diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs
index 92b6518..f86beb6 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilder.cs
@@ -15,7 +15,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 构建资源包
 		/// </summary>
-		public BuildResult Run(BuildParameters buildParameters, List<IBuildTask> buildPipeline)
+		public BuildResult Run(BuildParameters buildParameters, List<IBuildTask> buildPipeline, bool enableLog)
 		{
 			// 检测构建参数是否为空
 			if (buildParameters == null)
@@ -33,9 +33,10 @@ namespace YooAsset.Editor
 			_buildContext.SetContextObject(buildParametersContext);
 
 			// 初始化日志
-			BuildLogger.InitLogger(buildParameters.EnableLog);
+			BuildLogger.InitLogger(enableLog);
 
 			// 执行构建流程
+			Debug.Log($"Begin to build package : {buildParameters.PackageName} by {buildParameters.BuildPipeline}");
 			var buildResult = BuildRunner.Run(buildPipeline, _buildContext);
 			if (buildResult.Success)
 			{
@@ -51,62 +52,5 @@ namespace YooAsset.Editor
 
 			return buildResult;
 		}
-
-		/// <summary>
-		/// 构建资源包
-		/// </summary>
-		public BuildResult Run(BuildParameters buildParameters)
-		{
-			var buildPipeline = GetDefaultBuildPipeline(buildParameters.BuildPipeline);
-			return Run(buildParameters, buildPipeline);
-		}
-
-		/// <summary>
-		/// 获取默认的构建流程
-		/// </summary>
-		private List<IBuildTask> GetDefaultBuildPipeline(EBuildPipeline buildPipeline)
-		{
-			// 获取任务节点的属性集合
-			if (buildPipeline == EBuildPipeline.BuiltinBuildPipeline)
-			{
-				List<IBuildTask> pipeline = new List<IBuildTask>
-				{
-					new TaskPrepare(), //前期准备工作
-					new TaskGetBuildMap(), //获取构建列表
-					new TaskBuilding(), //开始执行构建
-					new TaskCopyRawFile(), //拷贝原生文件
-					new TaskVerifyBuildResult(), //验证构建结果
-					new TaskEncryption(), //加密资源文件
-					new TaskUpdateBundleInfo(), //更新资源包信息
-					new TaskCreateManifest(), //创建清单文件
-					new TaskCreateReport(), //创建报告文件
-					new TaskCreatePackage(), //制作包裹
-					new TaskCopyBuildinFiles(), //拷贝内置文件
-				};
-				return pipeline;
-			}
-			else if (buildPipeline == EBuildPipeline.ScriptableBuildPipeline)
-			{
-				List<IBuildTask> pipeline = new List<IBuildTask>
-				{
-					new TaskPrepare(), //前期准备工作
-					new TaskGetBuildMap(), //获取构建列表
-					new TaskBuilding_SBP(), //开始执行构建
-					new TaskCopyRawFile(), //拷贝原生文件
-					new TaskVerifyBuildResult_SBP(), //验证构建结果
-					new TaskEncryption(), //加密资源文件
-					new TaskUpdateBundleInfo(), //更新补丁信息
-					new TaskCreateManifest(), //创建清单文件
-					new TaskCreateReport(), //创建报告文件
-					new TaskCreatePackage(), //制作补丁包
-					new TaskCopyBuildinFiles(), //拷贝内置文件
-				};
-				return pipeline;
-			}
-			else
-			{
-				throw new NotImplementedException();
-			}
-		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs
index 35d30b4..050b937 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderHelper.cs
@@ -20,7 +20,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 获取流文件夹路径
 		/// </summary>
-		public static string GetDefaultStreamingAssetsRoot()
+		public static string GetStreamingAssetsRoot()
 		{
 			return $"{Application.dataPath}/StreamingAssets/{YooAssetSettings.DefaultYooFolderName}/";
 		}
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs
index 3d93766..77bcc6d 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs
@@ -1,49 +1,93 @@
 using System;
 using UnityEngine;
+using UnityEditor;
 
 namespace YooAsset.Editor
 {
-	[CreateAssetMenu(fileName = "AssetBundleBuilderSetting", menuName = "YooAsset/Create AssetBundle Builder Settings")]
-	public class AssetBundleBuilderSetting : ScriptableObject
+	public static class AssetBundleBuilderSetting
 	{
-		/// <summary>
-		/// 构建管线
-		/// </summary>
-		public EBuildPipeline BuildPipeline = EBuildPipeline.BuiltinBuildPipeline;
+		// EBuildPipeline
+		public static EBuildPipeline GetPackageBuildPipeline(string packageName)
+		{
+			string key = $"{Application.productName}_{packageName}_{nameof(EBuildPipeline)}";
+			return (EBuildPipeline)EditorPrefs.GetInt(key, (int)EBuildPipeline.BuiltinBuildPipeline);
+		}
+		public static void SetPackageBuildPipeline(string packageName, EBuildPipeline buildPipeline)
+		{
+			string key = $"{Application.productName}_{packageName}_{nameof(EBuildPipeline)}";
+			EditorPrefs.SetInt(key, (int)buildPipeline);
+		}
 
-		/// <summary>
-		/// 构建模式
-		/// </summary>
-		public EBuildMode BuildMode = EBuildMode.ForceRebuild;
+		// EBuildMode
+		public static EBuildMode GetPackageBuildMode(string packageName, EBuildPipeline buildPipeline)
+		{
+			string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuildMode)}";
+			return (EBuildMode)EditorPrefs.GetInt(key, (int)EBuildMode.ForceRebuild);
+		}
+		public static void SetPackageBuildMode(string packageName, EBuildPipeline buildPipeline, EBuildMode buildMode)
+		{
+			string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuildMode)}";
+			EditorPrefs.SetInt(key, (int)buildMode);
+		}
 
-		/// <summary>
-		/// 构建的包裹名称
-		/// </summary>
-		public string BuildPackage = string.Empty;
+		// ECompressOption
+		public static ECompressOption GetPackageCompressOption(string packageName, EBuildPipeline buildPipeline)
+		{
+			string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(ECompressOption)}";
+			return (ECompressOption)EditorPrefs.GetInt(key, (int)ECompressOption.LZ4);
+		}
+		public static void SetPackageCompressOption(string packageName, EBuildPipeline buildPipeline, ECompressOption compressOption)
+		{
+			string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(ECompressOption)}";
+			EditorPrefs.SetInt(key, (int)compressOption);
+		}
 
-		/// <summary>
-		/// 压缩方式
-		/// </summary>
-		public ECompressOption CompressOption = ECompressOption.LZ4;
+		// EFileNameStyle
+		public static EFileNameStyle GetPackageFileNameStyle(string packageName, EBuildPipeline buildPipeline)
+		{
+			string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EFileNameStyle)}";
+			return (EFileNameStyle)EditorPrefs.GetInt(key, (int)EFileNameStyle.HashName);
+		}
+		public static void SetPackageFileNameStyle(string packageName, EBuildPipeline buildPipeline, EFileNameStyle fileNameStyle)
+		{
+			string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EFileNameStyle)}";
+			EditorPrefs.SetInt(key, (int)fileNameStyle);
+		}
 
-		/// <summary>
-		/// 输出文件名称样式
-		/// </summary>
-		public EOutputNameStyle OutputNameStyle = EOutputNameStyle.HashName;
+		// EBuildinFileCopyOption
+		public static EBuildinFileCopyOption GetPackageBuildinFileCopyOption(string packageName, EBuildPipeline buildPipeline)
+		{
+			string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuildinFileCopyOption)}";
+			return (EBuildinFileCopyOption)EditorPrefs.GetInt(key, (int)EBuildinFileCopyOption.None);
+		}
+		public static void SetPackageBuildinFileCopyOption(string packageName, EBuildPipeline buildPipeline, EBuildinFileCopyOption buildinFileCopyOption)
+		{
+			string key = $"{Application.productName}_{packageName}_{buildPipeline}_{nameof(EBuildinFileCopyOption)}";
+			EditorPrefs.SetInt(key, (int)buildinFileCopyOption);
+		}
 
-		/// <summary>
-		/// 首包资源文件的拷贝方式
-		/// </summary>
-		public ECopyBuildinFileOption CopyBuildinFileOption = ECopyBuildinFileOption.None;
+		// BuildFileCopyParams
+		public static string GetPackageBuildinFileCopyParams(string packageName, EBuildPipeline buildPipeline)
+		{
+			string key = $"{Application.productName}_{packageName}_{buildPipeline}_BuildFileCopyParams";
+			return EditorPrefs.GetString(key, string.Empty);
+		}
+		public static void SetPackageBuildinFileCopyParams(string packageName, EBuildPipeline buildPipeline, string buildinFileCopyParams)
+		{
+			string key = $"{Application.productName}_{packageName}_{buildPipeline}_BuildFileCopyParams";
+			EditorPrefs.SetString(key, buildinFileCopyParams);
+		}
 
-		/// <summary>
-		/// 首包资源文件的标签集合
-		/// </summary>
-		public string CopyBuildinFileTags = string.Empty;
-
-		/// <summary>
-		/// 加密类名称
-		/// </summary>
-		public string EncyptionClassName = string.Empty;
+		// EncyptionClassName
+		public static string GetPackageEncyptionClassName(string packageName, EBuildPipeline buildPipeline)
+		{
+			string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionClassName";
+			return EditorPrefs.GetString(key, string.Empty);
+		}
+		public static void SetPackageEncyptionClassName(string packageName, EBuildPipeline buildPipeline, string encyptionClassName)
+		{
+			string key = $"{Application.productName}_{packageName}_{buildPipeline}_EncyptionClassName";
+			EditorPrefs.SetString(key, encyptionClassName);
+		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSettingData.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSettingData.cs
deleted file mode 100644
index 353931b..0000000
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSettingData.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor;
-
-namespace YooAsset.Editor
-{
-	public class AssetBundleBuilderSettingData
-	{
-		private static AssetBundleBuilderSetting _setting = null;
-		public static AssetBundleBuilderSetting Setting
-		{
-			get
-			{
-				if (_setting == null)
-					LoadSettingData();
-				return _setting;
-			}
-		}
-
-		/// <summary>
-		/// 配置数据是否被修改
-		/// </summary>
-		public static bool IsDirty { set; get; } = false;
-
-		/// <summary>
-		/// 加载配置文件
-		/// </summary>
-		private static void LoadSettingData()
-		{
-			_setting = SettingLoader.LoadSettingData<AssetBundleBuilderSetting>();
-		}
-
-		/// <summary>
-		/// 存储文件
-		/// </summary>
-		public static void SaveFile()
-		{
-			if (Setting != null)
-			{
-				IsDirty = false;
-				EditorUtility.SetDirty(Setting);
-				AssetDatabase.SaveAssets();
-				Debug.Log($"{nameof(AssetBundleBuilderSetting)}.asset is saved!");
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs
index 450e31e..3d930d7 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs
@@ -18,22 +18,14 @@ namespace YooAsset.Editor
 			window.minSize = new Vector2(800, 600);
 		}
 
-		private BuildTarget _buildTarget;
-		private List<Type> _encryptionServicesClassTypes;
-		private List<string> _encryptionServicesClassNames;
-		private List<string> _buildPackageNames;
+		private string _buildPackage;
+		private EBuildPipeline _buildPipeline;
+
+		private Toolbar _toolbar;
+		private ToolbarMenu _packageMenu;
+		private ToolbarMenu _pipelineMenu;
+		private VisualElement _container;
 
-		private Button _saveButton;
-		private TextField _buildOutputField;
-		private EnumField _buildPipelineField;
-		private EnumField _buildModeField;
-		private TextField _buildVersionField;
-		private PopupField<string> _buildPackageField;
-		private PopupField<string> _encryptionField;
-		private EnumField _compressionField;
-		private EnumField _outputNameStyleField;
-		private EnumField _copyBuildinFileOptionField;
-		private TextField _copyBuildinFileTagsField;
 
 		public void CreateGUI()
 		{
@@ -47,276 +39,76 @@ namespace YooAsset.Editor
 					return;
 
 				visualAsset.CloneTree(root);
+				_toolbar = root.Q<Toolbar>("Toolbar");
+				_container = root.Q("Container");
 
-				// 配置保存按钮
-				_saveButton = root.Q<Button>("SaveButton");
-				_saveButton.clicked += SaveBtn_clicked;
-
-				// 构建平台
-				_buildTarget = EditorUserBuildSettings.activeBuildTarget;
-
-				// 包裹名称列表
-				_buildPackageNames = GetBuildPackageNames();
-
-				// 加密服务类
-				_encryptionServicesClassTypes = GetEncryptionServicesClassTypes();
-				_encryptionServicesClassNames = _encryptionServicesClassTypes.Select(t => t.Name).ToList();
-
-				// 输出目录
-				string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-				_buildOutputField = root.Q<TextField>("BuildOutput");
-				_buildOutputField.SetValueWithoutNotify(defaultOutputRoot);
-				_buildOutputField.SetEnabled(false);
-
-				// 构建管线
-				_buildPipelineField = root.Q<EnumField>("BuildPipeline");
-				_buildPipelineField.Init(AssetBundleBuilderSettingData.Setting.BuildPipeline);
-				_buildPipelineField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildPipeline);
-				_buildPipelineField.style.width = 350;
-				_buildPipelineField.RegisterValueChangedCallback(evt =>
+				// 检测构建包裹
+				var packageNames = GetBuildPackageNames();
+				if (packageNames.Count == 0)
 				{
-					AssetBundleBuilderSettingData.IsDirty = true;
-					AssetBundleBuilderSettingData.Setting.BuildPipeline = (EBuildPipeline)_buildPipelineField.value;
-					RefreshWindow();
-				});
-
-				// 构建模式
-				_buildModeField = root.Q<EnumField>("BuildMode");
-				_buildModeField.Init(AssetBundleBuilderSettingData.Setting.BuildMode);
-				_buildModeField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildMode);
-				_buildModeField.style.width = 350;
-				_buildModeField.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleBuilderSettingData.IsDirty = true;
-					AssetBundleBuilderSettingData.Setting.BuildMode = (EBuildMode)_buildModeField.value;
-					RefreshWindow();
-				});
-
-				// 构建版本
-				_buildVersionField = root.Q<TextField>("BuildVersion");
-				_buildVersionField.SetValueWithoutNotify(GetBuildPackageVersion());
+					var label = new Label();
+					label.text = "没有发现可构建的资源包";
+					label.style.width = 100;
+					_toolbar.Add(label);
+					return;
+				}
 
 				// 构建包裹
-				var buildPackageContainer = root.Q("BuildPackageContainer");
-				if (_buildPackageNames.Count > 0)
 				{
-					int defaultIndex = GetDefaultPackageIndex(AssetBundleBuilderSettingData.Setting.BuildPackage);
-					_buildPackageField = new PopupField<string>(_buildPackageNames, defaultIndex);
-					_buildPackageField.label = "Build Package";
-					_buildPackageField.style.width = 350;
-					_buildPackageField.RegisterValueChangedCallback(evt =>
+					_buildPackage = packageNames[0];
+					_packageMenu = new ToolbarMenu();
+					_packageMenu.style.width = 200;
+					foreach (var packageName in packageNames)
 					{
-						AssetBundleBuilderSettingData.IsDirty = true;
-						AssetBundleBuilderSettingData.Setting.BuildPackage = _buildPackageField.value;
-					});
-					buildPackageContainer.Add(_buildPackageField);
-				}
-				else
-				{
-					_buildPackageField = new PopupField<string>();
-					_buildPackageField.label = "Build Package";
-					_buildPackageField.style.width = 350;
-					buildPackageContainer.Add(_buildPackageField);
+						_packageMenu.menu.AppendAction(packageName, PackageMenuAction, PackageMenuFun, packageName);
+					}
+					_toolbar.Add(_packageMenu);
 				}
 
-				// 加密方法
-				var encryptionContainer = root.Q("EncryptionContainer");
-				if (_encryptionServicesClassNames.Count > 0)
+				// 构建管线
 				{
-					int defaultIndex = GetDefaultEncryptionIndex(AssetBundleBuilderSettingData.Setting.EncyptionClassName);
-					_encryptionField = new PopupField<string>(_encryptionServicesClassNames, defaultIndex);
-					_encryptionField.label = "Encryption";
-					_encryptionField.style.width = 350;
-					_encryptionField.RegisterValueChangedCallback(evt =>
-					{
-						AssetBundleBuilderSettingData.IsDirty = true;
-						AssetBundleBuilderSettingData.Setting.EncyptionClassName = _encryptionField.value;
-					});
-					encryptionContainer.Add(_encryptionField);
-				}
-				else
-				{
-					_encryptionField = new PopupField<string>();
-					_encryptionField.label = "Encryption";
-					_encryptionField.style.width = 350;
-					encryptionContainer.Add(_encryptionField);
+					_pipelineMenu = new ToolbarMenu();
+					_pipelineMenu.style.width = 200;
+					_pipelineMenu.menu.AppendAction(EBuildPipeline.BuiltinBuildPipeline.ToString(), PipelineMenuAction, PipelineMenuFun, EBuildPipeline.BuiltinBuildPipeline);
+					_pipelineMenu.menu.AppendAction(EBuildPipeline.ScriptableBuildPipeline.ToString(), PipelineMenuAction, PipelineMenuFun, EBuildPipeline.ScriptableBuildPipeline);
+					_pipelineMenu.menu.AppendAction(EBuildPipeline.RawFileBuildPipeline.ToString(), PipelineMenuAction, PipelineMenuFun, EBuildPipeline.RawFileBuildPipeline);
+					_toolbar.Add(_pipelineMenu);
 				}
 
-				// 压缩方式选项
-				_compressionField = root.Q<EnumField>("Compression");
-				_compressionField.Init(AssetBundleBuilderSettingData.Setting.CompressOption);
-				_compressionField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.CompressOption);
-				_compressionField.style.width = 350;
-				_compressionField.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleBuilderSettingData.IsDirty = true;
-					AssetBundleBuilderSettingData.Setting.CompressOption = (ECompressOption)_compressionField.value;
-				});
-
-				// 输出文件名称样式
-				_outputNameStyleField = root.Q<EnumField>("OutputNameStyle");
-				_outputNameStyleField.Init(AssetBundleBuilderSettingData.Setting.OutputNameStyle);
-				_outputNameStyleField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.OutputNameStyle);
-				_outputNameStyleField.style.width = 350;
-				_outputNameStyleField.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleBuilderSettingData.IsDirty = true;
-					AssetBundleBuilderSettingData.Setting.OutputNameStyle = (EOutputNameStyle)_outputNameStyleField.value;
-				});
-
-				// 首包文件拷贝选项
-				_copyBuildinFileOptionField = root.Q<EnumField>("CopyBuildinFileOption");
-				_copyBuildinFileOptionField.Init(AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption);
-				_copyBuildinFileOptionField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption);
-				_copyBuildinFileOptionField.style.width = 350;
-				_copyBuildinFileOptionField.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleBuilderSettingData.IsDirty = true;
-					AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption = (ECopyBuildinFileOption)_copyBuildinFileOptionField.value;
-					RefreshWindow();
-				});
-
-				// 首包文件的资源标签
-				_copyBuildinFileTagsField = root.Q<TextField>("CopyBuildinFileTags");
-				_copyBuildinFileTagsField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.CopyBuildinFileTags);
-				_copyBuildinFileTagsField.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleBuilderSettingData.IsDirty = true;
-					AssetBundleBuilderSettingData.Setting.CopyBuildinFileTags = _copyBuildinFileTagsField.value;
-				});
-
-				// 构建按钮
-				var buildButton = root.Q<Button>("Build");
-				buildButton.clicked += BuildButton_clicked; ;
-
-				RefreshWindow();
+				RefreshBuildPipelineView();
 			}
 			catch (Exception e)
 			{
 				Debug.LogError(e.ToString());
 			}
 		}
-		public void OnDestroy()
+
+		private void RefreshBuildPipelineView()
 		{
-			if (AssetBundleBuilderSettingData.IsDirty)
-				AssetBundleBuilderSettingData.SaveFile();
-		}
-		public void Update()
-		{
-			if (_saveButton != null)
+			// 清空扩展区域
+			_container.Clear();
+
+			_buildPipeline = AssetBundleBuilderSetting.GetPackageBuildPipeline(_buildPackage);
+			_packageMenu.text = _buildPackage;
+			_pipelineMenu.text = _buildPipeline.ToString();
+
+			var buildTarget = EditorUserBuildSettings.activeBuildTarget;
+			if (_buildPipeline == EBuildPipeline.BuiltinBuildPipeline)
 			{
-				if (AssetBundleBuilderSettingData.IsDirty)
-				{
-					if (_saveButton.enabledSelf == false)
-						_saveButton.SetEnabled(true);
-				}
-				else
-				{
-					if (_saveButton.enabledSelf)
-						_saveButton.SetEnabled(false);
-				}
+				var viewer = new BuiltinBuildPipelineViewer(_buildPackage, buildTarget, _container);
 			}
-		}
-
-		private void RefreshWindow()
-		{
-			var buildPipeline = AssetBundleBuilderSettingData.Setting.BuildPipeline;
-			var buildMode = AssetBundleBuilderSettingData.Setting.BuildMode;
-			var copyOption = AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption;
-			bool enableElement = buildMode == EBuildMode.ForceRebuild;
-			bool tagsFiledVisible = copyOption == ECopyBuildinFileOption.ClearAndCopyByTags || copyOption == ECopyBuildinFileOption.OnlyCopyByTags;
-
-			if (buildPipeline == EBuildPipeline.BuiltinBuildPipeline)
+			else if (_buildPipeline == EBuildPipeline.ScriptableBuildPipeline)
 			{
-				_compressionField.SetEnabled(enableElement);
-				_outputNameStyleField.SetEnabled(enableElement);
-				_copyBuildinFileOptionField.SetEnabled(enableElement);
-				_copyBuildinFileTagsField.SetEnabled(enableElement);
+				var viewer = new ScriptableBuildPipelineViewer(_buildPackage, buildTarget, _container);
+			}
+			else if (_buildPipeline == EBuildPipeline.RawFileBuildPipeline)
+			{
+				var viewer = new RawfileBuildpipelineViewer(_buildPackage, buildTarget, _container);
 			}
 			else
 			{
-				_compressionField.SetEnabled(true);
-				_outputNameStyleField.SetEnabled(true);
-				_copyBuildinFileOptionField.SetEnabled(true);
-				_copyBuildinFileTagsField.SetEnabled(true);
+				throw new System.NotImplementedException(_buildPipeline.ToString());
 			}
-
-			_copyBuildinFileTagsField.visible = tagsFiledVisible;
-		}
-		private void SaveBtn_clicked()
-		{
-			AssetBundleBuilderSettingData.SaveFile();
-		}
-		private void BuildButton_clicked()
-		{
-			var buildMode = AssetBundleBuilderSettingData.Setting.BuildMode;
-			if (EditorUtility.DisplayDialog("提示", $"通过构建模式【{buildMode}】来构建！", "Yes", "No"))
-			{
-				EditorTools.ClearUnityConsole();
-				EditorApplication.delayCall += ExecuteBuild;
-			}
-			else
-			{
-				Debug.LogWarning("[Build] 打包已经取消");
-			}
-		}
-
-		/// <summary>
-		/// 执行构建
-		/// </summary>
-		private void ExecuteBuild()
-		{
-			BuildParameters buildParameters = new BuildParameters();
-			buildParameters.StreamingAssetsRoot = AssetBundleBuilderHelper.GetDefaultStreamingAssetsRoot();
-			buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-			buildParameters.BuildTarget = _buildTarget;
-			buildParameters.BuildPipeline = AssetBundleBuilderSettingData.Setting.BuildPipeline;
-			buildParameters.BuildMode = AssetBundleBuilderSettingData.Setting.BuildMode;
-			buildParameters.PackageName = AssetBundleBuilderSettingData.Setting.BuildPackage;
-			buildParameters.PackageVersion = _buildVersionField.value;
-			buildParameters.VerifyBuildingResult = true;
-			buildParameters.SharedPackRule = new ZeroRedundancySharedPackRule();
-			buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
-			buildParameters.CompressOption = AssetBundleBuilderSettingData.Setting.CompressOption;
-			buildParameters.OutputNameStyle = AssetBundleBuilderSettingData.Setting.OutputNameStyle;
-			buildParameters.CopyBuildinFileOption = AssetBundleBuilderSettingData.Setting.CopyBuildinFileOption;
-			buildParameters.CopyBuildinFileTags = AssetBundleBuilderSettingData.Setting.CopyBuildinFileTags;
-
-			if (AssetBundleBuilderSettingData.Setting.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
-			{
-				buildParameters.SBPParameters = new BuildParameters.SBPBuildParameters();
-				buildParameters.SBPParameters.WriteLinkXML = true;
-			}
-
-			var builder = new AssetBundleBuilder();
-			var buildResult = builder.Run(buildParameters);
-			if (buildResult.Success)
-			{
-				EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
-			}
-		}
-
-		// 构建版本相关
-		private string GetBuildPackageVersion()
-		{
-			int totalMinutes = DateTime.Now.Hour * 60 + DateTime.Now.Minute;
-			return DateTime.Now.ToString("yyyy-MM-dd") + "-" + totalMinutes;
-		}
-
-		// 构建包裹相关
-		private int GetDefaultPackageIndex(string packageName)
-		{
-			for (int index = 0; index < _buildPackageNames.Count; index++)
-			{
-				if (_buildPackageNames[index] == packageName)
-				{
-					return index;
-				}
-			}
-
-			AssetBundleBuilderSettingData.IsDirty = true;
-			AssetBundleBuilderSettingData.Setting.BuildPackage = _buildPackageNames[0];
-			return 0;
 		}
 		private List<string> GetBuildPackageNames()
 		{
@@ -328,31 +120,41 @@ namespace YooAsset.Editor
 			return result;
 		}
 
-		// 加密类相关
-		private int GetDefaultEncryptionIndex(string className)
+		private void PackageMenuAction(DropdownMenuAction action)
 		{
-			for (int index = 0; index < _encryptionServicesClassNames.Count; index++)
+			var packageName = (string)action.userData;
+			if (_buildPackage != packageName)
 			{
-				if (_encryptionServicesClassNames[index] == className)
-				{
-					return index;
-				}
+				_buildPackage = packageName;
+				RefreshBuildPipelineView();
 			}
+		}
+		private DropdownMenuAction.Status PackageMenuFun(DropdownMenuAction action)
+		{
+			var packageName = (string)action.userData;
+			if (_buildPackage == packageName)
+				return DropdownMenuAction.Status.Checked;
+			else
+				return DropdownMenuAction.Status.Normal;
+		}
 
-			AssetBundleBuilderSettingData.IsDirty = true;
-			AssetBundleBuilderSettingData.Setting.EncyptionClassName = _encryptionServicesClassNames[0];
-			return 0;
-		}
-		private List<Type> GetEncryptionServicesClassTypes()
+		private void PipelineMenuAction(DropdownMenuAction action)
 		{
-			return EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
+			var pipelineType = (EBuildPipeline)action.userData;
+			if (_buildPipeline != pipelineType)
+			{
+				_buildPipeline = pipelineType;
+				AssetBundleBuilderSetting.SetPackageBuildPipeline(_buildPackage, pipelineType);
+				RefreshBuildPipelineView();
+			}
 		}
-		private IEncryptionServices CreateEncryptionServicesInstance()
+		private DropdownMenuAction.Status PipelineMenuFun(DropdownMenuAction action)
 		{
-			if (_encryptionField.index < 0)
-				return null;
-			var classType = _encryptionServicesClassTypes[_encryptionField.index];
-			return (IEncryptionServices)Activator.CreateInstance(classType);
+			var pipelineType = (EBuildPipeline)action.userData;
+			if (_buildPipeline == pipelineType)
+				return DropdownMenuAction.Status.Checked;
+			else
+				return DropdownMenuAction.Status.Normal;
 		}
 	}
 }
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.uxml b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.uxml
index 0585cfc..633b4f8 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.uxml
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.uxml
@@ -1,18 +1,4 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
-    <uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row-reverse;">
-        <ui:Button text="Save" display-tooltip-when-elided="true" name="SaveButton" style="background-color: rgb(56, 147, 58);" />
-    </uie:Toolbar>
-    <ui:VisualElement name="BuildContainer">
-        <ui:TextField picking-mode="Ignore" label="Build Output" name="BuildOutput" />
-        <uie:EnumField label="Build Pipeline" name="BuildPipeline" />
-        <uie:EnumField label="Build Mode" name="BuildMode" />
-        <ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" style="width: 350px;" />
-        <ui:VisualElement name="BuildPackageContainer" style="height: 24px;" />
-        <ui:VisualElement name="EncryptionContainer" style="height: 24px;" />
-        <uie:EnumField label="Compression" value="Center" name="Compression" />
-        <uie:EnumField label="Output Name Style" value="Center" name="OutputNameStyle" />
-        <uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
-        <ui:TextField picking-mode="Ignore" label="Copy Buildin File Tags" name="CopyBuildinFileTags" />
-        <ui:Button text="构建" display-tooltip-when-elided="true" name="Build" style="height: 50px; background-color: rgb(40, 106, 42); margin-top: 10px;" />
-    </ui:VisualElement>
+    <uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row;" />
+    <ui:VisualElement name="Container" />
 </ui:UXML>
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs
index c7adc44..663f66e 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleSimulateBuilder.cs
@@ -8,29 +8,92 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 模拟构建
 		/// </summary>
-		public static string SimulateBuild(string packageName)
+		public static string SimulateBuild(string buildPipelineName, string packageName)
 		{
-			Debug.Log($"Begin to create simulate package : {packageName}");
-			BuildParameters buildParameters = new BuildParameters();
-			buildParameters.StreamingAssetsRoot = AssetBundleBuilderHelper.GetDefaultStreamingAssetsRoot();
-			buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
-			buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
-			buildParameters.BuildMode = EBuildMode.SimulateBuild;
-			buildParameters.PackageName = packageName;
-			buildParameters.PackageVersion = "Simulate";
-			buildParameters.EnableLog = false;
-
-			AssetBundleBuilder builder = new AssetBundleBuilder();
-			var buildResult = builder.Run(buildParameters);
-			if (buildResult.Success)
+			if (buildPipelineName == EBuildPipeline.BuiltinBuildPipeline.ToString())
 			{
-				string manifestFileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-				string manifestFilePath = $"{buildResult.OutputPackageDirectory}/{manifestFileName}";
-				return manifestFilePath;
+				BuiltinBuildParameters buildParameters = new BuiltinBuildParameters();
+				buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+				buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+				buildParameters.BuildPipeline = buildPipelineName;
+				buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
+				buildParameters.BuildMode = EBuildMode.SimulateBuild;
+				buildParameters.PackageName = packageName;
+				buildParameters.PackageVersion = "Simulate";
+				buildParameters.FileNameStyle = EFileNameStyle.HashName;
+				buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.None;
+				buildParameters.BuildinFileCopyParams = string.Empty;
+
+				BuiltinBuildPipeline pipeline = new BuiltinBuildPipeline();
+				var buildResult = pipeline.Run(buildParameters, false);
+				if (buildResult.Success)
+				{
+					string manifestFileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+					string manifestFilePath = $"{buildResult.OutputPackageDirectory}/{manifestFileName}";
+					return manifestFilePath;
+				}
+				else
+				{
+					return null;
+				}
+			}
+			else if (buildPipelineName == EBuildPipeline.ScriptableBuildPipeline.ToString())
+			{
+				ScriptableBuildParameters buildParameters = new ScriptableBuildParameters();
+				buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+				buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+				buildParameters.BuildPipeline = buildPipelineName;
+				buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
+				buildParameters.BuildMode = EBuildMode.SimulateBuild;
+				buildParameters.PackageName = packageName;
+				buildParameters.PackageVersion = "Simulate";
+				buildParameters.FileNameStyle = EFileNameStyle.HashName;
+				buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.None;
+				buildParameters.BuildinFileCopyParams = string.Empty;
+
+				ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();
+				var buildResult = pipeline.Run(buildParameters, true);
+				if (buildResult.Success)
+				{
+					string manifestFileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+					string manifestFilePath = $"{buildResult.OutputPackageDirectory}/{manifestFileName}";
+					return manifestFilePath;
+				}
+				else
+				{
+					return null;
+				}
+			}
+			else if (buildPipelineName == EBuildPipeline.RawFileBuildPipeline.ToString())
+			{
+				RawFileBuildParameters buildParameters = new RawFileBuildParameters();
+				buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+				buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+				buildParameters.BuildPipeline = buildPipelineName;
+				buildParameters.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
+				buildParameters.BuildMode = EBuildMode.SimulateBuild;
+				buildParameters.PackageName = packageName;
+				buildParameters.PackageVersion = "Simulate";
+				buildParameters.FileNameStyle = EFileNameStyle.HashName;
+				buildParameters.BuildinFileCopyOption = EBuildinFileCopyOption.None;
+				buildParameters.BuildinFileCopyParams = string.Empty;
+
+				RawFileBuildPipeline pipeline = new RawFileBuildPipeline();
+				var buildResult = pipeline.Run(buildParameters, true);
+				if (buildResult.Success)
+				{
+					string manifestFileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+					string manifestFilePath = $"{buildResult.OutputPackageDirectory}/{manifestFileName}";
+					return manifestFilePath;
+				}
+				else
+				{
+					return null;
+				}
 			}
 			else
 			{
-				return null;
+				throw new System.NotImplementedException(buildPipelineName);
 			}
 		}
 	}
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs
index 4536337..3808c15 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs
@@ -36,9 +36,9 @@ namespace YooAsset.Editor
 		public string AssetGUID { private set; get; }
 
 		/// <summary>
-		/// 是否为原生资源
+		/// 资源类型
 		/// </summary>
-		public bool IsRawAsset { private set; get; }
+		public System.Type AssetType { private set; get; }
 
 		/// <summary>
 		/// 是否为着色器资源
@@ -50,11 +50,6 @@ namespace YooAsset.Editor
 		/// </summary>
 		public readonly List<string> AssetTags = new List<string>();
 
-		/// <summary>
-		/// 资源包的分类标签
-		/// </summary>
-		public readonly List<string> BundleTags = new List<string>();
-
 		/// <summary>
 		/// 依赖的所有资源
 		/// 注意：包括零依赖资源和冗余资源（资源包名无效）
@@ -62,17 +57,16 @@ namespace YooAsset.Editor
 		public List<BuildAssetInfo> AllDependAssetInfos { private set; get; }
 
 
-		public BuildAssetInfo(ECollectorType collectorType, string bundleName, string address, string assetPath, bool isRawAsset)
+		public BuildAssetInfo(ECollectorType collectorType, string bundleName, string address, string assetPath)
 		{
 			CollectorType = collectorType;
 			BundleName = bundleName;
 			Address = address;
 			AssetPath = assetPath;
-			IsRawAsset = isRawAsset;
 
 			AssetGUID = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath);
-			System.Type assetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
+			AssetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
+			if (AssetType == typeof(UnityEngine.Shader) || AssetType == typeof(UnityEngine.ShaderVariantCollection))
 				IsShaderAsset = true;
 			else
 				IsShaderAsset = false;
@@ -82,11 +76,10 @@ namespace YooAsset.Editor
 			CollectorType = ECollectorType.None;
 			Address = string.Empty;
 			AssetPath = assetPath;
-			IsRawAsset = false;
 
 			AssetGUID = UnityEditor.AssetDatabase.AssetPathToGUID(assetPath);
-			System.Type assetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
+			AssetType = UnityEditor.AssetDatabase.GetMainAssetTypeAtPath(assetPath);
+			if (AssetType == typeof(UnityEngine.Shader) || AssetType == typeof(UnityEngine.ShaderVariantCollection))
 				IsShaderAsset = true;
 			else
 				IsShaderAsset = false;
@@ -96,7 +89,7 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 设置所有依赖的资源
 		/// </summary>
-		public void SetAllDependAssetInfos(List<BuildAssetInfo> dependAssetInfos)
+		public void SetDependAssetInfos(List<BuildAssetInfo> dependAssetInfos)
 		{
 			if (AllDependAssetInfos != null)
 				throw new System.Exception("Should never get here !");
@@ -123,32 +116,6 @@ namespace YooAsset.Editor
 			}
 		}
 
-		/// <summary>
-		/// 添加资源包的分类标签
-		/// 说明：传染算法统计到的分类标签
-		/// </summary>
-		public void AddBundleTags(List<string> tags)
-		{
-			foreach (var tag in tags)
-			{
-				if (BundleTags.Contains(tag) == false)
-				{
-					BundleTags.Add(tag);
-				}
-			}
-		}
-
-		/// <summary>
-		/// 资源包名是否存在
-		/// </summary>
-		public bool HasBundleName()
-		{
-			if (string.IsNullOrEmpty(BundleName))
-				return false;
-			else
-				return true;
-		}
-
 		/// <summary>
 		/// 添加关联的资源包名称
 		/// </summary>
@@ -162,33 +129,14 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 计算共享资源包的完整包名
+		/// 资源包名是否存在
 		/// </summary>
-		public void CalculateShareBundleName(ISharedPackRule sharedPackRule, bool uniqueBundleName, string packageName, string shadersBundleName)
+		public bool HasBundleName()
 		{
-			if (CollectorType != ECollectorType.None)
-				return;
-
-			if (IsRawAsset)
-				throw new Exception("Should never get here !");
-
-			if (IsShaderAsset)
-			{
-				BundleName = shadersBundleName;
-			}
+			if (string.IsNullOrEmpty(BundleName))
+				return false;
 			else
-			{
-				if (_referenceBundleNames.Count > 1)
-				{
-					PackRuleResult packRuleResult = sharedPackRule.GetPackRuleResult(AssetPath);
-					BundleName = packRuleResult.GetShareBundleName(packageName, uniqueBundleName);
-				}
-				else
-				{
-					// 注意：被引用次数小于1的资源不需要设置资源包名称
-					BundleName = string.Empty;
-				}
-			}
+				return true;
 		}
 
 		/// <summary>
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs
index 177a708..e6d9ac3 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs
@@ -57,51 +57,21 @@ namespace YooAsset.Editor
 		#endregion
 
 
+		/// <summary>
+		/// 参与构建的资源列表
+		/// 注意：不包含零依赖资源和冗余资源
+		/// </summary>
+		public readonly List<BuildAssetInfo> MainAssets = new List<BuildAssetInfo>();
+
 		/// <summary>
 		/// 资源包名称
 		/// </summary>
 		public string BundleName { private set; get; }
 
 		/// <summary>
-		/// 参与构建的资源列表
-		/// 注意：不包含零依赖资源和冗余资源
+		/// 加密文件
 		/// </summary>
-		public readonly List<BuildAssetInfo> AllMainAssets = new List<BuildAssetInfo>();
-
-		/// <summary>
-		/// Bundle文件的加载方法
-		/// </summary>
-		public EBundleLoadMethod LoadMethod { set; get; }
-
-		/// <summary>
-		/// 是否为原生文件
-		/// </summary>
-		public bool IsRawFile
-		{
-			get
-			{
-				foreach (var assetInfo in AllMainAssets)
-				{
-					if (assetInfo.IsRawAsset)
-						return true;
-				}
-				return false;
-			}
-		}
-
-		/// <summary>
-		/// 是否为加密文件
-		/// </summary>
-		public bool IsEncryptedFile
-		{
-			get
-			{
-				if (string.IsNullOrEmpty(EncryptedFilePath))
-					return false;
-				else
-					return true;
-			}
-		}
+		public bool Encrypted { set; get; }
 
 
 		public BuildBundleInfo(string bundleName)
@@ -117,7 +87,7 @@ namespace YooAsset.Editor
 			if (IsContainsAsset(assetInfo.AssetPath))
 				throw new System.Exception($"Asset is existed : {assetInfo.AssetPath}");
 
-			AllMainAssets.Add(assetInfo);
+			MainAssets.Add(assetInfo);
 		}
 
 		/// <summary>
@@ -125,7 +95,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool IsContainsAsset(string assetPath)
 		{
-			foreach (var assetInfo in AllMainAssets)
+			foreach (var assetInfo in MainAssets)
 			{
 				if (assetInfo.AssetPath == assetPath)
 				{
@@ -135,29 +105,12 @@ namespace YooAsset.Editor
 			return false;
 		}
 
-		/// <summary>
-		/// 获取资源包的分类标签列表
-		/// </summary>
-		public string[] GetBundleTags()
-		{
-			List<string> result = new List<string>(AllMainAssets.Count);
-			foreach (var assetInfo in AllMainAssets)
-			{
-				foreach (var assetTag in assetInfo.BundleTags)
-				{
-					if (result.Contains(assetTag) == false)
-						result.Add(assetTag);
-				}
-			}
-			return result.ToArray();
-		}
-
 		/// <summary>
 		/// 获取构建的资源路径列表
 		/// </summary>
 		public string[] GetAllMainAssetPaths()
 		{
-			return AllMainAssets.Select(t => t.AssetPath).ToArray();
+			return MainAssets.Select(t => t.AssetPath).ToArray();
 		}
 
 		/// <summary>
@@ -167,7 +120,7 @@ namespace YooAsset.Editor
 		{
 			var packAssets = GetAllMainAssetPaths();
 			List<string> result = new List<string>(packAssets);
-			foreach (var assetInfo in AllMainAssets)
+			foreach (var assetInfo in MainAssets)
 			{
 				if (assetInfo.AllDependAssetInfos == null)
 					continue;
@@ -202,7 +155,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public BuildAssetInfo[] GetAllManifestAssetInfos()
 		{
-			return AllMainAssets.Where(t => t.CollectorType == ECollectorType.MainAssetCollector).ToArray();
+			return MainAssets.Where(t => t.CollectorType == ECollectorType.MainAssetCollector).ToArray();
 		}
 
 		/// <summary>
@@ -216,9 +169,7 @@ namespace YooAsset.Editor
 			packageBundle.FileCRC = PackageFileCRC;
 			packageBundle.FileSize = PackageFileSize;
 			packageBundle.UnityCRC = PackageUnityCRC;
-			packageBundle.IsRawFile = IsRawFile;
-			packageBundle.LoadMethod = (byte)LoadMethod;
-			packageBundle.Tags = GetBundleTags();
+			packageBundle.Encrypted = Encrypted;
 			return packageBundle;
 		}
 	}
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs
index 3cce1be..1ab7207 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs
@@ -8,13 +8,17 @@ namespace YooAsset.Editor
 {
 	public class BuildMapContext : IContextObject
 	{
+		/// <summary>
+		/// 资源包集合
+		/// </summary>
 		private readonly Dictionary<string, BuildBundleInfo> _bundleInfoDic = new Dictionary<string, BuildBundleInfo>(10000);
 
 		/// <summary>
 		/// 冗余的资源列表
 		/// </summary>
-		public readonly List<ReportRedundancyInfo> RedundancyInfos= new List<ReportRedundancyInfo>(1000);
-		
+		public readonly List<ReportRedundancyInfo> RedundancyInfos = new List<ReportRedundancyInfo>(1000);
+
+
 		/// <summary>
 		/// 参与构建的资源总数
 		/// 说明：包括主动收集的资源以及其依赖的所有资源
@@ -22,7 +26,7 @@ namespace YooAsset.Editor
 		public int AssetFileCount;
 
 		/// <summary>
-		/// 收集命令
+		/// 资源收集命令
 		/// </summary>
 		public CollectCommand Command { set; get; }
 
@@ -87,8 +91,7 @@ namespace YooAsset.Editor
 			List<UnityEditor.AssetBundleBuild> builds = new List<UnityEditor.AssetBundleBuild>(_bundleInfoDic.Count);
 			foreach (var bundleInfo in _bundleInfoDic.Values)
 			{
-				if (bundleInfo.IsRawFile == false)
-					builds.Add(bundleInfo.CreatePipelineBuild());
+				builds.Add(bundleInfo.CreatePipelineBuild());
 			}
 			return builds.ToArray();
 		}
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs
index cef251a..4c29215 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs
@@ -1,4 +1,6 @@
-using System.Collections;
+using System;
+using System.IO;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEditor;
 
@@ -7,54 +9,27 @@ namespace YooAsset.Editor
 	/// <summary>
 	/// 构建参数
 	/// </summary>
-	public class BuildParameters
+	public abstract class BuildParameters
 	{
-		/// <summary>
-		/// SBP构建参数
-		/// </summary>
-		public class SBPBuildParameters
-		{
-			/// <summary>
-			/// 生成代码防裁剪配置
-			/// </summary>
-			public bool WriteLinkXML = true;
-
-			/// <summary>
-			/// 缓存服务器地址
-			/// </summary>
-			public string CacheServerHost;
-
-			/// <summary>
-			/// 缓存服务器端口
-			/// </summary>
-			public int CacheServerPort;
-		}
-
-		/// <summary>
-		/// 可编程构建管线的参数
-		/// </summary>
-		public SBPBuildParameters SBPParameters;
-
-
-		/// <summary>
-		/// 内置资源的根目录
-		/// </summary>
-		public string StreamingAssetsRoot;
-
 		/// <summary>
 		/// 构建输出的根目录
 		/// </summary>
 		public string BuildOutputRoot;
 
 		/// <summary>
-		/// 构建的平台
+		/// 内置文件的根目录
 		/// </summary>
-		public BuildTarget BuildTarget;
+		public string BuildinFileRoot;
 
 		/// <summary>
 		/// 构建管线
 		/// </summary>
-		public EBuildPipeline BuildPipeline;
+		public string BuildPipeline;
+
+		/// <summary>
+		/// 构建的平台
+		/// </summary>
+		public BuildTarget BuildTarget;
 
 		/// <summary>
 		/// 构建模式
@@ -72,54 +47,140 @@ namespace YooAsset.Editor
 		public string PackageVersion;
 
 
-		/// <summary>
-		/// 是否显示普通日志
-		/// </summary>
-		public bool EnableLog = true;
-		
 		/// <summary>
 		/// 验证构建结果
 		/// </summary>
 		public bool VerifyBuildingResult = false;
+
+		/// <summary>
+		/// 资源包名称样式
+		/// </summary>
+		public EFileNameStyle FileNameStyle;
+
+		/// <summary>
+		/// 内置文件的拷贝选项
+		/// </summary>
+		public EBuildinFileCopyOption BuildinFileCopyOption;
+
+		/// <summary>
+		/// 内置文件的拷贝参数
+		/// </summary>
+		public string BuildinFileCopyParams;
+
+		/// <summary>
+		/// 资源包加密服务类
+		/// </summary>
+		public IEncryptionServices EncryptionServices;
+		
+
+
+		private string _pipelineOutputDirectory = string.Empty;
+		private string _packageOutputDirectory = string.Empty;
+		private string _packageRootDirectory = string.Empty;
+		private string _buildinRootDirectory = string.Empty;
 		
 		/// <summary>
-		/// 共享资源的打包规则
+		/// 检测构建参数是否合法
 		/// </summary>
-		public ISharedPackRule SharedPackRule = null;
+		public virtual void CheckBuildParameters()
+		{
+			// 检测当前是否正在构建资源包
+			if (UnityEditor.BuildPipeline.isBuildingPlayer)
+				throw new Exception("当前正在构建资源包，请结束后再试");
+
+			// 检测构建参数合法性
+			if (BuildTarget == BuildTarget.NoTarget)
+				throw new Exception("请选择目标平台！");
+			if (string.IsNullOrEmpty(PackageName))
+				throw new Exception("包裹名称不能为空！");
+			if (string.IsNullOrEmpty(PackageVersion))
+				throw new Exception("包裹版本不能为空！");
+			if (string.IsNullOrEmpty(BuildOutputRoot))
+				throw new Exception("构建输出的根目录为空！");
+			if (string.IsNullOrEmpty(BuildinFileRoot))
+				throw new Exception("内置资源根目录为空！");
+
+			// 检测是否有未保存场景
+			if (BuildMode != EBuildMode.SimulateBuild)
+			{
+				if (EditorTools.HasDirtyScenes())
+					throw new Exception("检测到未保存的场景文件");
+			}
+
+			// 强制构建删除包裹目录
+			if (BuildMode == EBuildMode.ForceRebuild)
+			{
+				string packageRootDirectory = GetPackageRootDirectory();
+				if (EditorTools.DeleteDirectory(packageRootDirectory))
+				{
+					BuildLogger.Log($"删除包裹目录：{packageRootDirectory}");
+				}
+			}
+
+			// 检测包裹输出目录是否存在
+			if (BuildMode != EBuildMode.SimulateBuild)
+			{
+				string packageOutputDirectory = GetPackageOutputDirectory();
+				if (Directory.Exists(packageOutputDirectory))
+					throw new Exception($"本次构建的补丁目录已经存在：{packageOutputDirectory}");
+			}
+
+			// 如果输出目录不存在
+			string pipelineOutputDirectory = GetPipelineOutputDirectory();
+			if (EditorTools.CreateDirectory(pipelineOutputDirectory))
+			{
+				BuildLogger.Log($"创建输出目录：{pipelineOutputDirectory}");
+			}
+		}
+
 
 		/// <summary>
-		/// 资源的加密接口
+		/// 获取构建管线的输出目录
 		/// </summary>
-		public IEncryptionServices EncryptionServices = null;
+		/// <returns></returns>
+		public string GetPipelineOutputDirectory()
+		{
+			if (string.IsNullOrEmpty(_pipelineOutputDirectory))
+			{
+				_pipelineOutputDirectory = $"{BuildOutputRoot}/{BuildTarget}/{PackageName}/{YooAssetSettings.OutputFolderName}";
+			}
+			return _pipelineOutputDirectory;
+		}
 
 		/// <summary>
-		/// 补丁文件名称的样式
+		/// 获取本次构建的补丁输出目录
 		/// </summary>
-		public EOutputNameStyle OutputNameStyle = EOutputNameStyle.HashName;
+		public string GetPackageOutputDirectory()
+		{
+			if (string.IsNullOrEmpty(_packageOutputDirectory))
+			{
+				_packageOutputDirectory = $"{BuildOutputRoot}/{BuildTarget}/{PackageName}/{PackageVersion}";
+			}
+			return _packageOutputDirectory;
+		}
 
 		/// <summary>
-		/// 拷贝内置资源选项
+		/// 获取本次构建的补丁根目录
 		/// </summary>
-		public ECopyBuildinFileOption CopyBuildinFileOption = ECopyBuildinFileOption.None;
+		public string GetPackageRootDirectory()
+		{
+			if (string.IsNullOrEmpty(_packageRootDirectory))
+			{
+				_packageRootDirectory = $"{BuildOutputRoot}/{BuildTarget}/{PackageName}";
+			}
+			return _packageRootDirectory;
+		}
 
 		/// <summary>
-		/// 拷贝内置资源的标签
+		/// 获取内置资源的根目录
 		/// </summary>
-		public string CopyBuildinFileTags = string.Empty;
-
-		/// <summary>
-		/// 压缩选项
-		/// </summary>
-		public ECompressOption CompressOption = ECompressOption.Uncompressed;
-
-		/// <summary>
-		/// 禁止写入类型树结构（可以降低包体和内存并提高加载效率）
-		/// </summary>
-		public bool DisableWriteTypeTree = false;
-
-		/// <summary>
-		/// 忽略类型树变化
-		/// </summary>
-		public bool IgnoreTypeTreeChanges = true;
+		public string GetBuildinRootDirectory()
+		{
+			if (string.IsNullOrEmpty(_buildinRootDirectory))
+			{
+				_buildinRootDirectory = $"{BuildinFileRoot}/{PackageName}";
+			}
+			return _buildinRootDirectory;
+		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs
index e4bb864..1cbd3f7 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParametersContext.cs
@@ -1,17 +1,13 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using UnityEditor;
 
 namespace YooAsset.Editor
 {
 	public class BuildParametersContext : IContextObject
 	{
-		private string _pipelineOutputDirectory = string.Empty;
-		private string _packageOutputDirectory = string.Empty;
-		private string _packageRootDirectory = string.Empty;
-		private string _streamingAssetsDirectory = string.Empty;
-
 		/// <summary>
 		/// 构建参数
 		/// </summary>
@@ -23,17 +19,21 @@ namespace YooAsset.Editor
 			Parameters = parameters;
 		}
 
+		/// <summary>
+		/// 检测构建参数是否合法
+		/// </summary>
+		public void CheckBuildParameters()
+		{
+			Parameters.CheckBuildParameters();
+		}
+
 		/// <summary>
 		/// 获取构建管线的输出目录
 		/// </summary>
 		/// <returns></returns>
 		public string GetPipelineOutputDirectory()
 		{
-			if (string.IsNullOrEmpty(_pipelineOutputDirectory))
-			{
-				_pipelineOutputDirectory = $"{Parameters.BuildOutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}/{YooAssetSettings.OutputFolderName}";
-			}
-			return _pipelineOutputDirectory;
+			return Parameters.GetPipelineOutputDirectory();
 		}
 
 		/// <summary>
@@ -41,11 +41,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string GetPackageOutputDirectory()
 		{
-			if (string.IsNullOrEmpty(_packageOutputDirectory))
-			{
-				_packageOutputDirectory = $"{Parameters.BuildOutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}/{Parameters.PackageVersion}";
-			}
-			return _packageOutputDirectory;
+			return Parameters.GetPackageOutputDirectory();
 		}
 
 		/// <summary>
@@ -53,93 +49,15 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string GetPackageRootDirectory()
 		{
-			if (string.IsNullOrEmpty(_packageRootDirectory))
-			{
-				_packageRootDirectory = $"{Parameters.BuildOutputRoot}/{Parameters.BuildTarget}/{Parameters.PackageName}";
-			}
-			return _packageRootDirectory;
+			return Parameters.GetPackageRootDirectory();
 		}
 
 		/// <summary>
-		/// 获取内置资源的目录
+		/// 获取内置资源的根目录
 		/// </summary>
-		public string GetStreamingAssetsDirectory()
+		public string GetBuildinRootDirectory()
 		{
-			if (string.IsNullOrEmpty(_streamingAssetsDirectory))
-			{
-				_streamingAssetsDirectory = $"{Parameters.StreamingAssetsRoot}/{Parameters.PackageName}";
-			}
-			return _streamingAssetsDirectory;
-		}
-
-		/// <summary>
-		/// 获取内置构建管线的构建选项
-		/// </summary>
-		public BuildAssetBundleOptions GetPipelineBuildOptions()
-		{
-			// For the new build system, unity always need BuildAssetBundleOptions.CollectDependencies and BuildAssetBundleOptions.DeterministicAssetBundle
-			// 除非设置ForceRebuildAssetBundle标记，否则会进行增量打包
-
-			if (Parameters.BuildMode == EBuildMode.SimulateBuild)
-				throw new Exception("Should never get here !");
-
-			BuildAssetBundleOptions opt = BuildAssetBundleOptions.None;
-			opt |= BuildAssetBundleOptions.StrictMode; //Do not allow the build to succeed if any errors are reporting during it.
-
-			if (Parameters.BuildMode == EBuildMode.DryRunBuild)
-			{
-				opt |= BuildAssetBundleOptions.DryRunBuild;
-				return opt;
-			}
-
-			if (Parameters.CompressOption == ECompressOption.Uncompressed)
-				opt |= BuildAssetBundleOptions.UncompressedAssetBundle;
-			else if (Parameters.CompressOption == ECompressOption.LZ4)
-				opt |= BuildAssetBundleOptions.ChunkBasedCompression;
-
-			if (Parameters.BuildMode == EBuildMode.ForceRebuild)
-				opt |= BuildAssetBundleOptions.ForceRebuildAssetBundle; //Force rebuild the asset bundles
-			if (Parameters.DisableWriteTypeTree)
-				opt |= BuildAssetBundleOptions.DisableWriteTypeTree; //Do not include type information within the asset bundle (don't write type tree).
-			if (Parameters.IgnoreTypeTreeChanges)
-				opt |= BuildAssetBundleOptions.IgnoreTypeTreeChanges; //Ignore the type tree changes when doing the incremental build check.
-
-			opt |= BuildAssetBundleOptions.DisableLoadAssetByFileName; //Disables Asset Bundle LoadAsset by file name.
-			opt |= BuildAssetBundleOptions.DisableLoadAssetByFileNameWithExtension; //Disables Asset Bundle LoadAsset by file name with extension.			
-
-			return opt;
-		}
-
-		/// <summary>
-		/// 获取可编程构建管线的构建参数
-		/// </summary>
-		public UnityEditor.Build.Pipeline.BundleBuildParameters GetSBPBuildParameters()
-		{
-			if (Parameters.BuildMode == EBuildMode.SimulateBuild)
-				throw new Exception("Should never get here !");
-
-			var targetGroup = BuildPipeline.GetBuildTargetGroup(Parameters.BuildTarget);
-			var pipelineOutputDirectory = GetPipelineOutputDirectory();
-			var buildParams = new UnityEditor.Build.Pipeline.BundleBuildParameters(Parameters.BuildTarget, targetGroup, pipelineOutputDirectory);
-
-			if (Parameters.CompressOption == ECompressOption.Uncompressed)
-				buildParams.BundleCompression = UnityEngine.BuildCompression.Uncompressed;
-			else if (Parameters.CompressOption == ECompressOption.LZMA)
-				buildParams.BundleCompression = UnityEngine.BuildCompression.LZMA;
-			else if (Parameters.CompressOption == ECompressOption.LZ4)
-				buildParams.BundleCompression = UnityEngine.BuildCompression.LZ4;
-			else
-				throw new System.NotImplementedException(Parameters.CompressOption.ToString());
-
-			if (Parameters.DisableWriteTypeTree)
-				buildParams.ContentBuildFlags |= UnityEditor.Build.Content.ContentBuildFlags.DisableWriteTypeTree;
-
-			buildParams.UseCache = true;
-			buildParams.CacheServerHost = Parameters.SBPParameters.CacheServerHost;
-			buildParams.CacheServerPort = Parameters.SBPParameters.CacheServerPort;
-			buildParams.WriteLinkXML = Parameters.SBPParameters.WriteLinkXML;
-
-			return buildParams;
+			return Parameters.GetBuildinRootDirectory();
 		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/Properties.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline.meta
similarity index 77%
rename from Assets/YooAsset/Runtime/Properties.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline.meta
index dc77b70..29b3e28 100644
--- a/Assets/YooAsset/Runtime/Properties.meta
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2de5a58f37a4ae64e804f150144da809
+guid: 431722e1bca52d448825f603789d7e4b
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks.meta
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCopyBuildinFiles.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCopyBuildinFiles.cs
new file mode 100644
index 0000000..89a9e63
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCopyBuildinFiles.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+	public class TaskCopyBuildinFiles
+	{
+		/// <summary>
+		/// 拷贝首包资源文件
+		/// </summary>
+		internal void CopyBuildinFilesToStreaming(BuildParametersContext buildParametersContext, PackageManifest manifest)
+		{
+			EBuildinFileCopyOption copyOption = buildParametersContext.Parameters.BuildinFileCopyOption;
+			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+			string buildinRootDirectory = buildParametersContext.GetBuildinRootDirectory();
+			string buildPackageName = buildParametersContext.Parameters.PackageName;
+			string buildPackageVersion = buildParametersContext.Parameters.PackageVersion;
+
+			// 清空内置文件的目录
+			if (copyOption == EBuildinFileCopyOption.ClearAndCopyAll || copyOption == EBuildinFileCopyOption.ClearAndCopyByTags)
+			{
+				EditorTools.ClearFolder(buildinRootDirectory);
+			}
+
+			// 拷贝补丁清单文件
+			{
+				string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildPackageName, buildPackageVersion);
+				string sourcePath = $"{packageOutputDirectory}/{fileName}";
+				string destPath = $"{buildinRootDirectory}/{fileName}";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝补丁清单哈希文件
+			{
+				string fileName = YooAssetSettingsData.GetPackageHashFileName(buildPackageName, buildPackageVersion);
+				string sourcePath = $"{packageOutputDirectory}/{fileName}";
+				string destPath = $"{buildinRootDirectory}/{fileName}";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝补丁清单版本文件
+			{
+				string fileName = YooAssetSettingsData.GetPackageVersionFileName(buildPackageName);
+				string sourcePath = $"{packageOutputDirectory}/{fileName}";
+				string destPath = $"{buildinRootDirectory}/{fileName}";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝文件列表（所有文件）
+			if (copyOption == EBuildinFileCopyOption.ClearAndCopyAll || copyOption == EBuildinFileCopyOption.OnlyCopyAll)
+			{
+				foreach (var packageBundle in manifest.BundleList)
+				{
+					string sourcePath = $"{packageOutputDirectory}/{packageBundle.FileName}";
+					string destPath = $"{buildinRootDirectory}/{packageBundle.FileName}";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
+			}
+
+			// 拷贝文件列表（带标签的文件）
+			if (copyOption == EBuildinFileCopyOption.ClearAndCopyByTags || copyOption == EBuildinFileCopyOption.OnlyCopyByTags)
+			{
+				string[] tags = buildParametersContext.Parameters.BuildinFileCopyParams.Split(';');
+				foreach (var packageBundle in manifest.BundleList)
+				{
+					if (packageBundle.HasTag(tags) == false)
+						continue;
+					string sourcePath = $"{packageOutputDirectory}/{packageBundle.FileName}";
+					string destPath = $"{buildinRootDirectory}/{packageBundle.FileName}";
+					EditorTools.CopyFile(sourcePath, destPath, true);
+				}
+			}
+
+			// 刷新目录
+			AssetDatabase.Refresh();
+			BuildLogger.Log($"内置文件拷贝完成：{buildinRootDirectory}");
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyBuildinFiles.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCopyBuildinFiles.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyBuildinFiles.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCopyBuildinFiles.cs.meta
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs
new file mode 100644
index 0000000..92e08fe
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs
@@ -0,0 +1,213 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEditor.Build.Pipeline;
+using UnityEditor.Build.Pipeline.Interfaces;
+
+namespace YooAsset.Editor
+{
+	public class ManifestContext : IContextObject
+	{
+		internal PackageManifest Manifest;
+	}
+
+	public abstract class TaskCreateManifest
+	{
+		private readonly Dictionary<string, int> _cachedBundleID = new Dictionary<string, int>(10000);
+
+		/// <summary>
+		/// 创建补丁清单文件到输出目录
+		/// </summary>
+		protected void CreateManifestFile(BuildContext context)
+		{
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildParameters = buildParametersContext.Parameters;
+			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+
+			// 创建新补丁清单
+			PackageManifest manifest = new PackageManifest();
+			manifest.FileVersion = YooAssetSettings.ManifestFileVersion;
+			manifest.EnableAddressable = buildMapContext.Command.EnableAddressable;
+			manifest.LocationToLower = buildMapContext.Command.LocationToLower;
+			manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
+			manifest.OutputNameStyle = (int)buildParameters.FileNameStyle;
+			manifest.BuildPipeline = buildParameters.BuildPipeline;
+			manifest.PackageName = buildParameters.PackageName;
+			manifest.PackageVersion = buildParameters.PackageVersion;
+			manifest.BundleList = GetAllPackageBundle(buildMapContext);
+			manifest.AssetList = GetAllPackageAsset(buildMapContext);
+
+			if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
+			{
+				// 处理资源包的依赖列表
+				ProcessBundleDepends(context, manifest);
+
+				// 处理资源包的标签集合
+				ProcessBundleTags(manifest);
+			}
+
+			// 创建补丁清单文本文件
+			{
+				string fileName = YooAssetSettingsData.GetManifestJsonFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+				string filePath = $"{packageOutputDirectory}/{fileName}";
+				ManifestTools.SerializeToJson(filePath, manifest);
+				BuildLogger.Log($"创建补丁清单文件：{filePath}");
+			}
+
+			// 创建补丁清单二进制文件
+			string packageHash;
+			{
+				string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+				string filePath = $"{packageOutputDirectory}/{fileName}";
+				ManifestTools.SerializeToBinary(filePath, manifest);
+				packageHash = HashUtility.FileMD5(filePath);
+				BuildLogger.Log($"创建补丁清单文件：{filePath}");
+
+				ManifestContext manifestContext = new ManifestContext();
+				byte[] bytesData = FileUtility.ReadAllBytes(filePath);
+				manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData);
+				context.SetContextObject(manifestContext);
+			}
+
+			// 创建补丁清单哈希文件
+			{
+				string fileName = YooAssetSettingsData.GetPackageHashFileName(buildParameters.PackageName, buildParameters.PackageVersion);
+				string filePath = $"{packageOutputDirectory}/{fileName}";
+				FileUtility.WriteAllText(filePath, packageHash);
+				BuildLogger.Log($"创建补丁清单哈希文件：{filePath}");
+			}
+
+			// 创建补丁清单版本文件
+			{
+				string fileName = YooAssetSettingsData.GetPackageVersionFileName(buildParameters.PackageName);
+				string filePath = $"{packageOutputDirectory}/{fileName}";
+				FileUtility.WriteAllText(filePath, buildParameters.PackageVersion);
+				BuildLogger.Log($"创建补丁清单版本文件：{filePath}");
+			}
+		}
+
+		/// <summary>
+		/// 获取资源包的依赖集合
+		/// </summary>
+		protected abstract string[] GetBundleDepends(BuildContext context, string bundleName);
+
+		/// <summary>
+		/// 获取主资源对象列表
+		/// </summary>
+		private List<PackageAsset> GetAllPackageAsset(BuildMapContext buildMapContext)
+		{
+			List<PackageAsset> result = new List<PackageAsset>(1000);
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				var assetInfos = bundleInfo.GetAllManifestAssetInfos();
+				foreach (var assetInfo in assetInfos)
+				{
+					PackageAsset packageAsset = new PackageAsset();
+					packageAsset.Address = buildMapContext.Command.EnableAddressable ? assetInfo.Address : string.Empty;
+					packageAsset.AssetPath = assetInfo.AssetPath;
+					packageAsset.AssetGUID = buildMapContext.Command.IncludeAssetGUID ? assetInfo.AssetGUID : string.Empty;
+					packageAsset.AssetTags = assetInfo.AssetTags.ToArray();
+					packageAsset.BundleID = GetCachedBundleID(assetInfo.BundleName);
+					result.Add(packageAsset);
+				}
+			}
+			return result;
+		}
+
+		/// <summary>
+		/// 获取资源包列表
+		/// </summary>
+		private List<PackageBundle> GetAllPackageBundle(BuildMapContext buildMapContext)
+		{
+			List<PackageBundle> result = new List<PackageBundle>(1000);
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				var packageBundle = bundleInfo.CreatePackageBundle();
+				result.Add(packageBundle);
+			}
+
+			// 注意：缓存资源包索引
+			for (int index = 0; index < result.Count; index++)
+			{
+				string bundleName = result[index].BundleName;
+				_cachedBundleID.Add(bundleName, index);
+			}
+
+			return result;
+		}
+
+		/// <summary>
+		/// 处理资源包的依赖集合
+		/// </summary>
+		private void ProcessBundleDepends(BuildContext context, PackageManifest manifest)
+		{
+			// 查询引擎生成的资源包依赖关系，然后记录到清单
+			foreach (var packageBundle in manifest.BundleList)
+			{
+				int mainBundleID = GetCachedBundleID(packageBundle.BundleName);
+				var depends = GetBundleDepends(context, packageBundle.BundleName);
+				List<int> dependIDs = new List<int>(depends.Length);
+				foreach (var dependBundleName in depends)
+				{
+					int bundleID = GetCachedBundleID(dependBundleName);
+					if (bundleID != mainBundleID)
+						dependIDs.Add(bundleID);
+				}
+				packageBundle.DependIDs = dependIDs.ToArray();
+			}
+		}
+
+		/// <summary>
+		/// 处理资源包的标签集合
+		/// </summary>
+		private void ProcessBundleTags(PackageManifest manifest)
+		{
+			Dictionary<int, HashSet<string>> cacheBundleTags = new Dictionary<int, HashSet<string>>(10000);
+
+			foreach (var packageAsset in manifest.AssetList)
+			{
+				// 主资源包
+				int bundleID = packageAsset.BundleID;
+				CacheBundleTags(cacheBundleTags, bundleID, packageAsset.AssetTags);
+
+				// 依赖资源包
+				var packageBundle = manifest.BundleList[bundleID];
+				foreach (var dependBundleID in packageBundle.DependIDs)
+				{
+					CacheBundleTags(cacheBundleTags, dependBundleID, packageAsset.AssetTags);
+				}
+			}
+
+			for (int index = 0; index < manifest.BundleList.Count; index++)
+			{
+				manifest.BundleList[index].Tags = cacheBundleTags[index].ToArray();
+			}
+		}
+		private void CacheBundleTags(Dictionary<int, HashSet<string>> cacheBundleTags, int bundleID, string[] assetTags)
+		{
+			if (cacheBundleTags.ContainsKey(bundleID) == false)
+				cacheBundleTags.Add(bundleID, new HashSet<string>());
+
+			foreach (var assetTag in assetTags)
+			{
+				if (cacheBundleTags[bundleID].Contains(assetTag) == false)
+					cacheBundleTags[bundleID].Add(assetTag);
+			}
+		}
+
+		/// <summary>
+		/// 获取资源包的索引ID
+		/// </summary>
+		private int GetCachedBundleID(string bundleName)
+		{
+			if (_cachedBundleID.TryGetValue(bundleName, out int value) == false)
+			{
+				throw new Exception($"Not found cached bundle ID : {bundleName}");
+			}
+			return value;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateManifest.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateManifest.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateManifest.cs.meta
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateReport.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs
similarity index 72%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateReport.cs
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs
index 8671e41..a9084b8 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateReport.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs
@@ -6,23 +6,9 @@ using UnityEditor;
 
 namespace YooAsset.Editor
 {
-	[TaskAttribute("创建构建报告文件")]
-	public class TaskCreateReport : IBuildTask
+	public class TaskCreateReport
 	{
-		void IBuildTask.Run(BuildContext context)
-		{
-			var buildParameters = context.GetContextObject<BuildParametersContext>();
-			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			var manifestContext = context.GetContextObject<ManifestContext>();
-
-			var buildMode = buildParameters.Parameters.BuildMode;
-			if (buildMode != EBuildMode.SimulateBuild)
-			{
-				CreateReportFile(buildParameters, buildMapContext, manifestContext);
-			}
-		}
-
-		private void CreateReportFile(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext, ManifestContext manifestContext)
+		protected void CreateReportFile(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext, ManifestContext manifestContext)
 		{
 			var buildParameters = buildParametersContext.Parameters;
 
@@ -49,16 +35,33 @@ namespace YooAsset.Editor
 				buildReport.Summary.LocationToLower = buildMapContext.Command.LocationToLower;
 				buildReport.Summary.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
 				buildReport.Summary.UniqueBundleName = buildMapContext.Command.UniqueBundleName;
-				buildReport.Summary.SharedPackRuleClassName = buildParameters.SharedPackRule == null ?
-					"null" : buildParameters.SharedPackRule.GetType().FullName;
 				buildReport.Summary.EncryptionServicesClassName = buildParameters.EncryptionServices == null ?
 					"null" : buildParameters.EncryptionServices.GetType().FullName;
 
 				// 构建参数
-				buildReport.Summary.OutputNameStyle = buildParameters.OutputNameStyle;
-				buildReport.Summary.CompressOption = buildParameters.CompressOption;
-				buildReport.Summary.DisableWriteTypeTree = buildParameters.DisableWriteTypeTree;
-				buildReport.Summary.IgnoreTypeTreeChanges = buildParameters.IgnoreTypeTreeChanges;
+				if (buildParameters.BuildPipeline == nameof(BuiltinBuildPipeline))
+				{
+					var builtinBuildParameters = buildParameters as BuiltinBuildParameters;
+					buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
+					buildReport.Summary.CompressOption = builtinBuildParameters.CompressOption;
+					buildReport.Summary.DisableWriteTypeTree = builtinBuildParameters.DisableWriteTypeTree;
+					buildReport.Summary.IgnoreTypeTreeChanges = builtinBuildParameters.IgnoreTypeTreeChanges;
+				}
+				else if (buildParameters.BuildPipeline == nameof(ScriptableBuildPipeline))
+				{
+					var scriptableBuildParameters = buildParameters as ScriptableBuildParameters;
+					buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
+					buildReport.Summary.CompressOption = scriptableBuildParameters.CompressOption;
+					buildReport.Summary.DisableWriteTypeTree = scriptableBuildParameters.DisableWriteTypeTree;
+					buildReport.Summary.IgnoreTypeTreeChanges = scriptableBuildParameters.IgnoreTypeTreeChanges;
+				}
+				else
+				{
+					buildReport.Summary.FileNameStyle = buildParameters.FileNameStyle;
+					buildReport.Summary.CompressOption = ECompressOption.Uncompressed;
+					buildReport.Summary.DisableWriteTypeTree = false;
+					buildReport.Summary.IgnoreTypeTreeChanges = false;
+				}
 
 				// 构建结果
 				buildReport.Summary.AssetFileTotalCount = buildMapContext.AssetFileCount;
@@ -67,8 +70,6 @@ namespace YooAsset.Editor
 				buildReport.Summary.AllBundleTotalSize = GetAllBundleSize(manifest);
 				buildReport.Summary.EncryptedBundleTotalCount = GetEncryptedBundleCount(manifest);
 				buildReport.Summary.EncryptedBundleTotalSize = GetEncryptedBundleSize(manifest);
-				buildReport.Summary.RawBundleTotalCount = GetRawBundleCount(manifest);
-				buildReport.Summary.RawBundleTotalSize = GetRawBundleSize(manifest);
 			}
 
 			// 资源对象列表
@@ -83,7 +84,6 @@ namespace YooAsset.Editor
 				reportAssetInfo.AssetGUID = AssetDatabase.AssetPathToGUID(packageAsset.AssetPath);
 				reportAssetInfo.MainBundleName = mainBundle.BundleName;
 				reportAssetInfo.MainBundleSize = mainBundle.FileSize;
-				reportAssetInfo.DependBundles = GetDependBundles(manifest, packageAsset);
 				reportAssetInfo.DependAssets = GetDependAssets(buildMapContext, mainBundle.BundleName, packageAsset.AssetPath);
 				buildReport.AssetInfos.Add(reportAssetInfo);
 			}
@@ -98,10 +98,9 @@ namespace YooAsset.Editor
 				reportBundleInfo.FileHash = packageBundle.FileHash;
 				reportBundleInfo.FileCRC = packageBundle.FileCRC;
 				reportBundleInfo.FileSize = packageBundle.FileSize;
-				reportBundleInfo.IsRawFile = packageBundle.IsRawFile;
-				reportBundleInfo.LoadMethod = (EBundleLoadMethod)packageBundle.LoadMethod;
+				reportBundleInfo.Encrypted = packageBundle.Encrypted;
 				reportBundleInfo.Tags = packageBundle.Tags;
-				reportBundleInfo.ReferenceIDs = packageBundle.ReferenceIDs;
+				reportBundleInfo.DependBundles = GetDependBundles(manifest, packageBundle);
 				reportBundleInfo.AllBuiltinAssets = GetAllBuiltinAssets(buildMapContext, packageBundle.BundleName);
 				buildReport.BundleInfos.Add(reportBundleInfo);
 			}
@@ -119,10 +118,10 @@ namespace YooAsset.Editor
 		/// <summary>
 		/// 获取资源对象依赖的所有资源包
 		/// </summary>
-		private List<string> GetDependBundles(PackageManifest manifest, PackageAsset packageAsset)
+		private List<string> GetDependBundles(PackageManifest manifest, PackageBundle packageBundle)
 		{
-			List<string> dependBundles = new List<string>(packageAsset.DependIDs.Length);
-			foreach (int index in packageAsset.DependIDs)
+			List<string> dependBundles = new List<string>(packageBundle.DependIDs.Length);
+			foreach (int index in packageBundle.DependIDs)
 			{
 				string dependBundleName = manifest.BundleList[index].BundleName;
 				dependBundles.Add(dependBundleName);
@@ -139,7 +138,7 @@ namespace YooAsset.Editor
 			var bundleInfo = buildMapContext.GetBundleInfo(bundleName);
 			{
 				BuildAssetInfo findAssetInfo = null;
-				foreach (var assetInfo in bundleInfo.AllMainAssets)
+				foreach (var assetInfo in bundleInfo.MainAssets)
 				{
 					if (assetInfo.AssetPath == assetPath)
 					{
@@ -190,7 +189,7 @@ namespace YooAsset.Editor
 			int fileCount = 0;
 			foreach (var packageBundle in manifest.BundleList)
 			{
-				if (packageBundle.LoadMethod != (byte)EBundleLoadMethod.Normal)
+				if (packageBundle.Encrypted)
 					fileCount++;
 			}
 			return fileCount;
@@ -200,27 +199,7 @@ namespace YooAsset.Editor
 			long fileBytes = 0;
 			foreach (var packageBundle in manifest.BundleList)
 			{
-				if (packageBundle.LoadMethod != (byte)EBundleLoadMethod.Normal)
-					fileBytes += packageBundle.FileSize;
-			}
-			return fileBytes;
-		}
-		private int GetRawBundleCount(PackageManifest manifest)
-		{
-			int fileCount = 0;
-			foreach (var packageBundle in manifest.BundleList)
-			{
-				if (packageBundle.IsRawFile)
-					fileCount++;
-			}
-			return fileCount;
-		}
-		private long GetRawBundleSize(PackageManifest manifest)
-		{
-			long fileBytes = 0;
-			foreach (var packageBundle in manifest.BundleList)
-			{
-				if (packageBundle.IsRawFile)
+				if (packageBundle.Encrypted)
 					fileBytes += packageBundle.FileSize;
 			}
 			return fileBytes;
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateReport.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateReport.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs.meta
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskEncryption.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskEncryption.cs
similarity index 57%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskEncryption.cs
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskEncryption.cs
index 4ca3832..f6fc36b 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskEncryption.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskEncryption.cs
@@ -6,25 +6,12 @@ using System.Collections.Generic;
 
 namespace YooAsset.Editor
 {
-	[TaskAttribute("资源包加密")]
-	public class TaskEncryption : IBuildTask
+	public class TaskEncryption
 	{
-		void IBuildTask.Run(BuildContext context)
-		{
-			var buildParameters = context.GetContextObject<BuildParametersContext>();
-			var buildMapContext = context.GetContextObject<BuildMapContext>();
-
-			var buildMode = buildParameters.Parameters.BuildMode;
-			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
-			{
-				EncryptingBundleFiles(buildParameters, buildMapContext);
-			}
-		}
-
 		/// <summary>
 		/// 加密文件
 		/// </summary>
-		private void EncryptingBundleFiles(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
+		public void EncryptingBundleFiles(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
 		{
 			var encryptionServices = buildParametersContext.Parameters.EncryptionServices;
 			if (encryptionServices == null)
@@ -42,21 +29,18 @@ namespace YooAsset.Editor
 				fileInfo.FilePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
 
 				var encryptResult = encryptionServices.Encrypt(fileInfo);		
-				if (encryptResult.LoadMethod != EBundleLoadMethod.Normal)
+				if (encryptResult.Encrypted)
 				{
-					// 注意：原生文件不支持加密
-					if (bundleInfo.IsRawFile)
-					{
-						BuildLogger.Warning($"Encryption not support raw file : {bundleInfo.BundleName}");
-						continue;
-					}
-
 					string filePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}.encrypt";
 					FileUtility.WriteAllBytes(filePath, encryptResult.EncryptedData);
 					bundleInfo.EncryptedFilePath = filePath;
-					bundleInfo.LoadMethod = encryptResult.LoadMethod;
+					bundleInfo.Encrypted = true;
 					BuildLogger.Log($"Bundle文件加密完成：{filePath}");
 				}
+				else
+				{
+					bundleInfo.Encrypted = false;
+				}
 
 				// 进度条
 				EditorTools.DisplayProgressBar("加密资源包", ++progressValue, buildMapContext.Collection.Count);
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskEncryption.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskEncryption.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskEncryption.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskEncryption.cs.meta
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskGetBuildMap.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskGetBuildMap.cs
new file mode 100644
index 0000000..f64d29b
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskGetBuildMap.cs
@@ -0,0 +1,170 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	public class TaskGetBuildMap
+	{
+		/// <summary>
+		/// 生成资源构建上下文
+		/// </summary>
+		public BuildMapContext CreateBuildMap(BuildParameters buildParameters)
+		{
+			var buildMode = buildParameters.BuildMode;
+			var packageName = buildParameters.PackageName;
+
+			Dictionary<string, BuildAssetInfo> allBuildAssetInfos = new Dictionary<string, BuildAssetInfo>(1000);
+
+			// 1. 获取所有收集器收集的资源
+			var collectResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(buildMode, packageName);
+			List<CollectAssetInfo> allCollectAssetInfos = collectResult.CollectAssets;
+
+			// 2. 剔除未被引用的依赖项资源
+			RemoveZeroReferenceAssets(allCollectAssetInfos);
+
+			// 3. 录入所有收集器收集的资源
+			foreach (var collectAssetInfo in allCollectAssetInfos)
+			{
+				if (allBuildAssetInfos.ContainsKey(collectAssetInfo.AssetPath) == false)
+				{
+					if (collectAssetInfo.CollectorType != ECollectorType.MainAssetCollector)
+					{
+						if (collectAssetInfo.AssetTags.Count > 0)
+						{
+							collectAssetInfo.AssetTags.Clear();
+							BuildLogger.Warning($"The tags has been cleared ! {collectAssetInfo.AssetPath} ");
+						}
+					}
+
+					var buildAssetInfo = new BuildAssetInfo(collectAssetInfo.CollectorType, collectAssetInfo.BundleName, collectAssetInfo.Address, collectAssetInfo.AssetPath);
+					buildAssetInfo.AddAssetTags(collectAssetInfo.AssetTags);
+					allBuildAssetInfos.Add(collectAssetInfo.AssetPath, buildAssetInfo);
+				}
+				else
+				{
+					throw new Exception($"Should never get here !");
+				}
+			}
+
+			// 4. 录入所有收集资源的依赖资源
+			foreach (var collectAssetInfo in allCollectAssetInfos)
+			{
+				string bundleName = collectAssetInfo.BundleName;
+				foreach (var dependAssetPath in collectAssetInfo.DependAssets)
+				{
+					if (allBuildAssetInfos.ContainsKey(dependAssetPath))
+					{
+						allBuildAssetInfos[dependAssetPath].AddReferenceBundleName(bundleName);
+					}
+					else
+					{
+						var buildAssetInfo = new BuildAssetInfo(dependAssetPath);
+						buildAssetInfo.AddReferenceBundleName(bundleName);
+						allBuildAssetInfos.Add(dependAssetPath, buildAssetInfo);
+					}
+				}
+			}
+
+			// 5. 填充所有收集资源的依赖列表
+			foreach (var collectAssetInfo in allCollectAssetInfos)
+			{
+				var dependAssetInfos = new List<BuildAssetInfo>(collectAssetInfo.DependAssets.Count);
+				foreach (var dependAssetPath in collectAssetInfo.DependAssets)
+				{
+					if (allBuildAssetInfos.TryGetValue(dependAssetPath, out BuildAssetInfo value))
+						dependAssetInfos.Add(value);
+					else
+						throw new Exception("Should never get here !");
+				}
+				allBuildAssetInfos[collectAssetInfo.AssetPath].SetDependAssetInfos(dependAssetInfos);
+			}
+
+			// 6. 记录关键信息
+			BuildMapContext context = new BuildMapContext();
+			context.AssetFileCount = allBuildAssetInfos.Count;
+			context.Command = collectResult.Command;
+
+			// 7. 记录冗余资源
+			foreach (var buildAssetInfo in allBuildAssetInfos.Values)
+			{
+				if (buildAssetInfo.IsRedundancyAsset())
+				{
+					var redundancyInfo = new ReportRedundancyInfo();
+					redundancyInfo.AssetPath = buildAssetInfo.AssetPath;
+					redundancyInfo.AssetType = buildAssetInfo.AssetType.Name;
+					redundancyInfo.AssetGUID = buildAssetInfo.AssetGUID;
+					redundancyInfo.FileSize = FileUtility.GetFileSize(buildAssetInfo.AssetPath);
+					redundancyInfo.Number = buildAssetInfo.GetReferenceBundleCount();
+					context.RedundancyInfos.Add(redundancyInfo);
+				}
+			}
+
+			// 8. 移除不参与构建的资源
+			List<BuildAssetInfo> removeBuildList = new List<BuildAssetInfo>();
+			foreach (var buildAssetInfo in allBuildAssetInfos.Values)
+			{
+				if (buildAssetInfo.HasBundleName() == false)
+					removeBuildList.Add(buildAssetInfo);
+			}
+			foreach (var removeValue in removeBuildList)
+			{
+				allBuildAssetInfos.Remove(removeValue.AssetPath);
+			}
+
+			// 9. 构建资源列表
+			var allPackAssets = allBuildAssetInfos.Values.ToList();
+			if (allPackAssets.Count == 0)
+				throw new Exception("构建的资源列表不能为空");
+			foreach (var assetInfo in allPackAssets)
+			{
+				context.PackAsset(assetInfo);
+			}
+
+			return context;
+		}
+		private void RemoveZeroReferenceAssets(List<CollectAssetInfo> allCollectAssetInfos)
+		{
+			// 1. 检测是否任何存在依赖资源
+			if (allCollectAssetInfos.Exists(x => x.CollectorType == ECollectorType.DependAssetCollector) == false)
+				return;
+
+			// 2. 获取所有主资源的依赖资源集合
+			HashSet<string> allDependAsset = new HashSet<string>();
+			foreach (var collectAssetInfo in allCollectAssetInfos)
+			{
+				var collectorType = collectAssetInfo.CollectorType;
+				if (collectorType == ECollectorType.MainAssetCollector || collectorType == ECollectorType.StaticAssetCollector)
+				{
+					foreach (var dependAsset in collectAssetInfo.DependAssets)
+					{
+						if (allDependAsset.Contains(dependAsset) == false)
+							allDependAsset.Add(dependAsset);
+					}
+				}
+			}
+
+			// 3. 找出所有零引用的依赖资源集合
+			List<CollectAssetInfo> removeList = new List<CollectAssetInfo>();
+			foreach (var collectAssetInfo in allCollectAssetInfos)
+			{
+				var collectorType = collectAssetInfo.CollectorType;
+				if (collectorType == ECollectorType.DependAssetCollector)
+				{
+					if (allDependAsset.Contains(collectAssetInfo.AssetPath) == false)
+						removeList.Add(collectAssetInfo);
+				}
+			}
+
+			// 4. 移除所有零引用的依赖资源
+			foreach (var removeValue in removeList)
+			{
+				BuildLogger.Log($"发现未被依赖的资源并自动移除 : {removeValue.AssetPath}");
+				allCollectAssetInfos.Remove(removeValue);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskGetBuildMap.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskGetBuildMap.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskGetBuildMap.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskGetBuildMap.cs.meta
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskUpdateBundleInfo.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskUpdateBundleInfo.cs
new file mode 100644
index 0000000..a5ec895
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskUpdateBundleInfo.cs
@@ -0,0 +1,65 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	public abstract class TaskUpdateBundleInfo
+	{
+		public void UpdateBundleInfo(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+			int outputNameStyle = (int)buildParametersContext.Parameters.FileNameStyle;
+
+			// 1.检测文件名长度
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				// NOTE：检测文件名长度不要超过260字符。
+				string fileName = bundleInfo.BundleName;
+				if (fileName.Length >= 260)
+					throw new Exception($"The output bundle name is too long {fileName.Length} chars : {fileName}");
+			}
+
+			// 2.更新构建输出的文件路径
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				bundleInfo.BuildOutputFilePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
+				if (bundleInfo.Encrypted)
+					bundleInfo.PackageSourceFilePath = bundleInfo.EncryptedFilePath;
+				else
+					bundleInfo.PackageSourceFilePath = bundleInfo.BuildOutputFilePath;
+			}
+
+			// 3.更新文件其它信息
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				bundleInfo.PackageUnityHash = GetUnityHash(bundleInfo, context);
+				bundleInfo.PackageUnityCRC = GetUnityCRC(bundleInfo, context);
+				bundleInfo.PackageFileHash = GetBundleFileHash(bundleInfo.PackageSourceFilePath, buildParametersContext);
+				bundleInfo.PackageFileCRC = GetBundleFileCRC(bundleInfo.PackageSourceFilePath, buildParametersContext);
+				bundleInfo.PackageFileSize = GetBundleFileSize(bundleInfo.PackageSourceFilePath, buildParametersContext);
+			}
+
+			// 4.更新补丁包输出的文件路径
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				string bundleName = bundleInfo.BundleName;
+				string fileHash = bundleInfo.PackageFileHash;
+				string fileExtension = ManifestTools.GetRemoteBundleFileExtension(bundleName);
+				string fileName = ManifestTools.GetRemoteBundleFileName(outputNameStyle, bundleName, fileExtension, fileHash);
+				bundleInfo.PackageDestFilePath = $"{packageOutputDirectory}/{fileName}";
+			}
+		}
+
+		protected abstract string GetUnityHash(BuildBundleInfo bundleInfo, BuildContext context);
+		protected abstract uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context);
+		protected abstract string GetBundleFileHash(string filePath, BuildParametersContext buildParametersContext);
+		protected abstract string GetBundleFileCRC(string filePath, BuildParametersContext buildParametersContext);
+		protected abstract long GetBundleFileSize(string filePath, BuildParametersContext buildParametersContext);
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskUpdateBundleInfo.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskUpdateBundleInfo.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskUpdateBundleInfo.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskUpdateBundleInfo.cs.meta
diff --git a/Assets/YooAsset/Runtime/Services/Internal.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline.meta
similarity index 77%
rename from Assets/YooAsset/Runtime/Services/Internal.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline.meta
index 79cd3b3..2c37be7 100644
--- a/Assets/YooAsset/Runtime/Services/Internal.meta
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 40c870edb8e84064a8be2d56acb8bbc0
+guid: 5c0a1b7e213a63047994bbf419867c64
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks.meta
new file mode 100644
index 0000000..3679054
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 950b38743cf6b74419af76ab327206ed
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskBuilding.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskBuilding_BBP.cs
similarity index 88%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskBuilding.cs
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskBuilding_BBP.cs
index da267bd..209bcfe 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskBuilding.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskBuilding_BBP.cs
@@ -8,7 +8,7 @@ using UnityEngine;
 namespace YooAsset.Editor
 {
 	[TaskAttribute("资源构建内容打包")]
-	public class TaskBuilding : IBuildTask
+	public class TaskBuilding_BBP : IBuildTask
 	{
 		public class BuildResultContext : IContextObject
 		{
@@ -19,6 +19,7 @@ namespace YooAsset.Editor
 		{
 			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			var builtinBuildParameters = buildParametersContext.Parameters as BuiltinBuildParameters;
 
 			// 模拟构建模式下跳过引擎构建
 			var buildMode = buildParametersContext.Parameters.BuildMode;
@@ -27,7 +28,7 @@ namespace YooAsset.Editor
 
 			// 开始构建
 			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
-			BuildAssetBundleOptions buildOptions = buildParametersContext.GetPipelineBuildOptions();
+			BuildAssetBundleOptions buildOptions = builtinBuildParameters.GetBundleBuildOptions();
 			AssetBundleManifest buildResults = BuildPipeline.BuildAssetBundles(pipelineOutputDirectory, buildMapContext.GetPipelineBuilds(), buildOptions, buildParametersContext.Parameters.BuildTarget);
 			if (buildResults == null)
 			{
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePackage.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskBuilding_BBP.cs.meta
similarity index 83%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePackage.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskBuilding_BBP.cs.meta
index 0f45229..8db983f 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePackage.cs.meta
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskBuilding_BBP.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d110092f543e3fe40a4d3882e1a718e8
+guid: d10c8f8b9937fe848b2cb0cc0836280d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuildinFiles_BBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuildinFiles_BBP.cs
new file mode 100644
index 0000000..28eee82
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuildinFiles_BBP.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("拷贝内置文件")]
+	public class TaskCopyBuildinFiles_BBP : TaskCopyBuildinFiles, IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var manifestContext = context.GetContextObject<ManifestContext>();
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+
+			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+			{
+				if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+				{
+					CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSettingData.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuildinFiles_BBP.cs.meta
similarity index 83%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSettingData.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuildinFiles_BBP.cs.meta
index 4d7c62e..537a68d 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSettingData.cs.meta
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCopyBuildinFiles_BBP.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 24698266f028e4a47bb88f091fd64547
+guid: 80c30fb9eb35a514daadefa4a2fb4f28
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateManifest_BBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateManifest_BBP.cs
new file mode 100644
index 0000000..ed4fda2
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateManifest_BBP.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("创建清单文件")]
+	public class TaskCreateManifest_BBP : TaskCreateManifest, IBuildTask
+	{
+		private TaskBuilding_BBP.BuildResultContext _buildResultContext = null;
+
+		void IBuildTask.Run(BuildContext context)
+		{
+			CreateManifestFile(context);
+		}
+
+		protected override string[] GetBundleDepends(BuildContext context, string bundleName)
+		{
+			if (_buildResultContext == null)
+				_buildResultContext = context.GetContextObject<TaskBuilding_BBP.BuildResultContext>();
+
+			return _buildResultContext.UnityManifest.GetAllDependencies(bundleName);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskPrepare.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateManifest_BBP.cs.meta
similarity index 83%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskPrepare.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateManifest_BBP.cs.meta
index ba61476..89cb837 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskPrepare.cs.meta
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateManifest_BBP.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0dee755cccd608d48b6581ec33c99b39
+guid: db8a306d84a7b284f9acc8925cfaf812
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreatePackage_BBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreatePackage_BBP.cs
new file mode 100644
index 0000000..d79274f
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreatePackage_BBP.cs
@@ -0,0 +1,54 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("制作包裹")]
+	public class TaskCreatePackage_BBP : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			var buildMode = buildParameters.Parameters.BuildMode;
+			if (buildMode != EBuildMode.SimulateBuild && buildMode != EBuildMode.DryRunBuild)
+			{
+				CopyPackageFiles(buildParameters, buildMapContext);
+			}
+		}
+
+		/// <summary>
+		/// 拷贝补丁文件到补丁包目录
+		/// </summary>
+		private void CopyPackageFiles(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
+		{
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+			BuildLogger.Log($"开始拷贝补丁文件到补丁包目录：{packageOutputDirectory}");
+
+			// 拷贝UnityManifest序列化文件
+			{
+				string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}";
+				string destPath = $"{packageOutputDirectory}/{YooAssetSettings.OutputFolderName}";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝UnityManifest文本文件
+			{
+				string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}.manifest";
+				string destPath = $"{packageOutputDirectory}/{YooAssetSettings.OutputFolderName}.manifest";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝所有补丁文件
+			int progressValue = 0;
+			int fileTotalCount = buildMapContext.Collection.Count;
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				EditorTools.CopyFile(bundleInfo.PackageSourceFilePath, bundleInfo.PackageDestFilePath, true);
+				EditorTools.DisplayProgressBar("拷贝补丁文件", ++progressValue, fileTotalCount);
+			}
+			EditorTools.ClearProgressBar();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskBuilding.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreatePackage_BBP.cs.meta
similarity index 83%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskBuilding.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreatePackage_BBP.cs.meta
index c4d1e7c..d667dae 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskBuilding.cs.meta
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreatePackage_BBP.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9466e826c135e994c84961e4b921ca5f
+guid: 509e58fe0b061a54795f60209fbbbb5a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateReport_BBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateReport_BBP.cs
new file mode 100644
index 0000000..c76809c
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateReport_BBP.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("创建构建报告文件")]
+	public class TaskCreateReport_BBP : TaskCreateReport, IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			var manifestContext = context.GetContextObject<ManifestContext>();
+
+			var buildMode = buildParameters.Parameters.BuildMode;
+			if (buildMode != EBuildMode.SimulateBuild)
+			{
+				CreateReportFile(buildParameters, buildMapContext, manifestContext);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateReport_BBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateReport_BBP.cs.meta
new file mode 100644
index 0000000..e2e7c64
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskCreateReport_BBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cb66f3d5c56a85643a0e009d59079e54
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskEncryption_BBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskEncryption_BBP.cs
new file mode 100644
index 0000000..abb71a3
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskEncryption_BBP.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("资源包加密")]
+	public class TaskEncryption_BBP : TaskEncryption, IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+
+			var buildMode = buildParameters.Parameters.BuildMode;
+			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+			{
+				EncryptingBundleFiles(buildParameters, buildMapContext);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskEncryption_BBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskEncryption_BBP.cs.meta
new file mode 100644
index 0000000..60bee27
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskEncryption_BBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6e871faedf2401c4c9225eb9815c5aa0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskGetBuildMap_BBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskGetBuildMap_BBP.cs
new file mode 100644
index 0000000..0daaeaa
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskGetBuildMap_BBP.cs
@@ -0,0 +1,20 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("获取资源构建内容")]
+	public class TaskGetBuildMap_BBP : TaskGetBuildMap, IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = CreateBuildMap(buildParametersContext.Parameters);
+			context.SetContextObject(buildMapContext);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskGetBuildMap_BBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskGetBuildMap_BBP.cs.meta
new file mode 100644
index 0000000..9787488
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskGetBuildMap_BBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b621fbca3fe162448bda8c817daa101a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskPrepare_BBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskPrepare_BBP.cs
new file mode 100644
index 0000000..44a07a8
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskPrepare_BBP.cs
@@ -0,0 +1,30 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("资源构建准备工作")]
+	public class TaskPrepare_BBP : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildParameters = buildParametersContext.Parameters;
+			var builtinBuildParameters = buildParameters as BuiltinBuildParameters;
+
+			// 检测基础构建参数
+			buildParametersContext.CheckBuildParameters();
+
+			// 检测Unity版本
+#if UNITY_2021_3_OR_NEWER
+			if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
+			{
+				BuildLogger.Warning("Unity2021版本开始内置构建管线不再维护，推荐使用可编程构建管线（SBP）！");
+			}
+#endif
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskPrepare_BBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskPrepare_BBP.cs.meta
new file mode 100644
index 0000000..3ee963d
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskPrepare_BBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6dc94501197179048b85b6e959c50e9c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskUpdateBundleInfo_BBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskUpdateBundleInfo_BBP.cs
new file mode 100644
index 0000000..28464d7
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskUpdateBundleInfo_BBP.cs
@@ -0,0 +1,79 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("更新资源包信息")]
+	public class TaskUpdateBundleInfo_BBP : TaskUpdateBundleInfo, IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			UpdateBundleInfo(context);
+		}
+
+		protected override string GetUnityHash(BuildBundleInfo bundleInfo, BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var parameters = buildParametersContext.Parameters;
+			var buildMode = parameters.BuildMode;
+			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
+			{
+				return "00000000000000000000000000000000"; //32位
+			}
+			else
+			{
+				var buildResult = context.GetContextObject<TaskBuilding_BBP.BuildResultContext>();
+				var hash = buildResult.UnityManifest.GetAssetBundleHash(bundleInfo.BundleName);
+				if (hash.isValid)
+					return hash.ToString();
+				else
+					throw new Exception($"Not found bundle hash in build result : {bundleInfo.BundleName}");
+			}
+		}
+		protected override uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var parameters = buildParametersContext.Parameters;
+			var buildMode = parameters.BuildMode;
+			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
+			{
+				return 0;
+			}
+			else
+			{
+				string filePath = bundleInfo.BuildOutputFilePath;
+				if (BuildPipeline.GetCRCForAssetBundle(filePath, out uint crc))
+					return crc;
+				else
+					throw new Exception($"Not found bundle crc in build result : {bundleInfo.BundleName}");
+			}
+		}
+		protected override string GetBundleFileHash(string filePath, BuildParametersContext buildParametersContext)
+		{
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
+				return "00000000000000000000000000000000"; //32位
+			else
+				return HashUtility.FileMD5(filePath);
+		}
+		protected override string GetBundleFileCRC(string filePath, BuildParametersContext buildParametersContext)
+		{
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
+				return "00000000"; //8位
+			else
+				return HashUtility.FileCRC32(filePath);
+		}
+		protected override long GetBundleFileSize(string filePath, BuildParametersContext buildParametersContext)
+		{
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
+				return 0;
+			else
+				return FileUtility.GetFileSize(filePath);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskUpdateBundleInfo_BBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskUpdateBundleInfo_BBP.cs.meta
new file mode 100644
index 0000000..5e4099f
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskUpdateBundleInfo_BBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 26a84c5ae3c1a344883de3f85d48c952
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskVerifyBuildResult_BBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskVerifyBuildResult_BBP.cs
new file mode 100644
index 0000000..b3e4aaf
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskVerifyBuildResult_BBP.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("验证构建结果")]
+	public class TaskVerifyBuildResult_BBP : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildParameters = buildParametersContext.Parameters as BuiltinBuildParameters;
+
+			// 模拟构建模式下跳过验证
+			if (buildParameters.BuildMode == EBuildMode.SimulateBuild)
+				return;
+
+			// 验证构建结果
+			if (buildParameters.VerifyBuildingResult)
+			{
+				var buildResultContext = context.GetContextObject<TaskBuilding_BBP.BuildResultContext>();
+				VerifyingBuildingResult(context, buildResultContext.UnityManifest);
+			}
+		}
+
+		/// <summary>
+		/// 验证构建结果
+		/// </summary>
+		private void VerifyingBuildingResult(BuildContext context, AssetBundleManifest unityManifest)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			string[] unityCreateBundles = unityManifest.GetAllAssetBundles();
+
+			// 1. 过滤掉原生Bundle
+			string[] mapBundles = buildMapContext.Collection.Select(t => t.BundleName).ToArray();
+
+			// 2. 验证Bundle
+			List<string> exceptBundleList1 = unityCreateBundles.Except(mapBundles).ToList();
+			if (exceptBundleList1.Count > 0)
+			{
+				foreach (var exceptBundle in exceptBundleList1)
+				{
+					BuildLogger.Warning($"差异资源包: {exceptBundle}");
+				}
+				throw new System.Exception("存在差异资源包！请查看警告信息！");
+			}
+
+			// 3. 验证Bundle
+			List<string> exceptBundleList2 = mapBundles.Except(unityCreateBundles).ToList();
+			if (exceptBundleList2.Count > 0)
+			{
+				foreach (var exceptBundle in exceptBundleList2)
+				{
+					BuildLogger.Warning($"差异资源包: {exceptBundle}");
+				}
+				throw new System.Exception("存在差异资源包！请查看警告信息！");
+			}
+
+			BuildLogger.Log("构建结果验证成功！");
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskVerifyBuildResult.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskVerifyBuildResult_BBP.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskVerifyBuildResult.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuildTasks/TaskVerifyBuildResult_BBP.cs.meta
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildParameters.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildParameters.cs
new file mode 100644
index 0000000..38009cc
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildParameters.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	public class BuiltinBuildParameters : BuildParameters
+	{
+		/// <summary>
+		/// 压缩选项
+		/// </summary>
+		public ECompressOption CompressOption = ECompressOption.Uncompressed;
+
+		/// <summary>
+		/// 禁止写入类型树结构（可以降低包体和内存并提高加载效率）
+		/// </summary>
+		public bool DisableWriteTypeTree = false;
+
+		/// <summary>
+		/// 忽略类型树变化
+		/// </summary>
+		public bool IgnoreTypeTreeChanges = true;
+
+
+		/// <summary>
+		/// 获取内置构建管线的构建选项
+		/// </summary>
+		public BuildAssetBundleOptions GetBundleBuildOptions()
+		{
+			// For the new build system, unity always need BuildAssetBundleOptions.CollectDependencies and BuildAssetBundleOptions.DeterministicAssetBundle
+			// 除非设置ForceRebuildAssetBundle标记，否则会进行增量打包
+
+			BuildAssetBundleOptions opt = BuildAssetBundleOptions.None;
+			opt |= BuildAssetBundleOptions.StrictMode; //Do not allow the build to succeed if any errors are reporting during it.
+
+			if (BuildMode == EBuildMode.DryRunBuild)
+			{
+				opt |= BuildAssetBundleOptions.DryRunBuild;
+				return opt;
+			}
+
+			if (CompressOption == ECompressOption.Uncompressed)
+				opt |= BuildAssetBundleOptions.UncompressedAssetBundle;
+			else if (CompressOption == ECompressOption.LZ4)
+				opt |= BuildAssetBundleOptions.ChunkBasedCompression;
+
+			if (BuildMode == EBuildMode.ForceRebuild)
+				opt |= BuildAssetBundleOptions.ForceRebuildAssetBundle; //Force rebuild the asset bundles
+			if (DisableWriteTypeTree)
+				opt |= BuildAssetBundleOptions.DisableWriteTypeTree; //Do not include type information within the asset bundle (don't write type tree).
+			if (IgnoreTypeTreeChanges)
+				opt |= BuildAssetBundleOptions.IgnoreTypeTreeChanges; //Ignore the type tree changes when doing the incremental build check.
+
+			opt |= BuildAssetBundleOptions.DisableLoadAssetByFileName; //Disables Asset Bundle LoadAsset by file name.
+			opt |= BuildAssetBundleOptions.DisableLoadAssetByFileNameWithExtension; //Disables Asset Bundle LoadAsset by file name with extension.			
+
+			return opt;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildParameters.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildParameters.cs.meta
new file mode 100644
index 0000000..4999edf
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildParameters.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cd05d8038cf42e54e974483bb5da4198
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildPipeline.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildPipeline.cs
new file mode 100644
index 0000000..cc803f5
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildPipeline.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Linq;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	public class BuiltinBuildPipeline : IBuildPipeline
+	{
+		public BuildResult Run(BuildParameters buildParameters, bool enableLog)
+		{
+			AssetBundleBuilder builder = new AssetBundleBuilder();
+			return builder.Run(buildParameters, GetDefaultBuildPipeline(), enableLog);
+		}
+
+		/// <summary>
+		/// 获取默认的构建流程
+		/// </summary>
+		private List<IBuildTask> GetDefaultBuildPipeline()
+		{
+			List<IBuildTask> pipeline = new List<IBuildTask>
+				{
+					new TaskPrepare_BBP(), //前期准备工作
+					new TaskGetBuildMap_BBP(), //获取构建列表
+					new TaskBuilding_BBP(), //开始执行构建
+					new TaskVerifyBuildResult_BBP(), //验证构建结果
+					new TaskUpdateBundleInfo_BBP(), //更新资源包信息
+					new TaskCreateManifest_BBP(), //创建清单文件
+					new TaskCreateReport_BBP(), //创建报告文件
+					new TaskCreatePackage_BBP(), //制作包裹
+					new TaskCopyBuildinFiles_BBP(), //拷贝内置文件
+				};
+			return pipeline;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildPipeline.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildPipeline.cs.meta
new file mode 100644
index 0000000..324f03a
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BuiltinBuildPipeline/BuiltinBuildPipeline.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 62d7756143e561843800bc521b5e090f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline.meta
new file mode 100644
index 0000000..4f14777
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8a5f30f9c58f36946b2028bddce08c9c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks.meta
new file mode 100644
index 0000000..7b83789
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 141f7d1ebdf7cc147801aa711e29ac17
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyRawFile.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskBuilding_RFBP.cs
similarity index 73%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyRawFile.cs
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskBuilding_RFBP.cs
index 661af52..2b65f03 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyRawFile.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskBuilding_RFBP.cs
@@ -5,8 +5,8 @@ using System.Collections.Generic;
 
 namespace YooAsset.Editor
 {
-	[TaskAttribute("拷贝原生文件")]
-	public class TaskCopyRawFile : IBuildTask
+	[TaskAttribute("资源构建内容打包")]
+	public class TaskBuilding_RFBP : IBuildTask
 	{
 		void IBuildTask.Run(BuildContext context)
 		{
@@ -29,14 +29,10 @@ namespace YooAsset.Editor
 			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
 			foreach (var bundleInfo in buildMapContext.Collection)
 			{
-				if (bundleInfo.IsRawFile)
+				string dest = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
+				foreach (var assetInfo in bundleInfo.MainAssets)
 				{
-					string dest = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
-					foreach (var assetInfo in bundleInfo.AllMainAssets)
-					{
-						if (assetInfo.IsRawAsset)
-							EditorTools.CopyFile(assetInfo.AssetPath, dest, true);
-					}
+					EditorTools.CopyFile(assetInfo.AssetPath, dest, true);
 				}
 			}
 		}
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyRawFile.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskBuilding_RFBP.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyRawFile.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskBuilding_RFBP.cs.meta
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuildinFiles_RFBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuildinFiles_RFBP.cs
new file mode 100644
index 0000000..a49bdae
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuildinFiles_RFBP.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("拷贝内置文件")]
+	public class TaskCopyBuildinFiles_RFBP : TaskCopyBuildinFiles, IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildParameters = buildParametersContext.Parameters;
+			var manifestContext = context.GetContextObject<ManifestContext>();
+
+			if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
+			{
+				if (buildParameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+				{
+					CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuildinFiles_RFBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuildinFiles_RFBP.cs.meta
new file mode 100644
index 0000000..697821a
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCopyBuildinFiles_RFBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bf10a5495e90b844b8aca1eadf7ed8f7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateManifest_RFBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateManifest_RFBP.cs
new file mode 100644
index 0000000..919b997
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateManifest_RFBP.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("创建清单文件")]
+	public class TaskCreateManifest_RFBP : TaskCreateManifest, IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			CreateManifestFile(context);
+		}
+
+		protected override string[] GetBundleDepends(BuildContext context, string bundleName)
+		{
+			return new string[] { };
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateManifest_RFBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateManifest_RFBP.cs.meta
new file mode 100644
index 0000000..1daf9d2
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateManifest_RFBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 86bdc7d5ae31fdd409f9dc68d73e2600
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreatePackage_RFBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreatePackage_RFBP.cs
new file mode 100644
index 0000000..519076d
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreatePackage_RFBP.cs
@@ -0,0 +1,41 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("制作包裹")]
+	public class TaskCreatePackage_RFBP : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			var buildMode = buildParameters.Parameters.BuildMode;
+			if (buildMode != EBuildMode.SimulateBuild)
+			{
+				CopyPackageFiles(buildParameters, buildMapContext);
+			}
+		}
+
+		/// <summary>
+		/// 拷贝补丁文件到补丁包目录
+		/// </summary>
+		private void CopyPackageFiles(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
+		{
+			var buildParameters = buildParametersContext.Parameters;
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+			BuildLogger.Log($"开始拷贝补丁文件到补丁包目录：{packageOutputDirectory}");
+
+			// 拷贝所有补丁文件
+			int progressValue = 0;
+			int fileTotalCount = buildMapContext.Collection.Count;
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				EditorTools.CopyFile(bundleInfo.PackageSourceFilePath, bundleInfo.PackageDestFilePath, true);
+				EditorTools.DisplayProgressBar("拷贝补丁文件", ++progressValue, fileTotalCount);
+			}
+			EditorTools.ClearProgressBar();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreatePackage_RFBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreatePackage_RFBP.cs.meta
new file mode 100644
index 0000000..1bb29cc
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreatePackage_RFBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a6d813044f843b944b4ec3d6f562c7e2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateReport_RFBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateReport_RFBP.cs
new file mode 100644
index 0000000..564dead
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateReport_RFBP.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("创建构建报告文件")]
+	public class TaskCreateReport_RFBP : TaskCreateReport, IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			var manifestContext = context.GetContextObject<ManifestContext>();
+
+			var buildMode = buildParameters.Parameters.BuildMode;
+			if (buildMode != EBuildMode.SimulateBuild)
+			{
+				CreateReportFile(buildParameters, buildMapContext, manifestContext);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateReport_RFBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateReport_RFBP.cs.meta
new file mode 100644
index 0000000..04e549c
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskCreateReport_RFBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 55595ba60c30a634d8921cfc6524e201
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskGetBuildMap_RFBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskGetBuildMap_RFBP.cs
new file mode 100644
index 0000000..9d06a0a
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskGetBuildMap_RFBP.cs
@@ -0,0 +1,36 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("获取资源构建内容")]
+	public class TaskGetBuildMap_RFBP : TaskGetBuildMap, IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = CreateBuildMap(buildParametersContext.Parameters);
+			context.SetContextObject(buildMapContext);
+
+			// 检测构建结果
+			CheckBuildMapContent(buildMapContext);
+		}
+
+		/// <summary>
+		/// 检测资源构建上下文
+		/// </summary>
+		private void CheckBuildMapContent(BuildMapContext buildMapContext)
+		{
+			// 注意：原生文件资源包只能包含一个原生文件
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				if (bundleInfo.MainAssets.Count != 1)
+					throw new Exception($"The bundle does not support multiple raw asset : {bundleInfo.BundleName}");
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskGetBuildMap_RFBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskGetBuildMap_RFBP.cs.meta
new file mode 100644
index 0000000..091c0e9
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskGetBuildMap_RFBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a8bdb5b4ee29e5b48a88689c6519b830
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskPrepare_RFBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskPrepare_RFBP.cs
new file mode 100644
index 0000000..bbdbeab
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskPrepare_RFBP.cs
@@ -0,0 +1,27 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("资源构建准备工作")]
+	public class TaskPrepare_RFBP : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildParameters = buildParametersContext.Parameters;
+
+			// 检测基础构建参数
+			buildParametersContext.CheckBuildParameters();
+
+			// 检测不被支持的构建模式
+			if (buildParameters.BuildMode == EBuildMode.DryRunBuild)
+				throw new Exception($"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.DryRunBuild)} build mode !");
+			if (buildParameters.BuildMode == EBuildMode.IncrementalBuild)
+				throw new Exception($"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.IncrementalBuild)} build mode !");
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskPrepare_RFBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskPrepare_RFBP.cs.meta
new file mode 100644
index 0000000..3be82c1
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskPrepare_RFBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 97204fd262bb58449a87e517318905c3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskUpdateBundleInfo_RFBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskUpdateBundleInfo_RFBP.cs
new file mode 100644
index 0000000..359000b
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskUpdateBundleInfo_RFBP.cs
@@ -0,0 +1,61 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("更新资源包信息")]
+	public class TaskUpdateBundleInfo_RFBP : TaskUpdateBundleInfo, IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			UpdateBundleInfo(context);
+		}
+
+		protected override string GetUnityHash(BuildBundleInfo bundleInfo, BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var parameters = buildParametersContext.Parameters;
+			var buildMode = parameters.BuildMode;
+			if (buildMode == EBuildMode.SimulateBuild)
+			{
+				return "00000000000000000000000000000000"; //32位
+			}
+			else
+			{
+				string filePath = bundleInfo.PackageSourceFilePath;
+				return HashUtility.FileMD5(filePath);
+			}
+		}
+		protected override uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context)
+		{
+			return 0;
+		}
+		protected override string GetBundleFileHash(string filePath, BuildParametersContext buildParametersContext)
+		{
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.SimulateBuild)
+				return "00000000000000000000000000000000"; //32位
+			else
+				return HashUtility.FileMD5(filePath);
+		}
+		protected override string GetBundleFileCRC(string filePath, BuildParametersContext buildParametersContext)
+		{
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.SimulateBuild)
+				return "00000000"; //8位
+			else
+				return HashUtility.FileCRC32(filePath);
+		}
+		protected override long GetBundleFileSize(string filePath, BuildParametersContext buildParametersContext)
+		{
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.SimulateBuild)
+				return 0;
+			else
+				return FileUtility.GetFileSize(filePath);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskUpdateBundleInfo_RFBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskUpdateBundleInfo_RFBP.cs.meta
new file mode 100644
index 0000000..5dc4f47
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/BuildTasks/TaskUpdateBundleInfo_RFBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b2c8ae6a3e6ca3b4bba4e1495ea297d4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildParameters.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildParameters.cs
new file mode 100644
index 0000000..cbb61ed
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildParameters.cs
@@ -0,0 +1,10 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	public class RawFileBuildParameters : BuildParameters
+	{
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildParameters.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildParameters.cs.meta
new file mode 100644
index 0000000..7703739
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildParameters.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d5ba9a5c89be56147a651be73b1d8a30
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildPipeline.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildPipeline.cs
new file mode 100644
index 0000000..bad9705
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildPipeline.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Linq;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	public class RawFileBuildPipeline : IBuildPipeline
+	{
+		public BuildResult Run(BuildParameters buildParameters, bool enableLog)
+		{
+			AssetBundleBuilder builder = new AssetBundleBuilder();
+			return builder.Run(buildParameters, GetDefaultBuildPipeline(), enableLog);
+		}
+
+		/// <summary>
+		/// 获取默认的构建流程
+		/// </summary>
+		private List<IBuildTask> GetDefaultBuildPipeline()
+		{
+			List<IBuildTask> pipeline = new List<IBuildTask>
+				{
+					new TaskPrepare_RFBP(), //前期准备工作
+					new TaskGetBuildMap_RFBP(), //获取构建列表
+					new TaskBuilding_RFBP(), //开始执行构建
+					new TaskUpdateBundleInfo_RFBP(), //更新资源包信息
+					new TaskCreateManifest_RFBP(), //创建清单文件
+					new TaskCreateReport_RFBP(), //创建报告文件
+					new TaskCreatePackage_RFBP(), //制作包裹
+					new TaskCopyBuildinFiles_RFBP(), //拷贝内置文件
+				};
+			return pipeline;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildPipeline.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildPipeline.cs.meta
new file mode 100644
index 0000000..93f10a2
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/RawFileBuildPipeline/RawFileBuildPipeline.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ee1731ae83e2f0045bab58773be95743
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline.meta
new file mode 100644
index 0000000..871f32f
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c8b9d8597bfdc994e9ef52f319cc96ec
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks.meta
new file mode 100644
index 0000000..26ca0ef
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 64c9242d4708b1f47b1469897bbfe127
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskBuilding_SBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskBuilding_SBP.cs
similarity index 91%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskBuilding_SBP.cs
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskBuilding_SBP.cs
index 6c0f294..11746a2 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskBuilding_SBP.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskBuilding_SBP.cs
@@ -2,7 +2,6 @@
 using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
-
 using UnityEditor.Build.Pipeline;
 using UnityEditor.Build.Pipeline.Interfaces;
 using UnityEditor.Build.Pipeline.Tasks;
@@ -21,6 +20,7 @@ namespace YooAsset.Editor
 		{
 			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			var scriptableBuildParameters = buildParametersContext.Parameters as ScriptableBuildParameters;
 
 			// 模拟构建模式下跳过引擎构建
 			var buildMode = buildParametersContext.Parameters.BuildMode;
@@ -32,7 +32,7 @@ namespace YooAsset.Editor
 
 			// 开始构建
 			IBundleBuildResults buildResults;
-			var buildParameters = buildParametersContext.GetSBPBuildParameters();
+			var buildParameters = scriptableBuildParameters.GetBundleBuildParameters();
 			var taskList = SBPBuildTasks.Create(buildMapContext.Command.ShadersBundleName);
 			ReturnCode exitCode = ContentPipeline.BuildAssetBundles(buildParameters, buildContent, out buildResults, taskList);
 			if (exitCode < 0)
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskBuilding_SBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskBuilding_SBP.cs.meta
similarity index 83%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskBuilding_SBP.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskBuilding_SBP.cs.meta
index 0fc6ce6..91a0eb9 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskBuilding_SBP.cs.meta
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskBuilding_SBP.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1af5fed7e9f83174d868c12b41c4a79e
+guid: 255306458772c8b4eb94ca288dfc77ac
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuildinFiles_SBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuildinFiles_SBP.cs
new file mode 100644
index 0000000..16c9b01
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuildinFiles_SBP.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("拷贝内置文件")]
+	public class TaskCopyBuildinFiles_SBP : TaskCopyBuildinFiles, IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var manifestContext = context.GetContextObject<ManifestContext>();
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+
+			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+			{
+				if (buildParametersContext.Parameters.BuildinFileCopyOption != EBuildinFileCopyOption.None)
+				{
+					CopyBuildinFilesToStreaming(buildParametersContext, manifestContext.Manifest);
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuildinFiles_SBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuildinFiles_SBP.cs.meta
new file mode 100644
index 0000000..ef55b62
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCopyBuildinFiles_SBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 67f8cc89ad41abe42aa1eed9a3d41f20
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateManifest_SBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateManifest_SBP.cs
new file mode 100644
index 0000000..29f1b85
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateManifest_SBP.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor.Build.Pipeline;
+using UnityEditor.Build.Pipeline.Interfaces;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("创建清单文件")]
+	public class TaskCreateManifest_SBP : TaskCreateManifest, IBuildTask
+	{
+		private TaskBuilding_SBP.BuildResultContext _buildResultContext = null;
+
+		void IBuildTask.Run(BuildContext context)
+		{
+			CreateManifestFile(context);
+		}
+
+		protected override string[] GetBundleDepends(BuildContext context, string bundleName)
+		{
+			if (_buildResultContext == null)
+				_buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
+
+			if (_buildResultContext.Results.BundleInfos.ContainsKey(bundleName) == false)
+				throw new Exception($"Not found bundle in SBP build results : {bundleName}");
+			return _buildResultContext.Results.BundleInfos[bundleName].Dependencies;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateManifest_SBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateManifest_SBP.cs.meta
new file mode 100644
index 0000000..9b33572
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateManifest_SBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: adfbea99cce4707409469a37c7e5da31
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreatePackage_SBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreatePackage_SBP.cs
new file mode 100644
index 0000000..a8c62bd
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreatePackage_SBP.cs
@@ -0,0 +1,56 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("制作包裹")]
+	public class TaskCreatePackage_SBP : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			var buildMode = buildParameters.Parameters.BuildMode;
+			if (buildMode != EBuildMode.SimulateBuild)
+			{
+				CopyPackageFiles(buildParameters, buildMapContext);
+			}
+		}
+
+		/// <summary>
+		/// 拷贝补丁文件到补丁包目录
+		/// </summary>
+		private void CopyPackageFiles(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
+		{
+			var scriptableBuildParameters = buildParametersContext.Parameters as ScriptableBuildParameters;
+			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
+			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
+			BuildLogger.Log($"开始拷贝补丁文件到补丁包目录：{packageOutputDirectory}");
+
+			// 拷贝构建日志
+			{
+				string sourcePath = $"{pipelineOutputDirectory}/buildlogtep.json";
+				string destPath = $"{packageOutputDirectory}/buildlogtep.json";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝代码防裁剪配置
+			if (scriptableBuildParameters.WriteLinkXML)
+			{
+				string sourcePath = $"{pipelineOutputDirectory}/link.xml";
+				string destPath = $"{packageOutputDirectory}/link.xml";
+				EditorTools.CopyFile(sourcePath, destPath, true);
+			}
+
+			// 拷贝所有补丁文件
+			int progressValue = 0;
+			int fileTotalCount = buildMapContext.Collection.Count;
+			foreach (var bundleInfo in buildMapContext.Collection)
+			{
+				EditorTools.CopyFile(bundleInfo.PackageSourceFilePath, bundleInfo.PackageDestFilePath, true);
+				EditorTools.DisplayProgressBar("拷贝补丁文件", ++progressValue, fileTotalCount);
+			}
+			EditorTools.ClearProgressBar();
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreatePackage_SBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreatePackage_SBP.cs.meta
new file mode 100644
index 0000000..3ed2a85
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreatePackage_SBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c798c7056a23c8840af89492d30cb89c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateReport_SBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateReport_SBP.cs
new file mode 100644
index 0000000..8748b89
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateReport_SBP.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("创建构建报告文件")]
+	public class TaskCreateReport_SBP : TaskCreateReport, IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+			var manifestContext = context.GetContextObject<ManifestContext>();
+
+			var buildMode = buildParameters.Parameters.BuildMode;
+			if (buildMode != EBuildMode.SimulateBuild)
+			{
+				CreateReportFile(buildParameters, buildMapContext, manifestContext);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateReport_SBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateReport_SBP.cs.meta
new file mode 100644
index 0000000..5e1c710
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskCreateReport_SBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 11893a8199d4d8549b76a16c740d507a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskEncryption_SBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskEncryption_SBP.cs
new file mode 100644
index 0000000..6f5e797
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskEncryption_SBP.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("资源包加密")]
+	public class TaskEncryption_SBP : TaskEncryption, IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParameters = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = context.GetContextObject<BuildMapContext>();
+
+			var buildMode = buildParameters.Parameters.BuildMode;
+			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
+			{
+				EncryptingBundleFiles(buildParameters, buildMapContext);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskEncryption_SBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskEncryption_SBP.cs.meta
new file mode 100644
index 0000000..18f96b6
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskEncryption_SBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ff8ba0dd63fc3304c8f20680733a74e0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskGetBuildMap_SBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskGetBuildMap_SBP.cs
new file mode 100644
index 0000000..52e7c02
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskGetBuildMap_SBP.cs
@@ -0,0 +1,20 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("获取资源构建内容")]
+	public class TaskGetBuildMap_SBP : TaskGetBuildMap, IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildMapContext = CreateBuildMap(buildParametersContext.Parameters);
+			context.SetContextObject(buildMapContext);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskGetBuildMap_SBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskGetBuildMap_SBP.cs.meta
new file mode 100644
index 0000000..37bf02c
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskGetBuildMap_SBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cc3a7680622c5254f80b9541196091c3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskPrepare_SBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskPrepare_SBP.cs
new file mode 100644
index 0000000..de89cc3
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskPrepare_SBP.cs
@@ -0,0 +1,27 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("资源构建准备工作")]
+	public class TaskPrepare_SBP : IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildParameters = buildParametersContext.Parameters;
+
+			// 检测基础构建参数
+			buildParametersContext.CheckBuildParameters();
+
+			// 检测不被支持的构建模式
+			if (buildParameters.BuildMode == EBuildMode.DryRunBuild)
+				throw new Exception($"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.DryRunBuild)} build mode !");
+			if (buildParameters.BuildMode == EBuildMode.ForceRebuild)
+				throw new Exception($"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.ForceRebuild)} build mode !");
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskPrepare_SBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskPrepare_SBP.cs.meta
new file mode 100644
index 0000000..a89d526
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskPrepare_SBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 698615f2a9590ef488a62419111d1e3d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskUpdateBundleInfo_SBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskUpdateBundleInfo_SBP.cs
new file mode 100644
index 0000000..1faa2f8
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskUpdateBundleInfo_SBP.cs
@@ -0,0 +1,79 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	[TaskAttribute("更新资源包信息")]
+	public class TaskUpdateBundleInfo_SBP : TaskUpdateBundleInfo, IBuildTask
+	{
+		void IBuildTask.Run(BuildContext context)
+		{
+			UpdateBundleInfo(context);
+		}
+
+		protected override string GetUnityHash(BuildBundleInfo bundleInfo, BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var parameters = buildParametersContext.Parameters;
+			var buildMode = parameters.BuildMode;
+			if (buildMode == EBuildMode.SimulateBuild)
+			{
+				return "00000000000000000000000000000000"; //32位
+			}
+			else
+			{
+				// 注意：当资源包的依赖列表发生变化的时候，ContentHash也会发生变化！
+				var buildResult = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
+				if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
+					return value.Hash.ToString();
+				else
+					throw new Exception($"Not found bundle hash in build result : {bundleInfo.BundleName}");
+			}
+		}
+		protected override uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context)
+		{
+			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var parameters = buildParametersContext.Parameters;
+			var buildMode = parameters.BuildMode;
+			if (buildMode == EBuildMode.SimulateBuild)
+			{
+				return 0;
+			}
+			else
+			{
+				var buildResult = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
+				if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
+					return value.Crc;
+				else
+					throw new Exception($"Not found bundle crc in build result : {bundleInfo.BundleName}");
+			}
+		}
+		protected override string GetBundleFileHash(string filePath, BuildParametersContext buildParametersContext)
+		{
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.SimulateBuild)
+				return "00000000000000000000000000000000"; //32位
+			else
+				return HashUtility.FileMD5(filePath);
+		}
+		protected override string GetBundleFileCRC(string filePath, BuildParametersContext buildParametersContext)
+		{
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.SimulateBuild)
+				return "00000000"; //8位
+			else
+				return HashUtility.FileCRC32(filePath);
+		}
+		protected override long GetBundleFileSize(string filePath, BuildParametersContext buildParametersContext)
+		{
+			var buildMode = buildParametersContext.Parameters.BuildMode;
+			if (buildMode == EBuildMode.SimulateBuild)
+				return 0;
+			else
+				return FileUtility.GetFileSize(filePath);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskUpdateBundleInfo_SBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskUpdateBundleInfo_SBP.cs.meta
new file mode 100644
index 0000000..8bf56e8
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskUpdateBundleInfo_SBP.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c53b8e8dd0618e344931ad9ac4ad0656
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskVerifyBuildResult_SBP.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskVerifyBuildResult_SBP.cs
similarity index 86%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskVerifyBuildResult_SBP.cs
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskVerifyBuildResult_SBP.cs
index b4ec42a..a3e6bb8 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskVerifyBuildResult_SBP.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskVerifyBuildResult_SBP.cs
@@ -3,8 +3,8 @@ using System.Linq;
 using System.IO;
 using System.Collections;
 using System.Collections.Generic;
-using UnityEditor;
 using UnityEngine;
+using UnityEditor;
 using UnityEditor.Build.Pipeline.Interfaces;
 
 namespace YooAsset.Editor
@@ -15,13 +15,14 @@ namespace YooAsset.Editor
 		void IBuildTask.Run(BuildContext context)
 		{
 			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
+			var buildParameters = buildParametersContext.Parameters as ScriptableBuildParameters;
 
 			// 模拟构建模式下跳过验证
-			if (buildParametersContext.Parameters.BuildMode == EBuildMode.SimulateBuild)
+			if (buildParameters.BuildMode == EBuildMode.SimulateBuild)
 				return;
 
 			// 验证构建结果
-			if (buildParametersContext.Parameters.VerifyBuildingResult)
+			if (buildParameters.VerifyBuildingResult)
 			{
 				var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
 				VerifyingBuildingResult(context, buildResultContext.Results);
@@ -38,7 +39,7 @@ namespace YooAsset.Editor
 			List<string> unityCreateBundles = buildResults.BundleInfos.Keys.ToList();
 
 			// 1. 过滤掉原生Bundle
-			List<string> expectBundles = buildMapContext.Collection.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToList();
+			List<string> expectBundles = buildMapContext.Collection.Select(t => t.BundleName).ToList();
 
 			// 2. 验证Bundle
 			List<string> exceptBundleList1 = unityCreateBundles.Except(expectBundles).ToList();
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskVerifyBuildResult_SBP.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskVerifyBuildResult_SBP.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskVerifyBuildResult_SBP.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskVerifyBuildResult_SBP.cs.meta
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/ExtdBuildTasks.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasksEx.cs
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/ExtdBuildTasks.cs
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasksEx.cs
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/ExtdBuildTasks.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasksEx.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/ExtdBuildTasks.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasksEx.cs.meta
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/SBPBuildTasks.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/SBPBuildTasks.cs
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/SBPBuildTasks.cs
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/SBPBuildTasks.cs
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/SBPBuildTasks.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/SBPBuildTasks.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/SBPBuildTasks.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/SBPBuildTasks.cs.meta
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildParameters.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildParameters.cs
new file mode 100644
index 0000000..0d77048
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildParameters.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEditor.Build.Pipeline;
+using UnityEditor.Build.Pipeline.Interfaces;
+
+namespace YooAsset.Editor
+{
+	public class ScriptableBuildParameters : BuildParameters
+	{
+		/// <summary>
+		/// 压缩选项
+		/// </summary>
+		public ECompressOption CompressOption = ECompressOption.Uncompressed;
+
+		/// <summary>
+		/// 禁止写入类型树结构（可以降低包体和内存并提高加载效率）
+		/// </summary>
+		public bool DisableWriteTypeTree = false;
+
+		/// <summary>
+		/// 忽略类型树变化
+		/// </summary>
+		public bool IgnoreTypeTreeChanges = true;
+
+
+		/// <summary>
+		/// 生成代码防裁剪配置
+		/// </summary>
+		public bool WriteLinkXML = true;
+
+		/// <summary>
+		/// 缓存服务器地址
+		/// </summary>
+		public string CacheServerHost;
+
+		/// <summary>
+		/// 缓存服务器端口
+		/// </summary>
+		public int CacheServerPort;
+
+
+		/// <summary>
+		/// 获取可编程构建管线的构建参数
+		/// </summary>
+		public BundleBuildParameters GetBundleBuildParameters()
+		{
+			var targetGroup = UnityEditor.BuildPipeline.GetBuildTargetGroup(BuildTarget);
+			var pipelineOutputDirectory = GetPipelineOutputDirectory();
+			var buildParams = new BundleBuildParameters(BuildTarget, targetGroup, pipelineOutputDirectory);
+
+			if (CompressOption == ECompressOption.Uncompressed)
+				buildParams.BundleCompression = UnityEngine.BuildCompression.Uncompressed;
+			else if (CompressOption == ECompressOption.LZMA)
+				buildParams.BundleCompression = UnityEngine.BuildCompression.LZMA;
+			else if (CompressOption == ECompressOption.LZ4)
+				buildParams.BundleCompression = UnityEngine.BuildCompression.LZ4;
+			else
+				throw new System.NotImplementedException(CompressOption.ToString());
+
+			if (DisableWriteTypeTree)
+				buildParams.ContentBuildFlags |= UnityEditor.Build.Content.ContentBuildFlags.DisableWriteTypeTree;
+
+			buildParams.UseCache = true;
+			buildParams.CacheServerHost = CacheServerHost;
+			buildParams.CacheServerPort = CacheServerPort;
+			buildParams.WriteLinkXML = WriteLinkXML;
+
+			return buildParams;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildParameters.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildParameters.cs.meta
new file mode 100644
index 0000000..281869c
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildParameters.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 83ca8a0609deaf04d9d1f1f0d396efa9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildPipeline.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildPipeline.cs
new file mode 100644
index 0000000..03037c9
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildPipeline.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Linq;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+	public class ScriptableBuildPipeline : IBuildPipeline
+	{
+		public BuildResult Run(BuildParameters buildParameters, bool enableLog)
+		{
+			AssetBundleBuilder builder = new AssetBundleBuilder();
+			return builder.Run(buildParameters, GetDefaultBuildPipeline(), enableLog);
+		}
+
+		/// <summary>
+		/// 获取默认的构建流程
+		/// </summary>
+		private List<IBuildTask> GetDefaultBuildPipeline()
+		{
+			List<IBuildTask> pipeline = new List<IBuildTask>
+				{
+					new TaskPrepare_SBP(), //前期准备工作
+					new TaskGetBuildMap_SBP(), //获取构建列表
+					new TaskBuilding_SBP(), //开始执行构建
+					new TaskVerifyBuildResult_SBP(), //验证构建结果
+					new TaskUpdateBundleInfo_SBP(), //更新补丁信息
+					new TaskCreateManifest_SBP(), //创建清单文件
+					new TaskCreateReport_SBP(), //创建报告文件
+					new TaskCreatePackage_SBP(), //制作补丁包
+					new TaskCopyBuildinFiles_SBP(), //拷贝内置文件
+				};
+			return pipeline;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildPipeline.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildPipeline.cs.meta
new file mode 100644
index 0000000..6641303
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildPipeline.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2e2dcea2c826dc94d8b439f724b25d57
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyBuildinFiles.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyBuildinFiles.cs
deleted file mode 100644
index 645040d..0000000
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyBuildinFiles.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEditor;
-using UnityEngine;
-
-namespace YooAsset.Editor
-{
-	[TaskAttribute("拷贝内置文件到流目录")]
-	public class TaskCopyBuildinFiles : IBuildTask
-	{
-		void IBuildTask.Run(BuildContext context)
-		{
-			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-			var manifestContext = context.GetContextObject<ManifestContext>();
-			var buildMode = buildParametersContext.Parameters.BuildMode;
-			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
-			{
-				if (buildParametersContext.Parameters.CopyBuildinFileOption != ECopyBuildinFileOption.None)
-				{
-					CopyBuildinFilesToStreaming(buildParametersContext, manifestContext);
-				}
-			}
-		}
-
-		/// <summary>
-		/// 拷贝首包资源文件
-		/// </summary>
-		private void CopyBuildinFilesToStreaming(BuildParametersContext buildParametersContext, ManifestContext manifestContext)
-		{
-			ECopyBuildinFileOption option = buildParametersContext.Parameters.CopyBuildinFileOption;
-			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
-			string streamingAssetsDirectory = buildParametersContext.GetStreamingAssetsDirectory();
-			string buildPackageName = buildParametersContext.Parameters.PackageName;
-			string buildPackageVersion = buildParametersContext.Parameters.PackageVersion;
-
-			// 加载补丁清单
-			PackageManifest manifest = manifestContext.Manifest;
-
-			// 清空流目录
-			if (option == ECopyBuildinFileOption.ClearAndCopyAll || option == ECopyBuildinFileOption.ClearAndCopyByTags)
-			{
-				EditorTools.ClearFolder(streamingAssetsDirectory);
-			}
-
-			// 拷贝补丁清单文件
-			{
-				string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildPackageName, buildPackageVersion);
-				string sourcePath = $"{packageOutputDirectory}/{fileName}";
-				string destPath = $"{streamingAssetsDirectory}/{fileName}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
-			}
-
-			// 拷贝补丁清单哈希文件
-			{
-				string fileName = YooAssetSettingsData.GetPackageHashFileName(buildPackageName, buildPackageVersion);
-				string sourcePath = $"{packageOutputDirectory}/{fileName}";
-				string destPath = $"{streamingAssetsDirectory}/{fileName}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
-			}
-
-			// 拷贝补丁清单版本文件
-			{
-				string fileName = YooAssetSettingsData.GetPackageVersionFileName(buildPackageName);
-				string sourcePath = $"{packageOutputDirectory}/{fileName}";
-				string destPath = $"{streamingAssetsDirectory}/{fileName}";
-				EditorTools.CopyFile(sourcePath, destPath, true);
-			}
-
-			// 拷贝文件列表（所有文件）
-			if (option == ECopyBuildinFileOption.ClearAndCopyAll || option == ECopyBuildinFileOption.OnlyCopyAll)
-			{
-				foreach (var packageBundle in manifest.BundleList)
-				{
-					string sourcePath = $"{packageOutputDirectory}/{packageBundle.FileName}";
-					string destPath = $"{streamingAssetsDirectory}/{packageBundle.FileName}";
-					EditorTools.CopyFile(sourcePath, destPath, true);
-				}
-			}
-
-			// 拷贝文件列表（带标签的文件）
-			if (option == ECopyBuildinFileOption.ClearAndCopyByTags || option == ECopyBuildinFileOption.OnlyCopyByTags)
-			{
-				string[] tags = buildParametersContext.Parameters.CopyBuildinFileTags.Split(';');
-				foreach (var packageBundle in manifest.BundleList)
-				{
-					if (packageBundle.HasTag(tags) == false)
-						continue;
-					string sourcePath = $"{packageOutputDirectory}/{packageBundle.FileName}";
-					string destPath = $"{streamingAssetsDirectory}/{packageBundle.FileName}";
-					EditorTools.CopyFile(sourcePath, destPath, true);
-				}
-			}
-
-			// 刷新目录
-			AssetDatabase.Refresh();
-			BuildLogger.Log($"内置文件拷贝完成：{streamingAssetsDirectory}");
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateManifest.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateManifest.cs
deleted file mode 100644
index 327693f..0000000
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateManifest.cs
+++ /dev/null
@@ -1,384 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections;
-using System.Collections.Generic;
-
-using UnityEditor.Build.Pipeline;
-using UnityEditor.Build.Pipeline.Interfaces;
-
-namespace YooAsset.Editor
-{
-	public class ManifestContext : IContextObject
-	{
-		internal PackageManifest Manifest;
-	}
-
-	[TaskAttribute("创建清单文件")]
-	public class TaskCreateManifest : IBuildTask
-	{
-		void IBuildTask.Run(BuildContext context)
-		{
-			CreateManifestFile(context);
-		}
-
-		/// <summary>
-		/// 创建补丁清单文件到输出目录
-		/// </summary>
-		private void CreateManifestFile(BuildContext context)
-		{
-			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-			var buildParameters = buildParametersContext.Parameters;
-			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
-
-			// 创建新补丁清单
-			PackageManifest manifest = new PackageManifest();
-			manifest.FileVersion = YooAssetSettings.ManifestFileVersion;
-			manifest.EnableAddressable = buildMapContext.Command.EnableAddressable;
-			manifest.LocationToLower = buildMapContext.Command.LocationToLower;
-			manifest.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID;
-			manifest.OutputNameStyle = (int)buildParameters.OutputNameStyle;
-			manifest.PackageName = buildParameters.PackageName;
-			manifest.PackageVersion = buildParameters.PackageVersion;
-
-			// 填充资源包集合
-			manifest.BundleList = GetAllPackageBundle(context);
-			CacheBundleIDs(manifest);
-
-			// 填充主资源集合
-			manifest.AssetList = GetAllPackageAsset(context, manifest);
-
-			// 更新Unity内置资源包的引用关系
-			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
-			{
-				if (buildParameters.BuildMode == EBuildMode.IncrementalBuild)
-				{
-					var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
-					UpdateBuiltInBundleReference(manifest, buildResultContext, buildMapContext.Command.ShadersBundleName);
-				}
-			}
-
-			// 更新资源包之间的引用关系
-			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
-			{
-				if (buildParameters.BuildMode == EBuildMode.IncrementalBuild)
-				{
-					var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
-					UpdateScriptPipelineReference(manifest, buildResultContext);
-				}
-			}
-
-			// 更新资源包之间的引用关系
-			if (buildParameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
-			{
-				if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
-				{
-					var buildResultContext = context.GetContextObject<TaskBuilding.BuildResultContext>();
-					UpdateBuiltinPipelineReference(manifest, buildResultContext);
-				}
-			}
-
-			// 创建补丁清单文本文件
-			{
-				string fileName = YooAssetSettingsData.GetManifestJsonFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-				string filePath = $"{packageOutputDirectory}/{fileName}";
-				ManifestTools.SerializeToJson(filePath, manifest);
-				BuildLogger.Log($"创建补丁清单文件：{filePath}");
-			}
-
-			// 创建补丁清单二进制文件
-			string packageHash;
-			{
-				string fileName = YooAssetSettingsData.GetManifestBinaryFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-				string filePath = $"{packageOutputDirectory}/{fileName}";
-				ManifestTools.SerializeToBinary(filePath, manifest);
-				packageHash = HashUtility.FileMD5(filePath);
-				BuildLogger.Log($"创建补丁清单文件：{filePath}");
-
-				ManifestContext manifestContext = new ManifestContext();
-				byte[] bytesData = FileUtility.ReadAllBytes(filePath);
-				manifestContext.Manifest = ManifestTools.DeserializeFromBinary(bytesData);
-				context.SetContextObject(manifestContext);
-			}
-
-			// 创建补丁清单哈希文件
-			{
-				string fileName = YooAssetSettingsData.GetPackageHashFileName(buildParameters.PackageName, buildParameters.PackageVersion);
-				string filePath = $"{packageOutputDirectory}/{fileName}";
-				FileUtility.WriteAllText(filePath, packageHash);
-				BuildLogger.Log($"创建补丁清单哈希文件：{filePath}");
-			}
-
-			// 创建补丁清单版本文件
-			{
-				string fileName = YooAssetSettingsData.GetPackageVersionFileName(buildParameters.PackageName);
-				string filePath = $"{packageOutputDirectory}/{fileName}";
-				FileUtility.WriteAllText(filePath, buildParameters.PackageVersion);
-				BuildLogger.Log($"创建补丁清单版本文件：{filePath}");
-			}
-		}
-
-		/// <summary>
-		/// 获取资源包列表
-		/// </summary>
-		private List<PackageBundle> GetAllPackageBundle(BuildContext context)
-		{
-			var buildMapContext = context.GetContextObject<BuildMapContext>();
-
-			List<PackageBundle> result = new List<PackageBundle>(1000);
-			foreach (var bundleInfo in buildMapContext.Collection)
-			{
-				var packageBundle = bundleInfo.CreatePackageBundle();
-				result.Add(packageBundle);
-			}
-			return result;
-		}
-
-		/// <summary>
-		/// 获取资源列表
-		/// </summary>
-		private List<PackageAsset> GetAllPackageAsset(BuildContext context, PackageManifest manifest)
-		{
-			var buildMapContext = context.GetContextObject<BuildMapContext>();
-
-			List<PackageAsset> result = new List<PackageAsset>(1000);
-			foreach (var bundleInfo in buildMapContext.Collection)
-			{
-				var assetInfos = bundleInfo.GetAllManifestAssetInfos();
-				foreach (var assetInfo in assetInfos)
-				{
-					PackageAsset packageAsset = new PackageAsset();
-					packageAsset.Address = buildMapContext.Command.EnableAddressable ? assetInfo.Address : string.Empty;
-					packageAsset.AssetPath = assetInfo.AssetPath;
-					packageAsset.AssetGUID = buildMapContext.Command.IncludeAssetGUID ? assetInfo.AssetGUID : string.Empty;
-					packageAsset.AssetTags = assetInfo.AssetTags.ToArray();
-					packageAsset.BundleID = GetCachedBundleID(assetInfo.BundleName);
-					packageAsset.DependIDs = GetAssetBundleDependIDs(packageAsset.BundleID, assetInfo, manifest);
-					result.Add(packageAsset);
-				}
-			}
-			return result;
-		}
-		private int[] GetAssetBundleDependIDs(int mainBundleID, BuildAssetInfo assetInfo, PackageManifest manifest)
-		{
-			HashSet<int> result = new HashSet<int>();
-			foreach (var dependAssetInfo in assetInfo.AllDependAssetInfos)
-			{
-				if (dependAssetInfo.HasBundleName())
-				{
-					int bundleID = GetCachedBundleID(dependAssetInfo.BundleName);
-					if (mainBundleID != bundleID)
-					{
-						if (result.Contains(bundleID) == false)
-							result.Add(bundleID);
-					}
-				}
-			}
-			return result.ToArray();
-		}
-
-		/// <summary>
-		/// 更新Unity内置资源包的引用关系
-		/// </summary>
-		private void UpdateBuiltInBundleReference(PackageManifest manifest, TaskBuilding_SBP.BuildResultContext buildResultContext, string shadersBunldeName)
-		{
-			// 获取所有依赖着色器资源包的资源包列表
-			List<string> shaderBundleReferenceList = new List<string>();
-			foreach (var valuePair in buildResultContext.Results.BundleInfos)
-			{
-				if (valuePair.Value.Dependencies.Any(t => t == shadersBunldeName))
-					shaderBundleReferenceList.Add(valuePair.Key);
-			}
-
-			// 注意：没有任何资源依赖着色器
-			if (shaderBundleReferenceList.Count == 0)
-				return;
-
-			// 获取着色器资源包索引
-			Predicate<PackageBundle> predicate = new Predicate<PackageBundle>(s => s.BundleName == shadersBunldeName);
-			int shaderBundleId = manifest.BundleList.FindIndex(predicate);
-			if (shaderBundleId == -1)
-				throw new Exception("没有发现着色器资源包！");
-
-			// 检测依赖交集并更新依赖ID
-			HashSet<string> tagTemps = new HashSet<string>();
-			foreach (var packageAsset in manifest.AssetList)
-			{
-				List<string> dependBundles = GetPackageAssetAllDependBundles(manifest, packageAsset);
-				List<string> conflictAssetPathList = dependBundles.Intersect(shaderBundleReferenceList).ToList();
-				if (conflictAssetPathList.Count > 0)
-				{
-					HashSet<int> newDependIDs = new HashSet<int>(packageAsset.DependIDs);
-					if (newDependIDs.Contains(shaderBundleId) == false)
-						newDependIDs.Add(shaderBundleId);
-					packageAsset.DependIDs = newDependIDs.ToArray();
-					foreach (var tag in packageAsset.AssetTags)
-					{
-						if (tagTemps.Contains(tag) == false)
-							tagTemps.Add(tag);
-					}
-				}
-			}
-
-			// 更新资源包标签
-			var packageBundle = manifest.BundleList[shaderBundleId];
-			HashSet<string> newTags = new HashSet<string>(packageBundle.Tags);
-			foreach (var tag in tagTemps)
-			{
-				if (newTags.Contains(tag) == false)
-					newTags.Add(tag);
-			}
-			packageBundle.Tags = newTags.ToArray();
-		}
-		private List<string> GetPackageAssetAllDependBundles(PackageManifest manifest, PackageAsset packageAsset)
-		{
-			List<string> result = new List<string>();
-			string mainBundle = manifest.BundleList[packageAsset.BundleID].BundleName;
-			result.Add(mainBundle);
-			foreach (var dependID in packageAsset.DependIDs)
-			{
-				string dependBundle = manifest.BundleList[dependID].BundleName;
-				result.Add(dependBundle);
-			}
-			return result;
-		}
-
-		#region 资源包引用关系相关
-		private readonly Dictionary<string, int> _cachedBundleID = new Dictionary<string, int>(10000);
-		private readonly Dictionary<string, string[]> _cachedBundleDepends = new Dictionary<string, string[]>(10000);
-		
-		private void CacheBundleIDs(PackageManifest manifest)
-		{
-			UnityEngine.Debug.Assert(manifest.BundleList.Count != 0, "Manifest bundle list is empty !");
-			for (int index = 0; index < manifest.BundleList.Count; index++)
-			{
-				string bundleName = manifest.BundleList[index].BundleName;
-				_cachedBundleID.Add(bundleName, index);
-			}
-		}
-
-		private void UpdateScriptPipelineReference(PackageManifest manifest, TaskBuilding_SBP.BuildResultContext buildResultContext)
-		{
-			int progressValue;
-			int totalCount = manifest.BundleList.Count;
-
-			// 缓存资源包依赖
-			_cachedBundleDepends.Clear();
-			progressValue = 0;
-			foreach (var packageBundle in manifest.BundleList)
-			{
-				if (packageBundle.IsRawFile)
-				{
-					_cachedBundleDepends.Add(packageBundle.BundleName, new string[] { });
-					continue;
-				}
-
-				if (buildResultContext.Results.BundleInfos.ContainsKey(packageBundle.BundleName) == false)
-					throw new Exception($"Not found bundle in SBP build results : {packageBundle.BundleName}");
-
-				var depends = buildResultContext.Results.BundleInfos[packageBundle.BundleName].Dependencies;
-				_cachedBundleDepends.Add(packageBundle.BundleName, depends);
-				int pro = ++progressValue;
-				if (pro % 100 == 0)
-				{
-					EditorTools.DisplayProgressBar("缓存资源包依赖列表", pro, totalCount);
-				}
-			}
-			EditorTools.ClearProgressBar();
-
-			// 计算资源包引用列表
-			foreach (var packageBundle in manifest.BundleList)
-			{
-				packageBundle.ReferenceIDs = GetBundleRefrenceIDs(manifest, packageBundle);
-				int pro = ++progressValue;
-				if (pro % 100 == 0)
-				{
-					EditorTools.DisplayProgressBar("计算资源包引用关系", pro, totalCount);
-				}
-			}
-			EditorTools.ClearProgressBar();
-		}
-		private void UpdateBuiltinPipelineReference(PackageManifest manifest, TaskBuilding.BuildResultContext buildResultContext)
-		{
-			int progressValue;
-			int totalCount = manifest.BundleList.Count;
-
-			// 缓存资源包依赖
-			_cachedBundleDepends.Clear();
-			progressValue = 0;
-			foreach (var packageBundle in manifest.BundleList)
-			{
-				if (packageBundle.IsRawFile)
-				{
-					_cachedBundleDepends.Add(packageBundle.BundleName, new string[] { });
-					continue;
-				}
-
-				var depends = buildResultContext.UnityManifest.GetDirectDependencies(packageBundle.BundleName);
-				_cachedBundleDepends.Add(packageBundle.BundleName, depends);
-				int pro = ++progressValue;
-				if (pro % 100 == 0)
-				{
-					EditorTools.DisplayProgressBar("缓存资源包依赖列表", pro, totalCount);
-				}
-			}
-			EditorTools.ClearProgressBar();
-
-			// 计算资源包引用列表
-			progressValue = 0;
-			foreach (var packageBundle in manifest.BundleList)
-			{
-				packageBundle.ReferenceIDs = GetBundleRefrenceIDs(manifest, packageBundle);
-				int pro = ++progressValue;
-				if (pro % 100 == 0)
-				{
-					EditorTools.DisplayProgressBar("计算资源包引用关系", ++progressValue, totalCount);
-				}
-			}
-			EditorTools.ClearProgressBar();
-		}
-
-		private int[] GetBundleRefrenceIDs(PackageManifest manifest, PackageBundle targetBundle)
-		{
-			List<string> referenceList = new List<string>();
-			foreach (var packageBundle in manifest.BundleList)
-			{
-				string bundleName = packageBundle.BundleName;
-				if (bundleName == targetBundle.BundleName)
-					continue;
-
-				string[] dependencies = GetCachedBundleDepends(bundleName);
-				if (dependencies.Contains(targetBundle.BundleName))
-				{
-					referenceList.Add(bundleName);
-				}
-			}
-
-			HashSet<int> result = new HashSet<int>();
-			foreach (var bundleName in referenceList)
-			{
-				int bundleID = GetCachedBundleID(bundleName);
-				if (result.Contains(bundleID) == false)
-					result.Add(bundleID);
-			}
-			return result.ToArray();
-		}
-		private int GetCachedBundleID(string bundleName)
-		{
-			if (_cachedBundleID.TryGetValue(bundleName, out int value) == false)
-			{
-				throw new Exception($"Not found cached bundle ID : {bundleName}");
-			}
-			return value;
-		}
-		private string[] GetCachedBundleDepends(string bundleName)
-		{
-			if (_cachedBundleDepends.TryGetValue(bundleName, out string[] value) == false)
-			{
-				throw new Exception($"Not found cached bundle depends : {bundleName}");
-			}
-			return value;
-		}
-		#endregion
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePackage.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePackage.cs
deleted file mode 100644
index cf91af4..0000000
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePackage.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-
-namespace YooAsset.Editor
-{
-	[TaskAttribute("制作包裹")]
-	public class TaskCreatePackage : IBuildTask
-	{
-		void IBuildTask.Run(BuildContext context)
-		{
-			var buildParameters = context.GetContextObject<BuildParametersContext>();
-			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			var buildMode = buildParameters.Parameters.BuildMode;
-			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
-			{
-				CopyPackageFiles(buildParameters, buildMapContext);
-			}
-		}
-
-		/// <summary>
-		/// 拷贝补丁文件到补丁包目录
-		/// </summary>
-		private void CopyPackageFiles(BuildParametersContext buildParametersContext, BuildMapContext buildMapContext)
-		{
-			var buildParameters = buildParametersContext.Parameters;
-			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
-			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
-			BuildLogger.Log($"开始拷贝补丁文件到补丁包目录：{packageOutputDirectory}");
-
-			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
-			{
-				// 拷贝构建日志
-				{
-					string sourcePath = $"{pipelineOutputDirectory}/buildlogtep.json";
-					string destPath = $"{packageOutputDirectory}/buildlogtep.json";
-					EditorTools.CopyFile(sourcePath, destPath, true);
-				}
-
-				// 拷贝代码防裁剪配置
-				if (buildParameters.SBPParameters.WriteLinkXML)
-				{
-					string sourcePath = $"{pipelineOutputDirectory}/link.xml";
-					string destPath = $"{packageOutputDirectory}/link.xml";
-					EditorTools.CopyFile(sourcePath, destPath, true);
-				}
-			}
-			else if (buildParameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
-			{
-				// 拷贝UnityManifest序列化文件
-				{
-					string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}";
-					string destPath = $"{packageOutputDirectory}/{YooAssetSettings.OutputFolderName}";
-					EditorTools.CopyFile(sourcePath, destPath, true);
-				}
-
-				// 拷贝UnityManifest文本文件
-				{
-					string sourcePath = $"{pipelineOutputDirectory}/{YooAssetSettings.OutputFolderName}.manifest";
-					string destPath = $"{packageOutputDirectory}/{YooAssetSettings.OutputFolderName}.manifest";
-					EditorTools.CopyFile(sourcePath, destPath, true);
-				}
-			}
-			else
-			{
-				throw new System.NotImplementedException();
-			}
-
-			// 拷贝所有补丁文件
-			int progressValue = 0;
-			int fileTotalCount = buildMapContext.Collection.Count;
-			foreach (var bundleInfo in buildMapContext.Collection)
-			{
-				EditorTools.CopyFile(bundleInfo.PackageSourceFilePath, bundleInfo.PackageDestFilePath, true);
-				EditorTools.DisplayProgressBar("拷贝补丁文件", ++progressValue, fileTotalCount);
-			}
-			EditorTools.ClearProgressBar();
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskGetBuildMap.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskGetBuildMap.cs
deleted file mode 100644
index b8554a6..0000000
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskGetBuildMap.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEditor;
-
-namespace YooAsset.Editor
-{
-	[TaskAttribute("获取资源构建内容")]
-	public class TaskGetBuildMap : IBuildTask
-	{
-		void IBuildTask.Run(BuildContext context)
-		{
-			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-			var buildMapContext = CreateBuildMap(buildParametersContext.Parameters);
-			context.SetContextObject(buildMapContext);
-			BuildLogger.Log("构建内容准备完毕！");
-
-			// 检测构建结果
-			CheckBuildMapContent(buildMapContext);
-		}
-
-		/// <summary>
-		/// 资源构建上下文
-		/// </summary>
-		public BuildMapContext CreateBuildMap(BuildParameters buildParameters)
-		{
-			var buildMode = buildParameters.BuildMode;
-			var packageName = buildParameters.PackageName;
-			var sharedPackRule = buildParameters.SharedPackRule;
-
-			Dictionary<string, BuildAssetInfo> allBuildAssetInfoDic = new Dictionary<string, BuildAssetInfo>(1000);
-
-			// 1. 检测配置合法性
-			AssetBundleCollectorSettingData.Setting.CheckPackageConfigError(packageName);
-
-			// 2. 获取所有收集器收集的资源
-			var collectResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(buildMode, packageName);
-			List<CollectAssetInfo> allCollectAssetInfos = collectResult.CollectAssets;
-
-			// 3. 剔除未被引用的依赖项资源
-			RemoveZeroReferenceAssets(allCollectAssetInfos);
-
-			// 4. 录入所有收集器收集的资源
-			foreach (var collectAssetInfo in allCollectAssetInfos)
-			{
-				if (allBuildAssetInfoDic.ContainsKey(collectAssetInfo.AssetPath) == false)
-				{
-					var buildAssetInfo = new BuildAssetInfo(collectAssetInfo.CollectorType, collectAssetInfo.BundleName,
-						collectAssetInfo.Address, collectAssetInfo.AssetPath, collectAssetInfo.IsRawAsset);
-					buildAssetInfo.AddAssetTags(collectAssetInfo.AssetTags);
-					buildAssetInfo.AddBundleTags(collectAssetInfo.AssetTags);
-					allBuildAssetInfoDic.Add(collectAssetInfo.AssetPath, buildAssetInfo);
-				}
-				else
-				{
-					throw new Exception($"Should never get here !");
-				}
-			}
-
-			// 5. 录入所有收集资源的依赖资源
-			foreach (var collectAssetInfo in allCollectAssetInfos)
-			{
-				string collectAssetBundleName = collectAssetInfo.BundleName;
-				foreach (var dependAssetPath in collectAssetInfo.DependAssets)
-				{
-					if (allBuildAssetInfoDic.ContainsKey(dependAssetPath))
-					{
-						allBuildAssetInfoDic[dependAssetPath].AddBundleTags(collectAssetInfo.AssetTags);
-						allBuildAssetInfoDic[dependAssetPath].AddReferenceBundleName(collectAssetBundleName);
-					}
-					else
-					{
-						var buildAssetInfo = new BuildAssetInfo(dependAssetPath);
-						buildAssetInfo.AddBundleTags(collectAssetInfo.AssetTags);
-						buildAssetInfo.AddReferenceBundleName(collectAssetBundleName);
-						allBuildAssetInfoDic.Add(dependAssetPath, buildAssetInfo);
-					}
-				}
-			}
-
-			// 6. 填充所有收集资源的依赖列表
-			foreach (var collectAssetInfo in allCollectAssetInfos)
-			{
-				var dependAssetInfos = new List<BuildAssetInfo>(collectAssetInfo.DependAssets.Count);
-				foreach (var dependAssetPath in collectAssetInfo.DependAssets)
-				{
-					if (allBuildAssetInfoDic.TryGetValue(dependAssetPath, out BuildAssetInfo value))
-						dependAssetInfos.Add(value);
-					else
-						throw new Exception("Should never get here !");
-				}
-				allBuildAssetInfoDic[collectAssetInfo.AssetPath].SetAllDependAssetInfos(dependAssetInfos);
-			}
-
-			// 7. 记录关键信息
-			BuildMapContext context = new BuildMapContext();
-			context.AssetFileCount = allBuildAssetInfoDic.Count;
-			context.Command = collectResult.Command;
-
-			// 8. 计算共享资源的包名		
-			var command = collectResult.Command;
-			foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
-			{
-				buildAssetInfo.CalculateShareBundleName(sharedPackRule, command.UniqueBundleName, command.PackageName, command.ShadersBundleName);
-			}
-
-			// 9. 记录冗余资源
-			foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
-			{
-				if (buildAssetInfo.IsRedundancyAsset())
-				{
-					var redundancyInfo = new ReportRedundancyInfo();
-					redundancyInfo.AssetPath = buildAssetInfo.AssetPath;
-					redundancyInfo.AssetType = AssetDatabase.GetMainAssetTypeAtPath(buildAssetInfo.AssetPath).Name;
-					redundancyInfo.AssetGUID = AssetDatabase.AssetPathToGUID(buildAssetInfo.AssetPath);
-					redundancyInfo.FileSize = FileUtility.GetFileSize(buildAssetInfo.AssetPath);
-					redundancyInfo.Number = buildAssetInfo.GetReferenceBundleCount();
-					context.RedundancyInfos.Add(redundancyInfo);
-				}
-			}
-
-			// 10. 移除不参与构建的资源
-			List<BuildAssetInfo> removeBuildList = new List<BuildAssetInfo>();
-			foreach (var buildAssetInfo in allBuildAssetInfoDic.Values)
-			{
-				if (buildAssetInfo.HasBundleName() == false)
-					removeBuildList.Add(buildAssetInfo);
-			}
-			foreach (var removeValue in removeBuildList)
-			{
-				allBuildAssetInfoDic.Remove(removeValue.AssetPath);
-			}
-
-			// 11. 构建资源列表
-			var allPackAssets = allBuildAssetInfoDic.Values.ToList();
-			if (allPackAssets.Count == 0)
-				throw new Exception("构建的资源列表不能为空");
-			foreach (var assetInfo in allPackAssets)
-			{
-				context.PackAsset(assetInfo);
-			}
-
-			return context;
-		}
-		private void RemoveZeroReferenceAssets(List<CollectAssetInfo> allCollectAssetInfos)
-		{
-			// 1. 检测是否任何存在依赖资源
-			bool hasAnyDependCollector = false;
-			foreach (var collectAssetInfo in allCollectAssetInfos)
-			{
-				var collectorType = collectAssetInfo.CollectorType;
-				if (collectorType == ECollectorType.DependAssetCollector)
-				{
-					hasAnyDependCollector = true;
-					break;
-				}
-			}
-			if (hasAnyDependCollector == false)
-				return;
-
-			// 2. 获取所有主资源的依赖资源集合
-			HashSet<string> allDependAsset = new HashSet<string>();
-			foreach (var collectAssetInfo in allCollectAssetInfos)
-			{
-				var collectorType = collectAssetInfo.CollectorType;
-				if (collectorType == ECollectorType.MainAssetCollector || collectorType == ECollectorType.StaticAssetCollector)
-				{
-					foreach (var dependAsset in collectAssetInfo.DependAssets)
-					{
-						if (allDependAsset.Contains(dependAsset) == false)
-							allDependAsset.Add(dependAsset);
-					}
-				}
-			}
-
-			// 3. 找出所有零引用的依赖资源集合
-			List<CollectAssetInfo> removeList = new List<CollectAssetInfo>();
-			foreach (var collectAssetInfo in allCollectAssetInfos)
-			{
-				var collectorType = collectAssetInfo.CollectorType;
-				if (collectorType == ECollectorType.DependAssetCollector)
-				{
-					if (allDependAsset.Contains(collectAssetInfo.AssetPath) == false)
-						removeList.Add(collectAssetInfo);
-				}
-			}
-
-			// 4. 移除所有零引用的依赖资源
-			foreach (var removeValue in removeList)
-			{
-				BuildLogger.Log($"发现未被依赖的资源并自动移除 : {removeValue.AssetPath}");
-				allCollectAssetInfos.Remove(removeValue);
-			}
-		}
-
-		/// <summary>
-		/// 检测构建结果
-		/// </summary>
-		private void CheckBuildMapContent(BuildMapContext buildMapContext)
-		{
-			foreach (var bundleInfo in buildMapContext.Collection)
-			{
-				// 注意：原生文件资源包只能包含一个原生文件
-				bool isRawFile = bundleInfo.IsRawFile;
-				if (isRawFile)
-				{
-					if (bundleInfo.AllMainAssets.Count != 1)
-						throw new Exception($"The bundle does not support multiple raw asset : {bundleInfo.BundleName}");
-					continue;
-				}
-
-				// 注意：原生文件不能被其它资源文件依赖
-				foreach (var assetInfo in bundleInfo.AllMainAssets)
-				{
-					if (assetInfo.AllDependAssetInfos != null)
-					{
-						foreach (var dependAssetInfo in assetInfo.AllDependAssetInfos)
-						{
-							if (dependAssetInfo.IsRawAsset)
-								throw new Exception($"{assetInfo.AssetPath} can not depend raw asset : {dependAssetInfo.AssetPath}");
-						}
-					}
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskPrepare.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskPrepare.cs
deleted file mode 100644
index d28c250..0000000
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskPrepare.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using System;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEditor;
-
-namespace YooAsset.Editor
-{
-	[TaskAttribute("资源构建准备工作")]
-	public class TaskPrepare : IBuildTask
-	{
-		void IBuildTask.Run(BuildContext context)
-		{
-			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-			var buildParameters = buildParametersContext.Parameters;
-
-			// 检测构建参数合法性
-			if (buildParameters.BuildTarget == BuildTarget.NoTarget)
-				throw new Exception("请选择目标平台！");
-			if (string.IsNullOrEmpty(buildParameters.PackageName))
-				throw new Exception("包裹名称不能为空！");
-			if (string.IsNullOrEmpty(buildParameters.PackageVersion))
-				throw new Exception("包裹版本不能为空！");
-			if (string.IsNullOrEmpty(buildParameters.BuildOutputRoot))
-				throw new Exception("构建输出的根目录为空！");
-			if (string.IsNullOrEmpty(buildParameters.StreamingAssetsRoot))
-				throw new Exception("内置资源根目录为空！");
-
-			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
-			{
-				if (buildParameters.SBPParameters == null)
-					throw new Exception($"{nameof(BuildParameters.SBPParameters)} is null !");
-
-				if (buildParameters.BuildMode == EBuildMode.DryRunBuild)
-					throw new Exception($"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.DryRunBuild)} build mode !");
-
-				if (buildParameters.BuildMode == EBuildMode.ForceRebuild)
-					throw new Exception($"{nameof(EBuildPipeline.ScriptableBuildPipeline)} not support {nameof(EBuildMode.ForceRebuild)} build mode !");
-			}
-
-			if (buildParameters.BuildMode != EBuildMode.SimulateBuild)
-			{
-#if UNITY_2021_3_OR_NEWER
-				if (buildParameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
-				{
-					BuildLogger.Warning("推荐使用可编程构建管线（SBP）！");
-				}
-#endif
-
-				// 检测当前是否正在构建资源包
-				if (BuildPipeline.isBuildingPlayer)
-					throw new Exception("当前正在构建资源包，请结束后再试");
-
-				// 检测是否有未保存场景
-				if (EditorTools.HasDirtyScenes())
-					throw new Exception("检测到未保存的场景文件");
-
-				// 检测首包资源标签
-				if (buildParameters.CopyBuildinFileOption == ECopyBuildinFileOption.ClearAndCopyByTags
-					|| buildParameters.CopyBuildinFileOption == ECopyBuildinFileOption.OnlyCopyByTags)
-				{
-					if (string.IsNullOrEmpty(buildParameters.CopyBuildinFileTags))
-						throw new Exception("首包资源标签不能为空！");
-				}
-
-				// 检测共享资源打包规则
-				if (buildParameters.SharedPackRule == null)
-					throw new Exception("共享资源打包规则不能为空！");
-
-#if UNITY_WEBGL
-				if (buildParameters.EncryptionServices != null)
-				{
-					if (buildParameters.EncryptionServices.GetType() != typeof(EncryptionNone))
-					{
-						throw new Exception("WebGL平台不支持加密！");
-					}
-				}
-#endif
-
-				// 检测包裹输出目录是否存在
-				string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
-				if (Directory.Exists(packageOutputDirectory))
-					throw new Exception($"本次构建的补丁目录已经存在：{packageOutputDirectory}");
-
-				// 保存改动的资源
-				AssetDatabase.SaveAssets();
-			}
-
-			if (buildParameters.BuildMode == EBuildMode.ForceRebuild)
-			{
-				string packageRootDirectory = buildParametersContext.GetPackageRootDirectory();
-				if (EditorTools.DeleteDirectory(packageRootDirectory))
-				{
-					BuildLogger.Log($"删除包裹目录：{packageRootDirectory}");
-				}
-			}
-
-			// 如果输出目录不存在
-			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
-			if (EditorTools.CreateDirectory(pipelineOutputDirectory))
-			{
-				BuildLogger.Log($"创建输出目录：{pipelineOutputDirectory}");
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskUpdateBundleInfo.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskUpdateBundleInfo.cs
deleted file mode 100644
index ab7e63f..0000000
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskUpdateBundleInfo.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using System;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEditor;
-
-namespace YooAsset.Editor
-{
-	[TaskAttribute("更新资源包信息")]
-	public class TaskUpdateBundleInfo : IBuildTask
-	{
-		void IBuildTask.Run(BuildContext context)
-		{
-			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
-			string packageOutputDirectory = buildParametersContext.GetPackageOutputDirectory();
-			int outputNameStyle = (int)buildParametersContext.Parameters.OutputNameStyle;
-
-			// 1.检测文件名长度
-			foreach (var bundleInfo in buildMapContext.Collection)
-			{
-				// NOTE：检测文件名长度不要超过260字符。
-				string fileName = bundleInfo.BundleName;
-				if (fileName.Length >= 260)
-					throw new Exception($"The output bundle name is too long {fileName.Length} chars : {fileName}");
-			}
-
-			// 2.更新构建输出的文件路径
-			foreach (var bundleInfo in buildMapContext.Collection)
-			{
-				bundleInfo.BuildOutputFilePath = $"{pipelineOutputDirectory}/{bundleInfo.BundleName}";
-				if (bundleInfo.IsEncryptedFile)
-					bundleInfo.PackageSourceFilePath = bundleInfo.EncryptedFilePath;
-				else
-					bundleInfo.PackageSourceFilePath = bundleInfo.BuildOutputFilePath;
-			}
-
-			// 3.更新文件其它信息
-			foreach (var bundleInfo in buildMapContext.Collection)
-			{
-				bundleInfo.PackageUnityHash = GetUnityHash(bundleInfo, context);
-				bundleInfo.PackageUnityCRC = GetUnityCRC(bundleInfo, context);
-				bundleInfo.PackageFileHash = GetBundleFileHash(bundleInfo.PackageSourceFilePath, buildParametersContext);
-				bundleInfo.PackageFileCRC = GetBundleFileCRC(bundleInfo.PackageSourceFilePath, buildParametersContext);
-				bundleInfo.PackageFileSize = GetBundleFileSize(bundleInfo.PackageSourceFilePath, buildParametersContext);
-			}
-
-			// 4.更新补丁包输出的文件路径
-			foreach (var bundleInfo in buildMapContext.Collection)
-			{
-				string bundleName = bundleInfo.BundleName;
-				string fileHash = bundleInfo.PackageFileHash;
-				string fileExtension = ManifestTools.GetRemoteBundleFileExtension(bundleName);
-				string fileName = ManifestTools.GetRemoteBundleFileName(outputNameStyle, bundleName, fileExtension, fileHash);
-				bundleInfo.PackageDestFilePath = $"{packageOutputDirectory}/{fileName}";
-			}
-		}
-
-		private string GetUnityHash(BuildBundleInfo bundleInfo, BuildContext context)
-		{
-			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-			var parameters = buildParametersContext.Parameters;
-			var buildMode = parameters.BuildMode;
-			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
-				return "00000000000000000000000000000000"; //32位
-
-			if (bundleInfo.IsRawFile)
-			{
-				string filePath = bundleInfo.PackageSourceFilePath;
-				return HashUtility.FileMD5(filePath);
-			}
-
-			if (parameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
-			{
-				var buildResult = context.GetContextObject<TaskBuilding.BuildResultContext>();
-				var hash = buildResult.UnityManifest.GetAssetBundleHash(bundleInfo.BundleName);
-				if (hash.isValid)
-					return hash.ToString();
-				else
-					throw new Exception($"Not found bundle hash in build result : {bundleInfo.BundleName}");
-			}
-			else if (parameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
-			{
-				// 注意：当资源包的依赖列表发生变化的时候，ContentHash也会发生变化！
-				var buildResult = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
-				if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
-					return value.Hash.ToString();
-				else
-					throw new Exception($"Not found bundle hash in build result : {bundleInfo.BundleName}");
-			}
-			else
-			{
-				throw new System.NotImplementedException();
-			}
-		}
-		private uint GetUnityCRC(BuildBundleInfo bundleInfo, BuildContext context)
-		{
-			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-			var parameters = buildParametersContext.Parameters;
-			var buildMode = parameters.BuildMode;
-			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
-				return 0;
-
-			if (bundleInfo.IsRawFile)
-				return 0;
-
-			if (parameters.BuildPipeline == EBuildPipeline.BuiltinBuildPipeline)
-			{
-				string filePath = bundleInfo.BuildOutputFilePath;
-				if (BuildPipeline.GetCRCForAssetBundle(filePath, out uint crc))
-					return crc;
-				else
-					throw new Exception($"Not found bundle crc in build result : {bundleInfo.BundleName}");
-			}
-			else if (parameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
-			{
-				var buildResult = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
-				if (buildResult.Results.BundleInfos.TryGetValue(bundleInfo.BundleName, out var value))
-					return value.Crc;
-				else
-					throw new Exception($"Not found bundle crc in build result : {bundleInfo.BundleName}");
-			}
-			else
-			{
-				throw new System.NotImplementedException();
-			}
-		}
-		private string GetBundleFileHash(string filePath, BuildParametersContext buildParametersContext)
-		{
-			var buildMode = buildParametersContext.Parameters.BuildMode;
-			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
-				return "00000000000000000000000000000000"; //32位
-			else
-				return HashUtility.FileMD5(filePath);
-		}
-		private string GetBundleFileCRC(string filePath, BuildParametersContext buildParametersContext)
-		{
-			var buildMode = buildParametersContext.Parameters.BuildMode;
-			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
-				return "00000000"; //8位
-			else
-				return HashUtility.FileCRC32(filePath);
-		}
-		private long GetBundleFileSize(string filePath, BuildParametersContext buildParametersContext)
-		{
-			var buildMode = buildParametersContext.Parameters.BuildMode;
-			if (buildMode == EBuildMode.DryRunBuild || buildMode == EBuildMode.SimulateBuild)
-				return 0;
-			else
-				return FileUtility.GetFileSize(filePath);
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskVerifyBuildResult.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskVerifyBuildResult.cs
deleted file mode 100644
index e3ffbbf..0000000
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskVerifyBuildResult.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-using System;
-using System.Linq;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEditor;
-using UnityEngine;
-
-namespace YooAsset.Editor
-{
-	[TaskAttribute("验证构建结果")]
-	public class TaskVerifyBuildResult : IBuildTask
-	{
-		void IBuildTask.Run(BuildContext context)
-		{
-			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-
-			// 模拟构建模式下跳过验证
-			if (buildParametersContext.Parameters.BuildMode == EBuildMode.SimulateBuild)
-				return;
-
-			// 验证构建结果
-			if (buildParametersContext.Parameters.VerifyBuildingResult)
-			{
-				var buildResultContext = context.GetContextObject<TaskBuilding.BuildResultContext>();
-				VerifyingBuildingResult(context, buildResultContext.UnityManifest);
-			}
-		}
-
-		/// <summary>
-		/// 验证构建结果
-		/// </summary>
-		private void VerifyingBuildingResult(BuildContext context, AssetBundleManifest unityManifest)
-		{
-			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			string[] unityCreateBundles = unityManifest.GetAllAssetBundles();
-
-			// 1. 过滤掉原生Bundle
-			string[] mapBundles = buildMapContext.Collection.Where(t => t.IsRawFile == false).Select(t => t.BundleName).ToArray();
-
-			// 2. 验证Bundle
-			List<string> exceptBundleList1 = unityCreateBundles.Except(mapBundles).ToList();
-			if (exceptBundleList1.Count > 0)
-			{
-				foreach (var exceptBundle in exceptBundleList1)
-				{
-					BuildLogger.Warning($"差异资源包: {exceptBundle}");
-				}
-				throw new System.Exception("存在差异资源包！请查看警告信息！");
-			}
-
-			// 3. 验证Bundle
-			List<string> exceptBundleList2 = mapBundles.Except(unityCreateBundles).ToList();
-			if (exceptBundleList2.Count > 0)
-			{
-				foreach (var exceptBundle in exceptBundleList2)
-				{
-					BuildLogger.Warning($"差异资源包: {exceptBundle}");
-				}
-				throw new System.Exception("存在差异资源包！请查看警告信息！");
-			}
-
-			// 4. 验证Asset
-			/*
-			bool isPass = true;
-			var buildMode = buildParametersContext.Parameters.BuildMode;
-			if (buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild)
-			{
-				int progressValue = 0;
-				string pipelineOutputDirectory = buildParametersContext.GetPipelineOutputDirectory();
-				foreach (var buildedBundle in buildedBundles)
-				{
-					string filePath = $"{pipelineOutputDirectory}/{buildedBundle}";
-					string[] buildedAssetPaths = GetAssetBundleAllAssets(filePath);
-					string[] mapAssetPaths = buildMapContext.GetBuildinAssetPaths(buildedBundle);
-					if (mapAssetPaths.Length != buildedAssetPaths.Length)
-					{
-						BuildLogger.Warning($"构建的Bundle文件内的资源对象数量和预期不匹配 : {buildedBundle}");
-						var exceptAssetList1 = mapAssetPaths.Except(buildedAssetPaths).ToList();
-						foreach (var excpetAsset in exceptAssetList1)
-						{
-							BuildLogger.Warning($"构建失败的资源对象路径为 : {excpetAsset}");
-						}
-						var exceptAssetList2 = buildedAssetPaths.Except(mapAssetPaths).ToList();
-						foreach (var excpetAsset in exceptAssetList2)
-						{
-							BuildLogger.Warning($"构建失败的资源对象路径为 : {excpetAsset}");
-						}
-						isPass = false;
-						continue;
-					}
-					EditorTools.DisplayProgressBar("验证构建结果", ++progressValue, buildedBundles.Length);
-				}
-				EditorTools.ClearProgressBar();
-
-				if (isPass == false)
-				{
-					throw new Exception("构建结果验证没有通过，请参考警告日志！");
-				}
-			}
-			*/
-
-			BuildLogger.Log("构建结果验证成功！");
-		}
-
-		/// <summary>
-		/// 解析.manifest文件并获取资源列表
-		/// </summary>
-		private string[] GetAssetBundleAllAssets(string filePath)
-		{
-			string manifestFilePath = $"{filePath}.manifest";
-			List<string> assetLines = new List<string>();
-			using (StreamReader reader = File.OpenText(manifestFilePath))
-			{
-				string content;
-				bool findTarget = false;
-				while (null != (content = reader.ReadLine()))
-				{
-					if (content.StartsWith("Dependencies:"))
-						break;
-					if (findTarget == false && content.StartsWith("Assets:"))
-						findTarget = true;
-					if (findTarget)
-					{
-						if (content.StartsWith("- "))
-						{
-							string assetPath = content.TrimStart("- ".ToCharArray());
-							assetLines.Add(assetPath);
-						}
-					}
-				}
-			}
-			return assetLines.ToArray();
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildPipeline.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildPipeline.cs
index 7ecff2c..b158bf4 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildPipeline.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildPipeline.cs
@@ -7,13 +7,18 @@ namespace YooAsset.Editor
 	public enum EBuildPipeline
 	{
 		/// <summary>
-		/// 传统内置构建管线
+		/// 传统内置构建管线 (BBP)
 		/// </summary>
 		BuiltinBuildPipeline,
 		
 		/// <summary>
-		/// 可编程构建管线
+		/// 可编程构建管线 (SBP)
 		/// </summary>
 		ScriptableBuildPipeline,
+
+		/// <summary>
+		/// 原生文件构建管线 (RFBP)
+		/// </summary>
+		RawFileBuildPipeline,
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/ECopyBuildinFileOption.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildinFileCopyOption.cs
similarity index 94%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/ECopyBuildinFileOption.cs
rename to Assets/YooAsset/Editor/AssetBundleBuilder/EBuildinFileCopyOption.cs
index 6cfa240..22a1d98 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/ECopyBuildinFileOption.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildinFileCopyOption.cs
@@ -4,7 +4,7 @@ namespace YooAsset.Editor
 	/// <summary>
 	/// 首包资源文件的拷贝方式
 	/// </summary>
-	public enum ECopyBuildinFileOption
+	public enum EBuildinFileCopyOption
 	{
 		/// <summary>
 		/// 不拷贝任何文件
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/ECopyBuildinFileOption.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/EBuildinFileCopyOption.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/ECopyBuildinFileOption.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/EBuildinFileCopyOption.cs.meta
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/EOutputNameStyle.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/EFileNameStyle.cs
similarity index 50%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/EOutputNameStyle.cs
rename to Assets/YooAsset/Editor/AssetBundleBuilder/EFileNameStyle.cs
index fb6cf84..a3ac354 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/EOutputNameStyle.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/EFileNameStyle.cs
@@ -2,18 +2,23 @@
 namespace YooAsset.Editor
 {
 	/// <summary>
-	/// 输出文件名称的样式
+	/// 补丁包内的文件样式
 	/// </summary>
-	public enum EOutputNameStyle
+	public enum EFileNameStyle
 	{
 		/// <summary>
 		/// 哈希值名称
 		/// </summary>
-		HashName = 1,
+		HashName = 0,
+
+		/// <summary>
+		/// 资源包名称（不推荐）
+		/// </summary>
+		BundleName = 1,
 
 		/// <summary>
 		/// 资源包名称 + 哈希值名称
 		/// </summary>
-		BundleName_HashName = 4,
+		BundleName_HashName = 2,
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/EOutputNameStyle.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/EFileNameStyle.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/EOutputNameStyle.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/EFileNameStyle.cs.meta
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/IBuildPipeline.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/IBuildPipeline.cs
new file mode 100644
index 0000000..b10fee3
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/IBuildPipeline.cs
@@ -0,0 +1,8 @@
+
+namespace YooAsset.Editor
+{
+	public interface IBuildPipeline
+	{
+		public BuildResult Run(BuildParameters buildParameters, bool enableLog);
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/IBuildPipeline.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/IBuildPipeline.cs.meta
new file mode 100644
index 0000000..6fa8d07
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/IBuildPipeline.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4c86b6dc67868574ea68f632a1d42180
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers.meta
new file mode 100644
index 0000000..3174e91
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7c39b7c7b58d79a4a9ee9970e9d0470e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs
new file mode 100644
index 0000000..f006492
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs
@@ -0,0 +1,210 @@
+#if UNITY_2019_4_OR_NEWER
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+	internal abstract class BuildPipelineViewerBase
+	{
+		private const int StyleWidth = 400;
+
+		protected readonly string PackageName;
+		protected readonly BuildTarget BuildTarget;
+		protected readonly EBuildPipeline BuildPipeline;
+		protected TemplateContainer Root;
+
+		private TextField _buildOutputField;
+		private TextField _buildVersionField;
+		private PopupField<Enum> _buildModeField;
+		private PopupField<Type> _encryptionField;
+		private EnumField _compressionField;
+		private EnumField _outputNameStyleField;
+		private EnumField _copyBuildinFileOptionField;
+		private TextField _copyBuildinFileTagsField;
+
+		public BuildPipelineViewerBase(string packageName, EBuildPipeline buildPipeline, BuildTarget buildTarget, VisualElement parent)
+		{
+			PackageName = packageName;
+			BuildTarget = buildTarget;
+			BuildPipeline = buildPipeline;
+
+			CreateView(parent);
+			RefreshView();
+		}
+		private void CreateView(VisualElement parent)
+		{
+			// ���ز����ļ�
+			var visualAsset = UxmlLoader.LoadWindowUXML<BuildPipelineViewerBase>();
+			if (visualAsset == null)
+				return;
+
+			Root = visualAsset.CloneTree();
+			Root.style.flexGrow = 1f;
+			parent.Add(Root);
+
+			// ���Ŀ¼
+			string defaultOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+			_buildOutputField = Root.Q<TextField>("BuildOutput");
+			_buildOutputField.SetValueWithoutNotify(defaultOutputRoot);
+			_buildOutputField.SetEnabled(false);
+
+			// �����汾
+			_buildVersionField = Root.Q<TextField>("BuildVersion");
+			_buildVersionField.style.width = StyleWidth;
+			_buildVersionField.SetValueWithoutNotify(GetDefaultPackageVersion());
+
+			// ����ģʽ
+			{
+				var buildModeContainer = Root.Q("BuildModeContainer");
+				var buildMode = AssetBundleBuilderSetting.GetPackageBuildMode(PackageName, BuildPipeline);
+				var buildModeList = GetSupportBuildModes();
+				int defaultIndex = buildModeList.FindIndex(x => x.Equals(buildMode));
+				_buildModeField = new PopupField<Enum>(buildModeList, defaultIndex);
+				_buildModeField.label = "BuildMode";
+				_buildModeField.style.width = StyleWidth;
+				_buildModeField.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleBuilderSetting.SetPackageBuildMode(PackageName, BuildPipeline, (EBuildMode)_buildModeField.value);
+				});
+				buildModeContainer.Add(_buildModeField);
+			}
+
+			// ���ܷ���
+			{
+				var encryptionContainer = Root.Q("EncryptionContainer");
+				var encryptionClassTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
+				if (encryptionClassTypes.Count > 0)
+				{
+					var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, BuildPipeline);
+					int defaultIndex = encryptionClassTypes.FindIndex(x => x.FullName.Equals(encyptionClassName));
+					_encryptionField = new PopupField<Type>(encryptionClassTypes, defaultIndex);
+					_encryptionField.label = "Encryption";
+					_encryptionField.style.width = StyleWidth;
+					_encryptionField.RegisterValueChangedCallback(evt =>
+					{
+						AssetBundleBuilderSetting.SetPackageEncyptionClassName(PackageName, BuildPipeline, _encryptionField.value.FullName);
+					});
+					encryptionContainer.Add(_encryptionField);
+				}
+				else
+				{
+					_encryptionField = new PopupField<Type>();
+					_encryptionField.label = "Encryption";
+					_encryptionField.style.width = StyleWidth;
+					encryptionContainer.Add(_encryptionField);
+				}
+			}
+
+			// ѹ����ʽѡ��
+			var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, BuildPipeline);
+			_compressionField = Root.Q<EnumField>("Compression");
+			_compressionField.Init(compressOption);
+			_compressionField.SetValueWithoutNotify(compressOption);
+			_compressionField.style.width = StyleWidth;
+			_compressionField.RegisterValueChangedCallback(evt =>
+			{
+				AssetBundleBuilderSetting.SetPackageCompressOption(PackageName, BuildPipeline, (ECompressOption)_compressionField.value);
+			});
+
+			// ����ļ�������ʽ
+			var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, BuildPipeline);
+			_outputNameStyleField = Root.Q<EnumField>("FileNameStyle");
+			_outputNameStyleField.Init(fileNameStyle);
+			_outputNameStyleField.SetValueWithoutNotify(fileNameStyle);
+			_outputNameStyleField.style.width = StyleWidth;
+			_outputNameStyleField.RegisterValueChangedCallback(evt =>
+			{
+				AssetBundleBuilderSetting.SetPackageFileNameStyle(PackageName, BuildPipeline, (EFileNameStyle)_outputNameStyleField.value);
+			});
+
+			// �װ��ļ�����ѡ��
+			var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, BuildPipeline);
+			_copyBuildinFileOptionField = Root.Q<EnumField>("CopyBuildinFileOption");
+			_copyBuildinFileOptionField.Init(buildinFileCopyOption);
+			_copyBuildinFileOptionField.SetValueWithoutNotify(buildinFileCopyOption);
+			_copyBuildinFileOptionField.style.width = StyleWidth;
+			_copyBuildinFileOptionField.RegisterValueChangedCallback(evt =>
+			{
+				AssetBundleBuilderSetting.SetPackageBuildinFileCopyOption(PackageName, BuildPipeline, (EBuildinFileCopyOption)_copyBuildinFileOptionField.value);
+				RefreshView();
+			});
+
+			// �װ��ļ���������
+			var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, BuildPipeline);
+			_copyBuildinFileTagsField = Root.Q<TextField>("CopyBuildinFileTags");
+			_copyBuildinFileTagsField.SetValueWithoutNotify(buildinFileCopyParams);
+			_copyBuildinFileTagsField.RegisterValueChangedCallback(evt =>
+			{
+				AssetBundleBuilderSetting.SetPackageBuildinFileCopyParams(PackageName, BuildPipeline, _copyBuildinFileTagsField.value);
+			});
+
+			// ������ť
+			var buildButton = Root.Q<Button>("Build");
+			buildButton.clicked += BuildButton_clicked;
+		}
+		private void RefreshView()
+		{
+			var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, BuildPipeline);
+			bool tagsFiledVisible = buildinFileCopyOption == EBuildinFileCopyOption.ClearAndCopyByTags || buildinFileCopyOption == EBuildinFileCopyOption.OnlyCopyByTags;
+			_copyBuildinFileTagsField.visible = tagsFiledVisible;
+		}
+		private void BuildButton_clicked()
+		{
+			var buildMode = AssetBundleBuilderSetting.GetPackageBuildMode(PackageName, BuildPipeline);
+			if (EditorUtility.DisplayDialog("��ʾ", $"ͨ������ģʽ��{buildMode}����������", "Yes", "No"))
+			{
+				EditorTools.ClearUnityConsole();
+				EditorApplication.delayCall += ExecuteBuild;
+			}
+			else
+			{
+				Debug.LogWarning("[Build] ����Ѿ�ȡ��");
+			}
+		}
+
+		/// <summary>
+		/// ִ�й�������
+		/// </summary>
+		protected abstract void ExecuteBuild();
+
+		/// <summary>
+		/// ��ȡ��������֧�ֵĹ���ģʽ����
+		/// </summary>
+		protected abstract List<Enum> GetSupportBuildModes();
+
+		/// <summary>
+		/// ��ȡ�����汾
+		/// </summary>
+		protected string GetPackageVersion()
+		{
+			return _buildVersionField.value;
+		}
+
+		/// <summary>
+		/// ����������ʵ��
+		/// </summary>
+		protected IEncryptionServices CreateEncryptionInstance()
+		{
+			var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, BuildPipeline);
+			var encryptionClassTypes = EditorTools.GetAssignableTypes(typeof(IEncryptionServices));
+			var classType = encryptionClassTypes.Find(x => x.FullName.Equals(encyptionClassName));
+			if (classType != null)
+				return (IEncryptionServices)Activator.CreateInstance(classType);
+			else
+				return null;
+		}
+
+		private string GetDefaultPackageVersion()
+		{
+			int totalMinutes = DateTime.Now.Hour * 60 + DateTime.Now.Minute;
+			return DateTime.Now.ToString("yyyy-MM-dd") + "-" + totalMinutes;
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs.meta
new file mode 100644
index 0000000..1d3d5f1
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d0e8bb3e0555c3241bbbd8ad0298dc47
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.uxml b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.uxml
new file mode 100644
index 0000000..a82605e
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.uxml
@@ -0,0 +1,14 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <ui:VisualElement name="BuildContainer">
+        <ui:TextField picking-mode="Ignore" label="Build Output" name="BuildOutput" />
+        <ui:TextField picking-mode="Ignore" label="Build Version" name="BuildVersion" />
+        <ui:VisualElement name="BuildModeContainer" style="height: 24px;" />
+        <ui:VisualElement name="EncryptionContainer" style="height: 24px;" />
+        <uie:EnumField label="Compression" value="Center" name="Compression" />
+        <uie:EnumField label="File Name Style" value="Center" name="FileNameStyle" />
+        <uie:EnumField label="Copy Buildin File Option" value="Center" name="CopyBuildinFileOption" />
+        <ui:TextField picking-mode="Ignore" label="Copy Buildin File Tags" name="CopyBuildinFileTags" />
+        <ui:VisualElement name="ExtensionContainer" />
+        <ui:Button text="构建" display-tooltip-when-elided="true" name="Build" style="height: 50px; background-color: rgb(40, 106, 42); margin-top: 10px;" />
+    </ui:VisualElement>
+</ui:UXML>
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.uxml.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.uxml.meta
new file mode 100644
index 0000000..8d2d68f
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 1c2478fe2eee9684e84a14a7860b178d
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipelineViewer.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipelineViewer.cs
new file mode 100644
index 0000000..96e16dc
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipelineViewer.cs
@@ -0,0 +1,63 @@
+#if UNITY_2019_4_OR_NEWER
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+	internal class BuiltinBuildPipelineViewer : BuildPipelineViewerBase
+	{
+		public BuiltinBuildPipelineViewer(string packageName, BuildTarget buildTarget, VisualElement parent)
+			: base(packageName, EBuildPipeline.BuiltinBuildPipeline, buildTarget, parent)
+		{
+		}
+
+		/// <summary>
+		/// ִ�й���
+		/// </summary>
+		protected override void ExecuteBuild()
+		{
+			var buildMode = AssetBundleBuilderSetting.GetPackageBuildMode(PackageName, BuildPipeline);
+			var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, BuildPipeline);
+			var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, BuildPipeline);
+			var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, BuildPipeline);
+			var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, BuildPipeline);
+
+			BuiltinBuildParameters buildParameters = new BuiltinBuildParameters();
+			buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+			buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+			buildParameters.BuildPipeline = BuildPipeline.ToString();
+			buildParameters.BuildTarget = BuildTarget;
+			buildParameters.BuildMode = buildMode;
+			buildParameters.PackageName = PackageName;
+			buildParameters.PackageVersion = GetPackageVersion();
+			buildParameters.VerifyBuildingResult = true;
+			buildParameters.FileNameStyle = fileNameStyle;
+			buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
+			buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
+			buildParameters.EncryptionServices = CreateEncryptionInstance();
+			buildParameters.CompressOption = compressOption;
+
+			BuiltinBuildPipeline pipeline = new BuiltinBuildPipeline();
+			var buildResult = pipeline.Run(buildParameters, true);
+			if (buildResult.Success)
+				EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
+		}
+
+		protected override List<Enum> GetSupportBuildModes()
+		{
+			List<Enum> buildModeList = new List<Enum>();
+			buildModeList.Add(EBuildMode.ForceRebuild);
+			buildModeList.Add(EBuildMode.IncrementalBuild);
+			buildModeList.Add(EBuildMode.DryRunBuild);
+			buildModeList.Add(EBuildMode.SimulateBuild);
+			return buildModeList;
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipelineViewer.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipelineViewer.cs.meta
new file mode 100644
index 0000000..6f83a04
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuiltinBuildPipelineViewer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 70e1625d735b4dc4998cd038eb7dc4c6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipelineViewer.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipelineViewer.cs
new file mode 100644
index 0000000..54ff48a
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipelineViewer.cs
@@ -0,0 +1,61 @@
+#if UNITY_2019_4_OR_NEWER
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+	internal class RawfileBuildpipelineViewer : BuildPipelineViewerBase
+	{
+		public RawfileBuildpipelineViewer(string packageName, BuildTarget buildTarget, VisualElement parent)
+			: base(packageName, EBuildPipeline.RawFileBuildPipeline, buildTarget, parent)
+		{
+			var compressionField = Root.Q<EnumField>("Compression");
+			UIElementsTools.SetElementVisible(compressionField, false);
+		}
+
+		/// <summary>
+		/// ִ�й���
+		/// </summary>
+		protected override void ExecuteBuild()
+		{
+			var buildMode = AssetBundleBuilderSetting.GetPackageBuildMode(PackageName, BuildPipeline);
+			var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, BuildPipeline);
+			var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, BuildPipeline);
+			var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, BuildPipeline);
+
+			RawFileBuildParameters buildParameters = new RawFileBuildParameters();
+			buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+			buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+			buildParameters.BuildPipeline = BuildPipeline.ToString();
+			buildParameters.BuildTarget = BuildTarget;
+			buildParameters.BuildMode = buildMode;
+			buildParameters.PackageName = PackageName;
+			buildParameters.PackageVersion = GetPackageVersion();
+			buildParameters.VerifyBuildingResult = true;
+			buildParameters.FileNameStyle = fileNameStyle;
+			buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
+			buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
+			buildParameters.EncryptionServices = CreateEncryptionInstance();
+
+			RawFileBuildPipeline pipeline = new RawFileBuildPipeline();
+			var buildResult = pipeline.Run(buildParameters, true);
+			if (buildResult.Success)
+				EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
+		}
+
+		protected override List<Enum> GetSupportBuildModes()
+		{
+			List<Enum> buildModeList = new List<Enum>();
+			buildModeList.Add(EBuildMode.ForceRebuild);
+			buildModeList.Add(EBuildMode.SimulateBuild);
+			return buildModeList;
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipelineViewer.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipelineViewer.cs.meta
new file mode 100644
index 0000000..5455dfe
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/RawfileBuildpipelineViewer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 50d661794c5cd0b4fbc90877c9c224b4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipelineViewer.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipelineViewer.cs
new file mode 100644
index 0000000..defcd56
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipelineViewer.cs
@@ -0,0 +1,61 @@
+#if UNITY_2019_4_OR_NEWER
+using System;
+using System.IO;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+	internal class ScriptableBuildPipelineViewer : BuildPipelineViewerBase
+	{
+		public ScriptableBuildPipelineViewer(string packageName, BuildTarget buildTarget, VisualElement parent)
+			: base(packageName, EBuildPipeline.ScriptableBuildPipeline, buildTarget, parent)
+		{
+		}
+
+		/// <summary>
+		/// 执行构建
+		/// </summary>
+		protected override void ExecuteBuild()
+		{
+			var buildMode = AssetBundleBuilderSetting.GetPackageBuildMode(PackageName, BuildPipeline);
+			var fileNameStyle = AssetBundleBuilderSetting.GetPackageFileNameStyle(PackageName, BuildPipeline);
+			var buildinFileCopyOption = AssetBundleBuilderSetting.GetPackageBuildinFileCopyOption(PackageName, BuildPipeline);
+			var buildinFileCopyParams = AssetBundleBuilderSetting.GetPackageBuildinFileCopyParams(PackageName, BuildPipeline);
+			var compressOption = AssetBundleBuilderSetting.GetPackageCompressOption(PackageName, BuildPipeline);
+
+			ScriptableBuildParameters buildParameters = new ScriptableBuildParameters();
+			buildParameters.BuildOutputRoot = AssetBundleBuilderHelper.GetDefaultBuildOutputRoot();
+			buildParameters.BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+			buildParameters.BuildPipeline = BuildPipeline.ToString();
+			buildParameters.BuildTarget = BuildTarget;
+			buildParameters.BuildMode = buildMode;
+			buildParameters.PackageName = PackageName;
+			buildParameters.PackageVersion = GetPackageVersion();
+			buildParameters.VerifyBuildingResult = true;
+			buildParameters.FileNameStyle = fileNameStyle;
+			buildParameters.BuildinFileCopyOption = buildinFileCopyOption;
+			buildParameters.BuildinFileCopyParams = buildinFileCopyParams;
+			buildParameters.EncryptionServices = CreateEncryptionInstance();
+			buildParameters.CompressOption = compressOption;
+
+			ScriptableBuildPipeline pipeline = new ScriptableBuildPipeline();
+			var buildResult = pipeline.Run(buildParameters, true);
+			if (buildResult.Success)
+				EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory);
+		}
+
+		protected override List<Enum> GetSupportBuildModes()
+		{
+			List<Enum> buildModeList = new List<Enum>();
+			buildModeList.Add(EBuildMode.IncrementalBuild);
+			buildModeList.Add(EBuildMode.SimulateBuild);
+			return buildModeList;
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipelineViewer.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipelineViewer.cs.meta
new file mode 100644
index 0000000..db5e499
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/ScriptableBuildPipelineViewer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 17cf22b4a5419df4bbeb34057e10a0b4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs
index 813d7f1..718217b 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs
@@ -148,17 +148,6 @@ namespace YooAsset.Editor
 
 			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(1000);
 
-			// 检测是否为原生资源打包规则
-			IPackRule packRuleInstance = AssetBundleCollectorSettingData.GetPackRuleInstance(PackRuleName);
-			bool isRawFilePackRule = packRuleInstance.IsRawFilePackRule();
-
-			// 检测原生资源包的收集器类型
-			if (isRawFilePackRule && CollectorType != ECollectorType.MainAssetCollector)
-				throw new Exception($"The raw file pack rule must be set to {nameof(ECollectorType)}.{ECollectorType.MainAssetCollector} : {CollectPath}");
-
-			if (string.IsNullOrEmpty(CollectPath))
-				throw new Exception($"The collect path is null or empty in group : {group.GroupName}");
-
 			// 收集打包资源
 			if (AssetDatabase.IsValidFolder(CollectPath))
 			{
@@ -166,11 +155,11 @@ namespace YooAsset.Editor
 				string[] findAssets = EditorTools.FindAssets(EAssetSearchType.All, collectDirectory);
 				foreach (string assetPath in findAssets)
 				{
-					if (IsValidateAsset(assetPath, isRawFilePackRule) && IsCollectAsset(assetPath))
+					if (IsValidateAsset(command, assetPath) && IsCollectAsset(assetPath))
 					{
 						if (result.ContainsKey(assetPath) == false)
 						{
-							var collectAssetInfo = CreateCollectAssetInfo(command, group, assetPath, isRawFilePackRule);
+							var collectAssetInfo = CreateCollectAssetInfo(command, group, assetPath);
 							result.Add(assetPath, collectAssetInfo);
 						}
 						else
@@ -183,9 +172,9 @@ namespace YooAsset.Editor
 			else
 			{
 				string assetPath = CollectPath;
-				if (IsValidateAsset(assetPath, isRawFilePackRule) && IsCollectAsset(assetPath))
+				if (IsValidateAsset(command, assetPath) && IsCollectAsset(assetPath))
 				{
-					var collectAssetInfo = CreateCollectAssetInfo(command, group, assetPath, isRawFilePackRule);
+					var collectAssetInfo = CreateCollectAssetInfo(command, group, assetPath);
 					result.Add(assetPath, collectAssetInfo);
 				}
 				else
@@ -220,22 +209,22 @@ namespace YooAsset.Editor
 			return result.Values.ToList();
 		}
 
-		private CollectAssetInfo CreateCollectAssetInfo(CollectCommand command, AssetBundleCollectorGroup group, string assetPath, bool isRawFilePackRule)
+		private CollectAssetInfo CreateCollectAssetInfo(CollectCommand command, AssetBundleCollectorGroup group, string assetPath)
 		{
 			string address = GetAddress(command, group, assetPath);
 			string bundleName = GetBundleName(command, group, assetPath);
 			List<string> assetTags = GetAssetTags(group);
-			CollectAssetInfo collectAssetInfo = new CollectAssetInfo(CollectorType, bundleName, address, assetPath, isRawFilePackRule, assetTags);
+			CollectAssetInfo collectAssetInfo = new CollectAssetInfo(CollectorType, bundleName, address, assetPath, assetTags);
 
 			// 注意：模拟构建模式下不需要收集依赖资源
 			if (command.BuildMode == EBuildMode.SimulateBuild)
 				collectAssetInfo.DependAssets = new List<string>();
 			else
-				collectAssetInfo.DependAssets = GetAllDependencies(assetPath);
+				collectAssetInfo.DependAssets = GetAllDependencies(command, assetPath);
 
 			return collectAssetInfo;
 		}
-		private bool IsValidateAsset(string assetPath, bool isRawFilePackRule)
+		private bool IsValidateAsset(CollectCommand command, string assetPath)
 		{
 			if (assetPath.StartsWith("Assets/") == false && assetPath.StartsWith("Packages/") == false)
 			{
@@ -252,33 +241,9 @@ namespace YooAsset.Editor
 			if (assetType == typeof(LightingDataAsset))
 				return false;
 
-			// 检测原生文件是否合规
-			if (isRawFilePackRule)
+			// 忽略Unity引擎无法识别的文件
+			if (command.IgnoreDefaultType)
 			{
-				string extension = EditorTools.RemoveFirstChar(System.IO.Path.GetExtension(assetPath));
-				if (extension == EAssetFileExtension.unity.ToString() || extension == EAssetFileExtension.prefab.ToString() ||
-					extension == EAssetFileExtension.fbx.ToString() || extension == EAssetFileExtension.mat.ToString() ||
-					extension == EAssetFileExtension.controller.ToString() || extension == EAssetFileExtension.anim.ToString() ||
-					extension == EAssetFileExtension.ttf.ToString() || extension == EAssetFileExtension.shader.ToString())
-				{
-					UnityEngine.Debug.LogWarning($"Raw file pack rule can not support file estension : {extension}");
-					return false;
-				}
-
-				// 注意：原生文件只支持无依赖关系的资源
-				/*
-				string[] depends = AssetDatabase.GetDependencies(assetPath, true);
-				if (depends.Length != 1)
-				{
-					UnityEngine.Debug.LogWarning($"Raw file pack rule can not support estension : {extension}");
-					return false;
-				}
-				*/
-			}
-			else
-			{
-				// 忽略Unity无法识别的无效文件
-				// 注意：只对非原生文件收集器处理
 				if (assetType == typeof(UnityEditor.DefaultAsset))
 				{
 					UnityEngine.Debug.LogWarning($"Cannot pack default asset : {assetPath}");
@@ -317,14 +282,14 @@ namespace YooAsset.Editor
 			{
 				// 获取着色器打包规则结果
 				PackRuleResult packRuleResult = DefaultPackRule.CreateShadersPackRuleResult();
-				return packRuleResult.GetMainBundleName(command.PackageName, command.UniqueBundleName);
+				return packRuleResult.GetBundleName(command.PackageName, command.UniqueBundleName);
 			}
 			else
 			{
 				// 获取其它资源打包规则结果
 				IPackRule packRuleInstance = AssetBundleCollectorSettingData.GetPackRuleInstance(PackRuleName);
 				PackRuleResult packRuleResult = packRuleInstance.GetPackRuleResult(new PackRuleData(assetPath, CollectPath, group.GroupName, UserData));
-				return packRuleResult.GetMainBundleName(command.PackageName, command.UniqueBundleName);
+				return packRuleResult.GetBundleName(command.PackageName, command.UniqueBundleName);
 			}
 		}
 		private List<string> GetAssetTags(AssetBundleCollectorGroup group)
@@ -334,7 +299,7 @@ namespace YooAsset.Editor
 			tags.AddRange(temper);
 			return tags;
 		}
-		private List<string> GetAllDependencies(string mainAssetPath)
+		private List<string> GetAllDependencies(CollectCommand command, string mainAssetPath)
 		{
 			string[] depends = AssetDatabase.GetDependencies(mainAssetPath, true);
 			List<string> result = new List<string>(depends.Length);
@@ -344,10 +309,8 @@ namespace YooAsset.Editor
 				if (assetPath == mainAssetPath)
 					continue;
 
-				if (IsValidateAsset(assetPath, false))
-				{
+				if (IsValidateAsset(command, assetPath))
 					result.Add(assetPath);
-				}
 			}
 			return result;
 		}
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorConfig.cs b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorConfig.cs
index 17f8117..b993caa 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorConfig.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorConfig.cs
@@ -10,20 +10,22 @@ namespace YooAsset.Editor
 {
 	public class AssetBundleCollectorConfig
 	{
-		public const string ConfigVersion = "2.4";
+		public const string ConfigVersion = "v2.0.0";
 
 		public const string XmlVersion = "Version";
 		public const string XmlCommon = "Common";
-		public const string XmlEnableAddressable = "AutoAddressable";
-		public const string XmlLocationToLower = "LocationToLower";
-		public const string XmlIncludeAssetGUID = "IncludeAssetGUID";
-		public const string XmlUniqueBundleName = "UniqueBundleName";
+
 		public const string XmlShowPackageView = "ShowPackageView";
 		public const string XmlShowEditorAlias = "ShowEditorAlias";
+		public const string XmlUniqueBundleName = "UniqueBundleName";
 
 		public const string XmlPackage = "Package";
 		public const string XmlPackageName = "PackageName";
 		public const string XmlPackageDesc = "PackageDesc";
+		public const string XmlEnableAddressable = "AutoAddressable";
+		public const string XmlLocationToLower = "LocationToLower";
+		public const string XmlIncludeAssetGUID = "IncludeAssetGUID";
+		public const string XmlIgnoreDefaultType = "IgnoreDefaultType";
 
 		public const string XmlGroup = "Group";
 		public const string XmlGroupActiveRule = "GroupActiveRule";
@@ -67,9 +69,6 @@ namespace YooAsset.Editor
 			}
 
 			// 读取公共配置
-			bool enableAddressable = false;
-			bool locationToLower = false;
-			bool includeAssetGUID = false;
 			bool uniqueBundleName = false;
 			bool showPackageView = false;
 			bool showEditorAlias = false;
@@ -77,18 +76,12 @@ namespace YooAsset.Editor
 			if (commonNodeList.Count > 0)
 			{
 				XmlElement commonElement = commonNodeList[0] as XmlElement;
-				if (commonElement.HasAttribute(XmlEnableAddressable))
-					enableAddressable = commonElement.GetAttribute(XmlEnableAddressable) == "True" ? true : false;
-				if (commonElement.HasAttribute(XmlLocationToLower))
-					locationToLower = commonElement.GetAttribute(XmlLocationToLower) == "True" ? true : false;
-				if (commonElement.HasAttribute(XmlIncludeAssetGUID))
-					includeAssetGUID = commonElement.GetAttribute(XmlIncludeAssetGUID) == "True" ? true : false;
-				if (commonElement.HasAttribute(XmlUniqueBundleName))
-					uniqueBundleName = commonElement.GetAttribute(XmlUniqueBundleName) == "True" ? true : false;
 				if (commonElement.HasAttribute(XmlShowPackageView))
 					showPackageView = commonElement.GetAttribute(XmlShowPackageView) == "True" ? true : false;
 				if (commonElement.HasAttribute(XmlShowEditorAlias))
 					showEditorAlias = commonElement.GetAttribute(XmlShowEditorAlias) == "True" ? true : false;
+				if (commonElement.HasAttribute(XmlUniqueBundleName))
+					uniqueBundleName = commonElement.GetAttribute(XmlUniqueBundleName) == "True" ? true : false;
 			}
 
 			// 读取包裹配置
@@ -105,6 +98,10 @@ namespace YooAsset.Editor
 				AssetBundleCollectorPackage package = new AssetBundleCollectorPackage();
 				package.PackageName = packageElement.GetAttribute(XmlPackageName);
 				package.PackageDesc = packageElement.GetAttribute(XmlPackageDesc);
+				package.EnableAddressable = packageElement.GetAttribute(XmlEnableAddressable) == "True" ? true : false;
+				package.LocationToLower = packageElement.GetAttribute(XmlLocationToLower) == "True" ? true : false;
+				package.IncludeAssetGUID = packageElement.GetAttribute(XmlIncludeAssetGUID) == "True" ? true : false;
+				package.IgnoreDefaultType = packageElement.GetAttribute(XmlIgnoreDefaultType) == "True" ? true : false;
 				packages.Add(package);
 
 				// 读取分组配置
@@ -172,12 +169,9 @@ namespace YooAsset.Editor
 
 			// 保存配置数据
 			AssetBundleCollectorSettingData.ClearAll();
-			AssetBundleCollectorSettingData.Setting.EnableAddressable = enableAddressable;
-			AssetBundleCollectorSettingData.Setting.LocationToLower = locationToLower;
-			AssetBundleCollectorSettingData.Setting.IncludeAssetGUID = includeAssetGUID;
-			AssetBundleCollectorSettingData.Setting.UniqueBundleName = uniqueBundleName;
 			AssetBundleCollectorSettingData.Setting.ShowPackageView = showPackageView;
 			AssetBundleCollectorSettingData.Setting.ShowEditorAlias = showEditorAlias;
+			AssetBundleCollectorSettingData.Setting.UniqueBundleName = uniqueBundleName;
 			AssetBundleCollectorSettingData.Setting.Packages.AddRange(packages);
 			AssetBundleCollectorSettingData.SaveFile();
 			Debug.Log($"导入配置完毕！");
@@ -205,12 +199,9 @@ namespace YooAsset.Editor
 
 			// 设置公共配置
 			var commonElement = xmlDoc.CreateElement(XmlCommon);
-			commonElement.SetAttribute(XmlEnableAddressable, AssetBundleCollectorSettingData.Setting.EnableAddressable.ToString());
-			commonElement.SetAttribute(XmlLocationToLower, AssetBundleCollectorSettingData.Setting.LocationToLower.ToString());
-			commonElement.SetAttribute(XmlIncludeAssetGUID, AssetBundleCollectorSettingData.Setting.IncludeAssetGUID.ToString());
-			commonElement.SetAttribute(XmlUniqueBundleName, AssetBundleCollectorSettingData.Setting.UniqueBundleName.ToString());
 			commonElement.SetAttribute(XmlShowPackageView, AssetBundleCollectorSettingData.Setting.ShowPackageView.ToString());
 			commonElement.SetAttribute(XmlShowEditorAlias, AssetBundleCollectorSettingData.Setting.ShowEditorAlias.ToString());
+			commonElement.SetAttribute(XmlUniqueBundleName, AssetBundleCollectorSettingData.Setting.UniqueBundleName.ToString());
 			root.AppendChild(commonElement);
 
 			// 设置Package配置
@@ -219,6 +210,10 @@ namespace YooAsset.Editor
 				var packageElement = xmlDoc.CreateElement(XmlPackage);
 				packageElement.SetAttribute(XmlPackageName, package.PackageName);
 				packageElement.SetAttribute(XmlPackageDesc, package.PackageDesc);
+				packageElement.SetAttribute(XmlEnableAddressable, package.EnableAddressable.ToString());
+				packageElement.SetAttribute(XmlLocationToLower, package.LocationToLower.ToString());
+				packageElement.SetAttribute(XmlIncludeAssetGUID, package.IncludeAssetGUID.ToString());
+				packageElement.SetAttribute(XmlIgnoreDefaultType, package.IgnoreDefaultType.ToString());
 				root.AppendChild(packageElement);
 
 				// 设置分组配置
@@ -263,125 +258,6 @@ namespace YooAsset.Editor
 			if (configVersion == ConfigVersion)
 				return true;
 
-			// 1.0 -> 2.0
-			if (configVersion == "1.0")
-			{
-				// 添加公共元素属性
-				var commonNodeList = root.GetElementsByTagName(XmlCommon);
-				if (commonNodeList.Count > 0)
-				{
-					XmlElement commonElement = commonNodeList[0] as XmlElement;
-					if (commonElement.HasAttribute(XmlShowPackageView) == false)
-						commonElement.SetAttribute(XmlShowPackageView, "False");
-				}
-
-				// 添加包裹元素
-				var packageElement = xmlDoc.CreateElement(XmlPackage);
-				packageElement.SetAttribute(XmlPackageName, "DefaultPackage");
-				packageElement.SetAttribute(XmlPackageDesc, string.Empty);
-				root.AppendChild(packageElement);
-
-				// 获取所有分组元素
-				var groupNodeList = root.GetElementsByTagName(XmlGroup);
-				List<XmlElement> temper = new List<XmlElement>(groupNodeList.Count);
-				foreach (var groupNode in groupNodeList)
-				{
-					XmlElement groupElement = groupNode as XmlElement;
-					var collectorNodeList = groupElement.GetElementsByTagName(XmlCollector);
-					foreach (var collectorNode in collectorNodeList)
-					{
-						XmlElement collectorElement = collectorNode as XmlElement;
-						if (collectorElement.HasAttribute(XmlCollectorGUID) == false)
-							collectorElement.SetAttribute(XmlCollectorGUID, string.Empty);
-					}
-					temper.Add(groupElement);
-				}
-
-				// 将分组元素转移至包裹元素下
-				foreach (var groupElement in temper)
-				{
-					root.RemoveChild(groupElement);
-					packageElement.AppendChild(groupElement);
-				}
-
-				// 更新版本
-				root.SetAttribute(XmlVersion, "2.0");
-				return UpdateXmlConfig(xmlDoc);
-			}
-
-			// 2.0 -> 2.1
-			if (configVersion == "2.0")
-			{
-				// 添加公共元素属性
-				var commonNodeList = root.GetElementsByTagName(XmlCommon);
-				if (commonNodeList.Count > 0)
-				{
-					XmlElement commonElement = commonNodeList[0] as XmlElement;
-					if (commonElement.HasAttribute(XmlUniqueBundleName) == false)
-						commonElement.SetAttribute(XmlUniqueBundleName, "False");
-				}
-
-				// 更新版本
-				root.SetAttribute(XmlVersion, "2.1");
-				return UpdateXmlConfig(xmlDoc);
-			}
-
-			// 2.1 -> 2.2
-			if (configVersion == "2.1")
-			{
-				// 添加公共元素属性
-				var commonNodeList = root.GetElementsByTagName(XmlCommon);
-				if (commonNodeList.Count > 0)
-				{
-					XmlElement commonElement = commonNodeList[0] as XmlElement;
-					if (commonElement.HasAttribute(XmlShowEditorAlias) == false)
-						commonElement.SetAttribute(XmlShowEditorAlias, "False");
-				}
-
-				// 更新版本
-				root.SetAttribute(XmlVersion, "2.2");
-				return UpdateXmlConfig(xmlDoc);
-			}
-
-			// 2.2 -> 2.3
-			if (configVersion == "2.2")
-			{
-				// 获取所有分组元素
-				var groupNodeList = root.GetElementsByTagName(XmlGroup);
-				foreach (var groupNode in groupNodeList)
-				{
-					XmlElement groupElement = groupNode as XmlElement;
-					var collectorNodeList = groupElement.GetElementsByTagName(XmlCollector);
-					foreach (var collectorNode in collectorNodeList)
-					{
-						XmlElement collectorElement = collectorNode as XmlElement;
-						if (collectorElement.HasAttribute(XmlUserData) == false)
-							collectorElement.SetAttribute(XmlUserData, string.Empty);
-					}
-				}
-
-				// 更新版本
-				root.SetAttribute(XmlVersion, "2.3");
-				return UpdateXmlConfig(xmlDoc);
-			}
-
-			// 2.3 -> 2.4
-			if (configVersion == "2.3")
-			{
-				// 获取所有分组元素
-				var groupNodeList = root.GetElementsByTagName(XmlGroup);
-				foreach (var groupNode in groupNodeList)
-				{
-					XmlElement groupElement = groupNode as XmlElement;
-					if (groupElement.HasAttribute(XmlGroupActiveRule) == false)
-						groupElement.SetAttribute(XmlGroupActiveRule, $"{nameof(EnableGroup)}");
-				}
-
-				// 更新版本
-				root.SetAttribute(XmlVersion, "2.4");
-				return UpdateXmlConfig(xmlDoc);
-			}
-
 			return false;
 		}
 	}
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs
index 694dbc5..684a6e9 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs
@@ -20,6 +20,26 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string PackageDesc = string.Empty;
 
+		/// <summary>
+		/// 启用可寻址资源定位
+		/// </summary>
+		public bool EnableAddressable = false;
+
+		/// <summary>
+		/// 资源定位地址大小写不敏感
+		/// </summary>
+		public bool LocationToLower = false;
+
+		/// <summary>
+		/// 包含资源GUID数据
+		/// </summary>
+		public bool IncludeAssetGUID = false;
+
+		/// <summary>
+		/// 忽略Unity引擎无法识别的文件
+		/// </summary>
+		public bool IgnoreDefaultType = true;
+
 		/// <summary>
 		/// 分组列表
 		/// </summary>
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs
index 2871f94..7031e42 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs
@@ -15,30 +15,15 @@ namespace YooAsset.Editor
 		public bool ShowPackageView = false;
 
 		/// <summary>
-		/// 启用可寻址资源定位
+		/// 是否显示编辑器别名
 		/// </summary>
-		public bool EnableAddressable = false;
-
-		/// <summary>
-		/// 资源定位地址大小写不敏感
-		/// </summary>
-		public bool LocationToLower = false;
-
-		/// <summary>
-		/// 包含资源GUID数据
-		/// </summary>
-		public bool IncludeAssetGUID = false;
+		public bool ShowEditorAlias = false;
 
 		/// <summary>
 		/// 资源包名唯一化
 		/// </summary>
 		public bool UniqueBundleName = false;
 
-		/// <summary>
-		/// 是否显示编辑器别名
-		/// </summary>
-		public bool ShowEditorAlias = false;
-
 
 		/// <summary>
 		/// 包裹列表
@@ -52,9 +37,6 @@ namespace YooAsset.Editor
 		public void ClearAll()
 		{
 			ShowPackageView = false;
-			EnableAddressable = false;
-			LocationToLower = false;
-			IncludeAssetGUID = false;
 			UniqueBundleName = false;
 			ShowEditorAlias = false;
 			Packages.Clear();
@@ -113,9 +95,15 @@ namespace YooAsset.Editor
 			if (string.IsNullOrEmpty(packageName))
 				throw new Exception("Build package name is null or empty !");
 
+			// 检测配置合法性
 			var package = GetPackage(packageName);
+			package.CheckConfigError();
+
+			// 创建资源收集命令
 			CollectCommand command = new CollectCommand(buildMode, packageName,
-			EnableAddressable, LocationToLower, IncludeAssetGUID, UniqueBundleName);
+				 package.EnableAddressable, package.LocationToLower, package.IncludeAssetGUID, package.IgnoreDefaultType, UniqueBundleName);
+
+			// 获取收集的资源集合
 			CollectResult collectResult = new CollectResult(command);
 			collectResult.SetCollectAssets(package.GetAllCollectAssets(command));
 			return collectResult;
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs
index b29684c..5cf40b3 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSettingData.cs
@@ -321,36 +321,21 @@ namespace YooAsset.Editor
 		}
 
 		// 公共参数编辑相关
-		public static void ModifyPackageView(bool showPackageView)
+		public static void ModifyShowPackageView(bool showPackageView)
 		{
 			Setting.ShowPackageView = showPackageView;
 			IsDirty = true;
 		}
-		public static void ModifyAddressable(bool enableAddressable)
-		{
-			Setting.EnableAddressable = enableAddressable;
-			IsDirty = true;
-		}
-		public static void ModifyLocationToLower(bool locationToLower)
-		{
-			Setting.LocationToLower = locationToLower;
-			IsDirty = true;
-		}
-		public static void ModifyIncludeAssetGUID(bool includeAssetGUID)
-		{
-			Setting.IncludeAssetGUID = includeAssetGUID;
-			IsDirty = true;
-		}
-		public static void ModifyUniqueBundleName(bool uniqueBundleName)
-		{
-			Setting.UniqueBundleName = uniqueBundleName;
-			IsDirty = true;
-		}
 		public static void ModifyShowEditorAlias(bool showAlias)
 		{
 			Setting.ShowEditorAlias = showAlias;
 			IsDirty = true;
 		}
+		public static void ModifyUniqueBundleName(bool uniqueBundleName)
+		{
+			Setting.UniqueBundleName = uniqueBundleName;
+			IsDirty = true;
+		}
 
 		// 资源包裹编辑相关
 		public static AssetBundleCollectorPackage CreatePackage(string packageName)
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs
index 7648054..6179ae3 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs
@@ -25,16 +25,20 @@ namespace YooAsset.Editor
 		private List<RuleDisplayName> _packRuleList;
 		private List<RuleDisplayName> _filterRuleList;
 
-		private Button _settingsButton;
 		private VisualElement _helpBoxContainer;
+
 		private VisualElement _setting1Container;
-		private VisualElement _setting2Container;
+		private Button _globalSettingsButton;
 		private Toggle _showPackageToogle;
+		private Toggle _showEditorAliasToggle;
+		private Toggle _uniqueBundleNameToogle;
+
+		private VisualElement _setting3Container;
+		private Button _packageSettingsButton;
 		private Toggle _enableAddressableToogle;
 		private Toggle _locationToLowerToogle;
 		private Toggle _includeAssetGUIDToogle;
-		private Toggle _uniqueBundleNameToogle;
-		private Toggle _showEditorAliasToggle;
+		private Toggle _ignoreDefaultTypeToogle;
 
 		private VisualElement _packageContainer;
 		private ListView _packageListView;
@@ -53,7 +57,8 @@ namespace YooAsset.Editor
 
 		private int _lastModifyPackageIndex = 0;
 		private int _lastModifyGroupIndex = 0;
-		private bool _showSettings = false;
+		private bool _showGlobalSettings = false;
+		private bool _showPackageSettings = false;
 
 
 		public void CreateGUI()
@@ -87,32 +92,19 @@ namespace YooAsset.Editor
 				_helpBoxContainer = root.Q("HelpBoxContainer");
 
 				// 公共设置相关
-				_settingsButton = root.Q<Button>("SettingsButton");
-				_settingsButton.clicked += SettingsBtn_clicked;
 				_setting1Container = root.Q("PublicContainer1");
-				_setting2Container = root.Q("PublicContainer2");
+				_globalSettingsButton = root.Q<Button>("GlobalSettingsButton");
+				_globalSettingsButton.clicked += GlobalSettingsBtn_clicked;
 				_showPackageToogle = root.Q<Toggle>("ShowPackages");
 				_showPackageToogle.RegisterValueChangedCallback(evt =>
 				{
-					AssetBundleCollectorSettingData.ModifyPackageView(evt.newValue);
+					AssetBundleCollectorSettingData.ModifyShowPackageView(evt.newValue);
 					RefreshWindow();
 				});
-				_enableAddressableToogle = root.Q<Toggle>("EnableAddressable");
-				_enableAddressableToogle.RegisterValueChangedCallback(evt =>
+				_showEditorAliasToggle = root.Q<Toggle>("ShowEditorAlias");
+				_showEditorAliasToggle.RegisterValueChangedCallback(evt =>
 				{
-					AssetBundleCollectorSettingData.ModifyAddressable(evt.newValue);
-					RefreshWindow();
-				});
-				_locationToLowerToogle = root.Q<Toggle>("LocationToLower");
-				_locationToLowerToogle.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleCollectorSettingData.ModifyLocationToLower(evt.newValue);
-					RefreshWindow();
-				});
-				_includeAssetGUIDToogle = root.Q<Toggle>("IncludeAssetGUID");
-				_includeAssetGUIDToogle.RegisterValueChangedCallback(evt =>
-				{
-					AssetBundleCollectorSettingData.ModifyIncludeAssetGUID(evt.newValue);
+					AssetBundleCollectorSettingData.ModifyShowEditorAlias(evt.newValue);
 					RefreshWindow();
 				});
 				_uniqueBundleNameToogle = root.Q<Toggle>("UniqueBundleName");
@@ -121,11 +113,54 @@ namespace YooAsset.Editor
 					AssetBundleCollectorSettingData.ModifyUniqueBundleName(evt.newValue);
 					RefreshWindow();
 				});
-				_showEditorAliasToggle = root.Q<Toggle>("ShowEditorAlias");
-				_showEditorAliasToggle.RegisterValueChangedCallback(evt =>
+
+				// 包裹设置相关
+				_setting3Container = root.Q("PublicContainer3");
+				_packageSettingsButton = root.Q<Button>("PackageSettingsButton");
+				_packageSettingsButton.clicked += PackageSettingsBtn_clicked;
+				_enableAddressableToogle = root.Q<Toggle>("EnableAddressable");
+				_enableAddressableToogle.RegisterValueChangedCallback(evt =>
 				{
-					AssetBundleCollectorSettingData.ModifyShowEditorAlias(evt.newValue);
-					RefreshWindow();
+					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+					if (selectPackage != null)
+					{
+						selectPackage.EnableAddressable = evt.newValue;
+						AssetBundleCollectorSettingData.ModifyPackage(selectPackage);
+						RefreshWindow();
+					}
+				});
+				_locationToLowerToogle = root.Q<Toggle>("LocationToLower");
+				_locationToLowerToogle.RegisterValueChangedCallback(evt =>
+				{
+					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+					if (selectPackage != null)
+					{
+						selectPackage.LocationToLower = evt.newValue;
+						AssetBundleCollectorSettingData.ModifyPackage(selectPackage);
+						RefreshWindow();
+					}
+				});
+				_includeAssetGUIDToogle = root.Q<Toggle>("IncludeAssetGUID");
+				_includeAssetGUIDToogle.RegisterValueChangedCallback(evt =>
+				{
+					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+					if (selectPackage != null)
+					{
+						selectPackage.IncludeAssetGUID = evt.newValue;
+						AssetBundleCollectorSettingData.ModifyPackage(selectPackage);
+						RefreshWindow();
+					}
+				});
+				_ignoreDefaultTypeToogle = root.Q<Toggle>("IgnoreDefaultType");
+				_ignoreDefaultTypeToogle.RegisterValueChangedCallback(evt =>
+				{
+					var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+					if (selectPackage != null)
+					{
+						selectPackage.IgnoreDefaultType = evt.newValue;
+						AssetBundleCollectorSettingData.ModifyPackage(selectPackage);
+						RefreshWindow();
+					}
 				});
 
 				// 配置修复按钮
@@ -325,46 +360,11 @@ namespace YooAsset.Editor
 
 		private void RefreshWindow()
 		{
-			_showPackageToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowPackageView);
-			_enableAddressableToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.EnableAddressable);
-			_locationToLowerToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.LocationToLower);
-			_includeAssetGUIDToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.IncludeAssetGUID);
-			_uniqueBundleNameToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.UniqueBundleName);
-			_showEditorAliasToggle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowEditorAlias);
-
-			// 警示框
-			_helpBoxContainer.Clear();
-			if (_enableAddressableToogle.value && _locationToLowerToogle.value)
-			{
-				var helpBox = new HelpBox("无法同时开启[Enable Addressable]选项和[Location To Lower]选项", HelpBoxMessageType.Error);
-				_helpBoxContainer.Add(helpBox);
-			}
-			if (AssetBundleCollectorSettingData.Setting.Packages.Count > 1 && _uniqueBundleNameToogle.value == false)
-			{
-				var helpBox = new HelpBox("检测到当前配置存在多个Package，建议开启[Unique Bundle Name]选项", HelpBoxMessageType.Warning);
-				_helpBoxContainer.Add(helpBox);
-			}
-			if (_helpBoxContainer.childCount > 0)
-				_helpBoxContainer.style.display = DisplayStyle.Flex;
-			else
-				_helpBoxContainer.style.display = DisplayStyle.None;
-
-			// 设置栏
-			if (_showSettings)
-			{
-				_setting1Container.style.display = DisplayStyle.Flex;
-				_setting2Container.style.display = DisplayStyle.Flex;
-			}
-			else
-			{
-				_setting1Container.style.display = DisplayStyle.None;
-				_setting2Container.style.display = DisplayStyle.None;
-			}
-
 			_groupContainer.visible = false;
 			_collectorContainer.visible = false;
 
 			FillPackageViewData();
+			RefreshSettings();
 		}
 		private void FixBtn_clicked()
 		{
@@ -392,10 +392,15 @@ namespace YooAsset.Editor
 		{
 			AssetBundleCollectorSettingData.SaveFile();
 		}
-		private void SettingsBtn_clicked()
+		private void GlobalSettingsBtn_clicked()
 		{
-			_showSettings = !_showSettings;
-			RefreshWindow();
+			_showGlobalSettings = !_showGlobalSettings;
+			RefreshGlobalSetting();
+		}
+		private void PackageSettingsBtn_clicked()
+		{
+			_showPackageSettings = !_showPackageSettings;
+			RefreshPackageSetting();
 		}
 		private string FormatListItemCallback(RuleDisplayName ruleDisplayName)
 		{
@@ -412,6 +417,81 @@ namespace YooAsset.Editor
 				return ruleDisplayName.ClassName;
 		}
 
+		// 设置栏相关
+		private void RefreshSettings()
+		{
+			RefreshGlobalSetting();
+			RefreshPackageSetting();
+			RefreshHelpBoxTips();
+		}
+		private void RefreshGlobalSetting()
+		{
+			_showPackageToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowPackageView);
+			_showEditorAliasToggle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.ShowEditorAlias);
+			_uniqueBundleNameToogle.SetValueWithoutNotify(AssetBundleCollectorSettingData.Setting.UniqueBundleName);
+
+			if (_showGlobalSettings)
+			{
+				_setting1Container.style.display = DisplayStyle.Flex;
+			}
+			else
+			{
+				_setting1Container.style.display = DisplayStyle.None;
+			}
+
+			if (_showPackageToogle.value)
+				_packageContainer.style.display = DisplayStyle.Flex;
+			else
+				_packageContainer.style.display = DisplayStyle.None;
+		}
+		private void RefreshPackageSetting()
+		{
+			var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+			if (selectPackage != null)
+			{
+				_packageSettingsButton.SetEnabled(true);
+				_packageSettingsButton.text = $"Package Setting ({selectPackage.PackageName})";
+				_enableAddressableToogle.SetValueWithoutNotify(selectPackage.EnableAddressable);
+				_locationToLowerToogle.SetValueWithoutNotify(selectPackage.LocationToLower);
+				_includeAssetGUIDToogle.SetValueWithoutNotify(selectPackage.IncludeAssetGUID);
+				_ignoreDefaultTypeToogle.SetValueWithoutNotify(selectPackage.IgnoreDefaultType);
+			}
+			else
+			{
+				_packageSettingsButton.SetEnabled(false);
+				if(_packageListView.itemsSource.Count == 0)
+					_packageSettingsButton.text = $"Not Found Any Package !";
+				else
+					_packageSettingsButton.text = $"Package Setting";
+			}
+
+			if (_showPackageSettings)
+				_setting3Container.style.display = DisplayStyle.Flex;
+			else
+				_setting3Container.style.display = DisplayStyle.None;
+		}
+		private void RefreshHelpBoxTips()
+		{
+			_helpBoxContainer.Clear();
+
+			if (_enableAddressableToogle.value && _locationToLowerToogle.value)
+			{
+				var helpBox = new HelpBox("无法同时开启[Enable Addressable]选项和[Location To Lower]选项", HelpBoxMessageType.Error);
+				_helpBoxContainer.Add(helpBox);
+			}
+
+			if (AssetBundleCollectorSettingData.Setting.Packages.Count > 1 && _uniqueBundleNameToogle.value == false)
+			{
+				var helpBox = new HelpBox("检测到当前配置存在多个Package，建议开启[Unique Bundle Name]选项", HelpBoxMessageType.Warning);
+				_helpBoxContainer.Add(helpBox);
+			}
+
+			if (_helpBoxContainer.childCount > 0)
+				_helpBoxContainer.style.display = DisplayStyle.Flex;
+			else
+				_helpBoxContainer.style.display = DisplayStyle.None;
+		}
+
 		// 包裹列表相关
 		private void FillPackageViewData()
 		{
@@ -424,11 +504,6 @@ namespace YooAsset.Editor
 			{
 				_packageListView.selectedIndex = _lastModifyPackageIndex;
 			}
-
-			if (_showPackageToogle.value)
-				_packageContainer.style.display = DisplayStyle.Flex;
-			else
-				_packageContainer.style.display = DisplayStyle.None;
 		}
 		private VisualElement MakePackageListViewItem()
 		{
@@ -462,20 +537,25 @@ namespace YooAsset.Editor
 			{
 				_groupContainer.visible = false;
 				_collectorContainer.visible = false;
-				return;
+				_showPackageSettings = false;
 			}
+			else
+			{
+				_groupContainer.visible = true;
+				_lastModifyPackageIndex = _packageListView.selectedIndex;
+				_packageNameTxt.SetValueWithoutNotify(selectPackage.PackageName);
+				_packageDescTxt.SetValueWithoutNotify(selectPackage.PackageDesc);
 
-			_groupContainer.visible = true;
-			_lastModifyPackageIndex = _packageListView.selectedIndex;
-			_packageNameTxt.SetValueWithoutNotify(selectPackage.PackageName);
-			_packageDescTxt.SetValueWithoutNotify(selectPackage.PackageDesc);
-			FillGroupViewData();
+				RefreshSettings();
+				FillGroupViewData();
+			}
 		}
 		private void AddPackageBtn_clicked()
 		{
 			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset.AssetBundleCollectorWindow AddPackage");
 			AssetBundleCollectorSettingData.CreatePackage("DefaultPackage");
 			FillPackageViewData();
+			RefreshSettings();
 		}
 		private void RemovePackageBtn_clicked()
 		{
@@ -486,6 +566,7 @@ namespace YooAsset.Editor
 			Undo.RecordObject(AssetBundleCollectorSettingData.Setting, "YooAsset.AssetBundleCollectorWindow RemovePackage");
 			AssetBundleCollectorSettingData.RemovePackage(selectPackage);
 			FillPackageViewData();
+			RefreshSettings();
 		}
 
 		// 分组列表相关
@@ -729,6 +810,13 @@ namespace YooAsset.Editor
 			if (collectObject != null)
 				collectObject.name = collector.CollectPath;
 
+			// 注意：非主资源收集器的标签栏需要被冻结
+			var textTags = element.Q<TextField>("TextField1");
+			if (collector.CollectorType == ECollectorType.MainAssetCollector)
+				textTags.SetEnabled(true);
+			else
+				textTags.SetEnabled(false);
+
 			// Foldout
 			var foldout = element.Q<Foldout>("Foldout1");
 			foldout.RegisterValueChangedCallback(evt =>
@@ -772,6 +860,11 @@ namespace YooAsset.Editor
 				{
 					RefreshFoldout(foldout, selectGroup, collector);
 				}
+
+				if (collector.CollectorType == ECollectorType.MainAssetCollector)
+					textTags.SetEnabled(true);
+				else
+					textTags.SetEnabled(false);
 			});
 
 			// Address Rule
@@ -858,7 +951,8 @@ namespace YooAsset.Editor
 				try
 				{
 					CollectCommand command = new CollectCommand(EBuildMode.SimulateBuild, _packageNameTxt.value,
-						_enableAddressableToogle.value, _locationToLowerToogle.value, _includeAssetGUIDToogle.value, _uniqueBundleNameToogle.value);
+						_enableAddressableToogle.value, _locationToLowerToogle.value, _includeAssetGUIDToogle.value, _ignoreDefaultTypeToogle.value, _uniqueBundleNameToogle.value);
+					collector.CheckConfigError();
 					collectAssetInfos = collector.GetAllCollectAssets(command, group);
 				}
 				catch (System.Exception e)
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml
index c57b2de..07eb99c 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml
@@ -7,16 +7,22 @@
     </uie:Toolbar>
     <ui:VisualElement name="PublicContainer" style="background-color: rgb(79, 79, 79); flex-direction: column; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
         <ui:VisualElement name="HelpBoxContainer" style="flex-grow: 1;" />
-        <ui:Button text="Settings" display-tooltip-when-elided="true" name="SettingsButton" />
-        <ui:VisualElement name="PublicContainer1" style="flex-direction: row; flex-wrap: nowrap; height: 28px;">
-            <ui:Toggle label="Show Packages" name="ShowPackages" style="width: 196px; -unity-text-align: middle-left;" />
-            <ui:Toggle label="Show Editor Alias" name="ShowEditorAlias" style="width: 196px; -unity-text-align: middle-left;" />
-            <ui:Toggle label="Enable Addressable" name="EnableAddressable" style="width: 196px; -unity-text-align: middle-left;" />
-            <ui:Toggle label="Unique Bundle Name" name="UniqueBundleName" style="width: 196px; -unity-text-align: middle-left;" />
+        <ui:VisualElement name="GlobalSettingsContainer">
+            <ui:Button text="Global Settings" display-tooltip-when-elided="true" name="GlobalSettingsButton" />
+            <ui:VisualElement name="PublicContainer1" style="flex-direction: row; flex-wrap: nowrap; height: 28px;">
+                <ui:Toggle label="Show Packages" name="ShowPackages" style="width: 196px; -unity-text-align: middle-left;" />
+                <ui:Toggle label="Show Editor Alias" name="ShowEditorAlias" style="width: 196px; -unity-text-align: middle-left;" />
+                <ui:Toggle label="Unique Bundle Name" name="UniqueBundleName" style="width: 196px; -unity-text-align: middle-left;" />
+            </ui:VisualElement>
         </ui:VisualElement>
-        <ui:VisualElement name="PublicContainer2" style="flex-direction: row; flex-wrap: nowrap; height: 28px;">
-            <ui:Toggle label="Location To Lower" name="LocationToLower" style="width: 196px; -unity-text-align: middle-left;" />
-            <ui:Toggle label="Include Asset GUID" name="IncludeAssetGUID" style="width: 196px; -unity-text-align: middle-left;" />
+        <ui:VisualElement name="PackageSettingsContainer">
+            <ui:Button text="Package Settings" display-tooltip-when-elided="true" name="PackageSettingsButton" />
+            <ui:VisualElement name="PublicContainer3" style="flex-direction: row; flex-wrap: nowrap; height: 28px;">
+                <ui:Toggle label="Enable Addressable" name="EnableAddressable" style="width: 196px; -unity-text-align: middle-left;" />
+                <ui:Toggle label="Location To Lower" name="LocationToLower" style="width: 196px; -unity-text-align: middle-left;" />
+                <ui:Toggle label="Include Asset GUID" name="IncludeAssetGUID" style="width: 196px; -unity-text-align: middle-left;" />
+                <ui:Toggle label="Ignore Default Type" name="IgnoreDefaultType" style="width: 196px; -unity-text-align: middle-left;" />
+            </ui:VisualElement>
         </ui:VisualElement>
     </ui:VisualElement>
     <ui:VisualElement name="ContentContainer" style="flex-grow: 1; flex-direction: row;">
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/CollectAssetInfo.cs b/Assets/YooAsset/Editor/AssetBundleCollector/CollectAssetInfo.cs
index 6d12c35..15c8ae9 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/CollectAssetInfo.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/CollectAssetInfo.cs
@@ -14,7 +14,7 @@ namespace YooAsset.Editor
 		/// 资源包名称
 		/// </summary>
 		public string BundleName { private set; get; }
-		
+
 		/// <summary>
 		/// 可寻址地址
 		/// </summary>
@@ -25,11 +25,6 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string AssetPath { private set; get; }
 
-		/// <summary>
-		/// 是否为原生资源
-		/// </summary>
-		public bool IsRawAsset { private set; get; }
-
 		/// <summary>
 		/// 资源分类标签
 		/// </summary>
@@ -41,14 +36,13 @@ namespace YooAsset.Editor
 		public List<string> DependAssets = new List<string>();
 
 
-		public CollectAssetInfo(ECollectorType collectorType, string bundleName, string address, string assetPath, bool isRawAsset, List<string> assetTags)
+		public CollectAssetInfo(ECollectorType collectorType, string bundleName, string address, string assetPath, List<string> assetTags)
 		{
 			CollectorType = collectorType;
 			BundleName = bundleName;
 			Address = address;
 			AssetPath = assetPath;
-			IsRawAsset = isRawAsset;
-			AssetTags = assetTags;		
+			AssetTags = assetTags;
 		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs b/Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs
index 8baa3a1..19ae4cc 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs
@@ -13,6 +13,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string PackageName { private set; get; }
 
+		/// <summary>
+		/// 忽略Unity引擎无法识别的文件
+		/// </summary>
+		public bool IgnoreDefaultType { private set; get; }
+
 		/// <summary>
 		/// 启用可寻址资源定位
 		/// </summary>
@@ -39,18 +44,19 @@ namespace YooAsset.Editor
 		public string ShadersBundleName { private set; get; }
 
 
-		public CollectCommand(EBuildMode buildMode, string packageName, bool enableAddressable, bool locationToLower, bool includeAssetGUID, bool uniqueBundleName)
+		public CollectCommand(EBuildMode buildMode, string packageName, bool enableAddressable, bool locationToLower, bool includeAssetGUID, bool ignoreDefaultType, bool uniqueBundleName)
 		{
 			BuildMode = buildMode;
 			PackageName = packageName;
 			EnableAddressable = enableAddressable;
 			LocationToLower = locationToLower;
 			IncludeAssetGUID = includeAssetGUID;
+			IgnoreDefaultType = ignoreDefaultType;
 			UniqueBundleName = uniqueBundleName;
 
 			// 着色器统一全名称
 			var packRuleResult = DefaultPackRule.CreateShadersPackRuleResult();
-			ShadersBundleName = packRuleResult.GetMainBundleName(packageName, uniqueBundleName);
+			ShadersBundleName = packRuleResult.GetBundleName(packageName, uniqueBundleName);
 		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/IPackRule.cs b/Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/IPackRule.cs
index feaba34..5effd56 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/IPackRule.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/IPackRule.cs
@@ -36,9 +36,9 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 获取主资源包全名称
+		/// 获取资源包全名称
 		/// </summary>
-		public string GetMainBundleName(string packageName, bool uniqueBundleName)
+		public string GetBundleName(string packageName, bool uniqueBundleName)
 		{
 			string fullName;
 			string bundleName = EditorTools.GetRegularPath(_bundleName).Replace('/', '_').Replace('.', '_').ToLower();
@@ -48,24 +48,6 @@ namespace YooAsset.Editor
 				fullName = $"{bundleName}.{_bundleExtension}";
 			return fullName.ToLower();
 		}
-
-		/// <summary>
-		/// 获取共享资源包全名称
-		/// </summary>
-		public string GetShareBundleName(string packageName, bool uniqueBundleName)
-		{
-			// 注意：冗余的共享资源包名返回空
-			if (string.IsNullOrEmpty(_bundleName) && string.IsNullOrEmpty(_bundleExtension))
-				return string.Empty;
-
-			string fullName;
-			string bundleName = EditorTools.GetRegularPath(_bundleName).Replace('/', '_').Replace('.', '_').ToLower();
-			if (uniqueBundleName)
-				fullName = $"{packageName}_share_{bundleName}.{_bundleExtension}";
-			else
-				fullName = $"share_{bundleName}.{_bundleExtension}";
-			return fullName.ToLower();
-		}
 	}
 
 	/// <summary>
@@ -77,10 +59,5 @@ namespace YooAsset.Editor
 		/// 获取打包规则结果
 		/// </summary>
 		PackRuleResult GetPackRuleResult(PackRuleData data);
-
-		/// <summary>
-		/// 是否为原生文件打包规则
-		/// </summary>
-		bool IsRawFilePackRule();
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/ISharedPackRule.cs b/Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/ISharedPackRule.cs
deleted file mode 100644
index 66acd7d..0000000
--- a/Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/ISharedPackRule.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-
-namespace YooAsset.Editor
-{
-	/// <summary>
-	/// 共享资源的打包规则
-	/// </summary>
-	public interface ISharedPackRule
-	{
-		/// <summary>
-		/// 获取打包规则结果
-		/// </summary>
-		PackRuleResult GetPackRuleResult(string assetPath);
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/ISharedPackRule.cs.meta b/Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/ISharedPackRule.cs.meta
deleted file mode 100644
index 4fa1990..0000000
--- a/Assets/YooAsset/Editor/AssetBundleCollector/CollectRules/ISharedPackRule.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 1ed930b0cc1db1742b0a131ca476bd82
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultPackRule.cs b/Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultPackRule.cs
index 8f6c462..27e8812 100644
--- a/Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultPackRule.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultPackRule.cs
@@ -44,11 +44,6 @@ namespace YooAsset.Editor
 			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
 			return result;
 		}
-
-		bool IPackRule.IsRawFilePackRule()
-		{
-			return false;
-		}
 	}
 
 	/// <summary>
@@ -66,11 +61,6 @@ namespace YooAsset.Editor
 			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
 			return result;
 		}
-
-		bool IPackRule.IsRawFilePackRule()
-		{
-			return false;
-		}
 	}
 
 	/// <summary>
@@ -101,11 +91,6 @@ namespace YooAsset.Editor
 				throw new Exception($"Not found root directory : {assetPath}");
 			}
 		}
-
-		bool IPackRule.IsRawFilePackRule()
-		{
-			return false;
-		}
 	}
 
 	/// <summary>
@@ -131,11 +116,6 @@ namespace YooAsset.Editor
 			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
 			return result;
 		}
-
-		bool IPackRule.IsRawFilePackRule()
-		{
-			return false;
-		}
 	}
 
 	/// <summary>
@@ -151,11 +131,6 @@ namespace YooAsset.Editor
 			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
 			return result;
 		}
-
-		bool IPackRule.IsRawFilePackRule()
-		{
-			return false;
-		}
 	}
 
 	/// <summary>
@@ -170,11 +145,6 @@ namespace YooAsset.Editor
 			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.RawFileExtension);
 			return result;
 		}
-
-		bool IPackRule.IsRawFilePackRule()
-		{
-			return true;
-		}
 	}
 
 	/// <summary>
@@ -187,10 +157,5 @@ namespace YooAsset.Editor
 		{
 			return DefaultPackRule.CreateShadersPackRuleResult();
 		}
-
-		bool IPackRule.IsRawFilePackRule()
-		{
-			return false;
-		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultSharedPackRule.cs b/Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultSharedPackRule.cs
deleted file mode 100644
index 8dd6987..0000000
--- a/Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultSharedPackRule.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.IO;
-using UnityEditor;
-
-namespace YooAsset.Editor
-{
-	/// <summary>
-	/// 零冗余的共享资源打包规则
-	/// </summary>
-	public class ZeroRedundancySharedPackRule : ISharedPackRule
-	{
-		public PackRuleResult GetPackRuleResult(string assetPath)
-		{
-			string bundleName = Path.GetDirectoryName(assetPath);
-			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
-			return result;
-		}
-	}
-	
-	/// <summary>
-	/// 全部冗余的共享资源打包规则
-	/// </summary>
-	public class FullRedundancySharedPackRule : ISharedPackRule
-	{
-		public PackRuleResult GetPackRuleResult(string assetPath)
-		{
-			PackRuleResult result = new PackRuleResult(string.Empty, string.Empty);
-			return result;
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultSharedPackRule.cs.meta b/Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultSharedPackRule.cs.meta
deleted file mode 100644
index 61e38b2..0000000
--- a/Assets/YooAsset/Editor/AssetBundleCollector/DefaultRules/DefaultSharedPackRule.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 3b8606481370397489cb3aa21e726d9a
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleReporter/ReportAssetInfo.cs b/Assets/YooAsset/Editor/AssetBundleReporter/ReportAssetInfo.cs
index b23823b..4200480 100644
--- a/Assets/YooAsset/Editor/AssetBundleReporter/ReportAssetInfo.cs
+++ b/Assets/YooAsset/Editor/AssetBundleReporter/ReportAssetInfo.cs
@@ -37,11 +37,6 @@ namespace YooAsset.Editor
 		/// 所属资源包的大小
 		/// </summary>
 		public long MainBundleSize;
-		
-		/// <summary>
-		/// 依赖的资源包名称列表
-		/// </summary>
-		public List<string> DependBundles = new List<string>();
 
 		/// <summary>
 		/// 依赖的资源路径列表
diff --git a/Assets/YooAsset/Editor/AssetBundleReporter/ReportBundleInfo.cs b/Assets/YooAsset/Editor/AssetBundleReporter/ReportBundleInfo.cs
index a4339ee..2b404f4 100644
--- a/Assets/YooAsset/Editor/AssetBundleReporter/ReportBundleInfo.cs
+++ b/Assets/YooAsset/Editor/AssetBundleReporter/ReportBundleInfo.cs
@@ -34,24 +34,19 @@ namespace YooAsset.Editor
 		public long FileSize;
 
 		/// <summary>
-		/// 是否为原生文件
+		/// 加密文件
 		/// </summary>
-		public bool IsRawFile;
+		public bool Encrypted;
 
 		/// <summary>
-		/// 加载方法
-		/// </summary>
-		public EBundleLoadMethod LoadMethod;
-
-		/// <summary>
-		/// Tags
+		/// 资源包标签集合
 		/// </summary>
 		public string[] Tags;
 
 		/// <summary>
-		/// 引用该资源包的ID列表
+		/// 资源包的依赖集合
 		/// </summary>
-		public int[] ReferenceIDs;
+		public List<string> DependBundles;
 
 		/// <summary>
 		/// 该资源包内包含的所有资源
diff --git a/Assets/YooAsset/Editor/AssetBundleReporter/ReportSummary.cs b/Assets/YooAsset/Editor/AssetBundleReporter/ReportSummary.cs
index f9eb25c..f410f5c 100644
--- a/Assets/YooAsset/Editor/AssetBundleReporter/ReportSummary.cs
+++ b/Assets/YooAsset/Editor/AssetBundleReporter/ReportSummary.cs
@@ -33,16 +33,16 @@ namespace YooAsset.Editor
 		/// </summary>
 		public BuildTarget BuildTarget;
 
-		/// <summary>
-		/// 构建管线
-		/// </summary>
-		public EBuildPipeline BuildPipeline;
-
 		/// <summary>
 		/// 构建模式
 		/// </summary>
 		public EBuildMode BuildMode;
 
+		/// <summary>
+		/// 构建管线
+		/// </summary>
+		public string BuildPipeline;
+
 		/// <summary>
 		/// 构建包裹名称
 		/// </summary>
@@ -73,18 +73,13 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool UniqueBundleName;
 
-		/// <summary>
-		/// 共享资源的打包规则类名
-		/// </summary>
-		public string SharedPackRuleClassName;
-
 		/// <summary>
 		/// 加密服务类名称
 		/// </summary>
 		public string EncryptionServicesClassName;
 
 		// 构建参数
-		public EOutputNameStyle OutputNameStyle;
+		public EFileNameStyle FileNameStyle;
 		public ECompressOption CompressOption;
 		public bool DisableWriteTypeTree;
 		public bool IgnoreTypeTreeChanges;
@@ -96,7 +91,5 @@ namespace YooAsset.Editor
 		public long AllBundleTotalSize;
 		public int EncryptedBundleTotalCount;
 		public long EncryptedBundleTotalSize;
-		public int RawBundleTotalCount;
-		public long RawBundleTotalSize;
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterAssetListViewer.cs b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterAssetListViewer.cs
index 9417146..c742ce9 100644
--- a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterAssetListViewer.cs
+++ b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterAssetListViewer.cs
@@ -254,7 +254,7 @@ namespace YooAsset.Editor
 			List<ReportBundleInfo> bundles = new List<ReportBundleInfo>();
 			var mainBundle = _buildReport.GetBundleInfo(assetInfo.MainBundleName);
 			bundles.Add(mainBundle);
-			foreach (string dependBundleName in assetInfo.DependBundles)
+			foreach (string dependBundleName in mainBundle.DependBundles)
 			{
 				var dependBundle = _buildReport.GetBundleInfo(dependBundleName);
 				bundles.Add(dependBundle);
diff --git a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.cs b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.cs
index 577f9b7..23d9202 100644
--- a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.cs
+++ b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.cs
@@ -269,9 +269,9 @@ namespace YooAsset.Editor
 			var label3 = element.Q<Label>("Label3");
 			label3.text = bundleInfo.FileHash;
 
-			// LoadMethod
+			// Encrypted
 			var label5 = element.Q<Label>("Label5");
-			label5.text = bundleInfo.LoadMethod.ToString();
+			label5.text = bundleInfo.Encrypted.ToString();
 
 			// Tags
 			var label6 = element.Q<Label>("Label6");
@@ -289,7 +289,7 @@ namespace YooAsset.Editor
 		}
 		private void ShowAssetBundleInspector(ReportBundleInfo bundleInfo)
 		{
-			if (bundleInfo.IsRawFile)
+			if (_buildReport.Summary.BuildPipeline == nameof(EBuildPipeline.RawFileBuildPipeline))
 				return;
 
 			string rootDirectory = Path.GetDirectoryName(_reportFilePath);
diff --git a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.uxml b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.uxml
index 943b306..aee3981 100644
--- a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.uxml
+++ b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.uxml
@@ -4,7 +4,7 @@
             <uie:ToolbarButton text="Bundle Name" display-tooltip-when-elided="true" name="TopBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
             <uie:ToolbarButton text="Size" display-tooltip-when-elided="true" name="TopBar2" style="width: 100px; -unity-text-align: middle-left; flex-grow: 0;" />
             <uie:ToolbarButton text="Hash" display-tooltip-when-elided="true" name="TopBar3" style="width: 280px; -unity-text-align: middle-left;" />
-            <uie:ToolbarButton text="LoadMethod" display-tooltip-when-elided="true" name="TopBar4" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
+            <uie:ToolbarButton text="Encrypted" display-tooltip-when-elided="true" name="TopBar4" style="width: 150px; -unity-text-align: middle-left; flex-grow: 0;" />
             <uie:ToolbarButton text="Tags" display-tooltip-when-elided="true" name="TopBar5" style="width: 80px; -unity-text-align: middle-left; flex-grow: 1;" />
         </uie:Toolbar>
         <ui:ListView focusable="true" name="TopListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1; flex-basis: 60px;" />
diff --git a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterSummaryViewer.cs b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterSummaryViewer.cs
index 9a2ad93..e377349 100644
--- a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterSummaryViewer.cs
+++ b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterSummaryViewer.cs
@@ -71,12 +71,11 @@ namespace YooAsset.Editor
 			_items.Add(new ItemWrapper("资源定位地址大小写不敏感", $"{buildReport.Summary.LocationToLower}"));
 			_items.Add(new ItemWrapper("包含资源GUID数据", $"{buildReport.Summary.IncludeAssetGUID}"));
 			_items.Add(new ItemWrapper("资源包名唯一化", $"{buildReport.Summary.UniqueBundleName}"));
-			_items.Add(new ItemWrapper("共享资源打包规则", buildReport.Summary.SharedPackRuleClassName));
 			_items.Add(new ItemWrapper("资源加密服务类", buildReport.Summary.EncryptionServicesClassName));
 
 			_items.Add(new ItemWrapper(string.Empty, string.Empty));
 			_items.Add(new ItemWrapper("构建参数", string.Empty));
-			_items.Add(new ItemWrapper("OutputNameStyle", $"{buildReport.Summary.OutputNameStyle}"));
+			_items.Add(new ItemWrapper("FileNameStyle", $"{buildReport.Summary.FileNameStyle}"));
 			_items.Add(new ItemWrapper("CompressOption", $"{buildReport.Summary.CompressOption}"));
 			_items.Add(new ItemWrapper("DisableWriteTypeTree", $"{buildReport.Summary.DisableWriteTypeTree}"));
 			_items.Add(new ItemWrapper("IgnoreTypeTreeChanges", $"{buildReport.Summary.IgnoreTypeTreeChanges}"));
@@ -89,8 +88,6 @@ namespace YooAsset.Editor
 			_items.Add(new ItemWrapper("资源包总大小", ConvertSize(buildReport.Summary.AllBundleTotalSize)));
 			_items.Add(new ItemWrapper("加密资源包总数", $"{buildReport.Summary.EncryptedBundleTotalCount}"));
 			_items.Add(new ItemWrapper("加密资源包总大小", ConvertSize(buildReport.Summary.EncryptedBundleTotalSize)));
-			_items.Add(new ItemWrapper("原生资源包总数", $"{buildReport.Summary.RawBundleTotalCount}"));
-			_items.Add(new ItemWrapper("原生资源包总大小", ConvertSize(buildReport.Summary.RawBundleTotalSize)));
 
 			_listView.Clear();
 			_listView.ClearSelection();
diff --git a/Assets/YooAsset/Editor/UIElements.meta b/Assets/YooAsset/Editor/UIElements.meta
new file mode 100644
index 0000000..8378e36
--- /dev/null
+++ b/Assets/YooAsset/Editor/UIElements.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8aaf907486f440246afc03084641843e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/UxmlDefine.cs b/Assets/YooAsset/Editor/UIElements/UIElementsDefine.cs
similarity index 100%
rename from Assets/YooAsset/Editor/UxmlDefine.cs
rename to Assets/YooAsset/Editor/UIElements/UIElementsDefine.cs
diff --git a/Assets/YooAsset/Editor/UxmlDefine.cs.meta b/Assets/YooAsset/Editor/UIElements/UIElementsDefine.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/UxmlDefine.cs.meta
rename to Assets/YooAsset/Editor/UIElements/UIElementsDefine.cs.meta
diff --git a/Assets/YooAsset/Editor/UxmlExtension.cs b/Assets/YooAsset/Editor/UIElements/UIElementsExtension.cs
similarity index 100%
rename from Assets/YooAsset/Editor/UxmlExtension.cs
rename to Assets/YooAsset/Editor/UIElements/UIElementsExtension.cs
diff --git a/Assets/YooAsset/Editor/UxmlExtension.cs.meta b/Assets/YooAsset/Editor/UIElements/UIElementsExtension.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/UxmlExtension.cs.meta
rename to Assets/YooAsset/Editor/UIElements/UIElementsExtension.cs.meta
diff --git a/Assets/YooAsset/Editor/UIElements/UIElementsTools.cs b/Assets/YooAsset/Editor/UIElements/UIElementsTools.cs
new file mode 100644
index 0000000..46759d1
--- /dev/null
+++ b/Assets/YooAsset/Editor/UIElements/UIElementsTools.cs
@@ -0,0 +1,21 @@
+#if UNITY_2019_4_OR_NEWER
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace YooAsset.Editor
+{
+	public static class UIElementsTools
+	{
+        public static void SetElementVisible(VisualElement element, bool visible)
+        {
+            if (element == null)
+                return;
+
+            element.style.display = visible ? DisplayStyle.Flex : DisplayStyle.None;
+            element.style.visibility = visible ? Visibility.Visible : Visibility.Hidden;
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/UIElements/UIElementsTools.cs.meta b/Assets/YooAsset/Editor/UIElements/UIElementsTools.cs.meta
new file mode 100644
index 0000000..5117d6b
--- /dev/null
+++ b/Assets/YooAsset/Editor/UIElements/UIElementsTools.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cacb478021cc90b49a635aae388996fa
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/UxmlLoader.cs b/Assets/YooAsset/Editor/UIElements/UxmlLoader.cs
similarity index 100%
rename from Assets/YooAsset/Editor/UxmlLoader.cs
rename to Assets/YooAsset/Editor/UIElements/UxmlLoader.cs
diff --git a/Assets/YooAsset/Editor/UxmlLoader.cs.meta b/Assets/YooAsset/Editor/UIElements/UxmlLoader.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/UxmlLoader.cs.meta
rename to Assets/YooAsset/Editor/UIElements/UxmlLoader.cs.meta
diff --git a/Assets/YooAsset/Runtime/Properties/AssemblyInfo.cs b/Assets/YooAsset/Runtime/AssemblyInfo.cs
similarity index 100%
rename from Assets/YooAsset/Runtime/Properties/AssemblyInfo.cs
rename to Assets/YooAsset/Runtime/AssemblyInfo.cs
diff --git a/Assets/YooAsset/Runtime/Properties/AssemblyInfo.cs.meta b/Assets/YooAsset/Runtime/AssemblyInfo.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/Properties/AssemblyInfo.cs.meta
rename to Assets/YooAsset/Runtime/AssemblyInfo.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/EBundleLoadMethod.cs b/Assets/YooAsset/Runtime/AssetSystem/Loader/EBundleLoadMethod.cs
deleted file mode 100644
index 625fcce..0000000
--- a/Assets/YooAsset/Runtime/AssetSystem/Loader/EBundleLoadMethod.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-
-namespace YooAsset
-{
-	/// <summary>
-	/// Bundle文件的加载方法
-	/// </summary>
-	public enum EBundleLoadMethod
-	{
-		/// <summary>
-		/// 正常加载（不需要解密）
-		/// </summary>
-		Normal = 0,
-		
-		/// <summary>
-		/// 通过文件偏移来解密加载
-		/// </summary>
-		LoadFromFileOffset = 1,
-
-		/// <summary>
-		/// 通过文件内存来解密加载
-		/// </summary>
-		LoadFromMemory = 2,
-		
-		/// <summary>
-		/// 通过文件流来解密加载
-		/// </summary>
-		LoadFromStream = 3,
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/EBundleLoadMethod.cs.meta b/Assets/YooAsset/Runtime/AssetSystem/Loader/EBundleLoadMethod.cs.meta
deleted file mode 100644
index 10eb8db..0000000
--- a/Assets/YooAsset/Runtime/AssetSystem/Loader/EBundleLoadMethod.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 5e32c14ed62806b4189d20ad48ce7631
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/YooAsset/Runtime/CacheSystem/CacheHelper.cs b/Assets/YooAsset/Runtime/CacheSystem/CacheHelper.cs
new file mode 100644
index 0000000..23894c5
--- /dev/null
+++ b/Assets/YooAsset/Runtime/CacheSystem/CacheHelper.cs
@@ -0,0 +1,103 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace YooAsset
+{
+	internal static class CacheHelper
+	{
+		/// <summary>
+		/// 禁用Unity缓存系统在WebGL平台
+		/// </summary>
+		public static bool DisableUnityCacheOnWebGL = false;
+
+		/// <summary>
+		/// 验证缓存文件（子线程内操作）
+		/// </summary>
+		public static EVerifyResult VerifyingCacheFile(VerifyCacheFileElement element, EVerifyLevel verifyLevel)
+		{
+			try
+			{
+				if (verifyLevel == EVerifyLevel.Low)
+				{
+					if (File.Exists(element.InfoFilePath) == false)
+						return EVerifyResult.InfoFileNotExisted;
+					if (File.Exists(element.DataFilePath) == false)
+						return EVerifyResult.DataFileNotExisted;
+					return EVerifyResult.Succeed;
+				}
+				else
+				{
+					if (File.Exists(element.InfoFilePath) == false)
+						return EVerifyResult.InfoFileNotExisted;
+
+					// 解析信息文件获取验证数据
+					CacheFileInfo.ReadInfoFromFile(element.InfoFilePath, out element.DataFileCRC, out element.DataFileSize);
+				}
+			}
+			catch (Exception)
+			{
+				return EVerifyResult.Exception;
+			}
+
+			return VerifyingInternal(element.DataFilePath, element.DataFileSize, element.DataFileCRC, verifyLevel);
+		}
+
+		/// <summary>
+		/// 验证下载文件（子线程内操作）
+		/// </summary>
+		public static EVerifyResult VerifyingTempFile(VerifyTempFileElement element)
+		{
+			return VerifyingInternal(element.TempDataFilePath, element.FileSize, element.FileCRC, EVerifyLevel.High);
+		}
+
+		/// <summary>
+		/// 验证记录文件（主线程内操作）
+		/// </summary>
+		public static EVerifyResult VerifyingRecordFile(CacheManager cache, string cacheGUID)
+		{
+			var wrapper = cache.TryGetWrapper(cacheGUID);
+			if (wrapper == null)
+				return EVerifyResult.CacheNotFound;
+
+			EVerifyResult result = VerifyingInternal(wrapper.DataFilePath, wrapper.DataFileSize, wrapper.DataFileCRC, EVerifyLevel.High);
+			return result;
+		}
+
+		private static EVerifyResult VerifyingInternal(string filePath, long fileSize, string fileCRC, EVerifyLevel verifyLevel)
+		{
+			try
+			{
+				if (File.Exists(filePath) == false)
+					return EVerifyResult.DataFileNotExisted;
+
+				// 先验证文件大小
+				long size = FileUtility.GetFileSize(filePath);
+				if (size < fileSize)
+					return EVerifyResult.FileNotComplete;
+				else if (size > fileSize)
+					return EVerifyResult.FileOverflow;
+
+				// 再验证文件CRC
+				if (verifyLevel == EVerifyLevel.High)
+				{
+					string crc = HashUtility.FileCRC32(filePath);
+					if (crc == fileCRC)
+						return EVerifyResult.Succeed;
+					else
+						return EVerifyResult.FileCrcError;
+				}
+				else
+				{
+					return EVerifyResult.Succeed;
+				}
+			}
+			catch (Exception)
+			{
+				return EVerifyResult.Exception;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/CacheSystem/CacheSystem.cs.meta b/Assets/YooAsset/Runtime/CacheSystem/CacheHelper.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/CacheSystem/CacheSystem.cs.meta
rename to Assets/YooAsset/Runtime/CacheSystem/CacheHelper.cs.meta
diff --git a/Assets/YooAsset/Runtime/CacheSystem/PackageCache.cs b/Assets/YooAsset/Runtime/CacheSystem/CacheManager.cs
similarity index 70%
rename from Assets/YooAsset/Runtime/CacheSystem/PackageCache.cs
rename to Assets/YooAsset/Runtime/CacheSystem/CacheManager.cs
index 1ddaab7..71ef9ac 100644
--- a/Assets/YooAsset/Runtime/CacheSystem/PackageCache.cs
+++ b/Assets/YooAsset/Runtime/CacheSystem/CacheManager.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 namespace YooAsset
 {
-	internal class PackageCache
+	internal class CacheManager
 	{
 		internal class RecordWrapper
 		{
@@ -26,14 +26,20 @@ namespace YooAsset
 		private readonly Dictionary<string, RecordWrapper> _wrappers = new Dictionary<string, RecordWrapper>();
 
 		/// <summary>
-		/// 包裹名称
+		/// 所属包裹
 		/// </summary>
-		public string PackageName { private set; get; }
+		public readonly string PackageName;
+
+		/// <summary>
+		/// 验证级别
+		/// </summary>
+		public readonly EVerifyLevel BootVerifyLevel;
 
 
-		public PackageCache(string packageName)
+		public CacheManager(string packageName, EVerifyLevel bootVerifyLevel)
 		{
 			PackageName = packageName;
+			BootVerifyLevel = bootVerifyLevel;
 		}
 
 		/// <summary>
@@ -44,14 +50,6 @@ namespace YooAsset
 			_wrappers.Clear();
 		}
 
-		/// <summary>
-		/// 获取缓存文件总数
-		/// </summary>
-		public int GetCachedFilesCount()
-		{
-			return _wrappers.Count;
-		}
-
 		/// <summary>
 		/// 查询缓存记录
 		/// </summary>
@@ -76,10 +74,26 @@ namespace YooAsset
 		}
 
 		/// <summary>
-		/// 丢弃验证结果
+		/// 丢弃验证结果并删除缓存文件
 		/// </summary>
 		public void Discard(string cacheGUID)
 		{
+			var wrapper = TryGetWrapper(cacheGUID);
+			if (wrapper != null)
+			{
+				try
+				{
+					string dataFilePath = wrapper.DataFilePath;
+					FileInfo fileInfo = new FileInfo(dataFilePath);
+					if (fileInfo.Exists)
+						fileInfo.Directory.Delete(true);
+				}
+				catch (Exception e)
+				{
+					YooLogger.Error($"Failed to delete cache file ! {e.Message}");
+				}
+			}
+
 			if (_wrappers.ContainsKey(cacheGUID))
 			{
 				_wrappers.Remove(cacheGUID);
@@ -97,7 +111,18 @@ namespace YooAsset
 				return null;
 		}
 
-		internal List<string> GetAllKeys()
+		/// <summary>
+		/// 获取缓存文件总数
+		/// </summary>
+		public int GetAllCachedFilesCount()
+		{
+			return _wrappers.Count;
+		}
+
+		/// <summary>
+		/// 获取缓存GUID集合
+		/// </summary>
+		public List<string> GetAllCachedGUIDs()
 		{
 			List<string> keys = new List<string>(_wrappers.Keys.Count);
 			var keyCollection = _wrappers.Keys;
diff --git a/Assets/YooAsset/Runtime/CacheSystem/PackageCache.cs.meta b/Assets/YooAsset/Runtime/CacheSystem/CacheManager.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/CacheSystem/PackageCache.cs.meta
rename to Assets/YooAsset/Runtime/CacheSystem/CacheManager.cs.meta
diff --git a/Assets/YooAsset/Runtime/CacheSystem/CacheSystem.cs b/Assets/YooAsset/Runtime/CacheSystem/CacheSystem.cs
deleted file mode 100644
index 948a2da..0000000
--- a/Assets/YooAsset/Runtime/CacheSystem/CacheSystem.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-using System;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-namespace YooAsset
-{
-	internal static class CacheSystem
-	{
-		private readonly static Dictionary<string, PackageCache> _cachedDic = new Dictionary<string, PackageCache>(1000);
-
-		/// <summary>
-		/// 禁用Unity缓存系统在WebGL平台
-		/// </summary>
-		public static bool DisableUnityCacheOnWebGL = false;
-
-		/// <summary>
-		/// 初始化时的验证级别
-		/// </summary>
-		public static EVerifyLevel InitVerifyLevel { set; get; } = EVerifyLevel.Middle;
-
-		/// <summary>
-		/// 清空所有数据
-		/// </summary>
-		public static void ClearAll()
-		{
-			_cachedDic.Clear();
-		}
-
-		/// <summary>
-		/// 清空指定包裹的所有缓存数据
-		/// </summary>
-		public static void ClearPackage(string packageName)
-		{
-			var cache = GetOrCreateCache(packageName);
-			cache.ClearAll();
-		}
-
-		/// <summary>
-		/// 获取缓存文件总数
-		/// </summary>
-		public static int GetCachedFilesCount(string packageName)
-		{
-			var cache = GetOrCreateCache(packageName);
-			return cache.GetCachedFilesCount();
-		}
-
-		/// <summary>
-		/// 查询是否为验证文件
-		/// </summary>
-		public static bool IsCached(string packageName, string cacheGUID)
-		{
-			var cache = GetOrCreateCache(packageName);
-			return cache.IsCached(cacheGUID);
-		}
-
-		/// <summary>
-		/// 录入验证的文件
-		/// </summary>
-		public static void RecordFile(string packageName, string cacheGUID, PackageCache.RecordWrapper wrapper)
-		{
-			//YooLogger.Log($"Record file : {packageName} = {cacheGUID}");
-			var cache = GetOrCreateCache(packageName);
-			cache.Record(cacheGUID, wrapper);
-		}
-
-		/// <summary>
-		/// 丢弃验证的文件（同时删除文件）
-		/// </summary>
-		public static void DiscardFile(string packageName, string cacheGUID)
-		{
-			var cache = GetOrCreateCache(packageName);
-			var wrapper = cache.TryGetWrapper(cacheGUID);
-			if (wrapper == null)
-				return;
-
-			cache.Discard(cacheGUID);
-
-			try
-			{
-				string dataFilePath = wrapper.DataFilePath;
-				FileInfo fileInfo = new FileInfo(dataFilePath);
-				if (fileInfo.Exists)
-					fileInfo.Directory.Delete(true);
-			}
-			catch (Exception e)
-			{
-				YooLogger.Error($"Failed to delete cache file ! {e.Message}");
-			}
-		}
-
-		/// <summary>
-		/// 验证缓存文件（子线程内操作）
-		/// </summary>
-		public static EVerifyResult VerifyingCacheFile(VerifyCacheFileElement element)
-		{
-			try
-			{
-				if (InitVerifyLevel == EVerifyLevel.Low)
-				{
-					if (File.Exists(element.InfoFilePath) == false)
-						return EVerifyResult.InfoFileNotExisted;
-					if (File.Exists(element.DataFilePath) == false)
-						return EVerifyResult.DataFileNotExisted;
-					return EVerifyResult.Succeed;
-				}
-				else
-				{
-					if (File.Exists(element.InfoFilePath) == false)
-						return EVerifyResult.InfoFileNotExisted;
-
-					// 解析信息文件获取验证数据
-					CacheFileInfo.ReadInfoFromFile(element.InfoFilePath, out element.DataFileCRC, out element.DataFileSize);
-				}
-			}
-			catch (Exception)
-			{
-				return EVerifyResult.Exception;
-			}
-
-			return VerifyingInternal(element.DataFilePath, element.DataFileSize, element.DataFileCRC, InitVerifyLevel);
-		}
-
-		/// <summary>
-		/// 验证下载文件（子线程内操作）
-		/// </summary>
-		public static EVerifyResult VerifyingTempFile(VerifyTempFileElement element)
-		{
-			return VerifyingInternal(element.TempDataFilePath, element.FileSize, element.FileCRC, EVerifyLevel.High);
-		}
-
-		/// <summary>
-		/// 验证记录文件（主线程内操作）
-		/// </summary>
-		public static EVerifyResult VerifyingRecordFile(string packageName, string cacheGUID)
-		{
-			var cache = GetOrCreateCache(packageName);
-			var wrapper = cache.TryGetWrapper(cacheGUID);
-			if (wrapper == null)
-				return EVerifyResult.CacheNotFound;
-
-			EVerifyResult result = VerifyingInternal(wrapper.DataFilePath, wrapper.DataFileSize, wrapper.DataFileCRC, EVerifyLevel.High);
-			return result;
-		}
-
-		/// <summary>
-		/// 获取未被使用的缓存文件
-		/// </summary>
-		public static List<string> GetUnusedCacheGUIDs(ResourcePackage package)
-		{
-			var cache = GetOrCreateCache(package.PackageName);
-			var keys = cache.GetAllKeys();
-			List<string> result = new List<string>(keys.Count);
-			foreach (var cacheGUID in keys)
-			{
-				if (package.IsIncludeBundleFile(cacheGUID) == false)
-				{
-					result.Add(cacheGUID);
-				}
-			}
-			return result;
-		}
-
-		/// <summary>
-		/// 获取所有的缓存文件
-		/// </summary>
-		public static List<string> GetAllCacheGUIDs(ResourcePackage package)
-		{
-			var cache = GetOrCreateCache(package.PackageName);
-			return cache.GetAllKeys();
-		}
-
-		private static EVerifyResult VerifyingInternal(string filePath, long fileSize, string fileCRC, EVerifyLevel verifyLevel)
-		{
-			try
-			{
-				if (File.Exists(filePath) == false)
-					return EVerifyResult.DataFileNotExisted;
-
-				// 先验证文件大小
-				long size = FileUtility.GetFileSize(filePath);
-				if (size < fileSize)
-					return EVerifyResult.FileNotComplete;
-				else if (size > fileSize)
-					return EVerifyResult.FileOverflow;
-
-				// 再验证文件CRC
-				if (verifyLevel == EVerifyLevel.High)
-				{
-					string crc = HashUtility.FileCRC32(filePath);
-					if (crc == fileCRC)
-						return EVerifyResult.Succeed;
-					else
-						return EVerifyResult.FileCrcError;
-				}
-				else
-				{
-					return EVerifyResult.Succeed;
-				}
-			}
-			catch (Exception)
-			{
-				return EVerifyResult.Exception;
-			}
-		}
-		private static PackageCache GetOrCreateCache(string packageName)
-		{
-			if (_cachedDic.TryGetValue(packageName, out PackageCache cache) == false)
-			{
-				cache = new PackageCache(packageName);
-				_cachedDic.Add(packageName, cache);
-			}
-			return cache;
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Operations.meta b/Assets/YooAsset/Runtime/CacheSystem/Operation.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/CacheSystem/Operations.meta
rename to Assets/YooAsset/Runtime/CacheSystem/Operation.meta
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Operations/ClearAllCacheFilesOperation.cs b/Assets/YooAsset/Runtime/CacheSystem/Operation/ClearAllCacheFilesOperation.cs
similarity index 84%
rename from Assets/YooAsset/Runtime/CacheSystem/Operations/ClearAllCacheFilesOperation.cs
rename to Assets/YooAsset/Runtime/CacheSystem/Operation/ClearAllCacheFilesOperation.cs
index adb77d3..b0a2176 100644
--- a/Assets/YooAsset/Runtime/CacheSystem/Operations/ClearAllCacheFilesOperation.cs
+++ b/Assets/YooAsset/Runtime/CacheSystem/Operation/ClearAllCacheFilesOperation.cs
@@ -17,14 +17,14 @@ namespace YooAsset
 			Done,
 		}
 
-		private readonly ResourcePackage _package;
+		private readonly CacheManager _cache;
 		private List<string> _allCacheGUIDs;
 		private int _fileTotalCount = 0;
 		private ESteps _steps = ESteps.None;
 		
-		internal ClearAllCacheFilesOperation(ResourcePackage package)
+		internal ClearAllCacheFilesOperation(CacheManager cache)
 		{
-			_package = package;
+			_cache = cache;
 		}
 		internal override void Start()
 		{
@@ -37,7 +37,7 @@ namespace YooAsset
 
 			if (_steps == ESteps.GetAllCacheFiles)
 			{
-				_allCacheGUIDs = CacheSystem.GetAllCacheGUIDs(_package);
+				_allCacheGUIDs = _cache.GetAllCachedGUIDs();
 				_fileTotalCount = _allCacheGUIDs.Count;
 				YooLogger.Log($"Found all cache file count : {_fileTotalCount}");
 				_steps = ESteps.ClearAllCacheFiles;
@@ -48,7 +48,7 @@ namespace YooAsset
 				for (int i = _allCacheGUIDs.Count - 1; i >= 0; i--)
 				{
 					string cacheGUID = _allCacheGUIDs[i];
-					CacheSystem.DiscardFile(_package.PackageName, cacheGUID);
+					_cache.Discard(cacheGUID);
 					_allCacheGUIDs.RemoveAt(i);
 
 					if (OperationSystem.IsBusy)
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Operations/ClearAllCacheFilesOperation.cs.meta b/Assets/YooAsset/Runtime/CacheSystem/Operation/ClearAllCacheFilesOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/CacheSystem/Operations/ClearAllCacheFilesOperation.cs.meta
rename to Assets/YooAsset/Runtime/CacheSystem/Operation/ClearAllCacheFilesOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Operations/ClearUnusedCacheFilesOperation.cs b/Assets/YooAsset/Runtime/CacheSystem/Operation/ClearUnusedCacheFilesOperation.cs
similarity index 75%
rename from Assets/YooAsset/Runtime/CacheSystem/Operations/ClearUnusedCacheFilesOperation.cs
rename to Assets/YooAsset/Runtime/CacheSystem/Operation/ClearUnusedCacheFilesOperation.cs
index c5a7e8d..d53e812 100644
--- a/Assets/YooAsset/Runtime/CacheSystem/Operations/ClearUnusedCacheFilesOperation.cs
+++ b/Assets/YooAsset/Runtime/CacheSystem/Operation/ClearUnusedCacheFilesOperation.cs
@@ -18,13 +18,15 @@ namespace YooAsset
 		}
 
 		private readonly ResourcePackage _package;
+		private readonly CacheManager _cache;
 		private List<string> _unusedCacheGUIDs;
 		private int _unusedFileTotalCount = 0;
 		private ESteps _steps = ESteps.None;
 
-		internal ClearUnusedCacheFilesOperation(ResourcePackage package)
+		internal ClearUnusedCacheFilesOperation(ResourcePackage package, CacheManager cache)
 		{
 			_package = package;
+			_cache = cache;
 		}
 		internal override void Start()
 		{
@@ -37,7 +39,7 @@ namespace YooAsset
 
 			if (_steps == ESteps.GetUnusedCacheFiles)
 			{
-				_unusedCacheGUIDs = CacheSystem.GetUnusedCacheGUIDs(_package);
+				_unusedCacheGUIDs = GetUnusedCacheGUIDs();
 				_unusedFileTotalCount = _unusedCacheGUIDs.Count;
 				YooLogger.Log($"Found unused cache file count : {_unusedFileTotalCount}");
 				_steps = ESteps.ClearUnusedCacheFiles;
@@ -48,7 +50,7 @@ namespace YooAsset
 				for (int i = _unusedCacheGUIDs.Count - 1; i >= 0; i--)
 				{
 					string cacheGUID = _unusedCacheGUIDs[i];
-					CacheSystem.DiscardFile(_package.PackageName, cacheGUID);
+					_cache.Discard(cacheGUID);
 					_unusedCacheGUIDs.RemoveAt(i);
 
 					if (OperationSystem.IsBusy)
@@ -67,5 +69,19 @@ namespace YooAsset
 				}
 			}
 		}
+
+		private List<string> GetUnusedCacheGUIDs()
+		{
+			var allCacheGUIDs = _cache.GetAllCachedGUIDs();
+			List<string> result = new List<string>(allCacheGUIDs.Count);
+			foreach (var cacheGUID in allCacheGUIDs)
+			{
+				if (_package.IsIncludeBundleFile(cacheGUID) == false)
+				{
+					result.Add(cacheGUID);
+				}
+			}
+			return result;
+		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Operations/ClearUnusedCacheFilesOperation.cs.meta b/Assets/YooAsset/Runtime/CacheSystem/Operation/ClearUnusedCacheFilesOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/CacheSystem/Operations/ClearUnusedCacheFilesOperation.cs.meta
rename to Assets/YooAsset/Runtime/CacheSystem/Operation/ClearUnusedCacheFilesOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Operations/Internal.meta b/Assets/YooAsset/Runtime/CacheSystem/Operation/Internal.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/CacheSystem/Operations/Internal.meta
rename to Assets/YooAsset/Runtime/CacheSystem/Operation/Internal.meta
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Operation/Internal/FindCacheFilesOperation.cs b/Assets/YooAsset/Runtime/CacheSystem/Operation/Internal/FindCacheFilesOperation.cs
new file mode 100644
index 0000000..355456a
--- /dev/null
+++ b/Assets/YooAsset/Runtime/CacheSystem/Operation/Internal/FindCacheFilesOperation.cs
@@ -0,0 +1,126 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+	internal sealed class FindCacheFilesOperation : AsyncOperationBase
+	{
+		private enum ESteps
+		{
+			None,
+			Prepare,
+			UpdateCacheFiles,
+			Done,
+		}
+
+		private readonly PersistentManager _persistent;
+		private readonly CacheManager _cache;
+		private IEnumerator<DirectoryInfo> _filesEnumerator = null;
+		private float _verifyStartTime;
+		private ESteps _steps = ESteps.None;
+
+		/// <summary>
+		/// 需要验证的元素
+		/// </summary>
+		public readonly List<VerifyCacheFileElement> VerifyElements = new List<VerifyCacheFileElement>(5000);
+
+		public FindCacheFilesOperation(PersistentManager persistent, CacheManager cache)
+		{
+			_persistent = persistent;
+			_cache = cache;
+		}
+		internal override void Start()
+		{
+			_steps = ESteps.Prepare;
+			_verifyStartTime = UnityEngine.Time.realtimeSinceStartup;
+		}
+		internal override void Update()
+		{
+			if (_steps == ESteps.None || _steps == ESteps.Done)
+				return;
+
+			if (_steps == ESteps.Prepare)
+			{
+				string rootPath = _persistent.SandboxCacheFilesRoot;
+				DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
+				if (rootDirectory.Exists)
+				{
+					var directorieInfos = rootDirectory.EnumerateDirectories();
+					_filesEnumerator = directorieInfos.GetEnumerator();
+				}
+				_steps = ESteps.UpdateCacheFiles;
+			}
+
+			if (_steps == ESteps.UpdateCacheFiles)
+			{
+				if (UpdateCacheFiles())
+					return;
+
+				// 注意：总是返回成功
+				_steps = ESteps.Done;
+				Status = EOperationStatus.Succeed;
+				float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyStartTime;
+				YooLogger.Log($"Find cache files elapsed time {costTime:f1} seconds");
+			}
+		}
+
+		private bool UpdateCacheFiles()
+		{
+			if (_filesEnumerator == null)
+				return false;
+
+			bool isFindItem;
+			while (true)
+			{
+				isFindItem = _filesEnumerator.MoveNext();
+				if (isFindItem == false)
+					break;
+
+				var rootFoder = _filesEnumerator.Current;
+				var childDirectories = rootFoder.GetDirectories();
+				foreach (var chidDirectory in childDirectories)
+				{
+					string cacheGUID = chidDirectory.Name;
+					if (_cache.IsCached(cacheGUID))
+						continue;
+
+					// 创建验证元素类
+					string fileRootPath = chidDirectory.FullName;
+					string dataFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleDataFileName}";
+					string infoFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleInfoFileName}";
+					if (_persistent.AppendFileExtension)
+					{
+						string fileExtension = FindFileExtension(chidDirectory);
+						if (string.IsNullOrEmpty(fileExtension) == false)
+							dataFilePath += fileExtension;
+					}
+					VerifyCacheFileElement element = new VerifyCacheFileElement(_cache.PackageName, cacheGUID, fileRootPath, dataFilePath, infoFilePath);
+					VerifyElements.Add(element);
+				}
+
+				if (OperationSystem.IsBusy)
+					break;
+			}
+
+			return isFindItem;
+		}
+		private string FindFileExtension(DirectoryInfo directoryInfo)
+		{
+			string dataFileExtension = string.Empty;
+			var fileInfos = directoryInfo.GetFiles();
+			foreach (var fileInfo in fileInfos)
+			{
+				if (fileInfo.Extension == ".temp")
+					continue;
+				if (fileInfo.Name.StartsWith(YooAssetSettings.CacheBundleDataFileName))
+				{
+					dataFileExtension = fileInfo.Extension;
+					break;
+				}
+			}
+			return dataFileExtension;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/FindCacheFilesOperation.cs.meta b/Assets/YooAsset/Runtime/CacheSystem/Operation/Internal/FindCacheFilesOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/FindCacheFilesOperation.cs.meta
rename to Assets/YooAsset/Runtime/CacheSystem/Operation/Internal/FindCacheFilesOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/VerifyCacheFilesOperation.cs b/Assets/YooAsset/Runtime/CacheSystem/Operation/Internal/VerifyCacheFilesOperation.cs
similarity index 85%
rename from Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/VerifyCacheFilesOperation.cs
rename to Assets/YooAsset/Runtime/CacheSystem/Operation/Internal/VerifyCacheFilesOperation.cs
index 9266a4f..673d211 100644
--- a/Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/VerifyCacheFilesOperation.cs
+++ b/Assets/YooAsset/Runtime/CacheSystem/Operation/Internal/VerifyCacheFilesOperation.cs
@@ -8,12 +8,12 @@ namespace YooAsset
 {
 	internal abstract class VerifyCacheFilesOperation : AsyncOperationBase
 	{
-		public static VerifyCacheFilesOperation CreateOperation(List<VerifyCacheFileElement> elements)
+		public static VerifyCacheFilesOperation CreateOperation(CacheManager cache, List<VerifyCacheFileElement> elements)
 		{
 #if UNITY_WEBGL
-			var operation = new VerifyCacheFilesWithoutThreadOperation(elements);
+			var operation = new VerifyCacheFilesWithoutThreadOperation(cache, elements);
 #else
-			var operation = new VerifyCacheFilesWithThreadOperation(elements);
+			var operation = new VerifyCacheFilesWithThreadOperation(cache, elements);
 #endif
 			return operation;
 		}
@@ -33,6 +33,7 @@ namespace YooAsset
 		}
 
 		private readonly ThreadSyncContext _syncContext = new ThreadSyncContext();
+		private readonly CacheManager _cache;
 		private List<VerifyCacheFileElement> _waitingList;
 		private List<VerifyCacheFileElement> _verifyingList;
 		private int _verifyMaxNum;
@@ -42,8 +43,9 @@ namespace YooAsset
 		private int _failedCount;
 		private ESteps _steps = ESteps.None;
 
-		public VerifyCacheFilesWithThreadOperation(List<VerifyCacheFileElement> elements)
+		public VerifyCacheFilesWithThreadOperation(CacheManager cache, List<VerifyCacheFileElement> elements)
 		{
+			_cache = cache;
 			_waitingList = elements;
 		}
 		internal override void Start()
@@ -121,7 +123,7 @@ namespace YooAsset
 		private void VerifyInThread(object obj)
 		{
 			VerifyCacheFileElement element = (VerifyCacheFileElement)obj;
-			element.Result = CacheSystem.VerifyingCacheFile(element);
+			element.Result = CacheHelper.VerifyingCacheFile(element, _cache.BootVerifyLevel);
 			_syncContext.Post(VerifyCallback, element);
 		}
 		private void VerifyCallback(object obj)
@@ -132,8 +134,8 @@ namespace YooAsset
 			if (element.Result == EVerifyResult.Succeed)
 			{
 				_succeedCount++;
-				var wrapper = new PackageCache.RecordWrapper(element.InfoFilePath, element.DataFilePath, element.DataFileCRC, element.DataFileSize);
-				CacheSystem.RecordFile(element.PackageName, element.CacheGUID, wrapper);
+				var wrapper = new CacheManager.RecordWrapper(element.InfoFilePath, element.DataFilePath, element.DataFileCRC, element.DataFileSize);
+				_cache.Record(element.CacheGUID, wrapper);
 			}
 			else
 			{
@@ -158,6 +160,7 @@ namespace YooAsset
 			Done,
 		}
 
+		private readonly CacheManager _cache;
 		private List<VerifyCacheFileElement> _waitingList;
 		private List<VerifyCacheFileElement> _verifyingList;
 		private int _verifyMaxNum;
@@ -167,8 +170,9 @@ namespace YooAsset
 		private int _failedCount;
 		private ESteps _steps = ESteps.None;
 		
-		public VerifyCacheFilesWithoutThreadOperation(List<VerifyCacheFileElement> elements)
+		public VerifyCacheFilesWithoutThreadOperation(CacheManager cache, List<VerifyCacheFileElement> elements)
 		{
+			_cache = cache;
 			_waitingList = elements;
 		}
 		internal override void Start()
@@ -231,12 +235,12 @@ namespace YooAsset
 		}
 		private void BeginVerifyFileWithoutThread(VerifyCacheFileElement element)
 		{
-			element.Result = CacheSystem.VerifyingCacheFile(element);
+			element.Result = CacheHelper.VerifyingCacheFile(element, _cache.BootVerifyLevel);
 			if (element.Result == EVerifyResult.Succeed)
 			{
 				_succeedCount++;
-				var wrapper = new PackageCache.RecordWrapper(element.InfoFilePath, element.DataFilePath, element.DataFileCRC, element.DataFileSize);
-				CacheSystem.RecordFile(element.PackageName, element.CacheGUID, wrapper);
+				var wrapper = new CacheManager.RecordWrapper(element.InfoFilePath, element.DataFilePath, element.DataFileCRC, element.DataFileSize);
+				_cache.Record(element.CacheGUID, wrapper);
 			}
 			else
 			{
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/VerifyCacheFilesOperation.cs.meta b/Assets/YooAsset/Runtime/CacheSystem/Operation/Internal/VerifyCacheFilesOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/VerifyCacheFilesOperation.cs.meta
rename to Assets/YooAsset/Runtime/CacheSystem/Operation/Internal/VerifyCacheFilesOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/VerifyTempFileOperation.cs b/Assets/YooAsset/Runtime/CacheSystem/Operation/Internal/VerifyTempFileOperation.cs
similarity index 96%
rename from Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/VerifyTempFileOperation.cs
rename to Assets/YooAsset/Runtime/CacheSystem/Operation/Internal/VerifyTempFileOperation.cs
index 7f7decd..20e3c29 100644
--- a/Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/VerifyTempFileOperation.cs
+++ b/Assets/YooAsset/Runtime/CacheSystem/Operation/Internal/VerifyTempFileOperation.cs
@@ -86,7 +86,7 @@ namespace YooAsset
 		private void VerifyInThread(object obj)
 		{
 			VerifyTempFileElement element = (VerifyTempFileElement)obj;
-			int result = (int)CacheSystem.VerifyingTempFile(element);
+			int result = (int)CacheHelper.VerifyingTempFile(element);
 			element.Result = result;
 		}
 	}
@@ -121,7 +121,7 @@ namespace YooAsset
 
 			if (_steps == ESteps.VerifyFile)
 			{
-				_element.Result = (int)CacheSystem.VerifyingTempFile(_element);
+				_element.Result = (int)CacheHelper.VerifyingTempFile(_element);
 
 				VerifyResult = (EVerifyResult)_element.Result;
 				if (VerifyResult == EVerifyResult.Succeed)
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/VerifyTempFileOperation.cs.meta b/Assets/YooAsset/Runtime/CacheSystem/Operation/Internal/VerifyTempFileOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/VerifyTempFileOperation.cs.meta
rename to Assets/YooAsset/Runtime/CacheSystem/Operation/Internal/VerifyTempFileOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Operations/PackageCachingOperation.cs b/Assets/YooAsset/Runtime/CacheSystem/Operation/PackageCachingOperation.cs
similarity index 65%
rename from Assets/YooAsset/Runtime/CacheSystem/Operations/PackageCachingOperation.cs
rename to Assets/YooAsset/Runtime/CacheSystem/Operation/PackageCachingOperation.cs
index c8c9777..40bf5d9 100644
--- a/Assets/YooAsset/Runtime/CacheSystem/Operations/PackageCachingOperation.cs
+++ b/Assets/YooAsset/Runtime/CacheSystem/Operation/PackageCachingOperation.cs
@@ -15,14 +15,16 @@ namespace YooAsset
 			Done,
 		}
 
-		private readonly string _packageName;
+		private readonly PersistentManager _persistent;
+		private readonly CacheManager _cache;
 		private FindCacheFilesOperation _findCacheFilesOp;
 		private VerifyCacheFilesOperation _verifyCacheFilesOp;
 		private ESteps _steps = ESteps.None;
 
-		public PackageCachingOperation(string packageName)
+		public PackageCachingOperation(PersistentManager persistent, CacheManager cache)
 		{
-			_packageName = packageName;
+			_persistent = persistent;
+			_cache = cache;
 		}
 		internal override void Start()
 		{
@@ -37,8 +39,8 @@ namespace YooAsset
 			{
 				if (_findCacheFilesOp == null)
 				{
-					_findCacheFilesOp = new FindCacheFilesOperation(_packageName);
-					OperationSystem.StartOperation(_findCacheFilesOp);
+					_findCacheFilesOp = new FindCacheFilesOperation(_persistent, _cache);
+					OperationSystem.StartOperation(_cache.PackageName, _findCacheFilesOp);
 				}
 
 				Progress = _findCacheFilesOp.Progress;
@@ -52,8 +54,8 @@ namespace YooAsset
 			{
 				if (_verifyCacheFilesOp == null)
 				{
-					_verifyCacheFilesOp = VerifyCacheFilesOperation.CreateOperation(_findCacheFilesOp.VerifyElements);
-					OperationSystem.StartOperation(_verifyCacheFilesOp);
+					_verifyCacheFilesOp = VerifyCacheFilesOperation.CreateOperation(_cache, _findCacheFilesOp.VerifyElements);
+					OperationSystem.StartOperation(_cache.PackageName, _verifyCacheFilesOp);
 				}
 
 				Progress = _verifyCacheFilesOp.Progress;
@@ -64,8 +66,8 @@ namespace YooAsset
 				_steps = ESteps.Done;
 				Status = EOperationStatus.Succeed;
 
-				int totalCount = CacheSystem.GetCachedFilesCount(_packageName);
-				YooLogger.Log($"Package '{_packageName}' cached files count : {totalCount}");
+				int totalCount = _cache.GetAllCachedFilesCount();
+				YooLogger.Log($"Package '{_cache.PackageName}' cached files count : {totalCount}");
 			}
 		}
 	}
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Operations/PackageCachingOperation.cs.meta b/Assets/YooAsset/Runtime/CacheSystem/Operation/PackageCachingOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/CacheSystem/Operations/PackageCachingOperation.cs.meta
rename to Assets/YooAsset/Runtime/CacheSystem/Operation/PackageCachingOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/FindCacheFilesOperation.cs b/Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/FindCacheFilesOperation.cs
deleted file mode 100644
index f2987e9..0000000
--- a/Assets/YooAsset/Runtime/CacheSystem/Operations/Internal/FindCacheFilesOperation.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-using System;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace YooAsset
-{
-	internal class FindCacheFilesOperation : AsyncOperationBase
-	{
-		private enum ESteps
-		{
-			None,
-			FindPrepare,
-			FindBundleFiles,
-			FindRawFiles,
-			Done,
-		}
-
-		private readonly string _packageName;
-		private float _verifyStartTime;
-		private IEnumerator<DirectoryInfo> _bundleFilesEnumerator = null;
-		private IEnumerator<DirectoryInfo> _rawFilesEnumerator = null;
-		private ESteps _steps = ESteps.None;
-
-		/// <summary>
-		/// 需要验证的元素
-		/// </summary>
-		public readonly List<VerifyCacheFileElement> VerifyElements = new List<VerifyCacheFileElement>(5000);
-
-		public FindCacheFilesOperation(string packageName)
-		{
-			_packageName = packageName;
-		}
-		internal override void Start()
-		{
-			_steps = ESteps.FindPrepare;
-			_verifyStartTime = UnityEngine.Time.realtimeSinceStartup;
-		}
-		internal override void Update()
-		{
-			if (_steps == ESteps.None || _steps == ESteps.Done)
-				return;
-
-			if (_steps == ESteps.FindPrepare)
-			{
-				// BundleFiles
-				{
-					string rootPath = PersistentTools.GetPersistent(_packageName).SandboxCacheBundleFilesRoot;
-					DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
-					if (rootDirectory.Exists)
-					{
-						var directorieInfos = rootDirectory.EnumerateDirectories();
-						_bundleFilesEnumerator = directorieInfos.GetEnumerator();
-					}
-				}
-
-				// RawFiles
-				{
-					string rootPath = PersistentTools.GetPersistent(_packageName).SandboxCacheRawFilesRoot;
-					DirectoryInfo rootDirectory = new DirectoryInfo(rootPath);
-					if (rootDirectory.Exists)
-					{
-						var directorieInfos = rootDirectory.EnumerateDirectories();
-						_rawFilesEnumerator = directorieInfos.GetEnumerator();
-					}
-				}
-
-				_steps = ESteps.FindBundleFiles;
-			}
-
-			if (_steps == ESteps.FindBundleFiles)
-			{
-				if (UpdateFindBundleFiles())
-					return;
-
-				_steps = ESteps.FindRawFiles;
-			}
-
-			if (_steps == ESteps.FindRawFiles)
-			{
-				if (UpdateFindRawFiles())
-					return;
-
-				// 注意：总是返回成功
-				_steps = ESteps.Done;
-				Status = EOperationStatus.Succeed;
-				float costTime = UnityEngine.Time.realtimeSinceStartup - _verifyStartTime;
-				YooLogger.Log($"Find cache files elapsed time {costTime:f1} seconds");
-			}
-		}
-
-		private bool UpdateFindBundleFiles()
-		{
-			if (_bundleFilesEnumerator == null)
-				return false;
-
-			bool isFindItem;
-			while (true)
-			{
-				isFindItem = _bundleFilesEnumerator.MoveNext();
-				if (isFindItem == false)
-					break;
-
-				var rootFoder = _bundleFilesEnumerator.Current;
-				var childDirectories = rootFoder.GetDirectories();
-				foreach(var chidDirectory in childDirectories)
-				{
-					string cacheGUID = chidDirectory.Name;
-					if (CacheSystem.IsCached(_packageName, cacheGUID))
-						continue;
-
-					// 创建验证元素类
-					string fileRootPath = chidDirectory.FullName;
-					string dataFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleDataFileName}";
-					string infoFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleInfoFileName}";
-					VerifyCacheFileElement element = new VerifyCacheFileElement(_packageName, cacheGUID, fileRootPath, dataFilePath, infoFilePath);
-					VerifyElements.Add(element);
-				}
-
-				if (OperationSystem.IsBusy)
-					break;
-			}
-
-			return isFindItem;
-		}
-		private bool UpdateFindRawFiles()
-		{
-			if (_rawFilesEnumerator == null)
-				return false;
-
-			bool isFindItem;
-			while (true)
-			{
-				isFindItem = _rawFilesEnumerator.MoveNext();
-				if (isFindItem == false)
-					break;
-
-				var rootFoder = _rawFilesEnumerator.Current;
-				var childDirectories = rootFoder.GetDirectories();
-				foreach (var chidDirectory in childDirectories)
-				{
-					string cacheGUID = chidDirectory.Name;
-					if (CacheSystem.IsCached(_packageName, cacheGUID))
-						continue;
-
-					// 获取数据文件的后缀名
-					string dataFileExtension = string.Empty;
-					var fileInfos = chidDirectory.GetFiles();
-					foreach (var fileInfo in fileInfos)
-					{
-						if (fileInfo.Extension == ".temp")
-							continue;
-						if (fileInfo.Name.StartsWith(YooAssetSettings.CacheBundleDataFileName))
-						{
-							dataFileExtension = fileInfo.Extension;
-							break;
-						}
-					}
-
-					// 创建验证元素类
-					string fileRootPath = chidDirectory.FullName;
-					string dataFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleDataFileName}{dataFileExtension}";
-					string infoFilePath = $"{fileRootPath}/{ YooAssetSettings.CacheBundleInfoFileName}";
-					VerifyCacheFileElement element = new VerifyCacheFileElement(_packageName, cacheGUID, fileRootPath, dataFilePath, infoFilePath);
-					VerifyElements.Add(element);
-				}
-
-				if (OperationSystem.IsBusy)
-					break;
-			}
-
-			return isFindItem;
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/CacheSystem/PersistentHelper.cs b/Assets/YooAsset/Runtime/CacheSystem/PersistentHelper.cs
new file mode 100644
index 0000000..9569d96
--- /dev/null
+++ b/Assets/YooAsset/Runtime/CacheSystem/PersistentHelper.cs
@@ -0,0 +1,24 @@
+
+namespace YooAsset
+{
+	internal static class PersistentHelper
+	{
+		/// <summary>
+		/// 获取WWW加载本地资源的路径
+		/// </summary>
+		public static string ConvertToWWWPath(string path)
+		{
+#if UNITY_EDITOR
+			return StringUtility.Format("file:///{0}", path);
+#elif UNITY_IPHONE
+			return StringUtility.Format("file://{0}", path);
+#elif UNITY_ANDROID
+			return path;
+#elif UNITY_STANDALONE
+			return StringUtility.Format("file:///{0}", path);
+#elif UNITY_WEBGL
+			return path;
+#endif
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/CacheSystem/PersistentTools.cs.meta b/Assets/YooAsset/Runtime/CacheSystem/PersistentHelper.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/CacheSystem/PersistentTools.cs.meta
rename to Assets/YooAsset/Runtime/CacheSystem/PersistentHelper.cs.meta
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Persistent.cs b/Assets/YooAsset/Runtime/CacheSystem/PersistentManager.cs
similarity index 57%
rename from Assets/YooAsset/Runtime/CacheSystem/Persistent.cs
rename to Assets/YooAsset/Runtime/CacheSystem/PersistentManager.cs
index b4ab6a1..1e7467b 100644
--- a/Assets/YooAsset/Runtime/CacheSystem/Persistent.cs
+++ b/Assets/YooAsset/Runtime/CacheSystem/PersistentManager.cs
@@ -1,31 +1,43 @@
-using System.IO;
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
 
 namespace YooAsset
 {
-	internal class Persistent
+	internal class PersistentManager
 	{
-		private readonly string _packageName;
+		private readonly Dictionary<string, string> _cachedDataFilePaths = new Dictionary<string, string>(10000);
+		private readonly Dictionary<string, string> _cachedInfoFilePaths = new Dictionary<string, string>(10000);
+		private readonly Dictionary<string, string> _tempDataFilePaths = new Dictionary<string, string>(10000);
+		private readonly Dictionary<string, string> _buildinFilePaths = new Dictionary<string, string>(10000);
+
+		/// <summary>
+		/// 所属包裹
+		/// </summary>
+		public readonly string PackageName;
 
 		public string BuildinRoot { private set; get; }
 		public string BuildinPackageRoot { private set; get; }
 
 		public string SandboxRoot { private set; get; }
 		public string SandboxPackageRoot { private set; get; }
-		public string SandboxCacheBundleFilesRoot { private set; get; }
-		public string SandboxCacheRawFilesRoot { private set; get; }
+		public string SandboxCacheFilesRoot { private set; get; }
 		public string SandboxManifestFilesRoot { private set; get; }
 		public string SandboxAppFootPrintFilePath { private set; get; }
 
+		public bool AppendFileExtension { private set; get; }
 
-		public Persistent(string packageName)
+
+		public PersistentManager(string packageName)
 		{
-			_packageName = packageName;
+			PackageName = packageName;
 		}
 
 		/// <summary>
-		/// 重写根路径
+		/// 初始化
 		/// </summary>
-		public void OverwriteRootDirectory(string buildinRoot, string sandboxRoot)
+		public void Initialize(string buildinRoot, string sandboxRoot, bool appendFileExtension)
 		{
 			if (string.IsNullOrEmpty(buildinRoot))
 				BuildinRoot = CreateDefaultBuildinRoot();
@@ -37,12 +49,12 @@ namespace YooAsset
 			else
 				SandboxRoot = sandboxRoot;
 
-			BuildinPackageRoot = PathUtility.Combine(BuildinRoot, _packageName);
-			SandboxPackageRoot = PathUtility.Combine(SandboxRoot, _packageName);
-			SandboxCacheBundleFilesRoot = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.CachedBundleFileFolder);
-			SandboxCacheRawFilesRoot = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.CachedRawFileFolder);
+			BuildinPackageRoot = PathUtility.Combine(BuildinRoot, PackageName);
+			SandboxPackageRoot = PathUtility.Combine(SandboxRoot, PackageName);
+			SandboxCacheFilesRoot = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.CacheFilesFolderName);
 			SandboxManifestFilesRoot = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.ManifestFolderName);
 			SandboxAppFootPrintFilePath = PathUtility.Combine(SandboxPackageRoot, YooAssetSettings.AppFootPrintFileName);
+			AppendFileExtension = appendFileExtension;
 		}
 		private static string CreateDefaultBuildinRoot()
 		{
@@ -62,6 +74,47 @@ namespace YooAsset
 #endif
 		}
 
+		public string GetCachedDataFilePath(PackageBundle bundle)
+		{
+			if (_cachedDataFilePaths.TryGetValue(bundle.CacheGUID, out string filePath) == false)
+			{
+				string folderName = bundle.FileHash.Substring(0, 2);
+				filePath = PathUtility.Combine(SandboxCacheFilesRoot, folderName, bundle.CacheGUID, YooAssetSettings.CacheBundleDataFileName);
+				if (AppendFileExtension)
+					filePath += bundle.FileExtension;
+				_cachedDataFilePaths.Add(bundle.CacheGUID, filePath);
+			}
+			return filePath;
+		}
+		public string GetCachedInfoFilePath(PackageBundle bundle)
+		{
+			if (_cachedInfoFilePaths.TryGetValue(bundle.CacheGUID, out string filePath) == false)
+			{
+				string folderName = bundle.FileHash.Substring(0, 2);
+				filePath = PathUtility.Combine(SandboxCacheFilesRoot, folderName, bundle.CacheGUID, YooAssetSettings.CacheBundleInfoFileName);
+				_cachedInfoFilePaths.Add(bundle.CacheGUID, filePath);
+			}
+			return filePath;
+		}
+		public string GetTempDataFilePath(PackageBundle bundle)
+		{
+			if (_tempDataFilePaths.TryGetValue(bundle.CacheGUID, out string filePath) == false)
+			{
+				string cachedDataFilePath = GetCachedDataFilePath(bundle);
+				filePath = $"{cachedDataFilePath}.temp";
+				_tempDataFilePaths.Add(bundle.CacheGUID, filePath);
+			}
+			return filePath;
+		}
+		public string GetBuildinFilePath(PackageBundle bundle)
+		{
+			if (_buildinFilePaths.TryGetValue(bundle.CacheGUID, out string filePath) == false)
+			{
+				filePath = PathUtility.Combine(BuildinPackageRoot, bundle.FileName);
+				_buildinFilePaths.Add(bundle.CacheGUID, filePath);
+			}
+			return filePath;
+		}
 
 		/// <summary>
 		/// 删除沙盒里的包裹目录
@@ -71,19 +124,14 @@ namespace YooAsset
 			if (Directory.Exists(SandboxPackageRoot))
 				Directory.Delete(SandboxPackageRoot, true);
 		}
-		
+
 		/// <summary>
 		/// 删除沙盒内的缓存文件夹
 		/// </summary>
 		public void DeleteSandboxCacheFilesFolder()
 		{
-			// CacheBundleFiles
-			if (Directory.Exists(SandboxCacheBundleFilesRoot))
-				Directory.Delete(SandboxCacheBundleFilesRoot, true);
-
-			// CacheRawFiles
-			if (Directory.Exists(SandboxCacheRawFilesRoot))
-				Directory.Delete(SandboxCacheRawFilesRoot, true);
+			if (Directory.Exists(SandboxCacheFilesRoot))
+				Directory.Delete(SandboxCacheFilesRoot, true);
 		}
 
 		/// <summary>
@@ -101,7 +149,7 @@ namespace YooAsset
 		/// </summary>
 		public string GetSandboxPackageManifestFilePath(string packageVersion)
 		{
-			string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, packageVersion);
+			string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
 			return PathUtility.Combine(SandboxManifestFilesRoot, fileName);
 		}
 
@@ -110,7 +158,7 @@ namespace YooAsset
 		/// </summary>
 		public string GetSandboxPackageHashFilePath(string packageVersion)
 		{
-			string fileName = YooAssetSettingsData.GetPackageHashFileName(_packageName, packageVersion);
+			string fileName = YooAssetSettingsData.GetPackageHashFileName(PackageName, packageVersion);
 			return PathUtility.Combine(SandboxManifestFilesRoot, fileName);
 		}
 
@@ -119,7 +167,7 @@ namespace YooAsset
 		/// </summary>
 		public string GetSandboxPackageVersionFilePath()
 		{
-			string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName);
+			string fileName = YooAssetSettingsData.GetPackageVersionFileName(PackageName);
 			return PathUtility.Combine(SandboxManifestFilesRoot, fileName);
 		}
 
@@ -138,7 +186,7 @@ namespace YooAsset
 		/// </summary>
 		public string GetBuildinPackageManifestFilePath(string packageVersion)
 		{
-			string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, packageVersion);
+			string fileName = YooAssetSettingsData.GetManifestBinaryFileName(PackageName, packageVersion);
 			return PathUtility.Combine(BuildinPackageRoot, fileName);
 		}
 
@@ -147,7 +195,7 @@ namespace YooAsset
 		/// </summary>
 		public string GetBuildinPackageHashFilePath(string packageVersion)
 		{
-			string fileName = YooAssetSettingsData.GetPackageHashFileName(_packageName, packageVersion);
+			string fileName = YooAssetSettingsData.GetPackageHashFileName(PackageName, packageVersion);
 			return PathUtility.Combine(BuildinPackageRoot, fileName);
 		}
 
@@ -156,7 +204,7 @@ namespace YooAsset
 		/// </summary>
 		public string GetBuildinPackageVersionFilePath()
 		{
-			string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName);
+			string fileName = YooAssetSettingsData.GetPackageVersionFileName(PackageName);
 			return PathUtility.Combine(BuildinPackageRoot, fileName);
 		}
 	}
diff --git a/Assets/YooAsset/Runtime/CacheSystem/Persistent.cs.meta b/Assets/YooAsset/Runtime/CacheSystem/PersistentManager.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/CacheSystem/Persistent.cs.meta
rename to Assets/YooAsset/Runtime/CacheSystem/PersistentManager.cs.meta
diff --git a/Assets/YooAsset/Runtime/CacheSystem/PersistentTools.cs b/Assets/YooAsset/Runtime/CacheSystem/PersistentTools.cs
deleted file mode 100644
index a0c2fb6..0000000
--- a/Assets/YooAsset/Runtime/CacheSystem/PersistentTools.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.IO;
-using System.Collections.Generic;
-
-namespace YooAsset
-{
-	internal class PersistentTools
-	{
-		private static readonly Dictionary<string, Persistent> _persitentDic = new Dictionary<string, Persistent>(100);
-
-		/// <summary>
-		/// 获取包裹的持久化类
-		/// </summary>
-		public static Persistent GetPersistent(string packageName)
-		{
-			if (_persitentDic.ContainsKey(packageName) == false)
-				throw new System.Exception("Should never get here !");
-			return _persitentDic[packageName];
-		}
-
-		/// <summary>
-		/// 获取或创建包裹的持久化类
-		/// </summary>
-		public static Persistent GetOrCreatePersistent(string packageName)
-		{
-			if (_persitentDic.ContainsKey(packageName) == false)
-			{
-				Persistent persistent = new Persistent(packageName);
-				_persitentDic.Add(packageName, persistent);
-			}
-			return _persitentDic[packageName];
-		}
-
-		/// <summary>
-		/// 获取WWW加载本地资源的路径
-		/// </summary>
-		public static string ConvertToWWWPath(string path)
-		{
-#if UNITY_EDITOR
-			return StringUtility.Format("file:///{0}", path);
-#elif UNITY_IPHONE
-			return StringUtility.Format("file://{0}", path);
-#elif UNITY_ANDROID
-			return path;
-#elif UNITY_STANDALONE
-			return StringUtility.Format("file:///{0}", path);
-#elif UNITY_WEBGL
-			return path;
-#endif
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/CacheSystem/VerifyElement.cs b/Assets/YooAsset/Runtime/CacheSystem/VerifyElement.cs
index fda536b..83ca07b 100644
--- a/Assets/YooAsset/Runtime/CacheSystem/VerifyElement.cs
+++ b/Assets/YooAsset/Runtime/CacheSystem/VerifyElement.cs
@@ -28,14 +28,13 @@ namespace YooAsset
 
 		public void DeleteFiles()
 		{
-			if (File.Exists(DataFilePath))
+			try
 			{
-				File.Delete(DataFilePath);
+				Directory.Delete(FileRootPath, true);
 			}
-
-			if (File.Exists(InfoFilePath))
+			catch(System.Exception e)
 			{
-				File.Delete(InfoFilePath);
+				YooLogger.Warning($"Failed delete cache bundle folder : {e}");
 			}
 		}
 	}
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/DownloadHelper.cs b/Assets/YooAsset/Runtime/DownloadSystem/DownloadHelper.cs
new file mode 100644
index 0000000..8aa06e1
--- /dev/null
+++ b/Assets/YooAsset/Runtime/DownloadSystem/DownloadHelper.cs
@@ -0,0 +1,41 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+using UnityEngine.Networking;
+
+namespace YooAsset
+{
+	/// <summary>
+	/// 自定义下载器的请求委托
+	/// </summary>
+	public delegate UnityWebRequest DownloadRequestDelegate(string url);
+
+
+	internal static class DownloadHelper
+	{
+		/// <summary>
+		/// 下载失败后清理文件的HTTP错误码
+		/// </summary>
+		public static List<long> ClearFileResponseCodes { set; get; }
+
+		/// <summary>
+		/// 自定义下载器的请求委托
+		/// </summary>
+		public static DownloadRequestDelegate RequestDelegate = null;
+
+		/// <summary>
+		/// 创建一个新的网络请求
+		/// </summary>
+		public static UnityWebRequest NewRequest(string requestURL)
+		{
+			UnityWebRequest webRequest;
+			if (RequestDelegate != null)
+				webRequest = RequestDelegate.Invoke(requestURL);
+			else
+				webRequest = new UnityWebRequest(requestURL, UnityWebRequest.kHttpVerbGET);
+			return webRequest;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/DownloadSystem.cs.meta b/Assets/YooAsset/Runtime/DownloadSystem/DownloadHelper.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/DownloadSystem/DownloadSystem.cs.meta
rename to Assets/YooAsset/Runtime/DownloadSystem/DownloadHelper.cs.meta
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/DownloadManager.cs b/Assets/YooAsset/Runtime/DownloadSystem/DownloadManager.cs
new file mode 100644
index 0000000..c3b0431
--- /dev/null
+++ b/Assets/YooAsset/Runtime/DownloadSystem/DownloadManager.cs
@@ -0,0 +1,132 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine.Networking;
+
+namespace YooAsset
+{
+	/// <summary>
+	/// 1. 保证每一时刻资源文件只存在一个下载器
+	/// 2. 保证下载器下载完成后立刻验证并缓存
+	/// 3. 保证资源文件不会被重复下载
+	/// </summary>
+	internal class DownloadManager
+	{
+		private readonly Dictionary<string, DownloaderBase> _downloaders = new Dictionary<string, DownloaderBase>(1000);
+		private readonly List<string> _removeList = new List<string>(1000);
+
+		private uint _breakpointResumeFileSize;
+
+		/// <summary>
+		/// 所属包裹
+		/// </summary>
+		public readonly string PackageName;
+
+
+		public DownloadManager(string packageName)
+		{
+			PackageName = packageName;
+		}
+
+		/// <summary>
+		/// 初始化
+		/// </summary>
+		public void Initialize(uint breakpointResumeFileSize)
+		{
+			_breakpointResumeFileSize = breakpointResumeFileSize;
+		}
+
+		/// <summary>
+		/// 更新下载器
+		/// </summary>
+		public void Update()
+		{
+			// 更新下载器
+			_removeList.Clear();
+			foreach (var valuePair in _downloaders)
+			{
+				var downloader = valuePair.Value;
+				downloader.Update();
+				if (downloader.IsDone())
+					_removeList.Add(valuePair.Key);
+			}
+
+			// 移除下载器
+			foreach (var key in _removeList)
+			{
+				_downloaders.Remove(key);
+			}
+		}
+
+		/// <summary>
+		/// 销毁所有下载器
+		/// </summary>
+		public void DestroyAll()
+		{
+			foreach (var valuePair in _downloaders)
+			{
+				var downloader = valuePair.Value;
+				downloader.Abort();
+			}
+
+			_downloaders.Clear();
+			_removeList.Clear();
+		}
+
+		/// <summary>
+		/// 创建下载器
+		/// 注意：只有第一次请求的参数才有效
+		/// </summary>
+		public DownloaderBase CreateDownload(BundleInfo bundleInfo, int failedTryAgain, int timeout = 60)
+		{
+			// 查询存在的下载器
+			if (_downloaders.TryGetValue(bundleInfo.CachedDataFilePath, out var downloader))
+				return downloader;
+
+			// 如果资源已经缓存
+			if (bundleInfo.IsCached())
+			{
+				var completedDownloader = new CompletedDownloader(bundleInfo);
+				return completedDownloader;
+			}
+
+			// 创建新的下载器	
+			YooLogger.Log($"Beginning to download bundle : {bundleInfo.Bundle.BundleName} URL : {bundleInfo.RemoteMainURL}");
+#if UNITY_WEBGL
+			if (bundleInfo.Bundle.Buildpipeline == DefaultBuildPipeline.RawFileBuildPipelineName)
+			{
+				FileUtility.CreateFileDirectory(bundleInfo.CachedDataFilePath);
+				System.Type requesterType = typeof(FileGeneralRequest);
+				DownloaderBase newDownloader = new FileDownloader(bundleInfo, requesterType, failedTryAgain, timeout);
+				_downloaders.Add(bundleInfo.CachedDataFilePath, newDownloader);
+				return newDownloader;
+			}
+			else
+			{
+				System.Type requesterType = typeof(AssetBundleWebRequest);
+				WebDownloader newDownloader = new WebDownloader(bundleInfo, requesterType, failedTryAgain, timeout);
+				_downloaders.Add(bundleInfo.CachedDataFilePath, newDownloader);
+				return newDownloader;
+			}
+#else
+			FileUtility.CreateFileDirectory(bundleInfo.CachedDataFilePath);
+			bool resumeDownload = bundleInfo.Bundle.FileSize >= _breakpointResumeFileSize;
+			if (resumeDownload)
+			{
+				System.Type requesterType = typeof(FileResumeRequest);
+				DownloaderBase newDownloader = new FileDownloader(bundleInfo, requesterType, failedTryAgain, timeout);
+				_downloaders.Add(bundleInfo.CachedDataFilePath, newDownloader);
+				return newDownloader;
+			}
+			else
+			{
+				System.Type requesterType = typeof(FileGeneralRequest);
+				DownloaderBase newDownloader = new FileDownloader(bundleInfo, requesterType, failedTryAgain, timeout);
+				_downloaders.Add(bundleInfo.CachedDataFilePath, newDownloader);
+				return newDownloader;
+			}
+#endif
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/DownloadManager.cs.meta b/Assets/YooAsset/Runtime/DownloadSystem/DownloadManager.cs.meta
new file mode 100644
index 0000000..dceffc0
--- /dev/null
+++ b/Assets/YooAsset/Runtime/DownloadSystem/DownloadManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6fbbbfe01e018b241bf33469f870a4b8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/DownloadReport.cs b/Assets/YooAsset/Runtime/DownloadSystem/DownloadReport.cs
deleted file mode 100644
index b1c8c6a..0000000
--- a/Assets/YooAsset/Runtime/DownloadSystem/DownloadReport.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-
-namespace YooAsset
-{
-	public struct DownloadReport
-	{
-		/// <summary>
-		/// 下载进度（0f~1f）
-		/// </summary>
-		public float Progress;
-
-		/// <summary>
-		/// 需要下载的总字节数
-		/// </summary>
-		public ulong TotalSize;
-
-		/// <summary>
-		/// 已经下载的字节数
-		/// </summary>
-		public ulong DownloadedBytes;
-
-		public static DownloadReport CreateDefaultReport()
-		{
-			DownloadReport report = new DownloadReport();
-			report.Progress = 0f;
-			report.TotalSize = 0;
-			report.DownloadedBytes = 0;
-			return report;
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/DownloadStatus.cs b/Assets/YooAsset/Runtime/DownloadSystem/DownloadStatus.cs
new file mode 100644
index 0000000..d9296ea
--- /dev/null
+++ b/Assets/YooAsset/Runtime/DownloadSystem/DownloadStatus.cs
@@ -0,0 +1,36 @@
+
+namespace YooAsset
+{
+	public struct DownloadStatus
+	{
+		/// <summary>
+		/// 下载是否完成
+		/// </summary>
+		public bool IsDone;
+
+		/// <summary>
+		/// 下载进度（0f~1f）
+		/// </summary>
+		public float Progress;
+
+		/// <summary>
+		/// 需要下载的总字节数
+		/// </summary>
+		public ulong TotalBytes;
+
+		/// <summary>
+		/// 已经下载的字节数
+		/// </summary>
+		public ulong DownloadedBytes;
+
+		public static DownloadStatus CreateDefaultStatus()
+		{
+			DownloadStatus status = new DownloadStatus();
+			status.IsDone = false;
+			status.Progress = 0f;
+			status.TotalBytes = 0;
+			status.DownloadedBytes = 0;
+			return status;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/DownloadReport.cs.meta b/Assets/YooAsset/Runtime/DownloadSystem/DownloadStatus.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/DownloadSystem/DownloadReport.cs.meta
rename to Assets/YooAsset/Runtime/DownloadSystem/DownloadStatus.cs.meta
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/DownloadSystem.cs b/Assets/YooAsset/Runtime/DownloadSystem/DownloadSystem.cs
deleted file mode 100644
index 81f77dd..0000000
--- a/Assets/YooAsset/Runtime/DownloadSystem/DownloadSystem.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-using System;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading;
-using UnityEngine.Networking;
-
-namespace YooAsset
-{
-	/// <summary>
-	/// 自定义下载器的请求委托
-	/// </summary>
-	public delegate UnityWebRequest DownloadRequestDelegate(string url);
-
-	/// <summary>
-	/// 1. 保证每一时刻资源文件只存在一个下载器
-	/// 2. 保证下载器下载完成后立刻验证并缓存
-	/// 3. 保证资源文件不会被重复下载
-	/// </summary>
-	internal static class DownloadSystem
-	{
-		private static readonly Dictionary<string, DownloaderBase> _downloaderDic = new Dictionary<string, DownloaderBase>();
-		private static readonly List<string> _removeList = new List<string>(100);
-
-		/// <summary>
-		/// 自定义下载器的请求委托
-		/// </summary>
-		public static DownloadRequestDelegate RequestDelegate = null;
-
-		/// <summary>
-		/// 自定义的证书认证实例
-		/// </summary>
-		public static CertificateHandler CertificateHandlerInstance = null;
-
-		/// <summary>
-		/// 网络重定向次数
-		/// </summary>
-		public static int RedirectLimit { set; get; } = -1;
-
-		/// <summary>
-		/// 启用断点续传功能文件的最小字节数
-		/// </summary>
-		public static int BreakpointResumeFileSize { set; get; } = int.MaxValue;
-
-		/// <summary>
-		/// 下载失败后清理文件的HTTP错误码
-		/// </summary>
-		public static List<long> ClearFileResponseCodes { set; get; }
-
-
-		/// <summary>
-		/// 初始化下载器
-		/// </summary>
-		public static void Initialize()
-		{
-		}
-
-		/// <summary>
-		/// 更新下载器
-		/// </summary>
-		public static void Update()
-		{
-			// 更新下载器
-			_removeList.Clear();
-			foreach (var valuePair in _downloaderDic)
-			{
-				var downloader = valuePair.Value;
-				downloader.Update();
-				if (downloader.IsDone())
-					_removeList.Add(valuePair.Key);
-			}
-
-			// 移除下载器
-			foreach (var key in _removeList)
-			{
-				_downloaderDic.Remove(key);
-			}
-		}
-
-		/// <summary>
-		/// 销毁所有下载器
-		/// </summary>
-		public static void DestroyAll()
-		{
-			foreach (var valuePair in _downloaderDic)
-			{
-				var downloader = valuePair.Value;
-				downloader.Abort();
-			}
-			_downloaderDic.Clear();
-			_removeList.Clear();
-
-			RequestDelegate = null;
-			CertificateHandlerInstance = null;
-			BreakpointResumeFileSize = int.MaxValue;
-			ClearFileResponseCodes = null;
-		}
-
-
-		/// <summary>
-		/// 创建下载器
-		/// 注意：只有第一次请求的参数才有效
-		/// </summary>
-		public static DownloaderBase CreateDownload(BundleInfo bundleInfo, int failedTryAgain, int timeout = 60)
-		{
-			// 查询存在的下载器
-			if (_downloaderDic.TryGetValue(bundleInfo.Bundle.CachedDataFilePath, out var downloader))
-				return downloader;
-
-			// 如果资源已经缓存
-			if (CacheSystem.IsCached(bundleInfo.Bundle.PackageName, bundleInfo.Bundle.CacheGUID))
-			{
-				var completedDownloader = new CompletedDownloader(bundleInfo);
-				return completedDownloader;
-			}
-
-			// 创建新的下载器	
-			YooLogger.Log($"Beginning to download bundle : {bundleInfo.Bundle.BundleName} URL : {bundleInfo.RemoteMainURL}");
-#if UNITY_WEBGL
-			if (bundleInfo.Bundle.IsRawFile)
-			{
-				FileUtility.CreateFileDirectory(bundleInfo.Bundle.CachedDataFilePath);
-				DownloaderBase newDownloader = new FileGeneralDownloader(bundleInfo, failedTryAgain, timeout);
-				_downloaderDic.Add(bundleInfo.Bundle.CachedDataFilePath, newDownloader);
-				return newDownloader;
-			}
-			else
-			{
-				WebDownloader newDownloader = new WebDownloader(bundleInfo, failedTryAgain, timeout);
-				_downloaderDic.Add(bundleInfo.Bundle.CachedDataFilePath, newDownloader);
-				return newDownloader;
-			}
-#else
-			FileUtility.CreateFileDirectory(bundleInfo.Bundle.CachedDataFilePath);
-			bool resumeDownload = bundleInfo.Bundle.FileSize >= BreakpointResumeFileSize;
-			DownloaderBase newDownloader;
-			if (resumeDownload)
-				newDownloader = new FileResumeDownloader(bundleInfo, failedTryAgain, timeout);
-			else
-				newDownloader = new FileGeneralDownloader(bundleInfo, failedTryAgain, timeout);
-			_downloaderDic.Add(bundleInfo.Bundle.CachedDataFilePath, newDownloader);
-			return newDownloader;
-#endif
-		}
-
-		/// <summary>
-		/// 创建一个新的网络请求
-		/// </summary>
-		public static UnityWebRequest NewRequest(string requestURL)
-		{
-			UnityWebRequest webRequest;
-			if (RequestDelegate != null)
-				webRequest = RequestDelegate.Invoke(requestURL);
-			else
-				webRequest = new UnityWebRequest(requestURL, UnityWebRequest.kHttpVerbGET);
-
-			SetUnityWebRequestParam(webRequest);
-			return webRequest;
-		}
-
-		/// <summary>
-		/// 设置网络请求的自定义参数
-		/// </summary>
-		private static void SetUnityWebRequestParam(UnityWebRequest webRequest)
-		{
-			if (RedirectLimit >= 0)
-				webRequest.redirectLimit = RedirectLimit;
-
-			if (CertificateHandlerInstance != null)
-			{
-				webRequest.certificateHandler = CertificateHandlerInstance;
-				webRequest.disposeCertificateHandlerOnDispose = false;
-			}
-		}
-
-		/// <summary>
-		/// 获取下载器的总数
-		/// </summary>
-		public static int GetDownloaderTotalCount()
-		{
-			return _downloaderDic.Count;
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Downloader/CompletedDownloader.cs b/Assets/YooAsset/Runtime/DownloadSystem/Downloader/CompletedDownloader.cs
index 8c798f8..a027bd8 100644
--- a/Assets/YooAsset/Runtime/DownloadSystem/Downloader/CompletedDownloader.cs
+++ b/Assets/YooAsset/Runtime/DownloadSystem/Downloader/CompletedDownloader.cs
@@ -1,12 +1,14 @@
 
+using UnityEngine;
+
 namespace YooAsset
 {
 	internal sealed class CompletedDownloader : DownloaderBase
 	{
-		public CompletedDownloader(BundleInfo bundleInfo) : base(bundleInfo, 0, 0)
+		public CompletedDownloader(BundleInfo bundleInfo) : base(bundleInfo, null, 0, 0)
 		{
-			_downloadProgress = 1f;
-			_downloadedBytes = (ulong)bundleInfo.Bundle.FileSize;
+			DownloadProgress = 1f;
+			DownloadedBytes = (ulong)bundleInfo.Bundle.FileSize;
 			_status = EStatus.Succeed;
 		}
 
@@ -19,5 +21,9 @@ namespace YooAsset
 		public override void Abort()
 		{
 		}
+		public override AssetBundle GetAssetBundle()
+		{
+			throw new System.NotImplementedException();
+		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Downloader/DownloaderBase.cs b/Assets/YooAsset/Runtime/DownloadSystem/Downloader/DownloaderBase.cs
index f187903..7fb1dda 100644
--- a/Assets/YooAsset/Runtime/DownloadSystem/Downloader/DownloaderBase.cs
+++ b/Assets/YooAsset/Runtime/DownloadSystem/Downloader/DownloaderBase.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System;
 using UnityEngine;
 using UnityEngine.Networking;
 
@@ -14,22 +14,19 @@ namespace YooAsset
 		}
 
 		protected readonly BundleInfo _bundleInfo;
+		protected readonly System.Type _requesterType;
 		protected readonly int _timeout;
 		protected int _failedTryAgain;
 
-		protected UnityWebRequest _webRequest;
+		protected IWebRequester _requester;
 		protected EStatus _status = EStatus.None;
-		protected string _lastError = string.Empty;
-		protected long _lastCode = 0;
+		protected string _lastestNetError = string.Empty;
+		protected long _lastestHttpCode = 0;
 
 		// 请求次数
 		protected int _requestCount = 0;
 		protected string _requestURL;
 
-		// 下载进度
-		protected float _downloadProgress = 0f;
-		protected ulong _downloadedBytes = 0;
-
 		// 超时相关
 		protected bool _isAbort = false;
 		protected ulong _latestDownloadBytes;
@@ -45,29 +42,25 @@ namespace YooAsset
 		/// <summary>
 		/// 下载进度（0f~1f）
 		/// </summary>
-		public float DownloadProgress
-		{
-			get { return _downloadProgress; }
-		}
+		public float DownloadProgress { protected set; get; }
 
 		/// <summary>
 		/// 已经下载的总字节数
 		/// </summary>
-		public ulong DownloadedBytes
-		{
-			get { return _downloadedBytes; }
-		}
+		public ulong DownloadedBytes { protected set; get; }
 
 
-		public DownloaderBase(BundleInfo bundleInfo, int failedTryAgain, int timeout)
+		public DownloaderBase(BundleInfo bundleInfo, System.Type requesterType, int failedTryAgain, int timeout)
 		{
 			_bundleInfo = bundleInfo;
+			_requesterType = requesterType;
 			_failedTryAgain = failedTryAgain;
 			_timeout = timeout;
 		}
-		public abstract void SendRequest(params object[] param);
+		public abstract void SendRequest(params object[] args);
 		public abstract void Update();
 		public abstract void Abort();
+		public abstract AssetBundle GetAssetBundle();
 
 		/// <summary>
 		/// 获取下载文件的大小
@@ -123,7 +116,7 @@ namespace YooAsset
 		/// </summary>
 		public string GetLastError()
 		{
-			return $"Failed to download : {_requestURL} Error : {_lastError} Code : {_lastCode}";
+			return $"Failed to download : {_requestURL} Error : {_lastestNetError} Code : {_lastestHttpCode}";
 		}
 
 
@@ -158,36 +151,11 @@ namespace YooAsset
 				if (offset > _timeout)
 				{
 					YooLogger.Warning($"Web file request timeout : {_requestURL}");
-					_webRequest.Abort();
+					if(_requester != null)
+						_requester.Abort();
 					_isAbort = true;
 				}
 			}
 		}
-
-		/// <summary>
-		/// 缓存下载文件
-		/// </summary>
-		protected void CachingFile(string tempFilePath)
-		{
-			string infoFilePath = _bundleInfo.Bundle.CachedInfoFilePath;
-			string dataFilePath = _bundleInfo.Bundle.CachedDataFilePath;
-			string dataFileCRC = _bundleInfo.Bundle.FileCRC;
-			long dataFileSize = _bundleInfo.Bundle.FileSize;
-
-			if (File.Exists(infoFilePath))
-				File.Delete(infoFilePath);
-			if (File.Exists(dataFilePath))
-				File.Delete(dataFilePath);
-
-			FileInfo fileInfo = new FileInfo(tempFilePath);
-			fileInfo.MoveTo(dataFilePath);
-
-			// 写入信息文件记录验证数据
-			CacheFileInfo.WriteInfoToFile(infoFilePath, dataFileCRC, dataFileSize);
-
-			// 记录缓存文件
-			var wrapper = new PackageCache.RecordWrapper(infoFilePath, dataFilePath, dataFileCRC, dataFileSize);
-			CacheSystem.RecordFile(_bundleInfo.Bundle.PackageName, _bundleInfo.Bundle.CacheGUID, wrapper);
-		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileGeneralDownloader.cs b/Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileDownloader.cs
similarity index 55%
rename from Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileGeneralDownloader.cs
rename to Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileDownloader.cs
index 5d737bf..e4320f1 100644
--- a/Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileGeneralDownloader.cs
+++ b/Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileDownloader.cs
@@ -3,14 +3,13 @@ using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using UnityEngine;
-using UnityEngine.Networking;
 
 namespace YooAsset
 {
 	/// <summary>
-	/// 普通的下载器
+	/// 文件下载器
 	/// </summary>
-	internal sealed class FileGeneralDownloader : DownloaderBase
+	internal sealed class FileDownloader : DownloaderBase
 	{
 		private enum ESteps
 		{
@@ -25,16 +24,13 @@ namespace YooAsset
 			Done,
 		}
 
-		private readonly string _tempFilePath;
 		private VerifyTempFileOperation _verifyFileOp = null;
 		private ESteps _steps = ESteps.None;
 
-
-		public FileGeneralDownloader(BundleInfo bundleInfo, int failedTryAgain, int timeout) : base(bundleInfo, failedTryAgain, timeout)
+		public FileDownloader(BundleInfo bundleInfo, System.Type requesterType, int failedTryAgain, int timeout) : base(bundleInfo, requesterType, failedTryAgain, timeout)
 		{
-			_tempFilePath = bundleInfo.Bundle.TempDataFilePath;
 		}
-		public override void SendRequest(params object[] param)
+		public override void SendRequest(params object[] args)
 		{
 			if (_steps == ESteps.None)
 			{
@@ -55,8 +51,8 @@ namespace YooAsset
 				_requestURL = GetRequestURL();
 
 				// 重置变量
-				_downloadProgress = 0f;
-				_downloadedBytes = 0;
+				DownloadProgress = 0f;
+				DownloadedBytes = 0;
 
 				// 重置变量
 				_isAbort = false;
@@ -64,83 +60,51 @@ namespace YooAsset
 				_latestDownloadRealtime = Time.realtimeSinceStartup;
 
 				// 重置计时器
-				if(_tryAgainTimer > 0f)
+				if (_tryAgainTimer > 0f)
 					YooLogger.Warning($"Try again download : {_requestURL}");
 				_tryAgainTimer = 0f;
 
-				// 删除临时文件
-				if (File.Exists(_tempFilePath))
-					File.Delete(_tempFilePath);
-
 				_steps = ESteps.CreateDownloader;
 			}
 
 			// 创建下载器
 			if (_steps == ESteps.CreateDownloader)
 			{
-				_webRequest = DownloadSystem.NewRequest(_requestURL);
-				DownloadHandlerFile handler = new DownloadHandlerFile(_tempFilePath);
-				handler.removeFileOnAbort = true;
-				_webRequest.downloadHandler = handler;
-				_webRequest.disposeDownloadHandlerOnDispose = true;
-				_webRequest.SendWebRequest();
+				_requester = (IWebRequester)Activator.CreateInstance(_requesterType);
+				_requester.Create(_requestURL, _bundleInfo);
 				_steps = ESteps.CheckDownload;
 			}
 
 			// 检测下载结果
 			if (_steps == ESteps.CheckDownload)
 			{
-				_downloadProgress = _webRequest.downloadProgress;
-				_downloadedBytes = _webRequest.downloadedBytes;
-				if (_webRequest.isDone == false)
+				_requester.Update();
+				DownloadedBytes = _requester.DownloadedBytes;
+				DownloadProgress = _requester.DownloadProgress;
+				if (_requester.IsDone() == false)
 				{
 					CheckTimeout();
 					return;
 				}
 
-				bool hasError = false;
-
-				// 检查网络错误
-#if UNITY_2020_3_OR_NEWER
-				if (_webRequest.result != UnityWebRequest.Result.Success)
+				_lastestNetError = _requester.RequestNetError;
+				_lastestHttpCode = _requester.RequestHttpCode;
+				if (_requester.Status != ERequestStatus.Success)
 				{
-					hasError = true;
-					_lastError = _webRequest.error;
-					_lastCode = _webRequest.responseCode;
-				}
-#else
-				if (_webRequest.isNetworkError || _webRequest.isHttpError)
-				{
-					hasError = true;
-					_lastError = _webRequest.error;
-					_lastCode = _webRequest.responseCode;
-				}
-#endif
-
-				// 如果网络异常
-				if (hasError)
-				{
-					// 下载失败之后删除文件
-					if (File.Exists(_tempFilePath))
-						File.Delete(_tempFilePath);
-
 					_steps = ESteps.TryAgain;
 				}
 				else
 				{
 					_steps = ESteps.VerifyTempFile;
 				}
-
-				// 最终释放下载器
-				DisposeWebRequest();
 			}
 
 			// 验证下载文件
 			if (_steps == ESteps.VerifyTempFile)
 			{
-				VerifyTempFileElement element = new VerifyTempFileElement(_bundleInfo.Bundle.TempDataFilePath, _bundleInfo.Bundle.FileCRC, _bundleInfo.Bundle.FileSize);
+				VerifyTempFileElement element = new VerifyTempFileElement(_bundleInfo.TempDataFilePath, _bundleInfo.Bundle.FileCRC, _bundleInfo.Bundle.FileSize);
 				_verifyFileOp = VerifyTempFileOperation.CreateOperation(element);
-				OperationSystem.StartOperation(_verifyFileOp);
+				OperationSystem.StartOperation(_bundleInfo.Bundle.PackageName, _verifyFileOp);
 				_steps = ESteps.WaitingVerifyTempFile;
 			}
 
@@ -159,10 +123,11 @@ namespace YooAsset
 				}
 				else
 				{
-					if (File.Exists(_tempFilePath))
-						File.Delete(_tempFilePath);
+					string tempFilePath = _bundleInfo.TempDataFilePath;
+					if (File.Exists(tempFilePath))
+						File.Delete(tempFilePath);
 
-					_lastError = _verifyFileOp.Error;
+					_lastestNetError = _verifyFileOp.Error;
 					_steps = ESteps.TryAgain;
 				}
 			}
@@ -172,15 +137,13 @@ namespace YooAsset
 			{
 				try
 				{
-					CachingFile(_tempFilePath);
+					CachingFile();
 					_status = EStatus.Succeed;
 					_steps = ESteps.Done;
-					_lastError = string.Empty;
-					_lastCode = 0;
 				}
 				catch (Exception e)
 				{
-					_lastError = e.Message;
+					_lastestNetError = e.Message;
 					_steps = ESteps.TryAgain;
 				}
 			}
@@ -207,23 +170,47 @@ namespace YooAsset
 		}
 		public override void Abort()
 		{
+			if (_requester != null)
+				_requester.Abort();
+
 			if (IsDone() == false)
 			{
 				_status = EStatus.Failed;
 				_steps = ESteps.Done;
-				_lastError = "user abort";
-				_lastCode = 0;
-				DisposeWebRequest();
+				_lastestNetError = "user abort";
+				_lastestHttpCode = 0;
 			}
 		}
-
-		private void DisposeWebRequest()
+		public override AssetBundle GetAssetBundle()
 		{
-			if (_webRequest != null)
-			{
-				_webRequest.Dispose();
-				_webRequest = null;
-			}
+			throw new NotImplementedException();
+		}
+
+		/// <summary>
+		/// 缓存下载文件
+		/// </summary>
+		private void CachingFile()
+		{
+			string tempFilePath = _bundleInfo.TempDataFilePath;
+			string infoFilePath = _bundleInfo.CachedInfoFilePath;
+			string dataFilePath = _bundleInfo.CachedDataFilePath;
+			string dataFileCRC = _bundleInfo.Bundle.FileCRC;
+			long dataFileSize = _bundleInfo.Bundle.FileSize;
+
+			if (File.Exists(infoFilePath))
+				File.Delete(infoFilePath);
+			if (File.Exists(dataFilePath))
+				File.Delete(dataFilePath);
+
+			// 移动临时文件路径
+			FileInfo fileInfo = new FileInfo(tempFilePath);
+			fileInfo.MoveTo(dataFilePath);
+
+			// 写入信息文件记录验证数据
+			CacheFileInfo.WriteInfoToFile(infoFilePath, dataFileCRC, dataFileSize);
+
+			// 记录缓存文件
+			_bundleInfo.CacheRecord();
 		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileGeneralDownloader.cs.meta b/Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileDownloader.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileGeneralDownloader.cs.meta
rename to Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileDownloader.cs.meta
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileResumeDownloader.cs b/Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileResumeDownloader.cs
deleted file mode 100644
index f117d14..0000000
--- a/Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileResumeDownloader.cs
+++ /dev/null
@@ -1,295 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using UnityEngine;
-using UnityEngine.Networking;
-
-namespace YooAsset
-{
-	/// <summary>
-	/// 断点续传下载器
-	/// </summary>
-	internal sealed class FileResumeDownloader : DownloaderBase
-	{
-		private enum ESteps
-		{
-			None,
-			CheckTempFile,
-			WaitingCheckTempFile,
-			PrepareDownload,
-			CreateDownloader,
-			CheckDownload,
-			VerifyTempFile,
-			WaitingVerifyTempFile,
-			CachingFile,
-			TryAgain,
-			Done,
-		}
-
-		private readonly string _tempFilePath;
-		private DownloadHandlerFileRange _downloadHandle = null;
-		private VerifyTempFileOperation _checkFileOp = null;
-		private VerifyTempFileOperation _verifyFileOp = null;
-		private ESteps _steps = ESteps.None;
-
-		// 重置变量
-		private ulong _fileOriginLength;
-
-
-		public FileResumeDownloader(BundleInfo bundleInfo, int failedTryAgain, int timeout) : base(bundleInfo, failedTryAgain, timeout)
-		{
-			_tempFilePath = bundleInfo.Bundle.TempDataFilePath;
-		}
-		public override void SendRequest(params object[] param)
-		{
-			if (_steps == ESteps.None)
-			{
-				_steps = ESteps.CheckTempFile;
-			}
-		}
-		public override void Update()
-		{
-			if (_steps == ESteps.None)
-				return;
-			if (IsDone())
-				return;
-
-			// 检测临时文件
-			if (_steps == ESteps.CheckTempFile)
-			{
-				VerifyTempFileElement element = new VerifyTempFileElement(_bundleInfo.Bundle.TempDataFilePath, _bundleInfo.Bundle.FileCRC, _bundleInfo.Bundle.FileSize);
-				_checkFileOp = VerifyTempFileOperation.CreateOperation(element);
-				OperationSystem.StartOperation(_checkFileOp);
-				_steps = ESteps.WaitingCheckTempFile;
-			}
-
-			// 等待检测结果
-			if (_steps == ESteps.WaitingCheckTempFile)
-			{
-				if (WaitForAsyncComplete)
-					_checkFileOp.Update();
-
-				if (_checkFileOp.IsDone == false)
-					return;
-
-				if (_checkFileOp.Status == EOperationStatus.Succeed)
-				{
-					_steps = ESteps.CachingFile;
-				}
-				else
-				{
-					if (_checkFileOp.VerifyResult == EVerifyResult.FileOverflow)
-					{
-						if (File.Exists(_tempFilePath))
-							File.Delete(_tempFilePath);
-					}
-					_steps = ESteps.PrepareDownload;
-				}
-			}
-
-			// 创建下载器
-			if (_steps == ESteps.PrepareDownload)
-			{
-				// 获取请求地址
-				_requestURL = GetRequestURL();
-
-				// 重置变量
-				_downloadProgress = 0f;
-				_downloadedBytes = 0;
-
-				// 重置变量
-				_isAbort = false;
-				_latestDownloadBytes = 0;
-				_latestDownloadRealtime = Time.realtimeSinceStartup;
-				_fileOriginLength = 0;
-
-				// 重置计时器
-				if (_tryAgainTimer > 0f)
-					YooLogger.Warning($"Try again download : {_requestURL}");
-				_tryAgainTimer = 0f;
-
-				_steps = ESteps.CreateDownloader;
-			}
-
-			// 创建下载器
-			if (_steps == ESteps.CreateDownloader)
-			{
-				long fileLength = -1;
-				if (File.Exists(_tempFilePath))
-				{
-					FileInfo fileInfo = new FileInfo(_tempFilePath);
-					fileLength = fileInfo.Length;
-					_fileOriginLength = (ulong)fileLength;
-					_downloadedBytes = _fileOriginLength;
-				}
-
-#if UNITY_2019_4_OR_NEWER
-				_webRequest = DownloadSystem.NewRequest(_requestURL);
-				var handler = new DownloadHandlerFile(_tempFilePath, true);
-				handler.removeFileOnAbort = false;
-#else
-				_webRequest = DownloadSystem.NewRequest(_requestURL);
-				var handler = new DownloadHandlerFileRange(_tempFilePath, _bundleInfo.Bundle.FileSize, _webRequest);
-				_downloadHandle = handler;
-#endif
-				_webRequest.downloadHandler = handler;
-				_webRequest.disposeDownloadHandlerOnDispose = true;
-				if (fileLength > 0)
-					_webRequest.SetRequestHeader("Range", $"bytes={fileLength}-");
-				_webRequest.SendWebRequest();
-				_steps = ESteps.CheckDownload;
-			}
-
-			// 检测下载结果
-			if (_steps == ESteps.CheckDownload)
-			{
-				_downloadProgress = _webRequest.downloadProgress;
-				_downloadedBytes = _fileOriginLength + _webRequest.downloadedBytes;
-				if (_webRequest.isDone == false)
-				{
-					CheckTimeout();
-					return;
-				}
-
-				bool hasError = false;
-
-				// 检查网络错误
-#if UNITY_2020_3_OR_NEWER
-				if (_webRequest.result != UnityWebRequest.Result.Success)
-				{
-					hasError = true;
-					_lastError = _webRequest.error;
-					_lastCode = _webRequest.responseCode;
-				}
-#else
-				if (_webRequest.isNetworkError || _webRequest.isHttpError)
-				{
-					hasError = true;
-					_lastError = _webRequest.error;
-					_lastCode = _webRequest.responseCode;
-				}
-#endif
-
-				// 如果网络异常
-				if (hasError)
-				{
-					// 注意：下载断点续传文件发生特殊错误码之后删除文件
-					if (DownloadSystem.ClearFileResponseCodes != null)
-					{
-						if (DownloadSystem.ClearFileResponseCodes.Contains(_webRequest.responseCode))
-						{
-							if (File.Exists(_tempFilePath))
-								File.Delete(_tempFilePath);
-						}
-					}
-
-					_steps = ESteps.TryAgain;
-				}
-				else
-				{
-					_steps = ESteps.VerifyTempFile;
-				}
-
-				// 最终释放下载器
-				DisposeWebRequest();
-			}
-
-			// 验证下载文件
-			if (_steps == ESteps.VerifyTempFile)
-			{
-				VerifyTempFileElement element = new VerifyTempFileElement(_bundleInfo.Bundle.TempDataFilePath, _bundleInfo.Bundle.FileCRC, _bundleInfo.Bundle.FileSize);
-				_verifyFileOp = VerifyTempFileOperation.CreateOperation(element);
-				OperationSystem.StartOperation(_verifyFileOp);
-				_steps = ESteps.WaitingVerifyTempFile;
-			}
-
-			// 等待验证完成
-			if (_steps == ESteps.WaitingVerifyTempFile)
-			{
-				if (WaitForAsyncComplete)
-					_verifyFileOp.Update();
-
-				if (_verifyFileOp.IsDone == false)
-					return;
-
-				if (_verifyFileOp.Status == EOperationStatus.Succeed)
-				{
-					_steps = ESteps.CachingFile;
-				}
-				else
-				{
-					if (File.Exists(_tempFilePath))
-						File.Delete(_tempFilePath);
-
-					_lastError = _verifyFileOp.Error;
-					_steps = ESteps.TryAgain;
-				}
-			}
-
-			// 缓存下载文件
-			if (_steps == ESteps.CachingFile)
-			{
-				try
-				{
-					CachingFile(_tempFilePath);
-					_status = EStatus.Succeed;
-					_steps = ESteps.Done;
-					_lastError = string.Empty;
-					_lastCode = 0;
-				}
-				catch (Exception e)
-				{
-					_lastError = e.Message;
-					_steps = ESteps.TryAgain;
-				}
-			}
-
-			// 重新尝试下载
-			if (_steps == ESteps.TryAgain)
-			{
-				if (_failedTryAgain <= 0)
-				{
-					ReportError();
-					_status = EStatus.Failed;
-					_steps = ESteps.Done;
-					return;
-				}
-
-				_tryAgainTimer += Time.unscaledDeltaTime;
-				if (_tryAgainTimer > 1f)
-				{
-					_failedTryAgain--;
-					_steps = ESteps.PrepareDownload;
-					ReportWarning();
-				}
-			}
-		}
-		public override void Abort()
-		{
-			if (IsDone() == false)
-			{
-				_status = EStatus.Failed;
-				_steps = ESteps.Done;
-				_lastError = "user abort";
-				_lastCode = 0;
-				DisposeWebRequest();
-			}
-		}
-
-		private void DisposeWebRequest()
-		{
-			if (_downloadHandle != null)
-			{
-				_downloadHandle.Cleanup();
-				_downloadHandle = null;
-			}
-
-			if (_webRequest != null)
-			{
-				_webRequest.Dispose();
-				_webRequest = null;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileResumeDownloader.cs.meta b/Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileResumeDownloader.cs.meta
deleted file mode 100644
index 0d2cdfd..0000000
--- a/Assets/YooAsset/Runtime/DownloadSystem/Downloader/FileResumeDownloader.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a439c9a8f36dcc942b92a8e8af927237
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Downloader/WebDownloader.cs b/Assets/YooAsset/Runtime/DownloadSystem/Downloader/WebDownloader.cs
index 3464457..b5a5666 100644
--- a/Assets/YooAsset/Runtime/DownloadSystem/Downloader/WebDownloader.cs
+++ b/Assets/YooAsset/Runtime/DownloadSystem/Downloader/WebDownloader.cs
@@ -3,7 +3,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using UnityEngine;
-using UnityEngine.Networking;
 
 namespace YooAsset
 {
@@ -15,26 +14,21 @@ namespace YooAsset
 			PrepareDownload,
 			CreateDownloader,
 			CheckDownload,
-			VerifyTempFile,
-			WaitingVerifyTempFile,
-			CachingFile,
 			TryAgain,
 			Done,
 		}
 
-		private bool _keepDownloadHandleLife = false;
-		private DownloadHandlerAssetBundle _downloadhandler;
 		private ESteps _steps = ESteps.None;
+		private bool _getAssetBundle;
 
-
-		public WebDownloader(BundleInfo bundleInfo, int failedTryAgain, int timeout) : base(bundleInfo, failedTryAgain, timeout)
+		public WebDownloader(BundleInfo bundleInfo, System.Type requesterType, int failedTryAgain, int timeout) : base(bundleInfo, requesterType, failedTryAgain, timeout)
 		{
 		}
-		public override void SendRequest(params object[] param)
+		public override void SendRequest(params object[] args)
 		{
 			if (_steps == ESteps.None)
 			{
-				_keepDownloadHandleLife = (bool)param[0];
+				_getAssetBundle = (bool)args[0];
 				_steps = ESteps.PrepareDownload;
 			}
 		}
@@ -48,82 +42,49 @@ namespace YooAsset
 			// 创建下载器
 			if (_steps == ESteps.PrepareDownload)
 			{
+				// 获取请求地址
+				_requestURL = GetRequestURL();
+
 				// 重置变量
-				_downloadProgress = 0f;
-				_downloadedBytes = 0;
+				DownloadProgress = 0f;
+				DownloadedBytes = 0;
 
 				// 重置变量
 				_isAbort = false;
 				_latestDownloadBytes = 0;
 				_latestDownloadRealtime = Time.realtimeSinceStartup;
+
+				// 重置计时器
+				if (_tryAgainTimer > 0f)
+					YooLogger.Warning($"Try again download : {_requestURL}");
 				_tryAgainTimer = 0f;
 
-				// 获取请求地址
-				_requestURL = GetRequestURL();
 				_steps = ESteps.CreateDownloader;
 			}
 
 			// 创建下载器
 			if (_steps == ESteps.CreateDownloader)
 			{
-				_webRequest = DownloadSystem.NewRequest(_requestURL);
-
-				if (CacheSystem.DisableUnityCacheOnWebGL)
-				{
-					uint crc = _bundleInfo.Bundle.UnityCRC;
-					_downloadhandler = new DownloadHandlerAssetBundle(_requestURL, crc);
-#if UNITY_2020_3_OR_NEWER
-					_downloadhandler.autoLoadAssetBundle = false;
-#endif
-				}
-				else
-				{
-					uint crc = _bundleInfo.Bundle.UnityCRC;
-					var hash = Hash128.Parse(_bundleInfo.Bundle.FileHash);
-					_downloadhandler = new DownloadHandlerAssetBundle(_requestURL, hash, crc);
-#if UNITY_2020_3_OR_NEWER
-					_downloadhandler.autoLoadAssetBundle = false;
-#endif
-				}
-
-				_webRequest.downloadHandler = _downloadhandler;
-				_webRequest.disposeDownloadHandlerOnDispose = false;
-				_webRequest.SendWebRequest();
+				_requester = (IWebRequester)Activator.CreateInstance(_requesterType);
+				_requester.Create(_requestURL, _bundleInfo, _getAssetBundle);
 				_steps = ESteps.CheckDownload;
 			}
 
 			// 检测下载结果
 			if (_steps == ESteps.CheckDownload)
 			{
-				_downloadProgress = _webRequest.downloadProgress;
-				_downloadedBytes = _webRequest.downloadedBytes;
-				if (_webRequest.isDone == false)
+				_requester.Update();
+				DownloadedBytes = _requester.DownloadedBytes;
+				DownloadProgress = _requester.DownloadProgress;
+				if (_requester.IsDone() == false)
 				{
 					CheckTimeout();
 					return;
 				}
 
-				bool hasError = false;
-
-				// 检查网络错误
-#if UNITY_2020_3_OR_NEWER
-				if (_webRequest.result != UnityWebRequest.Result.Success)
-				{
-					hasError = true;
-					_lastError = _webRequest.error;
-					_lastCode = _webRequest.responseCode;
-				}
-#else
-				if (_webRequest.isNetworkError || _webRequest.isHttpError)
-				{
-					hasError = true;
-					_lastError = _webRequest.error;
-					_lastCode = _webRequest.responseCode;
-				}
-#endif
-
-				// 如果网络异常
-				if (hasError)
+				_lastestNetError = _requester.RequestNetError;
+				_lastestHttpCode = _requester.RequestHttpCode;
+				if (_requester.Status != ERequestStatus.Success)
 				{
 					_steps = ESteps.TryAgain;
 				}
@@ -131,15 +92,7 @@ namespace YooAsset
 				{
 					_status = EStatus.Succeed;
 					_steps = ESteps.Done;
-					_lastError = string.Empty;
-					_lastCode = 0;
 				}
-
-				// 最终释放请求
-				DisposeRequest();
-
-				if (_keepDownloadHandleLife == false)
-					DisposeHandler();
 			}
 
 			// 重新尝试下载
@@ -147,8 +100,6 @@ namespace YooAsset
 			{
 				if (_failedTryAgain <= 0)
 				{
-					DisposeRequest();
-					DisposeHandler();
 					ReportError();
 					_status = EStatus.Failed;
 					_steps = ESteps.Done;
@@ -167,47 +118,20 @@ namespace YooAsset
 		}
 		public override void Abort()
 		{
+			if (_requester != null)
+				_requester.Abort();
+
 			if (IsDone() == false)
 			{
 				_status = EStatus.Failed;
 				_steps = ESteps.Done;
-				_lastError = "user abort";
-				_lastCode = 0;
-
-				DisposeRequest();
-				DisposeHandler();
+				_lastestNetError = "user abort";
+				_lastestHttpCode = 0;
 			}
 		}
-		private void DisposeRequest()
+		public override AssetBundle GetAssetBundle()
 		{
-			if (_webRequest != null)
-			{
-				_webRequest.Dispose();
-				_webRequest = null;
-			}
-		}
-
-		/// <summary>
-		/// 获取资源包
-		/// </summary>
-		public AssetBundle GetAssetBundle()
-		{
-			if (_downloadhandler != null)
-				return _downloadhandler.assetBundle;
-
-			return null;
-		}
-
-		/// <summary>
-		/// 释放下载句柄
-		/// </summary>
-		public void DisposeHandler()
-		{
-			if (_downloadhandler != null)
-			{
-				_downloadhandler.Dispose();
-				_downloadhandler = null;
-			}
+			return (AssetBundle)_requester.GetRequestObject();
 		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/RemoteTools.cs b/Assets/YooAsset/Runtime/DownloadSystem/RemoteTools.cs
new file mode 100644
index 0000000..4b40d3b
--- /dev/null
+++ b/Assets/YooAsset/Runtime/DownloadSystem/RemoteTools.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+	public class RemoteTools
+	{
+		/// <summary>
+		/// 记录网络请求失败事件的次数
+		/// </summary>
+		private static readonly Dictionary<string, int> _requestFailedRecorder = new Dictionary<string, int>(1000);
+
+		/// <summary>
+		/// 记录请求失败事件
+		/// </summary>
+		public static void RecordRequestFailed(string packageName, string eventName)
+		{
+			string key = $"{packageName}_{eventName}";
+			if (_requestFailedRecorder.ContainsKey(key) == false)
+				_requestFailedRecorder.Add(key, 0);
+			_requestFailedRecorder[key]++;
+		}
+
+		/// <summary>
+		/// 获取请求失败的次数
+		/// </summary>
+		public static int GetRequestFailedCount(string packageName, string eventName)
+		{
+			string key = $"{packageName}_{eventName}";
+			if (_requestFailedRecorder.ContainsKey(key) == false)
+				_requestFailedRecorder.Add(key, 0);
+			return _requestFailedRecorder[key];
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/RemoteTools.cs.meta b/Assets/YooAsset/Runtime/DownloadSystem/RemoteTools.cs.meta
new file mode 100644
index 0000000..394f817
--- /dev/null
+++ b/Assets/YooAsset/Runtime/DownloadSystem/RemoteTools.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ca9b2c6456d21bb4e9eecd9dc820a641
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Requester.meta b/Assets/YooAsset/Runtime/DownloadSystem/Requester.meta
new file mode 100644
index 0000000..451d6c0
--- /dev/null
+++ b/Assets/YooAsset/Runtime/DownloadSystem/Requester.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8a97534752300584a9b8c60c04c6a6a8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Requester/AssetBundleWebRequest.cs b/Assets/YooAsset/Runtime/DownloadSystem/Requester/AssetBundleWebRequest.cs
new file mode 100644
index 0000000..4edc3c5
--- /dev/null
+++ b/Assets/YooAsset/Runtime/DownloadSystem/Requester/AssetBundleWebRequest.cs
@@ -0,0 +1,144 @@
+using System.IO;
+using UnityEngine;
+using UnityEngine.Networking;
+
+namespace YooAsset
+{
+	internal class AssetBundleWebRequest : IWebRequester
+	{
+		private UnityWebRequest _webRequest;
+		private DownloadHandlerAssetBundle _downloadhandler;
+		private AssetBundle _cacheAssetBundle;
+		private bool _getAssetBundle = false;
+
+		public ERequestStatus Status { private set; get; } = ERequestStatus.None;
+		public float DownloadProgress { private set; get; }
+		public ulong DownloadedBytes { private set; get; }
+		public string RequestNetError { private set; get; }
+		public long RequestHttpCode { private set; get; }
+
+		public void Create(string requestURL, BundleInfo bundleInfo, params object[] args)
+		{
+			if (Status != ERequestStatus.None)
+				throw new System.Exception("Should never get here !");
+
+			if (args.Length == 0)
+				throw new System.Exception("Not found param value");
+
+			// 解析附加参数
+			_getAssetBundle = (bool)args[0];
+
+			// 创建下载器
+			_webRequest = DownloadHelper.NewRequest(requestURL);
+			if (CacheHelper.DisableUnityCacheOnWebGL)
+			{
+				uint crc = bundleInfo.Bundle.UnityCRC;
+				_downloadhandler = new DownloadHandlerAssetBundle(requestURL, crc);
+			}
+			else
+			{
+				uint crc = bundleInfo.Bundle.UnityCRC;
+				var hash = Hash128.Parse(bundleInfo.Bundle.FileHash);
+				_downloadhandler = new DownloadHandlerAssetBundle(requestURL, hash, crc);
+			}
+#if UNITY_2020_3_OR_NEWER
+			_downloadhandler.autoLoadAssetBundle = false;
+#endif
+			_webRequest.downloadHandler = _downloadhandler;
+			_webRequest.disposeDownloadHandlerOnDispose = true;
+			_webRequest.SendWebRequest();
+			Status = ERequestStatus.InProgress;
+		}
+		public void Update()
+		{
+			if (Status == ERequestStatus.None)
+				return;
+			if (IsDone())
+				return;
+
+			DownloadProgress = _webRequest.downloadProgress;
+			DownloadedBytes = _webRequest.downloadedBytes;
+			if (_webRequest.isDone == false)
+				return;
+
+			// 检查网络错误
+#if UNITY_2020_3_OR_NEWER
+			RequestHttpCode = _webRequest.responseCode;
+			if (_webRequest.result != UnityWebRequest.Result.Success)
+			{
+				RequestNetError = _webRequest.error;
+				Status = ERequestStatus.Error;
+			}
+			else
+			{
+				Status = ERequestStatus.Success;
+			}
+#else
+			RequestHttpCode = _webRequest.responseCode;
+			if (_webRequest.isNetworkError || _webRequest.isHttpError)
+			{
+				RequestNetError = _webRequest.error;
+				Status = ERequestStatus.Error;
+			}
+			else
+			{
+				Status = ERequestStatus.Success;
+			}
+#endif
+
+			// 缓存加载的AssetBundle对象
+			if (Status == ERequestStatus.Success)
+			{
+				if (_getAssetBundle)
+				{
+					_cacheAssetBundle = _downloadhandler.assetBundle;
+					if (_cacheAssetBundle == null)
+					{
+						RequestNetError = "assetBundle is null";
+						Status = ERequestStatus.Error;
+					}
+				}
+			}
+
+			// 最终释放下载器
+			DisposeWebRequest();
+		}
+		public void Abort()
+		{
+			// 如果下载任务还未开始
+			if (Status == ERequestStatus.None)
+			{
+				RequestNetError = "user cancel";
+				Status = ERequestStatus.Error;
+			}
+			else
+			{
+				// 注意：为了防止同一个文件强制停止之后立马创建新的请求，应该让进行中的请求自然终止。
+				if (_webRequest != null)
+				{
+					if (_webRequest.isDone == false)
+						_webRequest.Abort(); // If in progress, halts the UnityWebRequest as soon as possible.
+				}
+			}
+		}
+		public bool IsDone()
+		{
+			if (Status == ERequestStatus.Success || Status == ERequestStatus.Error)
+				return true;
+			else
+				return false;
+		}
+		public object GetRequestObject()
+		{
+			return _cacheAssetBundle;
+		}
+		private void DisposeWebRequest()
+		{
+			if (_webRequest != null)
+			{
+				_webRequest.Dispose();
+				_webRequest = null;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Requester/AssetBundleWebRequest.cs.meta b/Assets/YooAsset/Runtime/DownloadSystem/Requester/AssetBundleWebRequest.cs.meta
new file mode 100644
index 0000000..2c61d44
--- /dev/null
+++ b/Assets/YooAsset/Runtime/DownloadSystem/Requester/AssetBundleWebRequest.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 34efa85440da15247b570a98b0971282
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Downloader/DownloadHandlerFileRange.cs b/Assets/YooAsset/Runtime/DownloadSystem/Requester/DownloadHandlerFileRange.cs
similarity index 100%
rename from Assets/YooAsset/Runtime/DownloadSystem/Downloader/DownloadHandlerFileRange.cs
rename to Assets/YooAsset/Runtime/DownloadSystem/Requester/DownloadHandlerFileRange.cs
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Downloader/DownloadHandlerFileRange.cs.meta b/Assets/YooAsset/Runtime/DownloadSystem/Requester/DownloadHandlerFileRange.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/DownloadSystem/Downloader/DownloadHandlerFileRange.cs.meta
rename to Assets/YooAsset/Runtime/DownloadSystem/Requester/DownloadHandlerFileRange.cs.meta
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Requester/FileGeneralRequest.cs b/Assets/YooAsset/Runtime/DownloadSystem/Requester/FileGeneralRequest.cs
new file mode 100644
index 0000000..0d0904d
--- /dev/null
+++ b/Assets/YooAsset/Runtime/DownloadSystem/Requester/FileGeneralRequest.cs
@@ -0,0 +1,106 @@
+using System.IO;
+using UnityEngine.Networking;
+
+namespace YooAsset
+{
+	internal class FileGeneralRequest : IWebRequester
+	{
+		private UnityWebRequest _webRequest;
+
+		public ERequestStatus Status { private set; get; } = ERequestStatus.None;
+		public float DownloadProgress { private set; get; }
+		public ulong DownloadedBytes { private set; get; }
+		public string RequestNetError { private set; get; }
+		public long RequestHttpCode { private set; get; }
+
+		public void Create(string requestURL, BundleInfo bundleInfo, params object[] args)
+		{
+			if (Status != ERequestStatus.None)
+				throw new System.Exception("Should never get here !");
+
+			string tempFilePath = bundleInfo.TempDataFilePath;
+
+			// 删除临时文件
+			if (File.Exists(tempFilePath))
+				File.Delete(tempFilePath);
+
+			// 创建下载器
+			_webRequest = DownloadHelper.NewRequest(requestURL);
+			DownloadHandlerFile handler = new DownloadHandlerFile(tempFilePath);
+			handler.removeFileOnAbort = true;
+			_webRequest.downloadHandler = handler;
+			_webRequest.disposeDownloadHandlerOnDispose = true;
+			_webRequest.SendWebRequest();
+			Status = ERequestStatus.InProgress;
+		}
+		public void Update()
+		{
+			if (Status == ERequestStatus.None)
+				return;
+			if (IsDone())
+				return;
+
+			DownloadProgress = _webRequest.downloadProgress;
+			DownloadedBytes = _webRequest.downloadedBytes;
+			if (_webRequest.isDone == false)
+				return;
+
+			// 检查网络错误
+#if UNITY_2020_3_OR_NEWER
+			RequestHttpCode = _webRequest.responseCode;
+			if (_webRequest.result != UnityWebRequest.Result.Success)
+			{
+				RequestNetError = _webRequest.error;
+				Status = ERequestStatus.Error;
+			}
+			else
+			{
+				Status = ERequestStatus.Success;
+			}
+#else
+			RequestHttpCode = _webRequest.responseCode;
+			if (_webRequest.isNetworkError || _webRequest.isHttpError)
+			{
+				RequestNetError = _webRequest.error;
+				Status = ERequestStatus.Error;
+			}
+			else
+			{
+				Status = ERequestStatus.Success;
+			}
+#endif
+
+			// 最终释放下载器
+			DisposeWebRequest();
+		}
+		public void Abort()
+		{
+			DisposeWebRequest();
+			if (IsDone() == false)
+			{
+				RequestNetError = "user abort";
+				RequestHttpCode = 0;
+				Status = ERequestStatus.Error;
+			}
+		}
+		public bool IsDone()
+		{
+			if (Status == ERequestStatus.Success || Status == ERequestStatus.Error)
+				return true;
+			else
+				return false;
+		}
+		public object GetRequestObject()
+		{
+			throw new System.NotImplementedException();
+		}
+		private void DisposeWebRequest()
+		{
+			if (_webRequest != null)
+			{
+				_webRequest.Dispose(); //注意：引擎底层会自动调用Abort方法
+				_webRequest = null;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Requester/FileGeneralRequest.cs.meta b/Assets/YooAsset/Runtime/DownloadSystem/Requester/FileGeneralRequest.cs.meta
new file mode 100644
index 0000000..1025532
--- /dev/null
+++ b/Assets/YooAsset/Runtime/DownloadSystem/Requester/FileGeneralRequest.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b2f339136a4269343a3b5ab80450b889
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Requester/FileResumeRequest.cs b/Assets/YooAsset/Runtime/DownloadSystem/Requester/FileResumeRequest.cs
new file mode 100644
index 0000000..5eb27d6
--- /dev/null
+++ b/Assets/YooAsset/Runtime/DownloadSystem/Requester/FileResumeRequest.cs
@@ -0,0 +1,149 @@
+using System.IO;
+using UnityEngine.Networking;
+
+namespace YooAsset
+{
+	internal class FileResumeRequest : IWebRequester
+	{
+		private string _tempFilePath;
+		private UnityWebRequest _webRequest;
+		private DownloadHandlerFileRange _downloadHandle;
+		private ulong _fileOriginLength;
+
+		public ERequestStatus Status { private set; get; } = ERequestStatus.None;
+		public float DownloadProgress { private set; get; }
+		public ulong DownloadedBytes { private set; get; }
+		public string RequestNetError { private set; get; }
+		public long RequestHttpCode { private set; get; }
+
+		public void Create(string requestURL, BundleInfo bundleInfo, params object[] args)
+		{
+			if (Status != ERequestStatus.None)
+				throw new System.Exception("Should never get here !");
+
+			_tempFilePath = bundleInfo.TempDataFilePath;
+			long fileBytes = bundleInfo.Bundle.FileSize;
+
+			// 获取下载的起始位置
+			long fileLength = -1;
+			if (File.Exists(_tempFilePath))
+			{
+				FileInfo fileInfo = new FileInfo(_tempFilePath);
+				fileLength = fileInfo.Length;
+				_fileOriginLength = (ulong)fileLength;
+				DownloadedBytes = _fileOriginLength;
+			}
+
+			// 检测下载起始位置是否有效
+			if (fileLength >= fileBytes)
+			{
+				if (File.Exists(_tempFilePath))
+					File.Delete(_tempFilePath);
+			}
+
+			// 创建下载器
+			_webRequest = DownloadHelper.NewRequest(requestURL);
+#if UNITY_2019_4_OR_NEWER
+			var handler = new DownloadHandlerFile(_tempFilePath, true);
+			handler.removeFileOnAbort = false;
+#else
+			var handler = new DownloadHandlerFileRange(tempFilePath, _bundleInfo.Bundle.FileSize, _webRequest);
+			_downloadHandle = handler;
+#endif
+			_webRequest.downloadHandler = handler;
+			_webRequest.disposeDownloadHandlerOnDispose = true;
+			if (fileLength > 0)
+				_webRequest.SetRequestHeader("Range", $"bytes={fileLength}-");
+			_webRequest.SendWebRequest();
+			Status = ERequestStatus.InProgress;
+		}
+		public void Update()
+		{
+			if (Status == ERequestStatus.None)
+				return;
+			if (IsDone())
+				return;
+
+			DownloadProgress = _webRequest.downloadProgress;
+			DownloadedBytes = _fileOriginLength + _webRequest.downloadedBytes;
+			if (_webRequest.isDone == false)
+				return;
+
+			// 检查网络错误
+#if UNITY_2020_3_OR_NEWER
+			RequestHttpCode = _webRequest.responseCode;
+			if (_webRequest.result != UnityWebRequest.Result.Success)
+			{
+				RequestNetError = _webRequest.error;
+				Status = ERequestStatus.Error;
+			}
+			else
+			{
+				Status = ERequestStatus.Success;
+			}
+#else
+			RequestHttpCode = _webRequest.responseCode;
+			if (_webRequest.isNetworkError || _webRequest.isHttpError)
+			{
+				RequestNetError = _webRequest.error;
+				Status = ERequestStatus.Error;
+			}
+			else
+			{
+				Status = ERequestStatus.Success;
+			}
+#endif
+
+			// 注意：下载断点续传文件发生特殊错误码之后删除文件
+			if (Status == ERequestStatus.Error)
+			{
+				if (DownloadHelper.ClearFileResponseCodes != null)
+				{
+					if (DownloadHelper.ClearFileResponseCodes.Contains(RequestHttpCode))
+					{
+						if (File.Exists(_tempFilePath))
+							File.Delete(_tempFilePath);
+					}
+				}
+			}
+
+			// 最终释放下载器
+			DisposeWebRequest();
+		}
+		public void Abort()
+		{
+			DisposeWebRequest();
+			if (IsDone() == false)
+			{
+				RequestNetError = "user abort";
+				RequestHttpCode = 0;
+				Status = ERequestStatus.Error;
+			}
+		}
+		public bool IsDone()
+		{
+			if (Status == ERequestStatus.Success || Status == ERequestStatus.Error)
+				return true;
+			else
+				return false;
+		}
+		public object GetRequestObject()
+		{
+			throw new System.NotImplementedException();
+		}
+		private void DisposeWebRequest()
+		{
+			if (_downloadHandle != null)
+			{
+				_downloadHandle.Cleanup();
+				_downloadHandle = null;
+			}
+
+			if (_webRequest != null)
+			{
+				_webRequest.Dispose();
+				_webRequest = null;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Requester/FileResumeRequest.cs.meta b/Assets/YooAsset/Runtime/DownloadSystem/Requester/FileResumeRequest.cs.meta
new file mode 100644
index 0000000..df15a3b
--- /dev/null
+++ b/Assets/YooAsset/Runtime/DownloadSystem/Requester/FileResumeRequest.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 816bf5396d7570e4ab28f1af407bc10f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Requester/IWebRequester.cs b/Assets/YooAsset/Runtime/DownloadSystem/Requester/IWebRequester.cs
new file mode 100644
index 0000000..4274451
--- /dev/null
+++ b/Assets/YooAsset/Runtime/DownloadSystem/Requester/IWebRequester.cs
@@ -0,0 +1,65 @@
+
+namespace YooAsset
+{
+	internal enum ERequestStatus
+	{
+		None,
+		InProgress,
+		Error,
+		Success,
+	}
+
+	internal interface IWebRequester
+	{
+		/// <summary>
+		/// 任务状态
+		/// </summary>
+		public ERequestStatus Status { get; }
+
+		/// <summary>
+		/// 下载进度（0f~1f）
+		/// </summary>
+		public float DownloadProgress { get; }
+
+		/// <summary>
+		/// 已经下载的总字节数
+		/// </summary>
+		public ulong DownloadedBytes { get; }
+
+		/// <summary>
+		/// 返回的网络错误
+		/// </summary>
+		public string RequestNetError { get; }
+
+		/// <summary>
+		/// 返回的HTTP CODE
+		/// </summary>
+		public long RequestHttpCode { get; }
+
+
+		/// <summary>
+		/// 创建任务
+		/// </summary>
+		public void Create(string url, BundleInfo bundleInfo, params object[] args);
+
+		/// <summary>
+		/// 更新任务
+		/// </summary>
+		public void Update();
+
+		/// <summary>
+		/// 终止任务
+		/// </summary>
+		public void Abort();
+
+		/// <summary>
+		/// 是否已经完成（无论成功或失败）
+		/// </summary>
+		public bool IsDone();
+
+		/// <summary>
+		/// 获取请求的对象
+		/// </summary>
+		public object GetRequestObject();
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/Requester/IWebRequester.cs.meta b/Assets/YooAsset/Runtime/DownloadSystem/Requester/IWebRequester.cs.meta
new file mode 100644
index 0000000..fffe195
--- /dev/null
+++ b/Assets/YooAsset/Runtime/DownloadSystem/Requester/IWebRequester.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4d80b965d56870b43af1bf6943015914
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/UnityWebDataRequester.cs b/Assets/YooAsset/Runtime/DownloadSystem/UnityWebDataRequester.cs
index 9839a2c..fb84e7c 100644
--- a/Assets/YooAsset/Runtime/DownloadSystem/UnityWebDataRequester.cs
+++ b/Assets/YooAsset/Runtime/DownloadSystem/UnityWebDataRequester.cs
@@ -18,7 +18,7 @@ namespace YooAsset
 				URL = url;
 				ResetTimeout(timeout);
 
-				_webRequest = DownloadSystem.NewRequest(URL);
+				_webRequest = DownloadHelper.NewRequest(URL);
 				DownloadHandlerBuffer handler = new DownloadHandlerBuffer();
 				_webRequest.downloadHandler = handler;
 				_webRequest.disposeDownloadHandlerOnDispose = true;
diff --git a/Assets/YooAsset/Runtime/DownloadSystem/UnityWebFileRequester.cs b/Assets/YooAsset/Runtime/DownloadSystem/UnityWebFileRequester.cs
index 4358fcb..2d15aac 100644
--- a/Assets/YooAsset/Runtime/DownloadSystem/UnityWebFileRequester.cs
+++ b/Assets/YooAsset/Runtime/DownloadSystem/UnityWebFileRequester.cs
@@ -18,7 +18,7 @@ namespace YooAsset
 				URL = url;
 				ResetTimeout(timeout);
 
-				_webRequest = DownloadSystem.NewRequest(URL);
+				_webRequest = DownloadHelper.NewRequest(URL);
 				DownloadHandlerFile handler = new DownloadHandlerFile(fileSavePath);
 				handler.removeFileOnAbort = true;
 				_webRequest.downloadHandler = handler;
diff --git a/Assets/YooAsset/Runtime/InitializeParameters.cs b/Assets/YooAsset/Runtime/InitializeParameters.cs
index 93805b8..b8daeb4 100644
--- a/Assets/YooAsset/Runtime/InitializeParameters.cs
+++ b/Assets/YooAsset/Runtime/InitializeParameters.cs
@@ -1,6 +1,16 @@
 
 namespace YooAsset
 {
+	/// <summary>
+	/// 默认的构建管线
+	/// </summary>
+	public class DefaultBuildPipeline
+	{
+		public const string BuiltinBuildPipelineName = "BuiltinBuildPipeline";
+		public const string ScriptableBuildPipelineName = "ScriptableBuildPipeline";
+		public const string RawFileBuildPipelineName = "RawFileBuildPipeline";
+	}
+
 	/// <summary>
 	/// 运行模式
 	/// </summary>
@@ -32,11 +42,6 @@ namespace YooAsset
 	/// </summary>
 	public abstract class InitializeParameters
 	{
-		/// <summary>
-		/// 文件解密服务接口
-		/// </summary>
-		public IDecryptionServices DecryptionServices = null;
-
 		/// <summary>
 		/// 内置文件的根路径
 		/// 注意：当参数为空的时候会使用默认的根目录。
@@ -48,18 +53,33 @@ namespace YooAsset
 		/// 注意：当参数为空的时候会使用默认的根目录。
 		/// </summary>
 		public string SandboxRootDirectory = string.Empty;
-		
+
+		/// <summary>
+		/// 缓存文件追加原始后缀格式
+		/// </summary>
+		public bool CacheFileAppendExtension = false;
+
+		/// <summary>
+		/// 缓存系统启动时的验证级别
+		/// </summary>
+		public EVerifyLevel CacheBootVerifyLevel = EVerifyLevel.Middle;
+
 		/// <summary>
 		/// 资源加载每帧处理的最大时间片段
 		/// 注意：默认值为MaxValue
 		/// </summary>
 		public long LoadingMaxTimeSlice = long.MaxValue;
-		
+
 		/// <summary>
-		/// 下载失败尝试次数
-		/// 注意：默认值为MaxValue
+		/// 启用断点续传参数
+		/// 说明：当文件的大小大于设置的字节数时启用断点续传下载器
 		/// </summary>
-		public int DownloadFailedTryAgain = int.MaxValue;
+		public uint BreakpointResumeFileSize = int.MaxValue;
+
+		/// <summary>
+		/// 文件解密服务接口
+		/// </summary>
+		public IDecryptionServices DecryptionServices = null;
 	}
 
 	/// <summary>
@@ -85,6 +105,11 @@ namespace YooAsset
 	/// </summary>
 	public class HostPlayModeParameters : InitializeParameters
 	{
+		/// <summary>
+		/// 远端资源地址查询服务类
+		/// </summary>
+		public IRemoteServices RemoteServices = null;
+
 		/// <summary>
 		/// 内置资源查询服务接口
 		/// </summary>
@@ -96,9 +121,9 @@ namespace YooAsset
 		public IDeliveryQueryServices DeliveryQueryServices = null;
 
 		/// <summary>
-		/// 远端资源地址查询服务类
+		/// 分发资源加载服务接口
 		/// </summary>
-		public IRemoteServices RemoteServices = null;
+		public IDeliveryLoadServices DeliveryLoadServices = null;
 	}
 
 	/// <summary>
@@ -106,14 +131,14 @@ namespace YooAsset
 	/// </summary>
 	public class WebPlayModeParameters : InitializeParameters
 	{
-		/// <summary>
-		/// 内置资源查询服务接口
-		/// </summary>
-		public IBuildinQueryServices BuildinQueryServices = null;
-
 		/// <summary>
 		/// 远端资源地址查询服务类
 		/// </summary>
 		public IRemoteServices RemoteServices = null;
+
+		/// <summary>
+		/// 内置资源查询服务接口
+		/// </summary>
+		public IBuildinQueryServices BuildinQueryServices = null;
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/OperationSystem/AsyncOperationBase.cs b/Assets/YooAsset/Runtime/OperationSystem/AsyncOperationBase.cs
index 029c7aa..c9bb338 100644
--- a/Assets/YooAsset/Runtime/OperationSystem/AsyncOperationBase.cs
+++ b/Assets/YooAsset/Runtime/OperationSystem/AsyncOperationBase.cs
@@ -10,6 +10,11 @@ namespace YooAsset
 		// 用户请求的回调
 		private Action<AsyncOperationBase> _callback;
 
+		/// <summary>
+		/// 所属包裹
+		/// </summary>
+		public string PackageName { private set; get; }
+
 		/// <summary>
 		/// 状态
 		/// </summary>
@@ -74,6 +79,20 @@ namespace YooAsset
 		internal abstract void Start();
 		internal abstract void Update();
 
+		internal void SetPackageName(string packageName)
+		{
+			PackageName = packageName;
+		}
+		internal void SetAbort()
+		{
+			if (IsDone == false)
+			{
+				Status = EOperationStatus.Failed;
+				Error = "user abort";
+				YooLogger.Warning($"Async operaiton has been abort : {this.GetType().Name}");
+				SetFinish();
+			}
+		}
 		internal void SetFinish()
 		{
 			Progress = 1f;
diff --git a/Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs b/Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs
index ff416d9..d4384b7 100644
--- a/Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs
+++ b/Assets/YooAsset/Runtime/OperationSystem/OperationSystem.cs
@@ -6,9 +6,9 @@ namespace YooAsset
 {
 	internal class OperationSystem
 	{
-		private static readonly List<AsyncOperationBase> _operations = new List<AsyncOperationBase>(100);
-		private static readonly List<AsyncOperationBase> _addList = new List<AsyncOperationBase>(100);
-		private static readonly List<AsyncOperationBase> _removeList = new List<AsyncOperationBase>(100);
+		private static readonly List<AsyncOperationBase> _operations = new List<AsyncOperationBase>(1000);
+		private static readonly List<AsyncOperationBase> _addList = new List<AsyncOperationBase>(1000);
+		private static readonly List<AsyncOperationBase> _removeList = new List<AsyncOperationBase>(1000);
 
 		// 计时器相关
 		private static Stopwatch _watch;
@@ -58,11 +58,12 @@ namespace YooAsset
 			}
 
 			// 更新所有的异步操作
-			foreach (var operation in _operations)
+			for (int i = 0; i < _operations.Count; i++)
 			{
 				if (IsBusy)
 					break;
 
+				var operation = _operations[i];
 				operation.Update();
 				if (operation.IsDone)
 				{
@@ -95,12 +96,41 @@ namespace YooAsset
 			MaxTimeSlice = long.MaxValue;
 		}
 
+		/// <summary>
+		/// 销毁包裹的所有任务
+		/// </summary>
+		public static void ClearPackageOperation(string packageName)
+		{
+			// 移除临时队列里的任务
+			for (int i = _addList.Count - 1; i >= 0; i--)
+			{
+				var operation = _addList[i];
+				if (operation.PackageName == packageName)
+				{
+					operation.SetAbort();
+					_addList.RemoveAt(i);
+				}
+			}
+
+			// 移除正在进行的任务
+			for (int i = _operations.Count - 1; i >= 0; i--)
+			{
+				var operation = _operations[i];
+				if (operation.PackageName == packageName)
+				{
+					operation.SetAbort();
+					_operations.RemoveAt(i);
+				}
+			}
+		}
+
 		/// <summary>
 		/// 开始处理异步操作类
 		/// </summary>
-		public static void StartOperation(AsyncOperationBase operation)
+		public static void StartOperation(string packageName, AsyncOperationBase operation)
 		{
 			_addList.Add(operation);
+			operation.SetPackageName(packageName);
 			operation.SetStart();
 			operation.Start();
 		}
diff --git a/Assets/YooAsset/Runtime/PackageSystem/BundleInfo.cs b/Assets/YooAsset/Runtime/PackageSystem/BundleInfo.cs
deleted file mode 100644
index 99b662a..0000000
--- a/Assets/YooAsset/Runtime/PackageSystem/BundleInfo.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-
-namespace YooAsset
-{
-	internal class BundleInfo
-	{
-		public enum ELoadMode
-		{
-			None,
-			LoadFromDelivery,
-			LoadFromStreaming,
-			LoadFromCache,
-			LoadFromRemote,
-			LoadFromEditor,
-		}
-
-		public readonly PackageBundle Bundle;
-		public readonly ELoadMode LoadMode;
-
-		/// <summary>
-		/// 远端下载地址
-		/// </summary>
-		public string RemoteMainURL { private set; get; }
-
-		/// <summary>
-		/// 远端下载备用地址
-		/// </summary>
-		public string RemoteFallbackURL { private set; get; }
-
-		/// <summary>
-		/// 开发者分发的文件地址
-		/// </summary>
-		public string DeliveryFilePath { private set; get; }
-
-		/// <summary>
-		/// 开发者分发的文件偏移量
-		/// </summary>
-		public ulong DeliveryFileOffset { private set; get; }
-
-		/// <summary>
-		/// 注意：该字段只用于帮助编辑器下的模拟模式。
-		/// </summary>
-		public string[] IncludeAssets;
-
-
-		private BundleInfo()
-		{
-		}
-		public BundleInfo(PackageBundle bundle, ELoadMode loadMode, string mainURL, string fallbackURL)
-		{
-			Bundle = bundle;
-			LoadMode = loadMode;
-			RemoteMainURL = mainURL;
-			RemoteFallbackURL = fallbackURL;
-			DeliveryFilePath = string.Empty;
-			DeliveryFileOffset = 0;
-		}
-		public BundleInfo(PackageBundle bundle, ELoadMode loadMode, string deliveryFilePath, ulong deliveryFileOffset)
-		{
-			Bundle = bundle;
-			LoadMode = loadMode;
-			RemoteMainURL = string.Empty;
-			RemoteFallbackURL = string.Empty;
-			DeliveryFilePath = deliveryFilePath;
-			DeliveryFileOffset = deliveryFileOffset;
-		}
-		public BundleInfo(PackageBundle bundle, ELoadMode loadMode)
-		{
-			Bundle = bundle;
-			LoadMode = loadMode;
-			RemoteMainURL = string.Empty;
-			RemoteFallbackURL = string.Empty;
-			DeliveryFilePath = string.Empty;
-			DeliveryFileOffset = 0;
-		}
-
-		/// <summary>
-		/// 是否为JAR包内文件
-		/// </summary>
-		public static bool IsBuildinJarFile(string streamingPath)
-		{
-			return streamingPath.StartsWith("jar:");
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PackageBundle.cs b/Assets/YooAsset/Runtime/PackageSystem/PackageBundle.cs
deleted file mode 100644
index 819eafd..0000000
--- a/Assets/YooAsset/Runtime/PackageSystem/PackageBundle.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-using System;
-using System.Linq;
-
-namespace YooAsset
-{
-	[Serializable]
-	internal class PackageBundle
-	{
-		/// <summary>
-		/// 资源包名称
-		/// </summary>
-		public string BundleName;
-
-		/// <summary>
-		/// Unity引擎生成的CRC
-		/// </summary>
-		public uint UnityCRC;
-
-		/// <summary>
-		/// 文件哈希值
-		/// </summary>
-		public string FileHash;
-
-		/// <summary>
-		/// 文件校验码
-		/// </summary>
-		public string FileCRC;
-
-		/// <summary>
-		/// 文件大小（字节数）
-		/// </summary>
-		public long FileSize;
-
-		/// <summary>
-		/// 是否为原生文件
-		/// </summary>
-		public bool IsRawFile;
-
-		/// <summary>
-		/// 加载方法
-		/// </summary>
-		public byte LoadMethod;
-
-		/// <summary>
-		/// 资源包的分类标签
-		/// </summary>
-		public string[] Tags;
-
-		/// <summary>
-		/// 引用该资源包的ID列表
-		/// </summary>
-		public int[] ReferenceIDs;
-
-
-		/// <summary>
-		/// 所属的包裹名称
-		/// </summary>
-		public string PackageName { private set; get; }
-
-		/// <summary>
-		/// 缓存GUID
-		/// </summary>
-		public string CacheGUID
-		{
-			get { return FileHash; }
-		}
-
-		/// <summary>
-		/// 缓存的数据文件路径
-		/// </summary>
-		private string _cachedDataFilePath;
-		public string CachedDataFilePath
-		{
-			get
-			{
-				if (string.IsNullOrEmpty(_cachedDataFilePath) == false)
-					return _cachedDataFilePath;
-
-				string folderName = FileHash.Substring(0, 2);
-				if (IsRawFile)
-				{
-					string cacheRoot = PersistentTools.GetPersistent(PackageName).SandboxCacheRawFilesRoot;
-					_cachedDataFilePath = PathUtility.Combine(cacheRoot, folderName, CacheGUID, YooAssetSettings.CacheBundleDataFileName);
-					_cachedDataFilePath += _fileExtension;
-				}
-				else
-				{
-					string cacheRoot = PersistentTools.GetPersistent(PackageName).SandboxCacheBundleFilesRoot;
-					_cachedDataFilePath = PathUtility.Combine(cacheRoot, folderName, CacheGUID, YooAssetSettings.CacheBundleDataFileName);
-				}
-				return _cachedDataFilePath;
-			}
-		}
-
-		/// <summary>
-		/// 缓存的信息文件路径
-		/// </summary>
-		private string _cachedInfoFilePath;
-		public string CachedInfoFilePath
-		{
-			get
-			{
-				if (string.IsNullOrEmpty(_cachedInfoFilePath) == false)
-					return _cachedInfoFilePath;
-
-				string folderName = FileHash.Substring(0, 2);
-				if (IsRawFile)
-				{
-					string cacheRoot = PersistentTools.GetPersistent(PackageName).SandboxCacheRawFilesRoot;
-					_cachedInfoFilePath = PathUtility.Combine(cacheRoot, folderName, CacheGUID, YooAssetSettings.CacheBundleInfoFileName);
-				}
-				else
-				{
-					string cacheRoot = PersistentTools.GetPersistent(PackageName).SandboxCacheBundleFilesRoot;
-					_cachedInfoFilePath = PathUtility.Combine(cacheRoot, folderName, CacheGUID, YooAssetSettings.CacheBundleInfoFileName);
-				}
-				return _cachedInfoFilePath;
-			}
-		}
-
-		/// <summary>
-		/// 临时的数据文件路径
-		/// </summary>
-		private string _tempDataFilePath;
-		public string TempDataFilePath
-		{
-			get
-			{
-				if (string.IsNullOrEmpty(_tempDataFilePath) == false)
-					return _tempDataFilePath;
-
-				_tempDataFilePath = $"{CachedDataFilePath}.temp";
-				return _tempDataFilePath;
-			}
-		}
-
-		/// <summary>
-		/// 内置文件路径
-		/// </summary>
-		private string _streamingFilePath;
-		public string StreamingFilePath
-		{
-			get
-			{
-				if (string.IsNullOrEmpty(_streamingFilePath) == false)
-					return _streamingFilePath;
-
-				string root = PersistentTools.GetPersistent(PackageName).BuildinPackageRoot;
-				_streamingFilePath = PathUtility.Combine(root, FileName);
-				return _streamingFilePath;
-			}
-		}
-
-		/// <summary>
-		/// 文件名称
-		/// </summary>
-		private string _fileName;
-		public string FileName
-		{
-			get
-			{
-				if (string.IsNullOrEmpty(_fileName))
-					throw new Exception("Should never get here !");
-				return _fileName;
-			}
-		}
-
-		/// <summary>
-		/// 文件后缀名
-		/// </summary>
-		private string _fileExtension;
-		public string FileExtension
-		{
-			get
-			{
-				if (string.IsNullOrEmpty(_fileExtension))
-					throw new Exception("Should never get here !");
-				return _fileExtension;
-			}
-		}
-
-
-		public PackageBundle()
-		{
-		}
-
-		/// <summary>
-		/// 解析资源包
-		/// </summary>
-		public void ParseBundle(string packageName, int nameStype)
-		{
-			PackageName = packageName;
-			_fileExtension = ManifestTools.GetRemoteBundleFileExtension(BundleName);
-			_fileName = ManifestTools.GetRemoteBundleFileName(nameStype, BundleName, _fileExtension, FileHash);
-		}
-
-		/// <summary>
-		/// 是否包含Tag
-		/// </summary>
-		public bool HasTag(string[] tags)
-		{
-			if (tags == null || tags.Length == 0)
-				return false;
-			if (Tags == null || Tags.Length == 0)
-				return false;
-
-			foreach (var tag in tags)
-			{
-				if (Tags.Contains(tag))
-					return true;
-			}
-			return false;
-		}
-
-		/// <summary>
-		/// 是否包含任意Tags
-		/// </summary>
-		public bool HasAnyTags()
-		{
-			if (Tags != null && Tags.Length > 0)
-				return true;
-			else
-				return false;
-		}
-
-		/// <summary>
-		/// 检测资源包文件内容是否相同
-		/// </summary>
-		public bool Equals(PackageBundle otherBundle)
-		{
-			if (FileHash == otherBundle.FileHash)
-				return true;
-
-			return false;
-		}
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PlayMode/EditorSimulateModeImpl.cs b/Assets/YooAsset/Runtime/PackageSystem/PlayMode/EditorSimulateModeImpl.cs
deleted file mode 100644
index 50f8933..0000000
--- a/Assets/YooAsset/Runtime/PackageSystem/PlayMode/EditorSimulateModeImpl.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace YooAsset
-{
-	internal class EditorSimulateModeImpl : IPlayModeServices, IBundleServices
-	{
-		private PackageManifest _activeManifest;
-
-		/// <summary>
-		/// 异步初始化
-		/// </summary>
-		public InitializationOperation InitializeAsync(string simulateManifestFilePath)
-		{
-			var operation = new EditorSimulateModeInitializationOperation(this, simulateManifestFilePath);
-			OperationSystem.StartOperation(operation);
-			return operation;
-		}
-
-		#region IPlayModeServices接口
-		public PackageManifest ActiveManifest
-		{
-			set
-			{
-				_activeManifest = value;
-			}
-			get
-			{
-				return _activeManifest;
-			}
-		}
-		public void FlushManifestVersionFile()
-		{
-		}
-
-		UpdatePackageVersionOperation IPlayModeServices.UpdatePackageVersionAsync(bool appendTimeTicks, int timeout)
-		{
-			var operation = new EditorPlayModeUpdatePackageVersionOperation();
-			OperationSystem.StartOperation(operation);
-			return operation;
-		}
-		UpdatePackageManifestOperation IPlayModeServices.UpdatePackageManifestAsync(string packageVersion, bool autoSaveVersion, int timeout)
-		{
-			var operation = new EditorPlayModeUpdatePackageManifestOperation();
-			OperationSystem.StartOperation(operation);
-			return operation;
-		}
-		PreDownloadContentOperation IPlayModeServices.PreDownloadContentAsync(string packageVersion, int timeout)
-		{
-			var operation = new EditorPlayModePreDownloadContentOperation();
-			OperationSystem.StartOperation(operation);
-			return operation;
-		}
-
-		ResourceDownloaderOperation IPlayModeServices.CreateResourceDownloaderByAll(int downloadingMaxNumber, int failedTryAgain, int timeout)
-		{
-			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
-		}
-		ResourceDownloaderOperation IPlayModeServices.CreateResourceDownloaderByTags(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout)
-		{
-			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
-		}
-		ResourceDownloaderOperation IPlayModeServices.CreateResourceDownloaderByPaths(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain, int timeout)
-		{
-			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
-		}
-
-		ResourceUnpackerOperation IPlayModeServices.CreateResourceUnpackerByAll(int upackingMaxNumber, int failedTryAgain, int timeout)
-		{
-			return ResourceUnpackerOperation.CreateEmptyUnpacker(upackingMaxNumber, failedTryAgain, timeout);
-		}
-		ResourceUnpackerOperation IPlayModeServices.CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain, int timeout)
-		{
-			return ResourceUnpackerOperation.CreateEmptyUnpacker(upackingMaxNumber, failedTryAgain, timeout);
-		}
-		#endregion
-
-		#region IBundleServices接口
-		private BundleInfo CreateBundleInfo(PackageBundle packageBundle, AssetInfo assetInfo)
-		{
-			if (packageBundle == null)
-				throw new Exception("Should never get here !");
-
-			BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromEditor);
-			bundleInfo.IncludeAssets = _activeManifest.GetBundleIncludeAssets(assetInfo.AssetPath);
-			return bundleInfo;
-		}
-		BundleInfo IBundleServices.GetBundleInfo(AssetInfo assetInfo)
-		{
-			if (assetInfo.IsInvalid)
-				throw new Exception("Should never get here !");
-
-			// 注意：如果清单里未找到资源包会抛出异常！
-			var packageBundle = _activeManifest.GetMainPackageBundle(assetInfo.AssetPath);
-			return CreateBundleInfo(packageBundle, assetInfo);
-		}
-		BundleInfo[] IBundleServices.GetAllDependBundleInfos(AssetInfo assetInfo)
-		{
-			if (assetInfo.IsInvalid)
-				throw new Exception("Should never get here !");
-
-			// 注意：如果清单里未找到资源包会抛出异常！
-			var depends = _activeManifest.GetAllDependencies(assetInfo.AssetPath);
-			List<BundleInfo> result = new List<BundleInfo>(depends.Length);
-			foreach (var packageBundle in depends)
-			{
-				BundleInfo bundleInfo = CreateBundleInfo(packageBundle, assetInfo);
-				result.Add(bundleInfo);
-			}
-			return result.ToArray();
-		}
-		string IBundleServices.GetBundleName(int bundleID)
-		{
-			return _activeManifest.GetBundleName(bundleID);
-		}
-		bool IBundleServices.IsServicesValid()
-		{
-			return _activeManifest != null;
-		}
-		#endregion
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PlayMode/WebPlayModeImpl.cs b/Assets/YooAsset/Runtime/PackageSystem/PlayMode/WebPlayModeImpl.cs
deleted file mode 100644
index 24a846f..0000000
--- a/Assets/YooAsset/Runtime/PackageSystem/PlayMode/WebPlayModeImpl.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace YooAsset
-{
-	internal class WebPlayModeImpl : IPlayModeServices, IBundleServices
-	{
-		private PackageManifest _activeManifest;
-
-		// 参数相关
-		private string _packageName;
-		private IBuildinQueryServices _buildinQueryServices;
-		private IRemoteServices _remoteServices;
-
-		public IRemoteServices RemoteServices
-		{
-			get { return _remoteServices; }
-		}
-
-		/// <summary>
-		/// 异步初始化
-		/// </summary>
-		public InitializationOperation InitializeAsync(string packageName, IBuildinQueryServices buildinQueryServices, IRemoteServices remoteServices)
-		{
-			_packageName = packageName;
-			_buildinQueryServices = buildinQueryServices;
-			_remoteServices = remoteServices;
-
-			var operation = new WebPlayModeInitializationOperation(this, packageName);
-			OperationSystem.StartOperation(operation);
-			return operation;
-		}
-
-		// 下载相关
-		private BundleInfo ConvertToDownloadInfo(PackageBundle packageBundle)
-		{
-			string remoteMainURL = _remoteServices.GetRemoteMainURL(packageBundle.FileName);
-			string remoteFallbackURL = _remoteServices.GetRemoteFallbackURL(packageBundle.FileName);
-			BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromRemote, remoteMainURL, remoteFallbackURL);
-			return bundleInfo;
-		}
-
-		// 查询相关
-		private bool IsBuildinPackageBundle(PackageBundle packageBundle)
-		{
-			return _buildinQueryServices.QueryStreamingAssets(_packageName, packageBundle.FileName);
-		}
-
-		#region IPlayModeServices接口
-		public PackageManifest ActiveManifest
-		{
-			set
-			{
-				_activeManifest = value;
-			}
-			get
-			{
-				return _activeManifest;
-			}
-		}
-		public void FlushManifestVersionFile()
-		{
-		}
-
-		UpdatePackageVersionOperation IPlayModeServices.UpdatePackageVersionAsync(bool appendTimeTicks, int timeout)
-		{
-			var operation = new WebPlayModeUpdatePackageVersionOperation(this, _packageName, appendTimeTicks, timeout);
-			OperationSystem.StartOperation(operation);
-			return operation;
-		}
-		UpdatePackageManifestOperation IPlayModeServices.UpdatePackageManifestAsync(string packageVersion, bool autoSaveVersion, int timeout)
-		{
-			var operation = new WebPlayModeUpdatePackageManifestOperation(this, _packageName, packageVersion, timeout);
-			OperationSystem.StartOperation(operation);
-			return operation;
-		}
-		PreDownloadContentOperation IPlayModeServices.PreDownloadContentAsync(string packageVersion, int timeout)
-		{
-			var operation = new WebPlayModePreDownloadContentOperation();
-			OperationSystem.StartOperation(operation);
-			return operation;
-		}
-
-		ResourceDownloaderOperation IPlayModeServices.CreateResourceDownloaderByAll(int downloadingMaxNumber, int failedTryAgain, int timeout)
-		{
-			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
-		}
-		ResourceDownloaderOperation IPlayModeServices.CreateResourceDownloaderByTags(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout)
-		{
-			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
-		}
-		ResourceDownloaderOperation IPlayModeServices.CreateResourceDownloaderByPaths(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain, int timeout)
-		{
-			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
-		}
-
-		ResourceUnpackerOperation IPlayModeServices.CreateResourceUnpackerByAll(int upackingMaxNumber, int failedTryAgain, int timeout)
-		{
-			return ResourceUnpackerOperation.CreateEmptyUnpacker(upackingMaxNumber, failedTryAgain, timeout);
-		}
-		ResourceUnpackerOperation IPlayModeServices.CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain, int timeout)
-		{
-			return ResourceUnpackerOperation.CreateEmptyUnpacker(upackingMaxNumber, failedTryAgain, timeout);
-		}
-		#endregion
-
-		#region IBundleServices接口
-		private BundleInfo CreateBundleInfo(PackageBundle packageBundle)
-		{
-			if (packageBundle == null)
-				throw new Exception("Should never get here !");
-
-			// 查询APP资源
-			if (IsBuildinPackageBundle(packageBundle))
-			{
-				BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromStreaming);
-				return bundleInfo;
-			}
-
-			// 从服务端下载
-			return ConvertToDownloadInfo(packageBundle);
-		}
-		BundleInfo IBundleServices.GetBundleInfo(AssetInfo assetInfo)
-		{
-			if (assetInfo.IsInvalid)
-				throw new Exception("Should never get here !");
-
-			// 注意：如果清单里未找到资源包会抛出异常！
-			var packageBundle = _activeManifest.GetMainPackageBundle(assetInfo.AssetPath);
-			return CreateBundleInfo(packageBundle);
-		}
-		BundleInfo[] IBundleServices.GetAllDependBundleInfos(AssetInfo assetInfo)
-		{
-			if (assetInfo.IsInvalid)
-				throw new Exception("Should never get here !");
-
-			// 注意：如果清单里未找到资源包会抛出异常！
-			var depends = _activeManifest.GetAllDependencies(assetInfo.AssetPath);
-			List<BundleInfo> result = new List<BundleInfo>(depends.Length);
-			foreach (var packageBundle in depends)
-			{
-				BundleInfo bundleInfo = CreateBundleInfo(packageBundle);
-				result.Add(bundleInfo);
-			}
-			return result.ToArray();
-		}
-		string IBundleServices.GetBundleName(int bundleID)
-		{
-			return _activeManifest.GetBundleName(bundleID);
-		}
-		bool IBundleServices.IsServicesValid()
-		{
-			return _activeManifest != null;
-		}
-		#endregion
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/AssetSystem.meta b/Assets/YooAsset/Runtime/ResourceManager.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem.meta
rename to Assets/YooAsset/Runtime/ResourceManager.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Handles.meta b/Assets/YooAsset/Runtime/ResourceManager/Handle.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Handles.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Handle.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Handles/AllAssetsOperationHandle.cs b/Assets/YooAsset/Runtime/ResourceManager/Handle/AllAssetsHandle.cs
similarity index 71%
rename from Assets/YooAsset/Runtime/AssetSystem/Handles/AllAssetsOperationHandle.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Handle/AllAssetsHandle.cs
index 532bc27..4d4206c 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Handles/AllAssetsOperationHandle.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Handle/AllAssetsHandle.cs
@@ -3,11 +3,11 @@ using System.Collections.Generic;
 
 namespace YooAsset
 {
-	public sealed class AllAssetsOperationHandle : OperationHandleBase, IDisposable
+	public sealed class AllAssetsHandle : HandleBase, IDisposable
 	{
-		private System.Action<AllAssetsOperationHandle> _callback;
+		private System.Action<AllAssetsHandle> _callback;
 
-		internal AllAssetsOperationHandle(ProviderBase provider) : base(provider)
+		internal AllAssetsHandle(ProviderBase provider) : base(provider)
 		{
 		}
 		internal override void InvokeCallback()
@@ -18,12 +18,12 @@ namespace YooAsset
 		/// <summary>
 		/// 完成委托
 		/// </summary>
-		public event System.Action<AllAssetsOperationHandle> Completed
+		public event System.Action<AllAssetsHandle> Completed
 		{
 			add
 			{
 				if (IsValidWithWarning == false)
-					throw new System.Exception($"{nameof(AllAssetsOperationHandle)} is invalid");
+					throw new System.Exception($"{nameof(AllAssetsHandle)} is invalid");
 				if (Provider.IsDone)
 					value.Invoke(this);
 				else
@@ -32,7 +32,7 @@ namespace YooAsset
 			remove
 			{
 				if (IsValidWithWarning == false)
-					throw new System.Exception($"{nameof(AllAssetsOperationHandle)} is invalid");
+					throw new System.Exception($"{nameof(AllAssetsHandle)} is invalid");
 				_callback -= value;
 			}
 		}
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Handles/AllAssetsOperationHandle.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Handle/AllAssetsHandle.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Handles/AllAssetsOperationHandle.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Handle/AllAssetsHandle.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Handles/AssetOperationHandle.cs b/Assets/YooAsset/Runtime/ResourceManager/Handle/AssetHandle.cs
similarity index 89%
rename from Assets/YooAsset/Runtime/AssetSystem/Handles/AssetOperationHandle.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Handle/AssetHandle.cs
index 24a43d2..f67533c 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Handles/AssetOperationHandle.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Handle/AssetHandle.cs
@@ -4,11 +4,11 @@ using UnityEngine;
 
 namespace YooAsset
 {
-	public sealed class AssetOperationHandle : OperationHandleBase, IDisposable
+	public sealed class AssetHandle : HandleBase, IDisposable
 	{
-		private System.Action<AssetOperationHandle> _callback;
+		private System.Action<AssetHandle> _callback;
 
-		internal AssetOperationHandle(ProviderBase provider) : base(provider)
+		internal AssetHandle(ProviderBase provider) : base(provider)
 		{
 		}
 		internal override void InvokeCallback()
@@ -19,12 +19,12 @@ namespace YooAsset
 		/// <summary>
 		/// 完成委托
 		/// </summary>
-		public event System.Action<AssetOperationHandle> Completed
+		public event System.Action<AssetHandle> Completed
 		{
 			add
 			{
 				if (IsValidWithWarning == false)
-					throw new System.Exception($"{nameof(AssetOperationHandle)} is invalid");
+					throw new System.Exception($"{nameof(AssetHandle)} is invalid");
 				if (Provider.IsDone)
 					value.Invoke(this);
 				else
@@ -33,7 +33,7 @@ namespace YooAsset
 			remove
 			{
 				if (IsValidWithWarning == false)
-					throw new System.Exception($"{nameof(AssetOperationHandle)} is invalid");
+					throw new System.Exception($"{nameof(AssetHandle)} is invalid");
 				_callback -= value;
 			}
 		}
@@ -148,8 +148,9 @@ namespace YooAsset
 		}
 		private InstantiateOperation InstantiateAsyncInternal(bool setPositionAndRotation, Vector3 position, Quaternion rotation, Transform parent, bool worldPositionStays)
 		{
+			string packageName = GetAssetInfo().PackageName;
 			InstantiateOperation operation = new InstantiateOperation(this, setPositionAndRotation, position, rotation, parent, worldPositionStays);
-			OperationSystem.StartOperation(operation);
+			OperationSystem.StartOperation(packageName, operation);
 			return operation;
 		}
 	}
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Handles/AssetOperationHandle.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Handle/AssetHandle.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Handles/AssetOperationHandle.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Handle/AssetHandle.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Handles/OperationHandleBase.cs b/Assets/YooAsset/Runtime/ResourceManager/Handle/HandleBase.cs
similarity index 92%
rename from Assets/YooAsset/Runtime/AssetSystem/Handles/OperationHandleBase.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Handle/HandleBase.cs
index 737e60e..1c1233c 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Handles/OperationHandleBase.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Handle/HandleBase.cs
@@ -3,12 +3,12 @@ using System.Collections;
 
 namespace YooAsset
 {
-	public abstract class OperationHandleBase : IEnumerator
+	public abstract class HandleBase : IEnumerator
 	{
 		private readonly AssetInfo _assetInfo;
 		internal ProviderBase Provider { private set; get; }
 
-		internal OperationHandleBase(ProviderBase provider)
+		internal HandleBase(ProviderBase provider)
 		{
 			Provider = provider;
 			_assetInfo = provider.MainAssetInfo;
@@ -26,13 +26,13 @@ namespace YooAsset
 		/// <summary>
 		/// 获取下载报告
 		/// </summary>
-		public DownloadReport GetDownloadReport()
+		public DownloadStatus GetDownloadStatus()
 		{
 			if (IsValidWithWarning == false)
 			{
-				return DownloadReport.CreateDefaultReport();
+				return DownloadStatus.CreateDefaultStatus();
 			}
-			return Provider.GetDownloadReport();
+			return Provider.GetDownloadStatus();
 		}
 
 		/// <summary>
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Handles/OperationHandleBase.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Handle/HandleBase.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Handles/OperationHandleBase.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Handle/HandleBase.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Handles/RawFileOperationHandle.cs b/Assets/YooAsset/Runtime/ResourceManager/Handle/RawFileHandle.cs
similarity index 78%
rename from Assets/YooAsset/Runtime/AssetSystem/Handles/RawFileOperationHandle.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Handle/RawFileHandle.cs
index 4faad57..f700973 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Handles/RawFileOperationHandle.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Handle/RawFileHandle.cs
@@ -4,11 +4,11 @@ using System.Text;
 
 namespace YooAsset
 {
-	public class RawFileOperationHandle : OperationHandleBase, IDisposable
+	public class RawFileHandle : HandleBase, IDisposable
 	{
-		private System.Action<RawFileOperationHandle> _callback;
+		private System.Action<RawFileHandle> _callback;
 
-		internal RawFileOperationHandle(ProviderBase provider) : base(provider)
+		internal RawFileHandle(ProviderBase provider) : base(provider)
 		{
 		}
 		internal override void InvokeCallback()
@@ -19,12 +19,12 @@ namespace YooAsset
 		/// <summary>
 		/// 完成委托
 		/// </summary>
-		public event System.Action<RawFileOperationHandle> Completed
+		public event System.Action<RawFileHandle> Completed
 		{
 			add
 			{
 				if (IsValidWithWarning == false)
-					throw new System.Exception($"{nameof(RawFileOperationHandle)} is invalid");
+					throw new System.Exception($"{nameof(RawFileHandle)} is invalid");
 				if (Provider.IsDone)
 					value.Invoke(this);
 				else
@@ -33,7 +33,7 @@ namespace YooAsset
 			remove
 			{
 				if (IsValidWithWarning == false)
-					throw new System.Exception($"{nameof(RawFileOperationHandle)} is invalid");
+					throw new System.Exception($"{nameof(RawFileHandle)} is invalid");
 				_callback -= value;
 			}
 		}
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Handles/RawFileOperationHandle.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Handle/RawFileHandle.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Handles/RawFileOperationHandle.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Handle/RawFileHandle.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Handles/SceneOperationHandle.cs b/Assets/YooAsset/Runtime/ResourceManager/Handle/SceneHandle.cs
similarity index 82%
rename from Assets/YooAsset/Runtime/AssetSystem/Handles/SceneOperationHandle.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Handle/SceneHandle.cs
index b0f14eb..7b95dcc 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Handles/SceneOperationHandle.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Handle/SceneHandle.cs
@@ -2,12 +2,12 @@
 
 namespace YooAsset
 {
-	public class SceneOperationHandle : OperationHandleBase
+	public class SceneHandle : HandleBase
 	{
-		private System.Action<SceneOperationHandle> _callback;
+		private System.Action<SceneHandle> _callback;
 		internal string PackageName { set; get; }
 
-		internal SceneOperationHandle(ProviderBase provider) : base(provider)
+		internal SceneHandle(ProviderBase provider) : base(provider)
 		{
 		}
 		internal override void InvokeCallback()
@@ -18,12 +18,12 @@ namespace YooAsset
 		/// <summary>
 		/// 完成委托
 		/// </summary>
-		public event System.Action<SceneOperationHandle> Completed
+		public event System.Action<SceneHandle> Completed
 		{
 			add
 			{
 				if (IsValidWithWarning == false)
-					throw new System.Exception($"{nameof(SceneOperationHandle)} is invalid");
+					throw new System.Exception($"{nameof(SceneHandle)} is invalid");
 				if (Provider.IsDone)
 					value.Invoke(this);
 				else
@@ -32,7 +32,7 @@ namespace YooAsset
 			remove
 			{
 				if (IsValidWithWarning == false)
-					throw new System.Exception($"{nameof(SceneOperationHandle)} is invalid");
+					throw new System.Exception($"{nameof(SceneHandle)} is invalid");
 				_callback -= value;
 			}
 		}
@@ -130,12 +130,14 @@ namespace YooAsset
 		/// </summary>
 		public UnloadSceneOperation UnloadAsync()
 		{
+			string packageName = GetAssetInfo().PackageName;
+
 			// 如果句柄无效
 			if (IsValidWithWarning == false)
 			{
-				string error = $"{nameof(SceneOperationHandle)} is invalid.";
+				string error = $"{nameof(SceneHandle)} is invalid.";
 				var operation = new UnloadSceneOperation(error);
-				OperationSystem.StartOperation(operation);
+				OperationSystem.StartOperation(packageName, operation);
 				return operation;
 			}
 
@@ -145,7 +147,7 @@ namespace YooAsset
 				string error = $"Cannot unload main scene. Use {nameof(YooAssets.LoadSceneAsync)} method to change the main scene !";
 				YooLogger.Error(error);
 				var operation = new UnloadSceneOperation(error);
-				OperationSystem.StartOperation(operation);
+				OperationSystem.StartOperation(packageName, operation);
 				return operation;
 			}
 
@@ -154,7 +156,7 @@ namespace YooAsset
 			Provider.Impl.UnloadSubScene(Provider);
 			{
 				var operation = new UnloadSceneOperation(sceneObject);
-				OperationSystem.StartOperation(operation);
+				OperationSystem.StartOperation(packageName, operation);
 				return operation;
 			}
 		}
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Handles/SceneOperationHandle.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Handle/SceneHandle.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Handles/SceneOperationHandle.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Handle/SceneHandle.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Handles/SubAssetsOperationHandle.cs b/Assets/YooAsset/Runtime/ResourceManager/Handle/SubAssetsHandle.cs
similarity index 83%
rename from Assets/YooAsset/Runtime/AssetSystem/Handles/SubAssetsOperationHandle.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Handle/SubAssetsHandle.cs
index 0ad7afd..7c9ed89 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Handles/SubAssetsOperationHandle.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Handle/SubAssetsHandle.cs
@@ -3,11 +3,11 @@ using System.Collections.Generic;
 
 namespace YooAsset
 {
-	public sealed class SubAssetsOperationHandle : OperationHandleBase, IDisposable
+	public sealed class SubAssetsHandle : HandleBase, IDisposable
 	{
-		private System.Action<SubAssetsOperationHandle> _callback;
+		private System.Action<SubAssetsHandle> _callback;
 
-		internal SubAssetsOperationHandle(ProviderBase provider) : base(provider)
+		internal SubAssetsHandle(ProviderBase provider) : base(provider)
 		{
 		}
 		internal override void InvokeCallback()
@@ -18,12 +18,12 @@ namespace YooAsset
 		/// <summary>
 		/// 完成委托
 		/// </summary>
-		public event System.Action<SubAssetsOperationHandle> Completed
+		public event System.Action<SubAssetsHandle> Completed
 		{
 			add
 			{
 				if (IsValidWithWarning == false)
-					throw new System.Exception($"{nameof(SubAssetsOperationHandle)} is invalid");
+					throw new System.Exception($"{nameof(SubAssetsHandle)} is invalid");
 				if (Provider.IsDone)
 					value.Invoke(this);
 				else
@@ -32,7 +32,7 @@ namespace YooAsset
 			remove
 			{
 				if (IsValidWithWarning == false)
-					throw new System.Exception($"{nameof(SubAssetsOperationHandle)} is invalid");
+					throw new System.Exception($"{nameof(SubAssetsHandle)} is invalid");
 				_callback -= value;
 			}
 		}
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Handles/SubAssetsOperationHandle.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Handle/SubAssetsHandle.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Handles/SubAssetsOperationHandle.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Handle/SubAssetsHandle.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader.meta b/Assets/YooAsset/Runtime/ResourceManager/Loader.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Loader.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Loader.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleFileLoader.cs b/Assets/YooAsset/Runtime/ResourceManager/Loader/AssetBundleFileLoader.cs
similarity index 61%
rename from Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleFileLoader.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Loader/AssetBundleFileLoader.cs
index 16d8595..3597a2d 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleFileLoader.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Loader/AssetBundleFileLoader.cs
@@ -27,10 +27,10 @@ namespace YooAsset
 		private DownloaderBase _unpacker;
 		private DownloaderBase _downloader;
 		private AssetBundleCreateRequest _createRequest;
-		private Stream _stream;
+		private Stream _managedStream;
 
 
-		public AssetBundleFileLoader(AssetSystemImpl impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
+		public AssetBundleFileLoader(ResourceManager impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
 		{
 		}
 
@@ -47,31 +47,30 @@ namespace YooAsset
 				if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
 				{
 					_steps = ESteps.Download;
-					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
+					FileLoadPath = MainBundleInfo.CachedDataFilePath;
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
 				{
 #if UNITY_ANDROID
-					EBundleLoadMethod loadMethod = (EBundleLoadMethod)MainBundleInfo.Bundle.LoadMethod;
-					if (loadMethod == EBundleLoadMethod.LoadFromMemory || loadMethod == EBundleLoadMethod.LoadFromStream)
+					if (MainBundleInfo.Bundle.Encrypted)
 					{
 						_steps = ESteps.Unpack;
-						FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
+						FileLoadPath = MainBundleInfo.CachedDataFilePath;
 					}
 					else
 					{
 						_steps = ESteps.LoadBundleFile;
-						FileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
+						FileLoadPath = MainBundleInfo.BuildinFilePath;
 					}
 #else
 					_steps = ESteps.LoadBundleFile;
-					FileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
+					FileLoadPath = MainBundleInfo.BuildinFilePath;
 #endif
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
 				{
 					_steps = ESteps.LoadBundleFile;
-					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
+					FileLoadPath = MainBundleInfo.CachedDataFilePath;
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromDelivery)
 				{
@@ -87,8 +86,7 @@ namespace YooAsset
 			// 1. 从服务器下载
 			if (_steps == ESteps.Download)
 			{
-				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				_downloader = DownloadSystem.CreateDownload(MainBundleInfo, failedTryAgain);
+				_downloader = MainBundleInfo.CreateDownloader(int.MaxValue);
 				_downloader.SendRequest();
 				_steps = ESteps.CheckDownload;
 			}
@@ -117,9 +115,8 @@ namespace YooAsset
 			// 3. 内置文件解压
 			if (_steps == ESteps.Unpack)
 			{
-				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
-				_unpacker = DownloadSystem.CreateDownload(bundleInfo, failedTryAgain);
+				int failedTryAgain = 1;
+				_unpacker = MainBundleInfo.CreateUnpacker(failedTryAgain);
 				_unpacker.SendRequest();
 				_steps = ESteps.CheckUnpack;
 			}
@@ -163,60 +160,13 @@ namespace YooAsset
 				DownloadProgress = 1f;
 				DownloadedBytes = (ulong)MainBundleInfo.Bundle.FileSize;
 
-				// Load assetBundle file
-				var loadMethod = (EBundleLoadMethod)MainBundleInfo.Bundle.LoadMethod;
-				if (loadMethod == EBundleLoadMethod.Normal)
-				{
-					if (_isWaitForAsyncComplete)
-						CacheBundle = AssetBundle.LoadFromFile(FileLoadPath);
-					else
-						_createRequest = AssetBundle.LoadFromFileAsync(FileLoadPath);
-				}
+				// 加载AssetBundle资源对象
+				// 注意：解密服务类可能会返回空的对象。
+				if (_isWaitForAsyncComplete)
+					CacheBundle = MainBundleInfo.LoadAssetBundle(FileLoadPath, out _managedStream);
 				else
-				{
-					if (Impl.DecryptionServices == null)
-					{
-						_steps = ESteps.Done;
-						Status = EStatus.Failed;
-						LastError = $"{nameof(IDecryptionServices)} is null : {MainBundleInfo.Bundle.BundleName}";
-						YooLogger.Error(LastError);
-						return;
-					}
+					_createRequest = MainBundleInfo.LoadAssetBundleAsync(FileLoadPath, out _managedStream);
 
-					DecryptFileInfo fileInfo = new DecryptFileInfo();
-					fileInfo.BundleName = MainBundleInfo.Bundle.BundleName;
-					fileInfo.FilePath = FileLoadPath;
-
-					if (loadMethod == EBundleLoadMethod.LoadFromFileOffset)
-					{
-						ulong offset = Impl.DecryptionServices.LoadFromFileOffset(fileInfo);
-						if (_isWaitForAsyncComplete)
-							CacheBundle = AssetBundle.LoadFromFile(FileLoadPath, 0, offset);
-						else
-							_createRequest = AssetBundle.LoadFromFileAsync(FileLoadPath, 0, offset);
-					}
-					else if (loadMethod == EBundleLoadMethod.LoadFromMemory)
-					{
-						byte[] fileData = Impl.DecryptionServices.LoadFromMemory(fileInfo);
-						if (_isWaitForAsyncComplete)
-							CacheBundle = AssetBundle.LoadFromMemory(fileData);
-						else
-							_createRequest = AssetBundle.LoadFromMemoryAsync(fileData);
-					}
-					else if (loadMethod == EBundleLoadMethod.LoadFromStream)
-					{
-						_stream = Impl.DecryptionServices.LoadFromStream(fileInfo);
-						uint managedReadBufferSize = Impl.DecryptionServices.GetManagedReadBufferSize();
-						if (_isWaitForAsyncComplete)
-							CacheBundle = AssetBundle.LoadFromStream(_stream, 0, managedReadBufferSize);
-						else
-							_createRequest = AssetBundle.LoadFromStreamAsync(_stream, 0, managedReadBufferSize);
-					}
-					else
-					{
-						throw new System.NotImplementedException();
-					}
-				}
 				_steps = ESteps.CheckLoadFile;
 			}
 
@@ -228,23 +178,11 @@ namespace YooAsset
 				DownloadedBytes = (ulong)MainBundleInfo.Bundle.FileSize;
 
 				// Load assetBundle file
-				var loadMethod = (EBundleLoadMethod)MainBundleInfo.Bundle.LoadMethod;
-				if (loadMethod == EBundleLoadMethod.Normal)
-				{
-					ulong offset = MainBundleInfo.DeliveryFileOffset;
-					if (_isWaitForAsyncComplete)
-						CacheBundle = AssetBundle.LoadFromFile(FileLoadPath, 0, offset);
-					else
-						_createRequest = AssetBundle.LoadFromFileAsync(FileLoadPath, 0, offset);
-				}
+				if (_isWaitForAsyncComplete)
+					CacheBundle = MainBundleInfo.LoadDeliveryAssetBundle(FileLoadPath);
 				else
-				{
-					_steps = ESteps.Done;
-					Status = EStatus.Failed;
-					LastError = $"Delivery file not support encryption : {MainBundleInfo.Bundle.BundleName}";
-					YooLogger.Error(LastError);
-					return;
-				}
+					_createRequest = MainBundleInfo.LoadDeliveryAssetBundleAsync(FileLoadPath);
+
 				_steps = ESteps.CheckLoadFile;
 			}
 
@@ -279,11 +217,11 @@ namespace YooAsset
 					// 在AssetBundle文件加载失败的情况下，我们需要重新验证文件的完整性！
 					if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
 					{
-						var result = CacheSystem.VerifyingRecordFile(MainBundleInfo.Bundle.PackageName, MainBundleInfo.Bundle.CacheGUID);
+						var result = MainBundleInfo.VerifySelf();
 						if (result != EVerifyResult.Succeed)
 						{
 							YooLogger.Error($"Found possibly corrupt file ! {MainBundleInfo.Bundle.CacheGUID} Verify result : {result}");
-							CacheSystem.DiscardFile(MainBundleInfo.Bundle.PackageName, MainBundleInfo.Bundle.CacheGUID);
+							MainBundleInfo.CacheDiscard();
 						}
 					}
 				}
@@ -302,11 +240,11 @@ namespace YooAsset
 		{
 			base.Destroy();
 
-			if (_stream != null)
+			if (_managedStream != null)
 			{
-				_stream.Close();
-				_stream.Dispose();
-				_stream = null;
+				_managedStream.Close();
+				_managedStream.Dispose();
+				_managedStream = null;
 			}
 		}
 
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleFileLoader.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Loader/AssetBundleFileLoader.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleFileLoader.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Loader/AssetBundleFileLoader.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleWebLoader.cs b/Assets/YooAsset/Runtime/ResourceManager/Loader/AssetBundleWebLoader.cs
similarity index 80%
rename from Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleWebLoader.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Loader/AssetBundleWebLoader.cs
index fe81b44..20d013c 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleWebLoader.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Loader/AssetBundleWebLoader.cs
@@ -22,10 +22,10 @@ namespace YooAsset
 		}
 
 		private ESteps _steps = ESteps.None;
-		private WebDownloader _downloader;
+		private DownloaderBase _downloader;
 
 
-		public AssetBundleWebLoader(AssetSystemImpl impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
+		public AssetBundleWebLoader(ResourceManager impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
 		{
 		}
 
@@ -58,8 +58,7 @@ namespace YooAsset
 			// 1. 跨域获取资源包
 			if (_steps == ESteps.LoadRemoteFile)
 			{
-				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				_downloader = DownloadSystem.CreateDownload(MainBundleInfo, failedTryAgain) as WebDownloader;
+				_downloader = MainBundleInfo.CreateDownloader(int.MaxValue);
 				_downloader.SendRequest(true);
 				_steps = ESteps.CheckLoadFile;
 			}
@@ -67,9 +66,7 @@ namespace YooAsset
 			// 2. 从站点获取资源包
 			if (_steps == ESteps.LoadWebSiteFile)
 			{
-				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
-				_downloader = DownloadSystem.CreateDownload(bundleInfo, failedTryAgain) as WebDownloader;
+				_downloader = MainBundleInfo.CreateUnpacker(int.MaxValue);
 				_downloader.SendRequest(true);
 				_steps = ESteps.CheckLoadFile;
 			}
@@ -95,9 +92,6 @@ namespace YooAsset
 					_steps = ESteps.Done;
 					Status = EStatus.Succeed;
 				}
-
-				// 注意：释放下载句柄
-				_downloader.DisposeHandler();
 			}
 		}
 
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleWebLoader.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Loader/AssetBundleWebLoader.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Loader/AssetBundleWebLoader.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Loader/AssetBundleWebLoader.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/BundleLoaderBase.cs b/Assets/YooAsset/Runtime/ResourceManager/Loader/BundleLoaderBase.cs
similarity index 89%
rename from Assets/YooAsset/Runtime/AssetSystem/Loader/BundleLoaderBase.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Loader/BundleLoaderBase.cs
index 12d3e4d..8301b44 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Loader/BundleLoaderBase.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Loader/BundleLoaderBase.cs
@@ -17,7 +17,7 @@ namespace YooAsset
 		/// <summary>
 		/// 所属资源系统
 		/// </summary>
-		public AssetSystemImpl Impl { private set; get; }
+		public ResourceManager Impl { private set; get; }
 
 		/// <summary>
 		/// 资源包文件信息
@@ -51,7 +51,7 @@ namespace YooAsset
 		internal ulong DownloadedBytes { set; get; }
 
 
-		public BundleLoaderBase(AssetSystemImpl impl, BundleInfo bundleInfo)
+		public BundleLoaderBase(ResourceManager impl, BundleInfo bundleInfo)
 		{
 			Impl = impl;
 			MainBundleInfo = bundleInfo;
@@ -103,14 +103,6 @@ namespace YooAsset
 			if (RefCount > 0)
 				return false;
 
-			// 检查引用链上的资源包是否已经全部销毁
-			// 注意：互相引用的资源包无法卸载！
-			foreach (var bundleID in MainBundleInfo.Bundle.ReferenceIDs)
-			{
-				if (Impl.CheckBundleDestroyed(bundleID) == false)
-					return false;
-			}
-
 			return true;
 		}
 
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/BundleLoaderBase.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Loader/BundleLoaderBase.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Loader/BundleLoaderBase.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Loader/BundleLoaderBase.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/DependAssetBundles.cs b/Assets/YooAsset/Runtime/ResourceManager/Loader/DependAssetBundles.cs
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Loader/DependAssetBundles.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Loader/DependAssetBundles.cs
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/DependAssetBundles.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Loader/DependAssetBundles.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Loader/DependAssetBundles.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Loader/DependAssetBundles.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/RawBundleFileLoader.cs b/Assets/YooAsset/Runtime/ResourceManager/Loader/RawBundleFileLoader.cs
similarity index 84%
rename from Assets/YooAsset/Runtime/AssetSystem/Loader/RawBundleFileLoader.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Loader/RawBundleFileLoader.cs
index c5a8122..34a3989 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Loader/RawBundleFileLoader.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Loader/RawBundleFileLoader.cs
@@ -20,7 +20,7 @@ namespace YooAsset
 		private DownloaderBase _downloader;
 
 
-		public RawBundleFileLoader(AssetSystemImpl impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
+		public RawBundleFileLoader(ResourceManager impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
 		{
 		}
 
@@ -37,22 +37,22 @@ namespace YooAsset
 				if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
 				{
 					_steps = ESteps.Download;
-					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
+					FileLoadPath = MainBundleInfo.CachedDataFilePath;
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
 				{
 #if UNITY_ANDROID
 					_steps = ESteps.Unpack;
-					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
+					FileLoadPath = MainBundleInfo.CachedDataFilePath;
 #else
 					_steps = ESteps.CheckFile;
-					FileLoadPath = MainBundleInfo.Bundle.StreamingFilePath;
+					FileLoadPath = MainBundleInfo.BuildinFilePath;
 #endif
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromCache)
 				{
 					_steps = ESteps.CheckFile;
-					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
+					FileLoadPath = MainBundleInfo.CachedDataFilePath;
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromDelivery)
 				{
@@ -68,8 +68,7 @@ namespace YooAsset
 			// 1. 下载远端文件
 			if (_steps == ESteps.Download)
 			{
-				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				_downloader = DownloadSystem.CreateDownload(MainBundleInfo, failedTryAgain);
+				_downloader = MainBundleInfo.CreateDownloader(int.MaxValue);
 				_downloader.SendRequest();
 				_steps = ESteps.CheckDownload;
 			}
@@ -97,9 +96,8 @@ namespace YooAsset
 			// 3. 解压内置文件
 			if (_steps == ESteps.Unpack)
 			{
-				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
-				_unpacker = DownloadSystem.CreateDownload(bundleInfo, failedTryAgain);
+				int failedTryAgain = 1;
+				_unpacker = MainBundleInfo.CreateUnpacker(failedTryAgain);
 				_unpacker.SendRequest();
 				_steps = ESteps.CheckUnpack;
 			}
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/RawBundleFileLoader.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Loader/RawBundleFileLoader.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Loader/RawBundleFileLoader.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Loader/RawBundleFileLoader.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/RawBundleWebLoader.cs b/Assets/YooAsset/Runtime/ResourceManager/Loader/RawBundleWebLoader.cs
similarity index 84%
rename from Assets/YooAsset/Runtime/AssetSystem/Loader/RawBundleWebLoader.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Loader/RawBundleWebLoader.cs
index 6879db7..b5dbbc3 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Loader/RawBundleWebLoader.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Loader/RawBundleWebLoader.cs
@@ -23,7 +23,7 @@ namespace YooAsset
 		private DownloaderBase _downloader;
 
 
-		public RawBundleWebLoader(AssetSystemImpl impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
+		public RawBundleWebLoader(ResourceManager impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
 		{
 		}
 
@@ -40,12 +40,12 @@ namespace YooAsset
 				if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
 				{
 					_steps = ESteps.Download;
-					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
+					FileLoadPath = MainBundleInfo.CachedDataFilePath;
 				}
 				else if (MainBundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromStreaming)
 				{
 					_steps = ESteps.Website;
-					FileLoadPath = MainBundleInfo.Bundle.CachedDataFilePath;
+					FileLoadPath = MainBundleInfo.CachedDataFilePath;
 				}
 				else
 				{
@@ -56,8 +56,7 @@ namespace YooAsset
 			// 1. 下载远端文件
 			if (_steps == ESteps.Download)
 			{
-				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				_downloader = DownloadSystem.CreateDownload(MainBundleInfo, failedTryAgain);
+				_downloader = MainBundleInfo.CreateDownloader(int.MaxValue);
 				_downloader.SendRequest();
 				_steps = ESteps.CheckDownload;
 			}
@@ -85,9 +84,7 @@ namespace YooAsset
 			// 3. 从站点下载
 			if (_steps == ESteps.Website)
 			{
-				int failedTryAgain = Impl.DownloadFailedTryAgain;
-				var bundleInfo = ManifestTools.ConvertToUnpackInfo(MainBundleInfo.Bundle);
-				_website = DownloadSystem.CreateDownload(bundleInfo, failedTryAgain);
+				_website = MainBundleInfo.CreateUnpacker(int.MaxValue);
 				_website.SendRequest();
 				_steps = ESteps.CheckWebsite;
 			}
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/RawBundleWebLoader.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Loader/RawBundleWebLoader.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Loader/RawBundleWebLoader.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Loader/RawBundleWebLoader.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/VirtualBundleFileLoader.cs b/Assets/YooAsset/Runtime/ResourceManager/Loader/VirtualBundleFileLoader.cs
similarity index 95%
rename from Assets/YooAsset/Runtime/AssetSystem/Loader/VirtualBundleFileLoader.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Loader/VirtualBundleFileLoader.cs
index e429fbe..b9cabbb 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Loader/VirtualBundleFileLoader.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Loader/VirtualBundleFileLoader.cs
@@ -12,7 +12,7 @@ namespace YooAsset
 
 		private ESteps _steps = ESteps.None;
 
-		public VirtualBundleFileLoader(AssetSystemImpl impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
+		public VirtualBundleFileLoader(ResourceManager impl, BundleInfo bundleInfo) : base(impl, bundleInfo)
 		{
 		}
 
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Loader/VirtualBundleFileLoader.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Loader/VirtualBundleFileLoader.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Loader/VirtualBundleFileLoader.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Loader/VirtualBundleFileLoader.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Operations.meta b/Assets/YooAsset/Runtime/ResourceManager/Operation.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Operations.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Operation.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Operations/InstantiateOperation.cs b/Assets/YooAsset/Runtime/ResourceManager/Operation/InstantiateOperation.cs
similarity index 88%
rename from Assets/YooAsset/Runtime/AssetSystem/Operations/InstantiateOperation.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Operation/InstantiateOperation.cs
index 02f2d5a..7587647 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Operations/InstantiateOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Operation/InstantiateOperation.cs
@@ -11,7 +11,7 @@ namespace YooAsset
 			Done,
 		}
 
-		private readonly AssetOperationHandle _handle;
+		private readonly AssetHandle _handle;
 		private readonly bool _setPositionAndRotation;
 		private readonly Vector3 _position;
 		private readonly Quaternion _rotation;
@@ -25,7 +25,7 @@ namespace YooAsset
 		public GameObject Result = null;
 
 
-		internal InstantiateOperation(AssetOperationHandle handle, bool setPositionAndRotation, Vector3 position, Quaternion rotation, Transform parent, bool worldPositionStays)
+		internal InstantiateOperation(AssetHandle handle, bool setPositionAndRotation, Vector3 position, Quaternion rotation, Transform parent, bool worldPositionStays)
 		{
 			_handle = handle;
 			_setPositionAndRotation = setPositionAndRotation;
@@ -49,7 +49,7 @@ namespace YooAsset
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
-					Error = $"{nameof(AssetOperationHandle)} is invalid.";
+					Error = $"{nameof(AssetHandle)} is invalid.";
 					return;
 				}
 
@@ -60,7 +60,7 @@ namespace YooAsset
 				{
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
-					Error = $"{nameof(AssetOperationHandle.AssetObject)} is null.";
+					Error = $"{nameof(AssetHandle.AssetObject)} is null.";
 					return;
 				}
 
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Operations/InstantiateOperation.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Operation/InstantiateOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Operations/InstantiateOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Operation/InstantiateOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Operations/UnloadSceneOperation.cs b/Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadSceneOperation.cs
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Operations/UnloadSceneOperation.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadSceneOperation.cs
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Operations/UnloadSceneOperation.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadSceneOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Operations/UnloadSceneOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Operation/UnloadSceneOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider.meta b/Assets/YooAsset/Runtime/ResourceManager/Provider.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Provider.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/BundledAllAssetsProvider.cs b/Assets/YooAsset/Runtime/ResourceManager/Provider/BundledAllAssetsProvider.cs
similarity index 97%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/BundledAllAssetsProvider.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/BundledAllAssetsProvider.cs
index d5d2ee9..b30ad31 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Provider/BundledAllAssetsProvider.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Provider/BundledAllAssetsProvider.cs
@@ -8,7 +8,7 @@ namespace YooAsset
 	{
 		private AssetBundleRequest _cacheRequest;
 		
-		public BundledAllAssetsProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
+		public BundledAllAssetsProvider(ResourceManager impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}
 		public override void Update()
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/BundledAllAssetsProvider.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Provider/BundledAllAssetsProvider.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/BundledAllAssetsProvider.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/BundledAllAssetsProvider.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/BundledAssetProvider.cs b/Assets/YooAsset/Runtime/ResourceManager/Provider/BundledAssetProvider.cs
similarity index 97%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/BundledAssetProvider.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/BundledAssetProvider.cs
index 4d83c7b..dcff7d4 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Provider/BundledAssetProvider.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Provider/BundledAssetProvider.cs
@@ -8,7 +8,7 @@ namespace YooAsset
 	{
 		private AssetBundleRequest _cacheRequest;
 
-		public BundledAssetProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
+		public BundledAssetProvider(ResourceManager impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}
 		public override void Update()
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/BundledAssetProvider.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Provider/BundledAssetProvider.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/BundledAssetProvider.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/BundledAssetProvider.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/BundledRawFileProvider.cs b/Assets/YooAsset/Runtime/ResourceManager/Provider/BundledRawFileProvider.cs
similarity index 93%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/BundledRawFileProvider.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/BundledRawFileProvider.cs
index c8ee879..6f89bab 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Provider/BundledRawFileProvider.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Provider/BundledRawFileProvider.cs
@@ -3,7 +3,7 @@ namespace YooAsset
 {
 	internal class BundledRawFileProvider : ProviderBase
 	{
-		public BundledRawFileProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
+		public BundledRawFileProvider(ResourceManager impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}
 		public override void Update()
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/BundledRawFileProvider.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Provider/BundledRawFileProvider.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/BundledRawFileProvider.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/BundledRawFileProvider.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/BundledSceneProvider.cs b/Assets/YooAsset/Runtime/ResourceManager/Provider/BundledSceneProvider.cs
similarity index 97%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/BundledSceneProvider.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/BundledSceneProvider.cs
index 81140df..f632ba2 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Provider/BundledSceneProvider.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Provider/BundledSceneProvider.cs
@@ -14,7 +14,7 @@ namespace YooAsset
 		private readonly int _priority;
 		private AsyncOperation _asyncOperation;
 
-		public BundledSceneProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool suspendLoad, int priority) : base(impl, providerGUID, assetInfo)
+		public BundledSceneProvider(ResourceManager impl, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool suspendLoad, int priority) : base(impl, providerGUID, assetInfo)
 		{
 			SceneMode = sceneMode;
 			_sceneName = Path.GetFileNameWithoutExtension(assetInfo.AssetPath);
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/BundledSceneProvider.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Provider/BundledSceneProvider.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/BundledSceneProvider.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/BundledSceneProvider.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/BundledSubAssetsProvider.cs b/Assets/YooAsset/Runtime/ResourceManager/Provider/BundledSubAssetsProvider.cs
similarity index 97%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/BundledSubAssetsProvider.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/BundledSubAssetsProvider.cs
index 58dece6..70ce28e 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Provider/BundledSubAssetsProvider.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Provider/BundledSubAssetsProvider.cs
@@ -8,7 +8,7 @@ namespace YooAsset
 	{
 		private AssetBundleRequest _cacheRequest;
 
-		public BundledSubAssetsProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
+		public BundledSubAssetsProvider(ResourceManager impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}
 		public override void Update()
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/BundledSubAssetsProvider.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Provider/BundledSubAssetsProvider.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/BundledSubAssetsProvider.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/BundledSubAssetsProvider.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/CompletedProvider.cs b/Assets/YooAsset/Runtime/ResourceManager/Provider/CompletedProvider.cs
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/CompletedProvider.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/CompletedProvider.cs
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/CompletedProvider.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Provider/CompletedProvider.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/CompletedProvider.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/CompletedProvider.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseAllAssetsProvider.cs b/Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseAllAssetsProvider.cs
similarity index 96%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseAllAssetsProvider.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseAllAssetsProvider.cs
index 44e98d6..1931f02 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseAllAssetsProvider.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseAllAssetsProvider.cs
@@ -6,7 +6,7 @@ namespace YooAsset
 {
 	internal sealed class DatabaseAllAssetsProvider : ProviderBase
 	{
-		public DatabaseAllAssetsProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
+		public DatabaseAllAssetsProvider(ResourceManager impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}
 		public override void Update()
@@ -63,7 +63,7 @@ namespace YooAsset
 				if (MainAssetInfo.AssetType == null)
 				{
 					List<UnityEngine.Object> result = new List<Object>();
-					foreach (var assetPath in OwnerBundle.MainBundleInfo.IncludeAssets)
+					foreach (var assetPath in OwnerBundle.MainBundleInfo.IncludeAssetsInEditor)
 					{
 						UnityEngine.Object mainAsset = UnityEditor.AssetDatabase.LoadMainAssetAtPath(assetPath);
 						if (mainAsset != null)
@@ -74,7 +74,7 @@ namespace YooAsset
 				else
 				{
 					List<UnityEngine.Object> result = new List<Object>();
-					foreach (var assetPath in OwnerBundle.MainBundleInfo.IncludeAssets)
+					foreach (var assetPath in OwnerBundle.MainBundleInfo.IncludeAssetsInEditor)
 					{
 						UnityEngine.Object mainAsset = UnityEditor.AssetDatabase.LoadAssetAtPath(assetPath, MainAssetInfo.AssetType);
 						if (mainAsset != null)
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseAllAssetsProvider.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseAllAssetsProvider.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseAllAssetsProvider.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseAllAssetsProvider.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseAssetProvider.cs b/Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseAssetProvider.cs
similarity index 97%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseAssetProvider.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseAssetProvider.cs
index e3590a2..87fc107 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseAssetProvider.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseAssetProvider.cs
@@ -6,7 +6,7 @@ namespace YooAsset
 {
 	internal sealed class DatabaseAssetProvider : ProviderBase
 	{
-		public DatabaseAssetProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
+		public DatabaseAssetProvider(ResourceManager impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}
 		public override void Update()
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseAssetProvider.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseAssetProvider.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseAssetProvider.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseAssetProvider.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseRawFileProvider.cs b/Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseRawFileProvider.cs
similarity index 95%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseRawFileProvider.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseRawFileProvider.cs
index 167d287..6e96659 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseRawFileProvider.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseRawFileProvider.cs
@@ -3,7 +3,7 @@ namespace YooAsset
 {
 	internal class DatabaseRawFileProvider : ProviderBase
 	{
-		public DatabaseRawFileProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
+		public DatabaseRawFileProvider(ResourceManager impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}
 		public override void Update()
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseRawFileProvider.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseRawFileProvider.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseRawFileProvider.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseRawFileProvider.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseSceneProvider.cs b/Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseSceneProvider.cs
similarity index 97%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseSceneProvider.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseSceneProvider.cs
index 90d22b6..b3612dd 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseSceneProvider.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseSceneProvider.cs
@@ -10,7 +10,7 @@ namespace YooAsset
 		private readonly int _priority;
 		private AsyncOperation _asyncOperation;
 
-		public DatabaseSceneProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool suspendLoad, int priority) : base(impl, providerGUID, assetInfo)
+		public DatabaseSceneProvider(ResourceManager impl, string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool suspendLoad, int priority) : base(impl, providerGUID, assetInfo)
 		{
 			SceneMode = sceneMode;
 			_suspendLoad = suspendLoad;
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseSceneProvider.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseSceneProvider.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseSceneProvider.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseSceneProvider.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseSubAssetsProvider.cs b/Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseSubAssetsProvider.cs
similarity index 97%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseSubAssetsProvider.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseSubAssetsProvider.cs
index f89d3e7..8e1478e 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseSubAssetsProvider.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseSubAssetsProvider.cs
@@ -6,7 +6,7 @@ namespace YooAsset
 {
 	internal sealed class DatabaseSubAssetsProvider : ProviderBase
 	{
-		public DatabaseSubAssetsProvider(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
+		public DatabaseSubAssetsProvider(ResourceManager impl, string providerGUID, AssetInfo assetInfo) : base(impl, providerGUID, assetInfo)
 		{
 		}
 		public override void Update()
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseSubAssetsProvider.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseSubAssetsProvider.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/DatabaseSubAssetsProvider.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/DatabaseSubAssetsProvider.cs.meta
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/ProviderBase.cs b/Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderBase.cs
similarity index 77%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/ProviderBase.cs
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderBase.cs
index 68491dc..782bd72 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/Provider/ProviderBase.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderBase.cs
@@ -25,7 +25,7 @@ namespace YooAsset
 		/// <summary>
 		/// 所属资源系统
 		/// </summary>
-		public AssetSystemImpl Impl { private set; get; }
+		public ResourceManager Impl { private set; get; }
 
 		/// <summary>
 		/// 资源信息
@@ -93,10 +93,10 @@ namespace YooAsset
 		protected BundleLoaderBase OwnerBundle { private set; get; }
 		protected DependAssetBundles DependBundles { private set; get; }
 		protected bool IsWaitForAsyncComplete { private set; get; } = false;
-		private readonly List<OperationHandleBase> _handles = new List<OperationHandleBase>();
+		private readonly List<HandleBase> _handles = new List<HandleBase>();
 
 
-		public ProviderBase(AssetSystemImpl impl, string providerGUID, AssetInfo assetInfo)
+		public ProviderBase(ResourceManager impl, string providerGUID, AssetInfo assetInfo)
 		{
 			Impl = impl;
 			ProviderGUID = providerGUID;
@@ -151,36 +151,25 @@ namespace YooAsset
 			return RefCount <= 0;
 		}
 
-		/// <summary>
-		/// 是否为场景提供者
-		/// </summary>
-		public bool IsSceneProvider()
-		{
-			if (this is BundledSceneProvider || this is DatabaseSceneProvider)
-				return true;
-			else
-				return false;
-		}
-
 		/// <summary>
 		/// 创建操作句柄
 		/// </summary>
-		public T CreateHandle<T>() where T : OperationHandleBase
+		public T CreateHandle<T>() where T : HandleBase
 		{
 			// 引用计数增加
 			RefCount++;
 
-			OperationHandleBase handle;
-			if (typeof(T) == typeof(AssetOperationHandle))
-				handle = new AssetOperationHandle(this);
-			else if (typeof(T) == typeof(SceneOperationHandle))
-				handle = new SceneOperationHandle(this);
-			else if (typeof(T) == typeof(SubAssetsOperationHandle))
-				handle = new SubAssetsOperationHandle(this);
-			else if (typeof(T) == typeof(AllAssetsOperationHandle))
-				handle = new AllAssetsOperationHandle(this);
-			else if (typeof(T) == typeof(RawFileOperationHandle))
-				handle = new RawFileOperationHandle(this);
+			HandleBase handle;
+			if (typeof(T) == typeof(AssetHandle))
+				handle = new AssetHandle(this);
+			else if (typeof(T) == typeof(SceneHandle))
+				handle = new SceneHandle(this);
+			else if (typeof(T) == typeof(SubAssetsHandle))
+				handle = new SubAssetsHandle(this);
+			else if (typeof(T) == typeof(AllAssetsHandle))
+				handle = new AllAssetsHandle(this);
+			else if (typeof(T) == typeof(RawFileHandle))
+				handle = new RawFileHandle(this);
 			else
 				throw new System.NotImplementedException();
 
@@ -191,7 +180,7 @@ namespace YooAsset
 		/// <summary>
 		/// 释放操作句柄
 		/// </summary>
-		public void ReleaseHandle(OperationHandleBase handle)
+		public void ReleaseHandle(HandleBase handle)
 		{
 			if (RefCount <= 0)
 				YooLogger.Warning("Asset provider reference count is already zero. There may be resource leaks !");
@@ -228,20 +217,10 @@ namespace YooAsset
 			if (OwnerBundle.IsDestroyed)
 				throw new System.Exception("Should never get here !");
 
-			if (OwnerBundle.MainBundleInfo.Bundle.IsRawFile)
-			{
-				Status = EStatus.Failed;
-				LastError = $"Cannot load asset bundle file using {nameof(ResourcePackage.LoadRawFileAsync)} method !";
-				YooLogger.Error(LastError);
-				InvokeCompletion();
-			}
-			else
-			{
-				Status = EStatus.Failed;
-				LastError = $"The bundle {OwnerBundle.MainBundleInfo.Bundle.BundleName} has been destroyed by unity bugs !";
-				YooLogger.Error(LastError);
-				InvokeCompletion();
-			}
+			Status = EStatus.Failed;
+			LastError = $"The bundle {OwnerBundle.MainBundleInfo.Bundle.BundleName} has been destroyed by unity bugs !";
+			YooLogger.Error(LastError);
+			InvokeCompletion();
 		}
 
 		/// <summary>
@@ -272,7 +251,7 @@ namespace YooAsset
 
 			// 注意：创建临时列表是为了防止外部逻辑在回调函数内创建或者释放资源句柄。
 			// 注意：回调方法如果发生异常，会阻断列表里的后续回调方法！
-			List<OperationHandleBase> tempers = new List<OperationHandleBase>(_handles);
+			List<HandleBase> tempers = new List<HandleBase>(_handles);
 			foreach (var hande in tempers)
 			{
 				if (hande.IsValid)
@@ -341,18 +320,23 @@ namespace YooAsset
 		/// <summary>
 		/// 获取下载报告
 		/// </summary>
-		internal DownloadReport GetDownloadReport()
+		internal DownloadStatus GetDownloadStatus()
 		{
-			DownloadReport result = new DownloadReport();
-			result.TotalSize = (ulong)OwnerBundle.MainBundleInfo.Bundle.FileSize;
-			result.DownloadedBytes = OwnerBundle.DownloadedBytes;
+			DownloadStatus status = new DownloadStatus();
+			status.TotalBytes = (ulong)OwnerBundle.MainBundleInfo.Bundle.FileSize;
+			status.DownloadedBytes = OwnerBundle.DownloadedBytes;
 			foreach (var dependBundle in DependBundles.DependList)
 			{
-				result.TotalSize += (ulong)dependBundle.MainBundleInfo.Bundle.FileSize;
-				result.DownloadedBytes += dependBundle.DownloadedBytes;
+				status.TotalBytes += (ulong)dependBundle.MainBundleInfo.Bundle.FileSize;
+				status.DownloadedBytes += dependBundle.DownloadedBytes;
 			}
-			result.Progress = (float)result.DownloadedBytes / result.TotalSize;
-			return result;
+
+			if (status.TotalBytes == 0)
+				throw new System.Exception("Should never get here !");
+
+			status.IsDone = status.DownloadedBytes == status.TotalBytes;
+			status.Progress = (float)status.DownloadedBytes / status.TotalBytes;
+			return status;
 		}
 
 		/// <summary>
diff --git a/Assets/YooAsset/Runtime/AssetSystem/Provider/ProviderBase.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderBase.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/Provider/ProviderBase.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/Provider/ProviderBase.cs.meta
diff --git a/Assets/YooAsset/Runtime/ResourceManager/ResourceLoader.cs b/Assets/YooAsset/Runtime/ResourceManager/ResourceLoader.cs
new file mode 100644
index 0000000..a897a65
--- /dev/null
+++ b/Assets/YooAsset/Runtime/ResourceManager/ResourceLoader.cs
@@ -0,0 +1,103 @@
+using System.IO;
+using UnityEngine;
+
+namespace YooAsset
+{
+	internal class ResourceLoader
+	{
+		private IDecryptionServices _decryption;
+		private IDeliveryLoadServices _delivery;
+
+		public void Init(IDecryptionServices decryption, IDeliveryLoadServices delivery)
+		{
+			_decryption = decryption;
+			_delivery = delivery;
+		}
+
+		/// <summary>
+		/// 同步加载资源包对象
+		/// </summary>
+		public AssetBundle LoadAssetBundle(BundleInfo bundleInfo, string fileLoadPath, out Stream managedStream)
+		{
+			managedStream = null;
+			if (bundleInfo.Bundle.Encrypted)
+			{
+				if (_decryption == null)
+				{
+					YooLogger.Error($"{nameof(IDecryptionServices)} is null ! when load asset bundle {bundleInfo.Bundle.BundleName}!");
+					return null;
+				}
+
+				DecryptFileInfo fileInfo = new DecryptFileInfo();
+				fileInfo.BundleName = bundleInfo.Bundle.BundleName;
+				fileInfo.FileLoadPath = fileLoadPath;
+				fileInfo.ConentCRC = bundleInfo.Bundle.UnityCRC;
+				return _decryption.LoadAssetBundle(fileInfo, out managedStream);
+			}
+			else
+			{
+				return AssetBundle.LoadFromFile(fileLoadPath);
+			}
+		}
+
+		/// <summary>
+		/// 异步加载资源包对象
+		/// </summary>
+		public AssetBundleCreateRequest LoadAssetBundleAsync(BundleInfo bundleInfo, string fileLoadPath, out Stream managedStream)
+		{
+			managedStream = null;
+			if (bundleInfo.Bundle.Encrypted)
+			{
+				if (_decryption == null)
+				{
+					YooLogger.Error($"{nameof(IDecryptionServices)} is null ! when load asset bundle {bundleInfo.Bundle.BundleName}!");
+					return null;
+				}
+
+				DecryptFileInfo fileInfo = new DecryptFileInfo();
+				fileInfo.BundleName = bundleInfo.Bundle.BundleName;
+				fileInfo.FileLoadPath = fileLoadPath;
+				fileInfo.ConentCRC = bundleInfo.Bundle.UnityCRC;
+				return _decryption.LoadAssetBundleAsync(fileInfo, out managedStream);
+			}
+			else
+			{
+				return AssetBundle.LoadFromFileAsync(fileLoadPath);
+			}
+		}
+
+		/// <summary>
+		/// 同步加载分发的资源包对象
+		/// </summary>
+		public AssetBundle LoadDeliveryAssetBundle(BundleInfo bundleInfo, string fileLoadPath)
+		{
+			if (_delivery == null)
+				throw new System.Exception("Should never get here !");
+
+			// 注意：对于已经加密的资源包，需要开发者自行解密。
+			DeliveryFileInfo fileInfo = new DeliveryFileInfo();
+			fileInfo.BundleName = bundleInfo.Bundle.BundleName;
+			fileInfo.FileLoadPath = fileLoadPath;
+			fileInfo.ConentCRC = bundleInfo.Bundle.UnityCRC;
+			fileInfo.Encrypted = bundleInfo.Bundle.Encrypted;
+			return _delivery.LoadAssetBundle(fileInfo);
+		}
+
+		/// <summary>
+		/// 异步加载分发的资源包对象
+		/// </summary>
+		public AssetBundleCreateRequest LoadDeliveryAssetBundleAsync(BundleInfo bundleInfo, string fileLoadPath)
+		{
+			if (_delivery == null)
+				throw new System.Exception("Should never get here !");
+
+			// 注意：对于已经加密的资源包，需要开发者自行解密。
+			DeliveryFileInfo fileInfo = new DeliveryFileInfo();
+			fileInfo.BundleName = bundleInfo.Bundle.BundleName;
+			fileInfo.FileLoadPath = fileLoadPath;
+			fileInfo.ConentCRC = bundleInfo.Bundle.UnityCRC;
+			fileInfo.Encrypted = bundleInfo.Bundle.Encrypted;
+			return _delivery.LoadAssetBundleAsync(fileInfo);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/ResourceManager/ResourceLoader.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/ResourceLoader.cs.meta
new file mode 100644
index 0000000..21c5f91
--- /dev/null
+++ b/Assets/YooAsset/Runtime/ResourceManager/ResourceLoader.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3818e5adef4eaea4a85b112f953c4f7b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Runtime/AssetSystem/AssetSystem.cs b/Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs
similarity index 81%
rename from Assets/YooAsset/Runtime/AssetSystem/AssetSystem.cs
rename to Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs
index c3825e9..77ca442 100644
--- a/Assets/YooAsset/Runtime/AssetSystem/AssetSystem.cs
+++ b/Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs
@@ -7,7 +7,7 @@ using UnityEngine.SceneManagement;
 
 namespace YooAsset
 {
-	internal class AssetSystemImpl
+	internal class ResourceManager
 	{
 		private readonly Dictionary<string, BundleLoaderBase> _loaderDic = new Dictionary<string, BundleLoaderBase>(5000);
 		private readonly List<BundleLoaderBase> _loaderList = new List<BundleLoaderBase>(5000);
@@ -15,16 +15,14 @@ namespace YooAsset
 		private readonly Dictionary<string, ProviderBase> _providerDic = new Dictionary<string, ProviderBase>(5000);
 		private readonly List<ProviderBase> _providerList = new List<ProviderBase>(5000);
 
-		private readonly static Dictionary<string, SceneOperationHandle> _sceneHandles = new Dictionary<string, SceneOperationHandle>(100);
+		private readonly static Dictionary<string, SceneHandle> _sceneHandles = new Dictionary<string, SceneHandle>(100);
 		private static long _sceneCreateCount = 0;
 
-		private bool _isUnloadSafe = true;
-		private string _packageName;
+
 		private bool _simulationOnEditor;
 		private long _loadingMaxTimeSlice;
-		public int DownloadFailedTryAgain { private set; get; }
-		public IDecryptionServices DecryptionServices { private set; get; }
-		public IBundleServices BundleServices { private set; get; }
+		private IBundleQuery _bundleQuery;
+		private bool _isUnloadSafe = true;
 
 		// 计时器相关
 		private Stopwatch _watch;
@@ -37,20 +35,25 @@ namespace YooAsset
 			}
 		}
 
+		/// <summary>
+		/// 所属包裹
+		/// </summary>
+		public readonly string PackageName;
+
+
+		public ResourceManager(string packageName)
+		{
+			PackageName = packageName;
+		}
 
 		/// <summary>
 		/// 初始化
-		/// 注意：在使用AssetSystem之前需要初始化
 		/// </summary>
-		public void Initialize(string packageName, bool simulationOnEditor, long loadingMaxTimeSlice, int downloadFailedTryAgain,
-			IDecryptionServices decryptionServices, IBundleServices bundleServices)
+		public void Initialize(bool simulationOnEditor, long loadingMaxTimeSlice, IBundleQuery bundleServices)
 		{
-			_packageName = packageName;
 			_simulationOnEditor = simulationOnEditor;
 			_loadingMaxTimeSlice = loadingMaxTimeSlice;
-			DownloadFailedTryAgain = downloadFailedTryAgain;
-			DecryptionServices = decryptionServices;
-			BundleServices = bundleServices;
+			_bundleQuery = bundleServices;
 			_watch = Stopwatch.StartNew();
 		}
 
@@ -151,14 +154,14 @@ namespace YooAsset
 		/// <summary>
 		/// 加载场景
 		/// </summary>
-		public SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode, bool suspendLoad, int priority)
+		public SceneHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode, bool suspendLoad, int priority)
 		{
 			if (assetInfo.IsInvalid)
 			{
 				YooLogger.Error($"Failed to load scene ! {assetInfo.Error}");
 				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
 				completedProvider.SetCompleted(assetInfo.Error);
-				return completedProvider.CreateHandle<SceneOperationHandle>();
+				return completedProvider.CreateHandle<SceneHandle>();
 			}
 
 			// 如果加载的是主场景，则卸载所有缓存的场景
@@ -180,8 +183,8 @@ namespace YooAsset
 				_providerDic.Add(providerGUID, provider);
 			}
 
-			var handle = provider.CreateHandle<SceneOperationHandle>();
-			handle.PackageName = _packageName;
+			var handle = provider.CreateHandle<SceneHandle>();
+			handle.PackageName = PackageName;
 			_sceneHandles.Add(providerGUID, handle);
 			return handle;
 		}
@@ -189,14 +192,14 @@ namespace YooAsset
 		/// <summary>
 		/// 加载资源对象
 		/// </summary>
-		public AssetOperationHandle LoadAssetAsync(AssetInfo assetInfo)
+		public AssetHandle LoadAssetAsync(AssetInfo assetInfo)
 		{
 			if (assetInfo.IsInvalid)
 			{
 				YooLogger.Error($"Failed to load asset ! {assetInfo.Error}");
 				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
 				completedProvider.SetCompleted(assetInfo.Error);
-				return completedProvider.CreateHandle<AssetOperationHandle>();
+				return completedProvider.CreateHandle<AssetHandle>();
 			}
 
 			string providerGUID = assetInfo.GUID;
@@ -211,20 +214,20 @@ namespace YooAsset
 				_providerList.Add(provider);
 				_providerDic.Add(providerGUID, provider);
 			}
-			return provider.CreateHandle<AssetOperationHandle>();
+			return provider.CreateHandle<AssetHandle>();
 		}
 
 		/// <summary>
 		/// 加载子资源对象
 		/// </summary>
-		public SubAssetsOperationHandle LoadSubAssetsAsync(AssetInfo assetInfo)
+		public SubAssetsHandle LoadSubAssetsAsync(AssetInfo assetInfo)
 		{
 			if (assetInfo.IsInvalid)
 			{
 				YooLogger.Error($"Failed to load sub assets ! {assetInfo.Error}");
 				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
 				completedProvider.SetCompleted(assetInfo.Error);
-				return completedProvider.CreateHandle<SubAssetsOperationHandle>();
+				return completedProvider.CreateHandle<SubAssetsHandle>();
 			}
 
 			string providerGUID = assetInfo.GUID;
@@ -239,20 +242,20 @@ namespace YooAsset
 				_providerList.Add(provider);
 				_providerDic.Add(providerGUID, provider);
 			}
-			return provider.CreateHandle<SubAssetsOperationHandle>();
+			return provider.CreateHandle<SubAssetsHandle>();
 		}
 
 		/// <summary>
 		/// 加载所有资源对象
 		/// </summary>
-		public AllAssetsOperationHandle LoadAllAssetsAsync(AssetInfo assetInfo)
+		public AllAssetsHandle LoadAllAssetsAsync(AssetInfo assetInfo)
 		{
 			if (assetInfo.IsInvalid)
 			{
 				YooLogger.Error($"Failed to load all assets ! {assetInfo.Error}");
 				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
 				completedProvider.SetCompleted(assetInfo.Error);
-				return completedProvider.CreateHandle<AllAssetsOperationHandle>();
+				return completedProvider.CreateHandle<AllAssetsHandle>();
 			}
 
 			string providerGUID = assetInfo.GUID;
@@ -267,20 +270,20 @@ namespace YooAsset
 				_providerList.Add(provider);
 				_providerDic.Add(providerGUID, provider);
 			}
-			return provider.CreateHandle<AllAssetsOperationHandle>();
+			return provider.CreateHandle<AllAssetsHandle>();
 		}
 
 		/// <summary>
 		/// 加载原生文件
 		/// </summary>
-		public RawFileOperationHandle LoadRawFileAsync(AssetInfo assetInfo)
+		public RawFileHandle LoadRawFileAsync(AssetInfo assetInfo)
 		{
 			if (assetInfo.IsInvalid)
 			{
 				YooLogger.Error($"Failed to load raw file ! {assetInfo.Error}");
 				CompletedProvider completedProvider = new CompletedProvider(assetInfo);
 				completedProvider.SetCompleted(assetInfo.Error);
-				return completedProvider.CreateHandle<RawFileOperationHandle>();
+				return completedProvider.CreateHandle<RawFileHandle>();
 			}
 
 			string providerGUID = assetInfo.GUID;
@@ -295,7 +298,7 @@ namespace YooAsset
 				_providerList.Add(provider);
 				_providerDic.Add(providerGUID, provider);
 			}
-			return provider.CreateHandle<RawFileOperationHandle>();
+			return provider.CreateHandle<RawFileHandle>();
 		}
 
 		internal void UnloadSubScene(ProviderBase provider)
@@ -308,7 +311,7 @@ namespace YooAsset
 			_sceneHandles[providerGUID].ReleaseInternal();
 			_sceneHandles.Remove(providerGUID);
 		}
-		internal void UnloadAllScene()
+		private void UnloadAllScene()
 		{
 			// 释放所有场景句柄
 			foreach (var valuePair in _sceneHandles)
@@ -317,12 +320,12 @@ namespace YooAsset
 			}
 			_sceneHandles.Clear();
 		}
-		internal void ClearSceneHandle()
+		private void ClearSceneHandle()
 		{
 			// 释放资源包下的所有场景
-			if (BundleServices.IsServicesValid())
+			if (_bundleQuery.ManifestValid())
 			{
-				string packageName = _packageName;
+				string packageName = PackageName;
 				List<string> removeList = new List<string>();
 				foreach (var valuePair in _sceneHandles)
 				{
@@ -340,12 +343,12 @@ namespace YooAsset
 
 		internal BundleLoaderBase CreateOwnerAssetBundleLoader(AssetInfo assetInfo)
 		{
-			BundleInfo bundleInfo = BundleServices.GetBundleInfo(assetInfo);
+			BundleInfo bundleInfo = _bundleQuery.GetMainBundleInfo(assetInfo);
 			return CreateAssetBundleLoaderInternal(bundleInfo);
 		}
 		internal List<BundleLoaderBase> CreateDependAssetBundleLoaders(AssetInfo assetInfo)
 		{
-			BundleInfo[] depends = BundleServices.GetAllDependBundleInfos(assetInfo);
+			BundleInfo[] depends = _bundleQuery.GetAllDependBundleInfos(assetInfo);
 			List<BundleLoaderBase> result = new List<BundleLoaderBase>(depends.Length);
 			foreach (var bundleInfo in depends)
 			{
@@ -362,14 +365,6 @@ namespace YooAsset
 				_providerDic.Remove(provider.ProviderGUID);
 			}
 		}
-		internal bool CheckBundleDestroyed(int bundleID)
-		{
-			string bundleName = BundleServices.GetBundleName(bundleID);
-			BundleLoaderBase loader = TryGetAssetBundleLoader(bundleName);
-			if (loader == null)
-				return true;
-			return loader.IsDestroyed;
-		}
 
 		private BundleLoaderBase CreateAssetBundleLoaderInternal(BundleInfo bundleInfo)
 		{
@@ -387,12 +382,12 @@ namespace YooAsset
 			else
 			{
 #if UNITY_WEBGL
-				if (bundleInfo.Bundle.IsRawFile)
+				if (bundleInfo.Bundle.Buildpipeline== DefaultBuildPipeline.RawFileBuildPipelineName)
 					loader = new RawBundleWebLoader(this, bundleInfo);
 				else
 					loader = new AssetBundleWebLoader(this, bundleInfo);
 #else
-				if (bundleInfo.Bundle.IsRawFile)
+				if (bundleInfo.Bundle.Buildpipeline == DefaultBuildPipeline.RawFileBuildPipelineName)
 					loader = new RawBundleFileLoader(this, bundleInfo);
 				else
 					loader = new AssetBundleFileLoader(this, bundleInfo);
diff --git a/Assets/YooAsset/Runtime/AssetSystem/AssetSystem.cs.meta b/Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/AssetSystem/AssetSystem.cs.meta
rename to Assets/YooAsset/Runtime/ResourceManager/ResourceManager.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem.meta b/Assets/YooAsset/Runtime/ResourcePackage.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem.meta
rename to Assets/YooAsset/Runtime/ResourcePackage.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/AssetInfo.cs b/Assets/YooAsset/Runtime/ResourcePackage/AssetInfo.cs
similarity index 81%
rename from Assets/YooAsset/Runtime/PackageSystem/AssetInfo.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/AssetInfo.cs
index 9a5411d..69a5f6d 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/AssetInfo.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/AssetInfo.cs
@@ -6,6 +6,11 @@ namespace YooAsset
 		private readonly PackageAsset _packageAsset;
 		private string _providerGUID;
 
+		/// <summary>
+		/// 所属包裹
+		/// </summary>
+		public string PackageName { private set; get; }
+
 		/// <summary>
 		/// 资源类型
 		/// </summary>
@@ -77,30 +82,33 @@ namespace YooAsset
 		{
 			// 注意：禁止从外部创建该类
 		}
-		internal AssetInfo(PackageAsset packageAsset, System.Type assetType)
+		internal AssetInfo(string packageName, PackageAsset packageAsset, System.Type assetType)
 		{
 			if (packageAsset == null)
 				throw new System.Exception("Should never get here !");
 
 			_providerGUID = string.Empty;
 			_packageAsset = packageAsset;
+			PackageName = packageName;
 			AssetType = assetType;
 			Error = string.Empty;
 		}
-		internal AssetInfo(PackageAsset packageAsset)
+		internal AssetInfo(string packageName, PackageAsset packageAsset)
 		{
 			if (packageAsset == null)
 				throw new System.Exception("Should never get here !");
 
 			_providerGUID = string.Empty;
 			_packageAsset = packageAsset;
+			PackageName = packageName;
 			AssetType = null;
 			Error = string.Empty;
 		}
-		internal AssetInfo(string error)
+		internal AssetInfo(string packageName, string error)
 		{
 			_providerGUID = string.Empty;
 			_packageAsset = null;
+			PackageName = packageName;
 			AssetType = null;
 			Error = error;
 		}
diff --git a/Assets/YooAsset/Runtime/PackageSystem/AssetInfo.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/AssetInfo.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/AssetInfo.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/AssetInfo.cs.meta
diff --git a/Assets/YooAsset/Runtime/ResourcePackage/BundleInfo.cs b/Assets/YooAsset/Runtime/ResourcePackage/BundleInfo.cs
new file mode 100644
index 0000000..74e1925
--- /dev/null
+++ b/Assets/YooAsset/Runtime/ResourcePackage/BundleInfo.cs
@@ -0,0 +1,198 @@
+using System.IO;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace YooAsset
+{
+	internal class BundleInfo
+	{
+		public enum ELoadMode
+		{
+			None,
+			LoadFromDelivery,
+			LoadFromStreaming,
+			LoadFromCache,
+			LoadFromRemote,
+			LoadFromEditor,
+		}
+
+		private readonly ResourceAssist _assist;
+
+		/// <summary>
+		/// 资源包对象
+		/// </summary>
+		public readonly PackageBundle Bundle;
+
+		/// <summary>
+		/// 资源包加载模式
+		/// </summary>
+		public readonly ELoadMode LoadMode;
+
+		/// <summary>
+		/// 远端下载地址
+		/// </summary>
+		public string RemoteMainURL { private set; get; }
+
+		/// <summary>
+		/// 远端下载备用地址
+		/// </summary>
+		public string RemoteFallbackURL { private set; get; }
+
+		/// <summary>
+		/// 分发资源文件路径
+		/// </summary>
+		public string DeliveryFilePath { private set; get; }
+
+		/// <summary>
+		/// 注意：该字段只用于帮助编辑器下的模拟模式。
+		/// </summary>
+		public string[] IncludeAssetsInEditor;
+
+		private BundleInfo()
+		{
+		}
+		public BundleInfo(ResourceAssist assist, PackageBundle bundle, ELoadMode loadMode, string mainURL, string fallbackURL)
+		{
+			_assist = assist;
+			Bundle = bundle;
+			LoadMode = loadMode;
+			RemoteMainURL = mainURL;
+			RemoteFallbackURL = fallbackURL;
+			DeliveryFilePath = string.Empty;
+		}
+		public BundleInfo(ResourceAssist assist, PackageBundle bundle, ELoadMode loadMode, string deliveryFilePath)
+		{
+			_assist = assist;
+			Bundle = bundle;
+			LoadMode = loadMode;
+			RemoteMainURL = string.Empty;
+			RemoteFallbackURL = string.Empty;
+			DeliveryFilePath = deliveryFilePath;
+		}
+		public BundleInfo(ResourceAssist assist, PackageBundle bundle, ELoadMode loadMode)
+		{
+			_assist = assist;
+			Bundle = bundle;
+			LoadMode = loadMode;
+			RemoteMainURL = string.Empty;
+			RemoteFallbackURL = string.Empty;
+			DeliveryFilePath = string.Empty;
+		}
+
+		#region Cache
+		public bool IsCached()
+		{
+			return _assist.Cache.IsCached(Bundle.CacheGUID);
+		}
+		public void CacheRecord()
+		{
+			string infoFilePath = CachedInfoFilePath;
+			string dataFilePath = CachedDataFilePath;
+			string dataFileCRC = Bundle.FileCRC;
+			long dataFileSize = Bundle.FileSize;
+			var wrapper = new CacheManager.RecordWrapper(infoFilePath, dataFilePath, dataFileCRC, dataFileSize);
+			_assist.Cache.Record(Bundle.CacheGUID, wrapper);
+		}
+		public void CacheDiscard()
+		{
+			_assist.Cache.Discard(Bundle.CacheGUID);
+		}
+		public EVerifyResult VerifySelf()
+		{
+			return CacheHelper.VerifyingRecordFile(_assist.Cache, Bundle.CacheGUID);
+		}
+		#endregion
+
+		#region Persistent
+		public string CachedDataFilePath
+		{
+			get
+			{
+				return _assist.Persistent.GetCachedDataFilePath(Bundle);
+			}
+		}
+		public string CachedInfoFilePath
+		{
+			get
+			{
+				return _assist.Persistent.GetCachedInfoFilePath(Bundle);
+			}
+		}
+		public string TempDataFilePath
+		{
+			get
+			{
+				return _assist.Persistent.GetTempDataFilePath(Bundle);
+			}
+		}
+		public string BuildinFilePath
+		{
+			get
+			{
+				return _assist.Persistent.GetBuildinFilePath(Bundle);
+			}
+		}
+		#endregion
+
+		#region Download
+		public DownloaderBase CreateDownloader(int failedTryAgain, int timeout = 60)
+		{
+			return _assist.Download.CreateDownload(this, failedTryAgain, timeout);
+		}
+		public DownloaderBase CreateUnpacker(int failedTryAgain, int timeout = 60)
+		{
+			var unpackBundleInfo = ConvertToUnpackInfo();
+			return _assist.Download.CreateDownload(unpackBundleInfo, failedTryAgain, timeout);
+		}
+		#endregion
+
+		#region AssetBundle
+		internal AssetBundle LoadAssetBundle(string fileLoadPath, out Stream managedStream)
+		{
+			return _assist.Loader.LoadAssetBundle(this, fileLoadPath, out managedStream);
+		}
+		internal AssetBundleCreateRequest LoadAssetBundleAsync(string fileLoadPath, out Stream managedStream)
+		{
+			return _assist.Loader.LoadAssetBundleAsync(this, fileLoadPath, out managedStream);
+		}
+		internal AssetBundle LoadDeliveryAssetBundle(string fileLoadPath)
+		{
+			return _assist.Loader.LoadDeliveryAssetBundle(this, fileLoadPath);
+		}
+		internal AssetBundleCreateRequest LoadDeliveryAssetBundleAsync(string fileLoadPath)
+		{
+			return _assist.Loader.LoadDeliveryAssetBundleAsync(this, fileLoadPath);
+		}
+		#endregion
+
+		/// <summary>
+		/// 转换为解压BundleInfo
+		/// </summary>
+		private BundleInfo ConvertToUnpackInfo()
+		{
+			string streamingPath = PersistentHelper.ConvertToWWWPath(BuildinFilePath);
+			BundleInfo newBundleInfo = new BundleInfo(_assist, Bundle, ELoadMode.LoadFromStreaming, streamingPath, streamingPath);
+			return newBundleInfo;
+		}
+
+		/// <summary>
+		/// 批量转换为解压BundleInfo
+		/// </summary>
+		public static List<BundleInfo> ConvertToUnpackInfos(ResourceAssist assist, List<PackageBundle> unpackList)
+		{
+			List<BundleInfo> result = new List<BundleInfo>(unpackList.Count);
+			foreach (var packageBundle in unpackList)
+			{
+				var bundleInfo = ConvertToUnpackInfo(assist, packageBundle);
+				result.Add(bundleInfo);
+			}
+			return result;
+		}
+		private static BundleInfo ConvertToUnpackInfo(ResourceAssist assist, PackageBundle packageBundle)
+		{
+			string streamingPath = PersistentHelper.ConvertToWWWPath(assist.Persistent.GetBuildinFilePath(packageBundle));
+			BundleInfo newBundleInfo = new BundleInfo(assist, packageBundle, ELoadMode.LoadFromStreaming, streamingPath, streamingPath);
+			return newBundleInfo;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/PackageSystem/BundleInfo.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/BundleInfo.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/BundleInfo.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/BundleInfo.cs.meta
diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Interface.meta b/Assets/YooAsset/Runtime/ResourcePackage/Interface.meta
new file mode 100644
index 0000000..8643af0
--- /dev/null
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Interface.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e7f5776546411834d9ed949d54a6f241
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Runtime/ResourcePackage/Interface/IBundleQuery.cs b/Assets/YooAsset/Runtime/ResourcePackage/Interface/IBundleQuery.cs
new file mode 100644
index 0000000..7e076cd
--- /dev/null
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Interface/IBundleQuery.cs
@@ -0,0 +1,21 @@
+
+namespace YooAsset
+{
+	internal interface IBundleQuery
+	{	
+		/// <summary>
+		/// 获取主资源包信息
+		/// </summary>
+		BundleInfo GetMainBundleInfo(AssetInfo assetInfo);
+
+		/// <summary>
+		/// 获取依赖的资源包信息集合
+		/// </summary>
+		BundleInfo[] GetAllDependBundleInfos(AssetInfo assetPath);
+
+		/// <summary>
+		/// 清单是否有效
+		/// </summary>
+		bool ManifestValid();
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/Services/Internal/IBundleServices.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Interface/IBundleQuery.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/Services/Internal/IBundleServices.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Interface/IBundleQuery.cs.meta
diff --git a/Assets/YooAsset/Runtime/Services/Internal/IPlayModeServices.cs b/Assets/YooAsset/Runtime/ResourcePackage/Interface/IPlayMode.cs
similarity index 97%
rename from Assets/YooAsset/Runtime/Services/Internal/IPlayModeServices.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Interface/IPlayMode.cs
index d1be3a0..e1a87ff 100644
--- a/Assets/YooAsset/Runtime/Services/Internal/IPlayModeServices.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Interface/IPlayMode.cs
@@ -1,7 +1,7 @@
 
 namespace YooAsset
 {
-	internal interface IPlayModeServices
+	internal interface IPlayMode
 	{
 		/// <summary>
 		/// 激活的清单
diff --git a/Assets/YooAsset/Runtime/Services/Internal/IPlayModeServices.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Interface/IPlayMode.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/Services/Internal/IPlayModeServices.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Interface/IPlayMode.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/ManifestTools.cs b/Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs
similarity index 82%
rename from Assets/YooAsset/Runtime/PackageSystem/ManifestTools.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs
index e096143..7d150af 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/ManifestTools.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs
@@ -39,6 +39,7 @@ namespace YooAsset
 				buffer.WriteBool(manifest.LocationToLower);
 				buffer.WriteBool(manifest.IncludeAssetGUID);
 				buffer.WriteInt32(manifest.OutputNameStyle);
+				buffer.WriteUTF8(manifest.BuildPipeline);
 				buffer.WriteUTF8(manifest.PackageName);
 				buffer.WriteUTF8(manifest.PackageVersion);
 
@@ -52,7 +53,6 @@ namespace YooAsset
 					buffer.WriteUTF8(packageAsset.AssetGUID);
 					buffer.WriteUTF8Array(packageAsset.AssetTags);
 					buffer.WriteInt32(packageAsset.BundleID);
-					buffer.WriteInt32Array(packageAsset.DependIDs);
 				}
 
 				// 写入资源包列表
@@ -65,10 +65,9 @@ namespace YooAsset
 					buffer.WriteUTF8(packageBundle.FileHash);
 					buffer.WriteUTF8(packageBundle.FileCRC);
 					buffer.WriteInt64(packageBundle.FileSize);
-					buffer.WriteBool(packageBundle.IsRawFile);
-					buffer.WriteByte(packageBundle.LoadMethod);
+					buffer.WriteBool(packageBundle.Encrypted);
 					buffer.WriteUTF8Array(packageBundle.Tags);
-					buffer.WriteInt32Array(packageBundle.ReferenceIDs);
+					buffer.WriteInt32Array(packageBundle.DependIDs);
 				}
 
 				// 写入文件流
@@ -111,6 +110,7 @@ namespace YooAsset
 				manifest.LocationToLower = buffer.ReadBool();
 				manifest.IncludeAssetGUID = buffer.ReadBool();
 				manifest.OutputNameStyle = buffer.ReadInt32();
+				manifest.BuildPipeline = buffer.ReadUTF8();
 				manifest.PackageName = buffer.ReadUTF8();
 				manifest.PackageVersion = buffer.ReadUTF8();
 
@@ -129,7 +129,6 @@ namespace YooAsset
 					packageAsset.AssetGUID = buffer.ReadUTF8();
 					packageAsset.AssetTags = buffer.ReadUTF8Array();
 					packageAsset.BundleID = buffer.ReadInt32();
-					packageAsset.DependIDs = buffer.ReadInt32Array();
 					manifest.AssetList.Add(packageAsset);
 				}
 
@@ -144,10 +143,9 @@ namespace YooAsset
 					packageBundle.FileHash = buffer.ReadUTF8();
 					packageBundle.FileCRC = buffer.ReadUTF8();
 					packageBundle.FileSize = buffer.ReadInt64();
-					packageBundle.IsRawFile = buffer.ReadBool();
-					packageBundle.LoadMethod = buffer.ReadByte();
+					packageBundle.Encrypted = buffer.ReadBool();
 					packageBundle.Tags = buffer.ReadUTF8Array();
-					packageBundle.ReferenceIDs = buffer.ReadInt32Array();
+					packageBundle.DependIDs = buffer.ReadInt32Array();
 					manifest.BundleList.Add(packageBundle);
 				}
 			}
@@ -156,7 +154,7 @@ namespace YooAsset
 			manifest.BundleDic = new Dictionary<string, PackageBundle>(manifest.BundleList.Count);
 			foreach (var packageBundle in manifest.BundleList)
 			{
-				packageBundle.ParseBundle(manifest.PackageName, manifest.OutputNameStyle);
+				packageBundle.ParseBundle(manifest);
 				manifest.BundleDic.Add(packageBundle.BundleName, packageBundle);
 			}
 
@@ -176,18 +174,50 @@ namespace YooAsset
 		}
 #endif
 
+		/// <summary>
+		/// 注意：该类拷贝自编辑器
+		/// </summary>
+		private enum EFileNameStyle
+		{
+			/// <summary>
+			/// 哈希值名称
+			/// </summary>
+			HashName = 0,
+
+			/// <summary>
+			/// 资源包名称（不推荐）
+			/// </summary>
+			BundleName = 1,
+
+			/// <summary>
+			/// 资源包名称 + 哈希值名称
+			/// </summary>
+			BundleName_HashName = 2,
+		}
+
+		/// <summary>
+		/// 获取资源文件的后缀名
+		/// </summary>
 		public static string GetRemoteBundleFileExtension(string bundleName)
 		{
 			string fileExtension = Path.GetExtension(bundleName);
 			return fileExtension;
 		}
+
+		/// <summary>
+		/// 获取远端的资源文件名
+		/// </summary>
 		public static string GetRemoteBundleFileName(int nameStyle, string bundleName, string fileExtension, string fileHash)
 		{
-			if (nameStyle == 1) //HashName
+			if (nameStyle == (int)EFileNameStyle.HashName)
 			{
 				return StringUtility.Format("{0}{1}", fileHash, fileExtension);
 			}
-			else if (nameStyle == 4) //BundleName_HashName
+			else if (nameStyle == (int)EFileNameStyle.BundleName)
+			{
+				return bundleName;
+			}
+			else if (nameStyle == (int)EFileNameStyle.BundleName_HashName)
 			{
 				string fileName = bundleName.Remove(bundleName.LastIndexOf('.'));
 				return StringUtility.Format("{0}_{1}{2}", fileName, fileHash, fileExtension);
@@ -197,30 +227,5 @@ namespace YooAsset
 				throw new NotImplementedException($"Invalid name style : {nameStyle}");
 			}
 		}
-
-		/// <summary>
-		/// 转换为解压BundleInfo
-		/// </summary>
-		public static BundleInfo ConvertToUnpackInfo(PackageBundle packageBundle)
-		{
-			// 注意：我们把流加载路径指定为远端下载地址
-			string streamingPath = PersistentTools.ConvertToWWWPath(packageBundle.StreamingFilePath);
-			BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromStreaming, streamingPath, streamingPath);
-			return bundleInfo;
-		}
-
-		/// <summary>
-		/// 批量转换为解压BundleInfo
-		/// </summary>
-		public static List<BundleInfo> ConvertToUnpackInfos(List<PackageBundle> unpackList)
-		{
-			List<BundleInfo> result = new List<BundleInfo>(unpackList.Count);
-			foreach (var packageBundle in unpackList)
-			{
-				var bundleInfo = ConvertToUnpackInfo(packageBundle);
-				result.Add(bundleInfo);
-			}
-			return result;
-		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/PackageSystem/ManifestTools.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/ManifestTools.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/ManifestTools.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/DownloaderOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/DownloaderOperation.cs
similarity index 84%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/DownloaderOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/DownloaderOperation.cs
index 6d727e4..2369440 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/DownloaderOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/DownloaderOperation.cs
@@ -20,6 +20,7 @@ namespace YooAsset
 		public delegate void OnDownloadError(string fileName, string error);
 		public delegate void OnStartDownloadFile(string fileName, long sizeBytes);
 
+		private readonly string _packageName;
 		private readonly int _downloadingMaxNumber;
 		private readonly int _failedTryAgain;
 		private readonly int _timeout;
@@ -35,22 +36,22 @@ namespace YooAsset
 		private long _cachedDownloadBytes = 0;
 		private int _cachedDownloadCount = 0;
 		private ESteps _steps = ESteps.None;
-		
+
 
 		/// <summary>
 		/// 统计的下载文件总数量
 		/// </summary>
 		public int TotalDownloadCount { private set; get; }
-		
+
 		/// <summary>
 		/// 统计的下载文件的总大小
 		/// </summary>
 		public long TotalDownloadBytes { private set; get; }
-		
+
 		/// <summary>
 		/// 当前已经完成的下载总数量
 		/// </summary>
-		public int CurrentDownloadCount 
+		public int CurrentDownloadCount
 		{
 			get { return _lastDownloadCount; }
 		}
@@ -84,8 +85,9 @@ namespace YooAsset
 		public OnStartDownloadFile OnStartDownloadFileCallback { set; get; }
 
 
-		internal DownloaderOperation(List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
+		internal DownloaderOperation(string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
 		{
+			_packageName = packageName;
 			_downloadList = downloadList;
 			_downloadingMaxNumber = UnityEngine.Mathf.Clamp(downloadingMaxNumber, 1, MAX_LOADER_COUNT); ;
 			_failedTryAgain = failedTryAgain;
@@ -175,7 +177,7 @@ namespace YooAsset
 					{
 						int index = _downloadList.Count - 1;
 						var bundleInfo = _downloadList[index];
-						var downloader = DownloadSystem.CreateDownload(bundleInfo, _failedTryAgain, _timeout);
+						var downloader = bundleInfo.CreateDownloader(_failedTryAgain, _timeout);
 						downloader.SendRequest();
 						_downloaders.Add(downloader);
 						_downloadList.RemoveAt(index);
@@ -214,7 +216,7 @@ namespace YooAsset
 		{
 			if (_steps == ESteps.None)
 			{
-				OperationSystem.StartOperation(this);
+				OperationSystem.StartOperation(_packageName, this);
 			}
 		}
 
@@ -250,35 +252,36 @@ namespace YooAsset
 
 	public sealed class ResourceDownloaderOperation : DownloaderOperation
 	{
-		internal ResourceDownloaderOperation(List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
-			: base(downloadList, downloadingMaxNumber, failedTryAgain, timeout)
+		internal ResourceDownloaderOperation(string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
+			: base(packageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout)
 		{
 		}
 
 		/// <summary>
 		/// 创建空的下载器
 		/// </summary>
-		internal static ResourceDownloaderOperation CreateEmptyDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout)
+		internal static ResourceDownloaderOperation CreateEmptyDownloader(string packageName, int downloadingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> downloadList = new List<BundleInfo>();
-			var operation = new ResourceDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+			var operation = new ResourceDownloaderOperation(packageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 	}
+
 	public sealed class ResourceUnpackerOperation : DownloaderOperation
 	{
-		internal ResourceUnpackerOperation(List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
-			: base(downloadList, downloadingMaxNumber, failedTryAgain, timeout)
+		internal ResourceUnpackerOperation(string packageName, List<BundleInfo> downloadList, int downloadingMaxNumber, int failedTryAgain, int timeout)
+			: base(packageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout)
 		{
 		}
 
 		/// <summary>
 		/// 创建空的解压器
 		/// </summary>
-		internal static ResourceUnpackerOperation CreateEmptyUnpacker(int upackingMaxNumber, int failedTryAgain, int timeout)
+		internal static ResourceUnpackerOperation CreateEmptyUnpacker(string packageName, int upackingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> downloadList = new List<BundleInfo>();
-			var operation = new ResourceUnpackerOperation(downloadList, upackingMaxNumber, failedTryAgain, int.MaxValue);
+			var operation = new ResourceUnpackerOperation(packageName, downloadList, upackingMaxNumber, failedTryAgain, int.MaxValue);
 			return operation;
 		}
 	}
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/DownloaderOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/DownloaderOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/DownloaderOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/DownloaderOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/InitializationOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/InitializationOperation.cs
similarity index 83%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/InitializationOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/InitializationOperation.cs
index 092b000..0ce43f1 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/InitializationOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/InitializationOperation.cs
@@ -45,8 +45,8 @@ namespace YooAsset
 			{
 				if (_loadEditorManifestOp == null)
 				{
-					_loadEditorManifestOp = new LoadEditorManifestOperation(_simulateManifestFilePath);
-					OperationSystem.StartOperation(_loadEditorManifestOp);
+					_loadEditorManifestOp = new LoadEditorManifestOperation(_impl.PackageName, _simulateManifestFilePath);
+					OperationSystem.StartOperation(_impl.PackageName, _loadEditorManifestOp);
 				}
 
 				if (_loadEditorManifestOp.IsDone == false)
@@ -84,16 +84,14 @@ namespace YooAsset
 		}
 
 		private readonly OfflinePlayModeImpl _impl;
-		private readonly string _packageName;
 		private QueryBuildinPackageVersionOperation _queryBuildinPackageVersionOp;
 		private LoadBuildinManifestOperation _loadBuildinManifestOp;
 		private PackageCachingOperation _cachingOperation;
 		private ESteps _steps = ESteps.None;
 
-		internal OfflinePlayModeInitializationOperation(OfflinePlayModeImpl impl, string packageName)
+		internal OfflinePlayModeInitializationOperation(OfflinePlayModeImpl impl)
 		{
 			_impl = impl;
-			_packageName = packageName;
 		}
 		internal override void Start()
 		{
@@ -108,8 +106,8 @@ namespace YooAsset
 			{
 				if (_queryBuildinPackageVersionOp == null)
 				{
-					_queryBuildinPackageVersionOp = new QueryBuildinPackageVersionOperation(_packageName);
-					OperationSystem.StartOperation(_queryBuildinPackageVersionOp);
+					_queryBuildinPackageVersionOp = new QueryBuildinPackageVersionOperation(_impl.Persistent);
+					OperationSystem.StartOperation(_impl.PackageName, _queryBuildinPackageVersionOp);
 				}
 
 				if (_queryBuildinPackageVersionOp.IsDone == false)
@@ -131,8 +129,8 @@ namespace YooAsset
 			{
 				if (_loadBuildinManifestOp == null)
 				{
-					_loadBuildinManifestOp = new LoadBuildinManifestOperation(_packageName, _queryBuildinPackageVersionOp.PackageVersion);
-					OperationSystem.StartOperation(_loadBuildinManifestOp);
+					_loadBuildinManifestOp = new LoadBuildinManifestOperation(_impl.Persistent, _queryBuildinPackageVersionOp.PackageVersion);
+					OperationSystem.StartOperation(_impl.PackageName, _loadBuildinManifestOp);
 				}
 
 				Progress = _loadBuildinManifestOp.Progress;
@@ -157,8 +155,8 @@ namespace YooAsset
 			{
 				if (_cachingOperation == null)
 				{
-					_cachingOperation = new PackageCachingOperation(_packageName);
-					OperationSystem.StartOperation(_cachingOperation);
+					_cachingOperation = new PackageCachingOperation(_impl.Persistent, _impl.Cache);
+					OperationSystem.StartOperation(_impl.PackageName, _cachingOperation);
 				}
 
 				Progress = _cachingOperation.Progress;
@@ -191,7 +189,6 @@ namespace YooAsset
 		}
 
 		private readonly HostPlayModeImpl _impl;
-		private readonly string _packageName;
 		private QueryBuildinPackageVersionOperation _queryBuildinPackageVersionOp;
 		private QueryCachePackageVersionOperation _queryCachePackageVersionOp;
 		private UnpackBuildinManifestOperation _unpackBuildinManifestOp;
@@ -200,10 +197,9 @@ namespace YooAsset
 		private PackageCachingOperation _cachingOperation;
 		private ESteps _steps = ESteps.None;
 
-		internal HostPlayModeInitializationOperation(HostPlayModeImpl impl, string packageName)
+		internal HostPlayModeInitializationOperation(HostPlayModeImpl impl)
 		{
 			_impl = impl;
-			_packageName = packageName;
 		}
 		internal override void Start()
 		{
@@ -216,14 +212,14 @@ namespace YooAsset
 
 			if (_steps == ESteps.CheckAppFootPrint)
 			{
-				var appFootPrint = new AppFootPrint();
-				appFootPrint.Load(_packageName);
+				var appFootPrint = new AppFootPrint(_impl.Persistent);
+				appFootPrint.Load(_impl.PackageName);
 
 				// 如果水印发生变化，则说明覆盖安装后首次打开游戏
 				if (appFootPrint.IsDirty())
 				{
-					PersistentTools.GetPersistent(_packageName).DeleteSandboxManifestFilesFolder();
-					appFootPrint.Coverage(_packageName);
+					_impl.Persistent.DeleteSandboxManifestFilesFolder();
+					appFootPrint.Coverage(_impl.PackageName);
 					YooLogger.Log("Delete manifest files when application foot print dirty !");
 				}
 				_steps = ESteps.QueryCachePackageVersion;
@@ -233,8 +229,8 @@ namespace YooAsset
 			{
 				if (_queryCachePackageVersionOp == null)
 				{
-					_queryCachePackageVersionOp = new QueryCachePackageVersionOperation(_packageName);
-					OperationSystem.StartOperation(_queryCachePackageVersionOp);
+					_queryCachePackageVersionOp = new QueryCachePackageVersionOperation(_impl.Persistent);
+					OperationSystem.StartOperation(_impl.PackageName, _queryCachePackageVersionOp);
 				}
 
 				if (_queryCachePackageVersionOp.IsDone == false)
@@ -254,8 +250,8 @@ namespace YooAsset
 			{
 				if (_loadCacheManifestOp == null)
 				{
-					_loadCacheManifestOp = new LoadCacheManifestOperation(_packageName, _queryCachePackageVersionOp.PackageVersion);
-					OperationSystem.StartOperation(_loadCacheManifestOp);
+					_loadCacheManifestOp = new LoadCacheManifestOperation(_impl.Persistent, _queryCachePackageVersionOp.PackageVersion);
+					OperationSystem.StartOperation(_impl.PackageName, _loadCacheManifestOp);
 				}
 
 				if (_loadCacheManifestOp.IsDone == false)
@@ -277,8 +273,8 @@ namespace YooAsset
 			{
 				if (_queryBuildinPackageVersionOp == null)
 				{
-					_queryBuildinPackageVersionOp = new QueryBuildinPackageVersionOperation(_packageName);
-					OperationSystem.StartOperation(_queryBuildinPackageVersionOp);
+					_queryBuildinPackageVersionOp = new QueryBuildinPackageVersionOperation(_impl.Persistent);
+					OperationSystem.StartOperation(_impl.PackageName, _queryBuildinPackageVersionOp);
 				}
 
 				if (_queryBuildinPackageVersionOp.IsDone == false)
@@ -301,8 +297,8 @@ namespace YooAsset
 			{
 				if (_unpackBuildinManifestOp == null)
 				{
-					_unpackBuildinManifestOp = new UnpackBuildinManifestOperation(_packageName, _queryBuildinPackageVersionOp.PackageVersion);
-					OperationSystem.StartOperation(_unpackBuildinManifestOp);
+					_unpackBuildinManifestOp = new UnpackBuildinManifestOperation(_impl.Persistent, _queryBuildinPackageVersionOp.PackageVersion);
+					OperationSystem.StartOperation(_impl.PackageName, _unpackBuildinManifestOp);
 				}
 
 				if (_unpackBuildinManifestOp.IsDone == false)
@@ -324,8 +320,8 @@ namespace YooAsset
 			{
 				if (_loadBuildinManifestOp == null)
 				{
-					_loadBuildinManifestOp = new LoadBuildinManifestOperation(_packageName, _queryBuildinPackageVersionOp.PackageVersion);
-					OperationSystem.StartOperation(_loadBuildinManifestOp);
+					_loadBuildinManifestOp = new LoadBuildinManifestOperation(_impl.Persistent, _queryBuildinPackageVersionOp.PackageVersion);
+					OperationSystem.StartOperation(_impl.PackageName, _loadBuildinManifestOp);
 				}
 
 				Progress = _loadBuildinManifestOp.Progress;
@@ -350,8 +346,8 @@ namespace YooAsset
 			{
 				if (_cachingOperation == null)
 				{
-					_cachingOperation = new PackageCachingOperation(_packageName);
-					OperationSystem.StartOperation(_cachingOperation);
+					_cachingOperation = new PackageCachingOperation(_impl.Persistent, _impl.Cache);
+					OperationSystem.StartOperation(_impl.PackageName,_cachingOperation);
 				}
 
 				Progress = _cachingOperation.Progress;
@@ -378,15 +374,13 @@ namespace YooAsset
 		}
 
 		private readonly WebPlayModeImpl _impl;
-		private readonly string _packageName;
 		private QueryBuildinPackageVersionOperation _queryWebPackageVersionOp;
 		private LoadBuildinManifestOperation _loadWebManifestOp;
 		private ESteps _steps = ESteps.None;
 
-		internal WebPlayModeInitializationOperation(WebPlayModeImpl impl, string packageName)
+		internal WebPlayModeInitializationOperation(WebPlayModeImpl impl)
 		{
 			_impl = impl;
-			_packageName = packageName;
 		}
 		internal override void Start()
 		{
@@ -401,8 +395,8 @@ namespace YooAsset
 			{
 				if (_queryWebPackageVersionOp == null)
 				{
-					_queryWebPackageVersionOp = new QueryBuildinPackageVersionOperation(_packageName);
-					OperationSystem.StartOperation(_queryWebPackageVersionOp);
+					_queryWebPackageVersionOp = new QueryBuildinPackageVersionOperation(_impl.Persistent);
+					OperationSystem.StartOperation(_impl.PackageName, _queryWebPackageVersionOp);
 				}
 
 				if (_queryWebPackageVersionOp.IsDone == false)
@@ -426,8 +420,8 @@ namespace YooAsset
 			{
 				if (_loadWebManifestOp == null)
 				{
-					_loadWebManifestOp = new LoadBuildinManifestOperation(_packageName, _queryWebPackageVersionOp.PackageVersion);
-					OperationSystem.StartOperation(_loadWebManifestOp);
+					_loadWebManifestOp = new LoadBuildinManifestOperation(_impl.Persistent, _queryWebPackageVersionOp.PackageVersion);
+					OperationSystem.StartOperation(_impl.PackageName, _loadWebManifestOp);
 				}
 
 				Progress = _loadWebManifestOp.Progress;
@@ -456,14 +450,20 @@ namespace YooAsset
 	/// </summary>
 	internal class AppFootPrint
 	{
+		private PersistentManager _persistent;
 		private string _footPrint;
 
+		public AppFootPrint(PersistentManager persistent)
+		{
+			_persistent = persistent;
+		}
+
 		/// <summary>
 		/// 读取应用程序水印
 		/// </summary>
 		public void Load(string packageName)
 		{
-			string footPrintFilePath = PersistentTools.GetPersistent(packageName).SandboxAppFootPrintFilePath;
+			string footPrintFilePath = _persistent.SandboxAppFootPrintFilePath;
 			if (File.Exists(footPrintFilePath))
 			{
 				_footPrint = FileUtility.ReadAllText(footPrintFilePath);
@@ -496,7 +496,7 @@ namespace YooAsset
 #else
 			_footPrint = Application.buildGUID;
 #endif
-			string footPrintFilePath = PersistentTools.GetPersistent(packageName).SandboxAppFootPrintFilePath;
+			string footPrintFilePath = _persistent.SandboxAppFootPrintFilePath;
 			FileUtility.WriteAllText(footPrintFilePath, _footPrint);
 			YooLogger.Log($"Save application foot print : {_footPrint}");
 		}
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/InitializationOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/InitializationOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/InitializationOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/InitializationOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/DeserializeManifestOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs
similarity index 95%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/DeserializeManifestOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs
index 8e0c698..a3c2989 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/DeserializeManifestOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs
@@ -80,6 +80,7 @@ namespace YooAsset
 					Manifest.LocationToLower = _buffer.ReadBool();
 					Manifest.IncludeAssetGUID = _buffer.ReadBool();
 					Manifest.OutputNameStyle = _buffer.ReadInt32();
+					Manifest.BuildPipeline = _buffer.ReadUTF8();
 					Manifest.PackageName = _buffer.ReadUTF8();
 					Manifest.PackageVersion = _buffer.ReadUTF8();
 
@@ -119,7 +120,6 @@ namespace YooAsset
 						packageAsset.AssetGUID = _buffer.ReadUTF8();
 						packageAsset.AssetTags = _buffer.ReadUTF8Array();
 						packageAsset.BundleID = _buffer.ReadInt32();
-						packageAsset.DependIDs = _buffer.ReadInt32Array();
 						Manifest.AssetList.Add(packageAsset);
 
 						// 注意：我们不允许原始路径存在重名
@@ -199,13 +199,11 @@ namespace YooAsset
 						packageBundle.FileHash = _buffer.ReadUTF8();
 						packageBundle.FileCRC = _buffer.ReadUTF8();
 						packageBundle.FileSize = _buffer.ReadInt64();
-						packageBundle.IsRawFile = _buffer.ReadBool();
-						packageBundle.LoadMethod = _buffer.ReadByte();
+						packageBundle.Encrypted = _buffer.ReadBool();
 						packageBundle.Tags = _buffer.ReadUTF8Array();
-						packageBundle.ReferenceIDs = _buffer.ReadInt32Array();
-						Manifest.BundleList.Add(packageBundle);
-
-						packageBundle.ParseBundle(Manifest.PackageName, Manifest.OutputNameStyle);
+						packageBundle.DependIDs = _buffer.ReadInt32Array();
+						packageBundle.ParseBundle(Manifest);
+						Manifest.BundleList.Add(packageBundle);				
 						Manifest.BundleDic.Add(packageBundle.BundleName, packageBundle);
 
 						// 注意：原始文件可能存在相同的CacheGUID
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/DeserializeManifestOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/DeserializeManifestOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DeserializeManifestOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/DownloadManifestOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DownloadManifestOperation.cs
similarity index 75%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/DownloadManifestOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DownloadManifestOperation.cs
index 294dec9..144e09a 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/DownloadManifestOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DownloadManifestOperation.cs
@@ -10,26 +10,26 @@ namespace YooAsset
 			DownloadManifestFile,
 			Done,
 		}
-
-		private static int RequestCount = 0;
+	
+		private readonly PersistentManager _persistent;
 		private readonly IRemoteServices _remoteServices;
-		private readonly string _packageName;
 		private readonly string _packageVersion;
 		private readonly int _timeout;
 		private UnityWebFileRequester _downloader1;
 		private UnityWebFileRequester _downloader2;
 		private ESteps _steps = ESteps.None;
+		private int RequestCount = 0;
 
-		internal DownloadManifestOperation(IRemoteServices remoteServices, string packageName, string packageVersion, int timeout)
+		internal DownloadManifestOperation(PersistentManager persistent, IRemoteServices remoteServices, string packageVersion, int timeout)
 		{
+			_persistent = persistent;
 			_remoteServices = remoteServices;
-			_packageName = packageName;
 			_packageVersion = packageVersion;
 			_timeout = timeout;
 		}
 		internal override void Start()
 		{
-			RequestCount++;
+			RequestCount = RemoteTools.GetRequestFailedCount(_persistent.PackageName, nameof(DownloadManifestOperation));
 			_steps = ESteps.DownloadPackageHashFile;
 		}
 		internal override void Update()
@@ -41,8 +41,8 @@ namespace YooAsset
 			{
 				if (_downloader1 == null)
 				{
-					string savePath = PersistentTools.GetPersistent(_packageName).GetSandboxPackageHashFilePath(_packageVersion);
-					string fileName = YooAssetSettingsData.GetPackageHashFileName(_packageName, _packageVersion);
+					string savePath = _persistent.GetSandboxPackageHashFilePath(_packageVersion);
+					string fileName = YooAssetSettingsData.GetPackageHashFileName(_persistent.PackageName, _packageVersion);
 					string webURL = GetDownloadRequestURL(fileName);
 					YooLogger.Log($"Beginning to download package hash file : {webURL}");
 					_downloader1 = new UnityWebFileRequester();
@@ -58,6 +58,7 @@ namespace YooAsset
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
 					Error = _downloader1.GetError();
+					RemoteTools.RecordRequestFailed(_persistent.PackageName, nameof(DownloadManifestOperation));
 				}
 				else
 				{
@@ -71,8 +72,8 @@ namespace YooAsset
 			{
 				if (_downloader2 == null)
 				{
-					string savePath = PersistentTools.GetPersistent(_packageName).GetSandboxPackageManifestFilePath(_packageVersion);
-					string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_packageName, _packageVersion);
+					string savePath = _persistent.GetSandboxPackageManifestFilePath(_packageVersion);
+					string fileName = YooAssetSettingsData.GetManifestBinaryFileName(_persistent.PackageName, _packageVersion);
 					string webURL = GetDownloadRequestURL(fileName);
 					YooLogger.Log($"Beginning to download package manifest file : {webURL}");
 					_downloader2 = new UnityWebFileRequester();
@@ -88,6 +89,7 @@ namespace YooAsset
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
 					Error = _downloader2.GetError();
+					RemoteTools.RecordRequestFailed(_persistent.PackageName, nameof(DownloadManifestOperation));
 				}
 				else
 				{
@@ -103,9 +105,9 @@ namespace YooAsset
 		{
 			// 轮流返回请求地址
 			if (RequestCount % 2 == 0)
-				return _remoteServices.GetRemoteFallbackURL(fileName);
-			else
 				return _remoteServices.GetRemoteMainURL(fileName);
+			else
+				return _remoteServices.GetRemoteFallbackURL(fileName);
 		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/DownloadManifestOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DownloadManifestOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/DownloadManifestOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/DownloadManifestOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadBuildinManifestOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadBuildinManifestOperation.cs
similarity index 80%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadBuildinManifestOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadBuildinManifestOperation.cs
index 0378bbb..2136efc 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadBuildinManifestOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadBuildinManifestOperation.cs
@@ -11,7 +11,7 @@ namespace YooAsset
 			Done,
 		}
 
-		private readonly string _buildinPackageName;
+		private readonly PersistentManager _persistent;
 		private readonly string _buildinPackageVersion;
 		private UnityWebDataRequester _downloader;
 		private DeserializeManifestOperation _deserializer;
@@ -23,9 +23,9 @@ namespace YooAsset
 		public PackageManifest Manifest { private set; get; }
 
 
-		public LoadBuildinManifestOperation(string buildinPackageName, string buildinPackageVersion)
+		public LoadBuildinManifestOperation(PersistentManager persistent, string buildinPackageVersion)
 		{
-			_buildinPackageName = buildinPackageName;
+			_persistent = persistent;
 			_buildinPackageVersion = buildinPackageVersion;
 		}
 		internal override void Start()
@@ -41,8 +41,8 @@ namespace YooAsset
 			{
 				if (_downloader == null)
 				{
-					string filePath = PersistentTools.GetPersistent(_buildinPackageName).GetBuildinPackageManifestFilePath(_buildinPackageVersion);
-					string url = PersistentTools.ConvertToWWWPath(filePath);
+					string filePath = _persistent.GetBuildinPackageManifestFilePath(_buildinPackageVersion);
+					string url = PersistentHelper.ConvertToWWWPath(filePath);
 					_downloader = new UnityWebDataRequester();
 					_downloader.SendRequest(url);
 				}
@@ -60,7 +60,7 @@ namespace YooAsset
 				{
 					byte[] bytesData = _downloader.GetData();
 					_deserializer = new DeserializeManifestOperation(bytesData);
-					OperationSystem.StartOperation(_deserializer);
+					OperationSystem.StartOperation(_persistent.PackageName, _deserializer);
 					_steps = ESteps.CheckDeserializeManifest;
 				}
 
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadBuildinManifestOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadBuildinManifestOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadBuildinManifestOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadBuildinManifestOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadCacheManifestOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadCacheManifestOperation.cs
similarity index 85%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadCacheManifestOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadCacheManifestOperation.cs
index 0ea054c..ec04b80 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadCacheManifestOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadCacheManifestOperation.cs
@@ -14,7 +14,7 @@ namespace YooAsset
 			Done,
 		}
 
-		private readonly string _packageName;
+		private readonly PersistentManager _persistent;
 		private readonly string _packageVersion;
 		private QueryCachePackageHashOperation _queryCachePackageHashOp;
 		private DeserializeManifestOperation _deserializer;
@@ -27,9 +27,9 @@ namespace YooAsset
 		public PackageManifest Manifest { private set; get; }
 
 
-		public LoadCacheManifestOperation(string packageName, string packageVersion)
+		public LoadCacheManifestOperation(PersistentManager persistent, string packageVersion)
 		{
-			_packageName = packageName;
+			_persistent = persistent;
 			_packageVersion = packageVersion;
 		}
 		internal override void Start()
@@ -45,8 +45,8 @@ namespace YooAsset
 			{
 				if (_queryCachePackageHashOp == null)
 				{
-					_queryCachePackageHashOp = new QueryCachePackageHashOperation(_packageName, _packageVersion);
-					OperationSystem.StartOperation(_queryCachePackageHashOp);
+					_queryCachePackageHashOp = new QueryCachePackageHashOperation(_persistent, _packageVersion);
+					OperationSystem.StartOperation(_persistent.PackageName, _queryCachePackageHashOp);
 				}
 
 				if (_queryCachePackageHashOp.IsDone == false)
@@ -67,7 +67,7 @@ namespace YooAsset
 
 			if (_steps == ESteps.VerifyFileHash)
 			{
-				_manifestFilePath = PersistentTools.GetPersistent(_packageName).GetSandboxPackageManifestFilePath(_packageVersion);
+				_manifestFilePath = _persistent.GetSandboxPackageManifestFilePath(_packageVersion);
 				if (File.Exists(_manifestFilePath) == false)
 				{
 					_steps = ESteps.Done;
@@ -95,7 +95,7 @@ namespace YooAsset
 			{
 				byte[] bytesData = File.ReadAllBytes(_manifestFilePath);
 				_deserializer = new DeserializeManifestOperation(bytesData);
-				OperationSystem.StartOperation(_deserializer);
+				OperationSystem.StartOperation(_persistent.PackageName, _deserializer);
 				_steps = ESteps.CheckDeserializeManifest;
 			}
 
@@ -131,7 +131,7 @@ namespace YooAsset
 				File.Delete(_manifestFilePath);
 			}
 
-			string hashFilePath = PersistentTools.GetPersistent(_packageName).GetSandboxPackageHashFilePath(_packageVersion);
+			string hashFilePath = _persistent.GetSandboxPackageHashFilePath(_packageVersion);
 			if (File.Exists(hashFilePath))
 			{
 				File.Delete(hashFilePath);
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadCacheManifestOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadCacheManifestOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadCacheManifestOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadCacheManifestOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadEditorManifestOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadEditorManifestOperation.cs
similarity index 88%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadEditorManifestOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadEditorManifestOperation.cs
index 5fe071f..5b4396c 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadEditorManifestOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadEditorManifestOperation.cs
@@ -12,6 +12,7 @@ namespace YooAsset
 			Done,
 		}
 
+		private readonly string _packageName;
 		private readonly string _manifestFilePath;
 		private DeserializeManifestOperation _deserializer;
 		private ESteps _steps = ESteps.None;
@@ -22,8 +23,9 @@ namespace YooAsset
 		public PackageManifest Manifest { private set; get; }
 
 
-		public LoadEditorManifestOperation(string manifestFilePath)
+		public LoadEditorManifestOperation(string packageName, string manifestFilePath)
 		{
+			_packageName = packageName;
 			_manifestFilePath = manifestFilePath;
 		}
 		internal override void Start()
@@ -48,7 +50,7 @@ namespace YooAsset
 				YooLogger.Log($"Load editor manifest file : {_manifestFilePath}");
 				byte[] bytesData = FileUtility.ReadAllBytes(_manifestFilePath);
 				_deserializer = new DeserializeManifestOperation(bytesData);
-				OperationSystem.StartOperation(_deserializer);
+				OperationSystem.StartOperation(_packageName, _deserializer);
 				_steps = ESteps.CheckDeserializeManifest;
 			}
 
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadEditorManifestOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadEditorManifestOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadEditorManifestOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadEditorManifestOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadRemoteManifestOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadRemoteManifestOperation.cs
similarity index 90%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadRemoteManifestOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadRemoteManifestOperation.cs
index 3344b95..860bd46 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadRemoteManifestOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadRemoteManifestOperation.cs
@@ -13,7 +13,6 @@ namespace YooAsset
 			Done,
 		}
 
-		private static int RequestCount = 0;
 		private readonly IRemoteServices _remoteServices;
 		private readonly string _packageName;
 		private readonly string _packageVersion;
@@ -23,6 +22,7 @@ namespace YooAsset
 		private DeserializeManifestOperation _deserializer;
 		private byte[] _fileData;
 		private ESteps _steps = ESteps.None;
+		private int RequestCount = 0;
 
 		/// <summary>
 		/// 加载的清单实例
@@ -39,7 +39,7 @@ namespace YooAsset
 		}
 		internal override void Start()
 		{
-			RequestCount++;
+			RequestCount = RemoteTools.GetRequestFailedCount(_packageName, nameof(LoadRemoteManifestOperation));
 			_steps = ESteps.DownloadPackageHashFile;
 		}
 		internal override void Update()
@@ -52,7 +52,7 @@ namespace YooAsset
 				if (_queryRemotePackageHashOp == null)
 				{
 					_queryRemotePackageHashOp = new QueryRemotePackageHashOperation(_remoteServices, _packageName, _packageVersion, _timeout);
-					OperationSystem.StartOperation(_queryRemotePackageHashOp);
+					OperationSystem.StartOperation(_packageName, _queryRemotePackageHashOp);
 				}
 
 				if (_queryRemotePackageHashOp.IsDone == false)
@@ -90,6 +90,7 @@ namespace YooAsset
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
 					Error = _downloader.GetError();
+					RemoteTools.RecordRequestFailed(_packageName, nameof(LoadRemoteManifestOperation));
 				}
 				else
 				{
@@ -112,7 +113,7 @@ namespace YooAsset
 				else
 				{
 					_deserializer = new DeserializeManifestOperation(_fileData);
-					OperationSystem.StartOperation(_deserializer);
+					OperationSystem.StartOperation(_packageName, _deserializer);
 					_steps = ESteps.CheckDeserializeManifest;
 				}
 			}
@@ -142,9 +143,9 @@ namespace YooAsset
 		{
 			// 轮流返回请求地址
 			if (RequestCount % 2 == 0)
-				return _remoteServices.GetRemoteFallbackURL(fileName);
-			else
 				return _remoteServices.GetRemoteMainURL(fileName);
+			else
+				return _remoteServices.GetRemoteFallbackURL(fileName);
 		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadRemoteManifestOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadRemoteManifestOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/LoadRemoteManifestOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/LoadRemoteManifestOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryBuildinPackageVersionOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryBuildinPackageVersionOperation.cs
similarity index 81%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryBuildinPackageVersionOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryBuildinPackageVersionOperation.cs
index 9c8687b..d5ba73d 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryBuildinPackageVersionOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryBuildinPackageVersionOperation.cs
@@ -10,7 +10,7 @@ namespace YooAsset
 			Done,
 		}
 
-		private readonly string _packageName;
+		private readonly PersistentManager _persistent;
 		private UnityWebDataRequester _downloader;
 		private ESteps _steps = ESteps.None;
 
@@ -20,9 +20,9 @@ namespace YooAsset
 		public string PackageVersion { private set; get; }
 
 
-		public QueryBuildinPackageVersionOperation(string packageName)
+		public QueryBuildinPackageVersionOperation(PersistentManager persistent)
 		{
-			_packageName = packageName;
+			_persistent = persistent;
 		}
 		internal override void Start()
 		{
@@ -37,8 +37,8 @@ namespace YooAsset
 			{
 				if (_downloader == null)
 				{
-					string filePath = PersistentTools.GetPersistent(_packageName).GetBuildinPackageVersionFilePath();
-					string url = PersistentTools.ConvertToWWWPath(filePath);
+					string filePath = _persistent.GetBuildinPackageVersionFilePath();
+					string url = PersistentHelper.ConvertToWWWPath(filePath);
 					_downloader = new UnityWebDataRequester();
 					_downloader.SendRequest(url);
 				}
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryBuildinPackageVersionOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryBuildinPackageVersionOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryBuildinPackageVersionOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryBuildinPackageVersionOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryCachePackageHashOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryCachePackageHashOperation.cs
similarity index 81%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryCachePackageHashOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryCachePackageHashOperation.cs
index 5e1072c..b6c782f 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryCachePackageHashOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryCachePackageHashOperation.cs
@@ -11,7 +11,7 @@ namespace YooAsset
 			Done,
 		}
 
-		private readonly string _packageName;
+		private readonly PersistentManager _persistent;
 		private readonly string _packageVersion;
 		private ESteps _steps = ESteps.None;
 
@@ -21,9 +21,9 @@ namespace YooAsset
 		public string PackageHash { private set; get; }
 
 
-		public QueryCachePackageHashOperation(string packageName, string packageVersion)
+		public QueryCachePackageHashOperation(PersistentManager persistent, string packageVersion)
 		{
-			_packageName = packageName;
+			_persistent = persistent;
 			_packageVersion = packageVersion;
 		}
 		internal override void Start()
@@ -37,7 +37,7 @@ namespace YooAsset
 
 			if (_steps == ESteps.LoadCachePackageHashFile)
 			{
-				string filePath = PersistentTools.GetPersistent(_packageName).GetSandboxPackageHashFilePath(_packageVersion);
+				string filePath = _persistent.GetSandboxPackageHashFilePath(_packageVersion);
 				if (File.Exists(filePath) == false)
 				{
 					_steps = ESteps.Done;
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryCachePackageHashOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryCachePackageHashOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryCachePackageHashOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryCachePackageHashOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryCachePackageVersionOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryCachePackageVersionOperation.cs
similarity index 82%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryCachePackageVersionOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryCachePackageVersionOperation.cs
index fb231a4..77a00bf 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryCachePackageVersionOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryCachePackageVersionOperation.cs
@@ -11,7 +11,7 @@ namespace YooAsset
 			Done,
 		}
 
-		private readonly string _packageName;
+		private readonly PersistentManager _persistent;
 		private ESteps _steps = ESteps.None;
 
 		/// <summary>
@@ -20,9 +20,9 @@ namespace YooAsset
 		public string PackageVersion { private set; get; }
 
 
-		public QueryCachePackageVersionOperation(string packageName)
+		public QueryCachePackageVersionOperation(PersistentManager persistent)
 		{
-			_packageName = packageName;
+			_persistent = persistent;
 		}
 		internal override void Start()
 		{
@@ -35,7 +35,7 @@ namespace YooAsset
 
 			if (_steps == ESteps.LoadCachePackageVersionFile)
 			{
-				string filePath = PersistentTools.GetPersistent(_packageName).GetSandboxPackageVersionFilePath();
+				string filePath = _persistent.GetSandboxPackageVersionFilePath();
 				if (File.Exists(filePath) == false)
 				{
 					_steps = ESteps.Done;
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryCachePackageVersionOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryCachePackageVersionOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryCachePackageVersionOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryCachePackageVersionOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryRemotePackageHashOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageHashOperation.cs
similarity index 90%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryRemotePackageHashOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageHashOperation.cs
index e885358..6467280 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryRemotePackageHashOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageHashOperation.cs
@@ -10,13 +10,13 @@ namespace YooAsset
 			Done,
 		}
 		
-		private static int RequestCount = 0;
 		private readonly IRemoteServices _remoteServices;
 		private readonly string _packageName;
 		private readonly string _packageVersion;
 		private readonly int _timeout;
 		private UnityWebDataRequester _downloader;
 		private ESteps _steps = ESteps.None;
+		private int RequestCount = 0;
 
 		/// <summary>
 		/// 包裹哈希值
@@ -33,7 +33,7 @@ namespace YooAsset
 		}
 		internal override void Start()
 		{
-			RequestCount++;
+			RequestCount = RemoteTools.GetRequestFailedCount(_packageName, nameof(QueryRemotePackageHashOperation));
 			_steps = ESteps.DownloadPackageHash;
 		}
 		internal override void Update()
@@ -62,6 +62,7 @@ namespace YooAsset
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
 					Error = _downloader.GetError();
+					RemoteTools.RecordRequestFailed(_packageName, nameof(QueryRemotePackageHashOperation));
 				}
 				else
 				{
@@ -89,9 +90,9 @@ namespace YooAsset
 
 			// 轮流返回请求地址
 			if (RequestCount % 2 == 0)
-				url = _remoteServices.GetRemoteFallbackURL(fileName);
-			else
 				url = _remoteServices.GetRemoteMainURL(fileName);
+			else
+				url = _remoteServices.GetRemoteFallbackURL(fileName);
 
 			return url;
 		}
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryRemotePackageHashOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageHashOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryRemotePackageHashOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageHashOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryRemotePackageVersionOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageVersionOperation.cs
similarity index 91%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryRemotePackageVersionOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageVersionOperation.cs
index 7fbb043..46f1e41 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryRemotePackageVersionOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageVersionOperation.cs
@@ -10,13 +10,13 @@ namespace YooAsset
 			Done,
 		}
 
-		private static int RequestCount = 0;
 		private readonly IRemoteServices _remoteServices;
 		private readonly string _packageName;
 		private readonly bool _appendTimeTicks;
 		private readonly int _timeout;
 		private UnityWebDataRequester _downloader;
 		private ESteps _steps = ESteps.None;
+		private int RequestCount = 0;
 
 		/// <summary>
 		/// 包裹版本
@@ -33,7 +33,7 @@ namespace YooAsset
 		}
 		internal override void Start()
 		{
-			RequestCount++;
+			RequestCount = RemoteTools.GetRequestFailedCount(_packageName, nameof(QueryRemotePackageVersionOperation));
 			_steps = ESteps.DownloadPackageVersion;
 		}
 		internal override void Update()
@@ -62,6 +62,7 @@ namespace YooAsset
 					_steps = ESteps.Done;
 					Status = EOperationStatus.Failed;
 					Error = _downloader.GetError();
+					RemoteTools.RecordRequestFailed(_packageName, nameof(QueryRemotePackageVersionOperation));
 				}
 				else
 				{
@@ -89,9 +90,9 @@ namespace YooAsset
 
 			// 轮流返回请求地址
 			if (RequestCount % 2 == 0)
-				url = _remoteServices.GetRemoteFallbackURL(fileName);
-			else
 				url = _remoteServices.GetRemoteMainURL(fileName);
+			else
+				url = _remoteServices.GetRemoteFallbackURL(fileName);
 
 			// 在URL末尾添加时间戳
 			if (_appendTimeTicks)
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryRemotePackageVersionOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageVersionOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/QueryRemotePackageVersionOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/QueryRemotePackageVersionOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/UnpackBuildinManifestOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/UnpackBuildinManifestOperation.cs
similarity index 66%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/UnpackBuildinManifestOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/UnpackBuildinManifestOperation.cs
index cba3b03..95f7684 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/UnpackBuildinManifestOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/UnpackBuildinManifestOperation.cs
@@ -11,15 +11,15 @@ namespace YooAsset
 			Done,
 		}
 
-		private readonly string _buildinPackageName;
+		private readonly PersistentManager _persistent;
 		private readonly string _buildinPackageVersion;
 		private UnityWebFileRequester _downloader1;
 		private UnityWebFileRequester _downloader2;
 		private ESteps _steps = ESteps.None;
 
-		public UnpackBuildinManifestOperation(string buildinPackageName, string buildinPackageVersion)
+		public UnpackBuildinManifestOperation(PersistentManager persistent, string buildinPackageVersion)
 		{
-			_buildinPackageName = buildinPackageName;
+			_persistent = persistent;
 			_buildinPackageVersion = buildinPackageVersion;
 		}
 		internal override void Start()
@@ -35,10 +35,9 @@ namespace YooAsset
 			{
 				if (_downloader1 == null)
 				{
-					var persistent = PersistentTools.GetPersistent(_buildinPackageName);
-					string savePath = persistent.GetSandboxPackageHashFilePath(_buildinPackageVersion);
-					string filePath = persistent.GetBuildinPackageHashFilePath(_buildinPackageVersion);
-					string url = PersistentTools.ConvertToWWWPath(filePath);
+					string savePath = _persistent.GetSandboxPackageHashFilePath(_buildinPackageVersion);
+					string filePath = _persistent.GetBuildinPackageHashFilePath(_buildinPackageVersion);
+					string url = PersistentHelper.ConvertToWWWPath(filePath);
 					_downloader1 = new UnityWebFileRequester();
 					_downloader1.SendRequest(url, savePath);
 				}
@@ -64,10 +63,9 @@ namespace YooAsset
 			{
 				if (_downloader2 == null)
 				{
-					var persistent = PersistentTools.GetPersistent(_buildinPackageName);
-					string savePath = persistent.GetSandboxPackageManifestFilePath(_buildinPackageVersion);
-					string filePath = persistent.GetBuildinPackageManifestFilePath(_buildinPackageVersion);
-					string url = PersistentTools.ConvertToWWWPath(filePath);
+					string savePath = _persistent.GetSandboxPackageManifestFilePath(_buildinPackageVersion);
+					string filePath = _persistent.GetBuildinPackageManifestFilePath(_buildinPackageVersion);
+					string url = PersistentHelper.ConvertToWWWPath(filePath);
 					_downloader2 = new UnityWebFileRequester();
 					_downloader2.SendRequest(url, savePath);
 				}
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/UnpackBuildinManifestOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/UnpackBuildinManifestOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/Internal/UnpackBuildinManifestOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/Internal/UnpackBuildinManifestOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/PreDownloadContentOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs
similarity index 51%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/PreDownloadContentOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs
index 2ca5047..d44ce17 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/PreDownloadContentOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs
@@ -12,10 +12,7 @@ namespace YooAsset
 		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
 		/// <param name="failedTryAgain">下载失败的重试次数</param>
 		/// <param name="timeout">超时时间</param>
-		public virtual ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-		{
-			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
-		}
+		public abstract ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60);
 
 		/// <summary>
 		/// 创建资源下载器，用于下载指定的资源标签关联的资源包文件
@@ -24,10 +21,7 @@ namespace YooAsset
 		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
 		/// <param name="failedTryAgain">下载失败的重试次数</param>
 		/// <param name="timeout">超时时间</param>
-		public virtual ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-		{
-			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
-		}
+		public abstract ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60);
 
 		/// <summary>
 		/// 创建资源下载器，用于下载指定的资源标签列表关联的资源包文件
@@ -36,10 +30,7 @@ namespace YooAsset
 		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
 		/// <param name="failedTryAgain">下载失败的重试次数</param>
 		/// <param name="timeout">超时时间</param>
-		public virtual ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-		{
-			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
-		}
+		public abstract ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60);
 
 		/// <summary>
 		/// 创建资源下载器，用于下载指定的资源依赖的资源包文件
@@ -48,10 +39,7 @@ namespace YooAsset
 		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
 		/// <param name="failedTryAgain">下载失败的重试次数</param>
 		/// <param name="timeout">超时时间</param>
-		public virtual ResourceDownloaderOperation CreateBundleDownloader(string location, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-		{
-			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
-		}
+		public abstract ResourceDownloaderOperation CreateBundleDownloader(string location, int downloadingMaxNumber, int failedTryAgain, int timeout = 60);
 
 		/// <summary>
 		/// 创建资源下载器，用于下载指定的资源列表依赖的资源包文件
@@ -60,14 +48,17 @@ namespace YooAsset
 		/// <param name="downloadingMaxNumber">同时下载的最大文件数</param>
 		/// <param name="failedTryAgain">下载失败的重试次数</param>
 		/// <param name="timeout">超时时间</param>
-		public virtual ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
-		{
-			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
-		}
+		public abstract ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60);
 	}
 
 	internal class EditorPlayModePreDownloadContentOperation : PreDownloadContentOperation
 	{
+		private readonly EditorSimulateModeImpl _impl;
+
+		public EditorPlayModePreDownloadContentOperation(EditorSimulateModeImpl impl)
+		{
+			_impl = impl;
+		}
 		internal override void Start()
 		{
 			Status = EOperationStatus.Succeed;
@@ -75,9 +66,36 @@ namespace YooAsset
 		internal override void Update()
 		{
 		}
+
+		public override ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		public override ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		public override ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		public override ResourceDownloaderOperation CreateBundleDownloader(string location, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		public override ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
 	}
 	internal class OfflinePlayModePreDownloadContentOperation : PreDownloadContentOperation
 	{
+		private readonly OfflinePlayModeImpl _impl;
+
+		public OfflinePlayModePreDownloadContentOperation(OfflinePlayModeImpl impl)
+		{
+			_impl = impl;
+		}
 		internal override void Start()
 		{
 			Status = EOperationStatus.Succeed;
@@ -85,6 +103,27 @@ namespace YooAsset
 		internal override void Update()
 		{
 		}
+
+		public override ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		public override ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		public override ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		public override ResourceDownloaderOperation CreateBundleDownloader(string location, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		public override ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
 	}
 	internal class HostPlayModePreDownloadContentOperation : PreDownloadContentOperation
 	{
@@ -100,7 +139,6 @@ namespace YooAsset
 		}
 
 		private readonly HostPlayModeImpl _impl;
-		private readonly string _packageName;
 		private readonly string _packageVersion;
 		private readonly int _timeout;
 		private LoadCacheManifestOperation _tryLoadCacheManifestOp;
@@ -110,10 +148,9 @@ namespace YooAsset
 		private ESteps _steps = ESteps.None;
 
 
-		internal HostPlayModePreDownloadContentOperation(HostPlayModeImpl impl, string packageName, string packageVersion, int timeout)
+		internal HostPlayModePreDownloadContentOperation(HostPlayModeImpl impl, string packageVersion, int timeout)
 		{
 			_impl = impl;
-			_packageName = packageName;
 			_packageVersion = packageVersion;
 			_timeout = timeout;
 		}
@@ -146,8 +183,8 @@ namespace YooAsset
 			{
 				if (_tryLoadCacheManifestOp == null)
 				{
-					_tryLoadCacheManifestOp = new LoadCacheManifestOperation(_packageName, _packageVersion);
-					OperationSystem.StartOperation(_tryLoadCacheManifestOp);
+					_tryLoadCacheManifestOp = new LoadCacheManifestOperation(_impl.Persistent, _packageVersion);
+					OperationSystem.StartOperation(_impl.PackageName, _tryLoadCacheManifestOp);
 				}
 
 				if (_tryLoadCacheManifestOp.IsDone == false)
@@ -169,8 +206,8 @@ namespace YooAsset
 			{
 				if (_downloadManifestOp == null)
 				{
-					_downloadManifestOp = new DownloadManifestOperation(_impl.RemoteServices, _packageName, _packageVersion, _timeout);
-					OperationSystem.StartOperation(_downloadManifestOp);
+					_downloadManifestOp = new DownloadManifestOperation(_impl.Persistent, _impl.RemoteServices, _packageVersion, _timeout);
+					OperationSystem.StartOperation(_impl.PackageName, _downloadManifestOp);
 				}
 
 				if (_downloadManifestOp.IsDone == false)
@@ -192,8 +229,8 @@ namespace YooAsset
 			{
 				if (_loadCacheManifestOp == null)
 				{
-					_loadCacheManifestOp = new LoadCacheManifestOperation(_packageName, _packageVersion);
-					OperationSystem.StartOperation(_loadCacheManifestOp);
+					_loadCacheManifestOp = new LoadCacheManifestOperation(_impl.Persistent, _packageVersion);
+					OperationSystem.StartOperation(_impl.PackageName, _loadCacheManifestOp);
 				}
 
 				if (_loadCacheManifestOp.IsDone == false)
@@ -219,11 +256,11 @@ namespace YooAsset
 			if (Status != EOperationStatus.Succeed)
 			{
 				YooLogger.Warning($"{nameof(PreDownloadContentOperation)} status is not succeed !");
-				return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+				return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
 			}
 
 			List<BundleInfo> downloadList = _impl.GetDownloadListByAll(_manifest);
-			var operation = new ResourceDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+			var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		public override ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
@@ -231,11 +268,11 @@ namespace YooAsset
 			if (Status != EOperationStatus.Succeed)
 			{
 				YooLogger.Warning($"{nameof(PreDownloadContentOperation)} status is not succeed !");
-				return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+				return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
 			}
 
 			List<BundleInfo> downloadList = _impl.GetDownloadListByTags(_manifest, new string[] { tag });
-			var operation = new ResourceDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+			var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		public override ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
@@ -243,11 +280,11 @@ namespace YooAsset
 			if (Status != EOperationStatus.Succeed)
 			{
 				YooLogger.Warning($"{nameof(PreDownloadContentOperation)} status is not succeed !");
-				return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+				return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
 			}
 
 			List<BundleInfo> downloadList = _impl.GetDownloadListByTags(_manifest, tags);
-			var operation = new ResourceDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+			var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		public override ResourceDownloaderOperation CreateBundleDownloader(string location, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
@@ -255,7 +292,7 @@ namespace YooAsset
 			if (Status != EOperationStatus.Succeed)
 			{
 				YooLogger.Warning($"{nameof(PreDownloadContentOperation)} status is not succeed !");
-				return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+				return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
 			}
 
 			List<AssetInfo> assetInfos = new List<AssetInfo>();
@@ -263,7 +300,7 @@ namespace YooAsset
 			assetInfos.Add(assetInfo);
 
 			List<BundleInfo> downloadList = _impl.GetDownloadListByPaths(_manifest, assetInfos.ToArray());
-			var operation = new ResourceDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+			var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		public override ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
@@ -271,7 +308,7 @@ namespace YooAsset
 			if (Status != EOperationStatus.Succeed)
 			{
 				YooLogger.Warning($"{nameof(PreDownloadContentOperation)} status is not succeed !");
-				return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+				return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
 			}
 
 			List<AssetInfo> assetInfos = new List<AssetInfo>(locations.Length);
@@ -282,12 +319,18 @@ namespace YooAsset
 			}
 
 			List<BundleInfo> downloadList = _impl.GetDownloadListByPaths(_manifest, assetInfos.ToArray());
-			var operation = new ResourceDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+			var operation = new ResourceDownloaderOperation(_impl.PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 	}
 	internal class WebPlayModePreDownloadContentOperation : PreDownloadContentOperation
 	{
+		private readonly WebPlayModeImpl _impl;
+
+		public WebPlayModePreDownloadContentOperation(WebPlayModeImpl impl)
+		{
+			_impl = impl;
+		}
 		internal override void Start()
 		{
 			Status = EOperationStatus.Succeed;
@@ -295,5 +338,26 @@ namespace YooAsset
 		internal override void Update()
 		{
 		}
+
+		public override ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		public override ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		public override ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		public override ResourceDownloaderOperation CreateBundleDownloader(string location, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		public override ResourceDownloaderOperation CreateBundleDownloader(string[] locations, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(_impl.PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/PreDownloadContentOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/PreDownloadContentOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/PreDownloadContentOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/UpdatePackageManifestOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageManifestOperation.cs
similarity index 83%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/UpdatePackageManifestOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageManifestOperation.cs
index f60ef8c..b078f66 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/UpdatePackageManifestOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageManifestOperation.cs
@@ -68,7 +68,6 @@ namespace YooAsset
 		}
 
 		private readonly HostPlayModeImpl _impl;
-		private readonly string _packageName;
 		private readonly string _packageVersion;
 		private readonly bool _autoSaveVersion;
 		private readonly int _timeout;
@@ -78,10 +77,9 @@ namespace YooAsset
 		private ESteps _steps = ESteps.None;
 
 
-		internal HostPlayModeUpdatePackageManifestOperation(HostPlayModeImpl impl, string packageName, string packageVersion, bool autoSaveVersion, int timeout)
+		internal HostPlayModeUpdatePackageManifestOperation(HostPlayModeImpl impl, string packageVersion, bool autoSaveVersion, int timeout)
 		{
 			_impl = impl;
-			_packageName = packageName;
 			_packageVersion = packageVersion;
 			_autoSaveVersion = autoSaveVersion;
 			_timeout = timeout;
@@ -97,14 +95,6 @@ namespace YooAsset
 
 			if (_steps == ESteps.CheckParams)
 			{
-				if (string.IsNullOrEmpty(_packageName))
-				{
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Failed;
-					Error = "Package name is null or empty.";
-					return;
-				}
-
 				if (string.IsNullOrEmpty(_packageVersion))
 				{
 					_steps = ESteps.Done;
@@ -134,8 +124,8 @@ namespace YooAsset
 			{
 				if (_tryLoadCacheManifestOp == null)
 				{
-					_tryLoadCacheManifestOp = new LoadCacheManifestOperation(_packageName, _packageVersion);
-					OperationSystem.StartOperation(_tryLoadCacheManifestOp);
+					_tryLoadCacheManifestOp = new LoadCacheManifestOperation(_impl.Persistent, _packageVersion);
+					OperationSystem.StartOperation(_impl.PackageName, _tryLoadCacheManifestOp);
 				}
 
 				if (_tryLoadCacheManifestOp.IsDone == false)
@@ -159,8 +149,8 @@ namespace YooAsset
 			{
 				if (_downloadManifestOp == null)
 				{
-					_downloadManifestOp = new DownloadManifestOperation(_impl.RemoteServices, _packageName, _packageVersion, _timeout);
-					OperationSystem.StartOperation(_downloadManifestOp);
+					_downloadManifestOp = new DownloadManifestOperation(_impl.Persistent, _impl.RemoteServices, _packageVersion, _timeout);
+					OperationSystem.StartOperation(_impl.PackageName, _downloadManifestOp);
 				}
 
 				if (_downloadManifestOp.IsDone == false)
@@ -182,8 +172,8 @@ namespace YooAsset
 			{
 				if (_loadCacheManifestOp == null)
 				{
-					_loadCacheManifestOp = new LoadCacheManifestOperation(_packageName, _packageVersion);
-					OperationSystem.StartOperation(_loadCacheManifestOp);
+					_loadCacheManifestOp = new LoadCacheManifestOperation(_impl.Persistent, _packageVersion);
+					OperationSystem.StartOperation(_impl.PackageName, _loadCacheManifestOp);
 				}
 
 				if (_loadCacheManifestOp.IsDone == false)
@@ -227,17 +217,15 @@ namespace YooAsset
 		}
 
 		private readonly WebPlayModeImpl _impl;
-		private readonly string _packageName;
 		private readonly string _packageVersion;
 		private readonly int _timeout;
 		private LoadRemoteManifestOperation _loadCacheManifestOp;
 		private ESteps _steps = ESteps.None;
 
 
-		internal WebPlayModeUpdatePackageManifestOperation(WebPlayModeImpl impl, string packageName, string packageVersion, int timeout)
+		internal WebPlayModeUpdatePackageManifestOperation(WebPlayModeImpl impl, string packageVersion, int timeout)
 		{
 			_impl = impl;
-			_packageName = packageName;
 			_packageVersion = packageVersion;
 			_timeout = timeout;
 		}
@@ -252,14 +240,6 @@ namespace YooAsset
 
 			if (_steps == ESteps.CheckParams)
 			{
-				if (string.IsNullOrEmpty(_packageName))
-				{
-					_steps = ESteps.Done;
-					Status = EOperationStatus.Failed;
-					Error = "Package name is null or empty.";
-					return;
-				}
-
 				if (string.IsNullOrEmpty(_packageVersion))
 				{
 					_steps = ESteps.Done;
@@ -289,8 +269,8 @@ namespace YooAsset
 			{
 				if (_loadCacheManifestOp == null)
 				{
-					_loadCacheManifestOp = new LoadRemoteManifestOperation(_impl.RemoteServices, _packageName, _packageVersion, _timeout);
-					OperationSystem.StartOperation(_loadCacheManifestOp);
+					_loadCacheManifestOp = new LoadRemoteManifestOperation(_impl.RemoteServices, _impl.PackageName, _packageVersion, _timeout);
+					OperationSystem.StartOperation(_impl.PackageName, _loadCacheManifestOp);
 				}
 
 				if (_loadCacheManifestOp.IsDone == false)
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/UpdatePackageManifestOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageManifestOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/UpdatePackageManifestOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageManifestOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/UpdatePackageVersionOperation.cs b/Assets/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageVersionOperation.cs
similarity index 87%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/UpdatePackageVersionOperation.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageVersionOperation.cs
index a92c2c2..1ed68ba 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/Operations/UpdatePackageVersionOperation.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageVersionOperation.cs
@@ -56,16 +56,14 @@ namespace YooAsset
 		}
 
 		private readonly HostPlayModeImpl _impl;
-		private readonly string _packageName;
 		private readonly bool _appendTimeTicks;
 		private readonly int _timeout;
 		private QueryRemotePackageVersionOperation _queryRemotePackageVersionOp;
 		private ESteps _steps = ESteps.None;
 
-		internal HostPlayModeUpdatePackageVersionOperation(HostPlayModeImpl impl, string packageName, bool appendTimeTicks, int timeout)
+		internal HostPlayModeUpdatePackageVersionOperation(HostPlayModeImpl impl, bool appendTimeTicks, int timeout)
 		{
 			_impl = impl;
-			_packageName = packageName;
 			_appendTimeTicks = appendTimeTicks;
 			_timeout = timeout;
 		}
@@ -82,8 +80,8 @@ namespace YooAsset
 			{
 				if (_queryRemotePackageVersionOp == null)
 				{
-					_queryRemotePackageVersionOp = new QueryRemotePackageVersionOperation(_impl.RemoteServices, _packageName, _appendTimeTicks, _timeout);
-					OperationSystem.StartOperation(_queryRemotePackageVersionOp);
+					_queryRemotePackageVersionOp = new QueryRemotePackageVersionOperation(_impl.RemoteServices, _impl.PackageName, _appendTimeTicks, _timeout);
+					OperationSystem.StartOperation(_impl.PackageName, _queryRemotePackageVersionOp);
 				}
 
 				if (_queryRemotePackageVersionOp.IsDone == false)
@@ -118,16 +116,14 @@ namespace YooAsset
 		}
 
 		private readonly WebPlayModeImpl _impl;
-		private readonly string _packageName;
 		private readonly bool _appendTimeTicks;
 		private readonly int _timeout;
 		private QueryRemotePackageVersionOperation _queryRemotePackageVersionOp;
 		private ESteps _steps = ESteps.None;
 		
-		internal WebPlayModeUpdatePackageVersionOperation(WebPlayModeImpl impl, string packageName, bool appendTimeTicks, int timeout)
+		internal WebPlayModeUpdatePackageVersionOperation(WebPlayModeImpl impl, bool appendTimeTicks, int timeout)
 		{
 			_impl = impl;
-			_packageName = packageName;
 			_appendTimeTicks = appendTimeTicks;
 			_timeout = timeout;
 		}
@@ -144,8 +140,8 @@ namespace YooAsset
 			{
 				if (_queryRemotePackageVersionOp == null)
 				{
-					_queryRemotePackageVersionOp = new QueryRemotePackageVersionOperation(_impl.RemoteServices, _packageName, _appendTimeTicks, _timeout);
-					OperationSystem.StartOperation(_queryRemotePackageVersionOp);
+					_queryRemotePackageVersionOp = new QueryRemotePackageVersionOperation(_impl.RemoteServices, _impl.PackageName, _appendTimeTicks, _timeout);
+					OperationSystem.StartOperation(_impl.PackageName, _queryRemotePackageVersionOp);
 				}
 
 				if (_queryRemotePackageVersionOp.IsDone == false)
diff --git a/Assets/YooAsset/Runtime/PackageSystem/Operations/UpdatePackageVersionOperation.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageVersionOperation.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/Operations/UpdatePackageVersionOperation.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/Operation/UpdatePackageVersionOperation.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PackageAsset.cs b/Assets/YooAsset/Runtime/ResourcePackage/PackageAsset.cs
similarity index 90%
rename from Assets/YooAsset/Runtime/PackageSystem/PackageAsset.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/PackageAsset.cs
index d486cc3..96f69ac 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/PackageAsset.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/PackageAsset.cs
@@ -31,12 +31,6 @@ namespace YooAsset
 		/// </summary>
 		public int BundleID;
 
-		/// <summary>
-		/// 依赖的资源包ID列表
-		/// </summary>
-		public int[] DependIDs;
-
-
 		/// <summary>
 		/// 是否包含Tag
 		/// </summary>
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PackageAsset.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/PackageAsset.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/PackageAsset.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/PackageAsset.cs.meta
diff --git a/Assets/YooAsset/Runtime/ResourcePackage/PackageBundle.cs b/Assets/YooAsset/Runtime/ResourcePackage/PackageBundle.cs
new file mode 100644
index 0000000..5d0e9a6
--- /dev/null
+++ b/Assets/YooAsset/Runtime/ResourcePackage/PackageBundle.cs
@@ -0,0 +1,152 @@
+using System;
+using System.Linq;
+
+namespace YooAsset
+{
+	[Serializable]
+	internal class PackageBundle
+	{
+		/// <summary>
+		/// 资源包名称
+		/// </summary>
+		public string BundleName;
+
+		/// <summary>
+		/// Unity引擎生成的CRC
+		/// </summary>
+		public uint UnityCRC;
+
+		/// <summary>
+		/// 文件哈希值
+		/// </summary>
+		public string FileHash;
+
+		/// <summary>
+		/// 文件校验码
+		/// </summary>
+		public string FileCRC;
+
+		/// <summary>
+		/// 文件大小（字节数）
+		/// </summary>
+		public long FileSize;
+
+		/// <summary>
+		/// 文件是否加密
+		/// </summary>
+		public bool Encrypted;
+		
+		/// <summary>
+		/// 资源包的分类标签
+		/// </summary>
+		public string[] Tags;
+
+		/// <summary>
+		/// 依赖的资源包ID集合
+		/// </summary>
+		public int[] DependIDs;
+
+
+		/// <summary>
+		/// 所属的包裹名称
+		/// </summary>
+		public string PackageName { private set; get; }
+
+		/// <summary>
+		/// 所属的构建管线
+		/// </summary>
+		public string Buildpipeline { private set; get; }
+
+		/// <summary>
+		/// 缓存GUID
+		/// </summary>
+		public string CacheGUID
+		{
+			get { return FileHash; }
+		}
+
+		/// <summary>
+		/// 文件名称
+		/// </summary>
+		private string _fileName;
+		public string FileName
+		{
+			get
+			{
+				if (string.IsNullOrEmpty(_fileName))
+					throw new Exception("Should never get here !");
+				return _fileName;
+			}
+		}
+
+		/// <summary>
+		/// 文件后缀名
+		/// </summary>
+		private string _fileExtension;
+		public string FileExtension
+		{
+			get
+			{
+				if (string.IsNullOrEmpty(_fileExtension))
+					throw new Exception("Should never get here !");
+				return _fileExtension;
+			}
+		}
+
+
+		public PackageBundle()
+		{
+		}
+
+		/// <summary>
+		/// 解析资源包
+		/// </summary>
+		public void ParseBundle(PackageManifest manifest)
+		{
+			PackageName = manifest.PackageName;
+			Buildpipeline = manifest.BuildPipeline;
+			_fileExtension = ManifestTools.GetRemoteBundleFileExtension(BundleName);
+			_fileName = ManifestTools.GetRemoteBundleFileName(manifest.OutputNameStyle, BundleName, _fileExtension, FileHash);
+		}
+
+		/// <summary>
+		/// 是否包含Tag
+		/// </summary>
+		public bool HasTag(string[] tags)
+		{
+			if (tags == null || tags.Length == 0)
+				return false;
+			if (Tags == null || Tags.Length == 0)
+				return false;
+
+			foreach (var tag in tags)
+			{
+				if (Tags.Contains(tag))
+					return true;
+			}
+			return false;
+		}
+
+		/// <summary>
+		/// 是否包含任意Tags
+		/// </summary>
+		public bool HasAnyTags()
+		{
+			if (Tags != null && Tags.Length > 0)
+				return true;
+			else
+				return false;
+		}
+
+		/// <summary>
+		/// 检测资源包文件内容是否相同
+		/// </summary>
+		public bool Equals(PackageBundle otherBundle)
+		{
+			if (FileHash == otherBundle.FileHash)
+				return true;
+
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PackageBundle.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/PackageBundle.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/PackageBundle.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/PackageBundle.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PackageManifest.cs b/Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs
similarity index 86%
rename from Assets/YooAsset/Runtime/PackageSystem/PackageManifest.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs
index 4db8926..e2f0e2a 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/PackageManifest.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs
@@ -37,6 +37,11 @@ namespace YooAsset
 		/// </summary>
 		public int OutputNameStyle;
 
+		/// <summary>
+		/// 构建管线名称
+		/// </summary>
+		public string BuildPipeline;
+
 		/// <summary>
 		/// 资源包裹名称
 		/// </summary>
@@ -137,43 +142,21 @@ namespace YooAsset
 		/// </summary>
 		public PackageBundle[] GetAllDependencies(string assetPath)
 		{
-			if (AssetDic.TryGetValue(assetPath, out PackageAsset packageAsset))
+			var packageBundle = GetMainPackageBundle(assetPath);
+			List<PackageBundle> result = new List<PackageBundle>(packageBundle.DependIDs.Length);
+			foreach (var dependID in packageBundle.DependIDs)
 			{
-				List<PackageBundle> result = new List<PackageBundle>(packageAsset.DependIDs.Length);
-				foreach (var dependID in packageAsset.DependIDs)
+				if (dependID >= 0 && dependID < BundleList.Count)
 				{
-					if (dependID >= 0 && dependID < BundleList.Count)
-					{
-						var dependBundle = BundleList[dependID];
-						result.Add(dependBundle);
-					}
-					else
-					{
-						throw new Exception($"Invalid bundle id : {dependID} Asset path : {assetPath}");
-					}
+					var dependBundle = BundleList[dependID];
+					result.Add(dependBundle);
+				}
+				else
+				{
+					throw new Exception($"Invalid bundle id : {dependID} Asset path : {assetPath}");
 				}
-				return result.ToArray();
-			}
-			else
-			{
-				throw new Exception("Should never get here !");
-			}
-		}
-
-		/// <summary>
-		/// 获取资源包名称
-		/// </summary>
-		public string GetBundleName(int bundleID)
-		{
-			if (bundleID >= 0 && bundleID < BundleList.Count)
-			{
-				var packageBundle = BundleList[bundleID];
-				return packageBundle.BundleName;
-			}
-			else
-			{
-				throw new Exception($"Invalid bundle id : {bundleID}");
 			}
+			return result.ToArray();
 		}
 
 		/// <summary>
@@ -210,7 +193,7 @@ namespace YooAsset
 			{
 				if (packageAsset.HasTag(tags))
 				{
-					AssetInfo assetInfo = new AssetInfo(packageAsset);
+					AssetInfo assetInfo = new AssetInfo(PackageName, packageAsset);
 					result.Add(assetInfo);
 				}
 			}
@@ -228,7 +211,7 @@ namespace YooAsset
 			string assetPath = ConvertLocationToAssetInfoMapping(location);
 			if (TryGetPackageAsset(assetPath, out PackageAsset packageAsset))
 			{
-				AssetInfo assetInfo = new AssetInfo(packageAsset, assetType);
+				AssetInfo assetInfo = new AssetInfo(PackageName, packageAsset, assetType);
 				return assetInfo;
 			}
 			else
@@ -238,7 +221,7 @@ namespace YooAsset
 					error = $"The location is null or empty !";
 				else
 					error = $"The location is invalid : {location}";
-				AssetInfo assetInfo = new AssetInfo(error);
+				AssetInfo assetInfo = new AssetInfo(PackageName, error);
 				return assetInfo;
 			}
 		}
@@ -273,14 +256,14 @@ namespace YooAsset
 			if (IncludeAssetGUID == false)
 			{
 				YooLogger.Warning("Package manifest not include asset guid ! Please check asset bundle collector settings.");
-				AssetInfo assetInfo = new AssetInfo("AssetGUID data is empty !");
+				AssetInfo assetInfo = new AssetInfo(PackageName, "AssetGUID data is empty !");
 				return assetInfo;
 			}
 
 			string assetPath = ConvertAssetGUIDToAssetInfoMapping(assetGUID);
 			if (TryGetPackageAsset(assetPath, out PackageAsset packageAsset))
 			{
-				AssetInfo assetInfo = new AssetInfo(packageAsset, assetType);
+				AssetInfo assetInfo = new AssetInfo(PackageName, packageAsset, assetType);
 				return assetInfo;
 			}
 			else
@@ -290,7 +273,7 @@ namespace YooAsset
 					error = $"The assetGUID is null or empty !";
 				else
 					error = $"The assetGUID is invalid : {assetGUID}";
-				AssetInfo assetInfo = new AssetInfo(error);
+				AssetInfo assetInfo = new AssetInfo(PackageName, error);
 				return assetInfo;
 			}
 		}
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PackageManifest.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/PackageManifest.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/PackageManifest.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PlayMode.meta b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/PlayMode.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/PlayMode.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PlayMode/EditorSimulateModeHelper.cs b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeHelper.cs
similarity index 77%
rename from Assets/YooAsset/Runtime/PackageSystem/PlayMode/EditorSimulateModeHelper.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeHelper.cs
index ef52dd1..9f5d74f 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/PlayMode/EditorSimulateModeHelper.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeHelper.cs
@@ -10,12 +10,12 @@ namespace YooAsset
 		/// <summary>
 		/// 编辑器下模拟构建清单
 		/// </summary>
-		public static string SimulateBuild(string packageName)
+		public static string SimulateBuild(string buildPipelineName, string packageName)
 		{
 			if (_classType == null)
 				_classType = Assembly.Load("YooAsset.Editor").GetType("YooAsset.Editor.AssetBundleSimulateBuilder");
 
-			string manifestFilePath = (string)InvokePublicStaticMethod(_classType, "SimulateBuild", packageName);
+			string manifestFilePath = (string)InvokePublicStaticMethod(_classType, "SimulateBuild", buildPipelineName, packageName);
 			return manifestFilePath;
 		}
 
@@ -39,7 +39,7 @@ namespace YooAsset
 		/// <summary>
 		/// 编辑器下模拟构建清单
 		/// </summary>
-		public static string SimulateBuild(string packageName) { throw new System.Exception("Only support in unity editor !"); }
+		public static string SimulateBuild(string buildPipelineName, string packageName) { throw new System.Exception("Only support in unity editor !"); }
 	}
 }
 #endif
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PlayMode/EditorSimulateModeHelper.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeHelper.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/PlayMode/EditorSimulateModeHelper.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeHelper.cs.meta
diff --git a/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeImpl.cs b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeImpl.cs
new file mode 100644
index 0000000..6b00d00
--- /dev/null
+++ b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeImpl.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+	internal class EditorSimulateModeImpl : IPlayMode, IBundleQuery
+	{
+		private PackageManifest _activeManifest;
+		private ResourceAssist _assist;
+
+		public readonly string PackageName;
+
+
+		public EditorSimulateModeImpl(string packageName)
+		{
+			PackageName = packageName;
+		}
+
+		/// <summary>
+		/// 异步初始化
+		/// </summary>
+		public InitializationOperation InitializeAsync(ResourceAssist assist, string simulateManifestFilePath)
+		{
+			_assist = assist;
+
+			var operation = new EditorSimulateModeInitializationOperation(this, simulateManifestFilePath);
+			OperationSystem.StartOperation(PackageName, operation);
+			return operation;
+		}
+
+		#region IPlayModeServices接口
+		public PackageManifest ActiveManifest
+		{
+			set
+			{
+				_activeManifest = value;
+			}
+			get
+			{
+				return _activeManifest;
+			}
+		}
+		public void FlushManifestVersionFile()
+		{
+		}
+
+		UpdatePackageVersionOperation IPlayMode.UpdatePackageVersionAsync(bool appendTimeTicks, int timeout)
+		{
+			var operation = new EditorPlayModeUpdatePackageVersionOperation();
+			OperationSystem.StartOperation(PackageName, operation);
+			return operation;
+		}
+		UpdatePackageManifestOperation IPlayMode.UpdatePackageManifestAsync(string packageVersion, bool autoSaveVersion, int timeout)
+		{
+			var operation = new EditorPlayModeUpdatePackageManifestOperation();
+			OperationSystem.StartOperation(PackageName, operation);
+			return operation;
+		}
+		PreDownloadContentOperation IPlayMode.PreDownloadContentAsync(string packageVersion, int timeout)
+		{
+			var operation = new EditorPlayModePreDownloadContentOperation(this);
+			OperationSystem.StartOperation(PackageName, operation);
+			return operation;
+		}
+
+		ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByAll(int downloadingMaxNumber, int failedTryAgain, int timeout)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByTags(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByPaths(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain, int timeout)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+
+		ResourceUnpackerOperation IPlayMode.CreateResourceUnpackerByAll(int upackingMaxNumber, int failedTryAgain, int timeout)
+		{
+			return ResourceUnpackerOperation.CreateEmptyUnpacker(PackageName, upackingMaxNumber, failedTryAgain, timeout);
+		}
+		ResourceUnpackerOperation IPlayMode.CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain, int timeout)
+		{
+			return ResourceUnpackerOperation.CreateEmptyUnpacker(PackageName, upackingMaxNumber, failedTryAgain, timeout);
+		}
+		#endregion
+
+		#region IBundleQuery接口
+		private BundleInfo CreateBundleInfo(PackageBundle packageBundle, AssetInfo assetInfo)
+		{
+			if (packageBundle == null)
+				throw new Exception("Should never get here !");
+
+			BundleInfo bundleInfo = new BundleInfo(_assist, packageBundle, BundleInfo.ELoadMode.LoadFromEditor);
+			bundleInfo.IncludeAssetsInEditor = _activeManifest.GetBundleIncludeAssets(assetInfo.AssetPath);
+			return bundleInfo;
+		}
+		BundleInfo IBundleQuery.GetMainBundleInfo(AssetInfo assetInfo)
+		{
+			if (assetInfo.IsInvalid)
+				throw new Exception("Should never get here !");
+
+			// 注意：如果清单里未找到资源包会抛出异常！
+			var packageBundle = _activeManifest.GetMainPackageBundle(assetInfo.AssetPath);
+			return CreateBundleInfo(packageBundle, assetInfo);
+		}
+		BundleInfo[] IBundleQuery.GetAllDependBundleInfos(AssetInfo assetInfo)
+		{
+			if (assetInfo.IsInvalid)
+				throw new Exception("Should never get here !");
+
+			// 注意：如果清单里未找到资源包会抛出异常！
+			var depends = _activeManifest.GetAllDependencies(assetInfo.AssetPath);
+			List<BundleInfo> result = new List<BundleInfo>(depends.Length);
+			foreach (var packageBundle in depends)
+			{
+				BundleInfo bundleInfo = CreateBundleInfo(packageBundle, assetInfo);
+				result.Add(bundleInfo);
+			}
+			return result.ToArray();
+		}
+		bool IBundleQuery.ManifestValid()
+		{
+			return _activeManifest != null;
+		}
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PlayMode/EditorSimulateModeImpl.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeImpl.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/PlayMode/EditorSimulateModeImpl.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/PlayMode/EditorSimulateModeImpl.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PlayMode/HostPlayModeImpl.cs b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/HostPlayModeImpl.cs
similarity index 65%
rename from Assets/YooAsset/Runtime/PackageSystem/PlayMode/HostPlayModeImpl.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/PlayMode/HostPlayModeImpl.cs
index 0c818c4..1d0b431 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/PlayMode/HostPlayModeImpl.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/HostPlayModeImpl.cs
@@ -4,33 +4,46 @@ using System.Collections.Generic;
 
 namespace YooAsset
 {
-	internal class HostPlayModeImpl : IPlayModeServices, IBundleServices
+	internal class HostPlayModeImpl : IPlayMode, IBundleQuery
 	{
 		private PackageManifest _activeManifest;
-
-		// 参数相关
-		private string _packageName;
+		private ResourceAssist _assist;
 		private IBuildinQueryServices _buildinQueryServices;
 		private IDeliveryQueryServices _deliveryQueryServices;
 		private IRemoteServices _remoteServices;
-
+		
+		public readonly string PackageName;
+		public PersistentManager Persistent
+		{
+			get { return _assist.Persistent; }
+		}
+		public CacheManager Cache
+		{
+			get { return _assist.Cache; }
+		}
 		public IRemoteServices RemoteServices
 		{
 			get { return _remoteServices; }
 		}
 
+
+		public HostPlayModeImpl(string packageName)
+		{
+			PackageName = packageName;
+		}
+
 		/// <summary>
 		/// 异步初始化
 		/// </summary>
-		public InitializationOperation InitializeAsync(string packageName, IBuildinQueryServices buildinQueryServices, IDeliveryQueryServices deliveryQueryServices, IRemoteServices remoteServices)
+		public InitializationOperation InitializeAsync(ResourceAssist assist, IBuildinQueryServices buildinQueryServices, IDeliveryQueryServices deliveryQueryServices, IRemoteServices remoteServices)
 		{
-			_packageName = packageName;
+			_assist = assist;
 			_buildinQueryServices = buildinQueryServices;
 			_deliveryQueryServices = deliveryQueryServices;
 			_remoteServices = remoteServices;
 
-			var operation = new HostPlayModeInitializationOperation(this, packageName);
-			OperationSystem.StartOperation(operation);
+			var operation = new HostPlayModeInitializationOperation(this);
+			OperationSystem.StartOperation(PackageName, operation);
 			return operation;
 		}
 
@@ -49,29 +62,27 @@ namespace YooAsset
 		{
 			string remoteMainURL = _remoteServices.GetRemoteMainURL(packageBundle.FileName);
 			string remoteFallbackURL = _remoteServices.GetRemoteFallbackURL(packageBundle.FileName);
-			BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromRemote, remoteMainURL, remoteFallbackURL);
+			BundleInfo bundleInfo = new BundleInfo(_assist, packageBundle, BundleInfo.ELoadMode.LoadFromRemote, remoteMainURL, remoteFallbackURL);
 			return bundleInfo;
 		}
 
 		// 查询相关
-		private bool IsBuildinPackageBundle(PackageBundle packageBundle)
+		private bool IsDeliveryPackageBundle(PackageBundle packageBundle)
 		{
-			return _buildinQueryServices.QueryStreamingAssets(_packageName, packageBundle.FileName);
+			if (_deliveryQueryServices == null)
+				return false;
+			return _deliveryQueryServices.Query(PackageName, packageBundle.FileName);
 		}
 		private bool IsCachedPackageBundle(PackageBundle packageBundle)
 		{
-			return CacheSystem.IsCached(packageBundle.PackageName, packageBundle.CacheGUID);
+			return _assist.Cache.IsCached(packageBundle.CacheGUID);
 		}
-		private bool IsDeliveryPackageBundle(PackageBundle packageBundle)
+		private bool IsBuildinPackageBundle(PackageBundle packageBundle)
 		{
-			return _deliveryQueryServices.QueryDeliveryFiles(_packageName, packageBundle.FileName);
-		}
-		private DeliveryFileInfo GetDeiveryFileInfo(PackageBundle packageBundle)
-		{
-			return _deliveryQueryServices.GetDeliveryFileInfo(_packageName, packageBundle.FileName);
+			return _buildinQueryServices.Query(PackageName, packageBundle.FileName);
 		}
 
-		#region IPlayModeServices接口
+		#region IPlayMode接口
 		public PackageManifest ActiveManifest
 		{
 			set
@@ -87,33 +98,33 @@ namespace YooAsset
 		{
 			if (_activeManifest != null)
 			{
-				PersistentTools.GetPersistent(_packageName).SaveSandboxPackageVersionFile(_activeManifest.PackageVersion);
+				_assist.Persistent.SaveSandboxPackageVersionFile(_activeManifest.PackageVersion);
 			}
 		}
 
-		UpdatePackageVersionOperation IPlayModeServices.UpdatePackageVersionAsync(bool appendTimeTicks, int timeout)
+		UpdatePackageVersionOperation IPlayMode.UpdatePackageVersionAsync(bool appendTimeTicks, int timeout)
 		{
-			var operation = new HostPlayModeUpdatePackageVersionOperation(this, _packageName, appendTimeTicks, timeout);
-			OperationSystem.StartOperation(operation);
+			var operation = new HostPlayModeUpdatePackageVersionOperation(this, appendTimeTicks, timeout);
+			OperationSystem.StartOperation(PackageName, operation);
 			return operation;
 		}
-		UpdatePackageManifestOperation IPlayModeServices.UpdatePackageManifestAsync(string packageVersion, bool autoSaveVersion, int timeout)
+		UpdatePackageManifestOperation IPlayMode.UpdatePackageManifestAsync(string packageVersion, bool autoSaveVersion, int timeout)
 		{
-			var operation = new HostPlayModeUpdatePackageManifestOperation(this, _packageName, packageVersion, autoSaveVersion, timeout);
-			OperationSystem.StartOperation(operation);
+			var operation = new HostPlayModeUpdatePackageManifestOperation(this, packageVersion, autoSaveVersion, timeout);
+			OperationSystem.StartOperation(PackageName, operation);
 			return operation;
 		}
-		PreDownloadContentOperation IPlayModeServices.PreDownloadContentAsync(string packageVersion, int timeout)
+		PreDownloadContentOperation IPlayMode.PreDownloadContentAsync(string packageVersion, int timeout)
 		{
-			var operation = new HostPlayModePreDownloadContentOperation(this, _packageName, packageVersion, timeout);
-			OperationSystem.StartOperation(operation);
+			var operation = new HostPlayModePreDownloadContentOperation(this, packageVersion, timeout);
+			OperationSystem.StartOperation(PackageName, operation);
 			return operation;
 		}
 
-		ResourceDownloaderOperation IPlayModeServices.CreateResourceDownloaderByAll(int downloadingMaxNumber, int failedTryAgain, int timeout)
+		ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByAll(int downloadingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> downloadList = GetDownloadListByAll(_activeManifest);
-			var operation = new ResourceDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+			var operation = new ResourceDownloaderOperation(PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		public List<BundleInfo> GetDownloadListByAll(PackageManifest manifest)
@@ -139,10 +150,10 @@ namespace YooAsset
 			return ConvertToDownloadList(downloadList);
 		}
 
-		ResourceDownloaderOperation IPlayModeServices.CreateResourceDownloaderByTags(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout)
+		ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByTags(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> downloadList = GetDownloadListByTags(_activeManifest, tags);
-			var operation = new ResourceDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+			var operation = new ResourceDownloaderOperation(PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		public List<BundleInfo> GetDownloadListByTags(PackageManifest manifest, string[] tags)
@@ -180,10 +191,10 @@ namespace YooAsset
 			return ConvertToDownloadList(downloadList);
 		}
 
-		ResourceDownloaderOperation IPlayModeServices.CreateResourceDownloaderByPaths(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain, int timeout)
+		ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByPaths(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> downloadList = GetDownloadListByPaths(_activeManifest, assetInfos);
-			var operation = new ResourceDownloaderOperation(downloadList, downloadingMaxNumber, failedTryAgain, timeout);
+			var operation = new ResourceDownloaderOperation(PackageName, downloadList, downloadingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		public List<BundleInfo> GetDownloadListByPaths(PackageManifest manifest, AssetInfo[] assetInfos)
@@ -233,10 +244,10 @@ namespace YooAsset
 			return ConvertToDownloadList(downloadList);
 		}
 
-		ResourceUnpackerOperation IPlayModeServices.CreateResourceUnpackerByAll(int upackingMaxNumber, int failedTryAgain, int timeout)
+		ResourceUnpackerOperation IPlayMode.CreateResourceUnpackerByAll(int upackingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> unpcakList = GetUnpackListByAll(_activeManifest);
-			var operation = new ResourceUnpackerOperation(unpcakList, upackingMaxNumber, failedTryAgain, timeout);
+			var operation = new ResourceUnpackerOperation(PackageName, unpcakList, upackingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		private List<BundleInfo> GetUnpackListByAll(PackageManifest manifest)
@@ -254,13 +265,13 @@ namespace YooAsset
 				}
 			}
 
-			return ManifestTools.ConvertToUnpackInfos(downloadList);
+			return BundleInfo.ConvertToUnpackInfos(_assist, downloadList);
 		}
 
-		ResourceUnpackerOperation IPlayModeServices.CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain, int timeout)
+		ResourceUnpackerOperation IPlayMode.CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> unpcakList = GetUnpackListByTags(_activeManifest, tags);
-			var operation = new ResourceUnpackerOperation(unpcakList, upackingMaxNumber, failedTryAgain, timeout);
+			var operation = new ResourceUnpackerOperation(PackageName, unpcakList, upackingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		private List<BundleInfo> GetUnpackListByTags(PackageManifest manifest, string[] tags)
@@ -282,11 +293,11 @@ namespace YooAsset
 				}
 			}
 
-			return ManifestTools.ConvertToUnpackInfos(downloadList);
+			return BundleInfo.ConvertToUnpackInfos(_assist, downloadList);
 		}
 		#endregion
 
-		#region IBundleServices接口
+		#region IBundleQuery接口
 		private BundleInfo CreateBundleInfo(PackageBundle packageBundle)
 		{
 			if (packageBundle == null)
@@ -295,29 +306,29 @@ namespace YooAsset
 			// 查询分发资源
 			if (IsDeliveryPackageBundle(packageBundle))
 			{
-				DeliveryFileInfo deliveryFileInfo = GetDeiveryFileInfo(packageBundle);
-				BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromDelivery, deliveryFileInfo.DeliveryFilePath, deliveryFileInfo.DeliveryFileOffset);
+				string deliveryFilePath = _deliveryQueryServices.GetFilePath(PackageName, packageBundle.FileName);
+				BundleInfo bundleInfo = new BundleInfo(_assist, packageBundle, BundleInfo.ELoadMode.LoadFromDelivery, deliveryFilePath);
 				return bundleInfo;
 			}
 
 			// 查询沙盒资源
 			if (IsCachedPackageBundle(packageBundle))
 			{
-				BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromCache);
+				BundleInfo bundleInfo = new BundleInfo(_assist, packageBundle, BundleInfo.ELoadMode.LoadFromCache);
 				return bundleInfo;
 			}
 
 			// 查询APP资源
 			if (IsBuildinPackageBundle(packageBundle))
 			{
-				BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromStreaming);
+				BundleInfo bundleInfo = new BundleInfo(_assist, packageBundle, BundleInfo.ELoadMode.LoadFromStreaming);
 				return bundleInfo;
 			}
 
 			// 从服务端下载
 			return ConvertToDownloadInfo(packageBundle);
 		}
-		BundleInfo IBundleServices.GetBundleInfo(AssetInfo assetInfo)
+		BundleInfo IBundleQuery.GetMainBundleInfo(AssetInfo assetInfo)
 		{
 			if (assetInfo.IsInvalid)
 				throw new Exception("Should never get here !");
@@ -326,7 +337,7 @@ namespace YooAsset
 			var packageBundle = _activeManifest.GetMainPackageBundle(assetInfo.AssetPath);
 			return CreateBundleInfo(packageBundle);
 		}
-		BundleInfo[] IBundleServices.GetAllDependBundleInfos(AssetInfo assetInfo)
+		BundleInfo[] IBundleQuery.GetAllDependBundleInfos(AssetInfo assetInfo)
 		{
 			if (assetInfo.IsInvalid)
 				throw new Exception("Should never get here !");
@@ -341,11 +352,7 @@ namespace YooAsset
 			}
 			return result.ToArray();
 		}
-		string IBundleServices.GetBundleName(int bundleID)
-		{
-			return _activeManifest.GetBundleName(bundleID);
-		}
-		bool IBundleServices.IsServicesValid()
+		bool IBundleQuery.ManifestValid()
 		{
 			return _activeManifest != null;
 		}
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PlayMode/HostPlayModeImpl.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/HostPlayModeImpl.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/PlayMode/HostPlayModeImpl.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/PlayMode/HostPlayModeImpl.cs.meta
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PlayMode/OfflinePlayModeImpl.cs b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/OfflinePlayModeImpl.cs
similarity index 50%
rename from Assets/YooAsset/Runtime/PackageSystem/PlayMode/OfflinePlayModeImpl.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/PlayMode/OfflinePlayModeImpl.cs
index fc2cdb3..731abb7 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/PlayMode/OfflinePlayModeImpl.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/OfflinePlayModeImpl.cs
@@ -4,24 +4,43 @@ using System.Collections.Generic;
 
 namespace YooAsset
 {
-	internal class OfflinePlayModeImpl : IPlayModeServices, IBundleServices
+	internal class OfflinePlayModeImpl : IPlayMode, IBundleQuery
 	{
 		private PackageManifest _activeManifest;
+		private ResourceAssist _assist;
+		
+		public readonly string PackageName;
+		public PersistentManager Persistent
+		{
+			get { return _assist.Persistent; }
+		}
+		public CacheManager Cache
+		{
+			get { return _assist.Cache; }
+		}
+
+
+		public OfflinePlayModeImpl(string packageName)
+		{
+			PackageName = packageName;
+		}
 
 		/// <summary>
 		/// 异步初始化
 		/// </summary>
-		public InitializationOperation InitializeAsync(string packageName)
+		public InitializationOperation InitializeAsync(ResourceAssist assist)
 		{
-			var operation = new OfflinePlayModeInitializationOperation(this, packageName);
-			OperationSystem.StartOperation(operation);
+			_assist = assist;
+
+			var operation = new OfflinePlayModeInitializationOperation(this);
+			OperationSystem.StartOperation(PackageName, operation);
 			return operation;
 		}
 
 		// 查询相关
 		private bool IsCachedPackageBundle(PackageBundle packageBundle)
 		{
-			return CacheSystem.IsCached(packageBundle.PackageName, packageBundle.CacheGUID);
+			return _assist.Cache.IsCached(packageBundle.CacheGUID);
 		}
 
 		#region IPlayModeServices接口
@@ -40,42 +59,42 @@ namespace YooAsset
 		{
 		}
 
-		UpdatePackageVersionOperation IPlayModeServices.UpdatePackageVersionAsync(bool appendTimeTicks, int timeout)
+		UpdatePackageVersionOperation IPlayMode.UpdatePackageVersionAsync(bool appendTimeTicks, int timeout)
 		{
 			var operation = new OfflinePlayModeUpdatePackageVersionOperation();
-			OperationSystem.StartOperation(operation);
+			OperationSystem.StartOperation(PackageName, operation);
 			return operation;
 		}
-		UpdatePackageManifestOperation IPlayModeServices.UpdatePackageManifestAsync(string packageVersion, bool autoSaveVersion, int timeout)
+		UpdatePackageManifestOperation IPlayMode.UpdatePackageManifestAsync(string packageVersion, bool autoSaveVersion, int timeout)
 		{
 			var operation = new OfflinePlayModeUpdatePackageManifestOperation();
-			OperationSystem.StartOperation(operation);
+			OperationSystem.StartOperation(PackageName, operation);
 			return operation;
 		}
-		PreDownloadContentOperation IPlayModeServices.PreDownloadContentAsync(string packageVersion, int timeout)
+		PreDownloadContentOperation IPlayMode.PreDownloadContentAsync(string packageVersion, int timeout)
 		{
-			var operation = new OfflinePlayModePreDownloadContentOperation();
-			OperationSystem.StartOperation(operation);
+			var operation = new OfflinePlayModePreDownloadContentOperation(this);
+			OperationSystem.StartOperation(PackageName, operation);
 			return operation;
 		}
 
-		ResourceDownloaderOperation IPlayModeServices.CreateResourceDownloaderByAll(int downloadingMaxNumber, int failedTryAgain, int timeout)
+		ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByAll(int downloadingMaxNumber, int failedTryAgain, int timeout)
 		{
-			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+			return ResourceDownloaderOperation.CreateEmptyDownloader(PackageName, downloadingMaxNumber, failedTryAgain, timeout);
 		}
-		ResourceDownloaderOperation IPlayModeServices.CreateResourceDownloaderByTags(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout)
+		ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByTags(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout)
 		{
-			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+			return ResourceDownloaderOperation.CreateEmptyDownloader(PackageName, downloadingMaxNumber, failedTryAgain, timeout);
 		}
-		ResourceDownloaderOperation IPlayModeServices.CreateResourceDownloaderByPaths(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain, int timeout)
+		ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByPaths(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain, int timeout)
 		{
-			return ResourceDownloaderOperation.CreateEmptyDownloader(downloadingMaxNumber, failedTryAgain, timeout);
+			return ResourceDownloaderOperation.CreateEmptyDownloader(PackageName, downloadingMaxNumber, failedTryAgain, timeout);
 		}
 
-		ResourceUnpackerOperation IPlayModeServices.CreateResourceUnpackerByAll(int upackingMaxNumber, int failedTryAgain, int timeout)
+		ResourceUnpackerOperation IPlayMode.CreateResourceUnpackerByAll(int upackingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> unpcakList = GetUnpackListByAll(_activeManifest);
-			var operation = new ResourceUnpackerOperation(unpcakList, upackingMaxNumber, failedTryAgain, timeout);
+			var operation = new ResourceUnpackerOperation(PackageName, unpcakList, upackingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		private List<BundleInfo> GetUnpackListByAll(PackageManifest manifest)
@@ -90,13 +109,13 @@ namespace YooAsset
 				downloadList.Add(packageBundle);
 			}
 
-			return ManifestTools.ConvertToUnpackInfos(downloadList);
+			return BundleInfo.ConvertToUnpackInfos(_assist, downloadList);
 		}
 
-		ResourceUnpackerOperation IPlayModeServices.CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain, int timeout)
+		ResourceUnpackerOperation IPlayMode.CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain, int timeout)
 		{
 			List<BundleInfo> unpcakList = GetUnpackListByTags(_activeManifest, tags);
-			var operation = new ResourceUnpackerOperation(unpcakList, upackingMaxNumber, failedTryAgain, timeout);
+			var operation = new ResourceUnpackerOperation(PackageName, unpcakList, upackingMaxNumber, failedTryAgain, timeout);
 			return operation;
 		}
 		private List<BundleInfo> GetUnpackListByTags(PackageManifest manifest, string[] tags)
@@ -115,30 +134,30 @@ namespace YooAsset
 				}
 			}
 
-			return ManifestTools.ConvertToUnpackInfos(downloadList);
+			return BundleInfo.ConvertToUnpackInfos(_assist, downloadList);
 		}
 		#endregion
 
-		#region IBundleServices接口
+		#region IBundleQuery接口
 		private BundleInfo CreateBundleInfo(PackageBundle packageBundle)
 		{
 			if (packageBundle == null)
 				throw new Exception("Should never get here !");
 
 			// 查询沙盒资源
-			if (CacheSystem.IsCached(packageBundle.PackageName, packageBundle.CacheGUID))
+			if (IsCachedPackageBundle(packageBundle))
 			{
-				BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromCache);
+				BundleInfo bundleInfo = new BundleInfo(_assist, packageBundle, BundleInfo.ELoadMode.LoadFromCache);
 				return bundleInfo;
 			}
 
 			// 查询APP资源
 			{
-				BundleInfo bundleInfo = new BundleInfo(packageBundle, BundleInfo.ELoadMode.LoadFromStreaming);
+				BundleInfo bundleInfo = new BundleInfo(_assist, packageBundle, BundleInfo.ELoadMode.LoadFromStreaming);
 				return bundleInfo;
 			}
 		}
-		BundleInfo IBundleServices.GetBundleInfo(AssetInfo assetInfo)
+		BundleInfo IBundleQuery.GetMainBundleInfo(AssetInfo assetInfo)
 		{
 			if (assetInfo.IsInvalid)
 				throw new Exception("Should never get here !");
@@ -147,7 +166,7 @@ namespace YooAsset
 			var packageBundle = _activeManifest.GetMainPackageBundle(assetInfo.AssetPath);
 			return CreateBundleInfo(packageBundle);
 		}
-		BundleInfo[] IBundleServices.GetAllDependBundleInfos(AssetInfo assetInfo)
+		BundleInfo[] IBundleQuery.GetAllDependBundleInfos(AssetInfo assetInfo)
 		{
 			if (assetInfo.IsInvalid)
 				throw new Exception("Should never get here !");
@@ -162,11 +181,7 @@ namespace YooAsset
 			}
 			return result.ToArray();
 		}
-		string IBundleServices.GetBundleName(int bundleID)
-		{
-			return _activeManifest.GetBundleName(bundleID);
-		}
-		bool IBundleServices.IsServicesValid()
+		bool IBundleQuery.ManifestValid()
 		{
 			return _activeManifest != null;
 		}
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PlayMode/OfflinePlayModeImpl.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/OfflinePlayModeImpl.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/PlayMode/OfflinePlayModeImpl.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/PlayMode/OfflinePlayModeImpl.cs.meta
diff --git a/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/WebPlayModeImpl.cs b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/WebPlayModeImpl.cs
new file mode 100644
index 0000000..7e66515
--- /dev/null
+++ b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/WebPlayModeImpl.cs
@@ -0,0 +1,163 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace YooAsset
+{
+	internal class WebPlayModeImpl : IPlayMode, IBundleQuery
+	{
+		private PackageManifest _activeManifest;
+		private ResourceAssist _assist;
+		private IBuildinQueryServices _buildinQueryServices;
+		private IRemoteServices _remoteServices;
+
+		public readonly string PackageName;
+		public PersistentManager Persistent
+		{
+			get { return _assist.Persistent; }
+		}
+		public IRemoteServices RemoteServices
+		{
+			get { return _remoteServices; }
+		}
+
+
+		public WebPlayModeImpl(string packageName)
+		{
+			PackageName = packageName;
+		}
+
+		/// <summary>
+		/// 异步初始化
+		/// </summary>
+		public InitializationOperation InitializeAsync(ResourceAssist assist, IBuildinQueryServices buildinQueryServices, IRemoteServices remoteServices)
+		{
+			_assist = assist;
+			_buildinQueryServices = buildinQueryServices;
+			_remoteServices = remoteServices;
+
+			var operation = new WebPlayModeInitializationOperation(this);
+			OperationSystem.StartOperation(PackageName, operation);
+			return operation;
+		}
+
+		// 下载相关
+		private BundleInfo ConvertToDownloadInfo(PackageBundle packageBundle)
+		{
+			string remoteMainURL = _remoteServices.GetRemoteMainURL(packageBundle.FileName);
+			string remoteFallbackURL = _remoteServices.GetRemoteFallbackURL(packageBundle.FileName);
+			BundleInfo bundleInfo = new BundleInfo(_assist, packageBundle, BundleInfo.ELoadMode.LoadFromRemote, remoteMainURL, remoteFallbackURL);
+			return bundleInfo;
+		}
+
+		// 查询相关
+		private bool IsBuildinPackageBundle(PackageBundle packageBundle)
+		{
+			return _buildinQueryServices.Query(PackageName, packageBundle.FileName);
+		}
+
+		#region IPlayModeServices接口
+		public PackageManifest ActiveManifest
+		{
+			set
+			{
+				_activeManifest = value;
+			}
+			get
+			{
+				return _activeManifest;
+			}
+		}
+		public void FlushManifestVersionFile()
+		{
+		}
+
+		UpdatePackageVersionOperation IPlayMode.UpdatePackageVersionAsync(bool appendTimeTicks, int timeout)
+		{
+			var operation = new WebPlayModeUpdatePackageVersionOperation(this, appendTimeTicks, timeout);
+			OperationSystem.StartOperation(PackageName, operation);
+			return operation;
+		}
+		UpdatePackageManifestOperation IPlayMode.UpdatePackageManifestAsync(string packageVersion, bool autoSaveVersion, int timeout)
+		{
+			var operation = new WebPlayModeUpdatePackageManifestOperation(this, packageVersion, timeout);
+			OperationSystem.StartOperation(PackageName, operation);
+			return operation;
+		}
+		PreDownloadContentOperation IPlayMode.PreDownloadContentAsync(string packageVersion, int timeout)
+		{
+			var operation = new WebPlayModePreDownloadContentOperation(this);
+			OperationSystem.StartOperation(PackageName, operation);
+			return operation;
+		}
+
+		ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByAll(int downloadingMaxNumber, int failedTryAgain, int timeout)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByTags(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+		ResourceDownloaderOperation IPlayMode.CreateResourceDownloaderByPaths(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain, int timeout)
+		{
+			return ResourceDownloaderOperation.CreateEmptyDownloader(PackageName, downloadingMaxNumber, failedTryAgain, timeout);
+		}
+
+		ResourceUnpackerOperation IPlayMode.CreateResourceUnpackerByAll(int upackingMaxNumber, int failedTryAgain, int timeout)
+		{
+			return ResourceUnpackerOperation.CreateEmptyUnpacker(PackageName, upackingMaxNumber, failedTryAgain, timeout);
+		}
+		ResourceUnpackerOperation IPlayMode.CreateResourceUnpackerByTags(string[] tags, int upackingMaxNumber, int failedTryAgain, int timeout)
+		{
+			return ResourceUnpackerOperation.CreateEmptyUnpacker(PackageName, upackingMaxNumber, failedTryAgain, timeout);
+		}
+		#endregion
+
+		#region IBundleQuery接口
+		private BundleInfo CreateBundleInfo(PackageBundle packageBundle)
+		{
+			if (packageBundle == null)
+				throw new Exception("Should never get here !");
+
+			// 查询APP资源
+			if (IsBuildinPackageBundle(packageBundle))
+			{
+				BundleInfo bundleInfo = new BundleInfo(_assist, packageBundle, BundleInfo.ELoadMode.LoadFromStreaming);
+				return bundleInfo;
+			}
+
+			// 从服务端下载
+			return ConvertToDownloadInfo(packageBundle);
+		}
+		BundleInfo IBundleQuery.GetMainBundleInfo(AssetInfo assetInfo)
+		{
+			if (assetInfo.IsInvalid)
+				throw new Exception("Should never get here !");
+
+			// 注意：如果清单里未找到资源包会抛出异常！
+			var packageBundle = _activeManifest.GetMainPackageBundle(assetInfo.AssetPath);
+			return CreateBundleInfo(packageBundle);
+		}
+		BundleInfo[] IBundleQuery.GetAllDependBundleInfos(AssetInfo assetInfo)
+		{
+			if (assetInfo.IsInvalid)
+				throw new Exception("Should never get here !");
+
+			// 注意：如果清单里未找到资源包会抛出异常！
+			var depends = _activeManifest.GetAllDependencies(assetInfo.AssetPath);
+			List<BundleInfo> result = new List<BundleInfo>(depends.Length);
+			foreach (var packageBundle in depends)
+			{
+				BundleInfo bundleInfo = CreateBundleInfo(packageBundle);
+				result.Add(bundleInfo);
+			}
+			return result.ToArray();
+		}
+		bool IBundleQuery.ManifestValid()
+		{
+			return _activeManifest != null;
+		}
+		#endregion
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/PackageSystem/PlayMode/WebPlayModeImpl.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/PlayMode/WebPlayModeImpl.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/PlayMode/WebPlayModeImpl.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/PlayMode/WebPlayModeImpl.cs.meta
diff --git a/Assets/YooAsset/Runtime/ResourcePackage/ResourceAssist.cs b/Assets/YooAsset/Runtime/ResourcePackage/ResourceAssist.cs
new file mode 100644
index 0000000..1da4b5a
--- /dev/null
+++ b/Assets/YooAsset/Runtime/ResourcePackage/ResourceAssist.cs
@@ -0,0 +1,11 @@
+
+namespace YooAsset
+{
+	internal class ResourceAssist
+	{
+		public CacheManager Cache { set; get; }
+		public PersistentManager Persistent { set; get; }
+		public DownloadManager Download { set; get; }
+		public ResourceLoader Loader { set; get; }
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/ResourcePackage/ResourceAssist.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/ResourceAssist.cs.meta
new file mode 100644
index 0000000..0e93272
--- /dev/null
+++ b/Assets/YooAsset/Runtime/ResourcePackage/ResourceAssist.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 395d187f862588340b6fe7c437f477ec
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Runtime/PackageSystem/ResourcePackage.cs b/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs
similarity index 72%
rename from Assets/YooAsset/Runtime/PackageSystem/ResourcePackage.cs
rename to Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs
index c54a235..5025561 100644
--- a/Assets/YooAsset/Runtime/PackageSystem/ResourcePackage.cs
+++ b/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs
@@ -12,14 +12,20 @@ namespace YooAsset
 		private string _initializeError = string.Empty;
 		private EOperationStatus _initializeStatus = EOperationStatus.None;
 		private EPlayMode _playMode;
-		private IBundleServices _bundleServices;
-		private IPlayModeServices _playModeServices;
-		private AssetSystemImpl _assetSystemImpl;
+
+		// 管理器
+		private CacheManager _cacheMgr;
+		private PersistentManager _persistentMgr;
+		private DownloadManager _downloadMgr;
+		private ResourceManager _resourceMgr;
+		private ResourceLoader _resourceLoader;
+		private IBundleQuery _bundleQuery;
+		private IPlayMode _playModeImpl;
 
 		/// <summary>
 		/// 包裹名
 		/// </summary>
-		public string PackageName { private set; get; }
+		public readonly string PackageName;
 
 		/// <summary>
 		/// 初始化状态
@@ -43,8 +49,11 @@ namespace YooAsset
 		/// </summary>
 		internal void UpdatePackage()
 		{
-			if (_assetSystemImpl != null)
-				_assetSystemImpl.Update();
+			if (_resourceMgr != null)
+				_resourceMgr.Update();
+
+			if (_downloadMgr != null)
+				_downloadMgr.Update();
 		}
 
 		/// <summary>
@@ -57,14 +66,33 @@ namespace YooAsset
 				_isInitialize = false;
 				_initializeError = string.Empty;
 				_initializeStatus = EOperationStatus.None;
-				_bundleServices = null;
-				_playModeServices = null;
 
-				if (_assetSystemImpl != null)
+				_bundleQuery = null;
+				_playModeImpl = null;
+				_persistentMgr = null;
+				_resourceLoader = null;
+
+				if (_resourceMgr != null)
 				{
-					_assetSystemImpl.ForceUnloadAllAssets();
-					_assetSystemImpl = null;
+					_resourceMgr.ForceUnloadAllAssets();
+					_resourceMgr = null;
 				}
+
+				if (_downloadMgr != null)
+				{
+					_downloadMgr.DestroyAll();
+					_downloadMgr = null;
+				}
+
+				if (_cacheMgr != null)
+				{
+					_cacheMgr.ClearAll();
+					_cacheMgr = null;
+				}
+
+				// 最后清理该包裹的异步任务
+				// 注意：对于有线程操作的异步任务，需要保证线程安全释放。
+				OperationSystem.ClearPackageOperation(PackageName);
 			}
 		}
 
@@ -79,69 +107,84 @@ namespace YooAsset
 			// 检测初始化参数合法性
 			CheckInitializeParameters(parameters);
 
-			// 重写持久化根目录
-			var persistent = PersistentTools.GetOrCreatePersistent(PackageName);
-			persistent.OverwriteRootDirectory(parameters.BuildinRootDirectory, parameters.SandboxRootDirectory);
+			// 创建缓存管理器
+			_cacheMgr = new CacheManager(PackageName, parameters.CacheBootVerifyLevel);
 
-			// 初始化资源系统
+			// 创建持久化管理器
+			_persistentMgr = new PersistentManager(PackageName);
+			_persistentMgr.Initialize(parameters.BuildinRootDirectory, parameters.SandboxRootDirectory, parameters.CacheFileAppendExtension);
+
+			// 创建下载管理器
+			_downloadMgr = new DownloadManager(PackageName);
+			_downloadMgr.Initialize(parameters.BreakpointResumeFileSize);
+
+			// 创建资源包加载器
+			if (_playMode == EPlayMode.HostPlayMode)
+			{
+				var initializeParameters = parameters as HostPlayModeParameters;
+				_resourceLoader = new ResourceLoader();
+				_resourceLoader.Init(parameters.DecryptionServices, initializeParameters.DeliveryLoadServices);
+			}
+			else
+			{
+				_resourceLoader = new ResourceLoader();
+				_resourceLoader.Init(parameters.DecryptionServices, null);
+			}
+
+			// 创建资源协助类
+			ResourceAssist assist = new ResourceAssist();
+			assist.Cache = _cacheMgr;
+			assist.Persistent = _persistentMgr;
+			assist.Download = _downloadMgr;
+			assist.Loader = _resourceLoader;
+
+			// 创建资源管理器
 			InitializationOperation initializeOperation;
-			_assetSystemImpl = new AssetSystemImpl();
+			_resourceMgr = new ResourceManager(PackageName);
 			if (_playMode == EPlayMode.EditorSimulateMode)
 			{
-				var editorSimulateModeImpl = new EditorSimulateModeImpl();
-				_bundleServices = editorSimulateModeImpl;
-				_playModeServices = editorSimulateModeImpl;
-				_assetSystemImpl.Initialize(PackageName, true,
-					parameters.LoadingMaxTimeSlice, parameters.DownloadFailedTryAgain,
-					parameters.DecryptionServices, _bundleServices);
+				var editorSimulateModeImpl = new EditorSimulateModeImpl(PackageName);
+				_bundleQuery = editorSimulateModeImpl;
+				_playModeImpl = editorSimulateModeImpl;
+				_resourceMgr.Initialize(true, parameters.LoadingMaxTimeSlice, _bundleQuery);
 
 				var initializeParameters = parameters as EditorSimulateModeParameters;
-				initializeOperation = editorSimulateModeImpl.InitializeAsync(initializeParameters.SimulateManifestFilePath);
+				initializeOperation = editorSimulateModeImpl.InitializeAsync(assist, initializeParameters.SimulateManifestFilePath);
 			}
 			else if (_playMode == EPlayMode.OfflinePlayMode)
 			{
-				var offlinePlayModeImpl = new OfflinePlayModeImpl();
-				_bundleServices = offlinePlayModeImpl;
-				_playModeServices = offlinePlayModeImpl;
-				_assetSystemImpl.Initialize(PackageName, false,
-					parameters.LoadingMaxTimeSlice, parameters.DownloadFailedTryAgain,
-					parameters.DecryptionServices, _bundleServices);
+				var offlinePlayModeImpl = new OfflinePlayModeImpl(PackageName);
+				_bundleQuery = offlinePlayModeImpl;
+				_playModeImpl = offlinePlayModeImpl;
+				_resourceMgr.Initialize(false, parameters.LoadingMaxTimeSlice, _bundleQuery);
 
 				var initializeParameters = parameters as OfflinePlayModeParameters;
-				initializeOperation = offlinePlayModeImpl.InitializeAsync(PackageName);
+				initializeOperation = offlinePlayModeImpl.InitializeAsync(assist);
 			}
 			else if (_playMode == EPlayMode.HostPlayMode)
 			{
-				var hostPlayModeImpl = new HostPlayModeImpl();
-				_bundleServices = hostPlayModeImpl;
-				_playModeServices = hostPlayModeImpl;
-				_assetSystemImpl.Initialize(PackageName, false,
-					parameters.LoadingMaxTimeSlice, parameters.DownloadFailedTryAgain,
-					parameters.DecryptionServices, _bundleServices);
+				var hostPlayModeImpl = new HostPlayModeImpl(PackageName);
+				_bundleQuery = hostPlayModeImpl;
+				_playModeImpl = hostPlayModeImpl;
+				_resourceMgr.Initialize(false, parameters.LoadingMaxTimeSlice, _bundleQuery);
 
 				var initializeParameters = parameters as HostPlayModeParameters;
-				initializeOperation = hostPlayModeImpl.InitializeAsync(
-					PackageName,
+				initializeOperation = hostPlayModeImpl.InitializeAsync(assist,
 					initializeParameters.BuildinQueryServices,
 					initializeParameters.DeliveryQueryServices,
-					initializeParameters.RemoteServices
-					);
+					initializeParameters.RemoteServices);
 			}
 			else if (_playMode == EPlayMode.WebPlayMode)
 			{
-				var webPlayModeImpl = new WebPlayModeImpl();
-				_bundleServices = webPlayModeImpl;
-				_playModeServices = webPlayModeImpl;
-				_assetSystemImpl.Initialize(PackageName, false,
-					parameters.LoadingMaxTimeSlice, parameters.DownloadFailedTryAgain,
-					parameters.DecryptionServices, _bundleServices);
+				var webPlayModeImpl = new WebPlayModeImpl(PackageName);
+				_bundleQuery = webPlayModeImpl;
+				_playModeImpl = webPlayModeImpl;
+				_resourceMgr.Initialize(false, parameters.LoadingMaxTimeSlice, _bundleQuery);
 
 				var initializeParameters = parameters as WebPlayModeParameters;
-				initializeOperation = webPlayModeImpl.InitializeAsync(
-					PackageName,
+				initializeOperation = webPlayModeImpl.InitializeAsync(assist,
 					initializeParameters.BuildinQueryServices,
-					initializeParameters.RemoteServices
-					);
+					initializeParameters.RemoteServices);
 			}
 			else
 			{
@@ -160,9 +203,6 @@ namespace YooAsset
 				_isInitialize = false;
 				_initializeStatus = EOperationStatus.None;
 				_initializeError = string.Empty;
-				_bundleServices = null;
-				_playModeServices = null;
-				_assetSystemImpl = null;
 			}
 		}
 		private void CheckInitializeParameters(InitializeParameters parameters)
@@ -188,12 +228,15 @@ namespace YooAsset
 			if (parameters is HostPlayModeParameters)
 			{
 				var hostPlayModeParameters = parameters as HostPlayModeParameters;
-				if (hostPlayModeParameters.BuildinQueryServices == null)
-					throw new Exception($"{nameof(IBuildinQueryServices)} is null.");
-				if (hostPlayModeParameters.DeliveryQueryServices == null)
-					throw new Exception($"{nameof(IDeliveryQueryServices)} is null.");
 				if (hostPlayModeParameters.RemoteServices == null)
 					throw new Exception($"{nameof(IRemoteServices)} is null.");
+				if (hostPlayModeParameters.BuildinQueryServices == null)
+					throw new Exception($"{nameof(IBuildinQueryServices)} is null.");
+				if (hostPlayModeParameters.DeliveryQueryServices != null)
+				{
+					if (hostPlayModeParameters.DeliveryLoadServices == null)
+						throw new Exception($"{nameof(IDeliveryLoadServices)} is null.");
+				}
 			}
 
 			// 鉴定运行模式
@@ -230,11 +273,6 @@ namespace YooAsset
 				parameters.LoadingMaxTimeSlice = 10;
 				YooLogger.Warning($"{nameof(parameters.LoadingMaxTimeSlice)} minimum value is 10 milliseconds.");
 			}
-			if (parameters.DownloadFailedTryAgain < 1)
-			{
-				parameters.DownloadFailedTryAgain = 1;
-				YooLogger.Warning($"{nameof(parameters.DownloadFailedTryAgain)} minimum value is 1");
-			}
 		}
 		private void InitializeOperation_Completed(AsyncOperationBase op)
 		{
@@ -250,7 +288,7 @@ namespace YooAsset
 		public UpdatePackageVersionOperation UpdatePackageVersionAsync(bool appendTimeTicks = true, int timeout = 60)
 		{
 			DebugCheckInitialize(false);
-			return _playModeServices.UpdatePackageVersionAsync(appendTimeTicks, timeout);
+			return _playModeImpl.UpdatePackageVersionAsync(appendTimeTicks, timeout);
 		}
 
 		/// <summary>
@@ -263,7 +301,7 @@ namespace YooAsset
 		{
 			DebugCheckInitialize(false);
 			DebugCheckUpdateManifest();
-			return _playModeServices.UpdatePackageManifestAsync(packageVersion, autoSaveVersion, timeout);
+			return _playModeImpl.UpdatePackageManifestAsync(packageVersion, autoSaveVersion, timeout);
 		}
 
 		/// <summary>
@@ -274,7 +312,7 @@ namespace YooAsset
 		public PreDownloadContentOperation PreDownloadContentAsync(string packageVersion, int timeout = 60)
 		{
 			DebugCheckInitialize(false);
-			return _playModeServices.PreDownloadContentAsync(packageVersion, timeout);
+			return _playModeImpl.PreDownloadContentAsync(packageVersion, timeout);
 		}
 
 		/// <summary>
@@ -283,8 +321,8 @@ namespace YooAsset
 		public ClearUnusedCacheFilesOperation ClearUnusedCacheFilesAsync()
 		{
 			DebugCheckInitialize();
-			var operation = new ClearUnusedCacheFilesOperation(this);
-			OperationSystem.StartOperation(operation);
+			var operation = new ClearUnusedCacheFilesOperation(this, _cacheMgr);
+			OperationSystem.StartOperation(PackageName, operation);
 			return operation;
 		}
 
@@ -294,8 +332,8 @@ namespace YooAsset
 		public ClearAllCacheFilesOperation ClearAllCacheFilesAsync()
 		{
 			DebugCheckInitialize();
-			var operation = new ClearAllCacheFilesOperation(this);
-			OperationSystem.StartOperation(operation);
+			var operation = new ClearAllCacheFilesOperation(_cacheMgr);
+			OperationSystem.StartOperation(PackageName, operation);
 			return operation;
 		}
 
@@ -305,7 +343,7 @@ namespace YooAsset
 		public string GetPackageVersion()
 		{
 			DebugCheckInitialize();
-			return _playModeServices.ActiveManifest.PackageVersion;
+			return _playModeImpl.ActiveManifest.PackageVersion;
 		}
 
 		/// <summary>
@@ -314,8 +352,8 @@ namespace YooAsset
 		public void UnloadUnusedAssets()
 		{
 			DebugCheckInitialize();
-			_assetSystemImpl.Update();
-			_assetSystemImpl.UnloadUnusedAssets();
+			_resourceMgr.Update();
+			_resourceMgr.UnloadUnusedAssets();
 		}
 
 		/// <summary>
@@ -324,7 +362,7 @@ namespace YooAsset
 		public void ForceUnloadAllAssets()
 		{
 			DebugCheckInitialize();
-			_assetSystemImpl.ForceUnloadAllAssets();
+			_resourceMgr.ForceUnloadAllAssets();
 		}
 
 		#region 沙盒相关
@@ -334,8 +372,7 @@ namespace YooAsset
 		public string GetPackageBuildinRootDirectory()
 		{
 			DebugCheckInitialize();
-			var persistent = PersistentTools.GetPersistent(PackageName);
-			return persistent.BuildinRoot;
+			return _persistentMgr.BuildinRoot;
 		}
 
 		/// <summary>
@@ -344,8 +381,7 @@ namespace YooAsset
 		public string GetPackageSandboxRootDirectory()
 		{
 			DebugCheckInitialize();
-			var persistent = PersistentTools.GetPersistent(PackageName);
-			return persistent.SandboxRoot;
+			return _persistentMgr.SandboxRoot;
 		}
 
 		/// <summary>
@@ -354,8 +390,8 @@ namespace YooAsset
 		public void ClearPackageSandbox()
 		{
 			DebugCheckInitialize();
-			var persistent = PersistentTools.GetPersistent(PackageName);
-			persistent.DeleteSandboxPackageFolder();
+			_persistentMgr.DeleteSandboxPackageFolder();
+			_cacheMgr.ClearAll();
 		}
 		#endregion
 
@@ -374,7 +410,7 @@ namespace YooAsset
 				return false;
 			}
 
-			BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
+			BundleInfo bundleInfo = _bundleQuery.GetMainBundleInfo(assetInfo);
 			if (bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
 				return true;
 			else
@@ -394,7 +430,7 @@ namespace YooAsset
 				return false;
 			}
 
-			BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
+			BundleInfo bundleInfo = _bundleQuery.GetMainBundleInfo(assetInfo);
 			if (bundleInfo.LoadMode == BundleInfo.ELoadMode.LoadFromRemote)
 				return true;
 			else
@@ -409,7 +445,7 @@ namespace YooAsset
 		{
 			DebugCheckInitialize();
 			string[] tags = new string[] { tag };
-			return _playModeServices.ActiveManifest.GetAssetsInfoByTags(tags);
+			return _playModeImpl.ActiveManifest.GetAssetsInfoByTags(tags);
 		}
 
 		/// <summary>
@@ -419,7 +455,7 @@ namespace YooAsset
 		public AssetInfo[] GetAssetInfos(string[] tags)
 		{
 			DebugCheckInitialize();
-			return _playModeServices.ActiveManifest.GetAssetsInfoByTags(tags);
+			return _playModeImpl.ActiveManifest.GetAssetsInfoByTags(tags);
 		}
 
 		/// <summary>
@@ -449,7 +485,7 @@ namespace YooAsset
 		public bool CheckLocationValid(string location)
 		{
 			DebugCheckInitialize();
-			string assetPath = _playModeServices.ActiveManifest.TryMappingToAssetPath(location);
+			string assetPath = _playModeImpl.ActiveManifest.TryMappingToAssetPath(location);
 			return string.IsNullOrEmpty(assetPath) == false;
 		}
 		#endregion
@@ -459,7 +495,7 @@ namespace YooAsset
 		/// 同步加载原生文件
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public RawFileOperationHandle LoadRawFileSync(AssetInfo assetInfo)
+		public RawFileHandle LoadRawFileSync(AssetInfo assetInfo)
 		{
 			DebugCheckInitialize();
 			return LoadRawFileInternal(assetInfo, true);
@@ -469,7 +505,7 @@ namespace YooAsset
 		/// 同步加载原生文件
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
-		public RawFileOperationHandle LoadRawFileSync(string location)
+		public RawFileHandle LoadRawFileSync(string location)
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
@@ -480,7 +516,7 @@ namespace YooAsset
 		/// 异步加载原生文件
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public RawFileOperationHandle LoadRawFileAsync(AssetInfo assetInfo)
+		public RawFileHandle LoadRawFileAsync(AssetInfo assetInfo)
 		{
 			DebugCheckInitialize();
 			return LoadRawFileInternal(assetInfo, false);
@@ -490,7 +526,7 @@ namespace YooAsset
 		/// 异步加载原生文件
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
-		public RawFileOperationHandle LoadRawFileAsync(string location)
+		public RawFileHandle LoadRawFileAsync(string location)
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
@@ -498,18 +534,10 @@ namespace YooAsset
 		}
 
 
-		private RawFileOperationHandle LoadRawFileInternal(AssetInfo assetInfo, bool waitForAsyncComplete)
+		private RawFileHandle LoadRawFileInternal(AssetInfo assetInfo, bool waitForAsyncComplete)
 		{
-#if UNITY_EDITOR
-			if (assetInfo.IsInvalid == false)
-			{
-				BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
-				if (bundleInfo.Bundle.IsRawFile == false)
-					throw new Exception($"Cannot load asset bundle file using {nameof(LoadRawFileAsync)} method !");
-			}
-#endif
-
-			var handle = _assetSystemImpl.LoadRawFileAsync(assetInfo);
+			DebugCheckRawFileLoadMethod(nameof(LoadRawFileAsync));
+			var handle = _resourceMgr.LoadRawFileAsync(assetInfo);
 			if (waitForAsyncComplete)
 				handle.WaitForAsyncComplete();
 			return handle;
@@ -524,11 +552,11 @@ namespace YooAsset
 		/// <param name="sceneMode">场景加载模式</param>
 		/// <param name="suspendLoad">场景加载到90%自动挂起</param>
 		/// <param name="priority">优先级</param>
-		public SceneOperationHandle LoadSceneAsync(string location, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, int priority = 100)
+		public SceneHandle LoadSceneAsync(string location, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, int priority = 100)
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, null);
-			var handle = _assetSystemImpl.LoadSceneAsync(assetInfo, sceneMode, suspendLoad, priority);
+			var handle = _resourceMgr.LoadSceneAsync(assetInfo, sceneMode, suspendLoad, priority);
 			return handle;
 		}
 
@@ -539,10 +567,10 @@ namespace YooAsset
 		/// <param name="sceneMode">场景加载模式</param>
 		/// <param name="suspendLoad">场景加载到90%自动挂起</param>
 		/// <param name="priority">优先级</param>
-		public SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, int priority = 100)
+		public SceneHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, int priority = 100)
 		{
 			DebugCheckInitialize();
-			var handle = _assetSystemImpl.LoadSceneAsync(assetInfo, sceneMode, suspendLoad, priority);
+			var handle = _resourceMgr.LoadSceneAsync(assetInfo, sceneMode, suspendLoad, priority);
 			return handle;
 		}
 		#endregion
@@ -552,7 +580,7 @@ namespace YooAsset
 		/// 同步加载资源对象
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public AssetOperationHandle LoadAssetSync(AssetInfo assetInfo)
+		public AssetHandle LoadAssetSync(AssetInfo assetInfo)
 		{
 			DebugCheckInitialize();
 			return LoadAssetInternal(assetInfo, true);
@@ -563,7 +591,7 @@ namespace YooAsset
 		/// </summary>
 		/// <typeparam name="TObject">资源类型</typeparam>
 		/// <param name="location">资源的定位地址</param>
-		public AssetOperationHandle LoadAssetSync<TObject>(string location) where TObject : UnityEngine.Object
+		public AssetHandle LoadAssetSync<TObject>(string location) where TObject : UnityEngine.Object
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, typeof(TObject));
@@ -575,7 +603,7 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
 		/// <param name="type">资源类型</param>
-		public AssetOperationHandle LoadAssetSync(string location, System.Type type)
+		public AssetHandle LoadAssetSync(string location, System.Type type)
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, type);
@@ -586,7 +614,7 @@ namespace YooAsset
 		/// 同步加载资源对象
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
-		public AssetOperationHandle LoadAssetSync(string location)
+		public AssetHandle LoadAssetSync(string location)
 		{
 			DebugCheckInitialize();
 			Type type = typeof(UnityEngine.Object);
@@ -599,7 +627,7 @@ namespace YooAsset
 		/// 异步加载资源对象
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public AssetOperationHandle LoadAssetAsync(AssetInfo assetInfo)
+		public AssetHandle LoadAssetAsync(AssetInfo assetInfo)
 		{
 			DebugCheckInitialize();
 			return LoadAssetInternal(assetInfo, false);
@@ -610,7 +638,7 @@ namespace YooAsset
 		/// </summary>
 		/// <typeparam name="TObject">资源类型</typeparam>
 		/// <param name="location">资源的定位地址</param>
-		public AssetOperationHandle LoadAssetAsync<TObject>(string location) where TObject : UnityEngine.Object
+		public AssetHandle LoadAssetAsync<TObject>(string location) where TObject : UnityEngine.Object
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, typeof(TObject));
@@ -622,7 +650,7 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
 		/// <param name="type">资源类型</param>
-		public AssetOperationHandle LoadAssetAsync(string location, System.Type type)
+		public AssetHandle LoadAssetAsync(string location, System.Type type)
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, type);
@@ -633,7 +661,7 @@ namespace YooAsset
 		/// 异步加载资源对象
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
-		public AssetOperationHandle LoadAssetAsync(string location)
+		public AssetHandle LoadAssetAsync(string location)
 		{
 			DebugCheckInitialize();
 			Type type = typeof(UnityEngine.Object);
@@ -642,18 +670,10 @@ namespace YooAsset
 		}
 
 
-		private AssetOperationHandle LoadAssetInternal(AssetInfo assetInfo, bool waitForAsyncComplete)
+		private AssetHandle LoadAssetInternal(AssetInfo assetInfo, bool waitForAsyncComplete)
 		{
-#if UNITY_EDITOR
-			if (assetInfo.IsInvalid == false)
-			{
-				BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
-				if (bundleInfo.Bundle.IsRawFile)
-					throw new Exception($"Cannot load raw file using {nameof(LoadAssetAsync)} method !");
-			}
-#endif
-
-			var handle = _assetSystemImpl.LoadAssetAsync(assetInfo);
+			DebugCheckAssetLoadMethod(nameof(LoadAssetAsync));
+			var handle = _resourceMgr.LoadAssetAsync(assetInfo);
 			if (waitForAsyncComplete)
 				handle.WaitForAsyncComplete();
 			return handle;
@@ -665,7 +685,7 @@ namespace YooAsset
 		/// 同步加载子资源对象
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public SubAssetsOperationHandle LoadSubAssetsSync(AssetInfo assetInfo)
+		public SubAssetsHandle LoadSubAssetsSync(AssetInfo assetInfo)
 		{
 			DebugCheckInitialize();
 			return LoadSubAssetsInternal(assetInfo, true);
@@ -676,7 +696,7 @@ namespace YooAsset
 		/// </summary>
 		/// <typeparam name="TObject">资源类型</typeparam>
 		/// <param name="location">资源的定位地址</param>
-		public SubAssetsOperationHandle LoadSubAssetsSync<TObject>(string location) where TObject : UnityEngine.Object
+		public SubAssetsHandle LoadSubAssetsSync<TObject>(string location) where TObject : UnityEngine.Object
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, typeof(TObject));
@@ -688,7 +708,7 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
 		/// <param name="type">子对象类型</param>
-		public SubAssetsOperationHandle LoadSubAssetsSync(string location, System.Type type)
+		public SubAssetsHandle LoadSubAssetsSync(string location, System.Type type)
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, type);
@@ -699,7 +719,7 @@ namespace YooAsset
 		/// 同步加载子资源对象
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
-		public SubAssetsOperationHandle LoadSubAssetsSync(string location)
+		public SubAssetsHandle LoadSubAssetsSync(string location)
 		{
 			DebugCheckInitialize();
 			Type type = typeof(UnityEngine.Object);
@@ -712,7 +732,7 @@ namespace YooAsset
 		/// 异步加载子资源对象
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public SubAssetsOperationHandle LoadSubAssetsAsync(AssetInfo assetInfo)
+		public SubAssetsHandle LoadSubAssetsAsync(AssetInfo assetInfo)
 		{
 			DebugCheckInitialize();
 			return LoadSubAssetsInternal(assetInfo, false);
@@ -723,7 +743,7 @@ namespace YooAsset
 		/// </summary>
 		/// <typeparam name="TObject">资源类型</typeparam>
 		/// <param name="location">资源的定位地址</param>
-		public SubAssetsOperationHandle LoadSubAssetsAsync<TObject>(string location) where TObject : UnityEngine.Object
+		public SubAssetsHandle LoadSubAssetsAsync<TObject>(string location) where TObject : UnityEngine.Object
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, typeof(TObject));
@@ -735,7 +755,7 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
 		/// <param name="type">子对象类型</param>
-		public SubAssetsOperationHandle LoadSubAssetsAsync(string location, System.Type type)
+		public SubAssetsHandle LoadSubAssetsAsync(string location, System.Type type)
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, type);
@@ -746,7 +766,7 @@ namespace YooAsset
 		/// 异步加载子资源对象
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
-		public SubAssetsOperationHandle LoadSubAssetsAsync(string location)
+		public SubAssetsHandle LoadSubAssetsAsync(string location)
 		{
 			DebugCheckInitialize();
 			Type type = typeof(UnityEngine.Object);
@@ -755,18 +775,10 @@ namespace YooAsset
 		}
 
 
-		private SubAssetsOperationHandle LoadSubAssetsInternal(AssetInfo assetInfo, bool waitForAsyncComplete)
+		private SubAssetsHandle LoadSubAssetsInternal(AssetInfo assetInfo, bool waitForAsyncComplete)
 		{
-#if UNITY_EDITOR
-			if (assetInfo.IsInvalid == false)
-			{
-				BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
-				if (bundleInfo.Bundle.IsRawFile)
-					throw new Exception($"Cannot load raw file using {nameof(LoadSubAssetsAsync)} method !");
-			}
-#endif
-
-			var handle = _assetSystemImpl.LoadSubAssetsAsync(assetInfo);
+			DebugCheckAssetLoadMethod(nameof(LoadSubAssetsAsync));
+			var handle = _resourceMgr.LoadSubAssetsAsync(assetInfo);
 			if (waitForAsyncComplete)
 				handle.WaitForAsyncComplete();
 			return handle;
@@ -778,7 +790,7 @@ namespace YooAsset
 		/// 同步加载资源包内所有资源对象
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public AllAssetsOperationHandle LoadAllAssetsSync(AssetInfo assetInfo)
+		public AllAssetsHandle LoadAllAssetsSync(AssetInfo assetInfo)
 		{
 			DebugCheckInitialize();
 			return LoadAllAssetsInternal(assetInfo, true);
@@ -789,7 +801,7 @@ namespace YooAsset
 		/// </summary>
 		/// <typeparam name="TObject">资源类型</typeparam>
 		/// <param name="location">资源的定位地址</param>
-		public AllAssetsOperationHandle LoadAllAssetsSync<TObject>(string location) where TObject : UnityEngine.Object
+		public AllAssetsHandle LoadAllAssetsSync<TObject>(string location) where TObject : UnityEngine.Object
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, typeof(TObject));
@@ -801,7 +813,7 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
 		/// <param name="type">子对象类型</param>
-		public AllAssetsOperationHandle LoadAllAssetsSync(string location, System.Type type)
+		public AllAssetsHandle LoadAllAssetsSync(string location, System.Type type)
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, type);
@@ -812,7 +824,7 @@ namespace YooAsset
 		/// 同步加载资源包内所有资源对象
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
-		public AllAssetsOperationHandle LoadAllAssetsSync(string location)
+		public AllAssetsHandle LoadAllAssetsSync(string location)
 		{
 			DebugCheckInitialize();
 			Type type = typeof(UnityEngine.Object);
@@ -825,7 +837,7 @@ namespace YooAsset
 		/// 异步加载资源包内所有资源对象
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public AllAssetsOperationHandle LoadAllAssetsAsync(AssetInfo assetInfo)
+		public AllAssetsHandle LoadAllAssetsAsync(AssetInfo assetInfo)
 		{
 			DebugCheckInitialize();
 			return LoadAllAssetsInternal(assetInfo, false);
@@ -836,7 +848,7 @@ namespace YooAsset
 		/// </summary>
 		/// <typeparam name="TObject">资源类型</typeparam>
 		/// <param name="location">资源的定位地址</param>
-		public AllAssetsOperationHandle LoadAllAssetsAsync<TObject>(string location) where TObject : UnityEngine.Object
+		public AllAssetsHandle LoadAllAssetsAsync<TObject>(string location) where TObject : UnityEngine.Object
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, typeof(TObject));
@@ -848,7 +860,7 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
 		/// <param name="type">子对象类型</param>
-		public AllAssetsOperationHandle LoadAllAssetsAsync(string location, System.Type type)
+		public AllAssetsHandle LoadAllAssetsAsync(string location, System.Type type)
 		{
 			DebugCheckInitialize();
 			AssetInfo assetInfo = ConvertLocationToAssetInfo(location, type);
@@ -859,7 +871,7 @@ namespace YooAsset
 		/// 异步加载资源包内所有资源对象
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
-		public AllAssetsOperationHandle LoadAllAssetsAsync(string location)
+		public AllAssetsHandle LoadAllAssetsAsync(string location)
 		{
 			DebugCheckInitialize();
 			Type type = typeof(UnityEngine.Object);
@@ -868,18 +880,10 @@ namespace YooAsset
 		}
 
 
-		private AllAssetsOperationHandle LoadAllAssetsInternal(AssetInfo assetInfo, bool waitForAsyncComplete)
+		private AllAssetsHandle LoadAllAssetsInternal(AssetInfo assetInfo, bool waitForAsyncComplete)
 		{
-#if UNITY_EDITOR
-			if (assetInfo.IsInvalid == false)
-			{
-				BundleInfo bundleInfo = _bundleServices.GetBundleInfo(assetInfo);
-				if (bundleInfo.Bundle.IsRawFile)
-					throw new Exception($"Cannot load raw file using {nameof(LoadAllAssetsAsync)} method !");
-			}
-#endif
-
-			var handle = _assetSystemImpl.LoadAllAssetsAsync(assetInfo);
+			DebugCheckAssetLoadMethod(nameof(LoadAllAssetsAsync));
+			var handle = _resourceMgr.LoadAllAssetsAsync(assetInfo);
 			if (waitForAsyncComplete)
 				handle.WaitForAsyncComplete();
 			return handle;
@@ -896,7 +900,7 @@ namespace YooAsset
 		public ResourceDownloaderOperation CreateResourceDownloader(int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
 		{
 			DebugCheckInitialize();
-			return _playModeServices.CreateResourceDownloaderByAll(downloadingMaxNumber, failedTryAgain, timeout);
+			return _playModeImpl.CreateResourceDownloaderByAll(downloadingMaxNumber, failedTryAgain, timeout);
 		}
 
 		/// <summary>
@@ -909,7 +913,7 @@ namespace YooAsset
 		public ResourceDownloaderOperation CreateResourceDownloader(string tag, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
 		{
 			DebugCheckInitialize();
-			return _playModeServices.CreateResourceDownloaderByTags(new string[] { tag }, downloadingMaxNumber, failedTryAgain, timeout);
+			return _playModeImpl.CreateResourceDownloaderByTags(new string[] { tag }, downloadingMaxNumber, failedTryAgain, timeout);
 		}
 
 		/// <summary>
@@ -922,7 +926,7 @@ namespace YooAsset
 		public ResourceDownloaderOperation CreateResourceDownloader(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
 		{
 			DebugCheckInitialize();
-			return _playModeServices.CreateResourceDownloaderByTags(tags, downloadingMaxNumber, failedTryAgain, timeout);
+			return _playModeImpl.CreateResourceDownloaderByTags(tags, downloadingMaxNumber, failedTryAgain, timeout);
 		}
 
 		/// <summary>
@@ -937,7 +941,7 @@ namespace YooAsset
 			DebugCheckInitialize();
 			var assetInfo = ConvertLocationToAssetInfo(location, null);
 			AssetInfo[] assetInfos = new AssetInfo[] { assetInfo };
-			return _playModeServices.CreateResourceDownloaderByPaths(assetInfos, downloadingMaxNumber, failedTryAgain, timeout);
+			return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos, downloadingMaxNumber, failedTryAgain, timeout);
 		}
 
 		/// <summary>
@@ -956,7 +960,7 @@ namespace YooAsset
 				var assetInfo = ConvertLocationToAssetInfo(location, null);
 				assetInfos.Add(assetInfo);
 			}
-			return _playModeServices.CreateResourceDownloaderByPaths(assetInfos.ToArray(), downloadingMaxNumber, failedTryAgain, timeout);
+			return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos.ToArray(), downloadingMaxNumber, failedTryAgain, timeout);
 		}
 
 		/// <summary>
@@ -970,7 +974,7 @@ namespace YooAsset
 		{
 			DebugCheckInitialize();
 			AssetInfo[] assetInfos = new AssetInfo[] { assetInfo };
-			return _playModeServices.CreateResourceDownloaderByPaths(assetInfos, downloadingMaxNumber, failedTryAgain, timeout);
+			return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos, downloadingMaxNumber, failedTryAgain, timeout);
 		}
 
 		/// <summary>
@@ -983,7 +987,7 @@ namespace YooAsset
 		public ResourceDownloaderOperation CreateBundleDownloader(AssetInfo[] assetInfos, int downloadingMaxNumber, int failedTryAgain, int timeout = 60)
 		{
 			DebugCheckInitialize();
-			return _playModeServices.CreateResourceDownloaderByPaths(assetInfos, downloadingMaxNumber, failedTryAgain, timeout);
+			return _playModeImpl.CreateResourceDownloaderByPaths(assetInfos, downloadingMaxNumber, failedTryAgain, timeout);
 		}
 		#endregion
 
@@ -997,7 +1001,7 @@ namespace YooAsset
 		public ResourceUnpackerOperation CreateResourceUnpacker(string tag, int unpackingMaxNumber, int failedTryAgain)
 		{
 			DebugCheckInitialize();
-			return _playModeServices.CreateResourceUnpackerByTags(new string[] { tag }, unpackingMaxNumber, failedTryAgain, int.MaxValue);
+			return _playModeImpl.CreateResourceUnpackerByTags(new string[] { tag }, unpackingMaxNumber, failedTryAgain, int.MaxValue);
 		}
 
 		/// <summary>
@@ -1009,7 +1013,7 @@ namespace YooAsset
 		public ResourceUnpackerOperation CreateResourceUnpacker(string[] tags, int unpackingMaxNumber, int failedTryAgain)
 		{
 			DebugCheckInitialize();
-			return _playModeServices.CreateResourceUnpackerByTags(tags, unpackingMaxNumber, failedTryAgain, int.MaxValue);
+			return _playModeImpl.CreateResourceUnpackerByTags(tags, unpackingMaxNumber, failedTryAgain, int.MaxValue);
 		}
 
 		/// <summary>
@@ -1020,7 +1024,7 @@ namespace YooAsset
 		public ResourceUnpackerOperation CreateResourceUnpacker(int unpackingMaxNumber, int failedTryAgain)
 		{
 			DebugCheckInitialize();
-			return _playModeServices.CreateResourceUnpackerByAll(unpackingMaxNumber, failedTryAgain, int.MaxValue);
+			return _playModeImpl.CreateResourceUnpackerByAll(unpackingMaxNumber, failedTryAgain, int.MaxValue);
 		}
 		#endregion
 
@@ -1033,16 +1037,16 @@ namespace YooAsset
 			// NOTE : 编辑器模拟模式下始终返回TRUE
 			if (_playMode == EPlayMode.EditorSimulateMode)
 				return true;
-			return _playModeServices.ActiveManifest.IsIncludeBundleFile(cacheGUID);
+			return _playModeImpl.ActiveManifest.IsIncludeBundleFile(cacheGUID);
 		}
 
 		private AssetInfo ConvertLocationToAssetInfo(string location, System.Type assetType)
 		{
-			return _playModeServices.ActiveManifest.ConvertLocationToAssetInfo(location, assetType);
+			return _playModeImpl.ActiveManifest.ConvertLocationToAssetInfo(location, assetType);
 		}
 		private AssetInfo ConvertAssetGUIDToAssetInfo(string assetGUID, System.Type assetType)
 		{
-			return _playModeServices.ActiveManifest.ConvertAssetGUIDToAssetInfo(assetGUID, assetType);
+			return _playModeImpl.ActiveManifest.ConvertAssetGUIDToAssetInfo(assetGUID, assetType);
 		}
 		#endregion
 
@@ -1057,20 +1061,38 @@ namespace YooAsset
 
 			if (checkActiveManifest)
 			{
-				if (_playModeServices.ActiveManifest == null)
-					throw new Exception("Not found active manifest !");
+				if (_playModeImpl.ActiveManifest == null)
+					throw new Exception("Not found active package manifest !");
 			}
 		}
 
 		[Conditional("DEBUG")]
 		private void DebugCheckUpdateManifest()
 		{
-			var loadedBundleInfos = _assetSystemImpl.GetLoadedBundleInfos();
+			var loadedBundleInfos = _resourceMgr.GetLoadedBundleInfos();
 			if (loadedBundleInfos.Count > 0)
 			{
 				YooLogger.Warning($"Found loaded bundle before update manifest ! Recommended to call the  {nameof(ForceUnloadAllAssets)} method to release loaded bundle !");
 			}
 		}
+
+		[Conditional("DEBUG")]
+		private void DebugCheckRawFileLoadMethod(string method)
+		{
+			if (_playModeImpl.ActiveManifest.BuildPipeline != DefaultBuildPipeline.RawFileBuildPipelineName)
+			{
+				throw new Exception($"Cannot load asset bundle file using {method} method !");
+			}
+		}
+
+		[Conditional("DEBUG")]
+		private void DebugCheckAssetLoadMethod(string method)
+		{
+			if (_playModeImpl.ActiveManifest.BuildPipeline == DefaultBuildPipeline.RawFileBuildPipelineName)
+			{
+				throw new Exception($"Cannot load raw file using {method} method !");
+			}
+		}
 		#endregion
 
 		#region 调试信息
@@ -1078,7 +1100,7 @@ namespace YooAsset
 		{
 			DebugPackageData data = new DebugPackageData();
 			data.PackageName = PackageName;
-			data.ProviderInfos = _assetSystemImpl.GetDebugReportInfos();
+			data.ProviderInfos = _resourceMgr.GetDebugReportInfos();
 			return data;
 		}
 		#endregion
diff --git a/Assets/YooAsset/Runtime/PackageSystem/ResourcePackage.cs.meta b/Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs.meta
similarity index 100%
rename from Assets/YooAsset/Runtime/PackageSystem/ResourcePackage.cs.meta
rename to Assets/YooAsset/Runtime/ResourcePackage/ResourcePackage.cs.meta
diff --git a/Assets/YooAsset/Runtime/Services/IBuildinQueryServices.cs b/Assets/YooAsset/Runtime/Services/IBuildinQueryServices.cs
index bf4f230..0e30f92 100644
--- a/Assets/YooAsset/Runtime/Services/IBuildinQueryServices.cs
+++ b/Assets/YooAsset/Runtime/Services/IBuildinQueryServices.cs
@@ -4,8 +4,8 @@ namespace YooAsset
 	public interface IBuildinQueryServices
 	{
 		/// <summary>
-		/// 查询应用程序里的内置资源是否存在
+		/// 查询是否为应用程序内置的资源文件
 		/// </summary>
-		bool QueryStreamingAssets(string packageName, string fileName);
+		bool Query(string packageName, string fileName);
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/Services/IDecryptionServices.cs b/Assets/YooAsset/Runtime/Services/IDecryptionServices.cs
index 52e8fd9..28ac565 100644
--- a/Assets/YooAsset/Runtime/Services/IDecryptionServices.cs
+++ b/Assets/YooAsset/Runtime/Services/IDecryptionServices.cs
@@ -1,6 +1,11 @@
-
+using System.IO;
+using UnityEngine;
+
 namespace YooAsset
 {
+	/// <summary>
+	/// 解密文件的信息
+	/// </summary>
 	public struct DecryptFileInfo
 	{
 		/// <summary>
@@ -9,9 +14,14 @@ namespace YooAsset
 		public string BundleName;
 
 		/// <summary>
-		/// 文件路径
+		/// 文件加载路径
 		/// </summary>
-		public string FilePath;
+		public string FileLoadPath;
+
+		/// <summary>
+		/// Unity引擎用于内容校验的CRC
+		/// </summary>
+		public uint ConentCRC;
 	}
 
 	/// <summary>
@@ -20,23 +30,15 @@ namespace YooAsset
 	public interface IDecryptionServices
 	{
 		/// <summary>
-		/// 文件偏移解密方法
+		/// 同步方式获取解密的资源包对象
+		/// 注意：加载流对象在资源包对象释放的时候会自动释放
 		/// </summary>
-		ulong LoadFromFileOffset(DecryptFileInfo fileInfo);
+		AssetBundle LoadAssetBundle(DecryptFileInfo fileInfo, out Stream managedStream);
 
 		/// <summary>
-		/// 文件内存解密方法
+		/// 异步方式获取解密的资源包对象
+		/// 注意：加载流对象在资源包对象释放的时候会自动释放
 		/// </summary>
-		byte[] LoadFromMemory(DecryptFileInfo fileInfo);
-
-		/// <summary>
-		/// 文件流解密方法
-		/// </summary>
-		System.IO.Stream LoadFromStream(DecryptFileInfo fileInfo);
-
-		/// <summary>
-		/// 文件流解密的托管缓存大小
-		/// </summary>
-		uint GetManagedReadBufferSize();
+		AssetBundleCreateRequest LoadAssetBundleAsync(DecryptFileInfo fileInfo, out Stream managedStream);
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/Services/IDeliveryLoadServices.cs b/Assets/YooAsset/Runtime/Services/IDeliveryLoadServices.cs
new file mode 100644
index 0000000..ada7a3a
--- /dev/null
+++ b/Assets/YooAsset/Runtime/Services/IDeliveryLoadServices.cs
@@ -0,0 +1,43 @@
+using UnityEngine;
+
+namespace YooAsset
+{
+	/// <summary>
+	/// 分发的资源信息
+	/// </summary>
+	public struct DeliveryFileInfo
+	{
+		/// <summary>
+		/// 资源包名称
+		/// </summary>
+		public string BundleName;
+
+		/// <summary>
+		/// 文件加载路径
+		/// </summary>
+		public string FileLoadPath;
+
+		/// <summary>
+		/// Unity引擎用于内容校验的CRC
+		/// </summary>
+		public uint ConentCRC;
+
+		/// <summary>
+		/// 资源包是否加密
+		/// </summary>
+		public bool Encrypted;
+	}
+	
+	public interface IDeliveryLoadServices
+	{
+		/// <summary>
+		/// 同步方式获取分发的资源包对象
+		/// </summary>
+		AssetBundle LoadAssetBundle(DeliveryFileInfo fileInfo);
+
+		/// <summary>
+		/// 异步方式获取分发的资源包对象
+		/// </summary>
+		AssetBundleCreateRequest LoadAssetBundleAsync(DeliveryFileInfo fileInfo);
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/Services/IDeliveryLoadServices.cs.meta b/Assets/YooAsset/Runtime/Services/IDeliveryLoadServices.cs.meta
new file mode 100644
index 0000000..49ee7dd
--- /dev/null
+++ b/Assets/YooAsset/Runtime/Services/IDeliveryLoadServices.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5233328bd3a1b944da521581d61aae78
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Runtime/Services/IDeliveryQueryServices.cs b/Assets/YooAsset/Runtime/Services/IDeliveryQueryServices.cs
index 9e2fc11..7add9d0 100644
--- a/Assets/YooAsset/Runtime/Services/IDeliveryQueryServices.cs
+++ b/Assets/YooAsset/Runtime/Services/IDeliveryQueryServices.cs
@@ -1,25 +1,16 @@
 
 namespace YooAsset
 {
-	/// <summary>
-	/// 分发的资源信息
-	/// </summary>
-	public struct DeliveryFileInfo
-	{
-		public string DeliveryFilePath;
-		public ulong DeliveryFileOffset;
-	}
-	
 	public interface IDeliveryQueryServices
 	{
 		/// <summary>
-		/// 查询是否为开发者分发的资源
+		/// 查询是否为开发者分发的资源文件
 		/// </summary>
-		bool QueryDeliveryFiles(string packageName, string fileName);
+		bool Query(string packageName, string fileName);
 
 		/// <summary>
-		/// 获取开发者分发的资源信息
+		/// 获取分发资源文件的路径
 		/// </summary>
-		DeliveryFileInfo GetDeliveryFileInfo(string packageName, string fileName);
+		string GetFilePath(string packageName, string fileName);
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/Services/IEncryptionServices.cs b/Assets/YooAsset/Runtime/Services/IEncryptionServices.cs
index 0664bfc..f22c289 100644
--- a/Assets/YooAsset/Runtime/Services/IEncryptionServices.cs
+++ b/Assets/YooAsset/Runtime/Services/IEncryptionServices.cs
@@ -4,9 +4,9 @@ namespace YooAsset
 	public struct EncryptResult
 	{
 		/// <summary>
-		/// 加密后的Bunlde文件加载方法
+		/// 文件是否加密
 		/// </summary>
-		public EBundleLoadMethod LoadMethod;
+		public bool Encrypted;
 		
 		/// <summary>
 		/// 加密后的文件数据
diff --git a/Assets/YooAsset/Runtime/Services/Internal/IBundleServices.cs b/Assets/YooAsset/Runtime/Services/Internal/IBundleServices.cs
deleted file mode 100644
index 75c8620..0000000
--- a/Assets/YooAsset/Runtime/Services/Internal/IBundleServices.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-
-namespace YooAsset
-{
-	internal interface IBundleServices
-	{	
-		/// <summary>
-		/// 获取资源包信息
-		/// </summary>
-		BundleInfo GetBundleInfo(AssetInfo assetInfo);
-
-		/// <summary>
-		/// 获取依赖的资源包信息集合
-		/// </summary>
-		BundleInfo[] GetAllDependBundleInfos(AssetInfo assetPath);
-
-		/// <summary>
-		/// 获取资源包名称
-		/// </summary>
-		string GetBundleName(int bundleID);
-
-		/// <summary>
-		/// 服务接口是否有效
-		/// </summary>
-		bool IsServicesValid();
-	}
-}
\ No newline at end of file
diff --git a/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs b/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs
index 559bc39..a0d87bd 100644
--- a/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs
+++ b/Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs
@@ -24,7 +24,7 @@ namespace YooAsset
 		/// <summary>
 		/// 清单文件格式版本
 		/// </summary>
-		public const string ManifestFileVersion = "1.5.2";
+		public const string ManifestFileVersion = "2.0.0";
 
 
 		/// <summary>
@@ -45,13 +45,8 @@ namespace YooAsset
 		/// <summary>
 		/// 缓存的资源文件的文件夹名称
 		/// </summary>
-		public const string CachedBundleFileFolder = "CacheBundleFiles";
-
-		/// <summary>
-		/// 缓存的原生文件的文件夹名称
-		/// </summary>
-		public const string CachedRawFileFolder = "CacheRawFiles";
-
+		public const string CacheFilesFolderName = "CacheFiles";
+		
 		/// <summary>
 		/// 缓存的清单文件的文件夹名称
 		/// </summary>
diff --git a/Assets/YooAsset/Runtime/YooAssets.cs b/Assets/YooAsset/Runtime/YooAssets.cs
index 0a496ae..00e977e 100644
--- a/Assets/YooAsset/Runtime/YooAssets.cs
+++ b/Assets/YooAsset/Runtime/YooAssets.cs
@@ -41,7 +41,6 @@ namespace YooAsset
 #endif
 
 				OperationSystem.Initialize();
-				DownloadSystem.Initialize();
 			}
 		}
 
@@ -53,8 +52,6 @@ namespace YooAsset
 			if (_isInitialize)
 			{
 				OperationSystem.DestroyAll();
-				DownloadSystem.DestroyAll();
-				CacheSystem.ClearAll();
 
 				foreach (var package in _packages)
 				{
@@ -77,7 +74,6 @@ namespace YooAsset
 			if (_isInitialize)
 			{
 				OperationSystem.Update();
-				DownloadSystem.Update();
 
 				for (int i = 0; i < _packages.Count; i++)
 				{
@@ -93,12 +89,7 @@ namespace YooAsset
 		/// <param name="packageName">资源包名称</param>
 		public static ResourcePackage CreatePackage(string packageName)
 		{
-			if (_isInitialize == false)
-				throw new Exception($"{nameof(YooAssets)} not initialize !");
-
-			if (string.IsNullOrEmpty(packageName))
-				throw new Exception("Package name is null or empty !");
-
+			CheckException(packageName);
 			if (HasPackage(packageName))
 				throw new Exception($"Package {packageName} already existed !");
 
@@ -114,7 +105,8 @@ namespace YooAsset
 		/// <param name="packageName">资源包名称</param>
 		public static ResourcePackage GetPackage(string packageName)
 		{
-			var package = TryGetPackage(packageName);
+			CheckException(packageName);
+			var package = GetPackageInternal(packageName);
 			if (package == null)
 				YooLogger.Error($"Not found resource package : {packageName}");
 			return package;
@@ -126,18 +118,8 @@ namespace YooAsset
 		/// <param name="packageName">资源包名称</param>
 		public static ResourcePackage TryGetPackage(string packageName)
 		{
-			if (_isInitialize == false)
-				throw new Exception($"{nameof(YooAssets)} not initialize !");
-
-			if (string.IsNullOrEmpty(packageName))
-				throw new Exception("Package name is null or empty !");
-
-			foreach (var package in _packages)
-			{
-				if (package.PackageName == packageName)
-					return package;
-			}
-			return null;
+			CheckException(packageName);
+			return GetPackageInternal(packageName);
 		}
 
 		/// <summary>
@@ -146,16 +128,14 @@ namespace YooAsset
 		/// <param name="packageName">资源包名称</param>
 		public static void DestroyPackage(string packageName)
 		{
-			ResourcePackage package = GetPackage(packageName);
+			CheckException(packageName);
+			ResourcePackage package = GetPackageInternal(packageName);
 			if (package == null)
 				return;
 
 			YooLogger.Log($"Destroy resource package : {packageName}");
 			_packages.Remove(package);
 			package.DestroyPackage();
-
-			// 清空缓存
-			CacheSystem.ClearPackage(packageName);
 		}
 
 		/// <summary>
@@ -164,15 +144,9 @@ namespace YooAsset
 		/// <param name="packageName">资源包名称</param>
 		public static bool HasPackage(string packageName)
 		{
-			if (_isInitialize == false)
-				throw new Exception($"{nameof(YooAssets)} not initialize !");
-
-			foreach (var package in _packages)
-			{
-				if (package.PackageName == packageName)
-					return true;
-			}
-			return false;
+			CheckException(packageName);
+			var package = GetPackageInternal(packageName);
+			return package != null;
 		}
 
 		/// <summary>
@@ -181,32 +155,36 @@ namespace YooAsset
 		/// <param name="operation">异步操作对象</param>
 		public static void StartOperation(GameAsyncOperation operation)
 		{
-			OperationSystem.StartOperation(operation);
+			// 注意：游戏业务逻辑的包裹填写为空
+			OperationSystem.StartOperation(string.Empty, operation);
+		}
+
+
+		private static ResourcePackage GetPackageInternal(string packageName)
+		{
+			foreach (var package in _packages)
+			{
+				if (package.PackageName == packageName)
+					return package;
+			}
+			return null;
+		}
+		private static void CheckException(string packageName)
+		{
+			if (_isInitialize == false)
+				throw new Exception($"{nameof(YooAssets)} not initialize !");
+
+			if (string.IsNullOrEmpty(packageName))
+				throw new Exception("Package name is null or empty !");
 		}
 
 		#region 系统参数
-		/// <summary>
-		/// 设置下载系统参数，启用断点续传功能文件的最小字节数
-		/// </summary>
-		public static void SetDownloadSystemBreakpointResumeFileSize(int fileBytes)
-		{
-			DownloadSystem.BreakpointResumeFileSize = fileBytes;
-		}
-
 		/// <summary>
 		/// 设置下载系统参数，下载失败后清理文件的HTTP错误码
 		/// </summary>
 		public static void SetDownloadSystemClearFileResponseCode(List<long> codes)
 		{
-			DownloadSystem.ClearFileResponseCodes = codes;
-		}
-
-		/// <summary>
-		/// 设置下载系统参数，自定义的证书认证实例
-		/// </summary>
-		public static void SetDownloadSystemCertificateHandler(UnityEngine.Networking.CertificateHandler instance)
-		{
-			DownloadSystem.CertificateHandlerInstance = instance;
+			DownloadHelper.ClearFileResponseCodes = codes;
 		}
 
 		/// <summary>
@@ -214,22 +192,7 @@ namespace YooAsset
 		/// </summary>
 		public static void SetDownloadSystemUnityWebRequest(DownloadRequestDelegate requestDelegate)
 		{
-			DownloadSystem.RequestDelegate = requestDelegate;
-		}
-
-		/// <summary>
-		/// 设置下载系统参数，网络重定向次数（Unity引擎默认值32）
-		/// 注意：不支持设置为负值
-		/// </summary>
-		public static void SetDownloadSystemRedirectLimit(int redirectLimit)
-		{
-			if (redirectLimit < 0)
-			{
-				YooLogger.Warning($"Invalid param value : {redirectLimit}");
-				return;
-			}
-
-			DownloadSystem.RedirectLimit = redirectLimit;
+			DownloadHelper.RequestDelegate = requestDelegate;
 		}
 
 		/// <summary>
@@ -245,20 +208,12 @@ namespace YooAsset
 			OperationSystem.MaxTimeSlice = milliseconds;
 		}
 
-		/// <summary>
-		/// 设置缓存系统参数，已经缓存文件的校验等级
-		/// </summary>
-		public static void SetCacheSystemCachedFileVerifyLevel(EVerifyLevel verifyLevel)
-		{
-			CacheSystem.InitVerifyLevel = verifyLevel;
-		}
-
 		/// <summary>
 		/// 设置缓存系统参数，禁用缓存在WebGL平台
 		/// </summary>
 		public static void SetCacheSystemDisableCacheOnWebGL()
 		{
-			CacheSystem.DisableUnityCacheOnWebGL = true;
+			CacheHelper.DisableUnityCacheOnWebGL = true;
 		}
 		#endregion
 
diff --git a/Assets/YooAsset/Runtime/YooAssetsExtension.cs b/Assets/YooAsset/Runtime/YooAssetsExtension.cs
index bf46a6d..8cc1d23 100644
--- a/Assets/YooAsset/Runtime/YooAssetsExtension.cs
+++ b/Assets/YooAsset/Runtime/YooAssetsExtension.cs
@@ -85,7 +85,7 @@ namespace YooAsset
 		/// 同步加载原生文件
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public static RawFileOperationHandle LoadRawFileSync(AssetInfo assetInfo)
+		public static RawFileHandle LoadRawFileSync(AssetInfo assetInfo)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadRawFileSync(assetInfo);
@@ -95,17 +95,18 @@ namespace YooAsset
 		/// 同步加载原生文件
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
-		public static RawFileOperationHandle LoadRawFileSync(string location)
+		public static RawFileHandle LoadRawFileSync(string location)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadRawFileSync(location);
 		}
 
+
 		/// <summary>
 		/// 异步加载原生文件
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public static RawFileOperationHandle LoadRawFileAsync(AssetInfo assetInfo)
+		public static RawFileHandle LoadRawFileAsync(AssetInfo assetInfo)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadRawFileAsync(assetInfo);
@@ -115,7 +116,7 @@ namespace YooAsset
 		/// 异步加载原生文件
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
-		public static RawFileOperationHandle LoadRawFileAsync(string location)
+		public static RawFileHandle LoadRawFileAsync(string location)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadRawFileAsync(location);
@@ -130,7 +131,7 @@ namespace YooAsset
 		/// <param name="sceneMode">场景加载模式</param>
 		/// <param name="suspendLoad">场景加载到90%自动挂起</param>
 		/// <param name="priority">优先级</param>
-		public static SceneOperationHandle LoadSceneAsync(string location, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, int priority = 100)
+		public static SceneHandle LoadSceneAsync(string location, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, int priority = 100)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadSceneAsync(location, sceneMode, suspendLoad, priority);
@@ -143,7 +144,7 @@ namespace YooAsset
 		/// <param name="sceneMode">场景加载模式</param>
 		/// <param name="suspendLoad">场景加载到90%自动挂起</param>
 		/// <param name="priority">优先级</param>
-		public static SceneOperationHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, int priority = 100)
+		public static SceneHandle LoadSceneAsync(AssetInfo assetInfo, LoadSceneMode sceneMode = LoadSceneMode.Single, bool suspendLoad = false, int priority = 100)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadSceneAsync(assetInfo, sceneMode, suspendLoad, priority);
@@ -155,7 +156,7 @@ namespace YooAsset
 		/// 同步加载资源对象
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public static AssetOperationHandle LoadAssetSync(AssetInfo assetInfo)
+		public static AssetHandle LoadAssetSync(AssetInfo assetInfo)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadAssetSync(assetInfo);
@@ -166,7 +167,7 @@ namespace YooAsset
 		/// </summary>
 		/// <typeparam name="TObject">资源类型</typeparam>
 		/// <param name="location">资源的定位地址</param>
-		public static AssetOperationHandle LoadAssetSync<TObject>(string location) where TObject : UnityEngine.Object
+		public static AssetHandle LoadAssetSync<TObject>(string location) where TObject : UnityEngine.Object
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadAssetSync<TObject>(location);
@@ -177,18 +178,28 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
 		/// <param name="type">资源类型</param>
-		public static AssetOperationHandle LoadAssetSync(string location, System.Type type)
+		public static AssetHandle LoadAssetSync(string location, System.Type type)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadAssetSync(location, type);
 		}
 
+		/// <summary>
+		/// 同步加载资源对象
+		/// </summary>
+		/// <param name="location">资源的定位地址</param>
+		public static AssetHandle LoadAssetSync(string location)
+		{
+			DebugCheckDefaultPackageValid();
+			return _defaultPackage.LoadAssetSync(location);
+		}
+
 
 		/// <summary>
 		/// 异步加载资源对象
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public static AssetOperationHandle LoadAssetAsync(AssetInfo assetInfo)
+		public static AssetHandle LoadAssetAsync(AssetInfo assetInfo)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadAssetAsync(assetInfo);
@@ -199,7 +210,7 @@ namespace YooAsset
 		/// </summary>
 		/// <typeparam name="TObject">资源类型</typeparam>
 		/// <param name="location">资源的定位地址</param>
-		public static AssetOperationHandle LoadAssetAsync<TObject>(string location) where TObject : UnityEngine.Object
+		public static AssetHandle LoadAssetAsync<TObject>(string location) where TObject : UnityEngine.Object
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadAssetAsync<TObject>(location);
@@ -210,11 +221,21 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
 		/// <param name="type">资源类型</param>
-		public static AssetOperationHandle LoadAssetAsync(string location, System.Type type)
+		public static AssetHandle LoadAssetAsync(string location, System.Type type)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadAssetAsync(location, type);
 		}
+
+		/// <summary>
+		/// 异步加载资源对象
+		/// </summary>
+		/// <param name="location">资源的定位地址</param>
+		public static AssetHandle LoadAssetAsync(string location)
+		{
+			DebugCheckDefaultPackageValid();
+			return _defaultPackage.LoadAssetAsync(location);
+		}
 		#endregion
 
 		#region 资源加载
@@ -222,7 +243,7 @@ namespace YooAsset
 		/// 同步加载子资源对象
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public static SubAssetsOperationHandle LoadSubAssetsSync(AssetInfo assetInfo)
+		public static SubAssetsHandle LoadSubAssetsSync(AssetInfo assetInfo)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadSubAssetsSync(assetInfo);
@@ -233,7 +254,7 @@ namespace YooAsset
 		/// </summary>
 		/// <typeparam name="TObject">资源类型</typeparam>
 		/// <param name="location">资源的定位地址</param>
-		public static SubAssetsOperationHandle LoadSubAssetsSync<TObject>(string location) where TObject : UnityEngine.Object
+		public static SubAssetsHandle LoadSubAssetsSync<TObject>(string location) where TObject : UnityEngine.Object
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadSubAssetsSync<TObject>(location);
@@ -244,18 +265,28 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
 		/// <param name="type">子对象类型</param>
-		public static SubAssetsOperationHandle LoadSubAssetsSync(string location, System.Type type)
+		public static SubAssetsHandle LoadSubAssetsSync(string location, System.Type type)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadSubAssetsSync(location, type);
 		}
 
+		/// <summary>
+		/// 同步加载子资源对象
+		/// </summary>
+		/// <param name="location">资源的定位地址</param>
+		public static SubAssetsHandle LoadSubAssetsSync(string location)
+		{
+			DebugCheckDefaultPackageValid();
+			return _defaultPackage.LoadSubAssetsSync(location);
+		}
+
 
 		/// <summary>
 		/// 异步加载子资源对象
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public static SubAssetsOperationHandle LoadSubAssetsAsync(AssetInfo assetInfo)
+		public static SubAssetsHandle LoadSubAssetsAsync(AssetInfo assetInfo)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadSubAssetsAsync(assetInfo);
@@ -266,7 +297,7 @@ namespace YooAsset
 		/// </summary>
 		/// <typeparam name="TObject">资源类型</typeparam>
 		/// <param name="location">资源的定位地址</param>
-		public static SubAssetsOperationHandle LoadSubAssetsAsync<TObject>(string location) where TObject : UnityEngine.Object
+		public static SubAssetsHandle LoadSubAssetsAsync<TObject>(string location) where TObject : UnityEngine.Object
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadSubAssetsAsync<TObject>(location);
@@ -277,11 +308,21 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
 		/// <param name="type">子对象类型</param>
-		public static SubAssetsOperationHandle LoadSubAssetsAsync(string location, System.Type type)
+		public static SubAssetsHandle LoadSubAssetsAsync(string location, System.Type type)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadSubAssetsAsync(location, type);
 		}
+
+		/// <summary>
+		/// 异步加载子资源对象
+		/// </summary>
+		/// <param name="location">资源的定位地址</param>
+		public static SubAssetsHandle LoadSubAssetsAsync(string location)
+		{
+			DebugCheckDefaultPackageValid();
+			return _defaultPackage.LoadSubAssetsAsync(location);
+		}
 		#endregion
 
 		#region 资源加载
@@ -289,7 +330,7 @@ namespace YooAsset
 		/// 同步加载资源包内所有资源对象
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public static AllAssetsOperationHandle LoadAllAssetsSync(AssetInfo assetInfo)
+		public static AllAssetsHandle LoadAllAssetsSync(AssetInfo assetInfo)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadAllAssetsSync(assetInfo);
@@ -300,7 +341,7 @@ namespace YooAsset
 		/// </summary>
 		/// <typeparam name="TObject">资源类型</typeparam>
 		/// <param name="location">资源的定位地址</param>
-		public static AllAssetsOperationHandle LoadAllAssetsSync<TObject>(string location) where TObject : UnityEngine.Object
+		public static AllAssetsHandle LoadAllAssetsSync<TObject>(string location) where TObject : UnityEngine.Object
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadAllAssetsSync<TObject>(location);
@@ -311,18 +352,28 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
 		/// <param name="type">子对象类型</param>
-		public static AllAssetsOperationHandle LoadAllAssetsSync(string location, System.Type type)
+		public static AllAssetsHandle LoadAllAssetsSync(string location, System.Type type)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadAllAssetsSync(location, type);
 		}
 
+		/// <summary>
+		/// 同步加载资源包内所有资源对象
+		/// </summary>
+		/// <param name="location">资源的定位地址</param>
+		public static AllAssetsHandle LoadAllAssetsSync(string location)
+		{
+			DebugCheckDefaultPackageValid();
+			return _defaultPackage.LoadAllAssetsSync(location);
+		}
+
 
 		/// <summary>
 		/// 异步加载资源包内所有资源对象
 		/// </summary>
 		/// <param name="assetInfo">资源信息</param>
-		public static AllAssetsOperationHandle LoadAllAssetsAsync(AssetInfo assetInfo)
+		public static AllAssetsHandle LoadAllAssetsAsync(AssetInfo assetInfo)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadAllAssetsAsync(assetInfo);
@@ -333,7 +384,7 @@ namespace YooAsset
 		/// </summary>
 		/// <typeparam name="TObject">资源类型</typeparam>
 		/// <param name="location">资源的定位地址</param>
-		public static AllAssetsOperationHandle LoadAllAssetsAsync<TObject>(string location) where TObject : UnityEngine.Object
+		public static AllAssetsHandle LoadAllAssetsAsync<TObject>(string location) where TObject : UnityEngine.Object
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadAllAssetsAsync<TObject>(location);
@@ -344,11 +395,21 @@ namespace YooAsset
 		/// </summary>
 		/// <param name="location">资源的定位地址</param>
 		/// <param name="type">子对象类型</param>
-		public static AllAssetsOperationHandle LoadAllAssetsAsync(string location, System.Type type)
+		public static AllAssetsHandle LoadAllAssetsAsync(string location, System.Type type)
 		{
 			DebugCheckDefaultPackageValid();
 			return _defaultPackage.LoadAllAssetsAsync(location, type);
 		}
+
+		/// <summary>
+		/// 异步加载资源包内所有资源对象
+		/// </summary>
+		/// <param name="location">资源的定位地址</param>
+		public static AllAssetsHandle LoadAllAssetsAsync(string location)
+		{
+			DebugCheckDefaultPackageValid();
+			return _defaultPackage.LoadAllAssetsAsync(location);
+		}
 		#endregion
 
 		#region 资源下载