修改引导bug

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -42,7 +42,7 @@ namespace Fort23.Mono
         {
             Btn_Shop.onClick.AddListener(async () => { Btn_Shop_Click(); });
 
-            bnt_shengShi.onClick.AddListener(() => { Bnt_ShengShi_Click();});
+            bnt_shengShi.onClick.AddListener(() => { Bnt_ShengShi_Click(); });
             Btn_GongFa.onClick.AddListener(async () => { Btn_GongFa_Click(); });
             Btn_HeroInfomation.onClick.AddListener(async () => { Btn_HeroInfomation_Click(); });
             Btn_DongFu.onClick.AddListener(async () => { Bne_dongfu_Click(); });
@@ -82,14 +82,14 @@ namespace Fort23.Mono
 
         public async void Bnt_ShengShi_Click()
         {
-            await DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); }); 
-            
-            if (PlayerGuideManager.Instance.GuideIsCanDo(1,1))
+            await DivineSenceInfoPanel.OpenPanel((count, useItems) => { Bnt_shengShi_onClick(count, useItems); });
+
+            if (PlayerGuideManager.Instance.GuideIsCanDo(1, 1))
             {
-                 PlayerGuideManager.Instance.NextGuide();
+                PlayerGuideManager.Instance.NextGuide();
             }
         }
-        
+
         public async void Btn_Shop_Click()
         {
             if (currentOpenUIPanel is ShopPanel)
@@ -101,7 +101,8 @@ namespace Fort23.Mono
 
             CombatDrive.Instance.CombatController.isUpdate = false;
             ShopPanel shopPanel = await ShopPanel.OpenPanel();
-            if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel || uiPanel is MainHeroPanel)
+            if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel ||
+                uiPanel is MainHeroPanel)
             {
                 UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
             }
@@ -121,7 +122,8 @@ namespace Fort23.Mono
 
             UIPanel uiPanel = currentOpenUIPanel;
             SkillSelectPanel skillSelectPanel = await SkillSelectPanel.OpenSkillSelectPanel();
-            if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel || uiPanel is MainHeroPanel)
+            if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel ||
+                uiPanel is MainHeroPanel)
             {
                 UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
             }
@@ -137,7 +139,8 @@ namespace Fort23.Mono
 
             UIPanel uiPanel = currentOpenUIPanel;
             MainHeroPanel mainHeroPanel = await MainHeroPanel.OpenPanel();
-            if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel || uiPanel is MainHeroPanel)
+            if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel ||
+                uiPanel is MainHeroPanel)
             {
                 UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
             }
@@ -156,7 +159,8 @@ namespace Fort23.Mono
             UIPanel uiPanel = currentOpenUIPanel;
             CombatDrive.Instance.CombatController.isUpdate = false;
             CaveMainPanel heroInformationPanel = await CaveMainPanel.OpenPanel();
-            if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel || uiPanel is MainHeroPanel)
+            if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel ||
+                uiPanel is MainHeroPanel)
             {
                 UIManager.Instance.HideUIUIPanel(uiPanel, isBreadcrumbBarPanel: false);
             }
@@ -184,6 +188,8 @@ namespace Fort23.Mono
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
 
+            PlayerGuideManager.Instance.StepInit();
+
             EventSystemManager.Instance.isTriggerEvent = true;
             CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
             CombatController.currActiveCombat.CombatSenceController.StartPayShengShi(CombatController.currActiveCombat
@@ -194,6 +200,10 @@ namespace Fort23.Mono
             if (eventLists == null || eventLists.Count == 0)
             {
                 CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
+                if (PlayerGuideManager.Instance.GuideIsCanDo(1, 2))
+                {
+                    PlayerGuideManager.Instance.NextGuide();
+                }
                 return;
             }
 
@@ -203,6 +213,10 @@ namespace Fort23.Mono
                 await DivineSenceEventPreviewPanel.OpenPanel();
             }
 
+            if (PlayerGuideManager.Instance.GuideIsCanDo(1, 2))
+            {
+                PlayerGuideManager.Instance.NextGuide();
+            }
 
             CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
             EventManager.Instance.Dispatch(CustomEventType.ShengShiOnClick, null);
@@ -217,7 +231,8 @@ namespace Fort23.Mono
                 BtnRoot.gameObject.SetActive(true);
                 currentOpenUIPanel = uiPanel;
             }
-            else if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel || uiPanel is MainHeroPanel)
+            else if (uiPanel is CaveMainPanel || uiPanel is SkillSelectPanel || uiPanel is ShopPanel ||
+                     uiPanel is MainHeroPanel)
             {
                 Btn_Back.gameObject.SetActive(true);
                 bnt_shengShi.gameObject.SetActive(false);

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

@@ -58,10 +58,7 @@ namespace Fort23.Mono
 
                 callback?.Invoke(useCount, useItems);
                 UIManager.Instance.HideUIUIPanel(this);
-                if (PlayerGuideManager.Instance.GuideIsCanDo(1,2))
-                {
-                    PlayerGuideManager.Instance.NextGuide();
-                }
+            
             });
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
             Slider_Count.onValueChanged.AddListener((c) => { Slider_Count_OnValueChanged(c); });