AB包预置

GameClient/Assets/AssetBundleCollectorSetting.asset

@@ -65,7 +65,7 @@ MonoBehaviour:
         CollectorGUID: 47f25d28f5fb93d42b4b64d3bead4e98
         CollectorType: 0
         AddressRuleName: AddressByFileName
-        PackRuleName: PackArt
+        PackRuleName: PackTopDirectory
         FilterRuleName: CollectArtDynamic
         AssetTags: 
         UserData: 
@@ -73,7 +73,7 @@ MonoBehaviour:
         CollectorGUID: 4b0c1f03aa4fd074d9a32273318bb07c
         CollectorType: 0
         AddressRuleName: AddressByFileName
-        PackRuleName: PackArt
+        PackRuleName: PackTopDirectory
         FilterRuleName: CollectArtDynamic
         AssetTags: 
         UserData: 
@@ -94,7 +94,7 @@ MonoBehaviour:
         CollectorGUID: 33f777d553cae254a950b2f1303efb0c
         CollectorType: 0
         AddressRuleName: AddressByFileName
-        PackRuleName: PackArt
+        PackRuleName: PackTopDirectory
         FilterRuleName: CollectArtDynamic
         AssetTags: 
         UserData: 

GameClient/Assets/Editor/BuildEditor/PreloadAssetHelper.cs

@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using YooAsset.Editor;
+using YooAsset;
+using GFGGame;
+using UnityEditor;
+using System.IO;
+using UnityEngine;
+
+namespace GFGEditor
+{
+    public class PreloadAssetHelper
+    {
+
+        public static void CopyPreloadAssets()
+        {
+            // 等待资源构建流程完成
+            //......
+            string selectedFile =  EditorUtility.OpenFilePanel("Select a file", "", "");
+
+            if(string.IsNullOrEmpty(selectedFile))
+            {
+                return;
+            }
+            int t = selectedFile.LastIndexOf("/");
+            string dirPath = selectedFile.Substring(0, t);
+            // 加载构建成功的资源清单对象
+            byte[] manifestBytes = FileUtility.ReadAllBytes(selectedFile);
+            PackageManifest manifest = ManifestTools.DeserializeFromBinary(manifestBytes);
+
+            // 查找所有需要打进首包资源的依赖AB
+            HashSet<PackageBundle> bundles = new HashSet<PackageBundle>();
+
+            AssetBundlePreloadFiles assetBundlePreloadFiles = AssetBundlePreloadFiles.GetData();
+            foreach (var assetPath in assetBundlePreloadFiles.PreloadFiles)
+            {
+                if (manifest.TryGetPackageAsset(assetPath, out PackageAsset packageAsset))
+                {
+                    var packageBundle = manifest.BundleList[packageAsset.BundleID];
+                    if (bundles.Contains(packageBundle) == false)
+                        bundles.Add(packageBundle);
+                }
+            }
+
+            // 拷贝所有首包文件
+            string root = $"{AssetBundleBuilderHelper.GetDefaultStreamingAssetsRoot()}/{VersionController.DefaultPackage}";
+            foreach (var packageBundle in bundles)
+            {
+                string destPath = $"{root}/{packageBundle.FileName}";
+                //...... //拷贝文件
+                string sourcePath = $"{dirPath}/{packageBundle.FileName}";
+                File.Copy(sourcePath, destPath, true);
+                Debug.Log($"sourcePath { sourcePath}");
+                Debug.Log($"destPath { destPath}");
+            }
+        }
+
+    }
+}

GameClient/Assets/Editor/BuildEditor/PreloadAssetHelper.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 31296985951d2314e97cb005c87b0cad
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Editor/ToolsMenu.cs

@@ -364,5 +364,11 @@ namespace GFGEditor
         {
             BuildDllHelper.BuildHotUpdateDll();
         }
+
+        [MenuItem("Tools/Build/CopyPreloadAssets")]
+        public static void CopyPreloadAssets()
+        {
+            PreloadAssetHelper.CopyPreloadAssets();
+        }
     }
 }

GameClient/Assets/GFGAsset/AssetBundleCollectRuler.asset

@@ -18,19 +18,15 @@ MonoBehaviour:
   - Assets/Res/Texture/Npc
   - Assets/Res/Texture/Travel
   - Assets/Res/Texture/Icon
-  - Assets/Res/Texture/DressUp
-  - Assets/Res/Texture/SceneBg
   - Assets/Res/Texture/Card/Bg
   - Assets/Res/model
   - Assets/Res/Material
   PackByTopDir:
   - Assets/Res/Effect/UI
