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

GameClient/Assets/Game/HotUpdate/Utils/LogUtil.cs

@@ -34,7 +34,7 @@ namespace GFGGame
 
         public static void LogDev(string content)
         {
-            if(LauncherConfig.ChannelId == (int)ChannelID.Test)
+            if(LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test)
             {
                 Debug.Log($"dev log : {content}");
             }
@@ -43,7 +43,7 @@ namespace GFGGame
 
         public static void LogFormatDev(string content, params object[] args)
         {
-            if (LauncherConfig.ChannelId == (int)ChannelID.Test)
+            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test)
             {
                 Debug.LogFormat($"dev log : {content}", args);
             }
@@ -52,7 +52,7 @@ namespace GFGGame
 
         public static void LogWarningDev(string content)
         {
-            if (LauncherConfig.ChannelId == (int)ChannelID.Test)
+            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test)
             {
                 Debug.LogWarning($"dev warning {content}");
             }
@@ -60,7 +60,7 @@ namespace GFGGame
 
         public static void LogWarningFormatDev(string content, params object[] args)
         {
-            if (LauncherConfig.ChannelId == (int)ChannelID.Test)
+            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test)
             {
                 Debug.LogWarningFormat($"dev warning {content}", args);
             }