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

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -41,6 +41,10 @@ namespace GFGGame
             {
                 tsStatus = int.Parse(result.tsStatus);
             }
+            if (!string.IsNullOrEmpty(result.tsServer))
+            {
+                tsServer = int.Parse(result.tsServer);
+            }
             GameConfig.logApiReportUrl = LauncherConfig.logApiRootUrl + "ReportGet";
         }
 
@@ -50,6 +54,7 @@ namespace GFGGame
             public string showGM;
             public string openTime;
             public string tsStatus;
+            public string tsServer;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -1056,7 +1056,7 @@ namespace GFGGame
         }
         private void CheckAutoShowViews()
         {
-            if (GameConfig.tsStatus > 0) return; //提审服不显示弹窗
+            if (GameConfig.tsStatus > 0) return; //提审时不显示弹窗
             if (RoleDataManager.lvl < 10) return;
             if (GuideDataManager.currentGuideId > 0) return;
             if (GameGlobal.AutoShowCompleted) return;