-  - Assets/Res/Effect/DressUp
   - Assets/Res/Texture/FieldGuide
   - Assets/Res/Texture/Head
   - Assets/Res/Texture/Photograph
   - Assets/Res/Texture/Studios
-  - Assets/Res/Animation/DressUp
-  - Assets/Res/Animation/Card
   PackByCollecter: []
-
+  PackByFileName:
+  - Assets/Res/Texture/DressUp

GameClient/Assets/GFGAsset/PreloadFiles.asset

@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 127bf1119e106da438c0750d5c0c0e45, type: 3}
+  m_Name: PreloadFiles
+  m_EditorClassIdentifier: 
+  PreloadFiles:
+  - Assets/Res/Texture/DressUp/head.png
+  - Assets/Res/Texture/DressUp/body.png
+  - Assets/Res/Texture/DressUp/faxing_ys.png
+  - Assets/Res/Texture/DressUp/faxing_ys_t.png
+  - Assets/Res/Texture/DressUp/lianyiqun_ys.png
+  - Assets/Res/Texture/DressUp/shangyi_ys.png
+  - Assets/Res/Texture/DressUp/xiazhuang_ys.png
+  - Assets/Res/Texture/DressUp/sanmiaoy_bg.jpg

GameClient/Assets/StreamingAssets/Bundles.meta → GameClient/Assets/GFGAsset/PreloadFiles.asset.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: a71d610f561efe84fb231488f4db759b
-folderAsset: yes
-DefaultImporter:
+guid: 82e7eb2342e33984d892d7f9bd8b168d
+NativeFormatImporter:
   externalObjects: {}
+  mainObjectFileID: 11400000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -46,7 +46,7 @@ namespace GFGGame
                 GameConfig.InitData(data);
                 //显示登录
                 LoginController.ShowLogin();
-                //_ = ItemCfgArray.Instance.GetAllDataAsync();
+                ItemCfgArray.Instance.Init();
             });
         }
 

GameClient/Assets/Resources/BuildinFileManifest.asset

@@ -13,194 +13,203 @@ MonoBehaviour:
   m_Name: BuildinFileManifest
   m_EditorClassIdentifier: 
   BuildinFiles:
-  - 040f55bf1ee3f98abc4d9804eedec76e.bundle
-  - 050f1e157be62bd8ee5d24432e43bbcb.bundle
-  - 054863532e2e560a5cb19b30dfad1ca0.bundle
-  - 075491d0704494daa8de8678814fa7de.bundle
-  - 080c2d419af7c8ac141a56754145c685.bundle
-  - 082dec7a27d13ed7f90638d090b40fa4.bundle
-  - 09a0197d8748a0f9eced1920e257066e.bundle
-  - 0ad4875fd95a64dca125ed0ffb08b769.bundle
+  - 0022efeddce4602e7d1e442c7701ee3f.bundle
+  - 008c1c826d127eaf09e0a80b7d94356e.bundle
+  - 02ce29974818897a51ef54629546ecf7.bundle
+  - 0426fa1572b33849430a35a49afc1f34.bundle
+  - 0454346e3a595910522b7cb059895b27.bundle
+  - 050e07ea07ef205553b63824df7be4f2.bundle
+  - 05d9ac6f230d319fa63fedec7e6b6fe5.bundle
+  - 06007e1cb87e9b25a0183ae5d670495d.bundle
+  - 08670e459551ea964350883d41600cc6.bundle
+  - 0996ecb0c9b99198362049fd6dbef4a6.bundle
+  - 0a6bf7f6303e4405132f05227d1a1a71.bundle
+  - 0ac8f7b2bfe7e29cbe3bf37b30fffde9.bundle
   - 0af6c381e44d02a04bd555d00d9486ed.bundle
-  - 0b029509b7ebb6618311ec4efa425b40.bundle
   - 0b439b9b7105946a8272fc40aa434e95.bundle
-  - 0ff43397fd334ae99d8a7d3cf3dfb4a9.bundle
-  - 10c848a16b9e0e045fdc0d4a21ab400f.bundle
+  - 0b6e504ef3fa792a4d95fb7157d5e9d2.bundle
+  - 0bebfab6d1bd175fecd91925bbc31039.bundle
+  - 0c8111fd87db6cc20749d1dda5725d01.bundle
+  - 0eda81b30c2c68a338e01242eec8b51b.bundle
+  - 0fdb2cff1b4ce245d353457077dd564b.bundle
+  - 0fe0651f5419839a437f3f6d9da7cf57.bundle
   - 116cc3604898b17747b846f150e9ab50.bundle
