Merge 1c4aba6db5 into e57466e9e2

.gitignore

@@ -15,9 +15,7 @@
 /Bundles/
 /ProjectSettings/
 /App/
-/yoo/
-/Assets/Docs
-/Assets/Docs.meta
+/yoo/ 
 /Assets/StreamingAssets
 /Assets/StreamingAssets.meta
 /Assets/Samples
@@ -72,7 +70,6 @@ sysinfo.txt
 # Builds
 *.apk
 *.unitypackage
-*.zip
 
 # Crashlytics generated file
 crashlytics-build.properties

Assets/YooAsset/CHANGELOG.md

@@ -2,410 +2,6 @@
 
 All notable changes to this package will be documented in this file.
 
-## [2.3.18] - 2025-12-04
-
-### Fixed
-
-- (#676) 修复了UniTask扩展包的编译报错。
-- (#684) 修复了资源配置窗口Group列表数量过多的时候，添加和删除按钮会变小的问题。
-- (#700) [**严重**] 修复了小游戏扩展库的下载器再失败后重试逻辑不起效的问题。
-
-### Added
-
-- (#683) 新增了内置文件系统类初始化参数：UNPACK_FILE_SYSTEM_ROOT
-
-  ```csharp
-  class FileSystemParametersDefine
-  {
-      // 指定解压文件的根目录
-      public const string UNPACK_FILE_SYSTEM_ROOT = "UNPACK_FILE_SYSTEM_ROOT";
-  }
-  ```
-
-- (#682) 原生文件构建管线新增构建参数：IncludePathInHash
-
-  ```csharp
-  class RawFileBuildParameters : BuildParameters
-  {
-      /// <summary>
-      /// 文件哈希值计算包含路径信息
-      /// </summary>
-      public bool IncludePathInHash = false;
-  }
-  ```
-
-- (#671) 新增扩展工具，可以生成空的包裹内置资源目录文件。
-
-  ```csharp
-  public class CreateEmptyCatalogWindow : EditorWindow
-  ```
-
-- (#694) 新增资源清理方式：ClearBundleFilesByLocations
-
-  ```csharp
-  public enum EFileClearMode
-  {
-      /// <summary>
-      /// 清理指定地址的文件
-      /// 说明：需要指定参数，可选：string, string[], List<string>
-      /// </summary>
-      ClearBundleFilesByLocations,
-  }
-  ```
-
-## [2.3.17] - 2025-10-30
-
-**非常重要**：修复了#627优化导致的资源清单CRC值为空的问题。
-
-该问题会导致下载的损坏文件验证通过。
-
-影响范围：v2.3.15版本，v2.3.16版本。
-
-**非常重要**：(#661) 修复了Package销毁过程中，遇到正在加载的AssetBundle会导致无法卸载的问题。
-
-该问题是偶现，引擎会提示AssetBundle已经加载，无法加载新的文件，导致资源对象加载失败！
-
-影响范围：所有版本！
-
-### Fixed
-
-- (#645) 修复了着色器变种收集工具，在极端情况下变种收集不完整的问题。
-- (#646) 修复了EditorSimulateMode模式下开启模拟下载tag不生效的问题。
-- (#667) 修复了所有编辑器窗口针对中文IME的输入问题。
-- (#670) 修复了Catalog文件生成过程中白名单未考虑自定义清单前缀名。
-
-### Improvements
-
-- 重构并统一了资源清单的反序列化逻辑。
-- (#650) 解决互相依赖的资源包无法卸载的问题。需要开启宏定义：YOOASSET_EXPERIMENTAL
-- (#655) 优化了初始化的时候，缓存文件搜索效率。安卓平台性能提升1倍，IOS平台性能提升3倍。
-
-### Added
-
-- (#643) 新增构建参数，可以节省资源清单运行时内存
-
-  ```csharp
-  class ScriptableBuildParameters
-  {
-      /// <summary>
-      /// 使用可寻址地址代替资源路径
-      /// 说明：开启此项可以节省运行时清单占用的内存！
-      /// </summary>
-      public bool ReplaceAssetPathWithAddress = false;
-  }
-  ```
-
-- (#648) 新增初始化参数，可以自动释放引用计数为零的资源包
-
-  ```csharp
-  class InitializeParameters
-  {
-      /// <summary>
-      /// 当资源引用计数为零的时候自动释放资源包
-      /// </summary>
-      public bool AutoUnloadBundleWhenUnused = false;
-  }
-  ```
-
-### Changed
-
-- 程序集宏定义代码转移到扩展工程。参考MacroSupport文件夹。
-
-## [2.3.16] - 2025-09-17
-
-### Improvements
-
-- (#638) 优化了Provider加载机制，引用计数为零时自动挂起！
-
-### Fixed
-
-- (#644) [**严重**] 修复了2.3.15版本，资产量巨大的情况下，编辑器下模拟模式初始化耗时很久的问题。
-
-### Added
-
-- (#639) 新增了文件系统参数：VIRTUAL_DOWNLOAD_MODE 和 VIRTUAL_DOWNLOAD_SPEED 
-
-  编辑器下不需要构建AB，也可以模拟远端资源下载，等同真机运行环境。
-
-  ```csharp
-  class DefaultEditorFIleSystem
-  {
-      /// <summary>
-      /// 模拟虚拟下载模式
-      /// </summary>
-      public bool VirtualDownloadMode { private set; get; } = false;
-  
-      /// <summary>
-      /// 模拟虚拟下载的网速（单位：字节）
-      /// </summary>
-      public int VirtualDownloadSpeed { private set; get; } = 1024;
-  }
-  ```
-
-- (#640) 新增了文件系统参数：VIRTUAL_WEBGL_MODE 
-
-  编辑器下不需要构建AB，也可以模拟小游戏开发环境，等同真机运行环境。
-
-  ```csharp
-  class DefaultEditorFIleSystem
-  {
-      /// <summary>
-      /// 模拟WebGL平台模式
-      /// </summary>
-      public bool VirtualWebGLMode { private set; get; } = false;
-  }
-  ```
-
-- (#642) 新增了文件系统参数：DOWNLOAD_WATCH_DOG_TIME
-
-  监控时间范围内，如果没有接收到任何下载数据，那么直接终止任务！
-
-  ```csharp
-  class DefaultCacheFIleSystem
-  {
-      /// <summary>
-      /// 自定义参数：下载任务的看门狗机制监控时间
-      /// </summary>
-      public int DownloadWatchDogTime { private set; get; } = int.MaxValue;
-  }
-  ```
-
-### Changed
-
-- 下载器参数timeout移除。
-
-  可以使用文件系统的看门狗机制代替。
-
-- (#632) IFilterRule接口变动。
-
-  收集器可以指定搜寻的资源类型，在收集目录资产量巨大的情况下，可以极大加快打包速度！
-
-  ```csharp
-  public interface IFilterRule
-  {
-      /// <summary>
-      /// 搜寻的资源类型
-      /// 说明：使用引擎方法搜索获取所有资源列表
-      /// </summary>
-      string FindAssetType { get; } 
-  }
-  ```
-
-  
-
-## [2.3.15] - 2025-09-09
-
-**重要**：升级了资源清单版本，不兼容老版本。建议重新提审安装包。
-
-### Improvements
-
-- 重构了UniTask扩展库的目录结构和说明文档。
-- 重构了内置文件系统类的加载和拷贝逻辑，解决在一些特殊机型上遇到的偶发性拷贝失败问题。
-- 增加了生成内置清单文件的窗口工具，详情见扩展工程里CreateBuildinCatalog目录。
-- 优化了异步操作系统的繁忙检测机制。
-- (#621) 资源配置页面可以展示DependCollector和StaticCollector包含的文件列表内容。
-- (#627) 优化了资源清单部分字段类型，CRC字段从字符串类型调整为整形，可以降低清单尺寸。
-
-### Fixed
-
-- 修复了构建页面扩展类缺少指定属性报错的问题。
-- (#611)  修复了资源扫描器配置页面，修改备注信息后会丢失焦点的问题。
-- (#622)  修复了纯鸿蒙系统读取内置加密文件失败的问题。
-- (#620)  修复了LINUX系统URL地址转换失败的问题。
-- (#631)  修复了NET 4.x程序集库Math.Clamp导致的编译错误。
-
-### Added
-
-- 新增了支持支付宝小游戏的文件系统扩展类。
-
-- 新增了支持Taptap小游戏的文件系统扩展类。
-
-- 新增了资源系统初始化参数：UseWeakReferenceHandle 
-
-  目前处于预览版，可以在引擎设置页面开启宏：YOOASSET_EXPERIMENTAL
-
-  ```csharp
-  /// <summary>
-  /// 启用弱引用资源句柄
-  /// </summary>
-  public bool UseWeakReferenceHandle = false;
-  ```
-
-- 内置文件系统和缓存文件系统新增初始化参数：FILE_VERIFY_MAX_CONCURRENCY 
-
-  ```csharp
-  /// <summary>
-  /// 自定义参数：初始化的时候缓存文件校验最大并发数
-  /// </summary>
-  public int FileVerifyMaxConcurrency { private set; get; }
-  ```
-
-- (#623)  内置构建管线新增构建参数：StripUnityVersion 
-
-  ```csharp
-  /// <summary>
-  /// 从文件头里剥离Unity版本信息
-  /// </summary>
-  public bool StripUnityVersion = false;
-  ```
-
-- 可编程构建管线新增构建参数：TrackSpriteAtlasDependencies
-
-  ```csharp
-  /// <summary>
-  /// 自动建立资源对象对图集的依赖关系
-  /// </summary>
-  public bool TrackSpriteAtlasDependencies = false;
-  ```
-
-- (#617) 新增资源收集配置参数：SupportExtensionless
-
-  在不需要模糊加载模式的前提下，关闭此选项，可以降低运行时内存大小。
-
-  该选项默认开启！
-
-  ```csharp
-  public class CollectCommand
-  {
-      /// <summary>
-      /// 支持无后缀名的资源定位地址
-      /// </summary>
-      public bool SupportExtensionless { set; get; }  
-  }
-  ```
-
-- (#625) 异步操作系统类新增监听方法。
-
-  ```csharp
-  class OperationSystem
-  {
-      /// <summary>
-      /// 监听任务开始
-      /// </summary>
-      public static void RegisterStartCallback(Action<string, AsyncOperationBase> callback);
-          
-      /// <summary>
-      /// 监听任务结束
-      /// </summary>
-      public static void RegisterFinishCallback(Action<string, AsyncOperationBase> callback);
-  }
-  ```
-
-  
-
-## [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/Assembly/MacroDefine.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-#if YOO_MACRO_SUPPORT
+#if YOO_ASSET_EXPERIMENT
 namespace YooAsset.Editor
 {
     public class MacroDefine

Assets/YooAsset/Editor/Assembly/MacroProcessor.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Xml;
 using UnityEditor;
 
-#if YOO_MACRO_SUPPORT
+#if YOO_ASSET_EXPERIMENT
 namespace YooAsset.Editor
 {
     [InitializeOnLoad]

Assets/YooAsset/Editor/Assembly/RspGenerator.cs

@@ -6,7 +6,7 @@ using System.Xml;
 using UnityEditor;
 using UnityEngine;
 
-#if YOO_MACRO_SUPPORT
+#if YOO_ASSET_EXPERIMENT
 namespace YooAsset.Editor.Experiment
 {
     [InitializeOnLoad]

Assets/YooAsset/Editor/AssetArtReporter/AssetArtReporterWindow.cs

@@ -261,14 +261,14 @@ namespace YooAsset.Editor
             catch (System.Exception e)
             {
                 _reportCombiner = null;
-                _titleLabel.text = "Failed to import report!";
+                _titleLabel.text = "导入报告失败！";
                 _descLabel.text = e.Message;
                 UnityEngine.Debug.LogError(e.StackTrace);
             }
         }
         private void FixAllBtn_clicked()
         {
-            if (EditorUtility.DisplayDialog("Info", "Fix all resources (excluding whitelist and hidden elements)", "Yes", "No"))
+            if (EditorUtility.DisplayDialog("提示", "修复全部资源（排除白名单和隐藏元素）", "Yes", "No"))
             {
                 if (_reportCombiner != null)
                     _reportCombiner.FixAll();
@@ -276,7 +276,7 @@ namespace YooAsset.Editor
         }
         private void FixSelectBtn_clicked()
         {
-            if (EditorUtility.DisplayDialog("Info", "Fix selected resources (including whitelist and hidden elements)", "Yes", "No"))
+            if (EditorUtility.DisplayDialog("提示", "修复勾选资源（包含白名单和隐藏元素）", "Yes", "No"))
             {
                 if (_reportCombiner != null)
                     _reportCombiner.FixSelect();
@@ -302,7 +302,7 @@ namespace YooAsset.Editor
         }
         private void ExportFilesBtn_clicked()
         {
-            string selectFolderPath = EditorUtility.OpenFolderPanel("Export all selected resources", EditorTools.GetProjectPath(), string.Empty);
+            string selectFolderPath = EditorUtility.OpenFolderPanel("导入所有选中资源", EditorTools.GetProjectPath(), string.Empty);
             if (string.IsNullOrEmpty(selectFolderPath) == false)
             {
                 if (_reportCombiner != null)

Assets/YooAsset/Editor/AssetArtScanner/AssetArtScannerSetting.cs

@@ -32,14 +32,21 @@ namespace YooAsset.Editor
 
                 // 开始扫描工作
                 ScanReport report = scanner.RunScanner();
+
+                // 检测报告合法性
                 report.CheckError();
 
-                // 返回扫描结果
-                return new ScannerResult(report);
+                // 保存扫描结果
+                string saveDirectory = scanner.SaveDirectory;
+                if (string.IsNullOrEmpty(saveDirectory))
+                    saveDirectory = "Assets/";
+                string filePath = $"{saveDirectory}/{scanner.ScannerName}_{scanner.ScannerDesc}.json";
+                ScanReportConfig.ExportJsonConfig(filePath, report);
+                return new ScannerResult(filePath, report);
             }
             catch (Exception e)
             {
-                return new ScannerResult(e.Message, e.StackTrace);
+                return new ScannerResult(e.StackTrace);
             }
         }
 

Assets/YooAsset/Editor/AssetArtScanner/AssetArtScannerWindow.cs

@@ -240,7 +240,7 @@ namespace YooAsset.Editor
         }
         private void ScanAllBtn_clicked()
         {
-            if (EditorUtility.DisplayDialog("Info", $"Start full scan!", "Yes", "No"))
+            if (EditorUtility.DisplayDialog("提示", $"开始全面扫描！", "Yes", "No"))
             {
                 string searchKeyWord = _scannerSearchField.value;
                 AssetArtScannerSettingData.ScanAll(searchKeyWord);
@@ -248,7 +248,7 @@ namespace YooAsset.Editor
             }
             else
             {
-                Debug.LogWarning("Full scan has been canceled.");
+                Debug.LogWarning("全面扫描已经取消");
             }
         }
         private void ScanBtn_clicked()
@@ -294,11 +294,6 @@ namespace YooAsset.Editor
                 _scannerListView.itemsSource = filterItems;
                 _scannerListView.Rebuild();
             }
-
-            if (_lastModifyScannerIndex >= 0 && _lastModifyScannerIndex < _scannerListView.itemsSource.Count)
-            {
-                _scannerListView.selectedIndex = _lastModifyScannerIndex;
-            }
         }
         private List<AssetArtScanner> FilterScanners()
         {

Assets/YooAsset/Editor/AssetArtScanner/ScannerResult.cs

@@ -3,6 +3,11 @@ namespace YooAsset.Editor
 {
     public class ScannerResult
     {
+        /// <summary>
+        /// 生成的报告文件路径
+        /// </summary>
+        public string ReprotFilePath { private set; get; }
+
         /// <summary>
         /// 报告对象
         /// </summary>
@@ -13,11 +18,6 @@ namespace YooAsset.Editor
         /// </summary>
         public string ErrorInfo { private set; get; }
 
-        /// <summary>
-        /// 错误堆栈
-        /// </summary>
-        public string ErrorStack { private set; get; }
-
         /// <summary>
         /// 是否成功
         /// </summary>
@@ -33,14 +33,15 @@ namespace YooAsset.Editor
         }
 
 
-        public ScannerResult(string error, string stack)
+        public ScannerResult(string error)
         {
             ErrorInfo = error;
-            ErrorStack = stack;
         }
-        public ScannerResult(ScanReport report)
+        public ScannerResult(string filePath, ScanReport report)
         {
+            ReprotFilePath = filePath;
             Report = report;
+            ErrorInfo = string.Empty;
         }
 
         /// <summary>
@@ -54,19 +55,5 @@ namespace YooAsset.Editor
                 reproterWindow.ImportSingleReprotFile(Report);
             }
         }
-
-        /// <summary>
-        /// 保存报告文件
-        /// </summary>
-        public void SaveReportFile(string saveDirectory)
-        {
-            if (Report == null)
-                throw new System.Exception("Scan report is invalid !");
-
-            if (string.IsNullOrEmpty(saveDirectory))
-                saveDirectory = "Assets/";
-            string filePath = $"{saveDirectory}/{Report.ReportName}_{Report.ReportDesc}.json";
-            ScanReportConfig.ExportJsonConfig(filePath, Report);
-        }
     }
 }

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/AssetBundleBuilderWindow.cs

@@ -77,12 +77,6 @@ namespace YooAsset.Editor
                     foreach (var classType in viewerClassTypes)
                     {
                         var buildPipelineAttribute = EditorTools.GetAttribute<BuildPipelineAttribute>(classType);
-                        if (buildPipelineAttribute == null)
-                        {
-                            Debug.LogWarning($"The class {classType.FullName} need attribute {nameof(BuildPipelineAttribute)}");
-                            continue;
-                        }
-
                         string pipelineName = buildPipelineAttribute.PipelineName;
                         if (_viewClassDic.ContainsKey(pipelineName))
                         {

Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs

@@ -27,7 +27,7 @@ namespace YooAsset.Editor
         /// <summary>
         /// 文件哈希值
         /// </summary>
-        public uint PackageFileCRC { set; get; }
+        public string PackageFileCRC { set; get; }
 
         /// <summary>
         /// 文件哈希值
@@ -106,27 +106,7 @@ namespace YooAsset.Editor
         /// </summary>
         public string[] GetAllPackAssetPaths()
         {
-            List<string> results = new List<string>(AllPackAssets.Count);
-            for (int i = 0; i < AllPackAssets.Count; i++)
-            {
-                var packAsset = AllPackAssets[i];
-                results.Add(packAsset.AssetInfo.AssetPath);
-            }
-            return results.ToArray();
-        }
-
-        /// <summary>
-        /// 获取构建的资源可寻址列表
-        /// </summary>
-        public string[] GetAllPackAssetAddress()
-        {
-            List<string> results = new List<string>(AllPackAssets.Count);
-            for (int i = 0; i < AllPackAssets.Count; i++)
-            {
-                var packAsset = AllPackAssets[i];
-                results.Add(packAsset.Address);
-            }
-            return results.ToArray();
+            return AllPackAssets.Select(t => t.AssetInfo.AssetPath).ToArray();
         }
 
         /// <summary>
@@ -173,15 +153,13 @@ namespace YooAsset.Editor
         /// <summary>
         /// 创建AssetBundleBuild类
         /// </summary>
-        public UnityEditor.AssetBundleBuild CreatePipelineBuild(bool replaceAssetPathWithAddress)
+        public UnityEditor.AssetBundleBuild CreatePipelineBuild()
         {
             // 注意：我们不再支持AssetBundle的变种机制
             AssetBundleBuild build = new AssetBundleBuild();
             build.assetBundleName = BundleName;
             build.assetBundleVariant = string.Empty;
             build.assetNames = GetAllPackAssetPaths();
-            if (replaceAssetPathWithAddress)
-                build.addressableNames = GetAllPackAssetAddress();
             return build;
         }
 

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs

@@ -13,11 +13,6 @@ namespace YooAsset.Editor
         /// </summary>
         private readonly Dictionary<string, BuildBundleInfo> _bundleInfoDic = new Dictionary<string, BuildBundleInfo>(10000);
 
-        /// <summary>
-        /// 图集资源集合
-        /// </summary>
-        public readonly List<BuildAssetInfo> SpriteAtlasAssetList = new List<BuildAssetInfo>(10000);
-
         /// <summary>
         /// 未被依赖的资源列表
         /// </summary>
@@ -65,12 +60,6 @@ namespace YooAsset.Editor
                 newBundleInfo.PackAsset(assetInfo);
                 _bundleInfoDic.Add(bundleName, newBundleInfo);
             }
-
-            // 统计所有的精灵图集
-            if (assetInfo.AssetInfo.IsSpriteAtlas())
-            {
-                SpriteAtlasAssetList.Add(assetInfo);
-            }
         }
 
         /// <summary>
@@ -96,12 +85,12 @@ namespace YooAsset.Editor
         /// <summary>
         /// 获取构建管线里需要的数据
         /// </summary>
-        public UnityEditor.AssetBundleBuild[] GetPipelineBuilds(bool replaceAssetPathWithAddres)
+        public UnityEditor.AssetBundleBuild[] GetPipelineBuilds()
         {
             List<UnityEditor.AssetBundleBuild> builds = new List<UnityEditor.AssetBundleBuild>(_bundleInfoDic.Count);
             foreach (var bundleInfo in _bundleInfoDic.Values)
             {
-                builds.Add(bundleInfo.CreatePipelineBuild(replaceAssetPathWithAddres));
+                builds.Add(bundleInfo.CreatePipelineBuild());
             }
             return builds.ToArray();
         }

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

@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
-using UnityEditor;
 
 namespace YooAsset.Editor
 {
@@ -19,7 +18,7 @@ namespace YooAsset.Editor
         /// <summary>
         /// 创建补丁清单文件到输出目录
         /// </summary>
-        protected void CreateManifestFile(bool processBundleDepends, bool processBundleTags, bool replaceAssetPathWithAddress, BuildContext context)
+        protected void CreateManifestFile(bool processBundleDepends, bool processBundleTags, BuildContext context)
         {
             var buildMapContext = context.GetContextObject<BuildMapContext>();
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
@@ -33,10 +32,8 @@ namespace YooAsset.Editor
             PackageManifest manifest = new PackageManifest();
             manifest.FileVersion = ManifestDefine.FileVersion;
             manifest.EnableAddressable = buildMapContext.Command.EnableAddressable;
-            manifest.SupportExtensionless = buildMapContext.Command.SupportExtensionless;
             manifest.LocationToLower = buildMapContext.Command.LocationToLower;
             manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
-            manifest.ReplaceAssetPathWithAddress = replaceAssetPathWithAddress;
             manifest.OutputNameStyle = (int)buildParameters.FileNameStyle;
             manifest.BuildBundleType = buildParameters.BuildBundleType;
             manifest.BuildPipeline = buildParameters.BuildPipeline;
@@ -59,13 +56,7 @@ namespace YooAsset.Editor
 
             // 4. 处理内置资源包
             if (processBundleDepends)
-            {
-                // 注意：初始化资源清单建立引用关系
-                manifest.Initialize();
-
                 ProcessBuiltinBundleDependency(context, manifest);
-            }
-
 
             // 创建资源清单文本文件
             {
@@ -81,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}");
             }
@@ -106,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);
             }
         }
@@ -312,34 +303,15 @@ namespace YooAsset.Editor
             // 注意：如果是可编程构建管线，需要补充内置资源包
             // 注意：该步骤依赖前面的操作！
             var buildResultContext = context.TryGetContextObject<TaskBuilding_SBP.BuildResultContext>();
-
             if (buildResultContext != null)
             {
-                ProcessBuiltinBundleReference(manifest, buildResultContext.BuiltinShadersBundleName);
-                ProcessBuiltinBundleReference(manifest, buildResultContext.MonoScriptsBundleName);
-
-                var buildParametersContext = context.TryGetContextObject<BuildParametersContext>();
-                var buildParameters = buildParametersContext.Parameters;
-                if (buildParameters is ScriptableBuildParameters scriptableBuildParameters)
-                {
-                    if (scriptableBuildParameters.TrackSpriteAtlasDependencies)
-                    {
-                        // 注意：检测是否开启图集模式
-                        // 说明：需要记录主资源对象对图集的依赖关系！
-                        if (EditorSettings.spritePackerMode != SpritePackerMode.Disabled)
-                        {
-                            var buildMapContext = context.GetContextObject<BuildMapContext>();
-                            foreach (var spriteAtlasAsset in buildMapContext.SpriteAtlasAssetList)
-                            {
-                                string spriteAtlasBundleName = spriteAtlasAsset.BundleName;
-                                ProcessBuiltinBundleReference(manifest, spriteAtlasBundleName);
-                            }
-                        }
-                    }
-                }
+                // 注意：初始化资源清单建立引用关系
+                ManifestTools.InitManifest(manifest);
+                ProcessBuiltinBundleReference(context, manifest, buildResultContext.BuiltinShadersBundleName);
+                ProcessBuiltinBundleReference(context, manifest, buildResultContext.MonoScriptsBundleName);
             }
         }
-        private void ProcessBuiltinBundleReference(PackageManifest manifest, string builtinBundleName)
+        private void ProcessBuiltinBundleReference(BuildContext context, PackageManifest manifest, string builtinBundleName)
         {
             if (string.IsNullOrEmpty(builtinBundleName))
                 return;

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

@@ -32,7 +32,6 @@ namespace YooAsset.Editor
                 // 收集器配置
                 buildReport.Summary.UniqueBundleName = buildMapContext.Command.UniqueBundleName;
                 buildReport.Summary.EnableAddressable = buildMapContext.Command.EnableAddressable;
-                buildReport.Summary.SupportExtensionless = buildMapContext.Command.SupportExtensionless;
                 buildReport.Summary.LocationToLower = buildMapContext.Command.LocationToLower;
                 buildReport.Summary.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
                 buildReport.Summary.AutoCollectShaders = buildMapContext.Command.AutoCollectShaders;
@@ -45,16 +44,13 @@ 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;
                     buildReport.Summary.CompressOption = builtinBuildParameters.CompressOption;
                     buildReport.Summary.DisableWriteTypeTree = builtinBuildParameters.DisableWriteTypeTree;
                     buildReport.Summary.IgnoreTypeTreeChanges = builtinBuildParameters.IgnoreTypeTreeChanges;
-                    buildReport.Summary.ReplaceAssetPathWithAddress = builtinBuildParameters.ReplaceAssetPathWithAddress;
                 }
                 else if (buildParameters is ScriptableBuildParameters)
                 {
@@ -62,7 +58,6 @@ namespace YooAsset.Editor
                     buildReport.Summary.CompressOption = scriptableBuildParameters.CompressOption;
                     buildReport.Summary.DisableWriteTypeTree = scriptableBuildParameters.DisableWriteTypeTree;
                     buildReport.Summary.IgnoreTypeTreeChanges = scriptableBuildParameters.IgnoreTypeTreeChanges;
-                    buildReport.Summary.ReplaceAssetPathWithAddress = scriptableBuildParameters.ReplaceAssetPathWithAddress;
                     buildReport.Summary.WriteLinkXML = scriptableBuildParameters.WriteLinkXML;
                     buildReport.Summary.CacheServerHost = scriptableBuildParameters.CacheServerHost;
                     buildReport.Summary.CacheServerPort = scriptableBuildParameters.CacheServerPort;

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

@@ -44,9 +44,9 @@ namespace YooAsset.Editor
             {
                 bundleInfo.PackageUnityHash = GetUnityHash(bundleInfo, context);
                 bundleInfo.PackageUnityCRC = GetUnityCRC(bundleInfo, context);
-                bundleInfo.PackageFileHash = GetBundleFileHash(bundleInfo, context);
-                bundleInfo.PackageFileCRC = GetBundleFileCRC(bundleInfo, context);
-                bundleInfo.PackageFileSize = GetBundleFileSize(bundleInfo, context);
+                bundleInfo.PackageFileHash = GetBundleFileHash(bundleInfo, buildParametersContext);
+                bundleInfo.PackageFileCRC = GetBundleFileCRC(bundleInfo, buildParametersContext);
+                bundleInfo.PackageFileSize = GetBundleFileSize(bundleInfo, buildParametersContext);
             }
 
             // 4.更新补丁包输出的文件路径
@@ -62,8 +62,8 @@ namespace YooAsset.Editor
 
         protected abstract string GetUnityHash(BuildBundleInfo bundleInfo, BuildContext context);
         protected abstract uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context);
-        protected abstract string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildContext context);
-        protected abstract uint GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildContext context);
-        protected abstract long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildContext context);
+        protected abstract string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext);
+        protected abstract string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext);
+        protected abstract long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext);
     }
 }

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

@@ -23,8 +23,7 @@ namespace YooAsset.Editor
             // 开始构建
             string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
             BuildAssetBundleOptions buildOptions = builtinBuildParameters.GetBundleBuildOptions();
-            var bundleBuilds = buildMapContext.GetPipelineBuilds(builtinBuildParameters.ReplaceAssetPathWithAddress);
-            AssetBundleManifest unityManifest = BuildPipeline.BuildAssetBundles(pipelineOutputDirectory, bundleBuilds, buildOptions, buildParametersContext.Parameters.BuildTarget);
+            AssetBundleManifest unityManifest = BuildPipeline.BuildAssetBundles(pipelineOutputDirectory, buildMapContext.GetPipelineBuilds(), buildOptions, buildParametersContext.Parameters.BuildTarget);
             if (unityManifest == null)
             {
                 string message = BuildLogger.GetErrorMessage(ErrorCode.UnityEngineBuildFailed, "UnityEngine build failed !");

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

@@ -11,10 +11,7 @@ namespace YooAsset.Editor
 
         void IBuildTask.Run(BuildContext context)
         {
-            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var builtinBuildParameters = buildParametersContext.Parameters as BuiltinBuildParameters;
-            bool replaceAssetPathWithAddress = builtinBuildParameters.ReplaceAssetPathWithAddress;
-            CreateManifestFile(true, true, replaceAssetPathWithAddress, context);
+            CreateManifestFile(true, true, context);
         }
 
         protected override string[] GetBundleDepends(BuildContext context, string bundleName)

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

@@ -40,17 +40,17 @@ namespace YooAsset.Editor
                 throw new Exception(message);
             }
         }
-        protected override string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildContext context)
+        protected override string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
             return HashUtility.FileMD5(filePath);
         }
-        protected override uint GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildContext context)
+        protected override string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            return HashUtility.FileCRC32Value(filePath);
+            return HashUtility.FileCRC32(filePath);
         }
-        protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildContext context)
+        protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
             return FileUtility.GetFileSize(filePath);

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

@@ -12,11 +12,6 @@ namespace YooAsset.Editor
         /// </summary>
         public ECompressOption CompressOption = ECompressOption.Uncompressed;
 
-        /// <summary>
-        /// 从文件头里剥离Unity版本信息
-        /// </summary>
-        public bool StripUnityVersion = false;
-
         /// <summary>
         /// 禁止写入类型树结构（可以降低包体和内存并提高加载效率）
         /// </summary>
@@ -27,12 +22,6 @@ namespace YooAsset.Editor
         /// </summary>
         public bool IgnoreTypeTreeChanges = true;
 
-        /// <summary>
-        /// 使用可寻址地址代替资源路径
-        /// 说明：开启此项可以节省运行时清单占用的内存！
-        /// </summary>
-        public bool ReplaceAssetPathWithAddress = false;
-
 
         /// <summary>
         /// 获取内置构建管线的构建选项
@@ -52,8 +41,6 @@ namespace YooAsset.Editor
 
             if (ClearBuildCacheFiles)
                 opt |= BuildAssetBundleOptions.ForceRebuildAssetBundle; //Force rebuild the asset bundles
-            if (StripUnityVersion)
-                opt |= BuildAssetBundleOptions.AssetBundleStripUnityVersion; //Removes the Unity Version number in the Archive File & Serialized File headers
             if (DisableWriteTypeTree)
                 opt |= BuildAssetBundleOptions.DisableWriteTypeTree; //Do not include type information within the asset bundle (don't write type tree).
             if (IgnoreTypeTreeChanges)

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskCreateManifest_ESBP.cs

@@ -7,7 +7,7 @@ namespace YooAsset.Editor
     {
         void IBuildTask.Run(BuildContext context)
         {
-            CreateManifestFile(false, true, false, context);
+            CreateManifestFile(false, false, context);
         }
 
         protected override string[] GetBundleDepends(BuildContext context, string bundleName)

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/EditorSimulateBuildPipeline/BuildTasks/TaskUpdateBundleInfo_ESBP.cs

@@ -19,16 +19,16 @@ namespace YooAsset.Editor
         {
             return 0;
         }
-        protected override string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildContext context)
+        protected override string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
             return GetFilePathTempHash(filePath);
         }
-        protected override uint GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildContext context)
+        protected override string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
-            return 0;
+            return "00000000"; //8位
         }
-        protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildContext context)
+        protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             return GetBundleTempSize(bundleInfo);
         }

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

@@ -9,7 +9,7 @@ namespace YooAsset.Editor
     {
         void IBuildTask.Run(BuildContext context)
         {
-            CreateManifestFile(false, true, false, context);
+            CreateManifestFile(false, true, context);
         }
 
         protected override string[] GetBundleDepends(BuildContext context, string bundleName)

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

@@ -15,55 +15,27 @@ namespace YooAsset.Editor
 
         protected override string GetUnityHash(BuildBundleInfo bundleInfo, BuildContext context)
         {
-            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var rawFileBuildParameters = buildParametersContext.Parameters as RawFileBuildParameters;
-            if (rawFileBuildParameters.IncludePathInHash)
-            {
-                string filePath = bundleInfo.PackageSourceFilePath;
-                return GetFileMD5IncludePath(filePath);
-            }
-            else
-            {
-                string filePath = bundleInfo.PackageSourceFilePath;
-                return HashUtility.FileMD5(filePath);
-            }
+            string filePath = bundleInfo.PackageSourceFilePath;
+            return HashUtility.FileMD5(filePath);
         }
         protected override uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context)
         {
             return 0;
         }
-        protected override string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildContext context)
-        {
-            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var rawFileBuildParameters = buildParametersContext.Parameters as RawFileBuildParameters;
-            if (rawFileBuildParameters.IncludePathInHash)
-            {
-                string filePath = bundleInfo.PackageSourceFilePath;
-                return GetFileMD5IncludePath(filePath);
-            }
-            else
-            {
-                string filePath = bundleInfo.PackageSourceFilePath;
-                return HashUtility.FileMD5(filePath);
-            }
-        }
-        protected override uint GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildContext context)
+        protected override string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            return HashUtility.FileCRC32Value(filePath);
+            return HashUtility.FileMD5(filePath);
         }
-        protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildContext context)
+        protected override string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
+        {
+            string filePath = bundleInfo.PackageSourceFilePath;
+            return HashUtility.FileCRC32(filePath);
+        }
+        protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
             return FileUtility.GetFileSize(filePath);
         }
-
-        private string GetFileMD5IncludePath(string filePath)
-        {
-            string pathHash = HashUtility.StringMD5(filePath.ToLowerInvariant());
-            string contentHash = HashUtility.FileMD5(filePath);
-            string combined = pathHash + contentHash;
-            return HashUtility.StringMD5(combined);
-        }
     }
 }

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

@@ -6,9 +6,5 @@ namespace YooAsset.Editor
 {
     public class RawFileBuildParameters : BuildParameters
     {
-        /// <summary>
-        /// 文件哈希值计算包含路径信息
-        /// </summary>
-        public bool IncludePathInHash = false;
     }
 }

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

@@ -24,8 +24,7 @@ namespace YooAsset.Editor
             var scriptableBuildParameters = buildParametersContext.Parameters as ScriptableBuildParameters;
 
             // 构建内容
-            var bundleBuilds = buildMapContext.GetPipelineBuilds(scriptableBuildParameters.ReplaceAssetPathWithAddress);
-            var buildContent = new BundleBuildContent(bundleBuilds);
+            var buildContent = new BundleBuildContent(buildMapContext.GetPipelineBuilds());
 
             // 开始构建
             IBundleBuildResults buildResults;

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

@@ -13,10 +13,7 @@ namespace YooAsset.Editor
 
         void IBuildTask.Run(BuildContext context)
         {
-            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var scriptableBuildParameters = buildParametersContext.Parameters as ScriptableBuildParameters;
-            bool replaceAssetPathWithAddress = scriptableBuildParameters.ReplaceAssetPathWithAddress;
-            CreateManifestFile(true, true, replaceAssetPathWithAddress, context);
+            CreateManifestFile(true, true, context);
         }
 
         protected override string[] GetBundleDepends(BuildContext context, string bundleName)

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

@@ -40,17 +40,17 @@ namespace YooAsset.Editor
                 throw new Exception(message);
             }
         }
-        protected override string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildContext context)
+        protected override string GetBundleFileHash(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
             return HashUtility.FileMD5(filePath);
         }
-        protected override uint GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildContext context)
+        protected override string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            return HashUtility.FileCRC32Value(filePath);
+            return HashUtility.FileCRC32(filePath);
         }
-        protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildContext context)
+        protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
             return FileUtility.GetFileSize(filePath);

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

@@ -15,7 +15,7 @@ namespace YooAsset.Editor
         public ECompressOption CompressOption = ECompressOption.Uncompressed;
 
         /// <summary>
-        /// 从文件头里剥离Unity版本信息
+        /// 从AssetBundle文件头里剥离Unity版本信息
         /// </summary>
         public bool StripUnityVersion = false;
 
@@ -25,21 +25,10 @@ namespace YooAsset.Editor
         public bool DisableWriteTypeTree = false;
 
         /// <summary>
-        /// 忽略类型树变化（无效参数）
+        /// 忽略类型树变化
         /// </summary>
         public bool IgnoreTypeTreeChanges = true;
 
-        /// <summary>
-        /// 使用可寻址地址代替资源路径
-        /// 说明：开启此项可以节省运行时清单占用的内存！
-        /// </summary>
-        public bool ReplaceAssetPathWithAddress = false;
-
-        /// <summary>
-        /// 自动建立资源对象对图集的依赖关系
-        /// </summary>
-        public bool TrackSpriteAtlasDependencies = false;
-
 
         /// <summary>
         /// 生成代码防裁剪配置
@@ -87,9 +76,10 @@ namespace YooAsset.Editor
                 throw new System.NotImplementedException(CompressOption.ToString());
 
             if (StripUnityVersion)
-                buildParams.ContentBuildFlags |= UnityEditor.Build.Content.ContentBuildFlags.StripUnityVersion; // Build Flag to indicate the Unity Version should not be written to the serialized file.
+                buildParams.ContentBuildFlags |= UnityEditor.Build.Content.ContentBuildFlags.StripUnityVersion;
+
             if (DisableWriteTypeTree)
-                buildParams.ContentBuildFlags |= UnityEditor.Build.Content.ContentBuildFlags.DisableWriteTypeTree; //Do not include type information within the built content.
+                buildParams.ContentBuildFlags |= UnityEditor.Build.Content.ContentBuildFlags.DisableWriteTypeTree;
 
             buildParams.UseCache = true;
             buildParams.CacheServerHost = CacheServerHost;

Assets/YooAsset/Editor/AssetBundleBuilder/BuildSystem/BuildResult.cs

@@ -21,11 +21,6 @@ namespace YooAsset.Editor
         /// </summary>
         public string ErrorInfo;
 
-        /// <summary>
-        /// 构建失败的堆栈
-        /// </summary>
-        public string ErrorStack;
-
         /// <summary>
         /// 输出的补丁包目录
         /// </summary>

Assets/YooAsset/Editor/AssetBundleBuilder/BuildSystem/BuildRunner.cs

@@ -51,7 +51,6 @@ namespace YooAsset.Editor
                     EditorTools.ClearProgressBar();
                     buildResult.FailedTask = task.GetType().Name;
                     buildResult.ErrorInfo = e.ToString();
-                    buildResult.ErrorStack = e.StackTrace;
                     buildResult.Success = false;
                     break;
                 }

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");
@@ -82,14 +80,14 @@ namespace YooAsset.Editor
         }
         private void BuildButton_clicked()
         {
-            if (EditorUtility.DisplayDialog("Info", $"Start building resource package [{PackageName}]!", "Yes", "No"))
+            if (EditorUtility.DisplayDialog("提示", $"开始构建资源包[{PackageName}]！", "Yes", "No"))
             {
                 EditorTools.ClearUnityConsole();
                 EditorApplication.delayCall += ExecuteBuild;
             }
             else
             {
-                Debug.LogWarning("[Build] Packaging has been canceled.");
+                Debug.LogWarning("[Build] 打包已经取消");
             }
         }
 
@@ -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/EditorSimulateBuildpipeline/EditorSimulateBuildPipelineViewer.cs

@@ -42,14 +42,14 @@ namespace YooAsset.Editor
         }
         private void BuildButton_clicked()
         {
-            if (EditorUtility.DisplayDialog("Info", $"Start building resource package [{PackageName}]!", "Yes", "No"))
+            if (EditorUtility.DisplayDialog("提示", $"开始构建资源包[{PackageName}]！", "Yes", "No"))
             {
                 EditorTools.ClearUnityConsole();
                 EditorApplication.delayCall += ExecuteBuild;
             }
             else
             {
-                Debug.LogWarning("[Build] Packaging has been canceled.");
+                Debug.LogWarning("[Build] 打包已经取消");
             }
         }
 

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");
@@ -77,14 +75,14 @@ namespace YooAsset.Editor
         }
         private void BuildButton_clicked()
         {
-            if (EditorUtility.DisplayDialog("Info", $"Start building resource package [{PackageName}]!", "Yes", "No"))
+            if (EditorUtility.DisplayDialog("提示", $"开始构建资源包[{PackageName}]！", "Yes", "No"))
             {
                 EditorTools.ClearUnityConsole();
                 EditorApplication.delayCall += ExecuteBuild;
             }
             else
             {
-                Debug.LogWarning("[Build] Packaging has been canceled.");
+                Debug.LogWarning("[Build] 打包已经取消");
             }
         }
 
@@ -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");
@@ -82,14 +80,14 @@ namespace YooAsset.Editor
         }
         private void BuildButton_clicked()
         {
-            if (EditorUtility.DisplayDialog("Info", $"Start building resource package [{PackageName}]!", "Yes", "No"))
+            if (EditorUtility.DisplayDialog("提示", $"开始构建资源包[{PackageName}]！", "Yes", "No"))
             {
                 EditorTools.ClearUnityConsole();
                 EditorApplication.delayCall += ExecuteBuild;
             }
             else
             {
-                Debug.LogWarning("[Build] Packaging has been canceled.");
+                Debug.LogWarning("[Build] 打包已经取消");
             }
         }
 
@@ -104,6 +102,7 @@ namespace YooAsset.Editor
             var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, PipelineName);
             var clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, PipelineName);
             var useAssetDependencyDB = AssetBundleBuilderSetting.GetPackageUseAssetDependencyDB(PackageName, PipelineName);
+            var builtinShaderBundleName = GetBuiltinShaderBundleName();
 
             ScriptableBuildParameters buildParameters = new ScriptableBuildParameters();
             buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
@@ -121,10 +120,9 @@ namespace YooAsset.Editor
             buildParameters.CompressOption = compressOption;
             buildParameters.ClearBuildCacheFiles = clearBuildCache;
             buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
+            buildParameters.BuiltinShadersBundleName = builtinShaderBundleName;
             buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
-            buildParameters.ManifestProcessServices = CreateManifestProcessServicesInstance();
-            buildParameters.ManifestRestoreServices = CreateManifestRestoreServicesInstance();
-            buildParameters.BuiltinShadersBundleName = GetBuiltinShaderBundleName();
+            buildParameters.ManifestServices = CreateManifestServicesInstance();
 
             ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();
             var buildResult = pipeline.Run(buildParameters, true);
@@ -142,16 +140,6 @@ namespace YooAsset.Editor
             var packRuleResult = DefaultPackRule.CreateShadersPackRuleResult();
             return packRuleResult.GetBundleName(PackageName, uniqueBundleName);
         }
-
-        /// <summary>
-        /// Mono脚本的资源包名称
-        /// </summary>
-        protected string GetMonoScriptsBundleName()
-        {
-            var uniqueBundleName = AssetBundleCollectorSettingData.Setting.UniqueBundleName;
-            var packRuleResult = DefaultPackRule.CreateMonosPackRuleResult();
-            return packRuleResult.GetBundleName(PackageName, uniqueBundleName);
-        }
     }
 }
 #endif

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs

@@ -139,17 +139,10 @@ namespace YooAsset.Editor
         /// </summary>
         public List<CollectAssetInfo> GetAllCollectAssets(CollectCommand command, AssetBundleCollectorGroup group)
         {
-            bool ignoreStaticCollector = command.IsFlagSet(ECollectFlags.IgnoreStaticCollector);
-            if (ignoreStaticCollector)
+            // 注意：模拟构建模式下只收集主资源
+            if (command.SimulateBuild)
             {
-                if (CollectorType == ECollectorType.StaticAssetCollector)
-                    return new List<CollectAssetInfo>();
-            }
-
-            bool ignoreDependCollector = command.IsFlagSet(ECollectFlags.IgnoreDependCollector);
-            if (ignoreDependCollector)
-            {
-                if (CollectorType == ECollectorType.DependAssetCollector)
+                if (CollectorType != ECollectorType.MainAssetCollector)
                     return new List<CollectAssetInfo>();
             }
 
@@ -159,10 +152,8 @@ namespace YooAsset.Editor
             List<string> findAssets = new List<string>();
             if (AssetDatabase.IsValidFolder(CollectPath))
             {
-                IFilterRule filterRuleInstance = AssetBundleCollectorSettingData.GetFilterRuleInstance(FilterRuleName);
-                string findAssetType = filterRuleInstance.FindAssetType;
-                string searchFolder = CollectPath;
-                string[] findResult = EditorTools.FindAssets(findAssetType, searchFolder);
+                string collectDirectory = CollectPath;
+                string[] findResult = EditorTools.FindAssets(EAssetSearchType.All, collectDirectory);
                 findAssets.AddRange(findResult);
             }
             else
@@ -278,8 +269,8 @@ namespace YooAsset.Editor
         }
         private List<AssetInfo> GetAllDependencies(CollectCommand command, string mainAssetPath)
         {
-            bool ignoreGetDependencies = command.IsFlagSet(ECollectFlags.IgnoreGetDependencies);
-            if (ignoreGetDependencies)
+            // 注意：模拟构建模式下不需要收集依赖资源
+            if (command.SimulateBuild)
                 return new List<AssetInfo>();
 
             string[] depends = command.AssetDependency.GetDependencies(mainAssetPath, true);

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorConfig.cs

@@ -10,7 +10,7 @@ namespace YooAsset.Editor
 {
     public class AssetBundleCollectorConfig
     {
-        public const string ConfigVersion = "v2025.8.28";
+        public const string ConfigVersion = "v2.1";
 
         public const string XmlVersion = "Version";
         public const string XmlCommon = "Common";
@@ -23,7 +23,6 @@ namespace YooAsset.Editor
         public const string XmlPackageName = "PackageName";
         public const string XmlPackageDesc = "PackageDesc";
         public const string XmlEnableAddressable = "AutoAddressable";
-        public const string XmlSupportExtensionless = "SupportExtensionless";
         public const string XmlLocationToLower = "LocationToLower";
         public const string XmlIncludeAssetGUID = "IncludeAssetGUID";
         public const string XmlIgnoreRuleName = "IgnoreRuleName";
@@ -100,7 +99,6 @@ namespace YooAsset.Editor
                 package.PackageName = packageElement.GetAttribute(XmlPackageName);
                 package.PackageDesc = packageElement.GetAttribute(XmlPackageDesc);
                 package.EnableAddressable = packageElement.GetAttribute(XmlEnableAddressable) == "True" ? true : false;
-                package.SupportExtensionless = packageElement.GetAttribute(XmlSupportExtensionless) == "True" ? true : false;
                 package.LocationToLower = packageElement.GetAttribute(XmlLocationToLower) == "True" ? true : false;
                 package.IncludeAssetGUID = packageElement.GetAttribute(XmlIncludeAssetGUID) == "True" ? true : false;
                 package.IgnoreRuleName = packageElement.GetAttribute(XmlIgnoreRuleName);
@@ -213,7 +211,6 @@ namespace YooAsset.Editor
                 packageElement.SetAttribute(XmlPackageName, package.PackageName);
                 packageElement.SetAttribute(XmlPackageDesc, package.PackageDesc);
                 packageElement.SetAttribute(XmlEnableAddressable, package.EnableAddressable.ToString());
-                packageElement.SetAttribute(XmlSupportExtensionless, package.SupportExtensionless.ToString());
                 packageElement.SetAttribute(XmlLocationToLower, package.LocationToLower.ToString());
                 packageElement.SetAttribute(XmlIncludeAssetGUID, package.IncludeAssetGUID.ToString());
                 packageElement.SetAttribute(XmlIgnoreRuleName, package.IgnoreRuleName);
@@ -278,23 +275,6 @@ namespace YooAsset.Editor
                 return UpdateXmlConfig(xmlDoc);
             }
 
-            // v2.1 -> v2025.8.28
-            if (configVersion == "v2.1")
-            {
-                // 读取包裹配置
-                var packageNodeList = root.GetElementsByTagName(XmlPackage);
-                foreach (var packageNode in packageNodeList)
-                {
-                    XmlElement packageElement = packageNode as XmlElement;
-                    if (packageElement.HasAttribute(XmlSupportExtensionless) == false)
-                        packageElement.SetAttribute(XmlSupportExtensionless, "True");
-                }
-
-                // 更新版本
-                root.SetAttribute(XmlVersion, "v2025.8.28");
-                return UpdateXmlConfig(xmlDoc);
-            }
-
             return false;
         }
     }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs

@@ -25,11 +25,6 @@ namespace YooAsset.Editor
         /// </summary>
         public bool EnableAddressable = false;
 
-        /// <summary>
-        /// 支持无后缀名的资源定位地址
-        /// </summary>
-        public bool SupportExtensionless = true;
-
         /// <summary>
         /// 资源定位地址大小写不敏感
         /// </summary>

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs

@@ -111,7 +111,6 @@ namespace YooAsset.Editor
             command.UniqueBundleName = UniqueBundleName;
             command.UseAssetDependencyDB = useAssetDependencyDB;
             command.EnableAddressable = package.EnableAddressable;
-            command.SupportExtensionless = package.SupportExtensionless;
             command.LocationToLower = package.LocationToLower;
             command.IncludeAssetGUID = package.IncludeAssetGUID;
             command.AutoCollectShaders = package.AutoCollectShaders;

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

@@ -38,7 +38,6 @@ namespace YooAsset.Editor
 
         private VisualElement _setting2Container;
         private Toggle _enableAddressableToogle;
-        private Toggle _supportExtensionlessToogle;
         private Toggle _locationToLowerToogle;
         private Toggle _includeAssetGUIDToogle;
         private Toggle _autoCollectShadersToogle;
@@ -132,17 +131,6 @@ namespace YooAsset.Editor
                         RefreshWindow();
                     }
                 });
-                _supportExtensionlessToogle = root.Q<Toggle>("SupportExtensionless");
-                _supportExtensionlessToogle.RegisterValueChangedCallback(evt =>
-                {
-                    var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
-                    if (selectPackage != null)
-                    {
-                        selectPackage.SupportExtensionless = evt.newValue;
-                        AssetBundleCollectorSettingData.ModifyPackage(selectPackage);
-                        RefreshWindow();
-                    }
-                });
                 _locationToLowerToogle = root.Q<Toggle>("LocationToLower");
                 _locationToLowerToogle.RegisterValueChangedCallback(evt =>
                 {
@@ -236,7 +224,6 @@ namespace YooAsset.Editor
 
                 // 包裹名称
                 _packageNameTxt = root.Q<TextField>("PackageName");
-                _packageNameTxt.isDelayed = true;
                 _packageNameTxt.RegisterValueChangedCallback(evt =>
                 {
                     var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
@@ -250,7 +237,6 @@ namespace YooAsset.Editor
 
                 // 包裹备注
                 _packageDescTxt = root.Q<TextField>("PackageDesc");
-                _packageDescTxt.isDelayed = true;
                 _packageDescTxt.RegisterValueChangedCallback(evt =>
                 {
                     var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
@@ -288,7 +274,6 @@ namespace YooAsset.Editor
 
                 // 分组名称
                 _groupNameTxt = root.Q<TextField>("GroupName");
-                _groupNameTxt.isDelayed = true;
                 _groupNameTxt.RegisterValueChangedCallback(evt =>
                 {
                     var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
@@ -303,7 +288,6 @@ namespace YooAsset.Editor
 
                 // 分组备注
                 _groupDescTxt = root.Q<TextField>("GroupDesc");
-                _groupDescTxt.isDelayed = true;
                 _groupDescTxt.RegisterValueChangedCallback(evt =>
                 {
                     var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
@@ -318,7 +302,6 @@ namespace YooAsset.Editor
 
                 // 分组的资源标签
                 _groupTagsTxt = root.Q<TextField>("GroupTags");
-                _groupTagsTxt.isDelayed = true;
                 _groupTagsTxt.RegisterValueChangedCallback(evt =>
                 {
                     var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
@@ -504,7 +487,6 @@ namespace YooAsset.Editor
                 _packageSettingsButton.SetEnabled(true);
                 _packageSettingsButton.text = $"{packageSettingName} ({selectPackage.PackageName})";
                 _enableAddressableToogle.SetValueWithoutNotify(selectPackage.EnableAddressable);
-                _supportExtensionlessToogle.SetValueWithoutNotify(selectPackage.SupportExtensionless);
                 _locationToLowerToogle.SetValueWithoutNotify(selectPackage.LocationToLower);
                 _includeAssetGUIDToogle.SetValueWithoutNotify(selectPackage.IncludeAssetGUID);
                 _autoCollectShadersToogle.SetValueWithoutNotify(selectPackage.AutoCollectShaders);
@@ -822,7 +804,6 @@ namespace YooAsset.Editor
                 var textField = new TextField();
                 textField.name = "TextField0";
                 textField.label = "User Data";
-                textField.isDelayed = true;
                 textField.style.width = 200;
                 elementBottom.Add(textField);
                 var label = textField.Q<Label>();
@@ -832,7 +813,6 @@ namespace YooAsset.Editor
                 var textField = new TextField();
                 textField.name = "TextField1";
                 textField.label = "Asset Tags";
-                textField.isDelayed = true;
                 textField.style.width = 100;
                 textField.style.marginLeft = 20;
                 textField.style.flexGrow = 1;
@@ -851,7 +831,7 @@ namespace YooAsset.Editor
                 var foldout = new Foldout();
                 foldout.name = "Foldout1";
                 foldout.value = false;
-                foldout.text = "Assets";
+                foldout.text = "Main Assets";
                 elementFoldout.Add(foldout);
             }
 
@@ -884,9 +864,11 @@ namespace YooAsset.Editor
             var foldout = element.Q<Foldout>("Foldout1");
             foldout.RegisterValueChangedCallback(evt =>
             {
-                RefreshFoldoutContent(foldout, selectGroup, collector);
+                if (evt.newValue)
+                    RefreshFoldout(foldout, selectGroup, collector);
+                else
+                    foldout.Clear();
             });
-            RefreshFoldoutName(foldout, collector.CollectorType);
 
             // Remove Button
             var removeBtn = element.Q<Button>("Button1");
@@ -903,7 +885,10 @@ namespace YooAsset.Editor
                 collector.CollectPath = AssetDatabase.GetAssetPath(evt.newValue);
                 collector.CollectorGUID = AssetDatabase.AssetPathToGUID(collector.CollectPath);
                 AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
-                RefreshFoldoutContent(foldout, selectGroup, collector);
+                if (foldout.value)
+                {
+                    RefreshFoldout(foldout, selectGroup, collector);
+                }
             });
             UIElementsTools.RefreshObjectFieldShowPath(objectField1);
 
@@ -914,7 +899,10 @@ namespace YooAsset.Editor
             {
                 collector.CollectorType = EditorTools.NameToEnum<ECollectorType>(evt.newValue);
                 AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
-                RefreshFoldoutContent(foldout, selectGroup, collector);
+                if (foldout.value)
+                {
+                    RefreshFoldout(foldout, selectGroup, collector);
+                }
 
                 if (collector.CollectorType == ECollectorType.MainAssetCollector)
                     textTags.SetEnabled(true);
@@ -933,7 +921,10 @@ namespace YooAsset.Editor
                 {
                     collector.AddressRuleName = evt.newValue.ClassName;
                     AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
-                    RefreshFoldoutContent(foldout, selectGroup, collector);
+                    if (foldout.value)
+                    {
+                        RefreshFoldout(foldout, selectGroup, collector);
+                    }
                 });
             }
 
@@ -946,7 +937,10 @@ namespace YooAsset.Editor
             {
                 collector.PackRuleName = evt.newValue.ClassName;
                 AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
-                RefreshFoldoutContent(foldout, selectGroup, collector);
+                if (foldout.value)
+                {
+                    RefreshFoldout(foldout, selectGroup, collector);
+                }
             });
 
             // Filter Rule
@@ -958,7 +952,10 @@ namespace YooAsset.Editor
             {
                 collector.FilterRuleName = evt.newValue.ClassName;
                 AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
-                RefreshFoldoutContent(foldout, selectGroup, collector);
+                if (foldout.value)
+                {
+                    RefreshFoldout(foldout, selectGroup, collector);
+                }
             });
 
             // UserData
@@ -979,101 +976,61 @@ namespace YooAsset.Editor
                 AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
             });
         }
-        private void RefreshFoldoutName(Foldout foldout, ECollectorType collectorType, int elementNumber = -1)
+        private void RefreshFoldout(Foldout foldout, AssetBundleCollectorGroup group, AssetBundleCollector collector)
         {
-            if (collectorType == ECollectorType.MainAssetCollector)
-            {
-                if (elementNumber >= 0)
-                    foldout.text = $"Main Assets ({elementNumber})";
-                else
-                    foldout.text = $"Main Assets";
-            }
-            else if (collectorType == ECollectorType.StaticAssetCollector)
-            {
-                if (elementNumber >= 0)
-                    foldout.text = $"Static Assets ({elementNumber})";
-                else
-                    foldout.text = $"Static Assets";
-            }
-            else if (collectorType == ECollectorType.DependAssetCollector)
-            {
-                if (elementNumber >= 0)
-                    foldout.text = $"Depend Assets ({elementNumber})";
-                else
-                    foldout.text = $"Depend Assets";
-            }
-            else
-            {
-                throw new System.NotImplementedException(collectorType.ToString());
-            }
-        }
-        private void RefreshFoldoutContent(Foldout foldout, AssetBundleCollectorGroup group, AssetBundleCollector collector)
-        {
-            RefreshFoldoutName(foldout, collector.CollectorType);
-
-            // 折叠栏不可见
-            if (foldout.value == false)
-            {
-                foldout.Clear();
-                return;
-            }
-
             // 清空旧元素
             foldout.Clear();
 
-            // 检测配置是否有效
             if (collector.IsValid() == false)
             {
                 collector.CheckConfigError();
                 return;
             }
 
-            List<CollectAssetInfo> collectAssetInfos = null;
-
-            try
+            if (collector.CollectorType == ECollectorType.MainAssetCollector || collector.CollectorType == ECollectorType.StaticAssetCollector)
             {
-                IIgnoreRule ignoreRule = AssetBundleCollectorSettingData.GetIgnoreRuleInstance(_ignoreRulePopupField.value.ClassName);
-                string packageName = _packageNameTxt.value;
-                var command = new CollectCommand(packageName, ignoreRule);
-                command.SetFlag(ECollectFlags.IgnoreGetDependencies, true);
-                command.UniqueBundleName = _uniqueBundleNameToogle.value;
-                command.EnableAddressable = _enableAddressableToogle.value;
-                command.SupportExtensionless = _supportExtensionlessToogle.value;
-                command.LocationToLower = _locationToLowerToogle.value;
-                command.IncludeAssetGUID = _includeAssetGUIDToogle.value;
-                command.AutoCollectShaders = _autoCollectShadersToogle.value;
+                List<CollectAssetInfo> collectAssetInfos = null;
 
-                collector.CheckConfigError();
-                collectAssetInfos = collector.GetAllCollectAssets(command, group);
-            }
-            catch (System.Exception e)
-            {
-                Debug.LogError(e.ToString());
-            }
-
-            if (collectAssetInfos != null)
-            {
-                bool showAdress = false;
-                if (_enableAddressableToogle.value && collector.CollectorType == ECollectorType.MainAssetCollector)
-                    showAdress = true;
-
-                RefreshFoldoutName(foldout, collector.CollectorType, collectAssetInfos.Count);
-                foreach (var collectAsset in collectAssetInfos)
+                try
                 {
-                    VisualElement elementRow = new VisualElement();
-                    elementRow.style.flexDirection = FlexDirection.Row;
-                    foldout.Add(elementRow);
+                    IIgnoreRule ignoreRule = AssetBundleCollectorSettingData.GetIgnoreRuleInstance(_ignoreRulePopupField.value.ClassName);
+                    string packageName = _packageNameTxt.value;
+                    var command = new CollectCommand(packageName, ignoreRule);
+                    command.SimulateBuild = true;
+                    command.UniqueBundleName = _uniqueBundleNameToogle.value;
+                    command.UseAssetDependencyDB = true;
+                    command.EnableAddressable = _enableAddressableToogle.value;
+                    command.LocationToLower = _locationToLowerToogle.value;
+                    command.IncludeAssetGUID = _includeAssetGUIDToogle.value;
+                    command.AutoCollectShaders = _autoCollectShadersToogle.value;
 
-                    string showInfo = collectAsset.AssetInfo.AssetPath;
-                    if (showAdress)
-                        showInfo = $"[{collectAsset.Address}] {collectAsset.AssetInfo.AssetPath}";
+                    collector.CheckConfigError();
+                    collectAssetInfos = collector.GetAllCollectAssets(command, group);
+                }
+                catch (System.Exception e)
+                {
+                    Debug.LogError(e.ToString());
+                }
 
-                    var label = new Label();
-                    label.text = showInfo;
-                    label.style.width = 300;
-                    label.style.marginLeft = 0;
-                    label.style.flexGrow = 1;
-                    elementRow.Add(label);
+                if (collectAssetInfos != null)
+                {
+                    foreach (var collectAsset in collectAssetInfos)
+                    {
+                        VisualElement elementRow = new VisualElement();
+                        elementRow.style.flexDirection = FlexDirection.Row;
+                        foldout.Add(elementRow);
+
+                        string showInfo = collectAsset.AssetInfo.AssetPath;
+                        if (_enableAddressableToogle.value)
+                            showInfo = $"[{collectAsset.Address}] {collectAsset.AssetInfo.AssetPath}";
+
+                        var label = new Label();
+                        label.text = showInfo;
+                        label.style.width = 300;
+                        label.style.marginLeft = 0;
+                        label.style.flexGrow = 1;
+                        elementRow.Add(label);
+                    }
                 }
             }
         }

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml

@@ -19,7 +19,6 @@
             <ui:Button text="Package Settings" display-tooltip-when-elided="true" name="PackageSettingsButton" />
             <ui:VisualElement name="PublicContainer2">
                 <ui:Toggle label="Enable Addressable" name="EnableAddressable" style="width: 196px; -unity-text-align: middle-left;" />
-                <ui:Toggle label="Support Extensionless" name="SupportExtensionless" style="width: 196px; -unity-text-align: middle-left;" />
                 <ui:Toggle label="Location To Lower" name="LocationToLower" style="width: 196px; -unity-text-align: middle-left;" />
                 <ui:Toggle label="Include Asset GUID" name="IncludeAssetGUID" style="width: 196px; -unity-text-align: middle-left;" />
                 <ui:Toggle label="Auto Collect Shaders" name="AutoCollectShaders" value="true" style="width: 196px; -unity-text-align: middle-left;" />
@@ -30,7 +29,7 @@
         <ui:VisualElement name="PackageContainer" style="width: 200px; flex-grow: 0; background-color: rgb(67, 67, 67); border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
             <ui:Label text="Packages" display-tooltip-when-elided="true" name="PackageTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px;" />
             <ui:ListView focusable="true" name="PackageListView" item-height="20" virtualization-method="DynamicHeight" reorderable="true" reorder-mode="Animated" style="flex-grow: 1;" />
-            <ui:VisualElement name="PackageAddContainer" style="height: 20px; flex-direction: row; justify-content: center; flex-shrink: 0;">
+            <ui:VisualElement name="PackageAddContainer" style="height: 20px; flex-direction: row; justify-content: center;">
                 <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
                 <ui:Button text=" + " display-tooltip-when-elided="true" name="AddBtn" />
             </ui:VisualElement>
@@ -40,7 +39,7 @@
             <ui:TextField picking-mode="Ignore" label="Package Name" name="PackageName" style="flex-direction: column;" />
             <ui:TextField picking-mode="Ignore" label="Package Desc" name="PackageDesc" style="flex-direction: column;" />
             <ui:ListView focusable="true" name="GroupListView" item-height="20" virtualization-method="DynamicHeight" reorderable="true" reorder-mode="Animated" style="flex-grow: 1;" />
-            <ui:VisualElement name="GroupAddContainer" style="height: 20px; flex-direction: row; justify-content: center; flex-shrink: 0;">
+            <ui:VisualElement name="GroupAddContainer" style="height: 20px; flex-direction: row; justify-content: center;">
                 <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
                 <ui:Button text=" + " display-tooltip-when-elided="true" name="AddBtn" />
             </ui:VisualElement>

Assets/YooAsset/Editor/AssetBundleCollector/AssetDependencyDatabase.cs

@@ -88,8 +88,8 @@ namespace YooAsset.Editor
             }
             catch (Exception ex)
             {
-                Debug.LogError($"Failed to load cache database : {ex.Message}");
                 ClearDatabase(true);
+                Debug.LogError($"Failed to load cache database : {ex.Message}");
             }
             finally
             {
@@ -169,8 +169,7 @@ namespace YooAsset.Editor
                     File.Delete(_databaseFilePath);
             }
 
-            if (_database != null)
-                _database.Clear();
+            _database.Clear();
         }
 
         /// <summary>
@@ -178,6 +177,9 @@ namespace YooAsset.Editor
         /// </summary>
         public string[] GetDependencies(string assetPath, bool recursive)
         {
+            // 注意：AssetDatabase.GetDependencies()方法返回结果里会踢出丢失文件！
+            // 注意：AssetDatabase.GetDependencies()方法返回结果里会包含主资源路径！
+
             // 注意：机制上不允许存在未收录的资源
             if (_database.ContainsKey(assetPath) == false)
             {
@@ -185,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)
@@ -258,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/AssetBundleCollector/CollectCommand.cs

@@ -1,26 +1,6 @@
 
 namespace YooAsset.Editor
 {
-    public enum ECollectFlags
-    {
-        None = 0,
-
-        /// <summary>
-        /// 不收集依赖资源
-        /// </summary>
-        IgnoreGetDependencies = 1 << 0,
-
-        /// <summary>
-        /// 忽略静态收集器
-        /// </summary>
-        IgnoreStaticCollector = 1 << 1,
-
-        /// <summary>
-        /// 忽略依赖收集器
-        /// </summary>
-        IgnoreDependCollector = 1 << 2,
-    }
-
     public class CollectCommand
     {
         /// <summary>
@@ -37,20 +17,7 @@ namespace YooAsset.Editor
         /// <summary>
         /// 模拟构建模式
         /// </summary>
-        public bool SimulateBuild
-        {
-            set
-            {
-                SetFlag(ECollectFlags.IgnoreGetDependencies, value);
-                SetFlag(ECollectFlags.IgnoreStaticCollector, value);
-                SetFlag(ECollectFlags.IgnoreDependCollector, value);
-            }
-        }
-
-        /// <summary>
-        /// 窗口收集模式
-        /// </summary>
-        public int CollectFlags { set; get; } = 0;
+        public bool SimulateBuild { set; get; }
 
         /// <summary>
         /// 资源包名唯一化
@@ -67,11 +34,6 @@ namespace YooAsset.Editor
         /// </summary>
         public bool EnableAddressable { set; get; }
 
-        /// <summary>
-        /// 支持无后缀名的资源定位地址
-        /// </summary>
-        public bool SupportExtensionless { set; get; }
-
         /// <summary>
         /// 资源定位地址大小写不敏感
         /// </summary>
@@ -103,24 +65,5 @@ namespace YooAsset.Editor
             PackageName = packageName;
             IgnoreRule = ignoreRule;
         }
-
-        /// <summary>
-        /// 设置标记位
-        /// </summary>
-        public void SetFlag(ECollectFlags flag, bool isOn)
-        {
-            if (isOn)
-                CollectFlags |= (int)flag;  // 开启指定标志位
-            else
-                CollectFlags &= ~(int)flag; // 关闭指定标志位
-        }
-
-        /// <summary>
-        /// 查询标记位
-        /// </summary>
-        public bool IsFlagSet(ECollectFlags flag)
-        {
-            return (CollectFlags & (int)flag) != 0;
-        }
     }
 }

Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/IFilterRule.cs

@@ -23,13 +23,7 @@ namespace YooAsset.Editor
     public interface IFilterRule
     {
         /// <summary>
-        /// 搜寻的资源类型
-        /// 说明：使用引擎方法搜索获取所有资源列表
-        /// </summary>
-        string FindAssetType { get; }
-
-        /// <summary>
-        /// 验证搜寻的资源是否为收集资源
+        /// 是否为收集资源
         /// </summary>
         /// <returns>如果收集该资源返回TRUE</returns>
         bool IsCollectAsset(FilterRuleData data);

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

@@ -9,11 +9,6 @@ namespace YooAsset.Editor
     [DisplayName("收集所有资源")]
     public class CollectAll : IFilterRule
     {
-        public string FindAssetType
-        {
-            get { return EAssetSearchType.All.ToString(); }
-        }
-
         public bool IsCollectAsset(FilterRuleData data)
         {
             return true;
@@ -23,11 +18,6 @@ namespace YooAsset.Editor
     [DisplayName("收集场景")]
     public class CollectScene : IFilterRule
     {
-        public string FindAssetType
-        {
-            get { return EAssetSearchType.Scene.ToString(); }
-        }
-
         public bool IsCollectAsset(FilterRuleData data)
         {
             string extension = Path.GetExtension(data.AssetPath);
@@ -38,11 +28,6 @@ namespace YooAsset.Editor
     [DisplayName("收集预制体")]
     public class CollectPrefab : IFilterRule
     {
-        public string FindAssetType
-        {
-            get { return EAssetSearchType.Prefab.ToString(); }
-        }
-
         public bool IsCollectAsset(FilterRuleData data)
         {
             return Path.GetExtension(data.AssetPath) == ".prefab";
@@ -52,11 +37,6 @@ namespace YooAsset.Editor
     [DisplayName("收集精灵类型的纹理")]
     public class CollectSprite : IFilterRule
     {
-        public string FindAssetType
-        {
-            get { return EAssetSearchType.Sprite.ToString(); }
-        }
-
         public bool IsCollectAsset(FilterRuleData data)
         {
             var mainAssetType = AssetDatabase.GetMainAssetTypeAtPath(data.AssetPath);
@@ -78,11 +58,6 @@ namespace YooAsset.Editor
     [DisplayName("收集着色器")]
     public class CollectShader : IFilterRule
     {
-        public string FindAssetType
-        {
-            get { return EAssetSearchType.Shader.ToString(); }
-        }
-
         public bool IsCollectAsset(FilterRuleData data)
         {
             return Path.GetExtension(data.AssetPath) == ".shader";
@@ -92,11 +67,6 @@ namespace YooAsset.Editor
     [DisplayName("收集着色器变种集合")]
     public class CollectShaderVariants : IFilterRule
     {
-        public string FindAssetType
-        {
-            get { return EAssetSearchType.All.ToString(); }
-        }
-
         public bool IsCollectAsset(FilterRuleData data)
         {
             return Path.GetExtension(data.AssetPath) == ".shadervariants";

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

@@ -17,25 +17,16 @@ namespace YooAsset.Editor
         public const string RawFileExtension = "rawfile";
 
         /// <summary>
-        /// 默认的Unity着色器资源包名称
+        /// Unity着色器资源包名称
         /// </summary>
         public const string ShadersBundleName = "unityshaders";
 
-        /// <summary>
-        /// 默认的Unity脚本资源包名称
-        /// </summary>
-        public const string MonosBundleName = "unitymonos";
 
         public static PackRuleResult CreateShadersPackRuleResult()
         {
             PackRuleResult result = new PackRuleResult(ShadersBundleName, AssetBundleFileExtension);
             return result;
         }
-        public static PackRuleResult CreateMonosPackRuleResult()
-        {
-            PackRuleResult result = new PackRuleResult(MonosBundleName, AssetBundleFileExtension);
-            return result;
-        }
     }
 
     /// <summary>

Assets/YooAsset/Editor/AssetBundleReporter/ReportBundleInfo.cs

@@ -26,7 +26,7 @@ namespace YooAsset.Editor
         /// <summary>
         /// 文件校验码
         /// </summary>
-        public uint FileCRC;
+        public string FileCRC;
 
         /// <summary>
         /// 文件大小（字节数）

Assets/YooAsset/Editor/AssetBundleReporter/ReportSummary.cs

@@ -61,7 +61,6 @@ namespace YooAsset.Editor
         // 收集器配置
         public bool UniqueBundleName;
         public bool EnableAddressable;
-        public bool SupportExtensionless;
         public bool LocationToLower;
         public bool IncludeAssetGUID;
         public bool AutoCollectShaders;
@@ -73,15 +72,13 @@ namespace YooAsset.Editor
         public bool EnableSharePackRule;
         public bool SingleReferencedPackAlone;
         public string EncryptionServicesClassName;
-        public string ManifestProcessServicesClassName;
-        public string ManifestRestoreServicesClassName;
+        public string ManifestServicesClassName;
         public EFileNameStyle FileNameStyle;
         
         // 引擎参数
         public ECompressOption CompressOption;
         public bool DisableWriteTypeTree;
         public bool IgnoreTypeTreeChanges;
-        public bool ReplaceAssetPathWithAddress;
         public bool WriteLinkXML = true;
         public string CacheServerHost;
         public int CacheServerPort;

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

@@ -55,7 +55,6 @@ namespace YooAsset.Editor
             BindListViewHeader("Collect Settings");
             BindListViewItem("Unique Bundle Name", $"{buildReport.Summary.UniqueBundleName}");
             BindListViewItem("Enable Addressable", $"{buildReport.Summary.EnableAddressable}");
-            BindListViewItem("Support Extensionless", $"{buildReport.Summary.SupportExtensionless}");
             BindListViewItem("Location To Lower", $"{buildReport.Summary.LocationToLower}");
             BindListViewItem("Include Asset GUID", $"{buildReport.Summary.IncludeAssetGUID}");
             BindListViewItem("Auto Collect Shaders", $"{buildReport.Summary.AutoCollectShaders}");
@@ -68,13 +67,11 @@ 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}");
             BindListViewItem("IgnoreTypeTreeChanges", $"{buildReport.Summary.IgnoreTypeTreeChanges}");
-            BindListViewItem("ReplaceAssetPathWithAddress", $"{buildReport.Summary.ReplaceAssetPathWithAddress}");
             BindListViewItem(string.Empty, string.Empty);
 
             BindListViewHeader("Build Results");

Assets/YooAsset/Editor/Common/AssetInfo.cs

@@ -62,17 +62,6 @@ namespace YooAsset.Editor
                 return false;
         }
 
-        /// <summary>
-        /// 是否为图集资源
-        /// </summary>
-        public bool IsSpriteAtlas()
-        {
-            if (AssetType == typeof(UnityEngine.U2D.SpriteAtlas))
-                return true;
-            else
-                return false;
-        }
-
         public int CompareTo(AssetInfo other)
         {
             return this.AssetPath.CompareTo(other.AssetPath);

Assets/YooAsset/Editor/EditorDefine.cs

@@ -39,10 +39,7 @@ namespace YooAsset.Editor
         Shader,
         Sprite,
         Texture,
-        RenderTexture,
         VideoClip,
-        PlayableAsset,
-        TimelineAsset
     }
 
     /// <summary>

Assets/YooAsset/Editor/EditorTools.cs

@@ -169,28 +169,6 @@ namespace YooAsset.Editor
         /// <param name="searchInFolders">指定搜索的文件夹列表</param>
         /// <returns>返回搜集到的资源路径列表</returns>
         public static string[] FindAssets(EAssetSearchType searchType, string[] searchInFolders)
-        {
-            return FindAssets(searchType.ToString(), searchInFolders);
-        }
-
-        /// <summary>
-        /// 搜集资源
-        /// </summary>
-        /// <param name="searchType">搜集的资源类型</param>
-        /// <param name="searchInFolder">指定搜索的文件夹</param>
-        /// <returns>返回搜集到的资源路径列表</returns>
-        public static string[] FindAssets(EAssetSearchType searchType, string searchInFolder)
-        {
-            return FindAssets(searchType.ToString(), new string[] { searchInFolder });
-        }
-
-        /// <summary>
-        /// 搜集资源
-        /// </summary>
-        /// <param name="searchType">搜集的资源类型</param>
-        /// <param name="searchInFolders">指定搜索的文件夹列表</param>
-        /// <returns>返回搜集到的资源路径列表</returns>
-        public static string[] FindAssets(string searchType, string[] searchInFolders)
         {
             // 注意：AssetDatabase.FindAssets()不支持末尾带分隔符的文件夹路径
             for (int i = 0; i < searchInFolders.Length; i++)
@@ -201,7 +179,7 @@ namespace YooAsset.Editor
 
             // 注意：获取指定目录下的所有资源对象（包括子文件夹）
             string[] guids;
-            if (string.IsNullOrEmpty(searchType) || searchType == EAssetSearchType.All.ToString())
+            if (searchType == EAssetSearchType.All)
                 guids = AssetDatabase.FindAssets(string.Empty, searchInFolders);
             else
                 guids = AssetDatabase.FindAssets($"t:{searchType}", searchInFolders);
@@ -228,7 +206,7 @@ namespace YooAsset.Editor
         /// <param name="searchType">搜集的资源类型</param>
         /// <param name="searchInFolder">指定搜索的文件夹</param>
         /// <returns>返回搜集到的资源路径列表</returns>
-        public static string[] FindAssets(string searchType, string searchInFolder)
+        public static string[] FindAssets(EAssetSearchType searchType, string searchInFolder)
         {
             return FindAssets(searchType, new string[] { searchInFolder });
         }

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/DownloadSystemHelper.cs

@@ -37,17 +37,13 @@ namespace YooAsset
             string url;
 
             // 获取对应平台的URL地址
-            // 说明：苹果不同设备上操作系统不同。
-            // 说明：iPhone和iPod对应的是iOS系统。
-            // 说明：iPad对应的是iPadOS系统。
-            // 说明：AppleTV对应的是tvOS系统。
 #if UNITY_EDITOR_OSX
             url = StringUtility.Format("file://{0}", path);
-#elif UNITY_EDITOR_WIN
+#elif UNITY_EDITOR
             url = StringUtility.Format("file:///{0}", path);
 #elif UNITY_WEBGL
             url = path;
-#elif UNITY_IOS || UNITY_IPHONE
+#elif UNITY_IPHONE
             url = StringUtility.Format("file://{0}", path);
 #elif UNITY_ANDROID
             if (path.StartsWith("jar:file://"))
@@ -69,17 +65,12 @@ namespace YooAsset
                 else
                     url = StringUtility.Format("file://{0}", path);
             }
-
-#elif UNITY_WSA
+#elif UNITY_STANDALONE_OSX
+            url = new System.Uri(path).ToString();
+#elif UNITY_STANDALONE || UNITY_WSA
             url = StringUtility.Format("file:///{0}", path);
 #elif UNITY_TVOS
             url = StringUtility.Format("file:///{0}", path);
-#elif UNITY_STANDALONE_OSX
-            url = new System.Uri(path).ToString();
-#elif UNITY_STANDALONE_WIN
-            url = StringUtility.Format("file:///{0}", path);
-#elif UNITY_STANDALONE_LINUX
-            url = StringUtility.Format("file:///root/{0}", path);
 #else
             throw new System.NotImplementedException();
 #endif

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

@@ -1,65 +0,0 @@
-using UnityEngine.Networking;
-using UnityEngine;
-
-namespace YooAsset
-{
-    internal class UnityVirtualBundleRequestOperation : UnityWebRequestOperation
-    {
-        protected enum ESteps
-        {
-            None,
-            Download,
-            Done,
-        }
-
-        private readonly PackageBundle _bundle;
-        private readonly int _downloadSpeed;
-        private ESteps _steps = ESteps.None;
-
-        internal UnityVirtualBundleRequestOperation(PackageBundle packageBundle, int downloadSpeed, string url) : base(url)
-        {
-            _bundle = packageBundle;
-            _downloadSpeed = downloadSpeed;
-        }
-        internal override void InternalStart()
-        {
-            _steps = ESteps.Download;
-        }
-        internal override void InternalUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.Download)
-            {
-                // 模拟下载进度
-                float progress = 0;
-                if (DownloadedBytes > 0)
-                    progress = DownloadedBytes / _bundle.FileSize;
-                long downloadBytes = (long)((double)_downloadSpeed * Time.deltaTime);
-                
-                Progress = progress;
-                DownloadProgress = progress;
-                DownloadedBytes += downloadBytes;
-                if (DownloadedBytes < _bundle.FileSize)
-                    return;
-
-                Progress = 1f;
-                DownloadProgress = 1f;
-                DownloadedBytes = _bundle.FileSize;
-
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Succeed;
-            }
-        }
-        internal override void InternalWaitForAsyncComplete()
-        {
-            if (_steps != ESteps.Done)
-            {
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = $"Try load bundle {_bundle.BundleName} from remote !";
-            }
-        }
-    }
-}

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/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,147 +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",
-                DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName,
-                DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName
-            };
-            string packageVersionFileName = YooAssetSettingsData.GetPackageVersionFileName(packageName);
-            string packageHashFileName = YooAssetSettingsData.GetPackageHashFileName(packageName, packageVersion);
-            string manifestBinaryFIleName = YooAssetSettingsData.GetManifestBinaryFileName(packageName, packageVersion);
-            string manifestJsonFIleName = YooAssetSettingsData.GetManifestJsonFileName(packageName, packageVersion);
-            string reportFileName = YooAssetSettingsData.GetBuildReportFileName(packageName, packageVersion);
-            whiteFileList.Add(packageVersionFileName);
-            whiteFileList.Add(packageHashFileName);
-            whiteFileList.Add(manifestBinaryFIleName);
-            whiteFileList.Add(manifestJsonFIleName);
-            whiteFileList.Add(reportFileName);
-
-            // 记录所有内置资源文件
-            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;
-        }
-
-        /// <summary>
-        /// 生成空的包裹内置资源目录文件
-        /// </summary>
-        public static bool CreateEmptyCatalogFile(string packageName, string packageVersion, string outputPath)
-        {
-            // 创建内置清单实例
-            var buildinFileCatalog = new DefaultBuildinFileCatalog();
-            buildinFileCatalog.FileVersion = CatalogDefine.FileVersion;
-            buildinFileCatalog.PackageName = packageName;
-            buildinFileCatalog.PackageVersion = packageVersion;
-
-            // 创建输出文件
-            string jsonFilePath = $"{outputPath}/{DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName}";
-            if (File.Exists(jsonFilePath))
-                File.Delete(jsonFilePath);
-            SerializeToJson(jsonFilePath, buildinFileCatalog);
-
-            // 创建输出文件
-            string binaryFilePath = $"{outputPath}/{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

@@ -53,20 +53,15 @@ namespace YooAsset
         }
 
         #region 自定义参数
-        /// <summary>
-        /// 自定义参数：覆盖安装缓存清理模式
-        /// </summary>
-        public EOverwriteInstallClearMode InstallClearMode { private set; get; } = EOverwriteInstallClearMode.ClearAllManifestFiles;
-
         /// <summary>
         /// 自定义参数：初始化的时候缓存文件校验级别
         /// </summary>
         public EFileVerifyLevel FileVerifyLevel { private set; get; } = EFileVerifyLevel.Middle;
 
         /// <summary>
-        /// 自定义参数：初始化的时候缓存文件校验最大并发数
+        /// 自定义参数：覆盖安装缓存清理模式
         /// </summary>
-        public int FileVerifyMaxConcurrency { private set; get; } = int.MaxValue;
+        public EOverwriteInstallClearMode InstallClearMode { private set; get; } = EOverwriteInstallClearMode.ClearAllManifestFiles;
 
         /// <summary>
         /// 自定义参数：数据文件追加文件格式
@@ -90,24 +85,14 @@ namespace YooAsset
         public string CopyBuildinPackageManifestDestRoot { private set; get; }
 
         /// <summary>
-        /// 自定义参数：解压文件系统的根目录
-        /// </summary>
-        public string UnpackFileSystemRoot { private set; get; }
-
-        /// <summary>
-        ///  自定义参数：解密服务接口的实例类
+        ///  自定义参数：解密方法类
         /// </summary>
         public IDecryptionServices DecryptionServices { private set; get; }
 
         /// <summary>
         /// 自定义参数：资源清单服务类
         /// </summary>
-        public IManifestRestoreServices ManifestServices { private set; get; }
-
-        /// <summary>
-        /// 自定义参数：拷贝内置文件接口的实例类
-        /// </summary>
-        public ICopyLocalFileServices CopyLocalFileServices { private set; get; }
+        public IManifestServices ManifestServices { private set; get; }
         #endregion
 
 
@@ -135,7 +120,7 @@ namespace YooAsset
         }
         public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
         {
-            // 注意：业务层的解压器会依赖该方法
+            // 注意：业务层的解压下载器会依赖内置文件系统的下载方法
             options.ImportFilePath = GetBuildinFileLoadPath(bundle);
             return _unpackFileSystem.DownloadFileAsync(bundle, options);
         }
@@ -166,18 +151,13 @@ namespace YooAsset
 
         public virtual void SetParameter(string name, object value)
         {
-            if (name == FileSystemParametersDefine.INSTALL_CLEAR_MODE)
-            {
-                InstallClearMode = (EOverwriteInstallClearMode)value;
-            }
-            else if (name == FileSystemParametersDefine.FILE_VERIFY_LEVEL)
+            if (name == FileSystemParametersDefine.FILE_VERIFY_LEVEL)
             {
                 FileVerifyLevel = (EFileVerifyLevel)value;
             }
-            else if (name == FileSystemParametersDefine.FILE_VERIFY_MAX_CONCURRENCY)
+            else if (name == FileSystemParametersDefine.INSTALL_CLEAR_MODE)
             {
-                int convertValue = Convert.ToInt32(value);
-                FileVerifyMaxConcurrency = Mathf.Clamp(convertValue, 1, int.MaxValue);
+                InstallClearMode = (EOverwriteInstallClearMode)value;
             }
             else if (name == FileSystemParametersDefine.APPEND_FILE_EXTENSION)
             {
@@ -195,21 +175,13 @@ namespace YooAsset
             {
                 CopyBuildinPackageManifestDestRoot = (string)value;
             }
-            else if (name == FileSystemParametersDefine.UNPACK_FILE_SYSTEM_ROOT)
-            {
-                UnpackFileSystemRoot = (string)value;
-            }
             else if (name == FileSystemParametersDefine.DECRYPTION_SERVICES)
             {
                 DecryptionServices = (IDecryptionServices)value;
             }
             else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
             {
-                ManifestServices = (IManifestRestoreServices)value;
-            }
-            else if (name == FileSystemParametersDefine.COPY_LOCAL_FILE_SERVICES)
-            {
-                CopyLocalFileServices = (ICopyLocalFileServices)value;
+                ManifestServices = (IManifestServices)value;
             }
             else
             {
@@ -229,13 +201,11 @@ namespace YooAsset
             var remoteServices = new DefaultUnpackRemoteServices(_packageRoot);
             _unpackFileSystem = new DefaultUnpackFileSystem();
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices);
-            _unpackFileSystem.SetParameter(FileSystemParametersDefine.INSTALL_CLEAR_MODE, InstallClearMode);
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.FILE_VERIFY_LEVEL, FileVerifyLevel);
-            _unpackFileSystem.SetParameter(FileSystemParametersDefine.FILE_VERIFY_MAX_CONCURRENCY, FileVerifyMaxConcurrency);
+            _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, UnpackFileSystemRoot);
+            _unpackFileSystem.OnCreate(packageName, null);
         }
         public virtual void OnDestroy()
         {
@@ -355,27 +325,6 @@ namespace YooAsset
 #endif
         }
 
-        /// <summary>
-        /// 是否属于解压资源包文件
-        /// </summary>
-        protected virtual bool IsUnpackBundleFile(PackageBundle bundle)
-        {
-            if (Belong(bundle) == false)
-                return false;
-
-#if UNITY_ANDROID || UNITY_OPENHARMONY
-            if (bundle.Encrypted)
-                return true;
-
-            if (bundle.BundleType == (int)EBuildBundleType.RawBundle)
-                return true;
-
-            return false;
-#else
-            return false;
-#endif
-        }
-
         #region 内部方法
         protected string GetDefaultBuildinPackageRoot(string packageName)
         {
@@ -411,6 +360,27 @@ namespace YooAsset
             return PathUtility.Combine(_packageRoot, DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName);
         }
 
+        /// <summary>
+        /// 是否属于解压资源包文件
+        /// </summary>
+        protected bool IsUnpackBundleFile(PackageBundle bundle)
+        {
+            if (Belong(bundle) == false)
+                return false;
+
+#if UNITY_ANDROID
+            if (bundle.Encrypted)
+                return true;
+
+            if (bundle.BundleType == (int)EBuildBundleType.RawBundle)
+                return true;
+
+            return false;
+#else
+            return false;
+#endif
+        }
+
         /// <summary>
         /// 记录文件信息
         /// </summary>

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

@@ -8,20 +8,16 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            LoadBuildinPackageVersion,
-            CopyBuildinPackageHash,
-            CopyBuildinPackageManifest,
+            CopyBuildinManifest,
             InitUnpackFileSystem,
             LoadCatalogFile,
             Done,
         }
 
         private readonly DefaultBuildinFileSystem _fileSystem;
-        private RequestBuildinPackageVersionOperation _requestBuildinPackageVersionOp;
-        private CopyBuildinFileOperation _copyBuildinHashFileOp;
-        private CopyBuildinFileOperation _copyBuildinManifestFileOp;
+        private CopyBuildinPackageManifestOperation _copyBuildinPackageManifestOp;
         private FSInitializeFileSystemOperation _initUnpackFIleSystemOp;
-        private LoadBuildinCatalogFileOperation _loadBuildinCatalogFileOp;
+        private LoadBuildinCatalogFileOperation _loadCatalogFileOp;
         private ESteps _steps = ESteps.None;
 
         internal DBFSInitializeOperation(DefaultBuildinFileSystem fileSystem)
@@ -36,7 +32,7 @@ namespace YooAsset
             Error = $"{nameof(DefaultBuildinFileSystem)} is not support WEBGL platform !";
 #else
             if (_fileSystem.CopyBuildinPackageManifest)
-                _steps = ESteps.LoadBuildinPackageVersion;
+                _steps = ESteps.CopyBuildinManifest;
             else
                 _steps = ESteps.InitUnpackFileSystem;
 #endif
@@ -46,76 +42,20 @@ namespace YooAsset
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.LoadBuildinPackageVersion)
+            if (_steps == ESteps.CopyBuildinManifest)
             {
-                if (_requestBuildinPackageVersionOp == null)
+                if (_copyBuildinPackageManifestOp == null)
                 {
-                    _requestBuildinPackageVersionOp = new RequestBuildinPackageVersionOperation(_fileSystem);
-                    _requestBuildinPackageVersionOp.StartOperation();
-                    AddChildOperation(_requestBuildinPackageVersionOp);
+                    _copyBuildinPackageManifestOp = new CopyBuildinPackageManifestOperation(_fileSystem);
+                    _copyBuildinPackageManifestOp.StartOperation();
+                    AddChildOperation(_copyBuildinPackageManifestOp);
                 }
 
-                _requestBuildinPackageVersionOp.UpdateOperation();
-                if (_requestBuildinPackageVersionOp.IsDone == false)
+                _copyBuildinPackageManifestOp.UpdateOperation();
+                if (_copyBuildinPackageManifestOp.IsDone == false)
                     return;
 
-                if (_requestBuildinPackageVersionOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.CopyBuildinPackageHash;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _requestBuildinPackageVersionOp.Error;
-                }
-            }
-
-            if (_steps == ESteps.CopyBuildinPackageHash)
-            {
-                if (_copyBuildinHashFileOp == null)
-                {
-                    string packageVersion = _requestBuildinPackageVersionOp.PackageVersion;
-                    string destFilePath = GetCopyPackageHashDestPath(packageVersion);
-                    string sourceFilePath = _fileSystem.GetBuildinPackageHashFilePath(packageVersion);
-                    _copyBuildinHashFileOp = new CopyBuildinFileOperation(sourceFilePath, destFilePath);
-                    _copyBuildinHashFileOp.StartOperation();
-                    AddChildOperation(_copyBuildinHashFileOp);
-                }
-
-                _copyBuildinHashFileOp.UpdateOperation();
-                if (_copyBuildinHashFileOp.IsDone == false)
-                    return;
-
-                if (_copyBuildinHashFileOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.CopyBuildinPackageManifest;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _copyBuildinHashFileOp.Error;
-                }
-            }
-
-            if (_steps == ESteps.CopyBuildinPackageManifest)
-            {
-                if (_copyBuildinManifestFileOp == null)
-                {
-                    string packageVersion = _requestBuildinPackageVersionOp.PackageVersion;
-                    string destFilePath = GetCopyPackageManifestDestPath(packageVersion);
-                    string sourceFilePath = _fileSystem.GetBuildinPackageManifestFilePath(packageVersion);
-                    _copyBuildinManifestFileOp = new CopyBuildinFileOperation(sourceFilePath, destFilePath);
-                    _copyBuildinManifestFileOp.StartOperation();
-                    AddChildOperation(_copyBuildinManifestFileOp);
-                }
-
-                _copyBuildinManifestFileOp.UpdateOperation();
-                if (_copyBuildinManifestFileOp.IsDone == false)
-                    return;
-
-                if (_copyBuildinManifestFileOp.Status == EOperationStatus.Succeed)
+                if (_copyBuildinPackageManifestOp.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.InitUnpackFileSystem;
                 }
@@ -123,7 +63,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _copyBuildinManifestFileOp.Error;
+                    Error = _copyBuildinPackageManifestOp.Error;
                 }
             }
 
@@ -163,43 +103,35 @@ 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)
                 {
-                    var catalog = _loadBuildinCatalogFileOp.Catalog;
-                    if (catalog == null)
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = "Fatal error : catalog is null !";
-                        return;
-                    }
-
-                    if (catalog.PackageName != _fileSystem.PackageName)
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Catalog file package name {catalog.PackageName} cannot match the file system package name {_fileSystem.PackageName}";
-                        return;
-                    }
-
-                    foreach (var wrapper in catalog.Wrappers)
-                    {
-                        var fileWrapper = new DefaultBuildinFileSystem.FileWrapper(wrapper.FileName);
-                        _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
-                    }
-
-                    YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}");
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Succeed;
                 }
@@ -207,32 +139,9 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _loadBuildinCatalogFileOp.Error;
+                    Error = _loadCatalogFileOp.Error;
                 }
             }
         }
-
-        private string GetCopyManifestFileRoot()
-        {
-            string destRoot = _fileSystem.CopyBuildinPackageManifestDestRoot;
-            if (string.IsNullOrEmpty(destRoot))
-            {
-                string defaultCacheRoot = YooAssetSettingsData.GetYooDefaultCacheRoot();
-                destRoot = PathUtility.Combine(defaultCacheRoot, _fileSystem.PackageName, DefaultCacheFileSystemDefine.ManifestFilesFolderName);
-            }
-            return destRoot;
-        }
-        private string GetCopyPackageHashDestPath(string packageVersion)
-        {
-            string fileRoot = GetCopyManifestFileRoot();
-            string fileName = YooAssetSettingsData.GetPackageHashFileName(_fileSystem.PackageName, packageVersion);
-            return PathUtility.Combine(fileRoot, fileName);
-        }
-        private string GetCopyPackageManifestDestPath(string packageVersion)
-        {
-            string fileRoot = GetCopyManifestFileRoot();
-            string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, packageVersion);
-            return PathUtility.Combine(fileRoot, fileName);
-        }
     }
 }

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/CopyBuildinFileOperation.cs

@@ -1,102 +0,0 @@
-using System;
-using System.IO;
-
-namespace YooAsset
-{
-    internal class CopyBuildinFileOperation : AsyncOperationBase
-    {
-        private enum ESteps
-        {
-            None,
-            CheckFileExist,
-            TryCopyFile,
-            UnpackFile,
-            Done,
-        }
-
-        private UnityWebFileRequestOperation _webFileRequestOp;
-        private readonly string _sourceFilePath;
-        private readonly string _destFilePath;
-        private ESteps _steps = ESteps.None;
-
-        public CopyBuildinFileOperation(string sourceFilePath, string destFilePath)
-        {
-            _sourceFilePath = sourceFilePath;
-            _destFilePath = destFilePath;
-        }
-        internal override void InternalStart()
-        {
-            _steps = ESteps.CheckFileExist;
-        }
-        internal override void InternalUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.CheckFileExist)
-            {
-                if (File.Exists(_destFilePath))
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.TryCopyFile;
-                }
-            }
-
-            if (_steps == ESteps.TryCopyFile)
-            {
-                if (File.Exists(_sourceFilePath))
-                {
-                    try
-                    {
-                        var directory = Path.GetDirectoryName(_destFilePath);
-                        if (Directory.Exists(directory) == false)
-                            Directory.CreateDirectory(directory);
-                        File.Copy(_sourceFilePath, _destFilePath, true);
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Succeed;
-                    }
-                    catch (Exception ex)
-                    {
-                        YooLogger.Warning($"Failed copy buildin file : {ex.Message}");
-                        _steps = ESteps.UnpackFile;
-                    }
-                }
-                else
-                {
-                    _steps = ESteps.UnpackFile;
-                }
-            }
-
-            if (_steps == ESteps.UnpackFile)
-            {
-                if (_webFileRequestOp == null)
-                {
-                    string url = DownloadSystemHelper.ConvertToWWWPath(_sourceFilePath);
-                    _webFileRequestOp = new UnityWebFileRequestOperation(url, _destFilePath, 60);
-                    _webFileRequestOp.StartOperation();
-                    AddChildOperation(_webFileRequestOp);
-                }
-
-                _webFileRequestOp.UpdateOperation();
-                if (_webFileRequestOp.IsDone == false)
-                    return;
-
-                if (_webFileRequestOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _webFileRequestOp.Error;
-                }
-            }
-        }
-    }
-}

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

@@ -0,0 +1,173 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+
+namespace YooAsset
+{
+    internal class CopyBuildinPackageManifestOperation : AsyncOperationBase
+    {
+        private enum ESteps
+        {
+            None,
+            RequestPackageVersion,
+            CheckHashFile,
+            UnpackHashFile,
+            CheckManifestFile,
+            UnpackManifestFile,
+            Done,
+        }
+
+        private readonly DefaultBuildinFileSystem _fileSystem;
+        private RequestBuildinPackageVersionOperation _requestBuildinPackageVersionOp;
+        private UnityWebFileRequestOperation _hashFileRequestOp;
+        private UnityWebFileRequestOperation _manifestFileRequestOp;
+        private string _buildinPackageVersion;
+        private ESteps _steps = ESteps.None;
+
+        public CopyBuildinPackageManifestOperation(DefaultBuildinFileSystem fileSystem)
+        {
+            _fileSystem = fileSystem;
+        }
+        internal override void InternalStart()
+        {
+            _steps = ESteps.RequestPackageVersion;
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.RequestPackageVersion)
+            {
+                if (_requestBuildinPackageVersionOp == null)
+                {
+                    _requestBuildinPackageVersionOp = new RequestBuildinPackageVersionOperation(_fileSystem);
+                    _requestBuildinPackageVersionOp.StartOperation();
+                    AddChildOperation(_requestBuildinPackageVersionOp);
+                }
+
+                _requestBuildinPackageVersionOp.UpdateOperation();
+                if (_requestBuildinPackageVersionOp.IsDone == false)
+                    return;
+
+                if (_requestBuildinPackageVersionOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.CheckHashFile;
+                    _buildinPackageVersion = _requestBuildinPackageVersionOp.PackageVersion;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _requestBuildinPackageVersionOp.Error;
+                }
+            }
+
+            if (_steps == ESteps.CheckHashFile)
+            {
+                string hashFilePath = GetCopyPackageHashDestPath(_buildinPackageVersion);
+                if (File.Exists(hashFilePath))
+                {
+                    _steps = ESteps.CheckManifestFile;
+                    return;
+                }
+
+                _steps = ESteps.UnpackHashFile;
+            }
+
+            if (_steps == ESteps.UnpackHashFile)
+            {
+                if (_hashFileRequestOp == null)
+                {
+                    string sourcePath = _fileSystem.GetBuildinPackageHashFilePath(_buildinPackageVersion);
+                    string destPath = GetCopyPackageHashDestPath(_buildinPackageVersion);
+                    string url = DownloadSystemHelper.ConvertToWWWPath(sourcePath);
+                    _hashFileRequestOp = new UnityWebFileRequestOperation(url, destPath);
+                    _hashFileRequestOp.StartOperation();
+                    AddChildOperation(_hashFileRequestOp);
+                }
+
+                _hashFileRequestOp.UpdateOperation();
+                if (_hashFileRequestOp.IsDone == false)
+                    return;
+
+                if (_hashFileRequestOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.CheckManifestFile;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _hashFileRequestOp.Error;
+                }
+            }
+
+            if (_steps == ESteps.CheckManifestFile)
+            {
+                string manifestFilePath = GetCopyPackageManifestDestPath(_buildinPackageVersion);
+                if (File.Exists(manifestFilePath))
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                    return;
+                }
+
+                _steps = ESteps.UnpackManifestFile;
+            }
+
+            if (_steps == ESteps.UnpackManifestFile)
+            {
+                if (_manifestFileRequestOp == null)
+                {
+                    string sourcePath = _fileSystem.GetBuildinPackageManifestFilePath(_buildinPackageVersion);
+                    string destPath = GetCopyPackageManifestDestPath(_buildinPackageVersion);
+                    string url = DownloadSystemHelper.ConvertToWWWPath(sourcePath);
+                    _manifestFileRequestOp = new UnityWebFileRequestOperation(url, destPath);
+                    _manifestFileRequestOp.StartOperation();
+                    AddChildOperation(_manifestFileRequestOp);
+                }
+
+                _manifestFileRequestOp.UpdateOperation();
+                if (_manifestFileRequestOp.IsDone == false)
+                    return;
+
+                if (_manifestFileRequestOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _manifestFileRequestOp.Error;
+                }
+            }
+        }
+
+        private string GetCopyManifestFileRoot()
+        {
+            string destRoot = _fileSystem.CopyBuildinPackageManifestDestRoot;
+            if (string.IsNullOrEmpty(destRoot))
+            {
+                string defaultCacheRoot = YooAssetSettingsData.GetYooDefaultCacheRoot();
+                destRoot = PathUtility.Combine(defaultCacheRoot, _fileSystem.PackageName, DefaultCacheFileSystemDefine.ManifestFilesFolderName);
+            }
+            return destRoot;
+        }
+        private string GetCopyPackageHashDestPath(string packageVersion)
+        {
+            string fileRoot = GetCopyManifestFileRoot();
+            string fileName = YooAssetSettingsData.GetPackageHashFileName(_fileSystem.PackageName, packageVersion);
+            return PathUtility.Combine(fileRoot, fileName);
+        }
+        private string GetCopyPackageManifestDestPath(string packageVersion)
+        {
+            string fileRoot = GetCopyManifestFileRoot();
+            string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, packageVersion);
+            return PathUtility.Combine(fileRoot, fileName);
+        }
+    }
+}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 375d88bcf5b9a6146adaf98ceb5369f8
+guid: 69f62f6b4185d06498f96aa272e9b926
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 
 namespace YooAsset
 {
@@ -8,56 +7,35 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            TryLoadFileData,
-            RequestFileData,
+            RequestData,
             LoadCatalog,
             Done,
         }
 
         private readonly DefaultBuildinFileSystem _fileSystem;
         private UnityWebDataRequestOperation _webDataRequestOp;
-        private byte[] _fileData;
         private ESteps _steps = ESteps.None;
 
-        /// <summary>
-        /// 内置资源目录
-        /// </summary>
-        public DefaultBuildinFileCatalog Catalog;
-
         internal LoadBuildinCatalogFileOperation(DefaultBuildinFileSystem fileSystem)
         {
             _fileSystem = fileSystem;
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.TryLoadFileData;
+            _steps = ESteps.RequestData;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.TryLoadFileData)
-            {
-                string filePath = _fileSystem.GetCatalogBinaryFileLoadPath();
-                if (File.Exists(filePath))
-                {
-                    _fileData = File.ReadAllBytes(filePath);
-                    _steps = ESteps.LoadCatalog;
-                }
-                else
-                {
-                    _steps = ESteps.RequestFileData;
-                }
-            }
-
-            if (_steps == ESteps.RequestFileData)
+            if (_steps == ESteps.RequestData)
             {
                 if (_webDataRequestOp == null)
                 {
                     string filePath = _fileSystem.GetCatalogBinaryFileLoadPath();
                     string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
-                    _webDataRequestOp = new UnityWebDataRequestOperation(url, 60);
+                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
                     _webDataRequestOp.StartOperation();
                     AddChildOperation(_webDataRequestOp);
                 }
@@ -68,7 +46,6 @@ namespace YooAsset
 
                 if (_webDataRequestOp.Status == EOperationStatus.Succeed)
                 {
-                    _fileData = _webDataRequestOp.Result;
                     _steps = ESteps.LoadCatalog;
                 }
                 else
@@ -83,7 +60,22 @@ namespace YooAsset
             {
                 try
                 {
-                    Catalog = CatalogTools.DeserializeFromBinary(_fileData);
+                    var catalog = CatalogTools.DeserializeFromBinary(_webDataRequestOp.Result);
+                    if (catalog.PackageName != _fileSystem.PackageName)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"Catalog file package name {catalog.PackageName} cannot match the file system package name {_fileSystem.PackageName}";
+                        return;
+                    }
+
+                    foreach (var wrapper in catalog.Wrappers)
+                    {
+                        var fileWrapper = new DefaultBuildinFileSystem.FileWrapper(wrapper.FileName);
+                        _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
+                    }
+
+                    YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}");
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Succeed;
                 }

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

@@ -1,5 +1,4 @@
-using System.IO;
-
+
 namespace YooAsset
 {
     internal class LoadBuildinPackageManifestOperation : AsyncOperationBase
@@ -7,7 +6,6 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            TryLoadFileData,
             RequestFileData,
             VerifyFileData,
             LoadManifest,
@@ -19,7 +17,6 @@ namespace YooAsset
         private readonly string _packageHash;
         private UnityWebDataRequestOperation _webDataRequestOp;
         private DeserializeManifestOperation _deserializer;
-        private byte[] _fileData;
         private ESteps _steps = ESteps.None;
 
         /// <summary>
@@ -36,34 +33,20 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.TryLoadFileData;
+            _steps = ESteps.RequestFileData;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.TryLoadFileData)
-            {
-                string filePath = _fileSystem.GetBuildinPackageManifestFilePath(_packageVersion);
-                if (File.Exists(filePath))
-                {
-                    _fileData = File.ReadAllBytes(filePath);
-                    _steps = ESteps.VerifyFileData;
-                }
-                else
-                {
-                    _steps = ESteps.RequestFileData;
-                }
-            }
-
             if (_steps == ESteps.RequestFileData)
             {
                 if (_webDataRequestOp == null)
                 {
                     string filePath = _fileSystem.GetBuildinPackageManifestFilePath(_packageVersion);
                     string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
-                    _webDataRequestOp = new UnityWebDataRequestOperation(url, 60);
+                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
                     _webDataRequestOp.StartOperation();
                     AddChildOperation(_webDataRequestOp);
                 }
@@ -74,7 +57,6 @@ namespace YooAsset
 
                 if (_webDataRequestOp.Status == EOperationStatus.Succeed)
                 {
-                    _fileData = _webDataRequestOp.Result;
                     _steps = ESteps.VerifyFileData;
                 }
                 else
@@ -87,7 +69,7 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFileData)
             {
-                if (ManifestTools.VerifyManifestData(_fileData, _packageHash))
+                if (ManifestTools.VerifyManifestData(_webDataRequestOp.Result, _packageHash))
                 {
                     _steps = ESteps.LoadManifest;
                 }
@@ -103,7 +85,7 @@ namespace YooAsset
             {
                 if (_deserializer == null)
                 {
-                    _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _fileData);
+                    _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
                     _deserializer.StartOperation();
                     AddChildOperation(_deserializer);
                 }

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

@@ -1,5 +1,4 @@
-using System.IO;
-
+
 namespace YooAsset
 {
     internal class RequestBuildinPackageHashOperation : AsyncOperationBase
@@ -7,9 +6,7 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            TryLoadPackageHash,
             RequestPackageHash,
-            CheckResult,
             Done,
         }
 
@@ -31,34 +28,20 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.TryLoadPackageHash;
+            _steps = ESteps.RequestPackageHash;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.TryLoadPackageHash)
-            {
-                string filePath = _fileSystem.GetBuildinPackageHashFilePath(_packageVersion);
-                if (File.Exists(filePath))
-                {
-                    PackageHash = File.ReadAllText(filePath);
-                    _steps = ESteps.CheckResult;
-                }
-                else
-                {
-                    _steps = ESteps.RequestPackageHash;
-                }
-            }
-
             if (_steps == ESteps.RequestPackageHash)
             {
                 if (_webTextRequestOp == null)
                 {
                     string filePath = _fileSystem.GetBuildinPackageHashFilePath(_packageVersion);
                     string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
-                    _webTextRequestOp = new UnityWebTextRequestOperation(url, 60);
+                    _webTextRequestOp = new UnityWebTextRequestOperation(url);
                     _webTextRequestOp.StartOperation();
                     AddChildOperation(_webTextRequestOp);
                 }
@@ -70,7 +53,17 @@ namespace YooAsset
                 if (_webTextRequestOp.Status == EOperationStatus.Succeed)
                 {
                     PackageHash = _webTextRequestOp.Result;
-                    _steps = ESteps.CheckResult;
+                    if (string.IsNullOrEmpty(PackageHash))
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"Buildin package hash file content is empty !";
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Succeed;
+                    }
                 }
                 else
                 {
@@ -79,21 +72,6 @@ namespace YooAsset
                     Error = _webTextRequestOp.Error;
                 }
             }
-
-            if (_steps == ESteps.CheckResult)
-            {
-                if (string.IsNullOrEmpty(PackageHash))
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Buildin package hash file content is empty !";
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-            }
         }
     }
 }

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

@@ -1,5 +1,4 @@
-using System.IO;
-
+
 namespace YooAsset
 {
     internal class RequestBuildinPackageVersionOperation : AsyncOperationBase
@@ -7,9 +6,7 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            TryLoadPackageVersion,
             RequestPackageVersion,
-            CheckResult,
             Done,
         }
 
@@ -29,34 +26,20 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.TryLoadPackageVersion;
+            _steps = ESteps.RequestPackageVersion;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.TryLoadPackageVersion)
-            {
-                string filePath = _fileSystem.GetBuildinPackageVersionFilePath();
-                if (File.Exists(filePath))
-                {
-                    PackageVersion = File.ReadAllText(filePath);
-                    _steps = ESteps.CheckResult;
-                }
-                else
-                {
-                    _steps = ESteps.RequestPackageVersion;
-                }
-            }
-
             if (_steps == ESteps.RequestPackageVersion)
             {
                 if (_webTextRequestOp == null)
                 {
                     string filePath = _fileSystem.GetBuildinPackageVersionFilePath();
                     string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
-                    _webTextRequestOp = new UnityWebTextRequestOperation(url, 60);
+                    _webTextRequestOp = new UnityWebTextRequestOperation(url);
                     _webTextRequestOp.StartOperation();
                     AddChildOperation(_webTextRequestOp);
                 }
@@ -68,7 +51,17 @@ namespace YooAsset
                 if (_webTextRequestOp.Status == EOperationStatus.Succeed)
                 {
                     PackageVersion = _webTextRequestOp.Result;
-                    _steps = ESteps.CheckResult;
+                    if (string.IsNullOrEmpty(PackageVersion))
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"Buildin package version file content is empty !";
+                    }
+                    else
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Succeed;
+                    }
                 }
                 else
                 {
@@ -77,21 +70,6 @@ namespace YooAsset
                     Error = _webTextRequestOp.Error;
                 }
             }
-
-            if (_steps == ESteps.CheckResult)
-            {
-                if (string.IsNullOrEmpty(PackageVersion))
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Buildin package version file content is empty !";
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-            }
         }
     }
 }

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

@@ -2,7 +2,6 @@
 using System.IO;
 using System.Collections.Generic;
 using System.Linq;
-using UnityEngine;
 
 namespace YooAsset
 {
@@ -57,35 +56,25 @@ namespace YooAsset
 
         #region 自定义参数
         /// <summary>
-        /// 自定义参数：远程服务接口的实例类
+        /// 自定义参数：远程服务接口
         /// </summary>
         public IRemoteServices RemoteServices { private set; get; }
 
-        /// <summary>
-        /// 自定义参数：覆盖安装缓存清理模式
-        /// </summary>
-        public EOverwriteInstallClearMode InstallClearMode { private set; get; } = EOverwriteInstallClearMode.ClearAllManifestFiles;
-
         /// <summary>
         /// 自定义参数：初始化的时候缓存文件校验级别
         /// </summary>
         public EFileVerifyLevel FileVerifyLevel { private set; get; } = EFileVerifyLevel.Middle;
 
         /// <summary>
-        /// 自定义参数：初始化的时候缓存文件校验最大并发数
+        /// 自定义参数：覆盖安装缓存清理模式
         /// </summary>
-        public int FileVerifyMaxConcurrency { private set; get; } = int.MaxValue;
+        public EOverwriteInstallClearMode InstallClearMode { private set; get; } = EOverwriteInstallClearMode.ClearAllManifestFiles;
 
         /// <summary>
         /// 自定义参数：数据文件追加文件格式
         /// </summary>
         public bool AppendFileExtension { private set; get; } = false;
 
-        /// <summary>
-        /// 自定义参数：禁用边玩边下机制
-        /// </summary>
-        public bool DisableOnDemandDownload { private set; get; } = false;
-
         /// <summary>
         /// 自定义参数：最大并发连接数
         /// </summary>
@@ -96,11 +85,6 @@ namespace YooAsset
         /// </summary>
         public int DownloadMaxRequestPerFrame { private set; get; } = int.MaxValue;
 
-        /// <summary>
-        /// 自定义参数：下载任务的看门狗机制监控时间
-        /// </summary>
-        public int DownloadWatchDogTime { private set; get; } = int.MaxValue;
-
         /// <summary>
         /// 自定义参数：启用断点续传的最小尺寸
         /// </summary>
@@ -112,19 +96,14 @@ namespace YooAsset
         public List<long> ResumeDownloadResponseCodes { private set; get; } = null;
 
         /// <summary>
-        ///  自定义参数：解密服务接口的实例类
+        ///  自定义参数：解密方法类
         /// </summary>
         public IDecryptionServices DecryptionServices { private set; get; }
 
         /// <summary>
         /// 自定义参数：资源清单服务类
         /// </summary>
-        public IManifestRestoreServices ManifestServices { private set; get; }
-
-        /// <summary>
-        /// 自定义参数：拷贝内置文件接口的实例类
-        /// </summary>
-        public ICopyLocalFileServices CopyLocalFileServices { private set; get; }
+        public IManifestServices ManifestServices { private set; get; }
         #endregion
 
 
@@ -158,11 +137,6 @@ namespace YooAsset
                 var operation = new ClearUnusedCacheBundleFilesOperation(this, manifest);
                 return operation;
             }
-            else if (options.ClearMode == EFileClearMode.ClearBundleFilesByLocations.ToString())
-            {
-                var operation = new ClearCacheBundleFilesByLocationsOperaiton(this, manifest, options.ClearParam);
-                return operation;
-            }
             else if (options.ClearMode == EFileClearMode.ClearBundleFilesByTags.ToString())
             {
                 var operation = new ClearCacheBundleFilesByTagsOperaiton(this, manifest, options.ClearParam);
@@ -187,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)
         {
@@ -231,41 +194,25 @@ namespace YooAsset
             {
                 RemoteServices = (IRemoteServices)value;
             }
-            else if (name == FileSystemParametersDefine.INSTALL_CLEAR_MODE)
-            {
-                InstallClearMode = (EOverwriteInstallClearMode)value;
-            }
             else if (name == FileSystemParametersDefine.FILE_VERIFY_LEVEL)
             {
                 FileVerifyLevel = (EFileVerifyLevel)value;
             }
-            else if (name == FileSystemParametersDefine.FILE_VERIFY_MAX_CONCURRENCY)
+            else if (name == FileSystemParametersDefine.INSTALL_CLEAR_MODE)
             {
-                int convertValue = Convert.ToInt32(value);
-                FileVerifyMaxConcurrency = Mathf.Clamp(convertValue, 1, int.MaxValue);
+                InstallClearMode = (EOverwriteInstallClearMode)value;
             }
             else if (name == FileSystemParametersDefine.APPEND_FILE_EXTENSION)
             {
                 AppendFileExtension = Convert.ToBoolean(value);
             }
-            else if (name == FileSystemParametersDefine.DISABLE_ONDEMAND_DOWNLOAD)
-            {
-                DisableOnDemandDownload = Convert.ToBoolean(value);
-            }
             else if (name == FileSystemParametersDefine.DOWNLOAD_MAX_CONCURRENCY)
             {
-                int convertValue = Convert.ToInt32(value);
-                DownloadMaxConcurrency = Mathf.Clamp(convertValue, 1, int.MaxValue);
+                DownloadMaxConcurrency = Convert.ToInt32(value);
             }
             else if (name == FileSystemParametersDefine.DOWNLOAD_MAX_REQUEST_PER_FRAME)
             {
-                int convertValue = Convert.ToInt32(value);
-                DownloadMaxRequestPerFrame = Mathf.Clamp(convertValue, 1, int.MaxValue);
-            }
-            else if (name == FileSystemParametersDefine.DOWNLOAD_WATCH_DOG_TIME)
-            {
-                int convertValue = Convert.ToInt32(value);
-                DownloadWatchDogTime = Mathf.Clamp(convertValue, 1, int.MaxValue);
+                DownloadMaxRequestPerFrame = Convert.ToInt32(value);
             }
             else if (name == FileSystemParametersDefine.RESUME_DOWNLOAD_MINMUM_SIZE)
             {
@@ -281,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
             {
@@ -521,22 +464,22 @@ namespace YooAsset
         }
 
         private readonly BufferWriter _sharedBuffer = new BufferWriter(1024);
-        public void WriteBundleInfoFile(string filePath, uint dataFileCRC, long dataFileSize)
+        public void WriteBundleInfoFile(string filePath, string dataFileCRC, long dataFileSize)
         {
             using (FileStream fs = new FileStream(filePath, FileMode.Create, FileAccess.Write, FileShare.Read))
             {
                 _sharedBuffer.Clear();
-                _sharedBuffer.WriteUInt32(dataFileCRC);
+                _sharedBuffer.WriteUTF8(dataFileCRC);
                 _sharedBuffer.WriteInt64(dataFileSize);
                 _sharedBuffer.WriteToStream(fs);
                 fs.Flush();
             }
         }
-        public void ReadBundleInfoFile(string filePath, out uint dataFileCRC, out long dataFileSize)
+        public void ReadBundleInfoFile(string filePath, out string dataFileCRC, out long dataFileSize)
         {
             byte[] binaryData = FileUtility.ReadAllBytes(filePath);
             BufferReader buffer = new BufferReader(binaryData);
-            dataFileCRC = buffer.ReadUInt32();
+            dataFileCRC = buffer.ReadUTF8();
             dataFileSize = buffer.ReadInt64();
         }
         #endregion

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

@@ -7,10 +7,10 @@ namespace YooAsset
     {
         public string InfoFilePath { private set; get; }
         public string DataFilePath { private set; get; }
-        public uint DataFileCRC { private set; get; }
+        public string DataFileCRC { private set; get; }
         public long DataFileSize { private set; get; }
 
-        public RecordFileElement(string infoFilePath, string dataFilePath, uint dataFileCRC, long dataFileSize)
+        public RecordFileElement(string infoFilePath, string dataFilePath, string dataFileCRC, long dataFileSize)
         {
             InfoFilePath = infoFilePath;
             DataFilePath = dataFilePath;

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

@@ -4,7 +4,7 @@ namespace YooAsset
     internal class TempFileElement
     {
         public string TempFilePath { private set; get; }
-        public uint TempFileCRC { private set; get; }
+        public string TempFileCRC { private set; get; }
         public long TempFileSize { private set; get; }
 
         /// <summary>
@@ -12,7 +12,7 @@ namespace YooAsset
         /// </summary>
         public volatile int Result = 0;
 
-        public TempFileElement(string filePath, uint fileCRC, long fileSize)
+        public TempFileElement(string filePath, string fileCRC, long fileSize)
         {
             TempFilePath = filePath;
             TempFileCRC = fileCRC;

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

@@ -10,7 +10,7 @@ namespace YooAsset
         public string DataFilePath { private set; get; }
         public string InfoFilePath { private set; get; }
 
-        public uint DataFileCRC;
+        public string DataFileCRC;
         public long DataFileSize;
 
         /// <summary>

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

@@ -11,7 +11,6 @@ namespace YooAsset
             None,
             CheckExist,
             DownloadFile,
-            AbortDownload,
             LoadAssetBundle,
             CheckResult,
             Done,
@@ -50,36 +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;
-                    }
-                }
-            }
-
-            if (_steps == ESteps.DownloadFile)
-            {
-                // 中断下载
-                if (AbortDownloadFile)
-                {
-                    if (_downloadFileOp != null)
-                        _downloadFileOp.AbortOperation();
-                    _steps = ESteps.AbortDownload;
+                    _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);
@@ -106,23 +85,6 @@ namespace YooAsset
                 }
             }
 
-            if (_steps == ESteps.AbortDownload)
-            {
-                if (_downloadFileOp != null)
-                {
-                    if (IsWaitForAsyncComplete)
-                        _downloadFileOp.WaitForAsyncComplete();
-
-                    _downloadFileOp.UpdateOperation();
-                    if (_downloadFileOp.IsDone == false)
-                        return;
-                }
-
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = "Abort download file !";
-            }
-
             if (_steps == ESteps.LoadAssetBundle)
             {
                 if (_bundle.Encrypted)
@@ -266,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;
                 }
@@ -280,7 +246,6 @@ namespace YooAsset
             None,
             CheckExist,
             DownloadFile,
-            AbortDownload,
             LoadCacheRawBundle,
             Done,
         }
@@ -342,20 +307,10 @@ namespace YooAsset
 
             if (_steps == ESteps.DownloadFile)
             {
-                // 中断下载
-                if (AbortDownloadFile)
-                {
-                    if (_downloadFileOp != null)
-                        _downloadFileOp.AbortOperation();
-                    _steps = ESteps.AbortDownload;
-                }
-            }
-
-            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);
@@ -382,23 +337,6 @@ namespace YooAsset
                 }
             }
 
-            if (_steps == ESteps.AbortDownload)
-            {
-                if (_downloadFileOp != null)
-                {
-                    if (IsWaitForAsyncComplete)
-                        _downloadFileOp.WaitForAsyncComplete();
-
-                    _downloadFileOp.UpdateOperation();
-                    if (_downloadFileOp.IsDone == false)
-                        return;
-                }
-
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = "Abort download file !";
-            }
-
             if (_steps == ESteps.LoadCacheRawBundle)
             {
                 string filePath = _fileSystem.GetCacheBundleFileLoadPath(_bundle);
@@ -423,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/ClearCacheBundleFilesByLocationsOperaiton.cs

@@ -1,142 +0,0 @@
-using System.Collections.Generic;
-
-namespace YooAsset
-{
-    internal class ClearCacheBundleFilesByLocationsOperaiton : FSClearCacheFilesOperation
-    {
-        private enum ESteps
-        {
-            None,
-            CheckManifest,
-            CheckArgs,
-            GetClearCacheFiles,
-            ClearFilterCacheFiles,
-            Done,
-        }
-
-        private readonly DefaultCacheFileSystem _fileSystem;
-        private readonly PackageManifest _manifest;
-        private readonly object _clearParam;
-        private string[] _locations;
-        private List<string> _clearBundleGUIDs;
-        private int _clearFileTotalCount = 0;
-        private ESteps _steps = ESteps.None;
-
-        internal ClearCacheBundleFilesByLocationsOperaiton(DefaultCacheFileSystem fileSystem, PackageManifest manifest, object clearParam)
-        {
-            _fileSystem = fileSystem;
-            _manifest = manifest;
-            _clearParam = clearParam;
-        }
-
-        internal override void InternalStart()
-        {
-            _steps = ESteps.CheckManifest;
-        }
-
-        internal override void InternalUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.CheckManifest)
-            {
-                if (_manifest == null)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = "Can not found active package manifest !";
-                }
-                else
-                {
-                    _steps = ESteps.CheckArgs;
-                }
-            }
-
-            if (_steps == ESteps.CheckArgs)
-            {
-                if (_clearParam == null)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = "Clear param is null !";
-                    return;
-                }
-
-                if (_clearParam is string)
-                {
-                    _locations = new string[] { _clearParam as string };
-                }
-                else if (_clearParam is List<string>)
-                {
-                    var tempList = _clearParam as List<string>;
-                    _locations = tempList.ToArray();
-                }
-                else if (_clearParam is string[])
-                {
-                    _locations = _clearParam as string[];
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Invalid clear param : {_clearParam.GetType().FullName}";
-                    return;
-                }
-
-                _steps = ESteps.GetClearCacheFiles;
-            }
-
-            if (_steps == ESteps.GetClearCacheFiles)
-            {
-                _clearBundleGUIDs = GetBundleGUIDsByLocation();
-                _clearFileTotalCount = _clearBundleGUIDs.Count;
-                _steps = ESteps.ClearFilterCacheFiles;
-            }
-
-            if (_steps == ESteps.ClearFilterCacheFiles)
-            {
-                for (int i = _clearBundleGUIDs.Count - 1; i >= 0; i--)
-                {
-                    string bundleGUID = _clearBundleGUIDs[i];
-                    _fileSystem.DeleteCacheBundleFile(bundleGUID);
-                    _clearBundleGUIDs.RemoveAt(i);
-                    if (OperationSystem.IsBusy)
-                        break;
-                }
-
-                if (_clearFileTotalCount == 0)
-                    Progress = 1.0f;
-                else
-                    Progress = 1.0f - (_clearBundleGUIDs.Count / _clearFileTotalCount);
-
-                if (_clearBundleGUIDs.Count == 0)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-            }
-        }
-
-        private List<string> GetBundleGUIDsByLocation()
-        {
-            List<string> result = new List<string>(_locations.Length);
-
-            foreach (var location in _locations)
-            {
-                string assetPath = _manifest.TryMappingToAssetPath(location);
-                if (_manifest.TryGetPackageAsset(assetPath, out PackageAsset packageAsset))
-                {
-                    PackageBundle bundle = _manifest.GetMainPackageBundle(packageAsset.BundleID);
-
-                    if (bundle != null)
-                    {
-                        result.Add(bundle.BundleGUID);
-                    }
-                }
-            }
-
-            return result;
-        }
-    }
-}

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

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

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: e01cc308d7179a34281087fafe455b42
+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 = 0;
-        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/SearchCacheFilesOperation.cs

@@ -16,7 +16,7 @@ namespace YooAsset
         }
 
         private readonly DefaultCacheFileSystem _fileSystem;
-        private IEnumerator<string> _filesEnumerator = null;
+        private IEnumerator<DirectoryInfo> _filesEnumerator = null;
         private float _verifyStartTime;
         private ESteps _steps = ESteps.None;
 
@@ -42,11 +42,11 @@ namespace YooAsset
 
             if (_steps == ESteps.Prepare)
             {
-                string rootDirectory = _fileSystem.GetCacheBundleFilesRoot();
-                if (Directory.Exists(rootDirectory))
+                DirectoryInfo rootDirectory = new DirectoryInfo(_fileSystem.GetCacheBundleFilesRoot());
+                if (rootDirectory.Exists)
                 {
-                    var directories = Directory.EnumerateDirectories(rootDirectory);
-                    _filesEnumerator = directories.GetEnumerator();
+                    var directorieInfos = rootDirectory.EnumerateDirectories();
+                    _filesEnumerator = directorieInfos.GetEnumerator();
                 }
                 _steps = ESteps.SearchFiles;
             }
@@ -76,15 +76,15 @@ namespace YooAsset
                     break;
 
                 var rootFoder = _filesEnumerator.Current;
-                var childDirectories = Directory.EnumerateDirectories(rootFoder);
+                var childDirectories = rootFoder.GetDirectories();
                 foreach (var chidDirectory in childDirectories)
                 {
-                    string bundleGUID = Path.GetFileName(chidDirectory);
+                    string bundleGUID = chidDirectory.Name;
                     if (_fileSystem.IsRecordBundleFile(bundleGUID))
                         continue;
 
                     // 创建验证元素类
-                    string fileRootPath = chidDirectory;
+                    string fileRootPath = chidDirectory.FullName;
                     string dataFilePath = $"{fileRootPath}/{DefaultCacheFileSystemDefine.BundleDataFileName}";
                     string infoFilePath = $"{fileRootPath}/{DefaultCacheFileSystemDefine.BundleInfoFileName}";
 
@@ -108,15 +108,17 @@ namespace YooAsset
 
             return isFindItem;
         }
-        private string FindDataFileExtension(string directory)
+        private string FindDataFileExtension(DirectoryInfo directoryInfo)
         {
             string dataFileExtension = string.Empty;
-            string searchPattern = DefaultCacheFileSystemDefine.BundleDataFileName + "*";
-            var dataFiles = Directory.EnumerateFiles(directory, searchPattern);
-            foreach (var filePath in dataFiles)
+            var fileInfos = directoryInfo.GetFiles();
+            foreach (var fileInfo in fileInfos)
             {
-                dataFileExtension = Path.GetExtension(filePath);
-                break;
+                if (fileInfo.Name.StartsWith(DefaultCacheFileSystemDefine.BundleDataFileName))
+                {
+                    dataFileExtension = fileInfo.Extension;
+                    break;
+                }
             }
             return dataFileExtension;
         }

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

@@ -1,98 +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;
-
-        private bool _watchDogInit = false;
-        private bool _watchDogAborted = false;
-        private ulong _lastDownloadBytes;
-        private double _lastGetDataTime;
-
-        /// <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>
-        protected void UpdateWatchDog()
-        {
-            if (_fileSystem.DownloadWatchDogTime == int.MaxValue)
-                return;
-
-            if (_watchDogAborted)
-                return;
-
-#if UNITY_2020_3_OR_NEWER
-            double realtimeSinceStartup = UnityEngine.Time.realtimeSinceStartupAsDouble;
-#else
-            double realtimeSinceStartup = UnityEngine.Time.realtimeSinceStartup;
-#endif
-
-            if (_watchDogInit == false)
-            {
-                _watchDogInit = true;
-                _lastDownloadBytes = 0;
-                _lastGetDataTime = realtimeSinceStartup;
-            }
-
-            if (_webRequest.downloadedBytes != _lastDownloadBytes)
-            {
-                _lastDownloadBytes = _webRequest.downloadedBytes;
-                _lastGetDataTime = realtimeSinceStartup;
-            }
-            else
-            {
-                double deltaTime = realtimeSinceStartup - _lastGetDataTime;
-                if (deltaTime > _fileSystem.DownloadWatchDogTime)
-                {
-                    _watchDogAborted = true;
-                    InternalAbort(); //终止网络请求
-                }
-            }
-        }
-
-        /// <summary>
-        /// 减少引用计数
-        /// </summary>
-        public void Release()
-        {
-            RefCount--;
-        }
-
-        /// <summary>
-        /// 增加引用计数
-        /// </summary>
-        public void Reference()
-        {
-            RefCount++;
-        }
-    }
-}

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

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