统一设置为0dof,增加缩放面板功能

Assets/Game/Blue/Action/ResetTransform.cs

@@ -18,21 +18,8 @@ public class ResetTransform : MonoBehaviour
 
     public void Execute()
     {
-        if (FixedHeight)
-        {
-            Vector3 v3 = Xunjian.position;
-            v3.y = height;
-            transform.position = v3;
-            Vector3 v3Rot = Xunjian.eulerAngles;
-            v3Rot = new Vector3(0,v3Rot.y,0);
-            transform.eulerAngles = v3Rot;
-
-        }
-        else
-        {
-            transform.position = Xunjian.position;
-            transform.eulerAngles = Xunjian.eulerAngles;
-        }
+        transform.position = Xunjian.position;
+        transform.eulerAngles = Xunjian.eulerAngles;
 
         /*
         transform.LookAt(OpenXRCamera.Instance.head);
@@ -43,4 +30,14 @@ public class ResetTransform : MonoBehaviour
         transform.position = new Vector3(transform.position.x, transform.position.y + 0f, transform.position.z);
         */
     }
+
+    public void FixedHeightExecute()
+    {
+        Vector3 v3 = Xunjian.position;
+        v3.y = height;
+        transform.position = v3;
+        Vector3 v3Rot = Xunjian.eulerAngles;
+        v3Rot = new Vector3(0, v3Rot.y, 0);
+        transform.eulerAngles = v3Rot;
+    }
 }

Assets/Game/Blue/Action/ScaleFunction.cs

@@ -0,0 +1,9 @@
+using UnityEngine;
+
+/// <summary>
+/// 面板缩放功能
+/// </summary>
+public class ScaleFunction : MonoBehaviour
+{
+    
+}

Assets/Game/Blue/Action/ScaleFunction.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5966fbcf38b2aeb4f87706cf2cf5b20b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Blue/Controller/ShowDeviceControle.cs

@@ -2,12 +2,10 @@ using UnityEngine;
 using Blue;
 using GHZLangChao;
 
