yulong
/
NewN_UAVPlane
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane

This commit is contained in:
yulong 2024-02-28 09:26:47 +08:00
parent ecaac0b0a1 4e927017dc
commit cdbc867b4b
10 changed files with 53 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Temp/Scripts/Microwaveweapon.cs
View File

@ -213,7 +213,8 @@ public class Microwaveweapon : MonoBehaviour
{ {
micdistance = Vector3.Distance(miceopos.position, transform.position); micdistance = Vector3.Distance(miceopos.position, transform.position);
var newdata = Getmicdata(); var newdata = Getmicdata();
DeviceManager.Instance.send2roomStr.Enqueue(newdata); //DeviceManager.Instance.send2roomStr.Enqueue(newdata);
MyNetMQClient.instance.Send(newdata);
//_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", newdata)); //_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", newdata));
//MQTTManager.instance.SendData(MQTTManager.instance.Micow, newdata); //MQTTManager.instance.SendData(MQTTManager.instance.Micow, newdata);
microblog.MicrowaveDisplay(micdistance / 10 + 1, 0.5f); microblog.MicrowaveDisplay(micdistance / 10 + 1, 0.5f);
@ -240,7 +241,8 @@ public class Microwaveweapon : MonoBehaviour
public IEnumerator Destructiondata(UnmannedAerialVehicle unmannedAerialVehicle) public IEnumerator Destructiondata(UnmannedAerialVehicle unmannedAerialVehicle)
{ {
var newdata = Aeroplane(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); //MQTTManager.instance.SendData(MQTTManager.instance.Planedata, newdata);
yield return new WaitForSeconds(0.5f); yield return new WaitForSeconds(0.5f);
GameObject game = Instantiate(Destructioneffect, unmannedAerialVehicle.transform); GameObject game = Instantiate(Destructioneffect, unmannedAerialVehicle.transform);

3
Assets/Temp/Scripts/Spectrumdetection.cs
View File

@ -203,7 +203,8 @@ public class Spectrumdetection : MonoBehaviour
public void SweepFrequencyBandTo() public void SweepFrequencyBandTo()
{ {
string nowData = GetSyncDataThree(); string nowData = GetSyncDataThree();
DeviceManager.Instance.send2roomStr.Enqueue(nowData); MyNetMQClient.instance.Send(nowData);
//DeviceManager.Instance.send2roomStr.Enqueue(nowData);
//MQTTManager.instance.SendData(MQTTManager.instance.SweepFrequencyBand, nowData); //MQTTManager.instance.SendData(MQTTManager.instance.SweepFrequencyBand, nowData);
} }

2
Assets/Temp/Scripts/View_Panel2.cs
View File

@ -261,7 +261,7 @@ public class View_Panel2 : XUIPanel
{ {
//Debug.Log("OnJoinRoom ViewPanel===" + msg); //Debug.Log("OnJoinRoom ViewPanel===" + msg);
//Debug.Log("订阅"+GlobalFlag.roomID); //Debug.Log("订阅"+);
MyNetMQClient.instance._netMqListener.SubTopic(GlobalFlag.roomID); MyNetMQClient.instance._netMqListener.SubTopic(GlobalFlag.roomID);
SceneManager.LoadScene("AdamTraining_pilot_terminal_panl 1"); SceneManager.LoadScene("AdamTraining_pilot_terminal_panl 1");
} }

33
Assets/Zion/Scripts/Adam/DeviceManager.cs
View File

@ -13,7 +13,7 @@ public class DeviceManager : MonoSingleton<DeviceManager>
/// <summary> /// <summary>
/// 发送消息 /// 发送消息
/// </summary> /// </summary>
public Queue<string> send2roomStr = new Queue<string>(); //public Queue<string> send2roomStr = new Queue<string>();
private bool _isStartRehearsing = false; private bool _isStartRehearsing = false;
// 属性绑定布尔值，并在值变化时触发事件 // 属性绑定布尔值，并在值变化时触发事件
@ -62,11 +62,12 @@ public class DeviceManager : MonoSingleton<DeviceManager>
public bool isOnlyOne = true; public bool isOnlyOne = true;
private void Update() private void Update()
{ {
if (send2roomStr.Count > 0 && isOnlyOne) //if (send2roomStr.Count > 0 && isOnlyOne)
{ //{
isOnlyOne = false; // isOnlyOne = false;
StartCoroutine(DequeueSend2roomStr());
} // //StartCoroutine(DequeueSend2roomStr());
//}
#if UNITY_EDITOR #if UNITY_EDITOR
if (Input.GetKeyDown(KeyCode.Space)) if (Input.GetKeyDown(KeyCode.Space))
{ {
@ -76,16 +77,16 @@ public class DeviceManager : MonoSingleton<DeviceManager>
#endif #endif
} }
IEnumerator DequeueSend2roomStr() //IEnumerator DequeueSend2roomStr()
{ //{
while (send2roomStr.Count > 0) // while (send2roomStr.Count > 0)
{ // {
_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", send2roomStr.Dequeue())); // _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", send2roomStr.Dequeue()));
yield return new WaitForSeconds(0.05f); // yield return new WaitForSeconds(0.05f);
if (send2roomStr.Count == 0) // if (send2roomStr.Count == 0)
isOnlyOne = true; // isOnlyOne = true;
} // }
} //}
public void AddDevice(EquipmentCommon d) public void AddDevice(EquipmentCommon d)
{ {

6
Assets/Zion/Scripts/HighPriorityTarget.cs
View File

@ -101,7 +101,8 @@ public class HighPriorityTarget : MonoBehaviour
int layerValue = LayerMask.NameToLayer(frequency); int layerValue = LayerMask.NameToLayer(frequency);
gamepos.layer = layerValue; gamepos.layer = layerValue;
string nowData = GetSyncDataTwo(); string nowData = GetSyncDataTwo();
DeviceManager.Instance.send2roomStr.Enqueue(nowData); MyNetMQClient.instance.Send(nowData);
//DeviceManager.Instance.send2roomStr.Enqueue(nowData);
//MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData); //MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData);
} }
} }
@ -175,7 +176,8 @@ public class HighPriorityTarget : MonoBehaviour
HP -= 10; HP -= 10;
string nowData = GetSyncDis(Pos); string nowData = GetSyncDis(Pos);
Debug.Log("发送：" + nowData); Debug.Log("发送：" + nowData);
DeviceManager.Instance.send2roomStr.Enqueue(nowData); MyNetMQClient.instance.Send(nowData);
//DeviceManager.Instance.send2roomStr.Enqueue(nowData);
//MQTTManager.instance.SendData(MQTTManager.instance.KeyTarget, nowData); //MQTTManager.instance.SendData(MQTTManager.instance.KeyTarget, nowData);
} }
else else

