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

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.9256576
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.7075048
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Res/UI/CombatHPPanel.prefab

@@ -426,7 +426,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -491,8 +491,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -49.999996, y: 0}
-  m_SizeDelta: {x: 100, y: 9}
+  m_AnchoredPosition: {x: -49.5, y: 0}
+  m_SizeDelta: {x: 99, y: 8}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2768628954572887385
 CanvasRenderer:

Assets/Res/UI/CombatPanel.prefab

@@ -940,6 +940,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4287798501111193387}
   - component: {fileID: 8588517758620161246}
+  - component: {fileID: 6678406076135109507}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: ' BossHpRoot'
@@ -992,6 +993,21 @@ MonoBehaviour:
   m_Spacing: {x: 0, y: 0}
   m_Constraint: 0
   m_ConstraintCount: 2
+--- !u!114 &6678406076135109507
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1340706786225753752}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e884cfd2aa14b98baf1ef3f9d1fc5b0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  offsetX: 0
+  anchorPointType: 2
+  isUpdate: 0
 --- !u!1 &1343676762713764609
 GameObject:
   m_ObjectHideFlags: 0
@@ -9725,7 +9741,7 @@ RectTransform:
   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: 750, y: 1624}
+  m_SizeDelta: {x: 1170, y: 2532}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -176,7 +176,7 @@ namespace Fort23.Mono
                 UICamera = prefab.transform.GetComponentInChildren<Camera>();
             }
 
-            current = EventSystem.current;
+            current = Canvas.GetComponentInChildren<EventSystem>();
             Assembly assembly = Assembly.Load("Fort23.Mono");
             BackgroundPanelType = assembly.GetType(" Fort23.Mono.BackgroundPanel");
 
@@ -240,7 +240,7 @@ namespace Fort23.Mono
         public void SetEventSystemEnable(bool value)
         {
             if (current != null)
-                current.enabled = value;
+                current.gameObject.SetActive(value);
         }
 
         [CustomMethod(CustomMethodType.Update)]
@@ -362,7 +362,7 @@ namespace Fort23.Mono
                 {
                     if (current != null)
                     {
-                        SetEventSystemEnable(false);
+                        // SetEventSystemEnable(false);
                     }
 
 
@@ -439,7 +439,7 @@ namespace Fort23.Mono
 
                         if (current != null)
                         {
-                            SetEventSystemEnable(true);
+                            // SetEventSystemEnable(true);
                         }
 
 
@@ -464,7 +464,7 @@ namespace Fort23.Mono
                     {
                         if (current != null)
                         {
-                            SetEventSystemEnable(true);
+                            // SetEventSystemEnable(true);
                         }
 
                         // 界面数据没准备好，因此本次操作将被销毁
@@ -581,8 +581,7 @@ namespace Fort23.Mono
                     if (isShowBG)
                     {
                         uiPanel.IsShowCustomBGPanel = true;
-                        if (!AllShowBGUIs.Contains(uiPanel))
-                            AllShowBGUIs.Add(uiPanel);
+
                         await GetBackgroundPanel(uiPanel, GetLayer(layer));
                     }
 
@@ -621,12 +620,6 @@ namespace Fort23.Mono
                         await uiPanel.Open();
 
 
-                        if (current != null)
-                        {
-                            SetEventSystemEnable(true);
-                        }
-
-
                         await TimerComponent.Instance.WaitAsync(1); //等待一帧 让渲染完成后在执行完成逻辑
                         callback?.Invoke(uiPanel);
 
@@ -636,14 +629,16 @@ namespace Fort23.Mono
 
                         if (isShowBG)
                         {
+                            if (!AllShowBGUIs.Contains(uiPanel))
+                                AllShowBGUIs.Add(uiPanel);
                             var popupPanel = GetComponent(BackgroundPanelType) as UIPanel;
-                            // popupPanel.transform.SetAsFirstSibling();
                             int index01 = uiPanel.GObjectPoolInterface.transform.GetSiblingIndex();
                             popupPanel.transform.SetSiblingIndex(index01 - 1);
-                            // uiPanel.IsShowCustomBGPanel = true;
-                            // if (!AllShowBGUIs.Contains(uiPanel))
-                            //     AllShowBGUIs.Add(uiPanel);
-                            // await GetBackgroundPanel(uiPanel, GetLayer(layer));
+                        }
+
+                        if (current != null)
+                        {
+                            SetEventSystemEnable(true);
                         }
 
                         return uiPanel;

Assets/Scripts/Core/UI/UTool/UIAdapter/UIAdapterForSafeArea.cs

@@ -9,6 +9,8 @@ namespace Utility.UIAdapter
         {
             Left,
             Right,
+            Up,
+            Down,
         }
 
         [Header("固定偏移")] public float offsetX;
@@ -52,7 +54,23 @@ namespace Utility.UIAdapter
             var safeArea = Screen.safeArea;
             float ratio = _canvasScaler.referenceResolution.y * _canvasScaler.matchWidthOrHeight / Screen.height -
                           _canvasScaler.referenceResolution.x * (_canvasScaler.matchWidthOrHeight - 1) / Screen.width;
-            if (anchorPointType == AnchorPointType.Left)
+            if (anchorPointType == AnchorPointType.Up)
+            {
+                if (safeArea.yMin > 0)
+                {
+                    if (offsetX > 0)
+                    {
+                        myRectTransform.anchoredPosition =
+                            new Vector2(anchoredPosition.x , anchoredPosition.y- offsetX);
+                    }
+                    else
+                    {
+                        myRectTransform.anchoredPosition =
+                            new Vector2(anchoredPosition.x , anchoredPosition.y- safeArea.yMin * ratio);
+                    }
+                }
+            }
+            else if (anchorPointType == AnchorPointType.Left)
             {
                 if (safeArea.xMin > 0)
                 {
@@ -68,7 +86,7 @@ namespace Utility.UIAdapter
                     }
                 }
             }
-            else
+            else if (anchorPointType == AnchorPointType.Right)
             {
                 if (safeArea.xMin > 0)
                 {

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -64,7 +64,7 @@ namespace GameLogic.Combat.CombatType
         {
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
             await TestCombat(cTaskAwaitBuffer);
-
+           
             await cTaskAwaitBuffer.WaitAll();
             CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
         }
@@ -154,7 +154,11 @@ namespace GameLogic.Combat.CombatType
             heroEntity.isCreateHeroHp = index != 0;
             Vector3 pos = startPos + quaternion * enemyHeroPosOff[index];
             cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatHeroAi(), heroInfo, pos,
-                delegate(CombatHeroEntity entity) { combatController.CombatHeroController.AddHero(entity); }));
+                delegate(CombatHeroEntity entity)
+                {
+                    combatController.CombatHeroController.AddHero(entity);
+                    entity.CombatAIBasic.ChangeState(CombatHeroStateType.Active);
+                }));
         }
 
         protected override void ProUpdate(float t)
@@ -182,10 +186,11 @@ namespace GameLogic.Combat.CombatType
             heroEntity.number = 0;
 
             HeroInfo heroInfo = PlayerManager.Instance.myHero;
-            if (_startCombatInfo.levelBattleId== 10001)
+            if (_startCombatInfo.levelBattleId == 10001)
             {
                 heroInfo = PlayerManager.Instance.yindaoHeroData;
             }
+
             if (CombatController.currActiveCombat.playerHeroEntity != null)
             {
                 GameObjectPool gameObjectPool = CombatController.currActiveCombat.playerHeroEntity.combatHeroGameObject
@@ -204,8 +209,6 @@ namespace GameLogic.Combat.CombatType
             }
             else
             {
-                
-
                 Vector3 heroPoint = CombatController.currActiveCombat.CombatSenceController.GetTarget(0);
                 CombatController.currActiveCombat.MagicWeaponCombatSence.SetMagicWeaponCombatSence(heroPoint,
                     Vector3.forward);

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs

@@ -95,6 +95,10 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
 
 
         poolInterface.own.transform.position = pos;
+        if (IsEnemy)
+        {
+            poolInterface.own.SetActive(false);
+        }
         // if (!IsEnemy)
         // {
         //     GameObjectPool fx_hero_quan =
@@ -167,7 +171,7 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
         //     combatHeroAnimtion = new CombatHeroGPUAnimtion();
         // }
 
-        poolInterface.own.SetActive(true);
+      
         combatHeroAnimtion.Init(this);
         CombatAIBasic.ChangeState(CombatHeroStateType.XiuMian);
         if (isCreateHeroHp)
@@ -179,8 +183,9 @@ public class CombatHeroEntity : ShowBaiscEntity, ITimeLineAnimtion, ITimeLineGet
 
         await heroMagicWeaponControl.InitMagicWeapon(this, isPlayer);
         CombatReportManager.Instance.AddCombatReportInfo(this);
+        poolInterface.own.SetActive(true);
         callBack?.Invoke(this);
-
+      
         return this;
     }
 

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroActiveState.cs

@@ -1,5 +1,6 @@
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using Fort23.UTool;
+using GameLogic.Combat.CombatTool;
 using UnityEngine;
 
 namespace GameLogic.Combat.Hero.State
@@ -15,52 +16,44 @@ namespace GameLogic.Combat.Hero.State
         {
         }
 
-        public override bool IsUpdateLockTarget()
-        {
-            return false;
-        }
 
         protected override void ProEnter()
         {
-            stratPos = combatHeroEntity.dotPos;
-            currTime = 0;
-            // endpos
-            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_gw_dunguang_loop.prefab",
-                delegate(ParticleSystemPool obj)
-                {
-                    loopFx = obj;
-                    obj.own.transform.position = stratPos;
-                });
-            // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
-            // // TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
-            // //     combatHeroEntity.combatHeroTimeLineControl.TimeLineData
-            // //         .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>("jihuo", null);
-            // // if (timeLineEventLogicGroup != null)
-            // // {
-            // //     timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
-            // //     timeLineEventLogicGroup.TimeLineUpdateEnd = delegate
-            // //     {
-            // //         // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
-            // //         combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
-            // //         combatHeroEntity.CombatAIBasic.isAlert = false;
-            // //     };
-            // //     combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
-            // // }
-            // // else
-            // // {
-            // //     // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
-            // //     combatHeroEntity.CombatAIBasic.isAlert = false;
-            // //     combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
-            // // }
+            if (combatHeroEntity.IsEnemy)
+            {
+                combatHeroEntity.GameObject.SetActive(false);
+                stratPos = combatHeroEntity.dotPos+CombatController.currActiveCombat.playerHeroEntity.faceDir*100;
+                endpos = combatHeroEntity.dotPos;
+                currTime = 0;
+                GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_gw_dunguang_loop.prefab",
+                    delegate(ParticleSystemPool obj)
+                    {
+                        loopFx = obj;
+                        obj.own.transform.position = stratPos;
+                    });
+            }
+            else
+            {
+                combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+            }
         }
 
         protected override void ProUpdate(float t)
         {
-            currTime += t;
-            if (currTime > 2)
+            currTime += t*1.3f;
+            if (loopFx != null)
+            {
+                loopFx.own.transform.position = Vector3.Lerp(stratPos, endpos, currTime);
+            }
+
+            if (currTime > 1)
             {
+                combatHeroEntity.GameObject.SetActive(true);
                 GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_gw_dunguang_show.prefab",
-                    delegate(ParticleSystemPool obj) { obj.own.transform.position = stratPos; });
+                    delegate(ParticleSystemPool obj)
+                    {
+                        obj.own.transform.position = endpos;
+                    });
                 GObjectPool.Instance.Recycle(loopFx);
                 combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
             }

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -26,6 +26,8 @@ namespace GameLogic.Combat
             assetHandle.AssetObject<GameObject>().SetActive(true);
             EventManager.Instance.AddEventListener(CustomEventType.ShowLoadingUI, ShowLoadingUI);
             EventManager.Instance.AddEventListener(CustomEventType.CloseLoadingUI, CloseLoadingUI);
+            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_gw_dunguang_loop.prefab", Prestore: true);
+            GObjectPool.Instance.FetchAsync<ParticleSystemPool>("fx_gw_dunguang_show.prefab", Prestore: true);
 
             // 
         }
@@ -34,10 +36,12 @@ namespace GameLogic.Combat
         {
             LoadingPanel.OpenLodingPanel();
         }
+
         private void CloseLoadingUI(IEventData eventData)
         {
             UIManager.Instance.HideUIUIPanel<LoadingPanel>();
         }
+
         public void AddCombatController(CombatController combatController)
         {
             this.CombatController = combatController;
@@ -67,7 +71,8 @@ namespace GameLogic.Combat
             StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
         }
 
