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

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -51,7 +51,7 @@ namespace GFGGame
             netType = EnumNetType.TEMP;
             cfgName = "cfg_temp";
 #elif PT_IOS
-            netType == EnumNetType.TEMP;
+            netType = EnumNetType.TEMP;
             cfgName = "cfg_ios";
             platformId = 2;
 #elif PT_TISHEN