Update CHANGELOG.md

修复程序集不正确的问题

.gitignore

@@ -20,6 +20,8 @@
 /Assets/StreamingAssets.meta
 /Assets/Samples
 /Assets/Samples.meta
+/Assets/csc.rsp
+/Assets/csc.rsp.meta
 /UserSettings
 
 

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,171 @@
 
 All notable changes to this package will be documented in this file.
 
+## [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
+
+- (#526) 运行时资源清单的哈希值验证兼容了MD5和CRC32两种方式。
+- (#515) 优化了资源路径大小写不敏感的逻辑代码，减少字符串操作产生的GC。
+- (#523) UnloadUnusedAssetsOperation方法支持了分帧处理。
+
+### Fixed
+
+- (#520) 修复了UWP平台获取WWW加载路径未适配的问题。
+
+### Added
+
+- 新增了文件系统初始化参数：INSTALL_CLEAR_MODE
+
+  ```csharp
+  /// <summary>
+  /// 覆盖安装清理模式
+  /// </summary>
+  public enum EOverwriteInstallClearMode
+  {
+      /// <summary>
+      /// 不做任何处理
+      /// </summary>
+      None = 0,
+   
+      /// <summary>
+      /// 清理所有缓存文件（包含资源文件和清单文件）
+      /// </summary>
+      ClearAllCacheFiles = 1,
+   
+      /// <summary>
+      /// 清理所有缓存的资源文件
+      /// </summary>
+      ClearAllBundleFiles = 2,
+   
+      /// <summary>
+      /// 清理所有缓存的清单文件
+      /// </summary>
+      ClearAllManifestFiles = 3,
+  }
+  ```
+
+- 新增了初始化参数：BundleLoadingMaxConcurrency
+
+  ```csharp
+  public abstract class InitializeParameters
+  {
+      /// <summary>
+      /// 同时加载Bundle文件的最大并发数
+      /// </summary>
+      public int BundleLoadingMaxConcurrency = int.MaxValue;
+  }
+  ```
+
+## [2.3.6] - 2025-03-25
+
+### Improvements
+
+- 构建管线新增了TaskCreateCatalog任务节点。
+- 内置文件系统的catalog文件现在存储在streammingAssets目录下。
+
+### Fixed
+
+- (#486) 修复了微信小游戏文件系统调用ClearUnusedBundleFiles时候的异常。
+
+## [2.3.5-preview] - 2025-03-14
+
+### Fixed
+
+- (#502) 修复了原生缓存文件由于文件格式变动导致的加载本地缓存文件失败的问题。
+- (#504) 修复了MacOS平台Offline Play Mode模式请求本地资源清单失败的问题。
+- (#506) 修复了v2.3x版本LoadAllAssets方法计算依赖Bundle不完整的问题。
+- (#506) 修复了微信小游戏文件系统，在启用加密算法后卸载bundle报错的问题。
+
 ## [2.3.4-preview] - 2025-03-08
 
 ### Improvements

Assets/YooAsset/Editor/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

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+
+#if YOO_ASSET_EXPERIMENT
+namespace YooAsset.Editor
+{
+    public class MacroDefine
+    {
+        /// <summary>
+        /// YooAsset版本宏定义
+        /// </summary>
+        public static readonly List<string> Macros = new List<string>()
+        {
+            "YOO_ASSET_2",
+            "YOO_ASSET_2_3",
+            "YOO_ASSET_2_3_OR_NEWER",
+        };
+    }
+}
+#endif

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

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

Assets/YooAsset/Editor/Assembly/MacroProcessor.cs

@@ -1,28 +1,16 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Xml;
 using UnityEditor;
 
+#if YOO_ASSET_EXPERIMENT
 namespace YooAsset.Editor
 {
     [InitializeOnLoad]
-    public class MacrosProcessor : AssetPostprocessor
+    public class MacroProcessor : AssetPostprocessor
     {
-        static MacrosProcessor()
-        {
-        }
-
-        /// <summary>
-        /// YooAsset版本宏定义
-        /// </summary>
-        private static readonly List<string> YooAssetMacros = new List<string>()
-        {
-            "YOO_ASSET_2",
-            "YOO_ASSET_2_3",
-            "YOO_ASSET_2_3_OR_NEWER",
-        };
-
         static string OnGeneratedCSProject(string path, string content)
         {
             XmlDocument xmlDoc = new XmlDocument();
@@ -35,13 +23,21 @@ namespace YooAsset.Editor
                 return content;
 
             // 将修改后的XML结构重新输出为文本
-            var stringWriter = new StringWriter();
-            var writerSettings = new XmlWriterSettings();
-            writerSettings.Indent = true;
-            var xmlWriter = XmlWriter.Create(stringWriter, writerSettings);
-            xmlDoc.WriteTo(xmlWriter);
-            xmlWriter.Flush();
-            return stringWriter.ToString();
+            using (var memoryStream = new MemoryStream())
+            {
+                var writerSettings = new XmlWriterSettings
+                {
+                    Indent = true,
+                    Encoding = new UTF8Encoding(false), //无BOM
+                    OmitXmlDeclaration = false
+                };
+
+                using (var xmlWriter = XmlWriter.Create(memoryStream, writerSettings))
+                {
+                    xmlDoc.Save(xmlWriter);
+                }
+                return Encoding.UTF8.GetString(memoryStream.ToArray());
+            }
         }
 
         /// <summary>
@@ -65,7 +61,7 @@ namespace YooAsset.Editor
 
                     string[] defines = childNode.InnerText.Split(';');
                     HashSet<string> hashSets = new HashSet<string>(defines);
-                    foreach (string yooMacro in YooAssetMacros)
+                    foreach (string yooMacro in MacroDefine.Macros)
                     {
                         string tmpMacro = yooMacro.Trim();
                         if (hashSets.Contains(tmpMacro) == false)
@@ -107,3 +103,4 @@ namespace YooAsset.Editor
         }
     }
 }
+#endif

Assets/YooAsset/Editor/Assembly/RspGenerator.cs

@@ -0,0 +1,115 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using UnityEditor;
+using UnityEngine;
+
+#if YOO_ASSET_EXPERIMENT
+namespace YooAsset.Editor.Experiment
+{
+    [InitializeOnLoad]
+    public class RspGenerator
+    {
+        // csc.rsp文件路径
+        private static string RspFilePath => Path.Combine(Application.dataPath, "csc.rsp");
+
+        static RspGenerator()
+        {
+            UpdateRspFile(MacroDefine.Macros, null);
+        }
+
+        /// <summary>
+        /// 更新csc.rsp文件
+        /// </summary>
+        private static void UpdateRspFile(List<string> addMacros, List<string> removeMacros)
+        {
+            var existingDefines = new HashSet<string>();
+            var otherLines = new List<string>();
+
+            // 1. 读取现有内容
+            ReadRspFile(existingDefines, otherLines);
+
+            // 2. 添加新宏
+            if (addMacros != null && addMacros.Count > 0)
+            {
+                addMacros.ForEach(x =>
+                {
+                    if (existingDefines.Contains(x) == false)
+                        existingDefines.Add(x);
+                });
+            }
+
+            // 3. 移除指定宏
+            if (removeMacros != null && removeMacros.Count > 0)
+            {
+                removeMacros.ForEach(x =>
+                {
+                    existingDefines.Remove(x);
+                });
+            }
+
+            // 4. 重新生成内容
+            WriteRspFile(existingDefines, otherLines);
+
+            // 5. 刷新AssetDatabase
+            AssetDatabase.Refresh();
+            EditorUtility.RequestScriptReload();
+        }
+
+        /// <summary>
+        /// 读取csc.rsp文件,返回宏定义和其他行
+        /// </summary>
+        private static void ReadRspFile(HashSet<string> defines, List<string> others)
+        {
+            if (defines == null)
+                defines = new HashSet<string>();
+
+            if (others == null)
+                others = new List<string>();
+
+            if (File.Exists(RspFilePath) == false)
+                return;
+
+            foreach (string line in File.ReadAllLines(RspFilePath))
+            {
+                if (line.StartsWith("-define:"))
+                {
+                    string[] parts = line.Split(new[] { ':' }, 2);
+                    if (parts.Length == 2)
+                    {
+                        defines.Add(parts[1].Trim());
+                    }
+                }
+                else
+                {
+                    others.Add(line);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 重新写入csc.rsp文件
+        /// </summary>
+        private static void WriteRspFile(HashSet<string> defines, List<string> others)
+        {
+            StringBuilder sb = new StringBuilder();
+            if (others != null && others.Count > 0)
+            {
+                others.ForEach(o => sb.AppendLine(o));
+            }
+
+            if (defines != null && defines.Count > 0)
+            {
+                foreach (string define in defines)
+                {
+                    sb.AppendLine($"-define:{define}");
+                }
+            }
+
+            File.WriteAllText(RspFilePath, sb.ToString());
+        }
+    }
+}
+#endif

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

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

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();
-                    label.style.marginLeft = 3f;
-                    label.style.unityTextAlign = TextAnchor.MiddleLeft;
-                    return label;
+                    if (header.HeaderType == EHeaderType.AssetObject)
+                    {
+                        var objectFiled = new ObjectField();
+                        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;
-                    infoLabel.text = (string)cell.GetDisplayObject();
+                    if (header.HeaderType == EHeaderType.AssetObject)
+                    {
+                        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,98 @@ namespace YooAsset.Editor
 {
     public static class AssetBundleBuilderSetting
     {
-        // EBuildPipeline
-        public static EBuildPipeline GetPackageBuildPipeline(string packageName)
+        // BuildPipelineName
+        public static string GetPackageBuildPipeline(string packageName)
         {
-            string key = $"{Application.productName}_{packageName}_{nameof(EBuildPipeline)}";
-            return (EBuildPipeline)EditorPrefs.GetInt(key, (int)EBuildPipeline.BuiltinBuildPipeline);
+            string key = $"{Application.productName}_{packageName}_BuildPipelineName";
+            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)}";
-            EditorPrefs.SetInt(key, (int)buildPipeline);
+            string key = $"{Application.productName}_{packageName}_BuildPipelineName";
+            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
-        public static string GetPackageEncyptionClassName(string packageName, EBuildPipeline buildPipeline)
+        public static string GetPackageEncyptionClassName(string packageName, string buildPipeline)
         {
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionClassName";
             return EditorPrefs.GetString(key, string.Empty);
         }
-        public static void SetPackageEncyptionClassName(string packageName, EBuildPipeline buildPipeline, string encyptionClassName)
+        public static void SetPackageEncyptionClassName(string packageName, string buildPipeline, string encyptionClassName)
         {
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionClassName";
             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 (_buildPipeline == EBuildPipeline.EditorSimulateBuildPipeline)
+            if (_viewClassDic.TryGetValue(_buildPipeline, out Type value))
             {
-                var viewer = new EditorSimulateBuildPipelineViewer(_buildPackage, buildTarget, _container);
-            }
-            else if (_buildPipeline == EBuildPipeline.BuiltinBuildPipeline)
-            {
-                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);
+                var buildTarget = EditorUserBuildSettings.activeBuildTarget;
+                var viewer = Activator.CreateInstance(value) as BuildPipelineViewerBase;
+                viewer.InitView(_buildPackage, _buildPipeline, buildTarget);
+                viewer.CreateView(_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 != pipelineType)
+            if (_buildPipeline != action.name)
             {
-                _buildPipeline = pipelineType;
-                AssetBundleBuilderSetting.SetPackageBuildPipeline(_buildPackage, pipelineType);
+                _buildPipeline = action.name;
+                AssetBundleBuilderSetting.SetPackageBuildPipeline(_buildPackage, _buildPipeline);
                 RefreshBuildPipelineView();
             }
         }
         private DropdownMenuAction.Status PipelineMenuFun(DropdownMenuAction action)
         {
-            var pipelineType = (EBuildPipeline)action.userData;
-            if (_buildPipeline == pipelineType)
+            if (_buildPipeline == action.name)
                 return DropdownMenuAction.Status.Checked;
             else
                 return DropdownMenuAction.Status.Normal;

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

@@ -0,0 +1,23 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog
+    {
+        /// <summary>
+        /// 生成内置资源记录文件
+        /// </summary>
+        internal void CreateCatalogFile(BuildParametersContext buildParametersContext)
+        {
+            string buildinRootDirectory = buildParametersContext.GetBuildinRootDirectory();
+            string buildPackageName = buildParametersContext.Parameters.PackageName;
+            DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(buildPackageName, buildinRootDirectory);
+
+            // 刷新目录
+            AssetDatabase.Refresh();
+        }
+    }
+}

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

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

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

@@ -30,7 +30,7 @@ namespace YooAsset.Editor
 
             // 创建新补丁清单
             PackageManifest manifest = new PackageManifest();
-            manifest.FileVersion = YooAssetSettings.ManifestFileVersion;
+            manifest.FileVersion = ManifestDefine.FileVersion;
             manifest.EnableAddressable = buildMapContext.Command.EnableAddressable;
             manifest.LocationToLower = buildMapContext.Command.LocationToLower;
             manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;

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

@@ -0,0 +1,20 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog_BBP : TaskCreateCatalog, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            {
+                CreateCatalogFile(buildParametersContext);
+            }
+        }
+    }
+}

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

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

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

@@ -36,6 +36,7 @@ namespace YooAsset.Editor
                     new TaskCreateReport_BBP(),
                     new TaskCreatePackage_BBP(),
                     new TaskCopyBuildinFiles_BBP(),
+                    new TaskCreateCatalog_BBP()
                 };
             return pipeline;
         }

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

@@ -0,0 +1,20 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog_RFBP : TaskCreateCatalog, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            {
+                CreateCatalogFile(buildParametersContext);
+            }
+        }
+    }
+}

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

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

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

@@ -38,6 +38,7 @@ namespace YooAsset.Editor
                     new TaskCreateReport_RFBP(),
                     new TaskCreatePackage_RFBP(),
                     new TaskCopyBuildinFiles_RFBP(),
+                    new TaskCreateCatalog_RFBP()
                 };
             return pipeline;
         }

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

@@ -0,0 +1,20 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+    public class TaskCreateCatalog_SBP : TaskCreateCatalog, IBuildTask
+    {
+        void IBuildTask.Run(BuildContext context)
+        {
+            var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            {
+                CreateCatalogFile(buildParametersContext);
+            }
+        }
+    }
+}

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

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

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/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildPipeline.cs

@@ -36,6 +36,7 @@ namespace YooAsset.Editor
                     new TaskCreateReport_SBP(),
                     new TaskCreatePackage_SBP(),
                     new TaskCopyBuildinFiles_SBP(),
+                    new TaskCreateCatalog_SBP()
                 };
             return pipeline;
         }

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/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

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

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

@@ -12,190 +12,35 @@ namespace YooAsset.Editor
 {
     internal abstract class BuildPipelineViewerBase
     {
-        private const int StyleWidth = 400;
-        private const int LabelMinWidth = 180;
+        protected const int StyleWidth = 400;
+        protected const int LabelMinWidth = 190;
 
-        protected readonly string PackageName;
-        protected readonly BuildTarget BuildTarget;
-        protected readonly EBuildPipeline BuildPipeline;
-        protected TemplateContainer Root;
+        protected string PackageName { private set; get; }
+        protected string PipelineName { private set; get; }
+        protected BuildTarget BuildTarget { private set; get; }
 
-        private TextField _buildOutputField;
-        private TextField _buildVersionField;
-        private PopupField<Enum> _buildModeField;
-        private PopupField<Type> _encryptionField;
-        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)
+        /// <summary>
+        /// 初始化视图
+        /// </summary>
+        public void InitView(string packageName, string pipelineName, BuildTarget buildTarget)
         {
             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>
@@ -203,7 +48,7 @@ namespace YooAsset.Editor
         /// </summary>
         protected IEncryptionServices CreateEncryptionInstance()
         {
-            var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, BuildPipeline);
+            var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, PipelineName);
             var encryptionClassTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
             var classType = encryptionClassTypes.Find(x => x.FullName.Equals(encyptionClassName));
             if (classType != null)
@@ -212,11 +57,130 @@ namespace YooAsset.Editor
                 return null;
         }
 
-        private string GetDefaultPackageVersion()
+        #region UI元素通用处理方法
+        protected void SetBuildOutputField(TextField textField)
         {
-            int totalMinutes = DateTime.Now.Hour * 60 + DateTime.Now.Minute;
-            return DateTime.Now.ToString("yyyy-MM-dd") + "-" + totalMinutes;
+            // 输出目录
+            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);
+
+                // 设置内置资源标签显隐
+                bool tagsFiledVisible = buildinFileCopyOption == EBuildinFileCopyOption.ClearAndCopyByTags || buildinFileCopyOption == EBuildinFileCopyOption.OnlyCopyByTags;
+                tagField.visible = tagsFiledVisible;
+            });
+            UIElementsTools.SetElementLabelMinWidth(enumField, LabelMinWidth);
+        }
+        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> CreateEncryptionField(VisualElement container)
+        {
+            // 加密方法
+            var encryptionClassTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
+            if (encryptionClassTypes.Count > 0)
+            {
+                var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, PipelineName);
+                int defaultIndex = encryptionClassTypes.FindIndex(x => x.FullName.Equals(encyptionClassName));
+                if (defaultIndex < 0)
+                    defaultIndex = 0;
+                var encryptionField = new PopupField<Type>(encryptionClassTypes, defaultIndex);
+                encryptionField.label = "Encryption";
+                encryptionField.style.width = StyleWidth;
+                encryptionField.RegisterValueChangedCallback(evt =>
+                {
+                    AssetBundleBuilderSetting.SetPackageEncyptionClassName(PackageName, PipelineName, encryptionField.value.FullName);
+                });
+                container.Add(encryptionField);
+                UIElementsTools.SetElementLabelMinWidth(encryptionField, LabelMinWidth);
+                return encryptionField;
+            }
+            else
+            {
+                var encryptionField = new PopupField<Type>();
+                encryptionField.label = "Encryption";
+                encryptionField.style.width = StyleWidth;
+                container.Add(encryptionField);
+                UIElementsTools.SetElementLabelMinWidth(encryptionField, LabelMinWidth);
+                return encryptionField;
+            }
+        }
+        #endregion
     }
 }
 #endif

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

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

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