-        public async CTask LoadLevelBattleCombat(int levelBattleId, bool isCombatOverUi,int level, System.Action<bool> caombatFinish = null)
+        public async CTask LoadLevelBattleCombat(int levelBattleId, bool isCombatOverUi, int level,
+            System.Action<bool> caombatFinish = null)
         {
             await MarskPanel.OpenPanel();
             UIManager.Instance.HindCurrAllShowPanel();
@@ -76,7 +81,7 @@ namespace GameLogic.Combat
             startCombatInfo.CombatType = CombatType.CombatType.LevelBattle;
             startCombatInfo.isCombatOverUi = isCombatOverUi;
             startCombatInfo.monsterLevel = level;
-            startCombatInfo.levelBattleId= levelBattleId;
+            startCombatInfo.levelBattleId = levelBattleId;
             startCombatInfo.isAutoCombat = AccountFileInfo.Instance.playerData.isAutoCombat;
             await StartCombat(startCombatInfo);
 

Assets/Scripts/GameUI/UI/CombatPanel/DuiPingWidget.cs

@@ -46,12 +46,13 @@ namespace Fort23.Mono
             Vector3 p = UIManager.Instance.CurrCustomCameraStack.camera.WorldToScreenPoint(worldPos);
             Vector3 p2 = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
             transform.position = p2;
+            icon.color = combatMagicWeaponEntity.IsEnemy ? new Color(0.88f, 0.13f, 0.11f):new Color(0.43f, 0.87f, 0.52f);
         }
 
         public void UpdateHp()
         {
             float bl = combatMagicWeaponEntity.HpBl / combatMagicWeaponEntity.MaxHp;
-            rectTransform.sizeDelta = new Vector2(100 * bl, 9);
+            rectTransform.sizeDelta = new Vector2(99 * bl, 8);
         }
     }
 }

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -157,22 +157,7 @@ namespace Fort23.Mono
 
                 Text_Eventcondition.text = desc;
             }
-
-            // if (eventList.isCompleted)
-            // {
-            //     Text_Go.text = LanguageManager.Instance.Text(10240);
-            //     Btn_Go.image.color = new Color32(200, 199, 199, 255);
-            // }
-            // else if (eventList.isCompleted1)
-            // {
-            //     Text_Go.text = LanguageManager.Instance.Text(10157);
-            //     Btn_Go.image.color = new Color32(179, 39, 65, 255);
-            // }
-            // else
-            // {
-            //     Btn_Go.image.color = new Color32(206, 168, 105, 255);
-            // }
-
+            
 
             Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId !=
                                               eventList.guid);

Assets/Scripts/GameUI/UI/GuidePanel/PlayerGuideManager.cs

@@ -539,7 +539,7 @@ namespace Fort23.Mono
                 return;
             }
 
-            UIManager.Instance.SetEventSystemEnable(false);
+            // UIManager.Instance.SetEventSystemEnable(false);
 
 
             curPhase = phase;
@@ -551,7 +551,7 @@ namespace Fort23.Mono
             GuidePanel guildPanel =
                 await UIManager.Instance.LoadAndOpenPanel<GuidePanel>(null, UILayer.Top, isFocus: false);
             dialogBox.Init();
-            UIManager.Instance.SetEventSystemEnable(true);
+            // UIManager.Instance.SetEventSystemEnable(true);
 
             finger = guildPanel.GuideHand;
             fxTrans01 = guildPanel.FocusFrame01;
@@ -754,7 +754,7 @@ namespace Fort23.Mono
             SetBlackAlpha(guideConfig.blackAlpha);
             ShowDialogBox(action, str);
             await dialogBox.SetDiTex(guideConfig, guideConfig.SpeakerImage);
-            UIManager.Instance.SetEventSystemEnable(true);
+            // UIManager.Instance.SetEventSystemEnable(true);
         }
 
         /// <summary>
@@ -1215,7 +1215,7 @@ namespace Fort23.Mono
         /// </summary>
         public void StepInit()
         {
-            UIManager.Instance.SetEventSystemEnable(false);
+           
             _customVectorTween?.Kill();
             _customVectorTween = null;
             UIManager.Instance.GetComponent<GuidePanel>().transform.SetAsLastSibling();

Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiInfoPanel.cs

@@ -56,6 +56,7 @@ namespace Fort23.Mono
             }
 
 
+            List<ItemInfo> itemInfos = new List<ItemInfo>();
             foreach (var qiankundaiConfig in qiankundaiConfigs)
             {
                 for (var i = 0; i < qiankundaiConfig.ChoukaID.Length; i++)
@@ -64,6 +65,7 @@ namespace Fort23.Mono
                     {
                         List<ItemInfo> itemInfo = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i],
                             qiankundaiConfig.DropCount[i]);