-public class ShowDeviceControle : MonoBehaviour,IController
+public class ShowDeviceControle : SingletonMonobehaviour<ShowDeviceControle>,IController
 {
-    public static ShowDeviceControle Instance;
     public  void Awake()
     {
-        Instance = this;
         this.RegisterEvent<DeviceDetailsUpdataDataEvent>(e=>
         {
             if(DeviceDetailsControl==null)

Assets/Game/Blue/ScriptableObject/BlueObject.cs

@@ -10,4 +10,8 @@ public class BlueObject : ScriptableObject
     public GameObject WarningInfoItem; // ShowDeviceDetails 面板 -- WarningInfo ---子物体
 
     public GameObject ShowDeviceControle; // ShowDeviceDetails 面板 -- WarningInfo ---子物体
+
+    public float ZeroDofPosX;
+    public float ZeroDofPosY;
+    public float ZeroDofPosZ;
 }

Assets/Game/Blue/ScriptableObject/PrefabsAsset.asset

@@ -17,3 +17,6 @@ MonoBehaviour:
   FaultPanel_Item: {fileID: 7400388167945465585, guid: 48d98ef2483f27f41aa2ba8603fa54d5, type: 3}
   WarningInfoItem: {fileID: 8552349058852812674, guid: 80f48a9072eaf8e45940f1bed09e9cab, type: 3}
   ShowDeviceControle: {fileID: 6107917270000557272, guid: c61a8008bf2355c42ad9c16cde9bc3eb, type: 3}
+  ZeroDofPosX: 50
+  ZeroDofPosY: 0
+  ZeroDofPosZ: 180

Assets/Game/Blue/System/GetObjectSystem.cs

@@ -7,7 +7,7 @@ namespace GHZLangChao
     public class GetObjectSystem : SingletonMonobehaviour<GetObjectSystem>
     {
         [SerializeField] private GameObject ShowDevice;
-        [SerializeField] private Transform Xunjian2;
+        [SerializeField] private Transform Xunjian;
 
         private void Start()
         {
@@ -17,16 +17,16 @@ namespace GHZLangChao
 
         private void GetObj()
         {
-            Xunjian2 = new GameObject("Dof").AddComponent<Image>().transform;
-            Xunjian2.gameObject.SetActive(false);
-            Xunjian2.SetParent(OpenXRCamera.Instance.head.GetChild(0));
-            Xunjian2.GetComponent<RectTransform>().localPosition = new Vector3(50, 0, 180);
+            Xunjian = new GameObject("Dof").AddComponent<Image>().transform;
+            Xunjian.gameObject.SetActive(false);
+            Xunjian.SetParent(OpenXRCamera.Instance.head.GetChild(0));
+            Xunjian.GetComponent<RectTransform>().localPosition = new Vector3(InstantiateSystem.Instance.BlueObject.ZeroDofPosX, InstantiateSystem.Instance.BlueObject.ZeroDofPosY, InstantiateSystem.Instance.BlueObject.ZeroDofPosZ);
         }
 
         private void PushIOC()
         {
             SceneIOCContainer.Instance.Push("ShowDevice", ShowDevice);
-            SceneIOCContainer.Instance.Push("Dof", Xunjian2);
+            SceneIOCContainer.Instance.Push("Dof", Xunjian);
         }
     }
 }

Assets/Game/PrefabTemplate/ScaleFunction.prefab

@@ -0,0 +1,343 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2020461294465749889
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7942008384001139791}
+  - component: {fileID: 7420067286135412681}
+  m_Layer: 5
+  m_Name: ScaleFunction
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7942008384001139791
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2020461294465749889}
+  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:
+  - {fileID: 4065233719673788459}
+  - {fileID: 6688002177880493501}
+  m_Father: {fileID: 0}
+  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: 1293, y: -57}
+  m_SizeDelta: {x: 114, y: 114}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &7420067286135412681
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2020461294465749889}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5966fbcf38b2aeb4f87706cf2cf5b20b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &3221875647358120062
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4065233719673788459}
+  - component: {fileID: 3809897110756466166}
+  - component: {fileID: 4924563865704919856}
+  - component: {fileID: 8176056054556988260}
+  m_Layer: 5
+  m_Name: Retract_Btn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4065233719673788459
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  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_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_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -30}
+  m_SizeDelta: {x: 60, y: 114}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &3809897110756466166
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3221875647358120062}
+  m_CullTransparentMesh: 1
+--- !u!114 &4924563865704919856
+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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: c49063318fc35d247bd557c9224b280d, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  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
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6688002177880493501}
+  - component: {fileID: 388474953899611311}
+  - component: {fileID: 8247852193078128167}
+  - component: {fileID: 4840858669676698115}
+  m_Layer: 5
+  m_Name: Expand_Btn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6688002177880493501
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  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_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_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_Pivot: {x: 0, y: 0}
+--- !u!222 &388474953899611311
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8868107123287038631}
+  m_CullTransparentMesh: 1
+--- !u!114 &8247852193078128167
+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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: c49063318fc35d247bd557c9224b280d, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  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

Assets/Game/PrefabTemplate/ScaleFunction.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ef59d9efcbbc54a469082ba24ac09931
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/ShowChoose/ChooseManager.cs

