Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -10,6 +10,7 @@ namespace GFGGame
 
         public static string LoginAddress;
         public static string PlatformName;
+        public static int showGM;
 
         public static void InitData(string json)
         {
@@ -18,12 +19,14 @@ namespace GFGGame
             LoginAddress = result.loginApiUrl;
             //LoginAddress = "10.108.64.127:10005";
             PlatformName = result.platformName;
+            showGM = result.showGM;
         }
 
         private struct Result
         {
             public string loginApiUrl;
             public string platformName;
+            public int showGM;
         }
     }
 }

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

@@ -97,7 +97,7 @@ namespace GFGGame
 
         private void OnClickBtnHelp()
         {
-            if (LauncherConfig.netType == EnumNetType.LOCAL)
+            if (GameConfig.showGM >= 1)
             {
                 ViewManager.Show(ViewName.GM_PANEL_VIEW);
             }

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -34,7 +34,7 @@ namespace GFGGame
         {
             get
             {
-#if PT_TEMP
+#if PT_TEMP || PT_TISHEN
                 return "dfs";
 #else
                 return null;
@@ -51,6 +51,9 @@ namespace GFGGame
 #elif PT_TEMP
             netType = EnumNetType.TEMP;
             cfgName = "cfg_temp";
+#elif PT_TISHEN
+            netType = EnumNetType.TISHEN;
+            cfgName = "cfg_ts";
 #else
             netType = EnumNetType.LOCAL;
             cfgName = "cfg_local";