修改场景

GQ_TongXin/Assets/Scenes/SampleSceneG.unity

@@ -9437,7 +9437,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4065166174645593778, guid: cdff6149826a44f4abc275995ec2d804, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4065166174645593779, guid: cdff6149826a44f4abc275995ec2d804, type: 3}
       propertyPath: m_Pivot.x
@@ -9525,15 +9525,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4065166174663843264, guid: cdff6149826a44f4abc275995ec2d804, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4065166174663843264, guid: cdff6149826a44f4abc275995ec2d804, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4065166174663843264, guid: cdff6149826a44f4abc275995ec2d804, type: 3}
       propertyPath: m_SizeDelta.x
-      value: -8.4015
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4065166174663843267, guid: cdff6149826a44f4abc275995ec2d804, type: 3}
       propertyPath: m_IsActive
@@ -9573,11 +9573,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4065166176363962149, guid: cdff6149826a44f4abc275995ec2d804, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4065166176363962149, guid: cdff6149826a44f4abc275995ec2d804, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4065166176728925583, guid: cdff6149826a44f4abc275995ec2d804, type: 3}
       propertyPath: m_IsActive

GQ_TongXin/Assets/Scripts/Camera/CameraRT.cs

@@ -194,9 +194,10 @@ public class CameraRT : MonoBehaviour
 
         if (Menu.M_全景监控_柜门状态 != CabinetUIManager.Instance.current_menu) 
         {
-
+            GameManager.Inst.power_close();
         }
 
+
         DOTween.Kill(transform, false);
         DOTween.Kill(cameraTransform, false);
         //target.position = target_init_position;

GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs

@@ -314,8 +314,7 @@ public class UIToCabinet : MonoBehaviour
 
         for (int i = 0; i < CabinetUIManager.Instance.cabinet_ui_base_list.Count; i++)
         {
-            if (CabinetUIManager.Instance.cabinet_ui_base_list[i].gameObject.activeSelf &&
-                CabinetUIManager.Instance.cabinet_ui_base_list[i].gameObject.name != "智能巡检")
+            if (CabinetUIManager.Instance.cabinet_ui_base_list[i].gameObject.name != "智能巡检")
             {
                 CabinetUIManager.Instance.cabinet_ui_base_list[i].gameObject.SetActive(false);
             }

GQ_TongXin/Assets/script/SearchName1.cs

@@ -35,7 +35,7 @@ public class SearchName1 : MonoBehaviour
     private void Awake()
     {
         rectTransform = scrollView.GetComponent<RectTransform>();
-        initialHeight = rectTransform.sizeDelta.y;
+        //initialHeight = rectTransform.sizeDelta.y;
         rectTransform.sizeDelta = new Vector2(rectTransform.sizeDelta.x, 0);
         gameObject.SetActive(false);
     }
@@ -121,7 +121,7 @@ public class SearchName1 : MonoBehaviour
     /// </summary>
     public void hide_menu()
     {
-        if (rectTransform.sizeDelta.y >= 0)
+        //if (rectTransform.sizeDelta.y >= 0)
         {
             DOTween.Kill(rectTransform, false);
 
@@ -142,7 +142,7 @@ public class SearchName1 : MonoBehaviour
     /// </summary>
     public void show_menu()
     {
-        if (rectTransform.sizeDelta.y != initialHeight)
+        //if (rectTransform.sizeDelta.y != initialHeight)
         {
             DOTween.Kill(rectTransform, false);
 

GQ_TongXin/Assets/script/点击/ClickEvent.cs

@@ -146,6 +146,7 @@ public class ClickEvent : MonoBehaviour
                                 GameManager.Inst.gameObject.GetComponent<DeviceManager>().uposManger = drag.uPosManger;
                                 //drag.oriObjectPrefab = gameObject.GetComponent<DragTest1>();
                                 gameObject.GetComponent<DeviceItem>().OnselfClick();
+                                GameManager.Inst.objectToShow_add.SetActive(true);
                             }
                             else
                                 GameManager.Inst.editorMenu.gameObject.SetActive(false);