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

GameClient/Assets/Editor/ToolsMenu.cs

@@ -43,10 +43,9 @@ namespace GFGEditor
         }
 
         [MenuItem("策划/更新并导入Excel", false, (int)TOOL_MENU_PRIORITY.UpdateAndImportExcel)]
-        static void UpdateAndImportExcel()
+        static void UpdateAndImportExcelAndCommit()
         {
-            UpdateExcel();
-            ImportExcel();
+            UpdateAndImportExcel();
             if (CommitWhenRelease)
             {
                 CommitProject();
@@ -54,10 +53,9 @@ namespace GFGEditor
         }
 
         [MenuItem("策划/更新并导入美术资源", false, (int)TOOL_MENU_PRIORITY.UpdateAndImportArtRes)]
-        static void UpdateAndImportArtRes()
+        static void UpdateAndImportArtResAndCommit()
         {
-            UpdateArtRes();
-            ImportArtRes();
+            UpdateAndImportArtRes();
             if (CommitWhenRelease)
             {
                 CommitProject();
@@ -183,6 +181,18 @@ namespace GFGEditor
             EditorUtility.ClearProgressBar();
         }
 
+        static void UpdateAndImportArtRes()
+        {
+            UpdateArtRes();
+            ImportArtRes();
+        }
+
+        static void UpdateAndImportExcel()
+        {
+
+            UpdateExcel();
+            ImportExcel();
+        }
 
         [MenuItem("Tools/ImageClip/ImportClipImage")]
         public static void ImportClipImage()