From 71365e5c15d81759c04d7aab953fa757fb183f9b Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 12 十一月 2025 18:54:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Equip/EquipModel.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Main/System/Equip/EquipModel.cs b/Main/System/Equip/EquipModel.cs
index 4b8f35d..fbb4b5f 100644
--- a/Main/System/Equip/EquipModel.cs
+++ b/Main/System/Equip/EquipModel.cs
@@ -327,9 +327,6 @@
if (waitEquipOPPack)
return false;
- // 鍚庣画琛ュ厖寮曞鎴栬�呭叾浠栨儏鍐典笅锛屼笉鍏佽鍒囨崲瑁呭鐣岄潰
- // if (NewBieCenter.Instance.inGuiding)
- // return;
if (UIManager.Instance.IsOpened<EquipExchangeWin>())
{
@@ -356,6 +353,11 @@
if (NewBieCenter.Instance.inGuiding)
return null;
+ string activeBattleName = BattleManager.Instance.GetActiveBattleName();
+ if (activeBattleName != "" && activeBattleName != "StoryBattleField")
+ return null;
+
+
return PackManager.Instance.GetItemByIndex(PackType.DropItem, waitEquipOP.Dequeue());
}
--
Gitblit v1.8.0