更新引导

ProjectNLD/Assets/Code/Scripts/Framework/Event/Events.cs

@@ -436,6 +436,10 @@
             /// 取消角色上阵
             /// </summary>
             Guide_CancelModeFight,
+            /// <summary>
+            /// 引导等待事件
+            /// </summary>
+            Guide_Wait,
             #endregion
         }
     }

ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideComplete.cs

@@ -1168,4 +1168,24 @@ namespace Gameplay.Guide
             EventManager.Instance.Unregister(EventManager.EventName.Guide_JoinVehicle, Complete);
         }
     }
+
+    /// <summary>
+    /// 等待完成
+    /// </summary>
+    internal sealed class WaitComplete : GuideCompleteBase
+    {
+        public WaitComplete(DataGuideCfg cfg, Action complete) : base(cfg, complete)
+        {
+        }
+
+        public override void AddListener()
+        {
+            EventManager.Instance.Register(EventManager.EventName.Guide_Wait, Complete);
+        }
+
+        public override void RemoveListener()
+        {
+            EventManager.Instance.Unregister(EventManager.EventName.Guide_Wait, Complete);
+        }
+    }
 }

ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideStep.cs

@@ -99,6 +99,7 @@ namespace Gameplay.Guide
                 E_GuideCompleteType.ClearTeamComplete => new ClearTeamComplete(Cfg, Complete),
                 E_GuideCompleteType.SelectTeamComplete => new SelectTeamComplete(Cfg, Complete),
                 E_GuideCompleteType.SkillCDComplete => new SkillCDComplete(Cfg, Complete),
+                E_GuideCompleteType.WaitComplete => new WaitComplete(Cfg, Complete),
                 _ => throw new Exception($"未处理类型:{Cfg.GuideCompleteType}"),
             };
         }
@@ -858,6 +859,7 @@ namespace Gameplay.Guide
                 base.DoGuide();
 
                 UIManager.Instance.CloseWindow(UINameConst.UI_Guide);
+                LevelManager.Instance.CurrentLevel.SetPause(false);
             }
             catch (Exception e)
             {
@@ -936,6 +938,7 @@ namespace Gameplay.Guide
                 base.DoGuide();
 
                 await UI_GuideController.Open(isFullMask);
+                EventManager.Instance.Send(EventManager.EventName.Guide_Wait);
             }
             catch (Exception e)
             {

ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Guide/UI_GuideController.cs

@@ -540,6 +540,9 @@ public class UI_GuideController : UIWindow
             if (isSetTipText)
                 textTip.text = CommonUtils.GetLocalizeText(E_LocalizePrefix.Guide, cfg.Id);
 
+            rtsTip.pivot = Vector2.one * 0.5f;
+            rtsTip.anchoredPosition = Vector2.zero;
+
             rtsSliderArrowFinger.pivot = Vector2.zero;
             DOTween.To(() => rtsSliderArrowFinger.pivot, x => rtsSliderArrowFinger.pivot = x, new Vector2(0, 1f), 2f).SetLoops(-1, LoopType.Restart);
 

ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/GuideCfg/E_GuideCompleteType.cs

@@ -143,6 +143,10 @@ namespace cfg.GuideCfg
         /// 技能冷却完成
         /// </summary>
         SkillCDComplete = 32,
+        /// <summary>
+        /// 等待完成
+        /// </summary>
+        WaitComplete = 33,
     }
 
 } 

ProjectNLD/Assets/Config/Data/guidecfg_guideconfig.json

@@ -1473,6 +1473,25 @@
     "IsBeginStep": false,
     "IsComplete": false,
     "StepStartDelay": 4,
+    "GuideStepType": 12,
+    "GuideTypeParams": [],
+    "GuideCompleteType": 33,
+    "CompleteTypeParams": [],
+    "ArrowDirection": 0,
+    "ArrowOffset": {
+      "x": 0,
+      "y": 0
+    },
+    "TipKey": ""
+  },
+  {
+    "Id": 613,
+    "GroupId": 600,
+    "BeginCondition": [],
+    "NextId": 614,
+    "IsBeginStep": false,
+    "IsComplete": false,
+    "StepStartDelay": 0,
     "GuideStepType": 4,
     "GuideTypeParams": [
       "LevelSceneUI/UI_StartBtn_CMSBtn",
@@ -1489,10 +1508,10 @@
     "TipKey": ""
   },
   {
-    "Id": 613,
+    "Id": 614,
     "GroupId": 600,
     "BeginCondition": [],
-    "NextId": 614,
+    "NextId": 615,
     "IsBeginStep": false,
     "IsComplete": false,
     "StepStartDelay": 0,
@@ -1510,7 +1529,7 @@
     "TipKey": ""
   },
   {
-    "Id": 614,
+    "Id": 615,
     "GroupId": 600,
     "BeginCondition": [],
     "NextId": 700,