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

Compare commits

base: yulong:4e927017dcb8d5223533871adcf785e4bdafaf16
Branches Tags
yulong:master
..
compare: yulong:54155001334fa624ae3f2986abc0341979571e23
Branches Tags
yulong:master

No commits in common. "4e927017dcb8d5223533871adcf785e4bdafaf16" and "54155001334fa624ae3f2986abc0341979571e23" have entirely different histories.
4e927017dc ... 5415500133

10 changed files with 35 additions and 53 deletions
Show Stats Expand all files Collapse all files

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

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

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

@ -203,8 +203,7 @@ public class Spectrumdetection : MonoBehaviour
public void SweepFrequencyBandTo()
{
string nowData = GetSyncDataThree();
MyNetMQClient.instance.Send(nowData);
//DeviceManager.Instance.send2roomStr.Enqueue(nowData);
DeviceManager.Instance.send2roomStr.Enqueue(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("订阅"+);
//Debug.Log("订阅"+GlobalFlag.roomID);
MyNetMQClient.instance._netMqListener.SubTopic(GlobalFlag.roomID);
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>
//public Queue<string> send2roomStr = new Queue<string>();
public Queue<string> send2roomStr = new Queue<string>();
private bool _isStartRehearsing = false;
// 属性绑定布尔值，并在值变化时触发事件
@ -62,12 +62,11 @@ public class DeviceManager : MonoSingleton<DeviceManager>
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))
{
@ -77,16 +76,16 @@ public class DeviceManager : MonoSingleton<DeviceManager>
#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)
{

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

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

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

@ -282,9 +282,8 @@ 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();
}
@ -341,8 +340,7 @@ public class LaserFireControlPlatformManger : MonoBehaviour
{
string nowData = GetSyncDis(unmannedAerialVehicle);
Debug.Log(nowData);
MyNetMQClient.instance.Send(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 + " " + equipmentCommon.equipmentType + "(" + equipmentCommon.deviceID + ")" +

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

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

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

@ -115,10 +115,9 @@ 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 + ")"
@ -145,10 +144,9 @@ 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 + ")"
@ -265,9 +263,8 @@ 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(() =>

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

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

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

@ -56,7 +56,7 @@ public class MyNetMQClient : MonoBehaviour
/// <param name="msg"></param>
public void Send(string msg)
{
_netMqPublisher.AddMessageToSendQue(GlobalFlag.roomID, 0, Encoding.UTF8.GetBytes(msg));
_netMqPublisher.AddMessageToSendQue("Room", 0, Encoding.UTF8.GetBytes(msg));
}
private void Update()