CHANGELOG.md

@@ -2,19 +2,6 @@
 
 All notable changes to this package will be documented in this file.
 
-## [2.3.8] - 2025-04-17
-
-### Improvements
-
-- 扩展工程里增加了“图集丢失变白块的解决方案”的相关代码。
-
-### Fixed
-
-- (#528) 修复了微信小游戏平台WXFSClearUnusedBundleFiles无法清理的问题。
-- (#531) 修复了微信小游戏平台WXFSClearUnusedBundleFiles没有适配BundleName_HashName命名方式。
-- (#533) 修复了Editor程序集下无法访问YooAsset.Editor程序集里的internal字段的问题。
-- (#534) 修复了资源报告窗口AssetView视图里，依赖资源包列表显示不准确的问题。
-
 ## [2.3.7] - 2025-04-01
 
 ### Improvements

Editor/Assembly/AssemblyInfo.cs

@@ -1,5 +0,0 @@
-using System.Runtime.CompilerServices;
-
-// 外部友元
-[assembly: InternalsVisibleTo("YooAsset.EditorExtension")]
-[assembly: InternalsVisibleTo("Assembly-CSharp-Editor")]

Editor/Assembly/MacroDefine.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 
-#if YOO_ASSET_EXPERIMENT
 namespace YooAsset.Editor
 {
     public class MacroDefine
@@ -16,4 +15,3 @@ namespace YooAsset.Editor
         };
     }
 }
-#endif

Editor/Assembly/MacroProcessor.cs

@@ -5,7 +5,6 @@ using System.Text;
 using System.Xml;
 using UnityEditor;
 
-#if YOO_ASSET_EXPERIMENT
 namespace YooAsset.Editor
 {
     [InitializeOnLoad]
@@ -23,21 +22,13 @@ namespace YooAsset.Editor
                 return content;
 
             // 将修改后的XML结构重新输出为文本
-            using (var memoryStream = new MemoryStream())
-            {
-                var writerSettings = new XmlWriterSettings
-                {
-                    Indent = true,
-                    Encoding = new UTF8Encoding(false), //无BOM
-                    OmitXmlDeclaration = false
-                };
-
-                using (var xmlWriter = XmlWriter.Create(memoryStream, writerSettings))
-                {
-                    xmlDoc.Save(xmlWriter);
-                }
-                return Encoding.UTF8.GetString(memoryStream.ToArray());
-            }
+            var stringWriter = new StringWriter();
+            var writerSettings = new XmlWriterSettings();
+            writerSettings.Indent = true;
+            var xmlWriter = XmlWriter.Create(stringWriter, writerSettings);
+            xmlDoc.WriteTo(xmlWriter);
+            xmlWriter.Flush();
+            return stringWriter.ToString();
         }
 
         /// <summary>
@@ -103,4 +94,3 @@ namespace YooAsset.Editor
         }
     }
 }
-#endif

Editor/AssetBundleBuilder/AssetBundleBuilder.cs

@@ -32,9 +32,8 @@ namespace YooAsset.Editor
             var buildParametersContext = new BuildParametersContext(buildParameters);
             _buildContext.SetContextObject(buildParametersContext);
 
-            // 初始化日志系统
-            string logFilePath = $"{buildParametersContext.GetPipelineOutputDirectory()}/buildInfo.log";
-            BuildLogger.InitLogger(enableLog, logFilePath);
+            // 初始化日志
+            BuildLogger.InitLogger(enableLog);
 
             // 执行构建流程
             BuildLogger.Log($"Begin to build package : {buildParameters.PackageName} by {buildParameters.BuildPipeline}");
@@ -51,9 +50,6 @@ namespace YooAsset.Editor
                 BuildLogger.Error(buildResult.ErrorInfo);
             }
 
-            // 关闭日志系统
-            BuildLogger.Shuntdown();
-
             return buildResult;
         }
     }

Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/BuildTasks/TaskPrepare_SBP.cs

@@ -11,7 +11,7 @@ namespace YooAsset.Editor
         void IBuildTask.Run(BuildContext context)
         {
             var buildParametersContext = context.GetContextObject<BuildParametersContext>();
-            var buildParameters = buildParametersContext.Parameters as ScriptableBuildParameters;
+            var buildParameters = buildParametersContext.Parameters;
 
             // 检测基础构建参数
             buildParametersContext.CheckBuildParameters();
@@ -50,13 +50,6 @@ namespace YooAsset.Editor
             {
                 BuildLogger.Log($"Create pipeline output directory: {pipelineOutputDirectory}");
             }
-
-            // 检测内置着色器资源包名称
-            if (string.IsNullOrEmpty(buildParameters.BuiltinShadersBundleName))
-            {
-                string warning = BuildLogger.GetErrorMessage(ErrorCode.BuiltinShadersBundleNameIsNull, $"Builtin shaders bundle name is null. It will cause resource redundancy !");
-                BuildLogger.Warning(warning);
-            }
         }
     }
 }

Editor/AssetBundleBuilder/BuildPipeline/ScriptableBuildPipeline/ScriptableBuildParameters.cs

@@ -14,11 +14,6 @@ namespace YooAsset.Editor
         /// </summary>
         public ECompressOption CompressOption = ECompressOption.Uncompressed;
 
-        /// <summary>
-        /// 从AssetBundle文件头里剥离Unity版本信息
-        /// </summary>
-        public bool StripUnityVersion = false;
-
         /// <summary>
         /// 禁止写入类型树结构（可以降低包体和内存并提高加载效率）
         /// </summary>
@@ -75,9 +70,6 @@ namespace YooAsset.Editor
             else
                 throw new System.NotImplementedException(CompressOption.ToString());
 
-            if (StripUnityVersion)
-                buildParams.ContentBuildFlags |= UnityEditor.Build.Content.ContentBuildFlags.StripUnityVersion;
-
             if (DisableWriteTypeTree)
                 buildParams.ContentBuildFlags |= UnityEditor.Build.Content.ContentBuildFlags.DisableWriteTypeTree;
 

Editor/AssetBundleBuilder/BuildSystem/BuildLogger.cs

@@ -2,100 +2,37 @@
 using System.IO;
 using System.Collections.Generic;
 using UnityEngine;
-using System.Text;
 
 namespace YooAsset.Editor
 {
     internal static class BuildLogger
     {
-        private const int MAX_LOG_BUFFER_SIZE = 1024 * 1024 * 2; //2MB
-
         private static bool _enableLog = true;
-        private static string _logFilePath;
 
-        private static readonly object _lockObj = new object();
-        private static readonly StringBuilder _logBuilder = new StringBuilder(MAX_LOG_BUFFER_SIZE);
-
-        /// <summary>
-        /// 初始化日志系统
-        /// </summary>
-        public static void InitLogger(bool enableLog, string logFilePath)
+        public static void InitLogger(bool enableLog)
         {
             _enableLog = enableLog;
-            _logFilePath = logFilePath;
-            _logBuilder.Clear();
-
-            if (_enableLog)
-            {
-                if (string.IsNullOrEmpty(_logFilePath))
-                    throw new Exception("Log file path is null or empty !");
-
-                Debug.Log($"Logger initialized at {DateTime.Now:yyyy-MM-dd HH:mm:ss}");
-            }
-        }
-
-        /// <summary>
-        /// 关闭日志系统
-        /// </summary>
-        public static void Shuntdown()
-        {
-            if (_enableLog)
-            {
-                lock (_lockObj)
-                {
-                    try
-                    {
-                        if (File.Exists(_logFilePath))
-                            File.Delete(_logFilePath);
-
-                        FileUtility.CreateFileDirectory(_logFilePath);
-                        File.WriteAllText(_logFilePath, _logBuilder.ToString(), Encoding.UTF8);
-                        _logBuilder.Clear();
-                    }
-                    catch (Exception ex)
-                    {
-                        Debug.LogError($"Failed to write log file: {ex.Message}");
-                    }
-                }
-            }
         }
 
         public static void Log(string message)
         {
             if (_enableLog)
             {
-                WriteLog("INFO", message);
                 Debug.Log(message);
             }
         }
         public static void Warning(string message)
         {
-            if (_enableLog)
-            {
-                WriteLog("WARN", message);
-                Debug.LogWarning(message);
-            }
+            Debug.LogWarning(message);
         }
         public static void Error(string message)
         {
-            if (_enableLog)
-            {
-                WriteLog("ERROR", message);
-                Debug.LogError(message);
-            }
+            Debug.LogError(message);
         }
+
         public static string GetErrorMessage(ErrorCode code, string message)
         {
             return $"[ErrorCode{(int)code}] {message}";
         }
-
-        private static void WriteLog(string level, string message)
-        {
-            lock (_lockObj)
-            {
-                string logEntry = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff} [{level}] {message}";
-                _logBuilder.AppendLine(logEntry);
-            }
-        }
     }
 }

Editor/AssetBundleBuilder/BuildSystem/ErrorCode.cs

@@ -15,7 +15,6 @@ namespace YooAsset.Editor
         BuildPipelineIsNullOrEmpty = 116,
         BuildBundleTypeIsUnknown = 117,
         RecommendScriptBuildPipeline = 130,
-        BuiltinShadersBundleNameIsNull = 131,
 
         // TaskGetBuildMap
         RemoveInvalidTags = 200,

Editor/AssetBundleBuilder/EFileNameStyle.cs

@@ -1,6 +1,9 @@
 
-namespace YooAsset
+namespace YooAsset.Editor
 {
+    /// <summary>
+    /// 补丁包内的文件样式
+    /// </summary>
     public enum EFileNameStyle
     {
         /// <summary>

Editor/AssetBundleBuilder/EFileNameStyle.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5e81f00e510f07947873055518f5d1c6
+guid: 84c5eff5dedf53343897e83f6b10eea6
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Editor/AssetBundleCollector/AssetBundleCollector.cs

@@ -259,13 +259,10 @@ namespace YooAsset.Editor
         }
         private List<string> GetAssetTags(AssetBundleCollectorGroup group)
         {
-            List<string> result = EditorTools.StringToStringList(AssetTags, ';');
-            if (CollectorType == ECollectorType.MainAssetCollector)
-            {
-                List<string> temps = EditorTools.StringToStringList(group.AssetTags, ';');
-                result.AddRange(temps);
-            }
-            return result;
+            List<string> tags = EditorTools.StringToStringList(group.AssetTags, ';');
+            List<string> temper = EditorTools.StringToStringList(AssetTags, ';');
+            tags.AddRange(temper);
+            return tags;
         }
         private List<AssetInfo> GetAllDependencies(CollectCommand command, string mainAssetPath)
         {

Editor/AssetBundleDebugger/AssetBundleDebuggerWindow.cs

@@ -296,7 +296,6 @@ namespace YooAsset.Editor
                 string filePath = $"{resultPath}/{nameof(DebugReport)}_{_currentReport.FrameCount}.json";
                 string fileContent = JsonUtility.ToJson(_currentReport, true);
                 FileUtility.WriteAllText(filePath, fileContent);
-                Debug.Log($"Debug report file saved : {filePath}");
             }
         }
         private void OnSearchKeyWordChange(ChangeEvent<string> e)

Editor/AssetBundleReporter/VisualViewers/ReporterAssetListViewer.cs

@@ -238,8 +238,9 @@ namespace YooAsset.Editor
             ReportAssetInfo assetInfo = assetTableData.AssetInfo;
 
             // 填充依赖数据
-            var sourceDatas = new List<ITableData>(assetInfo.DependBundles.Count);
-            foreach (string dependBundleName in assetInfo.DependBundles)
+            var mainBundle = _buildReport.GetBundleInfo(assetInfo.MainBundleName);
+            var sourceDatas = new List<ITableData>(mainBundle.DependBundles.Count);
+            foreach (string dependBundleName in mainBundle.DependBundles)
             {
                 var dependBundle = _buildReport.GetBundleInfo(dependBundleName);
                 var rowData = new DependTableData();

Editor/Extension.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b06ab19560638014094f5cf14a1e05bf
+guid: 7f69598c1185588408737e4dc0a485f0
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Editor/Extension/PackageImporter/PackageImporterWindow.cs

@@ -51,6 +51,10 @@ namespace YooAsset.Editor
             string manifestFileName = Path.GetFileNameWithoutExtension(manifestFilePath);
             string outputDirectory = Path.GetDirectoryName(manifestFilePath);
 
+            // 加载补丁清单
+            byte[] bytesData = FileUtility.ReadAllBytes(manifestFilePath);
+            PackageManifest manifest = ManifestTools.DeserializeFromBinary(bytesData);
+
             // 拷贝核心文件
             {
                 string sourcePath = $"{outputDirectory}/{manifestFileName}.bytes";
@@ -63,16 +67,12 @@ namespace YooAsset.Editor
                 EditorTools.CopyFile(sourcePath, destPath, true);
             }
             {
-                string fileName = YooAssetSettingsData.GetPackageVersionFileName(_packageName);
+                string fileName = YooAssetSettingsData.GetPackageVersionFileName(manifest.PackageName);
                 string sourcePath = $"{outputDirectory}/{fileName}";
                 string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsRoot()}/{_packageName}/{fileName}";
                 EditorTools.CopyFile(sourcePath, destPath, true);
             }
 
-            // 加载补丁清单
-            byte[] bytesData = FileUtility.ReadAllBytes(manifestFilePath);
-            PackageManifest manifest = ManifestTools.DeserializeFromBinary(bytesData);
-
             // 拷贝文件列表
             int fileCount = 0;
             foreach (var packageBundle in manifest.BundleList)

Runtime/Assembly/AssemblyInfo.cs

@@ -1,10 +1,7 @@
 using System.Runtime.CompilerServices;
 
-// 内部友元
 [assembly: InternalsVisibleTo("YooAsset.Editor")]
-[assembly: InternalsVisibleTo("YooAsset.Test.Editor")]
-
-// 外部友元
-[assembly: InternalsVisibleTo("YooAsset.RuntimeExtension")]
 [assembly: InternalsVisibleTo("YooAsset.EditorExtension")]
+[assembly: InternalsVisibleTo("YooAsset.RuntimeExtension")]
+[assembly: InternalsVisibleTo("YooAsset.Test.Editor")]
 [assembly: InternalsVisibleTo("Assembly-CSharp-Editor")]

Runtime/DownloadSystem/DownloadParam.cs

@@ -0,0 +1,30 @@
+
+namespace YooAsset
+{
+    internal class DownloadParam
+    {
+        public readonly int FailedTryAgain;
+        public readonly int Timeout;
+
+        /// <summary>
+        /// 导入的本地文件路径
+        /// </summary>
+        public string ImportFilePath { set; get; }
+
+        /// <summary>
+        /// 主资源地址
+        /// </summary>
+        public string MainURL { set; get; }
+
+        /// <summary>
+        /// 备用资源地址
+        /// </summary>
+        public string FallbackURL { set; get; }
+
+        public DownloadParam(int failedTryAgain, int timeout)
+        {
+            FailedTryAgain = failedTryAgain;
+            Timeout = timeout;
+        }
+    }
+}

Runtime/DownloadSystem/DownloadParam.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ef774f01e50ab0a4d88122041938a6b9
+guid: 56ea224b45d314e4a86b558404e9b6c8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Runtime/Extension.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ae7a42484691fc944a8fa22364b6bcbb
+guid: f9f032cf1db8d624b9dd6f373396813e
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Runtime/Extension/ExtensionClass.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4638a54ac22c5e84fb0e3a098e97808b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Runtime/FileSystem/DefaultBuildinFileSystem/DefaultBuildinFileSystem.cs

@@ -109,15 +109,15 @@ namespace YooAsset
             var operation = new DBFSRequestPackageVersionOperation(this);
             return operation;
         }
-        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options)
+        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
         {
-            return _unpackFileSystem.ClearCacheFilesAsync(manifest, options);
+            return _unpackFileSystem.ClearCacheFilesAsync(manifest, clearMode, clearParam);
         }
-        public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
+        public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadParam param)
         {
             // 注意：业务层的解压下载器会依赖内置文件系统的下载方法
-            options.ImportFilePath = GetBuildinFileLoadPath(bundle);
-            return _unpackFileSystem.DownloadFileAsync(bundle, options);
+            param.ImportFilePath = GetBuildinFileLoadPath(bundle);
+            return _unpackFileSystem.DownloadFileAsync(bundle, param);
         }
         public virtual FSLoadBundleOperation LoadBundleFile(PackageBundle bundle)
         {

Runtime/FileSystem/DefaultCacheFileSystem/DefaultCacheFileSystem.cs

@@ -120,43 +120,43 @@ namespace YooAsset
             var operation = new DCFSRequestPackageVersionOperation(this, appendTimeTicks, timeout);
             return operation;
         }
-        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options)
+        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
         {
-            if (options.ClearMode == EFileClearMode.ClearAllBundleFiles.ToString())
+            if (clearMode == EFileClearMode.ClearAllBundleFiles.ToString())
             {
                 var operation = new ClearAllCacheBundleFilesOperation(this);
                 return operation;
             }
-            else if (options.ClearMode == EFileClearMode.ClearUnusedBundleFiles.ToString())
+            else if (clearMode == EFileClearMode.ClearUnusedBundleFiles.ToString())
             {
                 var operation = new ClearUnusedCacheBundleFilesOperation(this, manifest);
                 return operation;
             }
-            else if (options.ClearMode == EFileClearMode.ClearBundleFilesByTags.ToString())
+            else if (clearMode == EFileClearMode.ClearBundleFilesByTags.ToString())
             {
-                var operation = new ClearCacheBundleFilesByTagsOperaiton(this, manifest, options.ClearParam);
+                var operation = new ClearCacheBundleFilesByTagsOperaiton(this, manifest, clearParam);
                 return operation;
             }
-            else if (options.ClearMode == EFileClearMode.ClearAllManifestFiles.ToString())
+            else if (clearMode == EFileClearMode.ClearAllManifestFiles.ToString())
             {
                 var operation = new ClearAllCacheManifestFilesOperation(this);
                 return operation;
             }
-            else if (options.ClearMode == EFileClearMode.ClearUnusedManifestFiles.ToString())
+            else if (clearMode == EFileClearMode.ClearUnusedManifestFiles.ToString())
             {
                 var operation = new ClearUnusedCacheManifestFilesOperation(this, manifest);
                 return operation;
             }
             else
             {
-                string error = $"Invalid clear mode : {options.ClearMode}";
+                string error = $"Invalid clear mode : {clearMode}";
                 var operation = new FSClearCacheFilesCompleteOperation(error);
                 return operation;
             }
         }
-        public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
+        public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadParam param)
         {
-            var downloader = DownloadCenter.DownloadFileAsync(bundle, options);
+            var downloader = DownloadCenter.DownloadFileAsync(bundle, param);
             downloader.Reference(); //增加下载器的引用计数
 
             // 注意：将下载器进行包裹，可以避免父类任务终止的时候，连带子任务里的下载器也一起被终止！

Runtime/FileSystem/DefaultCacheFileSystem/Operation/DCFSLoadBundleOperation.cs

@@ -58,8 +58,8 @@ namespace YooAsset
                 // 注意：边玩边下下载器引用计数没有Release
                 if (_downloadFileOp == null)
                 {
-                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue, 60);
-                    _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, options);
+                    DownloadParam downloadParam = new DownloadParam(int.MaxValue, 60);
+                    _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, downloadParam);
                     _downloadFileOp.StartOperation();
                     AddChildOperation(_downloadFileOp);
                 }
@@ -297,8 +297,8 @@ namespace YooAsset
                 // 注意：边玩边下下载器引用计数没有Release
                 if (_downloadFileOp == null)
                 {
-                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue, 60);
-                    _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, options);
+                    DownloadParam downloadParam = new DownloadParam(int.MaxValue, 60);
+                    _downloadFileOp = _fileSystem.DownloadFileAsync(_bundle, downloadParam);
                     _downloadFileOp.StartOperation();
                     AddChildOperation(_downloadFileOp);
                 }

Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadCenterOperation.cs

@@ -74,7 +74,7 @@ namespace YooAsset
         /// <summary>
         /// 创建下载任务
         /// </summary>
-        public FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
+        public FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadParam param)
         {
             // 查询旧的下载器
             if (_downloaders.TryGetValue(bundle.BundleGUID, out var oldDownloader))
@@ -83,29 +83,29 @@ namespace YooAsset
             }
 
             // 设置请求URL
-            if (string.IsNullOrEmpty(options.ImportFilePath))
+            if (string.IsNullOrEmpty(param.ImportFilePath))
             {
-                options.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(bundle.FileName);
-                options.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(bundle.FileName);
+                param.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(bundle.FileName);
+                param.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(bundle.FileName);
             }
             else
             {
                 // 注意：把本地文件路径指定为远端下载地址
-                options.MainURL = DownloadSystemHelper.ConvertToWWWPath(options.ImportFilePath);
-                options.FallbackURL = options.MainURL;
+                param.MainURL = DownloadSystemHelper.ConvertToWWWPath(param.ImportFilePath);
+                param.FallbackURL = param.MainURL;
             }
 
             // 创建新的下载器
             DefaultDownloadFileOperation newDownloader;
             if (bundle.FileSize >= _fileSystem.ResumeDownloadMinimumSize)
             {
-                newDownloader = new DownloadResumeFileOperation(_fileSystem, bundle, options);
+                newDownloader = new DownloadResumeFileOperation(_fileSystem, bundle, param);
                 AddChildOperation(newDownloader);
                 _downloaders.Add(bundle.BundleGUID, newDownloader);
             }
             else
             {
-                newDownloader = new DownloadNormalFileOperation(_fileSystem, bundle, options);
+                newDownloader = new DownloadNormalFileOperation(_fileSystem, bundle, param);
                 AddChildOperation(newDownloader);
                 _downloaders.Add(bundle.BundleGUID, newDownloader);
             }

Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadNormalFileOperation.cs

@@ -12,13 +12,13 @@ namespace YooAsset
         private string _tempFilePath;
         private ESteps _steps = ESteps.None;
 
-        internal DownloadNormalFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, DownloadFileOptions options) : base(bundle, options)
+        internal DownloadNormalFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, DownloadParam param) : base(bundle, param)
         {
             _fileSystem = fileSystem;
         }
         internal override void InternalStart()
         {
-            _isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Options.MainURL);
+            _isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Param.MainURL);
             _tempFilePath = _fileSystem.GetTempFilePath(Bundle);
             _steps = ESteps.CheckExists;
         }

Runtime/FileSystem/DefaultCacheFileSystem/Operation/internal/DownloadResumeFileOperation.cs

@@ -15,13 +15,13 @@ namespace YooAsset
         private ESteps _steps = ESteps.None;
 
 
-        internal DownloadResumeFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, DownloadFileOptions options) : base(bundle, options)
+        internal DownloadResumeFileOperation(DefaultCacheFileSystem fileSystem, PackageBundle bundle, DownloadParam param) : base(bundle, param)
         {
             _fileSystem = fileSystem;
         }
         internal override void InternalStart()
         {
-            _isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Options.MainURL);
+            _isReuqestLocalFile = DownloadSystemHelper.IsRequestLocalFile(Param.MainURL);
             _tempFilePath = _fileSystem.GetTempFilePath(Bundle);
             _steps = ESteps.CheckExists;
         }

Runtime/FileSystem/DefaultEditorFileSystem/DefaultEditorFileSystem.cs

@@ -66,12 +66,12 @@ namespace YooAsset
             var operation = new DEFSRequestPackageVersionOperation(this);
             return operation;
         }
-        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options)
+        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
         {
             var operation = new FSClearCacheFilesCompleteOperation();
             return operation;
         }
-        public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
+        public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadParam param)
         {
             throw new System.NotImplementedException();
         }

Runtime/FileSystem/DefaultWebRemoteFileSystem/DefaultWebRemoteFileSystem.cs

@@ -73,12 +73,12 @@ namespace YooAsset
             var operation = new DWRFSRequestPackageVersionOperation(this, appendTimeTicks, timeout);
             return operation;
         }
-        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options)
+        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
         {
             var operation = new FSClearCacheFilesCompleteOperation();
             return operation;
         }
-        public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
+        public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadParam param)
         {
             throw new System.NotImplementedException();
         }

Runtime/FileSystem/DefaultWebRemoteFileSystem/Operation/DWRFSLoadBundleOperation.cs

@@ -34,19 +34,19 @@ namespace YooAsset
             {
                 if (_downloadAssetBundleOp == null)
                 {
-                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue, 60);
-                    options.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(_bundle.FileName);
-                    options.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(_bundle.FileName);
+                    DownloadParam downloadParam = new DownloadParam(int.MaxValue, 60);
+                    downloadParam.MainURL = _fileSystem.RemoteServices.GetRemoteMainURL(_bundle.FileName);
+                    downloadParam.FallbackURL = _fileSystem.RemoteServices.GetRemoteFallbackURL(_bundle.FileName);
 
                     if (_bundle.Encrypted)
                     {
-                        _downloadAssetBundleOp = new DownloadWebEncryptAssetBundleOperation(true, _fileSystem.DecryptionServices, _bundle, options);
+                        _downloadAssetBundleOp = new DownloadWebEncryptAssetBundleOperation(true, _fileSystem.DecryptionServices, _bundle, downloadParam);
                         _downloadAssetBundleOp.StartOperation();
                         AddChildOperation(_downloadAssetBundleOp);
                     }
                     else
                     {
-                        _downloadAssetBundleOp = new DownloadWebNormalAssetBundleOperation(_fileSystem.DisableUnityWebCache, _bundle, options);
+                        _downloadAssetBundleOp = new DownloadWebNormalAssetBundleOperation(_fileSystem.DisableUnityWebCache, _bundle, downloadParam);
                         _downloadAssetBundleOp.StartOperation();
                         AddChildOperation(_downloadAssetBundleOp);
                     }

Runtime/FileSystem/DefaultWebServerFileSystem/DefaultWebServerFileSystem.cs

@@ -82,12 +82,12 @@ namespace YooAsset
             var operation = new DWSFSRequestPackageVersionOperation(this, timeout);
             return operation;
         }
-        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options)
+        public virtual FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, string clearMode, object clearParam)
         {
             var operation = new FSClearCacheFilesCompleteOperation();
             return operation;
         }
-        public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options)
+        public virtual FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadParam param)
         {
             throw new System.NotImplementedException();
         }

Runtime/FileSystem/DefaultWebServerFileSystem/Operation/DWSFSLoadBundleOperation.cs

@@ -34,20 +34,20 @@ namespace YooAsset
             {
                 if (_downloadAssetBundleOp == null)
                 {
-                    DownloadFileOptions options = new DownloadFileOptions(int.MaxValue, 60);
+                    DownloadParam downloadParam = new DownloadParam(int.MaxValue, 60);
                     string fileLoadPath = _fileSystem.GetWebFileLoadPath(_bundle);
-                    options.MainURL = DownloadSystemHelper.ConvertToWWWPath(fileLoadPath);
-                    options.FallbackURL = options.MainURL;
+                    downloadParam.MainURL = DownloadSystemHelper.ConvertToWWWPath(fileLoadPath);
+                    downloadParam.FallbackURL = downloadParam.MainURL;
 
                     if (_bundle.Encrypted)
                     {
-                        _downloadAssetBundleOp = new DownloadWebEncryptAssetBundleOperation(true, _fileSystem.DecryptionServices, _bundle, options);
+                        _downloadAssetBundleOp = new DownloadWebEncryptAssetBundleOperation(true, _fileSystem.DecryptionServices, _bundle, downloadParam);
                         _downloadAssetBundleOp.StartOperation();
                         AddChildOperation(_downloadAssetBundleOp);
                     }
                     else
                     {
-                        _downloadAssetBundleOp = new DownloadWebNormalAssetBundleOperation(_fileSystem.DisableUnityWebCache, _bundle, options);
+                        _downloadAssetBundleOp = new DownloadWebNormalAssetBundleOperation(_fileSystem.DisableUnityWebCache, _bundle, downloadParam);
                         _downloadAssetBundleOp.StartOperation();
                         AddChildOperation(_downloadAssetBundleOp);
                     }

Runtime/FileSystem/Interface/IFileSystem.cs

@@ -37,13 +37,13 @@ namespace YooAsset
         /// <summary>
         /// 清理缓存文件
         /// </summary>
-        FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, ClearCacheFilesOptions options);
+        FSClearCacheFilesOperation ClearCacheFilesAsync(PackageManifest manifest, string clearMode, object clearParam);
 
         /// <summary>
         /// 下载Bundle文件
         /// </summary>
-        FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadFileOptions options);
-        
+        FSDownloadFileOperation DownloadFileAsync(PackageBundle bundle, DownloadParam param);
+
         /// <summary>
         /// 加载Bundle文件
         /// </summary>

Runtime/FileSystem/Operation/FSClearCacheFilesOperation.cs

@@ -1,19 +1,6 @@
 
 namespace YooAsset
 {
-    internal class ClearCacheFilesOptions
-    {
-        /// <summary>
-        /// 清理模式
-        /// </summary>
-        public string ClearMode;
-
-        /// <summary>
-        /// 附加参数
-        /// </summary>
-        public object ClearParam;
-    }
-
     internal abstract class FSClearCacheFilesOperation : AsyncOperationBase
     {
     }

Runtime/FileSystem/Operation/FSDownloadFileOperation.cs

@@ -1,40 +1,6 @@
 
 namespace YooAsset
 {
-    internal class DownloadFileOptions
-    {
-        /// <summary>
-        /// 失败后重试次数
-        /// </summary>
-        public readonly int FailedTryAgain;
-
-        /// <summary>
-        /// 超时时间
-        /// </summary>
-        public readonly int Timeout;
-
-        /// <summary>
-        /// 主资源地址
-        /// </summary>
-        public string MainURL { set; get; }
-
-        /// <summary>
-        /// 备用资源地址
-        /// </summary>
-        public string FallbackURL { set; get; }
-
-        /// <summary>
-        /// 导入的本地文件路径
-        /// </summary>
-        public string ImportFilePath { set; get; }
-
-        public DownloadFileOptions(int failedTryAgain, int timeout)
-        {
-            FailedTryAgain = failedTryAgain;
-            Timeout = timeout;
-        }
-    }
-
     internal abstract class FSDownloadFileOperation : AsyncOperationBase
     {
         public PackageBundle Bundle { private set; get; }

Runtime/FileSystem/Operation/Internal/DefaultDownloadFileOperation.cs

@@ -18,7 +18,7 @@ namespace YooAsset
         }
 
         // 下载参数
-        protected readonly DownloadFileOptions Options;
+        protected readonly DownloadParam Param;
 
         // 请求相关
         protected UnityWebRequest _webRequest;
@@ -35,10 +35,10 @@ namespace YooAsset
         protected int FailedTryAgain;
 
 
-        internal DefaultDownloadFileOperation(PackageBundle bundle, DownloadFileOptions options) : base(bundle)
+        internal DefaultDownloadFileOperation(PackageBundle bundle, DownloadParam param) : base(bundle)
         {
-            Options = options;
-            FailedTryAgain = options.FailedTryAgain;
+            Param = param;
+            FailedTryAgain = param.FailedTryAgain;
         }
 
         /// <summary>
@@ -49,9 +49,9 @@ namespace YooAsset
             // 轮流返回请求地址
             _requestCount++;
             if (_requestCount % 2 == 0)
-                return Options.FallbackURL;
+                return Param.FallbackURL;
             else
-                return Options.MainURL;
+                return Param.MainURL;
         }
 
         /// <summary>
@@ -87,7 +87,7 @@ namespace YooAsset
                 }
 
                 float offset = UnityEngine.Time.realtimeSinceStartup - _latestDownloadRealtime;
-                if (offset > Options.Timeout)
+                if (offset > Param.Timeout)
                 {
                     YooLogger.Warning($"Download request timeout : {_requestURL}");
                     if (_webRequest != null)

Runtime/FileSystem/Operation/Internal/DownloadAssetBundleOperation.cs

@@ -4,7 +4,7 @@ namespace YooAsset
 {
     internal abstract class DownloadAssetBundleOperation : DefaultDownloadFileOperation
     {
-        internal DownloadAssetBundleOperation(PackageBundle bundle, DownloadFileOptions options) : base(bundle, options)
+        internal DownloadAssetBundleOperation(PackageBundle bundle, DownloadParam param) : base(bundle, param)
         {
         }
 

Runtime/FileSystem/Operation/Internal/DownloadWebEncryptAssetBundleOperation.cs

@@ -10,7 +10,7 @@ namespace YooAsset
         private DownloadHandlerBuffer _downloadhandler;
         private ESteps _steps = ESteps.None;
 
-        internal DownloadWebEncryptAssetBundleOperation(bool checkTimeout, IWebDecryptionServices decryptionServices, PackageBundle bundle, DownloadFileOptions options) : base(bundle, options)
+        internal DownloadWebEncryptAssetBundleOperation(bool checkTimeout, IWebDecryptionServices decryptionServices, PackageBundle bundle, DownloadParam param) : base(bundle, param)
         {
             _checkTimeout = checkTimeout;
             _decryptionServices = decryptionServices;

Runtime/FileSystem/Operation/Internal/DownloadWebNormalAssetBundleOperation.cs

@@ -9,7 +9,7 @@ namespace YooAsset
         private DownloadHandlerAssetBundle _downloadhandler;
         private ESteps _steps = ESteps.None;
 
-        internal DownloadWebNormalAssetBundleOperation(bool disableUnityWebCache, PackageBundle bundle, DownloadFileOptions options) : base(bundle, options)
+        internal DownloadWebNormalAssetBundleOperation(bool disableUnityWebCache, PackageBundle bundle, DownloadParam param) : base(bundle, param)
         {
             _disableUnityWebCache = disableUnityWebCache;
         }
@@ -122,7 +122,7 @@ namespace YooAsset
         {
             if (_disableUnityWebCache)
             {
-                var downloadhandler = new DownloadHandlerAssetBundle(_requestURL, Bundle.UnityCRC);
+                var downloadhandler = new DownloadHandlerAssetBundle(_requestURL, 0);
 #if UNITY_2020_3_OR_NEWER
                 downloadhandler.autoLoadAssetBundle = false;
 #endif
@@ -132,8 +132,9 @@ namespace YooAsset
             {
                 // 注意：优先从浏览器缓存里获取文件
                 // The file hash defining the version of the asset bundle.
+                uint unityCRC = Bundle.UnityCRC;
                 Hash128 fileHash = Hash128.Parse(Bundle.FileHash);
-                var downloadhandler = new DownloadHandlerAssetBundle(_requestURL, fileHash, Bundle.UnityCRC);
+                var downloadhandler = new DownloadHandlerAssetBundle(_requestURL, fileHash, unityCRC);
 #if UNITY_2020_3_OR_NEWER
                 downloadhandler.autoLoadAssetBundle = false;
 #endif

Runtime/ResourcePackage/BundleInfo.cs

@@ -38,9 +38,9 @@ namespace YooAsset
         /// </summary>
         public FSDownloadFileOperation CreateDownloader(int failedTryAgain, int timeout)
         {
-            DownloadFileOptions options = new DownloadFileOptions(failedTryAgain, timeout);
-            options.ImportFilePath = _importFilePath;
-            return _fileSystem.DownloadFileAsync(Bundle, options);
+            DownloadParam downloadParam = new DownloadParam(failedTryAgain, timeout);
+            downloadParam.ImportFilePath = _importFilePath;
+            return _fileSystem.DownloadFileAsync(Bundle, downloadParam);
         }
 
         /// <summary>

Runtime/ResourcePackage/Interface/IPlayMode.cs

@@ -31,8 +31,8 @@ namespace YooAsset
         /// <summary>
         /// 清理缓存文件
         /// </summary>
-        ClearCacheFilesOperation ClearCacheFilesAsync(ClearCacheFilesOptions options);
-        
+        ClearCacheFilesOperation ClearCacheFilesAsync(string clearMode, object clearParam);
+
         // 下载相关
         ResourceDownloaderOperation CreateResourceDownloaderByAll(int downloadingMaxNumber, int failedTryAgain, int timeout);
         ResourceDownloaderOperation CreateResourceDownloaderByTags(string[] tags, int downloadingMaxNumber, int failedTryAgain, int timeout);

Runtime/ResourcePackage/ManifestTools.cs

@@ -314,6 +314,27 @@ namespace YooAsset
         }
         #endregion
 
+        /// <summary>
+        /// 注意：该类拷贝自编辑器
+        /// </summary>
+        private enum EFileNameStyle
+        {
+            /// <summary>
+            /// 哈希值名称
+            /// </summary>
+            HashName = 0,
+
+            /// <summary>
+            /// 资源包名称（不推荐）
+            /// </summary>
+            BundleName = 1,
+
+            /// <summary>
+            /// 资源包名称 + 哈希值名称
+            /// </summary>
+            BundleName_HashName = 2,
+        }
+
         /// <summary>
         /// 获取资源文件的后缀名
         /// </summary>

Runtime/ResourcePackage/Operation/ClearCacheFilesOperation.cs

@@ -15,15 +15,17 @@ namespace YooAsset
         }
 
         private readonly PlayModeImpl _impl;
-        private readonly ClearCacheFilesOptions _options;
+        private readonly string _clearMode;
+        private readonly object _clearParam;
         private List<IFileSystem> _cloneList;
         private FSClearCacheFilesOperation _clearCacheFilesOp;
         private ESteps _steps = ESteps.None;
 
-        internal ClearCacheFilesOperation(PlayModeImpl impl, ClearCacheFilesOptions options)
+        internal ClearCacheFilesOperation(PlayModeImpl impl, string clearMode, object clearParam)
         {
             _impl = impl;
-            _options = options;
+            _clearMode = clearMode;
+            _clearParam = clearParam;
         }
         internal override void InternalStart()
         {
@@ -72,7 +74,7 @@ namespace YooAsset
                     var fileSystem = _cloneList[0];
                     _cloneList.RemoveAt(0);
 
-                    _clearCacheFilesOp = fileSystem.ClearCacheFilesAsync(_impl.ActiveManifest, _options);
+                    _clearCacheFilesOp = fileSystem.ClearCacheFilesAsync(_impl.ActiveManifest, _clearMode, _clearParam);
                     _clearCacheFilesOp.StartOperation();
                     AddChildOperation(_clearCacheFilesOp);
                     _steps = ESteps.CheckClearResult;
@@ -100,7 +102,7 @@ namespace YooAsset
         }
         internal override string InternalGetDesc()
         {
-            return $"ClearMode : {_options.ClearMode}";
+            return $"ClearMode : {_clearMode}";
         }
     }
 }

Runtime/ResourcePackage/PlayMode/PlayModeImpl.cs

@@ -97,9 +97,9 @@ namespace YooAsset
         /// <summary>
         /// 清理缓存文件
         /// </summary>
-        ClearCacheFilesOperation IPlayMode.ClearCacheFilesAsync(ClearCacheFilesOptions options)
+        ClearCacheFilesOperation IPlayMode.ClearCacheFilesAsync(string clearMode, object clearParam)
         {
-            var operation = new ClearCacheFilesOperation(this, options);
+            var operation = new ClearCacheFilesOperation(this, clearMode, clearParam);
             return operation;
         }
 

Runtime/ResourcePackage/ResourcePackage.cs

@@ -268,10 +268,7 @@ namespace YooAsset
         public ClearCacheFilesOperation ClearCacheFilesAsync(EFileClearMode clearMode, object clearParam = null)
         {
             DebugCheckInitialize(false);
-            ClearCacheFilesOptions options = new ClearCacheFilesOptions();
-            options.ClearMode = clearMode.ToString();
-            options.ClearParam = clearParam;
-            var operation = _playModeImpl.ClearCacheFilesAsync(options);
+            var operation = _playModeImpl.ClearCacheFilesAsync(clearMode.ToString(), clearParam);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }
@@ -284,10 +281,7 @@ namespace YooAsset
         public ClearCacheFilesOperation ClearCacheFilesAsync(string clearMode, object clearParam = null)
         {
             DebugCheckInitialize(false);
-            ClearCacheFilesOptions options = new ClearCacheFilesOptions();
-            options.ClearMode = clearMode;
-            options.ClearParam = clearParam;
-            var operation = _playModeImpl.ClearCacheFilesAsync(options);
+            var operation = _playModeImpl.ClearCacheFilesAsync(clearMode, clearParam);
             OperationSystem.StartOperation(PackageName, operation);
             return operation;
         }

RuntimeExtension/link.xml

@@ -1,3 +0,0 @@
-<linker>
-  <assembly fullname="YooAsset.RuntimeExtension" preserve="all"/>
-</linker>

Samples~/Extension Sample.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b03c990ab10d8dc479d294d70f7c31a0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/Extension Sample/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 83541de392f5489438a81cb60f751e9c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/Extension Sample/Editor/CustomRules.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 73ef838ec60c36249ba05eaa3c96273e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/Extension Sample/Editor/CustomRules/CustomAdressRule.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using UnityEngine;
+using YooAsset.Editor;
+
+[DisplayName("定位地址: 文件名.智能尾缀")]
+public class AddressByFileNameAndExt : IAddressRule
+{
+    public string GetAssetAddress(AddressRuleData data)
+    {
+        var ext = Path.GetExtension(data.AssetPath);
+        if (ext == ".asset")
+        {
+            var a = UnityEditor.AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(data.AssetPath);
+            if (a == null) return ".errortype";
+            var type = a.GetType();
+            var dt = Path.GetFileNameWithoutExtension(data.AssetPath);
+            return dt + $".{type.Name.ToLowerInvariant()}";
+        }
+
+        return Path.GetFileName(data.AssetPath);
+    }
+}

Samples~/Extension Sample/Editor/CustomRules/CustomAdressRule.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 73aae15a0e1aec742a7e8f05755a2013
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/Extension Sample/Editor/CustomRules/CustomPackRule.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using UnityEngine;
+using YooAsset.Editor;
+
+[DisplayName("打包特效纹理（自定义）")]
+public class PackEffectTexture : IPackRule
+{
+    private const string PackDirectory = "Assets/Effect/Textures/";
+
+    PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data)
+    {
+        string assetPath = data.AssetPath;
+        if (assetPath.StartsWith(PackDirectory) == false)
+            throw new Exception($"Only support folder : {PackDirectory}");
+    
+        string assetName = Path.GetFileName(assetPath).ToLower();
+        string firstChar = assetName.Substring(0, 1);
+        string bundleName = $"{PackDirectory}effect_texture_{firstChar}";
+        var packRuleResult = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension);
+        return packRuleResult;
+    }
+}
+
+[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;
+    }
+
+    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"
+    }
+}

Samples~/Extension Sample/Editor/CustomRules/CustomPackRule.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ff1eb84d9996ca1409e37f45617b1bdb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/Extension Sample/Editor/PackageComparator.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c0b4ccec8007a6047aade899b4b74fcf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/Extension Sample/Editor/PackageComparator/PackageComparatorWindow.cs

@@ -0,0 +1,138 @@
+using System.IO;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+    public class PackageComparatorWindow : EditorWindow
+    {
+        static PackageComparatorWindow _thisInstance;
+        
+        [MenuItem("Tools/补丁包比对工具", false, 102)]
+        static void ShowWindow()
+        {
+            if (_thisInstance == null)
+            {
+                _thisInstance = EditorWindow.GetWindow(typeof(PackageComparatorWindow), false, "补丁包比对工具", true) as PackageComparatorWindow;
+                _thisInstance.minSize = new Vector2(800, 600);
+            }
+            _thisInstance.Show();
+        }
+
+        private string _manifestPath1 = string.Empty;
+        private string _manifestPath2 = string.Empty;
+        private readonly List<PackageBundle> _changeList = new List<PackageBundle>();
+        private readonly List<PackageBundle> _newList = new List<PackageBundle>();
+        private Vector2 _scrollPos1;
+        private Vector2 _scrollPos2;
+
+        private void OnGUI()
+        {
+            GUILayout.Space(10);
+            EditorGUILayout.BeginHorizontal();
+            if (GUILayout.Button("选择补丁包1", GUILayout.MaxWidth(150)))
+            {
+                string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes");
+                if (string.IsNullOrEmpty(resultPath))
+                    return;
+                _manifestPath1 = resultPath;
+            }
+            EditorGUILayout.LabelField(_manifestPath1);
+            EditorGUILayout.EndHorizontal();
+
+            GUILayout.Space(10);
+            EditorGUILayout.BeginHorizontal();
+            if (GUILayout.Button("选择补丁包2", GUILayout.MaxWidth(150)))
+            {
+                string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes");
+                if (string.IsNullOrEmpty(resultPath))
+                    return;
+                _manifestPath2 = resultPath;
+            }
+            EditorGUILayout.LabelField(_manifestPath2);
+            EditorGUILayout.EndHorizontal();
+
+            if (string.IsNullOrEmpty(_manifestPath1) == false && string.IsNullOrEmpty(_manifestPath2) == false)
+            {
+                if (GUILayout.Button("比对差异", GUILayout.MaxWidth(150)))
+                {
+                    ComparePackage(_changeList, _newList);
+                }
+            }
+
+            EditorGUILayout.Space();
+            using (new EditorGUI.DisabledScope(false))
+            {
+                int totalCount = _changeList.Count;
+                EditorGUILayout.Foldout(true, $"差异列表 ( {totalCount} )");
+
+                EditorGUI.indentLevel = 1;
+                _scrollPos1 = EditorGUILayout.BeginScrollView(_scrollPos1);
+                {
+                    foreach (var bundle in _changeList)
+                    {
+                        EditorGUILayout.LabelField($"{bundle.BundleName} | {(bundle.FileSize / 1024)}K");
+                    }
+                }
+                EditorGUILayout.EndScrollView();
+                EditorGUI.indentLevel = 0;
+            }
+
+            EditorGUILayout.Space();
+            using (new EditorGUI.DisabledScope(false))
+            {
+                int totalCount = _newList.Count;
+                EditorGUILayout.Foldout(true, $"新增列表 ( {totalCount} )");
+
+                EditorGUI.indentLevel = 1;
+                _scrollPos2 = EditorGUILayout.BeginScrollView(_scrollPos2);
+                {
+                    foreach (var bundle in _newList)
+                    {
+                        EditorGUILayout.LabelField($"{bundle.BundleName}");
+                    }
+                }
+                EditorGUILayout.EndScrollView();
+                EditorGUI.indentLevel = 0;
+            }
+        }
+
+        private void ComparePackage(List<PackageBundle> changeList, List<PackageBundle> newList)
+        {
+            changeList.Clear();
+            newList.Clear();
+
+            // 加载补丁清单1
+            byte[] bytesData1 = FileUtility.ReadAllBytes(_manifestPath1);
+            PackageManifest manifest1 = ManifestTools.DeserializeFromBinary(bytesData1);
+
+            // 加载补丁清单1
+            byte[] bytesData2 = FileUtility.ReadAllBytes(_manifestPath2);
+            PackageManifest manifest2 = ManifestTools.DeserializeFromBinary(bytesData2);
+
+            // 拷贝文件列表
+            foreach (var bundle2 in manifest2.BundleList)
+            {
+                if (manifest1.TryGetPackageBundleByBundleName(bundle2.BundleName, out PackageBundle bundle1))
+                {
+                    if (bundle2.FileHash != bundle1.FileHash)
+                    {
+                        changeList.Add(bundle2);
+                    }
+                }
+                else
+                {
+                    newList.Add(bundle2);
+                }
+            }
+
+            // 按字母重新排序
+            changeList.Sort((x, y) => string.Compare(x.BundleName, y.BundleName));
+            newList.Sort((x, y) => string.Compare(x.BundleName, y.BundleName));
+
+            Debug.Log("资源包差异比对完成！");
+        }
+    }
+}

Samples~/Extension Sample/Editor/PackageComparator/PackageComparatorWindow.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6ff3c700b7f108b48998aa1630a769e1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/Extension Sample/Editor/PackageImporter.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fa6624433c5d8e445b1426dcdf0763ba
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/Extension Sample/Editor/PackageImporter/PackageImporterWindow.cs

@@ -0,0 +1,90 @@
+using System.IO;
+using UnityEngine;
+using UnityEditor;
+
+namespace YooAsset.Editor
+{
+    public class PackageImporterWindow : EditorWindow
+    {
+        static PackageImporterWindow _thisInstance;
+
+        [MenuItem("Tools/补丁包导入工具", false, 101)]
+        static void ShowWindow()
+        {
+            if (_thisInstance == null)
+            {
+                _thisInstance = EditorWindow.GetWindow(typeof(PackageImporterWindow), false, "补丁包导入工具", true) as PackageImporterWindow;
+                _thisInstance.minSize = new Vector2(800, 600);
+            }
+            _thisInstance.Show();
+        }
+
+        private string _manifestPath = string.Empty;
+        private string _packageName = "DefaultPackage";
+
+        private void OnGUI()
+        {
+            GUILayout.Space(10);
+            EditorGUILayout.BeginHorizontal();
+            if (GUILayout.Button("选择补丁包", GUILayout.MaxWidth(150)))
+            {
+                string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes");
+                if (!string.IsNullOrEmpty(resultPath))
+                    _manifestPath = resultPath;
+            }
+            EditorGUILayout.LabelField(_manifestPath);
+            EditorGUILayout.EndHorizontal();
+
+            if (string.IsNullOrEmpty(_manifestPath) == false)
+            {
+                if (GUILayout.Button("导入补丁包（全部文件）", GUILayout.MaxWidth(150)))
+                {
+                    string streamingAssetsRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot();
+                    EditorTools.ClearFolder(streamingAssetsRoot);
+                    CopyPackageFiles(_manifestPath);
+                }
+            }
+        }
+
+        private void CopyPackageFiles(string manifestFilePath)
+        {
+            string manifestFileName = Path.GetFileNameWithoutExtension(manifestFilePath);
+            string outputDirectory = Path.GetDirectoryName(manifestFilePath);
+
+            // 加载补丁清单
+            byte[] bytesData = FileUtility.ReadAllBytes(manifestFilePath);
+            PackageManifest manifest = ManifestTools.DeserializeFromBinary(bytesData);
+
+            // 拷贝核心文件
+            {
+                string sourcePath = $"{outputDirectory}/{manifestFileName}.bytes";
+                string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsRoot()}/{_packageName}/{manifestFileName}.bytes";
+                EditorTools.CopyFile(sourcePath, destPath, true);
+            }
+            {
+                string sourcePath = $"{outputDirectory}/{manifestFileName}.hash";
+                string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsRoot()}/{_packageName}/{manifestFileName}.hash";
+                EditorTools.CopyFile(sourcePath, destPath, true);
+            }
+            {
+                string fileName = YooAssetSettingsData.GetPackageVersionFileName(manifest.PackageName);
+                string sourcePath = $"{outputDirectory}/{fileName}";
+                string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsRoot()}/{_packageName}/{fileName}";
+                EditorTools.CopyFile(sourcePath, destPath, true);
+            }
+
+            // 拷贝文件列表
+            int fileCount = 0;
+            foreach (var packageBundle in manifest.BundleList)
+            {
+                fileCount++;
+                string sourcePath = $"{outputDirectory}/{packageBundle.FileName}";
+                string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsRoot()}/{_packageName}/{packageBundle.FileName}";
+                EditorTools.CopyFile(sourcePath, destPath, true);
+            }
+
+            Debug.Log($"补丁包拷贝完成，一共拷贝了{fileCount}个资源文件");
+            AssetDatabase.Refresh();
+        }
+    }
+}

Samples~/Extension Sample/Editor/PackageImporter/PackageImporterWindow.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 699068f8f637708409436199baa62c1f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/Extension Sample/Editor/ShaderVariantCollector.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dcb9955c15609744a9666bd76f6af3d9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectionHelper.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEditor;
+using YooAsset.Editor;
+
+public static class ShaderVariantCollectionHelper
+{
+    public static void ClearCurrentShaderVariantCollection()
+    {
+        EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "ClearCurrentShaderVariantCollection");
+    }
+    public static void SaveCurrentShaderVariantCollection(string savePath)
+    {
+        EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "SaveCurrentShaderVariantCollection", savePath);
+    }
+    public static int GetCurrentShaderVariantCollectionShaderCount()
+    {
+        return (int)EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "GetCurrentShaderVariantCollectionShaderCount");
+    }
+    public static int GetCurrentShaderVariantCollectionVariantCount()
+    {
+        return (int)EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "GetCurrentShaderVariantCollectionVariantCount");
+    }
+
+    /// <summary>
+    /// 获取着色器的变种总数量
+    /// </summary>
+    public static string GetShaderVariantCount(string assetPath)
+    {
+        Shader shader = AssetDatabase.LoadAssetAtPath<Shader>(assetPath);
+        var variantCount = EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "GetVariantCount", shader, true);
+        return variantCount.ToString();
+    }
+}

Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectionHelper.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ab74d4ff4a2805147883de70a1559a0a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs

@@ -0,0 +1,190 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEditor;
+
+[Serializable]
+public class ShaderVariantCollectionManifest
+{
+    [Serializable]
+    public class ShaderVariantElement : IComparable<ShaderVariantElement>
+    {
+        public string SortValue { private set; get; }
+
+        /// <summary>
+        ///  Pass type to use in this variant.
+        /// </summary>
+        public PassType PassType;
+
+        /// <summary>
+        /// Array of shader keywords to use in this variant.
+        /// </summary>
+        public string[] Keywords;
+
+        public void MakeSortValue()
+        {
+            string combineKeyword = string.Empty;
+            for (int i = 0; i < Keywords.Length; i++)
+            {
+                if (i == 0)
+                    combineKeyword = Keywords[0];
+                else
+                    combineKeyword = $"{combineKeyword}+{Keywords[0]}";
+            }
+
+            SortValue = $"{PassType}+{combineKeyword}";
+        }
+        public int CompareTo(ShaderVariantElement other)
+        {
+            return SortValue.CompareTo(other.SortValue);
+        }
+    }
+
+    [Serializable]
+    public class ShaderVariantInfo : IComparable<ShaderVariantInfo>
+    {
+        public string SortValue { private set; get; }
+
+        /// <summary>
+        /// 着色器资源路径.
+        /// </summary>
+        public string AssetPath;
+
+        /// <summary>
+        /// 着色器名称
+        /// </summary>
+        public string ShaderName;
+
+        /// <summary>
+        /// 着色器变种总数
+        /// </summary>
+        public int ShaderVariantCount = 0;
+
+        /// <summary>
+        /// 着色器变种列表
+        /// </summary>
+        public List<ShaderVariantElement> ShaderVariantElements = new List<ShaderVariantElement>(1000);
+
+        public void MakeSortValue()
+        {
+            SortValue = AssetPath + "+" + ShaderName;
+        }
+        public int CompareTo(ShaderVariantInfo other)
+        {
+            return SortValue.CompareTo(other.SortValue);
+        }
+    }
+
+
+    /// <summary>
+    /// Number of shaders in this collection
+    /// </summary>
+    public int ShaderTotalCount;
+
+    /// <summary>
+    /// Number of total varians in this collection
+    /// </summary>
+    public int VariantTotalCount;
+
+    /// <summary>
+    /// Shader variants info list.
+    /// </summary>
+    public List<ShaderVariantInfo> ShaderVariantInfos = new List<ShaderVariantInfo>(1000);
+
+    /// <summary>
+    /// 添加着色器变种信息
+    /// </summary>
+    public void AddShaderVariant(string assetPath, string shaderName, PassType passType, string[] keywords)
+    {
+        // 排序Keyword列表
+        List<string> temper = new List<string>(keywords);
+        temper.Sort();
+
+        var info = GetOrCreateShaderVariantInfo(assetPath, shaderName);
+        ShaderVariantElement element = new ShaderVariantElement();
+        element.PassType = passType;
+        element.Keywords = temper.ToArray();
+        element.MakeSortValue();
+        info.ShaderVariantElements.Add(element);
+        info.ShaderVariantCount++;
+    }
+    private ShaderVariantInfo GetOrCreateShaderVariantInfo(string assetPath, string shaderName)
+    {
+        var selectList = ShaderVariantInfos.Where(t => t.ShaderName == shaderName && t.AssetPath == assetPath).ToList();
+        if (selectList.Count == 0)
+        {
+            ShaderVariantInfo newInfo = new ShaderVariantInfo();
+            newInfo.AssetPath = assetPath;
+            newInfo.ShaderName = shaderName;
+            newInfo.MakeSortValue();
+            ShaderVariantInfos.Add(newInfo);
+            return newInfo;
+        }
+
+        if (selectList.Count != 1)
+            throw new Exception("Should never get here !");
+
+        return selectList[0];
+    }
+
+
+    /// <summary>
+    /// 解析SVC文件并将数据写入到清单
+    /// </summary>
+    public static ShaderVariantCollectionManifest Extract(ShaderVariantCollection svc)
+    {
+        var manifest = new ShaderVariantCollectionManifest();
+        manifest.ShaderTotalCount = ShaderVariantCollectionHelper.GetCurrentShaderVariantCollectionShaderCount();
+        manifest.VariantTotalCount = ShaderVariantCollectionHelper.GetCurrentShaderVariantCollectionVariantCount();
+
+        using (var so = new SerializedObject(svc))
+        {
+            var shaderArray = so.FindProperty("m_Shaders.Array");
+            if (shaderArray != null && shaderArray.isArray)
+            {
+                for (int i = 0; i < shaderArray.arraySize; ++i)
+                {
+                    var shaderRef = shaderArray.FindPropertyRelative($"data[{i}].first");
+                    var shaderVariantsArray = shaderArray.FindPropertyRelative($"data[{i}].second.variants");
+                    if (shaderRef != null && shaderRef.propertyType == SerializedPropertyType.ObjectReference && shaderVariantsArray != null && shaderVariantsArray.isArray)
+                    {
+                        var shader = shaderRef.objectReferenceValue as Shader;
+                        if (shader == null)
+                        {
+                            throw new Exception("Invalid shader in ShaderVariantCollection file.");
+                        }
+
+                        string shaderAssetPath = AssetDatabase.GetAssetPath(shader);
+                        string shaderName = shader.name;
+
+                        // 添加变种信息
+                        for (int j = 0; j < shaderVariantsArray.arraySize; ++j)
+                        {
+                            var propKeywords = shaderVariantsArray.FindPropertyRelative($"Array.data[{j}].keywords");
+                            var propPassType = shaderVariantsArray.FindPropertyRelative($"Array.data[{j}].passType");
+                            if (propKeywords != null && propPassType != null && propKeywords.propertyType == SerializedPropertyType.String)
+                            {
+                                string[] keywords = propKeywords.stringValue.Split(' ');
+                                PassType pathType = (PassType)propPassType.intValue;
+                                manifest.AddShaderVariant(shaderAssetPath, shaderName, pathType, keywords);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // 重新排序
+        manifest.ShaderVariantInfos.Sort();
+        foreach (var shaderVariantInfo in manifest.ShaderVariantInfos)
+        {
+            shaderVariantInfo.ShaderVariantElements.Sort();
+        }
+
+        return manifest;
+    }
+}

Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 97098b04691f5c046ac4829f1d72f425
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollector.cs

@@ -0,0 +1,251 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.IO;
+using UnityEngine;
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using YooAsset.Editor;
+
+public static class ShaderVariantCollector
+{
+    private enum ESteps
+    {
+        None,
+        Prepare,
+        CollectAllMaterial,
+        CollectVariants,
+        CollectSleeping,
+        WaitingDone,
+    }
+
+    private const float WaitMilliseconds = 3000f;
+    private const float SleepMilliseconds = 3000f;
+    private static string _savePath;
+    private static string _packageName;
+    private static int _processMaxNum;
+    private static Action _completedCallback;
+
+    private static ESteps _steps = ESteps.None;
+    private static Stopwatch _elapsedTime;
+    private static List<string> _allMaterials;
+    private static List<GameObject> _allSpheres = new List<GameObject>(1000);
+
+
+    /// <summary>
+    /// 开始收集
+    /// </summary>
+    public static void Run(string savePath, string packageName, int processMaxNum, Action completedCallback)
+    {
+        if (_steps != ESteps.None)
+            return;
+
+        if (Path.HasExtension(savePath) == false)
+            savePath = $"{savePath}.shadervariants";
+        if (Path.GetExtension(savePath) != ".shadervariants")
+            throw new System.Exception("Shader variant file extension is invalid.");
+        if (string.IsNullOrEmpty(packageName))
+            throw new System.Exception("Package name is null or empty !");
+
+        // 注意：先删除再保存，否则ShaderVariantCollection内容将无法及时刷新
+        AssetDatabase.DeleteAsset(savePath);
+        EditorTools.CreateFileDirectory(savePath);
+        _savePath = savePath;
+        _packageName = packageName;
+        _processMaxNum = processMaxNum;
+        _completedCallback = completedCallback;
+
+        // 聚焦到游戏窗口
+        EditorTools.FocusUnityGameWindow();
+
+        // 创建临时测试场景
+        CreateTempScene();
+
+        _steps = ESteps.Prepare;
+        EditorApplication.update += EditorUpdate;
+    }
+
+    private static void EditorUpdate()
+    {
+        if (_steps == ESteps.None)
+            return;
+
+        if (_steps == ESteps.Prepare)
+        {
+            ShaderVariantCollectionHelper.ClearCurrentShaderVariantCollection();
+            _steps = ESteps.CollectAllMaterial;
+            return; //等待一帧
+        }
+
+        if (_steps == ESteps.CollectAllMaterial)
+        {
+            _allMaterials = GetAllMaterials();
+            _steps = ESteps.CollectVariants;
+            return; //等待一帧
+        }
+
+        if (_steps == ESteps.CollectVariants)
+        {
+            int count = Mathf.Min(_processMaxNum, _allMaterials.Count);
+            List<string> range = _allMaterials.GetRange(0, count);
+            _allMaterials.RemoveRange(0, count);
+            CollectVariants(range);
+
+            if (_allMaterials.Count > 0)
+            {
+                _elapsedTime = Stopwatch.StartNew();
+                _steps = ESteps.CollectSleeping;
+            }
+            else
+            {
+                _elapsedTime = Stopwatch.StartNew();
+                _steps = ESteps.WaitingDone;
+            }
+        }
+
+        if (_steps == ESteps.CollectSleeping)
+        {
+            if (_elapsedTime.ElapsedMilliseconds > SleepMilliseconds)
+            {
+                DestroyAllSpheres();
+                _elapsedTime.Stop();
+                _steps = ESteps.CollectVariants;
+            }
+        }
+
+        if (_steps == ESteps.WaitingDone)
+        {
+            // 注意：一定要延迟保存才会起效
+            if (_elapsedTime.ElapsedMilliseconds > WaitMilliseconds)
+            {
+                _elapsedTime.Stop();
+                _steps = ESteps.None;
+
+                // 保存结果并创建清单
+                ShaderVariantCollectionHelper.SaveCurrentShaderVariantCollection(_savePath);
+                CreateManifest();
+
+                UnityEngine.Debug.Log($"搜集SVC完毕！");
+                EditorApplication.update -= EditorUpdate;
+                _completedCallback?.Invoke();
+            }
+        }
+    }
+    private static void CreateTempScene()
+    {
+        EditorSceneManager.NewScene(NewSceneSetup.DefaultGameObjects);
+    }
+    private static List<string> GetAllMaterials()
+    {
+        // 获取所有打包的资源
+        CollectResult collectResult = AssetBundleCollectorSettingData.Setting.BeginCollect(_packageName, false, false);
+
+        // 搜集所有材质球
+        int progressValue = 0;
+        HashSet<string> result = new HashSet<string>();
+        foreach (var collectAssetInfo in collectResult.CollectAssets)
+        {
+            if (collectAssetInfo.AssetInfo.AssetType == typeof(UnityEngine.Material))
+            {
+                string assetPath = collectAssetInfo.AssetInfo.AssetPath;
+                if (result.Contains(assetPath) == false)
+                    result.Add(assetPath);
+            }
+            foreach(var dependAssetInfo in collectAssetInfo.DependAssets)
+            {
+                if (dependAssetInfo.AssetType == typeof(UnityEngine.Material))
+                {
+                    string assetPath = dependAssetInfo.AssetPath;
+                    if (result.Contains(assetPath) == false)
+                        result.Add(assetPath);
+                }
+            }
+            EditorTools.DisplayProgressBar("搜集所有材质球", ++progressValue, collectResult.CollectAssets.Count);
+        }
+        EditorTools.ClearProgressBar();
+
+        // 返回结果
+        return result.ToList();
+    }
+    private static void CollectVariants(List<string> materials)
+    {
+        Camera camera = Camera.main;
+        if (camera == null)
+            throw new System.Exception("Not found main camera.");
+
+        // 设置主相机
+        float aspect = camera.aspect;
+        int totalMaterials = materials.Count;
+        float height = Mathf.Sqrt(totalMaterials / aspect) + 1;
+        float width = Mathf.Sqrt(totalMaterials / aspect) * aspect + 1;
+        float halfHeight = Mathf.CeilToInt(height / 2f);
+        float halfWidth = Mathf.CeilToInt(width / 2f);
+        camera.orthographic = true;
+        camera.orthographicSize = halfHeight;
+        camera.transform.position = new Vector3(0f, 0f, -10f);
+
+        // 创建测试球体
+        int xMax = (int)(width - 1);
+        int x = 0, y = 0;
+        int progressValue = 0;
+        for (int i = 0; i < materials.Count; i++)
+        {
+            var material = materials[i];
+            var position = new Vector3(x - halfWidth + 1f, y - halfHeight + 1f, 0f);
+            var go = CreateSphere(material, position, i);
+            if (go != null)
+                _allSpheres.Add(go);
+            if (x == xMax)
+            {
+                x = 0;
+                y++;
+            }
+            else
+            {
+                x++;
+            }
+            EditorTools.DisplayProgressBar("照射所有材质球", ++progressValue, materials.Count);
+        }
+        EditorTools.ClearProgressBar();
+    }
+    private static GameObject CreateSphere(string assetPath, Vector3 position, int index)
+    {
+        var material = AssetDatabase.LoadAssetAtPath<Material>(assetPath);
+        var shader = material.shader;
+        if (shader == null)
+            return null;
+
+        var go = GameObject.CreatePrimitive(PrimitiveType.Sphere);
+        go.GetComponent<Renderer>().sharedMaterial = material;
+        go.transform.position = position;
+        go.name = $"Sphere_{index} | {material.name}";
+        return go;
+    }
+    private static void DestroyAllSpheres()
+    {
+        foreach (var go in _allSpheres)
+        {
+            GameObject.DestroyImmediate(go);
+        }
+        _allSpheres.Clear();
+
+        // 尝试释放编辑器加载的资源
+        EditorUtility.UnloadUnusedAssetsImmediate(true);
+    }
+    private static void CreateManifest()
+    {
+        AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
+
+        ShaderVariantCollection svc = AssetDatabase.LoadAssetAtPath<ShaderVariantCollection>(_savePath);
+        if (svc != null)
+        {
+            var wrapper = ShaderVariantCollectionManifest.Extract(svc);
+            string jsonData = JsonUtility.ToJson(wrapper, true);
+            string savePath = _savePath.Replace(".shadervariants", ".json");
+            File.WriteAllText(savePath, jsonData);
+        }
+
+        AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
+    }
+}

Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollector.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 21b4cc6bf4c0c064d8e2687024e24c86
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorSetting.cs

@@ -0,0 +1,29 @@
+using UnityEngine;
+using UnityEditor;
+
+public class ShaderVariantCollectorSetting : ScriptableObject
+{
+    private const string DefaultSavePath = "Assets/MyShaderVariants.shadervariants";
+
+    public static string GeFileSavePath(string packageName)
+    {
+        string key = $"{Application.productName}_{packageName}_GeFileSavePath";
+        return EditorPrefs.GetString(key, DefaultSavePath);
+    }
+    public static void SetFileSavePath(string packageName, string savePath)
+    {
+        string key = $"{Application.productName}_{packageName}_GeFileSavePath";
+        EditorPrefs.SetString(key, savePath);
+    }
+
+    public static int GeProcessCapacity(string packageName)
+    {
+        string key = $"{Application.productName}_{packageName}_GeProcessCapacity";
+        return EditorPrefs.GetInt(key, 1000);
+    }
+    public static void SetProcessCapacity(string packageName, int capacity)
+    {
+        string key = $"{Application.productName}_{packageName}_GeProcessCapacity";
+        EditorPrefs.SetInt(key, capacity);
+    }
+}

Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorSetting.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 44454e58a49818040a1aef5799e71b30
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.cs

@@ -0,0 +1,150 @@
+#if UNITY_2019_4_OR_NEWER
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+using YooAsset.Editor;
+
+public class ShaderVariantCollectorWindow : EditorWindow
+{
+    [MenuItem("Tools/着色器变种收集器", false, 100)]
+    public static void OpenWindow()
+    {
+        ShaderVariantCollectorWindow window = GetWindow<ShaderVariantCollectorWindow>("着色器变种收集工具", true);
+        window.minSize = new Vector2(800, 600);
+    }
+
+    private Button _collectButton;
+    private TextField _collectOutputField;
+    private Label _currentShaderCountField;
+    private Label _currentVariantCountField;
+    private SliderInt _processCapacitySlider;
+    private PopupField<string> _packageField;
+
+    private List<string> _packageNames;
+    private string _currentPackageName;
+
+    public void CreateGUI()
+    {
+        try
+        {
+            VisualElement root = this.rootVisualElement;
+
+            // 加载布局文件
+            var visualAsset = UxmlLoader.LoadWindowUXML<ShaderVariantCollectorWindow>();
+            if (visualAsset == null)
+                return;
+
+            visualAsset.CloneTree(root);
+
+            // 包裹名称列表
+            _packageNames = GetBuildPackageNames();
+            _currentPackageName = _packageNames[0];
+
+            // 文件输出目录
+            _collectOutputField = root.Q<TextField>("CollectOutput");
+            _collectOutputField.SetValueWithoutNotify(ShaderVariantCollectorSetting.GeFileSavePath(_currentPackageName));
+            _collectOutputField.RegisterValueChangedCallback(evt =>
+            {
+                ShaderVariantCollectorSetting.SetFileSavePath(_currentPackageName, _collectOutputField.value);
+            });
+
+            // 收集的包裹
+            var packageContainer = root.Q("PackageContainer");
+            if (_packageNames.Count > 0)
+            {
+                int defaultIndex = GetDefaultPackageIndex(_currentPackageName);
+                _packageField = new PopupField<string>(_packageNames, defaultIndex);
+                _packageField.label = "Package";
+                _packageField.style.width = 350;
+                _packageField.RegisterValueChangedCallback(evt =>
+                {
+                    _currentPackageName = _packageField.value;
+                });
+                packageContainer.Add(_packageField);
+            }
+            else
+            {
+                _packageField = new PopupField<string>();
+                _packageField.label = "Package";
+                _packageField.style.width = 350;
+                packageContainer.Add(_packageField);
+            }
+
+            // 容器值
+            _processCapacitySlider = root.Q<SliderInt>("ProcessCapacity");
+            _processCapacitySlider.SetValueWithoutNotify(ShaderVariantCollectorSetting.GeProcessCapacity(_currentPackageName));
+#if !UNITY_2020_3_OR_NEWER
+            _processCapacitySlider.label = $"Capacity ({_processCapacitySlider.value})";
+            _processCapacitySlider.RegisterValueChangedCallback(evt =>
+            {
+                ShaderVariantCollectorSetting.SetProcessCapacity(_currentPackageName, _processCapacitySlider.value);
+                _processCapacitySlider.label = $"Capacity ({_processCapacitySlider.value})";
+            });
+#else
+            _processCapacitySlider.RegisterValueChangedCallback(evt =>
+            {
+                ShaderVariantCollectorSetting.SetProcessCapacity(_currentPackageName, _processCapacitySlider.value);
+            });
+#endif
+
+            _currentShaderCountField = root.Q<Label>("CurrentShaderCount");
+            _currentVariantCountField = root.Q<Label>("CurrentVariantCount");
+
+            // 变种收集按钮
+            _collectButton = root.Q<Button>("CollectButton");
+            _collectButton.clicked += CollectButton_clicked;
+        }
+        catch (Exception e)
+        {
+            Debug.LogError(e.ToString());
+        }
+    }
+    private void Update()
+    {
+        if (_currentShaderCountField != null)
+        {
+            int currentShaderCount = ShaderVariantCollectionHelper.GetCurrentShaderVariantCollectionShaderCount();
+            _currentShaderCountField.text = $"Current Shader Count : {currentShaderCount}";
+        }
+
+        if (_currentVariantCountField != null)
+        {
+            int currentVariantCount = ShaderVariantCollectionHelper.GetCurrentShaderVariantCollectionVariantCount();
+            _currentVariantCountField.text = $"Current Variant Count : {currentVariantCount}";
+        }
+    }
+
+    private void CollectButton_clicked()
+    {
+        string savePath = ShaderVariantCollectorSetting.GeFileSavePath(_currentPackageName);
+        int processCapacity = _processCapacitySlider.value;
+        ShaderVariantCollector.Run(savePath, _currentPackageName, processCapacity, null);
+    }
+
+    // 构建包裹相关
+    private int GetDefaultPackageIndex(string packageName)
+    {
+        for (int index = 0; index < _packageNames.Count; index++)
+        {
+            if (_packageNames[index] == packageName)
+            {
+                return index;
+            }
+        }
+        return 0;
+    }
+    private List<string> GetBuildPackageNames()
+    {
+        List<string> result = new List<string>();
+        foreach (var package in AssetBundleCollectorSettingData.Setting.Packages)
+        {
+            result.Add(package.PackageName);
+        }
+        return result;
+    }
+}
+#endif

Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 70401cc80b9807e46bd8283e01b4302f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.uxml

@@ -0,0 +1,11 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
+    <uie:Toolbar name="Toolbar" style="display: flex; flex-direction: row-reverse;" />
+    <ui:VisualElement name="CollectContainer">
+        <ui:TextField picking-mode="Ignore" label="文件保存路径" name="CollectOutput" style="height: 22px;" />
+        <ui:VisualElement name="PackageContainer" style="height: 24px;" />
+        <ui:Label text="Current Shader Count" display-tooltip-when-elided="true" name="CurrentShaderCount" style="height: 20px; padding-left: 4px;" />
+        <ui:Label text="Current Variant Count" display-tooltip-when-elided="true" name="CurrentVariantCount" style="height: 20px; padding-left: 4px;" />
+        <ui:SliderInt picking-mode="Ignore" label="Capacity" value="9999" high-value="1000" name="ProcessCapacity" low-value="10" show-input-field="true" />
+        <ui:Button text="开始搜集" display-tooltip-when-elided="true" name="CollectButton" style="height: 50px; background-color: rgb(40, 106, 42); margin-top: 10px;" />
+    </ui:VisualElement>
+</ui:UXML>

Samples~/Extension Sample/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.uxml.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 9bff4878063eaf04dab8713e1e662ac5
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

Samples~/Extension Sample/Runtime.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6816dd00c9cfdce4d9386c0b3088b843
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: