Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Editor/ToolsMenu.cs

@@ -27,6 +27,9 @@ namespace GFGEditor
             ImportArtRes,
         }
 
+#if PT_TEMP || PT_TISHEN || PT_DEV
+        
+#else
         [MenuItem("策划/更新并导入所有", false, (int)TOOL_MENU_PRIORITY.UpdateAndImportAll)]
         static void UpdateAndImportAll()
         {
@@ -85,39 +88,6 @@ namespace GFGEditor
             EditorUtility.ClearProgressBar();
         }
 
-        public static void UpdateExcel()
-        {
-            EditorUtility.DisplayProgressBar("进度", "正在更新表格", 1);
-            ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateExcel.bat");
-            EditorUtility.ClearProgressBar();
-        }
-
-        public static void UpdateArtRes()
-        {
-            EditorUtility.DisplayProgressBar("进度", "正在更新美术资源", 1);
-            ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateArtRes.bat", ImportArtResTool.ResRootDirName);
-            //如果换装目录跟其他资源目录不一致，那么要再次更新换装目录
-            if (ImportArtResTool.ResRootDirNameDressUp != ImportArtResTool.ResRootDirName)
-            {
-                ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateArtRes.bat", ImportArtResTool.ResRootDirNameDressUp);
-            }
-            EditorUtility.ClearProgressBar();
-        }
-
-        static void CommitProject()
-        {
-            EditorUtility.DisplayProgressBar("进度", "正在提交项目", 1);
-            ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "commitGame.bat");
-            EditorUtility.ClearProgressBar();
-        }
-
-        static void CommitBundles()
-        {
-            EditorUtility.DisplayProgressBar("进度", "正在提交Bundles", 1);
-            ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "commitBundles.bat");
-            EditorUtility.ClearProgressBar();
-        }
-
         [MenuItem("策划/其它/导入配置表", false, (int)TOOL_MENU_PRIORITY.ImportExcel)]
         public static void ImportExcel()
         {
@@ -178,6 +148,41 @@ namespace GFGEditor
             ImportArtResTool.Import();
             EditorUtility.ClearProgressBar();
         }
+#endif
+
+        public static void UpdateExcel()
+        {
+            EditorUtility.DisplayProgressBar("进度", "正在更新表格", 1);
+            ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateExcel.bat");
+            EditorUtility.ClearProgressBar();
+        }
+
+        public static void UpdateArtRes()
+        {
+            EditorUtility.DisplayProgressBar("进度", "正在更新美术资源", 1);
+            ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateArtRes.bat", ImportArtResTool.ResRootDirName);
+            //如果换装目录跟其他资源目录不一致，那么要再次更新换装目录
+            if (ImportArtResTool.ResRootDirNameDressUp != ImportArtResTool.ResRootDirName)
+            {
+                ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateArtRes.bat", ImportArtResTool.ResRootDirNameDressUp);
+            }
+            EditorUtility.ClearProgressBar();
+        }
+
+        static void CommitProject()
+        {
+            EditorUtility.DisplayProgressBar("进度", "正在提交项目", 1);
+            ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "commitGame.bat");
+            EditorUtility.ClearProgressBar();
+        }
+
+        static void CommitBundles()
+        {
+            EditorUtility.DisplayProgressBar("进度", "正在提交Bundles", 1);
+            ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "commitBundles.bat");
+            EditorUtility.ClearProgressBar();
+        }
+
 
         [MenuItem("Tools/ImageClip/ImportClipImage")]
         public static void ImportClipImage()

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -35,7 +35,7 @@ namespace GFGGame
         {
             get
             {
-#if PT_TEMP || PT_TISHEN
+#if PT_TEMP || PT_TISHEN || PT_DEV
                 return "dfs";
 #else
                 return null;