Update CHANGELOG.md

内置清单构建

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,208 @@
 
 All notable changes to this package will be documented in this file.
 
+## [2.3.13] - 2025-07-23
+
+**重要**：**所有下载相关的超时参数（timeout）已更新判定逻辑**
+
+超时不再以‘指定时间内未接收到任何数据’为判定条件，而是以‘指定时间内未完成整个下载任务’为判定条件。
+
+### Improvements
+
+- 重构了核心代码的下载逻辑，解决了同步加载触发的下载任务没有完成的问题。
+- 扩展工程里新增了PreprocessBuildCatalog类，用于处理在构建应用程序前自动生成内置资源目录文件。
+- (#592) 优化了资源清单逻辑里不必要产生的GC逻辑。
+
+### Fixed
+
+- (#590) 修复了TryUnloadUnusedAsset方法，在依赖嵌套层数过深导致没有卸载的问题。
+
+### Added
+
+- 新增了支持Google Play的文件系统扩展示例。
+
+- 新增了支持DefaultCacheFileSystem的单元测试用例。
+
+- 新增了文件系统配置参数：DISABLE_ONDEMAND_DOWNLOAD
+
+  ```csharp
+  public class FileSystemParametersDefine
+  {
+      // 禁用边玩边下机制
+      public const string DISABLE_ONDEMAND_DOWNLOAD = "DISABLE_ONDEMAND_DOWNLO";
+  }
+  ```
+
+### Changed
+
+- IManifestServices接口拆分为了IManifestProcessServices和IManifestRestoreServices
+
+  ```csharp
+  public interface IManifestProcessServices
+  {
+      /// <summary>
+      /// 处理资源清单（压缩或加密）
+      /// </summary>
+      byte[] ProcessManifest(byte[] fileData);
+  }
+  
+  public interface IManifestRestoreServices
+  {
+      /// <summary>
+      /// 还原资源清单（解压或解密）
+      /// </summary>
+      byte[] RestoreManifest(byte[] fileData);
+  }
+  ```
+
+## [2.3.12] - 2025-07-01
+
+### Improvements
+
+- 优化了同步接口导致的资源拷贝和资源验证性能开销高的现象。
+- 微信小游戏和抖音小游戏支持资源清单加密。
+
+### Fixed
+
+- (#579) 修复了2.3.10版本资源包构建页面里CopyBuildinFileParam无法编辑问题。
+- (#572) 修复了资源收集页面指定收集的预制体名称变动的问题。
+- (#582) 修复了非递归收集依赖时，依赖列表中才包含主资源的问题。
+
+### Added
+
+- 新增初始化参数：WebGLForceSyncLoadAsset
+
+  ```csharp
+  public abstract class InitializeParameters
+  {
+      /// <summary>
+      /// WebGL平台强制同步加载资源对象
+      /// </summary>Add commentMore actions
+      public bool WebGLForceSyncLoadAsset = false;
+  }
+  ```
+
+- (#576) 新增了资源清单服务类：IManifestServices
+
+  ```csharp
+  /// <summary>
+  /// 资源清单文件处理服务接口
+  /// </summary>
+  public interface IManifestServices
+  {
+      /// <summary>
+      /// 处理资源清单（压缩和加密）
+      /// </summary>
+      byte[] ProcessManifest(byte[] fileData);
+          
+      /// <summary>
+      /// 还原资源清单（解压和解密）
+      /// </summary>
+      byte[] RestoreManifest(byte[] fileData);
+  } 
+  ```
+
+- (#585) 新增了本地文件拷贝服务类：ICopyLocalFileServices
+
+  ```csharp
+  /// <summary>
+  /// 本地文件拷贝服务类
+  /// </summary>
+  public interface ICopyLocalFileServices
+  {
+      void CopyFile(LocalFileInfo sourceFileInfo, string destFilePath);
+  }
+  ```
+
+## [2.3.10] - 2025-06-17
+
+### Improvements
+
+- 小游戏扩展库已经独立，可以单独导入到项目工程。
+- 编辑器里的TableView视图新增了AssetObjectCell类。
+- (#552) 微信小游戏文件系统类，增加了URL合法性的初始化检测机制。
+- (#566) 重构了资源构建页面，方便扩展自定义界面。
+- (#573) 完善了AssetDependencyDB的输出日志，可以正确输出丢失的引用资产信息。
+
+### Fixed
+
+- 修复太空战机DEMO在退出运行模式时的报错。
+- (#551) 修复了Unity2019, Unity2020的代码兼容性报错。
+- (#569) 修复了TVOS平台的兼容问题。  
+- (#564) 修复了TiktokFileSystem文件系统里appendTimeTicks无效的问题。
+
+### Added
+
+- (#562) 新增了解密方法。
+
+  ```csharp
+  public interface IDecryptionServices
+  {
+      /// <summary>
+      /// 后备方式获取解密的资源包对象
+      /// 注意：当正常解密方法失败后，会触发后备加载！
+      /// 说明：建议通过LoadFromMemory()方法加载资源对象作为保底机制。
+      /// issues : https://github.com/tuyoogame/YooAsset/issues/562
+      /// </summary>
+      DecryptResult LoadAssetBundleFallback(DecryptFileInfo fileInfo);    
+  }
+  ```
+
+
+
+## [2.3.9] - 2025-05-13
+
+### Improvements
+
+- 增加了YOO_ASSET_EXPERIMENT宏，用于控制实验性代码的开关。
+- 构建管线目前会输出构建日志到输出目录下，方便查看引擎在构建时主动清空的控制台日志。
+- 优化了收集器tag传染扩散逻辑，避免Group里配置了Tag导致的无意义的警告信息。
+- 扩展工程内PanelMonitor代码默认关闭状态。
+
+### Fixed
+
+- (#528) 修复了AssetDependencyDatabase在查询引擎资源对象是否存在的时效问题。
+
+### Added
+
+- (#542) 新增了资源管理系统销毁方法。
+
+  该方法会销毁所有的资源包裹和异步操作任务，以及卸载所有AssetBundle对象！
+
+  ```csharp
+  public class YooAssets
+  {
+      /// <summary>
+      /// 销毁资源系统
+      /// </summary>
+      public static void Destroy();
+  }
+  ```
+
+- 新增了SBP构建管线的构建参数
+
+  ```csharp
+  /// <summary>
+  /// 从AssetBundle文件头里剥离Unity版本信息
+  /// </summary>
+  public bool StripUnityVersion = false;
+  ```
+
+- 新增了构建错误码：BuiltinShadersBundleNameIsNull 
+
+## [2.3.8] - 2025-04-17
+
+### Improvements
+
+- 扩展工程里增加了“图集丢失变白块的解决方案”的相关代码。
+
+### Fixed
+
+- (#528) 修复了微信小游戏平台WXFSClearUnusedBundleFiles无法清理的问题。
+- (#531) 修复了微信小游戏平台WXFSClearUnusedBundleFiles没有适配BundleName_HashName命名方式。
+- (#533) 修复了Editor程序集下无法访问YooAsset.Editor程序集里的internal字段的问题。
+- (#534) 修复了资源报告窗口AssetView视图里，依赖资源包列表显示不准确的问题。
+
 ## [2.3.7] - 2025-04-01
 
 ### Improvements

Assets/YooAsset/Editor/Assembly/AssemblyInfo.cs

@@ -0,0 +1,5 @@
+using System.Runtime.CompilerServices;
+
+// 外部友元
+[assembly: InternalsVisibleTo("YooAsset.EditorExtension")]
+[assembly: InternalsVisibleTo("Assembly-CSharp-Editor")]

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 56ea224b45d314e4a86b558404e9b6c8
+guid: ef774f01e50ab0a4d88122041938a6b9
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Editor/Assembly/MacroDefine.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 
+#if YOO_ASSET_EXPERIMENT
 namespace YooAsset.Editor
 {
     public class MacroDefine
@@ -15,3 +16,4 @@ namespace YooAsset.Editor
         };
     }
 }
+#endif

Assets/YooAsset/Editor/Assembly/MacroProcessor.cs

@@ -5,6 +5,7 @@ using System.Text;
 using System.Xml;
 using UnityEditor;
 
+#if YOO_ASSET_EXPERIMENT
 namespace YooAsset.Editor
 {
     [InitializeOnLoad]
@@ -22,13 +23,21 @@ namespace YooAsset.Editor
                 return content;
 
             // 将修改后的XML结构重新输出为文本
-            var stringWriter = new StringWriter();
+            using (var memoryStream = new MemoryStream())
-            var writerSettings = new XmlWriterSettings();
+            {
-            writerSettings.Indent = true;
+                var writerSettings = new XmlWriterSettings
-            var xmlWriter = XmlWriter.Create(stringWriter, writerSettings);
+                {
-            xmlDoc.WriteTo(xmlWriter);
+                    Indent = true,
-            xmlWriter.Flush();
+                    Encoding = new UTF8Encoding(false), //无BOM
-            return stringWriter.ToString();
+                    OmitXmlDeclaration = false
+                };
+
+                using (var xmlWriter = XmlWriter.Create(memoryStream, writerSettings))
+                {
+                    xmlDoc.Save(xmlWriter);
+                }
+                return Encoding.UTF8.GetString(memoryStream.ToArray());
+            }
         }
 
         /// <summary>
@@ -94,3 +103,4 @@ namespace YooAsset.Editor
         }
     }
 }
+#endif

Assets/YooAsset/Editor/AssetArtReporter/AssetArtReporterWindow.cs

@@ -196,6 +196,32 @@ namespace YooAsset.Editor
             }
         }
 
+        /// <summary>
+        /// 导入单个报告对象
+        /// </summary>
+        public void ImportSingleReprotFile(ScanReport report)
+        {
+            _reportCombiner = new ScanReportCombiner();
+
+            try
+            {
+                _reportCombiner.Combine(report);
+
+                // 刷新页面
+                RefreshToolbar();
+                FillTableView();
+                RebuildView();
+            }
+            catch (System.Exception e)
+            {
+                _reportCombiner = null;
+                _titleLabel.text = "导入报告失败！";
+                _descLabel.text = e.Message;
+                UnityEngine.Debug.LogError(e.StackTrace);
+            }
+        }
+
+
         private void ImportSingleBtn_clicked()
         {
             string selectFilePath = EditorUtility.OpenFilePanel("导入报告", _lastestOpenFolder, "json");
@@ -446,15 +472,31 @@ namespace YooAsset.Editor
                 var column = new TableColumn(header.HeaderTitle, header.HeaderTitle, columnStyle);
                 column.MakeCell = () =>
                 {
-                    var label = new Label();
+                    if (header.HeaderType == EHeaderType.AssetObject)
-                    label.style.marginLeft = 3f;
+                    {
-                    label.style.unityTextAlign = TextAnchor.MiddleLeft;
+                        var objectFiled = new ObjectField();
-                    return label;
+                        return objectFiled;
+                    }
+                    else
+                    {
+                        var label = new Label();
+                        label.style.marginLeft = 3f;
+                        label.style.unityTextAlign = TextAnchor.MiddleLeft;
+                        return label;
+                    }
                 };
                 column.BindCell = (VisualElement element, ITableData data, ITableCell cell) =>
                 {
-                    var infoLabel = element as Label;
+                    if (header.HeaderType == EHeaderType.AssetObject)
-                    infoLabel.text = (string)cell.GetDisplayObject();
+                    {
+                        var objectFiled = element as ObjectField;
+                        objectFiled.value = (UnityEngine.Object)cell.GetDisplayObject();
+                    }
+                    else
+                    {
+                        var infoLabel = element as Label;
+                        infoLabel.text = (string)cell.GetDisplayObject();
+                    }
                 };
                 _elementTableView.AddColumn(column);
             }
@@ -480,6 +522,10 @@ namespace YooAsset.Editor
                     {
                         tableData.AddAssetPathCell(scanInfo.HeaderTitle, scanInfo.ScanInfo);
                     }
+                    else if (header.HeaderType == EHeaderType.AssetObject)
+                    {
+                        tableData.AddAssetObjectCell(scanInfo.HeaderTitle, scanInfo.ScanInfo);
+                    }
                     else if (header.HeaderType == EHeaderType.StringValue)
                     {
                         tableData.AddStringValueCell(scanInfo.HeaderTitle, scanInfo.ScanInfo);

Assets/YooAsset/Editor/AssetArtReporter/EHeaderType.cs

@@ -8,6 +8,11 @@ namespace YooAsset.Editor
         /// </summary>
         AssetPath,
 
+        /// <summary>
+        /// 资源对象
+        /// </summary>
+        AssetObject,
+
         /// <summary>
         /// 字符串
         /// </summary>

Assets/YooAsset/Editor/AssetArtReporter/ReportHeader.cs

@@ -126,6 +126,12 @@ namespace YooAsset.Editor
                 if (string.IsNullOrEmpty(guid))
                     throw new Exception($"{HeaderTitle} value is invalid asset path : {value}");
             }
+            else if (HeaderType == EHeaderType.AssetObject)
+            {
+                string guid = AssetDatabase.AssetPathToGUID(value);
+                if (string.IsNullOrEmpty(guid))
+                    throw new Exception($"{HeaderTitle} value is invalid asset object : {value}");
+            }
             else if (HeaderType == EHeaderType.DoubleValue)
             {
                 if (double.TryParse(value, out double doubleValue) == false)

Assets/YooAsset/Editor/AssetArtScanner/AssetArtScannerSetting.cs

@@ -46,7 +46,7 @@ namespace YooAsset.Editor
             }
             catch (Exception e)
             {
-                return new ScannerResult(e.Message);
+                return new ScannerResult(e.StackTrace);
             }
         }
 

Assets/YooAsset/Editor/AssetArtScanner/ScannerResult.cs

@@ -52,7 +52,7 @@ namespace YooAsset.Editor
             if (Succeed)
             {
                 var reproterWindow = AssetArtReporterWindow.OpenWindow();
-                reproterWindow.ImportSingleReprotFile(ReprotFilePath);
+                reproterWindow.ImportSingleReprotFile(Report);
             }
         }
     }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs

@@ -32,8 +32,9 @@ namespace YooAsset.Editor
             var buildParametersContext = new BuildParametersContext(buildParameters);
             _buildContext.SetContextObject(buildParametersContext);
 
-            // 初始化日志
+            // 初始化日志系统
-            BuildLogger.InitLogger(enableLog);
+            string logFilePath = $"{buildParametersContext.GetPipelineOutputDirectory()}/buildInfo.log";
+            BuildLogger.InitLogger(enableLog, logFilePath);
 
             // 执行构建流程
             BuildLogger.Log($"Begin to build package : {buildParameters.PackageName} by {buildParameters.BuildPipeline}");
@@ -50,6 +51,9 @@ namespace YooAsset.Editor
                 BuildLogger.Error(buildResult.ErrorInfo);
             }
 
+            // 关闭日志系统
+            BuildLogger.Shuntdown();
+
             return buildResult;
         }
     }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs

@@ -6,97 +6,122 @@ namespace YooAsset.Editor
 {
     public static class AssetBundleBuilderSetting
     {
-        // EBuildPipeline
+        // BuildPipelineName
-        public static EBuildPipeline GetPackageBuildPipeline(string packageName)
+        public static string GetPackageBuildPipeline(string packageName)
         {
-            string key = $"{Application.productName}_{packageName}_{nameof(EBuildPipeline)}";
+            string key = $"{Application.productName}_{packageName}_BuildPipelineName";
-            return (EBuildPipeline)EditorPrefs.GetInt(key, (int)EBuildPipeline.BuiltinBuildPipeline);
+            string defaultValue = EBuildPipeline.ScriptableBuildPipeline.ToString();
+            return EditorPrefs.GetString(key, defaultValue);
         }
-        public static void SetPackageBuildPipeline(string packageName, EBuildPipeline buildPipeline)
+        public static void SetPackageBuildPipeline(string packageName, string buildPipeline)
         {
-            string key = $"{Application.productName}_{packageName}_{nameof(EBuildPipeline)}";
+            string key = $"{Application.productName}_{packageName}_BuildPipelineName";
-            EditorPrefs.SetInt(key, (int)buildPipeline);
+            EditorPrefs.SetString(key, buildPipeline);
         }
 
         // ECompressOption
-        public static ECompressOption GetPackageCompressOption(string packageName, EBuildPipeline buildPipeline)
+        public static ECompressOption GetPackageCompressOption(string packageName, string buildPipeline)
         {
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(ECompressOption)}";
             return (ECompressOption)EditorPrefs.GetInt(key, (int)ECompressOption.LZ4);
         }
-        public static void SetPackageCompressOption(string packageName, EBuildPipeline buildPipeline, ECompressOption compressOption)
+        public static void SetPackageCompressOption(string packageName, string buildPipeline, ECompressOption compressOption)
         {
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(ECompressOption)}";
             EditorPrefs.SetInt(key, (int)compressOption);
         }
 
         // EFileNameStyle
-        public static EFileNameStyle GetPackageFileNameStyle(string packageName, EBuildPipeline buildPipeline)
+        public static EFileNameStyle GetPackageFileNameStyle(string packageName, string buildPipeline)
         {
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EFileNameStyle)}";
             return (EFileNameStyle)EditorPrefs.GetInt(key, (int)EFileNameStyle.HashName);
         }
-        public static void SetPackageFileNameStyle(string packageName, EBuildPipeline buildPipeline, EFileNameStyle fileNameStyle)
+        public static void SetPackageFileNameStyle(string packageName, string buildPipeline, EFileNameStyle fileNameStyle)
         {
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EFileNameStyle)}";
             EditorPrefs.SetInt(key, (int)fileNameStyle);
         }
 
         // EBuildinFileCopyOption
-        public static EBuildinFileCopyOption GetPackageBuildinFileCopyOption(string packageName, EBuildPipeline buildPipeline)
+        public static EBuildinFileCopyOption GetPackageBuildinFileCopyOption(string packageName, string buildPipeline)
         {
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuildinFileCopyOption)}";
             return (EBuildinFileCopyOption)EditorPrefs.GetInt(key, (int)EBuildinFileCopyOption.None);
         }
-        public static void SetPackageBuildinFileCopyOption(string packageName, EBuildPipeline buildPipeline, EBuildinFileCopyOption buildinFileCopyOption)
+        public static void SetPackageBuildinFileCopyOption(string packageName, string buildPipeline, EBuildinFileCopyOption buildinFileCopyOption)
         {
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuildinFileCopyOption)}";
             EditorPrefs.SetInt(key, (int)buildinFileCopyOption);
         }
 
         // BuildFileCopyParams
