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

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

@@ -109,11 +109,11 @@ namespace GFGGame
             {
                 _onCompleteStoryDialogCallParam = datas[3];
             }
-            if (LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
-            {
-                //临时设置都可以跳过对话
-                skipable = true;
-            }
+            // if (LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL)
+            // {
+            //临时设置都可以跳过对话
+            skipable = true;
+            // }
 
             _ui.m_btnSkip.enabled = skipable;
             ShowNextStep(_stroyStartID);

GameClient/Assets/Game/Launcher/GameLauncher.cs

@@ -38,7 +38,7 @@ public class GameLauncher : MonoBehaviour
         LauncherConfig.InitScriptCompilation();
         FGUILauncher.Init();
         HealthAdviceView.Instance.Open();
-        int time = LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL ? 3 : 10;
+        int time = LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL ? 1 : 10;
         Timers.inst.Add(time, 1, (object param) =>
         {
             HealthAdviceView.Instance.Close();