公用机提交

GameClient/Assets/Editor/ToolsMenu.cs

@@ -59,7 +59,7 @@ namespace GFGEditor
         {
             EditorUtility.DisplayProgressBar("进度", "正在更新至内网", 1);
             VEngine.Editor.Builds.BuildScript.BuildCustomBundles(new string[] { "Res", "ResIn" });
-            //CommitAll();
+            CommitAll();
             EditorUtility.ClearProgressBar();
             EditorUtility.DisplayDialog("提示", "操作成功！", "ok");//记得切出再切回编辑器焦点重新编译
         }

GameClient/Assets/Editor/Xasset/Builds/BuildTask.cs

@@ -9,6 +9,7 @@ namespace VEngine.Editor.Builds
     public class BuildTask
     {
         private readonly string[] EXCLUDE_EXTS = new string[] { ".meta" };
+        private readonly string[] EXCLUDE_DIRS = new string[] { "Assets/Res/.svn" };
         private readonly BuildAssetBundleOptions buildAssetBundleOptions;
         private readonly List<Asset> bundledAssets = new List<Asset>();
         private readonly string bundleExtension;
@@ -89,7 +90,9 @@ namespace VEngine.Editor.Builds
             var path = Path.Combine(Application.dataPath, resRootDirName);
             var buildSetting = GFGEditor.BuildSetting.GetBuildSetting();
             var dirBundleList = buildSetting.dirBundleList;
-            GFGEditor.FileUtil.ForeachFileInDir(path, dirBundleList, (string file) =>
+            var excludeDirs = buildSetting.dirBundleList.GetRange(0, buildSetting.dirBundleList.Count);
+            excludeDirs.AddRange(EXCLUDE_DIRS);
+            GFGEditor.FileUtil.ForeachFileInDir(path, excludeDirs, (string file) =>
             {
                 var ext = Path.GetExtension(file);
                 if (Array.IndexOf(EXCLUDE_EXTS, ext) < 0)

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit f48dc626ebca18730c9fe9ad1df506179314367e
+Subproject commit 95491530ab56690c0cc09319d2a548bc2b224e21