-        public static string GetPackageBuildinFileCopyParams(string packageName, EBuildPipeline buildPipeline)
+        public static string GetPackageBuildinFileCopyParams(string packageName, string buildPipeline)
         {
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_BuildFileCopyParams";
             return EditorPrefs.GetString(key, string.Empty);
         }
-        public static void SetPackageBuildinFileCopyParams(string packageName, EBuildPipeline buildPipeline, string buildinFileCopyParams)
+        public static void SetPackageBuildinFileCopyParams(string packageName, string buildPipeline, string buildinFileCopyParams)
         {
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_BuildFileCopyParams";
             EditorPrefs.SetString(key, buildinFileCopyParams);
         }
 
-        // EncyptionClassName
+        // EncyptionServicesClassName
-        public static string GetPackageEncyptionClassName(string packageName, EBuildPipeline buildPipeline)
+        public static string GetPackageEncyptionServicesClassName(string packageName, string buildPipeline)
         {
-            string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionClassName";
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionServicesClassName";
-            return EditorPrefs.GetString(key, string.Empty);
+            return EditorPrefs.GetString(key, $"{typeof(EncryptionNone).FullName}");
         }
-        public static void SetPackageEncyptionClassName(string packageName, EBuildPipeline buildPipeline, string encyptionClassName)
+        public static void SetPackageEncyptionServicesClassName(string packageName, string buildPipeline, string encyptionClassName)
         {
-            string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionClassName";
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionServicesClassName";
+            EditorPrefs.SetString(key, encyptionClassName);
+        }
+
+        // ManifestProcessServicesClassName
+        public static string GetPackageManifestProcessServicesClassName(string packageName, string buildPipeline)
+        {
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_ManifestProcessServicesClassName";
+            return EditorPrefs.GetString(key, $"{typeof(ManifestProcessNone).FullName}");
+        }
+        public static void SetPackageManifestProcessServicesClassName(string packageName, string buildPipeline, string encyptionClassName)
+        {
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_ManifestProcessServicesClassName";
+            EditorPrefs.SetString(key, encyptionClassName);
+        }
+
+        // ManifestRestoreServicesClassName
+        public static string GetPackageManifestRestoreServicesClassName(string packageName, string buildPipeline)
+        {
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_ManifestRestoreServicesClassName";
+            return EditorPrefs.GetString(key, $"{typeof(ManifestRestoreNone).FullName}");
+        }
+        public static void SetPackageManifestRestoreServicesClassName(string packageName, string buildPipeline, string encyptionClassName)
+        {
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_ManifestRestoreServicesClassName";
             EditorPrefs.SetString(key, encyptionClassName);
         }
 
         // ClearBuildCache
-        public static bool GetPackageClearBuildCache(string packageName, EBuildPipeline buildPipeline)
+        public static bool GetPackageClearBuildCache(string packageName, string buildPipeline)
         {
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_ClearBuildCache";
             return EditorPrefs.GetInt(key, 0) > 0;
         }
-        public static void SetPackageClearBuildCache(string packageName, EBuildPipeline buildPipeline, bool clearBuildCache)
+        public static void SetPackageClearBuildCache(string packageName, string buildPipeline, bool clearBuildCache)
         {
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_ClearBuildCache";
             EditorPrefs.SetInt(key, clearBuildCache ? 1 : 0);
         }
 
         // UseAssetDependencyDB
-        public static bool GetPackageUseAssetDependencyDB(string packageName, EBuildPipeline buildPipeline)
+        public static bool GetPackageUseAssetDependencyDB(string packageName, string buildPipeline)
         {
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_UseAssetDependencyDB";
             return EditorPrefs.GetInt(key, 0) > 0;
         }
-        public static void SetPackageUseAssetDependencyDB(string packageName, EBuildPipeline buildPipeline, bool useAssetDependencyDB)
+        public static void SetPackageUseAssetDependencyDB(string packageName, string buildPipeline, bool useAssetDependencyDB)
         {
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_UseAssetDependencyDB";
             EditorPrefs.SetInt(key, useAssetDependencyDB ? 1 : 0);

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

@@ -19,7 +19,9 @@ namespace YooAsset.Editor
         }
 
         private string _buildPackage;
-        private EBuildPipeline _buildPipeline;
+        private string _buildPipeline;
+
+        private Dictionary<string, Type> _viewClassDic = new Dictionary<string, Type>(10);
 
         private Toolbar _toolbar;
         private ToolbarMenu _packageMenu;
@@ -69,11 +71,23 @@ namespace YooAsset.Editor
                 {
                     _pipelineMenu = new ToolbarMenu();
                     _pipelineMenu.style.width = 200;
-                    _pipelineMenu.menu.AppendAction(EBuildPipeline.EditorSimulateBuildPipeline.ToString(), PipelineMenuAction, PipelineMenuFun, EBuildPipeline.EditorSimulateBuildPipeline);
-                    _pipelineMenu.menu.AppendAction(EBuildPipeline.BuiltinBuildPipeline.ToString(), PipelineMenuAction, PipelineMenuFun, EBuildPipeline.BuiltinBuildPipeline);
-                    _pipelineMenu.menu.AppendAction(EBuildPipeline.ScriptableBuildPipeline.ToString(), PipelineMenuAction, PipelineMenuFun, EBuildPipeline.ScriptableBuildPipeline);
-                    _pipelineMenu.menu.AppendAction(EBuildPipeline.RawFileBuildPipeline.ToString(), PipelineMenuAction, PipelineMenuFun, EBuildPipeline.RawFileBuildPipeline);
                     _toolbar.Add(_pipelineMenu);
+
+                    var viewerClassTypes = EditorTools.GetAssignableTypes(typeof(BuildPipelineViewerBase));
+                    foreach (var classType in viewerClassTypes)
+                    {
+                        var buildPipelineAttribute = EditorTools.GetAttribute<BuildPipelineAttribute>(classType);
+                        string pipelineName = buildPipelineAttribute.PipelineName;
+                        if (_viewClassDic.ContainsKey(pipelineName))
+                        {
+                            Debug.LogWarning($"The pipeline has already exist : {pipelineName}");
+                        }
+                        else
+                        {
+                            _viewClassDic.Add(pipelineName, classType);
+                            _pipelineMenu.menu.AppendAction(pipelineName, PipelineMenuAction, PipelineMenuFun);
+                        }
+                    }
                 }
 
                 RefreshBuildPipelineView();
@@ -91,28 +105,18 @@ namespace YooAsset.Editor
 
             _buildPipeline = AssetBundleBuilderSetting.GetPackageBuildPipeline(_buildPackage);
             _packageMenu.text = _buildPackage;
-            _pipelineMenu.text = _buildPipeline.ToString();
+            _pipelineMenu.text = _buildPipeline;
 
-            var buildTarget = EditorUserBuildSettings.activeBuildTarget;
+            if (_viewClassDic.TryGetValue(_buildPipeline, out Type value))
-            if (_buildPipeline == EBuildPipeline.EditorSimulateBuildPipeline)
             {
-                var viewer = new EditorSimulateBuildPipelineViewer(_buildPackage, buildTarget, _container);
+                var buildTarget = EditorUserBuildSettings.activeBuildTarget;
-            }
+                var viewer = Activator.CreateInstance(value) as BuildPipelineViewerBase;
-            else if (_buildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+                viewer.InitView(_buildPackage, _buildPipeline, buildTarget);
-            {
+                viewer.CreateView(_container);
-                var viewer = new BuiltinBuildPipelineViewer(_buildPackage, buildTarget, _container);
-            }
-            else if (_buildPipeline == EBuildPipeline.ScriptableBuildPipeline)
-            {
-                var viewer = new ScriptableBuildPipelineViewer(_buildPackage, buildTarget, _container);
-            }
-            else if (_buildPipeline == EBuildPipeline.RawFileBuildPipeline)
-            {
-                var viewer = new RawfileBuildpipelineViewer(_buildPackage, buildTarget, _container);
             }
             else
             {
-                throw new System.NotImplementedException(_buildPipeline.ToString());
+                Debug.LogError($"Not found build pipeline : {_buildPipeline}");
             }
         }
         private List<string> GetBuildPackageNames()
