Merge branch 'tuyoogame:main' into main

Assets/YooAsset/CHANGELOG.md

@@ -2,6 +2,35 @@
 
 All notable changes to this package will be documented in this file.
 
+## [1.4.5-preview] - 2023-02-17
+
+### Fixed
+
+- (#67)修复了报告查看界面在Unity2021.3上的兼容性问题。
+- (#66)修复了在Unity2021.3上编辑器模拟模式运行报错的问题。
+
+### Changed
+
+- 接口变更：IPackRule
+
+  ````c#
+  /// <summary>
+  /// 资源打包规则接口
+  /// </summary>
+  public interface IPackRule
+  {
+      /// <summary>
+      /// 获取打包规则结果
+      /// </summary>
+      PackRuleResult GetPackRuleResult(PackRuleData data);
+  
+      /// <summary>
+      /// 是否为原生文件打包规则
+      /// </summary>
+      bool IsRawFilePackRule();
+  }
+  ````
+
 ## [1.4.4-preview] - 2023-02-14
 
 ### Fixed

Assets/YooAsset/Editor/AssetBundleBuilder/BuildAssetInfo.cs

@@ -7,8 +7,6 @@ namespace YooAsset.Editor
 {
 	public class BuildAssetInfo
 	{
-		private string _mainBundleName;
-		private string _shareBundleName;
 		private bool _isAddAssetTags = false;
 		private readonly HashSet<string> _referenceBundleNames = new HashSet<string>();
 
@@ -17,6 +15,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public ECollectorType CollectorType { private set; get; }
 
+		/// <summary>
+		/// 资源包完整名称
+		/// </summary>
+		public string BundleName { private set; get; }
+
 		/// <summary>
 		/// 可寻址地址
 		/// </summary>
@@ -54,10 +57,10 @@ namespace YooAsset.Editor
 		public List<BuildAssetInfo> AllDependAssetInfos { private set; get; }
 
 
-		public BuildAssetInfo(ECollectorType collectorType, string mainBundleName, string address, string assetPath, bool isRawAsset)
+		public BuildAssetInfo(ECollectorType collectorType, string bundleName, string address, string assetPath, bool isRawAsset)
 		{
-			_mainBundleName = mainBundleName;
 			CollectorType = collectorType;
+			BundleName = bundleName;
 			Address = address;
 			AssetPath = assetPath;
 			IsRawAsset = isRawAsset;
@@ -133,24 +136,12 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool HasBundleName()
 		{
-			string bundleName = GetBundleName();
+			if (string.IsNullOrEmpty(BundleName))
-			if (string.IsNullOrEmpty(bundleName))
 				return false;
 			else
 				return true;
 		}
 
-		/// <summary>
-		/// 获取资源包名称
-		/// </summary>
-		public string GetBundleName()
-		{
-			if (CollectorType == ECollectorType.None)
-				return _shareBundleName;
-			else
-				return _mainBundleName;
-		}
-
 		/// <summary>
 		/// 添加关联的资源包名称
 		/// </summary>
@@ -164,53 +155,32 @@ namespace YooAsset.Editor
 		}
 
 		/// <summary>
-		/// 计算主资源或共享资源的完整包名
+		/// 计算共享资源包的完整包名
 		/// </summary>
-		public void CalculateFullBundleName(bool uniqueBundleName, string packageName)
+		public void CalculateShareBundleName(bool uniqueBundleName, string packageName, string shadersBundleName)
 		{
-			if (CollectorType == ECollectorType.None)
+			if (CollectorType != ECollectorType.None)
+				return;
+
+			if (IsRawAsset)
+				throw new Exception("Should never get here !");
+
+			if (IsShaderAsset)
 			{
-				if (IsRawAsset)
+				BundleName = shadersBundleName;
-					throw new Exception("Should never get here !");
-
-				if (IsShaderAsset)
-				{
-					_shareBundleName = YooAssetSettingsData.GetUnityShadersBundleFullName(uniqueBundleName, packageName);
-				}
-				else
-				{
-					if (_referenceBundleNames.Count > 1)
-					{
-						IPackRule packRule = PackDirectory.StaticPackRule;
-						var bundleName = packRule.GetBundleName(new PackRuleData(AssetPath));
-						if (YooAssetSettingsData.Setting.RegularBundleName)
-							bundleName = EditorTools.GetRegularPath(bundleName).Replace('/', '_').Replace('.', '_').ToLower();
-						else
-							bundleName = EditorTools.GetRegularPath(bundleName).ToLower();
-
-						if (uniqueBundleName)
-							_shareBundleName = $"{packageName.ToLower()}_share_{bundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
-						else
-							_shareBundleName = $"share_{bundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
-					}
-				}
 			}
 			else
 			{
-				if (IsRawAsset)
+				if (_referenceBundleNames.Count > 1)
 				{
-					string mainBundleName = $"{_mainBundleName}.{YooAssetSettingsData.Setting.RawBundleFileVariant}";
+					IPackRule packRule = PackDirectory.StaticPackRule;
-					_mainBundleName = mainBundleName.ToLower();
+					PackRuleResult packRuleResult = packRule.GetPackRuleResult(new PackRuleData(AssetPath));
+					BundleName = packRuleResult.GetShareBundleName(packageName, uniqueBundleName);
 				}
 				else
 				{
-					string mainBundleName = $"{_mainBundleName}.{YooAssetSettingsData.Setting.AssetBundleFileVariant}";
+					// 注意：被引用次数小于1的资源不需要设置资源包名称
-					_mainBundleName = mainBundleName.ToLower(); ;
+					BundleName = string.Empty;
-				}
-
-				if (uniqueBundleName)
-				{
-					_mainBundleName = $"{packageName.ToLower()}_{_mainBundleName}";
 				}
 			}
 		}

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapContext.cs

@@ -24,6 +24,11 @@ namespace YooAsset.Editor
 		/// </summary>
 		public bool UniqueBundleName;
 
+		/// <summary>
+		/// 着色器统一的全名称
+		/// </summary>
+		public string ShadersBundleName;
+
 		/// <summary>
 		/// 资源包列表
 		/// </summary>
@@ -35,7 +40,7 @@ namespace YooAsset.Editor
 		/// </summary>
 		public void PackAsset(BuildAssetInfo assetInfo)
 		{
-			string bundleName = assetInfo.GetBundleName();
+			string bundleName = assetInfo.BundleName;
 			if (string.IsNullOrEmpty(bundleName))
 				throw new Exception("Should never get here !");
 

Assets/YooAsset/Editor/AssetBundleBuilder/BuildMapCreater.cs

@@ -11,8 +11,7 @@ namespace YooAsset.Editor
 		/// 执行资源构建上下文
 		/// </summary>
 		public static BuildMapContext CreateBuildMap(EBuildMode buildMode, string packageName)
-		{
+		{	
-			BuildMapContext context = new BuildMapContext();
 			Dictionary<string, BuildAssetInfo> buildAssetDic = new Dictionary<string, BuildAssetInfo>(1000);
 
 			// 1. 检测配置合法性
@@ -22,7 +21,7 @@ namespace YooAsset.Editor
 			var buildResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(buildMode, packageName);
 			List<CollectAssetInfo> allCollectAssets = buildResult.CollectAssets;
 
-			// 3. 剔除未被引用的依赖资源
+			// 3. 剔除未被引用的依赖项资源
 			List<CollectAssetInfo> removeDependList = new List<CollectAssetInfo>();
 			foreach (var collectAssetInfo in allCollectAssets)
 			{
@@ -42,7 +41,8 @@ namespace YooAsset.Editor
 			{
 				if (buildAssetDic.ContainsKey(collectAssetInfo.AssetPath) == false)
 				{
-					var buildAssetInfo = new BuildAssetInfo(collectAssetInfo.CollectorType, collectAssetInfo.BundleName,
+					var buildAssetInfo = new BuildAssetInfo(
+						collectAssetInfo.CollectorType, collectAssetInfo.BundleName,
 						collectAssetInfo.Address, collectAssetInfo.AssetPath, collectAssetInfo.IsRawAsset);
 					buildAssetInfo.AddAssetTags(collectAssetInfo.AssetTags);
 					buildAssetInfo.AddBundleTags(collectAssetInfo.AssetTags);
@@ -54,32 +54,28 @@ namespace YooAsset.Editor
 				}
 			}
 
-			// 5. 录入相关依赖的资源
+			// 5. 录入所有收集资源的依赖资源
 			foreach (var collectAssetInfo in allCollectAssets)
 			{
+				string collectAssetBundleName = collectAssetInfo.BundleName;
 				foreach (var dependAssetPath in collectAssetInfo.DependAssets)
 				{
 					if (buildAssetDic.ContainsKey(dependAssetPath))
 					{
 						buildAssetDic[dependAssetPath].AddBundleTags(collectAssetInfo.AssetTags);
-						buildAssetDic[dependAssetPath].AddReferenceBundleName(collectAssetInfo.BundleName);
+						buildAssetDic[dependAssetPath].AddReferenceBundleName(collectAssetBundleName);
 					}
 					else
 					{
 						var buildAssetInfo = new BuildAssetInfo(dependAssetPath);
 						buildAssetInfo.AddBundleTags(collectAssetInfo.AssetTags);
-						buildAssetInfo.AddReferenceBundleName(collectAssetInfo.BundleName);
+						buildAssetInfo.AddReferenceBundleName(collectAssetBundleName);
 						buildAssetDic.Add(dependAssetPath, buildAssetInfo);
 					}
 				}
 			}
 
-			// 6. 记录关键信息
+			// 6. 填充所有收集资源的依赖列表
-			context.AssetFileCount = buildAssetDic.Count;
-			context.EnableAddressable = buildResult.EnableAddressable;
-			context.UniqueBundleName = buildResult.UniqueBundleName;
-
-			// 7. 填充主动收集资源的依赖列表
 			foreach (var collectAssetInfo in allCollectAssets)
 			{
 				var dependAssetInfos = new List<BuildAssetInfo>(collectAssetInfo.DependAssets.Count);
@@ -93,10 +89,18 @@ namespace YooAsset.Editor
 				buildAssetDic[collectAssetInfo.AssetPath].SetAllDependAssetInfos(dependAssetInfos);
 			}
 
-			// 8. 计算完整的资源包名
+			// 7. 记录关键信息
+			BuildMapContext context = new BuildMapContext();
+			context.AssetFileCount = buildAssetDic.Count;
+			context.EnableAddressable = buildResult.Command.EnableAddressable;
+			context.UniqueBundleName = buildResult.Command.UniqueBundleName;
+			context.ShadersBundleName = buildResult.ShadersBundleName;
+
+			// 8. 计算共享的资源包名
+			var command = buildResult.Command;
 			foreach (KeyValuePair<string, BuildAssetInfo> pair in buildAssetDic)
 			{
-				pair.Value.CalculateFullBundleName(buildResult.UniqueBundleName, buildResult.PackageName);
+				pair.Value.CalculateShareBundleName(command.UniqueBundleName, command.PackageName, buildResult.ShadersBundleName);
 			}
 
 			// 9. 移除不参与构建的资源

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

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

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

@@ -42,13 +42,12 @@ namespace YooAsset.Editor
 			patchManifest.AssetList = GetAllPatchAsset(context, patchManifest);
 
 			// 更新Unity内置资源包的引用关系
-			string shadersBunldeName = YooAssetSettingsData.GetUnityShadersBundleFullName(buildMapContext.UniqueBundleName, buildParameters.PackageName);
 			if (buildParameters.BuildPipeline == EBuildPipeline.ScriptableBuildPipeline)
 			{
 				if (buildParameters.BuildMode == EBuildMode.IncrementalBuild)
 				{
 					var buildResultContext = context.GetContextObject<TaskBuilding_SBP.BuildResultContext>();
-					UpdateBuiltInBundleReference(patchManifest, buildResultContext.Results, shadersBunldeName);
+					UpdateBuiltInBundleReference(patchManifest, buildResultContext.Results, buildMapContext.ShadersBundleName);
 				}
 			}
 
@@ -98,7 +97,6 @@ namespace YooAsset.Editor
 		private List<PatchBundle> GetAllPatchBundle(BuildContext context)
 		{
 			var buildMapContext = context.GetContextObject<BuildMapContext>();
-			var buildParametersContext = context.GetContextObject<BuildParametersContext>();
 
 			List<PatchBundle> result = new List<PatchBundle>(1000);
 			foreach (var bundleInfo in buildMapContext.BundleInfos)
@@ -129,7 +127,7 @@ namespace YooAsset.Editor
 						patchAsset.Address = string.Empty;
 					patchAsset.AssetPath = assetInfo.AssetPath;
 					patchAsset.AssetTags = assetInfo.AssetTags.ToArray();
-					patchAsset.BundleID = GetAssetBundleID(assetInfo.GetBundleName(), patchManifest);
+					patchAsset.BundleID = GetAssetBundleID(assetInfo.BundleName, patchManifest);
 					patchAsset.DependIDs = GetAssetBundleDependIDs(patchAsset.BundleID, assetInfo, patchManifest);
 					result.Add(patchAsset);
 				}
@@ -143,7 +141,7 @@ namespace YooAsset.Editor
 			{
 				if (dependAssetInfo.HasBundleName())
 				{
-					int bundleID = GetAssetBundleID(dependAssetInfo.GetBundleName(), patchManifest);
+					int bundleID = GetAssetBundleID(dependAssetInfo.BundleName, patchManifest);
 					if (mainBundleID != bundleID)
 					{
 						if (result.Contains(bundleID) == false)

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

@@ -48,7 +48,8 @@ namespace YooAsset.Editor
 			// 4.更新补丁包输出的文件路径
 			foreach (var bundleInfo in buildMapContext.BundleInfos)
 			{
-				string patchFileName = PatchManifestTools.CreateBundleFileName(outputNameStyle, bundleInfo.BundleName, bundleInfo.PatchInfo.PatchFileHash, bundleInfo.IsRawFile);
+				string patchFileExtension = PatchManifestTools.GetRemoteBundleFileExtension(bundleInfo.BundleName);
+				string patchFileName = PatchManifestTools.GetRemoteBundleFileName(outputNameStyle, bundleInfo.BundleName, patchFileExtension, bundleInfo.PatchInfo.PatchFileHash);
 				bundleInfo.PatchInfo.PatchOutputFilePath = $"{packageOutputDirectory}/{patchFileName}";
 			}
 		}

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollector.cs

@@ -152,11 +152,14 @@ namespace YooAsset.Editor
 			}
 
 			Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(1000);
-			bool isRawAsset = PackRuleName == nameof(PackRawFile);
+
+			// 检测是否为原生资源打包规则
+			IPackRule packRuleInstance = AssetBundleCollectorSettingData.GetPackRuleInstance(PackRuleName);
+			bool isRawFilePackRule = packRuleInstance.IsRawFilePackRule();
 
 			// 检测原生资源包的收集器类型
-			if (isRawAsset && CollectorType != ECollectorType.MainAssetCollector)
+			if (isRawFilePackRule && CollectorType != ECollectorType.MainAssetCollector)
-				throw new Exception($"The raw file must be set to {nameof(ECollectorType)}.{ECollectorType.MainAssetCollector} : {CollectPath}");
+				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}");
@@ -168,7 +171,7 @@ namespace YooAsset.Editor
 				string[] findAssets = EditorTools.FindAssets(EAssetSearchType.All, collectDirectory);
 				foreach (string assetPath in findAssets)
 				{
-					if (IsValidateAsset(assetPath) && IsCollectAsset(assetPath))
+					if (IsValidateAsset(assetPath, isRawFilePackRule) && IsCollectAsset(assetPath))
 					{
                         if (IsMultiPlatform)
                         {
@@ -186,7 +189,7 @@ namespace YooAsset.Editor
 
 						if (result.ContainsKey(assetPath) == false)
 						{
-							var collectAssetInfo = CreateCollectAssetInfo(command, group, assetPath, isRawAsset);
+							var collectAssetInfo = CreateCollectAssetInfo(command, group, assetPath, isRawFilePackRule);
 							result.Add(assetPath, collectAssetInfo);
 						}
 						else
@@ -199,9 +202,9 @@ namespace YooAsset.Editor
 			else
 			{
 				string assetPath = CollectPath;
-				if (IsValidateAsset(assetPath) && IsCollectAsset(assetPath))
+				if (IsValidateAsset(assetPath, isRawFilePackRule) && IsCollectAsset(assetPath))
 				{
-					var collectAssetInfo = CreateCollectAssetInfo(command, group, assetPath, isRawAsset);
+					var collectAssetInfo = CreateCollectAssetInfo(command, group, assetPath, isRawFilePackRule);
 					result.Add(assetPath, collectAssetInfo);
 				}
 				else
@@ -231,22 +234,22 @@ namespace YooAsset.Editor
 			return result.Values.ToList();
 		}
 
-		private CollectAssetInfo CreateCollectAssetInfo(CollectCommand command, AssetBundleCollectorGroup group, string assetPath, bool isRawAsset)
+		private CollectAssetInfo CreateCollectAssetInfo(CollectCommand command, AssetBundleCollectorGroup group, string assetPath, bool isRawFilePackRule)
 		{
 			string address = GetAddress(group, assetPath);
-			string bundleName = GetBundleName(group, assetPath);
+			string bundleName = GetBundleName(command, group, assetPath);
 			List<string> assetTags = GetAssetTags(group);
-			CollectAssetInfo collectAssetInfo = new CollectAssetInfo(CollectorType, bundleName, address, assetPath, assetTags, isRawAsset);
+			CollectAssetInfo collectAssetInfo = new CollectAssetInfo(CollectorType, bundleName, address, assetPath, isRawFilePackRule, assetTags);
 
 			// 注意：模拟构建模式下不需要收集依赖资源
 			if (command.BuildMode == EBuildMode.SimulateBuild)
 				collectAssetInfo.DependAssets = new List<string>();
 			else
-				collectAssetInfo.DependAssets = GetAllDependencies(assetPath);
+				collectAssetInfo.DependAssets = GetAllDependencies(assetPath, isRawFilePackRule);
 
 			return collectAssetInfo;
 		}
-		private bool IsValidateAsset(string assetPath)
+		private bool IsValidateAsset(string assetPath, bool isRawFilePackRule)
 		{
 			if (assetPath.StartsWith("Assets/") == false && assetPath.StartsWith("Packages/") == false)
 			{
@@ -263,10 +266,31 @@ namespace YooAsset.Editor
 			if (type == typeof(LightingDataAsset))
 				return false;
 
-			// 忽略Unity无法识别的无效文件
+			// 检测原生文件是否合规
-			// 注意：只对非原生文件收集器处理
+			if (isRawFilePackRule)
-			if(PackRuleName != nameof(PackRawFile))
 			{
+				string extension = StringUtility.RemoveFirstChar(System.IO.Path.GetExtension(assetPath));
+				if (extension == EAssetFileExtension.unity.ToString() || extension == EAssetFileExtension.prefab.ToString() ||
+					extension == EAssetFileExtension.mat.ToString() || extension == EAssetFileExtension.controller.ToString() ||
+					extension == EAssetFileExtension.fbx.ToString() || extension == EAssetFileExtension.anim.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 (type == typeof(UnityEditor.DefaultAsset))
 				{
 					UnityEngine.Debug.LogWarning($"Cannot pack default asset : {assetPath}");
@@ -282,7 +306,7 @@ namespace YooAsset.Editor
 		}
 		private bool IsIgnoreFile(string fileExtension)
 		{
-			foreach (var extension in YooAssetSettings.IgnoreFileExtensions)
+			foreach (var extension in DefaultFilterRule.IgnoreFileExtensions)
 			{
 				if (extension == fileExtension)
 					return true;
@@ -308,19 +332,22 @@ namespace YooAsset.Editor
 			string adressValue = addressRuleInstance.GetAssetAddress(new AddressRuleData(assetPath, CollectPath, group.GroupName, Address, IsMultiPlatform));
 			return adressValue;
 		}
-		private string GetBundleName(AssetBundleCollectorGroup group, string assetPath)
+		private string GetBundleName(CollectCommand command, AssetBundleCollectorGroup group, string assetPath)
 		{
 			System.Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath);
 			if (assetType == typeof(UnityEngine.Shader) || assetType == typeof(UnityEngine.ShaderVariantCollection))
-				return EditorTools.GetRegularPath(YooAssetSettings.UnityShadersBundleName).ToLower();
+			{
-
+				// 获取着色器打包规则结果
-			// 根据规则设置获取资源包名称
+				PackRuleResult packRuleResult = DefaultPackRule.CreateShadersPackRuleResult();
-			IPackRule packRuleInstance = AssetBundleCollectorSettingData.GetPackRuleInstance(PackRuleName);
+				return packRuleResult.GetMainBundleName(command.PackageName, command.UniqueBundleName);
-			string bundleName = packRuleInstance.GetBundleName(new PackRuleData(assetPath, CollectPath, group.GroupName));
+			}
-			if(YooAssetSettingsData.Setting.RegularBundleName)
-				return EditorTools.GetRegularPath(bundleName).Replace('/', '_').Replace('.', '_').ToLower();
 			else
-				return EditorTools.GetRegularPath(bundleName).ToLower();
+			{
+				// 获取其它资源打包规则结果
+				IPackRule packRuleInstance = AssetBundleCollectorSettingData.GetPackRuleInstance(PackRuleName);
+				PackRuleResult packRuleResult = packRuleInstance.GetPackRuleResult(new PackRuleData(assetPath, CollectPath, group.GroupName));
+				return packRuleResult.GetMainBundleName(command.PackageName, command.UniqueBundleName);
+			}
 		}
 		private List<string> GetAssetTags(AssetBundleCollectorGroup group)
 		{
@@ -329,13 +356,13 @@ namespace YooAsset.Editor
 			tags.AddRange(temper);
 			return tags;
 		}
-		private List<string> GetAllDependencies(string mainAssetPath)
+		private List<string> GetAllDependencies(string mainAssetPath, bool isRawFilePackRule)
 		{
 			List<string> result = new List<string>();
 			string[] depends = AssetDatabase.GetDependencies(mainAssetPath, true);
 			foreach (string assetPath in depends)
 			{
-				if (IsValidateAsset(assetPath))
+				if (IsValidateAsset(assetPath, isRawFilePackRule))
 				{
 					// 注意：排除主资源对象
 					if (assetPath != mainAssetPath)

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs

@@ -100,8 +100,8 @@ namespace YooAsset.Editor
 			{
 				if (package.PackageName == packageName)
 				{
-					CollectCommand command = new CollectCommand(buildMode, EnableAddressable);
+					CollectCommand command = new CollectCommand(buildMode, package.PackageName, EnableAddressable, UniqueBundleName);
-					CollectResult collectResult = new CollectResult(package.PackageName, EnableAddressable, UniqueBundleName);
+					CollectResult collectResult = new CollectResult(command);
 					collectResult.SetCollectAssets(package.GetAllCollectAssets(command));
 					return collectResult;
 				}
@@ -118,8 +118,8 @@ namespace YooAsset.Editor
 			List<CollectResult> collectResultList = new List<CollectResult>(1000);
 			foreach (var package in Packages)
 			{
-				CollectCommand command = new CollectCommand(buildMode, EnableAddressable);
+				CollectCommand command = new CollectCommand(buildMode, package.PackageName, EnableAddressable, UniqueBundleName);
-				CollectResult collectResult = new CollectResult(package.PackageName, EnableAddressable, UniqueBundleName);
+				CollectResult collectResult = new CollectResult(command);
 				collectResult.SetCollectAssets(package.GetAllCollectAssets(command));
 				collectResultList.Add(collectResult);
 			}

Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs

@@ -814,7 +814,7 @@ namespace YooAsset.Editor
 
 				try
 				{
-					CollectCommand command = new CollectCommand(EBuildMode.DryRunBuild, _enableAddressableToogle.value);
+					CollectCommand command = new CollectCommand(EBuildMode.DryRunBuild, _packageNameTxt.value, _enableAddressableToogle.value, _uniqueBundleNameToogle.value);
 					collectAssetInfos = collector.GetAllCollectAssets(command, group);
 				}
 				catch (System.Exception e)

Assets/YooAsset/Editor/AssetBundleCollector/CollectAssetInfo.cs

@@ -14,7 +14,7 @@ namespace YooAsset.Editor
 		/// 资源包名称
 		/// </summary>
 		public string BundleName { private set; get; }
-
+		
 		/// <summary>
 		/// 可寻址地址
 		/// </summary>
@@ -25,30 +25,30 @@ namespace YooAsset.Editor
 		/// </summary>
 		public string AssetPath { private set; get; }
 
-		/// <summary>
-		/// 资源分类标签
-		/// </summary>
-		public List<string> AssetTags { private set; get; }
-
 		/// <summary>
 		/// 是否为原生资源
 		/// </summary>
 		public bool IsRawAsset { private set; get; }
 
+		/// <summary>
+		/// 资源分类标签
+		/// </summary>
+		public List<string> AssetTags { private set; get; }
+
 		/// <summary>
 		/// 依赖的资源列表
 		/// </summary>
 		public List<string> DependAssets = new List<string>();
 
 
-		public CollectAssetInfo(ECollectorType collectorType, string bundleName, string address, string assetPath, List<string> assetTags, bool isRawAsset)
+		public CollectAssetInfo(ECollectorType collectorType, string bundleName, string address, string assetPath, bool isRawAsset, List<string> assetTags)
 		{
 			CollectorType = collectorType;
 			BundleName = bundleName;
 			Address = address;
 			AssetPath = assetPath;
-			AssetTags = assetTags;
 			IsRawAsset = isRawAsset;
+			AssetTags = assetTags;		
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs

@@ -8,15 +8,27 @@ namespace YooAsset.Editor
 		/// </summary>
 		public EBuildMode BuildMode { private set; get; }
 
+		/// <summary>
+		/// 包裹名称
+		/// </summary>
+		public string PackageName { private set; get; }
+
 		/// <summary>
 		/// 是否启用可寻址资源定位
 		/// </summary>
 		public bool EnableAddressable { private set; get; }
 
-		public CollectCommand(EBuildMode buildMode, bool enableAddressable)
+		/// <summary>
+		/// 资源包名唯一化
+		/// </summary>
+		public bool UniqueBundleName { private set; get; }
+
+		public CollectCommand(EBuildMode buildMode, string packageName, bool enableAddressable, bool uniqueBundleName)
 		{
 			BuildMode = buildMode;
+			PackageName = packageName;
 			EnableAddressable = enableAddressable;
+			UniqueBundleName = uniqueBundleName;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/CollectResult.cs

@@ -6,19 +6,14 @@ namespace YooAsset.Editor
 	public class CollectResult
 	{
 		/// <summary>
-		/// 包裹名称
+		/// 收集命令
 		/// </summary>
-		public string PackageName { private set; get; }
+		public CollectCommand Command { private set; get; }
 
 		/// <summary>
-		/// 是否启用可寻址资源定位
+		/// 着色器统一全名称
 		/// </summary>
-		public bool EnableAddressable { private set; get; }
+		public string ShadersBundleName { private set; get; }
-
-		/// <summary>
-		/// 资源包名唯一化
-		/// </summary>
-		public bool UniqueBundleName { private set; get; }
 
 		/// <summary>
 		/// 收集的资源信息列表
@@ -26,11 +21,13 @@ namespace YooAsset.Editor
 		public List<CollectAssetInfo> CollectAssets { private set; get; }
 
 
-		public CollectResult(string packageName, bool enableAddressable, bool uniqueBundleName)
+		public CollectResult(CollectCommand command)
 		{
-			PackageName = packageName;
+			Command = command;
-			EnableAddressable = enableAddressable;
+
-			UniqueBundleName = uniqueBundleName;
+			// 着色器统一全名称
+			var packRuleResult = DefaultPackRule.CreateShadersPackRuleResult();
+			ShadersBundleName = packRuleResult.GetMainBundleName(command.PackageName, command.UniqueBundleName);
 		}
 
 		public void SetCollectAssets(List<CollectAssetInfo> collectAssets)

Assets/YooAsset/Editor/AssetBundleCollector/DefaultFilterRule.cs

@@ -4,6 +4,14 @@ using System.IO;
 
 namespace YooAsset.Editor
 {
+	public class DefaultFilterRule
+	{
+		/// <summary>
+		/// 忽略的文件类型
+		/// </summary>
+		public static readonly string[] IgnoreFileExtensions = { "", ".so", ".dll", ".cs", ".js", ".boo", ".meta", ".cginc", ".hlsl" };
+	}
+
 	[DisplayName("收集所有资源")]
 	public class CollectAll : IFilterRule
 	{

Assets/YooAsset/Editor/AssetBundleCollector/DefaultPackRule.cs

@@ -4,6 +4,31 @@ using UnityEditor;
 
 namespace YooAsset.Editor
 {
+	public class DefaultPackRule
+	{
+		/// <summary>
+		/// AssetBundle文件的后缀名
+		/// </summary>
+		public const string AssetBundleFileExtension = "bundle";
+
+		/// <summary>
+		/// 原生文件的后缀名
+		/// </summary>
+		public const string RawFileExtension = "rawfile";
+
+		/// <summary>
+		/// Unity着色器资源包名称
+		/// </summary>
+		public const string ShadersBundleName = "unityshaders";
+
+
+		public static PackRuleResult CreateShadersPackRuleResult()
+		{
+			PackRuleResult result = new PackRuleResult(ShadersBundleName, AssetBundleFileExtension);
+			return result;
+		}
+	}
+
 	/// <summary>
 	/// 以文件路径作为资源包名
 	/// 注意：每个文件独自打资源包
@@ -13,9 +38,16 @@ namespace YooAsset.Editor
 	[DisplayName("以文件路径作为资源包名")]
 	public class PackSeparately : IPackRule
 	{
-		string IPackRule.GetBundleName(PackRuleData data)
+		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
 		{
-			return StringUtility.RemoveExtension(data.AssetPath);
+			string bundleName = StringUtility.RemoveExtension(data.AssetPath);
+			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
+			return result;
+		}
+
+		bool IPackRule.IsRawFilePackRule()
+		{
+			return false;
 		}
 	}
 
@@ -30,9 +62,16 @@ namespace YooAsset.Editor
 	{
 		public static PackDirectory StaticPackRule = new PackDirectory();
 
-		string IPackRule.GetBundleName(PackRuleData data)
+		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
 		{
-			return Path.GetDirectoryName(data.AssetPath);
+			string bundleName = Path.GetDirectoryName(data.AssetPath);
+			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
+			return result;
+		}
+
+		bool IPackRule.IsRawFilePackRule()
+		{
+			return false;
 		}
 	}
 
@@ -46,7 +85,7 @@ namespace YooAsset.Editor
 	[DisplayName("以收集器路径下顶级文件夹为资源包名")]
 	public class PackTopDirectory : IPackRule
 	{
-		string IPackRule.GetBundleName(PackRuleData data)
+		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
 		{
 			string assetPath = data.AssetPath.Replace(data.CollectPath, string.Empty);
 			assetPath = assetPath.TrimStart('/');
@@ -56,13 +95,19 @@ namespace YooAsset.Editor
 				if (Path.HasExtension(splits[0]))
 					throw new Exception($"Not found root directory : {assetPath}");
 				string bundleName = $"{data.CollectPath}/{splits[0]}";
-				return bundleName;
+				PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
+				return result;
 			}
 			else
 			{
 				throw new Exception($"Not found root directory : {assetPath}");
 			}
 		}
+
+		bool IPackRule.IsRawFilePackRule()
+		{
+			return false;
+		}
 	}
 
 	/// <summary>
@@ -72,17 +117,26 @@ namespace YooAsset.Editor
 	[DisplayName("以收集器路径作为资源包名")]
 	public class PackCollector : IPackRule
 	{
-		string IPackRule.GetBundleName(PackRuleData data)
+		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
 		{
+			string bundleName;
 			string collectPath = data.CollectPath;
 			if (AssetDatabase.IsValidFolder(collectPath))
 			{
-				return collectPath;
+				bundleName = collectPath;
 			}
 			else
 			{
-				return StringUtility.RemoveExtension(collectPath);
+				bundleName = StringUtility.RemoveExtension(collectPath);
 			}
+
+			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
+			return result;
+		}
+
+		bool IPackRule.IsRawFilePackRule()
+		{
+			return false;
 		}
 	}
 
@@ -93,9 +147,16 @@ namespace YooAsset.Editor
 	[DisplayName("以分组名称作为资源包名")]
 	public class PackGroup : IPackRule
 	{
-		string IPackRule.GetBundleName(PackRuleData data)
+		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
 		{
-			return data.GroupName;
+			string bundleName = data.GroupName;
+			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
+			return result;
+		}
+
+		bool IPackRule.IsRawFilePackRule()
+		{
+			return false;
 		}
 	}
 
@@ -106,23 +167,16 @@ namespace YooAsset.Editor
 	[DisplayName("打包原生文件")]
 	public class PackRawFile : IPackRule
 	{
-		string IPackRule.GetBundleName(PackRuleData data)
+		PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
 		{
-			string extension = StringUtility.RemoveFirstChar(Path.GetExtension(data.AssetPath));
+			string bundleName = data.AssetPath;
-			if (extension == EAssetFileExtension.unity.ToString() || extension == EAssetFileExtension.prefab.ToString() ||
+			PackRuleResult result = new PackRuleResult(bundleName, DefaultPackRule.RawFileExtension);
-				extension == EAssetFileExtension.mat.ToString() || extension == EAssetFileExtension.controller.ToString() ||
+			return result;
-				extension == EAssetFileExtension.fbx.ToString() || extension == EAssetFileExtension.anim.ToString() ||
+		}
-				extension == EAssetFileExtension.shader.ToString())
-			{
-				throw new Exception($"{nameof(PackRawFile)} is not support file estension : {extension}");
-			}
 
-			// 注意：原生文件只支持无依赖关系的资源
+		bool IPackRule.IsRawFilePackRule()
-			string[] depends = AssetDatabase.GetDependencies(data.AssetPath, true);
+		{
-			if (depends.Length != 1)
+			return true;
-				throw new Exception($"{nameof(PackRawFile)} is not support estension : {extension}");
-
-			return data.AssetPath;
 		}
 	}
 
@@ -132,9 +186,14 @@ namespace YooAsset.Editor
 	[DisplayName("打包着色器变种集合")]
 	public class PackShaderVariants : IPackRule
 	{
-		public string GetBundleName(PackRuleData data)
+		public PackRuleResult GetPackRuleResult(PackRuleData data)
 		{
-			return YooAssetSettings.UnityShadersBundleName;
+			return DefaultPackRule.CreateShadersPackRuleResult();
+		}
+
+		bool IPackRule.IsRawFilePackRule()
+		{
+			return false;
 		}
 	}
 }

Assets/YooAsset/Editor/AssetBundleCollector/IPackRule.cs

@@ -3,7 +3,7 @@ namespace YooAsset.Editor
 {
 	public struct PackRuleData
 	{
-		public string AssetPath;		
+		public string AssetPath;
 		public string CollectPath;
 		public string GroupName;
 
@@ -21,14 +21,59 @@ namespace YooAsset.Editor
 		}
 	}
 
+	public struct PackRuleResult
+	{
+		private readonly string _bundleName;
+		private readonly string _bundleExtension;
+
+		public PackRuleResult(string bundleName, string bundleExtension)
+		{
+			_bundleName = bundleName;
+			_bundleExtension = bundleExtension;
+		}
+
+		/// <summary>
+		/// 获取主资源包全名称
+		/// </summary>
+		public string GetMainBundleName(string packageName, bool uniqueBundleName)
+		{
+			string fullName;
+			string bundleName = EditorTools.GetRegularPath(_bundleName).Replace('/', '_').Replace('.', '_').ToLower();
+			if (uniqueBundleName)
+				fullName = $"{packageName}_{bundleName}.{_bundleExtension}";
+			else
+				fullName = $"{bundleName}.{_bundleExtension}";
+			return fullName.ToLower();
+		}
+		
+		/// <summary>
+		/// 获取共享资源包全名称
+		/// </summary>
+		public string GetShareBundleName(string packageName, bool uniqueBundleName)
+		{
+			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>
 	/// 资源打包规则接口
 	/// </summary>
 	public interface IPackRule
 	{
 		/// <summary>
-		/// 获取资源打包所属的资源包名称
+		/// 获取打包规则结果
 		/// </summary>
-		string GetBundleName(PackRuleData data);
+		PackRuleResult GetPackRuleResult(PackRuleData data);
+
+		/// <summary>
+		/// 是否为原生文件打包规则
+		/// </summary>
+		bool IsRawFilePackRule();
 	}
 }

Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterAssetListViewer.uxml

@@ -1,10 +1,10 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements">
     <ui:VisualElement name="TopGroup" style="flex-grow: 1; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 2px; margin-bottom: 1px; display: flex;">
         <uie:Toolbar name="TopBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
             <uie:ToolbarButton text="Asset Path" display-tooltip-when-elided="true" name="TopBar1" style="width: 280px; -unity-text-align: middle-left; flex-grow: 1;" />
             <uie:ToolbarButton text="Main Bundle" display-tooltip-when-elided="true" name="TopBar2" style="width: 145px; -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;" />
+        <ui:ListView focusable="true" name="TopListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1; flex-basis: 60px;" />
     </ui:VisualElement>
     <ui:VisualElement name="BottomGroup" style="height: 200px; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 1px; margin-bottom: 1px; display: flex;">
         <uie:Toolbar name="BottomBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">

Assets/YooAsset/Editor/AssetBundleReporter/VisualViewers/ReporterBundleListViewer.uxml

@@ -1,4 +1,4 @@
-<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements">
     <ui:VisualElement name="Viewer" style="flex-grow: 1; display: flex;">
         <ui:VisualElement name="TopGroup" style="flex-grow: 1; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 2px; margin-bottom: 1px; display: flex;">
             <uie:Toolbar name="TopBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">
@@ -8,7 +8,7 @@
                 <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="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;" />
+            <ui:ListView focusable="true" name="TopListView" item-height="18" virtualization-method="DynamicHeight" style="flex-grow: 1; flex-basis: 60px;" />
         </ui:VisualElement>
         <ui:VisualElement name="BottomGroup" style="height: 200px; border-left-width: 1px; border-right-width: 1px; border-top-width: 1px; border-bottom-width: 1px; border-left-color: rgb(0, 0, 0); border-right-color: rgb(0, 0, 0); border-top-color: rgb(0, 0, 0); border-bottom-color: rgb(0, 0, 0); margin-left: 0; margin-right: 0; margin-top: 1px; margin-bottom: 1px; display: flex;">
             <uie:Toolbar name="BottomBar" style="height: 25px; margin-left: 1px; margin-right: 1px;">

Assets/YooAsset/Runtime/PatchSystem/PatchBundle.cs

@@ -122,7 +122,7 @@ namespace YooAsset
 		}
 
 		/// <summary>
-		/// 文件名称（远端文件名和内置文件名）
+		/// 文件名称
 		/// </summary>
 		private string _fileName;
 		public string FileName
@@ -135,6 +135,20 @@ namespace YooAsset
 			}
 		}
 
+		/// <summary>
+		/// 文件后缀名
+		/// </summary>
+		private string _fileExtension;
+		public string FileExtension
+		{
+			get
+			{
+				if (string.IsNullOrEmpty(_fileExtension))
+					throw new Exception("Should never get here !");
+				return _fileExtension;
+			}
+		}
+
 
 		public PatchBundle()
 		{
@@ -146,7 +160,8 @@ namespace YooAsset
 		public void ParseBundle(string packageName, int nameStype)
 		{
 			PackageName = packageName;
-			_fileName = PatchManifestTools.CreateBundleFileName(nameStype, BundleName, FileHash, IsRawFile);
+			_fileExtension = PatchManifestTools.GetRemoteBundleFileExtension(BundleName);
+			_fileName = PatchManifestTools.GetRemoteBundleFileName(nameStype, BundleName, _fileExtension, FileHash);
 		}
 
 		/// <summary>

Assets/YooAsset/Runtime/PatchSystem/PatchManifestTools.cs

@@ -155,21 +155,21 @@ namespace YooAsset
 		}
 #endif
 
-		/// <summary>
+		public static string GetRemoteBundleFileExtension(string bundleName)
-		/// 生成Bundle文件的正式名称
+		{
-		/// </summary>
+			string fileExtension = Path.GetExtension(bundleName);
-		public static string CreateBundleFileName(int nameStyle, string bundleName, string fileHash, bool isRawFile)
+			return fileExtension;
+		}
+		public static string GetRemoteBundleFileName(int nameStyle, string bundleName, string fileExtension, string fileHash)
 		{
 			if (nameStyle == 1) //HashName
 			{
-				string fileExtension = isRawFile ? YooAssetSettingsData.Setting.RawBundleFileVariant : YooAssetSettingsData.Setting.AssetBundleFileVariant;
+				return StringUtility.Format("{0}{1}", fileHash, fileExtension);
-				return StringUtility.Format("{0}.{1}", fileHash, fileExtension);
 			}
 			else if (nameStyle == 4) //BundleName_HashName
 			{
 				string fileName = bundleName.Remove(bundleName.LastIndexOf('.'));
-				string fileExtension = isRawFile ? YooAssetSettingsData.Setting.RawBundleFileVariant : YooAssetSettingsData.Setting.AssetBundleFileVariant;
+				return StringUtility.Format("{0}_{1}{2}", fileName, fileHash, fileExtension);
-				return StringUtility.Format("{0}_{1}.{2}", fileName, fileHash, fileExtension);
 			}
 			else
 			{

Assets/YooAsset/Runtime/Settings/YooAssetSettings.cs

@@ -5,26 +5,11 @@ namespace YooAsset
 	[CreateAssetMenu(fileName = "YooAssetSettings", menuName = "YooAsset/Create Settings")]
 	internal class YooAssetSettings : ScriptableObject
 	{
-		/// <summary>
-		/// AssetBundle文件的后缀名
-		/// </summary>
-		public string AssetBundleFileVariant = "bundle";
-
-		/// <summary>
-		/// 原生文件的后缀名
-		/// </summary>
-		public string RawBundleFileVariant = "rawfile";
-
 		/// <summary>
 		/// 清单文件名称
 		/// </summary>
 		public string PatchManifestFileName = "PatchManifest";
 
-		/// <summary>
-		/// 资源包名正规化（移除路径分隔符）
-		/// </summary>
-		public bool RegularBundleName = true;
-
 
 		/// <summary>
 		/// 清单文件头标记
@@ -41,7 +26,7 @@ namespace YooAsset
 		/// </summary>
 		public const string PatchManifestFileVersion = "1.4.0";
 
-		
+
 		/// <summary>
 		/// 缓存的数据文件名称
 		/// </summary>
@@ -63,20 +48,9 @@ namespace YooAsset
 		/// </summary>
 		public const string ReportFileName = "BuildReport";
 
-		/// <summary>
-		/// Unity着色器资源包名称
-		/// </summary>
-		public const string UnityShadersBundleName = "unityshaders";
-
 		/// <summary>
 		/// 内置资源目录名称
 		/// </summary>
 		public const string StreamingAssetsBuildinFolder = "BuildinFiles";
-
-
-		/// <summary>
-		/// 忽略的文件类型
-		/// </summary>
-		public static readonly string[] IgnoreFileExtensions = { "", ".so", ".dll", ".cs", ".js", ".boo", ".meta", ".cginc", ".hlsl" };
 	}
 }

Assets/YooAsset/Runtime/Settings/YooAssetSettingsData.cs

@@ -71,18 +71,5 @@ namespace YooAsset
 		{
 			return $"{Setting.PatchManifestFileName}_{packageName}.version";
 		}
-
-		/// <summary>
-		/// 获取着色器资源包全名称（包含后缀名）
-		/// </summary>
-		public static string GetUnityShadersBundleFullName(bool uniqueBundleName, string packageName)
-		{
-			string shareBundleName;
-			if (uniqueBundleName)
-				shareBundleName = $"{packageName.ToLower()}_{YooAssetSettings.UnityShadersBundleName}.{Setting.AssetBundleFileVariant}";
-			else
-				shareBundleName = $"{YooAssetSettings.UnityShadersBundleName}.{Setting.AssetBundleFileVariant}";
-			return shareBundleName.ToLower();
-		}
 	}
 }

Assets/YooAsset/Samples~/Extension Sample/Scripts/Editor/CustomPackRule.cs

@@ -10,7 +10,7 @@ public class PackEffectTexture : IPackRule
 {
 	private const string PackDirectory = "Assets/Effect/Textures/";
 
-	string IPackRule.GetBundleName(PackRuleData data)
+	PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
 	{
 		string assetPath = data.AssetPath;
 		if (assetPath.StartsWith(PackDirectory) == false)
@@ -18,6 +18,43 @@ public class PackEffectTexture : IPackRule
 	
 		string assetName = Path.GetFileName(assetPath).ToLower();
 		string firstChar = assetName.Substring(0, 1);
-		return $"{PackDirectory}effect_texture_{firstChar}";
+		string bundleName = $"{PackDirectory}effect_texture_{firstChar}";
+		var packRuleResult = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
+		return packRuleResult;
+	}
+
+	bool IPackRule.IsRawFilePackRule()
+	{
+		return false;
+	}
+}
+
+[DisplayName("打包视频（自定义）")]
+public class PackVideo : IPackRule
+{
+	public PackRuleResult GetPackRuleResult(PackRuleData data)
+	{
+		string bundleName = RemoveExtension(data.AssetPath);
+		string fileExtension = Path.GetExtension(data.AssetPath);
+		fileExtension = fileExtension.Remove(0, 1);
+		PackRuleResult result = new PackRuleResult(bundleName, fileExtension);
+		return result;
+	}
+
+	bool IPackRule.IsRawFilePackRule()
+	{
+		return true;
+	}
+
+	private string RemoveExtension(string str)
+	{
+		if (string.IsNullOrEmpty(str))
+			return str;
+
+		int index = str.LastIndexOf(".");
+		if (index == -1)
+			return str;
+		else
+			return str.Remove(index); //"assets/config/test.unity3d" --> "assets/config/test"
 	}
 }

Assets/YooAsset/Samples~/Space Shooter/GameScript/Editor/Encryption.cs

@@ -42,7 +42,8 @@ public class FileStreamEncryption : IEncryptionServices
 {
 	public EncryptResult Encrypt(EncryptFileInfo fileInfo)
 	{
-		if (fileInfo.BundleName.Contains("gameres_music"))
+		// LoadFromStream
+		if (fileInfo.BundleName.Contains("_gameres_audio"))
 		{
 			var fileData = File.ReadAllBytes(fileInfo.FilePath);
 			for (int i = 0; i < fileData.Length; i++)
@@ -55,7 +56,22 @@ public class FileStreamEncryption : IEncryptionServices
 			result.EncryptedData = fileData;
 			return result;
 		}
-		else
+
+		// LoadFromFileOffset
+		if (fileInfo.BundleName.Contains("_gameres_uiimage"))
+		{
+			var fileData = File.ReadAllBytes(fileInfo.FilePath);
+			int offset = 32;
+			var temper = new byte[fileData.Length + offset];
+			Buffer.BlockCopy(fileData, 0, temper, offset, fileData.Length);
+
+			EncryptResult result = new EncryptResult();
+			result.LoadMethod = EBundleLoadMethod.LoadFromFileOffset;
+			result.EncryptedData = temper;
+			return result;
+		}
+
+		// Normal
 		{
 			EncryptResult result = new EncryptResult();
 			result.LoadMethod = EBundleLoadMethod.Normal;

Assets/YooAsset/package.json

@@ -1,7 +1,7 @@
 {
     "name": "com.tuyoogame.yooasset",
     "displayName": "YooAsset",
-    "version": "1.4.4-preview",
+    "version": "1.4.5-preview",
     "unity": "2019.4",
     "description": "unity3d resources management system.",
     "author": {

Docs/AssetBundleDeployer.md

@@ -20,3 +20,6 @@ CDN
     └─v2.0   
 ````
 
+**游戏版本说明**
+
+v1.0 代表的是游戏版本，不是资源版本。在没有更换安装包的前提下，不需要递增这个游戏版本。每次生成的补丁包只需要覆盖掉当前游戏版本目录下即可。

Docs/Samples.md

@@ -17,3 +17,9 @@
 1. Space Shooter在导入完成后，打开YooAsset->AssetBundle Collector窗口。
 1. 点击修复按钮，然后点击Save按钮保存配置，最后关闭窗口。
 3. 找到Boot.scene场景启动游戏。
+
+#### 太空战机项目
+
+首次需要在项目里手动添加Tags才可以保证真机演示正常运行。
+
+![image](./Image/Samples-img3.jpg)

Docs/ShaderVariantCollector.md

@@ -4,6 +4,8 @@
 
 点击搜集变种按钮开始收集，请耐心等待结束。
 
+**注意：在收集完成之后，需要将生成的shadervariants文件配置到收集界面（AssetBundle Collector）。**
+
 ### Jenkins支持
 
 ```c#