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

GameClient/Assets/Editor/Bat/commitBundles.bat

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

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

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

GameClient/Assets/Editor/ToolsMenu.cs

@@ -83,10 +83,6 @@ namespace GFGEditor
             BuildDllHelper.BuildHotUpdateDll();
             BuildScript.BuildCustomBundles(resArr, "BuildSetting");
             EditorUtility.ClearProgressBar();
-            if (CommitWhenRelease)
-            {
-                CommitBundles();
-            }
         }
 
         [MenuItem("策划/其它/更新项目(会丢弃未推送内容)", false, (int)TOOL_MENU_PRIORITY.UpdateProject)]
@@ -333,22 +329,6 @@ namespace GFGEditor
             BuildScript.CopyToStreamingAssets();
         }
 
-        [MenuItem("Tools/BuildTest/导入临时版本资源", false, 0)]
-        public static void SetBundlesResTestDir()
-        {
-            try
-            {
-                ImportArtResTool.ResRootDirNameDressUp = "正式资源-demo1";
-                CommitWhenRelease = false;
-                UpdateAndImportArtRes();
-            }
-            catch (Exception e)
-            {
-                Log.Error(e.ToString());
-                ImportArtResTool.ResRootDirNameDressUp = "正式资源";
-                CommitWhenRelease = true;
-            }
-        }
         [MenuItem("Tools/BuildTest/导入临时版本配置", false, 1)]
         public static void SetBundlesExcelTestDir()
         {