Merge 96b33f5816 into f3ebda0c04

修复极端情况下Shader变种收集不完整的问题

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,188 @@
 
 All notable changes to this package will be documented in this file.
 
+## [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）已更新判定逻辑**

Assets/YooAsset/Editor/AssetArtScanner/AssetArtScannerSetting.cs

@@ -32,21 +32,14 @@ namespace YooAsset.Editor
 
                 // 开始扫描工作
                 ScanReport report = scanner.RunScanner();
-
-                // 检测报告合法性
                 report.CheckError();
 
-                // 保存扫描结果
-                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);
+                // 返回扫描结果
+                return new ScannerResult(report);
             }
             catch (Exception e)
             {
-                return new ScannerResult(e.StackTrace);
+                return new ScannerResult(e.Message, e.StackTrace);
             }
         }
 

Assets/YooAsset/Editor/AssetArtScanner/AssetArtScannerWindow.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs

@@ -22,7 +22,7 @@ namespace YooAsset.Editor
         /// </summary>
         public static string GetStreamingAssetsRoot()
         {
-            return YooAssetSettingsData.GetYooDefaultBuildinRoot();
+            return YooAssetSettingsData.GetYooDefaultBuiltinRoot();
         }
     }
 }

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs

@@ -43,28 +43,28 @@ namespace YooAsset.Editor
             EditorPrefs.SetInt(key, (int)fileNameStyle);
         }
 
-        // EBuildinFileCopyOption
-        public static EBuildinFileCopyOption GetPackageBuildinFileCopyOption(string packageName, string buildPipeline)
+        // EBuiltinFileCopyOption
+        public static EBuiltinFileCopyOption GetPackageBuiltinFileCopyOption(string packageName, string buildPipeline)
         {
-            string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuildinFileCopyOption)}";
-            return (EBuildinFileCopyOption)EditorPrefs.GetInt(key, (int)EBuildinFileCopyOption.None);
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuiltinFileCopyOption)}";
+            return (EBuiltinFileCopyOption)EditorPrefs.GetInt(key, (int)EBuiltinFileCopyOption.None);
         }
-        public static void SetPackageBuildinFileCopyOption(string packageName, string buildPipeline, EBuildinFileCopyOption buildinFileCopyOption)
+        public static void SetPackageBuiltinFileCopyOption(string packageName, string buildPipeline, EBuiltinFileCopyOption builtinFileCopyOption)
         {
-            string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuildinFileCopyOption)}";
-            EditorPrefs.SetInt(key, (int)buildinFileCopyOption);
+            string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuiltinFileCopyOption)}";
+            EditorPrefs.SetInt(key, (int)builtinFileCopyOption);
         }
 
         // BuildFileCopyParams
-        public static string GetPackageBuildinFileCopyParams(string packageName, string buildPipeline)
+        public static string GetPackageBuiltinFileCopyParams(string packageName, string 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 SetPackageBuiltinFileCopyParams(string packageName, string buildPipeline, string builtinFileCopyParams)
         {
             string key = $"{Application.productName}_{packageName}_{buildPipeline}_BuildFileCopyParams";
-            EditorPrefs.SetString(key, buildinFileCopyParams);
+            EditorPrefs.SetString(key, builtinFileCopyParams);
         }
 
         // EncyptionServicesClassName

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs

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

Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs

@@ -17,15 +17,15 @@ namespace YooAsset.Editor
             {
                 var buildParameters = new EditorSimulateBuildParameters();
                 buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-                buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+                buildParameters.BuiltinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
                 buildParameters.BuildPipeline = EBuildPipeline.EditorSimulateBuildPipeline.ToString();
                 buildParameters.BuildBundleType = (int)EBuildBundleType.VirtualBundle;
                 buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
                 buildParameters.PackageName = packageName;
                 buildParameters.PackageVersion = "Simulate";
                 buildParameters.FileNameStyle = EFileNameStyle.HashName;
-                buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.None;
-                buildParameters.BuildinFileCopyParams = string.Empty;
+                buildParameters.BuiltinFileCopyOption = EBuiltinFileCopyOption.None;
+                buildParameters.BuiltinFileCopyParams = string.Empty;
                 buildParameters.UseAssetDependencyDB = true;
 
                 var pipeline = new EditorSimulateBuildPipeline();

Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs

@@ -27,7 +27,7 @@ namespace YooAsset.Editor
         /// <summary>
         /// 文件哈希值
         /// </summary>
-        public string PackageFileCRC { set; get; }
+        public uint PackageFileCRC { set; get; }
 
         /// <summary>
         /// 文件哈希值

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs

@@ -13,6 +13,11 @@ 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>
@@ -60,6 +65,12 @@ namespace YooAsset.Editor
                 newBundleInfo.PackAsset(assetInfo);
                 _bundleInfoDic.Add(bundleName, newBundleInfo);
             }
+
+            // 统计所有的精灵图集
+            if (assetInfo.AssetInfo.IsSpriteAtlas())
+            {
+                SpriteAtlasAssetList.Add(assetInfo);
+            }
         }
 
         /// <summary>

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -19,7 +19,7 @@ namespace YooAsset.Editor
         /// <summary>
         /// 内置文件的根目录
         /// </summary>
-        public string BuildinFileRoot;
+        public string BuiltinFileRoot;
 
         /// <summary>
         /// 构建管线名称
@@ -86,12 +86,12 @@ namespace YooAsset.Editor
         /// <summary>
         /// 内置文件的拷贝选项
         /// </summary>
-        public EBuildinFileCopyOption BuildinFileCopyOption = EBuildinFileCopyOption.None;
+        public EBuiltinFileCopyOption BuiltinFileCopyOption = EBuiltinFileCopyOption.None;
 
         /// <summary>
         /// 内置文件的拷贝参数
         /// </summary>
-        public string BuildinFileCopyParams;
+        public string BuiltinFileCopyParams;
 
         /// <summary>
         /// 资源包加密服务类
@@ -111,7 +111,7 @@ namespace YooAsset.Editor
         private string _pipelineOutputDirectory = string.Empty;
         private string _packageOutputDirectory = string.Empty;
         private string _packageRootDirectory = string.Empty;
-        private string _buildinRootDirectory = string.Empty;
+        private string _builtinRootDirectory = string.Empty;
 
         /// <summary>
         /// 检测构建参数是否合法
@@ -136,9 +136,9 @@ namespace YooAsset.Editor
                 string message = BuildLogger.GetErrorMessage(ErrorCode.BuildOutputRootIsNullOrEmpty, "Build output root is null or empty !");
                 throw new Exception(message);
             }
-            if (string.IsNullOrEmpty(BuildinFileRoot))
+            if (string.IsNullOrEmpty(BuiltinFileRoot))
             {
-                string message = BuildLogger.GetErrorMessage(ErrorCode.BuildinFileRootIsNullOrEmpty, "Buildin file root is null or empty !");
+                string message = BuildLogger.GetErrorMessage(ErrorCode.BuiltinFileRootIsNullOrEmpty, "Builtin file root is null or empty !");
                 throw new Exception(message);
             }
             if (string.IsNullOrEmpty(BuildPipeline))
@@ -210,13 +210,13 @@ namespace YooAsset.Editor
         /// <summary>
         /// 获取内置资源的根目录
         /// </summary>
-        public virtual string GetBuildinRootDirectory()
+        public virtual string GetBuiltinRootDirectory()
         {
-            if (string.IsNullOrEmpty(_buildinRootDirectory))
+            if (string.IsNullOrEmpty(_builtinRootDirectory))
             {
-                _buildinRootDirectory = $"{BuildinFileRoot}/{PackageName}";
+                _builtinRootDirectory = $"{BuiltinFileRoot}/{PackageName}";
             }
-            return _buildinRootDirectory;
+            return _builtinRootDirectory;
         }
     }
 }

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs

@@ -55,9 +55,9 @@ namespace YooAsset.Editor
         /// <summary>
         /// 获取内置资源的根目录
         /// </summary>
-        public string GetBuildinRootDirectory()
+        public string GetBuiltinRootDirectory()
         {
-            return Parameters.GetBuildinRootDirectory();
+            return Parameters.GetBuiltinRootDirectory();
         }
     }
 }

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

@@ -6,30 +6,30 @@ using UnityEngine;
 
 namespace YooAsset.Editor
 {
-    public class TaskCopyBuildinFiles
+    public class TaskCopyBuiltinFiles
     {
         /// <summary>
         /// 拷贝首包资源文件
         /// </summary>
-        internal void CopyBuildinFilesToStreaming(BuildParametersContext buildParametersContext, PackageManifest manifest)
+        internal void CopyBuiltinFilesToStreaming(BuildParametersContext buildParametersContext, PackageManifest manifest)
         {
-            EBuildinFileCopyOption copyOption = buildParametersContext.Parameters.BuildinFileCopyOption;
+            EBuiltinFileCopyOption copyOption = buildParametersContext.Parameters.BuiltinFileCopyOption;
             string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
-            string buildinRootDirectory = buildParametersContext.GetBuildinRootDirectory();
+            string builtinRootDirectory = buildParametersContext.GetBuiltinRootDirectory();
             string buildPackageName = buildParametersContext.Parameters.PackageName;
             string buildPackageVersion = buildParametersContext.Parameters.PackageVersion;
 
             // 清空内置文件的目录
-            if (copyOption == EBuildinFileCopyOption.ClearAndCopyAll || copyOption == EBuildinFileCopyOption.ClearAndCopyByTags)
+            if (copyOption == EBuiltinFileCopyOption.ClearAndCopyAll || copyOption == EBuiltinFileCopyOption.ClearAndCopyByTags)
             {
-                EditorTools.ClearFolder(buildinRootDirectory);
+                EditorTools.ClearFolder(builtinRootDirectory);
             }
 
             // 拷贝补丁清单文件
             {
                 string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildPackageName, buildPackageVersion);
                 string sourcePath = $"{packageOutputDirectory}/{fileName}";
-                string destPath = $"{buildinRootDirectory}/{fileName}";
+                string destPath = $"{builtinRootDirectory}/{fileName}";
                 EditorTools.CopyFile(sourcePath, destPath, true);
             }
 
@@ -37,7 +37,7 @@ namespace YooAsset.Editor
             {
                 string fileName = YooAssetSettingsData.GetPackageHashFileName(buildPackageName, buildPackageVersion);
                 string sourcePath = $"{packageOutputDirectory}/{fileName}";
-                string destPath = $"{buildinRootDirectory}/{fileName}";
+                string destPath = $"{builtinRootDirectory}/{fileName}";
                 EditorTools.CopyFile(sourcePath, destPath, true);
             }
 
@@ -45,38 +45,38 @@ namespace YooAsset.Editor
             {
                 string fileName = YooAssetSettingsData.GetPackageVersionFileName(buildPackageName);
                 string sourcePath = $"{packageOutputDirectory}/{fileName}";
-                string destPath = $"{buildinRootDirectory}/{fileName}";
+                string destPath = $"{builtinRootDirectory}/{fileName}";
                 EditorTools.CopyFile(sourcePath, destPath, true);
             }
 
             // 拷贝文件列表（所有文件）
-            if (copyOption == EBuildinFileCopyOption.ClearAndCopyAll || copyOption == EBuildinFileCopyOption.OnlyCopyAll)
+            if (copyOption == EBuiltinFileCopyOption.ClearAndCopyAll || copyOption == EBuiltinFileCopyOption.OnlyCopyAll)
             {
                 foreach (var packageBundle in manifest.BundleList)
                 {
                     string sourcePath = $"{packageOutputDirectory}/{packageBundle.FileName}";
-                    string destPath = $"{buildinRootDirectory}/{packageBundle.FileName}";
+                    string destPath = $"{builtinRootDirectory}/{packageBundle.FileName}";
                     EditorTools.CopyFile(sourcePath, destPath, true);
                 }
             }
 
             // 拷贝文件列表（带标签的文件）
-            if (copyOption == EBuildinFileCopyOption.ClearAndCopyByTags || copyOption == EBuildinFileCopyOption.OnlyCopyByTags)
+            if (copyOption == EBuiltinFileCopyOption.ClearAndCopyByTags || copyOption == EBuiltinFileCopyOption.OnlyCopyByTags)
             {
-                string[] tags = buildParametersContext.Parameters.BuildinFileCopyParams.Split(';');
+                string[] tags = buildParametersContext.Parameters.BuiltinFileCopyParams.Split(';');
                 foreach (var packageBundle in manifest.BundleList)
                 {
                     if (packageBundle.HasTag(tags) == false)
                         continue;
                     string sourcePath = $"{packageOutputDirectory}/{packageBundle.FileName}";
-                    string destPath = $"{buildinRootDirectory}/{packageBundle.FileName}";
+                    string destPath = $"{builtinRootDirectory}/{packageBundle.FileName}";
                     EditorTools.CopyFile(sourcePath, destPath, true);
                 }
             }
 
             // 刷新目录
             AssetDatabase.Refresh();
-            BuildLogger.Log($"Buildin files copy complete: {buildinRootDirectory}");
+            BuildLogger.Log($"Builtin files copy complete: {builtinRootDirectory}");
         }
     }
 }

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

