上传代码

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

@@ -0,0 +1,26 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace GHZLangChao
+{
+    public class DeviceInfo_Item : MonoBehaviour
+    {
+        private DeviceParameters DeviceParameter;
+
+        [SerializeField] private Button DetailsBtn;
+        private void Start()
+        {
+            DetailsBtn.onClick.AddListener(ClickDetails);
+        }
+        public void Init(DeviceParameters DeviceParameter)
+        {
+            this.DeviceParameter = DeviceParameter;
+        }
+
+        private void ClickDetails()
+        {
+            ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowDevice);
+            ShowDevice.Instance.gotoWindow(ScenesManager.SceneType.DeviceDetails);
+        }
+    }
+}

Assets/Game/Blue/Controller/Item/DeviceInfo_Item.cs.meta

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

Assets/Game/PrefabTemplate/DeviceInfo.prefab

@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 8395069113887031565}
   - component: {fileID: 4480840044778219963}
   - component: {fileID: 8485878558529821412}
+  - component: {fileID: 3228794465489414342}
   m_Layer: 5
   m_Name: DeviceInfo
   m_TagString: Untagged
@@ -35,6 +36,7 @@ RectTransform:
   - {fileID: 81248377243566017}
   - {fileID: 3431218634894485134}
   - {fileID: 52821472180710369}
+  - {fileID: 5041571584415525764}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -81,6 +83,19 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3228794465489414342
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1475626945930305025}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 02829452b0a2f7c49b469649bedbf522, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DetailsBtn: {fileID: 4141881959723194254}
 --- !u!1 &2158934736428582835
 GameObject:
   m_ObjectHideFlags: 0
@@ -1312,3 +1327,124 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 0
+--- !u!1 &8742461659272804791
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5041571584415525764}
+  - component: {fileID: 7228139809174974243}
+  - component: {fileID: 5703353709227259344}
+  - component: {fileID: 4141881959723194254}
+  m_Layer: 5
+  m_Name: Details_Btn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5041571584415525764
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8742461659272804791}
+  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: 8395069113887031565}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -31.12, y: 0.000103}
+  m_SizeDelta: {x: 58.25, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7228139809174974243
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8742461659272804791}
+  m_CullTransparentMesh: 1
+--- !u!114 &5703353709227259344
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8742461659272804791}
+  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: a4add86c43e7afc48a9126eed048db22, 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 &4141881959723194254
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8742461659272804791}
+  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: 5703353709227259344}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []

Assets/Game/ScenesManager.cs

@@ -37,6 +37,7 @@ public class ScenesManager
         //ShowZhiDao = 50001,
 
         ShowDevice = 60001, // 设备信息
+        DeviceDetails = 61002, // 设备详情
         Navigationing = 80001, // 导航中
 
         PopPublic = 70001,

Assets/Game/ShowLogin/LangChaoLogin.cs

@@ -18,7 +18,7 @@ namespace GHZLangChao
 
         private void LoginSuccess(LoginSuccessEvent e)
         {
-            UICallManager.Instance.MachineRoomInit(""); // 初始化
+            //UICallManager.Instance.MachineRoomInit(""); // 初始化
 
             ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
         }

Assets/Resources/DataItem.prefab

@@ -505,6 +505,17 @@ MonoBehaviour:
   selectPanel: {fileID: 0}
   isSelect: 0
   bgTransform: {fileID: 8961025229281339232}
+  DeviceInfoList:
+  - {fileID: 5806564346298785707}
+  - {fileID: 959259386625352700}
+  - {fileID: 7451155999784266479}
+  - {fileID: 5191057836543012104}
+  - {fileID: 2176030938046523990}
+  - {fileID: 5143760216004915910}
+  - {fileID: 7587669607435635146}
+  - {fileID: 8418059778116381954}
+  - {fileID: 4150389080769075059}
+  - {fileID: 7515252345308106227}
 --- !u!1 &7206794767383049776
 GameObject:
   m_ObjectHideFlags: 0
