Merge 0b4f6d6639 into 4d2df5b705

.gitignore

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

Assets/YooAsset/CHANGELOG.md

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

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

Assets/YooAsset/Editor/Assembly/MacroDefine.cs

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

Assets/YooAsset/Editor/Assembly/MacroProcessor.cs

@@ -5,7 +5,6 @@ using System.Text;
 using System.Xml;
 using UnityEditor;
 
-#if YOO_MACRO_SUPPORT
 namespace YooAsset.Editor
 {
     [InitializeOnLoad]
@@ -23,21 +22,13 @@ namespace YooAsset.Editor
                 return content;
 
             // 将修改后的XML结构重新输出为文本
-            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());
-            }
+            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();
         }
 
         /// <summary>
@@ -103,4 +94,3 @@ namespace YooAsset.Editor
         }
     }
 }
-#endif

Assets/YooAsset/Editor/Assembly/RspGenerator.cs

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

Assets/YooAsset/Editor/AssetArtReporter/AssetArtReporterWindow.cs

@@ -196,32 +196,6 @@ 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");
@@ -261,14 +235,14 @@ namespace YooAsset.Editor
             catch (System.Exception e)
             {
                 _reportCombiner = null;
-                _titleLabel.text = "Failed to import report!";
+                _titleLabel.text = "导入报告失败！";
                 _descLabel.text = e.Message;
                 UnityEngine.Debug.LogError(e.StackTrace);
             }
         }
         private void FixAllBtn_clicked()
         {
-            if (EditorUtility.DisplayDialog("Info", "Fix all resources (excluding whitelist and hidden elements)", "Yes", "No"))
+            if (EditorUtility.DisplayDialog("提示", "修复全部资源（排除白名单和隐藏元素）", "Yes", "No"))
             {
                 if (_reportCombiner != null)
                     _reportCombiner.FixAll();
@@ -276,7 +250,7 @@ namespace YooAsset.Editor
         }
         private void FixSelectBtn_clicked()
         {
-            if (EditorUtility.DisplayDialog("Info", "Fix selected resources (including whitelist and hidden elements)", "Yes", "No"))
+            if (EditorUtility.DisplayDialog("提示", "修复勾选资源（包含白名单和隐藏元素）", "Yes", "No"))
             {
                 if (_reportCombiner != null)
                     _reportCombiner.FixSelect();
@@ -302,7 +276,7 @@ namespace YooAsset.Editor
         }
         private void ExportFilesBtn_clicked()
         {
-            string selectFolderPath = EditorUtility.OpenFolderPanel("Export all selected resources", EditorTools.GetProjectPath(), string.Empty);
+            string selectFolderPath = EditorUtility.OpenFolderPanel("导入所有选中资源", EditorTools.GetProjectPath(), string.Empty);
             if (string.IsNullOrEmpty(selectFolderPath) == false)
             {
                 if (_reportCombiner != null)
@@ -472,31 +446,15 @@ namespace YooAsset.Editor
                 var column = new TableColumn(header.HeaderTitle, header.HeaderTitle, columnStyle);
                 column.MakeCell = () =>
                 {
-                    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;
-                    }
+                    var label = new Label();
+                    label.style.marginLeft = 3f;
+                    label.style.unityTextAlign = TextAnchor.MiddleLeft;
+                    return label;
                 };
                 column.BindCell = (VisualElement element, ITableData data, ITableCell cell) =>
                 {
-                    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();
-                    }
+                    var infoLabel = element as Label;
+                    infoLabel.text = (string)cell.GetDisplayObject();
                 };
                 _elementTableView.AddColumn(column);
             }
@@ -522,10 +480,6 @@ 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,11 +8,6 @@ namespace YooAsset.Editor
         /// </summary>
         AssetPath,
 
-        /// <summary>
-        /// 资源对象
-        /// </summary>
-        AssetObject,
-
         /// <summary>
         /// 字符串
         /// </summary>

Assets/YooAsset/Editor/AssetArtReporter/ReportHeader.cs

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

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

Assets/YooAsset/Editor/AssetArtScanner/AssetArtScannerWindow.cs

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

Assets/YooAsset/Editor/AssetArtScanner/ScannerResult.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

@@ -19,9 +19,7 @@ namespace YooAsset.Editor
         }
 
         private string _buildPackage;
-        private string _buildPipeline;
-
-        private Dictionary<string, Type> _viewClassDic = new Dictionary<string, Type>(10);
+        private EBuildPipeline _buildPipeline;
 
         private Toolbar _toolbar;
         private ToolbarMenu _packageMenu;
@@ -71,29 +69,11 @@ 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);
-                        if (buildPipelineAttribute == null)
-                        {
-                            Debug.LogWarning($"The class {classType.FullName} need attribute {nameof(BuildPipelineAttribute)}");
-                            continue;
-                        }
-
-                        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();
@@ -111,18 +91,28 @@ namespace YooAsset.Editor
 
             _buildPipeline = AssetBundleBuilderSetting.GetPackageBuildPipeline(_buildPackage);
             _packageMenu.text = _buildPackage;
-            _pipelineMenu.text = _buildPipeline;
+            _pipelineMenu.text = _buildPipeline.ToString();
 
