Merge branch 'F/20231018_Demo' of ssh://gogs.ghz-tech.com:30979/GHzGlass/GHZLangChao into F/20231018_Demo

Assets/Game/ShowDevice/ShowDevice.prefab

@@ -1046,6 +1046,7 @@ GameObject:
   m_Component:
   - component: {fileID: 918491418410476814}
   - component: {fileID: 1939905436320752828}
+  - component: {fileID: 6944355169282167507}
   m_Layer: 5
   m_Name: ShowHide_Toggle
   m_TagString: Untagged
@@ -1113,7 +1114,7 @@ MonoBehaviour:
     m_PressedTrigger: Pressed
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
-  m_Interactable: 0
+  m_Interactable: 1
   m_TargetGraphic: {fileID: 8009673171137622622}
   toggleTransition: 1
   graphic: {fileID: 3447651218044244439}
@@ -1121,7 +1122,23 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_IsOn: 0
+  m_IsOn: 1
+--- !u!114 &6944355169282167507
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1200604488847588142}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adc7e7b9276598843baabd94aeb3ad44, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  SpriteList:
+  - {fileID: 21300000, guid: 45952f334976d2647ba6af3e2fb5bb0e, type: 3}
+  - {fileID: 21300000, guid: 7416d0026c4d26248a5fd85a85becef5, type: 3}
+  mImage: {fileID: 8009673171137622622}
 --- !u!1 &1346261389600931557
 GameObject:
   m_ObjectHideFlags: 0
@@ -4119,7 +4136,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5035791214300277015}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -4629,7 +4646,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.49019608}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Game/ShowXunJian/ShowDaoHang.prefab

@@ -35,7 +35,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: 72, y: -72}
+  m_AnchoredPosition: {x: 58.817352, y: -38.666504}
   m_SizeDelta: {x: 48, y: 48}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7830225736155682953
@@ -4080,8 +4080,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -299, y: 0}
-  m_SizeDelta: {x: 144, y: 144}
+  m_AnchoredPosition: {x: -84, y: -24}
+  m_SizeDelta: {x: 117.149, y: 82.657}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1724476960348921325
 CanvasRenderer: