Browse Source

上传修改

蓝色星空 1 year ago
parent
commit
27e3b81687

+ 12 - 150
Assets/Game/PrefabTemplate/ScaleFunction.prefab

@@ -62,7 +62,6 @@ GameObject:
   - component: {fileID: 4065233719673788459}
   - component: {fileID: 3809897110756466166}
   - component: {fileID: 4924563865704919856}
-  - component: {fileID: 8176056054556988260}
   m_Layer: 5
   m_Name: Retract_Btn
   m_TagString: Untagged
@@ -77,18 +76,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3221875647358120062}
-  m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7942008384001139791}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: -30}
-  m_SizeDelta: {x: 60, y: 114}
+  m_AnchoredPosition: {x: -96, y: -103}
+  m_SizeDelta: {x: 45, y: 30}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &3809897110756466166
 CanvasRenderer:
@@ -118,8 +117,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c49063318fc35d247bd557c9224b280d, type: 3}
-  m_Type: 0
+  m_Sprite: {fileID: 1379788928, guid: c91ca0c0a7478ed4fbfe2acbbc13e0a7, type: 3}
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -128,74 +127,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &8176056054556988260
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3221875647358120062}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 4924563865704919856}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 8868107123287038631}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
-      - m_Target: {fileID: 3221875647358120062}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
 --- !u!1 &8868107123287038631
 GameObject:
   m_ObjectHideFlags: 0
@@ -207,7 +138,6 @@ GameObject:
   - component: {fileID: 6688002177880493501}
   - component: {fileID: 388474953899611311}
   - component: {fileID: 8247852193078128167}
-  - component: {fileID: 4840858669676698115}
   m_Layer: 5
   m_Name: Expand_Btn
   m_TagString: Untagged
@@ -222,18 +152,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8868107123287038631}
-  m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7942008384001139791}
   m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
+  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_AnchoredPosition: {x: 60, y: -32}
-  m_SizeDelta: {x: 60, y: 114}
+  m_AnchoredPosition: {x: -95, y: -103}
+  m_SizeDelta: {x: 45, y: 30}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &388474953899611311
 CanvasRenderer:
@@ -263,8 +193,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c49063318fc35d247bd557c9224b280d, type: 3}
-  m_Type: 0
+  m_Sprite: {fileID: 887803153, guid: 38a99ad61cc3caa4cb4fe4e74808bfdf, type: 3}
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -273,71 +203,3 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &4840858669676698115
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8868107123287038631}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 8247852193078128167}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 3221875647358120062}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 1
-        m_CallState: 2
-      - m_Target: {fileID: 8868107123287038631}
-        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
-        m_MethodName: SetActive
-        m_Mode: 6
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2

+ 2 - 2
Assets/Game/PrefabTemplate/ShowDeviceDetails.prefab

@@ -13267,7 +13267,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 888.2, y: 1581.4}
-  m_SizeDelta: {x: 179.426, y: -1623.859}
+  m_SizeDelta: {x: 193.997, y: -1623.859}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &8645788748444833270
 CanvasRenderer:
@@ -14013,7 +14013,7 @@ RectTransform:
   m_GameObject: {fileID: 6107917270000557272}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_LocalScale: {x: 0.45, y: 0.45, z: 0.45}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1247067359426320481}

+ 3 - 3
Assets/Game/ShowChoose/ChooseManager.cs

@@ -25,9 +25,6 @@ public class ChooseManager : MonoBehaviour,IController
         mQueueSystem.Level3QueueCount.Register(mQueueSystemCountNotNull).UnRegisterWhenGameObjectDestroyed(gameObject);
 
         SceneIOCContainer.Instance.Push("ShowChoose",gameObject);
-
-     
-
     }
 
 
@@ -81,6 +78,9 @@ public class ChooseManager : MonoBehaviour,IController
     private void Update()
     {
         if (Test) return;
+#if UNITY_EDITOR
+            return;
+#endif
         OnReset?.Invoke();
     }
     private void ShowHideLevel3(bool on)

File diff suppressed because it is too large
+ 117 - 737
Assets/Game/ShowChoose/ShowChoose.prefab


+ 33 - 33
Assets/Game/ShowSupport/ShowRtcHistory.prefab

