Browse Source

修改移动

胡佳骏 1 year ago
parent
commit
4cc4a82b89

+ 3 - 3
Assets/Game/ShowChoose/ShowChoose.prefab

@@ -2000,7 +2000,7 @@ GameObject:
   - component: {fileID: 5466424356445212017}
   - component: {fileID: 5466424356445212233}
   - component: {fileID: 6765360492072433445}
-  - component: {fileID: 8518192312414424363}
+  - component: {fileID: -2563318474759143114}
   m_Layer: 5
   m_Name: ShowChoose
   m_TagString: Untagged
@@ -2058,7 +2058,7 @@ MonoBehaviour:
   Tip: {fileID: 7897104504025182316}
   NavigationingBtn: {fileID: 235959186476976474}
   QuitBtn: {fileID: 6752051114129464009}
---- !u!114 &8518192312414424363
+--- !u!114 &-2563318474759143114
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2067,7 +2067,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5466424356445212314}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cf2687a5eaf355844bb90bf41eac5bd3, type: 3}
+  m_Script: {fileID: 11500000, guid: 98abaf856dae9dc41bd96faf988a2b8d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   StopFollower: 0

+ 14 - 14
Assets/Game/ShowDevice/ShowDevice.prefab

@@ -2696,8 +2696,8 @@ GameObject:
   m_Component:
   - component: {fileID: 5466424356445212017}
   - component: {fileID: 5466424356445212233}
-  - component: {fileID: 7600194254106481925}
   - component: {fileID: 5854089217068872903}
+  - component: {fileID: 182489533114299864}
   m_Layer: 5
   m_Name: ShowDevice
   m_TagString: Untagged
@@ -2737,7 +2737,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5466424356445212314}
   m_CullTransparentMesh: 0
---- !u!114 &7600194254106481925
+--- !u!114 &5854089217068872903
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2746,19 +2746,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 5466424356445212314}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cf2687a5eaf355844bb90bf41eac5bd3, type: 3}
+  m_Script: {fileID: 11500000, guid: e9497e0b9166cc34c94ef23097378c90, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  StopFollower: 0
-  windowDistance: 2
-  windowFollowSpeed: 2
-  windowAnchor: 7
-  windowOffset: {x: 0, y: 0}
-  defaultWindowRotation: {x: 0, y: 0}
-  InstantFollowing: 0
-  LinearFollowing: 0
-  menu_size: {x: 0, y: 0}
---- !u!114 &5854089217068872903
+--- !u!114 &182489533114299864
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2767,9 +2758,18 @@ MonoBehaviour:
   m_GameObject: {fileID: 5466424356445212314}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e9497e0b9166cc34c94ef23097378c90, type: 3}
+  m_Script: {fileID: 11500000, guid: 98abaf856dae9dc41bd96faf988a2b8d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  StopFollower: 0
+  windowDistance: 2
+  windowFollowSpeed: 2
+  windowAnchor: 7
+  windowOffset: {x: 0, y: 0}
+  defaultWindowRotation: {x: 0, y: 0}
+  InstantFollowing: 0
+  LinearFollowing: 0
+  menu_size: {x: 0, y: 0}
 --- !u!1 &5541364889485737482
 GameObject:
   m_ObjectHideFlags: 0

+ 5 - 11
Assets/Game/ShowLogin/LoginPanel.prefab

@@ -520,15 +520,12 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 5
   m_CharacterLimit: 100
-  m_OnSubmit:
+  m_OnEndEdit:
     m_PersistentCalls:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_OnDidEndEdit:
-    m_PersistentCalls:
-      m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 1, g: 1, b: 1, a: 0.7529412}
@@ -784,7 +781,7 @@ GameObject:
   - component: {fileID: 5466424356445212233}
   - component: {fileID: 5466424356445211600}
   - component: {fileID: 5245122704337899173}
-  - component: {fileID: 714681648994671835}
+  - component: {fileID: 2911140680020989035}
   m_Layer: 5
   m_Name: LoginPanel
   m_TagString: Untagged
@@ -870,7 +867,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a88615caab821064c9236e27153c1e38, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &714681648994671835
+--- !u!114 &2911140680020989035
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -879,7 +876,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5466424356445212314}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cf2687a5eaf355844bb90bf41eac5bd3, type: 3}
+  m_Script: {fileID: 11500000, guid: 98abaf856dae9dc41bd96faf988a2b8d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   StopFollower: 0
@@ -3357,15 +3354,12 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 5
   m_CharacterLimit: 100
-  m_OnSubmit:
+  m_OnEndEdit:
     m_PersistentCalls:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_OnDidEndEdit:
-    m_PersistentCalls:
-      m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 1, g: 1, b: 1, a: 0.7529412}