@@ -7,6 +7,7 @@ using UnityEngine.Events;
 
 public class ChooseManager : MonoBehaviour,IController
 {
+    public bool Test = false;
     [SerializeField] private GameObject Tip;
     [SerializeField] private GameObject ShowDevice => SceneIOCContainer.Instance.Pull("ShowDevice") as GameObject;
     [SerializeField] private Toggle ShowHide_Toggle;
@@ -65,7 +66,7 @@ public class ChooseManager : MonoBehaviour,IController
             ShowHide_Toggle.interactable = true;
         Debug.Log($"打开的数量：{mQueueSystem.Level3QueueCount.Value}");
 
-        OnReset?.Invoke();
+        //OnReset?.Invoke();
         /*
         transform.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
         Vector3 pos = OpenXRCamera.Instance.head.position+ OpenXRCamera.Instance.head.forward * 2.5f;
@@ -76,6 +77,12 @@ public class ChooseManager : MonoBehaviour,IController
         BladeServerManager.Instance.isDaoHang = false;
 
     }
+
+    private void Update()
+    {
+        if (Test) return;
+        OnReset?.Invoke();
+    }
     private void ShowHideLevel3(bool on)
     {
         Debug.Log("Level3Queue:"+mQueueSystem.Level3List.Count);

Assets/Game/ShowSupport/ShowRtc.prefab

@@ -113,7 +113,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 72, y: 72}
+  m_SizeDelta: {x: 114, y: 114}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8853836621542794430
 CanvasRenderer:
@@ -180,7 +180,7 @@ RectTransform:
   m_GameObject: {fileID: 1858131424492282977}
   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_LocalScale: {x: 0.5, y: 0.5, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6190091372559013309}
@@ -189,7 +189,7 @@ RectTransform:
   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: 1284, y: 184}
+  m_SizeDelta: {x: 642, y: 92}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3271203083442533758
 CanvasRenderer:
@@ -500,6 +500,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 70b6c715d0ac9db458e179de83838f4f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  Test: 0
   Titile_Btn: {fileID: 6989965228074315159}
   ShowHide_Toggle: {fileID: 6357884478346561751}
   UserList_Btn: {fileID: 8908284830907246518}
@@ -599,7 +600,7 @@ RectTransform:
   m_GameObject: {fileID: 5942839336781322053}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.5, y: 1.5, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1317126048481137427}
@@ -608,8 +609,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 597, y: 0}
-  m_SizeDelta: {x: 72, y: 72}
+  m_AnchoredPosition: {x: 555, y: 0}
+  m_SizeDelta: {x: 114, y: 114}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6357884478346561751
 MonoBehaviour:
@@ -704,7 +705,7 @@ RectTransform:
   m_GameObject: {fileID: 6804054572846459353}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.8, y: 0.8, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5466424356445212017}
@@ -713,7 +714,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 160, y: 0}
-  m_SizeDelta: {x: 144, y: 144}
+  m_SizeDelta: {x: 114, y: 114}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1724476960348921325
 CanvasRenderer:
@@ -850,7 +851,7 @@ RectTransform:
   m_GameObject: {fileID: 6942373655331855637}
   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: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6689376516573963911}
@@ -860,7 +861,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1284, y: 184}
+  m_SizeDelta: {x: 642, y: 92}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3336402154665985468
 CanvasRenderer:

Assets/Game/ShowSupport/SupportControl.cs

@@ -6,6 +6,7 @@ using UnityEngine.Events;
 
 public class SupportControl : AbstractController
 {
+    public bool Test = false;
     [SerializeField] private Button Titile_Btn;
     [SerializeField] private Toggle ShowHide_Toggle;
 
@@ -74,8 +75,12 @@ public class SupportControl : AbstractController
 
     private void OnEnable()
     {
-        OnReset?.Invoke();
+        //OnReset?.Invoke();
     }
 
-
+    private void Update()
+    {
+        if (Test) return;
+        OnReset?.Invoke();
+    }
 }

Assets/Game/ShowXunJian/ShowDaoHang.prefab

@@ -1,127 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &589766632195193235
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5785719617477820676}
-  - component: {fileID: 8878309936531663565}
-  - component: {fileID: 2054653752395576390}
-  - component: {fileID: 1383926541591453501}
-  m_Layer: 5
-  m_Name: ShowHideSelectBtn
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &5785719617477820676
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 589766632195193235}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 3, y: 3, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 3109919406984720926}
-  m_Father: {fileID: 5466424356445212017}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 421, y: 114}
-  m_SizeDelta: {x: 144, y: 144}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8878309936531663565
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 589766632195193235}
-  m_CullTransparentMesh: 1
---- !u!114 &2054653752395576390
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 589766632195193235}
-  m_Enabled: 1
-  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: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &1383926541591453501
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 589766632195193235}
-  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: 2054653752395576390}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &640449350784874615
 GameObject:
   m_ObjectHideFlags: 0
@@ -1139,7 +1017,7 @@ RectTransform:
   m_GameObject: {fileID: 1858131424492282977}
   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_LocalScale: {x: 0.5, y: 0.5, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6190091372559013309}
@@ -1148,7 +1026,7 @@ RectTransform:
   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: 1284, y: 184}
+  m_SizeDelta: {x: 642, y: 92}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3271203083442533758
 CanvasRenderer:
@@ -3098,8 +2976,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6690543009024857250}
-  - {fileID: 5785719617477820676}
   - {fileID: 6190091372559013309}
+  - {fileID: 4812539245563059681}
   - {fileID: 533781171914398967}
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -3129,6 +3007,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: abff3c8d793d3ee4eab21bcc53471f19, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  Test: 0
   SearchPanel: {fileID: 6811682075174963131}
   SearchPanelContent: {fileID: 1317167833826935999}
   FaultPanel: {fileID: 7179222928760826613}
@@ -3136,11 +3015,9 @@ MonoBehaviour:
   Serach_Toggle: {fileID: 5268524296250973737}
   Fault_Toggle: {fileID: 7522824807737108661}
   Nav_Btn: {fileID: 8408396580092868833}
-  ShowHideSelect_Btn: {fileID: 1383926541591453501}
-  SelectBtnSprite:
-  - {fileID: 21300000, guid: 45952f334976d2647ba6af3e2fb5bb0e, type: 3}
-  - {fileID: 21300000, guid: 7416d0026c4d26248a5fd85a85becef5, type: 3}
-  UI: {fileID: 9017032404431050513}
+  Retract_go: {fileID: 20365899205003728}
+  Expand_go: {fileID: 6336533925175026441}
+  UI_go: {fileID: 9017032404431050513}
   OnReset:
     m_PersistentCalls:
       m_Calls:
@@ -3185,7 +3062,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5466424356445212314}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 65f83d6e499a787479f63b1414eaaad8, type: 3}
   m_Name: 
@@ -4025,7 +3902,7 @@ RectTransform:
   m_GameObject: {fileID: 6804054572846459353}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.8, y: 0.8, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5466424356445212017}
@@ -4033,8 +3910,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: 155, y: -9}
-  m_SizeDelta: {x: 144, y: 144}
+  m_AnchoredPosition: {x: 160, y: 0}
+  m_SizeDelta: {x: 114, y: 114}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1724476960348921325
 CanvasRenderer:
@@ -4427,17 +4304,17 @@ RectTransform:
   m_GameObject: {fileID: 6942373655331855637}
   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: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6689376516573963911}
   m_Father: {fileID: 5466424356445212017}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1284, y: 184}
+  m_SizeDelta: {x: 642, y: 92}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3336402154665985468
 CanvasRenderer:
@@ -5076,82 +4953,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &7833298785537025255
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3109919406984720926}
-  - component: {fileID: 8837604579705155813}
-  - component: {fileID: 5246581852216458080}
-  m_Layer: 5
-  m_Name: ShowHideSelectImage
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3109919406984720926
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7833298785537025255}
-  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: 5785719617477820676}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -72, y: -72}
-  m_SizeDelta: {x: 48, y: 48}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8837604579705155813
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7833298785537025255}
-  m_CullTransparentMesh: 1
---- !u!114 &5246581852216458080
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7833298785537025255}
-  m_Enabled: 1
-  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: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 45952f334976d2647ba6af3e2fb5bb0e, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &7853215846151659065
 GameObject:
   m_ObjectHideFlags: 0
@@ -5809,3 +5610,207 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1001 &3242095275713919406
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 5466424356445212017}
+    m_Modifications:
+    - target: {fileID: 2020461294465749889, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      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
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 114
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 114
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 1350
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+      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
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3221875647358120062, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+  m_PrefabInstance: {fileID: 3242095275713919406}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &4812539245563059681 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7942008384001139791, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+  m_PrefabInstance: {fileID: 3242095275713919406}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &6336533925175026441 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8868107123287038631, guid: ef59d9efcbbc54a469082ba24ac09931, type: 3}
+  m_PrefabInstance: {fileID: 3242095275713919406}
+  m_PrefabAsset: {fileID: 0}

Assets/Game/ShowXunJian/ShowXunJian.prefab

@@ -1832,7 +1832,7 @@ RectTransform:
   m_GameObject: {fileID: 1858131424492282977}
   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_LocalScale: {x: 0.5, y: 0.5, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6190091372559013309}
@@ -1841,7 +1841,7 @@ RectTransform:
   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: 1284, y: 184}
+  m_SizeDelta: {x: 642, y: 92}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3271203083442533758
 CanvasRenderer:
@@ -6334,7 +6334,7 @@ RectTransform:
   m_GameObject: {fileID: 6804054572846459353}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.5, y: 1.5, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5466424356445212017}
@@ -6342,8 +6342,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: 157, y: 11}
-  m_SizeDelta: {x: 70, y: 70}
+  m_AnchoredPosition: {x: 160, y: 0}
+  m_SizeDelta: {x: 114, y: 114}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1724476960348921325
 CanvasRenderer:
@@ -6614,7 +6614,7 @@ RectTransform:
   m_GameObject: {fileID: 6942373655331855637}
   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: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6689376516573963911}
@@ -6624,7 +6624,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1284, y: 184}
+  m_SizeDelta: {x: 642, y: 92}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3336402154665985468
 CanvasRenderer:

Assets/Game/ShowXunJian/XunJianManager.cs

@@ -3,11 +3,13 @@ using TMPro;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
+using Blue;
 
 namespace GHZLangChao
 {
-    public class XunJianManager : AbstractController
+    public class XunJianManager : SingletonMonobehaviour<XunJianManager>, IController
     {
+        public bool Test = false;
         [SerializeField] private GameObject SearchPanel; // 搜索面板
         [SerializeField] private Transform SearchPanelContent; // 搜索面板Item父物体
         [SerializeField] private GameObject FaultPanel; // 故障面板
@@ -15,30 +17,17 @@ namespace GHZLangChao
         [SerializeField] private Toggle Serach_Toggle;
         public Toggle Fault_Toggle;
         [SerializeField] private Button Nav_Btn; // 导航按钮
-        [SerializeField] private Button ShowHideSelect_Btn; // 显示隐藏按钮
-        [SerializeField] private List<Sprite> SelectBtnSprite; // 显示隐藏按钮不同样式的Sprite
-        public GameObject UI;
+        [SerializeField] private GameObject Retract_go; // 收起
+        [SerializeField] private GameObject Expand_go; // 展开
+        public GameObject UI_go;
 
         public UnityEvent OnReset = new UnityEvent();
 
-        public static XunJianManager Instance;
-
-        private void Awake()
-        {
-            if(Instance==null)
-                Instance = this;
-        }
-        private void OnEnable()
-        {
-            OnReset?.Invoke();
-        }
-
         void Start()
         {
             Serach_Toggle.onValueChanged.AddListener(SerachChange);
             Fault_Toggle.onValueChanged.AddListener(FaultChange);
             Nav_Btn.onClick.AddListener(StartNav);
-            ShowHideSelect_Btn.onClick.AddListener(ShowHideSelect);
             //UICallManager.Instance.MachineRoomInit();
             XRRGBCamera.Instance.stopCamera();
             Init();
@@ -46,7 +35,7 @@ namespace GHZLangChao
 
         public void StartXunJain()
         {
-            UI.SetActive(false);
+            UI_go.SetActive(false);
         }
 
         public void Next()
@@ -134,28 +123,40 @@ namespace GHZLangChao
             get => mAlarmData;
             set => mAlarmData = value;
         }
+
         private void StartNav()
         {
             if(Serach_Toggle.isOn)
             {
                 MachineObj obj =  UICallManager.Instance.QueryMachineObj(MachineParameters.deviceId);
                 if (obj != null)
+                {
                     UICallManager.Instance.NavigatorServer(obj);
+                    UI_go.SetActive(false);
+                    Retract_go.SetActive(false);
+                    Expand_go.SetActive(true);
+                }
                 else
-                    Debug.LogError(" 未查找到设备 " + MachineParameters.deviceId +"   "+ MachineParameters.deviceName);
+                    Debug.LogError(" 未查找到设备 " + MachineParameters.deviceId + "   " + MachineParameters.deviceName);
             }
             else if(Fault_Toggle.isOn)
             {
                 MachineObj obj = UICallManager.Instance.QueryMachineObj(AlarmData.deviceId);
 
                 if (obj != null)
+                {
                     UICallManager.Instance.NavigatorServer(obj);
+                    UI_go.SetActive(false);
+                    Retract_go.SetActive(false);
+                    Expand_go.SetActive(true);
+                }
                 else
                     Debug.LogError(" 未查找到设备 " + AlarmData.deviceId + "   " + AlarmData.deviceName);
             }
 
         }
 
+        /*
         private bool ShowSelect = true;
         private void ShowHideSelect()
         {
@@ -169,7 +170,7 @@ namespace GHZLangChao
                 ShowHideSelect_Btn.transform.GetChild(0).GetComponent<Image>().sprite = SelectBtnSprite[1];
             }
         }
-
+        */
         public void showRTC()
         {
             LangChaoRTC.Instance.showRTC(0);
@@ -181,5 +182,11 @@ namespace GHZLangChao
         {
             SettingMachineRoomData.Instance.EditorOpen();
         }
+
+        private void Update()
+        {
+            if (Test) return;
+            OnReset?.Invoke();
+        }
     }
 }

