From e4b45f10a7dd966d87f67d94de4ec5b063c258f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=CE=A9?= <3291875824@qq.com>
Date: Fri, 13 Jun 2025 01:25:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E9=98=9F=E9=A1=B5=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/scripts/Team/CharacterCardView.cs |  2 -
 Assets/scripts/Team/teamSettingPanel.cs  | 52 +++++++++---------------
 2 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/Assets/scripts/Team/CharacterCardView.cs b/Assets/scripts/Team/CharacterCardView.cs
index 3d08aff2..fd489b33 100644
--- a/Assets/scripts/Team/CharacterCardView.cs
+++ b/Assets/scripts/Team/CharacterCardView.cs
@@ -14,8 +14,6 @@ public class CharacterCardView : MonoBehaviour
     void Start()
     {
         charactCard=gameObject;
-        characterImage.sprite = null;
-        levelIcon.sprite = null;
     }
     
   
diff --git a/Assets/scripts/Team/teamSettingPanel.cs b/Assets/scripts/Team/teamSettingPanel.cs
index 98a14823..17089372 100644
--- a/Assets/scripts/Team/teamSettingPanel.cs
+++ b/Assets/scripts/Team/teamSettingPanel.cs
@@ -33,7 +33,7 @@ public class teamSettingPanel : MonoBehaviour
     [SerializeField]
     public GameObject teamCharacterPrefab;
     [SerializeField]
-    public GameObject teamCharacterViewContent;
+    public RectTransform teamCharacterViewContent;
 
     private TeamManager teamManager;
     
@@ -59,9 +59,10 @@ public class teamSettingPanel : MonoBehaviour
         {
             teamManager.OnSelectedCharacterChanged += updateTeamCharacterSelectedStatus;
         }
-        StartCoroutine(UpdateTeamSettingAfterOneFrame());
-        // updateTeamSettingElements();
-        StartCoroutine(UpdateSelectableCharacterAfterOneFrame());
+        updateTeamSettingElements();
+        updateSelectableCharacterViewList();
+        // StartCoroutine(UpdateTeamSettingAfterOneFrame());
+        // StartCoroutine(UpdateSelectableCharacterAfterOneFrame());
     }
     void OnDestroy()
     {
@@ -70,16 +71,20 @@ public class teamSettingPanel : MonoBehaviour
             teamManager.OnSelectedCharacterChanged -= updateTeamCharacterSelectedStatus;
         }
     }
-    public void openTeamSettingPanel()
-    {
-        //根据获取的队伍信息处理ui组件
-        //可在此补充ui动画信息
-        StartCoroutine(UpdateTeamSettingAfterOneFrame());
-       // updateTeamSettingElements();
-        StartCoroutine(UpdateSelectableCharacterAfterOneFrame());
-        teamSettingPanelObj.SetActive(true);
-        // getSelectableCharacterList();
-    }
+    // public void openTeamSettingPanel()
+    // {
+    //     //根据获取的队伍信息处理ui组件
+    //     //可在此补充ui动画信息
+    //     StartCoroutine(UpdateTeamSettingAfterOneFrame());
+    //    // updateTeamSettingElements();
+    //     StartCoroutine(UpdateSelectableCharacterAfterOneFrame());
+    //     teamSettingPanelObj.SetActive(true);
+    //     // getSelectableCharacterList();
+    // }
+    // public void closeTeamSettingPanel()
+    // {
+    //     teamSettingPanelObj.SetActive(false);
+    // }
     private IEnumerator UpdateTeamSettingAfterOneFrame()
     {
         yield return null;
@@ -102,26 +107,10 @@ public class teamSettingPanel : MonoBehaviour
         yield return null;
         
         updateSelectableCharacterViewList();
-        //获取content下的所有子对象，并重新布局
-        // foreach (Transform child in teamCharacterViewContent.transform)
-        // {
-        //     if (child != null)
-        //     {
-        //         var t = child.GetComponent<CharacterCardView>();
-        //         if (t != null && t.characterImage != null)
-        //         {
-        //             LayoutRebuilder.ForceRebuildLayoutImmediate(t.characterImage.rectTransform);
-        //         }
-        //     }
-        // }
         RectTransform rt = teamCharacterViewContent.GetComponent<RectTransform>();
         LayoutRebuilder.ForceRebuildLayoutImmediate(rt);
     }
-
-    public void closeTeamSettingPanel()
-    {
-        teamSettingPanelObj.SetActive(false);
-    }
+    
     public TeamCharacterDataInfo getCharacterViewInfo(int characterID)
     {
         if (teamCharacterList == null)
@@ -214,7 +203,6 @@ public class teamSettingPanel : MonoBehaviour
                 ccv.characterImage.sprite =tcdi.CharacterCardSprite;
                 ccv.levelIcon.sprite = getLevelSprite(c.currentBoundaryLevel);
                 ccv.occupationIcon.sprite = tcdi.CharacterRoleSprite;
-                Debug.Log($"{ccv.characterID}--{ccv.characterImage.sprite.name}--{ccv.levelIcon.sprite.name}--{ccv.gameObject.name}");
             }
         }
     }