-            if (_viewClassDic.TryGetValue(_buildPipeline, out Type value))
+            var buildTarget = EditorUserBuildSettings.activeBuildTarget;
+            if (_buildPipeline == EBuildPipeline.EditorSimulateBuildPipeline)
             {
-                var buildTarget = EditorUserBuildSettings.activeBuildTarget;
-                var viewer = Activator.CreateInstance(value) as BuildPipelineViewerBase;
-                viewer.InitView(_buildPackage, _buildPipeline, buildTarget);
-                viewer.CreateView(_container);
+                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);
             }
             else
             {
-                Debug.LogError($"Not found build pipeline : {_buildPipeline}");
+                throw new System.NotImplementedException(_buildPipeline.ToString());
             }
         }
         private List<string> GetBuildPackageNames()
@@ -155,16 +145,18 @@ namespace YooAsset.Editor
 
         private void PipelineMenuAction(DropdownMenuAction action)
         {
-            if (_buildPipeline != action.name)
+            var pipelineType = (EBuildPipeline)action.userData;
+            if (_buildPipeline != pipelineType)
             {
-                _buildPipeline = action.name;
-                AssetBundleBuilderSetting.SetPackageBuildPipeline(_buildPackage, _buildPipeline);
+                _buildPipeline = pipelineType;
+                AssetBundleBuilderSetting.SetPackageBuildPipeline(_buildPackage, pipelineType);
                 RefreshBuildPipelineView();
             }
         }
         private DropdownMenuAction.Status PipelineMenuFun(DropdownMenuAction action)
         {
-            if (_buildPipeline == action.name)
+            var pipelineType = (EBuildPipeline)action.userData;
+            if (_buildPipeline == pipelineType)
                 return DropdownMenuAction.Status.Checked;
             else
                 return DropdownMenuAction.Status.Normal;

Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

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

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

@@ -1,24 +0,0 @@
-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;
-            var manifestServices = buildParametersContext.Parameters.ManifestRestoreServices;
-            CatalogTools.CreateCatalogFile(manifestServices, buildPackageName, buildinRootDirectory);
-
-            // 刷新目录
-            AssetDatabase.Refresh();
-        }
-    }
-}

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

@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
-using UnityEditor;
 
 namespace YooAsset.Editor
 {
@@ -19,7 +18,7 @@ namespace YooAsset.Editor
         /// <summary>
         /// 创建补丁清单文件到输出目录
         /// </summary>
-        protected void CreateManifestFile(bool processBundleDepends, bool processBundleTags, bool replaceAssetPathWithAddress, BuildContext context)
+        protected void CreateManifestFile(bool processBundleDepends, bool processBundleTags, BuildContext context)
         {
             var buildMapContext = context.GetContextObject<BuildMapContext>();
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
@@ -31,12 +30,10 @@ namespace YooAsset.Editor
 
             // 创建新补丁清单
             PackageManifest manifest = new PackageManifest();
-            manifest.FileVersion = ManifestDefine.FileVersion;
+            manifest.FileVersion = YooAssetSettings.ManifestFileVersion;
             manifest.EnableAddressable = buildMapContext.Command.EnableAddressable;
-            manifest.SupportExtensionless = buildMapContext.Command.SupportExtensionless;
             manifest.LocationToLower = buildMapContext.Command.LocationToLower;
             manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
-            manifest.ReplaceAssetPathWithAddress = replaceAssetPathWithAddress;
             manifest.OutputNameStyle = (int)buildParameters.FileNameStyle;
             manifest.BuildBundleType = buildParameters.BuildBundleType;
             manifest.BuildPipeline = buildParameters.BuildPipeline;
@@ -59,15 +56,9 @@ namespace YooAsset.Editor
 
             // 4. 处理内置资源包
             if (processBundleDepends)
-            {
-                // 注意：初始化资源清单建立引用关系
-                manifest.Initialize();
-
                 ProcessBuiltinBundleDependency(context, manifest);
-            }
 
-
-            // 创建资源清单文本文件
+            // 创建补丁清单文本文件
             {
                 string fileName = YooAssetSettingsData.GetManifestJsonFileName(buildParameters.PackageName, buildParameters.PackageVersion);
                 string filePath = $"{packageOutputDirectory}/{fileName}";
@@ -75,18 +66,18 @@ namespace YooAsset.Editor
                 BuildLogger.Log($"Create package manifest file: {filePath}");
             }
 
-            // 创建资源清单二进制文件
+            // 创建补丁清单二进制文件
             string packageHash;
             string packagePath;
             {
                 string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
                 packagePath = $"{packageOutputDirectory}/{fileName}";
-                ManifestTools.SerializeToBinary(packagePath, manifest, buildParameters.ManifestProcessServices);
+                ManifestTools.SerializeToBinary(packagePath, manifest);
                 packageHash = HashUtility.FileCRC32(packagePath);
                 BuildLogger.Log($"Create package manifest file: {packagePath}");
             }
 
-            // 创建资源清单哈希文件
+            // 创建补丁清单哈希文件
             {
                 string fileName = YooAssetSettingsData.GetPackageHashFileName(buildParameters.PackageName, buildParameters.PackageVersion);
                 string filePath = $"{packageOutputDirectory}/{fileName}";
@@ -94,7 +85,7 @@ namespace YooAsset.Editor
                 BuildLogger.Log($"Create package manifest hash file: {filePath}");
             }
 
-            // 创建资源清单版本文件
+            // 创建补丁清单版本文件
             {
                 string fileName = YooAssetSettingsData.GetPackageVersionFileName(buildParameters.PackageName);
                 string filePath = $"{packageOutputDirectory}/{fileName}";
@@ -106,7 +97,7 @@ namespace YooAsset.Editor
             {
                 ManifestContext manifestContext = new ManifestContext();
                 byte[] bytesData = FileUtility.ReadAllBytes(packagePath);
-                manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData, buildParameters.ManifestRestoreServices);
+                manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData);
                 context.SetContextObject(manifestContext);
             }
         }
@@ -312,34 +303,15 @@ namespace YooAsset.Editor
             // 注意：如果是可编程构建管线，需要补充内置资源包
             // 注意：该步骤依赖前面的操作！
             var buildResultContext = context.TryGetContextObject<TaskBuilding_SBP.BuildResultContext>();
-
             if (buildResultContext != null)
             {
-                ProcessBuiltinBundleReference(manifest, buildResultContext.BuiltinShadersBundleName);
-                ProcessBuiltinBundleReference(manifest, buildResultContext.MonoScriptsBundleName);
-
-                var buildParametersContext = context.TryGetContextObject<BuildParametersContext>();
-                var buildParameters = buildParametersContext.Parameters;
-                if (buildParameters is ScriptableBuildParameters scriptableBuildParameters)
-                {
-                    if (scriptableBuildParameters.TrackSpriteAtlasDependencies)
-                    {
-                        // 注意：检测是否开启图集模式
-                        // 说明：需要记录主资源对象对图集的依赖关系！
-                        if (EditorSettings.spritePackerMode != SpritePackerMode.Disabled)
-                        {
-                            var buildMapContext = context.GetContextObject<BuildMapContext>();
-                            foreach (var spriteAtlasAsset in buildMapContext.SpriteAtlasAssetList)
-                            {
-                                string spriteAtlasBundleName = spriteAtlasAsset.BundleName;
-                                ProcessBuiltinBundleReference(manifest, spriteAtlasBundleName);
-                            }
-                        }
-                    }
-                }
+                // 注意：初始化资源清单建立引用关系
+                ManifestTools.InitManifest(manifest);
+                ProcessBuiltinBundleReference(context, manifest, buildResultContext.BuiltinShadersBundleName);
+                ProcessBuiltinBundleReference(context, manifest, buildResultContext.MonoScriptsBundleName);
             }
         }
-        private void ProcessBuiltinBundleReference(PackageManifest manifest, string builtinBundleName)
+        private void ProcessBuiltinBundleReference(BuildContext context, PackageManifest manifest, string builtinBundleName)
         {
             if (string.IsNullOrEmpty(builtinBundleName))
                 return;

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

@@ -32,7 +32,6 @@ namespace YooAsset.Editor
                 // 收集器配置
                 buildReport.Summary.UniqueBundleName = buildMapContext.Command.UniqueBundleName;
                 buildReport.Summary.EnableAddressable = buildMapContext.Command.EnableAddressable;
-                buildReport.Summary.SupportExtensionless = buildMapContext.Command.SupportExtensionless;
                 buildReport.Summary.LocationToLower = buildMapContext.Command.LocationToLower;
                 buildReport.Summary.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
                 buildReport.Summary.AutoCollectShaders = buildMapContext.Command.AutoCollectShaders;
@@ -44,17 +43,13 @@ namespace YooAsset.Editor
                 buildReport.Summary.EnableSharePackRule = buildParameters.EnableSharePackRule;
                 buildReport.Summary.SingleReferencedPackAlone = buildParameters.SingleReferencedPackAlone;
                 buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
-                buildReport.Summary.EncryptionServicesClassName = buildParameters.EncryptionServices == null ? "null" : buildParameters.EncryptionServices.GetType().FullName;
-                buildReport.Summary.ManifestProcessServicesClassName = buildParameters.ManifestProcessServices == null ? "null" : buildParameters.ManifestProcessServices.GetType().FullName;
-                buildReport.Summary.ManifestRestoreServicesClassName = buildParameters.ManifestRestoreServices == null ? "null" : buildParameters.ManifestRestoreServices.GetType().FullName;
-
+                buildReport.Summary.EncryptionClassName = buildParameters.EncryptionServices == null ? "null" : buildParameters.EncryptionServices.GetType().FullName;
                 if (buildParameters is BuiltinBuildParameters)
                 {
                     var builtinBuildParameters = buildParameters as BuiltinBuildParameters;
                     buildReport.Summary.CompressOption = builtinBuildParameters.CompressOption;
                     buildReport.Summary.DisableWriteTypeTree = builtinBuildParameters.DisableWriteTypeTree;
                     buildReport.Summary.IgnoreTypeTreeChanges = builtinBuildParameters.IgnoreTypeTreeChanges;
-                    buildReport.Summary.ReplaceAssetPathWithAddress = builtinBuildParameters.ReplaceAssetPathWithAddress;
                 }
                 else if (buildParameters is ScriptableBuildParameters)
                 {
@@ -62,7 +57,6 @@ namespace YooAsset.Editor
                     buildReport.Summary.CompressOption = scriptableBuildParameters.CompressOption;
                     buildReport.Summary.DisableWriteTypeTree = scriptableBuildParameters.DisableWriteTypeTree;
                     buildReport.Summary.IgnoreTypeTreeChanges = scriptableBuildParameters.IgnoreTypeTreeChanges;
-                    buildReport.Summary.ReplaceAssetPathWithAddress = scriptableBuildParameters.ReplaceAssetPathWithAddress;
                     buildReport.Summary.WriteLinkXML = scriptableBuildParameters.WriteLinkXML;
                     buildReport.Summary.CacheServerHost = scriptableBuildParameters.CacheServerHost;
                     buildReport.Summary.CacheServerPort = scriptableBuildParameters.CacheServerPort;

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

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

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

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

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

@@ -15,6 +15,7 @@ namespace YooAsset.Editor
             if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
             {
                 CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
+                DefaultBuildinFileSystemBuild.ExportBuildinCatalogFile();
             }
         }
     }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -16,6 +16,7 @@ namespace YooAsset.Editor
             if (buildParameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
             {
                 CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
+                DefaultBuildinFileSystemBuild.ExportBuildinCatalogFile();
             }
         }
     }

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

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

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

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

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

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

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

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

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

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

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

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

