From 299f770692f99548e5e15a7da7d7b17c2e6dd198 Mon Sep 17 00:00:00 2001
From: hevinci <hevinci@hotmail.com>
Date: Wed, 16 Mar 2022 11:33:45 +0800
Subject: [PATCH] Update AssetBundleBuilder

---
 .../Editor/AssetBundleBuilder/BuildReport.meta  |  8 ++++++++
 .../{ => BuildReport}/BuildAssetInfo.cs         |  4 +++-
 .../{ => BuildReport}/BuildAssetInfo.cs.meta    |  0
 .../{ => BuildReport}/BuildBundleInfo.cs        |  4 +++-
 .../{ => BuildReport}/BuildBundleInfo.cs.meta   |  0
 .../BuildReport/BuildReport.cs                  | 17 +++++++++++++++++
 .../BuildReport/BuildReport.cs.meta             | 11 +++++++++++
 .../BuildTasks/TaskGetBuildMap.cs               |  4 ++--
 8 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport.meta
 rename Assets/YooAsset/Editor/AssetBundleBuilder/{ => BuildReport}/BuildAssetInfo.cs (97%)
 rename Assets/YooAsset/Editor/AssetBundleBuilder/{ => BuildReport}/BuildAssetInfo.cs.meta (100%)
 rename Assets/YooAsset/Editor/AssetBundleBuilder/{ => BuildReport}/BuildBundleInfo.cs (98%)
 rename Assets/YooAsset/Editor/AssetBundleBuilder/{ => BuildReport}/BuildBundleInfo.cs.meta (100%)
 create mode 100644 Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildReport.cs
 create mode 100644 Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildReport.cs.meta

diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport.meta
new file mode 100644
index 0000000..7508e72
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d6268d725eec21b4aae819adc1553f0e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildAssetInfo.cs
similarity index 97%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildAssetInfo.cs
index fa15038..e3b0306 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildAssetInfo.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 
 namespace YooAsset.Editor
@@ -6,6 +7,7 @@ namespace YooAsset.Editor
 	/// <summary>
 	/// 构建的资源信息类
 	/// </summary>
+	[Serializable]
 	public class BuildAssetInfo
 	{
 		/// <summary>
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildAssetInfo.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildAssetInfo.cs.meta
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildBundleInfo.cs
similarity index 98%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildBundleInfo.cs
index 96eff3e..0422173 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildBundleInfo.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEditor;
@@ -8,6 +9,7 @@ namespace YooAsset.Editor
 	/// <summary>
 	/// 构建的资源包信息类
 	/// </summary>
+	[Serializable]
 	public class BuildBundleInfo
 	{
 		/// <summary>
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildBundleInfo.cs.meta
similarity index 100%
rename from Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs.meta
rename to Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildBundleInfo.cs.meta
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildReport.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildReport.cs
new file mode 100644
index 0000000..3fd7a33
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildReport.cs
@@ -0,0 +1,17 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace YooAsset
+{
+	/// <summary>
+	/// 构建报告
+	/// </summary>
+	[Serializable]
+	public class BuildReport
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildReport.cs.meta b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildReport.cs.meta
new file mode 100644
index 0000000..c778e61
--- /dev/null
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildReport/BuildReport.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0f35afda8a63f874fb78877d65dafdd2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskGetBuildMap.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskGetBuildMap.cs
index d411dec..2bf4c27 100644
--- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskGetBuildMap.cs
+++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskGetBuildMap.cs
@@ -145,11 +145,11 @@ namespace YooAsset.Editor
 			Dictionary<string, BuildAssetInfo> buildAssets = new Dictionary<string, BuildAssetInfo>();
 
 			// 1. 获取主动收集的资源
-			List<AssetCollectInfo> allCollectInfos = AssetBundleCollectorSettingData.GetAllCollectAssets();
+			List<CollectAssetInfo> allCollectInfos = AssetBundleCollectorSettingData.GetAllCollectAssets();
 
 			// 2. 对收集的资源进行依赖分析
 			int progressValue = 0;
-			foreach (AssetCollectInfo collectInfo in allCollectInfos)
+			foreach (CollectAssetInfo collectInfo in allCollectInfos)
 			{
 				string mainAssetPath = collectInfo.AssetPath;