Преглед на файлове

Canvas 添加组件 增加导览接口

DGJ преди 1 година
родител
ревизия
7bb18acb57

+ 1 - 1
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);
         }

+ 1 - 1
Assets/Game/ShowXunJian/XunJianManager.cs

@@ -17,7 +17,7 @@ namespace GHZLangChao
         {
             Serach_Toggle.onValueChanged.AddListener(SerachChange);
             Fault_Toggle.onValueChanged.AddListener(FaultChange);
-
+            UICallManager.Instance.MachineRoomInit();
             Init();
         }
 

+ 55 - 42
Assets/Resources/DataItem.prefab

@@ -418,7 +418,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &7206794767239322300
 Transform:
   m_ObjectHideFlags: 0
@@ -528,6 +528,7 @@ GameObject:
   - component: {fileID: 7206794767383049788}
   - component: {fileID: 7206794767383049789}
   - component: {fileID: 7206794767383049778}
+  - component: {fileID: 6029178328219172598}
   m_Layer: 0
   m_Name: Canvas
   m_TagString: Untagged
@@ -618,6 +619,18 @@ MonoBehaviour:
   m_BlockingMask:
     serializedVersion: 2
     m_Bits: 4294967295
+--- !u!114 &6029178328219172598
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7206794767383049776}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 948b9ab040508dc48a294230f85b39e2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &8961025228171187529
 GameObject:
   m_ObjectHideFlags: 0
@@ -761,7 +774,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8961025229281339233}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -934,7 +947,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -942,7 +955,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
@@ -982,11 +995,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 313.72714
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -2760
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1047,7 +1060,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1055,7 +1068,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1095,11 +1108,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 313.72714
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -450
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1160,7 +1173,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1168,7 +1181,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1208,11 +1221,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 313.72714
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -1440
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1273,7 +1286,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1281,7 +1294,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1321,11 +1334,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 313.72714
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -3090
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1386,7 +1399,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1394,7 +1407,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1434,11 +1447,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 313.72714
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -2100
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1499,7 +1512,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1507,7 +1520,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1547,11 +1560,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 313.72714
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -780
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1612,7 +1625,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1620,7 +1633,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1660,11 +1673,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 313.72714
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -2430
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1725,7 +1738,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1733,7 +1746,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1773,11 +1786,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 313.72714
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -1110
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1838,7 +1851,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1846,7 +1859,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1886,11 +1899,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 313.72714
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -1770
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1951,7 +1964,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1959,7 +1972,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1999,11 +2012,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 313.72714
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -120
       objectReference: {fileID: 0}
     - target: {fileID: 8395069113887031565, guid: e70d412cbd688014e84356bffac55c6d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

Файловите разлики са ограничени, защото са твърде много
+ 721 - 38
Assets/Scenes/LangChaoDemo2.unity


+ 8 - 1
Assets/Scripts/Data/MachineObj.cs

@@ -9,6 +9,7 @@ public class MachineObj : MonoBehaviour
     public MachineParameters deviceParameters;
 
     public bool isSingle;
+    private MeshRenderer mesh;
     public void Setting(bool isSingle) //  是否是单行
     {
         this.isSingle = isSingle;
@@ -17,8 +18,14 @@ public class MachineObj : MonoBehaviour
         navigatorPoint.transform.localPosition = isSingle ? new Vector3(0, 0, 1f) : new Vector3(0, 0, -1f);
         door.gameObject.SetActive(false);
         navigatorPoint.gameObject.SetActive(false);
-    }
 
+        mesh = gameObject.GetComponent<MeshRenderer>();
+        mesh.enabled = false;
+    }
 
+    public void MeshState(bool state)
+    {
+        mesh.enabled = state;
+    }
 }
 

+ 8 - 0
Assets/Scripts/Data/MachineRoomData.cs

@@ -321,6 +321,14 @@ public class DeviceParameters
 /// </summary>
 public class AlarmData
 {
+    /// <summary>
+    ///  设备ID
+    /// </summary>
+    public int deviceId { get; set; }
+    /// <summary>
+    /// 设备名称
+    /// </summary>
+    public string deviceName { get; set; }
     /// <summary>
     /// 告警标题
     /// </summary>

+ 4 - 0
Assets/Scripts/Data/SettingMachineRoomData.cs

@@ -6,6 +6,7 @@ using UnityEngine.UI;
 
 public class SettingMachineRoomData : MonoSingleton<SettingMachineRoomData>
 {
+    public GameObject editorBtnCanvas;
     public GameObject EditorCanvas;
     public SCInputField line;
     public SCInputField list;
@@ -53,6 +54,7 @@ public class SettingMachineRoomData : MonoSingleton<SettingMachineRoomData>
 
     public void Init(MachineRoomData data)
     {
+        editorBtnCanvas.SetActive(true);
         //this.line.textComponent.text = data.line.ToString();
         //this.list.textComponent.text = data.list.ToString();
         //this.lineI.textComponent.text = data.intervalW.ToString();
@@ -195,6 +197,8 @@ public class SettingMachineRoomData : MonoSingleton<SettingMachineRoomData>
         EditorCanvas.SetActive(isEditor);
     }
 
+   
+
     public void LineSlider( float maxValue)
     {
         lineSlider.maxValue = maxValue;

+ 19 - 6
Assets/Scripts/Managers/MachineRoomManager.cs

@@ -306,21 +306,26 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
 
      
      
-        SettingMachineRoomData.Instance.Init(data);
-        OpenXRCamera.Instance.head.GetComponent<Camera>().farClipPlane = data.CameraFar;
-        ServerInit();
+      
     }
 
     private void Start()
     {
 
-        Init();
+        //Init();
 
 #if UNITY_EDITOR
-       // Init();
+       Init();
 #endif
     }
 
+    public void SceneInit()
+    {
+        SettingMachineRoomData.Instance.Init(data);
+        OpenXRCamera.Instance.head.GetComponent<Camera>().farClipPlane = data.CameraFar;
+        ServerInit();
+    }
+
     private void Update()
     {
         if (state && tagData != null)
@@ -473,7 +478,7 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
             GameObject item = GameObject.Instantiate(rDataItem);
             DataItem dataItem = item.GetComponent<DataItem>();
             dataItem.Init(data.listEquipmentData[i]);
-            item.SetActive(true);
+           // item.SetActive(true);
 
             for (int j = 0; j < data.listEquipmentData[i].listDevicesParameters.Count;j++)
             {
@@ -614,6 +619,12 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
         state = !state;
         DragManager.Instance.state = state;
         cubeY.SetActive(state);
+
+        for (int i = 0; i < listObjes.Count; i++)
+        {
+            listObjes[i].MeshState(state);
+        }
+
         if (!state && foundTracking!=null&& tagData!=null)
         {
             for (int i = 0; i < listEditorTag.Count; i++)
@@ -653,6 +664,8 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
             PlayerPrefs.SetString("MachineRoomTagData", JsonConvert.SerializeObject(data.listTagData));
 
             Debug.Log(" 保存成功 " + "MachineRoomTagData");
+
+          
         }
     }
    

+ 26 - 1
Assets/Scripts/UICallManager.cs

@@ -38,7 +38,30 @@ public class UICallManager : MonoSingleton<UICallManager>
         return MachineRoomManager.Instance.data;
 
     } 
+    /// <summary>
+    /// 场景物体初始化
+    /// </summary>
+    public void MachineRoomInit()
+    {
+        MachineRoomManager.Instance.SceneInit();
+    }
 
+    /// <summary>
+    ///  导航
+    /// </summary>
+    /// <param name="item"></param>
+    public void NavigatorServer(MachineObj item)
+    {
+        WayFindingManager.Instance.NavigatorServer(item);
+    }
+    /// <summary>
+    /// 导航
+    /// </summary>
+    /// <param name="listItem"></param>
+    public void NavigatorServer(List<MachineObj> listItem)
+    {
+        WayFindingManager.Instance.NavigatorServer(listItem);
+    }
     /// <summary>
     ///  获取告警列表
     /// </summary>
@@ -57,7 +80,9 @@ public class UICallManager : MonoSingleton<UICallManager>
         for (int i = 0; i < 30;i++)
         {
             AlarmData AlarmData = new AlarmData();
-            AlarmData.title = "设备" + i;
+            AlarmData.deviceId = i;
+            AlarmData.deviceName = "设备" + i;
+            AlarmData.title = "问题" + i;
             AlarmData.carryingSystem = "承载系统" + i;
             AlarmData.level = "重大告警";
             AlarmData.equipmentAlarmTime = System.DateTime.Now.ToString();

+ 3 - 1
ProjectSettings/ProjectSettings.asset

@@ -146,7 +146,9 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 0.1
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: -3507145773158424512, guid: 3df6047a2585e9a4b87f07c19a70fec7, type: 2}
+  - {fileID: -6724271008176559649, guid: aba1d4d6205d4914784889e2d8ed78c4, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1

Някои файлове не бяха показани, защото твърде много файлове са промени