From f1c47e46758101b5f31a952435f166d752d87a1f Mon Sep 17 00:00:00 2001
From: YiHan0621 <2857295085@qq.com>
Date: Mon, 22 Sep 2025 10:11:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E6=88=98=E5=8D=A1=E7=BB=84=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E5=88=87=E6=8D=A2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resources/Cards/Fire/spell_split.asset    |  2 +-
 Assets/TcgEngine/Scripts/UI/PresetDeck.cs     | 49 ++++++++++---------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/Assets/TcgEngine/Resources/Cards/Fire/spell_split.asset b/Assets/TcgEngine/Resources/Cards/Fire/spell_split.asset
index 01650c9..bc9f2cd 100644
--- a/Assets/TcgEngine/Resources/Cards/Fire/spell_split.asset
+++ b/Assets/TcgEngine/Resources/Cards/Fire/spell_split.asset
@@ -14,7 +14,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   id: spell_split
   title: "\u5206\u88C2"
-  art_full_path: Cards/imp.png
+  art_full_path: Cards/fire_chicken.png
   art_board_path: CardsBoard/imp_board.png
   type: 20
   camp: 0
diff --git a/Assets/TcgEngine/Scripts/UI/PresetDeck.cs b/Assets/TcgEngine/Scripts/UI/PresetDeck.cs
index 587ac76..46e26c7 100644
--- a/Assets/TcgEngine/Scripts/UI/PresetDeck.cs
+++ b/Assets/TcgEngine/Scripts/UI/PresetDeck.cs
@@ -35,9 +35,9 @@ namespace TcgEngine.UI
         
         // 卡组展示管理
         public int card_lines_size = 12;
-        private List<DeckLine> card_pool = new List<DeckLine>();
-        private List<DeckLine> card_lines = new List<DeckLine>();
-        private List<UserCardData> deck_cards = new List<UserCardData>();
+        public List<DeckLine> card_pool = new List<DeckLine>();
+        public List<DeckLine> card_lines = new List<DeckLine>();
+        
         
         private UserData lastUserData; 
         private int currIndex = 0;
@@ -116,7 +116,7 @@ namespace TcgEngine.UI
             {
                 deckSelector.SelectDeck(active_lines[0].GetUserDeck().tid);
                 currIndex += 1;
-                // SetupUserCardList();
+                SetupUserCardList();
             }
         }
         
@@ -126,7 +126,7 @@ namespace TcgEngine.UI
             deckSelector.SelectDeck(line.GetUserDeck().tid);
             // 获取索引
             currIndex = active_lines.IndexOf(line) + 1;
-            // SetupUserCardList();
+            SetupUserCardList();
         }
 
         /// <summary>
@@ -153,24 +153,29 @@ namespace TcgEngine.UI
 
         #region 展示卡组
 
-        // private void SetupUserCardList()
-        // {
-        //     foreach (var line in card_pool)
-        //         line.ResetLine();
-        //     
-        //     card_lines.Clear();
-        //     
-        //     for (int i = 0; i < active_lines[GetCurrIndex()].GetUserDeck().cards.Length; i++)
-        //     {
-        //         DeckLine line = card_pool[i];
-        //     }
-        // }
+        private void SetupUserCardList()
+        {
+            foreach (var line in card_pool)
+                line.ResetLine();
+            
+            card_lines.Clear();
+            
+            UserDeckData udeck = active_lines[GetCurrIndex()].GetUserDeck();
+            Debug.Log("卡组数量："+udeck.cards.Length);
+            for (int i = 0; i < udeck.cards.Length; i++)
+            {
+                UserCardData ucard = udeck.cards[i];
+                DeckLine line = card_pool[i];
 
-        // private CardData GetCardData(string id)
-        // {
-        //     CardData card = CardData.Get();
-        //     return null;
-        // }
+                CardData cdata = CardData.Get(ucard.tid);
+                VariantData variant = VariantData.Get(ucard.variant);
+
+                line.Refresh(cdata, variant, ucard.quantity);
+                line.gameObject.SetActive(true);
+                card_lines.Add(line);
+            }
+        }
+        
 
         #endregion