From 2dd3ba847e22aad4516c3e07f6e78b1275b16a00 Mon Sep 17 00:00:00 2001
From: hevinci <hevinci@hotmail.com>
Date: Sat, 21 May 2022 22:24:05 +0800
Subject: [PATCH] Bundle build system adds builtin files copy options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

资源构建增加内置文件拷贝的选项
---
 .../AssetBundleBuilderSetting.cs              |  7 ++++-
 .../AssetBundleBuilderWindow.cs               | 30 +++++++++++++------
 .../AssetBundleBuilderWindow.uxml             |  1 +
 .../AssetBundleBuilder/BuildParameters.cs     |  9 ++++--
 .../BuildReport/ReportSummary.cs              |  5 ++++
 .../BuildTasks/TaskCopyBuildinFiles.cs        |  2 +-
 .../BuildTasks/TaskCreatePatchManifest.cs     |  4 +--
 .../BuildTasks/TaskCreateReport.cs            |  1 +
 .../VisualViewers/ReporterSummaryViewer.cs    |  1 +
 9 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs
index 47593da..9c5ad25 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderSetting.cs
@@ -16,7 +16,7 @@ namespace YooAsset.Editor
 		public EBuildMode BuildMode = EBuildMode.ForceRebuild;
 
 		/// <summary>
-		/// 内置资源标签
+		/// 内置资源标签（首包资源标签）
 		/// </summary>
 		public string BuildTags = string.Empty;
 
@@ -34,5 +34,10 @@ namespace YooAsset.Editor
 		/// 附加后缀格式
 		/// </summary>
 		public bool AppendExtension = false;
+
+		/// <summary>
+		/// 拷贝内置资源文件（首包资源文件）
+		/// </summary>
+		public bool CopyBuildinTagFiles = true;
 	}
 }
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs
index eade0ec..a594dbb 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs
@@ -25,11 +25,12 @@ namespace YooAsset.Editor
 		private TextField _buildOutputField;
 		private IntegerField _buildVersionField;
 		private EnumField _buildModeField;
-		private TextField _buildTagsField;
+		private TextField _buildinTagsField;
 		private PopupField<string> _encryptionField;
 		private EnumField _compressionField;
 		private Toggle _appendExtensionToggle;
-
+		private Toggle _copyBuildinTagFilesToggle;
+		
 		public void CreateGUI()
 		{
 			try
@@ -76,11 +77,11 @@ namespace YooAsset.Editor
 				});
 
 				// 内置资源标签
-				_buildTagsField = root.Q<TextField>("BuildinTags");
-				_buildTagsField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildTags);
-				_buildTagsField.RegisterValueChangedCallback(evt =>
+				_buildinTagsField = root.Q<TextField>("BuildinTags");
+				_buildinTagsField.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.BuildTags);
+				_buildinTagsField.RegisterValueChangedCallback(evt =>
 				{
-					AssetBundleBuilderSettingData.Setting.BuildTags = _buildTagsField.value;
+					AssetBundleBuilderSettingData.Setting.BuildTags = _buildinTagsField.value;
 				});
 
 				// 加密方法
@@ -123,6 +124,14 @@ namespace YooAsset.Editor
 					AssetBundleBuilderSettingData.Setting.AppendExtension = _appendExtensionToggle.value;
 				});
 
+				// 拷贝首包文件
+				_copyBuildinTagFilesToggle = root.Q<Toggle>("CopyBuildinFiles");
+				_copyBuildinTagFilesToggle.SetValueWithoutNotify(AssetBundleBuilderSettingData.Setting.CopyBuildinTagFiles);
+				_copyBuildinTagFilesToggle.RegisterValueChangedCallback(evt =>
+				{
+					AssetBundleBuilderSettingData.Setting.CopyBuildinTagFiles = _copyBuildinTagFilesToggle.value;
+				});
+
 				// 构建按钮
 				var buildButton = root.Q<Button>("Build");
 				buildButton.clicked += BuildButton_clicked; ;
@@ -141,11 +150,13 @@ namespace YooAsset.Editor
 
 		private void RefreshWindow()
 		{
-			bool enableElement = AssetBundleBuilderSettingData.Setting.BuildMode == EBuildMode.ForceRebuild;
-			_buildTagsField.SetEnabled(enableElement);
+			var buildMode = AssetBundleBuilderSettingData.Setting.BuildMode;
+			bool enableElement = buildMode == EBuildMode.ForceRebuild;
+			_buildinTagsField.SetEnabled(enableElement);
 			_encryptionField.SetEnabled(enableElement);
 			_compressionField.SetEnabled(enableElement);
 			_appendExtensionToggle.SetEnabled(enableElement);
+			_copyBuildinTagFilesToggle.SetEnabled(buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild);
 		}
 		private void BuildButton_clicked()
 		{
@@ -172,10 +183,11 @@ namespace YooAsset.Editor
 			buildParameters.BuildTarget = _buildTarget;
 			buildParameters.BuildMode = (EBuildMode)_buildModeField.value;
 			buildParameters.BuildVersion = _buildVersionField.value;
-			buildParameters.BuildinTags = _buildTagsField.value;
+			buildParameters.BuildinTags = _buildinTagsField.value;
 			buildParameters.VerifyBuildingResult = true;
 			buildParameters.EnableAddressable = AssetBundleCollectorSettingData.Setting.EnableAddressable;
 			buildParameters.AppendFileExtension = _appendExtensionToggle.value;
+			buildParameters.CopyBuildinTagFiles = _copyBuildinTagFilesToggle.value;
 			buildParameters.EncryptionServices = CreateEncryptionServicesInstance();
 			buildParameters.CompressOption = (ECompressOption)_compressionField.value;
 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.uxml b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.uxml
index b57509e..5fac3d4 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.uxml
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.uxml
@@ -7,6 +7,7 @@
         <ui:VisualElement name="EncryptionContainer" style="height: 24px;" />
         <uie:EnumField label="Compression" value="Center" name="Compression" />
         <ui:Toggle label="Append Extension" name="AppendExtension" style="height: 15px;" />
+        <ui:Toggle label="Copy BuildinTag Files" name="CopyBuildinFiles" style="height: 15px;" />
         <ui:TextField picking-mode="Ignore" label="Buildin Tags" name="BuildinTags" />
         <ui:Button text="构建" display-tooltip-when-elided="true" name="Build" style="height: 50px; background-color: rgb(40, 106, 42); margin-top: 10px;" />
     </ui:VisualElement>
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs
index 71466c0..ad07f73 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs
@@ -30,7 +30,7 @@ namespace YooAsset.Editor
 		public int BuildVersion;
 
 		/// <summary>
-		/// 内置资源的标记列表
+		/// 内置资源标签集合（首包资源标签）
 		/// 注意：分号为分隔符
 		/// </summary>
 		public string BuildinTags;
@@ -51,6 +51,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool AppendFileExtension = false;
 
+		/// <summary>
+		/// 拷贝内置资源文件（首包资源文件）
+		/// </summary>
+		public bool CopyBuildinTagFiles = false;
+
 
 		/// <summary>
 		/// 加密类
@@ -74,7 +79,7 @@ namespace YooAsset.Editor
 
 
 		/// <summary>
-		/// 获取内置标记列表
+		/// 获取内置资源标签列表（首包资源标签）
 		/// </summary>
 		public List<string> GetBuildinTags()
 		{
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/ReportSummary.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/ReportSummary.cs
index 87827c5..cf33b7a 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/ReportSummary.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/ReportSummary.cs
@@ -53,6 +53,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool AppendFileExtension;
 
+		/// <summary>
+		/// 拷贝内置资源文件
+		/// </summary>
+		public bool CopyBuildinTagFiles;
+
 		/// <summary>
 		/// 自动收集着色器
 		/// </summary>
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyBuildinFiles.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyBuildinFiles.cs
index 024bed1..1410deb 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyBuildinFiles.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCopyBuildinFiles.cs
@@ -13,7 +13,7 @@ namespace YooAsset.Editor
 		{
 			// 注意：我们只有在强制重建的时候才会拷贝
 			var buildParameters = context.GetContextObject<AssetBundleBuilder.BuildParametersContext>();
-			if (buildParameters.Parameters.BuildMode == EBuildMode.ForceRebuild)
+			if (buildParameters.Parameters.CopyBuildinTagFiles)
 			{
 				// 清空流目录
 				AssetBundleBuilderHelper.ClearStreamingAssetsFolder();
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchManifest.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchManifest.cs
index bbe7984..c54db18 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchManifest.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreatePatchManifest.cs
@@ -58,9 +58,7 @@ namespace YooAsset.Editor
 		{
 			List<PatchBundle> result = new List<PatchBundle>(1000);
 
-			// 内置标记列表
 			List<string> buildinTags = buildParameters.Parameters.GetBuildinTags();
-
 			var buildMode = buildParameters.Parameters.BuildMode;
 			bool standardBuild = buildMode == EBuildMode.ForceRebuild || buildMode == EBuildMode.IncrementalBuild;
 			foreach (var bundleInfo in buildMapContext.BundleInfos)
@@ -90,7 +88,7 @@ namespace YooAsset.Editor
 		}
 		private bool IsBuildinBundle(string[] bundleTags, List<string> buildinTags)
 		{
-			// 注意：没有任何标记的Bundle文件默认为内置文件
+			// 注意：没有任何分类标签的Bundle文件默认为内置文件
 			if (bundleTags.Length == 0)
 				return true;
 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateReport.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateReport.cs
index 92ced06..fc5bd1f 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateReport.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskCreateReport.cs
@@ -42,6 +42,7 @@ namespace YooAsset.Editor
 				buildReport.Summary.BuildinTags = buildParameters.Parameters.BuildinTags;
 				buildReport.Summary.EnableAddressable = buildParameters.Parameters.EnableAddressable;
 				buildReport.Summary.AppendFileExtension = buildParameters.Parameters.AppendFileExtension;
+				buildReport.Summary.CopyBuildinTagFiles = buildParameters.Parameters.CopyBuildinTagFiles;
 				buildReport.Summary.AutoCollectShaders = AssetBundleCollectorSettingData.Setting.AutoCollectShaders;
 				buildReport.Summary.ShadersBundleName = AssetBundleCollectorSettingData.Setting.ShadersBundleName;
 				buildReport.Summary.EncryptionServicesClassName = buildParameters.Parameters.EncryptionServices == null ?
diff --git a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterSummaryViewer.cs b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterSummaryViewer.cs
index 554820c..ce0b3d7 100644
--- a/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterSummaryViewer.cs
+++ b/Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterSummaryViewer.cs
@@ -70,6 +70,7 @@ namespace YooAsset.Editor
 
 			_items.Add(new ItemWrapper("启用可寻址资源定位", $"{buildReport.Summary.EnableAddressable}"));
 			_items.Add(new ItemWrapper("追加文件扩展名", $"{buildReport.Summary.AppendFileExtension}"));
+			_items.Add(new ItemWrapper("拷贝内置资源文件", $"{buildReport.Summary.CopyBuildinTagFiles}"));
 			_items.Add(new ItemWrapper("自动收集着色器", $"{buildReport.Summary.AutoCollectShaders}"));
 			_items.Add(new ItemWrapper("着色器资源包名称", $"{buildReport.Summary.ShadersBundleName}"));
 			_items.Add(new ItemWrapper("加密服务类名称", $"{buildReport.Summary.EncryptionServicesClassName}"));