From 3f4b766f5d756a595967adc4baac11d6e275c004 Mon Sep 17 00:00:00 2001
From: YDL <1368269699@qq.com>
Date: Wed, 17 Apr 2024 10:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AA=E7=83=81=E8=84=9A=E6=9C=AC=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E6=97=B6=E5=80=99=E7=AB=8B=E5=8D=B3=E9=94=80=E6=AF=81?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/ANet/DeviceFollowTarget.cs | 4 ++--
 Assets/Scripts/ANet/DeviceItem.cs         | 8 ++++++++
 Assets/Scripts/ANet/DeviceObj.cs          | 2 +-
 Assets/Scripts/ANet/DeviceObjManager.cs   | 3 ++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Assets/Scripts/ANet/DeviceFollowTarget.cs b/Assets/Scripts/ANet/DeviceFollowTarget.cs
index beaf7c0..db56483 100644
--- a/Assets/Scripts/ANet/DeviceFollowTarget.cs
+++ b/Assets/Scripts/ANet/DeviceFollowTarget.cs
@@ -43,7 +43,7 @@ public class DeviceFollowTarget : MonoBehaviour
     {
         if (GetComponent<DeviceLumos>())
         {
-            DestroyImmediate(GetComponent<DeviceLumos>());
+            Destroy(GetComponent<DeviceLumos>());
         }
     }
     private void LateUpdate()
@@ -57,7 +57,7 @@ public class DeviceFollowTarget : MonoBehaviour
         {
             if (target && DevicePanelManager.Instance.NowClickObject != target.GetComponent<DeviceObj>())
             {
-                DestroyImmediate(GetComponent<DeviceLumos>());
+                Destroy(GetComponent<DeviceLumos>());
             }
         }
     }
diff --git a/Assets/Scripts/ANet/DeviceItem.cs b/Assets/Scripts/ANet/DeviceItem.cs
index ae09c0d..e98613b 100644
--- a/Assets/Scripts/ANet/DeviceItem.cs
+++ b/Assets/Scripts/ANet/DeviceItem.cs
@@ -56,6 +56,14 @@ public class DeviceItem : MonoBehaviour
             {
                 obj.GetComponent<DeviceObj>().ShowList();
             }
+            else
+            {
+                DevicePanelManager.Instance.NowClickObject = null;
+            }
+        }
+        else
+        {
+            DevicePanelManager.Instance.NowClickObject = null;
         }
     }
 
diff --git a/Assets/Scripts/ANet/DeviceObj.cs b/Assets/Scripts/ANet/DeviceObj.cs
index 955d5b3..026714e 100644
--- a/Assets/Scripts/ANet/DeviceObj.cs
+++ b/Assets/Scripts/ANet/DeviceObj.cs
@@ -74,7 +74,7 @@ public class DeviceObj : MonoBehaviour
         {
             if (DevicePanelManager.Instance.NowClickObject != this)
             {
-                DestroyImmediate(GetComponent<DeviceLumos>());
+                Destroy(GetComponent<DeviceLumos>());
             }
         }
         //if (BindType == DevicePanelManager.Instance.MenuType)
diff --git a/Assets/Scripts/ANet/DeviceObjManager.cs b/Assets/Scripts/ANet/DeviceObjManager.cs
index 00e2ef4..1060b25 100644
--- a/Assets/Scripts/ANet/DeviceObjManager.cs
+++ b/Assets/Scripts/ANet/DeviceObjManager.cs
@@ -93,6 +93,7 @@ public class DeviceObjManager : MonoBehaviour
                     {
                         data.postion = obj.postion;
                         data.type = obj.type;
+                        has = true;
                     }
                 }
                 if (!has)
@@ -159,8 +160,8 @@ public class DeviceObjManager : MonoBehaviour
                 foreach (var item in NowPointList)
                 {
                     GameObject go = Instantiate(Point, item.postion, Quaternion.identity, transform);
-                    go.GetComponent<DeviceObj>().CreateIcon(item.type, item.floorId);
                     go.name = item.name;
+                    go.GetComponent<DeviceObj>().CreateIcon(item.type, item.floorId);
                     SelectionManager.Instance.Sets.Add(go);
                 }
             });