-  - 12a842a68504e30342a864d439b4aa53.bundle
+  - 11c13fc21576755624af2f6656db47ec.bundle
   - 12d15c825109752c59a3cdcfc7fe71e7.bundle
-  - 13c062da354bc5b2e3eb13fc68197fec.bundle
-  - 1460b04131ac802a315aacc69cd522ed.rawfile
+  - 13253fe02d452a65f3248bb239101a69.bundle
   - 14ab28d46fb5c587b56859b3e71bcb0f.bundle
-  - 14e1f62a5cce6cc6fabf0b6674f8c3be.bundle
+  - 14ee621d615442d94a90fb2956ece7f1.bundle
+  - 153c32fbcd435ba61260842d2ba2c471.bundle
+  - 157e763aa1e9062a4361360fd2c533b5.bundle
   - 158f05f624957192a7d8bdc742088108.bundle
-  - 15e240e3f0b1b7c78932d7d2796d6c75.bundle
+  - 16a9e7c9e96722a2cce2461d387496a5.bundle
   - 175ec6f3984e9a6ebe1355fffe5fbda1.bundle
-  - 18ecec62e844ad425d08945ddac71886.bundle
-  - 19753c311c8f8721a2b96e6c7a6f1b4c.bundle
-  - 1bc09b10bc63b305509705b2dbf88055.bundle
+  - 19d0c885a88cea2d2ebc9138179cc75f.bundle
   - 1ced95b45cf0db006b3ef7056ee8e714.bundle
-  - 1d833506acc13716f26c7041f26555aa.bundle
-  - 2020b153191b5599cb9b2445aef43b0b.bundle
-  - 2188d491d7274bfa39aa2f0286ac1477.bundle
-  - 21e24c355725701d086954268943e2c9.bundle
-  - 22dbc9da2e6e4979fa6f50879eb679ff.bundle
-  - 239ba3e78b912fa08b94cbb29002dd20.bundle
+  - 1f555dd6d324bea88df69b2b4f44d935.bundle
+  - 1f7ac094039f3a492642ff56bb50e450.bundle
+  - 1fcf616816b9bb9d6596884ada8f2286.bundle
+  - 20bf5efa2fd81ac57ad1dfdb9eafa33b.bundle
+  - 20c64bf764ffea1aa920ba018e82a690.bundle
+  - 2360d34f0d4ddea6f7d4e102498e293b.bundle
   - 23d9e0e5eadc26d11fe62d26dc7ee026.bundle
-  - 25047ab48213e0821b350200fda1fdec.bundle
-  - 260713b72ae58f497c77f86bea22ca91.bundle
   - 2619bd96be0c4e92bd65462dab89d453.bundle
-  - 262223f934652544a5e37c51dec35922.bundle
-  - 26490e46db15e7f560bd8707125cd74d.bundle
-  - 272d0274a2caef75d64942704398aa48.bundle
-  - 27590be071239bd82609fba292de65dd.bundle
-  - 2c7495ddd0e5ab064fb54af5143096d8.bundle
-  - 2c916a6a6247b6cbc3299dfe07ce8ef0.bundle
-  - 2dc5b50b6e6d2921ff2840af818b33b2.bundle
-  - 2e615848817f1239befad372f5851c0b.bundle
-  - 2e64e69babf262242d388ae4f8a20d84.bundle
-  - 2e683ec2d22a0a0088c703280d16cd91.bundle
-  - 2e857e8ac28756710a78bb6b0a2b0259.bundle
-  - 3074bd545c3216903268c814b83b1f24.bundle
-  - 31cfda192f8d80370bad64ee0fb8ae84.bundle
+  - 2670f5632d46d1b04ff52af31aa7dd51.bundle
+  - 279af853004b89f5e159608c639ecaa0.bundle
+  - 2b43ec3bbb77bf7dbb3c2ebb787d5a01.bundle
+  - 2c92fce54dad8e6f3798dff97466de28.bundle
+  - 2e62b21e0262277d3d5063afe8f8d8d2.bundle
+  - 2ea734d7783f8ece32f548eafac2de6f.bundle
+  - 2fe2f431a63c70e91c743a39d59c1258.bundle
+  - 32b6a07343fa10321aa86742ce8426c5.bundle
   - 32ff0d940efa72d7f1a5cb9fd340794c.bundle
-  - 3473b8502aac2cec2b8d64d689d00af4.bundle
-  - 387d323a034c182b05d85b854a588312.bundle
   - 389467199645f812903296d771443a1d.bundle
