diff --git a/Assets/GameAssets/Renderer/Minimap.prefab b/Assets/GameAssets/Renderer/Minimap.prefab index a69d3be8..84bd72e0 100644 --- a/Assets/GameAssets/Renderer/Minimap.prefab +++ b/Assets/GameAssets/Renderer/Minimap.prefab @@ -185,7 +185,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1586417955185665358} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: diff --git a/Assets/Resources/UIPanel/frequencypanl.prefab b/Assets/Resources/UIPanel/frequencypanl.prefab index 56edb385..56c81178 100644 --- a/Assets/Resources/UIPanel/frequencypanl.prefab +++ b/Assets/Resources/UIPanel/frequencypanl.prefab @@ -797,11 +797,11 @@ MonoBehaviour: m_Value: 0 m_Options: m_Options: - - m_Text: 1227.60 MHz + - m_Text: 1227.60MHz m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3} - - m_Text: 1381.05 MHz + - m_Text: 1381.05MHz m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3} - - m_Text: 1575.42 MHz + - m_Text: 1575.42MHz m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3} - m_Text: 2GHz m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3} @@ -890,7 +890,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 1227.60 MHz + m_Text: 1227.60MHz --- !u!1 &1649737330324479757 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/StreamingAssets/IPPort.txt b/Assets/StreamingAssets/IPPort.txt index 615b3a1f..a012cbee 100644 --- a/Assets/StreamingAssets/IPPort.txt +++ b/Assets/StreamingAssets/IPPort.txt @@ -1 +1 @@ -172.16.1.41:48888 \ No newline at end of file +192.168.138.15:48888 \ No newline at end of file diff --git a/Assets/StreamingAssets/confing.txt b/Assets/StreamingAssets/confing.txt index e193bc6f..87589c67 100644 --- a/Assets/StreamingAssets/confing.txt +++ b/Assets/StreamingAssets/confing.txt @@ -1 +1 @@ -172.16.1.41 \ No newline at end of file +192.168.138.15 \ No newline at end of file diff --git a/Assets/Temp/Scripts/Conversionfrequency.cs b/Assets/Temp/Scripts/Conversionfrequency.cs index 9d2bfd6c..2ceda364 100644 --- a/Assets/Temp/Scripts/Conversionfrequency.cs +++ b/Assets/Temp/Scripts/Conversionfrequency.cs @@ -1,4 +1,5 @@ -using System; +using AdamSync; +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -44,17 +45,21 @@ public class Conversionfrequency : MonoBehaviour }); verify_buttn.onClick.AddListener(() => { - Smallfrequency = dropdown.value; - terrestrialRadioInterferenceManger.Interference(Smallfrequency); + //Smallfrequency = dropdown.value; + terrestrialRadioInterferenceManger.InterferingFrequency= dropdown.options[dropdown.value].text; + Debug.LogError(terrestrialRadioInterferenceManger.InterferingFrequency); + //terrestrialRadioInterferenceManger.Interference(Smallfrequency); transform.gameObject.SetActive(false); + string msg = $"send2room EditorDevice,{terrestrialRadioInterferenceManger.equipmentCommon.deviceID},{terrestrialRadioInterferenceManger.InterferingFrequency}"; + _ = SyncCreateRoom.SendMessageAsync(msg); }); } - + void Update() { - + } private void OnDestroy() { diff --git a/Assets/Temp/Scripts/Scenariopage.cs b/Assets/Temp/Scripts/Scenariopage.cs index f29c1fea..b2619747 100644 --- a/Assets/Temp/Scripts/Scenariopage.cs +++ b/Assets/Temp/Scripts/Scenariopage.cs @@ -1494,13 +1494,13 @@ public class Scenariopage : MonoBehaviour switch (value) { case 0: - frequency_text.text = "1227.60 MHz"; + frequency_text.text = "1227.60MHz"; break; case 1: - frequency_text.text = "1381.05 MHz"; + frequency_text.text = "1381.05MHz"; break; case 2: - frequency_text.text = "1575.42 MHz"; + frequency_text.text = "1575.42MHz"; break; case 3: frequency_text.text = "2GHz"; diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index 08cd983a..34d397a5 100644 --- a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity +++ b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1113159741} - m_IndirectSpecularColor: {r: 0.16231456, g: 0.30614573, b: 0.66931695, a: 1} + m_IndirectSpecularColor: {r: 0.165218, g: 0.3075422, b: 0.6572481, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -63100,7 +63100,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 1780006765 + randSeed: 1859322953 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 diff --git a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity index a8139de3..d92533ec 100644 --- a/Assets/Zion/Scenes/Contingenc_yediting_panl.unity +++ b/Assets/Zion/Scenes/Contingenc_yediting_panl.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.16521391, g: 0.30764452, b: 0.6578343, a: 1} + m_IndirectSpecularColor: {r: 0.165218, g: 0.3075422, b: 0.6572481, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -11717,7 +11717,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 1227.60 MHz + m_Text: 1227.60MHz --- !u!222 &168482738 CanvasRenderer: m_ObjectHideFlags: 0 @@ -49818,11 +49818,11 @@ MonoBehaviour: m_Value: 0 m_Options: m_Options: - - m_Text: 1227.60 MHz + - m_Text: 1227.60MHz m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3} - - m_Text: 1381.05 MHz + - m_Text: 1381.05MHz m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3} - - m_Text: 1575.42 MHz + - m_Text: 1575.42MHz m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3} - m_Text: 2GHz m_Image: {fileID: 21300000, guid: ab029b3f9356df54eb7dfe16e97c79ea, type: 3} @@ -51166,7 +51166,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 1227.60 MHz + m_Text: 1227.60MHz --- !u!222 &638510552 CanvasRenderer: m_ObjectHideFlags: 0 @@ -79930,11 +79930,11 @@ MonoBehaviour: m_Value: 0 m_Options: m_Options: - - m_Text: 1227.60 MHz + - m_Text: 1227.60MHz m_Image: {fileID: 21300000, guid: aee371e0f91624d4194218195a5abb8f, type: 3} - - m_Text: 1381.05 MHz + - m_Text: 1381.05MHz m_Image: {fileID: 21300000, guid: aee371e0f91624d4194218195a5abb8f, type: 3} - - m_Text: 1575.42 MHz + - m_Text: 1575.42MHz m_Image: {fileID: 21300000, guid: aee371e0f91624d4194218195a5abb8f, type: 3} m_OnValueChanged: m_PersistentCalls: @@ -106459,7 +106459,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 678732734 + randSeed: 1860173453 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs b/Assets/Zion/Scripts/Adam/DeviceManager.cs index 734f057e..8371a136 100644 --- a/Assets/Zion/Scripts/Adam/DeviceManager.cs +++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs @@ -8,7 +8,7 @@ public class DeviceManager : MonoSingleton /// /// 所有设备 /// - public List devices = new List(); + public List devices = new List(); /// /// 发送消息 /// @@ -32,7 +32,7 @@ public class DeviceManager : MonoSingleton public event System.Action OnActivationChanged; - // Start is called before the first frame update + void Start() { SyncCreateRoom.send2roomRequset += GetSend2roomMsg; @@ -55,7 +55,7 @@ public class DeviceManager : MonoSingleton public bool isOnlyOne = true; private void Update() { - if (send2roomStr.Count > 0&&isOnlyOne) + if (send2roomStr.Count > 0 && isOnlyOne) { isOnlyOne = false; StartCoroutine(DequeueSend2roomStr()); @@ -68,7 +68,7 @@ public class DeviceManager : MonoSingleton { _ = SyncCreateRoom.SendMessageAsync(string.Format("send2room {0}", send2roomStr.Dequeue())); yield return new WaitForSeconds(0.05f); - if(send2roomStr.Count==0) + if (send2roomStr.Count == 0) isOnlyOne = true; } } @@ -87,10 +87,19 @@ public class DeviceManager : MonoSingleton Debug.LogError("设备..:" + data); string[] info = data.Split(','); if (info.Length < 2) return; + EquipmentCommon equipmentCommon = devices.Find(x => x.deviceID == info[1]); - if (equipmentCommon) + if (info[0] == "EditorDevice") { - equipmentCommon.ReceivingPositionAngle(info); + equipmentCommon.GetComponent().InterferingFrequency = info[2]; + } + else + { + if (equipmentCommon) + { + equipmentCommon.ReceivingPositionAngle(info); + + } } } diff --git a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs index 91ac2259..cae35ec9 100644 --- a/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/Radar/RadarManger.cs @@ -46,11 +46,6 @@ public class RadarManger : MonoBehaviour /// public float interval = 5.0f; #endregion - - /// - /// 飞机不显示在小地图上 - /// - public GameObject minimap; /// /// 雷达UI预制体 /// @@ -299,33 +294,26 @@ public class RadarManger : MonoBehaviour Mincamera.orthographicSize = detectionRadius; if (colliders2.Count > 0) { - - for (int i = 0; i < colliders2.Count; i++) + if (Random.value > (1 - float.Parse(DetectionSuccessRate)/100)) { - if (i <= NumberOfProbes) + for (int i = 0; i < colliders2.Count; i++) { - - if (Random.value > (1 - float.Parse(DetectionSuccessRate) / 1000)) + UnmannedAerialVehicle unmannedAerialVehicle = colliders2[i].GetComponent(); + if (unmannedAerialVehicle) { - UnmannedAerialVehicle unmannedAerialVehicle = colliders2[i].GetComponent(); - if (unmannedAerialVehicle) + LaserFireControlPlatformManger laserFireControlPlatformManger = LaserFireControlPlatformManger.laserFireControlPlatformMangers.Find(x => (x != null && x.isLasing == false)); + if (laserFireControlPlatformManger) { - LaserFireControlPlatformManger laserFireControlPlatformManger = LaserFireControlPlatformManger.laserFireControlPlatformMangers.Find(x => (x != null && x.isLasing == false)); - if (laserFireControlPlatformManger) - { - laserFireControlPlatformManger.isLasing = true; - Debug.Log(laserFireControlPlatformManger.transform.name + "攻击无人机: " + unmannedAerialVehicle.transform.name); - laserFireControlPlatformManger.targetPoint = unmannedAerialVehicle.transform; - laserFireControlPlatformManger.Lasing(); - } - number++; + laserFireControlPlatformManger.isLasing = true; + Debug.Log(laserFireControlPlatformManger.transform.name + "攻击无人机: " + unmannedAerialVehicle.transform.name); + laserFireControlPlatformManger.targetPoint = unmannedAerialVehicle.transform; + laserFireControlPlatformManger.Lasing(); } + number++; } } - else - { - minimap.GetComponent().cullingMask = ~(1 << 15); - } + + } } } @@ -334,7 +322,7 @@ public class RadarManger : MonoBehaviour { Debug.LogError("鼠标进入"); RadarUi.transform.localScale = Vector3.one; - Mincamera.transform.position = new Vector3(transform.position.x,350, transform.position.z); + Mincamera.transform.position = new Vector3(transform.position.x, 350, transform.position.z); } private void OnMouseExit() diff --git a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs index 8b4605c3..8c092982 100644 --- a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs @@ -441,7 +441,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour /// private void Angularrange() { - Collider[] collider = Physics.OverlapSphere(transform.position, 300); + Collider[] collider = Physics.OverlapSphere(transform.position,300); for (int i = 0; i < collider.Length; i++) { if (collider[i].transform.tag == "WRJ") diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index 7c07b065..9ca0f1ae 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -338,13 +338,13 @@ public class UnmannedAerialVehicleManage : MonoBehaviour switch (weaponitemone[i].para_value) { case "0": - satellitePositioningFrequency = "1227.60 MHz"; + satellitePositioningFrequency = "1227.60MHz"; break; case "1": - satellitePositioningFrequency = "1381.05 MHz"; + satellitePositioningFrequency = "1381.05MHz"; break; case "2": - satellitePositioningFrequency = "1575.42 MHz"; + satellitePositioningFrequency = "1575.42MHz"; break; default: break;