6
Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs
View File

@ -282,8 +282,9 @@ public class LaserFireControlPlatformManger : MonoBehaviour
{ {
Debug.Log("角度合适进行打击"); Debug.Log("角度合适进行打击");
var nowData = GetSyncData(); var nowData = GetSyncData();
MyNetMQClient.instance.Send(nowData);
//_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", 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); //MQTTManager.instance.SendData(MQTTManager.instance.Lasing, nowData);
CastRayAndRender(); CastRayAndRender();
} }
@ -340,7 +341,8 @@ public class LaserFireControlPlatformManger : MonoBehaviour
{ {
string nowData = GetSyncDis(unmannedAerialVehicle); string nowData = GetSyncDis(unmannedAerialVehicle);
Debug.Log(nowData); Debug.Log(nowData);
DeviceManager.Instance.send2roomStr.Enqueue(nowData); MyNetMQClient.instance.Send(nowData);
//DeviceManager.Instance.send2roomStr.Enqueue(nowData);
//MQTTManager.instance.SendData(MQTTManager.instance.DroneWasDestroyed, nowData); //MQTTManager.instance.SendData(MQTTManager.instance.DroneWasDestroyed, nowData);
string currentTime = System.DateTime.Now.ToString(); string currentTime = System.DateTime.Now.ToString();
string _log = currentTime + " " + equipmentCommon.equipmentType + "(" + equipmentCommon.deviceID + ")" + string _log = currentTime + " " + equipmentCommon.equipmentType + "(" + equipmentCommon.deviceID + ")" +

6
Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs
View File

@ -417,7 +417,8 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
unmannedAerialVehicleManage.CheckSatellitePositioningFrequency( unmannedAerialVehicleManage.CheckSatellitePositioningFrequency(
InterferenceMode); InterferenceMode);
var nowData = GetSyncData(unmannedAerialVehicleManage); 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); //MQTTManager.instance.SendData(MQTTManager.instance.WRJExpel, nowData);
} }
UnmannedAerialVehicle unmannedAerialVehicle = wrj.GetComponent<UnmannedAerialVehicle>(); UnmannedAerialVehicle unmannedAerialVehicle = wrj.GetComponent<UnmannedAerialVehicle>();
@ -427,7 +428,8 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour
unmannedAerialVehicle.CheckSatellitePositioningFrequency( unmannedAerialVehicle.CheckSatellitePositioningFrequency(
InterferenceMode); InterferenceMode);
var nowData = GetSyncData(unmannedAerialVehicle); 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); //MQTTManager.instance.SendData(MQTTManager.instance.WRJDitch, nowData);
} }
isDo = true; isDo = true;

