Browse Source

角色移动手机端适配

DESKTOP-5BUCSUT\LSR 1 year ago
parent
commit
ee9d600f12

+ 3 - 3
SFGgouhuo/Assets/Bundles/UI/Prefab/Dlg/DlgLogin.prefab

@@ -630,10 +630,10 @@ RectTransform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1920, y: 1080}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7407440858644285731
 CanvasRenderer:

File diff suppressed because it is too large
+ 271 - 443
SFGgouhuo/Assets/Bundles/UI/Prefab/FaceBuildPanel.prefab


+ 1 - 1
SFGgouhuo/Assets/Bundles/UI/Prefab/FaceBuildPanel.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 749204158604c2e498bde4853e923f52
+guid: d3243b2e37655b14dbe8d183cb4ff891
 PrefabImporter:
   externalObjects: {}
   userData: 

+ 3 - 3
SFGgouhuo/Assets/Bundles/UI/Prefab/LoadingPanel.prefab

@@ -111,10 +111,10 @@ RectTransform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1920, y: 1080}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1767289065818953728
 CanvasRenderer:

+ 7 - 7
SFGgouhuo/Assets/Bundles/UI/Prefab/MainPanel.prefab

@@ -194,7 +194,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 1523.4299, y: -807.5112}
+  m_AnchoredPosition: {x: -200.00244, y: 251.22437}
   m_SizeDelta: {x: 100.859985, y: 83.02252}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4354690879999297762
@@ -393,7 +393,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -1597, y: 899}
+  m_AnchoredPosition: {x: 210, y: -119}
   m_SizeDelta: {x: 200.62427, y: 45.740997}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4354690880194401095
@@ -471,10 +471,10 @@ RectTransform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -1820, y: -980}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4354690880285302331
 CanvasRenderer:
@@ -646,7 +646,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 1523.4324, y: -694.7356}
+  m_AnchoredPosition: {x: -200, y: 364}
   m_SizeDelta: {x: 100.86487, y: 95.47119}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4354690881642419822
@@ -767,7 +767,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 1523.4299, y: -908.3779}
+  m_AnchoredPosition: {x: -200.00244, y: 150.35767}
   m_SizeDelta: {x: 100.859985, y: 76.75568}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4354690881870863916

+ 5 - 18
SFGgouhuo/Assets/Bundles/UI/Prefab/MobilePanel.prefab

@@ -181,7 +181,6 @@ GameObject:
   - component: {fileID: 1059468859320016060}
   - component: {fileID: 1059468859320016063}
   - component: {fileID: 1059468859320016062}
-  - component: {fileID: 9014499423246204975}
   m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
@@ -265,18 +264,6 @@ MonoBehaviour:
   controlPath: <Gamepad>/leftStick
   joyStickType: 0
   isHideWithoutTouch: 0
---- !u!114 &9014499423246204975
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1059468859320016056}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e31057ef324a04478bb4f7d469b3cdc0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &2599911378670964541
 GameObject:
   m_ObjectHideFlags: 0
@@ -312,10 +299,10 @@ RectTransform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1920, y: 1080}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5749698253210542842
 CanvasRenderer:
@@ -332,14 +319,14 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2599911378670964541}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:

+ 27 - 31
SFGgouhuo/Assets/Defs/InputActions.cs

@@ -149,7 +149,7 @@ public partial class @InputActions: IInputActionCollection2, IDisposable
                 },
                 {
                     ""name"": """",
-                    ""id"": ""c013f274-de5a-40c2-b1c9-04e886cc2b7c"",
+                    ""id"": ""8f6591a1-b519-45a1-8f85-0900c22e0bfa"",
                     ""path"": ""<Gamepad>/leftStick"",
                     ""interactions"": """",
                     ""processors"": """",
@@ -191,6 +191,17 @@ public partial class @InputActions: IInputActionCollection2, IDisposable
                     ""isComposite"": false,
                     ""isPartOfComposite"": false
                 },
+                {
+                    ""name"": """",
+                    ""id"": ""ea41aaa3-71af-4a0f-a472-46b9f582153a"",
+                    ""path"": ""<Touchscreen>/touch0/delta"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": """",
+                    ""action"": ""UIRot"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
+                },
                 {
                     ""name"": """",
                     ""id"": ""4077713c-4a4a-4a7d-b59c-3844eff339b8"",
@@ -202,6 +213,17 @@ public partial class @InputActions: IInputActionCollection2, IDisposable
                     ""isComposite"": false,
                     ""isPartOfComposite"": false
                 },
