diff --git a/Assets/Resources/model/重点攻击目标1.prefab b/Assets/Resources/model/重点攻击目标1.prefab index 82b8757f..f7974e45 100644 --- a/Assets/Resources/model/重点攻击目标1.prefab +++ b/Assets/Resources/model/重点攻击目标1.prefab @@ -2726,7 +2726,7 @@ GameObject: - component: {fileID: 1014353712495964052} m_Layer: 5 m_Name: Canvas - m_TagString: Untagged + m_TagString: Importance m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Resources/model/重点攻击目标2.prefab b/Assets/Resources/model/重点攻击目标2.prefab index 12316fcc..82398292 100644 --- a/Assets/Resources/model/重点攻击目标2.prefab +++ b/Assets/Resources/model/重点攻击目标2.prefab @@ -281,7 +281,7 @@ GameObject: - component: {fileID: 1422880735768166433} m_Layer: 5 m_Name: Canvas - m_TagString: Untagged + m_TagString: Importance m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Resources/model/重点攻击目标3.prefab b/Assets/Resources/model/重点攻击目标3.prefab index 2c944eda..698c2df8 100644 --- a/Assets/Resources/model/重点攻击目标3.prefab +++ b/Assets/Resources/model/重点攻击目标3.prefab @@ -2513,7 +2513,7 @@ GameObject: - component: {fileID: 4013790001393954177} m_Layer: 5 m_Name: Canvas - m_TagString: Untagged + m_TagString: Importance m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index 028dce82..0f07707b 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.16234729, g: 0.30613518, b: 0.6690394, a: 1} + m_IndirectSpecularColor: {r: 0.16231087, g: 0.30614385, b: 0.66932905, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -6834,7 +6834,7 @@ GameObject: - component: {fileID: 147647013} - component: {fileID: 147647014} m_Layer: 5 - m_Name: Canvas + m_Name: MianCanvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -54101,7 +54101,6 @@ MonoBehaviour: m_EditorClassIdentifier: deviceimages1: [] devices: [] - modellist: [] --- !u!114 &1436809535 MonoBehaviour: m_ObjectHideFlags: 0 @@ -69825,7 +69824,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 4767687 + randSeed: 753053593 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 diff --git a/Assets/Zion/Scripts/Adam/DragController.cs b/Assets/Zion/Scripts/Adam/DragController.cs index 41eaabc3..a8724d75 100644 --- a/Assets/Zion/Scripts/Adam/DragController.cs +++ b/Assets/Zion/Scripts/Adam/DragController.cs @@ -20,9 +20,9 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler, public Mastermanagement mastermanagement; - void Start() + void Awake() { - mastermanagement = GameObject.Find("Canvas").GetComponent(); + mastermanagement = GameObject.Find("MianCanvas").GetComponent(); } public void OnBeginDrag(PointerEventData eventData) { diff --git a/Assets/Zion/Scripts/HighPriorityTarget.cs b/Assets/Zion/Scripts/HighPriorityTarget.cs index b5c5c8a7..e047d388 100644 --- a/Assets/Zion/Scripts/HighPriorityTarget.cs +++ b/Assets/Zion/Scripts/HighPriorityTarget.cs @@ -60,7 +60,7 @@ public class HighPriorityTarget : MonoBehaviour /// /// 频率选择 /// - public Toggle toggle1, toggle2, toggle3, toggle4, toggle5, toggle6, toggle7; + //public Toggle toggle1, toggle2, toggle3, toggle4, toggle5, toggle6, toggle7; /// /// 频段设置 /// @@ -104,88 +104,7 @@ public class HighPriorityTarget : MonoBehaviour MQTTManager.instance.SendData(MQTTManager.instance.BandSetting, nowData); } } - /* - private void Interferencefrequency() - { - toggle1.onValueChanged.AddListener((ison) => - { - if (ison) - { - frequency = "UHF"; - gamepos.layer = 16; - string nowData = GetSyncDataTwo(); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); - - } - }); - toggle2.onValueChanged.AddListener((ison) => - { - if (ison) - { - frequency = "L"; - gamepos.layer = 17; - string nowData = GetSyncDataTwo(); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); - - } - }); - toggle3.onValueChanged.AddListener((ison) => - { - if (ison) - { - frequency = "S"; - gamepos.layer = 18; - string nowData = GetSyncDataTwo(); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); - - } - }); - toggle4.onValueChanged.AddListener((ison) => - { - if (ison) - { - frequency = "C"; - gamepos.layer = 19; - string nowData = GetSyncDataTwo(); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); - - } - }); - toggle5.onValueChanged.AddListener((ison) => - { - if (ison) - { - frequency = "X"; - gamepos.layer = 20; - string nowData = GetSyncDataTwo(); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); - - } - }); - toggle6.onValueChanged.AddListener((ison) => - { - if (ison) - { - frequency = "Ku"; - gamepos.layer = 21; - string nowData = GetSyncDataTwo(); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); - - } - }); - toggle7.onValueChanged.AddListener((ison) => - { - if (ison) - { - frequency = "Ka"; - gamepos.layer = 22; - string nowData = GetSyncDataTwo(); - DeviceManager.Instance.send2roomStr.Enqueue(nowData); - - } - }); - } - */ + public void FrequencyGamepos(string _frequency) { int layerValue = LayerMask.NameToLayer(_frequency); diff --git a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs index 9ca6b9eb..b1154970 100644 --- a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs @@ -8,8 +8,8 @@ using static InterfaceManager; using System; using UnityEngine.UI; using UnityEngine.EventSystems; - - + + /* 地面无线电干扰对无人机的干扰通常是指对其数据链通信频点的干扰，而不是卫星定位频点的干扰。 @@ -194,7 +194,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour private void disturb1() { - if (InterferingFrequency1.Length>0) + if (InterferingFrequency1.Length > 0) { string[] str = InterferingFrequency1.Split(','); for (int i = 0; i < str.Length; i++) @@ -206,7 +206,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour break; case "L": toggle2.gameObject.SetActive(true); - break ; + break; case "S": toggle3.gameObject.SetActive(true); break; @@ -241,10 +241,10 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour //Interferencemode(); //Angularrange(); } - - + + public GraphicRaycaster RaycastInCanvas; - + #region 启动暂停 @@ -314,36 +314,36 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour /// public void FillInTheData(List weaponitemone) { - + for (int i = 0; i < weaponitemone.Count; i++) { switch (weaponitemone[i].para_name) { case "干扰频率:": string[] str = weaponitemone[i].para_value.Split(','); - if (str.Length>0) + if (str.Length > 0) { for (int j = 0; j < str.Length; j++) { switch (str[j]) { case "0": - InterferingFrequency1 += "UHF"+"," ; + InterferingFrequency1 += "UHF" + ","; break; case "1": - InterferingFrequency1 += "L"+","; + InterferingFrequency1 += "L" + ","; break; case "2": - InterferingFrequency1 += "S"+","; + InterferingFrequency1 += "S" + ","; break; case "3": - InterferingFrequency1 += "C"+","; + InterferingFrequency1 += "C" + ","; break; case "4": - InterferingFrequency1 += "X"+","; + InterferingFrequency1 += "X" + ","; break; case "5": - InterferingFrequency1 += "Ku"+","; + InterferingFrequency1 += "Ku" + ","; break; case "6": InterferingFrequency1 += "Ka" + ","; @@ -353,7 +353,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour } } } - + //interval= float.Parse(InterferingFrequency); break; case "干扰模式:": @@ -456,7 +456,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour { if (colliders[i].transform.tag == "WRJ") { - + UnmannedAerialVehicleManage unmannedAerialVehicleManage = colliders[i].GetComponent(); //Debug.Log("检测到无人机: " + col.name); UnmannedAerialVehicle unmannedAerialVehicle = colliders[i].GetComponent(); @@ -475,7 +475,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour { WRJs.Enqueue(unmannedAerialVehicleManage.transform); } - + } } @@ -501,7 +501,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour } } - + /// ///上传日志 @@ -526,7 +526,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour })); } - + private void OnDestroy() { diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index e3ef05e7..34f35f2f 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -9,6 +9,7 @@ TagManager: - AttackTarget - WRJ1 - AttackTarget1 + - Importance layers: - Default - TransparentFX