@@ -145,18 +149,16 @@ namespace YooAsset.Editor
 
         private void PipelineMenuAction(DropdownMenuAction action)
         {
-            var pipelineType = (EBuildPipeline)action.userData;
+            if (_buildPipeline != action.name)
-            if (_buildPipeline != pipelineType)
             {
-                _buildPipeline = pipelineType;
+                _buildPipeline = action.name;
-                AssetBundleBuilderSetting.SetPackageBuildPipeline(_buildPackage, pipelineType);
+                AssetBundleBuilderSetting.SetPackageBuildPipeline(_buildPackage, _buildPipeline);
                 RefreshBuildPipelineView();
             }
         }
         private DropdownMenuAction.Status PipelineMenuFun(DropdownMenuAction action)
         {
-            var pipelineType = (EBuildPipeline)action.userData;
+            if (_buildPipeline == action.name)
-            if (_buildPipeline == pipelineType)
                 return DropdownMenuAction.Status.Checked;
             else
                 return DropdownMenuAction.Status.Normal;

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

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

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

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

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

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

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

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

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

@@ -11,7 +11,7 @@ namespace YooAsset.Editor
         void IBuildTask.Run(BuildContext context)
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var buildParameters = buildParametersContext.Parameters;
+            var buildParameters = buildParametersContext.Parameters as ScriptableBuildParameters;
 
             // 检测基础构建参数
             buildParametersContext.CheckBuildParameters();
@@ -50,6 +50,13 @@ namespace YooAsset.Editor
             {
                 BuildLogger.Log($"Create pipeline output directory: {pipelineOutputDirectory}");
             }
+
+            // 检测内置着色器资源包名称
+            if (string.IsNullOrEmpty(buildParameters.BuiltinShadersBundleName))
+            {
+                string warning = BuildLogger.GetErrorMessage(ErrorCode.BuiltinShadersBundleNameIsNull, $"Builtin shaders bundle name is null. It will cause resource redundancy !");
+                BuildLogger.Warning(warning);
+            }
         }
     }
 }

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

@@ -14,6 +14,11 @@ namespace YooAsset.Editor
         /// </summary>
         public ECompressOption CompressOption = ECompressOption.Uncompressed;
 
+        /// <summary>
+        /// 从AssetBundle文件头里剥离Unity版本信息
+        /// </summary>
+        public bool StripUnityVersion = false;
+
         /// <summary>
         /// 禁止写入类型树结构（可以降低包体和内存并提高加载效率）
         /// </summary>
@@ -70,6 +75,9 @@ namespace YooAsset.Editor
             else
                 throw new System.NotImplementedException(CompressOption.ToString());
 
+            if (StripUnityVersion)
+                buildParams.ContentBuildFlags |= UnityEditor.Build.Content.ContentBuildFlags.StripUnityVersion;
+
             if (DisableWriteTypeTree)
                 buildParams.ContentBuildFlags |= UnityEditor.Build.Content.ContentBuildFlags.DisableWriteTypeTree;
 

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

@@ -2,37 +2,100 @@
 using System.IO;
 using System.Collections.Generic;
 using UnityEngine;
+using System.Text;
 
 namespace YooAsset.Editor
 {
     internal static class BuildLogger
     {
-        private static bool _enableLog = true;
+        private const int MAX_LOG_BUFFER_SIZE = 1024 * 1024 * 2; //2MB
 
-        public static void InitLogger(bool enableLog)
+        private static bool _enableLog = true;
+        private static string _logFilePath;
+
+        private static readonly object _lockObj = new object();
+        private static readonly StringBuilder _logBuilder = new StringBuilder(MAX_LOG_BUFFER_SIZE);
+
+        /// <summary>
+        /// 初始化日志系统
+        /// </summary>
+        public static void InitLogger(bool enableLog, string logFilePath)
         {
             _enableLog = enableLog;
+            _logFilePath = logFilePath;
+            _logBuilder.Clear();
+
+            if (_enableLog)
+            {
+                if (string.IsNullOrEmpty(_logFilePath))
+                    throw new Exception("Log file path is null or empty !");
+
+                Debug.Log($"Logger initialized at {DateTime.Now:yyyy-MM-dd HH:mm:ss}");
+            }
+        }
+
+        /// <summary>
+        /// 关闭日志系统
+        /// </summary>
+        public static void Shuntdown()
+        {
+            if (_enableLog)
+            {
+                lock (_lockObj)
+                {
+                    try
+                    {
+                        if (File.Exists(_logFilePath))
+                            File.Delete(_logFilePath);
+
+                        FileUtility.CreateFileDirectory(_logFilePath);
+                        File.WriteAllText(_logFilePath, _logBuilder.ToString(), Encoding.UTF8);
+                        _logBuilder.Clear();
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.LogError($"Failed to write log file: {ex.Message}");
+                    }
+                }
+            }
         }
 
         public static void Log(string message)
         {
             if (_enableLog)
             {
+                WriteLog("INFO", message);
                 Debug.Log(message);
             }
         }
         public static void Warning(string message)
         {
-            Debug.LogWarning(message);
+            if (_enableLog)
+            {
+                WriteLog("WARN", message);
+                Debug.LogWarning(message);
+            }
         }
         public static void Error(string message)
         {
-            Debug.LogError(message);
+            if (_enableLog)
+            {
+                WriteLog("ERROR", message);
+                Debug.LogError(message);
+            }
         }
-
         public static string GetErrorMessage(ErrorCode code, string message)
         {
             return $"[ErrorCode{(int)code}] {message}";
         }
+
+        private static void WriteLog(string level, string message)
+        {
+            lock (_lockObj)
+            {
+                string logEntry = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff} [{level}] {message}";
+                _logBuilder.AppendLine(logEntry);
+            }
+        }
     }
 }

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

@@ -15,6 +15,7 @@ namespace YooAsset.Editor
         BuildPipelineIsNullOrEmpty = 116,
         BuildBundleTypeIsUnknown = 117,
         RecommendScriptBuildPipeline = 130,
+        BuiltinShadersBundleNameIsNull = 131,
 
         // TaskGetBuildMap
         RemoveInvalidTags = 200,

Assets/YooAsset/Editor/AssetBundleBuilder/DefaultManifestServices.cs

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

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/IBuildPipeline.cs

@@ -1,8 +1,13 @@
-
+using UnityEditor;
+using UnityEngine;
+
 namespace YooAsset.Editor
 {
     public interface IBuildPipeline
     {
+        /// <summary>
+        /// 运行构建任务
+        /// </summary>
         BuildResult Run(BuildParameters buildParameters, bool enableLog);
     }
 }

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

@@ -0,0 +1,14 @@
+using System;
+
+namespace YooAsset.Editor
+{
+    public class BuildPipelineAttribute : Attribute
+    {
+        public string PipelineName;
+
+        public BuildPipelineAttribute(string name)
+        {
+            this.PipelineName = name;
+        }
+    }
+}

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineAttribute.cs.meta

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

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

@@ -12,211 +12,269 @@ namespace YooAsset.Editor
 {
     internal abstract class BuildPipelineViewerBase
     {
-        private const int StyleWidth = 400;
+        protected const int StyleWidth = 400;
-        private const int LabelMinWidth = 180;
+        protected const int LabelMinWidth = 190;
 
-        protected readonly string PackageName;
+        protected string PackageName { private set; get; }
-        protected readonly BuildTarget BuildTarget;
+        protected string PipelineName { private set; get; }
-        protected readonly EBuildPipeline BuildPipeline;
+        protected BuildTarget BuildTarget { private set; get; }
-        protected TemplateContainer Root;
 
-        private TextField _buildOutputField;
+        /// <summary>
-        private TextField _buildVersionField;
+        /// 初始化视图
-        private PopupField<Enum> _buildModeField;
+        /// </summary>
-        private PopupField<Type> _encryptionField;
+        public void InitView(string packageName, string pipelineName, BuildTarget buildTarget)
-        private EnumField _compressionField;
-        private EnumField _outputNameStyleField;
-        private EnumField _copyBuildinFileOptionField;
-        private TextField _copyBuildinFileTagsField;
-        private Toggle _clearBuildCacheToggle;
-        private Toggle _useAssetDependencyDBToggle;
-
-        public BuildPipelineViewerBase(string packageName, EBuildPipeline buildPipeline, BuildTarget buildTarget, VisualElement parent)
         {
             PackageName = packageName;
+            PipelineName = pipelineName;
             BuildTarget = buildTarget;
-            BuildPipeline = buildPipeline;
-
-            CreateView(parent);
-            RefreshView();
-        }
-        private void CreateView(VisualElement parent)
-        {
-            // 加载布局文件
-            var visualAsset = UxmlLoader.LoadWindowUXML<BuildPipelineViewerBase>();
-            if (visualAsset == null)
-                return;
-
-            Root = visualAsset.CloneTree();
-            Root.style.flexGrow = 1f;
-            parent.Add(Root);
-
-            // 输出目录
-            string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-            _buildOutputField = Root.Q<TextField>("BuildOutput");
-            _buildOutputField.SetValueWithoutNotify(defaultOutputRoot);
-            _buildOutputField.SetEnabled(false);
-
-            // 构建版本
-            _buildVersionField = Root.Q<TextField>("BuildVersion");
-            _buildVersionField.style.width = StyleWidth;
-            _buildVersionField.SetValueWithoutNotify(GetDefaultPackageVersion());
-
-            // 加密方法
-            {
-                var encryptionContainer = Root.Q("EncryptionContainer");
-                var encryptionClassTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
-                if (encryptionClassTypes.Count > 0)
-                {
-                    var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, BuildPipeline);
-                    int defaultIndex = encryptionClassTypes.FindIndex(x => x.FullName.Equals(encyptionClassName));
-                    if (defaultIndex < 0)
-                        defaultIndex = 0;
-                    _encryptionField = new PopupField<Type>(encryptionClassTypes, defaultIndex);
-                    _encryptionField.label = "Encryption";
-                    _encryptionField.style.width = StyleWidth;
-                    _encryptionField.RegisterValueChangedCallback(evt =>
-                    {
-                        AssetBundleBuilderSetting.SetPackageEncyptionClassName(PackageName, BuildPipeline, _encryptionField.value.FullName);
-                    });
-                    encryptionContainer.Add(_encryptionField);
-                }
-                else
-                {
-                    _encryptionField = new PopupField<Type>();
-                    _encryptionField.label = "Encryption";
-                    _encryptionField.style.width = StyleWidth;
-                    encryptionContainer.Add(_encryptionField);
-                }
-            }
-
-            // 压缩方式选项
-            var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, BuildPipeline);
-            _compressionField = Root.Q<EnumField>("Compression");
-            _compressionField.Init(compressOption);
-            _compressionField.SetValueWithoutNotify(compressOption);
-            _compressionField.style.width = StyleWidth;
-            _compressionField.RegisterValueChangedCallback(evt =>
-            {
-                AssetBundleBuilderSetting.SetPackageCompressOption(PackageName, BuildPipeline, (ECompressOption)_compressionField.value);
-            });
-
-            // 输出文件名称样式
-            var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, BuildPipeline);
-            _outputNameStyleField = Root.Q<EnumField>("FileNameStyle");
-            _outputNameStyleField.Init(fileNameStyle);
-            _outputNameStyleField.SetValueWithoutNotify(fileNameStyle);
-            _outputNameStyleField.style.width = StyleWidth;
-            _outputNameStyleField.RegisterValueChangedCallback(evt =>
-            {
-                AssetBundleBuilderSetting.SetPackageFileNameStyle(PackageName, BuildPipeline, (EFileNameStyle)_outputNameStyleField.value);
-            });
-
-            // 首包文件拷贝选项
-            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, BuildPipeline);
-            _copyBuildinFileOptionField = Root.Q<EnumField>("CopyBuildinFileOption");
-            _copyBuildinFileOptionField.Init(buildinFileCopyOption);
-            _copyBuildinFileOptionField.SetValueWithoutNotify(buildinFileCopyOption);
-            _copyBuildinFileOptionField.style.width = StyleWidth;
-            _copyBuildinFileOptionField.RegisterValueChangedCallback(evt =>
-            {
-                AssetBundleBuilderSetting.SetPackageBuildinFileCopyOption(PackageName, BuildPipeline, (EBuildinFileCopyOption)_copyBuildinFileOptionField.value);
-                RefreshView();
-            });
-
-            // 首包文件拷贝参数
-            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, BuildPipeline);
-            _copyBuildinFileTagsField = Root.Q<TextField>("CopyBuildinFileParam");
-            _copyBuildinFileTagsField.SetValueWithoutNotify(buildinFileCopyParams);
-            _copyBuildinFileTagsField.RegisterValueChangedCallback(evt =>
-            {
-                AssetBundleBuilderSetting.SetPackageBuildinFileCopyParams(PackageName, BuildPipeline, _copyBuildinFileTagsField.value);
-            });
-
-            // 清理构建缓存
-            bool clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, BuildPipeline);
-            _clearBuildCacheToggle = Root.Q<Toggle>("ClearBuildCache");
-            _clearBuildCacheToggle.SetValueWithoutNotify(clearBuildCache);
-            _clearBuildCacheToggle.RegisterValueChangedCallback(evt =>
-            {
-                AssetBundleBuilderSetting.SetPackageClearBuildCache(PackageName, BuildPipeline, _clearBuildCacheToggle.value);
-            });
-
-            // 使用资源依赖数据库
-            bool useAssetDependencyDB = AssetBundleBuilderSetting.GetPackageUseAssetDependencyDB(PackageName, BuildPipeline);
-            _useAssetDependencyDBToggle = Root.Q<Toggle>("UseAssetDependency");
-            _useAssetDependencyDBToggle.SetValueWithoutNotify(useAssetDependencyDB);
-            _useAssetDependencyDBToggle.RegisterValueChangedCallback(evt =>
-            {
-                AssetBundleBuilderSetting.SetPackageUseAssetDependencyDB(PackageName, BuildPipeline, _useAssetDependencyDBToggle.value);
-            });
-
-            // 对齐文本间距
-            UIElementsTools.SetElementLabelMinWidth(_buildOutputField, LabelMinWidth);
-            UIElementsTools.SetElementLabelMinWidth(_buildVersionField, LabelMinWidth);
-            UIElementsTools.SetElementLabelMinWidth(_compressionField, LabelMinWidth);
-            UIElementsTools.SetElementLabelMinWidth(_encryptionField, LabelMinWidth);
-            UIElementsTools.SetElementLabelMinWidth(_outputNameStyleField, LabelMinWidth);
-            UIElementsTools.SetElementLabelMinWidth(_copyBuildinFileOptionField, LabelMinWidth);
-            UIElementsTools.SetElementLabelMinWidth(_copyBuildinFileTagsField, LabelMinWidth);
-            UIElementsTools.SetElementLabelMinWidth(_clearBuildCacheToggle, LabelMinWidth);
-            UIElementsTools.SetElementLabelMinWidth(_useAssetDependencyDBToggle, LabelMinWidth);
-
-            // 构建按钮
-            var buildButton = Root.Q<Button>("Build");
-            buildButton.clicked += BuildButton_clicked;
-        }
-        private void RefreshView()
-        {
-            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, BuildPipeline);
-            bool tagsFiledVisible = buildinFileCopyOption == EBuildinFileCopyOption.ClearAndCopyByTags || buildinFileCopyOption == EBuildinFileCopyOption.OnlyCopyByTags;
-            _copyBuildinFileTagsField.visible = tagsFiledVisible;
-        }
-        private void BuildButton_clicked()
-        {
-            if (EditorUtility.DisplayDialog("提示", $"开始构建资源包[{PackageName}]！", "Yes", "No"))
-            {
-                EditorTools.ClearUnityConsole();
-                EditorApplication.delayCall += ExecuteBuild;
-            }
-            else
-            {
-                Debug.LogWarning("[Build] 打包已经取消");
-            }
         }
 
         /// <summary>
