打AB包

GameClient/Assets/BuildSetting.asset

@@ -18,3 +18,10 @@ MonoBehaviour:
   - Assets/Res/Effect/DressUp
   - Assets/Res/Effect/UI
   - Assets/ResIn/UI
+  dirTypeList:
+  - texture_dressup_es_
+  - texture_dressup_js_
+  - texture_dressup_ss_
+  - texture_dressup_ts_
+  - texture_dressup_xz_
+  - texture_dressup_zr_

GameClient/Assets/BuildSetting1.asset

@@ -19,3 +19,10 @@ MonoBehaviour:
   - Assets/Res/Effect/UI
   - Assets/ResIn/UI
   - Assets/Res/Texture
+  dirTypeList:
+  - texture_dressup_es_
+  - texture_dressup_zr_
+  - texture_dressup_xz_
+  - texture_dressup_js_
+  - texture_dressup_ts_
+  - texture_dressup_ss_

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -102,6 +102,11 @@ namespace GFGEditor
 
         public static void Import()
         {
+            var md5Path = ImportArtResTool.Md5FilePath;
+            if (!Directory.Exists(md5Path))
+            {
+                Directory.CreateDirectory(md5Path);
+            }
 
             //音乐
             EditorUtility.DisplayProgressBar("进度", "正在导入音乐", 1);

GameClient/Assets/Editor/ToolsMenu.cs

@@ -245,38 +245,29 @@ namespace GFGEditor
             }
         }
 
-        [MenuItem("Tools/BuildTest/SetBundlesResTestDir")]
+        [MenuItem("Tools/BuildTest/导入临时版本资源")]
         public static void SetBundlesResTestDir()
         {
-            VEngine.Utility.buildPath = "Bundles_temp";
-            ImportArtResTool.ResRootDirNameDressUp = "正式资源-demo1";
-            CommitWhenRelease = false;
-        }
-
-        [MenuItem("Tools/BuildTest/ResetBundlesResDir")]
-        public static void ResetBundlesResTestDir()
-        {
-            VEngine.Utility.buildPath = "Bundles";
-            ImportArtResTool.ResRootDirNameDressUp = "正式资源";
-            CommitWhenRelease = true;
+            try
+            {
+                ImportArtResTool.ResRootDirNameDressUp = "正式资源-demo1";
+                CommitWhenRelease = false;
+                UpdateAndImportArtRes();
+            }
+            catch(Exception e)
+            {
+                Log.Error(e.ToString());
+                ImportArtResTool.ResRootDirNameDressUp = "正式资源";
+                CommitWhenRelease = true;
+            }
         }
 
         [MenuItem("Tools/BuildTest/发布临时版本", false, (int)TOOL_MENU_PRIORITY.BuildBundlesRes)]
         public static void BuildBundlesResTemp()
         {
-            //VEngine.Utility.buildPath = "Bundles_temp";
             EditorUtility.DisplayProgressBar("进度", "正在发布临时版本", 1);
-            VEngine.Editor.Builds.BuildScript.BuildCustomBundles(new string[] { "Res", "ResIn" }, "BuildSetting1");
+            BuildScript.BuildCustomBundles(new string[] { "Res", "ResIn" }, "BuildSetting1");
             EditorUtility.ClearProgressBar();
-            //VEngine.Utility.buildPath = "Bundles";
-        }
-
-        [MenuItem("Tools/BuildTest/Copy To StreamingAssets Temp")]
-        public static void CopyToStreamingAssets()
-        {
-            VEngine.Utility.buildPath = "Bundles_temp";
-            BuildScript.CopyToStreamingAssets();
-            VEngine.Utility.buildPath = "Bundles";
         }
 
     }

GameClient/Assets/Editor/Xasset/BuildSetting.cs