+                {
+                    ""name"": """",
+                    ""id"": ""1f3ce28e-26f4-4475-9185-1d065b52e2b8"",
+                    ""path"": ""<Pointer>/press"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": """",
+                    ""action"": ""PressDown"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
+                },
                 {
                     ""name"": """",
                     ""id"": ""ce253bba-0484-4170-ac71-817a0d336bb2"",
@@ -226,11 +248,11 @@ public partial class @InputActions: IInputActionCollection2, IDisposable
                 },
                 {
                     ""name"": """",
-                    ""id"": ""84d1b8e2-3bca-4e0e-b5db-020547117e0e"",
+                    ""id"": ""22ca5a7c-ec1e-4637-bf79-ae08d35db535"",
                     ""path"": ""<Mouse>/delta"",
                     ""interactions"": """",
-                    ""processors"": ""ScaleVector2"",
-                    ""groups"": ""New control scheme"",
+                    ""processors"": """",
+                    ""groups"": """",
                     ""action"": ""Camera"",
                     ""isComposite"": false,
                     ""isPartOfComposite"": false
@@ -238,24 +260,7 @@ public partial class @InputActions: IInputActionCollection2, IDisposable
             ]
         }
     ],
-    ""controlSchemes"": [
-        {
-            ""name"": ""New control scheme"",
-            ""bindingGroup"": ""New control scheme"",
-            ""devices"": [
-                {
-                    ""devicePath"": ""<Keyboard>"",
-                    ""isOptional"": false,
-                    ""isOR"": false
-                },
-                {
-                    ""devicePath"": ""<Mouse>"",
-                    ""isOptional"": false,
-                    ""isOR"": false
-                }
-            ]
-        }
-    ]
+    ""controlSchemes"": []
 }");
         // Player
         m_Player = asset.FindActionMap("Player", throwIfNotFound: true);
@@ -417,15 +422,6 @@ public partial class @InputActions: IInputActionCollection2, IDisposable
         }
     }
     public PlayerActions @Player => new PlayerActions(this);
-    private int m_NewcontrolschemeSchemeIndex = -1;
-    public InputControlScheme NewcontrolschemeScheme
-    {
-        get
-        {
-            if (m_NewcontrolschemeSchemeIndex == -1) m_NewcontrolschemeSchemeIndex = asset.FindControlSchemeIndex("New control scheme");
-            return asset.controlSchemes[m_NewcontrolschemeSchemeIndex];
-        }
-    }
     public interface IPlayerActions
     {
         void OnMove(InputAction.CallbackContext context);

+ 27 - 22
SFGgouhuo/Assets/Defs/InputActions.inputactions

@@ -127,7 +127,7 @@
                 },
                 {
                     "name": "",
-                    "id": "c013f274-de5a-40c2-b1c9-04e886cc2b7c",
+                    "id": "8f6591a1-b519-45a1-8f85-0900c22e0bfa",
                     "path": "<Gamepad>/leftStick",
                     "interactions": "",
                     "processors": "",
@@ -169,6 +169,17 @@
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
+                {
+                    "name": "",
+                    "id": "ea41aaa3-71af-4a0f-a472-46b9f582153a",
+                    "path": "<Touchscreen>/touch0/delta",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "UIRot",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
                 {
                     "name": "",
                     "id": "4077713c-4a4a-4a7d-b59c-3844eff339b8",
@@ -180,6 +191,17 @@
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
+                {
+                    "name": "",
+                    "id": "1f3ce28e-26f4-4475-9185-1d065b52e2b8",
+                    "path": "<Pointer>/press",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "PressDown",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
                 {
                     "name": "",
                     "id": "ce253bba-0484-4170-ac71-817a0d336bb2",
@@ -204,11 +226,11 @@
                 },
                 {
                     "name": "",
-                    "id": "84d1b8e2-3bca-4e0e-b5db-020547117e0e",
+                    "id": "22ca5a7c-ec1e-4637-bf79-ae08d35db535",
                     "path": "<Mouse>/delta",
                     "interactions": "",
-                    "processors": "ScaleVector2",
-                    "groups": "New control scheme",
+                    "processors": "",
+                    "groups": "",
                     "action": "Camera",
                     "isComposite": false,
                     "isPartOfComposite": false
@@ -216,22 +238,5 @@
             ]
         }
     ],
-    "controlSchemes": [
-        {
-            "name": "New control scheme",
-            "bindingGroup": "New control scheme",
-            "devices": [
-                {
-                    "devicePath": "<Keyboard>",
-                    "isOptional": false,
-                    "isOR": false
-                },
-                {
-                    "devicePath": "<Mouse>",
-                    "isOptional": false,
-                    "isOR": false
-                }
-            ]
-        }
-    ]
+    "controlSchemes": []
 }

+ 1 - 1
SFGgouhuo/Assets/GameResources/Player.renderTexture

@@ -25,7 +25,7 @@ RenderTexture:
   m_SRGB: 0
   m_UseDynamicScale: 0
   m_BindMS: 0
-  m_EnableCompatibleFormat: 1
+  m_EnableCompatibleFormat: 0
   m_TextureSettings:
     serializedVersion: 2
     m_FilterMode: 1

+ 12 - 273
SFGgouhuo/Assets/Resources/goodsData.json

@@ -10854,123 +10854,11 @@
         "mutex": "10, 17",
         "others": "1"
     },
-    {
-        "id": 100204,
-        "name": "tkcw多元宇宙特别款 休闲T恤A款-荧光绿",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 20,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!校园风的休闲T恤,主打一个青春感。",
-        "type": 0,
-        "level": 1,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 100205,
-        "name": "tkcw多元宇宙特别款 休闲T恤A款-天真蓝",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 20,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!校园风的休闲T恤,主打一个青春感。",
-        "type": 0,
-        "level": 1,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 100206,
-        "name": "tkcw多元宇宙特别款 休闲T恤B款-天真蓝",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 20,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!校园风的休闲T恤,主打一个青春感。",
-        "type": 0,
-        "level": 1,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 100207,
-        "name": "tkcw多元宇宙特别款 休闲T恤B款-荧光绿",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 20,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!校园风的休闲T恤,主打一个青春感。",
-        "type": 0,
-        "level": 1,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 100208,
-        "name": "tkcw多元宇宙特别款 休闲T恤C款-黑色",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 20,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!校园风的休闲T恤,主打一个青春感。",
-        "type": 0,
-        "level": 1,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 100209,
-        "name": "tkcw多元宇宙特别款 休闲T恤C款-白色",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 20,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!校园风的休闲T恤,主打一个青春感。",
-        "type": 0,
-        "level": 1,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 100210,
-        "name": "tkcw多元宇宙特别款 休闲T恤D款-黑色",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 20,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!校园风的休闲T恤,主打一个青春感。",
-        "type": 0,
-        "level": 1,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 100211,
-        "name": "tkcw多元宇宙特别款 休闲T恤D款-白色",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 20,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!校园风的休闲T恤,主打一个青春感。",
-        "type": 0,
-        "level": 1,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 100212,
-        "name": "tkcw多元宇宙特别款 休闲T恤E款-黑白",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 20,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!校园风的休闲T恤,主打一个青春感。",
-        "type": 0,
-        "level": 1,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
+  
+ 
+
+   
+
     {
         "id": 100301,
         "name": "休闲长袖T恤A款",
@@ -11335,45 +11223,7 @@
         "mutex": "12, 17",
         "others": ""
     },
-    {
-        "id": 120207,
-        "name": "tkcw多元宇宙特别款 时尚帆布鞋-蓝白SFG",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 20,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!拥有SFG签名的帆布鞋。",
-        "type": 0,
-        "level": 1,
-        "mutex": "12, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 120208,
-        "name": "tkcw多元宇宙特别款 时尚帆布鞋-黑白TKCW",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 20,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!拥有SFG签名的帆布鞋。",
-        "type": 0,
-        "level": 1,
-        "mutex": "12, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 120209,
-        "name": "tkcw多元宇宙特别款 时尚帆布鞋-黑白SFG",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 20,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!拥有SFG签名的帆布鞋。",
-        "type": 0,
-        "level": 1,
-        "mutex": "12, 17",
-        "others": "1,2"
-    },
+   
     {
         "id": 120301,
         "name": "短袜A款-白色",
@@ -11595,123 +11445,12 @@
         "mutex": "10, 17",
         "others": ""
     },
-    {
-        "id": 100806,
-        "name": "tkcw多元宇宙特别款 卫衣A款-天真蓝",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 60,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!限定系列卫衣,和直火帮一起探索世界!",
-        "type": 0,
-        "level": 2,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 100807,
-        "name": "tkcw多元宇宙特别款 卫衣A款-荧光绿",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 60,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!限定系列卫衣,和直火帮一起探索世界!",
-        "type": 0,
-        "level": 2,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 100808,
-        "name": "tkcw多元宇宙特别款 卫衣B款-白色",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 60,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!限定系列卫衣,和直火帮一起探索世界!",
-        "type": 0,
-        "level": 2,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 100809,
-        "name": "tkcw多元宇宙特别款 限定卫衣B款-黑色",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 60,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!限定系列卫衣,和直火帮一起探索世界!",
-        "type": 0,
-        "level": 2,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 100814,
-        "name": "tkcw多元宇宙特别款 限定卫衣C款-XZT",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 60,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!限定系列卫衣,和直火帮一起探索世界!",
-        "type": 0,
-        "level": 2,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 100810,
-        "name": "tkcw多元宇宙特别款 限定卫衣C款-Zigga",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 60,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!限定系列卫衣,和直火帮一起探索世界!",
-        "type": 0,
-        "level": 2,
-        "mutex": "10,17",
-        "others": "1,2"
-    },
-    {
-        "id": 100811,
-        "name": "tkcw多元宇宙特别款 限定卫衣C款-Feezy",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 60,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!限定系列卫衣,和直火帮一起探索世界!",
-        "type": 0,
-        "level": 2,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 100812,
-        "name": "tkcw多元宇宙特别款 限定卫衣D款-Feezy倒立",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 60,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!限定系列卫衣,和直火帮一起探索世界!",
-        "type": 0,
-        "level": 2,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
-    {
-        "id": 100813,
-        "name": "tkcw多元宇宙特别款 限定卫衣E款-TKCW",
-        "dressType": "1",
-        "assetsName": "",
-        "cost": 60,
-        "color": "0",
-        "descr": "tkcw多元宇宙特别系列!限定系列卫衣,和直火帮一起探索世界!",
-        "type": 0,
-        "level": 2,
-        "mutex": "10, 17",
-        "others": "1,2"
-    },
+ 
+
+ 
+    
+   
+  
     {
         "id": 110501,
         "name": "复古牛仔阔腿裤-蓝色",

+ 2 - 0
SFGgouhuo/Assets/Scripts/Manager/UIManager.cs

@@ -141,6 +141,8 @@ public class UIManager : MonoBehaviour
             ui.transform.SetParent(m_UIRoot.transform);
             RectTransform rect = ui.GetComponent<RectTransform>();
             rect.localPosition = Vector3.zero;
+            rect.offsetMax = Vector2.zero;
+            rect.offsetMin = Vector2.zero;
             rect.localRotation = Quaternion.identity;
             rect.localScale = Vector3.one;
             m_UIList.Add(uiName, ui);

+ 8 - 3
SFGgouhuo/Assets/Defs/MoveController.cs → SFGgouhuo/Assets/Scripts/MoveController.cs

@@ -195,7 +195,7 @@ public class MoveController : MonoBehaviour
             //camera.eulerAngles += (new Vector3(playerInput.touch0Input.y, playerInput.touch0Input.x, 0)) * 0.1f;
             angleX += playerInput.touch0Input.x * 10 * Time.fixedDeltaTime;
             angleY -= playerInput.touch0Input.y * 10 * Time.fixedDeltaTime;
-            angleY = angleClamp(angleY, 3, 60);//相机旋转角度限制
+            angleY = angleClamp(angleY, -10, 60);//相机旋转角度限制
 
             //使用插值平滑旋转
             camera.rotation = Quaternion.Lerp(camera.rotation, Quaternion.Euler(angleY, angleX, 0), Time.fixedDeltaTime * 5);
@@ -203,12 +203,17 @@ public class MoveController : MonoBehaviour
         }
         if (playerInput.touch1Input != Vector2.zero && !EventSystem.current.IsPointerOverGameObject())
         {
-            camera.Rotate(new Vector3(playerInput.touch1Input.y, playerInput.touch1Input.x, 0));
+            angleX += playerInput.touch1Input.x * 10 * Time.fixedDeltaTime;
+            angleY -= playerInput.touch1Input.y * 10 * Time.fixedDeltaTime;
+            angleY = angleClamp(angleY, -10, 60);//相机旋转角度限制
+
+            //使用插值平滑旋转
+            camera.rotation = Quaternion.Lerp(camera.rotation, Quaternion.Euler(angleY, angleX, 0), Time.fixedDeltaTime * 5);
         }
 
         angleX += playerInput.CameraInput.x * 10 * Time.fixedDeltaTime;
         angleY -= playerInput.CameraInput.y * 10 * Time.fixedDeltaTime;
-        angleY = angleClamp(angleY, 3, 60);//相机旋转角度限制
+        angleY = angleClamp(angleY, -10, 60);//相机旋转角度限制
 
         //使用插值平滑旋转
         camera.rotation = Quaternion.Lerp(camera.rotation, Quaternion.Euler(angleY, angleX, 0), Time.fixedDeltaTime * 5);

+ 0 - 0
SFGgouhuo/Assets/Defs/MoveController.cs.meta → SFGgouhuo/Assets/Scripts/MoveController.cs.meta


+ 0 - 0
SFGgouhuo/Assets/Defs/PlayerInputComponent.cs → SFGgouhuo/Assets/Scripts/PlayerInputComponent.cs


+ 0 - 0
SFGgouhuo/Assets/Defs/PlayerInputComponent.cs.meta → SFGgouhuo/Assets/Scripts/PlayerInputComponent.cs.meta


+ 16 - 3
SFGgouhuo/Assets/Scripts/UI/Component/ModelPanel.cs

@@ -30,12 +30,25 @@ public class ModelPanel : BasePanel,IPointerEnterHandler,IPointerExitHandler
         if (StepManager.player_dress)
         {
             PlayerInputComponent playerInput = StepManager.player_dress.GetComponent<PlayerInputComponent>();
+            Debug.Log(isOn + "////" + playerInput.isPressDown);
+#if UNITY_STANDALONE_WIN
+             if (isOn &&  playerInput.isPressDown)
+            {
+                StepManager.player_dress.transform.Rotate(StepManager.player_dress.transform.up, -playerInput.mousePosInput.x * 0.7f);
+            }
+#elif UNITY_EDITOR
             if (isOn && playerInput.isPressDown)
             {
                 StepManager.player_dress.transform.Rotate(StepManager.player_dress.transform.up, -playerInput.mousePosInput.x * 0.7f);
             }
-        } 
+#elif UNITY_ANDROID
+            if (isOn && Input.touchCount==1)
+            {
+                StepManager.player_dress.transform.Rotate(StepManager.player_dress.transform.up, -playerInput.mousePosInput.x * 0.7f);
+            }
+#endif
+        }
     }
 
-   
-}
+
+        }

+ 11 - 5
SFGgouhuo/Assets/Scripts/UI/FaceBuild/FaceBuildSystem.cs

@@ -57,11 +57,6 @@ public class FaceBuildSystem : MonoBehaviour
     private GameObject itempackage;
     private async void Start()
     {
-        ColorStyle =await YooAssetManager.Instance.LoadAsset<SpriteAtlas>("colorItems");
-        ItemIcon = await YooAssetManager.Instance.LoadAsset<SpriteAtlas>("ItemIcon");
-        itempackage = await YooAssetManager.Instance.LoadAsset<GameObject>("Item_Package");
-
-
         re = GetComponent<ReferenceCollector>();
         EFinish = re.Get<GameObject>("EFinish").GetComponent<Button>();
         EModel = re.Get<GameObject>("EModel").GetComponent<RectTransform>();
@@ -78,6 +73,14 @@ public class FaceBuildSystem : MonoBehaviour
         EGColorItem = re.Get<GameObject>("EGColorItem").GetComponent<RectTransform>();
         EGColorFilter = re.Get<GameObject>("EGColorFilter").GetComponent<RectTransform>();
         EModel.GetComponent<RawImage>().texture = GameObject.Find("UICamera").GetComponent<Camera>().targetTexture;
+
+
+        ColorStyle =await YooAssetManager.Instance.LoadAsset<SpriteAtlas>("colorItems");
+        ItemIcon = await YooAssetManager.Instance.LoadAsset<SpriteAtlas>("ItemIcon");
+        itempackage = await YooAssetManager.Instance.LoadAsset<GameObject>("Item_Package");
+
+
+     
         List<Good> goods = JsonMapper.ToObject<List<Good>>(Resources.Load<TextAsset>("goodsData").text);
         for (int i = 0; i < goods.Count; i++)
         {
@@ -86,6 +89,8 @@ public class FaceBuildSystem : MonoBehaviour
         }
 
 
+
+
         for (int i = 0; i < goods.Count; i++)
         {
             //if (goods[i].type == 1)
@@ -121,6 +126,7 @@ public class FaceBuildSystem : MonoBehaviour
         CreatColorItem();
         Init();
         Ebody.isOn = true;
+       
     }
 
     private void Init()

+ 12 - 10
SFGgouhuo/Assets/Scripts/UI/Loading/DlgLogin.cs

@@ -25,18 +25,20 @@ namespace Assets
 
         public override void OnInitWindow()
         {
-            LoadJson();
+            //LoadJson();
             confirmBtn.onClick.AddListener(async () =>
             {
-                if (userData.table.Contains(inputField.text))
-                {
-                    UIManager.Instance.HideUI(WindowID.DlgLogin);
-                    await UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
-                }
-                else
-                {
-                    await UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
-                }
+                //if (userData.table.Contains(inputField.text))
+                //{
+                //    UIManager.Instance.HideUI(WindowID.DlgLogin);
+                //    await UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
+                //}
+                //else
+                //{
+                //    await UIManager.Instance.ShowUI(WindowID.DlgLoginFaild);
+                //}
+                UIManager.Instance.HideUI(WindowID.DlgLogin);
+                await UIManager.Instance.ShowUI(WindowID.FaceBuildPanel);
 
             });
         }

Some files were not shown because too many files changed in this diff