From 29c7be98498e08d6bdc8ea963bb4991786cfe807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=90=8D?= <3077614386@qq.com>
Date: Sun, 21 Jan 2024 15:33:48 +0800
Subject: [PATCH] 1

---
 Assets/Zion/Scripts/Adam/DeviceManager.cs     |  6 +++
 .../UAV/UnmannedAerialVehicle.cs              |  5 ++-
 .../UAV/UnmannedAerialVehicleManage.cs        | 38 +++++++++++++------
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/Assets/Zion/Scripts/Adam/DeviceManager.cs b/Assets/Zion/Scripts/Adam/DeviceManager.cs
index e24cb030..0245b472 100644
--- a/Assets/Zion/Scripts/Adam/DeviceManager.cs
+++ b/Assets/Zion/Scripts/Adam/DeviceManager.cs
@@ -119,6 +119,11 @@ public class DeviceManager : MonoSingleton<DeviceManager>
     public List<UnmannedAerialVehicleManage> unmannedAerialVehicleManages;
     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)
         {
             unmannedAerialVehicleManages = GetGXWRJAndZSWRJ();
@@ -128,6 +133,7 @@ public class DeviceManager : MonoSingleton<DeviceManager>
                 {
                     if (unmannedAerialVehicleManages[i].unmannedAerialVehicles[0].attackTarget == null)
                     {
+                        
                         unmannedAerialVehicleManages[i].unmannedAerialVehicles[0].AttAck(attackColliders[0].transform);
                         //for (int j = 0; j < attackColliders.Count; j++)
                         //{
diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs
index 401bd914..8a44cc47 100644
--- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs
+++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicle.cs
@@ -167,7 +167,8 @@ public class UnmannedAerialVehicle : MonoBehaviour
         Bao.transform.localPosition = Vector3.zero;
         Bao.transform.SetParent(null);
         Bao.SetActive(true);
-        Destroy(_transform.gameObject);
+        if (_equipmentCommon)
+            Destroy(_transform.gameObject);
     }
     /// <summary>
     ///上传日志
@@ -260,7 +261,7 @@ public class UnmannedAerialVehicle : MonoBehaviour
             {
                 AddBao(attackTarget.transform);
                 // 销毁objectToDestroy对象
-                BeAssaulted("攻击到目标");
+                //BeAssaulted("攻击到目标");
                 Destroy(sb);
             });
         }
diff --git a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
index 0c4a198a..d7731724 100644
--- a/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
+++ b/Assets/Zion/Scripts/ModelFunction/UAV/UnmannedAerialVehicleManage.cs
@@ -294,21 +294,37 @@ public class UnmannedAerialVehicleManage : MonoBehaviour
         }
         if (wrjModel == WRJModel.光学无人机)
         {
+            for (int i = 0; i < attackColliders1.Count; i++)
+            {
+                if (attackColliders1[i] == null)
+                    attackColliders1.RemoveAt(i);
+            }
             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;
-                    if (attackColliders1[i] != null)
-                    {
-                        c = attackColliders1[i];
-                    }
-                    if (unmannedAerialVehicles[0].attackTarget == null)
-                    {
-                        SendMsg(c.transform);
-                        unmannedAerialVehicles[0].AttAck(c.transform);
-                    }
+                    SendMsg(attackColliders1[0].transform);
+                    unmannedAerialVehicles[0].AttAck(attackColliders1[0].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);
+                //    }
+                //}
             }
         }
     }