diff --git a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs index d7c5566b..cf2b6850 100644 --- a/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs +++ b/Assets/Zion/Scripts/ModelFunction/TerrestrialRadioInterference/TerrestrialRadioInterferenceManger.cs @@ -150,7 +150,7 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour } } - + #region 启动暂停 /// /// 导条变化调用 @@ -316,9 +316,8 @@ public class TerrestrialRadioInterferenceManger : MonoBehaviour if (colliders[i].GetComponent()) { unmannedAerialVehicleManage = colliders[i].GetComponent(); + unmannedAerialVehicleManage.CheckSatellitePositioningFrequency(this.transform, InterferenceMode, TransmittedPower, InterferingFrequency, InterferenceAngle, ground); } - - unmannedAerialVehicleManage.CheckSatellitePositioningFrequency(this.transform, InterferenceMode, TransmittedPower, InterferingFrequency, InterferenceAngle, ground); } } } @@ -328,7 +327,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/UnmannedAerialVehicle.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs index e85df8c4..96e297f0 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs @@ -99,32 +99,7 @@ public class UnmannedAerialVehicle : MonoBehaviour /// public void BeAssaulted(string type) { - switch (type) - { - //case "激光打击": - // AddBao(true); - // //Debug.Log(transform.name+"被激光打击销毁了"); - // break; - //case "无线电干扰": - // Vector3 _pos = transform.position - new Vector3(0, 30, 0); - // transform.LookAt(_pos); - // transform.DOMove(_pos, 1).OnComplete(() => - // { - // AddBao(true); - // }); - // //Debug.Log(transform.name + "无人机被无线电干扰销毁了"); - // break; - case "攻击到目标": - AddBao(true); - //Debug.Log(transform.name + "无人机自杀式攻击销毁了"); - break; - case "没有攻击到目标": - AddBao(true); - //Debug.Log(transform.name + "无人机自杀式没有攻击到目标撞击地面销毁了"); - break; - default: - break; - } + AddBao(true); } /// @@ -224,17 +199,17 @@ public class UnmannedAerialVehicle : MonoBehaviour { transform.DOKill(); attackTarget = target; - Debug.Log("开始攻击目标..:" + target.name); - Vector3 _v3 = target.position; + Debug.Log("开始攻击目标..:" + attackTarget.name); + Vector3 _v3 = attackTarget.position; transform.DOLookAt(_v3, 0.1f).OnComplete(() => { - float distance = Vector3.Distance(transform.position, target.position); - transform.DOMove(target.position, distance / FireSpeed).SetEase(Ease.Linear).OnComplete(() => + float distance = Vector3.Distance(transform.position, attackTarget.position); + transform.DOMove(attackTarget.position, distance / FireSpeed).SetEase(Ease.Linear).OnComplete(() => { - if (!target) - { - BeAssaulted("没有攻击到目标"); - } + //if (!attackTarget) + //{ + // //BeAssaulted("没有攻击到目标"); + //} }); }); } diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs index 937a3356..1ee5abaa 100644 --- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs +++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs @@ -290,14 +290,14 @@ public class UnmannedAerialVehicleManage : MonoBehaviour { if (attackColliders1.Count > 0) { - //isEngagedTarget = true; - //colliders1.ForEach(x => Debug.Log(x.transform.name)); - int _number = UnityEngine.Random.Range(0, attackColliders1.Count - 1); List _unmannedAerialVehicles = unmannedAerialVehicles.FindAll(x => x != null && x.gameObject.activeSelf); - SendMsg(attackColliders1[_number].transform); for (int i = 0; i < _unmannedAerialVehicles.Count; i++) { - _unmannedAerialVehicles[i].AttAck(attackColliders1[_number].transform); + if (_unmannedAerialVehicles[i].attackTarget == null) + { + SendMsg(attackColliders1[i].transform); + _unmannedAerialVehicles[i].AttAck(attackColliders1[i].transform); + } } } }