From 8e962f03a1098e822024bf236e1f8a2356914a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=8B=8B?= <3077614386@qq.com> Date: Wed, 28 Feb 2024 09:08:02 +0800 Subject: [PATCH] 1 --- Assets/Temp/Scripts/Microwaveweapon.cs | 6 ++-- Assets/Temp/Scripts/Spectrumdetection.cs | 3 +- Assets/Temp/Scripts/View_Panel2.cs | 2 +- Assets/Zion/Scripts/Adam/DeviceManager.cs | 33 ++++++++++--------- Assets/Zion/Scripts/HighPriorityTarget.cs | 6 ++-- .../LaserFireControlPlatformManger.cs | 6 ++-- .../TerrestrialRadioInterferenceManger.cs | 6 ++-- .../UAV/UnmannedAerialVehicle.cs | 9 +++-- .../UAV/UnmannedAerialVehicleManage.cs | 15 ++++++--- Assets/Zion/Scripts/cxx/MyNetMQClient.cs | 2 +- 10 files changed, 53 insertions(+), 35 deletions(-) diff --git a/Assets/Temp/Scripts/Microwaveweapon.cs b/Assets/Temp/Scripts/Microwaveweapon.cs index cc899b95..31282939 100644 --- a/Assets/Temp/Scripts/Microwaveweapon.cs +++ b/Assets/Temp/Scripts/Microwaveweapon.cs @@ -213,7 +213,8 @@ public class Microwaveweapon : MonoBehaviour { micdistance = Vector3.Distance(miceopos.position, transform.position); var newdata = Getmicdata(); - DeviceManager.Instance.send2roomStr.Enqueue(newdata); + //DeviceManager.Instance.send2roomStr.Enqueue(newdata); + MyNetMQClient.instance.Send(newdata); //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", newdata)); //MQTTManager.instance.SendData(MQTTManager.instance.Micow, newdata); microblog.MicrowaveDisplay(micdistance / 10 + 1, 0.5f); @@ -240,7 +241,8 @@ public class Microwaveweapon : MonoBehaviour public IEnumerator Destructiondata(UnmannedAerialVehicle unmannedAerialVehicle) { var newdata = Aeroplane(unmannedAerialVehicle); - DeviceManager.Instance.send2roomStr.Enqueue(newdata); + MyNetMQClient.instance.Send(newdata); + //DeviceManager.Instance.send2roomStr.Enqueue(newdata); //MQTTManager.instance.SendData(MQTTManager.instance.Planedata, newdata); yield return new WaitForSeconds(0.5f); GameObject game = Instantiate(Destructioneffect, unmannedAerialVehicle.transform); diff --git a/Assets/Temp/Scripts/Spectrumdetection.cs b/Assets/Temp/Scripts/Spectrumdetection.cs index c50abeeb..450fbb48 100644 --- a/Assets/Temp/Scripts/Spectrumdetection.cs +++ b/Assets/Temp/Scripts/Spectrumdetection.cs @@ -203,7 +203,8 @@ public class Spectrumdetection : MonoBehaviour public void SweepFrequencyBandTo() { string nowData = GetSyncDataThree(); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MyNetMQClient.instance.Send(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); //MQTTManager.instance.SendData(MQTTManager.instance.SweepFrequencyBand, nowData); } diff --git a/Assets/Temp/Scripts/View_Panel2.cs b/Assets/Temp/Scripts/View_Panel2.cs index 1ce53491..19117980 100644 --- a/Assets/Temp/Scripts/View_Panel2.cs +++ b/Assets/Temp/Scripts/View_Panel2.cs @@ -261,7 +261,7 @@ public class View_Panel2 : XUIPanel { //Debug.Log("OnJoinRoom ViewPanel===" + msg); - //Debug.Log("订阅"+GlobalFlag.roomID); + //Debug.Log("订阅"+); MyNetMQClient.instance._netMqListener.SubTopic(GlobalFlag.roomID); SceneManager.LoadScene("AdamTraining_pilot_terminal_panl 1"); } diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs b/Assets/Zion/Scripts/Adam/DeviceManager.cs index 47c81c4f..af67e333 100644 --- a/Assets/Zion/Scripts/Adam/DeviceManager.cs +++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs @@ -13,7 +13,7 @@ public class DeviceManager : MonoSingleton /// /// 发送消息 /// - public Queue send2roomStr = new Queue(); + //public Queue send2roomStr = new Queue(); private bool _isStartRehearsing = false; // 属性绑定布尔值，并在值变化时触发事件 @@ -62,11 +62,12 @@ public class DeviceManager : MonoSingleton public bool isOnlyOne = true; private void Update() { - if (send2roomStr.Count > 0 && isOnlyOne) - { - isOnlyOne = false; - StartCoroutine(DequeueSend2roomStr()); - } + //if (send2roomStr.Count > 0 && isOnlyOne) + //{ + // isOnlyOne = false; + + // //StartCoroutine(DequeueSend2roomStr()); + //} #if UNITY_EDITOR if (Input.GetKeyDown(KeyCode.Space)) { @@ -76,16 +77,16 @@ public class DeviceManager : MonoSingleton #endif } - IEnumerator DequeueSend2roomStr() - { - while (send2roomStr.Count > 0) - { - _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", send2roomStr.Dequeue())); - yield return new WaitForSeconds(0.05f); - if (send2roomStr.Count == 0) - isOnlyOne = true; - } - } + //IEnumerator DequeueSend2roomStr() + //{ + // while (send2roomStr.Count > 0) + // { + // _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", send2roomStr.Dequeue())); + // yield return new WaitForSeconds(0.05f); + // if (send2roomStr.Count == 0) + // isOnlyOne = true; + // } + //} public void AddDevice(EquipmentCommon d) { diff --git a/Assets/Zion/Scripts/HighPriorityTarget.cs b/Assets/Zion/Scripts/HighPriorityTarget.cs index 531ab278..fdb1e01a 100644 --- a/Assets/Zion/Scripts/HighPriorityTarget.cs +++ b/Assets/Zion/Scripts/HighPriorityTarget.cs @@ -101,7 +101,8 @@ public class HighPriorityTarget : MonoBehaviour int layerValue = LayerMask.NameToLayer(frequency); gamepos.layer = layerValue; string nowData = GetSyncDataTwo(); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MyNetMQClient.instance.Send(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); //MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData); } } @@ -175,7 +176,8 @@ public class HighPriorityTarget : MonoBehaviour HP -= 10; string nowData = GetSyncDis(Pos); Debug.Log("发送：" + nowData); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MyNetMQClient.instance.Send(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); //MQTTManager.instance.SendData(MQTTManager.instance.KeyTarget, nowData); } else diff --git a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs index 6d8cbcbf..e1a70f88 100644 --- a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs @@ -282,8 +282,9 @@ public class LaserFireControlPlatformManger : MonoBehaviour { Debug.Log("角度合适进行打击"); var nowData = GetSyncData(); + MyNetMQClient.instance.Send(nowData); //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); //MQTTManager.instance.SendData(MQTTManager.instance.Lasing, nowData); CastRayAndRender(); } @@ -340,7 +341,8 @@ public class LaserFireControlPlatformManger : MonoBehaviour { string nowData = GetSyncDis(unmannedAerialVehicle); Debug.Log(nowData); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MyNetMQClient.instance.Send(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); //MQTTManager.instance.SendData(MQTTManager.instance.DroneWasDestroyed, nowData); string currentTime = System.DateTime.Now.ToString(); string _log = currentTime + " " + equipmentCommon.equipmentType + "(" + equipmentCommon.deviceID + ")" + diff --git a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs index 278d5ff7..ab174351 100644 --- a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs @@ -417,7 +417,8 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour unmannedAerialVehicleManage.CheckSatellitePositioningFrequency( InterferenceMode); var nowData = GetSyncData(unmannedAerialVehicleManage); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MyNetMQClient.instance.Send(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); //MQTTManager.instance.SendData(MQTTManager.instance.WRJExpel, nowData); } UnmannedAerialVehicle unmannedAerialVehicle = wrj.GetComponent(); @@ -427,7 +428,8 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour unmannedAerialVehicle.CheckSatellitePositioningFrequency( InterferenceMode); var nowData = GetSyncData(unmannedAerialVehicle); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MyNetMQClient.instance.Send(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); //MQTTManager.instance.SendData(MQTTManager.instance.WRJDitch, nowData); } isDo = true; diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs index 4a44c7d7..6161e9d9 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs @@ -115,9 +115,10 @@ public class UnmannedAerialVehicle : MonoBehaviour if (isPassMessage) { string nowData = GetSyncDis(); + MyNetMQClient.instance.Send(nowData); //Debug.Log(nowData); //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); //MQTTManager.instance.SendData(MQTTManager.instance.DroneWasDestroyed, nowData); string currentTime = System.DateTime.Now.ToString(); string _log = currentTime + " " + unmannedAerialVehicleManage.equipmentCommon.equipmentType + "(" + unmannedAerialVehicleManage.equipmentCommon.deviceID + ")" @@ -144,9 +145,10 @@ public class UnmannedAerialVehicle : MonoBehaviour if (_equipmentCommon) { string nowData = string.Format("{0},{1}", "SetToBeDestroyed", _equipmentCommon.deviceID); + MyNetMQClient.instance.Send(nowData); //Debug.Log(nowData); //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); //MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyed, nowData); string currentTime = System.DateTime.Now.ToString(); string _log = currentTime + " " + unmannedAerialVehicleManage.equipmentCommon.equipmentType + "(" + unmannedAerialVehicleManage.equipmentCommon.deviceID + ")" @@ -263,8 +265,9 @@ public class UnmannedAerialVehicle : MonoBehaviour { string nowData = GetSyncData(attackTarget); Debug.Log(nowData); + MyNetMQClient.instance.Send(nowData); //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", nowData)); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); //MQTTManager.instance.SendData(MQTTManager.instance.SingleDronePosition, nowData); float distance = Vector3.Distance(transform.position, attackTarget.position); transform.DOMove(attackTarget.position, distance / FireSpeed).SetEase(Ease.Linear).OnComplete(() => diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index ba298f15..ffc77ae9 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -238,7 +238,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour int layerValue = LayerMask.NameToLayer(dataLinkCommunicationFrequency); gamePos.layer = layerValue; string nowData = GetSyncDataTwo(); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MyNetMQClient.instance.Send(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); //MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData); } } @@ -266,7 +267,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour int layerValue = LayerMask.NameToLayer(electronicReconnaissanceCapability); dzWRJCamera.cullingMask = 1 << layerValue; string nowData = GetSyncDataThree(); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MyNetMQClient.instance.Send(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); //MQTTManager.instance.SendData(MQTTManager.instance.SweepFrequencyBand, nowData); } } @@ -316,7 +318,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour if (_unmannedAerialVehicle.Count == 0) { string nowData = string.Format("{0},{1}", "SetToBeDestroyed", equipmentCommon.deviceID); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MyNetMQClient.instance.Send(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); //MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyed, nowData); UploadLog(equipmentCommon.deviceID); WWWForm headers = new WWWForm(); @@ -500,7 +503,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour { string nowData = GetSyncData(attackTarget); //MQTTManager.instance.SendData(MQTTManager.instance.SingleDronePosition, nowData); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MyNetMQClient.instance.Send(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); } /// /// 无人机攻击目标传递 @@ -1089,7 +1093,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour isMove = false; Vector3 _positions = positions.Dequeue(); var nowData = GetSyncData(_positions); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); + MyNetMQClient.instance.Send(nowData); + //DeviceManager.Instance.send2roomStr.Enqueue(nowData); //MQTTManager.instance.SendData(MQTTManager.instance.DronePosition, nowData); StartCoroutine(MoveObjectAlongPath(_positions)); // 启动协程，按规划的路线移动物体 } diff --git a/Assets/Zion/Scripts/cxx/MyNetMQClient.cs b/Assets/Zion/Scripts/cxx/MyNetMQClient.cs index fd05c82b..6fe18102 100644 --- a/Assets/Zion/Scripts/cxx/MyNetMQClient.cs +++ b/Assets/Zion/Scripts/cxx/MyNetMQClient.cs @@ -60,7 +60,7 @@ public class MyNetMQClient : MonoBehaviour /// public void Send(string msg) { - _netMqPublisher.AddMessageToSendQue("Room", 0, Encoding.UTF8.GetBytes(msg)); + _netMqPublisher.AddMessageToSendQue(GlobalFlag.roomID, 0, Encoding.UTF8.GetBytes(msg)); } private void Update()