@@ -12,10 +12,10 @@ namespace YooAsset.Editor
         /// </summary>
         internal void CreateCatalogFile(BuildParametersContext buildParametersContext)
         {
-            string buildinRootDirectory = buildParametersContext.GetBuildinRootDirectory();
+            string builtinRootDirectory = buildParametersContext.GetBuiltinRootDirectory();
             string buildPackageName = buildParametersContext.Parameters.PackageName;
             var manifestServices = buildParametersContext.Parameters.ManifestRestoreServices;
-            CatalogTools.CreateCatalogFile(manifestServices, buildPackageName, buildinRootDirectory);
+            CatalogTools.CreateCatalogFile(manifestServices, buildPackageName, builtinRootDirectory);
 
             // 刷新目录
             AssetDatabase.Refresh();

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

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
+using UnityEditor;
 
 namespace YooAsset.Editor
 {
@@ -32,6 +33,7 @@ namespace YooAsset.Editor
             PackageManifest manifest = new PackageManifest();
             manifest.FileVersion = ManifestDefine.FileVersion;
             manifest.EnableAddressable = buildMapContext.Command.EnableAddressable;
+            manifest.SupportExtensionless = buildMapContext.Command.SupportExtensionless;
             manifest.LocationToLower = buildMapContext.Command.LocationToLower;
             manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
             manifest.OutputNameStyle = (int)buildParameters.FileNameStyle;
@@ -300,18 +302,40 @@ namespace YooAsset.Editor
         #region YOOASSET_LEGACY_DEPENDENCY
         private void ProcessBuiltinBundleDependency(BuildContext context, PackageManifest manifest)
         {
+            // 注意：初始化资源清单建立引用关系
+            ManifestTools.InitManifest(manifest);
+
             // 注意：如果是可编程构建管线，需要补充内置资源包
             // 注意：该步骤依赖前面的操作！
             var buildResultContext = context.TryGetContextObject<TaskBuilding_SBP.BuildResultContext>();
+
             if (buildResultContext != null)
             {
-                // 注意：初始化资源清单建立引用关系
-                ManifestTools.InitManifest(manifest);
-                ProcessBuiltinBundleReference(context, manifest, buildResultContext.BuiltinShadersBundleName);
-                ProcessBuiltinBundleReference(context, manifest, buildResultContext.MonoScriptsBundleName);
+                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);
+                            }
+                        }
+                    }
+                }
             }
         }
-        private void ProcessBuiltinBundleReference(BuildContext context, PackageManifest manifest, string builtinBundleName)
+        private void ProcessBuiltinBundleReference(PackageManifest manifest, string builtinBundleName)
         {
             if (string.IsNullOrEmpty(builtinBundleName))
                 return;

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

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

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

@@ -63,7 +63,7 @@ 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, BuildParametersContext buildParametersContext);
-        protected abstract string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext);
+        protected abstract uint GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext);
         protected abstract long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext);
     }
 }

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

@@ -6,15 +6,15 @@ using UnityEngine;
 
 namespace YooAsset.Editor
 {
-    public class TaskCopyBuildinFiles_BBP : TaskCopyBuildinFiles, IBuildTask
+    public class TaskCopyBuiltinFiles_BBP : TaskCopyBuiltinFiles, IBuildTask
     {
         void IBuildTask.Run(BuildContext context)
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var manifestContext = context.GetContextObject<ManifestContext>();
-            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            if (buildParametersContext.Parameters.BuiltinFileCopyOption != EBuiltinFileCopyOption.None)
             {
-                CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
+                CopyBuiltinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
             }
         }
     }

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

@@ -11,7 +11,7 @@ namespace YooAsset.Editor
         void IBuildTask.Run(BuildContext context)
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            if (buildParametersContext.Parameters.BuiltinFileCopyOption != EBuiltinFileCopyOption.None)
             {
                 CreateCatalogFile(buildParametersContext);
             }

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

@@ -45,10 +45,10 @@ namespace YooAsset.Editor
             string filePath = bundleInfo.PackageSourceFilePath;
             return HashUtility.FileMD5(filePath);
         }
-        protected override string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
+        protected override uint GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            return HashUtility.FileCRC32(filePath);
+            return HashUtility.FileCRC32Value(filePath);
         }
         protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {

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

@@ -12,6 +12,11 @@ namespace YooAsset.Editor
         /// </summary>
         public ECompressOption CompressOption = ECompressOption.Uncompressed;
 
+        /// <summary>
+        /// 从文件头里剥离Unity版本信息
+        /// </summary>
+        public bool StripUnityVersion = false;
+
         /// <summary>
         /// 禁止写入类型树结构（可以降低包体和内存并提高加载效率）
         /// </summary>
@@ -41,6 +46,8 @@ 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

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

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

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

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

@@ -6,16 +6,16 @@ using UnityEngine;
 
 namespace YooAsset.Editor
 {
-    public class TaskCopyBuildinFiles_RFBP : TaskCopyBuildinFiles, IBuildTask
+    public class TaskCopyBuiltinFiles_RFBP : TaskCopyBuiltinFiles, IBuildTask
     {
         void IBuildTask.Run(BuildContext context)
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var buildParameters = buildParametersContext.Parameters;
             var manifestContext = context.GetContextObject<ManifestContext>();
-            if (buildParameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            if (buildParameters.BuiltinFileCopyOption != EBuiltinFileCopyOption.None)
             {
-                CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
+                CopyBuiltinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
             }
         }
     }

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

@@ -11,7 +11,7 @@ namespace YooAsset.Editor
         void IBuildTask.Run(BuildContext context)
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            if (buildParametersContext.Parameters.BuiltinFileCopyOption != EBuiltinFileCopyOption.None)
             {
                 CreateCatalogFile(buildParametersContext);
             }

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

@@ -27,10 +27,10 @@ namespace YooAsset.Editor
             string filePath = bundleInfo.PackageSourceFilePath;
             return HashUtility.FileMD5(filePath);
         }
-        protected override string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
+        protected override uint GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            return HashUtility.FileCRC32(filePath);
+            return HashUtility.FileCRC32Value(filePath);
         }
         protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {

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

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

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

@@ -6,15 +6,15 @@ using UnityEngine;
 
 namespace YooAsset.Editor
 {
-    public class TaskCopyBuildinFiles_SBP : TaskCopyBuildinFiles, IBuildTask
+    public class TaskCopyBuiltinFiles_SBP : TaskCopyBuiltinFiles, IBuildTask
     {
         void IBuildTask.Run(BuildContext context)
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
             var manifestContext = context.GetContextObject<ManifestContext>();
-            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            if (buildParametersContext.Parameters.BuiltinFileCopyOption != EBuiltinFileCopyOption.None)
             {
-                CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
+                CopyBuiltinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
             }
         }
     }

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

@@ -11,7 +11,7 @@ namespace YooAsset.Editor
         void IBuildTask.Run(BuildContext context)
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+            if (buildParametersContext.Parameters.BuiltinFileCopyOption != EBuiltinFileCopyOption.None)
             {
                 CreateCatalogFile(buildParametersContext);
             }

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

@@ -45,10 +45,10 @@ namespace YooAsset.Editor
             string filePath = bundleInfo.PackageSourceFilePath;
             return HashUtility.FileMD5(filePath);
         }
-        protected override string GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
+        protected override uint GetBundleFileCRC(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {
             string filePath = bundleInfo.PackageSourceFilePath;
-            return HashUtility.FileCRC32(filePath);
+            return HashUtility.FileCRC32Value(filePath);
         }
         protected override long GetBundleFileSize(BuildBundleInfo bundleInfo, BuildParametersContext buildParametersContext)
         {

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

@@ -15,7 +15,7 @@ namespace YooAsset.Editor
         public ECompressOption CompressOption = ECompressOption.Uncompressed;
 
         /// <summary>
-        /// 从AssetBundle文件头里剥离Unity版本信息
+        /// 从文件头里剥离Unity版本信息
         /// </summary>
         public bool StripUnityVersion = false;
 
@@ -25,10 +25,15 @@ namespace YooAsset.Editor
         public bool DisableWriteTypeTree = false;
 
         /// <summary>
-        /// 忽略类型树变化
+        /// 忽略类型树变化（无效参数）
         /// </summary>
         public bool IgnoreTypeTreeChanges = true;
 
+        /// <summary>
+        /// 自动建立资源对象对图集的依赖关系
+        /// </summary>
+        public bool TrackSpriteAtlasDependencies = false;
+
 
         /// <summary>
         /// 生成代码防裁剪配置
@@ -76,10 +81,9 @@ namespace YooAsset.Editor
                 throw new System.NotImplementedException(CompressOption.ToString());
 
             if (StripUnityVersion)
-                buildParams.ContentBuildFlags |= UnityEditor.Build.Content.ContentBuildFlags.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;
+                buildParams.ContentBuildFlags |= UnityEditor.Build.Content.ContentBuildFlags.DisableWriteTypeTree; //Do not include type information within the built content.
 
             buildParams.UseCache = true;
             buildParams.CacheServerHost = CacheServerHost;

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

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

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

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

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

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

@@ -10,7 +10,7 @@ namespace YooAsset.Editor
         PackageNameIsNullOrEmpty = 111,
         PackageVersionIsNullOrEmpty = 112,
         BuildOutputRootIsNullOrEmpty = 113,
-        BuildinFileRootIsNullOrEmpty = 114,
+        BuiltinFileRootIsNullOrEmpty = 114,
         PackageOutputDirectoryExists = 115,
         BuildPipelineIsNullOrEmpty = 116,
         BuildBundleTypeIsUnknown = 117,

Assets/YooAsset/Editor/AssetBundleBuilder/EBuiltinFileCopyOption.cs

@@ -4,7 +4,7 @@ namespace YooAsset.Editor
     /// <summary>
     /// 首包资源文件的拷贝方式
     /// </summary>
-    public enum EBuildinFileCopyOption
+    public enum EBuiltinFileCopyOption
     {
         /// <summary>
         /// 不拷贝任何文件

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

@@ -127,35 +127,35 @@ namespace YooAsset.Editor
             });
             UIElementsTools.SetElementLabelMinWidth(enumField, LabelMinWidth);
         }
-        protected void SetCopyBuildinFileOptionField(EnumField enumField, TextField tagField)
+        protected void SetCopyBuiltinFileOptionField(EnumField enumField, TextField tagField)
         {
             // 首包文件拷贝选项
-            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
-            enumField.Init(buildinFileCopyOption);
-            enumField.SetValueWithoutNotify(buildinFileCopyOption);
+            var builtinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyOption(PackageName, PipelineName);
+            enumField.Init(builtinFileCopyOption);
+            enumField.SetValueWithoutNotify(builtinFileCopyOption);
             enumField.style.width = StyleWidth;
             enumField.RegisterValueChangedCallback(evt =>
             {
-                AssetBundleBuilderSetting.SetPackageBuildinFileCopyOption(PackageName, PipelineName, (EBuildinFileCopyOption)enumField.value);
+                AssetBundleBuilderSetting.SetPackageBuiltinFileCopyOption(PackageName, PipelineName, (EBuiltinFileCopyOption)enumField.value);
 
                 // 设置内置资源标签显隐
-                SetCopyBuildinFileTagsVisible(tagField);
+                SetCopyBuiltinFileTagsVisible(tagField);
             });
             UIElementsTools.SetElementLabelMinWidth(enumField, LabelMinWidth);
         }
-        protected void SetCopyBuildinFileTagsVisible(TextField tagField)
+        protected void SetCopyBuiltinFileTagsVisible(TextField tagField)
         {
-            var option = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
-            tagField.visible = option == EBuildinFileCopyOption.ClearAndCopyByTags || option == EBuildinFileCopyOption.OnlyCopyByTags;
+            var option = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyOption(PackageName, PipelineName);
+            tagField.visible = option == EBuiltinFileCopyOption.ClearAndCopyByTags || option == EBuiltinFileCopyOption.OnlyCopyByTags;
         }
-        protected void SetCopyBuildinFileTagsField(TextField textField)
+        protected void SetCopyBuiltinFileTagsField(TextField textField)
         {
             // 首包文件拷贝参数
-            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName);
-            textField.SetValueWithoutNotify(buildinFileCopyParams);
+            var builtinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyParams(PackageName, PipelineName);
+            textField.SetValueWithoutNotify(builtinFileCopyParams);
             textField.RegisterValueChangedCallback(evt =>
             {
-                AssetBundleBuilderSetting.SetPackageBuildinFileCopyParams(PackageName, PipelineName, textField.value);
+                AssetBundleBuilderSetting.SetPackageBuiltinFileCopyParams(PackageName, PipelineName, textField.value);
             });
             UIElementsTools.SetElementLabelMinWidth(textField, LabelMinWidth);
         }

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

@@ -21,8 +21,8 @@ namespace YooAsset.Editor
         protected PopupField<Type> _manifestRestoreServicesField;
         protected EnumField _compressionField;
         protected EnumField _outputNameStyleField;