@@ -15,6 +15,7 @@ namespace YooAsset.Editor
             if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
             {
                 CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
+                DefaultBuildinFileSystemBuild.ExportBuildinCatalogFile();
             }
         }
     }

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

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

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

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

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

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

@@ -11,7 +11,7 @@ namespace YooAsset.Editor
         void IBuildTask.Run(BuildContext context)
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var buildParameters = buildParametersContext.Parameters as ScriptableBuildParameters;
+            var buildParameters = buildParametersContext.Parameters;
 
             // 检测基础构建参数
             buildParametersContext.CheckBuildParameters();
@@ -50,13 +50,6 @@ 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/BuildTasks/TaskUpdateBundleInfo_SBP.cs

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

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

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

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

@@ -36,7 +36,6 @@ 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,100 +2,37 @@
 using System.IO;
 using System.Collections.Generic;
 using UnityEngine;
-using System.Text;
 
 namespace YooAsset.Editor
 {
     internal static class BuildLogger
     {
-        private const int MAX_LOG_BUFFER_SIZE = 1024 * 1024 * 2; //2MB
-
         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)
+        public static void InitLogger(bool enableLog)
         {
             _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)
         {
-            if (_enableLog)
-            {
-                WriteLog("WARN", message);
-                Debug.LogWarning(message);
-            }
+            Debug.LogWarning(message);
         }
         public static void Error(string message)
         {
-            if (_enableLog)
-            {
-                WriteLog("ERROR", message);
-                Debug.LogError(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/BuildResult.cs

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

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

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

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/DefaultManifestServices.cs

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

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/EFileNameStyle.cs

@@ -1,6 +1,9 @@
 
-namespace YooAsset
+namespace YooAsset.Editor
 {
+    /// <summary>
+    /// 补丁包内的文件样式
+    /// </summary>
     public enum EFileNameStyle
     {
         /// <summary>

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5e81f00e510f07947873055518f5d1c6
+guid: 84c5eff5dedf53343897e83f6b10eea6
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Editor/AssetBundleBuilder/IBuildPipeline.cs

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

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

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

@@ -1,11 +0,0 @@
-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,269 +12,211 @@ namespace YooAsset.Editor
 {
     internal abstract class BuildPipelineViewerBase
     {
-        protected const int StyleWidth = 400;
-        protected const int LabelMinWidth = 190;
+        private const int StyleWidth = 400;
+        private const int LabelMinWidth = 180;
 
-        protected string PackageName { private set; get; }
-        protected string PipelineName { private set; get; }
-        protected BuildTarget BuildTarget { private set; get; }
+        protected readonly string PackageName;
+        protected readonly BuildTarget BuildTarget;
+        protected readonly EBuildPipeline BuildPipeline;
+        protected TemplateContainer Root;
 
-        /// <summary>
-        /// 初始化视图
-        /// </summary>
-        public void InitView(string packageName, string pipelineName, BuildTarget buildTarget)
+        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)
         {
             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>
-        public abstract void CreateView(VisualElement parent);
+        protected abstract void ExecuteBuild();
 
         /// <summary>
-        /// 获取默认版本
+        /// 获取构建版本
         /// </summary>
-        protected virtual string GetDefaultPackageVersion()
+        protected string GetPackageVersion()
         {
-            int totalMinutes = DateTime.Now.Hour * 60 + DateTime.Now.Minute;
-            return DateTime.Now.ToString("yyyy-MM-dd") + "-" + totalMinutes;
+            return _buildVersionField.value;
         }
 
         /// <summary>
-        /// 创建资源包加密服务类实例
+        /// 创建加密类实例
         /// </summary>
-        protected IEncryptionServices CreateEncryptionServicesInstance()
+        protected IEncryptionServices CreateEncryptionInstance()
         {
-            var className = AssetBundleBuilderSetting.GetPackageEncyptionServicesClassName(PackageName, PipelineName);
-            var classTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
-            var classType = classTypes.Find(x => x.FullName.Equals(className));
+            var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, BuildPipeline);
+            var encryptionClassTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
+            var classType = encryptionClassTypes.Find(x => x.FullName.Equals(encyptionClassName));
             if (classType != null)
                 return (IEncryptionServices)Activator.CreateInstance(classType);
             else
                 return null;
         }
 
-        /// <summary>
-        /// 创建资源清单加密服务类实例
-        /// </summary>
-        protected IManifestProcessServices CreateManifestProcessServicesInstance()
+        private string GetDefaultPackageVersion()
         {
-            var className = AssetBundleBuilderSetting.GetPackageManifestProcessServicesClassName(PackageName, PipelineName);
-            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestProcessServices));
-            var classType = classTypes.Find(x => x.FullName.Equals(className));
-            if (classType != null)
-                return (IManifestProcessServices)Activator.CreateInstance(classType);
-            else
-                return null;
+            int totalMinutes = DateTime.Now.Hour * 60 + DateTime.Now.Minute;
+            return DateTime.Now.ToString("yyyy-MM-dd") + "-" + totalMinutes;
         }
-
-        /// <summary>
-        /// 创建资源清单解密服务类实例
-        /// </summary>
-        protected IManifestRestoreServices CreateManifestRestoreServicesInstance()
-        {
-            var className = AssetBundleBuilderSetting.GetPackageManifestRestoreServicesClassName(PackageName, PipelineName);
-            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestRestoreServices));
-            var classType = classTypes.Find(x => x.FullName.Equals(className));
-            if (classType != null)
-                return (IManifestRestoreServices)Activator.CreateInstance(classType);
-            else
-                return null;
-        }
-
-        #region UI元素通用处理方法
-        protected void SetBuildOutputField(TextField textField)
-        {
-            // 输出目录
-            string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-            textField.SetValueWithoutNotify(defaultOutputRoot);
-            textField.SetEnabled(false);
-            UIElementsTools.SetElementLabelMinWidth(textField, LabelMinWidth);
-        }
-        protected void SetBuildVersionField(TextField textField)
-        {
-            // 构建版本
-            textField.style.width = StyleWidth;
-            textField.SetValueWithoutNotify(GetDefaultPackageVersion());
-            UIElementsTools.SetElementLabelMinWidth(textField, LabelMinWidth);
-        }
-        protected void SetCompressionField(EnumField enumField)
-        {
-            // 压缩方式选项
-            var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, PipelineName);
-            enumField.Init(compressOption);
-            enumField.SetValueWithoutNotify(compressOption);
-            enumField.style.width = StyleWidth;
-            enumField.RegisterValueChangedCallback(evt =>
-            {
-                AssetBundleBuilderSetting.SetPackageCompressOption(PackageName, PipelineName, (ECompressOption)enumField.value);
-            });
-            UIElementsTools.SetElementLabelMinWidth(enumField, LabelMinWidth);
-        }
-        protected void SetOutputNameStyleField(EnumField enumField)
-        {
-            // 输出文件名称样式
-            var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, PipelineName);
-            enumField.Init(fileNameStyle);
-            enumField.SetValueWithoutNotify(fileNameStyle);
-            enumField.style.width = StyleWidth;
-            enumField.RegisterValueChangedCallback(evt =>
-            {
-                AssetBundleBuilderSetting.SetPackageFileNameStyle(PackageName, PipelineName, (EFileNameStyle)enumField.value);
-            });
-            UIElementsTools.SetElementLabelMinWidth(enumField, LabelMinWidth);
-        }
-        protected void SetCopyBuildinFileOptionField(EnumField enumField, TextField tagField)
-        {
-            // 首包文件拷贝选项
-            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
-            enumField.Init(buildinFileCopyOption);
-            enumField.SetValueWithoutNotify(buildinFileCopyOption);
-            enumField.style.width = StyleWidth;
-            enumField.RegisterValueChangedCallback(evt =>
-            {
-                AssetBundleBuilderSetting.SetPackageBuildinFileCopyOption(PackageName, PipelineName, (EBuildinFileCopyOption)enumField.value);
-
-                // 设置内置资源标签显隐
-                SetCopyBuildinFileTagsVisible(tagField);
-            });
-            UIElementsTools.SetElementLabelMinWidth(enumField, LabelMinWidth);
-        }
-        protected void SetCopyBuildinFileTagsVisible(TextField tagField)
-        {
-            var option = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
-            tagField.visible = option == EBuildinFileCopyOption.ClearAndCopyByTags || option == EBuildinFileCopyOption.OnlyCopyByTags;
-        }
-        protected void SetCopyBuildinFileTagsField(TextField textField)
-        {
-            // 首包文件拷贝参数
-            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName);
-            textField.SetValueWithoutNotify(buildinFileCopyParams);
-            textField.RegisterValueChangedCallback(evt =>
-            {
-                AssetBundleBuilderSetting.SetPackageBuildinFileCopyParams(PackageName, PipelineName, textField.value);
-            });
-            UIElementsTools.SetElementLabelMinWidth(textField, LabelMinWidth);
-        }
-        protected void SetClearBuildCacheToggle(Toggle toggle)
-        {
-            // 清理构建缓存
-            bool clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, PipelineName);
-            toggle.SetValueWithoutNotify(clearBuildCache);
-            toggle.RegisterValueChangedCallback(evt =>
-            {
-                AssetBundleBuilderSetting.SetPackageClearBuildCache(PackageName, PipelineName, toggle.value);
-            });
-            UIElementsTools.SetElementLabelMinWidth(toggle, LabelMinWidth);
-        }
-        protected void SetUseAssetDependencyDBToggle(Toggle toggle)
-        {
-            // 使用资源依赖数据库
-            bool useAssetDependencyDB = AssetBundleBuilderSetting.GetPackageUseAssetDependencyDB(PackageName, PipelineName);
-            toggle.SetValueWithoutNotify(useAssetDependencyDB);
-            toggle.RegisterValueChangedCallback(evt =>
-            {
-                AssetBundleBuilderSetting.SetPackageUseAssetDependencyDB(PackageName, PipelineName, toggle.value);
-            });
-            UIElementsTools.SetElementLabelMinWidth(toggle, LabelMinWidth);
-        }
-        protected PopupField<Type> CreateEncryptionServicesField(VisualElement container)
-        {
-            // 资源包加密服务类
-            var classTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
-            if (classTypes.Count > 0)
-            {
-                var className = AssetBundleBuilderSetting.GetPackageEncyptionServicesClassName(PackageName, PipelineName);
-                int defaultIndex = classTypes.FindIndex(x => x.FullName.Equals(className));
-                if (defaultIndex < 0)
-                    defaultIndex = 0;
-                var popupField = new PopupField<Type>(classTypes, defaultIndex);
-                popupField.label = "Encryption Services";
-                popupField.style.width = StyleWidth;
-                popupField.RegisterValueChangedCallback(evt =>
-                {
-                    AssetBundleBuilderSetting.SetPackageEncyptionServicesClassName(PackageName, PipelineName, popupField.value.FullName);
-                });
-                container.Add(popupField);
-                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
-                return popupField;
-            }
-            else
-            {
-                var popupField = new PopupField<Type>();
-                popupField.label = "Encryption Services";
-                popupField.style.width = StyleWidth;
-                container.Add(popupField);
-                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
-                return popupField;
-            }
-        }
-        protected PopupField<Type> CreateManifestProcessServicesField(VisualElement container)
-        {
-            // 资源清单加密服务类
-            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestProcessServices));
-            if (classTypes.Count > 0)
-            {
-                var className = AssetBundleBuilderSetting.GetPackageManifestProcessServicesClassName(PackageName, PipelineName);
-                int defaultIndex = classTypes.FindIndex(x => x.FullName.Equals(className));
-                if (defaultIndex < 0)
-                    defaultIndex = 0;
-                var popupField = new PopupField<Type>(classTypes, defaultIndex);
-                popupField.label = "Manifest Process Services";
-                popupField.style.width = StyleWidth;
-                popupField.RegisterValueChangedCallback(evt =>
-                {
-                    AssetBundleBuilderSetting.SetPackageManifestProcessServicesClassName(PackageName, PipelineName, popupField.value.FullName);
-                });
-                container.Add(popupField);
-                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
-                return popupField;
-            }
-            else
-            {
-                var popupField = new PopupField<Type>();
-                popupField.label = "Manifest Process Services";
-                popupField.style.width = StyleWidth;
-                container.Add(popupField);
-                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
-                return popupField;
-            }
-        }
-        protected PopupField<Type> CreateManifestRestoreServicesField(VisualElement container)
-        {
-            // 资源清单加密服务类
-            var classTypes = EditorTools.GetAssignableTypes(typeof(IManifestRestoreServices));
-            if (classTypes.Count > 0)
-            {
-                var className = AssetBundleBuilderSetting.GetPackageManifestRestoreServicesClassName(PackageName, PipelineName);
-                int defaultIndex = classTypes.FindIndex(x => x.FullName.Equals(className));
-                if (defaultIndex < 0)
-                    defaultIndex = 0;
-                var popupField = new PopupField<Type>(classTypes, defaultIndex);
-                popupField.label = "Manifest Restore Services";
-                popupField.style.width = StyleWidth;
-                popupField.RegisterValueChangedCallback(evt =>
-                {
-                    AssetBundleBuilderSetting.SetPackageManifestRestoreServicesClassName(PackageName, PipelineName, popupField.value.FullName);
-                });
-                container.Add(popupField);
-                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
-                return popupField;
-            }
-            else
-            {
-                var popupField = new PopupField<Type>();
-                popupField.label = "Manifest Restore Services";
-                popupField.style.width = StyleWidth;
-                container.Add(popupField);
-                UIElementsTools.SetElementLabelMinWidth(popupField, LabelMinWidth);
-                return popupField;
-            }
-        }
-        #endregion
     }
 }
 #endif

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

