Merge 1c4aba6db5 into e57466e9e2

Assets/YooAsset/CHANGELOG.md

@@ -2,119 +2,6 @@
 
 All notable changes to this package will be documented in this file.
 
-## [2.3.14] - 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

@@ -79,27 +79,15 @@ namespace YooAsset.Editor
             EditorPrefs.SetString(key, encyptionClassName);
         }
 
-        // ManifestProcessServicesClassName
-        public static string GetPackageManifestProcessServicesClassName(string packageName, string buildPipeline)
+        // ManifestServicesClassName
+        public static string GetPackageManifestServicesClassName(string packageName, string buildPipeline)
         {
-            string key = $"{Application.productName}_{packageName}_{buildPipeline}_ManifestProcessServicesClassName";
-            return EditorPrefs.GetString(key, $"{typeof(ManifestProcessNone).FullName}");
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_ManifestServicesClassName";
+            return EditorPrefs.GetString(key, $"{typeof(ManifestNone).FullName}");
         }
-        public static void SetPackageManifestProcessServicesClassName(string packageName, string buildPipeline, string encyptionClassName)
+        public static void SetPackageManifestServicesClassName(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";
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_ManifestServicesClassName";
             EditorPrefs.SetString(key, encyptionClassName);
         }
 

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

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

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

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

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

@@ -72,7 +72,7 @@ namespace YooAsset.Editor
             {
                 string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
                 packagePath = $"{packageOutputDirectory}/{fileName}";
-                ManifestTools.SerializeToBinary(packagePath, manifest, buildParameters.ManifestProcessServices);
+                ManifestTools.SerializeToBinary(packagePath, manifest, buildParameters.ManifestServices);
                 packageHash = HashUtility.FileCRC32(packagePath);
                 BuildLogger.Log($"Create package manifest file: {packagePath}");
             }
@@ -97,7 +97,7 @@ namespace YooAsset.Editor
             {
                 ManifestContext manifestContext = new ManifestContext();
                 byte[] bytesData = FileUtility.ReadAllBytes(packagePath);
-                manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData, buildParameters.ManifestRestoreServices);
+                manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData, buildParameters.ManifestServices);
                 context.SetContextObject(manifestContext);
             }
         }

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

@@ -44,9 +44,7 @@ namespace YooAsset.Editor
                 buildReport.Summary.SingleReferencedPackAlone = buildParameters.SingleReferencedPackAlone;
                 buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
                 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;
-
+                buildReport.Summary.ManifestServicesClassName = buildParameters.ManifestServices == null ? "null" : buildParameters.ManifestServices.GetType().FullName;
                 if (buildParameters is BuiltinBuildParameters)
                 {
                     var builtinBuildParameters = buildParameters as BuiltinBuildParameters;

Assets/YooAsset/Editor/AssetBundleBuilder/DefaultManifestServices.cs

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

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

@@ -44,7 +44,7 @@ namespace YooAsset.Editor
         }
 
         /// <summary>
-        /// 创建资源包加密服务类实例
+        /// 创建资源加密服务类实例
         /// </summary>
         protected IEncryptionServices CreateEncryptionServicesInstance()
         {
@@ -58,29 +58,15 @@ namespace YooAsset.Editor
         }
 
         /// <summary>
-        /// 创建资源清单加密服务类实例
+        /// 创建资源清单服务类实例
         /// </summary>
-        protected IManifestProcessServices CreateManifestProcessServicesInstance()
+        protected IManifestServices CreateManifestServicesInstance()
         {
-            var className = AssetBundleBuilderSetting.GetPackageManifestProcessServicesClassName(PackageName, PipelineName);
-            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestProcessServices));
+            var className = AssetBundleBuilderSetting.GetPackageManifestServicesClassName(PackageName, PipelineName);
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestServices));
             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);
+                return (IManifestServices)Activator.CreateInstance(classType);
             else
                 return null;
         }
@@ -183,7 +169,7 @@ namespace YooAsset.Editor
         }
         protected PopupField<Type> CreateEncryptionServicesField(VisualElement container)
         {
-            // 资源包加密服务类
+            // 加密服务类
             var classTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
             if (classTypes.Count > 0)
             {
@@ -212,22 +198,22 @@ namespace YooAsset.Editor
                 return popupField;
             }
         }
-        protected PopupField<Type> CreateManifestProcessServicesField(VisualElement container)
+        protected PopupField<Type> CreateManifestServicesField(VisualElement container)
         {
-            // 资源清单加密服务类
-            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestProcessServices));
+            // 清单服务类
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestServices));
             if (classTypes.Count > 0)
             {
-                var className = AssetBundleBuilderSetting.GetPackageManifestProcessServicesClassName(PackageName, PipelineName);
+                var className = AssetBundleBuilderSetting.GetPackageManifestServicesClassName(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.label = "Manifest Services";
                 popupField.style.width = StyleWidth;
                 popupField.RegisterValueChangedCallback(evt =>
                 {
-                    AssetBundleBuilderSetting.SetPackageManifestProcessServicesClassName(PackageName, PipelineName, popupField.value.FullName);
+                    AssetBundleBuilderSetting.SetPackageManifestServicesClassName(PackageName, PipelineName, popupField.value.FullName);
                 });
                 container.Add(popupField);
                 UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
@@ -236,38 +222,7 @@ namespace YooAsset.Editor
             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.label = "Manifest Services";
                 popupField.style.width = StyleWidth;
                 container.Add(popupField);
                 UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);

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

@@ -17,8 +17,7 @@ namespace YooAsset.Editor
         protected TextField _buildOutputField;
         protected TextField _buildVersionField;
         protected PopupField<Type> _encryptionServicesField;
-        protected PopupField<Type> _manifestProcessServicesField;
-        protected PopupField<Type> _manifestRestoreServicesField;
+        protected PopupField<Type> _manifestServicesField;
         protected EnumField _compressionField;
         protected EnumField _outputNameStyleField;
         protected EnumField _copyBuildinFileOptionField;
@@ -48,8 +47,7 @@ namespace YooAsset.Editor
             // 服务类
             var popupContainer = Root.Q("PopupContainer");
             _encryptionServicesField = CreateEncryptionServicesField(popupContainer);
-            _manifestProcessServicesField = CreateManifestProcessServicesField(popupContainer);
-            _manifestRestoreServicesField = CreateManifestRestoreServicesField(popupContainer);
+            _manifestServicesField = CreateManifestServicesField(popupContainer);
 
             // 压缩方式选项
             _compressionField = Root.Q<EnumField>("Compression");
@@ -122,8 +120,7 @@ namespace YooAsset.Editor
             buildParameters.ClearBuildCacheFiles = clearBuildCache;
             buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
             buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
-            buildParameters.ManifestProcessServices = CreateManifestProcessServicesInstance();
-            buildParameters.ManifestRestoreServices = CreateManifestRestoreServicesInstance();
+            buildParameters.ManifestServices = CreateManifestServicesInstance();
 
             BuiltinBuildPipeline pipeline = new BuiltinBuildPipeline();
             var buildResult = pipeline.Run(buildParameters, true);

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

@@ -17,8 +17,7 @@ namespace YooAsset.Editor
         protected TextField _buildOutputField;
         protected TextField _buildVersionField;
         protected PopupField<Type> _encryptionServicesField;
-        protected PopupField<Type> _manifestProcessServicesField;
-        protected PopupField<Type> _manifestRestoreServicesField;
+        protected PopupField<Type> _manifestServicesField;
         protected EnumField _outputNameStyleField;
         protected EnumField _copyBuildinFileOptionField;
         protected TextField _copyBuildinFileTagsField;
@@ -47,8 +46,7 @@ namespace YooAsset.Editor
             // 加密方法
             var popupContainer = Root.Q("PopupContainer");
             _encryptionServicesField = CreateEncryptionServicesField(popupContainer);
-            _manifestProcessServicesField = CreateManifestProcessServicesField(popupContainer);
-            _manifestRestoreServicesField = CreateManifestRestoreServicesField(popupContainer);
+            _manifestServicesField = CreateManifestServicesField(popupContainer);
 
             // 输出文件名称样式
             _outputNameStyleField = Root.Q<EnumField>("FileNameStyle");
@@ -114,8 +112,7 @@ namespace YooAsset.Editor
             buildParameters.ClearBuildCacheFiles = clearBuildCache;
             buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
             buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
-            buildParameters.ManifestProcessServices = CreateManifestProcessServicesInstance();
-            buildParameters.ManifestRestoreServices = CreateManifestRestoreServicesInstance();
+            buildParameters.ManifestServices = CreateManifestServicesInstance();
 
             RawFileBuildPipeline pipeline = new RawFileBuildPipeline();
             var buildResult = pipeline.Run(buildParameters, true);

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

@@ -17,8 +17,7 @@ namespace YooAsset.Editor
         protected TextField _buildOutputField;
         protected TextField _buildVersionField;
         protected PopupField<Type> _encryptionServicesField;
-        protected PopupField<Type> _manifestProcessServicesField;
-        protected PopupField<Type> _manifestRestoreServicesField;
+        protected PopupField<Type> _manifestServicesField;
         protected EnumField _compressionField;
         protected EnumField _outputNameStyleField;
         protected EnumField _copyBuildinFileOptionField;
@@ -48,8 +47,7 @@ namespace YooAsset.Editor
             // 加密方法
             var popupContainer = Root.Q("PopupContainer");
             _encryptionServicesField = CreateEncryptionServicesField(popupContainer);
-            _manifestProcessServicesField = CreateManifestProcessServicesField(popupContainer);
-            _manifestRestoreServicesField = CreateManifestRestoreServicesField(popupContainer);
+            _manifestServicesField = CreateManifestServicesField(popupContainer);
 
             // 压缩方式选项
             _compressionField = Root.Q<EnumField>("Compression");
@@ -124,8 +122,7 @@ namespace YooAsset.Editor
             buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
             buildParameters.BuiltinShadersBundleName = builtinShaderBundleName;
             buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
-            buildParameters.ManifestProcessServices = CreateManifestProcessServicesInstance();
-            buildParameters.ManifestRestoreServices = CreateManifestRestoreServicesInstance();
+            buildParameters.ManifestServices = CreateManifestServicesInstance();
 
             ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();
             var buildResult = pipeline.Run(buildParameters, true);

Assets/YooAsset/Editor/AssetBundleCollector/AssetDependencyDatabase.cs

@@ -177,6 +177,9 @@ namespace YooAsset.Editor
         /// </summary>
         public string[] GetDependencies(string assetPath, bool recursive)
         {
+            // 注意：AssetDatabase.GetDependencies()方法返回结果里会踢出丢失文件！
+            // 注意：AssetDatabase.GetDependencies()方法返回结果里会包含主资源路径！
+
             // 注意：机制上不允许存在未收录的资源
             if (_database.ContainsKey(assetPath) == false)
             {
@@ -184,14 +187,17 @@ namespace YooAsset.Editor
             }
 
             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)
@@ -257,7 +263,6 @@ 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

@@ -72,8 +72,7 @@ namespace YooAsset.Editor
         public bool EnableSharePackRule;
         public bool SingleReferencedPackAlone;
         public string EncryptionServicesClassName;
-        public string ManifestProcessServicesClassName;
-        public string ManifestRestoreServicesClassName;
+        public string ManifestServicesClassName;
         public EFileNameStyle FileNameStyle;
         
         // 引擎参数

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

@@ -67,8 +67,7 @@ namespace YooAsset.Editor
             BindListViewItem("Enable Share Pack Rule", $"{buildReport.Summary.EnableSharePackRule}");
             BindListViewItem("Single Referenced Pack Alone", $"{buildReport.Summary.SingleReferencedPackAlone}");
             BindListViewItem("Encryption Services", buildReport.Summary.EncryptionServicesClassName);
-            BindListViewItem("Manifest Process Services", buildReport.Summary.ManifestProcessServicesClassName);
-            BindListViewItem("Manifest Restore Services", buildReport.Summary.ManifestRestoreServicesClassName);
+            BindListViewItem("Manifest Services", buildReport.Summary.ManifestServicesClassName);
             BindListViewItem("FileNameStyle", $"{buildReport.Summary.FileNameStyle}");
             BindListViewItem("CompressOption", $"{buildReport.Summary.CompressOption}");
             BindListViewItem("DisableWriteTypeTree", $"{buildReport.Summary.DisableWriteTypeTree}");

Assets/YooAsset/Runtime/Assembly/AssemblyInfo.cs

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

Assets/YooAsset/Runtime/DownloadSystem/DownloadDefine.cs

@@ -94,25 +94,4 @@ 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/UnityWebCacheRequestOperation.cs

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

@@ -1,11 +0,0 @@
-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,23 +5,7 @@ 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>
         /// 请求结果
@@ -29,9 +13,8 @@ namespace YooAsset
         public byte[] Result { private set; get; }
 
 
-        internal UnityWebDataRequestOperation(string url, int timeout) : base(url)
+        internal UnityWebDataRequestOperation(string url, int timeout = 60) : base(url, timeout)
         {
-            _timeout = timeout;
         }
         internal override void InternalStart()
         {
@@ -44,33 +27,27 @@ 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())
                 {
-                    var fileData = _webRequest.downloadHandler.data;
-                    if (fileData == null || fileData.Length == 0)
-                    {
-                        _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;
-                    }
+                    _steps = ESteps.Done;
+                    Result = _webRequest.downloadHandler.data;
+                    Status = EOperationStatus.Succeed;
                 }
                 else
                 {
@@ -82,12 +59,16 @@ namespace YooAsset
                 DisposeRequest();
             }
         }
+        internal override void InternalAbort()
+        {
+            _steps = ESteps.Done;
+            DisposeRequest();
+        }
 
         private void CreateWebRequest()
         {
-            DownloadHandlerBuffer handler = new DownloadHandlerBuffer();
             _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
-            _webRequest.timeout = _timeout;
+            DownloadHandlerBuffer handler = new DownloadHandlerBuffer();
             _webRequest.downloadHandler = handler;
             _webRequest.disposeDownloadHandlerOnDispose = true;
             _requestOperation = _webRequest.SendWebRequest();

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

@@ -5,30 +5,12 @@ 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;
 
-        /// <summary>
-        /// 响应的超时时间（单位：秒），在经过Timeout的秒数后尝试中止。
-        /// 注意：当Timeout设置为0时，不会应用超时。
-        /// 注意：设置的超时值可能应用于Android上的每个URL重定向，这可能会导致响应时间增加。
-        /// </summary>
-        private readonly int _timeout;
-
-
-        internal UnityWebFileRequestOperation(string url, string fileSavePath, int timeout) : base(url)
+        internal UnityWebFileRequestOperation(string url, string fileSavePath, int timeout = 60) : base(url, timeout)
         {
             _fileSavePath = fileSavePath;
-            _timeout = timeout;
         }
         internal override void InternalStart()
         {
@@ -41,17 +23,21 @@ 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())
                 {
@@ -68,13 +54,17 @@ 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,4 +1,6 @@
 using System;
+using System.Collections;
+using System.Collections.Concurrent;
 using UnityEngine.Networking;
 using UnityEngine;
 
@@ -6,50 +8,33 @@ 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)
+        internal UnityWebRequestOperation(string url, int timeout)
         {
             _requestURL = url;
-        }
-        internal override void InternalAbort()
-        {
-            //TODO
-            // 1. 编辑器下停止运行游戏的时候主动终止下载任务
-            // 2. 真机上销毁包裹的时候主动终止下载任务
-            if (_isAbort == false)
-            {
-                if (_webRequest != null)
-                {
-                    _webRequest.Abort();
-                    _isAbort = true;
-                }
-            }
+            _timeout = timeout;
         }
 
         /// <summary>
@@ -59,19 +44,39 @@ 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,23 +5,7 @@ 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>
         /// 请求结果
@@ -29,9 +13,8 @@ namespace YooAsset
         public string Result { private set; get; }
 
 
-        internal UnityWebTextRequestOperation(string url, int timeout) : base(url)
+        internal UnityWebTextRequestOperation(string url, int timeout = 60) : base(url, timeout)
         {
-            _timeout = timeout;
         }
         internal override void InternalStart()
         {
@@ -44,33 +27,27 @@ 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())
                 {
-                    var fileText = _webRequest.downloadHandler.text;
-                    if (string.IsNullOrEmpty(fileText))
-                    {
-                        _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;
-                    }
+                    _steps = ESteps.Done;
+                    Result = _webRequest.downloadHandler.text;
+                    Status = EOperationStatus.Succeed;
                 }
                 else
                 {
@@ -82,12 +59,16 @@ namespace YooAsset
                 DisposeRequest();
             }
         }
+        internal override void InternalAbort()
+        {
+            _steps = ESteps.Done;
+            DisposeRequest();
+        }
 
         private void CreateWebRequest()
         {
-            DownloadHandlerBuffer handler = new DownloadHandlerBuffer();
             _webRequest = DownloadSystemHelper.NewUnityWebRequestGet(_requestURL);
-            _webRequest.timeout = _timeout;
+            DownloadHandlerBuffer handler = new DownloadHandlerBuffer();
             _webRequest.downloadHandler = handler;
             _webRequest.disposeDownloadHandlerOnDispose = true;
             _requestOperation = _webRequest.SendWebRequest();

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

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

@@ -92,12 +92,7 @@ namespace YooAsset
         /// <summary>
         /// 自定义参数：资源清单服务类
         /// </summary>
-        public IManifestRestoreServices ManifestServices { private set; get; }
-
-        /// <summary>
-        /// 自定义参数：拷贝内置文件服务类
-        /// </summary>
-        public ICopyLocalFileServices CopyLocalFileServices { private set; get; }
+        public IManifestServices ManifestServices { private set; get; }
         #endregion
 
 
@@ -125,7 +120,7 @@ namespace YooAsset
         }
         public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
         {
-            // 注意：业务层的解压器会依赖该方法
+            // 注意：业务层的解压下载器会依赖内置文件系统的下载方法
             options.ImportFilePath = GetBuildinFileLoadPath(bundle);
             return _unpackFileSystem.DownloadFileAsync(bundle, options);
         }
@@ -186,11 +181,7 @@ namespace YooAsset
             }
             else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
             {
-                ManifestServices = (IManifestRestoreServices)value;
-            }
-            else if (name == FileSystemParametersDefine.COPY_LOCAL_FILE_SERVICES)
-            {
-                CopyLocalFileServices = (ICopyLocalFileServices)value;
+                ManifestServices = (IManifestServices)value;
             }
             else
             {
@@ -214,7 +205,6 @@ 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

@@ -0,0 +1,155 @@
+#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目录下的所有资源文件，将这些文件信息写入文件，然后在运行时做查询用途。
+        /// </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)
+            {
+                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;
+                try
+                {
+                    bool result = CreateBuildinCatalogFile(null, packageName, pacakgeDirectory);
+                    if (result == false)
+                    {
+                        Debug.LogError($"Create package {packageName} catalog file failed ! See the detail error in console !");
+                    }
+                }
+                catch (System.Exception ex)
+                {
+                    Debug.LogError($"Create package {packageName} catalog file failed ! {ex.Message}");
+                }
+            }
+        }
+
+        /// <summary>
+        /// 生成包裹的内置资源目录文件
+        /// </summary>
+        public static bool CreateBuildinCatalogFile(IManifestServices services, 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, 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(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 _loadBuildinCatalogFileOp;
+        private LoadBuildinCatalogFileOperation _loadCatalogFileOp;
         private ESteps _steps = ESteps.None;
 
         internal DBFSInitializeOperation(DefaultBuildinFileSystem fileSystem)
@@ -103,18 +103,34 @@ namespace YooAsset
 
             if (_steps == ESteps.LoadCatalogFile)
             {
-                if (_loadBuildinCatalogFileOp == null)
+                if (_loadCatalogFileOp == null)
                 {
-                    _loadBuildinCatalogFileOp = new LoadBuildinCatalogFileOperation(_fileSystem);
-                    _loadBuildinCatalogFileOp.StartOperation();
-                    AddChildOperation(_loadBuildinCatalogFileOp);
+#if UNITY_EDITOR
+                    /*
+                    // 兼容性初始化
+                    // 说明：内置文件系统在编辑器下运行时需要动态生成
+                    string packageRoot = _fileSystem.FileRoot;
+                    bool result = DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(_fileSystem.ManifestServices, _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);
                 }
 
-                _loadBuildinCatalogFileOp.UpdateOperation();
-                if (_loadBuildinCatalogFileOp.IsDone == false)
+                _loadCatalogFileOp.UpdateOperation();
+                if (_loadCatalogFileOp.IsDone == false)
                     return;
 
-                if (_loadBuildinCatalogFileOp.Status == EOperationStatus.Succeed)
+                if (_loadCatalogFileOp.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Succeed;
@@ -123,7 +139,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _loadBuildinCatalogFileOp.Error;
+                    Error = _loadCatalogFileOp.Error;
                 }
             }
         }

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

@@ -104,28 +104,27 @@ namespace YooAsset
                     }
                 }
 
-                if (_assetBundle == null)
-                {
-                    if (_bundle.Encrypted)
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Failed to load encrypted buildin asset bundle file : {_bundle.BundleName}";
-                        YooLogger.Error(Error);
-                    }
-                    else
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Failed to load buildin asset bundle file : {_bundle.BundleName}";
-                        YooLogger.Error(Error);
-                    }
-                }
-                else
+                if (_assetBundle != null)
                 {
                     _steps = ESteps.Done;
                     Result = new AssetBundleResult(_fileSystem, _bundle, _assetBundle, _managedStream);
                     Status = EOperationStatus.Succeed;
+                    return;
+                }
+
+                if (_bundle.Encrypted)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"Failed to load encrypted buildin asset bundle file : {_bundle.BundleName}";
+                    YooLogger.Error(Error);
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"Failed to load buildin asset bundle file : {_bundle.BundleName}";
+                    YooLogger.Error(Error);
                 }
             }
         }
@@ -177,15 +176,13 @@ namespace YooAsset
 
             if (_steps == ESteps.LoadBuildinRawBundle)
             {
-                string filePath = _fileSystem.GetBuildinFileLoadPath(_bundle);
-
 #if UNITY_ANDROID
                 //TODO : 安卓平台内置文件属于APK压缩包内的文件。
                 _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = $"Can not load android buildin raw bundle file : {filePath}";
-                YooLogger.Error(Error);
+                Result = new RawBundleResult(_fileSystem, _bundle);
+                Status = EOperationStatus.Succeed;
 #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 _hashWebFileRequestOp;
-        private UnityWebFileRequestOperation _manifestWebFileRequestOp;
+        private UnityWebFileRequestOperation _hashFileRequestOp;
+        private UnityWebFileRequestOperation _manifestFileRequestOp;
         private string _buildinPackageVersion;
         private ESteps _steps = ESteps.None;
 
@@ -78,21 +78,21 @@ namespace YooAsset
 
             if (_steps == ESteps.UnpackHashFile)
             {
-                if (_hashWebFileRequestOp == null)
+                if (_hashFileRequestOp == null)
                 {
                     string sourcePath = _fileSystem.GetBuildinPackageHashFilePath(_buildinPackageVersion);
                     string destPath = GetCopyPackageHashDestPath(_buildinPackageVersion);
                     string url = DownloadSystemHelper.ConvertToWWWPath(sourcePath);
-                    _hashWebFileRequestOp = new UnityWebFileRequestOperation(url, destPath, 60);
-                    _hashWebFileRequestOp.StartOperation();
-                    AddChildOperation(_hashWebFileRequestOp);
+                    _hashFileRequestOp = new UnityWebFileRequestOperation(url, destPath);
+                    _hashFileRequestOp.StartOperation();
+                    AddChildOperation(_hashFileRequestOp);
                 }
 
-                _hashWebFileRequestOp.UpdateOperation();
-                if (_hashWebFileRequestOp.IsDone == false)
+                _hashFileRequestOp.UpdateOperation();
+                if (_hashFileRequestOp.IsDone == false)
                     return;
 
-                if (_hashWebFileRequestOp.Status == EOperationStatus.Succeed)
+                if (_hashFileRequestOp.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.CheckManifestFile;
                 }
@@ -100,7 +100,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _hashWebFileRequestOp.Error;
+                    Error = _hashFileRequestOp.Error;
                 }
             }
 
@@ -119,21 +119,21 @@ namespace YooAsset
 
             if (_steps == ESteps.UnpackManifestFile)
             {
-                if (_manifestWebFileRequestOp == null)
+                if (_manifestFileRequestOp == null)
                 {
                     string sourcePath = _fileSystem.GetBuildinPackageManifestFilePath(_buildinPackageVersion);
                     string destPath = GetCopyPackageManifestDestPath(_buildinPackageVersion);
                     string url = DownloadSystemHelper.ConvertToWWWPath(sourcePath);
-                    _manifestWebFileRequestOp = new UnityWebFileRequestOperation(url, destPath, 60);
-                    _manifestWebFileRequestOp.StartOperation();
-                    AddChildOperation(_manifestWebFileRequestOp);
+                    _manifestFileRequestOp = new UnityWebFileRequestOperation(url, destPath);
+                    _manifestFileRequestOp.StartOperation();
+                    AddChildOperation(_manifestFileRequestOp);
                 }
 
-                _manifestWebFileRequestOp.UpdateOperation();
-                if (_manifestWebFileRequestOp.IsDone == false)
+                _manifestFileRequestOp.UpdateOperation();
+                if (_manifestFileRequestOp.IsDone == false)
                     return;
 
-                if (_manifestWebFileRequestOp.Status == EOperationStatus.Succeed)
+                if (_manifestFileRequestOp.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Succeed;
@@ -142,7 +142,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _manifestWebFileRequestOp.Error;
+                    Error = _manifestFileRequestOp.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, 60);
+                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
                     _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, 60);
+                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
                     _webDataRequestOp.StartOperation();
                     AddChildOperation(_webDataRequestOp);
                 }

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, 60);
+                    _webTextRequestOp = new UnityWebTextRequestOperation(url);
                     _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, 60);
+                    _webTextRequestOp = new UnityWebTextRequestOperation(url);
                     _webTextRequestOp.StartOperation();
                     AddChildOperation(_webTextRequestOp);
                 }

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

@@ -75,11 +75,6 @@ namespace YooAsset
         /// </summary>
         public bool AppendFileExtension { private set; get; } = false;
 
-        /// <summary>
-        /// 自定义参数：禁用边玩边下机制
-        /// </summary>
-        public bool DisableOnDemandDownload { private set; get; } = false;
-
         /// <summary>
         /// 自定义参数：最大并发连接数
         /// </summary>
@@ -108,12 +103,7 @@ namespace YooAsset
         /// <summary>
         /// 自定义参数：资源清单服务类
         /// </summary>
-        public IManifestRestoreServices ManifestServices { private set; get; }
-
-        /// <summary>
-        /// 自定义参数：拷贝内置文件服务类
-        /// </summary>
-        public ICopyLocalFileServices CopyLocalFileServices { private set; get; }
+        public IManifestServices ManifestServices { private set; get; }
         #endregion
 
 
@@ -171,23 +161,12 @@ namespace YooAsset
         }
         public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
         {
-            // 获取下载地址
-            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 = DownloadCenter.DownloadFileAsync(bundle, options);
+            downloader.Reference(); //增加下载器的引用计数
 
-            var downloader = new DownloadPackageBundleOperation(this, bundle, options);
-            return downloader;
+            // 注意：将下载器进行包裹，可以避免父类任务终止的时候，连带子任务里的下载器也一起被终止！
+            var wrapper = new DownloadFileWrapper(downloader);
+            return wrapper;
         }
         public virtual FSLoadBundleOperation LoadBundleFile(PackageBundle bundle)
         {
@@ -227,10 +206,6 @@ 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);
@@ -253,11 +228,7 @@ namespace YooAsset
             }
             else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
             {
-                ManifestServices = (IManifestRestoreServices)value;
-            }
-            else if (name == FileSystemParametersDefine.COPY_LOCAL_FILE_SERVICES)
-            {
-                CopyLocalFileServices = (ICopyLocalFileServices)value;
+                ManifestServices = (IManifestServices)value;
             }
             else
             {

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}' '{_fileSystem.GetType().Name}' cached files count : {_fileSystem.FileCount}");
+                    YooLogger.Log($"Package '{_fileSystem.PackageName}' cached files count : {_fileSystem.FileCount}");
                 }
                 else
                 {

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

@@ -49,25 +49,16 @@ namespace YooAsset
                 }
                 else
                 {
-                    if (_fileSystem.DisableOnDemandDownload)
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"The bundle not cached : {_bundle.BundleName}";
-                        YooLogger.Warning(Error);
-                    }
-                    else
-                    {
-                        _steps = ESteps.DownloadFile;
-                    }
+                    _steps = ESteps.DownloadFile;
                 }
             }
 
             if (_steps == ESteps.DownloadFile)
             {
+                // 注意：边玩边下下载器引用计数没有Release
                 if (_downloadFileOp == null)
                 {
-                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue);
+                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue, 60);
                     _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, options);
                     _downloadFileOp.StartOperation();
                     AddChildOperation(_downloadFileOp);
@@ -237,6 +228,10 @@ 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;
                 }
@@ -312,9 +307,10 @@ namespace YooAsset
 
             if (_steps == ESteps.DownloadFile)
             {
+                // 注意：边玩边下下载器引用计数没有Release
                 if (_downloadFileOp == null)
                 {
-                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue);
+                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue, 60);
                     _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, options);
                     _downloadFileOp.StartOperation();
                     AddChildOperation(_downloadFileOp);
@@ -365,6 +361,10 @@ 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, UnityDownloadFileOperation> _downloaders = new Dictionary<string, UnityDownloadFileOperation>(1000);
-        protected readonly List<string> _removeList = new List<string>(1000);
+        protected readonly Dictionary<string, DefaultDownloadFileOperation> _downloaders = new Dictionary<string, DefaultDownloadFileOperation>(1000);
+        protected readonly List<string> _removeDownloadList = new List<string>(1000);
 
         public DownloadCenterOperation(DefaultCacheFileSystem fileSystem)
         {
@@ -19,34 +19,31 @@ namespace YooAsset
         internal override void InternalUpdate()
         {
             // 获取可移除的下载器集合
-            _removeList.Clear();
+            _removeDownloadList.Clear();
             foreach (var valuePair in _downloaders)
             {
                 var downloader = valuePair.Value;
                 downloader.UpdateOperation();
-                if (downloader.IsDone)
-                {
-                    _removeList.Add(valuePair.Key);
-                    continue;
-                }
 
                 // 注意：主动终止引用计数为零的下载任务
                 if (downloader.RefCount <= 0)
                 {
-                    _removeList.Add(valuePair.Key);
+                    _removeDownloadList.Add(valuePair.Key);
                     downloader.AbortOperation();
                     continue;
                 }
+
+                if (downloader.IsDone)
+                {
+                    _removeDownloadList.Add(valuePair.Key);
+                    continue;
+                }
             }
 
             // 移除下载器
-            foreach (var key in _removeList)
+            foreach (var key in _removeDownloadList)
             {
-                if (_downloaders.TryGetValue(key, out var downloader))
-                {
-                    Childs.Remove(downloader);
-                    _downloaders.Remove(key);
-                }
+                _downloaders.Remove(key);
             }
 
             // 最大并发数检测
@@ -77,41 +74,41 @@ namespace YooAsset
         /// <summary>
         /// 创建下载任务
         /// </summary>
-        public UnityDownloadFileOperation DownloadFileAsync(PackageBundle bundle, string url)
+        public FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
         {
             // 查询旧的下载器
             if (_downloaders.TryGetValue(bundle.BundleGUID, out var oldDownloader))
             {
-                oldDownloader.Reference();
                 return oldDownloader;
             }
 
-            // 创建新的下载器
-            UnityDownloadFileOperation newDownloader;
-            bool isRequestLocalFile = DownloadSystemHelper.IsRequestLocalFile(url);
-            if (isRequestLocalFile)
+            // 设置请求URL
+            if (string.IsNullOrEmpty(options.ImportFilePath))
             {
-                newDownloader = new UnityDownloadLocalFileOperation(_fileSystem, bundle, url);
+                options.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(bundle.FileName);
+                options.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(bundle.FileName);
+            }
+            else
+            {
+                // 注意：把本地文件路径指定为远端下载地址
+                options.MainURL = DownloadSystemHelper.ConvertToWWWPath(options.ImportFilePath);
+                options.FallbackURL = options.MainURL;
+            }
+
+            // 创建新的下载器
+            DefaultDownloadFileOperation newDownloader;
+            if (bundle.FileSize >= _fileSystem.ResumeDownloadMinimumSize)
+            {
+                newDownloader = new DownloadResumeFileOperation(_fileSystem, bundle, options);
                 AddChildOperation(newDownloader);
                 _downloaders.Add(bundle.BundleGUID, newDownloader);
             }
             else
             {
-                if (bundle.FileSize >= _fileSystem.ResumeDownloadMinimumSize)
-                {
-                    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 = new DownloadNormalFileOperation(_fileSystem, bundle, options);
+                AddChildOperation(newDownloader);
+                _downloaders.Add(bundle.BundleGUID, newDownloader);
             }
-
-            newDownloader.Reference();
             return newDownloader;
         }
 

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

@@ -0,0 +1,87 @@
+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/DownloadHandlerFileRange.cs.meta

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

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

@@ -0,0 +1,211 @@
+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;
+
+                    // 短暂休眠避免完全卡死
+                    System.Threading.Thread.Sleep(1);
+                }
+                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

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

@@ -0,0 +1,255 @@
+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;
+
+                    // 短暂休眠避免完全卡死
+                    System.Threading.Thread.Sleep(1);
+                }
+                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/UnityDownloadFileOperation.cs

@@ -1,52 +0,0 @@
-
-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/UnityDownloadLocalFileOperation.cs

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

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

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

@@ -1,156 +0,0 @@
-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/DefaultWebRemoteFileSystem/DefaultWebRemoteFileSystem.cs

@@ -56,7 +56,7 @@ namespace YooAsset
         /// <summary>
         /// 自定义参数：资源清单服务类
         /// </summary>
-        public IManifestRestoreServices ManifestServices { private set; get; }
+        public IManifestServices ManifestServices { private set; get; }
         #endregion
 
 
@@ -118,7 +118,7 @@ namespace YooAsset
             }
             else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
             {
-                ManifestServices = (IManifestRestoreServices)value;
+                ManifestServices = (IManifestServices)value;
             }
             else
             {

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

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

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

@@ -15,7 +15,6 @@ 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;
@@ -27,12 +26,11 @@ namespace YooAsset
         public PackageManifest Manifest { private set; get; }
 
 
-        internal LoadWebRemotePackageManifestOperation(DefaultWebRemoteFileSystem fileSystem, string packageVersion, string packageHash, int timeout)
+        internal LoadWebRemotePackageManifestOperation(DefaultWebRemoteFileSystem fileSystem, string packageVersion, string packageHash)
         {
             _fileSystem = fileSystem;
             _packageVersion = packageVersion;
             _packageHash = packageHash;
-            _timeout = timeout;
         }
         internal override void InternalStart()
         {
@@ -50,7 +48,7 @@ namespace YooAsset
                 {
                     string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, _packageVersion);
                     string url = GetWebRequestURL(fileName);
-                    _webDataRequestOp = new UnityWebDataRequestOperation(url, _timeout);
+                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
                     _webDataRequestOp.StartOperation();
                     AddChildOperation(_webDataRequestOp);
                 }

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

@@ -65,7 +65,7 @@ namespace YooAsset
         /// <summary>
         /// 自定义参数：资源清单服务类
         /// </summary>
-        public IManifestRestoreServices ManifestServices { private set; get; }
+        public IManifestServices ManifestServices { private set; get; }
         #endregion
 
 
@@ -123,7 +123,7 @@ namespace YooAsset
             }
             else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
             {
-                ManifestServices = (IManifestRestoreServices)value;
+                ManifestServices = (IManifestServices)value;
             }
             else
             {

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

@@ -32,7 +32,23 @@ namespace YooAsset
             {
                 if (_loadCatalogFileOp == null)
                 {
-                    _loadCatalogFileOp = new LoadWebServerCatalogFileOperation(_fileSystem, 60);
+#if UNITY_EDITOR
+                    /*
+                    // 兼容性初始化
+                    // 说明：内置文件系统在编辑器下运行时需要动态生成
+                    string packageRoot = _fileSystem.FileRoot;
+                    bool result = DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(_fileSystem.ManifestServices, _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,
-            LoadWebAssetBundle,
+            DownloadAssetBundle,
             Done,
         }
 
         private readonly DefaultWebServerFileSystem _fileSystem;
         private readonly PackageBundle _bundle;
-        private LoadWebAssetBundleOperation _loadWebAssetBundleOp;
+        private DownloadAssetBundleOperation _downloadAssetBundleOp;
         private ESteps _steps = ESteps.None;
 
 
@@ -23,51 +23,51 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.LoadWebAssetBundle;
+            _steps = ESteps.DownloadAssetBundle;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.LoadWebAssetBundle)
+            if (_steps == ESteps.DownloadAssetBundle)
             {
-                if (_loadWebAssetBundleOp == null)
+                if (_downloadAssetBundleOp == null)
                 {
+                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue, 60);
                     string fileLoadPath = _fileSystem.GetWebFileLoadPath(_bundle);
-                    string mainURL = DownloadSystemHelper.ConvertToWWWPath(fileLoadPath);
-                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue);
-                    options.SetURL(mainURL, mainURL);
+                    options.MainURL = DownloadSystemHelper.ConvertToWWWPath(fileLoadPath);
+                    options.FallbackURL = options.MainURL;
 
                     if (_bundle.Encrypted)
                     {
-                        _loadWebAssetBundleOp = new LoadWebEncryptAssetBundleOperation(_bundle, options, _fileSystem.DecryptionServices);
-                        _loadWebAssetBundleOp.StartOperation();
-                        AddChildOperation(_loadWebAssetBundleOp);
+                        _downloadAssetBundleOp = new DownloadWebEncryptAssetBundleOperation(true, _fileSystem.DecryptionServices, _bundle, options);
+                        _downloadAssetBundleOp.StartOperation();
+                        AddChildOperation(_downloadAssetBundleOp);
                     }
                     else
                     {
-                        _loadWebAssetBundleOp = new LoadWebNormalAssetBundleOperation(_bundle, options, _fileSystem.DisableUnityWebCache);
-                        _loadWebAssetBundleOp.StartOperation();
-                        AddChildOperation(_loadWebAssetBundleOp);
+                        _downloadAssetBundleOp = new DownloadWebNormalAssetBundleOperation(_fileSystem.DisableUnityWebCache, _bundle, options);
+                        _downloadAssetBundleOp.StartOperation();
+                        AddChildOperation(_downloadAssetBundleOp);
                     }
                 }
 
-                _loadWebAssetBundleOp.UpdateOperation();
-                DownloadProgress = _loadWebAssetBundleOp.DownloadProgress;
-                DownloadedBytes = _loadWebAssetBundleOp.DownloadedBytes;
-                Progress = _loadWebAssetBundleOp.Progress;
-                if (_loadWebAssetBundleOp.IsDone == false)
+                _downloadAssetBundleOp.UpdateOperation();
+                DownloadProgress = _downloadAssetBundleOp.DownloadProgress;
+                DownloadedBytes = _downloadAssetBundleOp.DownloadedBytes;
+                Progress = _downloadAssetBundleOp.Progress;
+                if (_downloadAssetBundleOp.IsDone == false)
                     return;
 
-                if (_loadWebAssetBundleOp.Status == EOperationStatus.Succeed)
+                if (_downloadAssetBundleOp.Status == EOperationStatus.Succeed)
                 {
-                    var assetBundle = _loadWebAssetBundleOp.Result;
+                    var assetBundle = _downloadAssetBundleOp.Result;
                     if (assetBundle == null)
                     {
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Failed;
-                        Error = $"{nameof(DWSFSLoadAssetBundleOperation)} loaded asset bundle is null !";
+                        Error = $"{nameof(DownloadAssetBundleOperation)} loaded asset bundle is null !";
                     }
                     else
                     {
@@ -80,7 +80,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _loadWebAssetBundleOp.Error;
+                    Error = _downloadAssetBundleOp.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, _timeout);
+                    _loadWebPackageManifestOp = new LoadWebServerPackageManifestOperation(_fileSystem, _packageVersion, packageHash);
                     _loadWebPackageManifestOp.StartOperation();
                     AddChildOperation(_loadWebPackageManifestOp);
                 }

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

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

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

@@ -15,7 +15,6 @@ 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;
@@ -26,12 +25,11 @@ namespace YooAsset
         public PackageManifest Manifest { private set; get; }
 
 
-        internal LoadWebServerPackageManifestOperation(DefaultWebServerFileSystem fileSystem, string packageVersion, string packageHash, int timeout)
+        internal LoadWebServerPackageManifestOperation(DefaultWebServerFileSystem fileSystem, string packageVersion, string packageHash)
         {
             _fileSystem = fileSystem;
             _packageVersion = packageVersion;
             _packageHash = packageHash;
-            _timeout = timeout;
         }
         internal override void InternalStart()
         {
@@ -48,7 +46,7 @@ namespace YooAsset
                 {
                     string filePath = _fileSystem.GetWebPackageManifestFilePath(_packageVersion);
                     string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
-                    _webDataRequestOp = new UnityWebDataRequestOperation(url, _timeout);
+                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
                     _webDataRequestOp.StartOperation();
                     AddChildOperation(_webDataRequestOp);
                 }

Assets/YooAsset/Runtime/FileSystem/FileSystemParametersDefine.cs

@@ -11,7 +11,6 @@ namespace YooAsset
         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";
@@ -20,6 +19,5 @@ 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,44 +8,30 @@ namespace YooAsset
         /// </summary>
         public readonly int FailedTryAgain;
 
+        /// <summary>
+        /// 超时时间
+        /// </summary>
+        public readonly int Timeout;
+
         /// <summary>
         /// 主资源地址
         /// </summary>
-        public string MainURL { private set; get; }
+        public string MainURL { set; get; }
 
         /// <summary>
         /// 备用资源地址
         /// </summary>
-        public string FallbackURL { private set; get; }
+        public string FallbackURL { set; get; }
 
         /// <summary>
-        /// 拷贝的本地文件路径
+        /// 导入的本地文件路径
         /// </summary>
         public string ImportFilePath { set; get; }
 
-        public DownloadFileOptions(int failedTryAgain)
+        public DownloadFileOptions(int failedTryAgain, int timeout)
         {
             FailedTryAgain = failedTryAgain;
-        }
-
-        /// <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;
+            Timeout = timeout;
         }
     }
 
@@ -53,6 +39,16 @@ 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>
@@ -67,8 +63,31 @@ 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

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

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

@@ -0,0 +1,71 @@
+
+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/DownloadFileWrapper.cs.meta

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

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

@@ -0,0 +1,157 @@
+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/DownloadWebNormalAssetBundleOperation.cs

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

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

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

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

@@ -1,114 +0,0 @@
-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/PakcageInvokeBuilder/PakcageInvokeBuilder.cs

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

Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs

@@ -60,48 +60,40 @@ namespace YooAsset
         /// <summary>
         /// 尝试卸载指定资源的资源包（包括依赖资源）
         /// </summary>
-        public void TryUnloadUnusedAsset(AssetInfo assetInfo, int loopCount)
+        public void TryUnloadUnusedAsset(AssetInfo assetInfo)
         {
-            if (assetInfo == null)
-            {
-                YooLogger.Error($"{nameof(AssetInfo)} is null !");
-                return;
-            }
             if (assetInfo.IsInvalid)
             {
                 YooLogger.Error($"Failed to unload asset ! {assetInfo.Error}");
                 return;
             }
 
-            while (loopCount > 0)
+            // 卸载主资源包加载器
+            string mainBundleName = _bundleQuery.GetMainBundleName(assetInfo);
+            var mainLoader = TryGetBundleFileLoader(mainBundleName);
+            if (mainLoader != null)
             {
-                loopCount--;
-
-                // 卸载主资源包加载器
-                string mainBundleName = _bundleQuery.GetMainBundleName(assetInfo.Asset.BundleID);
-                var mainLoader = TryGetBundleFileLoader(mainBundleName);
-                if (mainLoader != null)
+                mainLoader.TryDestroyProviders();
+                if (mainLoader.CanDestroyLoader())
                 {
-                    mainLoader.TryDestroyProviders();
-                    if (mainLoader.CanDestroyLoader())
-                    {
-                        mainLoader.DestroyLoader();
-                        LoaderDic.Remove(mainBundleName);
-                    }
+                    string bundleName = mainLoader.LoadBundleInfo.Bundle.BundleName;
+                    mainLoader.DestroyLoader();
+                    LoaderDic.Remove(bundleName);
                 }
+            }
 
-                // 卸载依赖资源包加载器
-                foreach (var dependID in assetInfo.Asset.DependBundleIDs)
+            // 卸载依赖资源包加载器
+            string[] dependBundleNames = _bundleQuery.GetDependBundleNames(assetInfo);
+            foreach (var dependBundleName in dependBundleNames)
+            {
+                var dependLoader = TryGetBundleFileLoader(dependBundleName);
+                if (dependLoader != null)
                 {
-                    string dependBundleName = _bundleQuery.GetMainBundleName(dependID);
-                    var dependLoader = TryGetBundleFileLoader(dependBundleName);
-                    if (dependLoader != null)
+                    if (dependLoader.CanDestroyLoader())
                     {
-                        if (dependLoader.CanDestroyLoader())
-                        {
-                            dependLoader.DestroyLoader();
-                            LoaderDic.Remove(dependBundleName);
-                        }
+                        string bundleName = dependLoader.LoadBundleInfo.Bundle.BundleName;
+                        dependLoader.DestroyLoader();
+                        LoaderDic.Remove(bundleName);
                     }
                 }
             }
@@ -299,8 +291,8 @@ namespace YooAsset
         }
         internal List<LoadBundleFileOperation> CreateDependBundleFileLoaders(AssetInfo assetInfo)
         {
-            List<BundleInfo> bundleInfos = _bundleQuery.GetDependBundleInfos(assetInfo);
-            List<LoadBundleFileOperation> result = new List<LoadBundleFileOperation>(bundleInfos.Count);
+            BundleInfo[] bundleInfos = _bundleQuery.GetDependBundleInfos(assetInfo);
+            List<LoadBundleFileOperation> result = new List<LoadBundleFileOperation>(bundleInfos.Length);
             foreach (var bundleInfo in bundleInfos)
             {
                 var bundleLoader = CreateBundleFileLoaderInternal(bundleInfo);

Assets/YooAsset/Runtime/ResourcePackage/BundleInfo.cs

@@ -36,9 +36,9 @@ namespace YooAsset
         /// <summary>
         /// 创建下载器
         /// </summary>
-        public FSDownloadFileOperation CreateDownloader(int failedTryAgain)
+        public FSDownloadFileOperation CreateDownloader(int failedTryAgain, int timeout)
         {
-            DownloadFileOptions options = new DownloadFileOptions(failedTryAgain);
+            DownloadFileOptions options = new DownloadFileOptions(failedTryAgain, timeout);
             options.ImportFilePath = _importFilePath;
             return _fileSystem.DownloadFileAsync(Bundle, options);
         }

Assets/YooAsset/Runtime/ResourcePackage/Interface/IBundleQuery.cs

@@ -1,6 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
-
+
 namespace YooAsset
 {
     internal interface IBundleQuery
@@ -13,11 +11,21 @@ namespace YooAsset
         /// <summary>
         /// 获取依赖的资源包信息集合
         /// </summary>
-        List<BundleInfo> GetDependBundleInfos(AssetInfo assetPath);
+        BundleInfo[] GetDependBundleInfos(AssetInfo assetPath);
 
         /// <summary>
         /// 获取主资源包名称
         /// </summary>
         string GetMainBundleName(int bundleID);
+
+        /// <summary>
+        /// 获取主资源包名称
+        /// </summary>
+        string GetMainBundleName(AssetInfo assetInfo);
+
+        /// <summary>
+        /// 获取依赖的资源包名称集合
+        /// </summary>
+        string[] GetDependBundleNames(AssetInfo assetInfo);
     }
 }

Assets/YooAsset/Runtime/ResourcePackage/Interface/IPlayMode.cs

@@ -34,16 +34,15 @@ namespace YooAsset
         ClearCacheFilesOperation ClearCacheFilesAsync(ClearCacheFilesOptions options);
         
         // 下载相关
-        ResourceDownloaderOperation CreateResourceDownloaderByAll(int downloadingMaxNumber, int failedTryAgain);
-        ResourceDownloaderOperation CreateResourceDownloaderByTags(string[] tags, int downloadingMaxNumber, int failedTryAgain);
-        ResourceDownloaderOperation CreateResourceDownloaderByPaths(AssetInfo[] assetInfos, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain);
+        ResourceDownloaderOperation CreateResourceDownloaderByAll(int downloadingMaxNumber, int failedTryAgain, int timeout);
+        ResourceDownloaderOperation CreateResourceDownloaderByTags(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout);
+        ResourceDownloaderOperation CreateResourceDownloaderByPaths(AssetInfo[] assetInfos, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout);
 
         // 解压相关
-        ResourceUnpackerOperation CreateResourceUnpackerByAll(int upackingMaxNumber, int failedTryAgain);
-        ResourceUnpackerOperation CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain);
-        
+        ResourceUnpackerOperation CreateResourceUnpackerByAll(int upackingMaxNumber, int failedTryAgain, int timeout);
+        ResourceUnpackerOperation CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain, int timeout);
+
         // 导入相关
-        ResourceImporterOperation CreateResourceImporterByFilePaths(string[] filePaths, int importingMaxNumber, int failedTryAgain);
-        ResourceImporterOperation CreateResourceImporterByFileInfos(ImportFileInfo[] fileInfos, int importingMaxNumber, int failedTryAgain);
+        ResourceImporterOperation CreateResourceImporterByFilePaths(string[] filePaths, int importerMaxNumber, int failedTryAgain, int timeout);
     }
 }

Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs

@@ -44,7 +44,7 @@ namespace YooAsset
         /// <summary>
         /// 序列化（二进制文件）
         /// </summary>
-        public static void SerializeToBinary(string savePath, PackageManifest manifest, IManifestProcessServices services)
+        public static void SerializeToBinary(string savePath, PackageManifest manifest, IManifestServices services)
         {
             using (FileStream fs = new FileStream(savePath, FileMode.Create))
             {
@@ -124,7 +124,7 @@ namespace YooAsset
         /// <summary>
         /// 反序列化（二进制文件）
         /// </summary>
-        public static PackageManifest DeserializeFromBinary(byte[] binaryData, IManifestRestoreServices services)
+        public static PackageManifest DeserializeFromBinary(byte[] binaryData, IManifestServices services)
         {
             // 创建缓存器
             BufferReader buffer;

Assets/YooAsset/Runtime/ResourcePackage/Operation/DownloaderOperation.cs

@@ -40,6 +40,7 @@ namespace YooAsset
         private readonly string _packageName;
         private readonly int _downloadingMaxNumber;
         private readonly int _failedTryAgain;
+        private readonly int _timeout;
         private readonly List<BundleInfo> _bundleInfoList;
         private readonly List<FSDownloadFileOperation> _downloaders = new List<FSDownloadFileOperation>(MAX_LOADER_COUNT);
         private readonly List<FSDownloadFileOperation> _removeList = new List<FSDownloadFileOperation>(MAX_LOADER_COUNT);
@@ -101,12 +102,13 @@ namespace YooAsset
         public DownloadFileBegin DownloadFileBeginCallback { set; get; }
 
 
-        internal DownloaderOperation(string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain)
+        internal DownloaderOperation(string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
         {
             _packageName = packageName;
             _bundleInfoList = downloadList;
             _downloadingMaxNumber = UnityEngine.Mathf.Clamp(downloadingMaxNumber, 1, MAX_LOADER_COUNT); ;
             _failedTryAgain = failedTryAgain;
+            _timeout = timeout;
 
             // 设置包裹名称 (fix #210)
             SetPackageName(packageName);
@@ -201,7 +203,7 @@ namespace YooAsset
                     {
                         int index = _bundleInfoList.Count - 1;
                         var bundleInfo = _bundleInfoList[index];
-                        var downloader = bundleInfo.CreateDownloader(_failedTryAgain);
+                        var downloader = bundleInfo.CreateDownloader(_failedTryAgain, _timeout);
                         downloader.StartOperation();
                         this.AddChildOperation(downloader);
 
@@ -364,7 +366,7 @@ namespace YooAsset
 
                 foreach (var downloader in _downloaders)
                 {
-                    downloader.AbortOperation();
+                    downloader.Release();
                 }
             }
         }
@@ -372,52 +374,52 @@ namespace YooAsset
 
     public sealed class ResourceDownloaderOperation : DownloaderOperation
     {
-        internal ResourceDownloaderOperation(string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain)
-            : base(packageName, downloadList, downloadingMaxNumber, failedTryAgain)
+        internal ResourceDownloaderOperation(string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
+            : base(packageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout)
         {
         }
 
         /// <summary>
         /// 创建空的下载器
         /// </summary>
-        internal static ResourceDownloaderOperation CreateEmptyDownloader(string packageName, int downloadingMaxNumber, int failedTryAgain)
+        internal static ResourceDownloaderOperation CreateEmptyDownloader(string packageName, int downloadingMaxNumber, int failedTryAgain, int timeout)
         {
             List<BundleInfo> downloadList = new List<BundleInfo>();
-            var operation = new ResourceDownloaderOperation(packageName, downloadList, downloadingMaxNumber, failedTryAgain);
+            var operation = new ResourceDownloaderOperation(packageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
     }
     public sealed class ResourceUnpackerOperation : DownloaderOperation
     {
-        internal ResourceUnpackerOperation(string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain)
-            : base(packageName, downloadList, downloadingMaxNumber, failedTryAgain)
+        internal ResourceUnpackerOperation(string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
+            : base(packageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout)
         {
         }
 
         /// <summary>
         /// 创建空的解压器
         /// </summary>
-        internal static ResourceUnpackerOperation CreateEmptyUnpacker(string packageName, int upackingMaxNumber, int failedTryAgain)
+        internal static ResourceUnpackerOperation CreateEmptyUnpacker(string packageName, int upackingMaxNumber, int failedTryAgain, int timeout)
         {
             List<BundleInfo> downloadList = new List<BundleInfo>();
-            var operation = new ResourceUnpackerOperation(packageName, downloadList, upackingMaxNumber, failedTryAgain);
+            var operation = new ResourceUnpackerOperation(packageName, downloadList, upackingMaxNumber, failedTryAgain, int.MaxValue);
             return operation;
         }
     }
     public sealed class ResourceImporterOperation : DownloaderOperation
     {
-        internal ResourceImporterOperation(string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain)
-            : base(packageName, downloadList, downloadingMaxNumber, failedTryAgain)
+        internal ResourceImporterOperation(string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
+            : base(packageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout)
         {
         }
 
         /// <summary>
         /// 创建空的导入器
         /// </summary>
-        internal static ResourceImporterOperation CreateEmptyImporter(string packageName, int upackingMaxNumber, int failedTryAgain)
+        internal static ResourceImporterOperation CreateEmptyImporter(string packageName, int upackingMaxNumber, int failedTryAgain, int timeout)
         {
             List<BundleInfo> downloadList = new List<BundleInfo>();
-            var operation = new ResourceImporterOperation(packageName, downloadList, upackingMaxNumber, failedTryAgain);
+            var operation = new ResourceImporterOperation(packageName, downloadList, upackingMaxNumber, failedTryAgain, int.MaxValue);
             return operation;
         }
     }

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

@@ -20,7 +20,7 @@ namespace YooAsset
             Done,
         }
 
-        private readonly IManifestRestoreServices _services;
+        private readonly IManifestServices _services;
         private byte[] _sourceData;
         private BufferReader _buffer;
         private int _packageAssetCount;
@@ -33,7 +33,7 @@ namespace YooAsset
         /// </summary>
         public PackageManifest Manifest { private set; get; }
 
-        public DeserializeManifestOperation(IManifestRestoreServices services, byte[] binaryData)
+        public DeserializeManifestOperation(IManifestServices services, byte[] binaryData)
         {
             _services = services;
             _sourceData = binaryData;

Assets/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs

@@ -107,11 +107,11 @@ namespace YooAsset
             if (Status != EOperationStatus.Succeed)
             {
                 YooLogger.Warning($"{nameof(PreDownloadContentOperation)} status is not succeed !");
-                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain);
+                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
             }
 
             List<BundleInfo> downloadList = _impl.GetDownloadListByAll(_manifest);
-            var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain);
+            var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
 
@@ -127,11 +127,11 @@ namespace YooAsset
             if (Status != EOperationStatus.Succeed)
             {
                 YooLogger.Warning($"{nameof(PreDownloadContentOperation)} status is not succeed !");
-                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain);
+                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
             }
 
             List<BundleInfo> downloadList = _impl.GetDownloadListByTags(_manifest, new string[] { tag });
-            var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain);
+            var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
 
@@ -147,11 +147,11 @@ namespace YooAsset
             if (Status != EOperationStatus.Succeed)
             {
                 YooLogger.Warning($"{nameof(PreDownloadContentOperation)} status is not succeed !");
-                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain);
+                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
             }
 
             List<BundleInfo> downloadList = _impl.GetDownloadListByTags(_manifest, tags);
-            var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain);
+            var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
 
@@ -167,7 +167,7 @@ namespace YooAsset
             if (Status != EOperationStatus.Succeed)
             {
                 YooLogger.Warning($"{nameof(PreDownloadContentOperation)} status is not succeed !");
-                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain);
+                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
             }
 
             List<AssetInfo> assetInfos = new List<AssetInfo>();
@@ -175,7 +175,7 @@ namespace YooAsset
             assetInfos.Add(assetInfo);
 
             List<BundleInfo> downloadList = _impl.GetDownloadListByPaths(_manifest, assetInfos.ToArray(), recursiveDownload);
-            var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain);
+            var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
 
@@ -191,7 +191,7 @@ namespace YooAsset
             if (Status != EOperationStatus.Succeed)
             {
                 YooLogger.Warning($"{nameof(PreDownloadContentOperation)} status is not succeed !");
-                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain);
+                return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
             }
 
             List<AssetInfo> assetInfos = new List<AssetInfo>(locations.Length);
@@ -202,7 +202,7 @@ namespace YooAsset
             }
 
             List<BundleInfo> downloadList = _impl.GetDownloadListByPaths(_manifest, assetInfos.ToArray(), recursiveDownload);
-            var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain);
+            var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
     }

Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Diagnostics;
 using System.Collections;
 using System.Collections.Generic;
@@ -170,10 +171,10 @@ namespace YooAsset
         }
 
         /// <summary>
-        /// 获取资源对象的依赖列表（框架层查询结果）
+        /// 获取依赖列表
         /// 注意：传入的资源对象一定合法有效！
         /// </summary>
-        public List<PackageBundle> GetAssetAllDependencies(PackageAsset packageAsset)
+        public PackageBundle[] GetAllDependencies(PackageAsset packageAsset)
         {
             List<PackageBundle> result = new List<PackageBundle>(packageAsset.DependBundleIDs.Length);
             foreach (var dependID in packageAsset.DependBundleIDs)
@@ -181,14 +182,14 @@ namespace YooAsset
                 var dependBundle = GetMainPackageBundle(dependID);
                 result.Add(dependBundle);
             }
-            return result;
+            return result.ToArray();
         }
 
         /// <summary>
-        /// 获取资源包的依赖列表（引擎层查询结果）
+        /// 获取依赖列表
         /// 注意：传入的资源包对象一定合法有效！
         /// </summary>
-        public List<PackageBundle> GetBundleAllDependencies(PackageBundle packageBundle)
+        public PackageBundle[] GetAllDependencies(PackageBundle packageBundle)
         {
             List<PackageBundle> result = new List<PackageBundle>(packageBundle.DependBundleIDs.Length);
             foreach (var dependID in packageBundle.DependBundleIDs)
@@ -196,7 +197,7 @@ namespace YooAsset
                 var dependBundle = GetMainPackageBundle(dependID);
                 result.Add(dependBundle);
             }
-            return result;
+            return result.ToArray();
         }
 
         /// <summary>
@@ -210,17 +211,17 @@ namespace YooAsset
         /// <summary>
         /// 尝试获取包裹的资源包
         /// </summary>
-        public bool TryGetPackageBundleByFileName(string fileName, out PackageBundle result)
+        public bool TryGetPackageBundleByBundleName(string bundleName, out PackageBundle result)
         {
-            return BundleDic2.TryGetValue(fileName, out result);
+            return BundleDic1.TryGetValue(bundleName, out result);
         }
 
         /// <summary>
         /// 尝试获取包裹的资源包
         /// </summary>
-        public bool TryGetPackageBundleByBundleName(string bundleName, out PackageBundle result)
+        public bool TryGetPackageBundleByFileName(string fileName, out PackageBundle result)
         {
-            return BundleDic1.TryGetValue(bundleName, out result);
+            return BundleDic2.TryGetValue(fileName, out result);
         }
 
         /// <summary>
@@ -244,14 +245,13 @@ namespace YooAsset
         /// </summary>
         public AssetInfo[] GetAllAssetInfos()
         {
-            AssetInfo[] result = new AssetInfo[AssetList.Count];
-            for (int i = 0; i < AssetList.Count; i++)
+            List<AssetInfo> result = new List<AssetInfo>(AssetList.Count);
+            foreach (var packageAsset in AssetList)
             {
-                var packageAsset = AssetList[i];
                 AssetInfo assetInfo = new AssetInfo(PackageName, packageAsset, null);
-                result[i] = assetInfo;
+                result.Add(assetInfo);
             }
-            return result;
+            return result.ToArray();
         }
 
         /// <summary>
@@ -259,7 +259,7 @@ namespace YooAsset
         /// </summary>
         public AssetInfo[] GetAssetInfosByTags(string[] tags)
         {
-            List<AssetInfo> result = new List<AssetInfo>(AssetList.Count);
+            List<AssetInfo> result = new List<AssetInfo>(100);
             foreach (var packageAsset in AssetList)
             {
                 if (packageAsset.HasTag(tags))

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

@@ -10,7 +10,7 @@ namespace YooAsset
             buildParam.InvokeAssmeblyName = "YooAsset.Editor";
             buildParam.InvokeClassFullName = "YooAsset.Editor.AssetBundleSimulateBuilder";
             buildParam.InvokeMethodName = "SimulateBuild";
-            return PackageInvokeBuilder.InvokeBuilder(buildParam);
+            return PakcageInvokeBuilder.InvokeBuilder(buildParam);
         }
     }
 }

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

@@ -104,50 +104,44 @@ namespace YooAsset
         }
 
         // 下载相关
-        ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByAll(int downloadingMaxNumber, int failedTryAgain)
+        ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByAll(int downloadingMaxNumber, int failedTryAgain, int timeout)
         {
             List<BundleInfo> downloadList = GetDownloadListByAll(ActiveManifest);
-            var operation = new ResourceDownloaderOperation(PackageName, downloadList, downloadingMaxNumber, failedTryAgain);
+            var operation = new ResourceDownloaderOperation(PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
-        ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByTags(string[] tags, int downloadingMaxNumber, int failedTryAgain)
+        ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByTags(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout)
         {
             List<BundleInfo> downloadList = GetDownloadListByTags(ActiveManifest, tags);
-            var operation = new ResourceDownloaderOperation(PackageName, downloadList, downloadingMaxNumber, failedTryAgain);
+            var operation = new ResourceDownloaderOperation(PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
-        ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByPaths(AssetInfo[] assetInfos, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain)
+        ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByPaths(AssetInfo[] assetInfos, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout)
         {
             List<BundleInfo> downloadList = GetDownloadListByPaths(ActiveManifest, assetInfos, recursiveDownload);
-            var operation = new ResourceDownloaderOperation(PackageName, downloadList, downloadingMaxNumber, failedTryAgain);
+            var operation = new ResourceDownloaderOperation(PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
 
         // 解压相关
-        ResourceUnpackerOperation IPlayMode.CreateResourceUnpackerByAll(int upackingMaxNumber, int failedTryAgain)
+        ResourceUnpackerOperation IPlayMode.CreateResourceUnpackerByAll(int upackingMaxNumber, int failedTryAgain, int timeout)
         {
             List<BundleInfo> unpcakList = GetUnpackListByAll(ActiveManifest);
-            var operation = new ResourceUnpackerOperation(PackageName, unpcakList, upackingMaxNumber, failedTryAgain);
+            var operation = new ResourceUnpackerOperation(PackageName, unpcakList, upackingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
-        ResourceUnpackerOperation IPlayMode.CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain)
+        ResourceUnpackerOperation IPlayMode.CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain, int timeout)
         {
             List<BundleInfo> unpcakList = GetUnpackListByTags(ActiveManifest, tags);
-            var operation = new ResourceUnpackerOperation(PackageName, unpcakList, upackingMaxNumber, failedTryAgain);
+            var operation = new ResourceUnpackerOperation(PackageName, unpcakList, upackingMaxNumber, failedTryAgain, timeout);
             return operation;
         }
 
         // 导入相关
-        ResourceImporterOperation IPlayMode.CreateResourceImporterByFilePaths(string[] filePaths, int importingMaxNumber, int failedTryAgain)
+        ResourceImporterOperation IPlayMode.CreateResourceImporterByFilePaths(string[] filePaths, int importerMaxNumber, int failedTryAgain, int timeout)
         {
             List<BundleInfo> importerList = GetImporterListByFilePaths(ActiveManifest, filePaths);
-            var operation = new ResourceImporterOperation(PackageName, importerList, importingMaxNumber, failedTryAgain);
-            return operation;
-        }
-        ResourceImporterOperation IPlayMode.CreateResourceImporterByFileInfos(ImportFileInfo[] fileInfos, int importingMaxNumber, int failedTryAgain)
-        {
-            List<BundleInfo> importerList = GetImporterListByFileInfos(ActiveManifest, fileInfos);
-            var operation = new ResourceImporterOperation(PackageName, importerList, importingMaxNumber, failedTryAgain);
+            var operation = new ResourceImporterOperation(PackageName, importerList, importerMaxNumber, failedTryAgain, timeout);
             return operation;
         }
         #endregion
@@ -176,30 +170,30 @@ namespace YooAsset
             var packageBundle = ActiveManifest.GetMainPackageBundle(assetInfo.Asset);
             return CreateBundleInfo(packageBundle);
         }
-        List<BundleInfo> IBundleQuery.GetDependBundleInfos(AssetInfo assetInfo)
+        BundleInfo[] IBundleQuery.GetDependBundleInfos(AssetInfo assetInfo)
         {
             if (assetInfo == null || assetInfo.IsInvalid)
                 throw new Exception("Should never get here !");
 
             // 注意：如果清单里未找到资源包会抛出异常！
-            List<PackageBundle> depends;
+            PackageBundle[] depends;
             if (assetInfo.LoadMethod == AssetInfo.ELoadMethod.LoadAllAssets)
             {
                 var mainBundle = ActiveManifest.GetMainPackageBundle(assetInfo.Asset);
-                depends = ActiveManifest.GetBundleAllDependencies(mainBundle);
+                depends = ActiveManifest.GetAllDependencies(mainBundle);
             }
             else
             {
-                depends = ActiveManifest.GetAssetAllDependencies(assetInfo.Asset);
+                depends = ActiveManifest.GetAllDependencies(assetInfo.Asset);
             }
 
-            List<BundleInfo> result = new List<BundleInfo>(depends.Count);
+            List<BundleInfo> result = new List<BundleInfo>(depends.Length);
             foreach (var packageBundle in depends)
             {
                 BundleInfo bundleInfo = CreateBundleInfo(packageBundle);
                 result.Add(bundleInfo);
             }
-            return result;
+            return result.ToArray();
         }
         string IBundleQuery.GetMainBundleName(int bundleID)
         {
@@ -207,6 +201,29 @@ namespace YooAsset
             var packageBundle = ActiveManifest.GetMainPackageBundle(bundleID);
             return packageBundle.BundleName;
         }
+        string IBundleQuery.GetMainBundleName(AssetInfo assetInfo)
+        {
+            if (assetInfo == null || assetInfo.IsInvalid)
+                throw new Exception("Should never get here !");
+
+            // 注意：如果清单里未找到资源包会抛出异常！
+            var packageBundle = ActiveManifest.GetMainPackageBundle(assetInfo.Asset);
+            return packageBundle.BundleName;
+        }
+        string[] IBundleQuery.GetDependBundleNames(AssetInfo assetInfo)
+        {
+            if (assetInfo == null || assetInfo.IsInvalid)
+                throw new Exception("Should never get here !");
+
+            // 注意：如果清单里未找到资源包会抛出异常！
+            var depends = ActiveManifest.GetAllDependencies(assetInfo.Asset);
+            List<string> result = new List<string>(depends.Length);
+            foreach (var packageBundle in depends)
+            {
+                result.Add(packageBundle.BundleName);
+            }
+            return result.ToArray();
+        }
         #endregion
 
         /// <summary>
@@ -313,7 +330,7 @@ namespace YooAsset
                     checkList.Add(mainBundle);
 
                 // 注意：如果清单里未找到资源包会抛出异常！
-                List<PackageBundle> mainDependBundles = manifest.GetAssetAllDependencies(assetInfo.Asset);
+                PackageBundle[] mainDependBundles = manifest.GetAllDependencies(assetInfo.Asset);
                 foreach (var dependBundle in mainDependBundles)
                 {
                     if (checkList.Contains(dependBundle) == false)
@@ -329,7 +346,7 @@ namespace YooAsset
                         if (checkList.Contains(otherMainBundle) == false)
                             checkList.Add(otherMainBundle);
 
-                        List<PackageBundle> otherDependBundles = manifest.GetAssetAllDependencies(otherMainAsset);
+                        PackageBundle[] otherDependBundles = manifest.GetAllDependencies(otherMainAsset);
                         foreach (var dependBundle in otherDependBundles)
                         {
                             if (checkList.Contains(dependBundle) == false)
@@ -398,60 +415,15 @@ namespace YooAsset
             return result;
         }
         public List<BundleInfo> GetImporterListByFilePaths(PackageManifest manifest, string[] filePaths)
-        {
-            if (manifest == null)
-                return new List<BundleInfo>();
-
-            ImportFileInfo[] fileInfos = new ImportFileInfo[filePaths.Length];
-            for (int i = 0; i < filePaths.Length; i++)
-            {
-                ImportFileInfo fileInfo = new ImportFileInfo();
-                fileInfo.FilePath = filePaths[i];
-                fileInfos[i] = fileInfo;
-            }
-
-            return GetImporterListByFileInfos(manifest, fileInfos);
-        }
-        public List<BundleInfo> GetImporterListByFileInfos(PackageManifest manifest, ImportFileInfo[] fileInfos)
         {
             if (manifest == null)
                 return new List<BundleInfo>();
 
             List<BundleInfo> result = new List<BundleInfo>();
-            foreach (var fileInfo in fileInfos)
+            foreach (var filePath in filePaths)
             {
-                string filePath = fileInfo.FilePath;
-                if (string.IsNullOrEmpty(filePath))
-                    continue;
-
-                PackageBundle packageBundle = null;
-                if (string.IsNullOrEmpty(fileInfo.BundleName) == false)
-                {
-                    if (manifest.TryGetPackageBundleByBundleName(fileInfo.BundleName, out packageBundle) == false)
-                    {
-                        YooLogger.Warning($"Not found package bundle, bundle name : {fileInfo.BundleName}");
-                        continue;
-                    }
-                }
-                else if (string.IsNullOrEmpty(fileInfo.BundleGUID) == false)
-                {
-                    if (manifest.TryGetPackageBundleByBundleGUID(fileInfo.BundleGUID, out packageBundle) == false)
-                    {
-                        YooLogger.Warning($"Not found package bundle, bundle guid : {fileInfo.BundleGUID}");
-                        continue;
-                    }
-                }
-                else
-                {
-                    string fileName = System.IO.Path.GetFileName(filePath);
-                    if (manifest.TryGetPackageBundleByFileName(fileName, out packageBundle) == false)
-                    {
-                        YooLogger.Warning($"Not found package bundle, file name : {fileName}");
-                        continue;
-                    }
-                }
-
-                if (packageBundle != null)
+                string fileName = System.IO.Path.GetFileName(filePath);
+                if (manifest.TryGetPackageBundleByFileName(fileName, out PackageBundle packageBundle))
                 {
                     var fileSystem = GetBelongFileSystem(packageBundle);
                     if (fileSystem == null)
@@ -463,6 +435,10 @@ namespace YooAsset
                         result.Add(bundleInfo);
                     }
                 }
+                else
+                {
+                    YooLogger.Warning($"Not found package bundle, importer file path : {filePath}");
+                }
             }
             return result;
         }

Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs

@@ -361,21 +361,21 @@ namespace YooAsset
         /// 资源回收
         /// 说明：尝试卸载指定的资源
         /// </summary>
-        public void TryUnloadUnusedAsset(string location, int loopCount = 10)
+        public void TryUnloadUnusedAsset(string location)
         {
             DebugCheckInitialize();
             AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
-            _resourceManager.TryUnloadUnusedAsset(assetInfo, loopCount);
+            _resourceManager.TryUnloadUnusedAsset(assetInfo);
         }
 
         /// <summary>
         /// 资源回收
         /// 说明：尝试卸载指定的资源
         /// </summary>
-        public void TryUnloadUnusedAsset(AssetInfo assetInfo, int loopCount = 10)
+        public void TryUnloadUnusedAsset(AssetInfo assetInfo)
         {
             DebugCheckInitialize();
-            _resourceManager.TryUnloadUnusedAsset(assetInfo, loopCount);
+            _resourceManager.TryUnloadUnusedAsset(assetInfo);
         }
         #endregion
 
@@ -496,7 +496,7 @@ namespace YooAsset
             if (bundleInfo.IsNeedDownloadFromRemote())
                 return true;
 
-            List<BundleInfo> depends = _bundleQuery.GetDependBundleInfos(assetInfo);
+            BundleInfo[] depends = _bundleQuery.GetDependBundleInfos(assetInfo);
             foreach (var depend in depends)
             {
                 if (depend.IsNeedDownloadFromRemote())
@@ -555,7 +555,6 @@ namespace YooAsset
 
         private RawFileHandle LoadRawFileInternal(AssetInfo assetInfo, bool waitForAsyncComplete, uint priority)
         {
-            assetInfo.LoadMethod = AssetInfo.ELoadMethod.LoadRawFile;
             var handle = _resourceManager.LoadRawFileAsync(assetInfo, priority);
             if (waitForAsyncComplete)
                 handle.WaitForAsyncComplete();
@@ -970,7 +969,7 @@ namespace YooAsset
         public ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             DebugCheckInitialize();
-            return _playModeImpl.CreateResourceDownloaderByAll(downloadingMaxNumber, failedTryAgain);
+            return _playModeImpl.CreateResourceDownloaderByAll(downloadingMaxNumber, failedTryAgain, timeout);
         }
 
         /// <summary>
@@ -983,7 +982,7 @@ namespace YooAsset
         public ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             DebugCheckInitialize();
-            return _playModeImpl.CreateResourceDownloaderByTags(new string[] { tag }, downloadingMaxNumber, failedTryAgain);
+            return _playModeImpl.CreateResourceDownloaderByTags(new string[] { tag }, downloadingMaxNumber, failedTryAgain, timeout);
         }
 
         /// <summary>
@@ -996,7 +995,7 @@ namespace YooAsset
         public ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             DebugCheckInitialize();
-            return _playModeImpl.CreateResourceDownloaderByTags(tags, downloadingMaxNumber, failedTryAgain);
+            return _playModeImpl.CreateResourceDownloaderByTags(tags, downloadingMaxNumber, failedTryAgain, timeout);
         }
 
         /// <summary>
@@ -1012,11 +1011,11 @@ namespace YooAsset
             DebugCheckInitialize();
             var assetInfo = ConvertLocationToAssetInfo(location, null);
             AssetInfo[] assetInfos = new AssetInfo[] { assetInfo };
-            return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos, recursiveDownload, downloadingMaxNumber, failedTryAgain);
+            return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos, recursiveDownload, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public ResourceDownloaderOperation CreateBundleDownloader(string location, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return CreateBundleDownloader(location, false, downloadingMaxNumber, failedTryAgain);
+            return CreateBundleDownloader(location, false, downloadingMaxNumber, failedTryAgain, timeout);
         }
 
         /// <summary>
@@ -1036,11 +1035,11 @@ namespace YooAsset
                 var assetInfo = ConvertLocationToAssetInfo(location, null);
                 assetInfos.Add(assetInfo);
             }
-            return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos.ToArray(), recursiveDownload, downloadingMaxNumber, failedTryAgain);
+            return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos.ToArray(), recursiveDownload, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return CreateBundleDownloader(locations, false, downloadingMaxNumber, failedTryAgain);
+            return CreateBundleDownloader(locations, false, downloadingMaxNumber, failedTryAgain, timeout);
         }
 
         /// <summary>
@@ -1055,11 +1054,11 @@ namespace YooAsset
         {
             DebugCheckInitialize();
             AssetInfo[] assetInfos = new AssetInfo[] { assetInfo };
-            return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos, recursiveDownload, downloadingMaxNumber, failedTryAgain);
+            return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos, recursiveDownload, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo assetInfo, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return CreateBundleDownloader(assetInfo, false, downloadingMaxNumber, failedTryAgain);
+            return CreateBundleDownloader(assetInfo, false, downloadingMaxNumber, failedTryAgain, timeout);
         }
 
         /// <summary>
@@ -1073,11 +1072,11 @@ namespace YooAsset
         public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo[] assetInfos, bool recursiveDownload, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
             DebugCheckInitialize();
-            return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos, recursiveDownload, downloadingMaxNumber, failedTryAgain);
+            return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos, recursiveDownload, downloadingMaxNumber, failedTryAgain, timeout);
         }
         public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
         {
-            return CreateBundleDownloader(assetInfos, false, downloadingMaxNumber, failedTryAgain);
+            return CreateBundleDownloader(assetInfos, false, downloadingMaxNumber, failedTryAgain, timeout);
         }
         #endregion
 
@@ -1090,7 +1089,7 @@ namespace YooAsset
         public ResourceUnpackerOperation CreateResourceUnpacker(int unpackingMaxNumber, int failedTryAgain)
         {
             DebugCheckInitialize();
-            return _playModeImpl.CreateResourceUnpackerByAll(unpackingMaxNumber, failedTryAgain);
+            return _playModeImpl.CreateResourceUnpackerByAll(unpackingMaxNumber, failedTryAgain, int.MaxValue);
         }
 
         /// <summary>
@@ -1102,7 +1101,7 @@ namespace YooAsset
         public ResourceUnpackerOperation CreateResourceUnpacker(string tag, int unpackingMaxNumber, int failedTryAgain)
         {
             DebugCheckInitialize();
-            return _playModeImpl.CreateResourceUnpackerByTags(new string[] { tag }, unpackingMaxNumber, failedTryAgain);
+            return _playModeImpl.CreateResourceUnpackerByTags(new string[] { tag }, unpackingMaxNumber, failedTryAgain, int.MaxValue);
         }
 
         /// <summary>
@@ -1114,7 +1113,7 @@ namespace YooAsset
         public ResourceUnpackerOperation CreateResourceUnpacker(string[] tags, int unpackingMaxNumber, int failedTryAgain)
         {
             DebugCheckInitialize();
-            return _playModeImpl.CreateResourceUnpackerByTags(tags, unpackingMaxNumber, failedTryAgain);
+            return _playModeImpl.CreateResourceUnpackerByTags(tags, unpackingMaxNumber, failedTryAgain, int.MaxValue);
         }
         #endregion
 
@@ -1129,20 +1128,7 @@ namespace YooAsset
         public ResourceImporterOperation CreateResourceImporter(string[] filePaths, int importerMaxNumber, int failedTryAgain)
         {
             DebugCheckInitialize();
-            return _playModeImpl.CreateResourceImporterByFilePaths(filePaths, importerMaxNumber, failedTryAgain);
-        }
-
-        /// <summary>
-        /// 创建资源导入器
-        /// 注意：资源信息里需要指定BundleName或BundleGUID！
-        /// </summary>
-        /// <param name="fileInfos">资源信息列表</param>
-        /// <param name="importerMaxNumber">同时导入的最大文件数</param>
-        /// <param name="failedTryAgain">导入失败的重试次数</param>
-        public ResourceImporterOperation CreateResourceImporter(ImportFileInfo[] fileInfos, int importerMaxNumber, int failedTryAgain)
-        {
-            DebugCheckInitialize();
-            return _playModeImpl.CreateResourceImporterByFileInfos(fileInfos, importerMaxNumber, failedTryAgain);
+            return _playModeImpl.CreateResourceImporterByFilePaths(filePaths, importerMaxNumber, failedTryAgain, int.MaxValue);
         }
         #endregion
 

Assets/YooAsset/Runtime/Services/ICopyLocalFileServices.cs

@@ -1,30 +0,0 @@
-
-namespace YooAsset
-{
-    public struct LocalFileInfo
-    {
-        /// <summary>
-        /// 包裹名称
-        /// </summary>
-        public string PackageName;
-
-        /// <summary>
-        /// 资源包名称
-        /// </summary>
-        public string BundleName;
-
-        /// <summary>
-        /// 源文件请求地址
-        /// </summary>
-        public string SourceFileURL;
-    }
-
-    /// <summary>
-    /// 本地文件拷贝服务类
-    /// 备注：包体内文件拷贝，沙盒内文件导入都会触发该服务！
-    /// </summary>
-    public interface ICopyLocalFileServices
-    {
-        void CopyFile(LocalFileInfo sourceFileInfo, string destFilePath);
-    }
-}

Assets/YooAsset/Runtime/Services/ICopyLocalFileServices.cs.meta

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

Assets/YooAsset/Runtime/Services/IManifestProcessServices.cs

@@ -1,14 +0,0 @@
-
-namespace YooAsset
-{
-    /// <summary>
-    /// 资源清单文件处理服务接口
-    /// </summary>
-    public interface IManifestProcessServices
-    {
-        /// <summary>
-        /// 处理资源清单（压缩或加密）
-        /// </summary>
-        byte[] ProcessManifest(byte[] fileData);
-    }
-}