-        protected EnumField _copyBuildinFileOptionField;
-        protected TextField _copyBuildinFileTagsField;
+        protected EnumField _copyBuiltinFileOptionField;
+        protected TextField _copyBuiltinFileTagsField;
         protected Toggle _clearBuildCacheToggle;
         protected Toggle _useAssetDependencyDBToggle;
 
@@ -60,13 +60,13 @@ namespace YooAsset.Editor
             SetOutputNameStyleField(_outputNameStyleField);
 
             // 首包文件拷贝参数
-            _copyBuildinFileTagsField = Root.Q<TextField>("CopyBuildinFileParam");
-            SetCopyBuildinFileTagsField(_copyBuildinFileTagsField);
-            SetCopyBuildinFileTagsVisible(_copyBuildinFileTagsField);
+            _copyBuiltinFileTagsField = Root.Q<TextField>("CopyBuiltinFileParam");
+            SetCopyBuiltinFileTagsField(_copyBuiltinFileTagsField);
+            SetCopyBuiltinFileTagsVisible(_copyBuiltinFileTagsField);
 
             // 首包文件拷贝选项
-            _copyBuildinFileOptionField = Root.Q<EnumField>("CopyBuildinFileOption");
-            SetCopyBuildinFileOptionField(_copyBuildinFileOptionField, _copyBuildinFileTagsField);
+            _copyBuiltinFileOptionField = Root.Q<EnumField>("CopyBuiltinFileOption");
+            SetCopyBuiltinFileOptionField(_copyBuiltinFileOptionField, _copyBuiltinFileTagsField);
 
             // 清理构建缓存
             _clearBuildCacheToggle = Root.Q<Toggle>("ClearBuildCache");
@@ -99,15 +99,15 @@ namespace YooAsset.Editor
         protected virtual void ExecuteBuild()
         {
             var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, PipelineName);
-            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
-            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName);
+            var builtinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyOption(PackageName, PipelineName);
+            var builtinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyParams(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.BuiltinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
             buildParameters.BuildPipeline = PipelineName.ToString();
             buildParameters.BuildBundleType = (int)EBuildBundleType.AssetBundle;
             buildParameters.BuildTarget = BuildTarget;
@@ -116,8 +116,8 @@ namespace YooAsset.Editor
             buildParameters.EnableSharePackRule = true;
             buildParameters.VerifyBuildingResult = true;
             buildParameters.FileNameStyle = fileNameStyle;
-            buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
-            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
+            buildParameters.BuiltinFileCopyOption = builtinFileCopyOption;
+            buildParameters.BuiltinFileCopyParams = builtinFileCopyParams;
             buildParameters.CompressOption = compressOption;
             buildParameters.ClearBuildCacheFiles = clearBuildCache;
             buildParameters.UseAssetDependencyDB = useAssetDependencyDB;

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

@@ -7,8 +7,8 @@
         <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" />
+        <uie:EnumField label="Copy Builtin File Option" value="Center" name="CopyBuiltinFileOption" />
+        <ui:TextField picking-mode="Ignore" label="Copy Builtin File Param" name="CopyBuiltinFileParam" />
         <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>

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

@@ -59,12 +59,12 @@ namespace YooAsset.Editor
         protected virtual void ExecuteBuild()
         {
             var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, PipelineName);
-            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
-            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName);
+            var builtinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyOption(PackageName, PipelineName);
+            var builtinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyParams(PackageName, PipelineName);
 
             EditorSimulateBuildParameters buildParameters = new EditorSimulateBuildParameters();
             buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-            buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+            buildParameters.BuiltinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
             buildParameters.BuildPipeline = PipelineName.ToString();
             buildParameters.BuildBundleType = (int)EBuildBundleType.VirtualBundle;
             buildParameters.BuildTarget = BuildTarget;
@@ -72,8 +72,8 @@ namespace YooAsset.Editor
             buildParameters.PackageVersion = _buildVersionField.value;
             buildParameters.VerifyBuildingResult = true;
             buildParameters.FileNameStyle = fileNameStyle;
-            buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
-            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
+            buildParameters.BuiltinFileCopyOption = builtinFileCopyOption;
+            buildParameters.BuiltinFileCopyParams = builtinFileCopyParams;
 
             EditorSimulateBuildPipeline pipeline = new EditorSimulateBuildPipeline();
             var buildResult = pipeline.Run(buildParameters, true);

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

@@ -20,8 +20,8 @@ namespace YooAsset.Editor
         protected PopupField<Type> _manifestProcessServicesField;
         protected PopupField<Type> _manifestRestoreServicesField;
         protected EnumField _outputNameStyleField;
-        protected EnumField _copyBuildinFileOptionField;
-        protected TextField _copyBuildinFileTagsField;
+        protected EnumField _copyBuiltinFileOptionField;
+        protected TextField _copyBuiltinFileTagsField;
         protected Toggle _clearBuildCacheToggle;
         protected Toggle _useAssetDependencyDBToggle;
 
@@ -55,13 +55,13 @@ namespace YooAsset.Editor
             SetOutputNameStyleField(_outputNameStyleField);
 
             // 首包文件拷贝参数
-            _copyBuildinFileTagsField = Root.Q<TextField>("CopyBuildinFileParam");
-            SetCopyBuildinFileTagsField(_copyBuildinFileTagsField);
-            SetCopyBuildinFileTagsVisible(_copyBuildinFileTagsField);
+            _copyBuiltinFileTagsField = Root.Q<TextField>("CopyBuiltinFileParam");
+            SetCopyBuiltinFileTagsField(_copyBuiltinFileTagsField);
+            SetCopyBuiltinFileTagsVisible(_copyBuiltinFileTagsField);
 
             // 首包文件拷贝选项
-            _copyBuildinFileOptionField = Root.Q<EnumField>("CopyBuildinFileOption");
-            SetCopyBuildinFileOptionField(_copyBuildinFileOptionField, _copyBuildinFileTagsField);
+            _copyBuiltinFileOptionField = Root.Q<EnumField>("CopyBuiltinFileOption");
+            SetCopyBuiltinFileOptionField(_copyBuiltinFileOptionField, _copyBuiltinFileTagsField);
 
             // 清理构建缓存
             _clearBuildCacheToggle = Root.Q<Toggle>("ClearBuildCache");
@@ -94,14 +94,14 @@ namespace YooAsset.Editor
         protected virtual void ExecuteBuild()
         {
             var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, PipelineName);
-            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
-            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName);
+            var builtinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyOption(PackageName, PipelineName);
+            var builtinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyParams(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.BuiltinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
             buildParameters.BuildPipeline = PipelineName.ToString();
             buildParameters.BuildBundleType = (int)EBuildBundleType.RawBundle;
             buildParameters.BuildTarget = BuildTarget;
@@ -109,8 +109,8 @@ namespace YooAsset.Editor
             buildParameters.PackageVersion = _buildVersionField.value;
             buildParameters.VerifyBuildingResult = true;
             buildParameters.FileNameStyle = fileNameStyle;
-            buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
-            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
+            buildParameters.BuiltinFileCopyOption = builtinFileCopyOption;
+            buildParameters.BuiltinFileCopyParams = builtinFileCopyParams;
             buildParameters.ClearBuildCacheFiles = clearBuildCache;
             buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
             buildParameters.EncryptionServices = CreateEncryptionServicesInstance();

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

@@ -6,8 +6,8 @@
         <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" />
+        <uie:EnumField label="Copy Builtin File Option" value="Center" name="CopyBuiltinFileOption" />
+        <ui:TextField picking-mode="Ignore" label="Copy Builtin File Param" name="CopyBuiltinFileParam" />
         <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>

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

@@ -21,8 +21,8 @@ namespace YooAsset.Editor
         protected PopupField<Type> _manifestRestoreServicesField;
         protected EnumField _compressionField;
         protected EnumField _outputNameStyleField;
-        protected EnumField _copyBuildinFileOptionField;
-        protected TextField _copyBuildinFileTagsField;
+        protected EnumField _copyBuiltinFileOptionField;
+        protected TextField _copyBuiltinFileTagsField;
         protected Toggle _clearBuildCacheToggle;
         protected Toggle _useAssetDependencyDBToggle;
 
@@ -60,13 +60,13 @@ namespace YooAsset.Editor
             SetOutputNameStyleField(_outputNameStyleField);
 
             // 首包文件拷贝参数
-            _copyBuildinFileTagsField = Root.Q<TextField>("CopyBuildinFileParam");
-            SetCopyBuildinFileTagsField(_copyBuildinFileTagsField);
-            SetCopyBuildinFileTagsVisible(_copyBuildinFileTagsField);
+            _copyBuiltinFileTagsField = Root.Q<TextField>("CopyBuiltinFileParam");
+            SetCopyBuiltinFileTagsField(_copyBuiltinFileTagsField);
+            SetCopyBuiltinFileTagsVisible(_copyBuiltinFileTagsField);
 
             // 首包文件拷贝选项
-            _copyBuildinFileOptionField = Root.Q<EnumField>("CopyBuildinFileOption");
-            SetCopyBuildinFileOptionField(_copyBuildinFileOptionField, _copyBuildinFileTagsField);
+            _copyBuiltinFileOptionField = Root.Q<EnumField>("CopyBuiltinFileOption");
+            SetCopyBuiltinFileOptionField(_copyBuiltinFileOptionField, _copyBuiltinFileTagsField);
 
             // 清理构建缓存
             _clearBuildCacheToggle = Root.Q<Toggle>("ClearBuildCache");
@@ -99,16 +99,15 @@ namespace YooAsset.Editor
         protected virtual void ExecuteBuild()
         {
             var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, PipelineName);
-            var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, PipelineName);
-            var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, PipelineName);
+            var builtinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyOption(PackageName, PipelineName);
+            var builtinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuiltinFileCopyParams(PackageName, PipelineName);
             var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, PipelineName);
             var clearBuildCache = AssetBundleBuilderSetting.GetPackageClearBuildCache(PackageName, PipelineName);
             var useAssetDependencyDB = AssetBundleBuilderSetting.GetPackageUseAssetDependencyDB(PackageName, PipelineName);
-            var builtinShaderBundleName = GetBuiltinShaderBundleName();
 
             ScriptableBuildParameters buildParameters = new ScriptableBuildParameters();
             buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-            buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+            buildParameters.BuiltinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
             buildParameters.BuildPipeline = PipelineName.ToString();
             buildParameters.BuildBundleType = (int)EBuildBundleType.AssetBundle;
             buildParameters.BuildTarget = BuildTarget;
@@ -117,15 +116,15 @@ namespace YooAsset.Editor
             buildParameters.EnableSharePackRule = true;
             buildParameters.VerifyBuildingResult = true;
             buildParameters.FileNameStyle = fileNameStyle;
-            buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
-            buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
+            buildParameters.BuiltinFileCopyOption = builtinFileCopyOption;
+            buildParameters.BuiltinFileCopyParams = builtinFileCopyParams;
             buildParameters.CompressOption = compressOption;
             buildParameters.ClearBuildCacheFiles = clearBuildCache;
             buildParameters.UseAssetDependencyDB = useAssetDependencyDB;
-            buildParameters.BuiltinShadersBundleName = builtinShaderBundleName;
             buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
             buildParameters.ManifestProcessServices = CreateManifestProcessServicesInstance();
             buildParameters.ManifestRestoreServices = CreateManifestRestoreServicesInstance();
+            buildParameters.BuiltinShadersBundleName = GetBuiltinShaderBundleName();
 
             ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();
             var buildResult = pipeline.Run(buildParameters, true);
@@ -143,6 +142,16 @@ namespace YooAsset.Editor
             var packRuleResult = DefaultPackRule.CreateShadersPackRuleResult();
             return packRuleResult.GetBundleName(PackageName, uniqueBundleName);
         }
+
+        /// <summary>
+        /// Mono脚本的资源包名称
+        /// </summary>
+        protected string GetMonoScriptsBundleName()
+        {
+            var uniqueBundleName = AssetBundleCollectorSettingData.Setting.UniqueBundleName;
+            var packRuleResult = DefaultPackRule.CreateMonosPackRuleResult();
+            return packRuleResult.GetBundleName(PackageName, uniqueBundleName);
+        }
     }
 }
 #endif

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

@@ -7,8 +7,8 @@
         <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" />
+        <uie:EnumField label="Copy Builtin File Option" value="Center" name="CopyBuiltinFileOption" />
+        <ui:TextField picking-mode="Ignore" label="Copy Builtin File Param" name="CopyBuiltinFileParam" />
         <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>

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs

@@ -139,10 +139,17 @@ namespace YooAsset.Editor
         /// </summary>
         public List<CollectAssetInfo> GetAllCollectAssets(CollectCommand command, AssetBundleCollectorGroup group)
         {
-            // 注意：模拟构建模式下只收集主资源
-            if (command.SimulateBuild)
+            bool ignoreStaticCollector = command.IsFlagSet(ECollectFlags.IgnoreStaticCollector);
+            if (ignoreStaticCollector)
             {
-                if (CollectorType != ECollectorType.MainAssetCollector)
+                if (CollectorType == ECollectorType.StaticAssetCollector)
+                    return new List<CollectAssetInfo>();
+            }
+
+            bool ignoreDependCollector = command.IsFlagSet(ECollectFlags.IgnoreDependCollector);
+            if (ignoreDependCollector)
+            {
+                if (CollectorType == ECollectorType.DependAssetCollector)
                     return new List<CollectAssetInfo>();
             }
 
@@ -152,8 +159,10 @@ namespace YooAsset.Editor
             List<string> findAssets = new List<string>();
             if (AssetDatabase.IsValidFolder(CollectPath))
             {
-                string collectDirectory = CollectPath;
-                string[] findResult = EditorTools.FindAssets(EAssetSearchType.All, collectDirectory);
+                IFilterRule filterRuleInstance = AssetBundleCollectorSettingData.GetFilterRuleInstance(FilterRuleName);
+                string findAssetType = filterRuleInstance.FindAssetType;
+                string searchFolder = CollectPath;
+                string[] findResult = EditorTools.FindAssets(findAssetType, searchFolder);
                 findAssets.AddRange(findResult);
             }
             else
@@ -269,8 +278,8 @@ namespace YooAsset.Editor
         }
         private List<AssetInfo> GetAllDependencies(CollectCommand command, string mainAssetPath)
         {
-            // 注意：模拟构建模式下不需要收集依赖资源
-            if (command.SimulateBuild)
+            bool ignoreGetDependencies = command.IsFlagSet(ECollectFlags.IgnoreGetDependencies);
+            if (ignoreGetDependencies)
                 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 = "v2.1";
+        public const string ConfigVersion = "v2025.8.28";
 
         public const string XmlVersion = "Version";
         public const string XmlCommon = "Common";
@@ -23,6 +23,7 @@ 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";
@@ -99,6 +100,7 @@ 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);
@@ -211,6 +213,7 @@ 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);
@@ -275,6 +278,23 @@ 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,6 +25,11 @@ namespace YooAsset.Editor
         /// </summary>
         public bool EnableAddressable = false;
 
+        /// <summary>
+        /// 支持无后缀名的资源定位地址
+        /// </summary>
+        public bool SupportExtensionless = true;
+
         /// <summary>
         /// 资源定位地址大小写不敏感
         /// </summary>

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs

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

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

@@ -38,6 +38,7 @@ namespace YooAsset.Editor
 
         private VisualElement _setting2Container;
         private Toggle _enableAddressableToogle;
+        private Toggle _supportExtensionlessToogle;
         private Toggle _locationToLowerToogle;
         private Toggle _includeAssetGUIDToogle;
         private Toggle _autoCollectShadersToogle;
@@ -131,6 +132,17 @@ 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 =>
                 {
@@ -487,6 +499,7 @@ 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);
@@ -831,7 +844,7 @@ namespace YooAsset.Editor
                 var foldout = new Foldout();
                 foldout.name = "Foldout1";
                 foldout.value = false;
-                foldout.text = "Main Assets";
+                foldout.text = "Assets";
                 elementFoldout.Add(foldout);
             }
 
@@ -864,11 +877,9 @@ namespace YooAsset.Editor
             var foldout = element.Q<Foldout>("Foldout1");
             foldout.RegisterValueChangedCallback(evt =>
             {
-                if (evt.newValue)
-                    RefreshFoldout(foldout, selectGroup, collector);
-                else
-                    foldout.Clear();
+                RefreshFoldoutContent(foldout, selectGroup, collector);
             });
+            RefreshFoldoutName(foldout, collector.CollectorType);
 
             // Remove Button
             var removeBtn = element.Q<Button>("Button1");
@@ -885,10 +896,7 @@ namespace YooAsset.Editor
                 collector.CollectPath = AssetDatabase.GetAssetPath(evt.newValue);
                 collector.CollectorGUID = AssetDatabase.AssetPathToGUID(collector.CollectPath);
                 AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
-                if (foldout.value)
-                {
-                    RefreshFoldout(foldout, selectGroup, collector);
-                }
+                RefreshFoldoutContent(foldout, selectGroup, collector);
             });
             UIElementsTools.RefreshObjectFieldShowPath(objectField1);
 
@@ -899,10 +907,7 @@ namespace YooAsset.Editor
             {
                 collector.CollectorType = EditorTools.NameToEnum<ECollectorType>(evt.newValue);
                 AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
-                if (foldout.value)
-                {
-                    RefreshFoldout(foldout, selectGroup, collector);
-                }
+                RefreshFoldoutContent(foldout, selectGroup, collector);
 
                 if (collector.CollectorType == ECollectorType.MainAssetCollector)
                     textTags.SetEnabled(true);
@@ -921,10 +926,7 @@ namespace YooAsset.Editor
                 {
                     collector.AddressRuleName = evt.newValue.ClassName;
                     AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
-                    if (foldout.value)
-                    {
-                        RefreshFoldout(foldout, selectGroup, collector);
-                    }
+                    RefreshFoldoutContent(foldout, selectGroup, collector);
                 });
             }
 
@@ -937,10 +939,7 @@ namespace YooAsset.Editor
             {
                 collector.PackRuleName = evt.newValue.ClassName;
                 AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
-                if (foldout.value)
-                {
-                    RefreshFoldout(foldout, selectGroup, collector);
-                }
+                RefreshFoldoutContent(foldout, selectGroup, collector);
             });
 
             // Filter Rule
@@ -952,10 +951,7 @@ namespace YooAsset.Editor
             {
                 collector.FilterRuleName = evt.newValue.ClassName;
                 AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
-                if (foldout.value)
-                {
-                    RefreshFoldout(foldout, selectGroup, collector);
-                }
+                RefreshFoldoutContent(foldout, selectGroup, collector);
             });
 
             // UserData
@@ -976,61 +972,101 @@ namespace YooAsset.Editor
                 AssetBundleCollectorSettingData.ModifyCollector(selectGroup, collector);
             });
         }
-        private void RefreshFoldout(Foldout foldout, AssetBundleCollectorGroup group, AssetBundleCollector collector)
+        private void RefreshFoldoutName(Foldout foldout, ECollectorType collectorType, int elementNumber = -1)
         {
+            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;
             }
 
-            if (collector.CollectorType == ECollectorType.MainAssetCollector || collector.CollectorType == ECollectorType.StaticAssetCollector)
+            List<CollectAssetInfo> collectAssetInfos = null;
+
+            try
             {
-                List<CollectAssetInfo> collectAssetInfos = null;
+                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;
 
-                try
+                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)
                 {
-                    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;
+                    VisualElement elementRow = new VisualElement();
+                    elementRow.style.flexDirection = FlexDirection.Row;
+                    foldout.Add(elementRow);
 
-                    collector.CheckConfigError();
-                    collectAssetInfos = collector.GetAllCollectAssets(command, group);
-                }
-                catch (System.Exception e)
-                {
-                    Debug.LogError(e.ToString());
-                }
+                    string showInfo = collectAsset.AssetInfo.AssetPath;
+                    if (showAdress)
+                        showInfo = $"[{collectAsset.Address}] {collectAsset.AssetInfo.AssetPath}";
 
-                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);
-                    }
+                    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,6 +19,7 @@
             <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;" />

Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs

@@ -1,6 +1,26 @@
 
 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>
@@ -17,7 +37,20 @@ namespace YooAsset.Editor
         /// <summary>
         /// 模拟构建模式
         /// </summary>
-        public bool SimulateBuild { set; get; }
+        public bool SimulateBuild
+        {
+            set
+            {
+                SetFlag(ECollectFlags.IgnoreGetDependencies, value);
+                SetFlag(ECollectFlags.IgnoreStaticCollector, value);
+                SetFlag(ECollectFlags.IgnoreDependCollector, value);
+            }
+        }
+
+        /// <summary>
+        /// 窗口收集模式
+        /// </summary>
+        public int CollectFlags { set; get; } = 0;
 
         /// <summary>
         /// 资源包名唯一化
@@ -34,6 +67,11 @@ namespace YooAsset.Editor
         /// </summary>
         public bool EnableAddressable { set; get; }
 
+        /// <summary>
+        /// 支持无后缀名的资源定位地址
+        /// </summary>
+        public bool SupportExtensionless { set; get; }
+
         /// <summary>
         /// 资源定位地址大小写不敏感
         /// </summary>
@@ -65,5 +103,24 @@ 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,7 +23,13 @@ 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,6 +9,11 @@ namespace YooAsset.Editor
     [DisplayName("收集所有资源")]
     public class CollectAll : IFilterRule
     {
+        public string FindAssetType
+        {
+            get { return EAssetSearchType.All.ToString(); }
+        }
+
         public bool IsCollectAsset(FilterRuleData data)
         {
             return true;
@@ -18,6 +23,11 @@ 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);
@@ -28,6 +38,11 @@ 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";
@@ -37,6 +52,11 @@ 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);
@@ -58,6 +78,11 @@ 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";
@@ -67,6 +92,11 @@ 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,16 +17,25 @@ namespace YooAsset.Editor
         public const string RawFileExtension = "rawfile";
 
         /// <summary>
-        /// Unity着色器资源包名称
+        /// 默认的Unity着色器资源包名称
         /// </summary>
         public const string ShadersBundleName = "unityshaders";
 
+        /// <summary>
+        /// 默认的Unity脚本资源包名称
+        /// </summary>
+        public const string MonosBundleName = "unitymonos";
 
         public static PackRuleResult CreateShadersPackRuleResult()
         {
             PackRuleResult result = new PackRuleResult(ShadersBundleName, AssetBundleFileExtension);
             return result;
         }
+        public static PackRuleResult CreateMonosPackRuleResult()
+        {
+            PackRuleResult result = new PackRuleResult(MonosBundleName, AssetBundleFileExtension);
+            return result;
+        }
     }
 
     /// <summary>

Assets/YooAsset/Editor/AssetBundleReporter/ReportBundleInfo.cs

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

Assets/YooAsset/Editor/AssetBundleReporter/ReportSummary.cs

@@ -61,6 +61,7 @@ namespace YooAsset.Editor
         // 收集器配置
         public bool UniqueBundleName;
         public bool EnableAddressable;
+        public bool SupportExtensionless;
         public bool LocationToLower;
         public bool IncludeAssetGUID;
         public bool AutoCollectShaders;

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

@@ -55,6 +55,7 @@ namespace YooAsset.Editor
             BindListViewHeader("Collect Settings");
             BindListViewItem("Unique Bundle Name", $"{buildReport.Summary.UniqueBundleName}");
             BindListViewItem("Enable Addressable", $"{buildReport.Summary.EnableAddressable}");
+            BindListViewItem("Support Extensionless", $"{buildReport.Summary.SupportExtensionless}");
             BindListViewItem("Location To Lower", $"{buildReport.Summary.LocationToLower}");
             BindListViewItem("Include Asset GUID", $"{buildReport.Summary.IncludeAssetGUID}");
             BindListViewItem("Auto Collect Shaders", $"{buildReport.Summary.AutoCollectShaders}");

Assets/YooAsset/Editor/Common/AssetInfo.cs

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

Assets/YooAsset/Editor/EditorDefine.cs

@@ -39,6 +39,7 @@ namespace YooAsset.Editor
         Shader,
         Sprite,
         Texture,
+        RenderTexture,
         VideoClip,
     }
 

Assets/YooAsset/Editor/EditorTools.cs

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

Assets/YooAsset/Runtime/DownloadSystem/DownloadSystemHelper.cs

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

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

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

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

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

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