@@ -0,0 +1,128 @@
+#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> _encryptionField;
+        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 encryptionContainer = Root.Q("EncryptionContainer");
+            _encryptionField = CreateEncryptionField(encryptionContainer);
+
+            // 压缩方式选项
+            _compressionField = Root.Q<EnumField>("Compression");
+            SetCompressionField(_compressionField);
+
+            // 输出文件名称样式
+            _outputNameStyleField = Root.Q<EnumField>("FileNameStyle");
+            SetOutputNameStyleField(_outputNameStyleField);
+
+            // 首包文件拷贝参数
+            _copyBuildinFileTagsField = Root.Q<TextField>("CopyBuildinFileParam");
+            SetCopyBuildinFileTagsField(_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 = CreateEncryptionInstance();
+
+            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.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

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

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

@@ -0,0 +1,86 @@
+#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;
+            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/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,120 @@
+#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> _encryptionField;
+        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 encryptionContainer = Root.Q("EncryptionContainer");
+            _encryptionField = CreateEncryptionField(encryptionContainer);
+
+            // 输出文件名称样式
+            _outputNameStyleField = Root.Q<EnumField>("FileNameStyle");
+            SetOutputNameStyleField(_outputNameStyleField);
+
+            // 首包文件拷贝参数
+            _copyBuildinFileTagsField = Root.Q<TextField>("CopyBuildinFileParam");
+            SetCopyBuildinFileTagsField(_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 = CreateEncryptionInstance();
+
+            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="EncryptionContainer" style="height: 24px;" />
+        <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,141 @@
+#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> _encryptionField;
+        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 encryptionContainer = Root.Q("EncryptionContainer");
+            _encryptionField = CreateEncryptionField(encryptionContainer);
+
+            // 压缩方式选项
+            _compressionField = Root.Q<EnumField>("Compression");
+            SetCompressionField(_compressionField);
+
+            // 输出文件名称样式
+            _outputNameStyleField = Root.Q<EnumField>("FileNameStyle");
+            SetOutputNameStyleField(_outputNameStyleField);
+
+            // 首包文件拷贝参数
+            _copyBuildinFileTagsField = Root.Q<TextField>("CopyBuildinFileParam");
+            SetCopyBuildinFileTagsField(_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 = CreateEncryptionInstance();
+
+            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="EncryptionContainer" style="height: 24px;" />
+        <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> temper = EditorTools.StringToStringList(AssetTags, ';');
-            tags.AddRange(temper);
-            return tags;
+            List<string> result = EditorTools.StringToStringList(AssetTags, ';');
+            if (CollectorType == ECollectorType.MainAssetCollector)
+            {
+                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/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);
@@ -183,16 +187,30 @@ namespace YooAsset.Editor
             }
 
             var result = new HashSet<string> { assetPath };
-            CollectDependencies(assetPath, result, recursive);
+            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 +231,7 @@ namespace YooAsset.Editor
 
                 // 递归收集依赖
                 if (recursive)
-                    CollectDependencies(dependAssetPath, result, recursive);
+                    CollectDependencies(assetPath, dependAssetPath, result, recursive);
             }
         }
 

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

