From 5a76ac15cb3e92877caeb52341a11cbcc48903d2 Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Sun, 31 Mar 2024 19:31:17 +0800
Subject: [PATCH] 1212

---
 Assets/Temp/Scripts/Microwaveweapon.cs        | 19 +++++++++++++------
 Assets/Zion/Scripts/WRJ0125/RadioAngleView.cs | 16 +++++++++-------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/Assets/Temp/Scripts/Microwaveweapon.cs b/Assets/Temp/Scripts/Microwaveweapon.cs
index 0cbd87b6..6180719f 100644
--- a/Assets/Temp/Scripts/Microwaveweapon.cs
+++ b/Assets/Temp/Scripts/Microwaveweapon.cs
@@ -251,13 +251,20 @@ public class Microwaveweapon : MonoBehaviour
         {
             foreach (var item in wrjList)
             {
-                item.limitHealth -= Time.deltaTime;
-                if (item.limitHealth <= 0)
+                if (item != null)
                 {
-                    var newdata = Aeroplane(item.unmannedAerialVehicles[0]);
-                    MyNetMQClient.instance.Send(newdata);
-                    DeviceManager.Instance.RemoveDevice(item.gameObject);
-                    Destroy(item.gameObject);
+                    item.limitHealth -= Time.deltaTime;
+                    if (item.limitHealth <= 0)
+                    {
+                        var newdata = Aeroplane(item.unmannedAerialVehicles[0]);
+                        MyNetMQClient.instance.Send(newdata);
+                        DeviceManager.Instance.RemoveDevice(item.gameObject);
+                        Destroy(item.gameObject);
+                    }
+                }
+                else
+                {
+                    wrjList.Remove(item);
                 }
             }
         }
diff --git a/Assets/Zion/Scripts/WRJ0125/RadioAngleView.cs b/Assets/Zion/Scripts/WRJ0125/RadioAngleView.cs
index ac9306fb..32dc36b0 100644
--- a/Assets/Zion/Scripts/WRJ0125/RadioAngleView.cs
+++ b/Assets/Zion/Scripts/WRJ0125/RadioAngleView.cs
@@ -66,14 +66,16 @@ public class RadioAngleView : MonoBehaviour
         {
             Destroy(child.gameObject);
         }
-
-        foreach (GameObject target in targets)
+        if (uavm != null)
         {
-            Vector3 relativePosition = target.transform.position - uavm.transform.position;
-            Vector2 radarPosition = new Vector2(relativePosition.x, relativePosition.z) * 0.1f;
-            GameObject point = Instantiate(targetPointPrefab, rawShow.transform);
-            RectTransform rt = point.GetComponent<RectTransform>();
-            rt.anchoredPosition = radarPosition;
+            foreach (GameObject target in targets)
+            {
+                Vector3 relativePosition = target.transform.position - uavm.transform.position;
+                Vector2 radarPosition = new Vector2(relativePosition.x, relativePosition.z) * 0.1f;
+                GameObject point = Instantiate(targetPointPrefab, rawShow.transform);
+                RectTransform rt = point.GetComponent<RectTransform>();
+                rt.anchoredPosition = radarPosition;
+            }
         }
     }
     /// <summary>