lzx 1 päivä sitten
vanhempi
commit
76e1042881
1 muutettua tiedostoa jossa 16 lisäystä ja 20 poistoa
  1. 16 20
      Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

+ 16 - 20
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -56,6 +56,7 @@ namespace Fort23.Mono
 
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
+            _skillInfo = uiData[0] as SkillInfo;
             List<SkillConfig> allSkillConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
             configs = allSkillConfigs.Where(s => s.IDGroup == _skillInfo.skillConfig.IDGroup).ToList();
             using (CTaskAwaitBuffer<GongFaUpgradeInfoWidget> cts = new CTaskAwaitBuffer<GongFaUpgradeInfoWidget>())
@@ -69,10 +70,11 @@ namespace Fort23.Mono
                     _skillInfos.Add(skillInfo1);
                     cts.AddTask(UIManager.Instance.CreateGComponent<GongFaUpgradeInfoWidget>(null, Content));
                 }
+
                 _gongFaUpgradeInfoWidgets = await cts.WaitAll();
             }
 
-       
+
             return await base.AsyncInit(uiData);
         }
 
@@ -283,16 +285,19 @@ namespace Fort23.Mono
         }
 
         private int index = 0;
+
         public async void CustomInit(SkillInfo skillInfo)
         {
-            // foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
-            // {
-            //     UIManager.Instance.DormancyGComponent(gongFaUpgradeInfoWidget);
-            // }
-            //
-            //
-            // _gongFaUpgradeInfoWidgets.Clear();
-            _skillInfo = skillInfo;
+            index = 0;
+            for (var i = 0; i < configs.Count; i++)
+            {
+                if (configs[i].level == 1)
+                    continue;
+
+                _gongFaUpgradeInfoWidgets[index].CustomInit(_skillInfo, _skillInfos[index], false);
+                index++;
+            }
+
             Btn_Rest.gameObject.SetActive(_skillInfo.SkillPowerupConfig.ID > 1);
             RedDotComType02.CustomInit(13, _skillInfo);
             RedDotComType01.CustomInit(12, _skillInfo);
@@ -375,16 +380,6 @@ namespace Fort23.Mono
                     icon.gameObject.SetActive(false);
                 }
             }
-
-
-            for (var i = 0; i < configs.Count; i++)
-            {
-                if (configs[i].level == 1)
-                    continue;
-     
-                _gongFaUpgradeInfoWidgets[index].CustomInit(_skillInfo, _skillInfos[index], false);
-               index++;
-            }
         }
 
         private async CTask UpdateStarBtn()
@@ -567,7 +562,8 @@ namespace Fort23.Mono
 
         public async static CTask<GongFaUpgradePanel> Open(SkillInfo skillInfo)
         {
-            GongFaUpgradePanel gongFaUpgradePanel = await UIManager.Instance.LoadAndOpenPanel<GongFaUpgradePanel>(null);
+            GongFaUpgradePanel gongFaUpgradePanel =
+                await UIManager.Instance.LoadAndOpenPanel<GongFaUpgradePanel>(null, uiData: new object[] { skillInfo });
             gongFaUpgradePanel.CustomInit(skillInfo);
             return gongFaUpgradePanel;
         }