Merge 0b4f6d6639 into 4d2df5b705

Assets/YooAsset/CHANGELOG.md

@@ -2,82 +2,6 @@
 
 All notable changes to this package will be documented in this file.
 
-## [2.3.7] - 2025-04-01
-
-### Improvements
-
-- (#526) 运行时资源清单的哈希值验证兼容了MD5和CRC32两种方式。
-- (#515) 优化了资源路径大小写不敏感的逻辑代码，减少字符串操作产生的GC。
-- (#523) UnloadUnusedAssetsOperation方法支持了分帧处理。
-
-### Fixed
-
-- (#520) 修复了UWP平台获取WWW加载路径未适配的问题。
-
-### Added
-
-- 新增了文件系统初始化参数：INSTALL_CLEAR_MODE
-
-  ```csharp
-  /// <summary>
-  /// 覆盖安装清理模式
-  /// </summary>
-  public enum EOverwriteInstallClearMode
-  {
-      /// <summary>
-      /// 不做任何处理
-      /// </summary>
-      None = 0,
-   
-      /// <summary>
-      /// 清理所有缓存文件（包含资源文件和清单文件）
-      /// </summary>
-      ClearAllCacheFiles = 1,
-   
-      /// <summary>
-      /// 清理所有缓存的资源文件
-      /// </summary>
-      ClearAllBundleFiles = 2,
-   
-      /// <summary>
-      /// 清理所有缓存的清单文件
-      /// </summary>
-      ClearAllManifestFiles = 3,
-  }
-  ```
-
-- 新增了初始化参数：BundleLoadingMaxConcurrency
-
-  ```csharp
-  public abstract class InitializeParameters
-  {
-      /// <summary>
-      /// 同时加载Bundle文件的最大并发数
-      /// </summary>
-      public int BundleLoadingMaxConcurrency = int.MaxValue;
-  }
-  ```
-
-## [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

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

@@ -1,23 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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 = ManifestDefine.FileVersion;
+            manifest.FileVersion = YooAssetSettings.ManifestFileVersion;
             manifest.EnableAddressable = buildMapContext.Command.EnableAddressable;
             manifest.LocationToLower = buildMapContext.Command.LocationToLower;
             manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;

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

@@ -15,6 +15,7 @@ namespace YooAsset.Editor
             if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
             {
                 CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
+                DefaultBuildinFileSystemBuild.ExportBuildinCatalogFile();
             }
         }
     }

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

@@ -1,20 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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,7 +36,6 @@ namespace YooAsset.Editor
                     new TaskCreateReport_BBP(),
                     new TaskCreatePackage_BBP(),
                     new TaskCopyBuildinFiles_BBP(),
-                    new TaskCreateCatalog_BBP()
                 };
             return pipeline;
         }

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

@@ -16,6 +16,7 @@ namespace YooAsset.Editor
             if (buildParameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
             {
                 CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
+                DefaultBuildinFileSystemBuild.ExportBuildinCatalogFile();
             }
         }
     }

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

@@ -1,20 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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,7 +38,6 @@ namespace YooAsset.Editor
                     new TaskCreateReport_RFBP(),
                     new TaskCreatePackage_RFBP(),
                     new TaskCopyBuildinFiles_RFBP(),
-                    new TaskCreateCatalog_RFBP()
                 };
             return pipeline;
         }

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

@@ -15,6 +15,7 @@ namespace YooAsset.Editor
             if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
             {
                 CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
+                DefaultBuildinFileSystemBuild.ExportBuildinCatalogFile();
             }
         }
     }

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

@@ -1,20 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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,7 +36,6 @@ namespace YooAsset.Editor
                     new TaskCreateReport_SBP(),
                     new TaskCreatePackage_SBP(),
                     new TaskCopyBuildinFiles_SBP(),
-                    new TaskCreateCatalog_SBP()
                 };
             return pipeline;
         }

Assets/YooAsset/Runtime/DownloadSystem/DownloadSystemHelper.cs

@@ -67,7 +67,7 @@ namespace YooAsset
             }
 #elif UNITY_STANDALONE_OSX
             url = new System.Uri(path).ToString();
-#elif UNITY_STANDALONE || UNITY_WSA
+#elif UNITY_STANDALONE
             url = StringUtility.Format("file:///{0}", path);
 #else
             throw new System.NotImplementedException();

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

@@ -1,21 +0,0 @@
-
-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

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

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

@@ -1,102 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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,5 +1,4 @@
 using System;
-using System.IO;
 using System.Collections.Generic;
 
 namespace YooAsset
@@ -15,12 +14,13 @@ namespace YooAsset
         {
             public string BundleGUID;
             public string FileName;
-        }
 
-        /// <summary>
+            public FileWrapper(string bundleGUID, string fileName)
-        /// 文件版本
+            {
-        /// </summary>
+                BundleGUID = bundleGUID;
-        public string FileVersion;
+                FileName = fileName;
+            }
+        }
 
         /// <summary>
         /// 包裹名称

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

@@ -58,11 +58,6 @@ namespace YooAsset
         /// </summary>
         public EFileVerifyLevel FileVerifyLevel { private set; get; } = EFileVerifyLevel.Middle;
 
-        /// <summary>
-        /// 自定义参数：覆盖安装缓存清理模式
-        /// </summary>
-        public EOverwriteInstallClearMode InstallClearMode { private set; get; } = EOverwriteInstallClearMode.ClearAllManifestFiles;
-
         /// <summary>
         /// 自定义参数：数据文件追加文件格式
         /// </summary>
@@ -150,10 +145,6 @@ namespace YooAsset
             {
                 FileVerifyLevel = (EFileVerifyLevel)value;
             }
-            else if (name == FileSystemParametersDefine.INSTALL_CLEAR_MODE)
-            {
-                InstallClearMode = (EOverwriteInstallClearMode)value;
-            }
             else if (name == FileSystemParametersDefine.APPEND_FILE_EXTENSION)
             {
                 AppendFileExtension = Convert.ToBoolean(value);
@@ -193,7 +184,6 @@ namespace YooAsset
             _unpackFileSystem = new DefaultUnpackFileSystem();
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices);
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.FILE_VERIFY_LEVEL, FileVerifyLevel);
-            _unpackFileSystem.SetParameter(FileSystemParametersDefine.INSTALL_CLEAR_MODE, InstallClearMode);
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.APPEND_FILE_EXTENSION, AppendFileExtension);
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, DecryptionServices);
             _unpackFileSystem.OnCreate(packageName, null);
@@ -346,9 +336,10 @@ namespace YooAsset
             string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
             return PathUtility.Combine(_packageRoot, fileName);
         }
-        public string GetCatalogBinaryFileLoadPath()
+        public string GetCatalogFileLoadPath()
         {
-            return PathUtility.Combine(_packageRoot, DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName);
+            string fileName = DefaultBuildinFileSystemDefine.BuildinCatalogFileName;
+            return PathUtility.Combine(YooAssetSettingsData.GetRequestYooDefaultBuildinRoot(), PackageName, fileName);
         }
 
         /// <summary>

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

@@ -5,15 +5,13 @@ using UnityEngine;
 
 namespace YooAsset
 {
-    public class DefaultBuildinFileSystemBuild : UnityEditor.Build.IPreprocessBuildWithReport
+    public class DefaultBuildinFileSystemBuild
     {
-        public int callbackOrder { get { return 0; } }
-
         /// <summary>
-        /// 在构建应用程序前自动生成内置资源目录文件。
+        /// 输出包裹的内置资源目录文件
-        /// 原理：搜索StreamingAssets目录下的所有资源文件，然后将这些文件信息写入文件，并存储在Resources目录下。
         /// </summary>
-        public void OnPreprocessBuild(UnityEditor.Build.Reporting.BuildReport report)
+        /// <exception cref="System.Exception"></exception>
+        public static void ExportBuildinCatalogFile()
         {
             YooLogger.Log("Begin to create catalog file !");
 
@@ -84,24 +82,9 @@ namespace YooAsset
 
             // 创建内置清单实例
             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();
@@ -110,15 +93,25 @@ namespace YooAsset
                 if (fileInfo.Extension == ".meta")
                     continue;
 
-                if (whiteFileList.Contains(fileInfo.Name))
+                if (fileInfo.Name == "link.xml" || fileInfo.Name == "buildlogtep.json")
+                    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;
+                if (fileInfo.Name == DefaultBuildinFileSystemDefine.BuildinCatalogFileName)
                     continue;
 
                 string fileName = fileInfo.Name;
                 if (fileMapping.TryGetValue(fileName, out string bundleGUID))
                 {
-                    var wrapper = new DefaultBuildinFileCatalog.FileWrapper();
+                    var wrapper = new DefaultBuildinFileCatalog.FileWrapper(bundleGUID, fileName);
-                    wrapper.BundleGUID = bundleGUID;
-                    wrapper.FileName = fileName;
                     buildinFileCatalog.Wrappers.Add(wrapper);
                 }
                 else
@@ -127,20 +120,16 @@ namespace YooAsset
                 }
             }
 
-            // 创建输出文件
+            // 创建输出目录
-            string jsonFilePath = $"{pacakgeDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName}";
+            string fullPath = YooAssetSettingsData.GetYooDefaultBuildinRoot();
-            if (File.Exists(jsonFilePath))
+            string saveFilePath = $"{fullPath}/{packageName}/{DefaultBuildinFileSystemDefine.BuildinCatalogFileName}";
-                File.Delete(jsonFilePath);
+            FileUtility.CreateFileDirectory(saveFilePath);
-            CatalogTools.SerializeToJson(jsonFilePath, buildinFileCatalog);
 
             // 创建输出文件
-            string binaryFilePath = $"{pacakgeDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName}";
+            File.WriteAllText(saveFilePath, JsonUtility.ToJson(buildinFileCatalog, false));
-            if (File.Exists(binaryFilePath))
-                File.Delete(binaryFilePath);
-            CatalogTools.SerializeToBinary(binaryFilePath, buildinFileCatalog);
-
             UnityEditor.AssetDatabase.Refresh();
-            Debug.Log($"Succeed to save buildin file catalog : {binaryFilePath}");
+
+            Debug.Log($"Succeed to save buildin file catalog : {saveFilePath}");
             return true;
         }
     }

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

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

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

@@ -1,4 +1,5 @@
-using System;
+using UnityEngine;
+using UnityEngine.Networking;
 
 namespace YooAsset
 {
@@ -7,84 +8,89 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            RequestData,
             LoadCatalog,
+            WaitForRequest,
             Done,
         }
 
+        private UnityWebRequest _request;
         private readonly DefaultBuildinFileSystem _fileSystem;
-        private UnityWebDataRequestOperation _webDataRequestOp;
         private ESteps _steps = ESteps.None;
 
+
         internal LoadBuildinCatalogFileOperation(DefaultBuildinFileSystem fileSystem)
         {
             _fileSystem = fileSystem;
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.RequestData;
+            _steps = ESteps.LoadCatalog;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.RequestData)
+            string catalogFilePath = _fileSystem.GetCatalogFileLoadPath();
-            {
-                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)
             {
-                try
+                _request = UnityWebRequest.Get(catalogFilePath);
-                {
+                _request.SendWebRequest();
-                    var catalog = CatalogTools.DeserializeFromBinary(_webDataRequestOp.Result);
+                _steps = ESteps.WaitForRequest;
-                    if (catalog.PackageName != _fileSystem.PackageName)
+                return;
-                    {
+            }
-                        _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)
+            if (_steps == ESteps.WaitForRequest)
-                    {
+            {
-                        var fileWrapper = new DefaultBuildinFileSystem.FileWrapper(wrapper.FileName);
+                // 等待请求完成
-                        _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
+                if (!_request.isDone)
-                    }
+                    return;
 
-                    YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}");
+                if (_request.result != UnityWebRequest.Result.Success)
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                catch (Exception e)
                 {
+                    _request.Dispose();
+                    _request = null;
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = $"Failed to load catalog file : {e.Message}";
+                    Error = $"Failed to load catalog file: {_request.error}";
+                    return;
                 }
+
+                // 解析 JSON
+                string jsonText = _request.downloadHandler.text;
+                var catalog = JsonUtility.FromJson<DefaultBuildinFileCatalog>(jsonText);
+                if (catalog == null)
+                {
+                    _request.Dispose();
+                    _request = null;
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"Failed to load catalog file : {catalogFilePath}";
+                    return;
+                }
+
+                if (catalog.PackageName != _fileSystem.PackageName)
+                {
+                    _request.Dispose();
+                    _request = null;
+                    _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}");
+                _request.Dispose();
+                _request = null;
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Succeed;
             }
         }
     }

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

@@ -69,7 +69,8 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFileData)
             {
-                if (ManifestTools.VerifyManifestData(_webDataRequestOp.Result, _packageHash))
+                string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result);
+                if (fileHash == _packageHash)
                 {
                     _steps = ESteps.LoadManifest;
                 }

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

@@ -65,11 +65,6 @@ namespace YooAsset
         /// </summary>
         public EFileVerifyLevel FileVerifyLevel { private set; get; } = EFileVerifyLevel.Middle;
 
-        /// <summary>
-        /// 自定义参数：覆盖安装缓存清理模式
-        /// </summary>
-        public EOverwriteInstallClearMode InstallClearMode { private set; get; } = EOverwriteInstallClearMode.ClearAllManifestFiles;
-
         /// <summary>
         /// 自定义参数：数据文件追加文件格式
         /// </summary>
@@ -193,10 +188,6 @@ namespace YooAsset
             {
                 FileVerifyLevel = (EFileVerifyLevel)value;
             }
-            else if (name == FileSystemParametersDefine.INSTALL_CLEAR_MODE)
-            {
-                InstallClearMode = (EOverwriteInstallClearMode)value;
-            }
             else if (name == FileSystemParametersDefine.APPEND_FILE_EXTENSION)
             {
                 AppendFileExtension = Convert.ToBoolean(value);
@@ -236,8 +227,8 @@ namespace YooAsset
                 _packageRoot = packageRoot;
 
             _cacheBundleFilesRoot = PathUtility.Combine(_packageRoot, DefaultCacheFileSystemDefine.BundleFilesFolderName);
-            _cacheManifestFilesRoot = PathUtility.Combine(_packageRoot, DefaultCacheFileSystemDefine.ManifestFilesFolderName);
             _tempFilesRoot = PathUtility.Combine(_packageRoot, DefaultCacheFileSystemDefine.TempFilesFolderName);
+            _cacheManifestFilesRoot = PathUtility.Combine(_packageRoot, DefaultCacheFileSystemDefine.ManifestFilesFolderName);
         }
         public virtual void OnDestroy()
         {
@@ -342,13 +333,6 @@ 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)
         {
@@ -400,10 +384,10 @@ namespace YooAsset
 
         public EFileVerifyResult VerifyCacheFile(PackageBundle bundle)
         {
-            if (_records.TryGetValue(bundle.BundleGUID, out RecordFileElement element) == false)
+            if (_records.TryGetValue(bundle.BundleGUID, out RecordFileElement wrapper) == false)
                 return EFileVerifyResult.CacheNotFound;
 
-            EFileVerifyResult result = FileVerifyHelper.FileVerify(element.DataFilePath, element.DataFileSize, element.DataFileCRC, EFileVerifyLevel.High);
+            EFileVerifyResult result = FileVerifyHelper.FileVerify(wrapper.DataFilePath, wrapper.DataFileSize, wrapper.DataFileCRC, EFileVerifyLevel.High);
             return result;
         }
         public bool WriteCacheBundleFile(PackageBundle bundle, string copyPath)
@@ -443,10 +427,22 @@ namespace YooAsset
         }
         public bool DeleteCacheBundleFile(string bundleGUID)
         {
-            if (_records.TryGetValue(bundleGUID, out RecordFileElement element))
+            if (_records.TryGetValue(bundleGUID, out RecordFileElement wrapper))
             {
-                _records.Remove(bundleGUID);
+                try
-                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
             {
@@ -509,18 +505,7 @@ namespace YooAsset
         }
 
         /// <summary>
-        /// 删除所有缓存的资源文件
+        /// 删除所有清单文件
-        /// </summary>
-        public void DeleteAllBundleFiles()
-        {
-            if (Directory.Exists(_cacheBundleFilesRoot))
-            {
-                Directory.Delete(_cacheBundleFilesRoot, true);
-            }
-        }
-
-        /// <summary>
-        /// 删除所有缓存的清单文件
         /// </summary>
         public void DeleteAllManifestFiles()
         {

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

@@ -1,29 +0,0 @@
-
-namespace YooAsset
-{
-    /// <summary>
-    /// 覆盖安装清理模式
-    /// </summary>
-    public enum EOverwriteInstallClearMode
-    {
-        /// <summary>
-        /// 不做任何处理
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// 清理所有缓存文件（包含资源文件和清单文件）
-        /// </summary>
-        ClearAllCacheFiles = 1,
-
-        /// <summary>
-        /// 清理所有缓存的资源文件
-        /// </summary>
-        ClearAllBundleFiles = 2,
-
-        /// <summary>
-        /// 清理所有缓存的清单文件
-        /// </summary>
-        ClearAllManifestFiles = 3,
-    }
-}

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

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

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

@@ -1,6 +1,4 @@
-using System;
+
-using System.IO;
-
 namespace YooAsset
 {
     internal class RecordFileElement
@@ -9,7 +7,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;
@@ -17,31 +15,5 @@ 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/DCFSInitializeOperation.cs

@@ -46,32 +46,9 @@ namespace YooAsset
                 // 如果水印发生变化，则说明覆盖安装后首次打开游戏
                 if (appFootPrint.IsDirty())
                 {
-                    if (_fileSystem.InstallClearMode == EOverwriteInstallClearMode.None)
+                    _fileSystem.DeleteAllManifestFiles();
-                    {
-                        YooLogger.Warning("Do nothing when overwrite install application !");
-                    }
-                    else if (_fileSystem.InstallClearMode == EOverwriteInstallClearMode.ClearAllCacheFiles)
-                    {
-                        _fileSystem.DeleteAllBundleFiles();
-                        _fileSystem.DeleteAllManifestFiles();
-                        YooLogger.Warning("Delete all cache files when overwrite install application !");
-                    }
-                    else if (_fileSystem.InstallClearMode == EOverwriteInstallClearMode.ClearAllBundleFiles)
-                    {
-                        _fileSystem.DeleteAllBundleFiles();
-                        YooLogger.Warning("Delete all bundle files when overwrite install application !");
-                    }
-                    else if (_fileSystem.InstallClearMode == EOverwriteInstallClearMode.ClearAllManifestFiles)
-                    {
-                        _fileSystem.DeleteAllManifestFiles();
-                        YooLogger.Warning("Delete all manifest files when overwrite install application !");
-                    }
-                    else
-                    {
-                        throw new System.NotImplementedException(_fileSystem.InstallClearMode.ToString());
-                    }
-
                     appFootPrint.Coverage(_fileSystem.PackageName);
+                    YooLogger.Warning("Delete manifest files when application foot print dirty !");
                 }
 
                 _steps = ESteps.SearchCacheFiles;

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

@@ -1,5 +1,4 @@
-using System;
+using System.IO;
-using System.IO;
 using UnityEngine;
 
 namespace YooAsset
@@ -261,30 +260,9 @@ namespace YooAsset
             {
                 if (_fileSystem.Exists(_bundle))
                 {
-                    // 注意：缓存的原生文件的格式，可能会在业务端根据需求发生变动！
+                    DownloadProgress = 1f;
-                    // 注意：这里需要校验文件格式，如果不一致对本地文件进行修正！
+                    DownloadedBytes = _bundle.FileSize;
-                    string filePath = _fileSystem.GetCacheBundleFileLoadPath(_bundle);
+                    _steps = ESteps.LoadCacheRawBundle;
-                    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,10 +7,9 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            CheckManifest,
             CheckArgs,
-            GetClearCacheFiles,
+            GetTagsCacheFiles,
-            ClearFilterCacheFiles,
+            ClearTagsCacheFiles,
             Done,
         }
 
@@ -30,27 +29,13 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.CheckManifest;
+            _steps = ESteps.CheckArgs;
         }
         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)
@@ -82,17 +67,17 @@ namespace YooAsset
                     return;
                 }
 
-                _steps = ESteps.GetClearCacheFiles;
+                _steps = ESteps.GetTagsCacheFiles;
             }
 
-            if (_steps == ESteps.GetClearCacheFiles)
+            if (_steps == ESteps.GetTagsCacheFiles)
             {
-                _clearBundleGUIDs = GetBundleGUIDsByTag();
+                _clearBundleGUIDs = GetTagsBundleGUIDs();
                 _clearFileTotalCount = _clearBundleGUIDs.Count;
-                _steps = ESteps.ClearFilterCacheFiles;
+                _steps = ESteps.ClearTagsCacheFiles;
             }
 
-            if (_steps == ESteps.ClearFilterCacheFiles)
+            if (_steps == ESteps.ClearTagsCacheFiles)
             {
                 for (int i = _clearBundleGUIDs.Count - 1; i >= 0; i--)
                 {
@@ -115,7 +100,7 @@ namespace YooAsset
                 }
             }
         }
-        private List<string> GetBundleGUIDsByTag()
+        private List<string> GetTagsBundleGUIDs()
         {
             var allBundleGUIDs = _fileSystem.GetAllCachedBundleGUIDs();
             List<string> result = new List<string>(allBundleGUIDs.Count);

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

@@ -8,7 +8,6 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            CheckManifest,
             GetUnusedCacheFiles,
             ClearUnusedCacheFiles,
             Done,
@@ -20,7 +19,7 @@ namespace YooAsset
         private int _unusedFileTotalCount = 0;
         private ESteps _steps = ESteps.None;
 
-
+        
         internal ClearUnusedCacheBundleFilesOperation(DefaultCacheFileSystem fileSystem, PackageManifest manifest)
         {
             _fileSystem = fileSystem;
@@ -28,29 +27,15 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.CheckManifest;
+            _steps = ESteps.GetUnusedCacheFiles;
         }
         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,7 +8,6 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            CheckManifest,
             ClearUnusedCacheFiles,
             Done,
         }
@@ -25,27 +24,13 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.CheckManifest;
+            _steps = ESteps.ClearUnusedCacheFiles;
         }
         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/LoadCachePackageManifestOperation.cs

@@ -59,7 +59,8 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFileData)
             {
-                if (ManifestTools.VerifyManifestData(_fileData, _packageHash))
+                string fileHash = HashUtility.BytesCRC32(_fileData);
+                if (fileHash == _packageHash)
                 {
                     _steps = ESteps.LoadManifest;
                 }

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

@@ -92,7 +92,12 @@ namespace YooAsset
                     if (_fileSystem.AppendFileExtension)
                     {
                         string dataFileExtension = FindDataFileExtension(chidDirectory);
-                        if (string.IsNullOrEmpty(dataFileExtension) == false)
+                        if (string.IsNullOrEmpty(dataFileExtension))
+                        {
+                            //注意：覆盖安装的情况下，缓存文件可能会没有后缀格式，需要删除重新下载！
+                            dataFilePath = string.Empty;
+                        }
+                        else
                         {
                             dataFilePath += dataFileExtension;
                         }

Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/LoadEditorPackageManifestOperation.cs

@@ -59,7 +59,8 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFileData)
             {
-                if (ManifestTools.VerifyManifestData(_fileData, _packageHash))
+                string fileHash = HashUtility.BytesCRC32(_fileData);
+                if (fileHash == _packageHash)
                 {
                     _steps = ESteps.LoadManifest;
                 }

Assets/YooAsset/Runtime/FileSystem/DefaultUnpackFileSystem/DefaultUnpackFileSystem.cs

@@ -14,8 +14,7 @@ namespace YooAsset
             base.OnCreate(packageName, rootDirectory);
 
             // 注意：重写保存根目录和临时目录
-            _cacheBundleFilesRoot = PathUtility.Combine(_packageRoot, DefaultUnpackFileSystemDefine.SaveBundleFilesFolderName);
+            _cacheBundleFilesRoot = PathUtility.Combine(_packageRoot, DefaultUnpackFileSystemDefine.SaveFilesFolderName);
-            _cacheManifestFilesRoot = PathUtility.Combine(_packageRoot, DefaultUnpackFileSystemDefine.SaveManifestFilesFolderName);
             _tempFilesRoot = PathUtility.Combine(_packageRoot, DefaultUnpackFileSystemDefine.TempFilesFolderName);
         }
     }

Assets/YooAsset/Runtime/FileSystem/DefaultUnpackFileSystem/DefaultUnpackFileSystemDefine.cs

@@ -11,13 +11,8 @@ namespace YooAsset
         /// <summary>
         /// 保存的资源文件的文件夹名称
         /// </summary>
-        public const string SaveBundleFilesFolderName = "UnpackBundleFiles";
+        public const string SaveFilesFolderName = "UnpackFiles";
-
+        
-        /// <summary>
-        /// 保存的清单文件的文件夹名称
-        /// </summary>
-        public const string SaveManifestFilesFolderName = "UnpackManifestFiles";
-
         /// <summary>
         /// 下载的临时文件的文件夹名称
         /// </summary>

Assets/YooAsset/Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/internal/LoadWebRemotePackageManifestOperation.cs

@@ -72,7 +72,8 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFileData)
             {
-                if (ManifestTools.VerifyManifestData(_webDataRequestOp.Result, _packageHash))
+                string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result);
+                if (fileHash == _packageHash)
                 {
                     _steps = ESteps.LoadManifest;
                 }

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

@@ -198,9 +198,10 @@ namespace YooAsset
             string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
             return PathUtility.Combine(FileRoot, fileName);
         }
-        public string GetCatalogBinaryFileLoadPath()
+        public string GetCatalogFileLoadPath()
         {
-            return PathUtility.Combine(_webPackageRoot, DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName);
+            string fileName = Path.GetFileNameWithoutExtension(DefaultBuildinFileSystemDefine.BuildinCatalogFileName);
+            return YooAssetSettingsData.GetYooResourcesLoadPath(PackageName, fileName);
         }
 
         /// <summary>

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

@@ -2,6 +2,8 @@
 using System.IO;
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Networking;
 
 namespace YooAsset
 {
@@ -10,84 +12,94 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            RequestData,
             LoadCatalog,
+            WaitForRequest,
             Done,
         }
 
+        private UnityWebRequest _request;
         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.RequestData;
+            _steps = ESteps.LoadCatalog;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.RequestData)
+            string catalogFilePath = _fileSystem.GetCatalogFileLoadPath();
-            {
-                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)
             {
-                try
+                _request = UnityWebRequest.Get(catalogFilePath);
-                {
+                _request.SendWebRequest();
-                    var catalog = CatalogTools.DeserializeFromBinary(_webDataRequestOp.Result);
+                _steps = ESteps.WaitForRequest;
-                    if (catalog.PackageName != _fileSystem.PackageName)
+                return;
-                    {
+            }
-                        _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)
+            if (_steps == ESteps.WaitForRequest)
-                    {
+            {
-                        var fileWrapper = new DefaultWebServerFileSystem.FileWrapper(wrapper.FileName);
+                // 等待请求完成
-                        _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
+                if (!_request.isDone)
-                    }
+                    return;
 
-                    YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}");
+                if (_request.result != UnityWebRequest.Result.Success)
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                catch (Exception e)
                 {
+                    _request.Dispose();
+                    _request = null;
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = $"Failed to load catalog file : {e.Message}";
+                    Error = $"Failed to load web server catalog file: {_request.error}";
+                    return;
                 }
+
+                // 解析 JSON
+                string jsonText = _request.downloadHandler.text;
+                var catalog = JsonUtility.FromJson<DefaultBuildinFileCatalog>(jsonText);
+                if (catalog == null)
+                {
+                    _request.Dispose();
+                    _request = null;
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"Failed to load web server catalog file : {catalogFilePath}";
+                    return;
+                }
+
+                if (catalog.PackageName != _fileSystem.PackageName)
+                {
+                    _request.Dispose();
+                    _request = null;
+                    _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}");
+                _request.Dispose();
+                _request = null;
+                _steps = ESteps.Done;
+                Status = EOperationStatus.Succeed;
             }
         }
     }

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

@@ -69,7 +69,8 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFileData)
             {
-                if (ManifestTools.VerifyManifestData(_webDataRequestOp.Result, _packageHash))
+                string fileHash = HashUtility.BytesCRC32(_webDataRequestOp.Result);
+                if (fileHash == _packageHash)
                 {
                     _steps = ESteps.LoadManifest;
                 }

Assets/YooAsset/Runtime/FileSystem/FileSystemParametersDefine.cs

@@ -4,7 +4,6 @@ namespace YooAsset
     public class FileSystemParametersDefine
     {
         public const string FILE_VERIFY_LEVEL = "FILE_VERIFY_LEVEL";
-        public const string INSTALL_CLEAR_MODE = "INSTALL_CLEAR_MODE";
         public const string REMOTE_SERVICES = "REMOTE_SERVICES";
         public const string DECRYPTION_SERVICES = "DECRYPTION_SERVICES";
         public const string APPEND_FILE_EXTENSION = "APPEND_FILE_EXTENSION";

Assets/YooAsset/Runtime/InitializeParameters.cs

@@ -38,10 +38,6 @@ namespace YooAsset
     /// </summary>
     public abstract class InitializeParameters
     {
-        /// <summary>
-        /// 同时加载Bundle文件的最大并发数
-        /// </summary>
-        public int BundleLoadingMaxConcurrency = int.MaxValue;
     }
 
     /// <summary>

Assets/YooAsset/Runtime/ResourceManager/Operation/Internal/LoadBundleFileOperation.cs

@@ -9,8 +9,7 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            CheckConcurrency,
+            LoadFile,
-            LoadBundleFile,
             Done,
         }
 
@@ -58,32 +57,17 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.CheckConcurrency;
+            _steps = ESteps.LoadFile;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.CheckConcurrency)
+            if (_steps == ESteps.LoadFile)
-            {
-                if (IsWaitForAsyncComplete)
-                {
-                    _steps = ESteps.LoadBundleFile;
-                }
-                else
-                {
-                    if (_resourceManager.BundleLoadingIsBusy())
-                        return;
-                    _steps = ESteps.LoadBundleFile;
-                }
-            }
-
-            if (_steps == ESteps.LoadBundleFile)
             {
                 if (_loadBundleOp == null)
                 {
-                    _resourceManager.BundleLoadingCounter++;
                     _loadBundleOp = LoadBundleInfo.LoadBundleFile();
                     _loadBundleOp.StartOperation();
                     AddChildOperation(_loadBundleOp);
@@ -119,9 +103,6 @@ namespace YooAsset
                     Status = EOperationStatus.Failed;
                     Error = _loadBundleOp.Error;
                 }
-
-                // 统计计数减少
-                _resourceManager.BundleLoadingCounter--;
             }
         }
         internal override void InternalWaitForAsyncComplete()

Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadUnusedAssetsOperation.cs

@@ -15,7 +15,6 @@ namespace YooAsset
 
         private readonly ResourceManager _resManager;
         private readonly int _loopCount;
-        private int _loopCounter = 0;
         private ESteps _steps = ESteps.None;
 
         internal UnloadUnusedAssetsOperation(ResourceManager resourceManager, int loopCount)
@@ -26,7 +25,6 @@ namespace YooAsset
         internal override void InternalStart()
         {
             _steps = ESteps.UnloadUnused;
-            _loopCounter = _loopCount;
         }
         internal override void InternalUpdate()
         {
@@ -35,23 +33,13 @@ namespace YooAsset
 
             if (_steps == ESteps.UnloadUnused)
             {
-                while (_loopCounter > 0)
+                for (int i = 0; i < _loopCount; i++)
                 {
-                    _loopCounter--;
                     LoopUnloadUnused();
-
-                    if (IsWaitForAsyncComplete == false)
-                    {
-                        if (OperationSystem.IsBusy)
-                            break;
-                    }
                 }
 
-                if (_loopCounter <= 0)
+                _steps = ESteps.Done;
-                {
+                Status = EOperationStatus.Succeed;
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
             }
         }
         internal override void InternalWaitForAsyncComplete()

Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs

@@ -14,7 +14,6 @@ namespace YooAsset
         internal readonly List<SceneHandle> SceneHandles = new List<SceneHandle>(100);
         private long _sceneCreateIndex = 0;
         private IBundleQuery _bundleQuery;
-        private int _bundleLoadingMaxConcurrency;
 
         /// <summary>
         /// 所属包裹
@@ -26,11 +25,6 @@ namespace YooAsset
         /// </summary>
         public bool LockLoadOperation = false;
 
-        /// <summary>
-        /// 统计正在加载的Bundle文件数量
-        /// </summary>
-        public int BundleLoadingCounter = 0;
-
 
         public ResourceManager(string packageName)
         {
@@ -40,9 +34,8 @@ namespace YooAsset
         /// <summary>
         /// 初始化
         /// </summary>
-        public void Initialize(InitializeParameters parameters, IBundleQuery bundleServices)
+        public void Initialize(IBundleQuery bundleServices)
         {
-            _bundleLoadingMaxConcurrency = parameters.BundleLoadingMaxConcurrency;
             _bundleQuery = bundleServices;
             SceneManager.sceneUnloaded += OnSceneUnloaded;
         }
@@ -317,10 +310,6 @@ namespace YooAsset
         {
             return LoaderDic.Count > 0;
         }
-        internal bool BundleLoadingIsBusy()
-        {
-            return BundleLoadingCounter >= _bundleLoadingMaxConcurrency;
-        }
 
         private LoadBundleFileOperation CreateBundleFileLoaderInternal(BundleInfo bundleInfo)
         {

Assets/YooAsset/Runtime/ResourcePackage/ManifestDefine.cs

@@ -1,21 +0,0 @@
-
-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

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

Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs

@@ -8,30 +8,7 @@ namespace YooAsset
 {
     internal static class ManifestTools
     {
-        /// <summary>
+#if UNITY_EDITOR
-        /// 验证清单文件的二进制数据
-        /// </summary>
-        public static bool VerifyManifestData(byte[] fileData, string hashValue)
-        {
-            if (fileData == null || fileData.Length == 0)
-                return false;
-            if (string.IsNullOrEmpty(hashValue))
-                return false;
-
-            // 注意：兼容俩种验证方式
-            // 注意：计算MD5的哈希值通常为32个字符
-            string fileHash;
-            if (hashValue.Length == 32)
-                fileHash = HashUtility.BytesMD5(fileData);
-            else
-                fileHash = HashUtility.BytesCRC32(fileData);
-
-            if (fileHash == hashValue)
-                return true;
-            else
-                return false;
-        }
-
         /// <summary>
         /// 序列化（JSON文件）
         /// </summary>
@@ -49,10 +26,10 @@ namespace YooAsset
             using (FileStream fs = new FileStream(savePath, FileMode.Create))
             {
                 // 创建缓存器
-                BufferWriter buffer = new BufferWriter(ManifestDefine.FileMaxSize);
+                BufferWriter buffer = new BufferWriter(YooAssetSettings.ManifestFileMaxSize);
 
                 // 写入文件标记
-                buffer.WriteUInt32(ManifestDefine.FileSign);
+                buffer.WriteUInt32(YooAssetSettings.ManifestFileSign);
 
                 // 写入文件版本
                 buffer.WriteUTF8(manifest.FileVersion);
@@ -120,13 +97,13 @@ namespace YooAsset
 
             // 读取文件标记
             uint fileSign = buffer.ReadUInt32();
-            if (fileSign != ManifestDefine.FileSign)
+            if (fileSign != YooAssetSettings.ManifestFileSign)
                 throw new Exception("Invalid manifest file !");
 
             // 读取文件版本
             string fileVersion = buffer.ReadUTF8();
-            if (fileVersion != ManifestDefine.FileVersion)
+            if (fileVersion != YooAssetSettings.ManifestFileVersion)
-                throw new Exception($"The manifest file version are not compatible : {fileVersion} != {ManifestDefine.FileVersion}");
+                throw new Exception($"The manifest file version are not compatible : {fileVersion} != {YooAssetSettings.ManifestFileVersion}");
 
             PackageManifest manifest = new PackageManifest();
             {
@@ -183,7 +160,7 @@ namespace YooAsset
             InitManifest(manifest);
             return manifest;
         }
-
+#endif
 
         #region 解析资源清单辅助方法
         public static void InitManifest(PackageManifest manifest)
@@ -221,16 +198,9 @@ namespace YooAsset
             manifest.AssetDic = new Dictionary<string, PackageAsset>(assetCount);
 
             if (manifest.EnableAddressable)
-            {
                 manifest.AssetPathMapping1 = new Dictionary<string, string>(assetCount * 3);
-            }
             else
-            {
+                manifest.AssetPathMapping1 = new Dictionary<string, string>(assetCount * 2);
-                if (manifest.LocationToLower)
-                    manifest.AssetPathMapping1 = new Dictionary<string, string>(assetCount * 2, StringComparer.OrdinalIgnoreCase);
-                else
-                    manifest.AssetPathMapping1 = new Dictionary<string, string>(assetCount * 2);
-            }
 
             if (manifest.IncludeAssetGUID)
                 manifest.AssetPathMapping2 = new Dictionary<string, string>(assetCount);
@@ -252,6 +222,8 @@ namespace YooAsset
             // 填充AssetPathMapping1
             {
                 string location = packageAsset.AssetPath;
+                if (manifest.LocationToLower)
+                    location = location.ToLower();
 
                 // 添加原生路径的映射
                 if (manifest.AssetPathMapping1.ContainsKey(location))

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

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

Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs

@@ -138,6 +138,9 @@ namespace YooAsset
             if (string.IsNullOrEmpty(location))
                 return string.Empty;
 
+            if (LocationToLower)
+                location = location.ToLower();
+
             if (AssetPathMapping1.TryGetValue(location, out string assetPath))
                 return assetPath;
             else
@@ -304,6 +307,9 @@ namespace YooAsset
                 return string.Empty;
             }
 
+            if (LocationToLower)
+                location = location.ToLower();
+
             if (AssetPathMapping1.TryGetValue(location, out string assetPath))
             {
                 return assetPath;

Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs

@@ -100,7 +100,7 @@ namespace YooAsset
             var playModeImpl = new PlayModeImpl(PackageName, _playMode);
             _bundleQuery = playModeImpl;
             _playModeImpl = playModeImpl;
-            _resourceManager.Initialize(parameters, _bundleQuery);
+            _resourceManager.Initialize(_bundleQuery);
 
             // 初始化资源系统
             InitializationOperation initializeOperation;
@@ -162,10 +162,6 @@ namespace YooAsset
                 throw new Exception($"Editor simulate mode only support unity editor.");
 #endif
 
-            // 检测初始化参数
-            if (parameters.BundleLoadingMaxConcurrency <= 0)
-                throw new Exception($"{nameof(parameters.BundleLoadingMaxConcurrency)} value must be greater than zero.");
-
             // 鉴定运行模式
             if (parameters is EditorSimulateModeParameters)
                 _playMode = EPlayMode.EditorSimulateMode;
@@ -267,7 +263,7 @@ namespace YooAsset
         /// <param name="clearParam">执行参数</param>
         public ClearCacheFilesOperation ClearCacheFilesAsync(EFileClearMode clearMode, object clearParam = null)
         {
-            DebugCheckInitialize(false);
+            DebugCheckInitialize();
             var operation = _playModeImpl.ClearCacheFilesAsync(clearMode.ToString(), clearParam);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
@@ -280,7 +276,7 @@ namespace YooAsset
         /// <param name="clearParam">执行参数</param>
         public ClearCacheFilesOperation ClearCacheFilesAsync(string clearMode, object clearParam = null)
         {
-            DebugCheckInitialize(false);
+            DebugCheckInitialize();
             var operation = _playModeImpl.ClearCacheFilesAsync(clearMode, clearParam);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;

Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs

@@ -16,6 +16,22 @@ 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

@@ -106,6 +106,28 @@ 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>
@@ -198,6 +220,26 @@ namespace YooAsset
             else
                 return PathUtility.Combine(Application.streamingAssetsPath, Setting.DefaultYooFolderName);
         }
+
+        internal static string GetRequestYooDefaultBuildinRoot()
+        {
+            if (string.IsNullOrEmpty(Setting.DefaultYooFolderName))
+                return GetRequestStreamingAssetsPath();
+            else
+                return PathUtility.Combine(GetRequestStreamingAssetsPath(), Setting.DefaultYooFolderName);
+        }
+
+        /// <summary>
+        /// 获取UnityWebRequest StreamingAssets的路径 (OSX and iOS 需要加 file://)
+        /// </summary>
+        internal static string GetRequestStreamingAssetsPath()
+        {
+#if UNITY_STANDALONE_OSX || UNITY_IOS
+            return $"file://{Application.streamingAssetsPath}";
+#else
+            return Application.streamingAssetsPath;
+#endif
+        }
         #endregion
     }
 }

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 = new List<string>(1000);
+    private List<string> _unusedCacheFiles;
     private int _unusedFileTotalCount = 0;
     private ESteps _steps = ESteps.None;
 

Assets/YooAsset/Samples~/Space Shooter/GameScript/Runtime/PatchLogic/PatchWindow.cs

@@ -126,7 +126,7 @@ public class PatchWindow : MonoBehaviour
             {
                 UserEventDefine.UserTryRequestPackageVersion.SendEventMessage();
             };
-            ShowMessageBox($"Failed to request package version, please check the network status.", callback);
+            ShowMessageBox($"Failed to update static version, please check the network status.", callback);
         }
         else if (message is PatchEventDefine.PackageManifestUpdateFailed)
         {

Assets/YooAsset/Samples~/Test Sample/Editor/TestPackageBuilder.cs

@@ -71,7 +71,7 @@ public static class TestPackageBuilder
             buildParameters.ClearBuildCacheFiles = true;
             buildParameters.UseAssetDependencyDB = true;
             buildParameters.BuiltinShadersBundleName = builtinShaderBundleName;
-            buildParameters.EncryptionServices = new FileStreamTestEncryption();
+            buildParameters.EncryptionServices = new FileStreamEncryption();
 
             var pipeline = new ScriptableBuildPipeline();
             BuildResult buildResult = pipeline.Run(buildParameters, false);
@@ -108,7 +108,7 @@ public static class TestPackageBuilder
             buildParameters.CompressOption = ECompressOption.LZ4;
             buildParameters.ClearBuildCacheFiles = true;
             buildParameters.UseAssetDependencyDB = true;
-            buildParameters.EncryptionServices = new FileStreamTestEncryption();
+            buildParameters.EncryptionServices = new FileStreamEncryption();
 
             var pipeline = new BuiltinBuildPipeline();
             BuildResult buildResult = pipeline.Run(buildParameters, false);

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

@@ -60,7 +60,7 @@ public class T2_TestBuldinFileSystem : IPrebuildSetup, IPostBuildCleanup
 
             // 初始化资源包
             var initParams = new OfflinePlayModeParameters();
-            var decryption = new FileStreamTestDecryption();
+            var decryption = new FileStreamDecryption();
             initParams.BuildinFileSystemParameters = FileSystemParameters.CreateDefaultBuildinFileSystemParameters(decryption, packageRoot);
             var initializeOp = package.InitializeAsync(initParams);
             yield return initializeOp;

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

@@ -34,7 +34,7 @@ public class TestBundleEncryption
 /// <summary>
 /// 文件流加密方式
 /// </summary>
-public class FileStreamTestEncryption : IEncryptionServices
+public class FileStreamEncryption : IEncryptionServices
 {
     public EncryptResult Encrypt(EncryptFileInfo fileInfo)
     {
@@ -64,7 +64,7 @@ public class FileStreamTestEncryption : IEncryptionServices
 /// <summary>
 /// 文件偏移加密方式
 /// </summary>
-public class FileOffsetTestEncryption : IEncryptionServices
+public class FileOffsetEncryption : IEncryptionServices
 {
     public EncryptResult Encrypt(EncryptFileInfo fileInfo)
     {
@@ -119,7 +119,7 @@ public class BundleStream : FileStream
 /// <summary>
 /// 资源文件流解密类
 /// </summary>
-public class FileStreamTestDecryption : IDecryptionServices
+public class FileStreamDecryption : IDecryptionServices
 {
     /// <summary>
     /// 同步方式获取解密的资源包对象
@@ -172,7 +172,7 @@ public class FileStreamTestDecryption : IDecryptionServices
 /// <summary>
 /// 资源文件偏移解密类
 /// </summary>
-public class FileOffsetTestDecryption : IDecryptionServices
+public class FileOffsetDecryption : IDecryptionServices
 {
     /// <summary>
     /// 同步方式获取解密的资源包对象
@@ -224,7 +224,7 @@ public class FileOffsetTestDecryption : IDecryptionServices
 /// WebGL平台解密类
 /// 注意：WebGL平台支持内存解密
 /// </summary>
-public class WebFileStreamTestDecryption : IWebDecryptionServices
+public class WebFileStreamDecryption : IWebDecryptionServices
 {
     public WebDecryptResult LoadAssetBundle(WebDecryptFileInfo fileInfo)
     {

Assets/YooAsset/package.json

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