From 3aafd10937de394ea38355e9bac553c286743704 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Tue, 21 Nov 2023 20:33:28 +0800 Subject: [PATCH] 1212122 --- Assets/Zion/Scripts/Adam/DeviceInfoItem.cs | 28 +++++++++++++ .../Zion/Scripts/Adam/DeviceInfoItem.cs.meta | 11 +++++ Assets/Zion/Scripts/Adam/DeviceManager.cs | 41 +++++++++++++++++++ .../Zion/Scripts/Adam/DeviceManager.cs.meta | 11 +++++ Assets/Zion/Scripts/Adam/GameManager.cs | 2 + .../Scripts/ModelFunction/EquipmentCommon.cs | 6 ++- 6 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 Assets/Zion/Scripts/Adam/DeviceInfoItem.cs create mode 100644 Assets/Zion/Scripts/Adam/DeviceInfoItem.cs.meta create mode 100644 Assets/Zion/Scripts/Adam/DeviceManager.cs create mode 100644 Assets/Zion/Scripts/Adam/DeviceManager.cs.meta diff --git a/Assets/Zion/Scripts/Adam/DeviceInfoItem.cs b/Assets/Zion/Scripts/Adam/DeviceInfoItem.cs new file mode 100644 index 00000000..1197e120 --- /dev/null +++ b/Assets/Zion/Scripts/Adam/DeviceInfoItem.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DeviceInfoItem : MonoBehaviour +{ + public string deviceId; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + public void Refesh(string[] data) + { + Vector3 pos = new Vector3(float.Parse(data[2]), float.Parse(data[3]), float.Parse(data[4])); + Vector3 rot = new Vector3(float.Parse(data[4]), float.Parse(data[6]), float.Parse(data[7])); + transform.position = pos; + transform.position = rot; + } +} diff --git a/Assets/Zion/Scripts/Adam/DeviceInfoItem.cs.meta b/Assets/Zion/Scripts/Adam/DeviceInfoItem.cs.meta new file mode 100644 index 00000000..6911d257 --- /dev/null +++ b/Assets/Zion/Scripts/Adam/DeviceInfoItem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0607bb6be5a37184f9cc11fffd5c8c15 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs b/Assets/Zion/Scripts/Adam/DeviceManager.cs new file mode 100644 index 00000000..cf09d098 --- /dev/null +++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs @@ -0,0 +1,41 @@ +using AdamSync; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DeviceManager : MonoBehaviour +{ + public List devices = new List(); + // Start is called before the first frame update + void Start() + { + SyncCreateRoom.send2roomRequset += GetSend2roomMsg; + } + + + public void AddDevice(DeviceInfoItem d) + { + if (!devices.Contains(d)) + { + devices.Add(d); + } + } + + public void GetSend2roomMsg(string data) + { + string[] info = data.Split(','); + for (int i = 0; i < devices.Count; i++) + { + if (devices[i].deviceId == info[0]) + { + devices[i].Refesh(info); + } + + } + } + + public void OnDisalbe() + { + SyncCreateRoom.send2roomRequset -= GetSend2roomMsg; + } +} diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs.meta b/Assets/Zion/Scripts/Adam/DeviceManager.cs.meta new file mode 100644 index 00000000..d3af2292 --- /dev/null +++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 27096289766e99845a47ad87729a988f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs index 7d48a667..8cac88b4 100644 --- a/Assets/Zion/Scripts/Adam/GameManager.cs +++ b/Assets/Zion/Scripts/Adam/GameManager.cs @@ -189,6 +189,8 @@ public class GameManager : MonoBehaviour } } + + public void SpawnDevice(DragController deviceDragBtn, string[] data) { GameObject obj = Instantiate(deviceDragBtn.prefabItem); diff --git a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs index 41a2403b..3a117172 100644 --- a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs +++ b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs @@ -179,7 +179,7 @@ public class EquipmentCommon : MonoBehaviour { latestData = nowData; Debug.Log(latestData); - _ = SyncCreateRoom.SendMessageAsync(string.Format("WRJ {0}", nowData)); + _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}",nowData)); } } } @@ -188,6 +188,10 @@ public class EquipmentCommon : MonoBehaviour return string.Format("{0},{1},{2},{3},{4},{5},{6},{7}", "WRJPosAngle", equipmentCommon.deviceID, transform.position.x, transform.position.y, transform.position.z, transform.eulerAngles.x, transform.eulerAngles.y, transform.eulerAngles.z); } + public void GetDeviceInfo(string info) + { + + } private void Update()