修改bug，完善升星动画

Assets/Res/UI/HeroDetailPanel.prefab

@@ -125,9 +125,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2241270421792290432}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0.44999695, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1078011943520483168
@@ -379,7 +379,6 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 5091166044801204644}
-  - component: {fileID: 148200880756156862}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: StarsObj
@@ -412,32 +411,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 37}
   m_SizeDelta: {x: 750, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &148200880756156862
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 207711551128351574}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 4
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 0
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
 --- !u!1 &208069830876522060
 GameObject:
   m_ObjectHideFlags: 0
@@ -1880,9 +1853,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5091166044801204644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 466.40002, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 91.400024, y: 0}
   m_SizeDelta: {x: 45.700012, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1969311041310409060
@@ -3535,9 +3508,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3725798218940426506}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 250.95001, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 67.95001, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8046685421020806195
@@ -6095,9 +6068,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5091166044801204644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 375, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 45.700012, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2732630439701141293
@@ -6365,9 +6338,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2241270421792290432}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -44.550003, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6870054070481677623
@@ -9411,8 +9384,8 @@ MonoBehaviour:
     - gameObject: {fileID: 79095900304602252}
     - gameObject: {fileID: 8504566407075160577}
     - gameObject: {fileID: 8929665916662750425}
-  - key: Stars1Layout
-    gameObject: {fileID: 7906698109012939668}
+  - key: Stars2Obj
+    gameObject: {fileID: 5692980826226210461}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
@@ -9421,8 +9394,8 @@ MonoBehaviour:
     - gameObject: {fileID: 79095900304602252}
     - gameObject: {fileID: 8504566407075160577}
     - gameObject: {fileID: 8929665916662750425}
-  - key: Stars2Layout
-    gameObject: {fileID: 3168672394615115645}
+  - key: Stars1Obj
+    gameObject: {fileID: 8191368305320982722}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
@@ -11091,9 +11064,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3725798218940426506}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 160.95001, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -22.049988, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &372935494571646065
@@ -11715,7 +11688,6 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 2241270421792290432}
-  - component: {fileID: 3168672394615115645}
   - component: {fileID: 5450255457165283008}
   - component: {fileID: 3515673915611034184}
   m_Layer: 0
@@ -11750,32 +11722,6 @@ RectTransform:
   m_AnchoredPosition: {x: 149, y: 132}
   m_SizeDelta: {x: 366.9, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &3168672394615115645
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5692980826226210461}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 4
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 0
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
 --- !u!320 &5450255457165283008
 PlayableDirector:
   m_ObjectHideFlags: 0
@@ -13004,26 +12950,8 @@ MonoBehaviour:
     - gameObject: {fileID: 386705721927191908}
     - gameObject: {fileID: 3414719560540881468}
     - gameObject: {fileID: 6905440077724744462}
-  - key: StarsLayout
-    gameObject: {fileID: 148200880756156862}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas:
-    - gameObject: {fileID: 2431497390631250942}
-    - gameObject: {fileID: 386705721927191908}
-    - gameObject: {fileID: 3414719560540881468}
-    - gameObject: {fileID: 6905440077724744462}
-  - key: Star (2)
-    gameObject: {fileID: 2983232722897563720}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas:
-    - gameObject: {fileID: 2431497390631250942}
-    - gameObject: {fileID: 386705721927191908}
-    - gameObject: {fileID: 3414719560540881468}
-    - gameObject: {fileID: 6905440077724744462}
-  - key: Star
-    gameObject: {fileID: 9043530873077291103}
+  - key: StarsObj
+    gameObject: {fileID: 207711551128351574}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas:
@@ -13043,7 +12971,7 @@ PlayableDirector:
   serializedVersion: 3
   m_PlayableAsset: {fileID: 11400000, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
   m_InitialState: 1
-  m_WrapMode: 0
+  m_WrapMode: 2
   m_DirectorUpdateMode: 1
   m_InitialTime: 0
   m_SceneBindings:
@@ -14683,9 +14611,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2241270421792290432}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -89.55, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7561109794277708299
@@ -16258,9 +16186,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3725798218940426506}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 205.95001, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 22.950012, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5490923062748187026
@@ -16658,9 +16586,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5091166044801204644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 329.3, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -45.700012, y: 0}
   m_SizeDelta: {x: 45.700012, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2451370377385730876
@@ -16915,9 +16843,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5091166044801204644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 420.7, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 45.700012, y: 0}
   m_SizeDelta: {x: 45.700012, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3596508466326571759
@@ -17590,7 +17518,6 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 3725798218940426506}
-  - component: {fileID: 7906698109012939668}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Stars_1
@@ -17623,32 +17550,6 @@ RectTransform:
   m_AnchoredPosition: {x: -144, y: 132.8}
   m_SizeDelta: {x: 366.90002, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &7906698109012939668
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8191368305320982722}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 4
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 0
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
 --- !u!1 &8226637605373966731
 GameObject:
   m_ObjectHideFlags: 0