@@ -10,7 +10,7 @@ namespace YooAsset.Editor
         /// <summary>
         /// 忽略的文件类型
         /// </summary>
-        public readonly static HashSet<string> IgnoreFileExtensions = new HashSet<string>() { "", ".so", ".dll", ".cs", ".js", ".boo", ".meta", ".cginc", ".hlsl" };
+        public readonly static HashSet<string> IgnoreFileExtensions = new HashSet<string>() { "", ".so", ".cs", ".js", ".boo", ".meta", ".cginc", ".hlsl" };
     }
 
     /// <summary>

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/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>(mainBundle.DependBundles.Count);
-            foreach (string dependBundleName in mainBundle.DependBundles)
+            var sourceDatas = new List<ITableData>(assetInfo.DependBundles.Count);
+            foreach (string dependBundleName in assetInfo.DependBundles)
             {
                 var dependBundle = _buildReport.GetBundleInfo(dependBundleName);
                 var rowData = new DependTableData();

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/Runtime/Assembly/AssemblyInfo.cs

@@ -1,7 +1,11 @@
 using System.Runtime.CompilerServices;
 
+// 内部友元
 [assembly: InternalsVisibleTo("YooAsset.Editor")]
-[assembly: InternalsVisibleTo("YooAsset.EditorExtension")]
-[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/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

@@ -37,7 +37,9 @@ namespace YooAsset
             string url;
 
             // 获取对应平台的URL地址
-#if UNITY_EDITOR
+#if UNITY_EDITOR_OSX
+            url = StringUtility.Format("file://{0}", path);
+#elif UNITY_EDITOR
             url = StringUtility.Format("file:///{0}", path);
 #elif UNITY_WEBGL
             url = path;
@@ -65,7 +67,9 @@ namespace YooAsset
             }
 #elif UNITY_STANDALONE_OSX
             url = new System.Uri(path).ToString();
-#elif UNITY_STANDALONE
+#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();

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

@@ -0,0 +1,21 @@
+
+namespace YooAsset
+{
+    internal class CatalogDefine
+    {
+        /// <summary>
+        /// 文件极限大小（100MB）
+        /// </summary>
+        public const int FileMaxSize = 104857600;
+
+        /// <summary>
+        /// 文件头标记
+        /// </summary>
+        public const uint FileSign = 0x133C5EE;
+
+        /// <summary>
+        /// 文件格式版本
+        /// </summary>
+        public const string FileVersion = "1.0.0";
+    }
+}

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

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

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

@@ -0,0 +1,102 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace YooAsset
+{
+    internal static class CatalogTools
+    {
+        /// <summary>
+        /// 序列化（JSON文件）
+        /// </summary>
+        public static void SerializeToJson(string savePath, DefaultBuildinFileCatalog catalog)
+        {
+            string json = JsonUtility.ToJson(catalog, true);
+            FileUtility.WriteAllText(savePath, json);
+        }
+
+        /// <summary>
+        /// 反序列化（JSON文件）
+        /// </summary>
+        public static DefaultBuildinFileCatalog DeserializeFromJson(string jsonContent)
+        {
+            return JsonUtility.FromJson<DefaultBuildinFileCatalog>(jsonContent);
+        }
+
+        /// <summary>
+        /// 序列化（二进制文件）
+        /// </summary>
+        public static void SerializeToBinary(string savePath, DefaultBuildinFileCatalog catalog)
+        {
+            using (FileStream fs = new FileStream(savePath, FileMode.Create))
+            {
+                // 创建缓存器
+                BufferWriter buffer = new BufferWriter(CatalogDefine.FileMaxSize);
+
+                // 写入文件标记
+                buffer.WriteUInt32(CatalogDefine.FileSign);
+
+                // 写入文件版本
+                buffer.WriteUTF8(CatalogDefine.FileVersion);
+
+                // 写入文件头信息
+                buffer.WriteUTF8(catalog.PackageName);
+                buffer.WriteUTF8(catalog.PackageVersion);
+
+                // 写入资源包列表
+                buffer.WriteInt32(catalog.Wrappers.Count);
+                for (int i = 0; i < catalog.Wrappers.Count; i++)
+                {
+                    var fileWrapper = catalog.Wrappers[i];
+                    buffer.WriteUTF8(fileWrapper.BundleGUID);
+                    buffer.WriteUTF8(fileWrapper.FileName);
+                }
+
+                // 写入文件流
+                buffer.WriteToStream(fs);
+                fs.Flush();
+            }
+        }
+
+        /// <summary>
+        /// 反序列化（二进制文件）
+        /// </summary>
+        public static DefaultBuildinFileCatalog DeserializeFromBinary(byte[] binaryData)
+        {
+            // 创建缓存器
+            BufferReader buffer = new BufferReader(binaryData);
+
+            // 读取文件标记
+            uint fileSign = buffer.ReadUInt32();
+            if (fileSign != CatalogDefine.FileSign)
+                throw new Exception("Invalid catalog file !");
+
+            // 读取文件版本
+            string fileVersion = buffer.ReadUTF8();
+            if (fileVersion != CatalogDefine.FileVersion)
+                throw new Exception($"The catalog file version are not compatible : {fileVersion} != {CatalogDefine.FileVersion}");
+
+            DefaultBuildinFileCatalog catalog = new DefaultBuildinFileCatalog();
+            {
+                // 读取文件头信息
+                catalog.FileVersion = fileVersion;
+                catalog.PackageName = buffer.ReadUTF8();
+                catalog.PackageVersion = buffer.ReadUTF8();
+
+                // 读取资源包列表
+                int fileCount = buffer.ReadInt32();
+                catalog.Wrappers = new List<DefaultBuildinFileCatalog.FileWrapper>(fileCount);
+                for (int i = 0; i < fileCount; i++)
+                {
+                    var fileWrapper = new DefaultBuildinFileCatalog.FileWrapper();
+                    fileWrapper.BundleGUID = buffer.ReadUTF8();
+                    fileWrapper.FileName = buffer.ReadUTF8();
+                    catalog.Wrappers.Add(fileWrapper);
+                }
+            }
+
+            return catalog;
+        }
+    }
+}

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

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

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

@@ -1,27 +1,27 @@
 using System;
+using System.IO;
 using System.Collections.Generic;
-using UnityEngine;
 
 namespace YooAsset
 {
     /// <summary>
     /// 内置资源清单目录
     /// </summary>
-    internal class DefaultBuildinFileCatalog : ScriptableObject
+    [Serializable]
+    internal class DefaultBuildinFileCatalog
     {
         [Serializable]
         public class FileWrapper
         {
             public string BundleGUID;
             public string FileName;
-
-            public FileWrapper(string bundleGUID, string fileName)
-            {
-                BundleGUID = bundleGUID;
-                FileName = fileName;
-            }
         }
 
+        /// <summary>
+        /// 文件版本
+        /// </summary>
+        public string FileVersion;
+
         /// <summary>
         /// 包裹名称
         /// </summary>

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

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

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

@@ -17,10 +17,6 @@ namespace YooAsset
         {
             YooLogger.Log("Begin to create catalog file !");
 
-            string savePath = YooAssetSettingsData.GetYooResourcesFullPath();
-            if (UnityEditor.AssetDatabase.DeleteAsset(savePath))
-                UnityEditor.AssetDatabase.Refresh();
-
             string rootPath = YooAssetSettingsData.GetYooDefaultBuildinRoot();
             DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
             if (rootDirectory.Exists == false)
@@ -87,10 +83,25 @@ namespace YooAsset
             }
 
             // 创建内置清单实例
-            var buildinFileCatalog = ScriptableObject.CreateInstance<DefaultBuildinFileCatalog>();
+            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();
@@ -99,23 +110,15 @@ namespace YooAsset
                 if (fileInfo.Extension == ".meta")
                     continue;
 
-                if (fileInfo.Name == "link.xml" || fileInfo.Name == "buildlogtep.json")
-                    continue;
-                if (fileInfo.Name == $"{packageName}.version")
-                    continue;
-                if (fileInfo.Name == $"{packageName}_{packageVersion}.bytes")
-                    continue;
-                if (fileInfo.Name == $"{packageName}_{packageVersion}.hash")
-                    continue;
-                if (fileInfo.Name == $"{packageName}_{packageVersion}.json")
-                    continue;
-                if (fileInfo.Name == $"{packageName}_{packageVersion}.report")
+                if (whiteFileList.Contains(fileInfo.Name))
                     continue;
 
                 string fileName = fileInfo.Name;
                 if (fileMapping.TryGetValue(fileName, out string bundleGUID))
                 {
-                    var wrapper = new DefaultBuildinFileCatalog.FileWrapper(bundleGUID, fileName);
+                    var wrapper = new DefaultBuildinFileCatalog.FileWrapper();
+                    wrapper.BundleGUID = bundleGUID;
+                    wrapper.FileName = fileName;
                     buildinFileCatalog.Wrappers.Add(wrapper);
                 }
                 else
@@ -124,21 +127,20 @@ namespace YooAsset
                 }
             }
 
-            // 创建输出目录
-            string fullPath = YooAssetSettingsData.GetYooResourcesFullPath();
-            string saveFilePath = $"{fullPath}/{packageName}/{DefaultBuildinFileSystemDefine.BuildinCatalogFileName}";
-            FileUtility.CreateFileDirectory(saveFilePath);
+            // 创建输出文件
+            string jsonFilePath = $"{pacakgeDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName}";
+            if (File.Exists(jsonFilePath))
+                File.Delete(jsonFilePath);
+            CatalogTools.SerializeToJson(jsonFilePath, buildinFileCatalog);
 
             // 创建输出文件
-            UnityEditor.AssetDatabase.CreateAsset(buildinFileCatalog, saveFilePath);
-            UnityEditor.EditorUtility.SetDirty(buildinFileCatalog);
-#if UNITY_2019
-            UnityEditor.AssetDatabase.SaveAssets();
-#else
-            UnityEditor.AssetDatabase.SaveAssetIfDirty(buildinFileCatalog);
-#endif
+            string binaryFilePath = $"{pacakgeDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName}";
+            if (File.Exists(binaryFilePath))
+                File.Delete(binaryFilePath);
+            CatalogTools.SerializeToBinary(binaryFilePath, buildinFileCatalog);
 
-            Debug.Log($"Succeed to save buildin file catalog : {saveFilePath}");
+            UnityEditor.AssetDatabase.Refresh();
+            Debug.Log($"Succeed to save buildin file catalog : {binaryFilePath}");
             return true;
         }
     }

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

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

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

@@ -1,4 +1,4 @@
-using UnityEngine;
+using System;
 
 namespace YooAsset
 {
@@ -7,56 +7,84 @@ namespace YooAsset
         private enum ESteps
         {
             None,
+            RequestData,
             LoadCatalog,
             Done,
         }
 
         private readonly DefaultBuildinFileSystem _fileSystem;
+        private UnityWebDataRequestOperation _webDataRequestOp;
         private ESteps _steps = ESteps.None;
 
-
         internal LoadBuildinCatalogFileOperation(DefaultBuildinFileSystem fileSystem)
         {
             _fileSystem = fileSystem;
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.LoadCatalog;
+            _steps = ESteps.RequestData;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.RequestData)
+            {
+                if (_webDataRequestOp == null)
+                {
+                    string filePath = _fileSystem.GetCatalogBinaryFileLoadPath();
+                    string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
+                    _webDataRequestOp = new UnityWebDataRequestOperation(url);
+                    _webDataRequestOp.StartOperation();
+                    AddChildOperation(_webDataRequestOp);
+                }
+
+                _webDataRequestOp.UpdateOperation();
+                if (_webDataRequestOp.IsDone == false)
+                    return;
+
+                if (_webDataRequestOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.LoadCatalog;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _webDataRequestOp.Error;
+                }
+            }
+
             if (_steps == ESteps.LoadCatalog)
             {
-                string catalogFilePath = _fileSystem.GetCatalogFileLoadPath();
-                var catalog = Resources.Load<DefaultBuildinFileCatalog>(catalogFilePath);
-                if (catalog == null)
+                try
+                {
+                    var catalog = CatalogTools.DeserializeFromBinary(_webDataRequestOp.Result);
+                    if (catalog.PackageName != _fileSystem.PackageName)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"Catalog file package name {catalog.PackageName} cannot match the file system package name {_fileSystem.PackageName}";
+                        return;
+                    }
+
+                    foreach (var wrapper in catalog.Wrappers)
+                    {
+                        var fileWrapper = new DefaultBuildinFileSystem.FileWrapper(wrapper.FileName);
+                        _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
+                    }
+
+                    YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}");
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                catch (Exception e)
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = $"Failed to load catalog file : {catalogFilePath}";
-                    return;
+                    Error = $"Failed to load catalog file : {e.Message}";
                 }
-
-                if (catalog.PackageName != _fileSystem.PackageName)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = $"Catalog file package name {catalog.PackageName} cannot match the file system package name {_fileSystem.PackageName}";
-                    return;
-                }
-
-                foreach (var wrapper in catalog.Wrappers)
-                {
-                    var fileWrapper = new DefaultBuildinFileSystem.FileWrapper(wrapper.FileName);
-                    _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
-                }
-
-                YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}");
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Succeed;
             }
         }
     }

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

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

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

@@ -65,6 +65,11 @@ namespace YooAsset
         /// </summary>
         public EFileVerifyLevel FileVerifyLevel { private set; get; } = EFileVerifyLevel.Middle;
 
+        /// <summary>
+        /// 自定义参数：覆盖安装缓存清理模式
+        /// </summary>
+        public EOverwriteInstallClearMode InstallClearMode { private set; get; } = EOverwriteInstallClearMode.ClearAllManifestFiles;
+
         /// <summary>
         /// 自定义参数：数据文件追加文件格式
         /// </summary>
@@ -115,43 +120,43 @@ 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);
+            var downloader = DownloadCenter.DownloadFileAsync(bundle, options);
             downloader.Reference(); //增加下载器的引用计数
 
             // 注意：将下载器进行包裹，可以避免父类任务终止的时候，连带子任务里的下载器也一起被终止！
@@ -188,6 +193,10 @@ namespace YooAsset
             {
                 FileVerifyLevel = (EFileVerifyLevel)value;
             }
+            else if (name == FileSystemParametersDefine.INSTALL_CLEAR_MODE)
+            {
+                InstallClearMode = (EOverwriteInstallClearMode)value;
+            }
             else if (name == FileSystemParametersDefine.APPEND_FILE_EXTENSION)
             {
                 AppendFileExtension = Convert.ToBoolean(value);
@@ -227,8 +236,8 @@ namespace YooAsset
                 _packageRoot = packageRoot;
 
             _cacheBundleFilesRoot = PathUtility.Combine(_packageRoot, DefaultCacheFileSystemDefine.BundleFilesFolderName);
-            _tempFilesRoot = PathUtility.Combine(_packageRoot, DefaultCacheFileSystemDefine.TempFilesFolderName);
             _cacheManifestFilesRoot = PathUtility.Combine(_packageRoot, DefaultCacheFileSystemDefine.ManifestFilesFolderName);
+            _tempFilesRoot = PathUtility.Combine(_packageRoot, DefaultCacheFileSystemDefine.TempFilesFolderName);
         }
         public virtual void OnDestroy()
         {
@@ -333,6 +342,13 @@ namespace YooAsset
         {
             return _records.Keys.ToList();
         }
+        public RecordFileElement GetRecordFileElement(PackageBundle bundle)
+        {
+            if (_records.TryGetValue(bundle.BundleGUID, out RecordFileElement element))
+                return element;
+            else
+                return null;
+        }
 
         public string GetTempFilePath(PackageBundle bundle)
         {
@@ -384,10 +400,10 @@ namespace YooAsset
 
         public EFileVerifyResult VerifyCacheFile(PackageBundle bundle)
         {
-            if (_records.TryGetValue(bundle.BundleGUID, out RecordFileElement wrapper) == false)
+            if (_records.TryGetValue(bundle.BundleGUID, out RecordFileElement element) == false)
                 return EFileVerifyResult.CacheNotFound;
 
-            EFileVerifyResult result = FileVerifyHelper.FileVerify(wrapper.DataFilePath, wrapper.DataFileSize, wrapper.DataFileCRC, EFileVerifyLevel.High);
+            EFileVerifyResult result = FileVerifyHelper.FileVerify(element.DataFilePath, element.DataFileSize, element.DataFileCRC, EFileVerifyLevel.High);
             return result;
         }
         public bool WriteCacheBundleFile(PackageBundle bundle, string copyPath)
@@ -427,22 +443,10 @@ namespace YooAsset
         }
         public bool DeleteCacheBundleFile(string bundleGUID)
         {
-            if (_records.TryGetValue(bundleGUID, out RecordFileElement wrapper))
+            if (_records.TryGetValue(bundleGUID, out RecordFileElement element))
             {
-                try
-                {
-                    string dataFilePath = wrapper.DataFilePath;
-                    FileInfo fileInfo = new FileInfo(dataFilePath);
-                    if (fileInfo.Exists)
-                        fileInfo.Directory.Delete(true);
-                    _records.Remove(bundleGUID);
-                    return true;
-                }
-                catch (Exception e)
-                {
-                    YooLogger.Error($"Failed to delete cache file ! {e.Message}");
-                    return false;
-                }
+                _records.Remove(bundleGUID);
+                return element.DeleteFolder();
             }
             else
             {
@@ -505,7 +509,18 @@ namespace YooAsset
         }
 
         /// <summary>
-        /// 删除所有清单文件
+        /// 删除所有缓存的资源文件
+        /// </summary>
+        public void DeleteAllBundleFiles()
+        {
+            if (Directory.Exists(_cacheBundleFilesRoot))
+            {
+                Directory.Delete(_cacheBundleFilesRoot, true);
+            }
+        }
+
+        /// <summary>
+        /// 删除所有缓存的清单文件
         /// </summary>
         public void DeleteAllManifestFiles()
         {
@@ -544,6 +559,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/EOverwriteInstallClearMode.cs

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

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

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

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

@@ -1,4 +1,6 @@
-
+using System;
+using System.IO;
+
 namespace YooAsset
 {
     internal class RecordFileElement
@@ -7,7 +9,7 @@ namespace YooAsset
         public string DataFilePath { private set; get; }
         public string DataFileCRC { private set; get; }
         public long DataFileSize { private set; get; }
-        
+
         public RecordFileElement(string infoFilePath, string dataFilePath, string dataFileCRC, long dataFileSize)
         {
             InfoFilePath = infoFilePath;
@@ -15,5 +17,31 @@ namespace YooAsset
             DataFileCRC = dataFileCRC;
             DataFileSize = dataFileSize;
         }
+
+        /// <summary>
+        /// 删除记录文件
+        /// </summary>
+        public bool DeleteFolder()
+        {
+            try
+            {
+                string directory = Path.GetDirectoryName(InfoFilePath);
+                DirectoryInfo directoryInfo = new DirectoryInfo(directory);
+                if (directoryInfo.Exists)
+                {
+                    directoryInfo.Delete(true);
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            catch (Exception e)
+            {
+                YooLogger.Error($"Failed to delete cache file ! {e.Message}");
+                return false;
+            }
+        }
     }
 }

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

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

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

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using UnityEngine;
 
 namespace YooAsset
@@ -57,8 +58,8 @@ namespace YooAsset
                 // 注意：边玩边下下载器引用计数没有Release
                 if (_downloadFileOp == null)
                 {
-                    DownloadParam downloadParam = new DownloadParam(int.MaxValue, 60);
-                    _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, downloadParam);
+                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue, 60);
+                    _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, options);
                     _downloadFileOp.StartOperation();
                     AddChildOperation(_downloadFileOp);
                 }
@@ -163,11 +164,23 @@ namespace YooAsset
                 {
                     if (_bundle.Encrypted)
                     {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Failed to load encrypted asset bundle file : {_bundle.BundleName}";
-                        YooLogger.Error(Error);
-                        return;
+                        var decryptResult = _fileSystem.LoadEncryptedAssetBundleFallback(_bundle);
+                        _assetBundle = decryptResult.Result;
+                        if (_assetBundle != null)
+                        {
+                            _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;
+                        }
                     }
 
                     // 注意：在安卓移动平台，华为和三星真机上有极小概率加载资源包失败。
@@ -260,9 +273,30 @@ namespace YooAsset
             {
                 if (_fileSystem.Exists(_bundle))
                 {
-                    DownloadProgress = 1f;
-                    DownloadedBytes = _bundle.FileSize;
-                    _steps = ESteps.LoadCacheRawBundle;
+                    // 注意：缓存的原生文件的格式，可能会在业务端根据需求发生变动！
+                    // 注意：这里需要校验文件格式，如果不一致对本地文件进行修正！
+                    string filePath = _fileSystem.GetCacheBundleFileLoadPath(_bundle);
+                    if (File.Exists(filePath) == false)
+                    {
+                        try
+                        {
+                            var recordFileElement = _fileSystem.GetRecordFileElement(_bundle);
+                            File.Move(recordFileElement.DataFilePath, filePath);
+                            _steps = ESteps.LoadCacheRawBundle;
+                        }
+                        catch (Exception e)
+                        {
+                            _steps = ESteps.Done;
+                            Status = EOperationStatus.Failed;
+                            Error = $"Faild rename raw data file : {e.Message}";
+                        }
+                    }
+                    else
+                    {
+                        DownloadProgress = 1f;
+                        DownloadedBytes = _bundle.FileSize;
+                        _steps = ESteps.LoadCacheRawBundle;
+                    }
                 }
                 else
                 {
@@ -275,8 +309,8 @@ namespace YooAsset
                 // 注意：边玩边下下载器引用计数没有Release
                 if (_downloadFileOp == null)
                 {
-                    DownloadParam downloadParam = new DownloadParam(int.MaxValue, 60);
-                    _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, downloadParam);
+                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue, 60);
+                    _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, options);
                     _downloadFileOp.StartOperation();
                     AddChildOperation(_downloadFileOp);
                 }

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

@@ -7,9 +7,10 @@ namespace YooAsset
         private enum ESteps
         {
             None,
+            CheckManifest,
             CheckArgs,
-            GetTagsCacheFiles,
-            ClearTagsCacheFiles,
+            GetClearCacheFiles,
+            ClearFilterCacheFiles,
             Done,
         }
 
@@ -29,13 +30,27 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.CheckArgs;
+            _steps = ESteps.CheckManifest;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.CheckManifest)
+            {
+                if (_manifest == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Can not found active package manifest !";
+                }
+                else
+                {
+                    _steps = ESteps.CheckArgs;
+                }
+            }
+
             if (_steps == ESteps.CheckArgs)
             {
                 if (_clearParam == null)
@@ -67,17 +82,17 @@ namespace YooAsset
                     return;
                 }
 
-                _steps = ESteps.GetTagsCacheFiles;
+                _steps = ESteps.GetClearCacheFiles;
             }
 
-            if (_steps == ESteps.GetTagsCacheFiles)
+            if (_steps == ESteps.GetClearCacheFiles)
             {
-                _clearBundleGUIDs = GetTagsBundleGUIDs();
+                _clearBundleGUIDs = GetBundleGUIDsByTag();
                 _clearFileTotalCount = _clearBundleGUIDs.Count;
-                _steps = ESteps.ClearTagsCacheFiles;
+                _steps = ESteps.ClearFilterCacheFiles;
             }
 
-            if (_steps == ESteps.ClearTagsCacheFiles)
+            if (_steps == ESteps.ClearFilterCacheFiles)
             {
                 for (int i = _clearBundleGUIDs.Count - 1; i >= 0; i--)
                 {
@@ -100,7 +115,7 @@ namespace YooAsset
                 }
             }
         }
-        private List<string> GetTagsBundleGUIDs()
+        private List<string> GetBundleGUIDsByTag()
         {
             var allBundleGUIDs = _fileSystem.GetAllCachedBundleGUIDs();
             List<string> result = new List<string>(allBundleGUIDs.Count);

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

@@ -8,6 +8,7 @@ namespace YooAsset
         private enum ESteps
         {
             None,
+            CheckManifest,
             GetUnusedCacheFiles,
             ClearUnusedCacheFiles,
             Done,
@@ -19,7 +20,7 @@ namespace YooAsset
         private int _unusedFileTotalCount = 0;
         private ESteps _steps = ESteps.None;
 
-        
+
         internal ClearUnusedCacheBundleFilesOperation(DefaultCacheFileSystem fileSystem, PackageManifest manifest)
         {
             _fileSystem = fileSystem;
@@ -27,15 +28,29 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.GetUnusedCacheFiles;
+            _steps = ESteps.CheckManifest;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.CheckManifest)
+            {
+                if (_manifest == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Can not found active package manifest !";
+                }
+                else
+                {
+                    _steps = ESteps.GetUnusedCacheFiles;
+                }
+            }
+
             if (_steps == ESteps.GetUnusedCacheFiles)
-            {    
+            {
                 _unusedBundleGUIDs = GetUnusedBundleGUIDs();
                 _unusedFileTotalCount = _unusedBundleGUIDs.Count;
                 _steps = ESteps.ClearUnusedCacheFiles;

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

@@ -8,6 +8,7 @@ namespace YooAsset
         private enum ESteps
         {
             None,
+            CheckManifest,
             ClearUnusedCacheFiles,
             Done,
         }
@@ -24,13 +25,27 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.ClearUnusedCacheFiles;
+            _steps = ESteps.CheckManifest;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.CheckManifest)
+            {
+                if (_manifest == null)
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = "Can not found active package manifest !";
+                }
+                else
+                {
+                    _steps = ESteps.ClearUnusedCacheFiles;
+                }
+            }
+
             if (_steps == ESteps.ClearUnusedCacheFiles)
             {
                 try

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

@@ -74,7 +74,7 @@ namespace YooAsset
         /// <summary>
         /// 创建下载任务
         /// </summary>
-        public FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadParam param)
+        public FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
         {
             // 查询旧的下载器
             if (_downloaders.TryGetValue(bundle.BundleGUID, out var oldDownloader))
@@ -83,29 +83,29 @@ namespace YooAsset
             }
 
             // 设置请求URL
-            if (string.IsNullOrEmpty(param.ImportFilePath))
+            if (string.IsNullOrEmpty(options.ImportFilePath))
             {
-                param.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(bundle.FileName);
-                param.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(bundle.FileName);
+                options.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(bundle.FileName);
+                options.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(bundle.FileName);
             }
             else
             {
                 // 注意：把本地文件路径指定为远端下载地址
-                param.MainURL = DownloadSystemHelper.ConvertToWWWPath(param.ImportFilePath);
-                param.FallbackURL = param.MainURL;
+                options.MainURL = DownloadSystemHelper.ConvertToWWWPath(options.ImportFilePath);
+                options.FallbackURL = options.MainURL;
             }
 
             // 创建新的下载器
             DefaultDownloadFileOperation newDownloader;
             if (bundle.FileSize >= _fileSystem.ResumeDownloadMinimumSize)
             {
-                newDownloader = new DownloadResumeFileOperation(_fileSystem, bundle, param);
+                newDownloader = new DownloadResumeFileOperation(_fileSystem, bundle, options);
                 AddChildOperation(newDownloader);
                 _downloaders.Add(bundle.BundleGUID, newDownloader);
             }
             else
             {
-                newDownloader = new DownloadNormalFileOperation(_fileSystem, bundle, param);
+                newDownloader = new DownloadNormalFileOperation(_fileSystem, bundle, options);
                 AddChildOperation(newDownloader);
                 _downloaders.Add(bundle.BundleGUID, newDownloader);
             }

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

@@ -12,13 +12,13 @@ namespace YooAsset
         private string _tempFilePath;
         private ESteps _steps = ESteps.None;
 
-        internal DownloadNormalFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, DownloadParam param) : base(bundle, param)
+        internal DownloadNormalFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, DownloadFileOptions options) : base(bundle, options)
         {
             _fileSystem = fileSystem;
         }
         internal override void InternalStart()
         {
-            _isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Param.MainURL);
+            _isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Options.MainURL);
             _tempFilePath = _fileSystem.GetTempFilePath(Bundle);
             _steps = ESteps.CheckExists;
         }

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

@@ -15,13 +15,13 @@ namespace YooAsset
         private ESteps _steps = ESteps.None;
 
 
-        internal DownloadResumeFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, DownloadParam param) : base(bundle, param)
+        internal DownloadResumeFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, DownloadFileOptions options) : base(bundle, options)
         {
             _fileSystem = fileSystem;
         }
         internal override void InternalStart()
         {
-            _isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Param.MainURL);
+            _isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Options.MainURL);
             _tempFilePath = _fileSystem.GetTempFilePath(Bundle);
             _steps = ESteps.CheckExists;
         }

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

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

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

@@ -85,15 +85,17 @@ namespace YooAsset
 
                     // 创建验证元素类
                     string fileRootPath = chidDirectory.FullName;
-                    string dataFilePath = $"{fileRootPath}/{ DefaultCacheFileSystemDefine.BundleDataFileName}";
-                    string infoFilePath = $"{fileRootPath}/{ DefaultCacheFileSystemDefine.BundleInfoFileName}";
+                    string dataFilePath = $"{fileRootPath}/{DefaultCacheFileSystemDefine.BundleDataFileName}";
+                    string infoFilePath = $"{fileRootPath}/{DefaultCacheFileSystemDefine.BundleInfoFileName}";
 
                     // 存储的数据文件追加文件格式
                     if (_fileSystem.AppendFileExtension)
                     {
                         string dataFileExtension = FindDataFileExtension(chidDirectory);
                         if (string.IsNullOrEmpty(dataFileExtension) == false)
+                        {
                             dataFilePath += dataFileExtension;
+                        }
                     }
 
                     var element = new VerifyFileElement(_fileSystem.PackageName, bundleGUID, fileRootPath, dataFilePath, infoFilePath);