-  - 39959f04b4134c3e051b6d4a67675a5a.bundle
-  - 3cf3e183eba24619774f34dddfe05c98.bundle
-  - 3d7c6f9938c954709399223549b76b3b.bundle
-  - 3eeb8a5e3a9d30053be6c2553a0625a1.bundle
-  - 441e4011d607b50320091a25cdbe3bfc.bundle
+  - 3a308654fb045f01c80de0f5d9ea12b3.bundle
+  - 3c479cbd2c6d7a43e68bb2cdd7c038a9.bundle
+  - 3e0c455b6fe7dc856144aa95011c183c.bundle
+  - 3e281c9baaaf383c34334928b3098848.bundle
+  - 3f1cf4ccc548fbfb76ac7b10b2cc9074.bundle
+  - 40d67be96d4b5333633f7099a827f27d.bundle
+  - 415c743f1ec8ba37b5d3480ec67c12af.bundle
+  - 438f54d0d6446c3578bf311a0a165083.bundle
+  - 44944ae0861e843be1a8f2a8998e1b25.bundle
   - 4595391f4b01c2187bb20cb5832fa553.bundle
-  - 466f575b3f4ae9c1363f606ebec703eb.bundle
-  - 46e58baef09dec5eaf20349cb5141cdd.bundle
-  - 49deb832b7b674b4913e19eb6e44e03d.bundle
-  - 4d324f05ed15f466ecdddd5ec4d6a023.bundle
-  - 4e46fae1e2190a3bbc2149fa0954b13c.bundle
-  - 4f4bf06c7957fbf1aa5a765b8e340518.bundle
-  - 50f35cb2a5700daad9bd27a9990e8d68.bundle
-  - 5257f458f99c3159bab33d3c03d0561e.bundle
-  - 556404fb01ca38651647aa7203ac76c9.bundle
-  - 577a9dbe8fb6d3ff7a799bef7606c9b4.bundle
-  - 5ba80abd8fac2ba6be0d29ab5625b706.bundle
-  - 5bcbccdd67cc167474b342701bbb8aac.bundle
+  - 48a565a8b420ac9055b5b6b6566a02e4.bundle
+  - 48b9ff7e962aad2244fc9ce8daf6a7e8.bundle
+  - 4ac6a089f0eb744f3e51afa0ad7e3423.bundle
+  - 4d8a12c713c12e875c530cb3c91d2fdd.bundle
+  - 4e795b4d84a1e38457f60a5222c64043.bundle
+  - 4f55440b4b9589227121662d8549753c.bundle
+  - 4fba511be4453a35f007f15b1e1601fd.bundle
+  - 52bf99954f34b61d9766e35b50d7d602.bundle
+  - 5315f1a5c5e4bb9824ee9c8d3578b23f.bundle
+  - 5650bfa6e4338a81d75d4c3324190a2c.bundle
+  - 5755769bcf9eacabf117f0514c541247.bundle
+  - 5856c2a0b1ceb3a927fefef9de1519c2.bundle
+  - 59008fe3484e1a7a4a90ca2a0939da2d.bundle
+  - 59de46f6096f778d45f5d1e4fc176606.bundle
+  - 5b1630b2feba8a46e1cf40403d4d7f05.bundle
+  - 5c044014844579395ac3733be5835bba.bundle
   - 5c67c6d67753c4fd92ed3016c1b5f6ba.bundle
   - 5d1e9fdd3008cb9b8a3c370e11934cf7.bundle
-  - 5e4b8565450269c17d65cf10bf668fb3.bundle
-  - 5f092de9d429deeb4a28a5df441fe8df.bundle
+  - 5e52bfcef49f0eabeed6731c5a20433e.bundle
+  - 5fdfc6c3affe57fb00143184237eebc4.bundle
+  - 60fdfc568035f2e57494f2a446b97b00.bundle
+  - 62e1382767a281635b4a9c00024cf350.bundle
+  - 63617823969b5a16b69f2de222399f0a.bundle
   - 63e6afa476fb0dc90b32a7e36baa2846.bundle
-  - 66d391bf91eb3af14bb338943b5b764d.bundle
-  - 68728bf9f1c6d881e9a0c823682c8d88.bundle
-  - 6c1bdabc9a019330d652fabea6d5aa66.bundle
+  - 640442e619a74b91828300cc84abbf75.rawfile
+  - 640944620525824cc07e886cf945ec42.bundle
+  - 65f0100281fc41568c0d83a8c1cffb4f.bundle
+  - 6719882c54f5ea537772f56f3afae3f4.bundle
+  - 678540a583e2ecd285dd83971123a7c6.bundle
+  - 6a87336133ef165044f75a5a04ab8b3f.bundle
+  - 6b56e7ee7ad99aea8539c3608a17b7a6.bundle
+  - 6b5c375fe150a1e7dcb95b8ffe584485.bundle
+  - 6bb84c3a821068c6f3d641d45c1e02f0.bundle
+  - 6c4d2adb69fe0d0230359bc6907d6a6d.bundle
+  - 6e325cdcc51828650cdf1d4fa6c0d5c8.bundle
   - 6e64e29925851284e20dbed4932a6ab1.bundle