@@ -4,7 +4,7 @@
         <ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
         <ui:Toggle label="Clear Build Cache" name="ClearBuildCache" />
         <ui:Toggle label="Use Asset Depend DB" name="UseAssetDependency" />
-        <ui:VisualElement name="PopupContainer" style="flex-grow: 1;" />
+        <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" />

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

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

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

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

@@ -0,0 +1,57 @@
+#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/EditorSimulateBuildPipelineViewer.cs

@@ -1,85 +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
-{
-    [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("Info", $"Start building resource package [{PackageName}]!", "Yes", "No"))
-            {
-                EditorTools.ClearUnityConsole();
-                EditorApplication.delayCall += ExecuteBuild;
-            }
-            else
-            {
-                Debug.LogWarning("[Build] Packaging has been canceled.");
-            }
-        }
-
-        /// <summary>
-        /// 执行构建
-        /// </summary>
-        protected virtual void ExecuteBuild()
-        {
-            var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, PipelineName);
-            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
-            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName);
-
-            EditorSimulateBuildParameters buildParameters = new EditorSimulateBuildParameters();
-            buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-            buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
-            buildParameters.BuildPipeline = PipelineName.ToString();
-            buildParameters.BuildBundleType = (int)EBuildBundleType.VirtualBundle;
-            buildParameters.BuildTarget = BuildTarget;
-            buildParameters.PackageName = PackageName;
-            buildParameters.PackageVersion = _buildVersionField.value;
-            buildParameters.VerifyBuildingResult = true;
-            buildParameters.FileNameStyle = fileNameStyle;
-            buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
-            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
-
-            EditorSimulateBuildPipeline pipeline = new EditorSimulateBuildPipeline();
-            var buildResult = pipeline.Run(buildParameters, true);
-            if (buildResult.Success)
-                EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
-        }
-    }
-}
-#endif

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

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

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

