周五演示用 本地 临时版本

Assets/Donghua.cs

@@ -0,0 +1,38 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using DG.Tweening;
+public class Donghua : MonoBehaviour
+{
+    RawImage rimage;
+    // Start is called before the first frame update
+    void Awake()
+    {
+        rimage = this.GetComponent<RawImage>();
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+    }
+
+    public void Show()
+    {
+        if(rimage ==null)
+            rimage = this.GetComponent<RawImage>();
+
+        rimage.DOKill();
+        rimage.color = Color.black;
+        rimage.DOColor(new Color(Color.black.r, Color.black.g, Color.black.b, 0),0.5f);
+    }
+
+    public void Hide()
+    {
+        if (rimage == null)
+            rimage = this.GetComponent<RawImage>();
+
+        rimage.DOKill();
+        rimage.DOColor(Color.black, 0.5f).OnComplete(()=> { }).OnComplete(() => { this.transform.parent.parent.gameObject.SetActive(false); });
+    }
+}

Assets/Donghua.cs.meta

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

Assets/Game/Blue/Service/ILoginService.cs

@@ -26,7 +26,7 @@ namespace GHZLangChao
 
         private IEnumerator LoginImitate()
         {
-            UICallManager.Instance.MachineRoomInit(""); // 初始化
+           // UICallManager.Instance.MachineRoomInit(""); // 初始化
             yield return new WaitForSeconds(0.1f);
             this.SendEvent<LoginSuccessEvent>();
         }

Assets/Game/ShowXunJian/XunJianManager.cs

@@ -16,13 +16,23 @@ namespace GHZLangChao
         [SerializeField] private Button ShowHideSelect_Btn; // 显示隐藏按钮
         [SerializeField] private List<Sprite> SelectBtnSprite; // 显示隐藏按钮不同样式的Sprite
         public GameObject UI;
+
+        private void OnEnable()
+        {
+            transform.LookAt(OpenXRCamera.Instance.head);
+            transform.localEulerAngles = new Vector3(0, transform.localEulerAngles.y + 180f, 0);
+            Transform Player = OpenXRCamera.Instance.head;
+            Player.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
+            transform.position = OpenXRCamera.Instance.head.position + Player.forward * 1.6f;
+            transform.position = new Vector3(transform.position.x, transform.position.y + 0f, transform.position.z);
+        }
         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();
+            //UICallManager.Instance.MachineRoomInit();
             XRRGBCamera.Instance.stopCamera();
             Init();
         }

Assets/LangChaoRTC/Remote/ShowRoom/RoomMain.prefab

@@ -3624,7 +3624,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:

Assets/Prefab/Route/Materials/LineMat_1_High.mat

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

Assets/Scripts/Data/DataItem.cs

@@ -30,9 +30,16 @@ public class DataItem : MonoBehaviour
 
     public RectTransform bgTransform;
 
+    public Donghua dongHua;
+
     private BoxCollider boxCollider;
     private MeshRenderer meshRenderer;
     private ManipulationHandler manipulationHandler;
+
+    private void OnEnable()
+    {
+        dongHua.Show();   
+    }
     private void Start()
     {
         boxCollider = this.GetComponent<BoxCollider>();
@@ -124,6 +131,11 @@ public class DataItem : MonoBehaviour
           
     }
 
+    public void Hide()
+    {
+        dongHua.Hide();
+    }
+
     public void SaveEdiotrData( Transform  foundTag)
     {
         //Transform point = foundTag.GetChild(0);

Assets/Scripts/Managers/BladeServerManager.cs

@@ -197,7 +197,8 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
             else if (Mathf.Abs(dis) > fadeDis)
             {
                 //OnTrackLast(foundItem);
-                foundItem.gameObject.SetActive(false);
+               // foundItem.gameObject.SetActive(false);
+                foundItem.Hide();
                 UICallManager.Instance.OnTracklast(foundItem);
                 foundItem = null;
                 // foundTag = null;
@@ -374,7 +375,8 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
                     if (foundItem != null)
                     {
 
-                        foundItem.gameObject.SetActive(false);
+                        //foundItem.gameObject.SetActive(false);
+                        foundItem.Hide();
                         if (state)
                         {
                             foundItem.isSelect = false;
@@ -413,7 +415,8 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
 
             if (foundItem != null && foundItem.tagId != foundID)
             {
-                foundItem.gameObject.SetActive(false);
+                //foundItem.gameObject.SetActive(false);
+                foundItem.Hide();
                 foundItem.isSelect = false;
                 foundItem.SetSelect(false);
                 foundItem = null;

Assets/Scripts/Managers/MachineRoomManager.cs

@@ -78,17 +78,39 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
 
 
         listTagid = new List<int>();
-
+        listTagid.Add(6);
+        listTagid.Add(16);
+        listTagid.Add(26);
+        listTagid.Add(27);
+        listTagid.Add(28);
+        listTagid.Add(30);
         listTagid.Add(31);
+        listTagid.Add(32);
+        listTagid.Add(35);
+        listTagid.Add(36);
+        listTagid.Add(38);
+        listTagid.Add(41);
+        listTagid.Add(42);
+        listTagid.Add(43);
+        listTagid.Add(44);
+        listTagid.Add(50);
+        listTagid.Add(53);
+        listTagid.Add(55);
+        listTagid.Add(58);
         listTagid.Add(61);
+        listTagid.Add(62);
         listTagid.Add(64);
-        listTagid.Add(43);
-        listTagid.Add(3161);
-        listTagid.Add(3164);
-        listTagid.Add(4361);
-        listTagid.Add(4364);
 
-      //  PlayerPrefs.DeleteAll();
+        //listTagid.Add(31);
+        //listTagid.Add(61);
+        //listTagid.Add(64);
+        //listTagid.Add(43);
+        //listTagid.Add(3161);
+        //listTagid.Add(3164);
+        //listTagid.Add(4361);
+        //listTagid.Add(4364);
+
+        //  PlayerPrefs.DeleteAll();
         if (PlayerPrefs.HasKey("MachineRoomData"))
         {
             string msg = PlayerPrefs.GetString("MachineRoomData");
@@ -312,7 +334,7 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
     private void Start()
     {
 
-        //Init();
+      //  Init();
 
 #if UNITY_EDITOR
     //   Init();
@@ -348,7 +370,7 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
 
             tagObjPoint.transform.localEulerAngles = new Vector3(0, tagData.offestrot == Vector3.zero ? tagData.rot.y : tagData.offestrot.y, 0);
             tagObjPoint.transform.localPosition = tagData.offestPos == Vector3.zero ? tagData.pos : tagData.offestPos;
-            Debug.Log(" MachineRoom T ");
+         //   Debug.Log(" MachineRoom T " + tagData.offestPos);
             transform.eulerAngles = new Vector3(0, tagObjPoint.transform.eulerAngles.y, 0);
             transform.position = new Vector3(tagObjPoint.transform.position.x, foundTracking.transform.position.y + data.TagOffestPosY, tagObjPoint.transform.position.z);
         }
@@ -539,7 +561,7 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
         {
             for (int j = 0; j < data.list; j++)
             {
-                data.listEquipmentData = new List<MachineParameters>();
+              
                 MachineParameters mp1 = new MachineParameters();
                 mp1.deviceId = (i * data.list + j + 1);
                 mp1.tagID = -1000;
@@ -553,21 +575,47 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
                 mp1.factory = null;
                 mp1.specification = null;
                 mp1.listDevicesParameters = new List<DeviceParameters>();
-
+               
                 if (mp1.deviceId % 2 == 0)
                     mp1.listDevicesParameters.Add(dp1);
                 else
                     mp1.listDevicesParameters.Add(dp2);
+
+                data.listEquipmentData.Add(mp1);
             }
         }
+        Debug.Log(data.line);
         for (int i = 0; i < listTagid.Count; i++)
         {
             if (data.listEquipmentData.Count < (i + 1))
             {
+                Debug.Log("a "+listTagid);
+                Debug.Log(data.listEquipmentData[i].tagID);
                 data.listEquipmentData[i].tagID = listTagid[i];
             }
         }
 
+        //for (int i = 0; i < data.listEquipmentData.Count; i++)
+        //{
+        //    GameObject obj = GameObject.Instantiate(cabinetObj, transform);
+        //    obj.transform.localScale = new Vector3(data.cabinetW, data.cabinetH, obj.transform.localScale.z);
+        //    Debug.Log(data.cabinetH + "    " + data.cabinetW);
+        //    obj.name = data.listEquipmentData[i].deviceName;
+        //    //   Debug.Log(obj.name + "  " + new Vector3(j * (data.cabinetW + data.intervalW), 0, i * data.intervalL));
+        //    obj.transform.localPosition = new Vector3((i % data.line) * (data.cabinetW + data.intervalW), 0, i * data.intervalL);
+        //    obj.GetComponent<MachineObj>().Setting((i % data.line) % 2 == 0);
+        //    listObjes.Add(obj.GetComponent<MachineObj>());
+        //    listObjes[i].deviceParameters = data.listEquipmentData[i];
+
+        //}
+
+        //Vector3 leftPos = new Vector3(-1 * (data.cabinetW + data.intervalW), 0, 0);
+        //Vector3 rightPos = new Vector3((data.cabinetW * data.list + data.intervalW * data.list), 0, 0);
+        //WayFindingManager.Instance.SetLine(leftPos, rightPos);
+
+
+
+        GameObject rDataItem = Resources.Load<GameObject>("DataItem");
         for (int i = 0; i < data.listEquipmentData.Count; i++)
         {
             GameObject obj = GameObject.Instantiate(cabinetObj, transform);
@@ -575,17 +623,41 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
             Debug.Log(data.cabinetH + "    " + data.cabinetW);
             obj.name = data.listEquipmentData[i].deviceName;
             //   Debug.Log(obj.name + "  " + new Vector3(j * (data.cabinetW + data.intervalW), 0, i * data.intervalL));
-            obj.transform.localPosition = new Vector3((i % data.line) * (data.cabinetW + data.intervalW), 0, i * data.intervalL);
-            obj.GetComponent<MachineObj>().Setting((i % data.line) % 2 == 0);
+            obj.transform.localPosition = new Vector3((i % data.line) * (data.cabinetW + data.intervalW), 0, (i / data.line) * data.intervalL);
+            obj.GetComponent<MachineObj>().Setting((i / data.line) % 2 == 0);
             listObjes.Add(obj.GetComponent<MachineObj>());
             listObjes[i].deviceParameters = data.listEquipmentData[i];
 
+
+            GameObject item = GameObject.Instantiate(rDataItem);
+            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);
+            }
+            listObjes[i].dataItem = dataItem;
+
+            dataItem.transform.SetParent(listObjes[i].transform);
+            dataItem.transform.localPosition = listObjes[i].xTag.localPosition;
+            dataItem.transform.localEulerAngles = new Vector3(0, listObjes[i].isSingle ? 180 : 0, 0);
+
         }
+        //Debug.Log(data.line);
+
+
 
         Vector3 leftPos = new Vector3(-1 * (data.cabinetW + data.intervalW), 0, 0);
         Vector3 rightPos = new Vector3((data.cabinetW * data.list + data.intervalW * data.list), 0, 0);
         WayFindingManager.Instance.SetLine(leftPos, rightPos);
 
+
+
+        SaveAllData();
+        isInit = true;
+
     }
 
     public void SettingCameraFar()

Assets/Scripts/Tool/UIFollow.cs

@@ -12,6 +12,10 @@ public class UIFollow : MonoBehaviour
 
     private bool state = true;
 
+    private void OnEnable()
+    {
+        state = true;
+    }
     void Start()
     {
 

Packages/manifest.json

@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "com.ghz.avideoplayer": "https://gogs.ghz-tech.com:8843/GHzGlass/VideoPlayerXR.git#EasyMovieTexture",
+    "com.ghz.mqtt": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZMQTTXR.git",
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.ide.rider": "3.0.16",
     "com.unity.ide.visualstudio": "2.0.16",

Packages/packages-lock.json

@@ -7,6 +7,13 @@
       "dependencies": {},
       "hash": "ec4bb2403989db8a5f491f8a9d6e5ac7c1288a67"
     },
+    "com.ghz.mqtt": {
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZMQTTXR.git",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {},
+      "hash": "238c8807d10555932c59dbd78f2b7f4a56faa07c"
+    },
     "com.unity.2d.sprite": {
       "version": "1.0.0",
       "depth": 0,
@@ -217,7 +224,7 @@
         "com.unity.inputsystem": "1.3.0",
         "com.unity.xr.openxr": "1.5.3"
       },
-      "hash": "1be760e1a372b13db307dbe0e09b719455bd53bd"
+      "hash": "cd97770096a2b1d48ed71aa123498cc3f3243e9d"
     },
     "jh.baseeditor.engine": {
       "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZBasePackage.git",