@@ -8,6 +8,7 @@ namespace GFGEditor
     public class BuildSetting : ScriptableObject
     {
         public List<string> dirBundleList;
+        public List<string> dirTypeList;
 
         public static BuildSetting GetBuildSetting(string setName)
         {

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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using GFGEditor;
 using UnityEditor;
 using UnityEngine;
 
@@ -9,7 +10,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", "Assets/Res/MD5" };
+        private readonly string[] EXCLUDE_DIRS = new string[] { "Assets/Res/.svn", ImportArtResTool.Md5FilePath };
         private readonly BuildAssetBundleOptions buildAssetBundleOptions;
         private readonly List<Asset> bundledAssets = new List<Asset>();
         private readonly string bundleExtension;
@@ -76,7 +77,7 @@ namespace VEngine.Editor.Builds
 
         public void BuildCustomBundles(string[] resRootDirNames, string setName)
         {
-            foreach(var resRootDirName in resRootDirNames)
+            foreach (var resRootDirName in resRootDirNames)
             {
                 CreateBundles(resRootDirName, setName);
             }
@@ -107,6 +108,17 @@ namespace VEngine.Editor.Builds
                     var i = bundle.IndexOf(".");
                     bundle = bundle.Substring(0, i);
                     bundle = bundle.ToLower();
+
+
+                    for (int j = 0; j < buildSetting.dirTypeList.Count; j++)
+                    {
+                        string str = buildSetting.dirTypeList[j];
+                        if (bundle.IndexOf(str) >= 0)
+                        {
+                            bundle = str.Substring(0, str.Length - 1);
+                            break;
+                        }
+                    }
                     bundledAssets.Add(new Asset
                     {
                         path = filePath,
@@ -118,7 +130,7 @@ namespace VEngine.Editor.Builds
             foreach (var dir in dirBundleList)
             {
                 var dirPath = Path.Combine(Environment.CurrentDirectory, dir);
-                if(!GFGEditor.FileUtil.CheckPathInParent(dirPath, path))
+                if (!GFGEditor.FileUtil.CheckPathInParent(dirPath, path))
                 {
                     continue;
                 }
@@ -203,7 +215,7 @@ namespace VEngine.Editor.Builds
                 Debug.LogErrorFormat("Failed to build {0}.", name);
                 return;
             }
-            if(!string.IsNullOrEmpty(GFGGame.LauncherConfig.resKey))
+            if (!string.IsNullOrEmpty(GFGGame.LauncherConfig.resKey))
             {
                 CreateEncryptAssets(outputPath, outputPath, manifest, GFGGame.LauncherConfig.resKey);
             }

GameClient/Assets/MD5.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ba4e48d93bfd6c642baf62869950bd91
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/MD5/BgMd5.meta

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

GameClient/Assets/MD5/CardBgMd5

@@ -1 +0,0 @@
-2../../../gfg/正式资源/卡牌/pic/kp_caiwei.jpg 869286f97bf1ed2a86461572588957593../../../gfg/正式资源/卡牌/pic/kp_feiying.jpg 3418376498f4c60ac66bd5927a4053a72../../../gfg/正式资源/卡牌/pic/kp_gongnv.jpg 078698e58774f28863e2e43ff0b717772../../../gfg/正式资源/卡牌/pic/kp_lanhua.jpg ef9eaa43a32c3e2e4379962869a70c081../../../gfg/正式资源/卡牌/pic/kp_mudan.jpg c5c8cb992e3cc88c268fc95f8bd529202../../../gfg/正式资源/卡牌/pic/kp_shiwei.jpg b99ffbbaa0d44a51a5d1aadd667d69ae1../../../gfg/正式资源/卡牌/pic/kp_xiake.jpg b4fa11df7cc8c12801e854e8fd8b72a73../../../gfg/正式资源/卡牌/pic/kp_zuochi1.jpg f0e340599fcf6ef042ce086c3f63e9d93../../../gfg/正式资源/卡牌/pic/kp_zuochi2.jpg 9662749cfcf5d57057fe339b554b14d4

GameClient/Assets/MD5/CardBgMd5.meta

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

GameClient/Assets/MD5/CardMd5

@@ -1 +0,0 @@
-3../../../gfg/正式资源/卡牌/icon/kp_caiwei.jpg 1e8f003d99eb386ec7c9daa60f2279fc4../../../gfg/正式资源/卡牌/icon/kp_feiying.jpg 70dc9c50f9a008c1218d38c4573fb3ce3../../../gfg/正式资源/卡牌/icon/kp_gongnv.jpg 85da913113aeeade020004629f725c4a3../../../gfg/正式资源/卡牌/icon/kp_lanhua.jpg c697fc44aaa97057a99f04e3b028d4152../../../gfg/正式资源/卡牌/icon/kp_mudan.jpg c7c5de444d0498dedd6bdbe7ef06c02d3../../../gfg/正式资源/卡牌/icon/kp_shiwei.jpg bf5e405ba7736f87c1ea0d6ddf05d02f2../../../gfg/正式资源/卡牌/icon/kp_xiake.jpg ac327b8dca1392e7b333ea68dfec99214../../../gfg/正式资源/卡牌/icon/kp_zuochi1.jpg 5ced6e970382fab571ab3c81ca0177a74../../../gfg/正式资源/卡牌/icon/kp_zuochi2.jpg 0bc1c73eb3197d4e579c8116c8f47f38

GameClient/Assets/MD5/CardMd5.meta

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

GameClient/Assets/MD5/DressUpMd5.meta

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

GameClient/Assets/MD5/FieldGuideIconMd5.meta

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

GameClient/Assets/MD5/HeadMd5

@@ -1 +0,0 @@
-7../../../gfg/正式资源/npc/对战头像/qixiongf.png 185268a7f0595b4b61274556e5de1f464../../../gfg/正式资源/npc/对战头像/qujuf.png 06eb1b4de8203a3a13d3ad98b8370b293../../../gfg/正式资源/npc/对战头像/self.png 928b32e57968cdeb06f777d43987f704:../../../gfg/正式资源/npc/对战头像/shangzuochi.png 80a3f6b2c978536bcf020dc673ddcb88;../../../gfg/正式资源/npc/对战头像/shangzuochit.png a2b4db3881af57e0e94ec3d586de8fc09../../../gfg/正式资源/npc/对战头像/yangguifei.png b098567acad5b49208cd9f08240d3ab6;../../../gfg/正式资源/npc/对战头像/yuanlingpaom.png f5de065b2e45a41be84b32a50be9518a5../../../gfg/正式资源/npc/对战头像/zhijuf.png de05bfec47d4cbd1bb49915bc0845203

GameClient/Assets/MD5/HeadMd5.meta

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

GameClient/Assets/MD5/IconMd5.meta

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

GameClient/Assets/MD5/MusicMd5

@@ -1 +0,0 @@
-)../../../gfg/正式资源/music/fight.mp3 56b058e235c4fba98836db41659f2419+../../../gfg/正式资源/music/zhuxian.mp3 df04daf64ee200e01eaec8499989b9ab)../../../gfg/正式资源/music/music.mp3 2d16fe3156881a8cab72a210b43c20f4

GameClient/Assets/MD5/MusicMd5.meta

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

GameClient/Assets/MD5/PicFMd5

@@ -1 +0,0 @@
-9../../../gfg/正式资源/npc/对战立绘/bzguzhuang.png 9b837821ab2b4dd50df0cfbf9427826b8../../../gfg/正式资源/npc/对战立绘/bzxiandai.png ff7408fc2f04231b3045ee1d238359bf7../../../gfg/正式资源/npc/对战立绘/qixiongf.png 7ee4f2c99eabd26f0a82c1cc06c4d0664../../../gfg/正式资源/npc/对战立绘/qujuf.png 0ce1d35bddafae26994e08747bccccaa9../../../gfg/正式资源/npc/对战立绘/yangguifei.png 5bafa17f1511de2b74e0f3bac306aad8;../../../gfg/正式资源/npc/对战立绘/yuanlingpaom.png 986992e80670270596482ed9acf097795../../../gfg/正式资源/npc/对战立绘/zhijuf.png 190a5982b5b090ca49cbe4bccaf0872e

GameClient/Assets/MD5/PicFMd5.meta

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

GameClient/Assets/MD5/PicSMd5

@@ -1 +0,0 @@
-6../../../gfg/正式资源/npc/对话立绘/default.png 9fa2f9169f0007dd27288096798534717../../../gfg/正式资源/npc/对话立绘/qixiongf.png b997621ae91a994e6783b38a6d28a3024../../../gfg/正式资源/npc/对话立绘/qujuf.png d36f7b90fc98048fb22fde10609e802a:../../../gfg/正式资源/npc/对话立绘/shangzuochi.png d426880934501292d2cd5f88867f6d47;../../../gfg/正式资源/npc/对话立绘/shangzuochit.png a3824cb23128e1cbb263342f7cdc756c9../../../gfg/正式资源/npc/对话立绘/yangguifei.png 36571bd4f4c9186ee484add37078e8e0;../../../gfg/正式资源/npc/对话立绘/yuanlingpaom.png 045f4a52a15b6c50370c64e8349a08dd5../../../gfg/正式资源/npc/对话立绘/zhijuf.png 372b7f8752bff99e73d23936ed3d43d3:../../../gfg/正式资源/npc/对话立绘/yizugongzhu.png 94e0ee15a97836d459eac5e4346b417a7../../../gfg/正式资源/npc/对话立绘/shenjiao.png bd369246ca008e97351e1dcf2f9fd442

GameClient/Assets/MD5/PicSMd5.meta

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