Browse Source

bug459,456

蓝色星空 1 year ago
parent
commit
8128890bcd

+ 8 - 0
Assets/Game/ShowDevice/BasicDeviceControl.cs

@@ -25,6 +25,7 @@ namespace GHZLangChao
                     ArrowToggleBackground.enabled = false;
                 else
                     ArrowToggleBackground.enabled = true;
+
             });
         }
         public void ShowChoose()
@@ -67,6 +68,13 @@ namespace GHZLangChao
         }
         private void StartNav()
         {
+            ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowXunJian);
+            ShowXunJian.Instance.gotoWindow(ScenesManager.SceneType.ShowDH);
+            BladeServerManager.Instance.isDaoHang = true;
+            XunJianManager.Instance.Fault_Toggle.isOn = true;
+            XunJianManager.Instance.FaultChange(true);
+            XunJianManager.Instance.SerachChange(false);
+
             (SceneIOCContainer.Instance.Pull("ShowChoose") as GameObject).SetActive(false);
             MachineObj obj = UICallManager.Instance.QueryMachineObj(AlarmData.deviceId);
 

+ 15 - 7
Assets/Game/ShowXunJian/XunJianManager.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -11,12 +12,19 @@ namespace GHZLangChao
         [SerializeField] private GameObject FaultPanel; // 故障面板
         [SerializeField] private Transform FaultPanelContent;// 故障面板Item父物体
         [SerializeField] private Toggle Serach_Toggle;
-        [SerializeField] private Toggle Fault_Toggle;
+        public Toggle Fault_Toggle;
         [SerializeField] private Button Nav_Btn; // 导航按钮
         [SerializeField] private Button ShowHideSelect_Btn; // 显示隐藏按钮
         [SerializeField] private List<Sprite> SelectBtnSprite; // 显示隐藏按钮不同样式的Sprite
         public GameObject UI;
 
+        public static XunJianManager Instance;
+
+        private void Awake()
+        {
+            if(Instance==null)
+                Instance = this;
+        }
         private void OnEnable()
         {
             transform.LookAt(OpenXRCamera.Instance.head);
@@ -91,29 +99,29 @@ namespace GHZLangChao
         }
 
         #region UI监听
-        private void SerachChange(bool arg0)
+        public void SerachChange(bool arg0)
         {
             if (arg0)
             {
-                Serach_Toggle.transform.GetComponent<Text>().fontStyle = FontStyle.Bold;
+                Serach_Toggle.transform.GetComponent<TextMeshProUGUI>().fontStyle = (FontStyles)FontStyle.Bold;
                 SearchPanel.SetActive(true);
             }
             else
             {
-                Serach_Toggle.transform.GetComponent<Text>().fontStyle = FontStyle.Normal;
+                Serach_Toggle.transform.GetComponent<TextMeshProUGUI>().fontStyle = (FontStyles)FontStyle.Normal;
                 SearchPanel.SetActive(false);
             }
         }
-        private void FaultChange(bool arg0)
+        public void FaultChange(bool arg0)
         {
             if (arg0)
             {
-                Fault_Toggle.transform.GetComponent<Text>().fontStyle = FontStyle.Bold;
+                Fault_Toggle.transform.GetComponent<TextMeshProUGUI>().fontStyle = (FontStyles)FontStyle.Bold;
                 FaultPanel.SetActive(true);
             }
             else
             {
-                Fault_Toggle.transform.GetComponent<Text>().fontStyle = FontStyle.Normal;
+                Fault_Toggle.transform.GetComponent<TextMeshProUGUI>().fontStyle = (FontStyles)FontStyle.Normal;
                 FaultPanel.SetActive(false);
             }
         }