@@ -18204,9 +18105,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3725798218940426506}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 273.45, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 90.45001, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4157655848032495787
@@ -18288,9 +18189,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3725798218940426506}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 115.95001, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -67.04999, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &270976551773092808
@@ -18521,9 +18422,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2241270421792290432}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 45.449997, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7072959453483645448
@@ -19454,9 +19355,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 2241270421792290432}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 90.45001, y: 0}
   m_SizeDelta: {x: 45, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1474425373263466003
@@ -19614,9 +19515,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5091166044801204644}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 283.59998, y: -40}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -91.400024, y: 0}
   m_SizeDelta: {x: 45.700012, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4300090933347681505

Assets/Scripts/Core/Utility/Helper/SimpleLayout.cs

@@ -0,0 +1,116 @@
+using UnityEngine;
+using System.Collections.Generic;
+
+namespace Fort23.Core
+{
+
+public enum LayoutType
+{
+    Horizontal,
+    Vertical
+}
+
+public class SimpleLayout
+{
+    /// <summary>
+    /// 根据传入的布局类型，排列 GameObject 列表，水平排列并居中
+    /// </summary>
+    /// <param name="list">需要排列的 GameObject 列表</param>
+    /// <param name="type">布局类型，支持 Horizontal 或 Vertical</param>
+    /// <param name="spacing">元素之间的间距</param>
+    public static void Layout(List<object> list, LayoutType type, float spacing = 0f)
+    {
+        // 获取父节点的 RectTransform
+        if (list.Count == 0)
+            return;
+
+        if (type == LayoutType.Horizontal)
+        {
+            List<GameObject> activeElements = new List<GameObject>();
+
+            // 筛选 active 为 true 的元素
+            foreach (object item in list)
+            {
+                GameObject g = item as GameObject;
+                if (g != null && g.activeSelf)
+                {
+                    activeElements.Add(g);
+                }
+            }
+
+            int count = activeElements.Count;
+
+            // 如果没有 active 的元素，直接返回
+            if (count == 0) return;
+
+            // 计算起始位置，使中心点的元素对齐父节点中心
+            float totalWidth = 0f;
+
+            for (int i = 0; i < count; i++)
+            {
+                RectTransform rt = activeElements[i].GetComponent<RectTransform>();
+                totalWidth += rt.rect.width + (i < count - 1 ? spacing : 0);
+            }
+
+            // 起始位置的计算：最左侧元素的中心点相对于父节点
+            float startX = -totalWidth / 2 + activeElements[0].GetComponent<RectTransform>().rect.width / 2;
+
+            // 设置每个元素的位置
+            for (int i = 0; i < count; i++)
+            {
+                RectTransform rt = activeElements[i].GetComponent<RectTransform>();
+
+                // 更新位置
+                rt.anchoredPosition = new Vector2(startX, 0);
+
+                // 移动到下一个元素位置
+                startX += rt.rect.width + spacing;
+            }
+        }
+        else if (type == LayoutType.Vertical)
+        {
+            List<GameObject> activeElements = new List<GameObject>();
+
+            // 筛选 active 为 true 的元素
+            foreach (object item in list)
+            {
+                GameObject g = item as GameObject;
+                if (g != null && g.activeSelf)
+                {
+                    activeElements.Add(g);
+                }
+            }
+
+            int count = activeElements.Count;
+
+            // 如果没有 active 的元素，直接返回
+            if (count == 0) return;
+
+            // 计算起始位置，使中心点的元素对齐父节点中心
+            float totalHeight = 0f;
+
+            for (int i = 0; i < count; i++)
+            {
+                RectTransform rt = activeElements[i].GetComponent<RectTransform>();
+                totalHeight += rt.rect.height + (i < count - 1 ? spacing : 0);
+            }
+
+            // 起始位置的计算：最顶部元素的中心点相对于父节点
+            float startY = totalHeight / 2 - activeElements[0].GetComponent<RectTransform>().rect.height / 2;
+
+            // 设置每个元素的位置
+            for (int i = 0; i < count; i++)
+            {
+                RectTransform rt = activeElements[i].GetComponent<RectTransform>();
+
+                // 更新位置
+                rt.anchoredPosition = new Vector2(0, startY);
+
+                // 移动到下一个元素位置
+                startY -= rt.rect.height + spacing;
+            }
+        }
+    }
+}
+
+}

Assets/Scripts/Core/Utility/Helper/SimpleLayout.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 596bf238533a485cb685af4995528336
+timeCreated: 1733823970

Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -59,40 +59,29 @@ namespace Fort23.Mono
 
             if (isOpenPre)
             {
-                if (BagController.Instance.DeductItem(heroInfo.modelConfig.itemID, heroInfo.promoteConfig.costCount))
+                //if (BagController.Instance.DeductItem(heroInfo.modelConfig.itemID, heroInfo.promoteConfig.costCount))
                 {
                     heroInfo.Promote();
                     PlayerManager.Instance.SaveHeroData(heroInfo);
                     UpdateAttributeUI();
                     HeroUITools.SetStarShow(stars, heroInfo.star.Value);
-                    LayoutRebuilder.MarkLayoutForRebuild(StarsLayout.GetComponent<RectTransform>());
+                    // LayoutRebuilder.ForceRebuildLayoutImmediate(StarsLayout.GetComponent<RectTransform>());
                     SendEvent(HeroUpType.Promote);
+                    
+                    // FlyOutEft(upPre.Stars2);
+                    ExitPowerUpPre(curPreTyp, upPre.Stars2);
                 }
             }
             else
             {
                 await UIManager.Instance.CreateGComponentForObject<HeroPowerUpPre>(objHeroPowerUpPre, Callback, root: rtBottom);    
             }
-            
-
-
-            
-            // heroInfo.modelConfig.itemID
-
- 
         }
 
         private async void Callback(HeroPowerUpPre pre)
         {
             upPre = pre;
             pre.OpenPromotePre(heroInfo);
-            
-            // upPre.Stars1Layout.enabled = true;
-            // upPre.Stars2Layout.enabled = true;
-            await TimerComponent.Instance.WaitAsync(1);
-            upPre.Stars1Layout.enabled = false;
-            upPre.Stars2Layout.enabled = false;
-            
             EnterPowerUpPre(2);
         }
 
