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

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -77,7 +77,7 @@ namespace GFGGame
             ChannelId = (int)ChannelID.TapTap;
 #elif PT_DOUYOU
             netType = EnumNetType.PUBLIC;
-            cfgName = "cfg_douyou";
+            cfgName = "cfg_douYou";
             ChannelId = (int)ChannelID.DouYou;
 #elif PT_IOS
             netType = EnumNetType.PUBLIC;