@@ -0,0 +1,70 @@
+#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/RawfileBuildPipelineViewer.cs

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

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

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

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

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

@@ -0,0 +1,56 @@
+#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/ScriptableBuildPipelineViewer.cs

@@ -1,157 +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
-{
-    [BuildPipelineAttribute(nameof(EBuildPipeline.ScriptableBuildPipeline))]
-    internal class ScriptableBuildPipelineViewer : BuildPipelineViewerBase
-    {
-        protected TemplateContainer Root;
-        protected TextField _buildOutputField;
-        protected TextField _buildVersionField;
-        protected PopupField<Type> _encryptionServicesField;
-        protected PopupField<Type> _manifestProcessServicesField;
-        protected PopupField<Type> _manifestRestoreServicesField;
-        protected EnumField _compressionField;
-        protected EnumField _outputNameStyleField;
-        protected EnumField _copyBuildinFileOptionField;
-        protected TextField _copyBuildinFileTagsField;
-        protected Toggle _clearBuildCacheToggle;
-        protected Toggle _useAssetDependencyDBToggle;
-
-        public override void CreateView(VisualElement parent)
-        {
-            // 加载布局文件
-            var visualAsset = UxmlLoader.LoadWindowUXML<ScriptableBuildPipelineViewer>();
-            if (visualAsset == null)
-                return;
-
-            Root = visualAsset.CloneTree();
-            Root.style.flexGrow = 1f;
-            parent.Add(Root);
-
-            // 输出目录
-            _buildOutputField = Root.Q<TextField>("BuildOutput");
-            SetBuildOutputField(_buildOutputField);
-
-            // 构建版本
-            _buildVersionField = Root.Q<TextField>("BuildVersion");
-            SetBuildVersionField(_buildVersionField);
-
-            // 加密方法
-            var popupContainer = Root.Q("PopupContainer");
-            _encryptionServicesField = CreateEncryptionServicesField(popupContainer);
-            _manifestProcessServicesField = CreateManifestProcessServicesField(popupContainer);
-            _manifestRestoreServicesField = CreateManifestRestoreServicesField(popupContainer);
-
-            // 压缩方式选项
-            _compressionField = Root.Q<EnumField>("Compression");
-            SetCompressionField(_compressionField);
-
-            // 输出文件名称样式
-            _outputNameStyleField = Root.Q<EnumField>("FileNameStyle");
-            SetOutputNameStyleField(_outputNameStyleField);
-
-            // 首包文件拷贝参数
-            _copyBuildinFileTagsField = Root.Q<TextField>("CopyBuildinFileParam");
-            SetCopyBuildinFileTagsField(_copyBuildinFileTagsField);
-            SetCopyBuildinFileTagsVisible(_copyBuildinFileTagsField);
-
-            // 首包文件拷贝选项
-            _copyBuildinFileOptionField = Root.Q<EnumField>("CopyBuildinFileOption");
-            SetCopyBuildinFileOptionField(_copyBuildinFileOptionField, _copyBuildinFileTagsField);
-
-            // 清理构建缓存
-            _clearBuildCacheToggle = Root.Q<Toggle>("ClearBuildCache");
-            SetClearBuildCacheToggle(_clearBuildCacheToggle);
-
-            // 使用资源依赖数据库
-            _useAssetDependencyDBToggle = Root.Q<Toggle>("UseAssetDependency");
-            SetUseAssetDependencyDBToggle(_useAssetDependencyDBToggle);
-
-            // 构建按钮
-            var buildButton = Root.Q<Button>("Build");
-            buildButton.clicked += BuildButton_clicked;
-        }
-        private void BuildButton_clicked()
-        {
-            if (EditorUtility.DisplayDialog("Info", $"Start building resource package [{PackageName}]!", "Yes", "No"))
-            {
-                EditorTools.ClearUnityConsole();
-                EditorApplication.delayCall += ExecuteBuild;
-            }
-            else
-            {
-                Debug.LogWarning("[Build] Packaging has been canceled.");
-            }
-        }
-
-        /// <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);
-
-            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.EncryptionServices = CreateEncryptionServicesInstance();
-            buildParameters.ManifestProcessServices = CreateManifestProcessServicesInstance();
-            buildParameters.ManifestRestoreServices = CreateManifestRestoreServicesInstance();
-            buildParameters.BuiltinShadersBundleName = GetBuiltinShaderBundleName();
-
-            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);
-        }
-
-        /// <summary>
-        /// Mono脚本的资源包名称
-        /// </summary>
-        protected string GetMonoScriptsBundleName()
-        {
-            var uniqueBundleName = AssetBundleCollectorSettingData.Setting.UniqueBundleName;
-            var packRuleResult = DefaultPackRule.CreateMonosPackRuleResult();
-            return packRuleResult.GetBundleName(PackageName, uniqueBundleName);
-        }
-    }
-}
-#endif

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

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

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

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

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorConfig.cs

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetDependencyDatabase.cs

