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

# Conflicts:
#	GameClient/ProjectSettings/ProjectSettings.asset

FGUIProject/assets/Studio/StudioUI.xml

@@ -17,7 +17,7 @@
       <relation target="" sidePair="right-right,bottom-middle"/>
       <property target="icon" propertyId="1" value="ui://xz8kxreces2q1f"/>
     </component>
-    <component id="n5_rbxq" name="comFiling" src="rbxq5" fileName="components/ComEctype.xml" xy="777,1261">
+    <component id="n5_rbxq" name="comFiling" src="rbxq5" fileName="components/ComEctype.xml" xy="777,1261" visible="false">
       <relation target="" sidePair="right-right,bottom-middle"/>
       <property target="icon" propertyId="1" value="ui://xz8kxreces2q1d"/>
     </component>

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();

GameClient/ProjectSettings/ProjectSettings.asset

@@ -256,8 +256,8 @@ PlayerSettings:
   useCustomProguardFile: 0
   AndroidTargetArchitectures: 1
   AndroidTargetDevices: 0
-  AndroidSplashScreenScale: 0
-  androidSplashScreen: {fileID: 2800000, guid: 966dcb9a66b3b204abd4325a28c092ca, type: 3}
+  AndroidSplashScreenScale: 2
+  androidSplashScreen: {fileID: 2800000, guid: 54987337fef777b46980ba168894a879, type: 3}
   AndroidKeystoreName: 
   AndroidKeyaliasName: 
   AndroidBuildApkPerCpuArchitecture: 0