Assets/Scenes/LangChaoDemo2.unity

@@ -7848,7 +7848,6 @@ RectTransform:
   - {fileID: 1107507334}
   - {fileID: 1456619378}
   - {fileID: 1746801817}
-  - {fileID: 1016632607}
   m_Father: {fileID: 1971097074}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -10007,7 +10006,7 @@ PrefabInstance:
     - target: {fileID: 6195766569180850275, guid: 9e1deb76e7ead614da932413e318b2fc, type: 3}
       propertyPath: Xunjian
       value: 
-      objectReference: {fileID: 1016632607}
+      objectReference: {fileID: 0}
     - target: {fileID: 6195766569180850275, guid: 9e1deb76e7ead614da932413e318b2fc, type: 3}
       propertyPath: ShowDevice
       value: 
@@ -14211,82 +14210,6 @@ MonoBehaviour:
   startShowDevice: {fileID: 1617127047}
   listRoomName: []
   listObjes: []
---- !u!1 &1016632606
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1016632607}
-  - component: {fileID: 1016632609}
-  - component: {fileID: 1016632608}
-  m_Layer: 5
-  m_Name: StartXunJian
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &1016632607
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1016632606}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 180}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 587736015}
-  m_RootOrder: 4
-  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: 50, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1016632608
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1016632606}
-  m_Enabled: 1
-  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: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &1016632609
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1016632606}
-  m_CullTransparentMesh: 1
 --- !u!1 &1016915732
 GameObject:
   m_ObjectHideFlags: 0