-  - 6f21900325a86d8dcc902a6f7c444355.bundle
+  - 6e7ba1b2e58ab1aa6d397bedbff25379.bundle
   - 70c119f57c1b2bea00aadda63ea96818.bundle
-  - 70d70f1858279ea4e2c52ce3202acae3.bundle
-  - 7134261e77347e9dcb885b7c793052ed.bundle
+  - 723415e529d85280bb472c91098428ea.bundle
+  - 73a721745314a855e511e02ab2164d39.bundle
+  - 73fe61979b2e32408f986adecd35f545.bundle
   - 76b00fd2c9eb448eb3dd2d4ee1fc0d45.bundle
-  - 77af17d5f38acde1a0df3acce1865cb5.bundle
+  - 77a61c6823665f98391999d012164a01.bundle
+  - 77bda917e80eefc38b5ebb3b76219d0f.bundle
   - 785704866a667eebe9ea70ac1db22752.bundle
-  - 78f81934f6ffd77560fa8dd56be20039.bundle
-  - 7e6012ddf3813c6d414c2cebc56efaca.bundle
-  - 7e7c5f410e0c3b77150d800ade12792a.bundle
-  - 7f79709c816d3504eee0a77356b717b5.bundle
-  - 80c97e59e4f258ce452d4afddf6cca8b.bundle
-  - 8111518fb5c7419afae10e7241a6ee0c.bundle
-  - 81bdd4fe70ac9f1dc53cf6561561fd05.bundle
-  - 82ea00e7eb7118d004a3b38ac1571fed.bundle
+  - 7c09176ef3f9aeb132dc683692001b56.bundle
+  - 7ded0d12b721a22232eec463d25fb0ea.bundle
+  - 80891ffa41d0c4b0fba836eb432e6f08.bundle
+  - 820e6783e0c0a9d665d82a21a65de402.bundle
   - 83ed18fc4e31997219d50d72725d37d7.bundle
-  - 83fcd01fb8807b2a1631d6da8f8d0285.bundle
-  - 86e7842bd7626a5d256f6d9e7c427d0a.bundle
-  - 87606992e0dae5d9ad30366715f73db6.bundle
-  - 8c4d12a5aa740ac222c36dcf5ca54a37.bundle
-  - 8d2bdcfd84b981063b0438d6e373f74a.bundle
-  - 8da660c52c3223ca79a46549c5e4d9d2.bundle
-  - 8e4fd217307a54fed8018556317384c4.bundle
-  - 8ec7d4a076f3602ce3ab584868b1484e.bundle
-  - 8ed1ea306119f690e147f0adcd53f81c.bundle
-  - 8ffdedc7d1d7c6d14d3d34af723bef3c.bundle
-  - 91065e88658cf678338ae089caa347d0.bundle
-  - 9196b7570c8a062583a7101e3476a8ec.bundle
+  - 8591500b0da75e840e23faa8c0d523f2.bundle
+  - 85b86aa30872bf935a82f7d6a7fda57b.bundle
+  - 877d38589bf1c46ace3d5bb51a7ab79b.bundle
+  - 8bddf307a930a529d05d77e2da1acdfc.bundle
+  - 8be21da1d6bdcb6f5db77b607bc7babf.bundle
+  - 8c1c0968284e0579dea84792a6bca4d2.bundle
+  - 9130d5c40b77a3f4af15647c9fa63810.bundle
+  - 93b7bfcc5320be29164bf63023825c39.bundle
+  - 940e60dfd9998cf3bc0f34f20557f72d.bundle
+  - 94adbe91abe3dfeeaa982958dc8bb6c5.bundle
+  - 968e1eed9b9456f69aed73a9bb5763e0.bundle
   - 970a9b4507f476f11c7a01f310696f80.bundle
