From 62188b271cce5e3aec5ca40d58c30f08643e2f60 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 04 九月 2025 23:20:17 +0800
Subject: [PATCH] 117 【武将】武将系统 - 天赋部分，优化自动战斗

---
 Main/System/Equip/EquipModel.cs |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Main/System/Equip/EquipModel.cs b/Main/System/Equip/EquipModel.cs
index 7135882..06e3d8c 100644
--- a/Main/System/Equip/EquipModel.cs
+++ b/Main/System/Equip/EquipModel.cs
@@ -87,7 +87,9 @@
     {
         if (!string.IsNullOrEmpty(guid))
             return;
+
         lastDropIndexs = drops.dropItemPackIndex;
+        // Debug.Log("-鎺夎惤瑁呭 " + lastDropIndexs.Count + " 涓�" + JsonMapper.ToJson(lastDropIndexs));
         NotifyItemDrop(drops.dropItemPackIndex, drops.rectTransform);
         action?.Invoke();
     }
@@ -118,6 +120,7 @@
         if (item == null)
             return;
 
+
         //闈炶嚜鍔ㄦā寮忎笅锛岀瓫閫夎澶囨墦寮�瑁呭鎿嶄綔鐣岄潰
         if (IsEquip(item))
         {
@@ -136,7 +139,8 @@
         if (info.MakeValue == 0)
             return;
 
-        waitEquipOPPack = false;
+        if (info.MakeValue == 2)
+            waitEquipOPPack = false;
         bool isDone = false;    // 鎹笂鏂拌澶囦笖鍒嗚В浜嗘棫瑁呭
         //閫変腑鐨勫湴鏉胯澶囪繘琛屽鐞嗭紝鏇挎崲杩樻槸鎵句笅涓�浠讹紝妫�鏌nEquipOPResultAction
         if (selectFloorEquip != null)
@@ -182,7 +186,7 @@
     /// <param name="autoDecompose"></param>
     public void SendEquipOP(ushort[] itemIndexList, byte opType, bool autoDecompose = false)
     {
-        if (waitEquipOPPack) return;
+        if (opType == 2 && waitEquipOPPack) return;
 
         // NoteFloorEquip(itemIndexList, opType);
         var pack = new CB415_tagCSMainDropItemOP();
@@ -191,7 +195,7 @@
         pack.OPType = opType;
         pack.OPValue = (byte)(autoDecompose ? 1 : 0); // 鏇挎崲鍚庢槸鍚﹁嚜鍔ㄥ垎瑙ｅ師瑁呭锛�0鍚�1鏄�
 
-        if (opType > 0)
+        if (opType == 2)
             waitEquipOPPack = true;
         GameNetSystem.Instance.SendInfo(pack);
     }

--
Gitblit v1.8.0