Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

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

@@ -4,7 +4,6 @@ using UI.Main;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using static Codice.CM.WorkspaceServer.WorkspaceTreeDataStore;
 
 namespace GFGGame
 {
@@ -104,13 +103,12 @@ namespace GFGGame
             {
                 _onCompleteStoryDialogCallParam = datas[3];
             }
-            //if(LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
-            //{
-
-            //}
+            if(LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
+            {
+                //临时设置都可以跳过对话
+                skipable = true;
+            }
 
-            //临时设置都可以跳过对话
-            skipable = true;
             _ui.m_btnSkip.enabled = skipable;
             ShowNextStep(stroyStartID);
 
@@ -178,6 +176,12 @@ namespace GFGGame
 
         private void OnClickBtnSpeedUp()
         {
+            //如果没有自动播放先开始自动播放
+            if(!_autoPlay)
+            {
+                _ui.m_btnAutoPlay.selected = true;
+                OnClickBtnAutoPlay();
+            }
             _speedAutoPlay = _speedAutoPlay * 2;
             if (_speedAutoPlay > GameConst.MAX_SPEED_AUTO_PLAY)
             {