-  - 99f428398ecb1efb0693b1f7ed32b29c.bundle
-  - 9bb149d5a5a97424e6e222d91b4ed190.bundle
-  - a0b907eed96efd281962e950c73d4ab9.bundle
-  - a234436a0a729ba07f013c1488b73594.bundle
-  - a3a82494dfd8e72dc85caac01333edf5.bundle
-  - a3d1de8217332a1ce446b642a2a5bc86.bundle
-  - a42625bebcc94e2fab575754677bad92.bundle
-  - a54cf29df933b426f44cbf7195ef6673.bundle
-  - a5dded3ed1cb30e91b3036423dd9e71c.bundle
-  - a9dcc72882c30ef48e12d186db1f6802.bundle
+  - 97d7ab310af7e7bf0964acec2d31c228.bundle
+  - 98822caa7a8c29a32c683a952d7f3dd0.bundle
+  - 9a8eb599d44e6591749774b8e588356b.bundle
+  - 9cb31c916d17eb2e748890c761dd25d3.bundle
+  - a18f616a489be602b6df3bcb31e9de4e.bundle
+  - a1b314be0a5113e747bcfc9d949ed6e5.bundle
   - ac00e9d1615c80397acbb09309d57792.bundle
-  - ac088892f07ade5324ab2aaa19d40193.bundle
+  - ac281207b1e15cb821894573e90a2271.bundle
+  - accfaf33013ce932180a0396b836b8a6.bundle
+  - adeb96732dccbb46ba1a044588968b21.bundle
+  - ae70fdf0d7b85f8a83d516110ed7135f.bundle
   - aed017e2cf74902990704cc7f3b7ec17.bundle
-  - afa93035c5279b6b6ab0bf1c6a108651.bundle
-  - b0114c0d34fafa1c904ce82bf824c6cf.bundle
-  - b6077006d91ccc0b19459ba74b00384e.bundle
-  - b6968abc6d9c702c2ed14f44274ed25c.bundle
+  - aee0833c800865e627f3a7f52a483d3b.bundle
+  - b3aeef69577122f64d613ba1e7fb9d04.bundle
   - b73f0b6d3c4b29f85333ae63379cfb15.bundle
-  - b85f65b06a3bb76f70b872b7738ea668.bundle
-  - b9e349a018a2d56d5c30e45a7ce3c81b.bundle
+  - b7412dced8d0bae799899247a4c54e68.bundle
+  - b876095d0b6738a903e3a7ea6e99b249.bundle
+  - b8f752d6a1c99141ae64f3ea027ceb00.bundle
   - bb3d3949389b450294031dbba8a9bf0c.bundle
-  - bc0a368b68dc5821c3d915a581e8b393.bundle
-  - bccca9c98df0aaa538837b056e1a3bb8.bundle
-  - bcf8a7cfe1222766c69103a4e76e512f.bundle
+  - bbb972e53160449c786b61b3c84e7e6b.bundle
+  - bbf6387e4b41785c318e5ad872af00b3.bundle
+  - bc1be44372373d2d98bdf92012c5b5d6.bundle
+  - bc648750b8a65cac8e88e33ce268ef14.bundle
   - bd839c9a83c48f76869d72b3d5a9244b.bundle
   - bda34824195b9ba41e4e4b6eeafe061d.bundle
-  - bdef9ae792745e329527d6f5ed51311b.bundle
+  - bea363036fd2818f0f361eb8d9ef000d.bundle
+  - bec153fb84f6e1c7761c2f8db5a1755f.bundle
+  - beda7cf81872ec1360b9e9041536d8dc.bundle
   - bf6376721c30345a5225357a2319b4de.bundle
-  - bfc049ee1190ac8013b946d49058043d.bundle
-  - bfc47e3e8f5804add0e49a62b0ecb4df.bundle
-  - c246220803a50f63dc9fd924e8b1368d.bundle
-  - c394983b4fba0e1912fde1cc1be9750e.bundle
-  - c5b2e35ebc920f3d4d0dea168441c669.bundle
-  - c7e27f3c5ae5036c264cc18a47c8efc9.bundle
+  - c20499d4e3397db4a21f41faa48416ef.bundle
+  - c2b28d57acbc508c4f1cd2cd31fb2063.bundle
+  - c702e5af73ce94e101a3b399889d83fa.bundle
   - c7ea5b7bb096117479634419cf57959d.bundle
+  - c867f9b7d6351d4fe2e30a0f9c9d926b.bundle
+  - c8bed04fa7474914d3a0c739a719ba80.bundle
   - c9da6e9b84c95c60010e55c6bffe176c.bundle
-  - cae6429eb80d622a13fc794f1baed6c1.bundle
+  - caab7ae6c0a4a229105b0f01a1e808bf.bundle
   - cb4c5f3a6776445acdcb99c401c02729.bundle
