From 72e48dde8a913569a8392094d12c44cd48881e1d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 17 十一月 2025 14:27:40 +0800
Subject: [PATCH] 0312 战力计算增加竞技增减伤系数，装备拾取改存guid避免检测过于频繁用索引容易混乱
---
Main/System/Equip/EquipModel.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Main/System/Equip/EquipModel.cs b/Main/System/Equip/EquipModel.cs
index 238549c..20588d5 100644
--- a/Main/System/Equip/EquipModel.cs
+++ b/Main/System/Equip/EquipModel.cs
@@ -24,7 +24,7 @@
public int[] equipUIGirdEffects; //瑁呭鏍煎瓙鐗规晥
public ItemModel selectFloorEquip; //閫変腑鐨勫湴鏉胯澶�
public int lastShowEquipIndex = -1; //涓婁竴娆＄晫闈㈡樉绀鸿澶囩殑绱㈠紩锛屾嬀鍙栧悗鐗╁搧娑堝け闇�璁板綍涓嬪仛琛ㄧ幇
- public Queue<int> waitEquipOP = new Queue<int>(); //绛夊緟鎿嶄綔鐨勮澶囷紝闇�瑕佸拰UI浜や簰纭 涓嶅惈鍒嗚В
+ public Queue<string> waitEquipOP = new Queue<string>(); //绛夊緟鎿嶄綔鐨勮澶囷紝闇�瑕佸拰UI浜や簰纭 涓嶅惈鍒嗚В
public List<int> lastDropIndexs = new List<int>(); //涓婁竴娆℃帀钀界墿鍝佺储寮�
@@ -356,7 +356,13 @@
}
// 濂藉嚑浠惰澶囬渶瑕佸鐞嗙殑鎯呭喌瀛樿捣鏉�
- waitEquipOP.Enqueue(equip.gridIndex);
+ if (waitEquipOP.Contains(equip.guid))
+ {
+ //妫�娴嬫椂鏈洪绻侊紝瀵艰嚧閲嶅鎺ㄩ�侊紝闇�瑕佹娴嬭繃婊わ紝瀵瑰簲Dequeue 涔熷仛涓�娆℃娴�
+ Debug.LogWarning("OpenEquipExchangeWin: 閲嶅鎺ㄩ��");
+ return false;
+ }
+ waitEquipOP.Enqueue(equip.guid);
//鏈洖澶嶈澶囨搷浣滅粨鏋滐紝鍚﹀垯浼氭樉绀烘棫瑁呭
if (waitEquipOPPack)
{
@@ -404,8 +410,13 @@
return null;
}
-
- return PackManager.Instance.GetItemByIndex(PackType.DropItem, waitEquipOP.Dequeue());
+ var item = PackManager.Instance.GetItemByGuid(waitEquipOP.Dequeue());
+ if (item != null && item.packType == PackType.DropItem)
+ {
+ return item;
+ }
+ Debug.LogError("GetSelectFloorEquip: 娌℃湁鎵惧埌鍙�夎澶�, 璇ヨ澶囧凡缁忚浆绉�");
+ return null;
}
--
Gitblit v1.8.0