This commit is contained in:
陈思海 2025-05-13 10:40:21 +08:00
parent 528172e14c
commit 7ac067086b
3 changed files with 16 additions and 4 deletions

View File

@ -28,7 +28,7 @@ public class ResourceBuildParameter
public ECompressOption CompressOption = ECompressOption.LZ4; public ECompressOption CompressOption = ECompressOption.LZ4;
public EFileNameStyle FileNameStyle = EFileNameStyle.BundleName_HashName; // public EFileNameStyle FileNameStyle = EFileNameStyle.BundleName_HashName;
public string EncryptionServiceType = "AlicizaX.Resource.Editor.FileOffsetEncryption"; public string EncryptionServiceType = "AlicizaX.Resource.Editor.FileOffsetEncryption";
} }

View File

@ -49,7 +49,7 @@ public static class ResourceBuildHelper
BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(), BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(),
PackageVersion = buildParameter.UseDefaultPackageVersion ? GeneratePackageVersion() : buildParameter.PackageVersion, PackageVersion = buildParameter.UseDefaultPackageVersion ? GeneratePackageVersion() : buildParameter.PackageVersion,
CompressOption = buildParameter.CompressOption, CompressOption = buildParameter.CompressOption,
FileNameStyle = buildParameter.FileNameStyle, BuiltinShadersBundleName = GetBuiltinShaderBundleName(),
VerifyBuildingResult = true, VerifyBuildingResult = true,
ClearBuildCacheFiles = false, ClearBuildCacheFiles = false,
BuildinFileCopyOption = copyOption, BuildinFileCopyOption = copyOption,
@ -80,6 +80,18 @@ public static class ResourceBuildHelper
} }
} }
/// <summary>
/// 内置着色器资源包名称
/// 注意:和自动收集的着色器资源包名保持一致!
/// </summary>
private static string GetBuiltinShaderBundleName()
{
var uniqueBundleName = AssetBundleCollectorSettingData.Setting.UniqueBundleName;
var packRuleResult = DefaultPackRule.CreateShadersPackRuleResult();
return packRuleResult.GetBundleName(BuildPackageName, uniqueBundleName);
}
private static void CopyFiles(string source, string destination) private static void CopyFiles(string source, string destination)
{ {
try try

View File

@ -66,6 +66,7 @@ public static class EditorSpriteSaveInfo
{ {
ti.SaveAndReimport(); ti.SaveAndReimport();
} }
#endregion #endregion
} }
@ -127,9 +128,8 @@ public static class EditorSpriteSaveInfo
public static void MarkParentAtlasesDirty(string assetPath) public static void MarkParentAtlasesDirty(string assetPath)
{ {
var currentPath = Path.GetDirectoryName(assetPath); var currentPath = Path.GetDirectoryName(assetPath)?.Replace("\\", "/");
var rootPath = Config.sourceAtlasRoot.Replace("\\", "/").TrimEnd('/'); var rootPath = Config.sourceAtlasRoot.Replace("\\", "/").TrimEnd('/');
while (currentPath != null && currentPath.StartsWith(rootPath)) while (currentPath != null && currentPath.StartsWith(rootPath))
{ {
var parentAtlasName = GetAtlasNameForDirectory(currentPath); var parentAtlasName = GetAtlasNameForDirectory(currentPath);