Merge 96b33f5816 into 4caf733ac6

Assets/YooAsset/CHANGELOG.md

@@ -2,115 +2,6 @@
 
 All notable changes to this package will be documented in this file.
 
-## [2.3.18] - 2025-12-04
-
-### Fixed
-
-- (#676) 修复了UniTask扩展包的编译报错。
-- (#684) 修复了资源配置窗口Group列表数量过多的时候，添加和删除按钮会变小的问题。
-- (#700) [**严重**] 修复了小游戏扩展库的下载器再失败后重试逻辑不起效的问题。
-
-### Added
-
-- (#683) 新增了内置文件系统类初始化参数：UNPACK_FILE_SYSTEM_ROOT
-
-  ```csharp
-  class FileSystemParametersDefine
-  {
-      // 指定解压文件的根目录
-      public const string UNPACK_FILE_SYSTEM_ROOT = "UNPACK_FILE_SYSTEM_ROOT";
-  }
-  ```
-
-- (#682) 原生文件构建管线新增构建参数：IncludePathInHash
-
-  ```csharp
-  class RawFileBuildParameters : BuildParameters
-  {
-      /// <summary>
-      /// 文件哈希值计算包含路径信息
-      /// </summary>
-      public bool IncludePathInHash = false;
-  }
-  ```
-
-- (#671) 新增扩展工具，可以生成空的包裹内置资源目录文件。
-
-  ```csharp
-  public class CreateEmptyCatalogWindow : EditorWindow
-  ```
-
-- (#694) 新增资源清理方式：ClearBundleFilesByLocations
-
-  ```csharp
-  public enum EFileClearMode
-  {
-      /// <summary>
-      /// 清理指定地址的文件
-      /// 说明：需要指定参数，可选：string, string[], List<string>
-      /// </summary>
-      ClearBundleFilesByLocations,
-  }
-  ```
-
-## [2.3.17] - 2025-10-30
-
-**非常重要**：修复了#627优化导致的资源清单CRC值为空的问题。
-
-该问题会导致下载的损坏文件验证通过。
-
-影响范围：v2.3.15版本，v2.3.16版本。
-
-**非常重要**：(#661) 修复了Package销毁过程中，遇到正在加载的AssetBundle会导致无法卸载的问题。
-
-该问题是偶现，引擎会提示AssetBundle已经加载，无法加载新的文件，导致资源对象加载失败！
-
-影响范围：所有版本！
-
-### Fixed
-
-- (#645) 修复了着色器变种收集工具，在极端情况下变种收集不完整的问题。
-- (#646) 修复了EditorSimulateMode模式下开启模拟下载tag不生效的问题。
-- (#667) 修复了所有编辑器窗口针对中文IME的输入问题。
-- (#670) 修复了Catalog文件生成过程中白名单未考虑自定义清单前缀名。
-
-### Improvements
-
-- 重构并统一了资源清单的反序列化逻辑。
-- (#650) 解决互相依赖的资源包无法卸载的问题。需要开启宏定义：YOOASSET_EXPERIMENTAL
-- (#655) 优化了初始化的时候，缓存文件搜索效率。安卓平台性能提升1倍，IOS平台性能提升3倍。
-
-### Added
-
-- (#643) 新增构建参数，可以节省资源清单运行时内存
-
-  ```csharp
-  class ScriptableBuildParameters
-  {
-      /// <summary>
-      /// 使用可寻址地址代替资源路径
-      /// 说明：开启此项可以节省运行时清单占用的内存！
-      /// </summary>
-      public bool ReplaceAssetPathWithAddress = false;
-  }
-  ```
-
-- (#648) 新增初始化参数，可以自动释放引用计数为零的资源包
-
-  ```csharp
-  class InitializeParameters
-  {
-      /// <summary>
-      /// 当资源引用计数为零的时候自动释放资源包
-      /// </summary>
-      public bool AutoUnloadBundleWhenUnused = false;
-  }
-  ```
-
-### Changed
-
-- 程序集宏定义代码转移到扩展工程。参考MacroSupport文件夹。
-
 ## [2.3.16] - 2025-09-17
 
 ### Improvements

Assets/YooAsset/Editor/Assembly/MacroDefine.cs

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

Assets/YooAsset/Editor/Assembly/MacroProcessor.cs

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

Assets/YooAsset/Editor/Assembly/RspGenerator.cs

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

Assets/YooAsset/Editor/AssetArtReporter/AssetArtReporterWindow.cs

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

Assets/YooAsset/Editor/AssetArtScanner/AssetArtScannerWindow.cs

@@ -240,7 +240,7 @@ namespace YooAsset.Editor
         }
         private void ScanAllBtn_clicked()
         {
-            if (EditorUtility.DisplayDialog("Info", $"Start full scan!", "Yes", "No"))
+            if (EditorUtility.DisplayDialog("提示", $"开始全面扫描！", "Yes", "No"))
             {
                 string searchKeyWord = _scannerSearchField.value;
                 AssetArtScannerSettingData.ScanAll(searchKeyWord);
@@ -248,7 +248,7 @@ namespace YooAsset.Editor
             }
             else
             {
-                Debug.LogWarning("Full scan has been canceled.");
+                Debug.LogWarning("全面扫描已经取消");
             }
         }
         private void ScanBtn_clicked()

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

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/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/TaskCreateManifest_ESBP.cs

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

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

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

Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/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

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

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

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

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

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

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

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

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

@@ -236,7 +236,6 @@ namespace YooAsset.Editor
 
                 // 包裹名称
                 _packageNameTxt = root.Q<TextField>("PackageName");
-                _packageNameTxt.isDelayed = true;
                 _packageNameTxt.RegisterValueChangedCallback(evt =>
                 {
                     var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
@@ -250,7 +249,6 @@ namespace YooAsset.Editor
 
                 // 包裹备注
                 _packageDescTxt = root.Q<TextField>("PackageDesc");
-                _packageDescTxt.isDelayed = true;
                 _packageDescTxt.RegisterValueChangedCallback(evt =>
                 {
                     var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
@@ -288,7 +286,6 @@ namespace YooAsset.Editor
 
                 // 分组名称
                 _groupNameTxt = root.Q<TextField>("GroupName");
-                _groupNameTxt.isDelayed = true;
                 _groupNameTxt.RegisterValueChangedCallback(evt =>
                 {
                     var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
@@ -303,7 +300,6 @@ namespace YooAsset.Editor
 
                 // 分组备注
                 _groupDescTxt = root.Q<TextField>("GroupDesc");
-                _groupDescTxt.isDelayed = true;
                 _groupDescTxt.RegisterValueChangedCallback(evt =>
                 {
                     var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
@@ -318,7 +314,6 @@ namespace YooAsset.Editor
 
                 // 分组的资源标签
                 _groupTagsTxt = root.Q<TextField>("GroupTags");
-                _groupTagsTxt.isDelayed = true;
                 _groupTagsTxt.RegisterValueChangedCallback(evt =>
                 {
                     var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
@@ -822,7 +817,6 @@ namespace YooAsset.Editor
                 var textField = new TextField();
                 textField.name = "TextField0";
                 textField.label = "User Data";
-                textField.isDelayed = true;
                 textField.style.width = 200;
                 elementBottom.Add(textField);
                 var label = textField.Q<Label>();
@@ -832,7 +826,6 @@ namespace YooAsset.Editor
                 var textField = new TextField();
                 textField.name = "TextField1";
                 textField.label = "Asset Tags";
-                textField.isDelayed = true;
                 textField.style.width = 100;
                 textField.style.marginLeft = 20;
                 textField.style.flexGrow = 1;

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml

@@ -30,7 +30,7 @@
         <ui:VisualElement name="PackageContainer" style="width: 200px; flex-grow: 0; background-color: rgb(67, 67, 67); border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
             <ui:Label text="Packages" display-tooltip-when-elided="true" name="PackageTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px;" />
             <ui:ListView focusable="true" name="PackageListView" item-height="20" virtualization-method="DynamicHeight" reorderable="true" reorder-mode="Animated" style="flex-grow: 1;" />
-            <ui:VisualElement name="PackageAddContainer" style="height: 20px; flex-direction: row; justify-content: center; flex-shrink: 0;">
+            <ui:VisualElement name="PackageAddContainer" style="height: 20px; flex-direction: row; justify-content: center;">
                 <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
                 <ui:Button text=" + " display-tooltip-when-elided="true" name="AddBtn" />
             </ui:VisualElement>
@@ -40,7 +40,7 @@
             <ui:TextField picking-mode="Ignore" label="Package Name" name="PackageName" style="flex-direction: column;" />
             <ui:TextField picking-mode="Ignore" label="Package Desc" name="PackageDesc" style="flex-direction: column;" />
             <ui:ListView focusable="true" name="GroupListView" item-height="20" virtualization-method="DynamicHeight" reorderable="true" reorder-mode="Animated" style="flex-grow: 1;" />
-            <ui:VisualElement name="GroupAddContainer" style="height: 20px; flex-direction: row; justify-content: center; flex-shrink: 0;">
+            <ui:VisualElement name="GroupAddContainer" style="height: 20px; flex-direction: row; justify-content: center;">
                 <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
                 <ui:Button text=" + " display-tooltip-when-elided="true" name="AddBtn" />
             </ui:VisualElement>

Assets/YooAsset/Editor/AssetBundleCollector/AssetDependencyDatabase.cs

@@ -88,8 +88,8 @@ namespace YooAsset.Editor
             }
             catch (Exception ex)
             {
-                Debug.LogError($"Failed to load cache database : {ex.Message}");
                 ClearDatabase(true);
+                Debug.LogError($"Failed to load cache database : {ex.Message}");
             }
             finally
             {
@@ -169,8 +169,7 @@ namespace YooAsset.Editor
                     File.Delete(_databaseFilePath);
             }
 
-            if (_database != null)
-                _database.Clear();
+            _database.Clear();
         }
 
         /// <summary>

Assets/YooAsset/Editor/EditorDefine.cs

@@ -41,8 +41,6 @@ namespace YooAsset.Editor
         Texture,
         RenderTexture,
         VideoClip,
-        PlayableAsset,
-        TimelineAsset
     }
 
     /// <summary>

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/DefaultBuiltinFileSystem/CatalogTools.cs

@@ -53,29 +53,24 @@ 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>
             {
                 "link.xml",
                 "buildlogtep.json",
-                DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName,
-                DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName
+                $"{packageName}.version",
+                $"{packageName}_{packageVersion}.bytes",
+                $"{packageName}_{packageVersion}.hash",
+                $"{packageName}_{packageVersion}.json",
+                $"{packageName}_{packageVersion}.report",
+                DefaultBuiltinFileSystemDefine.BuiltinCatalogJsonFileName,
+                DefaultBuiltinFileSystemDefine.BuiltinCatalogBinaryFileName
             };
-            string packageVersionFileName = YooAssetSettingsData.GetPackageVersionFileName(packageName);
-            string packageHashFileName = YooAssetSettingsData.GetPackageHashFileName(packageName, packageVersion);
-            string manifestBinaryFIleName = YooAssetSettingsData.GetManifestBinaryFileName(packageName, packageVersion);
-            string manifestJsonFIleName = YooAssetSettingsData.GetManifestJsonFileName(packageName, packageVersion);
-            string reportFileName = YooAssetSettingsData.GetBuildReportFileName(packageName, packageVersion);
-            whiteFileList.Add(packageVersionFileName);
-            whiteFileList.Add(packageHashFileName);
-            whiteFileList.Add(manifestBinaryFIleName);
-            whiteFileList.Add(manifestJsonFIleName);
-            whiteFileList.Add(reportFileName);
 
             // 记录所有内置资源文件
             DirectoryInfo rootDirectory = new DirectoryInfo(packageDirectory);
@@ -91,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
                 {
@@ -103,44 +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);
-
-            UnityEditor.AssetDatabase.Refresh();
-            Debug.Log($"Succeed to save catalog file : {binaryFilePath}");
-            return true;
-        }
-
-        /// <summary>
-        /// 生成空的包裹内置资源目录文件
-        /// </summary>
-        public static bool CreateEmptyCatalogFile(string packageName, string packageVersion, string outputPath)
-        {
-            // 创建内置清单实例
-            var buildinFileCatalog = new DefaultBuildinFileCatalog();
-            buildinFileCatalog.FileVersion = CatalogDefine.FileVersion;
-            buildinFileCatalog.PackageName = packageName;
-            buildinFileCatalog.PackageVersion = packageVersion;
-
-            // 创建输出文件
-            string jsonFilePath = $"{outputPath}/{DefaultBuildinFileSystemDefine.BuildinCatalogJsonFileName}";
-            if (File.Exists(jsonFilePath))
-                File.Delete(jsonFilePath);
-            SerializeToJson(jsonFilePath, buildinFileCatalog);
-
-            // 创建输出文件
-            string binaryFilePath = $"{outputPath}/{DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName}";
-            if (File.Exists(binaryFilePath))
-                File.Delete(binaryFilePath);
-            SerializeToBinary(binaryFilePath, buildinFileCatalog);
+            SerializeToBinary(binaryFilePath, builtinFileCatalog);
 
             UnityEditor.AssetDatabase.Refresh();
             Debug.Log($"Succeed to save catalog file : {binaryFilePath}");
@@ -151,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);
@@ -160,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))
             {
@@ -203,7 +170,7 @@ namespace YooAsset
         /// <summary>
         /// 反序列化（二进制文件）
         /// </summary>
-        public static DefaultBuildinFileCatalog DeserializeFromBinary(byte[] binaryData)
+        public static DefaultBuiltinFileCatalog DeserializeFromBinary(byte[] binaryData)
         {
             // 创建缓存器
             BufferReader buffer = new BufferReader(binaryData);
@@ -218,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;
@@ -227,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;
 
@@ -81,18 +81,13 @@ 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; }
-
-        /// <summary>
-        /// 自定义参数：解压文件系统的根目录
-        /// </summary>
-        public string UnpackFileSystemRoot { private set; get; }
+        public string CopyBuiltinPackageManifestDestRoot { private set; get; }
 
         /// <summary>
         ///  自定义参数：解密服务接口的实例类
@@ -111,7 +106,7 @@ namespace YooAsset
         #endregion
 
 
-        public DefaultBuildinFileSystem()
+        public DefaultBuiltinFileSystem()
         {
         }
         public virtual FSInitializeFileSystemOperation InitializeFileSystemAsync()
@@ -136,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)
@@ -158,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;
             }
@@ -189,15 +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;
-            }
-            else if (name == FileSystemParametersDefine.UNPACK_FILE_SYSTEM_ROOT)
-            {
-                UnpackFileSystemRoot = (string)value;
+                CopyBuiltinPackageManifestDestRoot = (string)value;
             }
             else if (name == FileSystemParametersDefine.DECRYPTION_SERVICES)
             {
@@ -221,7 +212,7 @@ namespace YooAsset
             PackageName = packageName;
 
             if (string.IsNullOrEmpty(packageRoot))
-                _packageRoot = GetDefaultBuildinPackageRoot(packageName);
+                _packageRoot = GetDefaultBuiltinPackageRoot(packageName);
             else
                 _packageRoot = packageRoot;
 
@@ -235,7 +226,7 @@ namespace YooAsset
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.APPEND_FILE_EXTENSION, AppendFileExtension);
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, DecryptionServices);
             _unpackFileSystem.SetParameter(FileSystemParametersDefine.COPY_LOCAL_FILE_SERVICES, CopyLocalFileServices);
-            _unpackFileSystem.OnCreate(packageName, UnpackFileSystemRoot);
+            _unpackFileSystem.OnCreate(packageName, null);
         }
         public virtual void OnDestroy()
         {
@@ -278,7 +269,7 @@ namespace YooAsset
             if (IsUnpackBundleFile(bundle))
                 return _unpackFileSystem.GetBundleFilePath(bundle);
 
-            return GetBuildinFileLoadPath(bundle);
+            return GetBuiltinFileLoadPath(bundle);
         }
         public virtual byte[] ReadBundleFileData(PackageBundle bundle)
         {
@@ -290,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)
@@ -301,7 +292,7 @@ namespace YooAsset
                     return null;
                 }
 
-                string filePath = GetBuildinFileLoadPath(bundle);
+                string filePath = GetBuiltinFileLoadPath(bundle);
                 var fileInfo = new DecryptFileInfo()
                 {
                     BundleName = bundle.BundleName,
@@ -312,7 +303,7 @@ namespace YooAsset
             }
             else
             {
-                string filePath = GetBuildinFileLoadPath(bundle);
+                string filePath = GetBuiltinFileLoadPath(bundle);
                 return FileUtility.ReadAllBytes(filePath);
             }
 #endif
@@ -327,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)
@@ -338,7 +329,7 @@ namespace YooAsset
                     return null;
                 }
 
-                string filePath = GetBuildinFileLoadPath(bundle);
+                string filePath = GetBuiltinFileLoadPath(bundle);
                 var fileInfo = new DecryptFileInfo()
                 {
                     BundleName = bundle.BundleName,
@@ -349,7 +340,7 @@ namespace YooAsset
             }
             else
             {
-                string filePath = GetBuildinFileLoadPath(bundle);
+                string filePath = GetBuiltinFileLoadPath(bundle);
                 return FileUtility.ReadAllText(filePath);
             }
 #endif
@@ -377,38 +368,38 @@ namespace YooAsset
         }
 
         #region 内部方法
-        protected string GetDefaultBuildinPackageRoot(string packageName)
+        protected string GetDefaultBuiltinPackageRoot(string packageName)
         {
-            string rootDirectory = YooAssetSettingsData.GetYooDefaultBuildinRoot();
+            string rootDirectory = YooAssetSettingsData.GetYooDefaultBuiltinRoot();
             return PathUtility.Combine(rootDirectory, packageName);
         }
-        public string GetBuildinFileLoadPath(PackageBundle bundle)
+        public string GetBuiltinFileLoadPath(PackageBundle bundle)
         {
-            if (_buildinFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false)
+            if (_builtinFilePathMapping.TryGetValue(bundle.BundleGUID, out string filePath) == false)
             {
                 filePath = PathUtility.Combine(_packageRoot, bundle.FileName);
-                _buildinFilePathMapping.Add(bundle.BundleGUID, filePath);
+                _builtinFilePathMapping.Add(bundle.BundleGUID, filePath);
             }
             return filePath;
         }
-        public string GetBuildinPackageVersionFilePath()
+        public string GetBuiltinPackageVersionFilePath()
         {
             string fileName = YooAssetSettingsData.GetPackageVersionFileName(PackageName);
             return PathUtility.Combine(_packageRoot, fileName);
         }
-        public string GetBuildinPackageHashFilePath(string packageVersion)
+        public string GetBuiltinPackageHashFilePath(string packageVersion)
         {
             string fileName = YooAssetSettingsData.GetPackageHashFileName(PackageName, packageVersion);
             return PathUtility.Combine(_packageRoot, fileName);
         }
-        public string GetBuildinPackageManifestFilePath(string packageVersion)
+        public string GetBuiltinPackageManifestFilePath(string packageVersion)
         {
             string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
             return PathUtility.Combine(_packageRoot, fileName);
         }
         public string GetCatalogBinaryFileLoadPath()
         {
-            return PathUtility.Combine(_packageRoot, DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName);
+            return PathUtility.Combine(_packageRoot, DefaultBuiltinFileSystemDefine.BuiltinCatalogBinaryFileName);
         }
 
         /// <summary>
@@ -418,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;
             }
 
@@ -439,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,
@@ -454,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

@@ -8,23 +8,23 @@ namespace YooAsset
         private enum ESteps
         {
             None,
-            LoadBuildinPackageVersion,
-            CopyBuildinPackageHash,
-            CopyBuildinPackageManifest,
+            LoadBuiltinPackageVersion,
+            CopyBuiltinPackageHash,
+            CopyBuiltinPackageManifest,
             InitUnpackFileSystem,
             LoadCatalogFile,
             Done,
         }
 
-        private readonly DefaultBuildinFileSystem _fileSystem;
-        private RequestBuildinPackageVersionOperation _requestBuildinPackageVersionOp;
-        private CopyBuildinFileOperation _copyBuildinHashFileOp;
-        private CopyBuildinFileOperation _copyBuildinManifestFileOp;
+        private readonly DefaultBuiltinFileSystem _fileSystem;
+        private RequestBuiltinPackageVersionOperation _requestBuiltinPackageVersionOp;
+        private CopyBuiltinFileOperation _copyBuiltinHashFileOp;
+        private CopyBuiltinFileOperation _copyBuiltinManifestFileOp;
         private FSInitializeFileSystemOperation _initUnpackFIleSystemOp;
-        private LoadBuildinCatalogFileOperation _loadBuildinCatalogFileOp;
+        private LoadBuiltinCatalogFileOperation _loadBuiltinCatalogFileOp;
         private ESteps _steps = ESteps.None;
 
-        internal DBFSInitializeOperation(DefaultBuildinFileSystem fileSystem)
+        internal DBFSInitializeOperation(DefaultBuiltinFileSystem fileSystem)
         {
             _fileSystem = fileSystem;
         }
@@ -33,10 +33,10 @@ namespace YooAsset
 #if UNITY_WEBGL
             _steps = ESteps.Done;
             Status = EOperationStatus.Failed;
-            Error = $"{nameof(DefaultBuildinFileSystem)} is not support WEBGL platform !";
+            Error = $"{nameof(DefaultBuiltinFileSystem)} is not support WEBGL platform !";
 #else
-            if (_fileSystem.CopyBuildinPackageManifest)
-                _steps = ESteps.LoadBuildinPackageVersion;
+            if (_fileSystem.CopyBuiltinPackageManifest)
+                _steps = ESteps.LoadBuiltinPackageVersion;
             else
                 _steps = ESteps.InitUnpackFileSystem;
 #endif
@@ -46,76 +46,76 @@ namespace YooAsset
             if (_steps == ESteps.None || _steps == ESteps.Done)
                 return;
 
-            if (_steps == ESteps.LoadBuildinPackageVersion)
+            if (_steps == ESteps.LoadBuiltinPackageVersion)
             {
-                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.CopyBuildinPackageHash;
+                    _steps = ESteps.CopyBuiltinPackageHash;
                 }
                 else
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _requestBuildinPackageVersionOp.Error;
+                    Error = _requestBuiltinPackageVersionOp.Error;
                 }
             }
 
-            if (_steps == ESteps.CopyBuildinPackageHash)
+            if (_steps == ESteps.CopyBuiltinPackageHash)
             {
-                if (_copyBuildinHashFileOp == null)
+                if (_copyBuiltinHashFileOp == null)
                 {
-                    string packageVersion = _requestBuildinPackageVersionOp.PackageVersion;
+                    string packageVersion = _requestBuiltinPackageVersionOp.PackageVersion;
                     string destFilePath = GetCopyPackageHashDestPath(packageVersion);
-                    string sourceFilePath = _fileSystem.GetBuildinPackageHashFilePath(packageVersion);
-                    _copyBuildinHashFileOp = new CopyBuildinFileOperation(sourceFilePath, destFilePath);
-                    _copyBuildinHashFileOp.StartOperation();
-                    AddChildOperation(_copyBuildinHashFileOp);
+                    string sourceFilePath = _fileSystem.GetBuiltinPackageHashFilePath(packageVersion);
+                    _copyBuiltinHashFileOp = new CopyBuiltinFileOperation(sourceFilePath, destFilePath);
+                    _copyBuiltinHashFileOp.StartOperation();
+                    AddChildOperation(_copyBuiltinHashFileOp);
                 }
 
-                _copyBuildinHashFileOp.UpdateOperation();
-                if (_copyBuildinHashFileOp.IsDone == false)
+                _copyBuiltinHashFileOp.UpdateOperation();
+                if (_copyBuiltinHashFileOp.IsDone == false)
                     return;
 
-                if (_copyBuildinHashFileOp.Status == EOperationStatus.Succeed)
+                if (_copyBuiltinHashFileOp.Status == EOperationStatus.Succeed)
                 {
-                    _steps = ESteps.CopyBuildinPackageManifest;
+                    _steps = ESteps.CopyBuiltinPackageManifest;
                 }
                 else
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _copyBuildinHashFileOp.Error;
+                    Error = _copyBuiltinHashFileOp.Error;
                 }
             }
 
-            if (_steps == ESteps.CopyBuildinPackageManifest)
+            if (_steps == ESteps.CopyBuiltinPackageManifest)
             {
-                if (_copyBuildinManifestFileOp == null)
+                if (_copyBuiltinManifestFileOp == null)
                 {
-                    string packageVersion = _requestBuildinPackageVersionOp.PackageVersion;
+                    string packageVersion = _requestBuiltinPackageVersionOp.PackageVersion;
                     string destFilePath = GetCopyPackageManifestDestPath(packageVersion);
-                    string sourceFilePath = _fileSystem.GetBuildinPackageManifestFilePath(packageVersion);
-                    _copyBuildinManifestFileOp = new CopyBuildinFileOperation(sourceFilePath, destFilePath);
-                    _copyBuildinManifestFileOp.StartOperation();
-                    AddChildOperation(_copyBuildinManifestFileOp);
+                    string sourceFilePath = _fileSystem.GetBuiltinPackageManifestFilePath(packageVersion);
+                    _copyBuiltinManifestFileOp = new CopyBuiltinFileOperation(sourceFilePath, destFilePath);
+                    _copyBuiltinManifestFileOp.StartOperation();
+                    AddChildOperation(_copyBuiltinManifestFileOp);
                 }
 
-                _copyBuildinManifestFileOp.UpdateOperation();
-                if (_copyBuildinManifestFileOp.IsDone == false)
+                _copyBuiltinManifestFileOp.UpdateOperation();
+                if (_copyBuiltinManifestFileOp.IsDone == false)
                     return;
 
-                if (_copyBuildinManifestFileOp.Status == EOperationStatus.Succeed)
+                if (_copyBuiltinManifestFileOp.Status == EOperationStatus.Succeed)
                 {
                     _steps = ESteps.InitUnpackFileSystem;
                 }
@@ -123,7 +123,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _copyBuildinManifestFileOp.Error;
+                    Error = _copyBuiltinManifestFileOp.Error;
                 }
             }
 
@@ -163,20 +163,20 @@ namespace YooAsset
 
             if (_steps == ESteps.LoadCatalogFile)
             {
-                if (_loadBuildinCatalogFileOp == null)
+                if (_loadBuiltinCatalogFileOp == null)
                 {
-                    _loadBuildinCatalogFileOp = new LoadBuildinCatalogFileOperation(_fileSystem);
-                    _loadBuildinCatalogFileOp.StartOperation();
-                    AddChildOperation(_loadBuildinCatalogFileOp);
+                    _loadBuiltinCatalogFileOp = new LoadBuiltinCatalogFileOperation(_fileSystem);
+                    _loadBuiltinCatalogFileOp.StartOperation();
+                    AddChildOperation(_loadBuiltinCatalogFileOp);
                 }
 
-                _loadBuildinCatalogFileOp.UpdateOperation();
-                if (_loadBuildinCatalogFileOp.IsDone == false)
+                _loadBuiltinCatalogFileOp.UpdateOperation();
+                if (_loadBuiltinCatalogFileOp.IsDone == false)
                     return;
 
-                if (_loadBuildinCatalogFileOp.Status == EOperationStatus.Succeed)
+                if (_loadBuiltinCatalogFileOp.Status == EOperationStatus.Succeed)
                 {
-                    var catalog = _loadBuildinCatalogFileOp.Catalog;
+                    var catalog = _loadBuiltinCatalogFileOp.Catalog;
                     if (catalog == null)
                     {
                         _steps = ESteps.Done;
@@ -195,11 +195,11 @@ namespace YooAsset
 
                     foreach (var wrapper in catalog.Wrappers)
                     {
-                        var fileWrapper = new DefaultBuildinFileSystem.FileWrapper(wrapper.FileName);
+                        var fileWrapper = new DefaultBuiltinFileSystem.FileWrapper(wrapper.FileName);
                         _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
                     }
 
-                    YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}");
+                    YooLogger.Log($"Package '{_fileSystem.PackageName}' builtin catalog files count : {catalog.Wrappers.Count}");
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Succeed;
                 }
@@ -207,14 +207,14 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = _loadBuildinCatalogFileOp.Error;
+                    Error = _loadBuiltinCatalogFileOp.Error;
                 }
             }
         }
 
         private string GetCopyManifestFileRoot()
         {
-            string destRoot = _fileSystem.CopyBuildinPackageManifestDestRoot;
+            string destRoot = _fileSystem.CopyBuiltinPackageManifestDestRoot;
             if (string.IsNullOrEmpty(destRoot))
             {
                 string defaultCacheRoot = YooAssetSettingsData.GetYooDefaultCacheRoot();

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

@@ -3,7 +3,7 @@ using System.IO;
 
 namespace YooAsset
 {
-    internal class CopyBuildinFileOperation : AsyncOperationBase
+    internal class CopyBuiltinFileOperation : AsyncOperationBase
     {
         private enum ESteps
         {
@@ -19,7 +19,7 @@ namespace YooAsset
         private readonly string _destFilePath;
         private ESteps _steps = ESteps.None;
 
-        public CopyBuildinFileOperation(string sourceFilePath, string destFilePath)
+        public CopyBuiltinFileOperation(string sourceFilePath, string destFilePath)
         {
             _sourceFilePath = sourceFilePath;
             _destFilePath = destFilePath;
@@ -61,7 +61,7 @@ namespace YooAsset
                     }
                     catch (Exception ex)
                     {
-                        YooLogger.Warning($"Failed copy buildin file : {ex.Message}");
+                        YooLogger.Warning($"Failed copy builtin file : {ex.Message}");
                         _steps = ESteps.UnpackFile;
                     }
                 }

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

@@ -3,7 +3,7 @@ using System.IO;
 
 namespace YooAsset
 {
-    internal sealed class LoadBuildinCatalogFileOperation : AsyncOperationBase
+    internal sealed class LoadBuiltinCatalogFileOperation : AsyncOperationBase
     {
         private enum ESteps
         {
@@ -14,7 +14,7 @@ namespace YooAsset
             Done,
         }
 
-        private readonly DefaultBuildinFileSystem _fileSystem;
+        private readonly DefaultBuiltinFileSystem _fileSystem;
         private UnityWebDataRequestOperation _webDataRequestOp;
         private byte[] _fileData;
         private ESteps _steps = ESteps.None;
@@ -22,9 +22,9 @@ namespace YooAsset
         /// <summary>
         /// 内置资源目录
         /// </summary>
-        public DefaultBuildinFileCatalog Catalog;
+        public DefaultBuiltinFileCatalog Catalog;
 
-        internal LoadBuildinCatalogFileOperation(DefaultBuildinFileSystem fileSystem)
+        internal LoadBuiltinCatalogFileOperation(DefaultBuiltinFileSystem fileSystem)
         {
             _fileSystem = fileSystem;
         }

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

@@ -2,7 +2,7 @@
 
 namespace YooAsset
 {
-    internal class LoadBuildinPackageManifestOperation : AsyncOperationBase
+    internal class LoadBuiltinPackageManifestOperation : AsyncOperationBase
     {
         private enum ESteps
         {
@@ -14,7 +14,7 @@ namespace YooAsset
             Done,
         }
 
-        private readonly DefaultBuildinFileSystem _fileSystem;
+        private readonly DefaultBuiltinFileSystem _fileSystem;
         private readonly string _packageVersion;
         private readonly string _packageHash;
         private UnityWebDataRequestOperation _webDataRequestOp;
@@ -28,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;
@@ -45,7 +45,7 @@ namespace YooAsset
 
             if (_steps == ESteps.TryLoadFileData)
             {
-                string filePath = _fileSystem.GetBuildinPackageManifestFilePath(_packageVersion);
+                string filePath = _fileSystem.GetBuiltinPackageManifestFilePath(_packageVersion);
                 if (File.Exists(filePath))
                 {
                     _fileData = File.ReadAllBytes(filePath);
@@ -61,7 +61,7 @@ namespace YooAsset
             {
                 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();
@@ -95,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 !";
                 }
             }
 

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

@@ -2,7 +2,7 @@
 
 namespace YooAsset
 {
-    internal class RequestBuildinPackageHashOperation : AsyncOperationBase
+    internal class RequestBuiltinPackageHashOperation : AsyncOperationBase
     {
         private enum ESteps
         {
@@ -13,7 +13,7 @@ namespace YooAsset
             Done,
         }
 
-        private readonly DefaultBuildinFileSystem _fileSystem;
+        private readonly DefaultBuiltinFileSystem _fileSystem;
         private readonly string _packageVersion;
         private UnityWebTextRequestOperation _webTextRequestOp;
         private ESteps _steps = ESteps.None;
@@ -24,7 +24,7 @@ namespace YooAsset
         public string PackageHash { private set; get; }
 
 
-        internal RequestBuildinPackageHashOperation(DefaultBuildinFileSystem fileSystem, string packageVersion)
+        internal RequestBuiltinPackageHashOperation(DefaultBuiltinFileSystem fileSystem, string packageVersion)
         {
             _fileSystem = fileSystem;
             _packageVersion = packageVersion;
@@ -40,7 +40,7 @@ namespace YooAsset
 
             if (_steps == ESteps.TryLoadPackageHash)
             {
-                string filePath = _fileSystem.GetBuildinPackageHashFilePath(_packageVersion);
+                string filePath = _fileSystem.GetBuiltinPackageHashFilePath(_packageVersion);
                 if (File.Exists(filePath))
                 {
                     PackageHash = File.ReadAllText(filePath);
@@ -56,7 +56,7 @@ namespace YooAsset
             {
                 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();
@@ -86,7 +86,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = $"Buildin package hash file content is empty !";
+                    Error = $"Builtin package hash file content is empty !";
                 }
                 else
                 {

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

@@ -2,7 +2,7 @@
 
 namespace YooAsset
 {
-    internal class RequestBuildinPackageVersionOperation : AsyncOperationBase
+    internal class RequestBuiltinPackageVersionOperation : AsyncOperationBase
     {
         private enum ESteps
         {
@@ -13,7 +13,7 @@ namespace YooAsset
             Done,
         }
 
-        private readonly DefaultBuildinFileSystem _fileSystem;
+        private readonly DefaultBuiltinFileSystem _fileSystem;
         private UnityWebTextRequestOperation _webTextRequestOp;
         private ESteps _steps = ESteps.None;
 
@@ -23,7 +23,7 @@ namespace YooAsset
         public string PackageVersion { private set; get; }
 
 
-        internal RequestBuildinPackageVersionOperation(DefaultBuildinFileSystem fileSystem)
+        internal RequestBuiltinPackageVersionOperation(DefaultBuiltinFileSystem fileSystem)
         {
             _fileSystem = fileSystem;
         }
@@ -38,7 +38,7 @@ namespace YooAsset
 
             if (_steps == ESteps.TryLoadPackageVersion)
             {
-                string filePath = _fileSystem.GetBuildinPackageVersionFilePath();
+                string filePath = _fileSystem.GetBuiltinPackageVersionFilePath();
                 if (File.Exists(filePath))
                 {
                     PackageVersion = File.ReadAllText(filePath);
@@ -54,7 +54,7 @@ namespace YooAsset
             {
                 if (_webTextRequestOp == null)
                 {
-                    string filePath = _fileSystem.GetBuildinPackageVersionFilePath();
+                    string filePath = _fileSystem.GetBuiltinPackageVersionFilePath();
                     string url = DownloadSystemHelper.ConvertToWWWPath(filePath);
                     _webTextRequestOp = new UnityWebTextRequestOperation(url, 60);
                     _webTextRequestOp.StartOperation();
@@ -84,7 +84,7 @@ namespace YooAsset
                 {
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Failed;
-                    Error = $"Buildin package version file content is empty !";
+                    Error = $"Builtin package version file content is empty !";
                 }
                 else
                 {

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

@@ -158,11 +158,6 @@ namespace YooAsset
                 var operation = new ClearUnusedCacheBundleFilesOperation(this, manifest);
                 return operation;
             }
-            else if (options.ClearMode == EFileClearMode.ClearBundleFilesByLocations.ToString())
-            {
-                var operation = new ClearCacheBundleFilesByLocationsOperaiton(this, manifest, options.ClearParam);
-                return operation;
-            }
             else if (options.ClearMode == EFileClearMode.ClearBundleFilesByTags.ToString())
             {
                 var operation = new ClearCacheBundleFilesByTagsOperaiton(this, manifest, options.ClearParam);

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

@@ -11,7 +11,6 @@ namespace YooAsset
             None,
             CheckExist,
             DownloadFile,
-            AbortDownload,
             LoadAssetBundle,
             CheckResult,
             Done,
@@ -64,17 +63,6 @@ namespace YooAsset
                 }
             }
 
-            if (_steps == ESteps.DownloadFile)
-            {
-                // 中断下载
-                if (AbortDownloadFile)
-                {
-                    if (_downloadFileOp != null)
-                        _downloadFileOp.AbortOperation();
-                    _steps = ESteps.AbortDownload;
-                }
-            }
-
             if (_steps == ESteps.DownloadFile)
             {
                 if (_downloadFileOp == null)
@@ -106,23 +94,6 @@ namespace YooAsset
                 }
             }
 
-            if (_steps == ESteps.AbortDownload)
-            {
-                if (_downloadFileOp != null)
-                {
-                    if (IsWaitForAsyncComplete)
-                        _downloadFileOp.WaitForAsyncComplete();
-
-                    _downloadFileOp.UpdateOperation();
-                    if (_downloadFileOp.IsDone == false)
-                        return;
-                }
-
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = "Abort download file !";
-            }
-
             if (_steps == ESteps.LoadAssetBundle)
             {
                 if (_bundle.Encrypted)
@@ -280,7 +251,6 @@ namespace YooAsset
             None,
             CheckExist,
             DownloadFile,
-            AbortDownload,
             LoadCacheRawBundle,
             Done,
         }
@@ -340,17 +310,6 @@ namespace YooAsset
                 }
             }
 
-            if (_steps == ESteps.DownloadFile)
-            {
-                // 中断下载
-                if (AbortDownloadFile)
-                {
-                    if (_downloadFileOp != null)
-                        _downloadFileOp.AbortOperation();
-                    _steps = ESteps.AbortDownload;
-                }
-            }
-
             if (_steps == ESteps.DownloadFile)
             {
                 if (_downloadFileOp == null)
@@ -382,23 +341,6 @@ namespace YooAsset
                 }
             }
 
-            if (_steps == ESteps.AbortDownload)
-            {
-                if (_downloadFileOp != null)
-                {
-                    if (IsWaitForAsyncComplete)
-                        _downloadFileOp.WaitForAsyncComplete();
-
-                    _downloadFileOp.UpdateOperation();
-                    if (_downloadFileOp.IsDone == false)
-                        return;
-                }
-
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = "Abort download file !";
-            }
-
             if (_steps == ESteps.LoadCacheRawBundle)
             {
                 string filePath = _fileSystem.GetCacheBundleFileLoadPath(_bundle);

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

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

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

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

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

@@ -20,7 +20,7 @@ namespace YooAsset
         private UnityDownloadFileOperation _unityDownloadFileOp;
 
         protected int _requestCount = 0;
-        protected float _tryAgainTimer = 0;
+        protected float _tryAgainTimer;
         protected int _failedTryAgain;
         private ESteps _steps = ESteps.None;
 

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

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

Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/DEFSLoadBundleOperation.cs

@@ -8,7 +8,6 @@ namespace YooAsset
             None,
             CheckExist,
             DownloadFile,
-            AbortDownload,
             LoadAssetBundle,
             CheckResult,
             Done,
@@ -49,17 +48,6 @@ namespace YooAsset
                 }
             }
 
-            if (_steps == ESteps.DownloadFile)
-            {
-                // 中断下载
-                if (AbortDownloadFile)
-                {
-                    if (_downloadFileOp != null)
-                        _downloadFileOp.AbortOperation();
-                    _steps = ESteps.AbortDownload;
-                }
-            }
-
             if (_steps == ESteps.DownloadFile)
             {
                 if (_downloadFileOp == null)
@@ -91,23 +79,6 @@ namespace YooAsset
                 }
             }
 
-            if (_steps == ESteps.AbortDownload)
-            {
-                if (_downloadFileOp != null)
-                {
-                    if (IsWaitForAsyncComplete)
-                        _downloadFileOp.WaitForAsyncComplete();
-
-                    _downloadFileOp.UpdateOperation();
-                    if (_downloadFileOp.IsDone == false)
-                        return;
-                }
-
-                _steps = ESteps.Done;
-                Status = EOperationStatus.Failed;
-                Error = "Abort download file !";
-            }
-
             if (_steps == ESteps.LoadAssetBundle)
             {
                 if (IsWaitForAsyncComplete)

Assets/YooAsset/Runtime/FileSystem/DefaultEditorFileSystem/Operation/internal/DownloadVirutalBundleOperation.cs

@@ -20,7 +20,7 @@ namespace YooAsset
         protected UnityVirtualBundleRequestOperation _unityDownloadFileOp;
 
         protected int _requestCount = 0;
-        protected float _tryAgainTimer = 0;
+        protected float _tryAgainTimer;
         protected int _failedTryAgain;
         private ESteps _steps = ESteps.None;
 

Assets/YooAsset/Runtime/FileSystem/DefaultUnpackFileSystem/DefaultUnpackRemoteServices.cs

@@ -4,12 +4,12 @@ namespace YooAsset
 {
     internal class DefaultUnpackRemoteServices : IRemoteServices
     {
-        private readonly string _buildinPackageRoot;
+        private readonly string _builtinPackageRoot;
         protected readonly Dictionary<string, string> _mapping = new Dictionary<string, string>(10000);
 
-        public DefaultUnpackRemoteServices(string buildinPackRoot)
+        public DefaultUnpackRemoteServices(string builtinPackRoot)
         {
-            _buildinPackageRoot = buildinPackRoot;
+            _builtinPackageRoot = builtinPackRoot;
         }
         string IRemoteServices.GetRemoteMainURL(string fileName)
         {
@@ -24,7 +24,7 @@ namespace YooAsset
         {
             if (_mapping.TryGetValue(fileName, out string url) == false)
             {
-                string filePath = PathUtility.Combine(_buildinPackageRoot, fileName);
+                string filePath = PathUtility.Combine(_builtinPackageRoot, fileName);
                 url = DownloadSystemHelper.ConvertToWWWPath(filePath);
                 _mapping.Add(fileName, url);
             }

Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/DefaultWebServerFileSystem.cs

@@ -180,7 +180,7 @@ namespace YooAsset
         #region 内部方法
         protected string GetDefaultWebPackageRoot(string packageName)
         {
-            string rootDirectory = YooAssetSettingsData.GetYooDefaultBuildinRoot();
+            string rootDirectory = YooAssetSettingsData.GetYooDefaultBuiltinRoot();
             return PathUtility.Combine(rootDirectory, packageName);
         }
         public string GetWebFileLoadPath(PackageBundle bundle)
@@ -209,7 +209,7 @@ namespace YooAsset
         }
         public string GetCatalogBinaryFileLoadPath()
         {
-            return PathUtility.Combine(_webPackageRoot, DefaultBuildinFileSystemDefine.BuildinCatalogBinaryFileName);
+            return PathUtility.Combine(_webPackageRoot, DefaultBuiltinFileSystemDefine.BuiltinCatalogBinaryFileName);
         }
 
         /// <summary>

Assets/YooAsset/Runtime/FileSystem/DefaultWebServerFileSystem/Operation/internal/LoadWebServerCatalogFileOperation.cs

@@ -77,7 +77,7 @@ namespace YooAsset
                         _fileSystem.RecordCatalogFile(wrapper.BundleGUID, fileWrapper);
                     }
 
-                    YooLogger.Log($"Package '{_fileSystem.PackageName}' buildin catalog files count : {catalog.Wrappers.Count}");
+                    YooLogger.Log($"Package '{_fileSystem.PackageName}' builtin catalog files count : {catalog.Wrappers.Count}");
                     _steps = ESteps.Done;
                     Status = EOperationStatus.Succeed;
                 }

Assets/YooAsset/Runtime/FileSystem/EFileClearMode.cs

@@ -16,12 +16,6 @@ namespace YooAsset
         /// </summary>
         ClearUnusedBundleFiles,
 
-        /// <summary>
-        /// 清理指定地址的文件
-        /// 说明：需要指定参数，可选：string, string[], List<string>
-        /// </summary>
-        ClearBundleFilesByLocations,
-
         /// <summary>
         /// 清理指定标签的文件
         /// 说明：需要指定参数，可选：string, string[], List<string>

Assets/YooAsset/Runtime/FileSystem/FileSystemParameters.cs

@@ -83,9 +83,9 @@ namespace YooAsset
         /// </summary>
         /// <param name="decryptionServices">加密文件解密服务类</param>
         /// <param name="packageRoot">文件系统的根目录</param>
-        public static FileSystemParameters CreateDefaultBuildinFileSystemParameters(IDecryptionServices decryptionServices = null, string packageRoot = null)
+        public static FileSystemParameters CreateDefaultBuiltinFileSystemParameters(IDecryptionServices decryptionServices = null, string packageRoot = null)
         {
-            string fileSystemClass = typeof(DefaultBuildinFileSystem).FullName;
+            string fileSystemClass = typeof(DefaultBuiltinFileSystem).FullName;
             var fileSystemParams = new FileSystemParameters(fileSystemClass, packageRoot);
             fileSystemParams.AddParameter(FileSystemParametersDefine.DECRYPTION_SERVICES, decryptionServices);
             return fileSystemParams;

Assets/YooAsset/Runtime/FileSystem/FileSystemParametersDefine.cs

@@ -26,6 +26,5 @@ namespace YooAsset
         public const string COPY_BUILDIN_PACKAGE_MANIFEST = "COPY_BUILDIN_PACKAGE_MANIFEST";
         public const string COPY_BUILDIN_PACKAGE_MANIFEST_DEST_ROOT = "COPY_BUILDIN_PACKAGE_MANIFEST_DEST_ROOT";
         public const string COPY_LOCAL_FILE_SERVICES = "COPY_LOCAL_FILE_SERVICES";
-        public const string UNPACK_FILE_SYSTEM_ROOT = "UNPACK_FILE_SYSTEM_ROOT";
     }
 }

Assets/YooAsset/Runtime/FileSystem/Operation/FSLoadBundleOperation.cs

@@ -17,11 +17,6 @@ namespace YooAsset
         /// 下载大小
         /// </summary>
         public long DownloadedBytes { protected set; get; } = 0;
-
-        /// <summary>
-        /// 终止下载文件
-        /// </summary>
-        public bool AbortDownloadFile = false;
     }
 
     internal sealed class FSLoadBundleCompleteOperation : FSLoadBundleOperation

Assets/YooAsset/Runtime/FileSystem/WebGame/Operation/LoadWebEncryptAssetBundleOperation.cs

@@ -18,16 +18,15 @@ namespace YooAsset
         private readonly IWebDecryptionServices _decryptionServices;
         private UnityWebDataRequestOperation _unityWebDataRequestOp;
 
-        private int _requestCount = 0;
-        private float _tryAgainTimer = 0;
-        private int _failedTryAgain;
+        protected int _requestCount = 0;
+        protected float _tryAgainTimer;
+        protected int _failedTryAgain;
         private ESteps _steps = ESteps.None;
 
         internal LoadWebEncryptAssetBundleOperation(PackageBundle bundle, DownloadFileOptions options, IWebDecryptionServices decryptionServices)
         {
             _bundle = bundle;
             _options = options;
-            _failedTryAgain = options.FailedTryAgain;
             _decryptionServices = decryptionServices;
         }
         internal override void InternalStart()

Assets/YooAsset/Runtime/FileSystem/WebGame/Operation/LoadWebNormalAssetBundleOperation.cs

@@ -18,9 +18,9 @@ namespace YooAsset
         private readonly bool _disableUnityWebCache;
         private UnityAssetBundleRequestOperation _unityAssetBundleRequestOp;
 
-        private int _requestCount = 0;
-        private float _tryAgainTimer = 0;
-        private int _failedTryAgain;
+        protected int _requestCount = 0;
+        protected float _tryAgainTimer;
+        protected int _failedTryAgain;
         private ESteps _steps = ESteps.None;
 
 
@@ -28,7 +28,6 @@ namespace YooAsset
         {
             _bundle = bundle;
             _options = options;
-            _failedTryAgain = options.FailedTryAgain;
             _disableUnityWebCache = disableUnityWebCache;
         }
         internal override void InternalStart()