diff --git a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab index 0314e0bb..7965e137 100644 --- a/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab +++ b/Assets/GameAssets/Prefebs/Models/moder/无人机List.prefab @@ -10983,6 +10983,21 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7591063048475770342, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7591063048475770342, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7591063048475770342, guid: 088baeb890d17754287a1161c0b1dceb, + type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7633175810598794496, guid: 088baeb890d17754287a1161c0b1dceb, type: 3} propertyPath: m_Layer diff --git a/Assets/Temp/Scripts/Mastermanagement.cs b/Assets/Temp/Scripts/Mastermanagement.cs index 743a4bc4..599013e5 100644 --- a/Assets/Temp/Scripts/Mastermanagement.cs +++ b/Assets/Temp/Scripts/Mastermanagement.cs @@ -5,7 +5,7 @@ using UnityEngine; public class Mastermanagement : MonoBehaviour { - + public List dragControllers = new List();//蓝方设备用于存UI元素 public List weapongames = new List();//蓝方设备用于存储场景中的物体 void Awake() @@ -17,7 +17,7 @@ public class Mastermanagement : MonoBehaviour StartCoroutine(WaitGetAllDevice()); } //蓝方设备 - private IEnumerator WaitGetAllDevice() + public IEnumerator WaitGetAllDevice() { yield return new WaitForSeconds(0.1f); Debug.Log("wew"); @@ -50,7 +50,7 @@ public class Mastermanagement : MonoBehaviour { for (int i = 0; i < dragControllers.Count; i++) { - if (dragControllers[i].gameObject.name == game.name && !dragControllers[i].gameObject.activeSelf) + if (dragControllers[i].gameObject.name == game.name && dragControllers[i].gameObject.activeSelf) { dragControllers[i].gameObject.SetActive(false); break; diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs b/Assets/Zion/Scripts/Adam/DeviceManager.cs index c83abc01..3a78c52a 100644 --- a/Assets/Zion/Scripts/Adam/DeviceManager.cs +++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs @@ -60,6 +60,13 @@ public class DeviceManager : MonoSingleton isOnlyOne = false; StartCoroutine(DequeueSend2roomStr()); } +#if UNITY_EDITOR + if (Input.GetKeyDown(KeyCode.Space)) + { + isStartRehearsing = !isStartRehearsing; + Debug.Log("编辑器测试...导条状态..:" + isStartRehearsing); + } +#endif } IEnumerator DequeueSend2roomStr() diff --git a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs index deed903d..d2a78ed2 100644 --- a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs @@ -301,73 +301,36 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour /// public void Interferencemode(Transform wrj) { - Collider[] colliders = Physics.OverlapSphere(transform.position, detectionRadius * 100);//检索范围 - UnmannedAerialVehicle unmannedAerialVehicle = null; - if (wrj.GetComponent()) - { - unmannedAerialVehicle = wrj.GetComponent(); - } + //Collider[] colliders = Physics.OverlapSphere(transform.position, detectionRadius * 100);//检索范围 + //UnmannedAerialVehicle unmannedAerialVehicle = null; UnmannedAerialVehicleManage unmannedAerialVehicleManage = null; + //if (wrj.GetComponent()) + //{ + // unmannedAerialVehicle = wrj.GetComponent(); + //} if (wrj.GetComponent()) { unmannedAerialVehicleManage = wrj.GetComponent(); unmannedAerialVehicleManage.CheckSatellitePositioningFrequency(this.transform, InterferenceMode, TransmittedPower, InterferingFrequency, InterferenceAngle, ground); } - isDo = false; - } - /// - /// 干扰无人机角度范围 - /// - /// - private void Angularrange() - { - Collider[] collider = Physics.OverlapSphere(transform.position, 300); - for (int i = 0; i < collider.Length; i++) - { - if (collider[i].transform.tag == "WRJ") - { - UnmannedAerialVehicle unmannedAerialVehicle = collider[i].GetComponent(); - Vector3 one = unmannedAerialVehicle.transform.position - transform.position; - float angue = Vector3.Angle(transform.forward, one); - if (float.Parse(InterferenceAngle) >= angue) - { - Debug.LogError("目标出现在范围内"); - - } - else - { - Debug.LogError("目标没有出现在范围里面"); - - } - } - } + isDo = true; } + /// /// 开启无线电干扰 /// public void RadioDisturbance() { - Collider[] colliders = Physics.OverlapSphere(transform.position, detectionRadius); // 检索范围内的所有碰撞体 + Collider[] colliders = Physics.OverlapSphere(transform.position, detectionRadius * 1000 / 5);// 检索范围内的所有碰撞体 for (int i = 0; i < colliders.Length; i++) { if (colliders[i].transform.tag == "WRJ") { + + UnmannedAerialVehicleManage unmannedAerialVehicleManage = colliders[i].GetComponent(); //Debug.Log("检测到无人机: " + col.name); UnmannedAerialVehicle unmannedAerialVehicle = colliders[i].GetComponent(); - if (unmannedAerialVehicle) - { - //Debug.Log(col.name+"数据链通信频点...:" + unmannedAerialVehicle.dataLinkCommunicationFrequency); - if (unmannedAerialVehicle.dataLinkCommunicationFrequency == "" || InterferingFrequency == "") continue;//无数据不执行 - if (unmannedAerialVehicle.dataLinkCommunicationFrequency == InterferingFrequency) - { - Debug.Log("干扰...:" + colliders[i].name + "成功。"); - //unmannedAerialVehicle.BeAssaulted("无线电干扰"); - WRJs.Enqueue(unmannedAerialVehicle.transform); - } - - } - UnmannedAerialVehicleManage unmannedAerialVehicleManage = colliders[i].GetComponent(); if (unmannedAerialVehicleManage) { //Debug.Log(col.name+"数据链通信频点...:" + unmannedAerialVehicle.dataLinkCommunicationFrequency); @@ -380,6 +343,18 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour } } + else if (unmannedAerialVehicle) + { + //Debug.Log(col.name+"数据链通信频点...:" + unmannedAerialVehicle.dataLinkCommunicationFrequency); + if (unmannedAerialVehicle.dataLinkCommunicationFrequency == "" || InterferingFrequency == "") continue;//无数据不执行 + if (unmannedAerialVehicle.dataLinkCommunicationFrequency == InterferingFrequency) + { + Debug.Log("干扰...:" + colliders[i].name + "成功。"); + //unmannedAerialVehicle.BeAssaulted("无线电干扰"); + WRJs.Enqueue(unmannedAerialVehicle.transform); + } + + } } } } @@ -422,4 +397,32 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour { OnActivationChanged -= OnActivationChangedHandler; } + + /// + /// 干扰无人机角度范围 + /// + /// + private void Angularrange() + { + Collider[] collider = Physics.OverlapSphere(transform.position, 300); + for (int i = 0; i < collider.Length; i++) + { + if (collider[i].transform.tag == "WRJ") + { + UnmannedAerialVehicle unmannedAerialVehicle = collider[i].GetComponent(); + Vector3 one = unmannedAerialVehicle.transform.position - transform.position; + float angue = Vector3.Angle(transform.forward, one); + if (float.Parse(InterferenceAngle) >= angue) + { + //Debug.LogError("目标出现在范围内"); + + } + else + { + //Debug.LogError("目标没有出现在范围里面"); + + } + } + } + } } diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index 9531f39f..600eb751 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -304,27 +304,12 @@ public class UnmannedAerialVehicleManage : MonoBehaviour var highPriorityTargets = attackColliders1.FindAll(x => x.transform.GetComponent()); if (highPriorityTargets.Count > 0) { - //SendMsg(highPriorityTargets[0].transform); unmannedAerialVehicles[0].AttAck(highPriorityTargets[0].transform); } - else{ - //SendMsg(attackColliders1[0].transform); + else + { unmannedAerialVehicles[0].AttAck(attackColliders1[0].transform); } - - //for (int i = 0; i < attackColliders1.Count; i++) - //{ - // Collider c = null; - // if (attackColliders1[i] != null) - // { - // c = attackColliders1[i]; - // } - // if (unmannedAerialVehicles[0]&&unmannedAerialVehicles[0].attackTarget == null) - // { - // SendMsg(c.transform); - // unmannedAerialVehicles[0].AttAck(c.transform); - // } - //} } } }