Merge remote-tracking branch 'remotes/origin/master' into douYou

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -61,12 +61,18 @@ namespace GFGGame
         public static string updateUrl;
         public static long updateEndTime; //强制更新期限,毫秒级时间戳
 
-        //新发行给的adId
+        //新发行给的
+        public static string showLog;
+        public static string gameId;
+
         public static string douYouAdId;
 
+        //是否使用douYou的ios sdk 0不使用用douYouSdk 1使用douYouSdk
+        public static string isUseDouYouIos;
+
         public static void InitScriptCompilation()
         {
-            launcherRootUrl = "http://gfg-client.obs.cn-north-4.myhuaweicloud.com/";
+            launcherRootUrl = "http://cdn.goufuguiwxw.com/";
 #if PT_DEV
             //外网dev版本
             netType = EnumNetType.LOCAL;
@@ -88,10 +94,13 @@ namespace GFGGame
             netType = EnumNetType.PUBLIC;
             cfgName = "cfg_ios";
             platformId = 2;
-            ChannelId = (int)ChannelID.AppStore;
-#elif PT_TISHEN
-            netType = EnumNetType.TISHEN;
-            cfgName = "cfg_ts";
+            ChannelId = (int)ChannelID.GFG;
+#elif PT_IosLocal
+            netType = EnumNetType.PUBLIC;
+            cfgName = "cfg_ios2";
+            platformId = 2;
+            isUseDouYouIos = "1";
+            ChannelId = (int)ChannelID.GFG;
 #else
             netType = EnumNetType.LOCAL;
             cfgName = "cfg_local";
@@ -118,11 +127,30 @@ namespace GFGGame
                 LauncherConfig.onDebug = int.Parse(result.onDebug);
             }
 
+            if (!string.IsNullOrEmpty(result.showLog))
+            {
+                LauncherConfig.showLog = result.showLog;
+            }
+
+            if (!string.IsNullOrEmpty(result.gameId))
+            {
+                LauncherConfig.gameId = result.gameId;
+            }
+
             if (!string.IsNullOrEmpty(result.douYouAdId))
             {
                 LauncherConfig.douYouAdId = result.douYouAdId;
             }
 
+            if (!string.IsNullOrEmpty(result.isUseDouYouIos))
+            {
+                LauncherConfig.isUseDouYouIos = result.isUseDouYouIos;
+                if (LauncherConfig.isUseDouYouIos == "1")
+                {
+                    ChannelId = (int)ChannelID.DouYou;
+                }
+            }
+
             LauncherConfig.manifest_v = result.manifest_v;
             LauncherConfig.privacy_v = result.privacy_v;
             LauncherConfig.statusPrompt = result.statusPrompt;
@@ -155,7 +183,10 @@ namespace GFGGame
             public string promptSizeMB;
             public string updateUrl;
             public string douYouAdId;
+            public string gameId;
+            public string showLog;
             public string updateEndTime; //更新最后时间
+            public string isUseDouYouIos;
         }
     }
 }