update asset bundle builder

Assets/YooAsset/Editor/AssetBundleBuilder/BuildParameters.cs

@@ -28,6 +28,11 @@ namespace YooAsset.Editor
 			/// 缓存服务器端口
 			/// </summary>
 			public int CacheServerPort;
+
+			/// <summary>
+			/// 修复图集资源冗余问题
+			/// </summary>
+			public bool FixSpriteAtlasRedundancy = false;
 		}
 
 		/// <summary>

Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/ExtdBuildTasks.cs

@@ -13,31 +13,27 @@ namespace UnityEditor.Build.Pipeline.Tasks
 	/// </summary>
 	public class RemoveSpriteAtlasRedundancy : IBuildTask
 	{
-        /// <inheritdoc />
 		public int Version => 1;
 
 		[InjectContext]
 		IBundleWriteData writeDataParam;
 
-        /// <inheritdoc />
 		public ReturnCode Run()
 		{
 #if UNITY_2020_3_OR_NEWER
 			BundleWriteData writeData = (BundleWriteData)writeDataParam;
 
-            // 所有图集散图的 guid 集合
+			// 图集引用的精灵图片集合
 			HashSet<GUID> spriteGuids = new HashSet<GUID>();
-
-            // 遍历资源包里的资源记录其中图集的散图 guid
 			foreach (var pair in writeData.FileToObjects)
 			{
 				foreach (ObjectIdentifier objectIdentifier in pair.Value)
 				{
-                    string path = AssetDatabase.GUIDToAssetPath(objectIdentifier.guid);
+					var assetPath = AssetDatabase.GUIDToAssetPath(objectIdentifier.guid);
-                    Object asset = AssetDatabase.LoadAssetAtPath<Object>(path);
+					var assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
-                    if (asset is SpriteAtlas)
+					if (assetType == typeof(SpriteAtlas))
 					{
-                        List<string> spritePaths = AssetDatabase.GetDependencies(path, false).ToList();
+						var spritePaths = AssetDatabase.GetDependencies(assetPath, false);
 						foreach (string spritePath in spritePaths)
 						{
 							GUID spriteGuild = AssetDatabase.GUIDFromAssetPath(spritePath);
@@ -47,7 +43,7 @@ namespace UnityEditor.Build.Pipeline.Tasks
 				}
 			}
 
-            // 将 writeData.FileToObjects 包含的图集散图的 texture 删掉避免冗余
+			// 移除图集引用的精力图片对象
 			foreach (var pair in writeData.FileToObjects)
 			{
 				List<ObjectIdentifier> objectIdentifiers = pair.Value;
@@ -58,7 +54,7 @@ namespace UnityEditor.Build.Pipeline.Tasks
 					{
 						if (objectIdentifier.localIdentifierInFile == 2800000)
 						{
-                            // 删除图集散图的冗余 texture
+							// 删除图集散图的冗余纹理
 							objectIdentifiers.RemoveAt(i);
 						}
 					}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/SBPBuildTasks.cs

@@ -9,7 +9,7 @@ namespace UnityEditor.Build.Pipeline.Tasks
 {
 	public static class SBPBuildTasks
 	{
-		public static IList<IBuildTask> Create(string builtInShaderBundleName)
+		public static IList<IBuildTask> Create(bool fixSpriteAtlasRedundancy, string builtInShaderBundleName)
 		{
 			var buildTasks = new List<IBuildTask>();
 
@@ -33,7 +33,8 @@ namespace UnityEditor.Build.Pipeline.Tasks
 
 			// Packing
 			buildTasks.Add(new GenerateBundlePacking());
-			buildTasks.Add(new RemoveSpriteAtlasRedundancy()); // Fix for SpriteAtlas Redundancy
+			if (fixSpriteAtlasRedundancy)
+				buildTasks.Add(new RemoveSpriteAtlasRedundancy());
 			buildTasks.Add(new UpdateBundleObjectLayout());
 			buildTasks.Add(new GenerateBundleCommands());
 			buildTasks.Add(new GenerateSubAssetPathMaps());

Assets/YooAsset/Editor/AssetBundleBuilder/BuildTasks/TaskBuilding_SBP.cs

@@ -33,7 +33,7 @@ namespace YooAsset.Editor
 			// 开始构建
 			IBundleBuildResults buildResults;
 			var buildParameters = buildParametersContext.GetSBPBuildParameters();
-			var taskList = SBPBuildTasks.Create(buildMapContext.Command.ShadersBundleName);
+			var taskList = SBPBuildTasks.Create(buildParametersContext.Parameters.SBPParameters.FixSpriteAtlasRedundancy, buildMapContext.Command.ShadersBundleName);
 			ReturnCode exitCode = ContentPipeline.BuildAssetBundles(buildParameters, buildContent, out buildResults, taskList);
 			if (exitCode < 0)
 			{