yulong
/
NewN_UAVPlane
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1

This commit is contained in:
账号名 2024-01-21 15:33:48 +08:00
parent 494cb4b9a7
commit 29c7be9849
3 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Zion/Scripts/Adam/DeviceManager.cs
View File

@ -119,6 +119,11 @@ public class DeviceManager : MonoSingleton<DeviceManager>
public List<UnmannedAerialVehicleManage> unmannedAerialVehicleManages; public List<UnmannedAerialVehicleManage> unmannedAerialVehicleManages;
public void SetCollider4WRJ(List<Collider> attackColliders, ref Collider currentTarget) public void SetCollider4WRJ(List<Collider> attackColliders, ref Collider currentTarget)
{ {
for(int i=0; i<attackColliders.Count; i++)
{
if (attackColliders[i]==null)
attackColliders.RemoveAt(i);
}
if (attackColliders.Count > 0) if (attackColliders.Count > 0)
{ {
unmannedAerialVehicleManages = GetGXWRJAndZSWRJ(); unmannedAerialVehicleManages = GetGXWRJAndZSWRJ();
@ -128,6 +133,7 @@ public class DeviceManager : MonoSingleton<DeviceManager>
{ {
if (unmannedAerialVehicleManages[i].unmannedAerialVehicles[0].attackTarget == null) if (unmannedAerialVehicleManages[i].unmannedAerialVehicles[0].attackTarget == null)
{ {
unmannedAerialVehicleManages[i].unmannedAerialVehicles[0].AttAck(attackColliders[0].transform); unmannedAerialVehicleManages[i].unmannedAerialVehicles[0].AttAck(attackColliders[0].transform);
//for (int j = 0; j < attackColliders.Count; j++) //for (int j = 0; j < attackColliders.Count; j++)
//{ //{

5
Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs
View File

@ -167,7 +167,8 @@ public class UnmannedAerialVehicle : MonoBehaviour
Bao.transform.localPosition = Vector3.zero; Bao.transform.localPosition = Vector3.zero;
Bao.transform.SetParent(null); Bao.transform.SetParent(null);
Bao.SetActive(true); Bao.SetActive(true);
Destroy(_transform.gameObject); if (_equipmentCommon)
Destroy(_transform.gameObject);
} }
/// <summary> /// <summary>
///上传日志 ///上传日志
@ -260,7 +261,7 @@ public class UnmannedAerialVehicle : MonoBehaviour
{ {
AddBao(attackTarget.transform); AddBao(attackTarget.transform);
// 销毁objectToDestroy对象 // 销毁objectToDestroy对象
BeAssaulted("攻击到目标"); //BeAssaulted("攻击到目标");
Destroy(sb); Destroy(sb);
}); });
} }

38
Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
View File

@ -294,21 +294,37 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
} }
if (wrjModel == WRJModel.光学无人机) if (wrjModel == WRJModel.光学无人机)
{ {
for (int i = 0; i < attackColliders1.Count; i++)
{
if (attackColliders1[i] == null)
attackColliders1.RemoveAt(i);
}
if (attackColliders1.Count > 0) if (attackColliders1.Count > 0)
{ {
for (int i = 0; i < attackColliders1.Count; i++) var highPriorityTargets = attackColliders1.FindAll(x => x.transform.GetComponent<HighPriorityTarget>());
if (highPriorityTargets.Count > 0)
{ {
Collider c = null; SendMsg(attackColliders1[0].transform);
if (attackColliders1[i] != null) unmannedAerialVehicles[0].AttAck(attackColliders1[0].transform);
{
c = attackColliders1[i];
}
if (unmannedAerialVehicles[0].attackTarget == null)
{
SendMsg(c.transform);
unmannedAerialVehicles[0].AttAck(c.transform);
}
} }
else{
SendMsg(attackColliders1[0].transform);
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);
// }
//}
} }
} }
} }