@@ -131,15 +120,11 @@ namespace Fort23.Mono
         private async void FlyInEft()
         {
             simpleMoves.Clear();
-            upPre.Stars1Layout.gameObject.SetActive(false);
-            upPre.Stars2Layout.gameObject.SetActive(false);
-            
-            // LayoutRebuilder.MarkLayoutForRebuild (upPre.Stars1Layout.GetComponent<RectTransform>());
-            
-            
+            upPre.Stars1Obj.SetActive(false);
+            upPre.Stars2Obj.SetActive(false);
             
             await TimerComponent.Instance.WaitAsync(200);
-            for (int i = 0; i < heroInfo.star; i++)
+            for (int i = 0; i < stars.Count; i++)
             {
                 GameObject targetGo = upPre.Stars1[i] as GameObject;
                 GameObject startGo = stars[i] as GameObject;
@@ -149,18 +134,9 @@ namespace Fort23.Mono
                 simpleMoves.Add(sm);
             }
             //把现在的星星隐藏了.
-            StarsLayout.gameObject.SetActive(false);
+            StarsObj.SetActive(false);
             
-     
-            
-           
-            // await TimerComponent.Instance.WaitAsync(1);
-            // upPre.Stars1Layout.enabled = true;
-            // upPre.Stars1Layout.SetLayoutHorizontal();
-            // await TimerComponent.Instance.WaitAsync(1);
-            // upPre.Stars1Layout.enabled = false;
-            
-            upPre.Stars1Layout.gameObject.SetActive(true);
+            upPre.Stars1Obj.SetActive(true);
             
             int j = 0;
             float delayTime = 0;
@@ -171,40 +147,40 @@ namespace Fort23.Mono
             }
             
             await TimerComponent.Instance.WaitAsync(Mathf.RoundToInt((delayTime + 0.3f) * 1000));