@@ -1,131 +0,0 @@
-using System;
-using System.IO;
-
-namespace YooAsset
-{
-    internal class DBFSInitializeOperation : FSInitializeFileSystemOperation
-    {
-        private enum ESteps
-        {
-            None,
-            CopyBuildinManifest,
-            InitUnpackFileSystem,
-            LoadCatalogFile,
-            Done,
-        }
-
-        private readonly DefaultBuildinFileSystem _fileSystem;
-        private CopyBuildinPackageManifestOperation _copyBuildinPackageManifestOp;
-        private FSInitializeFileSystemOperation _initUnpackFIleSystemOp;
-        private LoadBuildinCatalogFileOperation _loadBuildinCatalogFileOp;
-        private ESteps _steps = ESteps.None;
-
-        internal DBFSInitializeOperation(DefaultBuildinFileSystem fileSystem)
-        {
-            _fileSystem = fileSystem;
-        }
-        internal override void InternalStart()
-        {
-#if UNITY_WEBGL
-            _steps = ESteps.Done;
-            Status = EOperationStatus.Failed;
-            Error = $"{nameof(DefaultBuildinFileSystem)} is not support WEBGL platform !";
-#else
-            if (_fileSystem.CopyBuildinPackageManifest)
-                _steps = ESteps.CopyBuildinManifest;
-            else
-                _steps = ESteps.InitUnpackFileSystem;
-#endif
-        }
-        internal override void InternalUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.CopyBuildinManifest)
-            {
-                if (_copyBuildinPackageManifestOp == null)
-                {
-                    _copyBuildinPackageManifestOp = new CopyBuildinPackageManifestOperation(_fileSystem);
-                    _copyBuildinPackageManifestOp.StartOperation();
-                    AddChildOperation(_copyBuildinPackageManifestOp);
-                }
-
-                _copyBuildinPackageManifestOp.UpdateOperation();
-                if (_copyBuildinPackageManifestOp.IsDone == false)
-                    return;
-
-                if (_copyBuildinPackageManifestOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.InitUnpackFileSystem;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _copyBuildinPackageManifestOp.Error;
-                }
-            }
-
-            if (_steps == ESteps.InitUnpackFileSystem)
-            {
-                if (_initUnpackFIleSystemOp == null)
-                {
-                    _initUnpackFIleSystemOp = _fileSystem.InitializeUpackFileSystem();
-                    _initUnpackFIleSystemOp.StartOperation();
-                    AddChildOperation(_initUnpackFIleSystemOp);
-                }
-
-                _initUnpackFIleSystemOp.UpdateOperation();
-                Progress = _initUnpackFIleSystemOp.Progress;
-                if (_initUnpackFIleSystemOp.IsDone == false)
-                    return;
-
-                if (_initUnpackFIleSystemOp.Status == EOperationStatus.Succeed)
-                {
-                    if (_fileSystem.DisableCatalogFile)
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Succeed;
-                    }
-                    else
-                    {
-                        _steps = ESteps.LoadCatalogFile;
-                    }
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _initUnpackFIleSystemOp.Error;
-                }
-            }
-
-            if (_steps == ESteps.LoadCatalogFile)
-            {
-                if (_loadBuildinCatalogFileOp == null)
-                {
-                    _loadBuildinCatalogFileOp = new LoadBuildinCatalogFileOperation(_fileSystem);
-                    _loadBuildinCatalogFileOp.StartOperation();
-                    AddChildOperation(_loadBuildinCatalogFileOp);
-                }
-
-                _loadBuildinCatalogFileOp.UpdateOperation();
-                if (_loadBuildinCatalogFileOp.IsDone == false)
-                    return;
-
-                if (_loadBuildinCatalogFileOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _loadBuildinCatalogFileOp.Error;
-                }
-            }
-        }
-    }
-}

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

@@ -1,89 +0,0 @@
-
-namespace YooAsset
-{
-    internal class DBFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
-    {
-        private enum ESteps
-        {
-            None,
-            RequestBuildinPackageHash,
-            LoadBuildinPackageManifest,
-            Done,
-        }
-
-        private readonly DefaultBuildinFileSystem _fileSystem;
-        private readonly string _packageVersion;
-        private RequestBuildinPackageHashOperation _requestBuildinPackageHashOp;
-        private LoadBuildinPackageManifestOperation _loadBuildinPackageManifestOp;
-        private ESteps _steps = ESteps.None;
-
-
-        public DBFSLoadPackageManifestOperation(DefaultBuildinFileSystem fileSystem, string packageVersion)
-        {
-            _fileSystem = fileSystem;
-            _packageVersion = packageVersion;
-        }
-        internal override void InternalStart()
-        {
-            _steps = ESteps.RequestBuildinPackageHash;
-        }
-        internal override void InternalUpdate()
-        {
-            if (_steps == ESteps.None || _steps == ESteps.Done)
-                return;
-
-            if (_steps == ESteps.RequestBuildinPackageHash)
-            {
-                if (_requestBuildinPackageHashOp == null)
-                {
-                    _requestBuildinPackageHashOp = new RequestBuildinPackageHashOperation(_fileSystem, _packageVersion);
-                    _requestBuildinPackageHashOp.StartOperation();
-                    AddChildOperation(_requestBuildinPackageHashOp);
-                }
-
-                _requestBuildinPackageHashOp.UpdateOperation();
-                if (_requestBuildinPackageHashOp.IsDone == false)
-                    return;
-
-                if (_requestBuildinPackageHashOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.LoadBuildinPackageManifest;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _requestBuildinPackageHashOp.Error;
-                }
-            }
-
-            if (_steps == ESteps.LoadBuildinPackageManifest)
-            {
-                if (_loadBuildinPackageManifestOp == null)
-                {
-                    string packageHash = _requestBuildinPackageHashOp.PackageHash;
-                    _loadBuildinPackageManifestOp = new LoadBuildinPackageManifestOperation(_fileSystem, _packageVersion, packageHash);
-                    _loadBuildinPackageManifestOp.StartOperation();
-                    AddChildOperation(_loadBuildinPackageManifestOp);
-                }
-
-                _loadBuildinPackageManifestOp.UpdateOperation();
-                if (_loadBuildinPackageManifestOp.IsDone == false)
-                    return;
-
-                if (_loadBuildinPackageManifestOp.Status == EOperationStatus.Succeed)
-                {
-                    _steps = ESteps.Done;
-                    Manifest = _loadBuildinPackageManifestOp.Manifest;
-                    Status = EOperationStatus.Succeed;
-                }
-                else
-                {
-                    _steps = ESteps.Done;
-                    Status = EOperationStatus.Failed;
-                    Error = _loadBuildinPackageManifestOp.Error;
-                }
-            }
-        }
-    }
-}

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

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

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

@@ -53,10 +53,10 @@ namespace YooAsset
             }
 
             // 创建内置清单实例
-            var buildinFileCatalog = new DefaultBuildinFileCatalog();
-            buildinFileCatalog.FileVersion = CatalogDefine.FileVersion;
-            buildinFileCatalog.PackageName = packageName;
-            buildinFileCatalog.PackageVersion = packageVersion;
+            var builtinFileCatalog = new DefaultBuiltinFileCatalog();
+            builtinFileCatalog.FileVersion = CatalogDefine.FileVersion;
+            builtinFileCatalog.PackageName = packageName;
+            builtinFileCatalog.PackageVersion = packageVersion;
 
             // 创建白名单查询集合
             HashSet<string> whiteFileList = new HashSet<string>
@@ -68,8 +68,8 @@ namespace YooAsset
                 $"{packageName}_{packageVersion}.hash",
                 $"{packageName}_{packageVersion}.json",
                 $"{packageName}_{packageVersion}.report",
-                DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName,
-                DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName
+                DefaultBuiltinFileSystemDefine.BuiltinCatalogJsonFileName,
+                DefaultBuiltinFileSystemDefine.BuiltinCatalogBinaryFileName
             };
 
             // 记录所有内置资源文件
@@ -86,10 +86,10 @@ namespace YooAsset
                 string fileName = fileInfo.Name;
                 if (fileMapping.TryGetValue(fileName, out string bundleGUID))
                 {
-                    var wrapper = new DefaultBuildinFileCatalog.FileWrapper();
+                    var wrapper = new DefaultBuiltinFileCatalog.FileWrapper();
                     wrapper.BundleGUID = bundleGUID;
                     wrapper.FileName = fileName;
-                    buildinFileCatalog.Wrappers.Add(wrapper);
+                    builtinFileCatalog.Wrappers.Add(wrapper);
                 }
                 else
                 {
@@ -98,16 +98,16 @@ namespace YooAsset
             }
 
             // 创建输出文件
-            string jsonFilePath = $"{packageDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName}";
+            string jsonFilePath = $"{packageDirectory}/{DefaultBuiltinFileSystemDefine.BuiltinCatalogJsonFileName}";
             if (File.Exists(jsonFilePath))
                 File.Delete(jsonFilePath);
-            SerializeToJson(jsonFilePath, buildinFileCatalog);
+            SerializeToJson(jsonFilePath, builtinFileCatalog);
 
             // 创建输出文件
-            string binaryFilePath = $"{packageDirectory}/{DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName}";
+            string binaryFilePath = $"{packageDirectory}/{DefaultBuiltinFileSystemDefine.BuiltinCatalogBinaryFileName}";
             if (File.Exists(binaryFilePath))
                 File.Delete(binaryFilePath);
-            SerializeToBinary(binaryFilePath, buildinFileCatalog);
+            SerializeToBinary(binaryFilePath, builtinFileCatalog);
 
             UnityEditor.AssetDatabase.Refresh();
             Debug.Log($"Succeed to save catalog file : {binaryFilePath}");
@@ -118,7 +118,7 @@ namespace YooAsset
         /// <summary>
         /// 序列化（JSON文件）
         /// </summary>
-        public static void SerializeToJson(string savePath, DefaultBuildinFileCatalog catalog)
+        public static void SerializeToJson(string savePath, DefaultBuiltinFileCatalog catalog)
         {
             string json = JsonUtility.ToJson(catalog, true);
             FileUtility.WriteAllText(savePath, json);
@@ -127,15 +127,15 @@ namespace YooAsset
         /// <summary>
         /// 反序列化（JSON文件）
         /// </summary>
-        public static DefaultBuildinFileCatalog DeserializeFromJson(string jsonContent)
+        public static DefaultBuiltinFileCatalog DeserializeFromJson(string jsonContent)
         {
-            return JsonUtility.FromJson<DefaultBuildinFileCatalog>(jsonContent);
+            return JsonUtility.FromJson<DefaultBuiltinFileCatalog>(jsonContent);
         }
 
         /// <summary>
         /// 序列化（二进制文件）
         /// </summary>
-        public static void SerializeToBinary(string savePath, DefaultBuildinFileCatalog catalog)
+        public static void SerializeToBinary(string savePath, DefaultBuiltinFileCatalog catalog)
         {
             using (FileStream fs = new FileStream(savePath, FileMode.Create))
             {
@@ -170,7 +170,7 @@ namespace YooAsset
         /// <summary>
         /// 反序列化（二进制文件）
         /// </summary>
-        public static DefaultBuildinFileCatalog DeserializeFromBinary(byte[] binaryData)
+        public static DefaultBuiltinFileCatalog DeserializeFromBinary(byte[] binaryData)
         {
             // 创建缓存器
             BufferReader buffer = new BufferReader(binaryData);
@@ -185,7 +185,7 @@ namespace YooAsset
             if (fileVersion != CatalogDefine.FileVersion)
                 throw new Exception($"The catalog file version are not compatible : {fileVersion} != {CatalogDefine.FileVersion}");
 
-            DefaultBuildinFileCatalog catalog = new DefaultBuildinFileCatalog();
+            DefaultBuiltinFileCatalog catalog = new DefaultBuiltinFileCatalog();
             {
                 // 读取文件头信息
                 catalog.FileVersion = fileVersion;
@@ -194,10 +194,10 @@ namespace YooAsset
 
                 // 读取资源包列表
                 int fileCount = buffer.ReadInt32();
-                catalog.Wrappers = new List<DefaultBuildinFileCatalog.FileWrapper>(fileCount);
+                catalog.Wrappers = new List<DefaultBuiltinFileCatalog.FileWrapper>(fileCount);
                 for (int i = 0; i < fileCount; i++)
                 {
-                    var fileWrapper = new DefaultBuildinFileCatalog.FileWrapper();
+                    var fileWrapper = new DefaultBuiltinFileCatalog.FileWrapper();
                     fileWrapper.BundleGUID = buffer.ReadUTF8();
                     fileWrapper.FileName = buffer.ReadUTF8();
                     catalog.Wrappers.Add(fileWrapper);

Assets/YooAsset/Runtime/FileSystem/DefaultBuiltinFileSystem/DefaultBuiltinFileCatalog.cs

@@ -8,7 +8,7 @@ namespace YooAsset
     /// 内置资源清单目录
     /// </summary>
     [Serializable]
-    internal class DefaultBuildinFileCatalog
+    internal class DefaultBuiltinFileCatalog
     {
         [Serializable]
         public class FileWrapper

Assets/YooAsset/Runtime/FileSystem/DefaultBuiltinFileSystem/DefaultBuiltinFileSystem.cs

@@ -8,7 +8,7 @@ namespace YooAsset
     /// <summary>
     /// 内置文件系统
     /// </summary>
-    internal class DefaultBuildinFileSystem : IFileSystem
+    internal class DefaultBuiltinFileSystem : IFileSystem
     {
         public class FileWrapper
         {
@@ -21,7 +21,7 @@ namespace YooAsset
         }
 
         protected readonly Dictionary<string, FileWrapper> _wrappers = new Dictionary<string, FileWrapper>(10000);
-        protected readonly Dictionary<string, string> _buildinFilePathMapping = new Dictionary<string, string>(10000);
+        protected readonly Dictionary<string, string> _builtinFilePathMapping = new Dictionary<string, string>(10000);
         protected IFileSystem _unpackFileSystem;
         protected string _packageRoot;
 
@@ -53,15 +53,20 @@ namespace YooAsset
         }
 
         #region 自定义参数
+        /// <summary>
+        /// 自定义参数：覆盖安装缓存清理模式
+        /// </summary>
+        public EOverwriteInstallClearMode InstallClearMode { private set; get; } = EOverwriteInstallClearMode.ClearAllManifestFiles;
+
         /// <summary>
         /// 自定义参数：初始化的时候缓存文件校验级别
         /// </summary>
         public EFileVerifyLevel FileVerifyLevel { private set; get; } = EFileVerifyLevel.Middle;
 
         /// <summary>
-        /// 自定义参数：覆盖安装缓存清理模式
+        /// 自定义参数：初始化的时候缓存文件校验最大并发数
         /// </summary>
-        public EOverwriteInstallClearMode InstallClearMode { private set; get; } = EOverwriteInstallClearMode.ClearAllManifestFiles;
+        public int FileVerifyMaxConcurrency { private set; get; } = int.MaxValue;
 
         /// <summary>
         /// 自定义参数：数据文件追加文件格式
@@ -76,16 +81,16 @@ namespace YooAsset
         /// <summary>
         /// 自定义参数：拷贝内置清单
         /// </summary>
-        public bool CopyBuildinPackageManifest { private set; get; } = false;
+        public bool CopyBuiltinPackageManifest { private set; get; } = false;
 
         /// <summary>
         /// 自定义参数：拷贝内置清单的目标目录
         /// 注意：该参数为空的时候，会获取默认的沙盒目录！
         /// </summary>
-        public string CopyBuildinPackageManifestDestRoot { private set; get; }
+        public string CopyBuiltinPackageManifestDestRoot { private set; get; }
 
         /// <summary>
-        ///  自定义参数：解密方法类
+        ///  自定义参数：解密服务接口的实例类
         /// </summary>
         public IDecryptionServices DecryptionServices { private set; get; }
 
@@ -95,13 +100,13 @@ namespace YooAsset
         public IManifestRestoreServices ManifestServices { private set; get; }
 
         /// <summary>
-        /// 自定义参数：拷贝内置文件服务类
+        /// 自定义参数：拷贝内置文件接口的实例类
         /// </summary>
         public ICopyLocalFileServices CopyLocalFileServices { private set; get; }
         #endregion
 
 
-        public DefaultBuildinFileSystem()
+        public DefaultBuiltinFileSystem()
         {
         }
         public virtual FSInitializeFileSystemOperation InitializeFileSystemAsync()
@@ -126,7 +131,7 @@ namespace YooAsset
         public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
         {
             // 注意：业务层的解压器会依赖该方法
-            options.ImportFilePath = GetBuildinFileLoadPath(bundle);
+            options.ImportFilePath = GetBuiltinFileLoadPath(bundle);
             return _unpackFileSystem.DownloadFileAsync(bundle, options);
         }
         public virtual FSLoadBundleOperation LoadBundleFile(PackageBundle bundle)
@@ -148,7 +153,7 @@ namespace YooAsset
             }
             else
             {
-                string error = $"{nameof(DefaultBuildinFileSystem)} not support load bundle type : {bundle.BundleType}";
+                string error = $"{nameof(DefaultBuiltinFileSystem)} not support load bundle type : {bundle.BundleType}";
                 var operation = new FSLoadBundleCompleteOperation(error);
                 return operation;
             }
@@ -156,13 +161,18 @@ namespace YooAsset
 
         public virtual void SetParameter(string name, object value)
         {
-            if (name == FileSystemParametersDefine.FILE_VERIFY_LEVEL)
+            if (name == FileSystemParametersDefine.INSTALL_CLEAR_MODE)
+            {
+                InstallClearMode = (EOverwriteInstallClearMode)value;
+            }
+            else if (name == FileSystemParametersDefine.FILE_VERIFY_LEVEL)
             {
                 FileVerifyLevel = (EFileVerifyLevel)value;
             }
-            else if (name == FileSystemParametersDefine.INSTALL_CLEAR_MODE)
+            else if (name == FileSystemParametersDefine.FILE_VERIFY_MAX_CONCURRENCY)
             {
-                InstallClearMode = (EOverwriteInstallClearMode)value;
+                int convertValue = Convert.ToInt32(value);
+                FileVerifyMaxConcurrency = Mathf.Clamp(convertValue, 1, int.MaxValue);
             }
             else if (name == FileSystemParametersDefine.APPEND_FILE_EXTENSION)
             {
@@ -174,11 +184,11 @@ namespace YooAsset
             }
             else if (name == FileSystemParametersDefine.COPY_BUILDIN_PACKAGE_MANIFEST)
             {
-                CopyBuildinPackageManifest = Convert.ToBoolean(value);
+                CopyBuiltinPackageManifest = Convert.ToBoolean(value);
             }
             else if (name == FileSystemParametersDefine.COPY_BUILDIN_PACKAGE_MANIFEST_DEST_ROOT)
             {
-                CopyBuildinPackageManifestDestRoot = (string)value;
+                CopyBuiltinPackageManifestDestRoot = (string)value;
             }
             else if (name == FileSystemParametersDefine.DECRYPTION_SERVICES)
             {
@@ -202,7 +212,7 @@ namespace YooAsset
             PackageName = packageName;
 
             if (string.IsNullOrEmpty(packageRoot))
-                _packageRoot = GetDefaultBuildinPackageRoot(packageName);
+                _packageRoot = GetDefaultBuiltinPackageRoot(packageName);
             else
                 _packageRoot = packageRoot;
 
@@ -210,8 +220,9 @@ namespace YooAsset
             var remoteServices = new DefaultUnpackRemoteServices(_packageRoot);
             _unpackFileSystem = new DefaultUnpackFileSystem();
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.REMOTE_SERVICES, remoteServices);
-            _unpackFileSystem.SetParameter(FileSystemParametersDefine.FILE_VERIFY_LEVEL, FileVerifyLevel);
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.INSTALL_CLEAR_MODE, InstallClearMode);
+            _unpackFileSystem.SetParameter(FileSystemParametersDefine.FILE_VERIFY_LEVEL, FileVerifyLevel);
+            _unpackFileSystem.SetParameter(FileSystemParametersDefine.FILE_VERIFY_MAX_CONCURRENCY, FileVerifyMaxConcurrency);
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.APPEND_FILE_EXTENSION, AppendFileExtension);
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, DecryptionServices);
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.COPY_LOCAL_FILE_SERVICES, CopyLocalFileServices);
@@ -258,7 +269,7 @@ namespace YooAsset
             if (IsUnpackBundleFile(bundle))
                 return _unpackFileSystem.GetBundleFilePath(bundle);
 
-            return GetBuildinFileLoadPath(bundle);
+            return GetBuiltinFileLoadPath(bundle);
         }
         public virtual byte[] ReadBundleFileData(PackageBundle bundle)
         {
@@ -270,7 +281,7 @@ namespace YooAsset
 
 #if UNITY_ANDROID
             //TODO : 安卓平台内置文件属于APK压缩包内的文件。
-            YooLogger.Error($"Android platform not support read buildin bundle file data !");
+            YooLogger.Error($"Android platform not support read builtin bundle file data !");
             return null;
 #else
             if (bundle.Encrypted)
@@ -281,7 +292,7 @@ namespace YooAsset
                     return null;
                 }
 
-                string filePath = GetBuildinFileLoadPath(bundle);
+                string filePath = GetBuiltinFileLoadPath(bundle);
                 var fileInfo = new DecryptFileInfo()
                 {
                     BundleName = bundle.BundleName,
@@ -292,7 +303,7 @@ namespace YooAsset
             }
             else
             {
-                string filePath = GetBuildinFileLoadPath(bundle);
+                string filePath = GetBuiltinFileLoadPath(bundle);
                 return FileUtility.ReadAllBytes(filePath);
             }
 #endif
@@ -307,7 +318,7 @@ namespace YooAsset
 
 #if UNITY_ANDROID
             //TODO : 安卓平台内置文件属于APK压缩包内的文件。
-            YooLogger.Error($"Android platform not support read buildin bundle file text !");
+            YooLogger.Error($"Android platform not support read builtin bundle file text !");
             return null;
 #else
             if (bundle.Encrypted)
@@ -318,7 +329,7 @@ namespace YooAsset
                     return null;
                 }
 
-                string filePath = GetBuildinFileLoadPath(bundle);
+                string filePath = GetBuiltinFileLoadPath(bundle);
                 var fileInfo = new DecryptFileInfo()
                 {
                     BundleName = bundle.BundleName,
@@ -329,56 +340,21 @@ namespace YooAsset
             }
             else
             {
-                string filePath = GetBuildinFileLoadPath(bundle);
+                string filePath = GetBuiltinFileLoadPath(bundle);
                 return FileUtility.ReadAllText(filePath);
             }
 #endif
         }
 
-        #region 内部方法
-        protected string GetDefaultBuildinPackageRoot(string packageName)
-        {
-            string rootDirectory = YooAssetSettingsData.GetYooDefaultBuildinRoot();
-            return PathUtility.Combine(rootDirectory, packageName);
-        }
-        public string GetBuildinFileLoadPath(PackageBundle bundle)
-        {
-            if (_buildinFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false)
-            {
-                filePath = PathUtility.Combine(_packageRoot, bundle.FileName);
-                _buildinFilePathMapping.Add(bundle.BundleGUID, filePath);
-            }
-            return filePath;
-        }
-        public string GetBuildinPackageVersionFilePath()
-        {
-            string fileName = YooAssetSettingsData.GetPackageVersionFileName(PackageName);
-            return PathUtility.Combine(_packageRoot, fileName);
-        }
-        public string GetBuildinPackageHashFilePath(string packageVersion)
-        {
-            string fileName = YooAssetSettingsData.GetPackageHashFileName(PackageName, packageVersion);
-            return PathUtility.Combine(_packageRoot, fileName);
-        }
-        public string GetBuildinPackageManifestFilePath(string packageVersion)
-        {
-            string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
-            return PathUtility.Combine(_packageRoot, fileName);
-        }
-        public string GetCatalogBinaryFileLoadPath()
-        {
-            return PathUtility.Combine(_packageRoot, DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName);
-        }
-
         /// <summary>
         /// 是否属于解压资源包文件
         /// </summary>
-        protected bool IsUnpackBundleFile(PackageBundle bundle)
+        protected virtual bool IsUnpackBundleFile(PackageBundle bundle)
         {
             if (Belong(bundle) == false)
                 return false;
 
-#if UNITY_ANDROID
+#if UNITY_ANDROID || UNITY_OPENHARMONY
             if (bundle.Encrypted)
                 return true;
 
@@ -391,6 +367,41 @@ namespace YooAsset
 #endif
         }
 
+        #region 内部方法
+        protected string GetDefaultBuiltinPackageRoot(string packageName)
+        {
+            string rootDirectory = YooAssetSettingsData.GetYooDefaultBuiltinRoot();
+            return PathUtility.Combine(rootDirectory, packageName);
+        }
+        public string GetBuiltinFileLoadPath(PackageBundle bundle)
+        {
+            if (_builtinFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false)
+            {
+                filePath = PathUtility.Combine(_packageRoot, bundle.FileName);
+                _builtinFilePathMapping.Add(bundle.BundleGUID, filePath);
+            }
+            return filePath;
+        }
+        public string GetBuiltinPackageVersionFilePath()
+        {
+            string fileName = YooAssetSettingsData.GetPackageVersionFileName(PackageName);
+            return PathUtility.Combine(_packageRoot, fileName);
+        }
+        public string GetBuiltinPackageHashFilePath(string packageVersion)
+        {
+            string fileName = YooAssetSettingsData.GetPackageHashFileName(PackageName, packageVersion);
+            return PathUtility.Combine(_packageRoot, fileName);
+        }
+        public string GetBuiltinPackageManifestFilePath(string packageVersion)
+        {
+            string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
+            return PathUtility.Combine(_packageRoot, fileName);
+        }
+        public string GetCatalogBinaryFileLoadPath()
+        {
+            return PathUtility.Combine(_packageRoot, DefaultBuiltinFileSystemDefine.BuiltinCatalogBinaryFileName);
+        }
+
         /// <summary>
         /// 记录文件信息
         /// </summary>
@@ -398,7 +409,7 @@ namespace YooAsset
         {
             if (_wrappers.ContainsKey(bundleGUID))
             {
-                YooLogger.Error($"{nameof(DefaultBuildinFileSystem)} has element : {bundleGUID}");
+                YooLogger.Error($"{nameof(DefaultBuiltinFileSystem)} has element : {bundleGUID}");
                 return false;
             }
 
@@ -419,7 +430,7 @@ namespace YooAsset
         /// </summary>
         public DecryptResult LoadEncryptedAssetBundle(PackageBundle bundle)
         {
-            string filePath = GetBuildinFileLoadPath(bundle);
+            string filePath = GetBuiltinFileLoadPath(bundle);
             var fileInfo = new DecryptFileInfo()
             {
                 BundleName = bundle.BundleName,
@@ -434,7 +445,7 @@ namespace YooAsset
         /// </summary>
         public DecryptResult LoadEncryptedAssetBundleAsync(PackageBundle bundle)
         {
-            string filePath = GetBuildinFileLoadPath(bundle);
+            string filePath = GetBuiltinFileLoadPath(bundle);
             var fileInfo = new DecryptFileInfo()
             {
                 BundleName = bundle.BundleName,

Assets/YooAsset/Runtime/FileSystem/DefaultBuiltinFileSystem/DefaultBuiltinFileSystemDefine.cs

@@ -1,16 +1,16 @@
 
 namespace YooAsset
 {
-    internal class DefaultBuildinFileSystemDefine
+    internal class DefaultBuiltinFileSystemDefine
     {
         /// <summary>
         /// 内置清单JSON文件名称
         /// </summary>
-        public const string BuildinCatalogJsonFileName = "BuildinCatalog.json";
+        public const string BuiltinCatalogJsonFileName = "BuiltinCatalog.json";
 
         /// <summary>
         /// 内置清单二进制文件名称
         /// </summary>
-        public const string BuildinCatalogBinaryFileName = "BuildinCatalog.bytes";
+        public const string BuiltinCatalogBinaryFileName = "BuiltinCatalog.bytes";
     }
 }

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

@@ -0,0 +1,238 @@
+using System;
+using System.IO;
+
+namespace YooAsset
+{
+    internal class DBFSInitializeOperation : FSInitializeFileSystemOperation
+    {
+        private enum ESteps
+        {
+            None,
+            LoadBuiltinPackageVersion,
+            CopyBuiltinPackageHash,
+            CopyBuiltinPackageManifest,
+            InitUnpackFileSystem,
+            LoadCatalogFile,
+            Done,
+        }
+
+        private readonly DefaultBuiltinFileSystem _fileSystem;
+        private RequestBuiltinPackageVersionOperation _requestBuiltinPackageVersionOp;
+        private CopyBuiltinFileOperation _copyBuiltinHashFileOp;
+        private CopyBuiltinFileOperation _copyBuiltinManifestFileOp;
+        private FSInitializeFileSystemOperation _initUnpackFIleSystemOp;
+        private LoadBuiltinCatalogFileOperation _loadBuiltinCatalogFileOp;
+        private ESteps _steps = ESteps.None;
+
+        internal DBFSInitializeOperation(DefaultBuiltinFileSystem fileSystem)
+        {
+            _fileSystem = fileSystem;
+        }
+        internal override void InternalStart()
+        {
+#if UNITY_WEBGL
+            _steps = ESteps.Done;
+            Status = EOperationStatus.Failed;
+            Error = $"{nameof(DefaultBuiltinFileSystem)} is not support WEBGL platform !";
+#else
+            if (_fileSystem.CopyBuiltinPackageManifest)
+                _steps = ESteps.LoadBuiltinPackageVersion;
+            else
+                _steps = ESteps.InitUnpackFileSystem;
+#endif
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.LoadBuiltinPackageVersion)
+            {
+                if (_requestBuiltinPackageVersionOp == null)
+                {
+                    _requestBuiltinPackageVersionOp = new RequestBuiltinPackageVersionOperation(_fileSystem);
+                    _requestBuiltinPackageVersionOp.StartOperation();
+                    AddChildOperation(_requestBuiltinPackageVersionOp);
+                }
+
+                _requestBuiltinPackageVersionOp.UpdateOperation();
+                if (_requestBuiltinPackageVersionOp.IsDone == false)
+                    return;
+
+                if (_requestBuiltinPackageVersionOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.CopyBuiltinPackageHash;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _requestBuiltinPackageVersionOp.Error;
+                }
+            }
+
+            if (_steps == ESteps.CopyBuiltinPackageHash)
+            {
+                if (_copyBuiltinHashFileOp == null)
+                {
+                    string packageVersion = _requestBuiltinPackageVersionOp.PackageVersion;
+                    string destFilePath = GetCopyPackageHashDestPath(packageVersion);
+                    string sourceFilePath = _fileSystem.GetBuiltinPackageHashFilePath(packageVersion);
+                    _copyBuiltinHashFileOp = new CopyBuiltinFileOperation(sourceFilePath, destFilePath);
+                    _copyBuiltinHashFileOp.StartOperation();
+                    AddChildOperation(_copyBuiltinHashFileOp);
+                }
+
+                _copyBuiltinHashFileOp.UpdateOperation();
+                if (_copyBuiltinHashFileOp.IsDone == false)
+                    return;
+
+                if (_copyBuiltinHashFileOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.CopyBuiltinPackageManifest;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _copyBuiltinHashFileOp.Error;
+                }
+            }
+
+            if (_steps == ESteps.CopyBuiltinPackageManifest)
+            {
+                if (_copyBuiltinManifestFileOp == null)
+                {
+                    string packageVersion = _requestBuiltinPackageVersionOp.PackageVersion;
+                    string destFilePath = GetCopyPackageManifestDestPath(packageVersion);
+                    string sourceFilePath = _fileSystem.GetBuiltinPackageManifestFilePath(packageVersion);
+                    _copyBuiltinManifestFileOp = new CopyBuiltinFileOperation(sourceFilePath, destFilePath);
+                    _copyBuiltinManifestFileOp.StartOperation();
+                    AddChildOperation(_copyBuiltinManifestFileOp);
+                }
+
+                _copyBuiltinManifestFileOp.UpdateOperation();
+                if (_copyBuiltinManifestFileOp.IsDone == false)
+                    return;
+
+                if (_copyBuiltinManifestFileOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.InitUnpackFileSystem;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _copyBuiltinManifestFileOp.Error;
+                }
+            }
+
+            if (_steps == ESteps.InitUnpackFileSystem)
+            {
+                if (_initUnpackFIleSystemOp == null)
+                {
+                    _initUnpackFIleSystemOp = _fileSystem.InitializeUpackFileSystem();
+                    _initUnpackFIleSystemOp.StartOperation();
+                    AddChildOperation(_initUnpackFIleSystemOp);
+                }
+
+                _initUnpackFIleSystemOp.UpdateOperation();
+                Progress = _initUnpackFIleSystemOp.Progress;
+                if (_initUnpackFIleSystemOp.IsDone == false)
+                    return;
+
+                if (_initUnpackFIleSystemOp.Status == EOperationStatus.Succeed)
+                {
+                    if (_fileSystem.DisableCatalogFile)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Succeed;
+                    }
+                    else
+                    {
+                        _steps = ESteps.LoadCatalogFile;
+                    }
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _initUnpackFIleSystemOp.Error;
+                }
+            }
+
+            if (_steps == ESteps.LoadCatalogFile)
+            {
+                if (_loadBuiltinCatalogFileOp == null)
+                {
+                    _loadBuiltinCatalogFileOp = new LoadBuiltinCatalogFileOperation(_fileSystem);
+                    _loadBuiltinCatalogFileOp.StartOperation();
+                    AddChildOperation(_loadBuiltinCatalogFileOp);
+                }
+
+                _loadBuiltinCatalogFileOp.UpdateOperation();
+                if (_loadBuiltinCatalogFileOp.IsDone == false)
+                    return;
+
+                if (_loadBuiltinCatalogFileOp.Status == EOperationStatus.Succeed)
+                {
+                    var catalog = _loadBuiltinCatalogFileOp.Catalog;
+                    if (catalog == null)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = "Fatal error : catalog is null !";
+                        return;
+                    }
+
+                    if (catalog.PackageName != _fileSystem.PackageName)
+                    {
+                        _steps = ESteps.Done;
+                        Status = EOperationStatus.Failed;
+                        Error = $"Catalog file package name {catalog.PackageName} cannot match the file system package name {_fileSystem.PackageName}";
+                        return;
+                    }
+
+                    foreach (var wrapper in catalog.Wrappers)
+                    {
+                        var fileWrapper = new DefaultBuiltinFileSystem.FileWrapper(wrapper.FileName);
+                        _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
+                    }
+
+                    YooLogger.Log($"Package '{_fileSystem.PackageName}' builtin catalog files count : {catalog.Wrappers.Count}");
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _loadBuiltinCatalogFileOp.Error;
+                }
+            }
+        }
+
+        private string GetCopyManifestFileRoot()
+        {
+            string destRoot = _fileSystem.CopyBuiltinPackageManifestDestRoot;
+            if (string.IsNullOrEmpty(destRoot))
+            {
+                string defaultCacheRoot = YooAssetSettingsData.GetYooDefaultCacheRoot();
+                destRoot = PathUtility.Combine(defaultCacheRoot, _fileSystem.PackageName, DefaultCacheFileSystemDefine.ManifestFilesFolderName);
+            }
+            return destRoot;
+        }
+        private string GetCopyPackageHashDestPath(string packageVersion)
+        {
+            string fileRoot = GetCopyManifestFileRoot();
+            string fileName = YooAssetSettingsData.GetPackageHashFileName(_fileSystem.PackageName, packageVersion);
+            return PathUtility.Combine(fileRoot, fileName);
+        }
+        private string GetCopyPackageManifestDestPath(string packageVersion)
+        {
+            string fileRoot = GetCopyManifestFileRoot();
+            string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_fileSystem.PackageName, packageVersion);
+            return PathUtility.Combine(fileRoot, fileName);
+        }
+    }
+}

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

@@ -16,7 +16,7 @@ namespace YooAsset
             Done,
         }
 
-        private readonly DefaultBuildinFileSystem _fileSystem;
+        private readonly DefaultBuiltinFileSystem _fileSystem;
         private readonly PackageBundle _bundle;
         private AssetBundleCreateRequest _createRequest;
         private AssetBundle _assetBundle;
@@ -24,7 +24,7 @@ namespace YooAsset
         private ESteps _steps = ESteps.None;
 
 
-        internal DBFSLoadAssetBundleOperation(DefaultBuildinFileSystem fileSystem, PackageBundle bundle)
+        internal DBFSLoadAssetBundleOperation(DefaultBuiltinFileSystem fileSystem, PackageBundle bundle)
         {
             _fileSystem = fileSystem;
             _bundle = bundle;
@@ -64,7 +64,7 @@ namespace YooAsset
                     }
                     else
                     {
-                        string filePath = _fileSystem.GetBuildinFileLoadPath(_bundle);
+                        string filePath = _fileSystem.GetBuiltinFileLoadPath(_bundle);
                         _assetBundle = AssetBundle.LoadFromFile(filePath);
                     }
                 }
@@ -78,7 +78,7 @@ namespace YooAsset
                     }
                     else
                     {
-                        string filePath = _fileSystem.GetBuildinFileLoadPath(_bundle);
+                        string filePath = _fileSystem.GetBuiltinFileLoadPath(_bundle);
                         _createRequest = AssetBundle.LoadFromFileAsync(filePath);
                     }
                 }
@@ -110,14 +110,14 @@ namespace YooAsset
                     {
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Failed;
-                        Error = $"Failed to load encrypted buildin asset bundle file : {_bundle.BundleName}";
+                        Error = $"Failed to load encrypted builtin asset bundle file : {_bundle.BundleName}";
                         YooLogger.Error(Error);
                     }
                     else
                     {
                         _steps = ESteps.Done;
                         Status = EOperationStatus.Failed;
-                        Error = $"Failed to load buildin asset bundle file : {_bundle.BundleName}";
+                        Error = $"Failed to load builtin asset bundle file : {_bundle.BundleName}";
                         YooLogger.Error(Error);
                     }
                 }
@@ -150,16 +150,16 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            LoadBuildinRawBundle,
+            LoadBuiltinRawBundle,
             Done,
         }
 
-        private readonly DefaultBuildinFileSystem _fileSystem;
+        private readonly DefaultBuiltinFileSystem _fileSystem;
         private readonly PackageBundle _bundle;
         private ESteps _steps = ESteps.None;
 
 
-        internal DBFSLoadRawBundleOperation(DefaultBuildinFileSystem fileSystem, PackageBundle bundle)
+        internal DBFSLoadRawBundleOperation(DefaultBuiltinFileSystem fileSystem, PackageBundle bundle)
         {
             _fileSystem = fileSystem;
             _bundle = bundle;
@@ -168,22 +168,22 @@ namespace YooAsset
         {
             DownloadProgress = 1f;
             DownloadedBytes = _bundle.FileSize;
-            _steps = ESteps.LoadBuildinRawBundle;
+            _steps = ESteps.LoadBuiltinRawBundle;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.LoadBuildinRawBundle)
+            if (_steps == ESteps.LoadBuiltinRawBundle)
             {
-                string filePath = _fileSystem.GetBuildinFileLoadPath(_bundle);
+                string filePath = _fileSystem.GetBuiltinFileLoadPath(_bundle);
 
 #if UNITY_ANDROID
                 //TODO : 安卓平台内置文件属于APK压缩包内的文件。
                 _steps = ESteps.Done;
                 Status = EOperationStatus.Failed;
-                Error = $"Can not load android buildin raw bundle file : {filePath}";
+                Error = $"Can not load android builtin raw bundle file : {filePath}";
                 YooLogger.Error(Error);
 #else
                 if (File.Exists(filePath))
@@ -196,7 +196,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = $"Can not found buildin raw bundle file : {filePath}";
+                    Error = $"Can not found builtin raw bundle file : {filePath}";
                     YooLogger.Error(Error);
                 }
 #endif

Assets/YooAsset/Runtime/FileSystem/DefaultBuiltinFileSystem/Operation/DBFSLoadPackageManifestOperation.cs

@@ -0,0 +1,89 @@
+
+namespace YooAsset
+{
+    internal class DBFSLoadPackageManifestOperation : FSLoadPackageManifestOperation
+    {
+        private enum ESteps
+        {
+            None,
+            RequestBuiltinPackageHash,
+            LoadBuiltinPackageManifest,
+            Done,
+        }
+
+        private readonly DefaultBuiltinFileSystem _fileSystem;
+        private readonly string _packageVersion;
+        private RequestBuiltinPackageHashOperation _requestBuiltinPackageHashOp;
+        private LoadBuiltinPackageManifestOperation _loadBuiltinPackageManifestOp;
+        private ESteps _steps = ESteps.None;
+
+
+        public DBFSLoadPackageManifestOperation(DefaultBuiltinFileSystem fileSystem, string packageVersion)
+        {
+            _fileSystem = fileSystem;
+            _packageVersion = packageVersion;
+        }
+        internal override void InternalStart()
+        {
+            _steps = ESteps.RequestBuiltinPackageHash;
+        }
+        internal override void InternalUpdate()
+        {
+            if (_steps == ESteps.None || _steps == ESteps.Done)
+                return;
+
+            if (_steps == ESteps.RequestBuiltinPackageHash)
+            {
+                if (_requestBuiltinPackageHashOp == null)
+                {
+                    _requestBuiltinPackageHashOp = new RequestBuiltinPackageHashOperation(_fileSystem, _packageVersion);
+                    _requestBuiltinPackageHashOp.StartOperation();
+                    AddChildOperation(_requestBuiltinPackageHashOp);
+                }
+
+                _requestBuiltinPackageHashOp.UpdateOperation();
+                if (_requestBuiltinPackageHashOp.IsDone == false)
+                    return;
+
+                if (_requestBuiltinPackageHashOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.LoadBuiltinPackageManifest;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _requestBuiltinPackageHashOp.Error;
+                }
+            }
+
+            if (_steps == ESteps.LoadBuiltinPackageManifest)
+            {
+                if (_loadBuiltinPackageManifestOp == null)
+                {
+                    string packageHash = _requestBuiltinPackageHashOp.PackageHash;
+                    _loadBuiltinPackageManifestOp = new LoadBuiltinPackageManifestOperation(_fileSystem, _packageVersion, packageHash);
+                    _loadBuiltinPackageManifestOp.StartOperation();
+                    AddChildOperation(_loadBuiltinPackageManifestOp);
+                }
+
+                _loadBuiltinPackageManifestOp.UpdateOperation();
+                if (_loadBuiltinPackageManifestOp.IsDone == false)
+                    return;
+
+                if (_loadBuiltinPackageManifestOp.Status == EOperationStatus.Succeed)
+                {
+                    _steps = ESteps.Done;
+                    Manifest = _loadBuiltinPackageManifestOp.Manifest;
+                    Status = EOperationStatus.Succeed;
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = _loadBuiltinPackageManifestOp.Error;
+                }
+            }
+        }
+    }
+}

Assets/YooAsset/Runtime/FileSystem/DefaultBuiltinFileSystem/Operation/DBFSRequestPackageVersionOperation.cs

@@ -10,12 +10,12 @@ namespace YooAsset
             Done,
         }
 
-        private readonly DefaultBuildinFileSystem _fileSystem;
-        private RequestBuildinPackageVersionOperation _requestBuildinPackageVersionOp;
+        private readonly DefaultBuiltinFileSystem _fileSystem;
+        private RequestBuiltinPackageVersionOperation _requestBuiltinPackageVersionOp;
         private ESteps _steps = ESteps.None;
 
 
-        internal DBFSRequestPackageVersionOperation(DefaultBuildinFileSystem fileSystem)
+        internal DBFSRequestPackageVersionOperation(DefaultBuiltinFileSystem fileSystem)
         {
             _fileSystem = fileSystem;
         }
@@ -30,28 +30,28 @@ namespace YooAsset
 
             if (_steps == ESteps.RequestPackageVersion)
             {
-                if (_requestBuildinPackageVersionOp == null)
+                if (_requestBuiltinPackageVersionOp == null)
                 {
-                    _requestBuildinPackageVersionOp = new RequestBuildinPackageVersionOperation(_fileSystem);
-                    _requestBuildinPackageVersionOp.StartOperation();
-                    AddChildOperation(_requestBuildinPackageVersionOp);
+                    _requestBuiltinPackageVersionOp = new RequestBuiltinPackageVersionOperation(_fileSystem);
+                    _requestBuiltinPackageVersionOp.StartOperation();
+                    AddChildOperation(_requestBuiltinPackageVersionOp);
                 }
 
-                _requestBuildinPackageVersionOp.UpdateOperation();
-                if (_requestBuildinPackageVersionOp.IsDone == false)
+                _requestBuiltinPackageVersionOp.UpdateOperation();
+                if (_requestBuiltinPackageVersionOp.IsDone == false)
                     return;
 
-                if (_requestBuildinPackageVersionOp.Status == EOperationStatus.Succeed)
+                if (_requestBuiltinPackageVersionOp.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.Done;
-                    PackageVersion = _requestBuildinPackageVersionOp.PackageVersion;
+                    PackageVersion = _requestBuiltinPackageVersionOp.PackageVersion;
                     Status = EOperationStatus.Succeed;
                 }
                 else
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _requestBuildinPackageVersionOp.Error;
+                    Error = _requestBuiltinPackageVersionOp.Error;
                 }
             }
         }

Assets/YooAsset/Runtime/FileSystem/DefaultBuiltinFileSystem/Operation/internal/CopyBuiltinFileOperation.cs

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

Assets/YooAsset/Runtime/FileSystem/DefaultBuiltinFileSystem/Operation/internal/CopyBuiltinFileOperation.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9a38597f546a46a429b24abd595c76e4
+guid: bf44368bc5c2bf1479c36d82e931c295
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/YooAsset/Runtime/FileSystem/DefaultBuiltinFileSystem/Operation/internal/LoadBuiltinCatalogFileOperation.cs

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

Assets/YooAsset/Runtime/FileSystem/DefaultBuiltinFileSystem/Operation/internal/LoadBuiltinPackageManifestOperation.cs

@@ -1,22 +1,25 @@
-
+using System.IO;
+
 namespace YooAsset
 {
-    internal class LoadBuildinPackageManifestOperation : AsyncOperationBase
+    internal class LoadBuiltinPackageManifestOperation : AsyncOperationBase
     {
         private enum ESteps
         {
             None,
+            TryLoadFileData,
             RequestFileData,
             VerifyFileData,
             LoadManifest,
             Done,
         }
 
-        private readonly DefaultBuildinFileSystem _fileSystem;
+        private readonly DefaultBuiltinFileSystem _fileSystem;
         private readonly string _packageVersion;
         private readonly string _packageHash;
         private UnityWebDataRequestOperation _webDataRequestOp;
         private DeserializeManifestOperation _deserializer;
+        private byte[] _fileData;
         private ESteps _steps = ESteps.None;
 
         /// <summary>
@@ -25,7 +28,7 @@ namespace YooAsset
         public PackageManifest Manifest { private set; get; }
 
 
-        internal LoadBuildinPackageManifestOperation(DefaultBuildinFileSystem fileSystem, string packageVersion, string packageHash)
+        internal LoadBuiltinPackageManifestOperation(DefaultBuiltinFileSystem fileSystem, string packageVersion, string packageHash)
         {
             _fileSystem = fileSystem;
             _packageVersion = packageVersion;
@@ -33,18 +36,32 @@ namespace YooAsset
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.RequestFileData;
+            _steps = ESteps.TryLoadFileData;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.TryLoadFileData)
+            {
+                string filePath = _fileSystem.GetBuiltinPackageManifestFilePath(_packageVersion);
+                if (File.Exists(filePath))
+                {
+                    _fileData = File.ReadAllBytes(filePath);
+                    _steps = ESteps.VerifyFileData;
+                }
+                else
+                {
+                    _steps = ESteps.RequestFileData;
+                }
+            }
+
             if (_steps == ESteps.RequestFileData)
             {
                 if (_webDataRequestOp == null)
                 {
-                    string filePath = _fileSystem.GetBuildinPackageManifestFilePath(_packageVersion);
+                    string filePath = _fileSystem.GetBuiltinPackageManifestFilePath(_packageVersion);
                     string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
                     _webDataRequestOp = new UnityWebDataRequestOperation(url, 60);
                     _webDataRequestOp.StartOperation();
@@ -57,6 +74,7 @@ namespace YooAsset
 
                 if (_webDataRequestOp.Status == EOperationStatus.Succeed)
                 {
+                    _fileData = _webDataRequestOp.Result;
                     _steps = ESteps.VerifyFileData;
                 }
                 else
@@ -69,7 +87,7 @@ namespace YooAsset
 
             if (_steps == ESteps.VerifyFileData)
             {
-                if (ManifestTools.VerifyManifestData(_webDataRequestOp.Result, _packageHash))
+                if (ManifestTools.VerifyManifestData(_fileData, _packageHash))
                 {
                     _steps = ESteps.LoadManifest;
                 }
@@ -77,7 +95,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = "Failed to verify buildin package manifest file !";
+                    Error = "Failed to verify builtin package manifest file !";
                 }
             }
 
@@ -85,7 +103,7 @@ namespace YooAsset
             {
                 if (_deserializer == null)
                 {
-                    _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _webDataRequestOp.Result);
+                    _deserializer = new DeserializeManifestOperation(_fileSystem.ManifestServices, _fileData);
                     _deserializer.StartOperation();
                     AddChildOperation(_deserializer);
                 }

Assets/YooAsset/Runtime/FileSystem/DefaultBuiltinFileSystem/Operation/internal/RequestBuiltinPackageHashOperation.cs

@@ -1,16 +1,19 @@
-
+using System.IO;
+
 namespace YooAsset
 {
-    internal class RequestBuildinPackageHashOperation : AsyncOperationBase
+    internal class RequestBuiltinPackageHashOperation : AsyncOperationBase
     {
         private enum ESteps
         {
             None,
+            TryLoadPackageHash,
             RequestPackageHash,
+            CheckResult,
             Done,
         }
 
-        private readonly DefaultBuildinFileSystem _fileSystem;
+        private readonly DefaultBuiltinFileSystem _fileSystem;
         private readonly string _packageVersion;
         private UnityWebTextRequestOperation _webTextRequestOp;
         private ESteps _steps = ESteps.None;
@@ -21,25 +24,39 @@ namespace YooAsset
         public string PackageHash { private set; get; }
 
 
-        internal RequestBuildinPackageHashOperation(DefaultBuildinFileSystem fileSystem, string packageVersion)
+        internal RequestBuiltinPackageHashOperation(DefaultBuiltinFileSystem fileSystem, string packageVersion)
         {
             _fileSystem = fileSystem;
             _packageVersion = packageVersion;
         }
         internal override void InternalStart()
         {
-            _steps = ESteps.RequestPackageHash;
+            _steps = ESteps.TryLoadPackageHash;
         }
         internal override void InternalUpdate()
         {
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
+            if (_steps == ESteps.TryLoadPackageHash)
+            {
+                string filePath = _fileSystem.GetBuiltinPackageHashFilePath(_packageVersion);
+                if (File.Exists(filePath))
+                {
+                    PackageHash = File.ReadAllText(filePath);
+                    _steps = ESteps.CheckResult;
+                }
+                else
+                {
+                    _steps = ESteps.RequestPackageHash;
+                }
+            }
+
             if (_steps == ESteps.RequestPackageHash)
             {
                 if (_webTextRequestOp == null)
                 {
-                    string filePath = _fileSystem.GetBuildinPackageHashFilePath(_packageVersion);
+                    string filePath = _fileSystem.GetBuiltinPackageHashFilePath(_packageVersion);
                     string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
                     _webTextRequestOp = new UnityWebTextRequestOperation(url, 60);
                     _webTextRequestOp.StartOperation();
@@ -53,17 +70,7 @@ namespace YooAsset
                 if (_webTextRequestOp.Status == EOperationStatus.Succeed)
                 {
                     PackageHash = _webTextRequestOp.Result;
-                    if (string.IsNullOrEmpty(PackageHash))
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Failed;
-                        Error = $"Buildin package hash file content is empty !";
-                    }
-                    else
-                    {
-                        _steps = ESteps.Done;
-                        Status = EOperationStatus.Succeed;
-                    }
+                    _steps = ESteps.CheckResult;
                 }
                 else
                 {
@@ -72,6 +79,21 @@ namespace YooAsset
                     Error = _webTextRequestOp.Error;
                 }
             }
+
+            if (_steps == ESteps.CheckResult)
+            {
+                if (string.IsNullOrEmpty(PackageHash))
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Failed;
+                    Error = $"Builtin package hash file content is empty !";
+                }
+                else
+                {
+                    _steps = ESteps.Done;
+                    Status = EOperationStatus.Succeed;
+                }
+            }
         }
     }
 }