Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

GameClient/Assets/Editor/Bat/commitBundles.bat

@@ -0,0 +1,3 @@
+cd ../../../Bundles
+svn add . --force
+svn ci -m "¹«ÓûúÌá½»"

GameClient/Assets/Editor/Bat/commitBundles.bat.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0921dce128c6bba4aa7e3dc48de55622
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Editor/Bat/commitGame.bat

@@ -13,10 +13,3 @@ git add .
 git commit -am "公用机提交"
 git pull
 git push
-
-cd GameClient/Bundles
-svn add . --force
-svn ci -m "公用机提交"
-
-echo 请检查是否有冲突，如有请联系程序！
-pause

GameClient/Assets/Editor/Bat/updateGame.bat

@@ -12,5 +12,3 @@ git clean -df
 git reset --hard
 git status
 git pull
-
-pause

GameClient/Assets/Editor/ToolsMenu.cs

@@ -32,6 +32,10 @@ namespace GFGEditor
             UpdateProject();
             UpdateAndImportArtRes();
             UpdateAndImportExcel();
+            if (CommitWhenRelease)
+            {
+                CommitProject();
+            }
         }
 
         [MenuItem("策划/更新并导入Excel", false, (int)TOOL_MENU_PRIORITY.UpdateAndImportExcel)]
@@ -39,6 +43,10 @@ namespace GFGEditor
         {
             UpdateExcel();
             ImportExcel();
+            if (CommitWhenRelease)
+            {
+                CommitProject();
+            }
         }
 
         [MenuItem("策划/更新并导入美术资源", false, (int)TOOL_MENU_PRIORITY.UpdateAndImportArtRes)]
@@ -46,6 +54,10 @@ namespace GFGEditor
         {
             UpdateArtRes();
             ImportArtRes();
+            if (CommitWhenRelease)
+            {
+                CommitProject();
+            }
         }
 
         [MenuItem("策划/更新至内网版本", false, (int)TOOL_MENU_PRIORITY.BuildBundlesRes)]
@@ -56,11 +68,11 @@ namespace GFGEditor
             EditorUtility.ClearProgressBar();
             if (CommitWhenRelease)
             {
-                CommitProject();
+                CommitBundles();
             }
         }
 
-        [MenuItem("策划/其它/更新项目", false, (int)TOOL_MENU_PRIORITY.UpdateProject)]
+        [MenuItem("策划/其它/更新项目(会丢弃未推送内容)", false, (int)TOOL_MENU_PRIORITY.UpdateProject)]
         static void UpdateProject()
         {
             SQLiteHelper.Instance.CloseConnection();
@@ -96,6 +108,13 @@ namespace GFGEditor
             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()
         {