+ 14 - 14
Assets/Game/ShowSupport/ShowRtc.prefab

@@ -3662,8 +3662,8 @@ GameObject:
   m_Component:
   - component: {fileID: 5466424356445212017}
   - component: {fileID: 5466424356445212233}
-  - component: {fileID: 7600194254106481925}
   - component: {fileID: 3651108695874027832}
+  - component: {fileID: 68587665577711952}
   m_Layer: 5
   m_Name: ShowRtc
   m_TagString: Untagged
@@ -3705,7 +3705,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5466424356445212314}
   m_CullTransparentMesh: 0
---- !u!114 &7600194254106481925
+--- !u!114 &3651108695874027832
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -3714,19 +3714,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 5466424356445212314}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cf2687a5eaf355844bb90bf41eac5bd3, type: 3}
+  m_Script: {fileID: 11500000, guid: 70b6c715d0ac9db458e179de83838f4f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  StopFollower: 0
-  windowDistance: 2
-  windowFollowSpeed: 2
-  windowAnchor: 7
-  windowOffset: {x: 0, y: 0}
-  defaultWindowRotation: {x: 0, y: 0}
-  InstantFollowing: 0
-  LinearFollowing: 0
-  menu_size: {x: 0, y: 0}
---- !u!114 &3651108695874027832
+--- !u!114 &68587665577711952
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -3735,9 +3726,18 @@ MonoBehaviour:
   m_GameObject: {fileID: 5466424356445212314}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 70b6c715d0ac9db458e179de83838f4f, type: 3}
+  m_Script: {fileID: 11500000, guid: 98abaf856dae9dc41bd96faf988a2b8d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  StopFollower: 0
+  windowDistance: 2
+  windowFollowSpeed: 2
+  windowAnchor: 7
+  windowOffset: {x: 0, y: 0}
+  defaultWindowRotation: {x: 0, y: 0}
+  InstantFollowing: 0
+  LinearFollowing: 0
+  menu_size: {x: 0, y: 0}
 --- !u!1 &5495663601494064373
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -284,9 +284,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 692.6, y: -1400}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2115939808374290461
@@ -1024,9 +1024,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 692.6, y: -500}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7096818996737263148
@@ -1473,9 +1473,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 692.6, y: -1100}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8339159937412058794
@@ -3030,9 +3030,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 692.6, y: -650}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8625852191629176744
@@ -3839,9 +3839,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 692.6, y: -950}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &730687026234953373
@@ -4698,9 +4698,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 692.6, y: -1250}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2543573225854777956
@@ -4904,9 +4904,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 692.6, y: -200}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5877255975082997754
@@ -4927,8 +4927,8 @@ GameObject:
   m_Component:
   - component: {fileID: 5466424356445212017}
   - component: {fileID: 5466424356445212233}
-  - component: {fileID: 7600194254106481925}
   - component: {fileID: 846884574216209834}
+  - component: {fileID: 8352720626539740081}
   m_Layer: 5
   m_Name: ShowRtcHistory
   m_TagString: Untagged
@@ -4970,7 +4970,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5466424356445212314}
   m_CullTransparentMesh: 0
---- !u!114 &7600194254106481925
+--- !u!114 &846884574216209834
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4979,19 +4979,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 5466424356445212314}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cf2687a5eaf355844bb90bf41eac5bd3, type: 3}
+  m_Script: {fileID: 11500000, guid: e4175cdbcc0cdc240b825e1cc074e620, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  StopFollower: 0
-  windowDistance: 2
-  windowFollowSpeed: 2
-  windowAnchor: 7
-  windowOffset: {x: 0, y: 0}
-  defaultWindowRotation: {x: 0, y: 0}
-  InstantFollowing: 0
-  LinearFollowing: 0
-  menu_size: {x: 0, y: 0}
---- !u!114 &846884574216209834
+--- !u!114 &8352720626539740081
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -5000,9 +4991,18 @@ MonoBehaviour:
   m_GameObject: {fileID: 5466424356445212314}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e4175cdbcc0cdc240b825e1cc074e620, type: 3}
