From c0523eb4bbbf293e5fbc127318525a2a18f0b3a1 Mon Sep 17 00:00:00 2001
From: wulongxiao <2545507770@qq.com>
Date: Tue, 7 Jan 2025 10:12:59 +0800
Subject: [PATCH] =?UTF-8?q?1:=E5=AF=B9=E6=88=98=E6=96=97=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=90=8C=E5=A6=96=E8=BF=9B=E8=A1=8C=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=90=BA=E5=B8=A6=E8=90=8C?=
 =?UTF-8?q?=E5=A6=96=E6=9C=89=E6=9C=80=E5=A4=A7=E6=90=BA=E5=B8=A6=E9=87=8F?=
 =?UTF-8?q?=E3=80=82=202=EF=BC=9A=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=B1=9E=E6=80=A7=E8=90=8C=E5=A6=96=E5=88=B0?=
 =?UTF-8?q?=E6=90=BA=E5=B8=A6=E5=88=97=E8=A1=A8=EF=BC=8C=E7=84=B6=E5=90=8E?=
 =?UTF-8?q?=E5=9C=A8=E4=B8=8B=E6=96=B9=E5=88=87=E6=8D=A2=E8=90=8C=E5=A6=96?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=86=8D=E6=8A=8A?=
 =?UTF-8?q?=E8=90=8C=E5=A6=96=E6=8B=BF=E5=9B=9E=EF=BC=8C=E8=90=8C=E5=A6=96?=
 =?UTF-8?q?=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=9C=A8=E4=B8=8D=E5=B1=9E=E4=BA=8E?=
 =?UTF-8?q?=E8=87=AA=E5=B7=B1=E5=B1=9E=E6=80=A7=E7=9A=84=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E3=80=82=E7=9B=AE=E5=89=8D=E8=90=8C=E5=A6=96=E5=8F=AA?=
 =?UTF-8?q?=E4=BC=9A=E5=87=BA=E7=8E=B0=E5=9C=A8=E5=AF=B9=E5=BA=94=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=88=97=E8=A1=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/scene_main/Battle_Selection.prefab     |  9 ++++---
 .../script/UI_prefabs/Battle_Selection.cs     | 27 +++++++++++++++++--
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/meng_yao/Assets/Prefabs/ui/scene_main/Battle_Selection.prefab b/meng_yao/Assets/Prefabs/ui/scene_main/Battle_Selection.prefab
index 43a43285..002a0642 100644
--- a/meng_yao/Assets/Prefabs/ui/scene_main/Battle_Selection.prefab
+++ b/meng_yao/Assets/Prefabs/ui/scene_main/Battle_Selection.prefab
@@ -7030,6 +7030,7 @@ MonoBehaviour:
   EnemyGeneratePos: {fileID: 8646173537015180660}
   CarryGeneratePos: {fileID: 8646173536992652429}
   MengyaoGeneratePos: {fileID: 8646173537342263721}
+  MaxCarryCardCount: 3
   CardBTN:
   - {fileID: 7273037110982156962}
   - {fileID: 6557249533962720523}
@@ -9171,10 +9172,10 @@ RectTransform:
   m_Father: {fileID: 8646173537015180660}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 132, y: -174.5}
-  m_SizeDelta: {x: 264, y: 349}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8646173537325353418
 CanvasRenderer:
diff --git a/meng_yao/Assets/script/UI_prefabs/Battle_Selection.cs b/meng_yao/Assets/script/UI_prefabs/Battle_Selection.cs
index 515d115f..97490c5e 100644
--- a/meng_yao/Assets/script/UI_prefabs/Battle_Selection.cs
+++ b/meng_yao/Assets/script/UI_prefabs/Battle_Selection.cs
@@ -23,6 +23,11 @@ public class Battle_Selection : BaseUI
     private List<Button> CarryCard = new List<Button>();
     private List<Button> MengyaoCard = new List<Button>();
 
+    public int MaxCarryCardCount;
+    private int carryCardCount=0;
+
+    
+
     [Header("所有卡牌按钮列表")]
     public List<Button> CardBTN = new List<Button>();
 
@@ -39,6 +44,9 @@ public class Battle_Selection : BaseUI
 
     public GameObject loadPanelPrefab;
 
+
+    private int NowShuXing=-1;//当前的属性
+
     // Start is called before the first frame update
     async void Start()
     {
@@ -93,10 +101,19 @@ public class Battle_Selection : BaseUI
 
         if (MengyaoCard.Contains(btn))
         {
+
+            if (carryCardCount>=MaxCarryCardCount)
+            {
+                Promptmgr.Instance.PromptBubble("已达到最大携程数");
+                return;
+            }
+
             // 从萌妖卡列表移除，添加到携带卡列表
             MengyaoCard.Remove(btn);
             CarryCard.Add(btn);
 
+            carryCardCount++;//增加数量
+
             // 更改父节点并播放动画
             AnimateCardScaling(btn.transform, CarryGeneratePos, () =>
             {
@@ -111,6 +128,8 @@ public class Battle_Selection : BaseUI
             CarryCard.Remove(btn);
             MengyaoCard.Add(btn);
 
+            carryCardCount--;//减少数量
+
             // 更改父节点并播放动画
             AnimateCardScaling(btn.transform, MengyaoGeneratePos, () =>
             {
@@ -161,18 +180,22 @@ public class Battle_Selection : BaseUI
             onComplete?.Invoke();
         });
 
+        ShowCardOfShuixing(this.NowShuXing);//显示和隐藏
+
         // 开始动画
         mySequence.Play();
     }
     public void ShowCardOfShuixing(int shuxing)
     {
+        this.NowShuXing= shuxing;
+
         foreach (Button key in MengyaoCard)
         {
-            if (shuxing==-1)
+            if (this.NowShuXing == -1)
             {
                 key.gameObject.SetActive(true);
             }
-            else if (key.GetComponent<CardInfo>().shuxing == shuxing)
+            else if (key.GetComponent<CardInfo>().shuxing == this.NowShuXing)
             {
                 key.gameObject.SetActive(true);
             }