配置更新

2024-06-05 15:40:37 +08:00 · 2024-06-05 15:40:37 +08:00 · 03211701da
parent 6fc90b6b85
commit 03211701da
6 changed files with 94 additions and 123 deletions
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideGroup.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideGroup.cs
@ -123,7 +123,6 @@ namespace Gameplay.Guide
            return dataGuideCfg.GuideStepType switch
            {
                E_GuideStepType.PlayVideo => new PlayVideoStep(dataGuideCfg),
-                E_GuideStepType.PlayStoryline => new PlayStorylineStep(dataGuideCfg),
                E_GuideStepType.ClickButton => new ClickButtonStep(dataGuideCfg),
                E_GuideStepType.EnterHome => new EnterMainStateStep(dataGuideCfg),
                E_GuideStepType.ShowGuideTip => new ShowGuideTipStep(dataGuideCfg),
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideStep.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideStep.cs
@ -213,31 +213,6 @@ namespace Gameplay.Guide
        }
    }

-    /// <summary>
-    /// 播放剧情
-    /// </summary>
-    internal sealed class PlayStorylineStep : GuideStepBase
-    {
-        /// <summary>
-        /// 剧情关卡id
-        /// </summary>
-        private readonly int levelId;
-
-        public PlayStorylineStep(DataGuideCfg cfg) : base(cfg)
-        {
-            if (cfg.GuideTypeParams.Length <= 0)
-                throw new Exception($"引导id:{Cfg.Id}, 引导类型：{Cfg.GuideStepType}, 参数错误");
-
-            if (int.TryParse(cfg.GuideTypeParams[0], out int id))
-                levelId = id;
-        }
-
-        protected override void DoGuide()
-        {
-            LevelManager.Instance.TryEnterLevel(levelId);
-        }
-    }
-
    /// <summary>
    /// 切换主场景状态
    /// </summary>
--- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/GuideCfg/E_GuideCompleteType.cs
+++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/GuideCfg/E_GuideCompleteType.cs
@ -72,37 +72,33 @@ namespace cfg.GuideCfg
        /// </summary>
        LevelComplete = 14,
        /// <summary>
-        /// 等待时间结束
-        /// </summary>
-        WaitTimeComplete = 15,
-        /// <summary>
        /// 选择模式
        /// </summary>
-        SelectModel = 16,
+        SelectModel = 15,
        /// <summary>
        /// 选择章节
        /// </summary>
-        SelectChapter = 17,
+        SelectChapter = 16,
        /// <summary>
        /// 选择关卡
        /// </summary>
-        SelectLevel = 18,
+        SelectLevel = 17,
        /// <summary>
        /// 打开指挥官技能选择
        /// </summary>
-        OpenCommandSkill = 19,
+        OpenCommandSkill = 18,
        /// <summary>
        /// 关闭指挥官技能选择
        /// </summary>
-        CloseCommandSkill = 20,
+        CloseCommandSkill = 19,
        /// <summary>
        /// 角色升级
        /// </summary>
-        CharacterLevelUp = 21,
+        CharacterLevelUp = 20,
        /// <summary>
        /// 上阵载具完成
        /// </summary>
-        EmbattleVehicleComplete = 22,
+        EmbattleVehicleComplete = 21,
    }

 } 
--- a/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/GuideCfg/E_GuideStepType.cs
+++ b/ProjectNLD/Assets/Code/Scripts/GenCode/Luban/DataTable/GuideCfg/E_GuideStepType.cs
@ -16,61 +16,53 @@ namespace cfg.GuideCfg
        /// </summary>
        PlayVideo = 0,
        /// <summary>
-        /// 播放剧情
-        /// </summary>
-        PlayStoryline = 1,
-        /// <summary>
        /// 进入主场景
        /// </summary>
-        EnterHome = 2,
+        EnterHome = 1,
        /// <summary>
        /// 显示引导提示
        /// </summary>
-        ShowGuideTip = 3,
+        ShowGuideTip = 2,
        /// <summary>
        /// 点击按钮
        /// </summary>
-        ClickButton = 4,
+        ClickButton = 3,
        /// <summary>
        /// 进入关卡
        /// </summary>
-        EnterLevel = 5,
+        EnterLevel = 4,
        /// <summary>
        /// 关卡上阵
        /// </summary>
-        Embattle = 6,
+        Embattle = 5,
        /// <summary>
        /// 教学战斗移动
        /// </summary>
-        TeachFightMove = 7,
+        TeachFightMove = 6,
        /// <summary>
        /// 教学战斗攻击
        /// </summary>
-        TeachFightAttack = 8,
+        TeachFightAttack = 7,
        /// <summary>
        /// 教学战斗中上阵
        /// </summary>
-        TeachFightEmbattle = 9,
+        TeachFightEmbattle = 8,
        /// <summary>
        /// 教学士气与压制机制
        /// </summary>
-        TeachFightMoraleAndRepression = 10,
+        TeachFightMoraleAndRepression = 9,
        /// <summary>
        /// 教学释放技能
        /// </summary>
-        TeachFightUseSkill = 11,
-        /// <summary>
-        /// 等待时间开始
-        /// </summary>
-        WaitTimeBegin = 12,
+        TeachFightUseSkill = 10,
        /// <summary>
        /// 等待关卡结束
        /// </summary>
-        WaitLevelComplete = 13,
+        WaitLevelComplete = 11,
        /// <summary>
        /// 关卡上阵载具
        /// </summary>
-        EmbattleVehicle = 14,
+        EmbattleVehicle = 12,
    }

 } 
--- a/ProjectNLD/Assets/Config/Data/guidecfg_guideconfig.json
+++ b/ProjectNLD/Assets/Config/Data/guidecfg_guideconfig.json
@ -5,7 +5,7 @@
    "BeginCondition": 0,
    "NextId": 2,
    "StepStartDelay": 0,
-    "GuideStepType": 5,
+    "GuideStepType": 4,
    "GuideTypeParams": [
      "301001"
    ],
@ -25,7 +25,7 @@
    "BeginCondition": 0,
    "NextId": 3,
    "StepStartDelay": 0,
-    "GuideStepType": 13,
+    "GuideStepType": 11,
    "GuideTypeParams": [
      "False"
    ],
@ -45,7 +45,7 @@
    "BeginCondition": 0,
    "NextId": 4,
    "StepStartDelay": 0,
-    "GuideStepType": 5,
+    "GuideStepType": 4,
    "GuideTypeParams": [
      "100001"
    ],
@ -65,7 +65,7 @@
    "BeginCondition": 0,
    "NextId": 5,
    "StepStartDelay": 3,
-    "GuideStepType": 3,
+    "GuideStepType": 2,
    "GuideTypeParams": [
      "1"
    ],
@ -87,7 +87,7 @@
    "BeginCondition": 0,
    "NextId": 6,
    "StepStartDelay": 0,
-    "GuideStepType": 6,
+    "GuideStepType": 5,
    "GuideTypeParams": [],
    "GuideCompleteType": 7,
    "CompleteTypeParams": [
@ -107,7 +107,7 @@
    "BeginCondition": 0,
    "NextId": 7,
    "StepStartDelay": 0,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "LevelSceneUI/UI_StartBtn_CMSBtn",
      "UIStartBtn/Image_UI_Start_BG/Button_StartBtn"
@ -128,7 +128,7 @@
    "BeginCondition": 0,
    "NextId": 8,
    "StepStartDelay": 3,
-    "GuideStepType": 7,
+    "GuideStepType": 6,
    "GuideTypeParams": [
      "1"
    ],
@ -148,7 +148,7 @@
    "BeginCondition": 0,
    "NextId": 9,
    "StepStartDelay": 3,
-    "GuideStepType": 8,
+    "GuideStepType": 7,
    "GuideTypeParams": [
      "1"
    ],
@ -168,7 +168,7 @@
    "BeginCondition": 0,
    "NextId": 10,
    "StepStartDelay": 3,
-    "GuideStepType": 9,
+    "GuideStepType": 8,
    "GuideTypeParams": [
      "1"
    ],
@ -188,7 +188,7 @@
    "BeginCondition": 0,
    "NextId": 11,
    "StepStartDelay": 3,
-    "GuideStepType": 10,
+    "GuideStepType": 9,
    "GuideTypeParams": [
      "1"
    ],
@ -208,7 +208,7 @@
    "BeginCondition": 0,
    "NextId": 12,
    "StepStartDelay": 3,
-    "GuideStepType": 11,
+    "GuideStepType": 10,
    "GuideTypeParams": [
      "1"
    ],
@ -228,7 +228,7 @@
    "BeginCondition": 0,
    "NextId": 13,
    "StepStartDelay": 0,
-    "GuideStepType": 13,
+    "GuideStepType": 11,
    "GuideTypeParams": [
      "False"
    ],
@ -248,7 +248,7 @@
    "BeginCondition": 0,
    "NextId": 14,
    "StepStartDelay": 0,
-    "GuideStepType": 5,
+    "GuideStepType": 4,
    "GuideTypeParams": [
      "301001"
    ],
@ -268,7 +268,7 @@
    "BeginCondition": 0,
    "NextId": 100,
    "StepStartDelay": 0,
-    "GuideStepType": 13,
+    "GuideStepType": 11,
    "GuideTypeParams": [
      "False"
    ],
@ -288,7 +288,7 @@
    "BeginCondition": 0,
    "NextId": 101,
    "StepStartDelay": 0.5,
-    "GuideStepType": 2,
+    "GuideStepType": 1,
    "GuideTypeParams": [],
    "GuideCompleteType": 2,
    "CompleteTypeParams": [
@ -308,7 +308,7 @@
    "BeginCondition": 0,
    "NextId": 102,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "MainPanel/UI_MainPanel",
      "Image_RightBG/Button_ChooseLevel"
@ -331,12 +331,12 @@
    "BeginCondition": 0,
    "NextId": 103,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "LevelSelect/UI_LevelSelect",
      "UI_ModeChoose/Scroll View/Viewport/Content/Button_MainLevel"
    ],
-    "GuideCompleteType": 16,
+    "GuideCompleteType": 15,
    "CompleteTypeParams": [
      "0"
    ],
@ -354,12 +354,12 @@
    "BeginCondition": 0,
    "NextId": 104,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "LevelSelect/UI_LevelSelect",
      "UI_LevelGroupChoose/Image_ChapterBG/RecyScrollView/Viewport/Content/0"
    ],
-    "GuideCompleteType": 17,
+    "GuideCompleteType": 16,
    "CompleteTypeParams": [
      "101"
    ],
@ -377,7 +377,7 @@
    "BeginCondition": 0,
    "NextId": 105,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "LevelSelect/UI_LevelSelect",
      "UI_LevelChoose/Image_LevelBG/Scroll View/Viewport/Content/1"
@ -400,7 +400,7 @@
    "BeginCondition": 0,
    "NextId": 106,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "LevelSelect/UI_LevelDetail",
      "Image_BG/Image_StartFight"
@ -423,7 +423,7 @@
    "BeginCondition": 0,
    "NextId": 107,
    "StepStartDelay": 0.5,
-    "GuideStepType": 3,
+    "GuideStepType": 2,
    "GuideTypeParams": [
      "1"
    ],
@ -445,7 +445,7 @@
    "BeginCondition": 0,
    "NextId": 108,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "CommandSkill/CommandAndTeamSelect/UI_TeamAndSkillSelect",
      "ImageBG/UI_LiuHaiLeft/Teams/Button_Team/ImageTeamName/ButtonEdit"
@ -468,7 +468,7 @@
    "BeginCondition": 0,
    "NextId": 109,
    "StepStartDelay": 0.5,
-    "GuideStepType": 3,
+    "GuideStepType": 2,
    "GuideTypeParams": [
      "1"
    ],
@ -490,7 +490,7 @@
    "BeginCondition": 0,
    "NextId": 110,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "TeamChoose/UI_TeamInfo",
      "Button_Back/Button_back"
@ -513,7 +513,7 @@
    "BeginCondition": 0,
    "NextId": 111,
    "StepStartDelay": 0.5,
-    "GuideStepType": 3,
+    "GuideStepType": 2,
    "GuideTypeParams": [
      "1"
    ],
@ -535,12 +535,12 @@
    "BeginCondition": 0,
    "NextId": 112,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "CommandSkill/CommandAndTeamSelect/UI_TeamAndSkillSelect",
      "ImageBG/UI_LiuHaiRight/SkillAndFight/CommandSkills/Button_Skill01"
    ],
-    "GuideCompleteType": 19,
+    "GuideCompleteType": 18,
    "CompleteTypeParams": [],
    "ArrowDirection": 3,
    "ArrowOffset": {
@ -556,12 +556,12 @@
    "BeginCondition": 0,
    "NextId": 113,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "CommandSkill/CommandAndTeamSelect/UI_TeamAndSkillSelect",
      "ImageBG/SelectSkillPanel/Button_Confirm"
    ],
-    "GuideCompleteType": 20,
+    "GuideCompleteType": 19,
    "CompleteTypeParams": [],
    "ArrowDirection": 1,
    "ArrowOffset": {
@ -577,7 +577,7 @@
    "BeginCondition": 0,
    "NextId": 114,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "CommandSkill/CommandAndTeamSelect/UI_TeamAndSkillSelect",
      "ImageBG/UI_LiuHaiRight/SkillAndFight/Button_Start"
@ -600,7 +600,7 @@
    "BeginCondition": 0,
    "NextId": 115,
    "StepStartDelay": 0.5,
-    "GuideStepType": 13,
+    "GuideStepType": 11,
    "GuideTypeParams": [
      "False"
    ],
@ -620,7 +620,7 @@
    "BeginCondition": 0,
    "NextId": 116,
    "StepStartDelay": 0,
-    "GuideStepType": 5,
+    "GuideStepType": 4,
    "GuideTypeParams": [
      "301001"
    ],
@ -640,7 +640,7 @@
    "BeginCondition": 0,
    "NextId": 200,
    "StepStartDelay": 0,
-    "GuideStepType": 13,
+    "GuideStepType": 11,
    "GuideTypeParams": [
      "False"
    ],
@ -660,7 +660,7 @@
    "BeginCondition": 0,
    "NextId": 201,
    "StepStartDelay": 0.5,
-    "GuideStepType": 2,
+    "GuideStepType": 1,
    "GuideTypeParams": [],
    "GuideCompleteType": 2,
    "CompleteTypeParams": [
@ -680,7 +680,7 @@
    "BeginCondition": 0,
    "NextId": 202,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "MainPanel/UI_MainPanel",
      "Image_ButtonBG/Button_Character"
@ -703,7 +703,7 @@
    "BeginCondition": 0,
    "NextId": 203,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "MainScene/ShowCharacter/UISelectCharacter",
      "ScrollView_SelectCharacter/Viewport/Content/0/ClickBtn"
@ -726,7 +726,7 @@
    "BeginCondition": 0,
    "NextId": 204,
    "StepStartDelay": 0.5,
-    "GuideStepType": 3,
+    "GuideStepType": 2,
    "GuideTypeParams": [
      "1"
    ],
@ -748,7 +748,7 @@
    "BeginCondition": 0,
    "NextId": 205,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "MainScene/ShowCharacter/UI_Cultivate",
      "Image_BG/UI_Cultivate_Level/ImageUI_Cultivate_Level/Button_LevelPlus"
@ -771,7 +771,7 @@
    "BeginCondition": 0,
    "NextId": 206,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "MainScene/ShowCharacter/UILevelUp",
      "Image_BG/Image_LevelUPBar/UI_LevelPlusAndMinus/Button_Plus"
@ -792,7 +792,7 @@
    "BeginCondition": 0,
    "NextId": 207,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "MainScene/ShowCharacter/UILevelUp",
      "Image_BG/UI_ComfirmAndCancel/Button_Confirm"
@ -813,7 +813,7 @@
    "BeginCondition": 0,
    "NextId": 208,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "MainScene/ShowCharacter/UILevelUp",
      "Image_BG/Button_Back/Button_Home"
@ -836,7 +836,7 @@
    "BeginCondition": 0,
    "NextId": 209,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "MainPanel/UI_MainPanel",
      "Image_RightBG/Button_ChooseLevel"
@ -859,12 +859,12 @@
    "BeginCondition": 0,
    "NextId": 210,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "LevelSelect/UI_LevelSelect",
      "UI_ModeChoose/Scroll View/Viewport/Content/Button_MainLevel"
    ],
-    "GuideCompleteType": 16,
+    "GuideCompleteType": 15,
    "CompleteTypeParams": [
      "0"
    ],
@ -882,12 +882,12 @@
    "BeginCondition": 0,
    "NextId": 211,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "LevelSelect/UI_LevelSelect",
      "UI_LevelGroupChoose/Image_ChapterBG/RecyScrollView/Viewport/Content/0"
    ],
-    "GuideCompleteType": 17,
+    "GuideCompleteType": 16,
    "CompleteTypeParams": [
      "101"
    ],
@ -905,7 +905,7 @@
    "BeginCondition": 0,
    "NextId": 212,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "LevelSelect/UI_LevelSelect",
      "UI_LevelChoose/Image_LevelBG/Scroll View/Viewport/Content/2"
@ -928,7 +928,7 @@
    "BeginCondition": 0,
    "NextId": 213,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "LevelSelect/UI_LevelDetail",
      "Image_BG/Image_StartFight"
@ -951,7 +951,7 @@
    "BeginCondition": 0,
    "NextId": 214,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "CommandSkill/CommandAndTeamSelect/UI_TeamAndSkillSelect",
      "ImageBG/UI_LiuHaiLeft/Teams/Button_Team/ImageTeamName/ButtonEdit"
@ -974,7 +974,7 @@
    "BeginCondition": 0,
    "NextId": 215,
    "StepStartDelay": 0.5,
-    "GuideStepType": 3,
+    "GuideStepType": 2,
    "GuideTypeParams": [
      "1"
    ],
@ -996,7 +996,7 @@
    "BeginCondition": 0,
    "NextId": 216,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "TeamChoose/UI_TeamInfo",
      "UI_AllChoose/Image_VehicleHeadPic"
@ -1019,7 +1019,7 @@
    "BeginCondition": 0,
    "NextId": 217,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "MainScene/VehicleCultivate/UI_VehicleChoose",
      "Image_BG/UI_Vehicle/ScrollView/Viewport/Content/ScrollViewItem(Clone)/2"
@ -1042,7 +1042,7 @@
    "BeginCondition": 0,
    "NextId": 218,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "TeamChoose/UI_TeamInfo",
      "Button_Back/Button_back"
@ -1065,7 +1065,7 @@
    "BeginCondition": 0,
    "NextId": 219,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "CommandSkill/CommandAndTeamSelect/UI_TeamAndSkillSelect",
      "ImageBG/UI_LiuHaiRight/SkillAndFight/Button_Start"
@ -1088,7 +1088,7 @@
    "BeginCondition": 0,
    "NextId": 220,
    "StepStartDelay": 0.5,
-    "GuideStepType": 3,
+    "GuideStepType": 2,
    "GuideTypeParams": [
      "1"
    ],
@ -1110,9 +1110,9 @@
    "BeginCondition": 0,
    "NextId": 221,
    "StepStartDelay": 0.5,
-    "GuideStepType": 14,
+    "GuideStepType": 12,
    "GuideTypeParams": [],
-    "GuideCompleteType": 22,
+    "GuideCompleteType": 21,
    "CompleteTypeParams": [
      "1"
    ],
@ -1130,7 +1130,7 @@
    "BeginCondition": 0,
    "NextId": 222,
    "StepStartDelay": 0.5,
-    "GuideStepType": 13,
+    "GuideStepType": 11,
    "GuideTypeParams": [
      "False"
    ],
@ -1150,7 +1150,7 @@
    "BeginCondition": 0,
    "NextId": 223,
    "StepStartDelay": 0,
-    "GuideStepType": 5,
+    "GuideStepType": 4,
    "GuideTypeParams": [
      "301001"
    ],
@ -1170,7 +1170,7 @@
    "BeginCondition": 0,
    "NextId": 300,
    "StepStartDelay": 0,
-    "GuideStepType": 13,
+    "GuideStepType": 11,
    "GuideTypeParams": [
      "False"
    ],
@ -1190,7 +1190,7 @@
    "BeginCondition": 0,
    "NextId": 301,
    "StepStartDelay": 0.5,
-    "GuideStepType": 2,
+    "GuideStepType": 1,
    "GuideTypeParams": [],
    "GuideCompleteType": 2,
    "CompleteTypeParams": [
@ -1210,7 +1210,7 @@
    "BeginCondition": 0,
    "NextId": 302,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "MainPanel/UI_MainPanel",
      "RecruitAndShopBG/Button_DrawCard"
@ -1233,7 +1233,7 @@
    "BeginCondition": 0,
    "NextId": 303,
    "StepStartDelay": 0.5,
-    "GuideStepType": 3,
+    "GuideStepType": 2,
    "GuideTypeParams": [
      "1"
    ],
@ -1255,7 +1255,7 @@
    "BeginCondition": 0,
    "NextId": 0,
    "StepStartDelay": 0.5,
-    "GuideStepType": 4,
+    "GuideStepType": 3,
    "GuideTypeParams": [
      "MainScene/Raffle/UI_Raffle",
      "ImageBG/Image_Cultivate_BG_Black/RaffleOneBtn"
--- a/ProjectNLD/Assets/Config/Data/stringcfg_stringconfig.json
+++ b/ProjectNLD/Assets/Config/Data/stringcfg_stringconfig.json
@ -2186,6 +2186,15 @@
    "Param2": "",
    "Value_En": "environ_highland_desc"
  },
+  {
+    "ID": 20101,
+    "Key": "pvp_save_suc",
+    "Value": "保存阵容成功！",
+    "Param0": "",
+    "Param1": "",
+    "Param2": "",
+    "Value_En": "bao cun cheng gong"
+  },
  {
    "ID": 30001,
    "Key": "cultivate_fireRange",