-            upPre.Stars2Layout.gameObject.SetActive(true);
+            upPre.Stars2Obj.SetActive(true);
             
         }
 
-        private async void FlyOutEft()
+        private async void FlyOutEft(List<object> startList)
         {
             int i = 0;
             
             // LayoutRebuilder.MarkLayoutForRebuild(StarsLayout.GetComponent<RectTransform>());
-            
+            // LayoutUtility.Layout(stars, LayoutType.Horizontal);
             simpleMoves.Clear();
             foreach (var star in stars)
             {
                 GameObject targetGo = star as GameObject;
-                GameObject startGo = upPre.Stars1[i] as GameObject;
-                
+                GameObject startGo = startList[i++] as GameObject;
+                //目标
                 RectTransform targetRT = targetGo.GetComponent<RectTransform>();
+                //起始
                 RectTransform startRT = startGo.GetComponent<RectTransform>();
                 
                 SimpleMove sm = new SimpleMove(targetRT, startRT.position, targetRT.position);
                 simpleMoves.Add(sm);
             }
-            StarsLayout.gameObject.SetActive(true);
+            StarsObj.SetActive(true);
             
             int j = 0;
+            float delayTime = 0f;
             foreach (SimpleMove move in simpleMoves)
             {
-                var delayTime = (j++ * 0.05f);
+                delayTime = (j++ * 0.05f);
                 move.Start(delayTime);
             }
 
-            
-            
-            //await TimerComponent.Instance.WaitAsync(Mathf.RoundToInt((delayTime + 0.3f) * 1000));
+            await TimerComponent.Instance.WaitAsync(Mathf.RoundToInt((delayTime + 0.3f) * 1000));
             // upPre.Stars2Layout.gameObject.SetActive(false);
             
         }
@@ -257,7 +233,7 @@ namespace Fort23.Mono
         /// 离开 升级/升星预览界面
         /// </summary>
         /// <param name="preTyp">1升级;2 升星</param>
