From 7ac067086b960b8c3ec31fc1626655519daba03b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B5=B7?= <1464576565@qq.com>
Date: Tue, 13 May 2025 10:40:21 +0800
Subject: [PATCH] modify

---
 Editor/Build/BuildCLI/BuildParameter.cs            |  2 +-
 Editor/Build/BuildCLI/ResourceBuildHelper.cs       | 14 +++++++++++++-
 Editor/Postprocessor/Atlas/EditorSpriteSaveInfo.cs |  4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Editor/Build/BuildCLI/BuildParameter.cs b/Editor/Build/BuildCLI/BuildParameter.cs
index 176c29f..a1d3075 100644
--- a/Editor/Build/BuildCLI/BuildParameter.cs
+++ b/Editor/Build/BuildCLI/BuildParameter.cs
@@ -28,7 +28,7 @@ public class ResourceBuildParameter
 
 
     public ECompressOption CompressOption = ECompressOption.LZ4;
-    public EFileNameStyle FileNameStyle = EFileNameStyle.BundleName_HashName;
+    // public EFileNameStyle FileNameStyle = EFileNameStyle.BundleName_HashName;
     public string EncryptionServiceType = "AlicizaX.Resource.Editor.FileOffsetEncryption";
 }
 
diff --git a/Editor/Build/BuildCLI/ResourceBuildHelper.cs b/Editor/Build/BuildCLI/ResourceBuildHelper.cs
index 7d43e56..7fca405 100644
--- a/Editor/Build/BuildCLI/ResourceBuildHelper.cs
+++ b/Editor/Build/BuildCLI/ResourceBuildHelper.cs
@@ -49,7 +49,7 @@ public static class ResourceBuildHelper
                 BuildinFileRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(),
                 PackageVersion = buildParameter.UseDefaultPackageVersion ? GeneratePackageVersion() : buildParameter.PackageVersion,
                 CompressOption = buildParameter.CompressOption,
-                FileNameStyle = buildParameter.FileNameStyle,
+                BuiltinShadersBundleName = GetBuiltinShaderBundleName(),
                 VerifyBuildingResult = true,
                 ClearBuildCacheFiles = false,
                 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)
     {
         try
diff --git a/Editor/Postprocessor/Atlas/EditorSpriteSaveInfo.cs b/Editor/Postprocessor/Atlas/EditorSpriteSaveInfo.cs
index 909eedb..ea46024 100644
--- a/Editor/Postprocessor/Atlas/EditorSpriteSaveInfo.cs
+++ b/Editor/Postprocessor/Atlas/EditorSpriteSaveInfo.cs
@@ -66,6 +66,7 @@ public static class EditorSpriteSaveInfo
         {
             ti.SaveAndReimport();
         }
+
         #endregion
     }
 
@@ -127,9 +128,8 @@ public static class EditorSpriteSaveInfo
 
     public static void MarkParentAtlasesDirty(string assetPath)
     {
-        var currentPath = Path.GetDirectoryName(assetPath);
+        var currentPath = Path.GetDirectoryName(assetPath)?.Replace("\\", "/");
         var rootPath = Config.sourceAtlasRoot.Replace("\\", "/").TrimEnd('/');
-
         while (currentPath != null && currentPath.StartsWith(rootPath))
         {
             var parentAtlasName = GetAtlasNameForDirectory(currentPath);