+                        itemInfos.AddRange(itemInfo);
                         foreach (var info in itemInfo)
                         {
                             WidgetItem widgetItem =
@@ -77,15 +79,32 @@ namespace Fort23.Mono
                         DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(qiankundaiConfig.ChoukaID[i]);
                         foreach (var i1 in dropConfig.showItemId)
                         {
-                            WidgetItem widgetItem =
-                                await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
-                            widgetItem.InitWidget(new ItemInfo(i1, 0));
-                            items.Add(widgetItem);
+                            itemInfos.Add(new ItemInfo(i1, 0));
+                            // WidgetItem widgetItem =
+                            //     await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
+                            // widgetItem.InitWidget(new ItemInfo(i1, 0));
+                            // items.Add(widgetItem);
                         }
                     }
                 }
             }
 
+
+            using (CTaskAwaitBuffer<WidgetItem> cta = new CTaskAwaitBuffer<WidgetItem>())
+            {
+                foreach (var itemInfo in itemInfos)
+                {
+                    cta.AddTask(UIManager.Instance.CreateGComponent<WidgetItem>(null, Content));
+                  
+                }
+                items = await cta.WaitAll();
+            }
+
+            for (var i = 0; i < itemInfos.Count; i++)
+            {
+                items[i].InitWidget(itemInfos[i]);
+            }
+
             return await base.AsyncInit(uiData);
         }
 

Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiPanel.cs

@@ -73,7 +73,7 @@ namespace Fort23.Mono
 
                 RewardsPanel.OpenPanel(itemInfos);
                 CustomInit();
-                
+
                 RedDotManager.Instance.AllRedDotUpDate();
             });
 
@@ -94,14 +94,16 @@ namespace Fort23.Mono
             }
 
             items.Clear();
-   
+
             Text_Desc.text =
                 LanguageManager.Instance.Text(10172,
                     UtilTools.TimeToHSM(AccountFileInfo.Instance.playerData.QiankundaiDropTimer),
                     UtilTools.TimeToHSM(PlayerManager.Instance.gameConstantConfig.qiankundaiMaxTime));
-    
-            
-            
+
+
+            List<ItemInfo> itemInfos = new List<ItemInfo>();
+
+
             //可以掉落每日刷新奖励
             if (TimeHelper.ClientNow() >= AccountFileInfo.Instance.playerData.QiankundaiLingQuDailyDropTime)
             {
@@ -112,24 +114,32 @@ namespace Fort23.Mono
                     {
                         List<ItemInfo> itemInfo = DropManager.Instance.Drop(qiankundaiConfig.ChoukaID[i],
                             qiankundaiConfig.DropCount[i]);
-                        foreach (var info in itemInfo)
-                        {
-                            WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
-                            widgetItem.InitWidget(info);
-                            items.Add(widgetItem);
-                        }
+                        itemInfos.AddRange(itemInfo);
+          
                     }
                 }
             }
-            
-            
+
+
             foreach (var playerDataQiankundaiItemData in AccountFileInfo.Instance.playerData.QiankundaiItemDatas)
             {
-                WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, Content);
-                widgetItem.InitWidget(new ItemInfo(playerDataQiankundaiItemData));
-                items.Add(widgetItem);
+                itemInfos.Add(new ItemInfo(playerDataQiankundaiItemData));
+   
             }
 
+            using (CTaskAwaitBuffer<WidgetItem> cta = new CTaskAwaitBuffer<WidgetItem>())
+            {
+                for (var i = 0; i < itemInfos.Count; i++)
+                {
+                    cta.AddTask(UIManager.Instance.CreateGComponent<WidgetItem>(null, Content));
+                }
+                items = await cta.WaitAll();
+            }
+
+            for (var i = 0; i < itemInfos.Count; i++)
+            {
+                items[i].InitWidget(itemInfos[i]);
+            }
         }
 
         public static async CTask OpenPanel()

Assets/Scripts/GameUI/UI/ShopPanel/ShopGroupWidgetType1.cs

@@ -45,7 +45,8 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    Text_RefenceTime.text = PlayerManager.TimeToHSM((this.shopData.refreshTime - PlayerManager.Instance.serverTime) / 1000);
+                    Text_RefenceTime.text =
+                        PlayerManager.TimeToHSM((this.shopData.refreshTime - PlayerManager.Instance.serverTime) / 1000);
                 }
             }
         }
