Update CHANGELOG.md

内置清单构建

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,119 @@
 
 All notable changes to this package will be documented in this file.
 
+## [2.3.13] - 2025-07-23
+
+**重要**：**所有下载相关的超时参数（timeout）已更新判定逻辑**
+
+超时不再以‘指定时间内未接收到任何数据’为判定条件，而是以‘指定时间内未完成整个下载任务’为判定条件。
+
+### Improvements
+
+- 重构了核心代码的下载逻辑，解决了同步加载触发的下载任务没有完成的问题。
+- 扩展工程里新增了PreprocessBuildCatalog类，用于处理在构建应用程序前自动生成内置资源目录文件。
+- (#592) 优化了资源清单逻辑里不必要产生的GC逻辑。
+
+### Fixed
+
+- (#590) 修复了TryUnloadUnusedAsset方法，在依赖嵌套层数过深导致没有卸载的问题。
+
+### Added
+
+- 新增了支持Google Play的文件系统扩展示例。
+
+- 新增了支持DefaultCacheFileSystem的单元测试用例。
+
+- 新增了文件系统配置参数：DISABLE_ONDEMAND_DOWNLOAD
+
+  ```csharp
+  public class FileSystemParametersDefine
+  {
+      // 禁用边玩边下机制
+      public const string DISABLE_ONDEMAND_DOWNLOAD = "DISABLE_ONDEMAND_DOWNLO";
+  }
+  ```
+
+### Changed
+
+- IManifestServices接口拆分为了IManifestProcessServices和IManifestRestoreServices
+
+  ```csharp
+  public interface IManifestProcessServices
+  {
+      /// <summary>
+      /// 处理资源清单（压缩或加密）
+      /// </summary>
+      byte[] ProcessManifest(byte[] fileData);
+  }
+  
+  public interface IManifestRestoreServices
+  {
+      /// <summary>
+      /// 还原资源清单（解压或解密）
+      /// </summary>
+      byte[] RestoreManifest(byte[] fileData);
+  }
+  ```
+
+## [2.3.12] - 2025-07-01
+
+### Improvements
+
+- 优化了同步接口导致的资源拷贝和资源验证性能开销高的现象。
+- 微信小游戏和抖音小游戏支持资源清单加密。
+
+### Fixed
+
+- (#579) 修复了2.3.10版本资源包构建页面里CopyBuildinFileParam无法编辑问题。
+- (#572) 修复了资源收集页面指定收集的预制体名称变动的问题。
+- (#582) 修复了非递归收集依赖时，依赖列表中才包含主资源的问题。
+
+### Added
+
+- 新增初始化参数：WebGLForceSyncLoadAsset
+
+  ```csharp
+  public abstract class InitializeParameters
+  {
+      /// <summary>
+      /// WebGL平台强制同步加载资源对象
+      /// </summary>Add commentMore actions
+      public bool WebGLForceSyncLoadAsset = false;
+  }
+  ```
+
+- (#576) 新增了资源清单服务类：IManifestServices
+
+  ```csharp
+  /// <summary>
+  /// 资源清单文件处理服务接口
+  /// </summary>
+  public interface IManifestServices
+  {
+      /// <summary>
+      /// 处理资源清单（压缩和加密）
+      /// </summary>
+      byte[] ProcessManifest(byte[] fileData);
+          
+      /// <summary>
+      /// 还原资源清单（解压和解密）
+      /// </summary>
+      byte[] RestoreManifest(byte[] fileData);
+  } 
+  ```
+
+- (#585) 新增了本地文件拷贝服务类：ICopyLocalFileServices
+
+  ```csharp
+  /// <summary>
+  /// 本地文件拷贝服务类
+  /// </summary>
+  public interface ICopyLocalFileServices
+  {
+      void CopyFile(LocalFileInfo sourceFileInfo, string destFilePath);
+  }
+  ```
+
 ## [2.3.10] - 2025-06-17
 
 ### Improvements

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs

@@ -67,15 +67,39 @@ namespace YooAsset.Editor
             EditorPrefs.SetString(key, buildinFileCopyParams);
         }
 
-        // EncyptionClassName
+        // EncyptionServicesClassName
-        public static string GetPackageEncyptionClassName(string packageName, string buildPipeline)
+        public static string GetPackageEncyptionServicesClassName(string packageName, string buildPipeline)
         {
-            string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionClassName";
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionServicesClassName";
-            return EditorPrefs.GetString(key, string.Empty);
+            return EditorPrefs.GetString(key, $"{typeof(EncryptionNone).FullName}");
         }
-        public static void SetPackageEncyptionClassName(string packageName, string buildPipeline, string encyptionClassName)
+        public static void SetPackageEncyptionServicesClassName(string packageName, string buildPipeline, string encyptionClassName)
         {
-            string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionClassName";
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionServicesClassName";
+            EditorPrefs.SetString(key, encyptionClassName);
+        }
+
+        // ManifestProcessServicesClassName
+        public static string GetPackageManifestProcessServicesClassName(string packageName, string buildPipeline)
+        {
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_ManifestProcessServicesClassName";
+            return EditorPrefs.GetString(key, $"{typeof(ManifestProcessNone).FullName}");
+        }
+        public static void SetPackageManifestProcessServicesClassName(string packageName, string buildPipeline, string encyptionClassName)
+        {
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_ManifestProcessServicesClassName";
+            EditorPrefs.SetString(key, encyptionClassName);
+        }
+
+        // ManifestRestoreServicesClassName
+        public static string GetPackageManifestRestoreServicesClassName(string packageName, string buildPipeline)
+        {
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_ManifestRestoreServicesClassName";
+            return EditorPrefs.GetString(key, $"{typeof(ManifestRestoreNone).FullName}");
+        }
+        public static void SetPackageManifestRestoreServicesClassName(string packageName, string buildPipeline, string encyptionClassName)
+        {
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_ManifestRestoreServicesClassName";
             EditorPrefs.SetString(key, encyptionClassName);
         }
 

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -98,6 +98,15 @@ namespace YooAsset.Editor
         /// </summary>
         public IEncryptionServices EncryptionServices;
 
+        /// <summary>
+        /// 资源清单加密服务类
+        /// </summary>
+        public IManifestProcessServices ManifestProcessServices;
+
+        /// <summary>
+        /// 资源清单解密服务类
+        /// </summary>
+        public IManifestRestoreServices ManifestRestoreServices;
 
         private string _pipelineOutputDirectory = string.Empty;
         private string _packageOutputDirectory = string.Empty;

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

@@ -14,7 +14,8 @@ namespace YooAsset.Editor
         {
             string buildinRootDirectory = buildParametersContext.GetBuildinRootDirectory();
             string buildPackageName = buildParametersContext.Parameters.PackageName;
-            DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(buildPackageName, buildinRootDirectory);
+            var manifestServices = buildParametersContext.Parameters.ManifestRestoreServices;
+            CatalogTools.CreateCatalogFile(manifestServices, buildPackageName, buildinRootDirectory);
 
             // 刷新目录
             AssetDatabase.Refresh();

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

@@ -58,7 +58,7 @@ namespace YooAsset.Editor
             if (processBundleDepends)
                 ProcessBuiltinBundleDependency(context, manifest);
 
-            // 创建补丁清单文本文件
+            // 创建资源清单文本文件
             {
                 string fileName = YooAssetSettingsData.GetManifestJsonFileName(buildParameters.PackageName, buildParameters.PackageVersion);
                 string filePath = $"{packageOutputDirectory}/{fileName}";
@@ -66,18 +66,18 @@ namespace YooAsset.Editor
                 BuildLogger.Log($"Create package manifest file: {filePath}");
             }
 
-            // 创建补丁清单二进制文件
+            // 创建资源清单二进制文件
             string packageHash;
             string packagePath;
             {
                 string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
                 packagePath = $"{packageOutputDirectory}/{fileName}";
-                ManifestTools.SerializeToBinary(packagePath, manifest);
+                ManifestTools.SerializeToBinary(packagePath, manifest, buildParameters.ManifestProcessServices);
                 packageHash = HashUtility.FileCRC32(packagePath);
                 BuildLogger.Log($"Create package manifest file: {packagePath}");
             }
 
-            // 创建补丁清单哈希文件
+            // 创建资源清单哈希文件
             {
                 string fileName = YooAssetSettingsData.GetPackageHashFileName(buildParameters.PackageName, buildParameters.PackageVersion);
                 string filePath = $"{packageOutputDirectory}/{fileName}";
@@ -85,7 +85,7 @@ namespace YooAsset.Editor
                 BuildLogger.Log($"Create package manifest hash file: {filePath}");
             }
 
-            // 创建补丁清单版本文件
+            // 创建资源清单版本文件
             {
                 string fileName = YooAssetSettingsData.GetPackageVersionFileName(buildParameters.PackageName);
                 string filePath = $"{packageOutputDirectory}/{fileName}";
@@ -97,7 +97,7 @@ namespace YooAsset.Editor
             {
                 ManifestContext manifestContext = new ManifestContext();
                 byte[] bytesData = FileUtility.ReadAllBytes(packagePath);
-                manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData);
+                manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData, buildParameters.ManifestRestoreServices);
                 context.SetContextObject(manifestContext);
             }
         }

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

@@ -43,7 +43,10 @@ namespace YooAsset.Editor
                 buildReport.Summary.EnableSharePackRule = buildParameters.EnableSharePackRule;
                 buildReport.Summary.SingleReferencedPackAlone = buildParameters.SingleReferencedPackAlone;
                 buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
-                buildReport.Summary.EncryptionClassName = buildParameters.EncryptionServices == null ? "null" : buildParameters.EncryptionServices.GetType().FullName;
+                buildReport.Summary.EncryptionServicesClassName = buildParameters.EncryptionServices == null ? "null" : buildParameters.EncryptionServices.GetType().FullName;
+                buildReport.Summary.ManifestProcessServicesClassName = buildParameters.ManifestProcessServices == null ? "null" : buildParameters.ManifestProcessServices.GetType().FullName;
+                buildReport.Summary.ManifestRestoreServicesClassName = buildParameters.ManifestRestoreServices == null ? "null" : buildParameters.ManifestRestoreServices.GetType().FullName;
+
                 if (buildParameters is BuiltinBuildParameters)
                 {
                     var builtinBuildParameters = buildParameters as BuiltinBuildParameters;

Assets/YooAsset/Editor/AssetBundleBuilder/DefaultManifestServices.cs

@@ -0,0 +1,19 @@
+
+namespace YooAsset.Editor
+{
+    public class ManifestProcessNone : IManifestProcessServices
+    {
+        byte[] IManifestProcessServices.ProcessManifest(byte[] fileData)
+        {
+            return fileData;
+        }
+    }
+    
+    public class ManifestRestoreNone : IManifestRestoreServices
+    {
+        byte[] IManifestRestoreServices.RestoreManifest(byte[] fileData)
+        {
+            return fileData;
+        }
+    }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/DefaultManifestServices.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8088863fc7dfbd441bc897380cd7b97f
+guid: 446513b0ea9f5d445ade0cfb09c5073b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs

@@ -44,19 +44,47 @@ namespace YooAsset.Editor
         }
 
         /// <summary>
-        /// 创建加密类实例
+        /// 创建资源包加密服务类实例
         /// </summary>
-        protected IEncryptionServices CreateEncryptionInstance()
+        protected IEncryptionServices CreateEncryptionServicesInstance()
         {
-            var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, PipelineName);
+            var className = AssetBundleBuilderSetting.GetPackageEncyptionServicesClassName(PackageName, PipelineName);
-            var encryptionClassTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
-            var classType = encryptionClassTypes.Find(x => x.FullName.Equals(encyptionClassName));
+            var classType = classTypes.Find(x => x.FullName.Equals(className));
             if (classType != null)
                 return (IEncryptionServices)Activator.CreateInstance(classType);
             else
                 return null;
         }
 
+        /// <summary>
+        /// 创建资源清单加密服务类实例
+        /// </summary>
+        protected IManifestProcessServices CreateManifestProcessServicesInstance()
+        {
+            var className = AssetBundleBuilderSetting.GetPackageManifestProcessServicesClassName(PackageName, PipelineName);
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestProcessServices));
+            var classType = classTypes.Find(x => x.FullName.Equals(className));
+            if (classType != null)
+                return (IManifestProcessServices)Activator.CreateInstance(classType);
+            else
+                return null;
+        }
+
+        /// <summary>
+        /// 创建资源清单解密服务类实例
+        /// </summary>
+        protected IManifestRestoreServices CreateManifestRestoreServicesInstance()
+        {
+            var className = AssetBundleBuilderSetting.GetPackageManifestRestoreServicesClassName(PackageName, PipelineName);
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestRestoreServices));
+            var classType = classTypes.Find(x => x.FullName.Equals(className));
+            if (classType != null)
+                return (IManifestRestoreServices)Activator.CreateInstance(classType);
+            else
+                return null;
+        }
+
         #region UI元素通用处理方法
         protected void SetBuildOutputField(TextField textField)
         {
@@ -111,11 +139,15 @@ namespace YooAsset.Editor
                 AssetBundleBuilderSetting.SetPackageBuildinFileCopyOption(PackageName, PipelineName, (EBuildinFileCopyOption)enumField.value);
 
                 // 设置内置资源标签显隐
-                bool tagsFiledVisible = buildinFileCopyOption == EBuildinFileCopyOption.ClearAndCopyByTags || buildinFileCopyOption == EBuildinFileCopyOption.OnlyCopyByTags;
+                SetCopyBuildinFileTagsVisible(tagField);
-                tagField.visible = tagsFiledVisible;
             });
             UIElementsTools.SetElementLabelMinWidth(enumField, LabelMinWidth);
         }
+        protected void SetCopyBuildinFileTagsVisible(TextField tagField)
+        {
+            var option = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
+            tagField.visible = option == EBuildinFileCopyOption.ClearAndCopyByTags || option == EBuildinFileCopyOption.OnlyCopyByTags;
+        }
         protected void SetCopyBuildinFileTagsField(TextField textField)
         {
             // 首包文件拷贝参数
@@ -149,35 +181,97 @@ namespace YooAsset.Editor
             });
             UIElementsTools.SetElementLabelMinWidth(toggle, LabelMinWidth);
         }
-        protected PopupField<Type> CreateEncryptionField(VisualElement container)
+        protected PopupField<Type> CreateEncryptionServicesField(VisualElement container)
         {
-            // 加密方法
+            // 资源包加密服务类
-            var encryptionClassTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
-            if (encryptionClassTypes.Count > 0)
+            if (classTypes.Count > 0)
             {
-                var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, PipelineName);
+                var className = AssetBundleBuilderSetting.GetPackageEncyptionServicesClassName(PackageName, PipelineName);
-                int defaultIndex = encryptionClassTypes.FindIndex(x => x.FullName.Equals(encyptionClassName));
+                int defaultIndex = classTypes.FindIndex(x => x.FullName.Equals(className));
                 if (defaultIndex < 0)
                     defaultIndex = 0;
-                var encryptionField = new PopupField<Type>(encryptionClassTypes, defaultIndex);
+                var popupField = new PopupField<Type>(classTypes, defaultIndex);
-                encryptionField.label = "Encryption";
+                popupField.label = "Encryption Services";
-                encryptionField.style.width = StyleWidth;
+                popupField.style.width = StyleWidth;
-                encryptionField.RegisterValueChangedCallback(evt =>
+                popupField.RegisterValueChangedCallback(evt =>
                 {
-                    AssetBundleBuilderSetting.SetPackageEncyptionClassName(PackageName, PipelineName, encryptionField.value.FullName);
+                    AssetBundleBuilderSetting.SetPackageEncyptionServicesClassName(PackageName, PipelineName, popupField.value.FullName);
                 });
-                container.Add(encryptionField);
+                container.Add(popupField);
-                UIElementsTools.SetElementLabelMinWidth(encryptionField, LabelMinWidth);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
-                return encryptionField;
+                return popupField;
             }
             else
             {
-                var encryptionField = new PopupField<Type>();
+                var popupField = new PopupField<Type>();
-                encryptionField.label = "Encryption";
+                popupField.label = "Encryption Services";
-                encryptionField.style.width = StyleWidth;
+                popupField.style.width = StyleWidth;
-                container.Add(encryptionField);
+                container.Add(popupField);
-                UIElementsTools.SetElementLabelMinWidth(encryptionField, LabelMinWidth);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
-                return encryptionField;
+                return popupField;
+            }
+        }
+        protected PopupField<Type> CreateManifestProcessServicesField(VisualElement container)
+        {
+            // 资源清单加密服务类
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestProcessServices));
+            if (classTypes.Count > 0)
+            {
+                var className = AssetBundleBuilderSetting.GetPackageManifestProcessServicesClassName(PackageName, PipelineName);
+                int defaultIndex = classTypes.FindIndex(x => x.FullName.Equals(className));
+                if (defaultIndex < 0)
+                    defaultIndex = 0;
+                var popupField = new PopupField<Type>(classTypes, defaultIndex);
+                popupField.label = "Manifest Process Services";
+                popupField.style.width = StyleWidth;
+                popupField.RegisterValueChangedCallback(evt =>
+                {
+                    AssetBundleBuilderSetting.SetPackageManifestProcessServicesClassName(PackageName, PipelineName, popupField.value.FullName);
+                });
+                container.Add(popupField);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
+                return popupField;
+            }
+            else
+            {
+                var popupField = new PopupField<Type>();
+                popupField.label = "Manifest Process Services";
+                popupField.style.width = StyleWidth;
+                container.Add(popupField);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
+                return popupField;
+            }
+        }
+        protected PopupField<Type> CreateManifestRestoreServicesField(VisualElement container)
+        {
+            // 资源清单加密服务类
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestRestoreServices));
+            if (classTypes.Count > 0)
+            {
+                var className = AssetBundleBuilderSetting.GetPackageManifestRestoreServicesClassName(PackageName, PipelineName);
+                int defaultIndex = classTypes.FindIndex(x => x.FullName.Equals(className));
+                if (defaultIndex < 0)
+                    defaultIndex = 0;
+                var popupField = new PopupField<Type>(classTypes, defaultIndex);
+                popupField.label = "Manifest Restore Services";
+                popupField.style.width = StyleWidth;
+                popupField.RegisterValueChangedCallback(evt =>
+                {
+                    AssetBundleBuilderSetting.SetPackageManifestRestoreServicesClassName(PackageName, PipelineName, popupField.value.FullName);
+                });
+                container.Add(popupField);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
+                return popupField;
+            }
+            else
+            {
+                var popupField = new PopupField<Type>();
+                popupField.label = "Manifest Restore Services";
+                popupField.style.width = StyleWidth;
+                container.Add(popupField);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
+                return popupField;
             }
         }
         #endregion

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipeline/BuiltinBuildPipelineViewer.cs

@@ -16,7 +16,9 @@ namespace YooAsset.Editor
         protected TemplateContainer Root;
         protected TextField _buildOutputField;
         protected TextField _buildVersionField;
-        protected PopupField<Type> _encryptionField;
+        protected PopupField<Type> _encryptionServicesField;
+        protected PopupField<Type> _manifestProcessServicesField;
+        protected PopupField<Type> _manifestRestoreServicesField;
         protected EnumField _compressionField;
         protected EnumField _outputNameStyleField;
         protected EnumField _copyBuildinFileOptionField;
@@ -43,9 +45,11 @@ namespace YooAsset.Editor
             _buildVersionField = Root.Q<TextField>("BuildVersion");
             SetBuildVersionField(_buildVersionField);
 
-            // 加密方法
+            // 服务类
-            var encryptionContainer = Root.Q("EncryptionContainer");
+            var popupContainer = Root.Q("PopupContainer");
-            _encryptionField = CreateEncryptionField(encryptionContainer);
+            _encryptionServicesField = CreateEncryptionServicesField(popupContainer);
+            _manifestProcessServicesField = CreateManifestProcessServicesField(popupContainer);
+            _manifestRestoreServicesField = CreateManifestRestoreServicesField(popupContainer);
 
             // 压缩方式选项
             _compressionField = Root.Q<EnumField>("Compression");
@@ -58,6 +62,7 @@ namespace YooAsset.Editor
             // 首包文件拷贝参数
             _copyBuildinFileTagsField = Root.Q<TextField>("CopyBuildinFileParam");
             SetCopyBuildinFileTagsField(_copyBuildinFileTagsField);
+            SetCopyBuildinFileTagsVisible(_copyBuildinFileTagsField);
 
             // 首包文件拷贝选项
             _copyBuildinFileOptionField = Root.Q<EnumField>("CopyBuildinFileOption");
@@ -116,7 +121,9 @@ namespace YooAsset.Editor
             buildParameters.CompressOption = compressOption;
             buildParameters.ClearBuildCacheFiles = clearBuildCache;
             buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
-            buildParameters.EncryptionServices = CreateEncryptionInstance();
+            buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
+            buildParameters.ManifestProcessServices = CreateManifestProcessServicesInstance();
+            buildParameters.ManifestRestoreServices = CreateManifestRestoreServicesInstance();
 
             BuiltinBuildPipeline pipeline = new BuiltinBuildPipeline();
             var buildResult = pipeline.Run(buildParameters, true);

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipeline/BuiltinBuildPipelineViewer.uxml

@@ -4,7 +4,7 @@
         <ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
         <ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
         <ui:Toggle label="Use Asset Depend DB" name="UseAssetDependency" />
-        <ui:VisualElement name="EncryptionContainer" style="height: 24px;" />
+        <ui:VisualElement name="PopupContainer" style="flex-grow: 1;" />
         <uie:EnumField label="Compression" value="Center" name="Compression" />
         <uie:EnumField label="File Name Style" value="Center" name="FileNameStyle" />
         <uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/EditorSimulateBuildpipeline/EditorSimulateBuildPipelineViewer.cs

@@ -74,7 +74,6 @@ namespace YooAsset.Editor
             buildParameters.FileNameStyle = fileNameStyle;
             buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
             buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
-            buildParameters.EncryptionServices = CreateEncryptionInstance();
 
             EditorSimulateBuildPipeline pipeline = new EditorSimulateBuildPipeline();
             var buildResult = pipeline.Run(buildParameters, true);

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipeline/RawfileBuildPipelineViewer.cs

@@ -16,7 +16,9 @@ namespace YooAsset.Editor
         protected TemplateContainer Root;
         protected TextField _buildOutputField;
         protected TextField _buildVersionField;
-        protected PopupField<Type> _encryptionField;
+        protected PopupField<Type> _encryptionServicesField;
+        protected PopupField<Type> _manifestProcessServicesField;
+        protected PopupField<Type> _manifestRestoreServicesField;
         protected EnumField _outputNameStyleField;
         protected EnumField _copyBuildinFileOptionField;
         protected TextField _copyBuildinFileTagsField;
@@ -43,8 +45,10 @@ namespace YooAsset.Editor
             SetBuildVersionField(_buildVersionField);
 
             // 加密方法
-            var encryptionContainer = Root.Q("EncryptionContainer");
+            var popupContainer = Root.Q("PopupContainer");
-            _encryptionField = CreateEncryptionField(encryptionContainer);
+            _encryptionServicesField = CreateEncryptionServicesField(popupContainer);
+            _manifestProcessServicesField = CreateManifestProcessServicesField(popupContainer);
+            _manifestRestoreServicesField = CreateManifestRestoreServicesField(popupContainer);
 
             // 输出文件名称样式
             _outputNameStyleField = Root.Q<EnumField>("FileNameStyle");
@@ -53,6 +57,7 @@ namespace YooAsset.Editor
             // 首包文件拷贝参数
             _copyBuildinFileTagsField = Root.Q<TextField>("CopyBuildinFileParam");
             SetCopyBuildinFileTagsField(_copyBuildinFileTagsField);
+            SetCopyBuildinFileTagsVisible(_copyBuildinFileTagsField);
 
             // 首包文件拷贝选项
             _copyBuildinFileOptionField = Root.Q<EnumField>("CopyBuildinFileOption");
@@ -108,7 +113,9 @@ namespace YooAsset.Editor
             buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
             buildParameters.ClearBuildCacheFiles = clearBuildCache;
             buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
-            buildParameters.EncryptionServices = CreateEncryptionInstance();
+            buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
+            buildParameters.ManifestProcessServices = CreateManifestProcessServicesInstance();
+            buildParameters.ManifestRestoreServices = CreateManifestRestoreServicesInstance();
 
             RawFileBuildPipeline pipeline = new RawFileBuildPipeline();
             var buildResult = pipeline.Run(buildParameters, true);

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipeline/RawfileBuildPipelineViewer.uxml

@@ -4,7 +4,7 @@
         <ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
         <ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
         <ui:Toggle label="Use Asset Depend DB" name="UseAssetDependency" />
-        <ui:VisualElement name="EncryptionContainer" style="height: 24px;" />
+        <ui:VisualElement name="PopupContainer" style="flex-grow: 1;" />
         <uie:EnumField label="File Name Style" value="Center" name="FileNameStyle" />
         <uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
         <ui:TextField picking-mode="Ignore" label="Copy Buildin File Param" name="CopyBuildinFileParam" />

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipeline/ScriptableBuildPipelineViewer.cs

@@ -16,7 +16,9 @@ namespace YooAsset.Editor
         protected TemplateContainer Root;
         protected TextField _buildOutputField;
         protected TextField _buildVersionField;
-        protected PopupField<Type> _encryptionField;
+        protected PopupField<Type> _encryptionServicesField;
+        protected PopupField<Type> _manifestProcessServicesField;
+        protected PopupField<Type> _manifestRestoreServicesField;
         protected EnumField _compressionField;
         protected EnumField _outputNameStyleField;
         protected EnumField _copyBuildinFileOptionField;
@@ -44,8 +46,10 @@ namespace YooAsset.Editor
             SetBuildVersionField(_buildVersionField);
 
             // 加密方法
-            var encryptionContainer = Root.Q("EncryptionContainer");
+            var popupContainer = Root.Q("PopupContainer");
-            _encryptionField = CreateEncryptionField(encryptionContainer);
+            _encryptionServicesField = CreateEncryptionServicesField(popupContainer);
+            _manifestProcessServicesField = CreateManifestProcessServicesField(popupContainer);
+            _manifestRestoreServicesField = CreateManifestRestoreServicesField(popupContainer);
 
             // 压缩方式选项
             _compressionField = Root.Q<EnumField>("Compression");
@@ -58,6 +62,7 @@ namespace YooAsset.Editor
             // 首包文件拷贝参数
             _copyBuildinFileTagsField = Root.Q<TextField>("CopyBuildinFileParam");
             SetCopyBuildinFileTagsField(_copyBuildinFileTagsField);
+            SetCopyBuildinFileTagsVisible(_copyBuildinFileTagsField);
 
             // 首包文件拷贝选项
             _copyBuildinFileOptionField = Root.Q<EnumField>("CopyBuildinFileOption");
@@ -118,7 +123,9 @@ namespace YooAsset.Editor
             buildParameters.ClearBuildCacheFiles = clearBuildCache;
             buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
             buildParameters.BuiltinShadersBundleName = builtinShaderBundleName;
-            buildParameters.EncryptionServices = CreateEncryptionInstance();
+            buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
+            buildParameters.ManifestProcessServices = CreateManifestProcessServicesInstance();
+            buildParameters.ManifestRestoreServices = CreateManifestRestoreServicesInstance();
 
             ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();
             var buildResult = pipeline.Run(buildParameters, true);

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipeline/ScriptableBuildPipelineViewer.uxml

@@ -4,7 +4,7 @@
         <ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
         <ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
         <ui:Toggle label="Use Asset Depend DB" name="UseAssetDependency" />
-        <ui:VisualElement name="EncryptionContainer" style="height: 24px;" />
+        <ui:VisualElement name="PopupContainer" style="flex-grow: 1;" />
         <uie:EnumField label="Compression" value="Center" name="Compression" />
         <uie:EnumField label="File Name Style" value="Center" name="FileNameStyle" />
         <uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

@@ -762,6 +762,7 @@ namespace YooAsset.Editor
                 elementTop.Add(objectField);
                 var label = objectField.Q<Label>();
                 label.style.minWidth = 63;
+                UIElementsTools.SetObjectFieldShowPath(objectField);
             }
 
             // Bottom VisualElement
@@ -851,8 +852,6 @@ namespace YooAsset.Editor
 
             var collector = selectGroup.Collectors[index];
             var collectObject = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(collector.CollectPath);
-            if (collectObject != null)
-                collectObject.name = collector.CollectPath;
 
             // 注意：非主资源收集器的标签栏需要被冻结
             var textTags = element.Q<TextField>("TextField1");
@@ -885,13 +884,13 @@ namespace YooAsset.Editor
             {
                 collector.CollectPath = AssetDatabase.GetAssetPath(evt.newValue);
                 collector.CollectorGUID = AssetDatabase.AssetPathToGUID(collector.CollectPath);
-                objectField1.value.name = collector.CollectPath;
                 AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
                 if (foldout.value)
                 {
                     RefreshFoldout(foldout, selectGroup, collector);
                 }
             });
+            UIElementsTools.RefreshObjectFieldShowPath(objectField1);
 
             // Collector Type
             var popupField0 = element.Q<PopupField<string>>("PopupField0");

Assets/YooAsset/Editor/AssetBundleCollector/AssetDependencyDatabase.cs

@@ -177,19 +177,21 @@ namespace YooAsset.Editor
         /// </summary>
         public string[] GetDependencies(string assetPath, bool recursive)
         {
-            // 注意：AssetDatabase.GetDependencies()方法返回结果里会踢出丢失文件！
-            // 注意：AssetDatabase.GetDependencies()方法返回结果里会包含主资源路径！
-
             // 注意：机制上不允许存在未收录的资源
             if (_database.ContainsKey(assetPath) == false)
             {
                 throw new Exception($"Fatal : can not found cache info : {assetPath}");
             }
 
-            var result = new HashSet<string> { assetPath };
+            var result = new HashSet<string>();
+
+            // 注意：递归收集依赖时，依赖列表中包含主资源
+            if (recursive)
+                result.Add(assetPath);
+
+            // 收集依赖
             CollectDependencies(assetPath, assetPath, result, recursive);
 
-            // 注意：AssetDatabase.GetDependencies保持一致，将主资源添加到依赖列表最前面
             return result.ToArray();
         }
         private void CollectDependencies(string parent, string assetPath, HashSet<string> result, bool recursive)
@@ -255,6 +257,7 @@ namespace YooAsset.Editor
         }
         private DependencyInfo CreateDependencyInfo(string assetPath)
         {
+            // 注意：AssetDatabase.GetDependencies()方法返回结果里会踢出丢失文件！
             var dependHash = AssetDatabase.GetAssetDependencyHash(assetPath);
             var dependAssetPaths = AssetDatabase.GetDependencies(assetPath, false);
             var dependGUIDs = new List<string>();

Assets/YooAsset/Editor/AssetBundleReporter/ReportSummary.cs

@@ -71,7 +71,9 @@ namespace YooAsset.Editor
         public bool UseAssetDependencyDB;
         public bool EnableSharePackRule;
         public bool SingleReferencedPackAlone;
-        public string EncryptionClassName;
+        public string EncryptionServicesClassName;
+        public string ManifestProcessServicesClassName;
+        public string ManifestRestoreServicesClassName;
         public EFileNameStyle FileNameStyle;
         
         // 引擎参数

Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterSummaryViewer.cs

@@ -66,7 +66,9 @@ namespace YooAsset.Editor
             BindListViewItem("Use Asset Dependency DB", $"{buildReport.Summary.UseAssetDependencyDB}");
             BindListViewItem("Enable Share Pack Rule", $"{buildReport.Summary.EnableSharePackRule}");
             BindListViewItem("Single Referenced Pack Alone", $"{buildReport.Summary.SingleReferencedPackAlone}");
-            BindListViewItem("Encryption Class Name", buildReport.Summary.EncryptionClassName);
+            BindListViewItem("Encryption Services", buildReport.Summary.EncryptionServicesClassName);
+            BindListViewItem("Manifest Process Services", buildReport.Summary.ManifestProcessServicesClassName);
+            BindListViewItem("Manifest Restore Services", buildReport.Summary.ManifestRestoreServicesClassName);
             BindListViewItem("FileNameStyle", $"{buildReport.Summary.FileNameStyle}");
             BindListViewItem("CompressOption", $"{buildReport.Summary.CompressOption}");
             BindListViewItem("DisableWriteTypeTree", $"{buildReport.Summary.DisableWriteTypeTree}");

Assets/YooAsset/Editor/UIElements/UIElementsTools.cs

@@ -33,6 +33,67 @@ namespace YooAsset.Editor
             }
         }
 
+        /// <summary>
+        /// 设置元素显示文本为资源路径
+        /// </summary>
+        public static void SetObjectFieldShowPath(ObjectField objectField)
+        {
+            string LabelClassName = "unity-object-field-display__label";
+            var nameLable = objectField.Q<Label>(className: LabelClassName);
+            if (nameLable == null)
+                return;
+
+            objectField.RegisterValueChangedCallback(evt =>
+            {
+                Object obj = evt.newValue;
+                if (obj == null)
+                {
+                    nameLable.text = "None (Object)";
+                    return;
+                }
+
+                // 获取资源路径（仅适用于项目资源）
+                string path = AssetDatabase.GetAssetPath(obj);
+                if (string.IsNullOrEmpty(path) == false)
+                {
+                    nameLable.text = path;
+                }
+                else
+                {
+                    nameLable.text = obj.name;
+                }
+            });
+        }
+
+        /// <summary>
+        /// 刷新元素显示文本内容
+        /// </summary>
+        public static void RefreshObjectFieldShowPath(ObjectField objectField)
+        {
+            string LabelClassName = "unity-object-field-display__label";
+            var nameLable = objectField.Q<Label>(className: LabelClassName);
+            if (nameLable == null)
+                return;
+
+            Object obj = objectField.value;
+            if (obj == null)
+            {
+                nameLable.text = "None (Object)";
+                return;
+            }
+
+            // 获取资源路径（仅适用于项目资源）
+            string path = AssetDatabase.GetAssetPath(obj);
+            if (string.IsNullOrEmpty(path) == false)
+            {
+                nameLable.text = path;
+            }
+            else
+            {
+                nameLable.text = obj.name;
+            }
+        }
+
         /// <summary>
         /// 设置按钮图标
         /// </summary>

Assets/YooAsset/Runtime/Assembly/AssemblyInfo.cs

@@ -2,6 +2,7 @@
 
 // 内部友元
 [assembly: InternalsVisibleTo("YooAsset.Editor")]
+[assembly: InternalsVisibleTo("YooAsset.Test")]
 [assembly: InternalsVisibleTo("YooAsset.Test.Editor")]
 
 // 外部友元

Assets/YooAsset/Runtime/DownloadSystem/DownloadDefine.cs

@@ -94,4 +94,25 @@ namespace YooAsset
         /// </summary>
         public long FileSize;
     }
+
+    /// <summary>
+    /// 导入文件的信息
+    /// </summary>
+    public struct ImportFileInfo
+    {
+        /// <summary>
+        /// 本地文件路径
+        /// </summary>
+        public string FilePath;
+
+        /// <summary>
+        /// 资源包名称
+        /// </summary>
+        public string BundleName;
+
+        /// <summary>
+        /// 资源包GUID
+        /// </summary>
+        public string BundleGUID;
+    }
 }

Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityAssetBundleRequestOperation.cs

@@ -1,16 +1,32 @@
-using UnityEngine;
+using UnityEngine.Networking;
-using UnityEngine.Networking;
+using UnityEngine;
 
 namespace YooAsset
 {
-    internal class DownloadWebNormalAssetBundleOperation : DownloadAssetBundleOperation
+    internal class UnityAssetBundleRequestOperation : UnityWebRequestOperation
     {
-        private readonly bool _disableUnityWebCache;
+        protected enum ESteps
+        {
+            None,
+            CreateRequest,
+            Download,
+            Done,
+        }
+
+        private UnityWebRequestAsyncOperation _requestOperation;
         private DownloadHandlerAssetBundle _downloadhandler;
+        private readonly PackageBundle _packageBundle;
+        private readonly bool _disableUnityWebCache;
         private ESteps _steps = ESteps.None;
 
-        internal DownloadWebNormalAssetBundleOperation(bool disableUnityWebCache, PackageBundle bundle, DownloadFileOptions options) : base(bundle, options)
+        /// <summary>
+        /// 请求结果
+        /// </summary>
+        public AssetBundle Result { private set; get; }
+
+        internal UnityAssetBundleRequestOperation(PackageBundle packageBundle, bool disableUnityWebCache, string url) : base(url)
         {
+            _packageBundle = packageBundle;
             _disableUnityWebCache = disableUnityWebCache;
         }
         internal override void InternalStart()
@@ -22,34 +38,20 @@ namespace YooAsset
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            // 创建下载器
             if (_steps == ESteps.CreateRequest)
             {
-                // 获取请求地址
-                _requestURL = GetRequestURL();
-
-                // 重置变量
-                ResetRequestFiled();
-
-                // 创建下载器
                 CreateWebRequest();
-
+                _steps = ESteps.Download;
-                _steps = ESteps.CheckRequest;
             }
 
-            // 检测下载结果
+            if (_steps == ESteps.Download)
-            if (_steps == ESteps.CheckRequest)
             {
                 DownloadProgress = _webRequest.downloadProgress;
                 DownloadedBytes = (long)_webRequest.downloadedBytes;
-                Progress = DownloadProgress;
+                Progress = _requestOperation.progress;
-                if (_webRequest.isDone == false)
+                if (_requestOperation.isDone == false)
-                {
-                    CheckRequestTimeout();
                     return;
-                }
 
-                // 检查网络错误
                 if (CheckRequestResult())
                 {
                     AssetBundle assetBundle = _downloadhandler.assetBundle;
@@ -57,7 +59,7 @@ namespace YooAsset
                     {
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Failed;
-                        Error = "Download handler asset bundle object is null !";
+                        Error = $"URL : {_requestURL} Download handler asset bundle object is null !";
                     }
                     else
                     {
@@ -68,37 +70,13 @@ namespace YooAsset
                 }
                 else
                 {
-                    _steps = ESteps.TryAgain;
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
                 }
 
                 // 注意：最终释放请求器
-                DisposeWebRequest();
+                DisposeRequest();
             }
-
-            // 重新尝试下载
-            if (_steps == ESteps.TryAgain)
-            {
-                if (FailedTryAgain <= 0)
-                {
-                    Status = EOperationStatus.Failed;
-                    _steps = ESteps.Done;
-                    YooLogger.Error(Error);
-                    return;
-                }
-
-                _tryAgainTimer += Time.unscaledDeltaTime;
-                if (_tryAgainTimer > 1f)
-                {
-                    FailedTryAgain--;
-                    _steps = ESteps.CreateRequest;
-                    YooLogger.Warning(Error);
-                }
-            }
-        }
-        internal override void InternalAbort()
-        {
-            _steps = ESteps.Done;
-            DisposeWebRequest();
         }
 
         private void CreateWebRequest()
@@ -107,22 +85,13 @@ namespace YooAsset
             _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
             _webRequest.downloadHandler = _downloadhandler;
             _webRequest.disposeDownloadHandlerOnDispose = true;
-            _webRequest.SendWebRequest();
+            _requestOperation = _webRequest.SendWebRequest();
-        }
-        private void DisposeWebRequest()
-        {
-            if (_webRequest != null)
-            {
-                //注意：引擎底层会自动调用Abort方法
-                _webRequest.Dispose();
-                _webRequest = null;
-            }
         }
         private DownloadHandlerAssetBundle CreateWebDownloadHandler()
         {
             if (_disableUnityWebCache)
             {
-                var downloadhandler = new DownloadHandlerAssetBundle(_requestURL, Bundle.UnityCRC);
+                var downloadhandler = new DownloadHandlerAssetBundle(_requestURL, _packageBundle.UnityCRC);
 #if UNITY_2020_3_OR_NEWER
                 downloadhandler.autoLoadAssetBundle = false;
 #endif
@@ -132,8 +101,8 @@ namespace YooAsset
             {
                 // 注意：优先从浏览器缓存里获取文件
                 // The file hash defining the version of the asset bundle.
-                Hash128 fileHash = Hash128.Parse(Bundle.FileHash);
+                Hash128 fileHash = Hash128.Parse(_packageBundle.FileHash);
-                var downloadhandler = new DownloadHandlerAssetBundle(_requestURL, fileHash, Bundle.UnityCRC);
+                var downloadhandler = new DownloadHandlerAssetBundle(_requestURL, fileHash, _packageBundle.UnityCRC);
 #if UNITY_2020_3_OR_NEWER
                 downloadhandler.autoLoadAssetBundle = false;
 #endif

Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityAssetBundleRequestOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 94254ab8e4496214884c11a891c131c6
+guid: e01cc308d7179a34281087fafe455b42
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebCacheRequestOperation.cs

@@ -0,0 +1,89 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine.Networking;
+using UnityEngine;
+
+namespace YooAsset
+{
+    internal class UnityWebCacheRequestOperation : UnityWebRequestOperation
+    {
+        protected enum ESteps
+        {
+            None,
+            CreateRequest,
+            Download,
+            Done,
+        }
+
+        private UnityWebRequestAsyncOperation _requestOperation;
+        private readonly Dictionary<string, string> _headers = new Dictionary<string, string>();
+        private ESteps _steps = ESteps.None;
+
+
+        internal UnityWebCacheRequestOperation(string url) : base(url)
+        {
+        }
+        internal override void InternalStart()
+        {
+            _steps = ESteps.CreateRequest;
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.CreateRequest)
+            {
+                CreateWebRequest();
+                _steps = ESteps.Download;
+            }
+
+            if (_steps == ESteps.Download)
+            {
+                DownloadProgress = _webRequest.downloadProgress;
+                DownloadedBytes = (long)_webRequest.downloadedBytes;
+                Progress = _requestOperation.progress;
+                if (_requestOperation.isDone == false)
+                    return;
+
+                if (CheckRequestResult())
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                }
+
+                // 注意：最终释放请求器
+                DisposeRequest();
+            }
+        }
+
+        /// <summary>
+        /// 设置请求头信息
+        /// </summary>
+        public void SetRequestHeader(string name, string value)
+        {
+            _headers.Add(name, value);
+        }
+
+        private void CreateWebRequest()
+        {
+            _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
+            _webRequest.disposeDownloadHandlerOnDispose = true;
+
+            // 设置消息头
+            foreach (var keyValuePair in _headers)
+            {
+                string name = keyValuePair.Key;
+                string value = keyValuePair.Value;
+                _webRequest.SetRequestHeader(name, value);
+            }
+
+            _requestOperation = _webRequest.SendWebRequest();
+        }
+    }
+}

Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebCacheRequestOperation.cs.meta

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

Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebDataRequestOperation.cs

@@ -5,7 +5,23 @@ namespace YooAsset
 {
     internal class UnityWebDataRequestOperation : UnityWebRequestOperation
     {
+        protected enum ESteps
+        {
+            None,
+            CreateRequest,
+            Download,
+            Done,
+        }
+
         private UnityWebRequestAsyncOperation _requestOperation;
+        private ESteps _steps = ESteps.None;
+
+        /// <summary>
+        /// 响应的超时时间（单位：秒），在经过Timeout的秒数后尝试中止。
+        /// 注意：当Timeout设置为0时，不会应用超时。
+        /// 注意：设置的超时值可能应用于Android上的每个URL重定向，这可能会导致响应时间增加。
+        /// </summary>
+        private readonly int _timeout;
 
         /// <summary>
         /// 请求结果
@@ -13,8 +29,9 @@ namespace YooAsset
         public byte[] Result { private set; get; }
 
 
-        internal UnityWebDataRequestOperation(string url, int timeout = 60) : base(url, timeout)
+        internal UnityWebDataRequestOperation(string url, int timeout) : base(url)
         {
+            _timeout = timeout;
         }
         internal override void InternalStart()
         {
@@ -27,27 +44,33 @@ namespace YooAsset
 
             if (_steps == ESteps.CreateRequest)
             {
-                _latestDownloadBytes = 0;
-                _latestDownloadRealtime = Time.realtimeSinceStartup;
-
                 CreateWebRequest();
                 _steps = ESteps.Download;
             }
 
             if (_steps == ESteps.Download)
             {
+                DownloadProgress = _webRequest.downloadProgress;
+                DownloadedBytes = (long)_webRequest.downloadedBytes;
                 Progress = _requestOperation.progress;
                 if (_requestOperation.isDone == false)
-                {
-                    CheckRequestTimeout();
                     return;
-                }
 
                 if (CheckRequestResult())
                 {
-                    _steps = ESteps.Done;
+                    var fileData = _webRequest.downloadHandler.data;
-                    Result = _webRequest.downloadHandler.data;
+                    if (fileData == null || fileData.Length == 0)
-                    Status = EOperationStatus.Succeed;
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"URL : {_requestURL} Download handler data is null or empty !";
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Result = fileData;
+                        Status = EOperationStatus.Succeed;
+                    }
                 }
                 else
                 {
@@ -59,16 +82,12 @@ namespace YooAsset
                 DisposeRequest();
             }
         }
-        internal override void InternalAbort()
-        {
-            _steps = ESteps.Done;
-            DisposeRequest();
-        }
 
         private void CreateWebRequest()
         {
-            _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
             DownloadHandlerBuffer handler = new DownloadHandlerBuffer();
+            _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
+            _webRequest.timeout = _timeout;
             _webRequest.downloadHandler = handler;
             _webRequest.disposeDownloadHandlerOnDispose = true;
             _requestOperation = _webRequest.SendWebRequest();

Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebFileRequestOperation.cs

@@ -5,12 +5,30 @@ namespace YooAsset
 {
     internal class UnityWebFileRequestOperation : UnityWebRequestOperation
     {
+        protected enum ESteps
+        {
+            None,
+            CreateRequest,
+            Download,
+            Done,
+        }
+
         private UnityWebRequestAsyncOperation _requestOperation;
         private readonly string _fileSavePath;
+        private ESteps _steps = ESteps.None;
 
-        internal UnityWebFileRequestOperation(string url, string fileSavePath, int timeout = 60) : base(url, timeout)
+        /// <summary>
+        /// 响应的超时时间（单位：秒），在经过Timeout的秒数后尝试中止。
+        /// 注意：当Timeout设置为0时，不会应用超时。
+        /// 注意：设置的超时值可能应用于Android上的每个URL重定向，这可能会导致响应时间增加。
+        /// </summary>
+        private readonly int _timeout;
+
+
+        internal UnityWebFileRequestOperation(string url, string fileSavePath, int timeout) : base(url)
         {
             _fileSavePath = fileSavePath;
+            _timeout = timeout;
         }
         internal override void InternalStart()
         {
@@ -23,21 +41,17 @@ namespace YooAsset
 
             if (_steps == ESteps.CreateRequest)
             {
-                _latestDownloadBytes = 0;
-                _latestDownloadRealtime = Time.realtimeSinceStartup;
-
                 CreateWebRequest();
                 _steps = ESteps.Download;
             }
 
             if (_steps == ESteps.Download)
             {
+                DownloadProgress = _webRequest.downloadProgress;
+                DownloadedBytes = (long)_webRequest.downloadedBytes;
                 Progress = _requestOperation.progress;
                 if (_requestOperation.isDone == false)
-                {
-                    CheckRequestTimeout();
                     return;
-                }
 
                 if (CheckRequestResult())
                 {
@@ -54,17 +68,13 @@ namespace YooAsset
                 DisposeRequest();
             }
         }
-        internal override void InternalAbort()
-        {
-            _steps = ESteps.Done;
-            DisposeRequest();
-        }
 
         private void CreateWebRequest()
         {
-            _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
             DownloadHandlerFile handler = new DownloadHandlerFile(_fileSavePath);
             handler.removeFileOnAbort = true;
+            _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
+            _webRequest.timeout = _timeout;
             _webRequest.downloadHandler = handler;
             _webRequest.disposeDownloadHandlerOnDispose = true;
             _requestOperation = _webRequest.SendWebRequest();

Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebRequestOperation.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections;
-using System.Collections.Concurrent;
 using UnityEngine.Networking;
 using UnityEngine;
 
@@ -8,33 +6,50 @@ namespace YooAsset
 {
     internal abstract class UnityWebRequestOperation : AsyncOperationBase
     {
-        protected enum ESteps
-        {
-            None,
-            CreateRequest,
-            Download,
-            Done,
-        }
-
         protected UnityWebRequest _webRequest;
         protected readonly string _requestURL;
-        protected ESteps _steps = ESteps.None;
-
-        // 超时相关
-        protected readonly float _timeout;
-        protected ulong _latestDownloadBytes;
-        protected float _latestDownloadRealtime;
         private bool _isAbort = false;
 
+        /// <summary>
+        /// HTTP返回码
+        /// </summary>
+        public long HttpCode { private set; get; }
+
+        /// <summary>
+        /// 当前下载的字节数
+        /// </summary>
+        public long DownloadedBytes { protected set; get; }
+
+        /// <summary>
+        /// 当前下载进度（0f - 1f）
+        /// </summary>
+        public float DownloadProgress { protected set; get; }
+
+        /// <summary>
+        /// 请求的URL地址
+        /// </summary>
         public string URL
         {
             get { return _requestURL; }
         }
 
-        internal UnityWebRequestOperation(string url, int timeout)
+        internal UnityWebRequestOperation(string url)
         {
             _requestURL = url;
-            _timeout = timeout;
+        }
+        internal override void InternalAbort()
+        {
+            //TODO
+            // 1. 编辑器下停止运行游戏的时候主动终止下载任务
+            // 2. 真机上销毁包裹的时候主动终止下载任务
+            if (_isAbort == false)
+            {
+                if (_webRequest != null)
+                {
+                    _webRequest.Abort();
+                    _isAbort = true;
+                }
+            }
         }
 
         /// <summary>
@@ -44,39 +59,19 @@ namespace YooAsset
         {
             if (_webRequest != null)
             {
+                //注意：引擎底层会自动调用Abort方法
                 _webRequest.Dispose();
                 _webRequest = null;
             }
         }
 
-        /// <summary>
-        /// 检测超时
-        /// </summary>
-        protected void CheckRequestTimeout()
-        {
-            // 注意：在连续时间段内无新增下载数据及判定为超时
-            if (_isAbort == false)
-            {
-                if ( _latestDownloadBytes != _webRequest.downloadedBytes)
-                {
-                    _latestDownloadBytes = _webRequest.downloadedBytes;
-                    _latestDownloadRealtime = Time.realtimeSinceStartup;
-                }
-
-                float offset = Time.realtimeSinceStartup - _latestDownloadRealtime;
-                if (offset > _timeout)
-                {
-                    _webRequest.Abort();
-                    _isAbort = true;
-                }
-            }
-        }
-
         /// <summary>
         /// 检测请求结果
         /// </summary>
         protected bool CheckRequestResult()
         {
+            HttpCode = _webRequest.responseCode;
+
 #if UNITY_2020_3_OR_NEWER
             if (_webRequest.result != UnityWebRequest.Result.Success)
             {

Assets/YooAsset/Runtime/DownloadSystem/Operation/Internal/UnityWebTextRequestOperation.cs

@@ -5,7 +5,23 @@ namespace YooAsset
 {
     internal class UnityWebTextRequestOperation : UnityWebRequestOperation
     {
+        protected enum ESteps
+        {
+            None,
+            CreateRequest,
+            Download,
+            Done,
+        }
+
         private UnityWebRequestAsyncOperation _requestOperation;
+        private ESteps _steps = ESteps.None;
+
+        /// <summary>
+        /// 响应的超时时间（单位：秒），在经过Timeout的秒数后尝试中止。
+        /// 注意：当Timeout设置为0时，不会应用超时。
+        /// 注意：设置的超时值可能应用于Android上的每个URL重定向，这可能会导致响应时间增加。
+        /// </summary>
+        private readonly int _timeout;
 
         /// <summary>
         /// 请求结果
@@ -13,8 +29,9 @@ namespace YooAsset
         public string Result { private set; get; }
 
 
-        internal UnityWebTextRequestOperation(string url, int timeout = 60) : base(url, timeout)
+        internal UnityWebTextRequestOperation(string url, int timeout) : base(url)
         {
+            _timeout = timeout;
         }
         internal override void InternalStart()
         {
@@ -27,27 +44,33 @@ namespace YooAsset
 
             if (_steps == ESteps.CreateRequest)
             {
-                _latestDownloadBytes = 0;
-                _latestDownloadRealtime = Time.realtimeSinceStartup;
-
                 CreateWebRequest();
                 _steps = ESteps.Download;
             }
 
             if (_steps == ESteps.Download)
             {
+                DownloadProgress = _webRequest.downloadProgress;
+                DownloadedBytes = (long)_webRequest.downloadedBytes;
                 Progress = _requestOperation.progress;
                 if (_requestOperation.isDone == false)
-                {
-                    CheckRequestTimeout();
                     return;
-                }
 
                 if (CheckRequestResult())
                 {
-                    _steps = ESteps.Done;
+                    var fileText = _webRequest.downloadHandler.text;
-                    Result = _webRequest.downloadHandler.text;
+                    if (string.IsNullOrEmpty(fileText))
-                    Status = EOperationStatus.Succeed;
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"URL : {_requestURL} Download handler text is null or empty !";
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Result = fileText;
+                        Status = EOperationStatus.Succeed;
+                    }
                 }
                 else
                 {
@@ -59,16 +82,12 @@ namespace YooAsset
                 DisposeRequest();
             }
         }
-        internal override void InternalAbort()
-        {
-            _steps = ESteps.Done;
-            DisposeRequest();
-        }
 
         private void CreateWebRequest()
         {
-            _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
             DownloadHandlerBuffer handler = new DownloadHandlerBuffer();
+            _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
+            _webRequest.timeout = _timeout;
             _webRequest.downloadHandler = handler;
             _webRequest.disposeDownloadHandlerOnDispose = true;
             _requestOperation = _webRequest.SendWebRequest();

Assets/YooAsset/Runtime/FileSystem/BundleResult/AssetBundleResult/Operation/AssetBundleLoadSceneOperation.cs

@@ -106,7 +106,7 @@ namespace YooAsset
         }
         internal override void InternalWaitForAsyncComplete()
         {
-            //TODO 场景加载不支持异步转同步，为了支持同步加载方法需要实现该方法！
+            //注意：场景加载不支持异步转同步，为了支持同步加载方法需要实现该方法！
             InternalUpdate();
         }
         public override void UnSuspendLoad()

Assets/YooAsset/Runtime/FileSystem/BundleResult/VirtualBundleResult/Operation/VirtualBundleLoadSceneOperation.cs

@@ -112,7 +112,7 @@ namespace YooAsset
         }
         internal override void InternalWaitForAsyncComplete()
         {
-            //TODO 场景加载不支持异步转同步，为了支持同步加载方法需要实现该方法！
+            //注意：场景加载不支持异步转同步，为了支持同步加载方法需要实现该方法！
             InternalUpdate();
         }
         public override void UnSuspendLoad()

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

@@ -7,6 +7,114 @@ namespace YooAsset
 {
     internal static class CatalogTools
     {
+#if UNITY_EDITOR
+        /// <summary>
+        /// 生成包裹的内置资源目录文件
+        /// 说明：根据指定目录下的文件生成清单文件。
+        /// </summary>
+        public static bool CreateCatalogFile(IManifestRestoreServices services, string packageName, string packageDirectory)
+        {
+            // 获取资源清单版本
+            string packageVersion;
+            {
+                string versionFileName = YooAssetSettingsData.GetPackageVersionFileName(packageName);
+                string versionFilePath = $"{packageDirectory}/{versionFileName}";
+                if (File.Exists(versionFilePath) == false)
+                {
+                    Debug.LogError($"Can not found package version file : {versionFilePath}");
+                    return false;
+                }
+
+                packageVersion = FileUtility.ReadAllText(versionFilePath);
+            }
+
+            // 加载资源清单文件
+            PackageManifest packageManifest;
+            {
+                string manifestFileName = YooAssetSettingsData.GetManifestBinaryFileName(packageName, packageVersion);
+                string manifestFilePath = $"{packageDirectory}/{manifestFileName}";
+                if (File.Exists(manifestFilePath) == false)
+                {
+                    Debug.LogError($"Can not found package manifest file : {manifestFilePath}");
+                    return false;
+                }
+
+                var binaryData = FileUtility.ReadAllBytes(manifestFilePath);
+                packageManifest = ManifestTools.DeserializeFromBinary(binaryData, services);
+            }
+
+            // 获取文件名映射关系
+            Dictionary<string, string> fileMapping = new Dictionary<string, string>();
+            {
+                foreach (var packageBundle in packageManifest.BundleList)
+                {
+                    fileMapping.Add(packageBundle.FileName, packageBundle.BundleGUID);
+                }
+            }
+
+            // 创建内置清单实例
+            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(packageDirectory);
+            FileInfo[] fileInfos = rootDirectory.GetFiles();
+            foreach (var fileInfo in fileInfos)
+            {
+                if (fileInfo.Extension == ".meta")
+                    continue;
+
+                if (whiteFileList.Contains(fileInfo.Name))
+                    continue;
+
+                string fileName = fileInfo.Name;
+                if (fileMapping.TryGetValue(fileName, out string bundleGUID))
+                {
+                    var wrapper = new DefaultBuildinFileCatalog.FileWrapper();
+                    wrapper.BundleGUID = bundleGUID;
+                    wrapper.FileName = fileName;
+                    buildinFileCatalog.Wrappers.Add(wrapper);
+                }
+                else
+                {
+                    Debug.LogWarning($"Failed mapping file : {fileName}");
+                }
+            }
+
+            // 创建输出文件
+            string jsonFilePath = $"{packageDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName}";
+            if (File.Exists(jsonFilePath))
+                File.Delete(jsonFilePath);
+            SerializeToJson(jsonFilePath, buildinFileCatalog);
+
+            // 创建输出文件
+            string binaryFilePath = $"{packageDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName}";
+            if (File.Exists(binaryFilePath))
+                File.Delete(binaryFilePath);
+            SerializeToBinary(binaryFilePath, buildinFileCatalog);
+
+            UnityEditor.AssetDatabase.Refresh();
+            Debug.Log($"Succeed to save catalog file : {binaryFilePath}");
+            return true;
+        }
+#endif
+
         /// <summary>
         /// 序列化（JSON文件）
         /// </summary>

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

@@ -88,6 +88,16 @@ namespace YooAsset
         ///  自定义参数：解密方法类
         /// </summary>
         public IDecryptionServices DecryptionServices { private set; get; }
+
+        /// <summary>
+        /// 自定义参数：资源清单服务类
+        /// </summary>
+        public IManifestRestoreServices ManifestServices { private set; get; }
+
+        /// <summary>
+        /// 自定义参数：拷贝内置文件服务类
+        /// </summary>
+        public ICopyLocalFileServices CopyLocalFileServices { private set; get; }
         #endregion
 
 
@@ -115,7 +125,7 @@ namespace YooAsset
         }
         public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
         {
-            // 注意：业务层的解压下载器会依赖内置文件系统的下载方法
+            // 注意：业务层的解压器会依赖该方法
             options.ImportFilePath = GetBuildinFileLoadPath(bundle);
             return _unpackFileSystem.DownloadFileAsync(bundle, options);
         }
@@ -174,6 +184,14 @@ namespace YooAsset
             {
                 DecryptionServices = (IDecryptionServices)value;
             }
+            else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
+            {
+                ManifestServices = (IManifestRestoreServices)value;
+            }
+            else if (name == FileSystemParametersDefine.COPY_LOCAL_FILE_SERVICES)
+            {
+                CopyLocalFileServices = (ICopyLocalFileServices)value;
+            }
             else
             {
                 YooLogger.Warning($"Invalid parameter : {name}");
@@ -196,6 +214,7 @@ namespace YooAsset
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.INSTALL_CLEAR_MODE, InstallClearMode);
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.APPEND_FILE_EXTENSION, AppendFileExtension);
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, DecryptionServices);
+            _unpackFileSystem.SetParameter(FileSystemParametersDefine.COPY_LOCAL_FILE_SERVICES, CopyLocalFileServices);
             _unpackFileSystem.OnCreate(packageName, null);
         }
         public virtual void OnDestroy()

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

@@ -1,148 +0,0 @@
-#if UNITY_EDITOR
-using System.Collections.Generic;
-using System.IO;
-using UnityEngine;
-
-namespace YooAsset
-{
-    public class DefaultBuildinFileSystemBuild : UnityEditor.Build.IPreprocessBuildWithReport
-    {
-        public int callbackOrder { get { return 0; } }
-
-        /// <summary>
-        /// 在构建应用程序前自动生成内置资源目录文件。
-        /// 原理：搜索StreamingAssets目录下的所有资源文件，然后将这些文件信息写入文件，并存储在Resources目录下。
-        /// </summary>
-        public void OnPreprocessBuild(UnityEditor.Build.Reporting.BuildReport report)
-        {
-            YooLogger.Log("Begin to create catalog file !");
-
-            string rootPath = YooAssetSettingsData.GetYooDefaultBuildinRoot();
-            DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
-            if (rootDirectory.Exists == false)
-            {
-                UnityEngine.Debug.LogWarning($"Can not found StreamingAssets root directory : {rootPath}");
-                return;
-            }
-
-            // 搜索所有Package目录
-            DirectoryInfo[] subDirectories = rootDirectory.GetDirectories();
-            foreach (var subDirectory in subDirectories)
-            {
-                string packageName = subDirectory.Name;
-                string pacakgeDirectory = subDirectory.FullName;
-                bool result = CreateBuildinCatalogFile(packageName, pacakgeDirectory);
-                if (result == false)
-                {
-                    throw new System.Exception($"Create package {packageName} catalog file failed ! See the detail error in console !");
-                }
-            }
-        }
-
-        /// <summary>
-        /// 生成包裹的内置资源目录文件
-        /// </summary>
-        public static bool CreateBuildinCatalogFile(string packageName, string pacakgeDirectory)
-        {
-            // 获取资源清单版本
-            string packageVersion;
-            {
-                string versionFileName = YooAssetSettingsData.GetPackageVersionFileName(packageName);
-                string versionFilePath = $"{pacakgeDirectory}/{versionFileName}";
-                if (File.Exists(versionFilePath) == false)
-                {
-                    Debug.LogError($"Can not found package version file : {versionFilePath}");
-                    return false;
-                }
-
-                packageVersion = FileUtility.ReadAllText(versionFilePath);
-            }
-
-            // 加载资源清单文件
-            PackageManifest packageManifest;
-            {
-                string manifestFileName = YooAssetSettingsData.GetManifestBinaryFileName(packageName, packageVersion);
-                string manifestFilePath = $"{pacakgeDirectory}/{manifestFileName}";
-                if (File.Exists(manifestFilePath) == false)
-                {
-                    Debug.LogError($"Can not found package manifest file : {manifestFilePath}");
-                    return false;
-                }
-
-                var binaryData = FileUtility.ReadAllBytes(manifestFilePath);
-                packageManifest = ManifestTools.DeserializeFromBinary(binaryData);
-            }
-
-            // 获取文件名映射关系
-            Dictionary<string, string> fileMapping = new Dictionary<string, string>();
-            {
-                foreach (var packageBundle in packageManifest.BundleList)
-                {
-                    fileMapping.Add(packageBundle.FileName, packageBundle.BundleGUID);
-                }
-            }
-
-            // 创建内置清单实例
-            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();
-            foreach (var fileInfo in fileInfos)
-            {
-                if (fileInfo.Extension == ".meta")
-                    continue;
-
-                if (whiteFileList.Contains(fileInfo.Name))
-                    continue;
-
-                string fileName = fileInfo.Name;
-                if (fileMapping.TryGetValue(fileName, out string bundleGUID))
-                {
-                    var wrapper = new DefaultBuildinFileCatalog.FileWrapper();
-                    wrapper.BundleGUID = bundleGUID;
-                    wrapper.FileName = fileName;
-                    buildinFileCatalog.Wrappers.Add(wrapper);
-                }
-                else
-                {
-                    Debug.LogWarning($"Failed mapping file : {fileName}");
-                }
-            }
-
-            // 创建输出文件
-            string jsonFilePath = $"{pacakgeDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName}";
-            if (File.Exists(jsonFilePath))
-                File.Delete(jsonFilePath);
-            CatalogTools.SerializeToJson(jsonFilePath, buildinFileCatalog);
-
-            // 创建输出文件
-            string binaryFilePath = $"{pacakgeDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName}";
-            if (File.Exists(binaryFilePath))
-                File.Delete(binaryFilePath);
-            CatalogTools.SerializeToBinary(binaryFilePath, buildinFileCatalog);
-
-            UnityEditor.AssetDatabase.Refresh();
-            Debug.Log($"Succeed to save buildin file catalog : {binaryFilePath}");
-            return true;
-        }
-    }
-}
-#endif

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

@@ -17,7 +17,7 @@ namespace YooAsset
         private readonly DefaultBuildinFileSystem _fileSystem;
         private CopyBuildinPackageManifestOperation _copyBuildinPackageManifestOp;
         private FSInitializeFileSystemOperation _initUnpackFIleSystemOp;
-        private LoadBuildinCatalogFileOperation _loadCatalogFileOp;
+        private LoadBuildinCatalogFileOperation _loadBuildinCatalogFileOp;
         private ESteps _steps = ESteps.None;
 
         internal DBFSInitializeOperation(DefaultBuildinFileSystem fileSystem)
@@ -103,32 +103,18 @@ namespace YooAsset
 
             if (_steps == ESteps.LoadCatalogFile)
             {
-                if (_loadCatalogFileOp == null)
+                if (_loadBuildinCatalogFileOp == null)
                 {
-#if UNITY_EDITOR
+                    _loadBuildinCatalogFileOp = new LoadBuildinCatalogFileOperation(_fileSystem);
-                    // 兼容性初始化
+                    _loadBuildinCatalogFileOp.StartOperation();
-                    // 说明：内置文件系统在编辑器下运行时需要动态生成
+                    AddChildOperation(_loadBuildinCatalogFileOp);
-                    string packageRoot = _fileSystem.FileRoot;
-                    bool result = DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(_fileSystem.PackageName, packageRoot);
-                    if (result == false)
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Create package catalog file failed ! See the detail error in console !";
-                        return;
-                    }
-#endif
-
-                    _loadCatalogFileOp = new LoadBuildinCatalogFileOperation(_fileSystem);
-                    _loadCatalogFileOp.StartOperation();
-                    AddChildOperation(_loadCatalogFileOp);
                 }
 
-                _loadCatalogFileOp.UpdateOperation();
+                _loadBuildinCatalogFileOp.UpdateOperation();
-                if (_loadCatalogFileOp.IsDone == false)
+                if (_loadBuildinCatalogFileOp.IsDone == false)
                     return;
 
-                if (_loadCatalogFileOp.Status == EOperationStatus.Succeed)
+                if (_loadBuildinCatalogFileOp.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Succeed;
@@ -137,7 +123,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _loadCatalogFileOp.Error;
+                    Error = _loadBuildinCatalogFileOp.Error;
                 }
             }
         }

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

@@ -104,27 +104,28 @@ namespace YooAsset
                     }
                 }
 
-                if (_assetBundle != null)
+                if (_assetBundle == null)
                 {
-                    _steps = ESteps.Done;
+                    if (_bundle.Encrypted)
-                    Result = new AssetBundleResult(_fileSystem, _bundle, _assetBundle, _managedStream);
+                    {
-                    Status = EOperationStatus.Succeed;
+                        _steps = ESteps.Done;
-                    return;
+                        Status = EOperationStatus.Failed;
-                }
+                        Error = $"Failed to load encrypted buildin asset bundle file : {_bundle.BundleName}";
-
+                        YooLogger.Error(Error);
-                if (_bundle.Encrypted)
+                    }
-                {
+                    else
-                    _steps = ESteps.Done;
+                    {
-                    Status = EOperationStatus.Failed;
+                        _steps = ESteps.Done;
-                    Error = $"Failed to load encrypted buildin asset bundle file : {_bundle.BundleName}";
+                        Status = EOperationStatus.Failed;
-                    YooLogger.Error(Error);
+                        Error = $"Failed to load buildin asset bundle file : {_bundle.BundleName}";
+                        YooLogger.Error(Error);
+                    }
                 }
                 else
                 {
                     _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
+                    Result = new AssetBundleResult(_fileSystem, _bundle, _assetBundle, _managedStream);
-                    Error = $"Failed to load buildin asset bundle file : {_bundle.BundleName}";
+                    Status = EOperationStatus.Succeed;
-                    YooLogger.Error(Error);
                 }
             }
         }
@@ -176,13 +177,15 @@ namespace YooAsset
 
             if (_steps == ESteps.LoadBuildinRawBundle)
             {
+                string filePath = _fileSystem.GetBuildinFileLoadPath(_bundle);
+
 #if UNITY_ANDROID
                 //TODO : 安卓平台内置文件属于APK压缩包内的文件。
                 _steps = ESteps.Done;
-                Result = new RawBundleResult(_fileSystem, _bundle);
+                Status = EOperationStatus.Failed;
-                Status = EOperationStatus.Succeed;
+                Error = $"Can not load android buildin raw bundle file : {filePath}";
+                YooLogger.Error(Error);
 #else
-                string filePath = _fileSystem.GetBuildinFileLoadPath(_bundle);
                 if (File.Exists(filePath))
                 {
                     _steps = ESteps.Done;

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

@@ -20,8 +20,8 @@ namespace YooAsset
 
         private readonly DefaultBuildinFileSystem _fileSystem;
         private RequestBuildinPackageVersionOperation _requestBuildinPackageVersionOp;
-        private UnityWebFileRequestOperation _hashFileRequestOp;
+        private UnityWebFileRequestOperation _hashWebFileRequestOp;
-        private UnityWebFileRequestOperation _manifestFileRequestOp;
+        private UnityWebFileRequestOperation _manifestWebFileRequestOp;
         private string _buildinPackageVersion;
         private ESteps _steps = ESteps.None;
 
@@ -78,21 +78,21 @@ namespace YooAsset
 
             if (_steps == ESteps.UnpackHashFile)
             {
-                if (_hashFileRequestOp == null)
+                if (_hashWebFileRequestOp == null)
                 {
                     string sourcePath = _fileSystem.GetBuildinPackageHashFilePath(_buildinPackageVersion);
                     string destPath = GetCopyPackageHashDestPath(_buildinPackageVersion);
                     string url = DownloadSystemHelper.ConvertToWWWPath(sourcePath);
-                    _hashFileRequestOp = new UnityWebFileRequestOperation(url, destPath);
+                    _hashWebFileRequestOp = new UnityWebFileRequestOperation(url, destPath, 60);
-                    _hashFileRequestOp.StartOperation();
+                    _hashWebFileRequestOp.StartOperation();
-                    AddChildOperation(_hashFileRequestOp);
+                    AddChildOperation(_hashWebFileRequestOp);
                 }
 
-                _hashFileRequestOp.UpdateOperation();
+                _hashWebFileRequestOp.UpdateOperation();
-                if (_hashFileRequestOp.IsDone == false)
+                if (_hashWebFileRequestOp.IsDone == false)
                     return;
 
-                if (_hashFileRequestOp.Status == EOperationStatus.Succeed)
+                if (_hashWebFileRequestOp.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.CheckManifestFile;
                 }
@@ -100,7 +100,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _hashFileRequestOp.Error;
+                    Error = _hashWebFileRequestOp.Error;
                 }
             }
 
@@ -119,21 +119,21 @@ namespace YooAsset
 
             if (_steps == ESteps.UnpackManifestFile)
             {
-                if (_manifestFileRequestOp == null)
+                if (_manifestWebFileRequestOp == null)
                 {
                     string sourcePath = _fileSystem.GetBuildinPackageManifestFilePath(_buildinPackageVersion);
                     string destPath = GetCopyPackageManifestDestPath(_buildinPackageVersion);
                     string url = DownloadSystemHelper.ConvertToWWWPath(sourcePath);
-                    _manifestFileRequestOp = new UnityWebFileRequestOperation(url, destPath);
+                    _manifestWebFileRequestOp = new UnityWebFileRequestOperation(url, destPath, 60);
-                    _manifestFileRequestOp.StartOperation();
+                    _manifestWebFileRequestOp.StartOperation();
-                    AddChildOperation(_manifestFileRequestOp);
+                    AddChildOperation(_manifestWebFileRequestOp);
                 }
 
-                _manifestFileRequestOp.UpdateOperation();
+                _manifestWebFileRequestOp.UpdateOperation();
-                if (_manifestFileRequestOp.IsDone == false)
+                if (_manifestWebFileRequestOp.IsDone == false)
                     return;
 
-                if (_manifestFileRequestOp.Status == EOperationStatus.Succeed)
+                if (_manifestWebFileRequestOp.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Succeed;
@@ -142,7 +142,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _manifestFileRequestOp.Error;
+                    Error = _manifestWebFileRequestOp.Error;
                 }
             }
         }

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

@@ -35,7 +35,7 @@ namespace YooAsset
                 {
                     string filePath = _fileSystem.GetCatalogBinaryFileLoadPath();
                     string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
-                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
+                    _webDataRequestOp = new UnityWebDataRequestOperation(url, 60);
                     _webDataRequestOp.StartOperation();
                     AddChildOperation(_webDataRequestOp);
                 }

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

@@ -46,7 +46,7 @@ namespace YooAsset
                 {
                     string filePath = _fileSystem.GetBuildinPackageManifestFilePath(_packageVersion);
                     string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
-                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
+                    _webDataRequestOp = new UnityWebDataRequestOperation(url, 60);
                     _webDataRequestOp.StartOperation();
                     AddChildOperation(_webDataRequestOp);
                 }
@@ -85,7 +85,7 @@ namespace YooAsset
             {
                 if (_deserializer == null)
                 {
-                    _deserializer = new DeserializeManifestOperation(_webDataRequestOp.Result);
+                    _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
                     _deserializer.StartOperation();
                     AddChildOperation(_deserializer);
                 }

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

@@ -41,7 +41,7 @@ namespace YooAsset
                 {
                     string filePath = _fileSystem.GetBuildinPackageHashFilePath(_packageVersion);
                     string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
-                    _webTextRequestOp = new UnityWebTextRequestOperation(url);
+                    _webTextRequestOp = new UnityWebTextRequestOperation(url, 60);
                     _webTextRequestOp.StartOperation();
                     AddChildOperation(_webTextRequestOp);
                 }

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

@@ -39,7 +39,7 @@ namespace YooAsset
                 {
                     string filePath = _fileSystem.GetBuildinPackageVersionFilePath();
                     string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
-                    _webTextRequestOp = new UnityWebTextRequestOperation(url);
+                    _webTextRequestOp = new UnityWebTextRequestOperation(url, 60);
                     _webTextRequestOp.StartOperation();
                     AddChildOperation(_webTextRequestOp);
                 }

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

@@ -58,7 +58,7 @@ namespace YooAsset
         /// <summary>
         /// 自定义参数：远程服务接口
         /// </summary>
-        public IRemoteServices RemoteServices { private set; get; } = null;
+        public IRemoteServices RemoteServices { private set; get; }
 
         /// <summary>
         /// 自定义参数：初始化的时候缓存文件校验级别
@@ -75,6 +75,11 @@ namespace YooAsset
         /// </summary>
         public bool AppendFileExtension { private set; get; } = false;
 
+        /// <summary>
+        /// 自定义参数：禁用边玩边下机制
+        /// </summary>
+        public bool DisableOnDemandDownload { private set; get; } = false;
+
         /// <summary>
         /// 自定义参数：最大并发连接数
         /// </summary>
@@ -99,6 +104,16 @@ namespace YooAsset
         ///  自定义参数：解密方法类
         /// </summary>
         public IDecryptionServices DecryptionServices { private set; get; }
+
+        /// <summary>
+        /// 自定义参数：资源清单服务类
+        /// </summary>
+        public IManifestRestoreServices ManifestServices { private set; get; }
+
+        /// <summary>
+        /// 自定义参数：拷贝内置文件服务类
+        /// </summary>
+        public ICopyLocalFileServices CopyLocalFileServices { private set; get; }
         #endregion
 
 
@@ -156,12 +171,23 @@ namespace YooAsset
         }
         public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
         {
-            var downloader = DownloadCenter.DownloadFileAsync(bundle, options);
+            // 获取下载地址
-            downloader.Reference(); //增加下载器的引用计数
+            if (string.IsNullOrEmpty(options.ImportFilePath))
+            {
+                // 注意：如果是解压文件系统类，这里会返回本地内置文件的下载路径
+                string mainURL = RemoteServices.GetRemoteMainURL(bundle.FileName);
+                string fallbackURL = RemoteServices.GetRemoteFallbackURL(bundle.FileName);
+                options.SetURL(mainURL, fallbackURL);
+            }
+            else
+            {
+                // 注意：把本地导入文件路径转换为下载器请求地址
+                string mainURL = DownloadSystemHelper.ConvertToWWWPath(options.ImportFilePath);
+                options.SetURL(mainURL, mainURL);
+            }
 
-            // 注意：将下载器进行包裹，可以避免父类任务终止的时候，连带子任务里的下载器也一起被终止！
+            var downloader = new DownloadPackageBundleOperation(this, bundle, options);
-            var wrapper = new DownloadFileWrapper(downloader);
+            return downloader;
-            return wrapper;
         }
         public virtual FSLoadBundleOperation LoadBundleFile(PackageBundle bundle)
         {
@@ -201,6 +227,10 @@ namespace YooAsset
             {
                 AppendFileExtension = Convert.ToBoolean(value);
             }
+            else if (name == FileSystemParametersDefine.DISABLE_ONDEMAND_DOWNLOAD)
+            {
+                DisableOnDemandDownload = Convert.ToBoolean(value);
+            }
             else if (name == FileSystemParametersDefine.DOWNLOAD_MAX_CONCURRENCY)
             {
                 DownloadMaxConcurrency = Convert.ToInt32(value);
@@ -221,6 +251,14 @@ namespace YooAsset
             {
                 DecryptionServices = (IDecryptionServices)value;
             }
+            else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
+            {
+                ManifestServices = (IManifestRestoreServices)value;
+            }
+            else if (name == FileSystemParametersDefine.COPY_LOCAL_FILE_SERVICES)
+            {
+                CopyLocalFileServices = (ICopyLocalFileServices)value;
+            }
             else
             {
                 YooLogger.Warning($"Invalid parameter : {name}");

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

@@ -111,7 +111,7 @@ namespace YooAsset
                 if (_verifyCacheFilesOp.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.CreateDownloadCenter;
-                    YooLogger.Log($"Package '{_fileSystem.PackageName}' cached files count : {_fileSystem.FileCount}");
+                    YooLogger.Log($"Package '{_fileSystem.PackageName}' '{_fileSystem.GetType().Name}' cached files count : {_fileSystem.FileCount}");
                 }
                 else
                 {

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

@@ -49,16 +49,25 @@ namespace YooAsset
                 }
                 else
                 {
-                    _steps = ESteps.DownloadFile;
+                    if (_fileSystem.DisableOnDemandDownload)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"The bundle not cached : {_bundle.BundleName}";
+                        YooLogger.Warning(Error);
+                    }
+                    else
+                    {
+                        _steps = ESteps.DownloadFile;
+                    }
                 }
             }
 
             if (_steps == ESteps.DownloadFile)
             {
-                // 注意：边玩边下下载器引用计数没有Release
                 if (_downloadFileOp == null)
                 {
-                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue, 60);
+                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue);
                     _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, options);
                     _downloadFileOp.StartOperation();
                     AddChildOperation(_downloadFileOp);
@@ -228,9 +237,6 @@ namespace YooAsset
             {
                 if (ExecuteWhileDone())
                 {
-                    if (_downloadFileOp != null && _downloadFileOp.Status == EOperationStatus.Failed)
-                        YooLogger.Error($"Try load bundle {_bundle.BundleName} from remote !");
-
                     _steps = ESteps.Done;
                     break;
                 }
@@ -306,10 +312,9 @@ namespace YooAsset
 
             if (_steps == ESteps.DownloadFile)
             {
-                // 注意：边玩边下下载器引用计数没有Release
                 if (_downloadFileOp == null)
                 {
-                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue, 60);
+                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue);
                     _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, options);
                     _downloadFileOp.StartOperation();
                     AddChildOperation(_downloadFileOp);
@@ -360,10 +365,6 @@ namespace YooAsset
             {
                 if (ExecuteWhileDone())
                 {
-                    //TODO 拷贝本地文件失败也会触发该错误！
-                    if (_downloadFileOp != null && _downloadFileOp.Status == EOperationStatus.Failed)
-                        YooLogger.Error($"Try load bundle {_bundle.BundleName} from remote !");
-
                     _steps = ESteps.Done;
                     break;
                 }

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

@@ -6,8 +6,8 @@ namespace YooAsset
     internal class DownloadCenterOperation : AsyncOperationBase
     {
         private readonly DefaultCacheFileSystem _fileSystem;
-        protected readonly Dictionary<string, DefaultDownloadFileOperation> _downloaders = new Dictionary<string, DefaultDownloadFileOperation>(1000);
+        protected readonly Dictionary<string, UnityDownloadFileOperation> _downloaders = new Dictionary<string, UnityDownloadFileOperation>(1000);
-        protected readonly List<string> _removeDownloadList = new List<string>(1000);
+        protected readonly List<string> _removeList = new List<string>(1000);
 
         public DownloadCenterOperation(DefaultCacheFileSystem fileSystem)
         {
@@ -19,31 +19,34 @@ namespace YooAsset
         internal override void InternalUpdate()
         {
             // 获取可移除的下载器集合
-            _removeDownloadList.Clear();
+            _removeList.Clear();
             foreach (var valuePair in _downloaders)
             {
                 var downloader = valuePair.Value;
                 downloader.UpdateOperation();
+                if (downloader.IsDone)
+                {
+                    _removeList.Add(valuePair.Key);
+                    continue;
+                }
 
                 // 注意：主动终止引用计数为零的下载任务
                 if (downloader.RefCount <= 0)
                 {
-                    _removeDownloadList.Add(valuePair.Key);
+                    _removeList.Add(valuePair.Key);
                     downloader.AbortOperation();
                     continue;
                 }
-
-                if (downloader.IsDone)
-                {
-                    _removeDownloadList.Add(valuePair.Key);
-                    continue;
-                }
             }
 
             // 移除下载器
-            foreach (var key in _removeDownloadList)
+            foreach (var key in _removeList)
             {
-                _downloaders.Remove(key);
+                if (_downloaders.TryGetValue(key, out var downloader))
+                {
+                    Childs.Remove(downloader);
+                    _downloaders.Remove(key);
+                }
             }
 
             // 最大并发数检测
@@ -74,41 +77,41 @@ namespace YooAsset
         /// <summary>
         /// 创建下载任务
         /// </summary>
-        public FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
+        public UnityDownloadFileOperation DownloadFileAsync(PackageBundle bundle, string url)
         {
             // 查询旧的下载器
             if (_downloaders.TryGetValue(bundle.BundleGUID, out var oldDownloader))
             {
+                oldDownloader.Reference();
                 return oldDownloader;
             }
 
-            // 设置请求URL
+            // 创建新的下载器
-            if (string.IsNullOrEmpty(options.ImportFilePath))
+            UnityDownloadFileOperation newDownloader;
+            bool isRequestLocalFile = DownloadSystemHelper.IsRequestLocalFile(url);
+            if (isRequestLocalFile)
             {
-                options.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(bundle.FileName);
+                newDownloader = new UnityDownloadLocalFileOperation(_fileSystem, bundle, url);
-                options.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(bundle.FileName);
+                AddChildOperation(newDownloader);
+                _downloaders.Add(bundle.BundleGUID, newDownloader);
             }
             else
             {
-                // 注意：把本地文件路径指定为远端下载地址
+                if (bundle.FileSize >= _fileSystem.ResumeDownloadMinimumSize)
-                options.MainURL = DownloadSystemHelper.ConvertToWWWPath(options.ImportFilePath);
+                {
-                options.FallbackURL = options.MainURL;
+                    newDownloader = new UnityDownloadResumeFileOperation(_fileSystem, bundle, url);
+                    AddChildOperation(newDownloader);
+                    _downloaders.Add(bundle.BundleGUID, newDownloader);
+                }
+                else
+                {
+                    newDownloader = new UnityDownloadNormalFileOperation(_fileSystem, bundle, url);
+                    AddChildOperation(newDownloader);
+                    _downloaders.Add(bundle.BundleGUID, newDownloader);
+                }
             }
 
-            // 创建新的下载器
+            newDownloader.Reference();
-            DefaultDownloadFileOperation newDownloader;
-            if (bundle.FileSize >= _fileSystem.ResumeDownloadMinimumSize)
-            {
-                newDownloader = new DownloadResumeFileOperation(_fileSystem, bundle, options);
-                AddChildOperation(newDownloader);
-                _downloaders.Add(bundle.BundleGUID, newDownloader);
-            }
-            else
-            {
-                newDownloader = new DownloadNormalFileOperation(_fileSystem, bundle, options);
-                AddChildOperation(newDownloader);
-                _downloaders.Add(bundle.BundleGUID, newDownloader);
-            }
             return newDownloader;
         }
 

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

@@ -1,87 +0,0 @@
-using System;
-using System.IO;
-using UnityEngine;
-using UnityEngine.Networking;
-
-namespace YooAsset
-{
-    /// <summary>
-    /// 支持Unity2018版本的断点续传下载器
-    /// </summary>
-    internal class DownloadHandlerFileRange : DownloadHandlerScript
-    {
-        private string _fileSavePath;
-        private long _fileTotalSize;
-        private UnityWebRequest _webRequest;
-        private FileStream _fileStream;
-
-        private long _localFileSize = 0;
-        private long _curFileSize = 0;
-
-
-        public DownloadHandlerFileRange(string fileSavePath, long fileTotalSize, UnityWebRequest webRequest) : base(new byte[1024 * 1024])
-        {
-            _fileSavePath = fileSavePath;
-            _fileTotalSize = fileTotalSize;
-            _webRequest = webRequest;
-
-            if (File.Exists(fileSavePath))
-            {
-                FileInfo fileInfo = new FileInfo(fileSavePath);
-                _localFileSize = fileInfo.Length;
-            }
-
-            _fileStream = new FileStream(_fileSavePath, FileMode.Append, FileAccess.Write);
-            _curFileSize = _localFileSize;
-        }
-        protected override bool ReceiveData(byte[] data, int dataLength)
-        {
-            if (data == null || dataLength == 0 || _webRequest.responseCode >= 400)
-                return false;
-
-            if (_fileStream == null)
-                return false;
-
-            _fileStream.Write(data, 0, dataLength);
-            _curFileSize += dataLength;
-            return true;
-        }
-
-        /// <summary>
-        /// UnityWebRequest.downloadHandler.data
-        /// </summary>
-        protected override byte[] GetData()
-        {
-            return null;
-        }
-
-        /// <summary>
-        /// UnityWebRequest.downloadHandler.text
-        /// </summary>
-        protected override string GetText()
-        {
-            return null;
-        }
-
-        /// <summary>
-        /// UnityWebRequest.downloadProgress
-        /// </summary>
-        protected override float GetProgress()
-        {
-            return _fileTotalSize == 0 ? 0 : ((float)_curFileSize) / _fileTotalSize;
-        }
-
-        /// <summary>
-        /// 释放下载句柄
-        /// </summary>
-        public void Cleanup()
-        {
-            if (_fileStream != null)
-            {
-                _fileStream.Flush();
-                _fileStream.Dispose();
-                _fileStream = null;
-            }
-        }
-    }
-}

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

@@ -1,208 +0,0 @@
-using System.IO;
-using UnityEngine;
-using UnityEngine.Networking;
-
-namespace YooAsset
-{
-    internal sealed class DownloadNormalFileOperation : DefaultDownloadFileOperation
-    {
-        private readonly DefaultCacheFileSystem _fileSystem;
-        private VerifyTempFileOperation _verifyOperation;
-        private bool _isReuqestLocalFile;
-        private string _tempFilePath;
-        private ESteps _steps = ESteps.None;
-
-        internal DownloadNormalFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, DownloadFileOptions options) : base(bundle, options)
-        {
-            _fileSystem = fileSystem;
-        }
-        internal override void InternalStart()
-        {
-            _isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Options.MainURL);
-            _tempFilePath = _fileSystem.GetTempFilePath(Bundle);
-            _steps = ESteps.CheckExists;
-        }
-        internal override void InternalUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            // 检测文件是否存在
-            if (_steps == ESteps.CheckExists)
-            {
-                if (_fileSystem.Exists(Bundle))
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.CreateRequest;
-                }
-            }
-
-            // 创建下载器
-            if (_steps == ESteps.CreateRequest)
-            {
-                FileUtility.CreateFileDirectory(_tempFilePath);
-
-                // 删除临时文件
-                if (File.Exists(_tempFilePath))
-                    File.Delete(_tempFilePath);
-
-                // 获取请求地址
-                _requestURL = GetRequestURL();
-
-                // 重置请求
-                ResetRequestFiled();
-
-                // 创建下载器
-                CreateWebRequest();
-
-                _steps = ESteps.CheckRequest;
-            }
-
-            // 检测下载结果
-            if (_steps == ESteps.CheckRequest)
-            {
-                DownloadProgress = _webRequest.downloadProgress;
-                DownloadedBytes = (long)_webRequest.downloadedBytes;
-                Progress = DownloadProgress;
-                if (_webRequest.isDone == false)
-                {
-                    CheckRequestTimeout();
-                    return;
-                }
-
-                // 检查网络错误
-                if (CheckRequestResult())
-                    _steps = ESteps.VerifyTempFile;
-                else
-                    _steps = ESteps.TryAgain;
-
-                // 注意：最终释放请求器
-                DisposeWebRequest();
-            }
-
-            // 验证下载文件
-            if (_steps == ESteps.VerifyTempFile)
-            {
-                var element = new TempFileElement(_tempFilePath, Bundle.FileCRC, Bundle.FileSize);
-                _verifyOperation = new VerifyTempFileOperation(element);
-                _verifyOperation.StartOperation();
-                AddChildOperation(_verifyOperation);
-                _steps = ESteps.CheckVerifyTempFile;
-            }
-
-            // 等待验证完成
-            if (_steps == ESteps.CheckVerifyTempFile)
-            {
-                if (IsWaitForAsyncComplete)
-                    _verifyOperation.WaitForAsyncComplete();
-
-                _verifyOperation.UpdateOperation();
-                if (_verifyOperation.IsDone == false)
-                    return;
-
-                if (_verifyOperation.Status == EOperationStatus.Succeed)
-                {
-                    if (_fileSystem.WriteCacheBundleFile(Bundle, _tempFilePath))
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Succeed;
-                    }
-                    else
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"{_fileSystem.GetType().FullName} failed to write file !";
-                        YooLogger.Error(Error);
-                    }
-                }
-                else
-                {
-                    _steps = ESteps.TryAgain;
-                    Error = _verifyOperation.Error;
-                }
-
-                // 注意：验证完成后直接删除文件
-                if (File.Exists(_tempFilePath))
-                    File.Delete(_tempFilePath);
-            }
-
-            // 重新尝试下载
-            if (_steps == ESteps.TryAgain)
-            {
-                //TODO 拷贝本地文件失败后不再尝试！
-                if (_isReuqestLocalFile)
-                {
-                    Status = EOperationStatus.Failed;
-                    _steps = ESteps.Done;
-                    YooLogger.Error(Error);
-                    return;
-                }
-
-                if (FailedTryAgain <= 0)
-                {
-                    Status = EOperationStatus.Failed;
-                    _steps = ESteps.Done;
-                    YooLogger.Error(Error);
-                    return;
-                }
-
-                _tryAgainTimer += Time.unscaledDeltaTime;
-                if (_tryAgainTimer > 1f)
-                {
-                    FailedTryAgain--;
-                    _steps = ESteps.CreateRequest;
-                    YooLogger.Warning(Error);
-                }
-            }
-        }
-        internal override void InternalAbort()
-        {
-            _steps = ESteps.Done;
-            DisposeWebRequest();
-        }
-        internal override void InternalWaitForAsyncComplete()
-        {
-            while (true)
-            {
-                //TODO 如果是导入或解压本地文件，执行等待完毕
-                if (_isReuqestLocalFile)
-                {
-                    InternalUpdate();
-                    if (IsDone)
-                        break;
-                }
-                else
-                {
-                    if (ExecuteWhileDone())
-                    {
-                        _steps = ESteps.Done;
-                        break;
-                    }
-                }
-            }
-        }
-
-        private void CreateWebRequest()
-        {
-            _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
-            DownloadHandlerFile handler = new DownloadHandlerFile(_tempFilePath);
-            handler.removeFileOnAbort = true;
-            _webRequest.downloadHandler = handler;
-            _webRequest.disposeDownloadHandlerOnDispose = true;
-            _webRequest.SendWebRequest();
-        }
-        private void DisposeWebRequest()
-        {
-            if (_webRequest != null)
-            {
-                //注意：引擎底层会自动调用Abort方法
-                _webRequest.Dispose();
-                _webRequest = null;
-            }
-        }
-    }
-}

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

@@ -0,0 +1,164 @@
+using UnityEngine;
+
+namespace YooAsset
+{
+    internal class DownloadPackageBundleOperation : FSDownloadFileOperation
+    {
+        protected enum ESteps
+        {
+            None,
+            CheckExists,
+            CreateRequest,
+            CheckRequest,
+            TryAgain,
+            Done,
+        }
+
+        // 下载参数
+        protected readonly DefaultCacheFileSystem _fileSystem;
+        protected readonly DownloadFileOptions _options;
+        private UnityDownloadFileOperation _unityDownloadFileOp;
+
+        protected int _requestCount = 0;
+        protected float _tryAgainTimer;
+        protected int _failedTryAgain;
+        private ESteps _steps = ESteps.None;
+
+
+        internal DownloadPackageBundleOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, DownloadFileOptions options) : base(bundle)
+        {
+            _fileSystem = fileSystem;
+            _options = options;
+            _failedTryAgain = options.FailedTryAgain;
+        }
+        internal override void InternalStart()
+        {
+            _steps = ESteps.CheckExists;
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            // 检测文件是否存在
+            if (_steps == ESteps.CheckExists)
+            {
+                if (_fileSystem.Exists(Bundle))
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    _steps = ESteps.CreateRequest;
+                }
+            }
+
+            // 创建下载器
+            if (_steps == ESteps.CreateRequest)
+            {
+                if (_options.IsValid() == false)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Download file options is invalid !";
+                    Debug.Log(Error);
+                    return;
+                }
+
+                string url = GetRequestURL();
+                _unityDownloadFileOp = _fileSystem.DownloadCenter.DownloadFileAsync(Bundle, url);
+                _steps = ESteps.CheckRequest;
+            }
+
+            // 检测下载结果
+            if (_steps == ESteps.CheckRequest)
+            {
+                if (IsWaitForAsyncComplete)
+                    _unityDownloadFileOp.WaitForAsyncComplete();
+
+                // 因为并发数量限制，下载器可能被挂起！
+                if (_unityDownloadFileOp.Status == EOperationStatus.None)
+                    return;
+
+                _unityDownloadFileOp.UpdateOperation();
+                Progress = _unityDownloadFileOp.Progress;
+                DownloadedBytes = _unityDownloadFileOp.DownloadedBytes;
+                DownloadProgress = _unityDownloadFileOp.DownloadProgress;
+                if (_unityDownloadFileOp.IsDone == false)
+                    return;
+
+                if (_unityDownloadFileOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    if (IsWaitForAsyncComplete == false && _failedTryAgain > 0)
+                    {
+                        _steps = ESteps.TryAgain;
+                        YooLogger.Warning($"Failed download : {_unityDownloadFileOp.URL} Try again !");
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = _unityDownloadFileOp.Error;
+                        YooLogger.Error(Error);
+                    }
+                }
+            }
+
+            // 重新尝试下载
+            if (_steps == ESteps.TryAgain)
+            {
+                _tryAgainTimer += Time.unscaledDeltaTime;
+                if (_tryAgainTimer > 1f)
+                {
+                    _tryAgainTimer = 0f;
+                    _failedTryAgain--;
+                    Progress = 0f;
+                    DownloadProgress = 0f;
+                    DownloadedBytes = 0;
+                    _steps = ESteps.CreateRequest;
+                }
+            }
+        }
+        internal override void InternalWaitForAsyncComplete()
+        {
+            while (true)
+            {
+                if (ExecuteWhileDone())
+                {
+                    _steps = ESteps.Done;
+                    break;
+                }
+            }
+        }
+        internal override void InternalAbort()
+        {
+            // 注意：取消下载任务的时候引用计数减一
+            if (_steps != ESteps.Done)
+            {
+                if (_unityDownloadFileOp != null)
+                {
+                    _unityDownloadFileOp.Release();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取网络请求地址
+        /// </summary>
+        protected string GetRequestURL()
+        {
+            // 轮流返回请求地址
+            _requestCount++;
+            if (_requestCount % 2 == 0)
+                return _options.FallbackURL;
+            else
+                return _options.MainURL;
+        }
+    }
+}

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

@@ -1,252 +0,0 @@
-using System.IO;
-using UnityEngine;
-using UnityEngine.Networking;
-
-namespace YooAsset
-{
-    internal sealed class DownloadResumeFileOperation : DefaultDownloadFileOperation
-    {
-        private readonly DefaultCacheFileSystem _fileSystem;
-        private DownloadHandlerFileRange _downloadHandle;
-        private VerifyTempFileOperation _verifyOperation;
-        private bool _isReuqestLocalFile;
-        private long _fileOriginLength = 0;
-        private string _tempFilePath;
-        private ESteps _steps = ESteps.None;
-
-
-        internal DownloadResumeFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, DownloadFileOptions options) : base(bundle, options)
-        {
-            _fileSystem = fileSystem;
-        }
-        internal override void InternalStart()
-        {
-            _isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Options.MainURL);
-            _tempFilePath = _fileSystem.GetTempFilePath(Bundle);
-            _steps = ESteps.CheckExists;
-        }
-        internal override void InternalUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            // 检测文件是否存在
-            if (_steps == ESteps.CheckExists)
-            {
-                if (_fileSystem.Exists(Bundle))
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.CreateRequest;
-                }
-            }
-
-            // 创建下载器
-            if (_steps == ESteps.CreateRequest)
-            {
-                FileUtility.CreateFileDirectory(_tempFilePath);
-
-                // 获取请求地址
-                _requestURL = GetRequestURL();
-
-                // 重置变量
-                ResetRequestFiled();
-
-                // 获取下载起始位置
-                _fileOriginLength = 0;
-                long fileBeginLength = -1;
-                if (File.Exists(_tempFilePath))
-                {
-                    FileInfo fileInfo = new FileInfo(_tempFilePath);
-                    if (fileInfo.Length >= Bundle.FileSize)
-                    {
-                        // 删除临时文件
-                        File.Delete(_tempFilePath);
-                    }
-                    else
-                    {
-                        fileBeginLength = fileInfo.Length;
-                        _fileOriginLength = fileBeginLength;
-                        DownloadedBytes = _fileOriginLength;
-                    }
-                }
-
-                // 创建下载器
-                CreateWebRequest(fileBeginLength);
-
-                _steps = ESteps.CheckRequest;
-            }
-
-            // 检测下载结果
-            if (_steps == ESteps.CheckRequest)
-            {
-                DownloadProgress = _webRequest.downloadProgress;
-                DownloadedBytes = _fileOriginLength + (long)_webRequest.downloadedBytes;
-                if (_webRequest.isDone == false)
-                {
-                    CheckRequestTimeout();
-                    return;
-                }
-
-                // 检查网络错误
-                if (CheckRequestResult())
-                    _steps = ESteps.VerifyTempFile;
-                else
-                    _steps = ESteps.TryAgain;
-
-                // 在遇到特殊错误的时候删除文件
-                ClearTempFileWhenError();
-
-                // 注意：最终释放请求器
-                DisposeWebRequest();
-            }
-
-            // 验证下载文件
-            if (_steps == ESteps.VerifyTempFile)
-            {
-                var element = new TempFileElement(_tempFilePath, Bundle.FileCRC, Bundle.FileSize);
-                _verifyOperation = new VerifyTempFileOperation(element);
-                _verifyOperation.StartOperation();
-                AddChildOperation(_verifyOperation);
-                _steps = ESteps.CheckVerifyTempFile;
-            }
-
-            // 等待验证完成
-            if (_steps == ESteps.CheckVerifyTempFile)
-            {
-                if (IsWaitForAsyncComplete)
-                    _verifyOperation.WaitForAsyncComplete();
-
-                _verifyOperation.UpdateOperation();
-                if (_verifyOperation.IsDone == false)
-                    return;
-
-                if (_verifyOperation.Status == EOperationStatus.Succeed)
-                {
-                    if (_fileSystem.WriteCacheBundleFile(Bundle, _tempFilePath))
-                    {
-                        Status = EOperationStatus.Succeed;
-                        _steps = ESteps.Done;
-                    }
-                    else
-                    {
-                        Error = $"{_fileSystem.GetType().FullName} failed to write file !";
-                        Status = EOperationStatus.Failed;
-                        _steps = ESteps.Done;
-                    }
-                }
-                else
-                {
-                    Error = _verifyOperation.Error;
-                    _steps = ESteps.TryAgain;
-                }
-
-                // 注意：验证完成后直接删除文件
-                if (File.Exists(_tempFilePath))
-                    File.Delete(_tempFilePath);
-            }
-
-            // 重新尝试下载
-            if (_steps == ESteps.TryAgain)
-            {
-                //TODO 拷贝本地文件失败后不再尝试！
-                if (_isReuqestLocalFile)
-                {
-                    Status = EOperationStatus.Failed;
-                    _steps = ESteps.Done;
-                    YooLogger.Error(Error);
-                    return;
-                }
-
-                if (FailedTryAgain <= 0)
-                {
-                    Status = EOperationStatus.Failed;
-                    _steps = ESteps.Done;
-                    YooLogger.Error(Error);
-                    return;
-                }
-
-                _tryAgainTimer += Time.unscaledDeltaTime;
-                if (_tryAgainTimer > 1f)
-                {
-                    FailedTryAgain--;
-                    _steps = ESteps.CreateRequest;
-                    YooLogger.Warning(Error);
-                }
-            }
-        }
-        internal override void InternalAbort()
-        {
-            _steps = ESteps.Done;
-            DisposeWebRequest();
-        }
-        internal override void InternalWaitForAsyncComplete()
-        {
-            while (true)
-            {
-                //TODO 如果是导入或解压本地文件，执行等待完毕
-                if (_isReuqestLocalFile)
-                {
-                    InternalUpdate();
-                    if (IsDone)
-                        break;
-                }
-                else
-                {
-                    if (ExecuteWhileDone())
-                    {
-                        _steps = ESteps.Done;
-                        break;
-                    }
-                }
-            }
-        }
-
-        private void CreateWebRequest(long beginLength)
-        {
-            _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
-#if UNITY_2019_4_OR_NEWER
-            var handler = new DownloadHandlerFile(_tempFilePath, true);
-            handler.removeFileOnAbort = false;
-#else
-            var handler = new DownloadHandlerFileRange(FileSavePath, Bundle.FileSize, _webRequest);
-            _downloadHandle = handler;
-#endif
-            _webRequest.downloadHandler = handler;
-            _webRequest.disposeDownloadHandlerOnDispose = true;
-            if (beginLength > 0)
-                _webRequest.SetRequestHeader("Range", $"bytes={beginLength}-");
-            _webRequest.SendWebRequest();
-        }
-        private void DisposeWebRequest()
-        {
-            if (_downloadHandle != null)
-            {
-                _downloadHandle.Cleanup();
-                _downloadHandle = null;
-            }
-
-            if (_webRequest != null)
-            {
-                //注意：引擎底层会自动调用Abort方法
-                _webRequest.Dispose();
-                _webRequest = null;
-            }
-        }
-        private void ClearTempFileWhenError()
-        {
-            if (_fileSystem.ResumeDownloadResponseCodes == null)
-                return;
-
-            //说明：如果遇到以下错误返回码，验证失败直接删除文件
-            if (_fileSystem.ResumeDownloadResponseCodes.Contains(HttpCode))
-            {
-                if (File.Exists(_tempFilePath))
-                    File.Delete(_tempFilePath);
-            }
-        }
-    }
-}

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

@@ -75,7 +75,7 @@ namespace YooAsset
             {
                 if (_deserializer == null)
                 {
-                    _deserializer = new DeserializeManifestOperation(_fileData);
+                    _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _fileData);
                     _deserializer.StartOperation();
                     AddChildOperation(_deserializer);
                 }

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

@@ -0,0 +1,52 @@
+
+namespace YooAsset
+{
+    internal abstract class UnityDownloadFileOperation : UnityWebRequestOperation
+    {
+        protected enum ESteps
+        {
+            None,
+            CreateRequest,
+            Download,
+            CopyLocalFile,
+            VerifyFile,
+            Done,
+        }
+
+        protected readonly DefaultCacheFileSystem _fileSystem;
+        protected readonly PackageBundle _bundle;
+        protected readonly string _tempFilePath;
+
+        /// <summary>
+        /// 引用计数
+        /// </summary>
+        public int RefCount { private set; get; }
+
+        internal UnityDownloadFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, string url) : base(url)
+        {
+            _fileSystem = fileSystem;
+            _bundle = bundle;
+            _tempFilePath = _fileSystem.GetTempFilePath(bundle);
+        }
+        internal override string InternalGetDesc()
+        {
+            return $"RefCount : {RefCount}";
+        }
+
+        /// <summary>
+        /// 减少引用计数
+        /// </summary>
+        public void Release()
+        {
+            RefCount--;
+        }
+
+        /// <summary>
+        /// 增加引用计数
+        /// </summary>
+        public void Reference()
+        {
+            RefCount++;
+        }
+    }
+}

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/UnityDownloadFileOperation.cs.meta

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

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

@@ -0,0 +1,168 @@
+using System.IO;
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace YooAsset
+{
+    internal class UnityDownloadLocalFileOperation : UnityDownloadFileOperation
+    {
+        private VerifyTempFileOperation _verifyOperation;
+        private ESteps _steps = ESteps.None;
+
+        internal UnityDownloadLocalFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, string url)
+            : base(fileSystem, bundle, url)
+        {
+        }
+        internal override void InternalStart()
+        {
+            if (_fileSystem.CopyLocalFileServices != null)
+                _steps = ESteps.CopyLocalFile;
+            else
+                _steps = ESteps.CreateRequest;
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            // 创建下载器
+            if (_steps == ESteps.CreateRequest)
+            {
+                FileUtility.CreateFileDirectory(_tempFilePath);
+                if (File.Exists(_tempFilePath))
+                    File.Delete(_tempFilePath);
+
+                CreateWebRequest();
+                _steps = ESteps.Download;
+            }
+
+            // 检测下载结果
+            if (_steps == ESteps.Download)
+            {
+                DownloadProgress = _webRequest.downloadProgress;
+                DownloadedBytes = (long)_webRequest.downloadedBytes;
+                Progress = DownloadProgress;
+                if (_webRequest.isDone == false)
+                    return;
+
+                // 检查网络错误
+                if (CheckRequestResult())
+                {
+                    _steps = ESteps.VerifyFile;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                }
+
+                // 注意：最终释放请求器
+                DisposeRequest();
+            }
+
+            // 拷贝内置文件
+            if (_steps == ESteps.CopyLocalFile)
+            {
+                FileUtility.CreateFileDirectory(_tempFilePath);
+                if (File.Exists(_tempFilePath))
+                    File.Delete(_tempFilePath);
+
+                try
+                {
+                    //TODO 团结引擎，在某些机型（红米），拷贝包内文件会小概率失败！需要借助其它方式来拷贝包内文件。
+                    var localFileInfo = new LocalFileInfo();
+                    localFileInfo.PackageName = _fileSystem.PackageName;
+                    localFileInfo.BundleName = _bundle.BundleName;
+                    localFileInfo.SourceFileURL = _requestURL;
+                    _fileSystem.CopyLocalFileServices.CopyFile(localFileInfo, _tempFilePath);
+                    if (File.Exists(_tempFilePath))
+                    {
+                        DownloadProgress = 1f;
+                        DownloadedBytes = _bundle.FileSize;
+                        Progress = DownloadProgress;
+                        _steps = ESteps.VerifyFile;
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"Failed copy local file : {_requestURL}";
+                    }
+                }
+                catch (System.Exception ex)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"Failed copy local file : {ex.Message}";
+                }
+            }
+
+            // 验证下载文件
+            if (_steps == ESteps.VerifyFile)
+            {
+                if (_verifyOperation == null)
+                {
+                    var element = new TempFileElement(_tempFilePath, _bundle.FileCRC, _bundle.FileSize);
+                    _verifyOperation = new VerifyTempFileOperation(element);
+                    _verifyOperation.StartOperation();
+                    AddChildOperation(_verifyOperation);
+                }
+
+                if (IsWaitForAsyncComplete)
+                    _verifyOperation.WaitForAsyncComplete();
+
+                _verifyOperation.UpdateOperation();
+                if (_verifyOperation.IsDone == false)
+                    return;
+
+                if (_verifyOperation.Status == EOperationStatus.Succeed)
+                {
+                    if (_fileSystem.WriteCacheBundleFile(_bundle, _tempFilePath))
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Succeed;
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"{_fileSystem.GetType().FullName} failed to write file !";
+                    }
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _verifyOperation.Error;
+                }
+
+                // 注意：验证完成后直接删除文件
+                if (File.Exists(_tempFilePath))
+                    File.Delete(_tempFilePath);
+            }
+        }
+        internal override void InternalWaitForAsyncComplete()
+        {
+            while (true)
+            {
+                //TODO 等待导入或解压本地文件完毕，该操作会挂起主线程！
+                InternalUpdate();
+                if (IsDone)
+                    break;
+
+                // 短暂休眠避免完全卡死
+                System.Threading.Thread.Sleep(1);
+            }
+        }
+
+        private void CreateWebRequest()
+        {
+            DownloadHandlerFile handler = new DownloadHandlerFile(_tempFilePath);
+            handler.removeFileOnAbort = true;
+            _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
+            _webRequest.downloadHandler = handler;
+            _webRequest.disposeDownloadHandlerOnDispose = true;
+            _webRequest.SendWebRequest();
+        }
+    }
+}

Assets/YooAsset/Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/UnityDownloadLocalFileOperation.cs.meta

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

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

@@ -0,0 +1,122 @@
+using System.IO;
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace YooAsset
+{
+    internal sealed class UnityDownloadNormalFileOperation : UnityDownloadFileOperation
+    {
+        private VerifyTempFileOperation _verifyOperation;
+        private ESteps _steps = ESteps.None;
+
+        internal UnityDownloadNormalFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, string url)
+            : base(fileSystem, bundle, url)
+        {
+        }
+        internal override void InternalStart()
+        {
+            _steps = ESteps.CreateRequest;
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            // 创建下载器
+            if (_steps == ESteps.CreateRequest)
+            {
+                FileUtility.CreateFileDirectory(_tempFilePath);
+                if (File.Exists(_tempFilePath))
+                    File.Delete(_tempFilePath);
+
+                CreateWebRequest();
+                _steps = ESteps.Download;
+            }
+
+            // 检测下载结果
+            if (_steps == ESteps.Download)
+            {
+                DownloadProgress = _webRequest.downloadProgress;
+                DownloadedBytes = (long)_webRequest.downloadedBytes;
+                Progress = DownloadProgress;
+                if (_webRequest.isDone == false)
+                    return;
+
+                // 检查网络错误
+                if (CheckRequestResult())
+                {
+                    _steps = ESteps.VerifyFile;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                }
+
+                // 注意：最终释放请求器
+                DisposeRequest();
+            }
+
+            // 验证下载文件
+            if (_steps == ESteps.VerifyFile)
+            {
+                if (_verifyOperation == null)
+                {
+                    var element = new TempFileElement(_tempFilePath, _bundle.FileCRC, _bundle.FileSize);
+                    _verifyOperation = new VerifyTempFileOperation(element);
+                    _verifyOperation.StartOperation();
+                    AddChildOperation(_verifyOperation);
+                }
+
+                if (IsWaitForAsyncComplete)
+                    _verifyOperation.WaitForAsyncComplete();
+
+                _verifyOperation.UpdateOperation();
+                if (_verifyOperation.IsDone == false)
+                    return;
+
+                if (_verifyOperation.Status == EOperationStatus.Succeed)
+                {
+                    if (_fileSystem.WriteCacheBundleFile(_bundle, _tempFilePath))
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Succeed;
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"{_fileSystem.GetType().FullName} failed to write file ! {_tempFilePath}";
+                    }
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _verifyOperation.Error;
+                }
+
+                // 注意：验证完成后直接删除文件
+                if (File.Exists(_tempFilePath))
+                    File.Delete(_tempFilePath);
+            }
+        }
+        internal override void InternalWaitForAsyncComplete()
+        {
+            if (_steps != ESteps.Done)
+            {
+                YooLogger.Error($"Try load bundle {_bundle.BundleName} from remote : {_requestURL} !");
+            }
+        }
+
+        private void CreateWebRequest()
+        {
+            DownloadHandlerFile handler = new DownloadHandlerFile(_tempFilePath);
+            handler.removeFileOnAbort = true;
+            _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
+            _webRequest.downloadHandler = handler;
+            _webRequest.disposeDownloadHandlerOnDispose = true;
+            _webRequest.SendWebRequest();
+        }
+    }
+}

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

@@ -0,0 +1,156 @@
+using System.IO;
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace YooAsset
+{
+    internal sealed class UnityDownloadResumeFileOperation : UnityDownloadFileOperation
+    {
+        private VerifyTempFileOperation _verifyOperation;
+        private long _fileOriginLength = 0;
+        private ESteps _steps = ESteps.None;
+
+        internal UnityDownloadResumeFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, string url)
+            : base(fileSystem, bundle, url)
+        {
+        }
+        internal override void InternalStart()
+        {
+            _steps = ESteps.CreateRequest;
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            // 创建下载器
+            if (_steps == ESteps.CreateRequest)
+            {
+                FileUtility.CreateFileDirectory(_tempFilePath);
+
+                // 获取下载起始位置
+                _fileOriginLength = 0;
+                long fileBeginLength = -1;
+                if (File.Exists(_tempFilePath))
+                {
+                    FileInfo fileInfo = new FileInfo(_tempFilePath);
+                    if (fileInfo.Length >= _bundle.FileSize)
+                    {
+                        File.Delete(_tempFilePath);
+                    }
+                    else
+                    {
+                        fileBeginLength = fileInfo.Length;
+                        _fileOriginLength = fileBeginLength;
+                        DownloadedBytes = _fileOriginLength;
+                    }
+                }
+
+                CreateWebRequest(fileBeginLength);
+                _steps = ESteps.Download;
+            }
+
+            // 检测下载结果
+            if (_steps == ESteps.Download)
+            {
+                DownloadProgress = _webRequest.downloadProgress;
+                DownloadedBytes = _fileOriginLength + (long)_webRequest.downloadedBytes;
+                Progress = DownloadProgress;
+                if (_webRequest.isDone == false)
+                    return;
+
+                // 检查网络错误
+                if (CheckRequestResult())
+                {
+                    _steps = ESteps.VerifyFile;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                }
+
+                // 在遇到特殊错误的时候删除文件
+                ClearTempFileWhenError();
+
+                // 注意：最终释放请求器
+                DisposeRequest();
+            }
+
+            // 验证下载文件
+            if (_steps == ESteps.VerifyFile)
+            {
+                if (_verifyOperation == null)
+                {
+                    var element = new TempFileElement(_tempFilePath, _bundle.FileCRC, _bundle.FileSize);
+                    _verifyOperation = new VerifyTempFileOperation(element);
+                    _verifyOperation.StartOperation();
+                    AddChildOperation(_verifyOperation);
+                }
+
+                if (IsWaitForAsyncComplete)
+                    _verifyOperation.WaitForAsyncComplete();
+
+                _verifyOperation.UpdateOperation();
+                if (_verifyOperation.IsDone == false)
+                    return;
+
+                if (_verifyOperation.Status == EOperationStatus.Succeed)
+                {
+                    if (_fileSystem.WriteCacheBundleFile(_bundle, _tempFilePath))
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Succeed;
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"{_fileSystem.GetType().FullName} failed to write file !";
+                    }
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _verifyOperation.Error;
+                }
+
+                // 注意：验证完成后直接删除文件
+                if (File.Exists(_tempFilePath))
+                    File.Delete(_tempFilePath);
+            }
+        }
+        internal override void InternalWaitForAsyncComplete()
+        {
+            if (_steps != ESteps.Done)
+            {
+                YooLogger.Error($"Try load bundle {_bundle.BundleName} from remote : {_requestURL} !");
+            }
+        }
+
+        private void ClearTempFileWhenError()
+        {
+            if (_fileSystem.ResumeDownloadResponseCodes == null)
+                return;
+
+            //说明：如果遇到以下错误返回码，验证失败直接删除文件
+            if (_fileSystem.ResumeDownloadResponseCodes.Contains(HttpCode))
+            {
+                if (File.Exists(_tempFilePath))
+                    File.Delete(_tempFilePath);
+            }
+        }
+        private void CreateWebRequest(long fileBeginLength)
+        {
+            var handler = new DownloadHandlerFile(_tempFilePath, true);
+            handler.removeFileOnAbort = false;
+            _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
+            _webRequest.downloadHandler = handler;
+            _webRequest.disposeDownloadHandlerOnDispose = true;
+            if (fileBeginLength > 0)
+                _webRequest.SetRequestHeader("Range", $"bytes={fileBeginLength}-");
+            _webRequest.SendWebRequest();
+        }
+    }
+}

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

@@ -71,10 +71,13 @@ namespace YooAsset
         {
             while (true)
             {
-                //TODO 等待子线程验证文件完毕，该操作会挂起主线程
+                //TODO 等待子线程验证文件完毕，该操作会挂起主线程！
                 InternalUpdate();
                 if (IsDone)
                     break;
+
+                // 短暂休眠避免完全卡死
+                System.Threading.Thread.Sleep(1);
             }
         }
 

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

@@ -75,7 +75,7 @@ namespace YooAsset
             {
                 if (_deserializer == null)
                 {
-                    _deserializer = new DeserializeManifestOperation(_fileData);
+                    _deserializer = new DeserializeManifestOperation(null, _fileData);
                     _deserializer.StartOperation();
                     AddChildOperation(_deserializer);
                 }

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

@@ -3,11 +3,6 @@ namespace YooAsset
 {
     internal class DefaultUnpackFileSystemDefine
     {
-        /// <summary>
-        /// 文件系统的优先级
-        /// </summary>
-        public const int DefaultPriority = 11;
-
         /// <summary>
         /// 保存的资源文件的文件夹名称
         /// </summary>

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

@@ -46,12 +46,17 @@ namespace YooAsset
         /// <summary>
         /// 自定义参数：跨域下载服务接口
         /// </summary>
-        public IRemoteServices RemoteServices { private set; get; } = null;
+        public IRemoteServices RemoteServices { private set; get; }
 
         /// <summary>
         ///  自定义参数：解密方法类
         /// </summary>
         public IWebDecryptionServices DecryptionServices { private set; get; }
+
+        /// <summary>
+        /// 自定义参数：资源清单服务类
+        /// </summary>
+        public IManifestRestoreServices ManifestServices { private set; get; }
         #endregion
 
 
@@ -111,6 +116,10 @@ namespace YooAsset
             {
                 DecryptionServices = (IWebDecryptionServices)value;
             }
+            else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
+            {
+                ManifestServices = (IManifestRestoreServices)value;
+            }
             else
             {
                 YooLogger.Warning($"Invalid parameter : {name}");

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

@@ -6,13 +6,13 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            DownloadAssetBundle,
+            LoadWebAssetBundle,
             Done,
         }
 
         private readonly DefaultWebRemoteFileSystem _fileSystem;
         private readonly PackageBundle _bundle;
-        private DownloadAssetBundleOperation _downloadAssetBundleOp;
+        private LoadWebAssetBundleOperation _loadWebAssetBundleOp;
         private ESteps _steps = ESteps.None;
 
 
@@ -23,50 +23,51 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.DownloadAssetBundle;
+            _steps = ESteps.LoadWebAssetBundle;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.DownloadAssetBundle)
+            if (_steps == ESteps.LoadWebAssetBundle)
             {
-                if (_downloadAssetBundleOp == null)
+                if (_loadWebAssetBundleOp == null)
                 {
-                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue, 60);
+                    string mainURL = _fileSystem.RemoteServices.GetRemoteMainURL(_bundle.FileName);
-                    options.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(_bundle.FileName);
+                    string fallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(_bundle.FileName);
-                    options.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(_bundle.FileName);
+                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue);
+                    options.SetURL(mainURL, fallbackURL);
                     
                     if (_bundle.Encrypted)
                     {
-                        _downloadAssetBundleOp = new DownloadWebEncryptAssetBundleOperation(true, _fileSystem.DecryptionServices, _bundle, options);
+                        _loadWebAssetBundleOp = new LoadWebEncryptAssetBundleOperation(_bundle, options, _fileSystem.DecryptionServices);
-                        _downloadAssetBundleOp.StartOperation();
+                        _loadWebAssetBundleOp.StartOperation();
-                        AddChildOperation(_downloadAssetBundleOp);
+                        AddChildOperation(_loadWebAssetBundleOp);
                     }
                     else
                     {
-                        _downloadAssetBundleOp = new DownloadWebNormalAssetBundleOperation(_fileSystem.DisableUnityWebCache, _bundle, options);
+                        _loadWebAssetBundleOp = new LoadWebNormalAssetBundleOperation(_bundle, options, _fileSystem.DisableUnityWebCache);
-                        _downloadAssetBundleOp.StartOperation();
+                        _loadWebAssetBundleOp.StartOperation();
-                        AddChildOperation(_downloadAssetBundleOp);
+                        AddChildOperation(_loadWebAssetBundleOp);
                     }
                 }
 
-                _downloadAssetBundleOp.UpdateOperation();
+                _loadWebAssetBundleOp.UpdateOperation();
-                DownloadProgress = _downloadAssetBundleOp.DownloadProgress;
+                DownloadProgress = _loadWebAssetBundleOp.DownloadProgress;
-                DownloadedBytes = _downloadAssetBundleOp.DownloadedBytes;
+                DownloadedBytes = _loadWebAssetBundleOp.DownloadedBytes;
-                Progress = _downloadAssetBundleOp.Progress;
+                Progress = _loadWebAssetBundleOp.Progress;
-                if (_downloadAssetBundleOp.IsDone == false)
+                if (_loadWebAssetBundleOp.IsDone == false)
                     return;
 
-                if (_downloadAssetBundleOp.Status == EOperationStatus.Succeed)
+                if (_loadWebAssetBundleOp.Status == EOperationStatus.Succeed)
                 {
-                    var assetBundle = _downloadAssetBundleOp.Result;
+                    var assetBundle = _loadWebAssetBundleOp.Result;
                     if (assetBundle == null)
                     {
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Failed;
-                        Error = $"{nameof(DownloadAssetBundleOperation)} loaded asset bundle is null !";
+                        Error = $"{nameof(DWRFSLoadAssetBundleOperation)} loaded asset bundle is null !";
                     }
                     else
                     {
@@ -79,7 +80,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _downloadAssetBundleOp.Error;
+                    Error = _loadWebAssetBundleOp.Error;
                 }
             }
         }

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

@@ -64,7 +64,7 @@ namespace YooAsset
                 if (_loadWebPackageManifestOp == null)
                 {
                     string packageHash = _requestWebPackageHashOp.PackageHash;
-                    _loadWebPackageManifestOp = new LoadWebRemotePackageManifestOperation(_fileSystem, _packageVersion, packageHash);
+                    _loadWebPackageManifestOp = new LoadWebRemotePackageManifestOperation(_fileSystem, _packageVersion, packageHash, _timeout);
                     _loadWebPackageManifestOp.StartOperation();
                     AddChildOperation(_loadWebPackageManifestOp);
                 }

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

@@ -15,6 +15,7 @@ namespace YooAsset
         private readonly DefaultWebRemoteFileSystem _fileSystem;
         private readonly string _packageVersion;
         private readonly string _packageHash;
+        private readonly int _timeout;
         private UnityWebDataRequestOperation _webDataRequestOp;
         private DeserializeManifestOperation _deserializer;
         private int _requestCount = 0;
@@ -26,11 +27,12 @@ namespace YooAsset
         public PackageManifest Manifest { private set; get; }
 
 
-        internal LoadWebRemotePackageManifestOperation(DefaultWebRemoteFileSystem fileSystem, string packageVersion, string packageHash)
+        internal LoadWebRemotePackageManifestOperation(DefaultWebRemoteFileSystem fileSystem, string packageVersion, string packageHash, int timeout)
         {
             _fileSystem = fileSystem;
             _packageVersion = packageVersion;
             _packageHash = packageHash;
+            _timeout = timeout;
         }
         internal override void InternalStart()
         {
@@ -48,7 +50,7 @@ namespace YooAsset
                 {
                     string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, _packageVersion);
                     string url = GetWebRequestURL(fileName);
-                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
+                    _webDataRequestOp = new UnityWebDataRequestOperation(url, _timeout);
                     _webDataRequestOp.StartOperation();
                     AddChildOperation(_webDataRequestOp);
                 }
@@ -88,7 +90,7 @@ namespace YooAsset
             {
                 if (_deserializer == null)
                 {
-                    _deserializer = new DeserializeManifestOperation(_webDataRequestOp.Result);
+                    _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
                     _deserializer.StartOperation();
                     AddChildOperation(_deserializer);
                 }

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

@@ -61,6 +61,11 @@ namespace YooAsset
         ///  自定义参数：解密方法类
         /// </summary>
         public IWebDecryptionServices DecryptionServices { private set; get; }
+
+        /// <summary>
+        /// 自定义参数：资源清单服务类
+        /// </summary>
+        public IManifestRestoreServices ManifestServices { private set; get; }
         #endregion
 
 
@@ -116,6 +121,10 @@ namespace YooAsset
             {
                 DecryptionServices = (IWebDecryptionServices)value;
             }
+            else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
+            {
+                ManifestServices = (IManifestRestoreServices)value;
+            }
             else
             {
                 YooLogger.Warning($"Invalid parameter : {name}");

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

@@ -32,21 +32,7 @@ namespace YooAsset
             {
                 if (_loadCatalogFileOp == null)
                 {
-#if UNITY_EDITOR
+                    _loadCatalogFileOp = new LoadWebServerCatalogFileOperation(_fileSystem, 60);
-                    // 兼容性初始化
-                    // 说明：内置文件系统在编辑器下运行时需要动态生成
-                    string packageRoot = _fileSystem.FileRoot;
-                    bool result = DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(_fileSystem.PackageName, packageRoot);
-                    if (result == false)
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Create package catalog file failed ! See the detail error in console !";
-                        return;
-                    }
-#endif
-
-                    _loadCatalogFileOp = new LoadWebServerCatalogFileOperation(_fileSystem);
                     _loadCatalogFileOp.StartOperation();
                     AddChildOperation(_loadCatalogFileOp);
                 }

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

@@ -6,13 +6,13 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            DownloadAssetBundle,
+            LoadWebAssetBundle,
             Done,
         }
 
         private readonly DefaultWebServerFileSystem _fileSystem;
         private readonly PackageBundle _bundle;
-        private DownloadAssetBundleOperation _downloadAssetBundleOp;
+        private LoadWebAssetBundleOperation _loadWebAssetBundleOp;
         private ESteps _steps = ESteps.None;
 
 
@@ -23,51 +23,51 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.DownloadAssetBundle;
+            _steps = ESteps.LoadWebAssetBundle;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.DownloadAssetBundle)
+            if (_steps == ESteps.LoadWebAssetBundle)
             {
-                if (_downloadAssetBundleOp == null)
+                if (_loadWebAssetBundleOp == null)
                 {
-                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue, 60);
                     string fileLoadPath = _fileSystem.GetWebFileLoadPath(_bundle);
-                    options.MainURL = DownloadSystemHelper.ConvertToWWWPath(fileLoadPath);
+                    string mainURL = DownloadSystemHelper.ConvertToWWWPath(fileLoadPath);
-                    options.FallbackURL = options.MainURL;
+                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue);
+                    options.SetURL(mainURL, mainURL);
 
                     if (_bundle.Encrypted)
                     {
-                        _downloadAssetBundleOp = new DownloadWebEncryptAssetBundleOperation(true, _fileSystem.DecryptionServices, _bundle, options);
+                        _loadWebAssetBundleOp = new LoadWebEncryptAssetBundleOperation(_bundle, options, _fileSystem.DecryptionServices);
-                        _downloadAssetBundleOp.StartOperation();
+                        _loadWebAssetBundleOp.StartOperation();
-                        AddChildOperation(_downloadAssetBundleOp);
+                        AddChildOperation(_loadWebAssetBundleOp);
                     }
                     else
                     {
-                        _downloadAssetBundleOp = new DownloadWebNormalAssetBundleOperation(_fileSystem.DisableUnityWebCache, _bundle, options);
+                        _loadWebAssetBundleOp = new LoadWebNormalAssetBundleOperation(_bundle, options, _fileSystem.DisableUnityWebCache);
-                        _downloadAssetBundleOp.StartOperation();
+                        _loadWebAssetBundleOp.StartOperation();
-                        AddChildOperation(_downloadAssetBundleOp);
+                        AddChildOperation(_loadWebAssetBundleOp);
                     }
                 }
 
-                _downloadAssetBundleOp.UpdateOperation();
+                _loadWebAssetBundleOp.UpdateOperation();
-                DownloadProgress = _downloadAssetBundleOp.DownloadProgress;
+                DownloadProgress = _loadWebAssetBundleOp.DownloadProgress;
-                DownloadedBytes = _downloadAssetBundleOp.DownloadedBytes;
+                DownloadedBytes = _loadWebAssetBundleOp.DownloadedBytes;
-                Progress = _downloadAssetBundleOp.Progress;
+                Progress = _loadWebAssetBundleOp.Progress;
-                if (_downloadAssetBundleOp.IsDone == false)
+                if (_loadWebAssetBundleOp.IsDone == false)
                     return;
 
-                if (_downloadAssetBundleOp.Status == EOperationStatus.Succeed)
+                if (_loadWebAssetBundleOp.Status == EOperationStatus.Succeed)
                 {
-                    var assetBundle = _downloadAssetBundleOp.Result;
+                    var assetBundle = _loadWebAssetBundleOp.Result;
                     if (assetBundle == null)
                     {
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Failed;
-                        Error = $"{nameof(DownloadAssetBundleOperation)} loaded asset bundle is null !";
+                        Error = $"{nameof(DWSFSLoadAssetBundleOperation)} loaded asset bundle is null !";
                     }
                     else
                     {
@@ -80,7 +80,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _downloadAssetBundleOp.Error;
+                    Error = _loadWebAssetBundleOp.Error;
                 }
             }
         }

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

@@ -64,7 +64,7 @@ namespace YooAsset
                 if (_loadWebPackageManifestOp == null)
                 {
                     string packageHash = _requestWebPackageHashOp.PackageHash;
-                    _loadWebPackageManifestOp = new LoadWebServerPackageManifestOperation(_fileSystem, _packageVersion, packageHash);
+                    _loadWebPackageManifestOp = new LoadWebServerPackageManifestOperation(_fileSystem, _packageVersion, packageHash, _timeout);
                     _loadWebPackageManifestOp.StartOperation();
                     AddChildOperation(_loadWebPackageManifestOp);
                 }

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

@@ -1,7 +1,4 @@
 using System;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
 
 namespace YooAsset
 {
@@ -16,12 +13,14 @@ namespace YooAsset
         }
 
         private readonly DefaultWebServerFileSystem _fileSystem;
+        private readonly int _timeout;
         private UnityWebDataRequestOperation _webDataRequestOp;
         private ESteps _steps = ESteps.None;
 
-        internal LoadWebServerCatalogFileOperation(DefaultWebServerFileSystem fileSystem)
+        internal LoadWebServerCatalogFileOperation(DefaultWebServerFileSystem fileSystem, int timeout)
         {
             _fileSystem = fileSystem;
+            _timeout = timeout;
         }
         internal override void InternalStart()
         {
@@ -38,7 +37,7 @@ namespace YooAsset
                 {
                     string filePath = _fileSystem.GetCatalogBinaryFileLoadPath();
                     string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
-                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
+                    _webDataRequestOp = new UnityWebDataRequestOperation(url, _timeout);
                     _webDataRequestOp.StartOperation();
                     AddChildOperation(_webDataRequestOp);
                 }

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

@@ -15,6 +15,7 @@ namespace YooAsset
         private readonly DefaultWebServerFileSystem _fileSystem;
         private readonly string _packageVersion;
         private readonly string _packageHash;
+        private readonly int _timeout;
         private UnityWebDataRequestOperation _webDataRequestOp;
         private DeserializeManifestOperation _deserializer;
         private ESteps _steps = ESteps.None;
@@ -25,11 +26,12 @@ namespace YooAsset
         public PackageManifest Manifest { private set; get; }
 
 
-        internal LoadWebServerPackageManifestOperation(DefaultWebServerFileSystem fileSystem, string packageVersion, string packageHash)
+        internal LoadWebServerPackageManifestOperation(DefaultWebServerFileSystem fileSystem, string packageVersion, string packageHash, int timeout)
         {
             _fileSystem = fileSystem;
             _packageVersion = packageVersion;
             _packageHash = packageHash;
+            _timeout = timeout;
         }
         internal override void InternalStart()
         {
@@ -46,7 +48,7 @@ namespace YooAsset
                 {
                     string filePath = _fileSystem.GetWebPackageManifestFilePath(_packageVersion);
                     string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
-                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
+                    _webDataRequestOp = new UnityWebDataRequestOperation(url, _timeout);
                     _webDataRequestOp.StartOperation();
                     AddChildOperation(_webDataRequestOp);
                 }
@@ -85,7 +87,7 @@ namespace YooAsset
             {
                 if (_deserializer == null)
                 {
-                    _deserializer = new DeserializeManifestOperation(_webDataRequestOp.Result);
+                    _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
                     _deserializer.StartOperation();
                     AddChildOperation(_deserializer);
                 }

Assets/YooAsset/Runtime/FileSystem/FileSystemParametersDefine.cs

@@ -7,9 +7,11 @@ namespace YooAsset
         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 MANIFEST_SERVICES = "MANIFEST_SERVICES";
         public const string APPEND_FILE_EXTENSION = "APPEND_FILE_EXTENSION";
         public const string DISABLE_CATALOG_FILE = "DISABLE_CATALOG_FILE";
         public const string DISABLE_UNITY_WEB_CACHE = "DISABLE_UNITY_WEB_CACHE";
+        public const string DISABLE_ONDEMAND_DOWNLOAD = "DISABLE_ONDEMAND_DOWNLOAD";
         public const string DOWNLOAD_MAX_CONCURRENCY = "DOWNLOAD_MAX_CONCURRENCY";
         public const string DOWNLOAD_MAX_REQUEST_PER_FRAME = "DOWNLOAD_MAX_REQUEST_PER_FRAME";
         public const string RESUME_DOWNLOAD_MINMUM_SIZE = "RESUME_DOWNLOAD_MINMUM_SIZE";
@@ -18,5 +20,6 @@ namespace YooAsset
         public const string ASYNC_SIMULATE_MAX_FRAME = "ASYNC_SIMULATE_MAX_FRAME";
         public const string COPY_BUILDIN_PACKAGE_MANIFEST = "COPY_BUILDIN_PACKAGE_MANIFEST";
         public const string COPY_BUILDIN_PACKAGE_MANIFEST_DEST_ROOT = "COPY_BUILDIN_PACKAGE_MANIFEST_DEST_ROOT";
+        public const string COPY_LOCAL_FILE_SERVICES = "COPY_LOCAL_FILE_SERVICES";
     }
 }

Assets/YooAsset/Runtime/FileSystem/Operation/FSDownloadFileOperation.cs

@@ -8,30 +8,44 @@ namespace YooAsset
         /// </summary>
         public readonly int FailedTryAgain;
 
-        /// <summary>
-        /// 超时时间
-        /// </summary>
-        public readonly int Timeout;
-
         /// <summary>
         /// 主资源地址
         /// </summary>
-        public string MainURL { set; get; }
+        public string MainURL { private set; get; }
 
         /// <summary>
         /// 备用资源地址
         /// </summary>
-        public string FallbackURL { set; get; }
+        public string FallbackURL { private set; get; }
 
         /// <summary>
-        /// 导入的本地文件路径
+        /// 拷贝的本地文件路径
         /// </summary>
         public string ImportFilePath { set; get; }
 
-        public DownloadFileOptions(int failedTryAgain, int timeout)
+        public DownloadFileOptions(int failedTryAgain)
         {
             FailedTryAgain = failedTryAgain;
-            Timeout = timeout;
+        }
+
+        /// <summary>
+        /// 设置下载地址
+        /// </summary>
+        public void SetURL(string mainURL, string fallbackURL)
+        {
+            MainURL = mainURL;
+            FallbackURL = fallbackURL;
+        }
+
+        /// <summary>
+        /// 是否有效
+        /// </summary>
+        public bool IsValid()
+        {
+            if (string.IsNullOrEmpty(MainURL) || string.IsNullOrEmpty(FallbackURL))
+                return false;
+
+            return true;
         }
     }
 
@@ -39,16 +53,6 @@ namespace YooAsset
     {
         public PackageBundle Bundle { private set; get; }
 
-        /// <summary>
-        /// 引用计数
-        /// </summary>
-        public int RefCount { private set; get; }
-
-        /// <summary>
-        /// HTTP返回码
-        /// </summary>
-        public long HttpCode { protected set; get; }
-
         /// <summary>
         /// 当前下载的字节数
         /// </summary>
@@ -63,31 +67,8 @@ namespace YooAsset
         public FSDownloadFileOperation(PackageBundle bundle)
         {
             Bundle = bundle;
-            RefCount = 0;
-            HttpCode = 0;
             DownloadedBytes = 0;
             DownloadProgress = 0;
         }
-
-        internal override string InternalGetDesc()
-        {
-            return $"RefCount : {RefCount}";
-        }
-
-        /// <summary>
-        /// 减少引用计数
-        /// </summary>
-        public virtual void Release()
-        {
-            RefCount--;
-        }
-
-        /// <summary>
-        /// 增加引用计数
-        /// </summary>
-        public virtual void Reference()
-        {
-            RefCount++;
-        }
     }
 }

Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DefaultDownloadFileOperation.cs

@@ -1,130 +0,0 @@
-using UnityEngine;
-using UnityEngine.Networking;
-
-namespace YooAsset
-{
-    internal abstract class DefaultDownloadFileOperation : FSDownloadFileOperation
-    {
-        protected enum ESteps
-        {
-            None,
-            CheckExists,
-            CreateRequest,
-            CheckRequest,
-            VerifyTempFile,
-            CheckVerifyTempFile,
-            TryAgain,
-            Done,
-        }
-
-        // 下载参数
-        protected readonly DownloadFileOptions Options;
-
-        // 请求相关
-        protected UnityWebRequest _webRequest;
-        protected string _requestURL;
-        protected int _requestCount = 0;
-
-        // 超时相关
-        protected bool _isAbort = false;
-        protected long _latestDownloadBytes;
-        protected float _latestDownloadRealtime;
-        protected float _tryAgainTimer;
-
-        // 失败相关
-        protected int FailedTryAgain;
-
-
-        internal DefaultDownloadFileOperation(PackageBundle bundle, DownloadFileOptions options) : base(bundle)
-        {
-            Options = options;
-            FailedTryAgain = options.FailedTryAgain;
-        }
-
-        /// <summary>
-        /// 获取网络请求地址
-        /// </summary>
-        protected string GetRequestURL()
-        {
-            // 轮流返回请求地址
-            _requestCount++;
-            if (_requestCount % 2 == 0)
-                return Options.FallbackURL;
-            else
-                return Options.MainURL;
-        }
-
-        /// <summary>
-        /// 重置请求字段
-        /// </summary>
-        protected void ResetRequestFiled()
-        {
-            // 重置变量
-            _isAbort = false;
-            _latestDownloadBytes = 0;
-            _latestDownloadRealtime = Time.realtimeSinceStartup;
-            DownloadProgress = 0f;
-            DownloadedBytes = 0;
-
-            // 重置计时器
-            if (_tryAgainTimer > 0f)
-                YooLogger.Warning($"Try again download : {_requestURL}");
-            _tryAgainTimer = 0f;
-        }
-
-        /// <summary>
-        /// 检测请求超时
-        /// </summary>
-        protected void CheckRequestTimeout()
-        {
-            // 注意：在连续时间段内无新增下载数据及判定为超时
-            if (_isAbort == false)
-            {
-                if (_latestDownloadBytes != DownloadedBytes)
-                {
-                    _latestDownloadBytes = DownloadedBytes;
-                    _latestDownloadRealtime = UnityEngine.Time.realtimeSinceStartup;
-                }
-
-                float offset = UnityEngine.Time.realtimeSinceStartup - _latestDownloadRealtime;
-                if (offset > Options.Timeout)
-                {
-                    YooLogger.Warning($"Download request timeout : {_requestURL}");
-                    if (_webRequest != null)
-                        _webRequest.Abort();
-                    _isAbort = true;
-                }
-            }
-        }
-
-        /// <summary>
-        /// 检测请求结果
-        /// </summary>
-        protected bool CheckRequestResult()
-        {
-            HttpCode = _webRequest.responseCode;
-
-#if UNITY_2020_3_OR_NEWER
-            if (_webRequest.result != UnityWebRequest.Result.Success)
-            {
-                Error = _webRequest.error;
-                return false;
-            }
-            else
-            {
-                return true;
-            }
-#else
-            if (_webRequest.isNetworkError || _webRequest.isHttpError)
-            {
-                Error = _webRequest.error;
-                return false;
-            }
-            else
-            {
-                return true;
-            }
-#endif
-        }
-    }
-}

Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadAssetBundleOperation.cs

@@ -1,13 +0,0 @@
-using UnityEngine;
-
-namespace YooAsset
-{
-    internal abstract class DownloadAssetBundleOperation : DefaultDownloadFileOperation
-    {
-        internal DownloadAssetBundleOperation(PackageBundle bundle, DownloadFileOptions options) : base(bundle, options)
-        {
-        }
-
-        public AssetBundle Result;
-    }
-}

Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadFileWrapper.cs

@@ -1,71 +0,0 @@
-
-namespace YooAsset
-{
-    internal class DownloadFileWrapper : FSDownloadFileOperation
-    {
-        private enum ESteps
-        {
-            None,
-            Download,
-            Done,
-        }
-
-        private readonly FSDownloadFileOperation _downloadFileOp;
-        private ESteps _steps = ESteps.None;
-
-        internal DownloadFileWrapper(FSDownloadFileOperation downloadFileOp) : base(downloadFileOp.Bundle)
-        {
-            _downloadFileOp = downloadFileOp;
-        }
-        internal override void InternalStart()
-        {
-            _steps = ESteps.Download;
-        }
-        internal override void InternalUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.Download)
-            {
-                if (IsWaitForAsyncComplete)
-                    _downloadFileOp.WaitForAsyncComplete();
-
-                if (_downloadFileOp.Status == EOperationStatus.None)
-                    return;
-
-                _downloadFileOp.UpdateOperation();
-                Progress = _downloadFileOp.Progress;
-                DownloadedBytes = _downloadFileOp.DownloadedBytes;
-                DownloadProgress = _downloadFileOp.DownloadProgress;
-                if (_downloadFileOp.IsDone == false)
-                    return;
-
-                _steps = ESteps.Done;
-                Status = _downloadFileOp.Status;
-                Error = _downloadFileOp.Error;
-                HttpCode = _downloadFileOp.HttpCode;
-            }
-        }
-        internal override void InternalWaitForAsyncComplete()
-        {
-            while (true)
-            {
-                if (ExecuteWhileDone())
-                {
-                    _steps = ESteps.Done;
-                    break;
-                }
-            }
-        }
-
-        public override void Release()
-        {
-            _downloadFileOp.Release();
-        }
-        public override void Reference()
-        {
-            _downloadFileOp.Reference();
-        }
-    }
-}

Assets/YooAsset/Runtime/FileSystem/Operation/Internal/DownloadWebEncryptAssetBundleOperation.cs

@@ -1,157 +0,0 @@
-using UnityEngine;
-using UnityEngine.Networking;
-
-namespace YooAsset
-{
-    internal class DownloadWebEncryptAssetBundleOperation : DownloadAssetBundleOperation
-    {
-        private readonly bool _checkTimeout;
-        private readonly IWebDecryptionServices _decryptionServices;
-        private DownloadHandlerBuffer _downloadhandler;
-        private ESteps _steps = ESteps.None;
-
-        internal DownloadWebEncryptAssetBundleOperation(bool checkTimeout, IWebDecryptionServices decryptionServices, PackageBundle bundle, DownloadFileOptions options) : base(bundle, options)
-        {
-            _checkTimeout = checkTimeout;
-            _decryptionServices = decryptionServices;
-        }
-        internal override void InternalStart()
-        {
-            _steps = ESteps.CreateRequest;
-        }
-        internal override void InternalUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            // 创建下载器
-            if (_steps == ESteps.CreateRequest)
-            {
-                // 获取请求地址
-                _requestURL = GetRequestURL();
-
-                // 重置变量
-                ResetRequestFiled();
-
-                // 创建下载器
-                CreateWebRequest();
-
-                _steps = ESteps.CheckRequest;
-            }
-
-            // 检测下载结果
-            if (_steps == ESteps.CheckRequest)
-            {
-                DownloadProgress = _webRequest.downloadProgress;
-                DownloadedBytes = (long)_webRequest.downloadedBytes;
-                Progress = DownloadProgress;
-                if (_webRequest.isDone == false)
-                {
-                    if (_checkTimeout)
-                        CheckRequestTimeout();
-                    return;
-                }
-
-                // 检查网络错误
-                if (CheckRequestResult())
-                {
-                    if (_decryptionServices == null)
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"The {nameof(IWebDecryptionServices)} is null !";
-                        YooLogger.Error(Error);
-                        return;
-                    }
-
-                    var fileData = _downloadhandler.data;
-                    if (fileData == null || fileData.Length == 0)
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"The download handler data is null or empty !";
-                        YooLogger.Error(Error);
-                        return;
-                    }
-
-                    AssetBundle assetBundle = LoadEncryptedAssetBundle(fileData);
-                    if (assetBundle == null)
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = "Download handler asset bundle object is null !";
-                    }
-                    else
-                    {
-                        _steps = ESteps.Done;
-                        Result = assetBundle;
-                        Status = EOperationStatus.Succeed;
-                    }
-                }
-                else
-                {
-                    _steps = ESteps.TryAgain;
-                }
-
-                // 注意：最终释放请求器
-                DisposeWebRequest();
-            }
-
-            // 重新尝试下载
-            if (_steps == ESteps.TryAgain)
-            {
-                if (FailedTryAgain <= 0)
-                {
-                    Status = EOperationStatus.Failed;
-                    _steps = ESteps.Done;
-                    YooLogger.Error(Error);
-                    return;
-                }
-
-                _tryAgainTimer += Time.unscaledDeltaTime;
-                if (_tryAgainTimer > 1f)
-                {
-                    FailedTryAgain--;
-                    _steps = ESteps.CreateRequest;
-                    YooLogger.Warning(Error);
-                }
-            }
-        }
-        internal override void InternalAbort()
-        {
-            _steps = ESteps.Done;
-            DisposeWebRequest();
-        }
-
-        private void CreateWebRequest()
-        {
-            _downloadhandler = new DownloadHandlerBuffer();
-            _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
-            _webRequest.downloadHandler = _downloadhandler;
-            _webRequest.disposeDownloadHandlerOnDispose = true;
-            _webRequest.SendWebRequest();
-        }
-        private void DisposeWebRequest()
-        {
-            if (_webRequest != null)
-            {
-                //注意：引擎底层会自动调用Abort方法
-                _webRequest.Dispose();
-                _webRequest = null;
-            }
-        }
-
-        /// <summary>
-        /// 加载加密资源文件
-        /// </summary>
-        private AssetBundle LoadEncryptedAssetBundle(byte[] fileData)
-        {
-            var fileInfo = new WebDecryptFileInfo();
-            fileInfo.BundleName = Bundle.BundleName;
-            fileInfo.FileLoadCRC = Bundle.UnityCRC;
-            fileInfo.FileData = fileData;
-            var decryptResult = _decryptionServices.LoadAssetBundle(fileInfo);
-            return decryptResult.Result;
-        }
-    }
-}

Assets/YooAsset/Runtime/FileSystem/Operation/Internal/LoadWebAssetBundleOperation.cs

@@ -0,0 +1,22 @@
+using UnityEngine;
+
+namespace YooAsset
+{
+    internal abstract class LoadWebAssetBundleOperation : AsyncOperationBase
+    {
+        /// <summary>
+        /// AssetBundle对象
+        /// </summary>
+        public AssetBundle Result;
+
+        /// <summary>
+        /// 下载进度
+        /// </summary>
+        public float DownloadProgress { protected set; get; } = 0;
+
+        /// <summary>
+        /// 下载大小
+        /// </summary>
+        public long DownloadedBytes { protected set; get; } = 0;
+    }
+}

Assets/YooAsset/Runtime/FileSystem/Operation/Internal/LoadWebEncryptAssetBundleOperation.cs

@@ -0,0 +1,146 @@
+using UnityEngine;
+
+namespace YooAsset
+{
+    internal class LoadWebEncryptAssetBundleOperation : LoadWebAssetBundleOperation
+    {
+        protected enum ESteps
+        {
+            None,
+            CreateRequest,
+            CheckRequest,
+            TryAgain,
+            Done,
+        }
+
+        private readonly PackageBundle _bundle;
+        private readonly DownloadFileOptions _options;
+        private readonly IWebDecryptionServices _decryptionServices;
+        private UnityWebDataRequestOperation _unityWebDataRequestOp;
+
+        protected int _requestCount = 0;
+        protected float _tryAgainTimer;
+        protected int _failedTryAgain;
+        private ESteps _steps = ESteps.None;
+
+        internal LoadWebEncryptAssetBundleOperation(PackageBundle bundle, DownloadFileOptions options, IWebDecryptionServices decryptionServices)
+        {
+            _bundle = bundle;
+            _options = options;
+            _decryptionServices = decryptionServices;
+        }
+        internal override void InternalStart()
+        {
+            _steps = ESteps.CreateRequest;
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            // 创建下载器
+            if (_steps == ESteps.CreateRequest)
+            {
+                if (_decryptionServices == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"The {nameof(IWebDecryptionServices)} is null !";
+                    YooLogger.Error(Error);
+                    return;
+                }
+
+                string url = GetRequestURL();
+                _unityWebDataRequestOp = new UnityWebDataRequestOperation(url, 0);
+                _unityWebDataRequestOp.StartOperation();
+                AddChildOperation(_unityWebDataRequestOp);
+                _steps = ESteps.CheckRequest;
+            }
+
+            // 检测下载结果
+            if (_steps == ESteps.CheckRequest)
+            {
+                _unityWebDataRequestOp.UpdateOperation();
+                Progress = _unityWebDataRequestOp.Progress;
+                DownloadProgress = _unityWebDataRequestOp.DownloadProgress;
+                DownloadedBytes = _unityWebDataRequestOp.DownloadedBytes;
+                if (_unityWebDataRequestOp.IsDone == false)
+                    return;
+
+                // 检查网络错误
+                if (_unityWebDataRequestOp.Status == EOperationStatus.Succeed)
+                {
+                    AssetBundle assetBundle = LoadEncryptedAssetBundle(_unityWebDataRequestOp.Result);
+                    if (assetBundle == null)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = "Failed load encrypted AssetBundle !";
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Succeed;
+                        Result = assetBundle;
+                    }
+                }
+                else
+                {
+                    if (_failedTryAgain > 0)
+                    {
+                        _steps = ESteps.TryAgain;
+                        YooLogger.Warning($"Failed download : {_unityWebDataRequestOp.URL} Try again !");
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = _unityWebDataRequestOp.Error;
+                        YooLogger.Error(Error);
+                    }
+                }
+            }
+
+            // 重新尝试下载
+            if (_steps == ESteps.TryAgain)
+            {
+                _tryAgainTimer += Time.unscaledDeltaTime;
+                if (_tryAgainTimer > 1f)
+                {
+                    _tryAgainTimer = 0f;
+                    _failedTryAgain--;
+                    Progress = 0f;
+                    DownloadProgress = 0f;
+                    DownloadedBytes = 0;
+                    _steps = ESteps.CreateRequest;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 加载加密资源文件
+        /// </summary>
+        private AssetBundle LoadEncryptedAssetBundle(byte[] fileData)
+        {
+            var fileInfo = new WebDecryptFileInfo();
+            fileInfo.BundleName = _bundle.BundleName;
+            fileInfo.FileLoadCRC = _bundle.UnityCRC;
+            fileInfo.FileData = fileData;
+            var decryptResult = _decryptionServices.LoadAssetBundle(fileInfo);
+            return decryptResult.Result;
+        }
+
+        /// <summary>
+        /// 获取网络请求地址
+        /// </summary>
+        protected string GetRequestURL()
+        {
+            // 轮流返回请求地址
+            _requestCount++;
+            if (_requestCount % 2 == 0)
+                return _options.FallbackURL;
+            else
+                return _options.MainURL;
+        }
+    }
+}

Assets/YooAsset/Runtime/FileSystem/Operation/Internal/LoadWebNormalAssetBundleOperation.cs

@@ -0,0 +1,114 @@
+using UnityEngine;
+
+namespace YooAsset
+{
+    internal class LoadWebNormalAssetBundleOperation : LoadWebAssetBundleOperation
+    {
+        protected enum ESteps
+        {
+            None,
+            CreateRequest,
+            CheckRequest,
+            TryAgain,
+            Done,
+        }
+
+        private readonly PackageBundle _bundle;
+        private readonly DownloadFileOptions _options;
+        private readonly bool _disableUnityWebCache;
+        private UnityAssetBundleRequestOperation _unityAssetBundleRequestOp;
+
+        protected int _requestCount = 0;
+        protected float _tryAgainTimer;
+        protected int _failedTryAgain;
+        private ESteps _steps = ESteps.None;
+
+
+        internal LoadWebNormalAssetBundleOperation(PackageBundle bundle, DownloadFileOptions options, bool disableUnityWebCache)
+        {
+            _bundle = bundle;
+            _options = options;
+            _disableUnityWebCache = disableUnityWebCache;
+        }
+        internal override void InternalStart()
+        {
+            _steps = ESteps.CreateRequest;
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            // 创建下载器
+            if (_steps == ESteps.CreateRequest)
+            {
+                string url = GetRequestURL();
+                _unityAssetBundleRequestOp = new UnityAssetBundleRequestOperation(_bundle, _disableUnityWebCache, url);
+                _unityAssetBundleRequestOp.StartOperation();
+                AddChildOperation(_unityAssetBundleRequestOp);
+                _steps = ESteps.CheckRequest;
+            }
+
+            // 检测下载结果
+            if (_steps == ESteps.CheckRequest)
+            {
+                _unityAssetBundleRequestOp.UpdateOperation();
+                Progress = _unityAssetBundleRequestOp.Progress;
+                DownloadedBytes = _unityAssetBundleRequestOp.DownloadedBytes;
+                DownloadProgress = _unityAssetBundleRequestOp.DownloadProgress;
+                if (_unityAssetBundleRequestOp.IsDone == false)
+                    return;
+
+                if (_unityAssetBundleRequestOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                    Result = _unityAssetBundleRequestOp.Result;
+                }
+                else
+                {
+                    if (_failedTryAgain > 0)
+                    {
+                        _steps = ESteps.TryAgain;
+                        YooLogger.Warning($"Failed download : {_unityAssetBundleRequestOp.URL} Try again !");
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = _unityAssetBundleRequestOp.Error;
+                        YooLogger.Error(Error);
+                    }
+                }
+            }
+
+            // 重新尝试下载
+            if (_steps == ESteps.TryAgain)
+            {
+                _tryAgainTimer += Time.unscaledDeltaTime;
+                if (_tryAgainTimer > 1f)
+                {
+                    _tryAgainTimer = 0f;
+                    _failedTryAgain--;
+                    Progress = 0f;
+                    DownloadProgress = 0f;
+                    DownloadedBytes = 0;
+                    _steps = ESteps.CreateRequest;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取网络请求地址
+        /// </summary>
+        protected string GetRequestURL()
+        {
+            // 轮流返回请求地址
+            _requestCount++;
+            if (_requestCount % 2 == 0)
+                return _options.FallbackURL;
+            else
+                return _options.MainURL;
+        }
+    }
+}

Assets/YooAsset/Runtime/InitializeParameters.cs

@@ -42,6 +42,11 @@ namespace YooAsset
         /// 同时加载Bundle文件的最大并发数
         /// </summary>
         public int BundleLoadingMaxConcurrency = int.MaxValue;
+
+        /// <summary>
+        /// WebGL平台强制同步加载资源对象
+        /// </summary>
+        public bool WebGLForceSyncLoadAsset = false;
     }
 
     /// <summary>

Assets/YooAsset/Runtime/OperationSystem/AsyncOperationBase.cs

@@ -260,8 +260,11 @@ namespace YooAsset
                 StartOperation();
             }
 
-            IsWaitForAsyncComplete = true;
+            if (IsWaitForAsyncComplete == false)
-            InternalWaitForAsyncComplete();
+            {
+                IsWaitForAsyncComplete = true;
+                InternalWaitForAsyncComplete();
+            }
         }
 
         #region 调试信息

Assets/YooAsset/Runtime/PackageInvokeBuilder/PackageInvokeBuilder.cs

@@ -3,7 +3,7 @@ using System.Reflection;
 
 namespace YooAsset
 {
-    public static class PakcageInvokeBuilder
+    public static class PackageInvokeBuilder
     {
         /// <summary>
         /// 调用Editro类来执行构建资源包任务
@@ -32,7 +32,7 @@ namespace YooAsset
 #else
 namespace YooAsset
 { 
-    public static class PakcageInvokeBuilder
+    public static class PackageInvokeBuilder
     {
         public static PackageInvokeBuildResult InvokeBuilder(PackageInvokeBuildParam buildParam)
         {