-  - ce3a75c762793d679a7d663c7a919f3c.bundle
-  - cfdb7b3fce65fd6b2bc56a79ee6e46fb.bundle
-  - d5b34df1bc271487c813726e7f5199e9.bundle
+  - cc47c6d700eef76c6a054a06338c3e28.bundle
+  - ce14072b47e5ed052347b5dcfb8ba3e1.bundle
+  - cf12a692ad6cb2a18ea93dc482b5b518.bundle
+  - d1b26d59414885bd476bd69b1b8c3773.bundle
+  - d1b9224d96677a87c2f0b9506db076ee.bundle
+  - d68c90ceb864f3b4459f9c1d38d6674d.bundle
   - d8c3503e7efd6fcd428e4dff7578a3f8.bundle
-  - d911c4d817a678f0c55fd8f2ebf3069f.bundle
+  - d9487902f87be674eb9ee5121c18353e.bundle
   - d94a287ac27da3fe1d66811d09d1e5d6.bundle
+  - d9a6ccca8deedd2fef581ee230028e75.bundle
+  - d9ee1d8582e75b2f6472e334bdbc99c6.bundle
   - dacabb00c1f1fb5e76389c78597809b2.bundle
-  - db4b020cac5671c6f6c213456ab39834.bundle
-  - ddd6cdc3498f014d148d0245f426cb85.bundle
-  - e0d0b09baa5dcb944fe26757874ec492.bundle
-  - e11e0c885c711c8dacb35ddfab1a22b0.bundle
+  - dda4aa7b85f32108c550c16477995dc6.bundle
+  - dddee4e0e039df8df7c3dd5e7d04c6a4.bundle
   - e159838ed79107ebd8ad4c1eded1e120.bundle
-  - e2a69b5af6b877dc547934b61a5a79d1.bundle
-  - e32ddbd47349b4915dd482e0be747f25.bundle
+  - e17950828c723d2d2d4d8310f827d960.bundle
+  - e1bb081904331d49492a7ce92bd4ec94.bundle
   - e4c6f2f5a1c22be0e094c90046cf6869.bundle
   - e4fc341b7a0994a19a749b82dd373ce3.bundle
-  - e56ec6b4c6ab6586edc3daed40698fb1.bundle
-  - e6c649adb5799097fc94b55c5259a014.bundle
-  - e700a0a3ffa35137bd96d303c3cf34f6.bundle
-  - e9d479ab12101c79c67df4d51f948573.bundle
-  - ecb5dc335090c1fcc0b07d0d12145101.bundle
-  - ed38f8d78edf8522f1799a70dc93a3f2.bundle
-  - ed474264fe61ab64ebcafa9e5bb859ce.bundle
+  - e61e67034f3c41c383066ebdf7e3fbda.bundle
+  - ea43a9fd157a5711f74e4e2cb55314e6.bundle
+  - eaa55b86936a4e982a21ccb8335746e0.bundle
+  - eb82352d0292a1452a1a8dd9c058253e.bundle
+  - ebce501f1a24aae3c8161d2c041a72d1.bundle
+  - ebf7da22b76185ee372c5c4c31fbd4a9.bundle
   - eda2640532ada969d8e1e8ccee1db6d0.bundle
+  - ee9c3510a149aa3b8b86d13507ac6c0f.bundle
   - eed2bdffa7939f68d634a403452effd5.bundle
   - efa2e2c2d42c0988327e6af2c247fdd6.bundle
   - f1253f303355dc02374b11af4e4c9eda.bundle
-  - f1d94c78c4de70e6c8020960f6a981ce.bundle
-  - f4ac927bab0d4ac230cda56bac02e022.bundle
-  - f558a32a402b605cc0ce2ca105292c93.bundle
-  - f57abd9b258c5f39de0ee323ee300a47.bundle
-  - f588f8db77ffae37e927a45f2b2ff47b.bundle
-  - f6823c00587fd91123ac1b79bfdd16a1.bundle
-  - f6f24d0f7b8a659037f5f5fbc59f4fb6.bundle
-  - f7db0874002ced2461ad6a2408005cb6.bundle
-  - f7e79dc6552d4fb50d0c2962a9f01ef2.bundle
-  - f81874b9e22565272b28733b1ac90462.bundle
-  - f896169e9a1bde9f56c69dd879b84f31.bundle
-  - f8abfd943bac5b41b96a35e39ca24822.bundle
-  - f98433b6970f87cd5d3ea1a0062c25be.bundle
+  - f3dc6614956f5ff03d4c46a9c7a610de.bundle
+  - f920d30ab7646549760dcc98423428a2.bundle
+  - fa41c5fdd7a0bedd8c71302fc938fd8d.bundle
+  - fb7a3defd9337f5594bef798c5a86a4b.bundle
   - fce1299d4d76d24fa50d7bd51320f7ea.bundle
