From 49dd61e69798964729993464b6e4e933a5652bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=8B=8B?= <3077614386@qq.com> Date: Tue, 27 Feb 2024 16:34:06 +0800 Subject: [PATCH] 1 --- Assets/Zion/Scenes/InitConnect.unity | 15 +++++++++++++++ Assets/Zion/Scripts/Adam/DeviceManager.cs | 9 +++++---- .../LaserFireControlPlatformManger.cs | 2 ++ .../Scripts/ModelFunction/Radar/RadarManger.cs | 3 +-- .../UAV/UnmannedAerialVehicleManage.cs | 13 +++++++++++++ Assets/Zion/Scripts/cxx/MyNetMQClient.cs | 6 +++++- 6 files changed, 41 insertions(+), 7 deletions(-) diff --git a/Assets/Zion/Scenes/InitConnect.unity b/Assets/Zion/Scenes/InitConnect.unity index d338c1c7..508963d2 100644 --- a/Assets/Zion/Scenes/InitConnect.unity +++ b/Assets/Zion/Scenes/InitConnect.unity @@ -226,6 +226,7 @@ GameObject: - component: {fileID: 2132962760} - component: {fileID: 2132962758} - component: {fileID: 2132962761} + - component: {fileID: 2132962762} m_Layer: 0 m_Name: Net m_TagString: Untagged @@ -289,3 +290,17 @@ MonoBehaviour: m_EditorClassIdentifier: PubIP: 127.0.0.1:8082 SubIP: 127.0.0.1:8081 +--- !u!114 &2132962762 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2132962757} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5557d4b6fd90bcc489289539bebe43b0, type: 3} + m_Name: + m_EditorClassIdentifier: + currentRoomArea: + RSclient: {fileID: 0} diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs b/Assets/Zion/Scripts/Adam/DeviceManager.cs index ad5971ec..47c81c4f 100644 --- a/Assets/Zion/Scripts/Adam/DeviceManager.cs +++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs @@ -2,6 +2,7 @@ using AdamSync; using System.Collections; using System.Collections.Generic; using UnityEngine; +using System.Text; public class DeviceManager : MonoSingleton { @@ -37,7 +38,8 @@ public class DeviceManager : MonoSingleton OnActivationChanged += OnActivationChangedHandler; //接收实时传输数据 - SyncCreateRoom.send2roomRequset += GetSend2roomMsg; + //SyncCreateRoom.send2roomRequset += GetSend2roomMsg; + LoadManage.Instance.reciveData += GetSend2roomMsg; } void Start() @@ -184,10 +186,9 @@ public class DeviceManager : MonoSingleton /// /// /// - public void GetSend2roomMsg(string data) + public void GetSend2roomMsg(byte[] tt) { - - data = data.Replace("send2room", ""); + string data = Encoding.UTF8.GetString(tt).Replace("send2room", ""); string[] info = data.Split(','); if (info.Length < 2) return; diff --git a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs index 648a9cd5..6d8cbcbf 100644 --- a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs @@ -387,6 +387,8 @@ public class LaserFireControlPlatformManger : MonoBehaviour { return string.Format("{0},{1},{2}", "DroneWasDestroyed", unmannedAerialVehicle.unmannedAerialVehicleManage.equipmentCommon.deviceID, unmannedAerialVehicle.serialNumber); } + + /// /// 隐藏激光 /// diff --git a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs index e1a7de05..4c5291ba 100644 --- a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs @@ -256,6 +256,7 @@ public class RadarManger : MonoBehaviour isTimerRunning = true; } } + /// s /// 停止 /// @@ -263,11 +264,9 @@ public class RadarManger : MonoBehaviour { if (equipmentCommon.isPlayer && timerCoroutine != null) { - StopCoroutine(timerCoroutine); timerCoroutine = null; isTimerRunning = false; - } } #endregion diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index 1473ebc6..ba298f15 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -329,6 +329,7 @@ public class UnmannedAerialVehicleManage : MonoBehaviour Destroy(gameObject); })); } + if (Spectrumdetection.Radius > 0) { gxWRJCamera.orthographicSize = Spectrumdetection.Radius * 1000; @@ -1094,6 +1095,11 @@ public class UnmannedAerialVehicleManage : MonoBehaviour } } + /// + /// + /// + /// + /// public IEnumerator MoveObjectAlongPath(Vector3 _positions) // 协程：按路线移动物体 { Vector3 targetPosition = new Vector3(_positions.x, hight, _positions.z);// 目标位置为当前顶点坐标 @@ -1105,6 +1111,13 @@ public class UnmannedAerialVehicleManage : MonoBehaviour yield return new WaitForSeconds(_time); // 等待一帧时间 isMove = true; } + + /// + /// + /// + /// + /// + /// public IEnumerator MoveObjectAlongPath(Vector3 _positions, bool _isMove) // 协程：按路线移动物体 { diff --git a/Assets/Zion/Scripts/cxx/MyNetMQClient.cs b/Assets/Zion/Scripts/cxx/MyNetMQClient.cs index 0e19f1ac..fd05c82b 100644 --- a/Assets/Zion/Scripts/cxx/MyNetMQClient.cs +++ b/Assets/Zion/Scripts/cxx/MyNetMQClient.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; using System.Collections.Generic; using UnityEngine; using System; @@ -54,6 +54,10 @@ public class MyNetMQClient : MonoBehaviour _netMqPublisher.typeName = typename; } + /// + /// 发送消息 + /// + /// public void Send(string msg) { _netMqPublisher.AddMessageToSendQue("Room", 0, Encoding.UTF8.GetBytes(msg));