@@ -70,7 +71,8 @@ namespace Fort23.Mono
             Text_Title.text = LanguageManager.Instance.Text(_shopConfig.shopName);
             if (this.shopData.refreshTime != -1)
             {
-                Text_RefenceTime.text = PlayerManager.TimeToHSM((this.shopData.refreshTime - PlayerManager.Instance.serverTime) / 1000);
+                Text_RefenceTime.text =
+                    PlayerManager.TimeToHSM((this.shopData.refreshTime - PlayerManager.Instance.serverTime) / 1000);
                 RefenceTimeRoot.gameObject.SetActive(true);
             }
             else
@@ -79,21 +81,36 @@ namespace Fort23.Mono
             }
 
 
-            foreach (var shopItem in shopData.shopItemList)
+            using (CTaskAwaitBuffer<ShopItemWidgetType2> cts = new CTaskAwaitBuffer<ShopItemWidgetType2>())
             {
-                // if (shopData.id == 1 || shopData.id == 5)
-                // {
-                //     ShopItemWidgetType1 shopItemWidgetType1 = await UIManager.Instance.CreateGComponent<ShopItemWidgetType1>(null, Connect);
-                //     shopItemWidgetType1.CustomInit(shopItem);
-                //     _shopItemWidgetType1s.Add(shopItemWidgetType1);
-                // }
-                // else
+                foreach (var shopItem in shopData.shopItemList)
                 {
-                    ShopItemWidgetType2 shopItemWidgetType1 = await UIManager.Instance.CreateGComponent<ShopItemWidgetType2>(null, Connect);
-                    shopItemWidgetType1.CustomInit(shopItem);
-                    _shopItemWidgetType2s.Add(shopItemWidgetType1);
+                    cts.AddTask(UIManager.Instance.CreateGComponent<ShopItemWidgetType2>(null, Connect));
                 }
+
+                _shopItemWidgetType2s = await cts.WaitAll();
             }
+
+            for (var i = 0; i < shopData.shopItemList.Count; i++)
+            {
+                _shopItemWidgetType2s[i].CustomInit(shopData.shopItemList[i]);
+            }
+
+            // foreach (var shopItem in shopData.shopItemList)
+            // {
+            //     // if (shopData.id == 1 || shopData.id == 5)
+            //     // {
+            //     //     ShopItemWidgetType1 shopItemWidgetType1 = await UIManager.Instance.CreateGComponent<ShopItemWidgetType1>(null, Connect);
+            //     //     shopItemWidgetType1.CustomInit(shopItem);
+            //     //     _shopItemWidgetType1s.Add(shopItemWidgetType1);
+            //     // }
+            //     // else
+            //     {
+            //         ShopItemWidgetType2 shopItemWidgetType1 = await UIManager.Instance.CreateGComponent<ShopItemWidgetType2>(null, Connect);
+            //         shopItemWidgetType1.CustomInit(shopItem);
+            //         _shopItemWidgetType2s.Add(shopItemWidgetType1);
+            //     }
+            // }
             LayoutRebuilder.ForceRebuildLayoutImmediate(Connect);
             LayoutRebuilder.ForceRebuildLayoutImmediate(transform);
         }

UserSettings/EditorUserSettings.asset

@@ -54,13 +54,13 @@ EditorUserSettings:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd88908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c928797a7cf
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a560393d3511ea7046333e09f7181d02f50a06241708ee0b05bd4a435f95548717f73713d91006c1c309d0effad0d2f9ddffa5828e91f0beb6fdd1cbfceba0b9f0b3bed8e8f5ace1ff8c978883d3f59e98969d89eacfcc
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
       value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b9859884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec879c8395949c9483d68a8d97ddbd90bf
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd3c3e302a07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd88908fecb0f9cfddf1eff4e7a1b1eae482f0fca9e5e1928b86d888ed909a938797a7cf
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b7968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af9f8aaffff8e85dd8390e392998899daa7
       flags: 0
     UnityEditor.ShaderGraph.ToggleSettings:
       value: 18135d1527590858060c032302276919051e1a26296a7c243f3c187fa0e92708f0e220e0e22d09352a0bed30017c5b2be01f0c47b40219221f1ded0b12eb1f0127cc0bcc18c41a5e910d0edbc85193e0dadadbf8e8f9e8ced7dba5e0b6aaaca4dbfeabfef4eae1