+  - fd85cdc869d28db6daa099f9868b3e76.bundle
+  - fdc780f80942be7cd2d39b5ff5c441aa.bundle
   - ffbed72e2023bc16a40f41236144c66d.bundle
-  - ffd8a5ee9a882bb58e92b65a6fb93e1d.bundle
+  - fffb78bd0cf09bc1e76c00739f14c605.bundle

GameClient/Assets/StreamingAssets/Bundles/Manifest.meta

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

GameClient/Assets/StreamingAssets/Bundles/Manifest.version

@@ -1 +0,0 @@
-{"crc":426557319,"size":2183,"version":1,"appVersion":"1.6"}

GameClient/Assets/StreamingAssets/Bundles/Manifest.version.meta

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

GameClient/Assets/YooAsset/Editor/GFGAsset/Collect/AssetBundleCollectRuler.cs

@@ -11,7 +11,7 @@ namespace GFGEditor
     {
         public List<string> PackBySeparately;
         public List<string> PackByTopDir;
-        public List<string> PackByCollecter;
+        public List<string> PackByFileName;
 
         public static AssetBundleCollectRuler GetData()
         {

GameClient/Assets/YooAsset/Editor/GFGAsset/Collect/AssetBundleHelper.cs

@@ -54,7 +54,7 @@ namespace GFGEditor
                     {
                         var indexLastDot = path.LastIndexOf('.');
                         string key = path.Substring(0, indexLastDot);
-                        CollectDynamicFile(dir, key, path);
+                        CollectDynamicFile(dir, key, path, true);
                     }
                 });
             }
@@ -74,7 +74,26 @@ namespace GFGEditor
                         var topPath = path.Replace(dir + "/", "");
                         var arr = topPath.Split('/');
                         string key = dir + "/" + arr[0];
-                        CollectDynamicFile(dir, key, path);
+                        CollectDynamicFile(dir, key, path, true);
+                    }
+                });
+            }
+            foreach (var dir in ruler.PackByFileName)
+            {
+                FileHelper.ForeachFileInDir(dir, null, (string filePath) =>
+                {
+                    var path = filePath.Replace("\\", "/");
+                    var ext = Path.GetExtension(filePath);
+                    if (IsIgnoreFileExtension(ext))
+                    {
+                        return;
+                    }
+                    var dirPath = dir + "/";
+                    if (path.Contains(dirPath))
+                    {
+                        var indexLastDot = path.LastIndexOf('.');
+                        string key = path.Substring(0, indexLastDot);
+                        CollectDynamicFile(dir, key, path, false);
                     }
                 });
             }
@@ -101,7 +120,7 @@ namespace GFGEditor
             _ruler = null;
         }
 
-        public static void CollectDynamicFile(string dirPath, string itemKey, string assetPath)
+        public static void CollectDynamicFile(string dirPath, string itemKey, string assetPath, bool autoMerge)
         {
             AssetBundleAssetList assetList;
             AssetBundleAssetListItem newItem;
@@ -148,7 +167,14 @@ namespace GFGEditor
                 itemsSizeDic[itemKey] = newItem;
             }
             newItem.list.Add(assetPath);
-            newItem.bytes += GetFileSize(assetPath);
+            if(autoMerge)
+            {
+                newItem.bytes += GetFileSize(assetPath);
+            }
+            else
+            {
+                newItem.bytes = LimitByteSize;
+            }
         }
 
         public static void CollectNewItems()
@@ -239,16 +265,6 @@ namespace GFGEditor
 
         public static string GetBundleName(string assetPath)
         {
-            var path = assetPath.Replace("\\", "/");
-
-            foreach (var dir in ruler.PackByCollecter)
-            {
-                var dirPath = dir + "/";
-                if (path.Contains(dirPath))
-                {
-                    return dir;
-                }
-            }
             string bundleName = null;
             if (fileBundleDic != null)
             {

GameClient/Assets/YooAsset/Editor/GFGAsset/Collect/AssetBundlePreloadFiles.cs

@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace GFGEditor
+{
+    [CreateAssetMenu(menuName = "GFGAsset/PreloadFiles", fileName = "PreloadFiles")]
+    public class AssetBundlePreloadFiles : ScriptableObject
+    {
+        public List<string> PreloadFiles = new List<string>();
+        public static AssetBundlePreloadFiles GetData()
+        {
+            return AssetDatabase.LoadAssetAtPath<AssetBundlePreloadFiles>($"Assets/GFGAsset/PreloadFiles.asset");
+        }
+    }
+}

GameClient/Assets/YooAsset/Editor/GFGAsset/Collect/AssetBundlePreloadFiles.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 127bf1119e106da438c0750d5c0c0e45
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: