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 | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Main/System/Equip/ItemsOnFloor.cs b/Main/System/Equip/ItemsOnFloor.cs
index 7326eea..5bc8e96 100644
--- a/Main/System/Equip/ItemsOnFloor.cs
+++ b/Main/System/Equip/ItemsOnFloor.cs
@@ -40,7 +40,7 @@
//涓荤晫闈㈠垏鎹㈡ā寮忚Е鍙�
private void OnEnable()
{
- //bug璁板綍锛氬啀闃茶寖涓�娆★紝鐞嗚涓婁笉鍙兘涓ゆ瑙﹀彂OnEnable鏈熼棿 娌℃湁瑙﹀彂OnDisable
+ //bug璁板綍锛氬啀闃茶寖涓�娆★紝閲嶇櫥閿�姣佸悗鎰忓鐨勬敞鍐屼簡澶氭锛屽悗缁鏌ヨ繑鍥炵櫥褰曠晫闈㈠啀杩涘叆娓告垙鐨勬儏鍐�
EquipModel.Instance.OnItemDropEvent -= NotifyPlayItemDrop;
PackManager.Instance.DeleteItemEvent -= DeleteDropItem;
//涓荤晫闈㈡墦寮�鍜屾樉闅愰兘瑕佸埛鏂�
@@ -107,10 +107,12 @@
//涓嶅共娑夊叾浠栨帀钀界墿鍝�
continue;
}
- // if (item.isActiveAndEnabled)
- // {
- // continue;
- // }
+ if (item.isActiveAndEnabled)
+ {
+ //闃茶寖涓�鐩存挱鏀炬帀钀藉姩鐢�,鏌愮鍘熷洜琚墦鏂簡鍚庣画鐨勭晫闈㈡樉绀猴紝杩欓噷鐩存帴瑙﹀彂鎵撳紑鐣岄潰
+ EquipModel.Instance.CalcFloorEquip(i);
+ continue;
+ }
item.SetActive(true);
--
Gitblit v1.8.0