Merge remote-tracking branch 'origin/master' into ios

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -76,14 +76,23 @@ namespace GFGGame
             //LauncherConfig.logApiRootUrl = "http://10.108.64.106:8080/api/Log/";
             LauncherConfig.logApiReportLauncherUrl = LauncherConfig.logApiRootUrl + "ReportNode";
             LauncherConfig.apkVersion = result.apkVersion;
-            LauncherConfig.serverStatus = int.Parse(result.serverStatus);
-            LauncherConfig.onDebug = int.Parse(result.onDebug);
+            if(!string.IsNullOrEmpty(result.serverStatus))
+            {
+                LauncherConfig.serverStatus = int.Parse(result.serverStatus);
+            }
+            if(!string.IsNullOrEmpty(result.onDebug))
+            {
+                LauncherConfig.onDebug = int.Parse(result.onDebug);
+            }
             LauncherConfig.manifest_v = result.manifest_v;
             LauncherConfig.privacy_v = result.privacy_v;
             LauncherConfig.statusPrompt = result.statusPrompt;
             LauncherConfig.updateAppPrompt = result.updateAppPrompt;
             LauncherConfig.updateResPrompt = result.updateResPrompt;
-            LauncherConfig.promptSizeMB = int.Parse(result.promptSizeMB);
+            if(!string.IsNullOrEmpty(result.promptSizeMB))
+            {
+                LauncherConfig.promptSizeMB = int.Parse(result.promptSizeMB);
+            }
         }
 
         private struct Result