Переглянути джерело

Merge remote-tracking branch 'remotes/origin/master' into douYou

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs
hexiaojie 1 рік тому
батько
коміт
a150578c2b

+ 2 - 10
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -149,16 +149,8 @@ namespace GFGGame
             IsTeaParty = (bool)datas[4];
             _autoPlay = _lastStartAutoPlay;
 
-            if ((LauncherConfig.ChannelId != (int)ChannelID.Test) &&
-                !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
-            {
-                // 临时设置都可以跳过对话
-                skipable = false;
-            }
-            else
-            {
-                skipable = true;
-            }
+            //修改需求,所有关卡打开跳过(第一关除外)dd
+            skipable = true;
             if (MainStoryDataManager.currentLevelCfgId == 100001001 && !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
             {
                 skipable = false;