@@ -991,6 +1002,17 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
+--- !u!114 &4150389080769075059 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3228794465489414342, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
+  m_PrefabInstance: {fileID: 1537943627586142133}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 02829452b0a2f7c49b469649bedbf522, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &7049990998659694264 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
@@ -1093,6 +1115,17 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
+--- !u!114 &959259386625352700 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3228794465489414342, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
+  m_PrefabInstance: {fileID: 2414213219418442554}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 02829452b0a2f7c49b469649bedbf522, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &6124971086886603319 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
@@ -1195,6 +1228,17 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
+--- !u!114 &2176030938046523990 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3228794465489414342, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
+  m_PrefabInstance: {fileID: 3673859698483495568}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 02829452b0a2f7c49b469649bedbf522, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &5079335866014139293 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
@@ -1302,6 +1346,17 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
   m_PrefabInstance: {fileID: 4937477109388715317}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &7515252345308106227 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3228794465489414342, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
+  m_PrefabInstance: {fileID: 4937477109388715317}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 02829452b0a2f7c49b469649bedbf522, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &5008612169152258316
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1404,6 +1459,17 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
   m_PrefabInstance: {fileID: 5008612169152258316}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &7587669607435635146 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3228794465489414342, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
+  m_PrefabInstance: {fileID: 5008612169152258316}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 02829452b0a2f7c49b469649bedbf522, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &5451934534257279529
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1506,6 +1572,17 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
   m_PrefabInstance: {fileID: 5451934534257279529}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &7451155999784266479 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3228794465489414342, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
+  m_PrefabInstance: {fileID: 5451934534257279529}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 02829452b0a2f7c49b469649bedbf522, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &6348966831136376260
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1608,6 +1685,17 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
   m_PrefabInstance: {fileID: 6348966831136376260}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &8418059778116381954 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3228794465489414342, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
+  m_PrefabInstance: {fileID: 6348966831136376260}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 02829452b0a2f7c49b469649bedbf522, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &7261118632927233486
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1710,6 +1798,17 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
   m_PrefabInstance: {fileID: 7261118632927233486}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &5191057836543012104 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3228794465489414342, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
+  m_PrefabInstance: {fileID: 7261118632927233486}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 02829452b0a2f7c49b469649bedbf522, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &7758776215707326976
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1812,6 +1911,17 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
   m_PrefabInstance: {fileID: 7758776215707326976}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &5143760216004915910 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3228794465489414342, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
+  m_PrefabInstance: {fileID: 7758776215707326976}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 02829452b0a2f7c49b469649bedbf522, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &8961025227604113261
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1914,3 +2024,14 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
   m_PrefabInstance: {fileID: 8961025227604113261}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &5806564346298785707 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3228794465489414342, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
+  m_PrefabInstance: {fileID: 8961025227604113261}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 02829452b0a2f7c49b469649bedbf522, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/Scripts/Data/DataItem.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using GHZLangChao;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -42,6 +43,18 @@ public class DataItem : MonoBehaviour
         //bgTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, MachineRoomManager.Instance.data.cabinetH);
     }
 
+    private List<DeviceParameters> DeviceParameterList;
+    public List<DeviceInfo_Item> DeviceInfoList = new List<DeviceInfo_Item>();
+    public void SetDeviceParametersData(List<DeviceParameters> DeviceParameterList)
+    {
+        this.DeviceParameterList = DeviceParameterList;
+        Debug.LogError("DeviceParameterList:"+DeviceParameterList.Count);
+        for (int i = 0; i < DeviceInfoList.Count;i++)
+        {
+            DeviceInfoList[i].Init(DeviceParameterList[0]); // 数据只有一个，所以都是0
+        }
+    }
+
     //public void Init( int id ,Vector3 offsetPos, int eulerAxle ,BladeServerData data ,float width, float height)
     //{
     //    this.ID = id;
@@ -112,7 +125,6 @@ public class DataItem : MonoBehaviour
         if (machineParameters != null)
             machineParameters.offsetPos = offsetPos;
     }
-
 }
 
 

Assets/Scripts/Managers/MachineRoomManager.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using Newtonsoft.Json;
 using SC.XR.Unity.Module_InputSystem;
 using System;
@@ -473,6 +474,11 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
             DataItem dataItem = item.GetComponent<DataItem>();
             dataItem.Init(data.listEquipmentData[i]);
             item.SetActive(true);
+
+            for (int j = 0; j < data.listEquipmentData[i].listDevicesParameters.Count;j++)
+            {
+                dataItem.SetDeviceParametersData(data.listEquipmentData[i].listDevicesParameters);
+            }
         }
 
     }