소스 검색

修改bug

lzx 8 시간 전
부모
커밋
510b117fa3

+ 3 - 2
Assets/Scripts/Core/UI/Core/GameAssetUpdatePanel.cs

@@ -166,8 +166,8 @@ public class GameAssetUpdatePanel
             float m = downLoadHanderGroup.size / 1024f / 1024f;
             float speed = downLoadHanderGroup.speed / 1024f;
             _downloadUI.SetMassge(
-                $"Downloading:{updateFlieInfo.Count}   {m.ToString(".00")}M / {sizeM.ToString(".00")}M  speed {speed.ToString(".00")} Kb");
-            return downLoadHanderGroup.size;
+                $"Downloading:{updateFlieInfo.Count}   {m.ToString(".00")}M / {sizeM.ToString(".00")}M  speed {HotSyncContent.FormatSpeed(speed)}");
+            return downLoadHanderGroup.size;.
         };
         _downloadUI.SetSlider(sliderData);
 
@@ -175,6 +175,7 @@ public class GameAssetUpdatePanel
         downLoadHanderGroup.OnCallBack = Check;
         downLoadHanderGroup.StartUpdate();
     }
+  
 
     private void Check()
     {

+ 1 - 1
Assets/Scripts/GameStart/GameLoadDll.cs

@@ -402,7 +402,7 @@ public class GameLoadDll
             float m = downLoadHanderGroup.size / 1024f / 1024f;
             float speed = downLoadHanderGroup.speed / 1024f;
             _downloadUI.SetMassge(
-                $"开始下载文件,个数{updateFlieInfo.Count}   大小{m.ToString("0.00")}M / {sizeM.ToString("0.00")}M  速度{speed.ToString(".00")} Kb");
+                $"开始下载文件,个数{updateFlieInfo.Count}   大小{m.ToString("0.00")}M / {sizeM.ToString("0.00")}M  速度{HotSyncContent.FormatSpeed(speed)}");
             return downLoadHanderGroup.size;
         };
         // _downloadUI.SetSlider(sliderData);

+ 4 - 4
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceEventPreviewPanel.cs

@@ -129,8 +129,8 @@ namespace Fort23.Mono
                 TitleRoot.SetActive(true);
                 Rect_Sv.SetParent(Sv1root);
                 Rect_Sv.transform.SetAsFirstSibling();
-                Rect_Sv.offsetMax = new Vector2(11.88f, 0);
-                Rect_Sv.offsetMin = Vector2.zero;
+                Rect_Sv.offsetMax =Vector2.zero;
+                Rect_Sv.offsetMin = new Vector2(11.88f,0);
                 // Rect_Sv.sizeDelta = new Vector2(718.82f, 844.7f);
                 // Rect_Sv.anchoredPosition = new Vector2(2.61f, -190.52f);
                 Text_Tips.gameObject.SetActive(false);
@@ -174,8 +174,8 @@ namespace Fort23.Mono
                 TitleRoot.SetActive(false);
 
                 Rect_Sv.SetParent(Sv2root);
-                Rect_Sv.offsetMax = new Vector2(11.88f, 0);
-                Rect_Sv.offsetMin = Vector2.zero;
+                Rect_Sv.offsetMax  =Vector2.zero;
+                Rect_Sv.offsetMin = new Vector2(11.88f,0);
                 Text_Tips.gameObject.SetActive(showEventList.Count > 0);
                 DivineSenceHuoQuWidgetGam.SetActive(false);
             }

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

@@ -26,6 +26,7 @@ namespace Fort23.Mono
         // private SkillConstant skillConstant;
 
         List<ItemWidgetType1> _itemWidgetType1 = new List<ItemWidgetType1>();
+        private List<SkillInfo> _skillInfos = new List<SkillInfo>();
 
         // List<EnergyWidget> _energyWidgets = new List<EnergyWidget>();
 
@@ -53,6 +54,28 @@ namespace Fort23.Mono
         {
         }
 
+        public async override CTask<bool> AsyncInit(object[] uiData)
+        {
+            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>())
+            {
+                for (var i = 0; i < configs.Count; i++)
+                {
+                    if (configs[i].level == 1)
+                        continue;
+                    SkillInfo skillInfo1 =
+                        new SkillInfo(configs[i].IDGroup, _skillInfo.SkillPowerupConfig.ID, configs[i].level);
+                    _skillInfos.Add(skillInfo1);
+                    cts.AddTask(UIManager.Instance.CreateGComponent<GongFaUpgradeInfoWidget>(null, Content));
+                }
+                _gongFaUpgradeInfoWidgets = await cts.WaitAll();
+            }
+
+       
+            return await base.AsyncInit(uiData);
+        }
+
         public override void AddButtonEvent()
         {
             Btn_Back.onClick.AddListener(() =>
@@ -259,15 +282,16 @@ namespace Fort23.Mono
             AccountFileInfo.Instance.SavePlayerData();
         }
 
+        private int index = 0;
         public async void CustomInit(SkillInfo skillInfo)
         {
-            foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
-            {
-                UIManager.Instance.DormancyGComponent(gongFaUpgradeInfoWidget);
-            }
-
-           
-            _gongFaUpgradeInfoWidgets.Clear();
+            // foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
+            // {
+            //     UIManager.Instance.DormancyGComponent(gongFaUpgradeInfoWidget);
+            // }
+            //
+            //
+            // _gongFaUpgradeInfoWidgets.Clear();
             _skillInfo = skillInfo;
             Btn_Rest.gameObject.SetActive(_skillInfo.SkillPowerupConfig.ID > 1);
             RedDotComType02.CustomInit(13, _skillInfo);
@@ -353,19 +377,13 @@ namespace Fort23.Mono
             }
 
 
-            List<SkillConfig> allSkillConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
-            configs = allSkillConfigs.Where(s => s.IDGroup == skillConfig.IDGroup).ToList();
-
             for (var i = 0; i < configs.Count; i++)
             {
                 if (configs[i].level == 1)
                     continue;
-                SkillInfo skillInfo1 =
-                    new SkillInfo(configs[i].IDGroup, _skillInfo.SkillPowerupConfig.ID, configs[i].level);
-                GongFaUpgradeInfoWidget gongFaUpgradeInfoWidget =
-                    await UIManager.Instance.CreateGComponent<GongFaUpgradeInfoWidget>(null, Content);
-                gongFaUpgradeInfoWidget.CustomInit(_skillInfo, skillInfo1, false);
-                _gongFaUpgradeInfoWidgets.Add(gongFaUpgradeInfoWidget);
+     
+                _gongFaUpgradeInfoWidgets[index].CustomInit(_skillInfo, _skillInfos[index], false);
+               index++;
             }
         }
 
@@ -566,6 +584,7 @@ namespace Fort23.Mono
                 UIManager.Instance.DormancyGComponent(itemWidgetType1);
             }
 
+            _skillInfos.Clear();
             //
             // foreach (var energyWidget in _energyWidgets)
             // {

+ 15 - 0
Assets/Scripts/ThirdParty/DownloadSystem/HotSyncContent.cs

@@ -103,6 +103,21 @@ namespace ThirdParty
             return p;
         }
 
+        public static string FormatSpeed(float kbPerSecond)
+        {
+            const float ThresholdMB = 1024f; 
+
+            if (kbPerSecond >= ThresholdMB)
+            {
+                float mbPerSecond = kbPerSecond / 1000f;
+                return $"{mbPerSecond:F2} MB/s";
+            }
+            else
+            {
+                return $"{kbPerSecond:F2} KB/s";
+            }
+        }
+        
         public static string GetDllWebRequestPath(string resourceName)
         {
             string p = Path.Combine(AppHotfixResPath, resourceName);