-        /// 执行构建任务
+        /// 创建视图
         /// </summary>
-        protected abstract void ExecuteBuild();
+        public abstract void CreateView(VisualElement parent);
 
         /// <summary>
-        /// 获取构建版本
+        /// 获取默认版本
         /// </summary>
-        protected string GetPackageVersion()
+        protected virtual string GetDefaultPackageVersion()
         {
-            return _buildVersionField.value;
+            int totalMinutes = DateTime.Now.Hour * 60 + DateTime.Now.Minute;
+            return DateTime.Now.ToString("yyyy-MM-dd") + "-" + totalMinutes;
         }
 
         /// <summary>
-        /// 创建加密类实例
+        /// 创建资源包加密服务类实例
         /// </summary>
-        protected IEncryptionServices CreateEncryptionInstance()
+        protected IEncryptionServices CreateEncryptionServicesInstance()
         {
-            var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, BuildPipeline);
+            var className = AssetBundleBuilderSetting.GetPackageEncyptionServicesClassName(PackageName, PipelineName);
-            var encryptionClassTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
-            var classType = encryptionClassTypes.Find(x => x.FullName.Equals(encyptionClassName));
+            var classType = classTypes.Find(x => x.FullName.Equals(className));
             if (classType != null)
                 return (IEncryptionServices)Activator.CreateInstance(classType);
             else
                 return null;
         }
 
-        private string GetDefaultPackageVersion()
+        /// <summary>
+        /// 创建资源清单加密服务类实例
+        /// </summary>
+        protected IManifestProcessServices CreateManifestProcessServicesInstance()
         {
-            int totalMinutes = DateTime.Now.Hour * 60 + DateTime.Now.Minute;
+            var className = AssetBundleBuilderSetting.GetPackageManifestProcessServicesClassName(PackageName, PipelineName);
-            return DateTime.Now.ToString("yyyy-MM-dd") + "-" + totalMinutes;
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestProcessServices));
+            var classType = classTypes.Find(x => x.FullName.Equals(className));
+            if (classType != null)
+                return (IManifestProcessServices)Activator.CreateInstance(classType);
+            else
+                return null;
         }
+
+        /// <summary>
+        /// 创建资源清单解密服务类实例
+        /// </summary>
+        protected IManifestRestoreServices CreateManifestRestoreServicesInstance()
+        {
+            var className = AssetBundleBuilderSetting.GetPackageManifestRestoreServicesClassName(PackageName, PipelineName);
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestRestoreServices));
+            var classType = classTypes.Find(x => x.FullName.Equals(className));
+            if (classType != null)
+                return (IManifestRestoreServices)Activator.CreateInstance(classType);
+            else
+                return null;
+        }
+
+        #region UI元素通用处理方法
+        protected void SetBuildOutputField(TextField textField)
+        {
+            // 输出目录
+            string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+            textField.SetValueWithoutNotify(defaultOutputRoot);
+            textField.SetEnabled(false);
+            UIElementsTools.SetElementLabelMinWidth(textField, LabelMinWidth);
+        }
+        protected void SetBuildVersionField(TextField textField)
+        {
+            // 构建版本
+            textField.style.width = StyleWidth;
+            textField.SetValueWithoutNotify(GetDefaultPackageVersion());
+            UIElementsTools.SetElementLabelMinWidth(textField, LabelMinWidth);
+        }
+        protected void SetCompressionField(EnumField enumField)
+        {
+            // 压缩方式选项
+            var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, PipelineName);
+            enumField.Init(compressOption);
+            enumField.SetValueWithoutNotify(compressOption);
+            enumField.style.width = StyleWidth;
+            enumField.RegisterValueChangedCallback(evt =>
+            {
+                AssetBundleBuilderSetting.SetPackageCompressOption(PackageName, PipelineName, (ECompressOption)enumField.value);
+            });
+            UIElementsTools.SetElementLabelMinWidth(enumField, LabelMinWidth);
+        }
+        protected void SetOutputNameStyleField(EnumField enumField)
+        {
+            // 输出文件名称样式
+            var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, PipelineName);
+            enumField.Init(fileNameStyle);
+            enumField.SetValueWithoutNotify(fileNameStyle);
+            enumField.style.width = StyleWidth;
+            enumField.RegisterValueChangedCallback(evt =>
+            {
+                AssetBundleBuilderSetting.SetPackageFileNameStyle(PackageName, PipelineName, (EFileNameStyle)enumField.value);
+            });
+            UIElementsTools.SetElementLabelMinWidth(enumField, LabelMinWidth);
+        }
+        protected void SetCopyBuildinFileOptionField(EnumField enumField, TextField tagField)
+        {
+            // 首包文件拷贝选项
+            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
+            enumField.Init(buildinFileCopyOption);
+            enumField.SetValueWithoutNotify(buildinFileCopyOption);
+            enumField.style.width = StyleWidth;
+            enumField.RegisterValueChangedCallback(evt =>
+            {
+                AssetBundleBuilderSetting.SetPackageBuildinFileCopyOption(PackageName, PipelineName, (EBuildinFileCopyOption)enumField.value);
+
+                // 设置内置资源标签显隐
+                SetCopyBuildinFileTagsVisible(tagField);
+            });
+            UIElementsTools.SetElementLabelMinWidth(enumField, LabelMinWidth);
+        }
+        protected void SetCopyBuildinFileTagsVisible(TextField tagField)
+        {
+            var option = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
+            tagField.visible = option == EBuildinFileCopyOption.ClearAndCopyByTags || option == EBuildinFileCopyOption.OnlyCopyByTags;
+        }
+        protected void SetCopyBuildinFileTagsField(TextField textField)
+        {
+            // 首包文件拷贝参数
+            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName);
+            textField.SetValueWithoutNotify(buildinFileCopyParams);
+            textField.RegisterValueChangedCallback(evt =>
+            {
+                AssetBundleBuilderSetting.SetPackageBuildinFileCopyParams(PackageName, PipelineName, textField.value);
+            });
+            UIElementsTools.SetElementLabelMinWidth(textField, LabelMinWidth);
+        }
+        protected void SetClearBuildCacheToggle(Toggle toggle)
+        {
+            // 清理构建缓存
+            bool clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, PipelineName);
+            toggle.SetValueWithoutNotify(clearBuildCache);
+            toggle.RegisterValueChangedCallback(evt =>
+            {
+                AssetBundleBuilderSetting.SetPackageClearBuildCache(PackageName, PipelineName, toggle.value);
+            });
+            UIElementsTools.SetElementLabelMinWidth(toggle, LabelMinWidth);
+        }
+        protected void SetUseAssetDependencyDBToggle(Toggle toggle)
+        {
+            // 使用资源依赖数据库
+            bool useAssetDependencyDB = AssetBundleBuilderSetting.GetPackageUseAssetDependencyDB(PackageName, PipelineName);
+            toggle.SetValueWithoutNotify(useAssetDependencyDB);
+            toggle.RegisterValueChangedCallback(evt =>
+            {
+                AssetBundleBuilderSetting.SetPackageUseAssetDependencyDB(PackageName, PipelineName, toggle.value);
+            });
+            UIElementsTools.SetElementLabelMinWidth(toggle, LabelMinWidth);
+        }
+        protected PopupField<Type> CreateEncryptionServicesField(VisualElement container)
+        {
+            // 资源包加密服务类
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
+            if (classTypes.Count > 0)
+            {
+                var className = AssetBundleBuilderSetting.GetPackageEncyptionServicesClassName(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 = "Encryption Services";
+                popupField.style.width = StyleWidth;
+                popupField.RegisterValueChangedCallback(evt =>
+                {
+                    AssetBundleBuilderSetting.SetPackageEncyptionServicesClassName(PackageName, PipelineName, popupField.value.FullName);
+                });
+                container.Add(popupField);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
+                return popupField;
+            }
+            else
+            {
+                var popupField = new PopupField<Type>();
+                popupField.label = "Encryption Services";
+                popupField.style.width = StyleWidth;
+                container.Add(popupField);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
+                return popupField;
+            }
+        }
+        protected PopupField<Type> CreateManifestProcessServicesField(VisualElement container)
+        {
+            // 资源清单加密服务类
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestProcessServices));
+            if (classTypes.Count > 0)
+            {
+                var className = AssetBundleBuilderSetting.GetPackageManifestProcessServicesClassName(PackageName, PipelineName);
+                int defaultIndex = classTypes.FindIndex(x => x.FullName.Equals(className));
+                if (defaultIndex < 0)
+                    defaultIndex = 0;
+                var popupField = new PopupField<Type>(classTypes, defaultIndex);
+                popupField.label = "Manifest Process Services";
+                popupField.style.width = StyleWidth;
+                popupField.RegisterValueChangedCallback(evt =>
+                {
+                    AssetBundleBuilderSetting.SetPackageManifestProcessServicesClassName(PackageName, PipelineName, popupField.value.FullName);
+                });
+                container.Add(popupField);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
+                return popupField;
+            }
+            else
+            {
+                var popupField = new PopupField<Type>();
+                popupField.label = "Manifest Process Services";
+                popupField.style.width = StyleWidth;
+                container.Add(popupField);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
+                return popupField;
+            }
+        }
+        protected PopupField<Type> CreateManifestRestoreServicesField(VisualElement container)
+        {
+            // 资源清单加密服务类
+            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestRestoreServices));
+            if (classTypes.Count > 0)
+            {
+                var className = AssetBundleBuilderSetting.GetPackageManifestRestoreServicesClassName(PackageName, PipelineName);
+                int defaultIndex = classTypes.FindIndex(x => x.FullName.Equals(className));
+                if (defaultIndex < 0)
+                    defaultIndex = 0;
+                var popupField = new PopupField<Type>(classTypes, defaultIndex);
+                popupField.label = "Manifest Restore Services";
+                popupField.style.width = StyleWidth;
+                popupField.RegisterValueChangedCallback(evt =>
+                {
+                    AssetBundleBuilderSetting.SetPackageManifestRestoreServicesClassName(PackageName, PipelineName, popupField.value.FullName);
+                });
+                container.Add(popupField);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
+                return popupField;
+            }
+            else
+            {
+                var popupField = new PopupField<Type>();
+                popupField.label = "Manifest Restore Services";
+                popupField.style.width = StyleWidth;
+                container.Add(popupField);
+                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
+                return popupField;
+            }
+        }
+        #endregion
     }
 }
 #endif

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipeline.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8c5a1726d94498e4cbe30f5f510cc796
+guid: e2e1fae9b05cc554e9ebfee01f2b9333
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

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

@@ -0,0 +1,135 @@
+#if UNITY_2019_4_OR_NEWER
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+    [BuildPipelineAttribute(nameof(EBuildPipeline.BuiltinBuildPipeline))]
+    internal class BuiltinBuildPipelineViewer : BuildPipelineViewerBase
+    {
+        protected TemplateContainer Root;
+        protected TextField _buildOutputField;
+        protected TextField _buildVersionField;
+        protected PopupField<Type> _encryptionServicesField;
+        protected PopupField<Type> _manifestProcessServicesField;
+        protected PopupField<Type> _manifestRestoreServicesField;
+        protected EnumField _compressionField;
+        protected EnumField _outputNameStyleField;
+        protected EnumField _copyBuildinFileOptionField;
+        protected TextField _copyBuildinFileTagsField;
+        protected Toggle _clearBuildCacheToggle;
+        protected Toggle _useAssetDependencyDBToggle;
+
+        public override void CreateView(VisualElement parent)
+        {
+            // 加载布局文件
+            var visualAsset = UxmlLoader.LoadWindowUXML<BuiltinBuildPipelineViewer>();
+            if (visualAsset == null)
+                return;
+
+            Root = visualAsset.CloneTree();
+            Root.style.flexGrow = 1f;
+            parent.Add(Root);
+
+            // 输出目录
+            _buildOutputField = Root.Q<TextField>("BuildOutput");
+            SetBuildOutputField(_buildOutputField);
+
+            // 构建版本
+            _buildVersionField = Root.Q<TextField>("BuildVersion");
+            SetBuildVersionField(_buildVersionField);
+
+            // 服务类
+            var popupContainer = Root.Q("PopupContainer");
+            _encryptionServicesField = CreateEncryptionServicesField(popupContainer);
+            _manifestProcessServicesField = CreateManifestProcessServicesField(popupContainer);
+            _manifestRestoreServicesField = CreateManifestRestoreServicesField(popupContainer);
+
+            // 压缩方式选项
+            _compressionField = Root.Q<EnumField>("Compression");
+            SetCompressionField(_compressionField);
+
+            // 输出文件名称样式
+            _outputNameStyleField = Root.Q<EnumField>("FileNameStyle");
+            SetOutputNameStyleField(_outputNameStyleField);
+
+            // 首包文件拷贝参数
+            _copyBuildinFileTagsField = Root.Q<TextField>("CopyBuildinFileParam");
+            SetCopyBuildinFileTagsField(_copyBuildinFileTagsField);
+            SetCopyBuildinFileTagsVisible(_copyBuildinFileTagsField);
+
+            // 首包文件拷贝选项
+            _copyBuildinFileOptionField = Root.Q<EnumField>("CopyBuildinFileOption");
+            SetCopyBuildinFileOptionField(_copyBuildinFileOptionField, _copyBuildinFileTagsField);
+
+            // 清理构建缓存
+            _clearBuildCacheToggle = Root.Q<Toggle>("ClearBuildCache");
+            SetClearBuildCacheToggle(_clearBuildCacheToggle);
+
+            // 使用资源依赖数据库
+            _useAssetDependencyDBToggle = Root.Q<Toggle>("UseAssetDependency");
+            SetUseAssetDependencyDBToggle(_useAssetDependencyDBToggle);
+
+            // 构建按钮
+            var buildButton = Root.Q<Button>("Build");
+            buildButton.clicked += BuildButton_clicked;
+        }
+        private void BuildButton_clicked()
+        {
+            if (EditorUtility.DisplayDialog("提示", $"开始构建资源包[{PackageName}]！", "Yes", "No"))
+            {
+                EditorTools.ClearUnityConsole();
+                EditorApplication.delayCall += ExecuteBuild;
+            }
+            else
+            {
+                Debug.LogWarning("[Build] 打包已经取消");
+            }
+        }
+
+        /// <summary>
+        /// 执行构建
+        /// </summary>
+        protected virtual void ExecuteBuild()
+        {
+            var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, PipelineName);
+            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
+            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName);
+            var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, PipelineName);
+            var clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, PipelineName);
+            var useAssetDependencyDB = AssetBundleBuilderSetting.GetPackageUseAssetDependencyDB(PackageName, PipelineName);
+
+            BuiltinBuildParameters buildParameters = new BuiltinBuildParameters();
+            buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+            buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+            buildParameters.BuildPipeline = PipelineName.ToString();
+            buildParameters.BuildBundleType = (int)EBuildBundleType.AssetBundle;
+            buildParameters.BuildTarget = BuildTarget;
+            buildParameters.PackageName = PackageName;
+            buildParameters.PackageVersion = _buildVersionField.value;
+            buildParameters.EnableSharePackRule = true;
+            buildParameters.VerifyBuildingResult = true;
+            buildParameters.FileNameStyle = fileNameStyle;
+            buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
+            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
+            buildParameters.CompressOption = compressOption;
+            buildParameters.ClearBuildCacheFiles = clearBuildCache;
+            buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
+            buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
+            buildParameters.ManifestProcessServices = CreateManifestProcessServicesInstance();
+            buildParameters.ManifestRestoreServices = CreateManifestRestoreServicesInstance();
+
+            BuiltinBuildPipeline pipeline = new BuiltinBuildPipeline();
+            var buildResult = pipeline.Run(buildParameters, true);
+            if (buildResult.Success)
+                EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
+        }
+    }
+}
+#endif

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

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

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

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 86d0df373d425b449a3bbc42b4b2e5bb
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

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

@@ -1,57 +0,0 @@
-#if UNITY_2019_4_OR_NEWER
-using System;
-using System.IO;
-using System.Linq;
-using System.Collections.Generic;
-using UnityEditor;
-using UnityEngine;
-using UnityEditor.UIElements;
-using UnityEngine.UIElements;
-
-namespace YooAsset.Editor
-{
-    internal class BuiltinBuildPipelineViewer : BuildPipelineViewerBase
-    {
-        public BuiltinBuildPipelineViewer(string packageName, BuildTarget buildTarget, VisualElement parent)
-            : base(packageName, EBuildPipeline.BuiltinBuildPipeline, buildTarget, parent)
-        {
-        }
-
-        /// <summary>
-        /// 执行构建
-        /// </summary>
-        protected override void ExecuteBuild()
-        {
-            var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, BuildPipeline);
-            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, BuildPipeline);
-            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, BuildPipeline);
-            var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, BuildPipeline);
-            var clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, BuildPipeline);
-            var useAssetDependencyDB = AssetBundleBuilderSetting.GetPackageUseAssetDependencyDB(PackageName, BuildPipeline);
-
-            BuiltinBuildParameters buildParameters = new BuiltinBuildParameters();
-            buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-            buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
-            buildParameters.BuildPipeline = BuildPipeline.ToString();
-            buildParameters.BuildBundleType = (int)EBuildBundleType.AssetBundle;
-            buildParameters.BuildTarget = BuildTarget;
-            buildParameters.PackageName = PackageName;
-            buildParameters.PackageVersion = GetPackageVersion();
-            buildParameters.EnableSharePackRule = true;
-            buildParameters.VerifyBuildingResult = true;
-            buildParameters.FileNameStyle = fileNameStyle;
-            buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
-            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
-            buildParameters.CompressOption = compressOption;
-            buildParameters.ClearBuildCacheFiles = clearBuildCache;
-            buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
-            buildParameters.EncryptionServices = CreateEncryptionInstance();
-
-            BuiltinBuildPipeline pipeline = new BuiltinBuildPipeline();
-            var buildResult = pipeline.Run(buildParameters, true);
-            if (buildResult.Success)
-                EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
-        }
-    }
-}
-#endif

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/EditorSimulateBuildpipeline.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5280dfac6a481ee429c769ba5688c9d2
+guid: 33b6cb215b1d7bb4888cb3455b500399
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

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

@@ -0,0 +1,85 @@
+#if UNITY_2019_4_OR_NEWER
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+    [BuildPipelineAttribute(nameof(EBuildPipeline.EditorSimulateBuildPipeline))]
+    internal class EditorSimulateBuildPipelineViewer : BuildPipelineViewerBase
+    {
+        protected TemplateContainer Root;
+        protected TextField _buildOutputField;
+        protected TextField _buildVersionField;
+
+        public override void CreateView(VisualElement parent)
+        {
+            // 加载布局文件
+            var visualAsset = UxmlLoader.LoadWindowUXML<EditorSimulateBuildPipelineViewer>();
+            if (visualAsset == null)
+                return;
+
+            Root = visualAsset.CloneTree();
+            Root.style.flexGrow = 1f;
+            parent.Add(Root);
+
+            // 输出目录
+            _buildOutputField = Root.Q<TextField>("BuildOutput");
+            SetBuildOutputField(_buildOutputField);
+
+            // 构建版本
+            _buildVersionField = Root.Q<TextField>("BuildVersion");
+            SetBuildVersionField(_buildVersionField);
+
+            // 构建按钮
+            var buildButton = Root.Q<Button>("Build");
+            buildButton.clicked += BuildButton_clicked;
+        }
+        private void BuildButton_clicked()
+        {
+            if (EditorUtility.DisplayDialog("提示", $"开始构建资源包[{PackageName}]！", "Yes", "No"))
+            {
+                EditorTools.ClearUnityConsole();
+                EditorApplication.delayCall += ExecuteBuild;
+            }
+            else
+            {
+                Debug.LogWarning("[Build] 打包已经取消");
+            }
+        }
+
+        /// <summary>
+        /// 执行构建
+        /// </summary>
+        protected virtual void ExecuteBuild()
+        {
+            var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, PipelineName);
+            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
+            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName);
+
+            EditorSimulateBuildParameters buildParameters = new EditorSimulateBuildParameters();
+            buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+            buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+            buildParameters.BuildPipeline = PipelineName.ToString();
+            buildParameters.BuildBundleType = (int)EBuildBundleType.VirtualBundle;
+            buildParameters.BuildTarget = BuildTarget;
+            buildParameters.PackageName = PackageName;
+            buildParameters.PackageVersion = _buildVersionField.value;
+            buildParameters.VerifyBuildingResult = true;
+            buildParameters.FileNameStyle = fileNameStyle;
+            buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
+            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
+
+            EditorSimulateBuildPipeline pipeline = new EditorSimulateBuildPipeline();
+            var buildResult = pipeline.Run(buildParameters, true);
+            if (buildResult.Success)
+                EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
+        }
+    }
+}
+#endif

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

@@ -0,0 +1,8 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <ui:VisualElement name="BuildContainer">
+        <ui:TextField picking-mode="Ignore" label="Build Output" name="BuildOutput" />
+        <ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
+        <ui:VisualElement name="ExtensionContainer" />
+        <ui:Button text="Click Build" display-tooltip-when-elided="true" name="Build" style="height: 50px; background-color: rgb(40, 106, 42); margin-top: 10px;" />
+    </ui:VisualElement>
+</ui:UXML>

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/EditorSimulateBuildpipeline/EditorSimulateBuildPipelineViewer.uxml.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 90cc4546b2b8afe4e8c864c132a999a9
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

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

@@ -1,70 +0,0 @@
-#if UNITY_2019_4_OR_NEWER
-using System;
-using System.IO;
-using System.Linq;
-using System.Collections.Generic;
-using UnityEditor;
-using UnityEngine;
-using UnityEditor.UIElements;
-using UnityEngine.UIElements;
-
-namespace YooAsset.Editor
-{
-    internal class EditorSimulateBuildPipelineViewer : BuildPipelineViewerBase
-    {
-        public EditorSimulateBuildPipelineViewer(string packageName, BuildTarget buildTarget, VisualElement parent)
-            : base(packageName, EBuildPipeline.RawFileBuildPipeline, buildTarget, parent)
-        {
-            var compressionField = Root.Q<EnumField>("Compression");
-            UIElementsTools.SetElementVisible(compressionField, false);
-
-            var encryptionContainer = Root.Q<VisualElement>("EncryptionContainer");
-            UIElementsTools.SetElementVisible(encryptionContainer, false);
-
-            var fileNameStyleField = Root.Q<EnumField>("FileNameStyle");
-            UIElementsTools.SetElementVisible(fileNameStyleField, false);
-
-            var copyBuildinFileOptionField = Root.Q<EnumField>("CopyBuildinFileOption");
-            UIElementsTools.SetElementVisible(copyBuildinFileOptionField, false);
-
-            var copyBuildinFileParamField = Root.Q<TextField>("CopyBuildinFileParam");
-            UIElementsTools.SetElementVisible(copyBuildinFileParamField, false);
-
-            var clearBuildCacheToggle = Root.Q<Toggle>("ClearBuildCache");
-            UIElementsTools.SetElementVisible(clearBuildCacheToggle, false);
-
-            var useAssetDependencyToggle = Root.Q<Toggle>("UseAssetDependency");
-            UIElementsTools.SetElementVisible(useAssetDependencyToggle, false);
-        }
-
-        /// <summary>
-        /// 执行构建
-        /// </summary>
-        protected override void ExecuteBuild()
-        {
-            var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, BuildPipeline);
-            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, BuildPipeline);
-            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, BuildPipeline);
-
-            EditorSimulateBuildParameters buildParameters = new EditorSimulateBuildParameters();
-            buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-            buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
-            buildParameters.BuildPipeline = BuildPipeline.ToString();
-            buildParameters.BuildBundleType = (int)EBuildBundleType.VirtualBundle;
-            buildParameters.BuildTarget = BuildTarget;
-            buildParameters.PackageName = PackageName;
-            buildParameters.PackageVersion = GetPackageVersion();
-            buildParameters.VerifyBuildingResult = true;
-            buildParameters.FileNameStyle = fileNameStyle;
-            buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
-            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
-            buildParameters.EncryptionServices = CreateEncryptionInstance();
-
-            EditorSimulateBuildPipeline pipeline = new EditorSimulateBuildPipeline();
-            var buildResult = pipeline.Run(buildParameters, true);
-            if (buildResult.Success)
-                EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
-        }
-    }
-}
-#endif

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipeline.meta

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

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

@@ -0,0 +1,127 @@
+#if UNITY_2019_4_OR_NEWER
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+    [BuildPipelineAttribute(nameof(EBuildPipeline.RawFileBuildPipeline))]
+    internal class RawfileBuildpipelineViewer : BuildPipelineViewerBase
+    {
+        protected TemplateContainer Root;
+        protected TextField _buildOutputField;
+        protected TextField _buildVersionField;
+        protected PopupField<Type> _encryptionServicesField;
+        protected PopupField<Type> _manifestProcessServicesField;
+        protected PopupField<Type> _manifestRestoreServicesField;
+        protected EnumField _outputNameStyleField;
+        protected EnumField _copyBuildinFileOptionField;
+        protected TextField _copyBuildinFileTagsField;
+        protected Toggle _clearBuildCacheToggle;
+        protected Toggle _useAssetDependencyDBToggle;
+
+        public override void CreateView(VisualElement parent)
+        {
+            // 加载布局文件
+            var visualAsset = UxmlLoader.LoadWindowUXML<RawfileBuildpipelineViewer>();
+            if (visualAsset == null)
+                return;
+
+            Root = visualAsset.CloneTree();
+            Root.style.flexGrow = 1f;
+            parent.Add(Root);
+
+            // 输出目录
+            _buildOutputField = Root.Q<TextField>("BuildOutput");
+            SetBuildOutputField(_buildOutputField);
+
+            // 构建版本
+            _buildVersionField = Root.Q<TextField>("BuildVersion");
+            SetBuildVersionField(_buildVersionField);
+
+            // 加密方法
+            var popupContainer = Root.Q("PopupContainer");
+            _encryptionServicesField = CreateEncryptionServicesField(popupContainer);
+            _manifestProcessServicesField = CreateManifestProcessServicesField(popupContainer);
+            _manifestRestoreServicesField = CreateManifestRestoreServicesField(popupContainer);
+
+            // 输出文件名称样式
+            _outputNameStyleField = Root.Q<EnumField>("FileNameStyle");
+            SetOutputNameStyleField(_outputNameStyleField);
+
+            // 首包文件拷贝参数
+            _copyBuildinFileTagsField = Root.Q<TextField>("CopyBuildinFileParam");
+            SetCopyBuildinFileTagsField(_copyBuildinFileTagsField);
+            SetCopyBuildinFileTagsVisible(_copyBuildinFileTagsField);
+
+            // 首包文件拷贝选项
+            _copyBuildinFileOptionField = Root.Q<EnumField>("CopyBuildinFileOption");
+            SetCopyBuildinFileOptionField(_copyBuildinFileOptionField, _copyBuildinFileTagsField);
+
+            // 清理构建缓存
+            _clearBuildCacheToggle = Root.Q<Toggle>("ClearBuildCache");
+            SetClearBuildCacheToggle(_clearBuildCacheToggle);
+
+            // 使用资源依赖数据库
+            _useAssetDependencyDBToggle = Root.Q<Toggle>("UseAssetDependency");
+            SetUseAssetDependencyDBToggle(_useAssetDependencyDBToggle);
+
+            // 构建按钮
+            var buildButton = Root.Q<Button>("Build");
+            buildButton.clicked += BuildButton_clicked;
+        }
+        private void BuildButton_clicked()
+        {
+            if (EditorUtility.DisplayDialog("提示", $"开始构建资源包[{PackageName}]！", "Yes", "No"))
+            {
+                EditorTools.ClearUnityConsole();
+                EditorApplication.delayCall += ExecuteBuild;
+            }
+            else
+            {
+                Debug.LogWarning("[Build] 打包已经取消");
+            }
+        }
+
+        /// <summary>
+        /// 执行构建
+        /// </summary>
+        protected virtual void ExecuteBuild()
+        {
+            var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, PipelineName);
+            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
+            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName);
+            var clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, PipelineName);
+            var useAssetDependencyDB = AssetBundleBuilderSetting.GetPackageUseAssetDependencyDB(PackageName, PipelineName);
+
+            RawFileBuildParameters buildParameters = new RawFileBuildParameters();
+            buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+            buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+            buildParameters.BuildPipeline = PipelineName.ToString();
+            buildParameters.BuildBundleType = (int)EBuildBundleType.RawBundle;
+            buildParameters.BuildTarget = BuildTarget;
+            buildParameters.PackageName = PackageName;
+            buildParameters.PackageVersion = _buildVersionField.value;
+            buildParameters.VerifyBuildingResult = true;
+            buildParameters.FileNameStyle = fileNameStyle;
+            buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
+            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
+            buildParameters.ClearBuildCacheFiles = clearBuildCache;
+            buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
+            buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
+            buildParameters.ManifestProcessServices = CreateManifestProcessServicesInstance();
+            buildParameters.ManifestRestoreServices = CreateManifestRestoreServicesInstance();
+
+            RawFileBuildPipeline pipeline = new RawFileBuildPipeline();
+            var buildResult = pipeline.Run(buildParameters, true);
+            if (buildResult.Success)
+                EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
+        }
+    }
+}
+#endif

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

@@ -0,0 +1,14 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <ui:VisualElement name="BuildContainer">
+        <ui:TextField picking-mode="Ignore" label="Build Output" name="BuildOutput" />
+        <ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
+        <ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
+        <ui:Toggle label="Use Asset Depend DB" name="UseAssetDependency" />
+        <ui:VisualElement name="PopupContainer" style="flex-grow: 1;" />
+        <uie:EnumField label="File Name Style" value="Center" name="FileNameStyle" />
+        <uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
+        <ui:TextField picking-mode="Ignore" label="Copy Buildin File Param" name="CopyBuildinFileParam" />
+        <ui:VisualElement name="ExtensionContainer" />
+        <ui:Button text="Click Build" display-tooltip-when-elided="true" name="Build" style="height: 50px; background-color: rgb(40, 106, 42); margin-top: 10px;" />
+    </ui:VisualElement>
+</ui:UXML>

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

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 8ed3387ab250c814e9797164c9a4b89a
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

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

@@ -1,56 +0,0 @@
-#if UNITY_2019_4_OR_NEWER
-using System;
-using System.IO;
-using System.Linq;
-using System.Collections.Generic;
-using UnityEditor;
-using UnityEngine;
-using UnityEditor.UIElements;
-using UnityEngine.UIElements;
-
-namespace YooAsset.Editor
-{
-    internal class RawfileBuildpipelineViewer : BuildPipelineViewerBase
-    {
-        public RawfileBuildpipelineViewer(string packageName, BuildTarget buildTarget, VisualElement parent)
-            : base(packageName, EBuildPipeline.RawFileBuildPipeline, buildTarget, parent)
-        {
-            var compressionField = Root.Q<EnumField>("Compression");
-            UIElementsTools.SetElementVisible(compressionField, false);
-        }
-
-        /// <summary>
-        /// 执行构建
-        /// </summary>
-        protected override void ExecuteBuild()
-        {
-            var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, BuildPipeline);
-            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, BuildPipeline);
-            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, BuildPipeline);
-            var clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, BuildPipeline);
-            var useAssetDependencyDB = AssetBundleBuilderSetting.GetPackageUseAssetDependencyDB(PackageName, BuildPipeline);
-
-            RawFileBuildParameters buildParameters = new RawFileBuildParameters();
-            buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-            buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
-            buildParameters.BuildPipeline = BuildPipeline.ToString();
-            buildParameters.BuildBundleType = (int)EBuildBundleType.RawBundle;
-            buildParameters.BuildTarget = BuildTarget;
-            buildParameters.PackageName = PackageName;
-            buildParameters.PackageVersion = GetPackageVersion();
-            buildParameters.VerifyBuildingResult = true;
-            buildParameters.FileNameStyle = fileNameStyle;
-            buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
-            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
-            buildParameters.ClearBuildCacheFiles = clearBuildCache;
-            buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
-            buildParameters.EncryptionServices = CreateEncryptionInstance();
-
-            RawFileBuildPipeline pipeline = new RawFileBuildPipeline();
-            var buildResult = pipeline.Run(buildParameters, true);
-            if (buildResult.Success)
-                EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
-        }
-    }
-}
-#endif

Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipeline.meta

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

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

@@ -0,0 +1,148 @@
+#if UNITY_2019_4_OR_NEWER
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+    [BuildPipelineAttribute(nameof(EBuildPipeline.ScriptableBuildPipeline))]
+    internal class ScriptableBuildPipelineViewer : BuildPipelineViewerBase
+    {
+        protected TemplateContainer Root;
+        protected TextField _buildOutputField;
+        protected TextField _buildVersionField;
+        protected PopupField<Type> _encryptionServicesField;
+        protected PopupField<Type> _manifestProcessServicesField;
+        protected PopupField<Type> _manifestRestoreServicesField;
+        protected EnumField _compressionField;
+        protected EnumField _outputNameStyleField;
+        protected EnumField _copyBuildinFileOptionField;
+        protected TextField _copyBuildinFileTagsField;
+        protected Toggle _clearBuildCacheToggle;
+        protected Toggle _useAssetDependencyDBToggle;
+
+        public override void CreateView(VisualElement parent)
+        {
+            // 加载布局文件
+            var visualAsset = UxmlLoader.LoadWindowUXML<ScriptableBuildPipelineViewer>();
+            if (visualAsset == null)
+                return;
+
+            Root = visualAsset.CloneTree();
+            Root.style.flexGrow = 1f;
+            parent.Add(Root);
+
+            // 输出目录
+            _buildOutputField = Root.Q<TextField>("BuildOutput");
+            SetBuildOutputField(_buildOutputField);
+
+            // 构建版本
+            _buildVersionField = Root.Q<TextField>("BuildVersion");
+            SetBuildVersionField(_buildVersionField);
+
+            // 加密方法
+            var popupContainer = Root.Q("PopupContainer");
+            _encryptionServicesField = CreateEncryptionServicesField(popupContainer);
+            _manifestProcessServicesField = CreateManifestProcessServicesField(popupContainer);
+            _manifestRestoreServicesField = CreateManifestRestoreServicesField(popupContainer);
+
+            // 压缩方式选项
+            _compressionField = Root.Q<EnumField>("Compression");
+            SetCompressionField(_compressionField);
+
+            // 输出文件名称样式
+            _outputNameStyleField = Root.Q<EnumField>("FileNameStyle");
+            SetOutputNameStyleField(_outputNameStyleField);
+
+            // 首包文件拷贝参数
+            _copyBuildinFileTagsField = Root.Q<TextField>("CopyBuildinFileParam");
+            SetCopyBuildinFileTagsField(_copyBuildinFileTagsField);
+            SetCopyBuildinFileTagsVisible(_copyBuildinFileTagsField);
+
+            // 首包文件拷贝选项
+            _copyBuildinFileOptionField = Root.Q<EnumField>("CopyBuildinFileOption");
+            SetCopyBuildinFileOptionField(_copyBuildinFileOptionField, _copyBuildinFileTagsField);
+
+            // 清理构建缓存
+            _clearBuildCacheToggle = Root.Q<Toggle>("ClearBuildCache");
+            SetClearBuildCacheToggle(_clearBuildCacheToggle);
+
+            // 使用资源依赖数据库
+            _useAssetDependencyDBToggle = Root.Q<Toggle>("UseAssetDependency");
+            SetUseAssetDependencyDBToggle(_useAssetDependencyDBToggle);
+
+            // 构建按钮
+            var buildButton = Root.Q<Button>("Build");
+            buildButton.clicked += BuildButton_clicked;
+        }
+        private void BuildButton_clicked()
+        {
+            if (EditorUtility.DisplayDialog("提示", $"开始构建资源包[{PackageName}]！", "Yes", "No"))
+            {
+                EditorTools.ClearUnityConsole();
+                EditorApplication.delayCall += ExecuteBuild;
+            }
+            else
+            {
+                Debug.LogWarning("[Build] 打包已经取消");
+            }
+        }
+
+        /// <summary>
+        /// 执行构建
+        /// </summary>
+        protected virtual void ExecuteBuild()
+        {
+            var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, PipelineName);
+            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
+            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName);
+            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();
+            buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+            buildParameters.BuildPipeline = PipelineName.ToString();
+            buildParameters.BuildBundleType = (int)EBuildBundleType.AssetBundle;
+            buildParameters.BuildTarget = BuildTarget;
+            buildParameters.PackageName = PackageName;
+            buildParameters.PackageVersion = _buildVersionField.value;
+            buildParameters.EnableSharePackRule = true;
+            buildParameters.VerifyBuildingResult = true;
+            buildParameters.FileNameStyle = fileNameStyle;
+            buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
+            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
+            buildParameters.CompressOption = compressOption;
+            buildParameters.ClearBuildCacheFiles = clearBuildCache;
+            buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
+            buildParameters.BuiltinShadersBundleName = builtinShaderBundleName;
+            buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
+            buildParameters.ManifestProcessServices = CreateManifestProcessServicesInstance();
+            buildParameters.ManifestRestoreServices = CreateManifestRestoreServicesInstance();
+
+            ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();
+            var buildResult = pipeline.Run(buildParameters, true);
+            if (buildResult.Success)
+                EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
+        }
+
+        /// <summary>
+        /// 内置着色器资源包名称
+        /// 注意：和自动收集的着色器资源包名保持一致！
+        /// </summary>
+        protected string GetBuiltinShaderBundleName()
+        {
+            var uniqueBundleName = AssetBundleCollectorSettingData.Setting.UniqueBundleName;
+            var packRuleResult = DefaultPackRule.CreateShadersPackRuleResult();
+            return packRuleResult.GetBundleName(PackageName, uniqueBundleName);
+        }
+    }
+}
+#endif

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

@@ -0,0 +1,15 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <ui:VisualElement name="BuildContainer">
+        <ui:TextField picking-mode="Ignore" label="Build Output" name="BuildOutput" />
+        <ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
+        <ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
+        <ui:Toggle label="Use Asset Depend DB" name="UseAssetDependency" />
+        <ui:VisualElement name="PopupContainer" style="flex-grow: 1;" />
+        <uie:EnumField label="Compression" value="Center" name="Compression" />
+        <uie:EnumField label="File Name Style" value="Center" name="FileNameStyle" />
+        <uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
+        <ui:TextField picking-mode="Ignore" label="Copy Buildin File Param" name="CopyBuildinFileParam" />
+        <ui:VisualElement name="ExtensionContainer" />
+        <ui:Button text="Click Build" display-tooltip-when-elided="true" name="Build" style="height: 50px; background-color: rgb(40, 106, 42); margin-top: 10px;" />
+    </ui:VisualElement>
+</ui:UXML>

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

@@ -1,70 +0,0 @@
-#if UNITY_2019_4_OR_NEWER
-using System;
-using System.IO;
-using System.Linq;
-using System.Collections.Generic;
-using UnityEditor;
-using UnityEngine;
-using UnityEditor.UIElements;
-using UnityEngine.UIElements;
-
-namespace YooAsset.Editor
-{
-    internal class ScriptableBuildPipelineViewer : BuildPipelineViewerBase
-    {
-        public ScriptableBuildPipelineViewer(string packageName, BuildTarget buildTarget, VisualElement parent)
-            : base(packageName, EBuildPipeline.ScriptableBuildPipeline, buildTarget, parent)
-        {
-        }
-
-        /// <summary>
-        /// 执行构建
-        /// </summary>
-        protected override void ExecuteBuild()
-        {
-            var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, BuildPipeline);
-            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, BuildPipeline);
-            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, BuildPipeline);
-            var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, BuildPipeline);
-            var clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, BuildPipeline);
-            var useAssetDependencyDB = AssetBundleBuilderSetting.GetPackageUseAssetDependencyDB(PackageName, BuildPipeline);
-            var builtinShaderBundleName = GetBuiltinShaderBundleName();
-
-            ScriptableBuildParameters buildParameters = new ScriptableBuildParameters();
-            buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-            buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
-            buildParameters.BuildPipeline = BuildPipeline.ToString();
-            buildParameters.BuildBundleType = (int)EBuildBundleType.AssetBundle;
-            buildParameters.BuildTarget = BuildTarget;
-            buildParameters.PackageName = PackageName;
-            buildParameters.PackageVersion = GetPackageVersion();
-            buildParameters.EnableSharePackRule = true;
-            buildParameters.VerifyBuildingResult = true;
-            buildParameters.FileNameStyle = fileNameStyle;
-            buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
-            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
-            buildParameters.CompressOption = compressOption;
-            buildParameters.ClearBuildCacheFiles = clearBuildCache;
-            buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
-            buildParameters.BuiltinShadersBundleName = builtinShaderBundleName;
-            buildParameters.EncryptionServices = CreateEncryptionInstance();
-
-            ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();
-            var buildResult = pipeline.Run(buildParameters, true);
-            if (buildResult.Success)
-                EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
-        }
-
-        /// <summary>
-        /// 内置着色器资源包名称
-        /// 注意：和自动收集的着色器资源包名保持一致！
-        /// </summary>
-        private string GetBuiltinShaderBundleName()
-        {
-            var uniqueBundleName = AssetBundleCollectorSettingData.Setting.UniqueBundleName;
-            var packRuleResult = DefaultPackRule.CreateShadersPackRuleResult();
-            return packRuleResult.GetBundleName(PackageName, uniqueBundleName);
-        }
-    }
-}
-#endif

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs

@@ -259,10 +259,13 @@ namespace YooAsset.Editor
         }
         private List<string> GetAssetTags(AssetBundleCollectorGroup group)
         {
-            List<string> tags = EditorTools.StringToStringList(group.AssetTags, ';');
+            List<string> result = EditorTools.StringToStringList(AssetTags, ';');
-            List<string> temper = EditorTools.StringToStringList(AssetTags, ';');
+            if (CollectorType == ECollectorType.MainAssetCollector)
-            tags.AddRange(temper);
+            {
-            return tags;
+                List<string> temps = EditorTools.StringToStringList(group.AssetTags, ';');
+                result.AddRange(temps);
+            }
+            return result;
         }
         private List<AssetInfo> GetAllDependencies(CollectCommand command, string mainAssetPath)
         {

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs

@@ -265,7 +265,7 @@ namespace YooAsset.Editor
         }
         private static string GetRuleDisplayName(string name, Type type)
         {
-            var attribute = DisplayNameAttributeHelper.GetAttribute<DisplayNameAttribute>(type);
+            var attribute = EditorTools.GetAttribute<DisplayNameAttribute>(type);
             if (attribute != null && string.IsNullOrEmpty(attribute.DisplayName) == false)
                 return attribute.DisplayName;
             else

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetDependencyDatabase.cs

@@ -70,7 +70,11 @@ namespace YooAsset.Editor
                     foreach (var cacheInfoPair in _database)
                     {
                         var assetPath = cacheInfoPair.Key;
+#if UNITY_2021_3_OR_NEWER
+                        var assetGUID = AssetDatabase.AssetPathToGUID(assetPath, AssetPathToGUIDOptions.OnlyExistingAssets);
+#else
                         var assetGUID = AssetDatabase.AssetPathToGUID(assetPath);
+#endif
                         if (string.IsNullOrEmpty(assetGUID))
                         {
                             removeList.Add(assetPath);
@@ -173,26 +177,42 @@ namespace YooAsset.Editor
         /// </summary>
         public string[] GetDependencies(string assetPath, bool recursive)
         {
-            // 注意：AssetDatabase.GetDependencies()方法返回结果里会踢出丢失文件！
-            // 注意：AssetDatabase.GetDependencies()方法返回结果里会包含主资源路径！
-
             // 注意：机制上不允许存在未收录的资源
             if (_database.ContainsKey(assetPath) == false)
             {
                 throw new Exception($"Fatal : can not found cache info : {assetPath}");
             }
 
-            var result = new HashSet<string> { assetPath };
+            var result = new HashSet<string>();
-            CollectDependencies(assetPath, result, recursive);
+
+            // 注意：递归收集依赖时，依赖列表中包含主资源
+            if (recursive)
+                result.Add(assetPath);
+
+            // 收集依赖
+            CollectDependencies(assetPath, assetPath, result, recursive);
 
-            // 注意：AssetDatabase.GetDependencies保持一致，将主资源添加到依赖列表最前面
             return result.ToArray();
         }
-        private void CollectDependencies(string assetPath, HashSet<string> result, bool recursive)
+        private void CollectDependencies(string parent, string assetPath, HashSet<string> result, bool recursive)
         {
             if (_database.TryGetValue(assetPath, out var cacheInfo) == false)
             {
-                throw new Exception($"Fatal : can not found cache info : {assetPath}");
+                // 说明：检测是否为丢失引用的资产
+#if UNITY_2021_3_OR_NEWER
+                var assetGUID = AssetDatabase.AssetPathToGUID(assetPath, AssetPathToGUIDOptions.OnlyExistingAssets);
+#else
+                var assetGUID = AssetDatabase.AssetPathToGUID(assetPath);
+#endif
+                if (string.IsNullOrEmpty(assetGUID))
+                {
+                    Debug.LogWarning($"{parent} found missing asset : {assetPath}");
+                    return;
+                }
+                else
+                {
+                    throw new Exception($"Fatal : can not found cache info : {assetPath}");
+                }
             }
 
             foreach (var dependGUID in cacheInfo.DependGUIDs)
@@ -213,7 +233,7 @@ namespace YooAsset.Editor
 
                 // 递归收集依赖
                 if (recursive)
-                    CollectDependencies(dependAssetPath, result, recursive);
+                    CollectDependencies(assetPath, dependAssetPath, result, recursive);
             }
         }
 
@@ -237,6 +257,7 @@ namespace YooAsset.Editor
         }
         private DependencyInfo CreateDependencyInfo(string assetPath)
         {
+            // 注意：AssetDatabase.GetDependencies()方法返回结果里会踢出丢失文件！
             var dependHash = AssetDatabase.GetAssetDependencyHash(assetPath);
             var dependAssetPaths = AssetDatabase.GetDependencies(assetPath, false);
             var dependGUIDs = new List<string>();

Assets/YooAsset/Editor/AssetBundleCollector/DisplayNameAttribute.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 
 namespace YooAsset.Editor
 {
@@ -15,22 +14,4 @@ namespace YooAsset.Editor
             this.DisplayName = name;
         }
     }
-
-    public static class DisplayNameAttributeHelper
-    {
-        internal static T GetAttribute<T>(Type type) where T : Attribute
-        {
-            return (T)type.GetCustomAttribute(typeof(T), false);
-        }
-
-        internal static T GetAttribute<T>(MethodInfo methodInfo) where T : Attribute
-        {
-            return (T)methodInfo.GetCustomAttribute(typeof(T), false);
-        }
-
-        internal static T GetAttribute<T>(FieldInfo field) where T : Attribute
-        {
-            return (T)field.GetCustomAttribute(typeof(T), false);
-        }
-    }
 }

Assets/YooAsset/Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs

@@ -296,6 +296,7 @@ namespace YooAsset.Editor
                 string filePath = $"{resultPath}/{nameof(DebugReport)}_{_currentReport.FrameCount}.json";
                 string fileContent = JsonUtility.ToJson(_currentReport, true);
                 FileUtility.WriteAllText(filePath, fileContent);
+                Debug.Log($"Debug report file saved : {filePath}");
             }
         }
         private void OnSearchKeyWordChange(ChangeEvent<string> e)

Assets/YooAsset/Editor/AssetBundleReporter/ReportSummary.cs

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

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

@@ -238,9 +238,8 @@ namespace YooAsset.Editor
             ReportAssetInfo assetInfo = assetTableData.AssetInfo;
 
             // 填充依赖数据
-            var mainBundle = _buildReport.GetBundleInfo(assetInfo.MainBundleName);
+            var sourceDatas = new List<ITableData>(assetInfo.DependBundles.Count);
-            var sourceDatas = new List<ITableData>(mainBundle.DependBundles.Count);
+            foreach (string dependBundleName in assetInfo.DependBundles)
-            foreach (string dependBundleName in mainBundle.DependBundles)
             {
                 var dependBundle = _buildReport.GetBundleInfo(dependBundleName);
                 var rowData = new DependTableData();

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

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

Assets/YooAsset/Editor/EditorTools.cs

@@ -129,6 +129,23 @@ namespace YooAsset.Editor
         }
         #endregion
 
+        #region Attribute
+        public static T GetAttribute<T>(Type type) where T : Attribute
+        {
+            return (T)type.GetCustomAttribute(typeof(T), false);
+        }
+
+        public static T GetAttribute<T>(MethodInfo methodInfo) where T : Attribute
+        {
+            return (T)methodInfo.GetCustomAttribute(typeof(T), false);
+        }
+
+        public static T GetAttribute<T>(FieldInfo field) where T : Attribute
+        {
+            return (T)field.GetCustomAttribute(typeof(T), false);
+        }
+        #endregion
+
         #region PackageManager
         public static string GetPackageManagerYooVersion()
         {

Assets/YooAsset/Editor/UIElements/TableViewer/DefaultCells/AssetObjectCell.cs

@@ -0,0 +1,42 @@
+#if UNITY_2019_4_OR_NEWER
+using UnityEditor;
+using System;
+
+namespace YooAsset.Editor
+{
+    public class AssetObjectCell : ITableCell, IComparable
+    {
+        public string SearchTag { private set; get; }
+        public object CellValue { set; get; }
+        public string StringValue
+        {
+            get
+            {
+                return (string)CellValue;
+            }
+        }
+
+        public AssetObjectCell(string searchTag, string assetPath)
+        {
+            SearchTag = searchTag;
+            CellValue = assetPath;
+        }
+
+        public object GetDisplayObject()
+        {
+            return AssetDatabase.LoadMainAssetAtPath(StringValue);
+        }
+        public int CompareTo(object other)
+        {
+            if (other is AssetObjectCell cell)
+            {
+                return this.StringValue.CompareTo(cell.StringValue);
+            }
+            else
+            {
+                return 0;
+            }
+        }
+    }
+}
+#endif

Assets/YooAsset/Editor/UIElements/TableViewer/DefaultCells/AssetObjectCell.cs.meta

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

Assets/YooAsset/Editor/UIElements/TableViewer/DefaultTableData/DefaultTableData.cs

@@ -31,9 +31,14 @@ namespace YooAsset.Editor
             var cell = new ButtonCell(searchTag);
             Cells.Add(cell);
         }