@@ -339,9 +339,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 692.6, y: -1400}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2115939808374290461
@@ -1354,9 +1354,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 692.6, y: -500}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7096818996737263148
@@ -2078,9 +2078,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 692.6, y: -1100}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8339159937412058794
@@ -4405,9 +4405,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 692.6, y: -650}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8625852191629176744
@@ -5434,9 +5434,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 692.6, y: -950}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &730687026234953373
@@ -6568,9 +6568,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 692.6, y: -1250}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2543573225854777956
@@ -6829,9 +6829,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 692.6, y: -200}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5877255975082997754
@@ -8214,9 +8214,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 692.6, y: -350}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4608028662817439750
@@ -8621,9 +8621,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 692.6, y: -50}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1811445645089779225
@@ -8670,9 +8670,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 692.6, y: -800}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1113743781042514231
@@ -10432,9 +10432,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 692.6, y: -1550}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8088710613012652607

+ 86 - 99
Assets/Game/ShowXunJian/ShowDaoHang.prefab

@@ -3007,13 +3007,14 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: abff3c8d793d3ee4eab21bcc53471f19, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Test: 0
+  Test: 1
   SearchPanel: {fileID: 6811682075174963131}
   SearchPanelContent: {fileID: 1317167833826935999}
   FaultPanel: {fileID: 7179222928760826613}
   FaultPanelContent: {fileID: 8074901729563399304}
   Serach_Toggle: {fileID: 5268524296250973737}
   Fault_Toggle: {fileID: 7522824807737108661}
+  Titile_Btn: {fileID: 6151485519124196163}
   Nav_Btn: {fileID: 8408396580092868833}
   Retract_go: {fileID: 20365899205003728}
   Expand_go: {fileID: 6336533925175026441}
@@ -3033,6 +3034,84 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+  OnRetract:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 20365899205003728}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+      - m_Target: {fileID: 6336533925175026441}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 1
+        m_CallState: 2
+      - m_Target: {fileID: 9017032404431050513}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  OnExpand:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 20365899205003728}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 1
+        m_CallState: 2
+      - m_Target: {fileID: 6336533925175026441}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+      - m_Target: {fileID: 9017032404431050513}
+        m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+        m_MethodName: SetActive
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 1
+        m_CallState: 2
 --- !u!114 &335074033941586619
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5621,70 +5700,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: ScaleFunction
       objectReference: {fileID: 0}
-    - target: {fileID: 4065233719673788459, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4065233719673788459, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4065233719673788459, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: -57
-      objectReference: {fileID: 0}
-    - target: {fileID: 4065233719673788459, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -30
-      objectReference: {fileID: 0}
-    - target: {fileID: 4840858669676698115, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 4840858669676698115, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 4840858669676698115, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
-      value: 
-      objectReference: {fileID: 9017032404431050513}
-    - target: {fileID: 4840858669676698115, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 4840858669676698115, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
-      value: SetActive
-      objectReference: {fileID: 0}
-    - target: {fileID: 4840858669676698115, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName
-      value: UnityEngine.GameObject, UnityEngine
-      objectReference: {fileID: 0}
-    - target: {fileID: 4840858669676698115, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_BoolArgument
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4840858669676698115, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName
-      value: UnityEngine.Object, UnityEngine
-      objectReference: {fileID: 0}
-    - target: {fileID: 6688002177880493501, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6688002177880493501, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6688002177880493501, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6688002177880493501, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -30
-      objectReference: {fileID: 0}
     - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -5699,7 +5714,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
       propertyPath: m_AnchorMax.y
@@ -5707,7 +5722,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
       propertyPath: m_AnchorMin.x
-      value: 0
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
       propertyPath: m_AnchorMin.y
@@ -5715,11 +5730,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 114
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 114
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
       propertyPath: m_LocalPosition.x
@@ -5751,11 +5766,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 1350
+      value: 73
       objectReference: {fileID: 0}
     - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -5769,34 +5784,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8176056054556988260, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 8176056054556988260, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Mode
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 8176056054556988260, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
-      value: 
-      objectReference: {fileID: 9017032404431050513}
-    - target: {fileID: 8176056054556988260, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 8176056054556988260, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName
-      value: SetActive
-      objectReference: {fileID: 0}
-    - target: {fileID: 8176056054556988260, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName
-      value: UnityEngine.GameObject, UnityEngine
-      objectReference: {fileID: 0}
-    - target: {fileID: 8176056054556988260, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
-      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName
-      value: UnityEngine.Object, UnityEngine
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
 --- !u!1 &20365899205003728 stripped

File diff suppressed because it is too large
+ 865 - 129
Assets/Game/ShowXunJian/ShowXunJian.prefab


+ 20 - 1
Assets/Game/ShowXunJian/StartXunJian.cs

@@ -19,8 +19,12 @@ namespace GHZLangChao
         [SerializeField] private Button SaveBtn;
         [SerializeField] private bool[] toggleBoolList;
         [SerializeField] private GameObject DefaultUI_go;
+        [SerializeField] private GameObject EndUI_go;
+        [SerializeField] private Button Titile_Btn;
 
         public UnityEvent OnReset = new UnityEvent();
+        public UnityEvent OnRetract = new UnityEvent();
+        public UnityEvent OnExpand = new UnityEvent();
         void Start()
         {
             foreach (Button btn in ScreenshotBtnList)
@@ -28,11 +32,15 @@ namespace GHZLangChao
                 btn.onClick.AddListener(ClickScreenshot);
             }
             SaveBtn.onClick.AddListener(ClickSave);
+            Titile_Btn.onClick.AddListener(ClickTitle);
             //CancelBtn.onClick.AddListener(ClickCancel);
         }
         private void Update()
         {
             if (Test) return;
+#if UNITY_EDITOR
+            return;
+#endif
             OnReset?.Invoke();
         }
         public void Next()
@@ -102,13 +110,24 @@ namespace GHZLangChao
                     return;
                 }
             }
-            ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
+            EndUI_go.SetActive(true);
+            //ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
         }
 
         public void SetToogleBool(int index)
         {
             toggleBoolList[index] = true;
         }
+
+        private bool isRetract = false;
+        private void ClickTitle()
+        {
+            isRetract = !isRetract;
+            if(isRetract)
+                OnRetract?.Invoke();
+            else
+                OnExpand?.Invoke();
+        }
         #endregion
     }
 }

+ 17 - 0
Assets/Game/ShowXunJian/XunJianManager.cs

@@ -16,18 +16,22 @@ namespace GHZLangChao
         [SerializeField] private Transform FaultPanelContent;// 故障面板Item父物体
         [SerializeField] private Toggle Serach_Toggle;
         public Toggle Fault_Toggle;
+        [SerializeField] private Button Titile_Btn;
         [SerializeField] private Button Nav_Btn; // 导航按钮
         [SerializeField] private GameObject Retract_go; // 收起
         [SerializeField] private GameObject Expand_go; // 展开
         public GameObject UI_go;
 
         public UnityEvent OnReset = new UnityEvent();
+        public UnityEvent OnRetract = new UnityEvent();
+        public UnityEvent OnExpand = new UnityEvent();
 
         void Start()
         {
             Serach_Toggle.onValueChanged.AddListener(SerachChange);
             Fault_Toggle.onValueChanged.AddListener(FaultChange);
             Nav_Btn.onClick.AddListener(StartNav);
+            Titile_Btn.onClick.AddListener(ClickTitle);
             //UICallManager.Instance.MachineRoomInit();
             XRRGBCamera.Instance.stopCamera();
             Init();
@@ -176,6 +180,16 @@ namespace GHZLangChao
             LangChaoRTC.Instance.showRTC(0);
             ScenesManager.Instance.showWindow(ScenesManager.SceneType.RoomMain);
         }
+
+        private bool isRetract = false;
+        private void ClickTitle()
+        {
+            isRetract = !isRetract;
+            if(isRetract)
+                OnRetract?.Invoke();
+            else
+                OnExpand?.Invoke();
+        }
         #endregion
 
         public void OpenEidotrCanvas()
@@ -186,6 +200,9 @@ namespace GHZLangChao
         private void Update()
         {
             if (Test) return;
+#if UNITY_EDITOR
+            return;
+#endif
             OnReset?.Invoke();
         }
     }

+ 18 - 18
Assets/LangChaoRTC/Remote/ShowRoom/RoomMain.prefab

@@ -665,11 +665,11 @@ RectTransform:
   - {fileID: 2241088651101507120}
   - {fileID: 2313362337330922233}
   m_Father: {fileID: 557765135052244206}
-  m_RootOrder: 5
+  m_RootOrder: 11
   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_AnchoredPosition: {x: -7, y: -27}
+  m_AnchoredPosition: {x: 25.2, y: -45.4}
   m_SizeDelta: {x: 7.2, y: 7.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2241088650822641919
@@ -1792,7 +1792,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 557765135052244206}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1920,7 +1920,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2241088651684221945}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -52, y: -27, z: 0}
+  m_LocalPosition: {x: -19.8, y: -45.399998, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1928,7 +1928,7 @@ Transform:
   - {fileID: 2241088651471683786}
   - {fileID: 1387045231498400827}
   m_Father: {fileID: 557765135052244206}
-  m_RootOrder: 11
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2241088651695864273
 GameObject:
@@ -1954,7 +1954,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2241088651695864273}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -65, y: -27, z: 0}
+  m_LocalPosition: {x: -32.8, y: -45.399998, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1962,7 +1962,7 @@ Transform:
   - {fileID: 2241088652691173816}
   - {fileID: 8505436481987462423}
   m_Father: {fileID: 557765135052244206}
-  m_RootOrder: 10
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2241088651789104371
 GameObject:
@@ -2433,7 +2433,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 557765135052244206}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &2241088652319990554
 MeshFilter:
@@ -2888,11 +2888,11 @@ RectTransform:
   - {fileID: 2430319748161568938}
   - {fileID: 8713126046391109529}
   m_Father: {fileID: 557765135052244206}
-  m_RootOrder: 8
+  m_RootOrder: 9
   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_AnchoredPosition: {x: -37, y: -27}
+  m_AnchoredPosition: {x: -4.799999, y: -45.399998}
   m_SizeDelta: {x: 7.2, y: 7.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7735424442414073698
@@ -3184,8 +3184,8 @@ RectTransform:
   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_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 152.6, y: 86.4}
+  m_AnchoredPosition: {x: 0.82, y: -4.5}
+  m_SizeDelta: {x: 163.28, y: 102.96}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3365627282079776306
 CanvasRenderer:
@@ -3215,7 +3215,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 7a63fc2caa6f4e248bf38ab36beac2c6, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e475a827f6cd8ce4983a7315b90276a9, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4076,13 +4076,13 @@ RectTransform:
   - {fileID: 6325526256269672135}
   - {fileID: 2889834287218932637}
   - {fileID: 8639937286510639837}
-  - {fileID: 2241088650822641914}
   - {fileID: 2241088652319990553}
   - {fileID: 2241088651675265948}
-  - {fileID: 6496188556605830589}
-  - {fileID: 8733805478000310764}
   - {fileID: 2241088651695864272}
   - {fileID: 2241088651684221944}
+  - {fileID: 6496188556605830589}
+  - {fileID: 8733805478000310764}
+  - {fileID: 2241088650822641914}
   - {fileID: 2241088652138189772}
   - {fileID: 2241088651005219372}
   - {fileID: 4756682936245649874}
@@ -4191,11 +4191,11 @@ RectTransform:
   m_Children:
   - {fileID: 4596441203780356490}
   m_Father: {fileID: 557765135052244206}
-  m_RootOrder: 9
+  m_RootOrder: 10
   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_AnchoredPosition: {x: -22, y: -27}
+  m_AnchoredPosition: {x: 10.200001, y: -45.399998}
   m_SizeDelta: {x: 7.2, y: 7.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7347669372850126379

File diff suppressed because it is too large
+ 0 - 0
Assets/Resources/GHZLangChaoFont.asset


+ 25 - 3
Assets/UI/1027/1/下拉.png.meta

@@ -42,7 +42,7 @@ TextureImporter:
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 1
+  spriteMode: 2
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -115,7 +115,28 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
-    sprites: []
+    sprites:
+    - serializedVersion: 2
+      name: "\u4E0B\u62C9_0"
+      rect:
+        serializedVersion: 2
+        x: 46
+        y: 30
+        width: 88
+        height: 55
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 2b98b9f7dca99a34f943cf004b178dee
+      internalID: 1379788928
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
     outline: []
     physicsShape: []
     bones: []
@@ -126,7 +147,8 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-    nameFileIdTable: {}
+    nameFileIdTable:
+      "\u4E0B\u62C9_0": 1379788928
   spritePackingTag: 
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0

+ 25 - 3
Assets/UI/1027/1/收起.png.meta

@@ -42,7 +42,7 @@ TextureImporter:
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 1
+  spriteMode: 2
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -115,7 +115,28 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
-    sprites: []
+    sprites:
+    - serializedVersion: 2
+      name: "\u6536\u8D77_0"
+      rect:
+        serializedVersion: 2
+        x: 46
+        y: 97
+        width: 88
+        height: 54
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 2bc065ab21fadc24b84bd6fc68cfd171
+      internalID: 887803153
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
     outline: []
     physicsShape: []
     bones: []
@@ -126,7 +147,8 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-    nameFileIdTable: {}
+    nameFileIdTable:
+      "\u6536\u8D77_0": 887803153
   spritePackingTag: 
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0

+ 2 - 2
Assets/UI/1027/1/语音背景框加长.png.meta

@@ -42,7 +42,7 @@ TextureImporter:
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -119,7 +119,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

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