From 39001a600fcae2bcf27c225df8752d75fb92fef4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 31 十月 2025 11:18:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/Equip/ItemsOnFloor.cs |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/Main/System/Equip/ItemsOnFloor.cs b/Main/System/Equip/ItemsOnFloor.cs
index 12e456e..5bc8e96 100644
--- a/Main/System/Equip/ItemsOnFloor.cs
+++ b/Main/System/Equip/ItemsOnFloor.cs
@@ -40,6 +40,9 @@
     //涓荤晫闈㈠垏鎹㈡ā寮忚Е鍙�
     private void OnEnable()
     {
+        //bug璁板綍锛氬啀闃茶寖涓�娆★紝閲嶇櫥閿�姣佸悗鎰忓鐨勬敞鍐屼簡澶氭锛屽悗缁鏌ヨ繑鍥炵櫥褰曠晫闈㈠啀杩涘叆娓告垙鐨勬儏鍐�
+        EquipModel.Instance.OnItemDropEvent -= NotifyPlayItemDrop;
+        PackManager.Instance.DeleteItemEvent -= DeleteDropItem;
         //涓荤晫闈㈡墦寮�鍜屾樉闅愰兘瑕佸埛鏂�
         Display(true, EquipModel.Instance.lastDropIndexs);
         EquipModel.Instance.OnItemDropEvent += NotifyPlayItemDrop;
@@ -104,8 +107,15 @@
                 //涓嶅共娑夊叾浠栨帀钀界墿鍝�
                 continue;
             }
+            if (item.isActiveAndEnabled)
+            {
+                //闃茶寖涓�鐩存挱鏀炬帀钀藉姩鐢�,鏌愮鍘熷洜琚墦鏂簡鍚庣画鐨勭晫闈㈡樉绀猴紝杩欓噷鐩存帴瑙﹀彂鎵撳紑鐣岄潰
+                EquipModel.Instance.CalcFloorEquip(i);
+                continue;
+            }
 
             item.SetActive(true);
+            
             item.Display(i, isAnimate, rect == null ? defaultDropRect : rect);
         }
     }

--
Gitblit v1.8.0