+  m_Script: {fileID: 11500000, guid: 98abaf856dae9dc41bd96faf988a2b8d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  StopFollower: 0
+  windowDistance: 2
+  windowFollowSpeed: 2
+  windowAnchor: 7
+  windowOffset: {x: 0, y: 0}
+  defaultWindowRotation: {x: 0, y: 0}
+  InstantFollowing: 0
+  LinearFollowing: 0
+  menu_size: {x: 0, y: 0}
 --- !u!1 &5495663601494064373
 GameObject:
   m_ObjectHideFlags: 0
@@ -5903,9 +5903,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 692.6, y: -350}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4608028662817439750
@@ -6200,9 +6200,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 692.6, y: -50}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1811445645089779225
@@ -6249,9 +6249,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 692.6, y: -800}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1113743781042514231
@@ -7461,9 +7461,9 @@ RectTransform:
   m_Father: {fileID: 723551545861190551}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 692.6, y: -1550}
   m_SizeDelta: {x: 1385.2, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8088710613012652607

+ 14 - 14
Assets/Game/ShowSupport/ShowRtcMeeting.prefab

@@ -2032,8 +2032,8 @@ GameObject:
   m_Component:
   - component: {fileID: 5466424356445212017}
   - component: {fileID: 5466424356445212233}
-  - component: {fileID: 7600194254106481925}
   - component: {fileID: 5733659207209001261}
+  - component: {fileID: 7252745916548603527}
   m_Layer: 5
   m_Name: ShowRtcMeeting
   m_TagString: Untagged
@@ -2076,7 +2076,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5466424356445212314}
   m_CullTransparentMesh: 0
---- !u!114 &7600194254106481925
+--- !u!114 &5733659207209001261
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2085,19 +2085,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 5466424356445212314}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cf2687a5eaf355844bb90bf41eac5bd3, type: 3}
+  m_Script: {fileID: 11500000, guid: 7da1a799a493f29429bdb33cc0643e73, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  StopFollower: 0
-  windowDistance: 2
-  windowFollowSpeed: 2
-  windowAnchor: 7
-  windowOffset: {x: 0, y: 0}
-  defaultWindowRotation: {x: 0, y: 0}
-  InstantFollowing: 0
-  LinearFollowing: 0
-  menu_size: {x: 0, y: 0}
---- !u!114 &5733659207209001261
+--- !u!114 &7252745916548603527
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2106,9 +2097,18 @@ MonoBehaviour:
   m_GameObject: {fileID: 5466424356445212314}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7da1a799a493f29429bdb33cc0643e73, type: 3}
+  m_Script: {fileID: 11500000, guid: 98abaf856dae9dc41bd96faf988a2b8d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  StopFollower: 0
+  windowDistance: 2
+  windowFollowSpeed: 2
+  windowAnchor: 7
+  windowOffset: {x: 0, y: 0}
+  defaultWindowRotation: {x: 0, y: 0}
+  InstantFollowing: 0
+  LinearFollowing: 0
+  menu_size: {x: 0, y: 0}
 --- !u!1 &5864206297814027156
 GameObject:
   m_ObjectHideFlags: 0

+ 21 - 21
Assets/Game/ShowXunJian/ShowDaoHang.prefab

@@ -3145,8 +3145,8 @@ GameObject:
   m_Component:
   - component: {fileID: 5466424356445212017}
   - component: {fileID: 5466424356445212233}
-  - component: {fileID: 7600194254106481925}
   - component: {fileID: 6165832893745008072}
+  - component: {fileID: 335074033941586619}
   m_Layer: 5
   m_Name: ShowDaoHang
   m_TagString: Untagged
@@ -3190,7 +3190,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5466424356445212314}
   m_CullTransparentMesh: 0
---- !u!114 &7600194254106481925
+--- !u!114 &6165832893745008072
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -3199,19 +3199,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 5466424356445212314}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cf2687a5eaf355844bb90bf41eac5bd3, type: 3}
+  m_Script: {fileID: 11500000, guid: abff3c8d793d3ee4eab21bcc53471f19, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  StopFollower: 0
-  windowDistance: 2
-  windowFollowSpeed: 2
-  windowAnchor: 7
-  windowOffset: {x: 0, y: 0}
-  defaultWindowRotation: {x: 0, y: 0}
-  InstantFollowing: 0
-  LinearFollowing: 0
-  menu_size: {x: 0, y: 0}
---- !u!114 &6165832893745008072
+  SearchPanel: {fileID: 6811682075174963131}
+  SearchPanelContent: {fileID: 1317167833826935999}
+  FaultPanel: {fileID: 7179222928760826613}
+  FaultPanelContent: {fileID: 8074901729563399304}
+  Serach_Toggle: {fileID: 5268524296250973737}
+  Fault_Toggle: {fileID: 7522824807737108661}
+  UI: {fileID: 9017032404431050513}
+--- !u!114 &335074033941586619
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -3220,16 +3218,18 @@ MonoBehaviour:
   m_GameObject: {fileID: 5466424356445212314}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: abff3c8d793d3ee4eab21bcc53471f19, type: 3}