-        private void ExitPowerUpPre(byte preTyp)
+        private void ExitPowerUpPre(byte preTyp, List<object> list = null)
         {
             isOpenPre = false;
             btns1.SetActive(true);
@@ -274,7 +250,7 @@ namespace Fort23.Mono
             }
             else
             {
-                FlyOutEft();
+                FlyOutEft(list);
                 
                 btnUpgrade.gameObject.SetActive(true);
                 RectTransform rt = btnPromote.GetComponent<RectTransform>();
@@ -314,15 +290,13 @@ namespace Fort23.Mono
         {
             if (isOpenPre)
             {
-                ExitPowerUpPre(curPreTyp);
+                ExitPowerUpPre(curPreTyp, upPre.Stars1);
             }
             else
             {
                 UIManager.Instance.HideUIUIPanel(this);
                 GObjectPool.Instance.Recycle(modelObj);
             }
-            
-           
         }
 
         private GameObjectPool modelObj;
@@ -340,10 +314,10 @@ namespace Fort23.Mono
             // StarsLayout.gameObject.SetActive(true);
             
             HeroUITools.SetStarShow(stars, heroInfo.star.Value);
-            StarsLayout.enabled = true;
-            StarsLayout.SetLayoutHorizontal();
-            await TimerComponent.Instance.WaitAsync(1);
-            StarsLayout.enabled = false;
+            // StarsLayout.enabled = true;
+            // StarsLayout.SetLayoutHorizontal();
+            // await TimerComponent.Instance.WaitAsync(1);
+            // StarsLayout.enabled = false;
             
             // await TimerComponent.Instance.WaitAsync(50);
             // StarsLayout.GetComponent<LayoutGroup>().s
@@ -408,7 +382,7 @@ namespace Fort23.Mono
         private long costHeroCount;
         public async void UpdateAttributeUI(bool isInit = false)
         {
-            StarsLayout.gameObject.SetActive(true);
+            StarsObj.SetActive(true);
             if (txtHP.text != heroInfo.hp.Value.ToStringEx())
             {
                 long old = long.Parse(txtHP.text);

Assets/Scripts/GameUI/UI/Hero/HeroDetailPanelData.cs

@@ -318,15 +318,15 @@ namespace Fort23.Mono
 	      return _eftNumPos;
 	     }
 	   }
-	  private HorizontalLayoutGroup _StarsLayout;
-	  public HorizontalLayoutGroup StarsLayout
+	  private GameObject _StarsObj;
+	  public GameObject StarsObj
 	   {
 	   get{
-	      if (_StarsLayout == null)
+	      if (_StarsObj == null)
 	       {
-	         _StarsLayout  = GetUIUnit<HorizontalLayoutGroup>("StarsLayout"); 
+	         _StarsObj  = GetUIUnit<GameObject>("StarsObj"); 
 	       }
-	      return _StarsLayout;
+	      return _StarsObj;
 	     }
 	   }
 	  #endregion 自定义数据结束 

Assets/Scripts/GameUI/UI/Hero/HeroPowerUpPreData.cs

@@ -329,26 +329,26 @@ namespace Fort23.Mono
 	      return _objUpLvTips;
 	     }
 	   }
-	  private HorizontalLayoutGroup _Stars1Layout;
-	  public HorizontalLayoutGroup Stars1Layout
+	  private GameObject _Stars2Obj;
+	  public GameObject Stars2Obj
 	   {
 	   get{
-	      if (_Stars1Layout == null)
+	      if (_Stars2Obj == null)
 	       {
-	         _Stars1Layout  = GetUIUnit<HorizontalLayoutGroup>("Stars1Layout"); 
+	         _Stars2Obj  = GetUIUnit<GameObject>("Stars2Obj"); 
 	       }
-	      return _Stars1Layout;
+	      return _Stars2Obj;
 	     }
 	   }
-	  private HorizontalLayoutGroup _Stars2Layout;
-	  public HorizontalLayoutGroup Stars2Layout
+	  private GameObject _Stars1Obj;
+	  public GameObject Stars1Obj
 	   {
 	   get{
-	      if (_Stars2Layout == null)
+	      if (_Stars1Obj == null)
 	       {
-	         _Stars2Layout  = GetUIUnit<HorizontalLayoutGroup>("Stars2Layout"); 
+	         _Stars1Obj  = GetUIUnit<GameObject>("Stars1Obj"); 
 	       }
-	      return _Stars2Layout;
+	      return _Stars1Obj;
 	     }
 	   }
 	  #endregion 自定义数据结束 

Assets/Scripts/GameUI/UI/Hero/HeroUITools.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Fort23.Core;
 using Fort23.UTool;
 using UnityEngine;
 using UnityEngine.UI;
@@ -40,7 +41,7 @@ namespace Fort23.Mono
                 i++;
             }
             
-            
+            SimpleLayout.Layout(stars, LayoutType.Horizontal);
         }
         
         private static void SetStarImg(int group, GameObject starObj)

UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615