Browse Source

添加搜索设备Item按钮点击事件

蓝色星空 1 year ago
parent
commit
1d7b196abd

+ 8 - 0
Assets/Game/Blue/Controller/Item/FaultPanel_Item.cs

@@ -12,12 +12,20 @@ namespace GHZLangChao
         public Text Level; // 告警级别
         public Text Time;// 告警时间
 
+        private AlarmData AlarmData;
         public void Init(AlarmData AlarmData)
         {
+            this.AlarmData = AlarmData;
+
             Name.text = AlarmData.title;
             System.text = AlarmData.carryingSystem;
             Level.text = AlarmData.level;
             Time.text = AlarmData.equipmentAlarmTime;
         }
+
+        public void ClickButton()
+        {
+            UICallManager.Instance.NavigatorServer(AlarmData.deviceId);
+        }
     }
 }

+ 9 - 0
Assets/Game/Blue/Controller/Item/SearchPanel_Item.cs

@@ -16,8 +16,12 @@ namespace GHZLangChao
         public Text Factory;// 厂家
         public Text Standards;// 规格
 
+        private MachineParameters MachineParameter;
+
         public void Init(MachineParameters MachineParameter)
         {
+            this.MachineParameter = MachineParameter;
+
             Name.text = MachineParameter.deviceName;
             System.text = MachineParameter.carryingSystem;
             Pos.text = MachineParameter.deviceLocation;
@@ -38,5 +42,10 @@ namespace GHZLangChao
             else
                 Standards.text = "--";
         }
+
+        public void ClickButton()
+        {
+            UICallManager.Instance.NavigatorServer(MachineParameter.deviceId);
+        }
     }
 }

+ 13 - 1
Assets/Game/Blue/Prefabs/FaultPanel_Item.prefab

@@ -362,7 +362,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 7109718103764188753}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 6639642803538604138}
+        m_TargetAssemblyTypeName: GHZLangChao.FaultPanel_Item, Assembly-CSharp
+        m_MethodName: ClickButton
+        m_Mode: 1
+        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!114 &6639642803538604138
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 13 - 1
Assets/Game/Blue/Prefabs/SearchPanel_Item.prefab

@@ -605,7 +605,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 170681797478806084}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 9150179315505576344}
+        m_TargetAssemblyTypeName: GHZLangChao.SearchPanel_Item, Assembly-CSharp
+        m_MethodName: ClickButton
+        m_Mode: 1
+        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!114 &9150179315505576344
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 7 - 6
Assets/Game/ShowChoose/ShowChoose.prefab

@@ -315,7 +315,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: 0, y: -780}
+  m_AnchoredPosition: {x: 0, y: -750}
   m_SizeDelta: {x: 1096, y: 600}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &6462528577014354239
@@ -1398,6 +1398,7 @@ MonoBehaviour:
   - {fileID: 5067258804042980273}
   startIndex: 0
   endIndex: 0
+  moveSpeed: 2000
 --- !u!65 &7115951335860245533
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -1952,7 +1953,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3529837877409676170
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1973,7 +1974,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: -768, y: 146}
-  m_SizeDelta: {x: 1096, y: 692}
+  m_SizeDelta: {x: 1096, y: 750}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5828896859842943363
 MonoBehaviour:
@@ -2196,9 +2197,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 547, y: -106}
+  m_AnchoredPosition: {x: -1, y: -150}
   m_SizeDelta: {x: 1096, y: 150}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 0}
 --- !u!114 &4097570767918916516
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2926,7 +2927,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6390465772453546983
 RectTransform:
   m_ObjectHideFlags: 0

+ 2 - 2
Assets/Game/ShowChoose/ShowChoosePanelSelect.cs

@@ -13,7 +13,7 @@ namespace GHZLangChao
         {
             currentRoom_Text.text = UICallManager.Instance.GetMachineRoomList()[0];
 
-            /*
+            
             // 实例化 item
             for (int i = 0;i< UICallManager.Instance.GetMachineRoomList().Count;i++)
             {
@@ -22,7 +22,7 @@ namespace GHZLangChao
                 item.RoomName_Text.text = MachineRoomManager.Instance.listRoomName[i];
                 go.name = UICallManager.Instance.GetMachineRoomList()[i];
             }
-            */
+            
         }
     }
 }