任务1070

Assets/Game/Blue/Controller/Item/FaultPanel_Item.cs

@@ -1,3 +1,4 @@
+using UnityEngine;
 using UnityEngine.UI;
 
 namespace GHZLangChao
@@ -23,14 +24,12 @@ namespace GHZLangChao
             Time.text = AlarmData.equipmentAlarmTime;
         }
 
+        private Color mButtonColor = new Color(102,178,255,128);
         public void ClickButton()
         {
-            MachineObj obj = UICallManager.Instance.QueryMachineObj(AlarmData.deviceId);
-
-            if (obj != null)
-                UICallManager.Instance.NavigatorServer(obj);
-            //else
-            //    Debug.LogError(" 未查找到设备 " + AlarmData.deviceId + "   " + AlarmData.deviceName);
+            Debug.Log($"选择了{name}");
+            GetComponent<RawImage>().color = mButtonColor;
+            XunJianManager.AlarmData = AlarmData;
         }
     }
 }

Assets/Game/Blue/Controller/Item/SearchPanel_Item.cs

@@ -43,16 +43,12 @@ namespace GHZLangChao
                 Standards.text = "--";
         }
 
+        private Color mButtonColor = new Color(102,178,255,128);
         public void ClickButton()
         {
-         
-
-           MachineObj obj =  UICallManager.Instance.QueryMachineObj(MachineParameter.deviceId);
-
-            if (obj != null)
-                UICallManager.Instance.NavigatorServer(obj);
-            else
-                Debug.LogError(" 未查找到设备 " + MachineParameter.deviceId +"   "+ MachineParameter.deviceName);
+            Debug.Log($"选择了{name}");
+            GetComponent<RawImage>().color = mButtonColor;
+            XunJianManager.MachineParameters = MachineParameter;
         }
     }
 }

Assets/Game/ShowXunJian/XunJianManager.cs

@@ -12,11 +12,16 @@ namespace GHZLangChao
         [SerializeField] private Transform FaultPanelContent;// 故障面板Item父物体
         [SerializeField] private Toggle Serach_Toggle;
         [SerializeField] private Toggle Fault_Toggle;
+        [SerializeField] private Button Nav_Btn; // 导航按钮
+        [SerializeField] private Button ShowHideSelect_Btn; // 显示隐藏按钮
+        [SerializeField] private List<Sprite> SelectBtnSprite; // 显示隐藏按钮不同样式的Sprite
         public GameObject UI;
         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();
@@ -98,6 +103,54 @@ namespace GHZLangChao
             }
         }
 
+        private static MachineParameters mMachineParameter;
+        public static MachineParameters MachineParameters
+        {
+            get => mMachineParameter;
+            set => mMachineParameter = value;
+        }
+        private static AlarmData mAlarmData;
+        public static AlarmData AlarmData
+        {
+            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);
+                else
+                    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);
+                else
+                    Debug.LogError(" 未查找到设备 " + AlarmData.deviceId + "   " + AlarmData.deviceName);
+            }
+
+        }
+
+        private bool ShowSelect = true;
+        private void ShowHideSelect()
+        {
+            ShowSelect = !ShowSelect;
+            if(ShowSelect) // 选中状态
+            {
+                ShowHideSelect_Btn.transform.GetChild(0).GetComponent<Image>().sprite = SelectBtnSprite[0];
+            }
+            else // 隐藏状态
+            {
+                ShowHideSelect_Btn.transform.GetChild(0).GetComponent<Image>().sprite = SelectBtnSprite[1];
+            }
+        }
+
         public void showRTC()
         {
             LangChaoRTC.Instance.showRTC(0);

Assets/Prefab/Route/Materials/LineMat_1_High.mat

@@ -46,7 +46,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: d3f7a4a407ccaee48915bc7827f79dd6, type: 3}
         m_Scale: {x: 1, y: 3}
-        m_Offset: {x: 0, y: -23.199932}
+        m_Offset: {x: 0, y: -12.60003}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}