@@ -70,11 +70,7 @@ 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);
@@ -88,8 +84,8 @@ namespace YooAsset.Editor
             }
             catch (Exception ex)
             {
-                Debug.LogError($"Failed to load cache database : {ex.Message}");
                 ClearDatabase(true);
+                Debug.LogError($"Failed to load cache database : {ex.Message}");
             }
             finally
             {
@@ -169,8 +165,7 @@ namespace YooAsset.Editor
                     File.Delete(_databaseFilePath);
             }
 
-            if (_database != null)
-                _database.Clear();
+            _database.Clear();
         }
 
         /// <summary>
@@ -178,42 +173,26 @@ namespace YooAsset.Editor
         /// </summary>
         public string[] GetDependencies(string assetPath, bool recursive)
         {
+            // 注意：AssetDatabase.GetDependencies()方法返回结果里会踢出丢失文件！
+            // 注意：AssetDatabase.GetDependencies()方法返回结果里会包含主资源路径！
+
             // 注意：机制上不允许存在未收录的资源
             if (_database.ContainsKey(assetPath) == false)
             {
                 throw new Exception($"Fatal : can not found cache info : {assetPath}");
             }
 
-            var result = new HashSet<string>();
-
-            // 注意：递归收集依赖时，依赖列表中包含主资源
-            if (recursive)
-                result.Add(assetPath);
-
-            // 收集依赖
-            CollectDependencies(assetPath, assetPath, result, recursive);
+            var result = new HashSet<string> { assetPath };
+            CollectDependencies(assetPath, result, recursive);
 
+            // 注意：AssetDatabase.GetDependencies保持一致，将主资源添加到依赖列表最前面
             return result.ToArray();
         }
