Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/UI/ShopPanel/ShopPanel.prefab

@@ -2367,7 +2367,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 3
-  m_Spacing: 17
+  m_Spacing: 67.34
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -165,7 +165,7 @@ namespace Fort23.Mono
 
             skillConstant = ConfigComponent.Instance.Get<SkillConstant>(1);
 
-            
+
             UpdateStarBtn();
 
 
@@ -190,14 +190,13 @@ namespace Fort23.Mono
                     Icon_Attribute.icon_name = "dec_tu";
                     break;
             }
-            
+
             for (var i = 0; i < StarRoot.Count; i++)
             {
                 MyImage icon = StarRoot[i] as MyImage;
-                if ( i < skillInfo.skillConfig.level-1)
+                if (i < skillInfo.skillConfig.level - 1)
                 {
                     icon.gameObject.SetActive(true);
-                
                 }
                 else
                 {
@@ -244,7 +243,7 @@ namespace Fort23.Mono
 
             for (var i = 0; i < configs.Count; i++)
             {
-                if(configs[i].level == 1)
+                if (configs[i].level == 1)
                     continue;
                 SkillInfo skillInfo1 = new SkillInfo(configs[i].ID, _skillInfo.SkillPowerupConfig.ID);
                 GongFaUpgradeInfoWidget gongFaUpgradeInfoWidget = await UIManager.Instance.CreateGComponent<GongFaUpgradeInfoWidget>(null, Content);
@@ -340,6 +339,12 @@ namespace Fort23.Mono
                 UpStarItemRoot.SetActive(false);
                 UpGradeItemRoot.SetActive(false);
             }
+
+            LayoutRebuilder.ForceRebuildLayoutImmediate(UpStarItemRoot.GetComponent<RectTransform>());
+            LayoutRebuilder.ForceRebuildLayoutImmediate(UpGradeItemRoot.GetComponent<RectTransform>());
+            LayoutRebuilder.ForceRebuildLayoutImmediate(UpGradeItemRoot.transform.parent.GetComponent<RectTransform>());
+            LayoutRebuilder.ForceRebuildLayoutImmediate(UpStarItemRoot.transform.parent.GetComponent<RectTransform>());
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Btn_UpGrade.GetComponent<RectTransform>());
         }
 
         public async static CTask<GongFaUpgradePanel> Open(SkillInfo skillInfo)