From 87ed2d2d1203bbac6c85ef924fa72b465b25d59a Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Sun, 21 Jan 2024 14:56:40 +0800 Subject: [PATCH] ew --- Assets/StreamingAssets/IPPort.txt | 2 +- Assets/StreamingAssets/confing.txt | 2 +- .../Zion/Scripts/Adam/Components/ShellBoom.cs | 1 + .../Zion/Scripts/Adam/Components/UAVBase.cs | 136 +++++++++++++++++- .../LaserFireControlPlatformManger.cs | 5 +- 5 files changed, 141 insertions(+), 5 deletions(-) diff --git a/Assets/StreamingAssets/IPPort.txt b/Assets/StreamingAssets/IPPort.txt index b2035e1f..298829e4 100644 --- a/Assets/StreamingAssets/IPPort.txt +++ b/Assets/StreamingAssets/IPPort.txt @@ -1 +1 @@ -192.168.1.5:48888 \ No newline at end of file +127.0.0.1:48888 \ No newline at end of file diff --git a/Assets/StreamingAssets/confing.txt b/Assets/StreamingAssets/confing.txt index 8de8d0dc..e56ea71e 100644 --- a/Assets/StreamingAssets/confing.txt +++ b/Assets/StreamingAssets/confing.txt @@ -1 +1 @@ -192.168.1.5 \ No newline at end of file +127.0.0.1 \ No newline at end of file diff --git a/Assets/Zion/Scripts/Adam/Components/ShellBoom.cs b/Assets/Zion/Scripts/Adam/Components/ShellBoom.cs index e7b4c764..bcf9cd27 100644 --- a/Assets/Zion/Scripts/Adam/Components/ShellBoom.cs +++ b/Assets/Zion/Scripts/Adam/Components/ShellBoom.cs @@ -15,6 +15,7 @@ public class ShellBoom : MonoBehaviour { onShellAttack?.Invoke(); } + DestroyObject(gameObject, 8f); } private void Update() { diff --git a/Assets/Zion/Scripts/Adam/Components/UAVBase.cs b/Assets/Zion/Scripts/Adam/Components/UAVBase.cs index 03084082..802bff95 100644 --- a/Assets/Zion/Scripts/Adam/Components/UAVBase.cs +++ b/Assets/Zion/Scripts/Adam/Components/UAVBase.cs @@ -1,4 +1,5 @@ -using PData; +using AdamThinkDevicesData; +using PData; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -8,6 +9,139 @@ using UnityEngine; /// public class UAVBase : MonoBehaviour { + #region 无人机数据 + /// + /// 续航时间 + /// + public string batteryLife; + /// + /// 抗风等级 + /// + public string classificationWindResistance; + /// + /// 最大飞行速度 + /// + public string maximumFlyingSpeed; + /// + /// RCS + /// + public string RCS; + /// + /// 卫星定位频点 + /// + public string satellitePositioningFrequency; + /// + /// 数据链通信频点 + /// + public string dataLinkCommunicationFrequency; + /// + /// 电子侦察能力 + /// + public string electronicReconnaissanceCapability; + /// + /// 光学侦察能力 + /// + public string opticalReconnaissanceCapability; + + #endregion + public void SetAttribute(List weaponitemone) + { + for (int i = 0; i < weaponitemone.Count; i++) + { + switch (weaponitemone[i].para_name) + { + case "续航时间：": + batteryLife = weaponitemone[i].para_value; + break; + case "抗风等级：": + classificationWindResistance = weaponitemone[i].para_value; + break; + case "最大飞行速度：": + maximumFlyingSpeed = weaponitemone[i].para_value; + break; + case "RCS：": + RCS = weaponitemone[i].para_value; + break; + case "卫星定位频点：": + //satellitePositioningFrequency = weaponitemone[i].para_value; + switch (weaponitemone[i].para_value) + { + case "0": + satellitePositioningFrequency = "1227.60MHz"; + break; + case "1": + satellitePositioningFrequency = "1381.05MHz"; + break; + case "2": + satellitePositioningFrequency = "1575.42MHz"; + break; + default: + break; + } + break; + case "数据链通信频点:": + switch (weaponitemone[i].para_value) + { + case "0": + dataLinkCommunicationFrequency = "2GHz"; + break; + case "1": + dataLinkCommunicationFrequency = "4GHz"; + break; + case "2": + dataLinkCommunicationFrequency = "5GHz"; + break; + default: + break; + } + break; + case "电子侦察能力:": + switch (weaponitemone[i].para_value) + { + case "0": + electronicReconnaissanceCapability = "UHF"; + break; + case "1": + electronicReconnaissanceCapability = "L"; + break; + case "2": + electronicReconnaissanceCapability = "S"; + break; + case "3": + electronicReconnaissanceCapability = "C"; + break; + case "4": + electronicReconnaissanceCapability = "X"; + break; + case "5": + electronicReconnaissanceCapability = "Ku"; + break; + case "6": + electronicReconnaissanceCapability = "Ka"; + break; + default: + break; + } + break; + case "光学侦察能力:": + //opticalReconnaissanceCapability = weaponitemone[i].para_value; + switch (weaponitemone[i].para_value) + { + case "0": + opticalReconnaissanceCapability = "有"; + break; + case "1": + opticalReconnaissanceCapability = "无"; + break; + default: + break; + } + break; + default: + break; + } + } + } public void GetWeatherAttachUAV() { diff --git a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs index bf7e4afc..9441ce3f 100644 --- a/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/LaserFireControlPlatform/LaserFireControlPlatformManger.cs @@ -429,7 +429,7 @@ public class LaserFireControlPlatformManger : MonoBehaviour /// public void Launchanattack() { - if (targetPoint != null&& Receivingdistance>0) + if (targetPoint != null && Receivingdistance > 0) { Vector3 pos = camera.WorldToViewportPoint(targetPoint.position); ispcamera = (pos.x > 0 && pos.x < 1 && pos.y > 0 && pos.y < 1 && pos.z > 0); @@ -633,7 +633,8 @@ public class LaserFireControlPlatformManger : MonoBehaviour Destroy(crosshair.gameObject); Destroy(InnerLaserlineRenderer.gameObject); Destroy(InnerLaserlineRenderer.gameObject); - Destroy(OuterLaserlineRenderer.gameObject); + if (OuterLaserlineRenderer != null) + Destroy(OuterLaserlineRenderer.gameObject); OnActivationChanged -= OnActivationChangedHandler; } }