From 9705833cb610ea2a5147fafa8a2279020f98ed48 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 13 十一月 2025 15:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

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

diff --git a/Main/System/Equip/EquipModel.cs b/Main/System/Equip/EquipModel.cs
index fbb4b5f..3529a53 100644
--- a/Main/System/Equip/EquipModel.cs
+++ b/Main/System/Equip/EquipModel.cs
@@ -10,6 +10,7 @@
 {
     public const int TotleEquip = 12;  //瑁呭鏍忓ぇ灏�
     public bool waitEquipOPPack = false;    // 绌挎埓瑁呭鐨勬搷浣� 涓嶅惈鍒嗚В
+    public float waitEquipOPTime = 0;    
     public event Action<bool, int> OnEquipOPResultAction;    //鏄惁鎹笂浜嗘柊瑁呭涓斿垎瑙ｄ簡 瑁呭绱㈠紩
     public event Action<BattleDrops> OnItemDropEvent;
 
@@ -36,6 +37,7 @@
         EventBroadcast.Instance.AddListener<string, BattleDrops, Action>(EventName.BATTLE_DROP_ITEMS, OnDropEvent);
         EventBroadcast.Instance.AddListener<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, OnSkillCast);
         EventBroadcast.Instance.AddListener<string>(EventName.RECORDPLAYER_END, RecordPlayerEnd);
+        GlobalTimeEvent.Instance.secondEvent += OnSecondEvent;
         ParseConfig();
     }
 
@@ -46,6 +48,7 @@
         EventBroadcast.Instance.RemoveListener<string, BattleDrops, Action>(EventName.BATTLE_DROP_ITEMS, OnDropEvent);
         EventBroadcast.Instance.RemoveListener<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, OnSkillCast);
         EventBroadcast.Instance.RemoveListener<string>(EventName.RECORDPLAYER_END, RecordPlayerEnd);
+        GlobalTimeEvent.Instance.secondEvent -= OnSecondEvent;
     }
 
 
@@ -191,6 +194,16 @@
         }
     }
 
+
+    void OnSecondEvent()
+    {
+        if (waitEquipOPPack && Time.time - waitEquipOPTime > 2)
+        {
+            //閬垮厤瑁呭鍗℃鏃犳硶缁х画涓荤嚎
+            waitEquipOPPack = false;
+        }
+    }
+
     private void OnEquipResult(HA814_tagMCMakeItemAnswer info)
     {
         if (info.MakeType != (int)MakeType.EquipOP)
@@ -199,7 +212,10 @@
             return;
 
         if (info.MakeValue == 2)
+        {
             waitEquipOPPack = false;
+            Debug.LogWarning("绌挎埓瑁呭锛屾湇鍔″櫒鍝嶅簲瑙ｉ櫎绛夊緟鐘舵��");
+        }
         bool isDone = false;    // 鎹笂鏂拌澶囦笖鍒嗚В浜嗘棫瑁呭
         //閫変腑鐨勫湴鏉胯澶囪繘琛屽鐞嗭紝鏇挎崲杩樻槸鎵句笅涓�浠讹紝妫�鏌nEquipOPResultAction
         if (selectFloorEquip != null)
@@ -259,7 +275,11 @@
         pack.OPValue = (byte)(autoDecompose ? 1 : 0); // 鏇挎崲鍚庢槸鍚﹁嚜鍔ㄥ垎瑙ｅ師瑁呭锛�0鍚�1鏄�
 
         if (opType == 2)
+        {
             waitEquipOPPack = true;
+            waitEquipOPTime = Time.time;
+            Debug.LogWarning("绌挎埓瑁呭锛屽悜鏈嶅姟鍣ㄨ姹�");
+        }
         GameNetSystem.Instance.SendInfo(pack);
     }
 
@@ -310,7 +330,10 @@
             return false;
 
         if (!DTC0403_tagPlayerLoginLoadOK.finishedLogin)
+        {
+            Debug.LogWarning("OpenEquipExchangeWin: 鏈櫥褰�");
             return false;
+        }
 
         // if (!IsEquip(equip))
         //     return false;
@@ -325,7 +348,10 @@
         waitEquipOP.Enqueue(equip.gridIndex);
         //鏈洖澶嶈澶囨搷浣滅粨鏋滐紝鍚﹀垯浼氭樉绀烘棫瑁呭
         if (waitEquipOPPack)
+        {
+            Debug.LogError("OpenEquipExchangeWin: 绛夊緟鏈嶅姟鍣ㄥ搷搴�");
             return false;
+        }
 
 
         if (UIManager.Instance.IsOpened<EquipExchangeWin>())
@@ -351,11 +377,17 @@
 
         // 鏂版墜寮曞涓紝涓嶅厑璁稿垏鎹㈣澶囩晫闈�
         if (NewBieCenter.Instance.inGuiding)
+        {
+            Debug.LogWarning("GetSelectFloorEquip: 鏂版墜寮曞涓紝涓嶅厑璁稿垏鎹㈣澶囩晫闈�");
             return null;
+        }
 
         string activeBattleName = BattleManager.Instance.GetActiveBattleName();
         if (activeBattleName != "" && activeBattleName != "StoryBattleField")
+        {
+            Debug.LogWarning("闈炰富绾挎垬鏂椾笉寮圭獥");
             return null;
+        }
 
 
         return PackManager.Instance.GetItemByIndex(PackType.DropItem, waitEquipOP.Dequeue());

--
Gitblit v1.8.0