DESKTOP-FB72PO8\Administrator 19 godzin temu
rodzic
commit
18885a6c9a

+ 1 - 1
Assets/Scripts/GameLogic/Combat/CombatState/CombatUpdateState.cs

@@ -72,7 +72,7 @@ namespace GameLogic.Combat.CombatState
                 CombatController.currActiveCombat.CombatHeroController.GetHero(true,out int maxCount);
             if (maxCount > 0)
             {
-                CombatController.ChangeState("fight");
+                // CombatController.ChangeState("fight");
                 return;
             }
             

+ 2 - 2
Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -122,8 +122,8 @@ namespace GameLogic.Combat.CombatTool
             CombatTypeBasic.Init(this, startCombatInfo);
             await CombatTypeBasic.StartGame();
 
-            ChangeState("update");
-            isUpdate = true;
+            ChangeState("idle");
+            isUpdate = true; 
             EventManager.Instance.AddEventListener(CustomEventType.RefreshFull, RefreshFull);
             CombatEventManager.Instance.Dispatch(CombatEventType.GameStart, null);
         }

+ 1 - 1
Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -106,7 +106,7 @@ namespace GameLogic.Combat
 
             // MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
             // mainPanel.transform.gameObject.SetActive(false);
-            CombatController.ChangeState(CombatController.update);
+            CombatController.ChangeState(CombatController.fight);
             await MarskPanel.ClosePanel();
         }
 

+ 1 - 1
Assets/Scripts/GameUI/UI/CombatPanel/CombatPanel.cs

@@ -30,7 +30,7 @@ namespace Fort23.Mono
         {
             zhuanPanLogic =
                 await UIManager.Instance.CreateGComponentForObject<ZhuanPanPanel>(ZhuanPanPanel, null, null);
-            zhuanPanLogic.ShowPanel();
+            await zhuanPanLogic.ShowPanel();
         }
 
         public override CTask GetFocus()

+ 3 - 1
Assets/Scripts/GameUI/UI/CombatPanel/ZhuanPanPanel.cs

@@ -24,7 +24,9 @@ namespace Fort23.Mono
         private Map<WuXingType, WuXingGongFaWidget> _wuXingGongFaWidgets = new Map<WuXingType, WuXingGongFaWidget>();
 
         private ParticleSystemPool fx_ui_zhuangPan;
-        public async CTask ShowPanel()
+   
+
+        public  async CTask ShowPanel()
         {
             GObjectPool.Instance.DormancyPool<ParticleSystemPool>("fx_ui_fb_shifang");
             GObjectPool.Instance.DormancyPool<ParticleSystemPool>("fx_ui_fb_Noshifang");