-        private void CollectDependencies(string parent, string assetPath, HashSet<string> result, bool recursive)
+        private void CollectDependencies(string assetPath, HashSet<string> result, bool recursive)
         {
             if (_database.TryGetValue(assetPath, out var cacheInfo) == false)
             {
-                // 说明：检测是否为丢失引用的资产
-#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}");
-                }
+                throw new Exception($"Fatal : can not found cache info : {assetPath}");
             }
 
             foreach (var dependGUID in cacheInfo.DependGUIDs)
@@ -234,7 +213,7 @@ namespace YooAsset.Editor
 
                 // 递归收集依赖
                 if (recursive)
-                    CollectDependencies(assetPath, dependAssetPath, result, recursive);
+                    CollectDependencies(dependAssetPath, result, recursive);
             }
         }
 
@@ -258,7 +237,6 @@ namespace YooAsset.Editor
         }
         private DependencyInfo CreateDependencyInfo(string assetPath)
         {
-            // 注意：AssetDatabase.GetDependencies()方法返回结果里会踢出丢失文件！
             var dependHash = AssetDatabase.GetAssetDependencyHash(assetPath);
             var dependAssetPaths = AssetDatabase.GetDependencies(assetPath, false);
             var dependGUIDs = new List<string>();

Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs

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

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

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

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

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

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

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

Assets/YooAsset/Editor/AssetBundleCollector/DisplayNameAttribute.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 
 namespace YooAsset.Editor
 {
@@ -14,4 +15,22 @@ 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,7 +296,6 @@ 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/ReportBundleInfo.cs

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

Assets/YooAsset/Editor/AssetBundleReporter/ReportSummary.cs

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

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

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