-        public void AddAssetPathCell(string searchTag, string path)
+        public void AddAssetPathCell(string searchTag, string assetPath)
         {
-            var cell = new AssetPathCell(searchTag, path);
+            var cell = new AssetPathCell(searchTag, assetPath);
+            Cells.Add(cell);
+        }
+        public void AddAssetObjectCell(string searchTag, string assetPath)
+        {
+            var cell = new AssetObjectCell(searchTag, assetPath);
             Cells.Add(cell);
         }
         public void AddStringValueCell(string searchTag, string value)

Assets/YooAsset/Editor/UIElements/UIElementsTools.cs

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

Assets/YooAsset/Runtime/Assembly/AssemblyInfo.cs

@@ -1,7 +1,12 @@
 using System.Runtime.CompilerServices;
 
+// 内部友元
 [assembly: InternalsVisibleTo("YooAsset.Editor")]
-[assembly: InternalsVisibleTo("YooAsset.EditorExtension")]
+[assembly: InternalsVisibleTo("YooAsset.Test")]
-[assembly: InternalsVisibleTo("YooAsset.RuntimeExtension")]
 [assembly: InternalsVisibleTo("YooAsset.Test.Editor")]
+
+// 外部友元
+[assembly: InternalsVisibleTo("YooAsset.MiniGame")]
+[assembly: InternalsVisibleTo("YooAsset.RuntimeExtension")]
+[assembly: InternalsVisibleTo("YooAsset.EditorExtension")]
 [assembly: InternalsVisibleTo("Assembly-CSharp-Editor")]

Assets/YooAsset/Runtime/DownloadSystem/DownloadDefine.cs

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

Assets/YooAsset/Runtime/DownloadSystem/DownloadParam.cs

@@ -1,30 +0,0 @@
-
-namespace YooAsset
-{
-    internal class DownloadParam
-    {
-        public readonly int FailedTryAgain;
-        public readonly int Timeout;
-
-        /// <summary>
-        /// 导入的本地文件路径
-        /// </summary>
-        public string ImportFilePath { set; get; }
-
-        /// <summary>
-        /// 主资源地址
-        /// </summary>
-        public string MainURL { set; get; }
-
-        /// <summary>
-        /// 备用资源地址
-        /// </summary>
-        public string FallbackURL { set; get; }
-
-        public DownloadParam(int failedTryAgain, int timeout)
-        {
-            FailedTryAgain = failedTryAgain;
-            Timeout = timeout;
-        }
-    }
-}

Assets/YooAsset/Runtime/DownloadSystem/DownloadSystemHelper.cs

@@ -69,6 +69,8 @@ namespace YooAsset
             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);
 #else
             throw new System.NotImplementedException();
 #endif

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -58,7 +58,7 @@ namespace YooAsset
         /// <summary>
         /// 自定义参数：远程服务接口
         /// </summary>
-        public IRemoteServices RemoteServices { private set; get; } = null;
+        public IRemoteServices RemoteServices { private set; get; }
 
         /// <summary>
         /// 自定义参数：初始化的时候缓存文件校验级别
@@ -75,6 +75,11 @@ namespace YooAsset
         /// </summary>
         public bool AppendFileExtension { private set; get; } = false;
 
+        /// <summary>
+        /// 自定义参数：禁用边玩边下机制
+        /// </summary>
+        public bool DisableOnDemandDownload { private set; get; } = false;
+
         /// <summary>
         /// 自定义参数：最大并发连接数
         /// </summary>
@@ -99,6 +104,16 @@ namespace YooAsset
         ///  自定义参数：解密方法类
         /// </summary>
         public IDecryptionServices DecryptionServices { private set; get; }
+
+        /// <summary>
+        /// 自定义参数：资源清单服务类
+        /// </summary>
+        public IManifestRestoreServices ManifestServices { private set; get; }
+
+        /// <summary>
+        /// 自定义参数：拷贝内置文件服务类
+        /// </summary>
+        public ICopyLocalFileServices CopyLocalFileServices { private set; get; }
         #endregion
 
 
@@ -120,48 +135,59 @@ namespace YooAsset
             var operation = new DCFSRequestPackageVersionOperation(this, appendTimeTicks, timeout);
             return operation;
         }
-        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
+        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options)
         {
-            if (clearMode == EFileClearMode.ClearAllBundleFiles.ToString())
+            if (options.ClearMode == EFileClearMode.ClearAllBundleFiles.ToString())
             {
                 var operation = new ClearAllCacheBundleFilesOperation(this);
                 return operation;
             }
-            else if (clearMode == EFileClearMode.ClearUnusedBundleFiles.ToString())
+            else if (options.ClearMode == EFileClearMode.ClearUnusedBundleFiles.ToString())
             {
                 var operation = new ClearUnusedCacheBundleFilesOperation(this, manifest);
                 return operation;
             }
-            else if (clearMode == EFileClearMode.ClearBundleFilesByTags.ToString())
+            else if (options.ClearMode == EFileClearMode.ClearBundleFilesByTags.ToString())
             {
-                var operation = new ClearCacheBundleFilesByTagsOperaiton(this, manifest, clearParam);
+                var operation = new ClearCacheBundleFilesByTagsOperaiton(this, manifest, options.ClearParam);
                 return operation;
             }
-            else if (clearMode == EFileClearMode.ClearAllManifestFiles.ToString())
+            else if (options.ClearMode == EFileClearMode.ClearAllManifestFiles.ToString())
             {
                 var operation = new ClearAllCacheManifestFilesOperation(this);
                 return operation;
             }
-            else if (clearMode == EFileClearMode.ClearUnusedManifestFiles.ToString())
+            else if (options.ClearMode == EFileClearMode.ClearUnusedManifestFiles.ToString())
             {
                 var operation = new ClearUnusedCacheManifestFilesOperation(this, manifest);
                 return operation;
             }
             else
             {
-                string error = $"Invalid clear mode : {clearMode}";
+                string error = $"Invalid clear mode : {options.ClearMode}";
                 var operation = new FSClearCacheFilesCompleteOperation(error);
                 return operation;
             }
         }
-        public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadParam param)
+        public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
         {
-            var downloader = DownloadCenter.DownloadFileAsync(bundle, param);
+            // 获取下载地址
-            downloader.Reference(); //增加下载器的引用计数
+            if (string.IsNullOrEmpty(options.ImportFilePath))
+            {
+                // 注意：如果是解压文件系统类，这里会返回本地内置文件的下载路径
+                string mainURL = RemoteServices.GetRemoteMainURL(bundle.FileName);
+                string fallbackURL = RemoteServices.GetRemoteFallbackURL(bundle.FileName);
+                options.SetURL(mainURL, fallbackURL);
+            }
+            else
+            {
+                // 注意：把本地导入文件路径转换为下载器请求地址
+                string mainURL = DownloadSystemHelper.ConvertToWWWPath(options.ImportFilePath);
+                options.SetURL(mainURL, mainURL);
+            }
 
-            // 注意：将下载器进行包裹，可以避免父类任务终止的时候，连带子任务里的下载器也一起被终止！
+            var downloader = new DownloadPackageBundleOperation(this, bundle, options);
-            var wrapper = new DownloadFileWrapper(downloader);
+            return downloader;
-            return wrapper;
         }
         public virtual FSLoadBundleOperation LoadBundleFile(PackageBundle bundle)
         {
@@ -201,6 +227,10 @@ namespace YooAsset
             {
                 AppendFileExtension = Convert.ToBoolean(value);
             }
+            else if (name == FileSystemParametersDefine.DISABLE_ONDEMAND_DOWNLOAD)
+            {
+                DisableOnDemandDownload = Convert.ToBoolean(value);
+            }
             else if (name == FileSystemParametersDefine.DOWNLOAD_MAX_CONCURRENCY)
             {
                 DownloadMaxConcurrency = Convert.ToInt32(value);
@@ -221,6 +251,14 @@ namespace YooAsset
             {
                 DecryptionServices = (IDecryptionServices)value;
             }
+            else if (name == FileSystemParametersDefine.MANIFEST_SERVICES)
+            {
+                ManifestServices = (IManifestRestoreServices)value;
+            }
+            else if (name == FileSystemParametersDefine.COPY_LOCAL_FILE_SERVICES)
+            {
+                CopyLocalFileServices = (ICopyLocalFileServices)value;
+            }
             else
             {
                 YooLogger.Warning($"Invalid parameter : {name}");
@@ -559,6 +597,21 @@ namespace YooAsset
             };
             return DecryptionServices.LoadAssetBundleAsync(fileInfo);
         }
+
+        /// <summary>
+        /// 加载加密资源文件
+        /// </summary>
+        public DecryptResult LoadEncryptedAssetBundleFallback(PackageBundle bundle)
+        {
+            string filePath = GetCacheBundleFileLoadPath(bundle);
+            var fileInfo = new DecryptFileInfo()
+            {
+                BundleName = bundle.BundleName,
+                FileLoadCRC = bundle.UnityCRC,
+                FileLoadPath = filePath,
+            };
+            return DecryptionServices.LoadAssetBundleFallback(fileInfo);
+        }
         #endregion
     }
 }

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

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

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

@@ -49,17 +49,26 @@ namespace YooAsset
                 }
                 else
                 {
-                    _steps = ESteps.DownloadFile;
+                    if (_fileSystem.DisableOnDemandDownload)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"The bundle not cached : {_bundle.BundleName}";
+                        YooLogger.Warning(Error);
+                    }
+                    else
+                    {
+                        _steps = ESteps.DownloadFile;
+                    }
                 }
             }
 
             if (_steps == ESteps.DownloadFile)
             {
-                // 注意：边玩边下下载器引用计数没有Release
                 if (_downloadFileOp == null)
                 {
-                    DownloadParam downloadParam = new DownloadParam(int.MaxValue, 60);
+                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue);
-                    _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, downloadParam);
+                    _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, options);
                     _downloadFileOp.StartOperation();
                     AddChildOperation(_downloadFileOp);
                 }
@@ -164,11 +173,23 @@ namespace YooAsset
                 {
                     if (_bundle.Encrypted)
                     {
-                        _steps = ESteps.Done;
+                        var decryptResult = _fileSystem.LoadEncryptedAssetBundleFallback(_bundle);
-                        Status = EOperationStatus.Failed;
+                        _assetBundle = decryptResult.Result;
-                        Error = $"Failed to load encrypted asset bundle file : {_bundle.BundleName}";
+                        if (_assetBundle != null)
-                        YooLogger.Error(Error);
+                        {
-                        return;
+                            _steps = ESteps.Done;
+                            Result = new AssetBundleResult(_fileSystem, _bundle, _assetBundle, _managedStream);
+                            Status = EOperationStatus.Succeed;
+                            return;
+                        }
+                        else
+                        {
+                            _steps = ESteps.Done;
+                            Status = EOperationStatus.Failed;
+                            Error = $"Failed to load encrypted asset bundle file : {_bundle.BundleName}";
+                            YooLogger.Error(Error);
+                            return;
+                        }
                     }
 
                     // 注意：在安卓移动平台，华为和三星真机上有极小概率加载资源包失败。
@@ -216,9 +237,6 @@ namespace YooAsset
             {
                 if (ExecuteWhileDone())
                 {
-                    if (_downloadFileOp != null && _downloadFileOp.Status == EOperationStatus.Failed)
-                        YooLogger.Error($"Try load bundle {_bundle.BundleName} from remote !");
-
                     _steps = ESteps.Done;
                     break;
                 }
@@ -294,11 +312,10 @@ namespace YooAsset
 
             if (_steps == ESteps.DownloadFile)
             {
-                // 注意：边玩边下下载器引用计数没有Release
                 if (_downloadFileOp == null)
                 {
-                    DownloadParam downloadParam = new DownloadParam(int.MaxValue, 60);
+                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue);
-                    _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, downloadParam);
+                    _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, options);
                     _downloadFileOp.StartOperation();
                     AddChildOperation(_downloadFileOp);
                 }
@@ -348,10 +365,6 @@ namespace YooAsset
             {
                 if (ExecuteWhileDone())
                 {
-                    //TODO 拷贝本地文件失败也会触发该错误！
-                    if (_downloadFileOp != null && _downloadFileOp.Status == EOperationStatus.Failed)
-                        YooLogger.Error($"Try load bundle {_bundle.BundleName} from remote !");
-
                     _steps = ESteps.Done;
                     break;
                 }

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

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

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

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

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

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

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

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

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

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