Update CHANGELOG.md

增加TaskCreateCatalog任务节点

.gitignore

@@ -20,6 +20,8 @@
 /Assets/StreamingAssets.meta
 /Assets/Samples
 /Assets/Samples.meta
+/Assets/csc.rsp
+/Assets/csc.rsp.meta
 /UserSettings
 
 

Assets/YooAsset/CHANGELOG.md

@@ -2,12 +2,61 @@
 
 All notable changes to this package will be documented in this file.
 
+## [2.3.6] - 2025-03-25
+
+### Improvements
+
+- 构建管线新增了TaskCreateCatalog任务节点。
+- 内置文件系统的catalog文件现在存储在streammingAssets目录下。
+
+### Fixed
+
+- (#486) 修复了微信小游戏文件系统调用ClearUnusedBundleFiles时候的异常。
+
+## [2.3.5-preview] - 2025-03-14
+
+### Fixed
+
+- (#502) 修复了原生缓存文件由于文件格式变动导致的加载本地缓存文件失败的问题。
+- (#504) 修复了MacOS平台Offline Play Mode模式请求本地资源清单失败的问题。
+- (#506) 修复了v2.3x版本LoadAllAssets方法计算依赖Bundle不完整的问题。
+- (#506) 修复了微信小游戏文件系统，在启用加密算法后卸载bundle报错的问题。
+
+## [2.3.4-preview] - 2025-03-08
+
+### Improvements
+
+- YooAsset支持了版本宏定义。
+
+  ```csharp
+  YOO_ASSET_2
+  YOO_ASSET_2_3
+  YOO_ASSET_2_3_OR_NEWER
+  ```
+
+### Fixed
+
+- (#389) 修复了禁用域重载(Reload Domain)的情况下，再次启动游戏报错的问题。
+- (#496) 修复了文件系统参数RESUME_DOWNLOAD_MINMUM_SIZE传入int值会导致异常的错误。
+- (#498) 修复了v2.3版本尝试加载安卓包内的原生资源包失败的问题。
+
+### Added
+
+- 新增了YooAssets.GetAllPackages()方法
+
+  ```csharp
+  /// <summary>
+  /// 获取所有资源包裹
+  /// </summary>
+  public static List<ResourcePackage> GetAllPackages()
+  ```
+
 ## [2.3.3-preview] - 2025-03-06
 
 ### Improvements
 
 - 新增了异步操作任务调试器，AssetBundleDebugger窗口-->OperationView视图模式
-- 编辑器下模拟构建默认启用依赖关系数据库，可以大幅增加编辑器下开始游戏时间。
+- 编辑器下模拟构建默认启用依赖关系数据库，可以大幅降低编辑器下启动游戏的时间。
 - 单元测试用例增加加密解密测试用例。
 
 ### Fixed

Assets/YooAsset/Editor/Assembly.meta

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

Assets/YooAsset/Editor/Assembly/MacroDefine.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+    public class MacroDefine
+    {
+        /// <summary>
+        /// YooAsset版本宏定义
+        /// </summary>
+        public static readonly List<string> Macros = new List<string>()
+        {
+            "YOO_ASSET_2",
+            "YOO_ASSET_2_3",
+            "YOO_ASSET_2_3_OR_NEWER",
+        };
+    }
+}

Assets/YooAsset/Editor/Assembly/MacroDefine.cs.meta

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

Assets/YooAsset/Editor/Assembly/MacroProcessor.cs

@@ -0,0 +1,96 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+    [InitializeOnLoad]
+    public class MacroProcessor : AssetPostprocessor
+    {
+        static string OnGeneratedCSProject(string path, string content)
+        {
+            XmlDocument xmlDoc = new XmlDocument();
+            xmlDoc.LoadXml(content);
+
+            if (IsCSProjectReferenced(xmlDoc.DocumentElement) == false)
+                return content;
+
+            if (ProcessDefineConstants(xmlDoc.DocumentElement) == false)
+                return content;
+
+            // 将修改后的XML结构重新输出为文本
+            var stringWriter = new StringWriter();
+            var writerSettings = new XmlWriterSettings();
+            writerSettings.Indent = true;
+            var xmlWriter = XmlWriter.Create(stringWriter, writerSettings);
+            xmlDoc.WriteTo(xmlWriter);
+            xmlWriter.Flush();
+            return stringWriter.ToString();
+        }
+
+        /// <summary>
+        /// 处理宏定义
+        /// </summary>
+        private static bool ProcessDefineConstants(XmlElement element)
+        {
+            if (element == null)
+                return false;
+
+            bool processed = false;
+            foreach (XmlNode node in element.ChildNodes)
+            {
+                if (node.Name != "PropertyGroup")
+                    continue;
+
+                foreach (XmlNode childNode in node.ChildNodes)
+                {
+                    if (childNode.Name != "DefineConstants")
+                        continue;
+
+                    string[] defines = childNode.InnerText.Split(';');
+                    HashSet<string> hashSets = new HashSet<string>(defines);
+                    foreach (string yooMacro in MacroDefine.Macros)
+                    {
+                        string tmpMacro = yooMacro.Trim();
+                        if (hashSets.Contains(tmpMacro) == false)
+                            hashSets.Add(tmpMacro);
+                    }
+                    childNode.InnerText = string.Join(";", hashSets.ToArray());
+                    processed = true;
+                }
+            }
+
+            return processed;
+        }
+
+        /// <summary>
+        /// 检测工程是否引用了YooAsset
+        /// </summary>
+        private static bool IsCSProjectReferenced(XmlElement element)
+        {
+            if (element == null)
+                return false;
+
+            foreach (XmlNode node in element.ChildNodes)
+            {
+                if (node.Name != "ItemGroup")
+                    continue;
+
+                foreach (XmlNode childNode in node.ChildNodes)
+                {
+                    if (childNode.Name != "Reference" && childNode.Name != "ProjectReference")
+                        continue;
+
+                    string include = childNode.Attributes["Include"].Value;
+                    if (include.Contains("YooAsset"))
+                        return true;
+                }
+            }
+
+            return false;
+        }
+    }
+}

Assets/YooAsset/Editor/Assembly/MacroProcessor.cs.meta

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

Assets/YooAsset/Editor/Assembly/RspGenerator.cs

@@ -0,0 +1,115 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using UnityEditor;
+using UnityEngine;
+
+#if YOO_ASSET_EXPERIMENT
+namespace YooAsset.Editor.Experiment
+{
+    [InitializeOnLoad]
+    public class RspGenerator
+    {
+        // csc.rsp文件路径
+        private static string RspFilePath => Path.Combine(Application.dataPath, "csc.rsp");
+
+        static RspGenerator()
+        {
+            UpdateRspFile(MacroDefine.Macros, null);
+        }
+
+        /// <summary>
+        /// 更新csc.rsp文件
+        /// </summary>
+        private static void UpdateRspFile(List<string> addMacros, List<string> removeMacros)
+        {
+            var existingDefines = new HashSet<string>();
+            var otherLines = new List<string>();
+
+            // 1. 读取现有内容
+            ReadRspFile(existingDefines, otherLines);
+
+            // 2. 添加新宏
+            if (addMacros != null && addMacros.Count > 0)
+            {
+                addMacros.ForEach(x =>
+                {
+                    if (existingDefines.Contains(x) == false)
+                        existingDefines.Add(x);
+                });
+            }
+
+            // 3. 移除指定宏
+            if (removeMacros != null && removeMacros.Count > 0)
+            {
+                removeMacros.ForEach(x =>
+                {
+                    existingDefines.Remove(x);
+                });
+            }
+
+            // 4. 重新生成内容
+            WriteRspFile(existingDefines, otherLines);
+
+            // 5. 刷新AssetDatabase
+            AssetDatabase.Refresh();
+            EditorUtility.RequestScriptReload();
+        }
+
+        /// <summary>
+        /// 读取csc.rsp文件,返回宏定义和其他行
+        /// </summary>
+        private static void ReadRspFile(HashSet<string> defines, List<string> others)
+        {
+            if (defines == null)
+                defines = new HashSet<string>();
+
+            if (others == null)
+                others = new List<string>();
+
+            if (File.Exists(RspFilePath) == false)
+                return;
+
+            foreach (string line in File.ReadAllLines(RspFilePath))
+            {
+                if (line.StartsWith("-define:"))
+                {
+                    string[] parts = line.Split(new[] { ':' }, 2);
+                    if (parts.Length == 2)
+                    {
+                        defines.Add(parts[1].Trim());
+                    }
+                }
+                else
+                {
+                    others.Add(line);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 重新写入csc.rsp文件
+        /// </summary>
+        private static void WriteRspFile(HashSet<string> defines, List<string> others)
+        {
+            StringBuilder sb = new StringBuilder();
+            if (others != null && others.Count > 0)
+            {
+                others.ForEach(o => sb.AppendLine(o));
+            }
+
+            if (defines != null && defines.Count > 0)
+            {
+                foreach (string define in defines)
+                {
+                    sb.AppendLine($"-define:{define}");
+                }
+            }
+
+            File.WriteAllText(RspFilePath, sb.ToString());
+        }
+    }
+}
+#endif

Assets/YooAsset/Editor/Assembly/RspGenerator.cs.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateCatalog.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog
+    {
+        /// <summary>
+        /// 生成内置资源记录文件
+        /// </summary>
+        internal void CreateCatalogFile(BuildParametersContext buildParametersContext)
+        {
+            string buildinRootDirectory = buildParametersContext.GetBuildinRootDirectory();
+            string buildPackageName = buildParametersContext.Parameters.PackageName;
+            DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(buildPackageName, buildinRootDirectory);
+
+            // 刷新目录
+            AssetDatabase.Refresh();
+        }
+    }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateCatalog.cs.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs

@@ -30,7 +30,7 @@ namespace YooAsset.Editor
 
             // 创建新补丁清单
             PackageManifest manifest = new PackageManifest();
-            manifest.FileVersion = YooAssetSettings.ManifestFileVersion;
+            manifest.FileVersion = ManifestDefine.FileVersion;
             manifest.EnableAddressable = buildMapContext.Command.EnableAddressable;
             manifest.LocationToLower = buildMapContext.Command.LocationToLower;
             manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateCatalog_BBP.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog_BBP : TaskCreateCatalog, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            {
+                CreateCatalogFile(buildParametersContext);
+            }
+        }
+    }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateCatalog_BBP.cs.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildPipeline.cs

@@ -36,6 +36,7 @@ namespace YooAsset.Editor
                     new TaskCreateReport_BBP(),
                     new TaskCreatePackage_BBP(),
                     new TaskCopyBuildinFiles_BBP(),
+                    new TaskCreateCatalog_BBP()
                 };
             return pipeline;
         }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateCatalog_RFBP.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog_RFBP : TaskCreateCatalog, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            {
+                CreateCatalogFile(buildParametersContext);
+            }
+        }
+    }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateCatalog_RFBP.cs.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildPipeline.cs

@@ -38,6 +38,7 @@ namespace YooAsset.Editor
                     new TaskCreateReport_RFBP(),
                     new TaskCreatePackage_RFBP(),
                     new TaskCopyBuildinFiles_RFBP(),
+                    new TaskCreateCatalog_RFBP()
                 };
             return pipeline;
         }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateCatalog_SBP.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog_SBP : TaskCreateCatalog, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            {
+                CreateCatalogFile(buildParametersContext);
+            }
+        }
+    }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateCatalog_SBP.cs.meta

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildPipeline.cs

@@ -36,6 +36,7 @@ namespace YooAsset.Editor
                     new TaskCreateReport_SBP(),
                     new TaskCreatePackage_SBP(),
                     new TaskCopyBuildinFiles_SBP(),
+                    new TaskCreateCatalog_SBP()
                 };
             return pipeline;
         }

Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultIgnoreRule.cs

@@ -10,7 +10,7 @@ namespace YooAsset.Editor
         /// <summary>
         /// 忽略的文件类型
         /// </summary>
-        public readonly static HashSet<string> IgnoreFileExtensions = new HashSet<string>() { "", ".so", ".dll", ".cs", ".js", ".boo", ".meta", ".cginc", ".hlsl" };
+        public readonly static HashSet<string> IgnoreFileExtensions = new HashSet<string>() { "", ".so", ".cs", ".js", ".boo", ".meta", ".cginc", ".hlsl" };
     }
 
     /// <summary>

Assets/YooAsset/Runtime/Assembly.meta

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

Assets/YooAsset/Runtime/DiagnosticSystem/RemoteDebuggerInRuntime.cs

@@ -7,6 +7,15 @@ namespace YooAsset
 {
     internal class RemoteDebuggerInRuntime : MonoBehaviour
     {
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void OnRuntimeInitialize()
+        {
+            _sampleOnce = false;
+            _autoSample = false;
+        }
+#endif
+
         private static bool _sampleOnce = false;
         private static bool _autoSample = false;
 

Assets/YooAsset/Runtime/DiagnosticSystem/RemoteEditorConnection.cs

@@ -8,6 +8,14 @@ namespace YooAsset
 {
     internal class RemoteEditorConnection
     {
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void OnRuntimeInitialize()
+        {
+            _instance = null;
+        }
+#endif
+
         private static RemoteEditorConnection _instance;
         public static RemoteEditorConnection Instance
         {

Assets/YooAsset/Runtime/DiagnosticSystem/RemotePlayerConnection.cs

@@ -8,6 +8,14 @@ namespace YooAsset
 {
     internal class RemotePlayerConnection
     {
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void OnRuntimeInitialize()
+        {
+            _instance = null;
+        }
+#endif
+
         private static RemotePlayerConnection _instance;
         public static RemotePlayerConnection Instance
         {

Assets/YooAsset/Runtime/DownloadSystem/DownloadSystemHelper.cs

@@ -1,4 +1,5 @@
 using UnityEngine.Networking;
+using UnityEngine;
 
 namespace YooAsset
 {
@@ -9,6 +10,14 @@ namespace YooAsset
 
     internal class DownloadSystemHelper
     {
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void OnRuntimeInitialize()
+        {
+            UnityWebRequestCreater = null;
+        }
+#endif
+
         public static UnityWebRequestDelegate UnityWebRequestCreater = null;
         public static UnityWebRequest NewUnityWebRequestGet(string requestURL)
         {
@@ -28,7 +37,9 @@ namespace YooAsset
             string url;
 
             // 获取对应平台的URL地址
-#if UNITY_EDITOR
+#if UNITY_EDITOR_OSX
+            url = StringUtility.Format("file://{0}", path);
+#elif UNITY_EDITOR
             url = StringUtility.Format("file:///{0}", path);
 #elif UNITY_WEBGL
             url = path;

Assets/YooAsset/Runtime/DownloadSystem/WebRequestCounter.cs

@@ -6,6 +6,14 @@ namespace YooAsset
 {
     internal class WebRequestCounter
     {
+#if UNITY_EDITOR
+        [UnityEngine.RuntimeInitializeOnLoadMethod(UnityEngine.RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void OnRuntimeInitialize()
+        {
+            _requestFailedRecorder.Clear();
+        }
+#endif
+
         /// <summary>
         /// 记录网络请求失败事件的次数
         /// </summary>

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/CatalogDefine.cs

@@ -0,0 +1,21 @@
+
+namespace YooAsset
+{
+    internal class CatalogDefine
+    {
+        /// <summary>
+        /// 文件极限大小（100MB）
+        /// </summary>
+        public const int FileMaxSize = 104857600;
+
+        /// <summary>
+        /// 文件头标记
+        /// </summary>
+        public const uint FileSign = 0x133C5EE;
+
+        /// <summary>
+        /// 文件格式版本
+        /// </summary>
+        public const string FileVersion = "1.0.0";
+    }
+}

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/CatalogDefine.cs.meta

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

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/CatalogTools.cs

@@ -0,0 +1,102 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace YooAsset
+{
+    internal static class CatalogTools
+    {
+        /// <summary>
+        /// 序列化（JSON文件）
+        /// </summary>
+        public static void SerializeToJson(string savePath, DefaultBuildinFileCatalog catalog)
+        {
+            string json = JsonUtility.ToJson(catalog, true);
+            FileUtility.WriteAllText(savePath, json);
+        }
+
+        /// <summary>
+        /// 反序列化（JSON文件）
+        /// </summary>
+        public static DefaultBuildinFileCatalog DeserializeFromJson(string jsonContent)
+        {
+            return JsonUtility.FromJson<DefaultBuildinFileCatalog>(jsonContent);
+        }
+
+        /// <summary>
+        /// 序列化（二进制文件）
+        /// </summary>
+        public static void SerializeToBinary(string savePath, DefaultBuildinFileCatalog catalog)
+        {
+            using (FileStream fs = new FileStream(savePath, FileMode.Create))
+            {
+                // 创建缓存器
+                BufferWriter buffer = new BufferWriter(CatalogDefine.FileMaxSize);
+
+                // 写入文件标记
+                buffer.WriteUInt32(CatalogDefine.FileSign);
+
+                // 写入文件版本
+                buffer.WriteUTF8(CatalogDefine.FileVersion);
+
+                // 写入文件头信息
+                buffer.WriteUTF8(catalog.PackageName);
+                buffer.WriteUTF8(catalog.PackageVersion);
+
+                // 写入资源包列表
+                buffer.WriteInt32(catalog.Wrappers.Count);
+                for (int i = 0; i < catalog.Wrappers.Count; i++)
+                {
+                    var fileWrapper = catalog.Wrappers[i];
+                    buffer.WriteUTF8(fileWrapper.BundleGUID);
+                    buffer.WriteUTF8(fileWrapper.FileName);
+                }
+
+                // 写入文件流
+                buffer.WriteToStream(fs);
+                fs.Flush();
+            }
+        }
+
+        /// <summary>
+        /// 反序列化（二进制文件）
+        /// </summary>
+        public static DefaultBuildinFileCatalog DeserializeFromBinary(byte[] binaryData)
+        {
+            // 创建缓存器
+            BufferReader buffer = new BufferReader(binaryData);
+
+            // 读取文件标记
+            uint fileSign = buffer.ReadUInt32();
+            if (fileSign != CatalogDefine.FileSign)
+                throw new Exception("Invalid catalog file !");
+
+            // 读取文件版本
+            string fileVersion = buffer.ReadUTF8();
+            if (fileVersion != CatalogDefine.FileVersion)
+                throw new Exception($"The catalog file version are not compatible : {fileVersion} != {CatalogDefine.FileVersion}");
+
+            DefaultBuildinFileCatalog catalog = new DefaultBuildinFileCatalog();
+            {
+                // 读取文件头信息
+                catalog.FileVersion = fileVersion;
+                catalog.PackageName = buffer.ReadUTF8();
+                catalog.PackageVersion = buffer.ReadUTF8();
+
+                // 读取资源包列表
+                int fileCount = buffer.ReadInt32();
+                catalog.Wrappers = new List<DefaultBuildinFileCatalog.FileWrapper>(fileCount);
+                for (int i = 0; i < fileCount; i++)
+                {
+                    var fileWrapper = new DefaultBuildinFileCatalog.FileWrapper();
+                    fileWrapper.BundleGUID = buffer.ReadUTF8();
+                    fileWrapper.FileName = buffer.ReadUTF8();
+                    catalog.Wrappers.Add(fileWrapper);
+                }
+            }
+
+            return catalog;
+        }
+    }
+}

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/CatalogTools.cs.meta

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

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileCatalog.cs

@@ -1,27 +1,27 @@
 using System;
+using System.IO;
 using System.Collections.Generic;
-using UnityEngine;
 
 namespace YooAsset
 {
     /// <summary>
     /// 内置资源清单目录
     /// </summary>
-    internal class DefaultBuildinFileCatalog : ScriptableObject
+    [Serializable]
+    internal class DefaultBuildinFileCatalog
     {
         [Serializable]
         public class FileWrapper
         {
             public string BundleGUID;
             public string FileName;
-
-            public FileWrapper(string bundleGUID, string fileName)
-            {
-                BundleGUID = bundleGUID;
-                FileName = fileName;
-            }
         }
 
+        /// <summary>
+        /// 文件版本
+        /// </summary>
+        public string FileVersion;
+
         /// <summary>
         /// 包裹名称
         /// </summary>

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystem.cs

@@ -147,15 +147,15 @@ namespace YooAsset
             }
             else if (name == FileSystemParametersDefine.APPEND_FILE_EXTENSION)
             {
-                AppendFileExtension = (bool)value;
+                AppendFileExtension = Convert.ToBoolean(value);
             }
             else if (name == FileSystemParametersDefine.DISABLE_CATALOG_FILE)
             {
-                DisableCatalogFile = (bool)value;
+                DisableCatalogFile = Convert.ToBoolean(value);
             }
             else if (name == FileSystemParametersDefine.COPY_BUILDIN_PACKAGE_MANIFEST)
             {
-                CopyBuildinPackageManifest = (bool)value;
+                CopyBuildinPackageManifest = Convert.ToBoolean(value);
             }
             else if (name == FileSystemParametersDefine.COPY_BUILDIN_PACKAGE_MANIFEST_DEST_ROOT)
             {
@@ -239,6 +239,11 @@ namespace YooAsset
             if (Exists(bundle) == false)
                 return null;
 
+#if UNITY_ANDROID
+            //TODO : 安卓平台内置文件属于APK压缩包内的文件。
+            YooLogger.Error($"Android platform not support read buildin bundle file data !");
+            return null;
+#else
             if (bundle.Encrypted)
             {
                 if (DecryptionServices == null)
@@ -261,6 +266,7 @@ namespace YooAsset
                 string filePath = GetBuildinFileLoadPath(bundle);
                 return FileUtility.ReadAllBytes(filePath);
             }
+#endif
         }
         public virtual string ReadBundleFileText(PackageBundle bundle)
         {
@@ -270,6 +276,11 @@ namespace YooAsset
             if (Exists(bundle) == false)
                 return null;
 
+#if UNITY_ANDROID
+            //TODO : 安卓平台内置文件属于APK压缩包内的文件。
+            YooLogger.Error($"Android platform not support read buildin bundle file text !");
+            return null;
+#else
             if (bundle.Encrypted)
             {
                 if (DecryptionServices == null)
@@ -292,6 +303,7 @@ namespace YooAsset
                 string filePath = GetBuildinFileLoadPath(bundle);
                 return FileUtility.ReadAllText(filePath);
             }
+#endif
         }
 
         #region 内部方法
@@ -324,10 +336,9 @@ namespace YooAsset
             string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
             return PathUtility.Combine(_packageRoot, fileName);
         }
-        public string GetCatalogFileLoadPath()
+        public string GetCatalogBinaryFileLoadPath()
         {
-            string fileName = Path.GetFileNameWithoutExtension(DefaultBuildinFileSystemDefine.BuildinCatalogFileName);
+            return PathUtility.Combine(_packageRoot, DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName);
-            return YooAssetSettingsData.GetYooResourcesLoadPath(PackageName, fileName);
         }
 
         /// <summary>

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystemBuild.cs

@@ -17,10 +17,6 @@ namespace YooAsset
         {
             YooLogger.Log("Begin to create catalog file !");
 
-            string savePath = YooAssetSettingsData.GetYooResourcesFullPath();
-            if (UnityEditor.AssetDatabase.DeleteAsset(savePath))
-                UnityEditor.AssetDatabase.Refresh();
-
             string rootPath = YooAssetSettingsData.GetYooDefaultBuildinRoot();
             DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
             if (rootDirectory.Exists == false)
@@ -87,10 +83,25 @@ namespace YooAsset
             }
 
             // 创建内置清单实例
-            var buildinFileCatalog = ScriptableObject.CreateInstance<DefaultBuildinFileCatalog>();
+            var buildinFileCatalog = new DefaultBuildinFileCatalog();
+            buildinFileCatalog.FileVersion = CatalogDefine.FileVersion;
             buildinFileCatalog.PackageName = packageName;
             buildinFileCatalog.PackageVersion = packageVersion;
 
+            // 创建白名单查询集合
+            HashSet<string> whiteFileList = new HashSet<string>
+            {
+                "link.xml",
+                "buildlogtep.json",
+                $"{packageName}.version",
+                $"{packageName}_{packageVersion}.bytes",
+                $"{packageName}_{packageVersion}.hash",
+                $"{packageName}_{packageVersion}.json",
+                $"{packageName}_{packageVersion}.report",
+                DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName,
+                DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName
+            };
+
             // 记录所有内置资源文件
             DirectoryInfo rootDirectory = new DirectoryInfo(pacakgeDirectory);
             FileInfo[] fileInfos = rootDirectory.GetFiles();
@@ -99,23 +110,15 @@ namespace YooAsset
                 if (fileInfo.Extension == ".meta")
                     continue;
 
-                if (fileInfo.Name == "link.xml" || fileInfo.Name == "buildlogtep.json")
+                if (whiteFileList.Contains(fileInfo.Name))
-                    continue;
-                if (fileInfo.Name == $"{packageName}.version")
-                    continue;
-                if (fileInfo.Name == $"{packageName}_{packageVersion}.bytes")
-                    continue;
-                if (fileInfo.Name == $"{packageName}_{packageVersion}.hash")
-                    continue;
-                if (fileInfo.Name == $"{packageName}_{packageVersion}.json")
-                    continue;
-                if (fileInfo.Name == $"{packageName}_{packageVersion}.report")
                     continue;
 
                 string fileName = fileInfo.Name;
                 if (fileMapping.TryGetValue(fileName, out string bundleGUID))
                 {
-                    var wrapper = new DefaultBuildinFileCatalog.FileWrapper(bundleGUID, fileName);
+                    var wrapper = new DefaultBuildinFileCatalog.FileWrapper();
+                    wrapper.BundleGUID = bundleGUID;
+                    wrapper.FileName = fileName;
                     buildinFileCatalog.Wrappers.Add(wrapper);
                 }
                 else
@@ -124,21 +127,20 @@ namespace YooAsset
                 }
             }
 
-            // 创建输出目录
+            // 创建输出文件
-            string fullPath = YooAssetSettingsData.GetYooResourcesFullPath();
+            string jsonFilePath = $"{pacakgeDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName}";
-            string saveFilePath = $"{fullPath}/{packageName}/{DefaultBuildinFileSystemDefine.BuildinCatalogFileName}";
+            if (File.Exists(jsonFilePath))
-            FileUtility.CreateFileDirectory(saveFilePath);
+                File.Delete(jsonFilePath);
+            CatalogTools.SerializeToJson(jsonFilePath, buildinFileCatalog);
 
             // 创建输出文件
-            UnityEditor.AssetDatabase.CreateAsset(buildinFileCatalog, saveFilePath);
+            string binaryFilePath = $"{pacakgeDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName}";
-            UnityEditor.EditorUtility.SetDirty(buildinFileCatalog);
+            if (File.Exists(binaryFilePath))
-#if UNITY_2019
+                File.Delete(binaryFilePath);
-            UnityEditor.AssetDatabase.SaveAssets();
+            CatalogTools.SerializeToBinary(binaryFilePath, buildinFileCatalog);
-#else
-            UnityEditor.AssetDatabase.SaveAssetIfDirty(buildinFileCatalog);
-#endif
 
-            Debug.Log($"Succeed to save buildin file catalog : {saveFilePath}");
+            UnityEditor.AssetDatabase.Refresh();
+            Debug.Log($"Succeed to save buildin file catalog : {binaryFilePath}");
             return true;
         }
     }

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystemDefine.cs

@@ -4,8 +4,13 @@ namespace YooAsset
     internal class DefaultBuildinFileSystemDefine
     {
         /// <summary>
-        /// 内置清单文件名称
+        /// 内置清单JSON文件名称
         /// </summary>
-        public const string BuildinCatalogFileName = "BuildinCatalog.asset";
+        public const string BuildinCatalogJsonFileName = "BuildinCatalog.json";
+
+        /// <summary>
+        /// 内置清单二进制文件名称
+        /// </summary>
+        public const string BuildinCatalogBinaryFileName = "BuildinCatalog.bytes";
     }
 }

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/DBFSLoadBundleOperation.cs

@@ -176,6 +176,12 @@ namespace YooAsset
 
             if (_steps == ESteps.LoadBuildinRawBundle)
             {
+#if UNITY_ANDROID
+                //TODO : 安卓平台内置文件属于APK压缩包内的文件。
+                _steps = ESteps.Done;
+                Result = new RawBundleResult(_fileSystem, _bundle);
+                Status = EOperationStatus.Succeed;
+#else
                 string filePath = _fileSystem.GetBuildinFileLoadPath(_bundle);
                 if (File.Exists(filePath))
                 {
@@ -190,6 +196,7 @@ namespace YooAsset
                     Error = $"Can not found buildin raw bundle file : {filePath}";
                     YooLogger.Error(Error);
                 }
+#endif
             }
         }
         internal override void InternalWaitForAsyncComplete()

Assets/YooAsset/Runtime/FileSystem/DefaultBuildinFileSystem/Operation/internal/LoadBuildinCatalogFileOperation.cs

@@ -1,4 +1,4 @@
-using UnityEngine;
+using System;
 
 namespace YooAsset
 {
@@ -7,56 +7,84 @@ namespace YooAsset
         private enum ESteps
         {
             None,
+            RequestData,
             LoadCatalog,
             Done,
         }
 
         private readonly DefaultBuildinFileSystem _fileSystem;
+        private UnityWebDataRequestOperation _webDataRequestOp;
         private ESteps _steps = ESteps.None;
 
-
         internal LoadBuildinCatalogFileOperation(DefaultBuildinFileSystem fileSystem)
         {
             _fileSystem = fileSystem;
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.LoadCatalog;
+            _steps = ESteps.RequestData;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.RequestData)
+            {
+                if (_webDataRequestOp == null)
+                {
+                    string filePath = _fileSystem.GetCatalogBinaryFileLoadPath();
+                    string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
+                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
+                    _webDataRequestOp.StartOperation();
+                    AddChildOperation(_webDataRequestOp);
+                }
+
+                _webDataRequestOp.UpdateOperation();
+                if (_webDataRequestOp.IsDone == false)
+                    return;
+
+                if (_webDataRequestOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.LoadCatalog;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _webDataRequestOp.Error;
+                }
+            }
+
             if (_steps == ESteps.LoadCatalog)
             {
-                string catalogFilePath = _fileSystem.GetCatalogFileLoadPath();
+                try
-                var catalog = Resources.Load<DefaultBuildinFileCatalog>(catalogFilePath);
+                {
-                if (catalog == null)
+                    var catalog = CatalogTools.DeserializeFromBinary(_webDataRequestOp.Result);
+                    if (catalog.PackageName != _fileSystem.PackageName)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"Catalog file package name {catalog.PackageName} cannot match the file system package name {_fileSystem.PackageName}";
+                        return;
+                    }
+
+                    foreach (var wrapper in catalog.Wrappers)
+                    {
+                        var fileWrapper = new DefaultBuildinFileSystem.FileWrapper(wrapper.FileName);
+                        _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
+                    }
+
+                    YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}");
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                catch (Exception e)
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = $"Failed to load catalog file : {catalogFilePath}";
+                    Error = $"Failed to load catalog file : {e.Message}";
-                    return;
                 }
-
-                if (catalog.PackageName != _fileSystem.PackageName)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Catalog file package name {catalog.PackageName} cannot match the file system package name {_fileSystem.PackageName}";
-                    return;
-                }
-
-                foreach (var wrapper in catalog.Wrappers)
-                {
-                    var fileWrapper = new DefaultBuildinFileSystem.FileWrapper(wrapper.FileName);
-                    _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
-                }
-
-                YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}");
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Succeed;
             }
         }
     }

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/DefaultCacheFileSystem.cs

@@ -190,19 +190,19 @@ namespace YooAsset
             }
             else if (name == FileSystemParametersDefine.APPEND_FILE_EXTENSION)
             {
-                AppendFileExtension = (bool)value;
+                AppendFileExtension = Convert.ToBoolean(value);
             }
             else if (name == FileSystemParametersDefine.DOWNLOAD_MAX_CONCURRENCY)
             {
-                DownloadMaxConcurrency = (int)value;
+                DownloadMaxConcurrency = Convert.ToInt32(value);
             }
             else if (name == FileSystemParametersDefine.DOWNLOAD_MAX_REQUEST_PER_FRAME)
             {
-                DownloadMaxRequestPerFrame = (int)value;
+                DownloadMaxRequestPerFrame = Convert.ToInt32(value);
             }
             else if (name == FileSystemParametersDefine.RESUME_DOWNLOAD_MINMUM_SIZE)
             {
-                ResumeDownloadMinimumSize = (long)value;
+                ResumeDownloadMinimumSize = Convert.ToInt64(value);
             }
             else if (name == FileSystemParametersDefine.RESUME_DOWNLOAD_RESPONSE_CODES)
             {
@@ -333,6 +333,13 @@ namespace YooAsset
         {
             return _records.Keys.ToList();
         }
+        public RecordFileElement GetRecordFileElement(PackageBundle bundle)
+        {
+            if (_records.TryGetValue(bundle.BundleGUID, out RecordFileElement element))
+                return element;
+            else
+                return null;
+        }
 
         public string GetTempFilePath(PackageBundle bundle)
         {
@@ -384,10 +391,10 @@ namespace YooAsset
 
         public EFileVerifyResult VerifyCacheFile(PackageBundle bundle)
         {
-            if (_records.TryGetValue(bundle.BundleGUID, out RecordFileElement wrapper) == false)
+            if (_records.TryGetValue(bundle.BundleGUID, out RecordFileElement element) == false)
                 return EFileVerifyResult.CacheNotFound;
 
-            EFileVerifyResult result = FileVerifyHelper.FileVerify(wrapper.DataFilePath, wrapper.DataFileSize, wrapper.DataFileCRC, EFileVerifyLevel.High);
+            EFileVerifyResult result = FileVerifyHelper.FileVerify(element.DataFilePath, element.DataFileSize, element.DataFileCRC, EFileVerifyLevel.High);
             return result;
         }
         public bool WriteCacheBundleFile(PackageBundle bundle, string copyPath)
@@ -427,22 +434,10 @@ namespace YooAsset
         }
         public bool DeleteCacheBundleFile(string bundleGUID)
         {
-            if (_records.TryGetValue(bundleGUID, out RecordFileElement wrapper))
+            if (_records.TryGetValue(bundleGUID, out RecordFileElement element))
             {
-                try
+                _records.Remove(bundleGUID);
-                {
+                return element.DeleteFolder();
-                    string dataFilePath = wrapper.DataFilePath;
-                    FileInfo fileInfo = new FileInfo(dataFilePath);
-                    if (fileInfo.Exists)
-                        fileInfo.Directory.Delete(true);
-                    _records.Remove(bundleGUID);
-                    return true;
-                }
-                catch (Exception e)
-                {
-                    YooLogger.Error($"Failed to delete cache file ! {e.Message}");
-                    return false;
-                }
             }
             else
             {

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Elements/RecordFileElement.cs

@@ -1,4 +1,6 @@
-
+using System;
+using System.IO;
+
 namespace YooAsset
 {
     internal class RecordFileElement
@@ -7,7 +9,7 @@ namespace YooAsset
         public string DataFilePath { private set; get; }
         public string DataFileCRC { private set; get; }
         public long DataFileSize { private set; get; }
-        
+
         public RecordFileElement(string infoFilePath, string dataFilePath, string dataFileCRC, long dataFileSize)
         {
             InfoFilePath = infoFilePath;
@@ -15,5 +17,31 @@ namespace YooAsset
             DataFileCRC = dataFileCRC;
             DataFileSize = dataFileSize;
         }
+
+        /// <summary>
+        /// 删除记录文件
+        /// </summary>
+        public bool DeleteFolder()
+        {
+            try
+            {
+                string directory = Path.GetDirectoryName(InfoFilePath);
+                DirectoryInfo directoryInfo = new DirectoryInfo(directory);
+                if (directoryInfo.Exists)
+                {
+                    directoryInfo.Delete(true);
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            catch (Exception e)
+            {
+                YooLogger.Error($"Failed to delete cache file ! {e.Message}");
+                return false;
+            }
+        }
     }
 }

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadBundleOperation.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using UnityEngine;
 
 namespace YooAsset
@@ -260,9 +261,30 @@ namespace YooAsset
             {
                 if (_fileSystem.Exists(_bundle))
                 {
-                    DownloadProgress = 1f;
+                    // 注意：缓存的原生文件的格式，可能会在业务端根据需求发生变动！
-                    DownloadedBytes = _bundle.FileSize;
+                    // 注意：这里需要校验文件格式，如果不一致对本地文件进行修正！
-                    _steps = ESteps.LoadCacheRawBundle;
+                    string filePath = _fileSystem.GetCacheBundleFileLoadPath(_bundle);
+                    if (File.Exists(filePath) == false)
+                    {
+                        try
+                        {
+                            var recordFileElement = _fileSystem.GetRecordFileElement(_bundle);
+                            File.Move(recordFileElement.DataFilePath, filePath);
+                            _steps = ESteps.LoadCacheRawBundle;
+                        }
+                        catch (Exception e)
+                        {
+                            _steps = ESteps.Done;
+                            Status = EOperationStatus.Failed;
+                            Error = $"Faild rename raw data file : {e.Message}";
+                        }
+                    }
+                    else
+                    {
+                        DownloadProgress = 1f;
+                        DownloadedBytes = _bundle.FileSize;
+                        _steps = ESteps.LoadCacheRawBundle;
+                    }
                 }
                 else
                 {

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearCacheBundleFilesByTagsOperaiton.cs

@@ -7,9 +7,10 @@ namespace YooAsset
         private enum ESteps
         {
             None,
+            CheckManifest,
             CheckArgs,
-            GetTagsCacheFiles,
+            GetClearCacheFiles,
-            ClearTagsCacheFiles,
+            ClearFilterCacheFiles,
             Done,
         }
 
@@ -29,13 +30,27 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.CheckArgs;
+            _steps = ESteps.CheckManifest;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.CheckManifest)
+            {
+                if (_manifest == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Can not found active package manifest !";
+                }
+                else
+                {
+                    _steps = ESteps.CheckArgs;
+                }
+            }
+
             if (_steps == ESteps.CheckArgs)
             {
                 if (_clearParam == null)
@@ -67,17 +82,17 @@ namespace YooAsset
                     return;
                 }
 
-                _steps = ESteps.GetTagsCacheFiles;
+                _steps = ESteps.GetClearCacheFiles;
             }
 
-            if (_steps == ESteps.GetTagsCacheFiles)
+            if (_steps == ESteps.GetClearCacheFiles)
             {
-                _clearBundleGUIDs = GetTagsBundleGUIDs();
+                _clearBundleGUIDs = GetBundleGUIDsByTag();
                 _clearFileTotalCount = _clearBundleGUIDs.Count;
-                _steps = ESteps.ClearTagsCacheFiles;
+                _steps = ESteps.ClearFilterCacheFiles;
             }
 
-            if (_steps == ESteps.ClearTagsCacheFiles)
+            if (_steps == ESteps.ClearFilterCacheFiles)
             {
                 for (int i = _clearBundleGUIDs.Count - 1; i >= 0; i--)
                 {
@@ -100,7 +115,7 @@ namespace YooAsset
                 }
             }
         }
-        private List<string> GetTagsBundleGUIDs()
+        private List<string> GetBundleGUIDsByTag()
         {
             var allBundleGUIDs = _fileSystem.GetAllCachedBundleGUIDs();
             List<string> result = new List<string>(allBundleGUIDs.Count);

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearUnusedCacheBundleFilesOperation.cs

@@ -8,6 +8,7 @@ namespace YooAsset
         private enum ESteps
         {
             None,
+            CheckManifest,
             GetUnusedCacheFiles,
             ClearUnusedCacheFiles,
             Done,
@@ -19,7 +20,7 @@ namespace YooAsset
         private int _unusedFileTotalCount = 0;
         private ESteps _steps = ESteps.None;
 
-        
+
         internal ClearUnusedCacheBundleFilesOperation(DefaultCacheFileSystem fileSystem, PackageManifest manifest)
         {
             _fileSystem = fileSystem;
@@ -27,15 +28,29 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.GetUnusedCacheFiles;
+            _steps = ESteps.CheckManifest;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.CheckManifest)
+            {
+                if (_manifest == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Can not found active package manifest !";
+                }
+                else
+                {
+                    _steps = ESteps.GetUnusedCacheFiles;
+                }
+            }
+
             if (_steps == ESteps.GetUnusedCacheFiles)
-            {    
+            {
                 _unusedBundleGUIDs = GetUnusedBundleGUIDs();
                 _unusedFileTotalCount = _unusedBundleGUIDs.Count;
                 _steps = ESteps.ClearUnusedCacheFiles;

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/ClearUnusedCacheManifestFilesOperation.cs

@@ -8,6 +8,7 @@ namespace YooAsset
         private enum ESteps
         {
             None,
+            CheckManifest,
             ClearUnusedCacheFiles,
             Done,
         }
@@ -24,13 +25,27 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.ClearUnusedCacheFiles;
+            _steps = ESteps.CheckManifest;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.CheckManifest)
+            {
+                if (_manifest == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Can not found active package manifest !";
+                }
+                else
+                {
+                    _steps = ESteps.ClearUnusedCacheFiles;
+                }
+            }
+
             if (_steps == ESteps.ClearUnusedCacheFiles)
             {
                 try

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/SearchCacheFilesOperation.cs

@@ -85,15 +85,17 @@ namespace YooAsset
 
                     // 创建验证元素类
                     string fileRootPath = chidDirectory.FullName;
-                    string dataFilePath = $"{fileRootPath}/{ DefaultCacheFileSystemDefine.BundleDataFileName}";
+                    string dataFilePath = $"{fileRootPath}/{DefaultCacheFileSystemDefine.BundleDataFileName}";
-                    string infoFilePath = $"{fileRootPath}/{ DefaultCacheFileSystemDefine.BundleInfoFileName}";
+                    string infoFilePath = $"{fileRootPath}/{DefaultCacheFileSystemDefine.BundleInfoFileName}";
 
                     // 存储的数据文件追加文件格式
                     if (_fileSystem.AppendFileExtension)
                     {
                         string dataFileExtension = FindDataFileExtension(chidDirectory);
                         if (string.IsNullOrEmpty(dataFileExtension) == false)
+                        {
                             dataFilePath += dataFileExtension;
+                        }
                     }
 
                     var element = new VerifyFileElement(_fileSystem.PackageName, bundleGUID, fileRootPath, dataFilePath, infoFilePath);

Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/DefaultEditorFileSystem.cs

@@ -94,11 +94,11 @@ namespace YooAsset
         {
             if (name == FileSystemParametersDefine.ASYNC_SIMULATE_MIN_FRAME)
             {
-                _asyncSimulateMinFrame = (int)value;
+                _asyncSimulateMinFrame = Convert.ToInt32(value);
             }
             else if (name == FileSystemParametersDefine.ASYNC_SIMULATE_MAX_FRAME)
             {
-                _asyncSimulateMaxFrame = (int)value;
+                _asyncSimulateMaxFrame = Convert.ToInt32(value);
             }
             else
             {

Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/DefaultWebRemoteFileSystem.cs

@@ -101,7 +101,7 @@ namespace YooAsset
         {
             if (name == FileSystemParametersDefine.DISABLE_UNITY_WEB_CACHE)
             {
-                DisableUnityWebCache = (bool)value;
+                DisableUnityWebCache = Convert.ToBoolean(value);
             }
             else if (name == FileSystemParametersDefine.REMOTE_SERVICES)
             {

Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/DefaultWebServerFileSystem.cs

@@ -110,7 +110,7 @@ namespace YooAsset
         {
             if (name == FileSystemParametersDefine.DISABLE_UNITY_WEB_CACHE)
             {
-                DisableUnityWebCache = (bool)value;
+                DisableUnityWebCache = Convert.ToBoolean(value);
             }
             else if (name == FileSystemParametersDefine.DECRYPTION_SERVICES)
             {
@@ -198,10 +198,9 @@ namespace YooAsset
             string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
             return PathUtility.Combine(FileRoot, fileName);
         }
-        public string GetCatalogFileLoadPath()
+        public string GetCatalogBinaryFileLoadPath()
         {
-            string fileName = Path.GetFileNameWithoutExtension(DefaultBuildinFileSystemDefine.BuildinCatalogFileName);
+            return PathUtility.Combine(_webPackageRoot, DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName);
-            return YooAssetSettingsData.GetYooResourcesLoadPath(PackageName, fileName);
         }
 
         /// <summary>

Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerCatalogFileOperation.cs

@@ -2,7 +2,6 @@
 using System.IO;
 using System.Collections;
 using System.Collections.Generic;
-using UnityEngine;
 
 namespace YooAsset
 {
@@ -11,61 +10,84 @@ namespace YooAsset
         private enum ESteps
         {
             None,
+            RequestData,
             LoadCatalog,
             Done,
         }
 
         private readonly DefaultWebServerFileSystem _fileSystem;
+        private UnityWebDataRequestOperation _webDataRequestOp;
         private ESteps _steps = ESteps.None;
 
-        /// <summary>
-        /// 内置清单版本
-        /// </summary>
-        public string PackageVersion { private set; get; }
-
         internal LoadWebServerCatalogFileOperation(DefaultWebServerFileSystem fileSystem)
         {
             _fileSystem = fileSystem;
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.LoadCatalog;
+            _steps = ESteps.RequestData;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.RequestData)
+            {
+                if (_webDataRequestOp == null)
+                {
+                    string filePath = _fileSystem.GetCatalogBinaryFileLoadPath();
+                    string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
+                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
+                    _webDataRequestOp.StartOperation();
+                    AddChildOperation(_webDataRequestOp);
+                }
+
+                _webDataRequestOp.UpdateOperation();
+                if (_webDataRequestOp.IsDone == false)
+                    return;
+
+                if (_webDataRequestOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.LoadCatalog;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _webDataRequestOp.Error;
+                }
+            }
+
             if (_steps == ESteps.LoadCatalog)
             {
-                string catalogFilePath = _fileSystem.GetCatalogFileLoadPath();
+                try
-                var catalog = Resources.Load<DefaultBuildinFileCatalog>(catalogFilePath);
+                {
-                if (catalog == null)
+                    var catalog = CatalogTools.DeserializeFromBinary(_webDataRequestOp.Result);
+                    if (catalog.PackageName != _fileSystem.PackageName)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"Catalog file package name {catalog.PackageName} cannot match the file system package name {_fileSystem.PackageName}";
+                        return;
+                    }
+
+                    foreach (var wrapper in catalog.Wrappers)
+                    {
+                        var fileWrapper = new DefaultWebServerFileSystem.FileWrapper(wrapper.FileName);
+                        _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
+                    }
+
+                    YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}");
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                catch (Exception e)
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = $"Failed to load web server catalog file : {catalogFilePath}";
+                    Error = $"Failed to load catalog file : {e.Message}";
-                    return;
                 }
-
-                if (catalog.PackageName != _fileSystem.PackageName)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Web server catalog file package name {catalog.PackageName} cannot match the file system package name {_fileSystem.PackageName}";
-                    return;
-                }
-
-                PackageVersion = catalog.PackageVersion;
-                foreach (var wrapper in catalog.Wrappers)
-                {
-                    var fileWrapper = new DefaultWebServerFileSystem.FileWrapper(wrapper.FileName);
-                    _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
-                }
-
-                YooLogger.Log($"Package '{_fileSystem.PackageName}' catalog files count : {catalog.Wrappers.Count}");
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Succeed;
             }
         }
     }

Assets/YooAsset/Runtime/InitializeParameters.cs

@@ -83,6 +83,6 @@ namespace YooAsset
         /// 文件系统初始化参数列表
         /// 注意：列表最后一个元素作为主文件系统！
         /// </summary>
-        public List<FileSystemParameters> FileSystemParameterList;
+        public readonly List<FileSystemParameters> FileSystemParameterList = new List<FileSystemParameters>();
     }
 }

Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs

@@ -6,6 +6,14 @@ namespace YooAsset
 {
     internal class OperationSystem
     {
+#if UNITY_EDITOR
+        [UnityEngine.RuntimeInitializeOnLoadMethod(UnityEngine.RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void OnRuntimeInitialize()
+        {
+            DestroyAll();
+        }
+#endif
+
         private static readonly List<AsyncOperationBase> _operations = new List<AsyncOperationBase>(1000);
         private static readonly List<AsyncOperationBase> _newList = new List<AsyncOperationBase>(1000);
 

Assets/YooAsset/Runtime/ResourceManager/Handle/HandleFactory.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+    internal static class HandleFactory
+    {
+        private static readonly Dictionary<Type, Func<ProviderOperation, HandleBase>> _handleFactory = new Dictionary<Type, Func<ProviderOperation, HandleBase>>()
+        {
+            { typeof(AssetHandle), op => new AssetHandle(op) },
+            { typeof(SceneHandle), op => new SceneHandle(op) },
+            { typeof(SubAssetsHandle), op => new SubAssetsHandle(op) },
+            { typeof(AllAssetsHandle), op => new AllAssetsHandle(op) },
+            { typeof(RawFileHandle), op => new RawFileHandle(op) }
+        };
+
+        public static HandleBase CreateHandle(ProviderOperation operation, Type type)
+        {
+            if (_handleFactory.TryGetValue(type, out var factory) == false)
+            {
+                throw new NotImplementedException($"Handle type {type.FullName} is not supported.");
+            }
+            return factory(operation);
+        }
+    }
+}

Assets/YooAsset/Runtime/ResourceManager/Handle/HandleFactory.cs.meta

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

Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderOperation.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System;
+using System.Linq;
 
 namespace YooAsset
 {
@@ -69,8 +69,8 @@ namespace YooAsset
 
         private ESteps _steps = ESteps.None;
         private readonly LoadBundleFileOperation _mainBundleLoader;
-        private readonly List<LoadBundleFileOperation> _bundleLoaders = new List<LoadBundleFileOperation>();
+        private readonly List<LoadBundleFileOperation> _bundleLoaders = new List<LoadBundleFileOperation>(10);
-        private readonly List<HandleBase> _handles = new List<HandleBase>();
+        private readonly HashSet<HandleBase> _handles = new HashSet<HandleBase>();
 
 
         public ProviderOperation(ResourceManager manager, string providerGUID, AssetInfo assetInfo)
@@ -220,20 +220,7 @@ namespace YooAsset
             // 引用计数增加
             RefCount++;
 
-            HandleBase handle;
+            HandleBase handle = HandleFactory.CreateHandle(this, typeof(T));
-            if (typeof(T) == typeof(AssetHandle))
-                handle = new AssetHandle(this);
-            else if (typeof(T) == typeof(SceneHandle))
-                handle = new SceneHandle(this);
-            else if (typeof(T) == typeof(SubAssetsHandle))
-                handle = new SubAssetsHandle(this);
-            else if (typeof(T) == typeof(AllAssetsHandle))
-                handle = new AllAssetsHandle(this);
-            else if (typeof(T) == typeof(RawFileHandle))
-                handle = new RawFileHandle(this);
-            else
-                throw new System.NotImplementedException();
-
             _handles.Add(handle);
             return handle as T;
         }
@@ -258,9 +245,9 @@ namespace YooAsset
         /// </summary>
         public void ReleaseAllHandles()
         {
-            for (int i = _handles.Count - 1; i >= 0; i--)
+            List<HandleBase> tempers = _handles.ToList();
+            foreach (var handle in tempers)
             {
-                var handle = _handles[i];
                 handle.Release();
             }
         }
@@ -276,7 +263,7 @@ namespace YooAsset
 
             // 注意：创建临时列表是为了防止外部逻辑在回调函数内创建或者释放资源句柄。
             // 注意：回调方法如果发生异常，会阻断列表里的后续回调方法！
-            List<HandleBase> tempers = new List<HandleBase>(_handles);
+            List<HandleBase> tempers = _handles.ToList();
             foreach (var hande in tempers)
             {
                 if (hande.IsValid)

Assets/YooAsset/Runtime/ResourcePackage/AssetInfo.cs

@@ -3,6 +3,16 @@ namespace YooAsset
 {
     public class AssetInfo
     {
+        internal enum ELoadMethod
+        {
+            None = 0,
+            LoadAsset,
+            LoadSubAssets,
+            LoadAllAssets,
+            LoadScene,
+            LoadRawFile,
+        }
+
         private readonly PackageAsset _packageAsset;
         private string _providerGUID;
 
@@ -21,6 +31,11 @@ namespace YooAsset
         /// </summary>
         public string Error { private set; get; }
 
+        /// <summary>
+        /// 加载方法
+        /// </summary>
+        internal ELoadMethod LoadMethod;
+
         /// <summary>
         /// 资源对象
         /// </summary>

Assets/YooAsset/Runtime/ResourcePackage/ManifestDefine.cs

@@ -0,0 +1,21 @@
+
+namespace YooAsset
+{
+    public class ManifestDefine
+    {
+        /// <summary>
+        /// 文件极限大小（100MB）
+        /// </summary>
+        public const int FileMaxSize = 104857600;
+
+        /// <summary>
+        /// 文件头标记
+        /// </summary>
+        public const uint FileSign = 0x594F4F;
+
+        /// <summary>
+        /// 文件格式版本
+        /// </summary>
+        public const string FileVersion = "2.3.1";
+    }
+}

Assets/YooAsset/Runtime/ResourcePackage/ManifestDefine.cs.meta

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

Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs

@@ -8,7 +8,6 @@ namespace YooAsset
 {
     internal static class ManifestTools
     {
-#if UNITY_EDITOR
         /// <summary>
         /// 序列化（JSON文件）
         /// </summary>
@@ -26,10 +25,10 @@ namespace YooAsset
             using (FileStream fs = new FileStream(savePath, FileMode.Create))
             {
                 // 创建缓存器
-                BufferWriter buffer = new BufferWriter(YooAssetSettings.ManifestFileMaxSize);
+                BufferWriter buffer = new BufferWriter(ManifestDefine.FileMaxSize);
 
                 // 写入文件标记
-                buffer.WriteUInt32(YooAssetSettings.ManifestFileSign);
+                buffer.WriteUInt32(ManifestDefine.FileSign);
 
                 // 写入文件版本
                 buffer.WriteUTF8(manifest.FileVersion);
@@ -97,13 +96,13 @@ namespace YooAsset
 
             // 读取文件标记
             uint fileSign = buffer.ReadUInt32();
-            if (fileSign != YooAssetSettings.ManifestFileSign)
+            if (fileSign != ManifestDefine.FileSign)
                 throw new Exception("Invalid manifest file !");
 
             // 读取文件版本
             string fileVersion = buffer.ReadUTF8();
-            if (fileVersion != YooAssetSettings.ManifestFileVersion)
+            if (fileVersion != ManifestDefine.FileVersion)
-                throw new Exception($"The manifest file version are not compatible : {fileVersion} != {YooAssetSettings.ManifestFileVersion}");
+                throw new Exception($"The manifest file version are not compatible : {fileVersion} != {ManifestDefine.FileVersion}");
 
             PackageManifest manifest = new PackageManifest();
             {
@@ -160,7 +159,7 @@ namespace YooAsset
             InitManifest(manifest);
             return manifest;
         }
-#endif
+
 
         #region 解析资源清单辅助方法
         public static void InitManifest(PackageManifest manifest)

Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs

@@ -57,7 +57,7 @@ namespace YooAsset
 
                     // 读取文件标记
                     uint fileSign = _buffer.ReadUInt32();
-                    if (fileSign != YooAssetSettings.ManifestFileSign)
+                    if (fileSign != ManifestDefine.FileSign)
                     {
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Failed;
@@ -67,11 +67,11 @@ namespace YooAsset
 
                     // 读取文件版本
                     string fileVersion = _buffer.ReadUTF8();
-                    if (fileVersion != YooAssetSettings.ManifestFileVersion)
+                    if (fileVersion != ManifestDefine.FileVersion)
                     {
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Failed;
-                        Error = $"The manifest file version are not compatible : {fileVersion} != {YooAssetSettings.ManifestFileVersion}";
+                        Error = $"The manifest file version are not compatible : {fileVersion} != {ManifestDefine.FileVersion}";
                         return;
                     }
 

Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs

@@ -174,7 +174,7 @@ namespace YooAsset
         }
 
         /// <summary>
-        /// 获取资源依赖列表
+        /// 获取依赖列表
         /// 注意：传入的资源对象一定合法有效！
         /// </summary>
         public PackageBundle[] GetAllDependencies(PackageAsset packageAsset)
@@ -188,6 +188,21 @@ namespace YooAsset
             return result.ToArray();
         }
 
+        /// <summary>
+        /// 获取依赖列表
+        /// 注意：传入的资源包对象一定合法有效！
+        /// </summary>
+        public PackageBundle[] GetAllDependencies(PackageBundle packageBundle)
+        {
+            List<PackageBundle> result = new List<PackageBundle>(packageBundle.DependBundleIDs.Length);
+            foreach (var dependID in packageBundle.DependBundleIDs)
+            {
+                var dependBundle = GetMainPackageBundle(dependID);
+                result.Add(dependBundle);
+            }
+            return result.ToArray();
+        }
+
         /// <summary>
         /// 尝试获取包裹的资源
         /// </summary>

Assets/YooAsset/Runtime/ResourcePackage/PlayMode/PlayModeImpl.cs

@@ -176,7 +176,17 @@ namespace YooAsset
                 throw new Exception("Should never get here !");
 
             // 注意：如果清单里未找到资源包会抛出异常！
-            var depends = ActiveManifest.GetAllDependencies(assetInfo.Asset);
+            PackageBundle[] depends;
+            if (assetInfo.LoadMethod == AssetInfo.ELoadMethod.LoadAllAssets)
+            {
+                var mainBundle = ActiveManifest.GetMainPackageBundle(assetInfo.Asset);
+                depends = ActiveManifest.GetAllDependencies(mainBundle);
+            }
+            else
+            {
+                depends = ActiveManifest.GetAllDependencies(assetInfo.Asset);
+            }
+
             List<BundleInfo> result = new List<BundleInfo>(depends.Length);
             foreach (var packageBundle in depends)
             {

Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs

@@ -263,7 +263,7 @@ namespace YooAsset
         /// <param name="clearParam">执行参数</param>
         public ClearCacheFilesOperation ClearCacheFilesAsync(EFileClearMode clearMode, object clearParam = null)
         {
-            DebugCheckInitialize();
+            DebugCheckInitialize(false);
             var operation = _playModeImpl.ClearCacheFilesAsync(clearMode.ToString(), clearParam);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
@@ -276,7 +276,7 @@ namespace YooAsset
         /// <param name="clearParam">执行参数</param>
         public ClearCacheFilesOperation ClearCacheFilesAsync(string clearMode, object clearParam = null)
         {
-            DebugCheckInitialize();
+            DebugCheckInitialize(false);
             var operation = _playModeImpl.ClearCacheFilesAsync(clearMode, clearParam);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
@@ -610,6 +610,7 @@ namespace YooAsset
         private SceneHandle LoadSceneInternal(AssetInfo assetInfo, bool waitForAsyncComplete, LoadSceneMode sceneMode, LocalPhysicsMode physicsMode, bool suspendLoad, uint priority)
         {
             DebugCheckAssetLoadType(assetInfo.AssetType);
+            assetInfo.LoadMethod = AssetInfo.ELoadMethod.LoadScene;
             var loadSceneParams = new LoadSceneParameters(sceneMode, physicsMode);
             var handle = _resourceManager.LoadSceneAsync(assetInfo, loadSceneParams, suspendLoad, priority);
             if (waitForAsyncComplete)
@@ -720,6 +721,7 @@ namespace YooAsset
         private AssetHandle LoadAssetInternal(AssetInfo assetInfo, bool waitForAsyncComplete, uint priority)
         {
             DebugCheckAssetLoadType(assetInfo.AssetType);
+            assetInfo.LoadMethod = AssetInfo.ELoadMethod.LoadAsset;
             var handle = _resourceManager.LoadAssetAsync(assetInfo, priority);
             if (waitForAsyncComplete)
                 handle.WaitForAsyncComplete();
@@ -829,6 +831,7 @@ namespace YooAsset
         private SubAssetsHandle LoadSubAssetsInternal(AssetInfo assetInfo, bool waitForAsyncComplete, uint priority)
         {
             DebugCheckAssetLoadType(assetInfo.AssetType);
+            assetInfo.LoadMethod = AssetInfo.ELoadMethod.LoadSubAssets;
             var handle = _resourceManager.LoadSubAssetsAsync(assetInfo, priority);
             if (waitForAsyncComplete)
                 handle.WaitForAsyncComplete();
@@ -938,6 +941,7 @@ namespace YooAsset
         private AllAssetsHandle LoadAllAssetsInternal(AssetInfo assetInfo, bool waitForAsyncComplete, uint priority)
         {
             DebugCheckAssetLoadType(assetInfo.AssetType);
+            assetInfo.LoadMethod = AssetInfo.ELoadMethod.LoadAllAssets;
             var handle = _resourceManager.LoadAllAssetsAsync(assetInfo, priority);
             if (waitForAsyncComplete)
                 handle.WaitForAsyncComplete();

Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs

@@ -16,22 +16,6 @@ namespace YooAsset
         public string PackageManifestPrefix = string.Empty;
         
 
-        /// <summary>
-        /// 清单文件头标记
-        /// </summary>
-        public const uint ManifestFileSign = 0x594F4F;
-
-        /// <summary>
-        /// 清单文件极限大小（100MB）
-        /// </summary>
-        public const int ManifestFileMaxSize = 104857600;
-
-        /// <summary>
-        /// 清单文件格式版本
-        /// </summary>
-        public const string ManifestFileVersion = "2.3.1";
-
-
         /// <summary>
         /// 构建输出文件夹名称
         /// </summary>

Assets/YooAsset/Runtime/Settings/YooAssetSettingsData.cs

@@ -5,6 +5,14 @@ namespace YooAsset
 {
     public static class YooAssetSettingsData
     {
+#if UNITY_EDITOR
+        [UnityEngine.RuntimeInitializeOnLoadMethod(UnityEngine.RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void OnRuntimeInitialize()
+        {
+            _setting = null;
+        }
+#endif
+
         private static YooAssetSettings _setting = null;
         internal static YooAssetSettings Setting
         {
@@ -98,28 +106,6 @@ namespace YooAsset
         }
 
         #region 路径相关
-        /// <summary>
-        /// 获取YOO的Resources目录的加载路径
-        /// </summary>
-        internal static string GetYooResourcesLoadPath(string packageName, string fileName)
-        {
-            if (string.IsNullOrEmpty(Setting.DefaultYooFolderName))
-                return PathUtility.Combine(packageName, fileName);
-            else
-                return PathUtility.Combine(Setting.DefaultYooFolderName, packageName, fileName);
-        }
-
-        /// <summary>
-        /// 获取YOO的Resources目录的全路径
-        /// </summary>
-        internal static string GetYooResourcesFullPath()
-        {
-            if (string.IsNullOrEmpty(Setting.DefaultYooFolderName))
-                return $"Assets/Resources";
-            else
-                return $"Assets/Resources/{Setting.DefaultYooFolderName}";
-        }
-
         /// <summary>
         /// 获取YOO的编辑器下缓存文件根目录
         /// </summary>

Assets/YooAsset/Runtime/YooAsset.asmdef

@@ -9,6 +9,22 @@
     "precompiledReferences": [],
     "autoReferenced": true,
     "defineConstraints": [],
-    "versionDefines": [],
+    "versionDefines": [
+        {
+            "name": "com.tuyoogame.yooasset",
+            "expression": "",
+            "define": "YOO_ASSET_2"
+        },
+        {
+            "name": "com.tuyoogame.yooasset",
+            "expression": "2.3",
+            "define": "YOO_ASSET_2_3"
+        },
+        {
+            "name": "com.tuyoogame.yooasset",
+            "expression": "2.3",
+            "define": "YOO_ASSET_2_3_OR_NEWER"
+        }
+    ],
     "noEngineReferences": false
 }

Assets/YooAsset/Runtime/YooAssets.cs

@@ -2,12 +2,23 @@ using System;
 using System.Diagnostics;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 
 namespace YooAsset
 {
     public static partial class YooAssets
     {
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void OnRuntimeInitialize()
+        {
+            _isInitialize = false;
+            _packages.Clear();
+            _defaultPackage = null;
+        }
+#endif
+
         private static bool _isInitialize = false;
         private static GameObject _driver = null;
         private static readonly List<ResourcePackage> _packages = new List<ResourcePackage>();
@@ -77,9 +88,9 @@ namespace YooAsset
         }
 
         /// <summary>
-        /// 创建资源包
+        /// 创建资源包裹
         /// </summary>
-        /// <param name="packageName">资源包名称</param>
+        /// <param name="packageName">包裹名称</param>
         public static ResourcePackage CreatePackage(string packageName)
         {
             CheckException(packageName);
@@ -93,9 +104,9 @@ namespace YooAsset
         }
 
         /// <summary>
-        /// 获取资源包
+        /// 获取资源包裹
         /// </summary>
-        /// <param name="packageName">资源包名称</param>
+        /// <param name="packageName">包裹名称</param>
         public static ResourcePackage GetPackage(string packageName)
         {
             CheckException(packageName);
@@ -106,9 +117,9 @@ namespace YooAsset
         }
 
         /// <summary>
-        /// 尝试获取资源包
+        /// 尝试获取资源包裹
         /// </summary>
-        /// <param name="packageName">资源包名称</param>
+        /// <param name="packageName">包裹名称</param>
         public static ResourcePackage TryGetPackage(string packageName)
         {
             CheckException(packageName);
@@ -116,9 +127,17 @@ namespace YooAsset
         }
 
         /// <summary>
-        /// 移除资源包
+        /// 获取所有资源包裹
         /// </summary>
-        /// <param name="packageName">资源包名称</param>
+        public static List<ResourcePackage> GetAllPackages()
+        {
+            return _packages.ToList();
+        }
+
+        /// <summary>
+        /// 移除资源包裹
+        /// </summary>
+        /// <param name="packageName">包裹名称</param>
         public static bool RemovePackage(string packageName)
         {
             CheckException(packageName);
@@ -130,9 +149,9 @@ namespace YooAsset
         }
 
         /// <summary>
-        /// 移除资源包
+        /// 移除资源包裹
         /// </summary>
-        /// <param name="package">资源包实例对象</param>
+        /// <param name="package">包裹实例对象</param>
         public static bool RemovePackage(ResourcePackage package)
         {
             CheckException(package);
@@ -149,9 +168,9 @@ namespace YooAsset
         }
 
         /// <summary>
-        /// 检测资源包是否存在
+        /// 检测资源包裹是否存在
         /// </summary>
-        /// <param name="packageName">资源包名称</param>
+        /// <param name="packageName">包裹名称</param>
         public static bool ContainsPackage(string packageName)
         {
             CheckException(packageName);

Assets/YooAsset/Runtime/YooAssetsDriver.cs

@@ -5,6 +5,14 @@ namespace YooAsset
 {
     internal class YooAssetsDriver : MonoBehaviour
     {
+#if UNITY_EDITOR
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+        private static void OnRuntimeInitialize()
+        {
+            LastestUpdateFrame = 0;
+        }
+#endif
+
         private static int LastestUpdateFrame = 0;
 
         void Update()

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/TiktokFileSystem/BundleResult/TTAssetBundleResult.cs

@@ -23,7 +23,10 @@ namespace YooAsset
         {
             if (_assetBundle != null)
             {
-                _assetBundle.TTUnload(true);
+                if (_packageBundle.Encrypted)
+                    _assetBundle.Unload(true);
+                else
+                    _assetBundle.TTUnload(true);
             }
         }
         public override string GetBundleFilePath()

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/BundleResult/WXAssetBundleResult.cs

@@ -11,7 +11,7 @@ namespace YooAsset
         private readonly IFileSystem _fileSystem;
         private readonly PackageBundle _packageBundle;
         private readonly AssetBundle _assetBundle;
-        
+
         public WXAssetBundleResult(IFileSystem fileSystem, PackageBundle packageBundle, AssetBundle assetBundle)
         {
             _fileSystem = fileSystem;
@@ -23,7 +23,10 @@ namespace YooAsset
         {
             if (_assetBundle != null)
             {
-                _assetBundle.WXUnload(true);
+                if (_packageBundle.Encrypted)
+                    _assetBundle.Unload(true);
+                else
+                    _assetBundle.WXUnload(true);
             }
         }
         public override string GetBundleFilePath()

Assets/YooAsset/Samples~/Extension Sample/Runtime/ExtensionFileSystem/WechatFileSystem/Operation/WXFSClearUnusedBundleFilesAsync.cs

@@ -17,7 +17,7 @@ internal class WXFSClearUnusedBundleFilesAsync : FSClearCacheFilesOperation
 
     private readonly WechatFileSystem _fileSystem;
     private readonly PackageManifest _manifest;
-    private List<string> _unusedCacheFiles;
+    private List<string> _unusedCacheFiles = new List<string>(1000);
     private int _unusedFileTotalCount = 0;
     private ESteps _steps = ESteps.None;
 

Assets/YooAsset/Samples~/Test Sample/Runtime/T2_TestBuldinFileSystem/TestBundleEncryption.cs

@@ -3,9 +3,6 @@ using System.IO;
 using System.Text;
 using System.Collections;
 using UnityEngine;
-using UnityEngine.UI;
-using UnityEngine.U2D;
-using UnityEngine.TestTools;
 using NUnit.Framework;
 using YooAsset;
 
@@ -231,6 +228,7 @@ public class WebFileStreamDecryption : IWebDecryptionServices
 {
     public WebDecryptResult LoadAssetBundle(WebDecryptFileInfo fileInfo)
     {
+        /*
         byte[] copyData = new byte[fileInfo.FileData.Length];
         Buffer.BlockCopy(fileInfo.FileData, 0, copyData, 0, fileInfo.FileData.Length);
 
@@ -242,5 +240,15 @@ public class WebFileStreamDecryption : IWebDecryptionServices
         WebDecryptResult decryptResult = new WebDecryptResult();
         decryptResult.Result = AssetBundle.LoadFromMemory(copyData);
         return decryptResult;
+        */
+
+        for (int i = 0; i < fileInfo.FileData.Length; i++)
+        {
+            fileInfo.FileData[i] ^= BundleStream.KEY;
+        }
+
+        WebDecryptResult decryptResult = new WebDecryptResult();
+        decryptResult.Result = AssetBundle.LoadFromMemory(fileInfo.FileData);
+        return decryptResult;
     }
 }

Assets/YooAsset/package.json

@@ -1,7 +1,7 @@
 {
     "name": "com.tuyoogame.yooasset",
     "displayName": "YooAsset",
-    "version": "2.3.3-preview",
+    "version": "2.3.6",
     "unity": "2019.4",
     "description": "unity3d resources management system.",
     "author": {