Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -109,16 +109,18 @@ namespace GFGGame
             {
                 _onCompleteStoryDialogCallParam = datas[3];
             }
-            // StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(MainStoryDataManager.currentChapterCfgId);
-            // if (LauncherConfig.netType == LauncherConfig.EnumNetType.TEMP && MainStoryDataManager.currentChapterCfgId == 10001 && !InstanceZonesDataManager.CheckChapterPass(chapterCfg.type, chapterCfg.subType, chapterCfg.id, chapterCfg.levelCount))
-            // {
-            //     // 临时设置都可以跳过对话
-            //     skipable = false;
-            // }
-            // else
-            // {
-            skipable = true;
-            // }
+            //
+            StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(MainStoryDataManager.currentChapterCfgId);
+            StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterCfg.type, chapterCfg.subType, chapterCfg.id)[0];
+            if (LauncherConfig.netType == LauncherConfig.EnumNetType.TEMP && MainStoryDataManager.currentChapterCfgId == 10001 && storyLevelCfg.order == 1 && !InstanceZonesDataManager.CheckLevelPass(storyLevelCfg.id))
+            {
+                // 临时设置都可以跳过对话
+                skipable = false;
+            }
+            else
+            {
+                skipable = true;
+            }
 
             _ui.m_btnSkip.visible = skipable;