9
Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs
View File

@ -115,9 +115,10 @@ public class UnmannedAerialVehicle : MonoBehaviour
if (isPassMessage) if (isPassMessage)
{ {
string nowData = GetSyncDis(); string nowData = GetSyncDis();
MyNetMQClient.instance.Send(nowData);
//Debug.Log(nowData); //Debug.Log(nowData);
//_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", 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); //MQTTManager.instance.SendData(MQTTManager.instance.DroneWasDestroyed, nowData);
string currentTime = System.DateTime.Now.ToString(); string currentTime = System.DateTime.Now.ToString();
string _log = currentTime + " " + unmannedAerialVehicleManage.equipmentCommon.equipmentType + "(" + unmannedAerialVehicleManage.equipmentCommon.deviceID + ")" string _log = currentTime + " " + unmannedAerialVehicleManage.equipmentCommon.equipmentType + "(" + unmannedAerialVehicleManage.equipmentCommon.deviceID + ")"
@ -144,9 +145,10 @@ public class UnmannedAerialVehicle : MonoBehaviour
if (_equipmentCommon) if (_equipmentCommon)
{ {
string nowData = string.Format("{0},{1}", "SetToBeDestroyed", _equipmentCommon.deviceID); string nowData = string.Format("{0},{1}", "SetToBeDestroyed", _equipmentCommon.deviceID);
MyNetMQClient.instance.Send(nowData);
//Debug.Log(nowData); //Debug.Log(nowData);
//_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", 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); //MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyed, nowData);
string currentTime = System.DateTime.Now.ToString(); string currentTime = System.DateTime.Now.ToString();
string _log = currentTime + " " + unmannedAerialVehicleManage.equipmentCommon.equipmentType + "(" + unmannedAerialVehicleManage.equipmentCommon.deviceID + ")" string _log = currentTime + " " + unmannedAerialVehicleManage.equipmentCommon.equipmentType + "(" + unmannedAerialVehicleManage.equipmentCommon.deviceID + ")"
@ -263,8 +265,9 @@ public class UnmannedAerialVehicle : MonoBehaviour
{ {
string nowData = GetSyncData(attackTarget); string nowData = GetSyncData(attackTarget);
Debug.Log(nowData); Debug.Log(nowData);
MyNetMQClient.instance.Send(nowData);
//_ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", 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); //MQTTManager.instance.SendData(MQTTManager.instance.SingleDronePosition, nowData);
float distance = Vector3.Distance(transform.position, attackTarget.position); float distance = Vector3.Distance(transform.position, attackTarget.position);
transform.DOMove(attackTarget.position, distance / FireSpeed).SetEase(Ease.Linear).OnComplete(() => transform.DOMove(attackTarget.position, distance / FireSpeed).SetEase(Ease.Linear).OnComplete(() =>

15
Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
View File

@ -238,7 +238,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
int layerValue = LayerMask.NameToLayer(dataLinkCommunicationFrequency); int layerValue = LayerMask.NameToLayer(dataLinkCommunicationFrequency);
gamePos.layer = layerValue; gamePos.layer = layerValue;
string nowData = GetSyncDataTwo(); string nowData = GetSyncDataTwo();
DeviceManager.Instance.send2roomStr.Enqueue(nowData); MyNetMQClient.instance.Send(nowData);
//DeviceManager.Instance.send2roomStr.Enqueue(nowData);
//MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData); //MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData);
} }
} }
@ -266,7 +267,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
int layerValue = LayerMask.NameToLayer(electronicReconnaissanceCapability); int layerValue = LayerMask.NameToLayer(electronicReconnaissanceCapability);
dzWRJCamera.cullingMask = 1 << layerValue; dzWRJCamera.cullingMask = 1 << layerValue;
string nowData = GetSyncDataThree(); string nowData = GetSyncDataThree();
DeviceManager.Instance.send2roomStr.Enqueue(nowData); MyNetMQClient.instance.Send(nowData);
//DeviceManager.Instance.send2roomStr.Enqueue(nowData);
//MQTTManager.instance.SendData(MQTTManager.instance.SweepFrequencyBand, nowData); //MQTTManager.instance.SendData(MQTTManager.instance.SweepFrequencyBand, nowData);
} }
} }
@ -316,7 +318,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
if (_unmannedAerialVehicle.Count == 0) if (_unmannedAerialVehicle.Count == 0)
{ {
string nowData = string.Format("{0},{1}", "SetToBeDestroyed", equipmentCommon.deviceID); 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); //MQTTManager.instance.SendData(MQTTManager.instance.SetToBeDestroyed, nowData);
UploadLog(equipmentCommon.deviceID); UploadLog(equipmentCommon.deviceID);
WWWForm headers = new WWWForm(); WWWForm headers = new WWWForm();
@ -500,7 +503,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
{ {
string nowData = GetSyncData(attackTarget); string nowData = GetSyncData(attackTarget);
//MQTTManager.instance.SendData(MQTTManager.instance.SingleDronePosition, nowData); //MQTTManager.instance.SendData(MQTTManager.instance.SingleDronePosition, nowData);
DeviceManager.Instance.send2roomStr.Enqueue(nowData); MyNetMQClient.instance.Send(nowData);
//DeviceManager.Instance.send2roomStr.Enqueue(nowData);
} }
/// <summary> /// <summary>
/// 无人机攻击目标传递 /// 无人机攻击目标传递
@ -1089,7 +1093,8 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
isMove = false; isMove = false;
Vector3 _positions = positions.Dequeue(); Vector3 _positions = positions.Dequeue();
var nowData = GetSyncData(_positions); 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); //MQTTManager.instance.SendData(MQTTManager.instance.DronePosition, nowData);
StartCoroutine(MoveObjectAlongPath(_positions)); // 启动协程，按规划的路线移动物体 StartCoroutine(MoveObjectAlongPath(_positions)); // 启动协程，按规划的路线移动物体
} }

2
Assets/Zion/Scripts/cxx/MyNetMQClient.cs
View File

@ -60,7 +60,7 @@ public class MyNetMQClient : MonoBehaviour
/// <param name="msg"></param> /// <param name="msg"></param>
public void Send(string msg) 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() private void Update()