From f2e8df4c67cea11e89dc81cc96563b86a8c8ff83 Mon Sep 17 00:00:00 2001
From: mnjnhuang <1090031856@qq.com>
Date: Fri, 14 Nov 2025 15:34:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=83=E7=89=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/00_scripts/CardScripts/CardManager.cs | 25 +++++++++++---------
 Assets/00_scripts/Events/CardLockSvc.cs      |  2 +-
 Assets/Scenes/FightScene.unity               | 22 ++++++++---------
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/Assets/00_scripts/CardScripts/CardManager.cs b/Assets/00_scripts/CardScripts/CardManager.cs
index 9e552de..93c6899 100644
--- a/Assets/00_scripts/CardScripts/CardManager.cs
+++ b/Assets/00_scripts/CardScripts/CardManager.cs
@@ -97,24 +97,27 @@ public class CardManager : MonoBehaviour
 
         void callback(bool placeholder)
         {
-            if (CardOS.Instance.LOCK_GET(CardOSData.LOCK_EXCLUSIVE_CARD_ENUM.LOCK_OS_SHUFFLE_CARD)) return;
+            if (CardOS.Instance.LOCK_GET(CardOSData.LOCK_EXCLUSIVE_CARD_ENUM.LOCK_OS_SHUFFLE_CARD)) return; // 系统是否正在洗牌
+            if (!CardOS.Instance.LOCK_APPLY(CardOSData.LOCK_EXCLUSIVE_CARD_ENUM.LOCK_OS_DROP_CARD)) return; // 系统弃牌加锁失败
             StartCoroutine(coroutine());
             return;
 
 
             IEnumerator coroutine()
             {
-                CardOS.Instance.LOCK_APPLY(CardOSData.LOCK_EXCLUSIVE_CARD_ENUM.LOCK_OS_DROP_CARD);
-                for (var i = handCardList.Count; i >= 0; i--)
+                if (handCardList.Count > 0)
                 {
-                    CardOS.Instance.EVENT_TRIGGER(CardOSData.EVENT_REGISTER_CARD_ENUM.EVENT_LET_CARD_DROP_SELF,
-                        new CardOSData.STRUCT_EVENT_DROP_CARD
-                        {
-                            ID = i,
-                            POSITION = drop_card_point_world_position,
-                            DURATION = cardDropDuration,
-                        });
-                    yield return new WaitForSeconds(cardDropDuration);
+                    for (var i = handCardList.Count; i >= 0; i--)
+                    {
+                        CardOS.Instance.EVENT_TRIGGER(CardOSData.EVENT_REGISTER_CARD_ENUM.EVENT_LET_CARD_DROP_SELF,
+                            new CardOSData.STRUCT_EVENT_DROP_CARD
+                            {
+                                ID = i,
+                                POSITION = drop_card_point_world_position,
+                                DURATION = cardDropDuration,
+                            });
+                        yield return new WaitForSeconds(cardDropDuration);
+                    }
                 }
 
                 handCardList.Clear(); // 清空
diff --git a/Assets/00_scripts/Events/CardLockSvc.cs b/Assets/00_scripts/Events/CardLockSvc.cs
index a93285f..43358f6 100644
--- a/Assets/00_scripts/Events/CardLockSvc.cs
+++ b/Assets/00_scripts/Events/CardLockSvc.cs
@@ -8,7 +8,7 @@ public class CardLockSvc
 
     private bool GetNeedDebugLog() => CardOS.Instance.GetNeedDebugLog();
 
-    public bool LOCK_APPLY(CardOSData.LOCK_EXCLUSIVE_CARD_ENUM lock_name)
+    public bool LOCK_APPLY(CardOSData.LOCK_EXCLUSIVE_CARD_ENUM lock_name) // return true 加锁成功
     {
         if (!_exclusive_lock_queue.Add(lock_name))
         {
diff --git a/Assets/Scenes/FightScene.unity b/Assets/Scenes/FightScene.unity
index 6be6fee..3068200 100644
--- a/Assets/Scenes/FightScene.unity
+++ b/Assets/Scenes/FightScene.unity
@@ -296,11 +296,11 @@ RectTransform:
   - {fileID: 1803299165}
   m_Father: {fileID: 1403623315}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -100, y: 80}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -35, y: -240}
   m_SizeDelta: {x: 130.84595, y: 75.03522}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &335933409
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1081,9 +1081,9 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -129, y: 220.6}
-  m_SizeDelta: {x: 194.25, y: 152.2}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -35, y: 135.4}
+  m_SizeDelta: {x: 194.25, y: 152.20001}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &649480887
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1797,10 +1797,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 335933408}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -0.5, y: 0}
+  m_SizeDelta: {x: 131, y: 76}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1803299166
 MonoBehaviour: