修改功法法宝提示，修改引导bug

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -791,8 +791,12 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
                 onCompleteCallback?.Invoke();
                 onCompleteCallback = null;
-                await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
-                UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
+                if (eventConfig.ID != 10001)
+                {
+                    await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
+                    UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
+                }
+     
                 EventManager.Instance.Dispatch(CustomEventType.CompleteUpdate, null);
             }
 

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

@@ -213,9 +213,12 @@ namespace Fort23.Mono
                 return;
             AudioManager.Instance.PlayAudio("ui_shengshitansuo.wav");
             if (PlayerGuideManager.Instance.curPhase == 2)
+            {
                 PlayerGuideManager.Instance.StepInit();
-            if (PlayerGuideManager.Instance.curPhase == 3)
-                PlayerGuideManager.Instance.StepInit();
+                PlayerGuideManager.Instance.SetOnClickMask(true);
+            }
+                
+    
 
             EventSystemManager.Instance.isTriggerEvent = true;
             CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase2.cs

@@ -136,7 +136,7 @@ namespace Fort23.Mono.Phases
         {
             pgm.StepInit();
             await TimerComponent.Instance.WaitAsync(100);
-
+            PlayerGuideManager.Instance.SetOnClickMask(false);
             GameObject gameObject =
                 UIManager.Instance.GetComponent<DivineSenceEventPreviewPanel>().ContentRoot.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase3.cs

@@ -128,8 +128,9 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep302(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
-
+            PlayerGuideManager.Instance.SetOnClickMask(false);
             GameObject gameObject =
                 UIManager.Instance.GetComponent<DivineSenceEventPreviewPanel>().ContentRoot.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase4.cs

@@ -108,8 +108,8 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep402(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
-
             Vector2 size = new Vector2(735, 785);
             Vector3 localPos = new Vector2(0, -279);
             pgm.SetfxTransVisiable(true);
@@ -120,6 +120,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(localPos);
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
 
 
@@ -130,9 +131,9 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep403(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
 
-
             pgm.SetfxTransVisiable(true);
 
             Vector2 size = new Vector2(743, 690);
@@ -143,6 +144,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(localPos);
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
 
         /// <summary>
@@ -152,8 +154,9 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep404(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
-
+        
             GameObject gameObject =
                 UIManager.Instance.GetComponent<SkillSelectPanel>().Btn_Setting.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
@@ -167,6 +170,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
 
 
@@ -177,6 +181,7 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep405(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
 
             SkillSelectPanel skillSelectPanel =
@@ -204,6 +209,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
 
         /// <summary>
@@ -213,8 +219,9 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep406(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
-
+            PlayerGuideManager.Instance.SetOnClickMask(false);
 
             await pgm.ConfigLogic(406, delegate() { pgm.NextGuide(); });
         }
@@ -227,6 +234,7 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep407(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
 
             GameObject gameObject =
@@ -242,6 +250,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
         
         /// <summary>
@@ -251,6 +260,7 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep408(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
             SkillSelectPanel skillSelectPanel =
                 UIManager.Instance.GetComponent<SkillSelectPanel>();
@@ -275,6 +285,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
 
         
@@ -285,6 +296,7 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep409(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
 
             GameObject gameObject =
@@ -300,6 +312,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
 
 
@@ -310,6 +323,7 @@ namespace Fort23.Mono.Phases
         public async CTask OnStep410(UnityEngine.Object obj)
         {
             pgm.StepInit();
+            PlayerGuideManager.Instance.SetOnClickMask(true);
             await TimerComponent.Instance.WaitAsync(100);
 
             GameObject gameObject =
@@ -325,6 +339,7 @@ namespace Fort23.Mono.Phases
 
             pgm.SetFingerPos(pgm.Setpos(localPos, size, gameObject));
             pgm.SetFingerVisiable(true);
+            PlayerGuideManager.Instance.SetOnClickMask(false);
         }
 
         public async CTask OnStepEnd(UnityEngine.Object obj)

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

@@ -5,6 +5,8 @@ using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
+using GameLogic.Hero;
+using Utility;
 
 namespace Fort23.Mono
 {
@@ -33,6 +35,7 @@ namespace Fort23.Mono
             {
                 PlayerGuideManager.Instance.NextGuide();
             }
+
             return base.GetFocus();
         }
 
@@ -50,7 +53,40 @@ namespace Fort23.Mono
             itemWidget.InitWidget(new ItemInfo(_shopItemConfig.itemId[0], _shopItemConfig.itemCount[0]));
             ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(_shopItemConfig.itemId[0]);
             Text_name.text = LanguageManager.Instance.Text(itemConfig.itemName);
-            Text_desc.text = LanguageManager.Instance.Text(itemWidget.itemInfo.config.itemDesc);
+
+
+            //法宝
+            if (itemWidget.itemInfo.config.itemTag == 11)
+            {
+                AccountFileInfo.FaBaoData faaData = new AccountFileInfo.FaBaoData();
+                faaData.id = itemWidget.itemInfo.config.associateVlaue[1];
+                faaData.level = 1;
+                faaData.useIndex = -1;
+                FaBaoInfo faBaoInfo = new FaBaoInfo(faaData);
+                Text_desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec),
+                    faBaoInfo.effectValue);
+            }
+            //功法
+            else if (itemWidget.itemInfo.config.itemTag == 13)
+            {
+                AccountFileInfo.SkillData skillData = new AccountFileInfo.SkillData();
+                skillData.id = itemWidget.itemInfo.config.associateVlaue[1];
+                skillData.star = 1;
+                skillData.level = 1;
+                skillData.useIndex = -1;
+                SkillInfo skillInfo = new SkillInfo(skillData);
+
+                SkillConfig skillConfig =
+                    ConfigComponent.Instance.Get<SkillConfig>(itemConfig.associateVlaue[1] * 10 + 1);
+                Text_desc.text =
+                    UtilTools.GetString(LanguageManager.Instance.Text(skillConfig.dec), skillInfo.effectValue);
+            }
+            else
+            {
+                Text_desc.text = LanguageManager.Instance.Text(itemWidget.itemInfo.config.itemDesc);
+            }
+
+
             Text_ItemCount.text =
                 "当前持有：" + PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.itemId[0]);
             // UseSlider.value = 1;
@@ -156,7 +192,7 @@ namespace Fort23.Mono
         {
             _buyMark = true;
             UIManager.Instance.HideUIUIPanel(this);
-            
+
             if (PlayerGuideManager.Instance.GuideIsCanDo(7, 6))
             {
                 PlayerGuideManager.Instance.NextGuide();