+  m_Script: {fileID: 11500000, guid: 98abaf856dae9dc41bd96faf988a2b8d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  SearchPanel: {fileID: 6811682075174963131}
-  SearchPanelContent: {fileID: 1317167833826935999}
-  FaultPanel: {fileID: 7179222928760826613}
-  FaultPanelContent: {fileID: 8074901729563399304}
-  Serach_Toggle: {fileID: 5268524296250973737}
-  Fault_Toggle: {fileID: 7522824807737108661}
-  UI: {fileID: 9017032404431050513}
+  StopFollower: 0
+  windowDistance: 2
+  windowFollowSpeed: 2
+  windowAnchor: 7
+  windowOffset: {x: 0, y: 0}
+  defaultWindowRotation: {x: 0, y: 0}
+  InstantFollowing: 0
+  LinearFollowing: 0
+  menu_size: {x: 0, y: 0}
 --- !u!1 &5573163100672273733
 GameObject:
   m_ObjectHideFlags: 0

+ 22 - 22
Assets/Game/ShowXunJian/ShowXunJian.prefab

@@ -3365,8 +3365,8 @@ GameObject:
   m_Component:
   - component: {fileID: 5466424356445212017}
   - component: {fileID: 5466424356445212233}
-  - component: {fileID: 7600194254106481925}
   - component: {fileID: 1680626387826341901}
+  - component: {fileID: 2159527941179580181}
   m_Layer: 5
   m_Name: ShowXunJian
   m_TagString: Untagged
@@ -3409,27 +3409,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5466424356445212314}
   m_CullTransparentMesh: 0
---- !u!114 &7600194254106481925
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5466424356445212314}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cf2687a5eaf355844bb90bf41eac5bd3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  StopFollower: 0
-  windowDistance: 2
-  windowFollowSpeed: 2
-  windowAnchor: 7
-  windowOffset: {x: 0, y: 0}
-  defaultWindowRotation: {x: 0, y: 0}
-  InstantFollowing: 0
-  LinearFollowing: 0
-  menu_size: {x: 0, y: 0}
 --- !u!114 &1680626387826341901
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3454,6 +3433,27 @@ MonoBehaviour:
   CancelBtn: {fileID: 8020163195486443145}
   SaveBtn: {fileID: 3523176626855364471}
   NavigationingBtn: {fileID: 770239675660213892}
+--- !u!114 &2159527941179580181
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5466424356445212314}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 98abaf856dae9dc41bd96faf988a2b8d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  StopFollower: 0
+  windowDistance: 2
+  windowFollowSpeed: 2
+  windowAnchor: 7
+  windowOffset: {x: 0, y: 0}
+  defaultWindowRotation: {x: 0, y: 0}
+  InstantFollowing: 0
+  LinearFollowing: 0
+  menu_size: {x: 0, y: 0}
 --- !u!1 &5519994624036338274
 GameObject:
   m_ObjectHideFlags: 0

+ 14 - 14
Assets/Game/导航ing/Navigationing.prefab

@@ -344,8 +344,8 @@ GameObject:
   m_Component:
   - component: {fileID: 5466424356445212017}
   - component: {fileID: 5466424356445212233}
-  - component: {fileID: 7600194254106481925}
   - component: {fileID: 5083109122240645046}
+  - component: {fileID: 396295618378210564}
   m_Layer: 5
   m_Name: Navigationing
   m_TagString: Untagged
@@ -385,7 +385,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5466424356445212314}
   m_CullTransparentMesh: 0
---- !u!114 &7600194254106481925
+--- !u!114 &5083109122240645046
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -394,19 +394,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 5466424356445212314}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cf2687a5eaf355844bb90bf41eac5bd3, type: 3}
+  m_Script: {fileID: 11500000, guid: ae8667b4d07323445a0867851782edbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  StopFollower: 0
-  windowDistance: 2
-  windowFollowSpeed: 2
-  windowAnchor: 7
-  windowOffset: {x: 0, y: 0}
-  defaultWindowRotation: {x: 0, y: 0}
-  InstantFollowing: 0
-  LinearFollowing: 0
-  menu_size: {x: 0, y: 0}
---- !u!114 &5083109122240645046
+--- !u!114 &396295618378210564
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -415,9 +406,18 @@ MonoBehaviour:
   m_GameObject: {fileID: 5466424356445212314}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ae8667b4d07323445a0867851782edbb, type: 3}
+  m_Script: {fileID: 11500000, guid: 98abaf856dae9dc41bd96faf988a2b8d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  StopFollower: 0
+  windowDistance: 2
+  windowFollowSpeed: 2
+  windowAnchor: 7
+  windowOffset: {x: 0, y: 0}
+  defaultWindowRotation: {x: 0, y: 0}
+  InstantFollowing: 0
+  LinearFollowing: 0
+  menu_size: {x: 0, y: 0}
 --- !u!1 &6804054572846459353
 GameObject:
   m_ObjectHideFlags: 0