update AssetBundleBuilder

ScriptableBuildParameters类新增BuiltinShadersBundleName和MonoScriptsBundleName字段
2026-05-31 05:58:47 +00:00 · 2025-02-08 10:09:52 +08:00
parent e031498d5b
commit 6571faae4e
12 changed files with 133 additions and 119 deletions
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorPackage.cs
@@ -98,9 +98,9 @@ namespace YooAsset.Editor
        }

        /// <summary>
-        /// 获取打包收集的资源文件
+        /// 开始收集工作
        /// </summary>
-        public List<CollectAssetInfo> GetAllCollectAssets(CollectCommand command)
+        public CollectResult BeginCollect(CollectCommand command)
        {
            Dictionary<string, CollectAssetInfo> result = new Dictionary<string, CollectAssetInfo>(10000);

@@ -138,8 +138,10 @@ namespace YooAsset.Editor
                }
            }

-            // 返回列表
-            return result.Values.ToList();
+            // 返回结果
+            var collectAssets = result.Values.ToList();
+            var collectResult = new CollectResult(command, collectAssets);
+            return collectResult;
        }

        /// <summary>
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorSetting.cs
@@ -87,9 +87,9 @@ namespace YooAsset.Editor
        }

        /// <summary>
-        /// 获取包裹收集的资源文件
+        /// 收集指定包裹的资源文件
        /// </summary>
-        public CollectResult GetPackageAssets(bool simulateBuild, bool useAssetDependencyDB, string packageName)
+        public CollectResult BeginCollect(string packageName, bool simulateBuild, bool useAssetDependencyDB)
        {
            if (string.IsNullOrEmpty(packageName))
                throw new Exception("Build package name is null or empty !");
@@ -100,16 +100,17 @@ namespace YooAsset.Editor

            // 创建资源收集命令
            IIgnoreRule ignoreRule = AssetBundleCollectorSettingData.GetIgnoreRuleInstance(package.IgnoreRuleName);
-            CollectCommand command = new CollectCommand(simulateBuild, useAssetDependencyDB, packageName,
-                 package.EnableAddressable,
-                 package.LocationToLower,
-                 package.IncludeAssetGUID,
-                 package.AutoCollectShaders,
-                 UniqueBundleName, ignoreRule);
+            var command = new CollectCommand(packageName, ignoreRule);
+            command.SimulateBuild = simulateBuild;
+            command.UniqueBundleName = UniqueBundleName;
+            command.UseAssetDependencyDB = useAssetDependencyDB;
+            command.EnableAddressable = package.EnableAddressable;
+            command.LocationToLower = package.LocationToLower;
+            command.IncludeAssetGUID = package.IncludeAssetGUID;
+            command.AutoCollectShaders = package.AutoCollectShaders;

-            // 获取收集的资源集合
-            CollectResult collectResult = new CollectResult(command);
-            collectResult.SetCollectAssets(package.GetAllCollectAssets(command));
+            // 开始收集工作
+            CollectResult collectResult = package.BeginCollect(command);
            return collectResult;
        }

--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.cs
@@ -164,25 +164,25 @@ namespace YooAsset.Editor
                        RefreshWindow();
                    }
                });
+
+                // 忽略规则
+                _ignoreRulePopupField = new PopupField<RuleDisplayName>(_ignoreRuleList, 0);
+                _ignoreRulePopupField.label = "File Ignore Rule";
+                _ignoreRulePopupField.name = "IgnoreRulePopupField";
+                _ignoreRulePopupField.style.unityTextAlign = TextAnchor.MiddleLeft;
+                _ignoreRulePopupField.style.width = 300;
+                _ignoreRulePopupField.formatListItemCallback = FormatListItemCallback;
+                _ignoreRulePopupField.formatSelectedValueCallback = FormatSelectedValueCallback;
+                _ignoreRulePopupField.RegisterValueChangedCallback(evt =>
                {
-                    _ignoreRulePopupField = new PopupField<RuleDisplayName>(_ignoreRuleList, 0);
-                    _ignoreRulePopupField.label = "File Ignore Rule";
-                    _ignoreRulePopupField.name = "IgnoreRulePopupField";
-                    _ignoreRulePopupField.style.unityTextAlign = TextAnchor.MiddleLeft;
-                    _ignoreRulePopupField.style.width = 300;
-                    _ignoreRulePopupField.formatListItemCallback = FormatListItemCallback;
-                    _ignoreRulePopupField.formatSelectedValueCallback = FormatSelectedValueCallback;
-                    _ignoreRulePopupField.RegisterValueChangedCallback(evt =>
+                    var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
+                    if (selectPackage != null)
                    {
-                        var selectPackage = _packageListView.selectedItem as AssetBundleCollectorPackage;
-                        if (selectPackage != null)
-                        {
-                            selectPackage.IgnoreRuleName = evt.newValue.ClassName;
-                            AssetBundleCollectorSettingData.ModifyPackage(selectPackage);
-                        }
-                    });
-                    _setting2Container.Add(_ignoreRulePopupField);
-                }
+                        selectPackage.IgnoreRuleName = evt.newValue.ClassName;
+                        AssetBundleCollectorSettingData.ModifyPackage(selectPackage);
+                    }
+                });
+                _setting2Container.Add(_ignoreRulePopupField);

                // 配置修复按钮
                var fixBtn = root.Q<Button>("FixButton");
@@ -995,14 +995,16 @@ namespace YooAsset.Editor
                try
                {
                    IIgnoreRule ignoreRule = AssetBundleCollectorSettingData.GetIgnoreRuleInstance(_ignoreRulePopupField.value.ClassName);
-                    CollectCommand command = new CollectCommand(true, false,
-                        _packageNameTxt.value,
-                        _enableAddressableToogle.value,
-                        _locationToLowerToogle.value,
-                        _includeAssetGUIDToogle.value,
-                        _autoCollectShadersToogle.value,
-                        _uniqueBundleNameToogle.value,
-                        ignoreRule);
+                    string packageName = _packageNameTxt.value;
+                    var command = new CollectCommand(packageName, ignoreRule);
+                    command.SimulateBuild = true;
+                    command.UniqueBundleName = _uniqueBundleNameToogle.value;
+                    command.UseAssetDependencyDB = true;
+                    command.EnableAddressable = _enableAddressableToogle.value;
+                    command.LocationToLower = _locationToLowerToogle.value;
+                    command.IncludeAssetGUID = _includeAssetGUIDToogle.value;
+                    command.AutoCollectShaders = _autoCollectShadersToogle.value;
+
                    collector.CheckConfigError();
                    collectAssetInfos = collector.GetAllCollectAssets(command, group);
                }
--- a/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/AssetBundleCollectorWindow.uxml
@@ -36,8 +36,8 @@
        </ui:VisualElement>
        <ui:VisualElement name="GroupContainer" style="width: 200px; flex-grow: 0; background-color: rgb(67, 67, 67); border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px;">
            <ui:Label text="Groups" display-tooltip-when-elided="true" name="GroupTitle" style="background-color: rgb(89, 89, 89); -unity-text-align: upper-center; -unity-font-style: bold; border-left-width: 5px; border-right-width: 5px; border-top-width: 5px; border-bottom-width: 5px; font-size: 12px;" />
-            <ui:TextField picking-mode="Ignore" label="Package Name" value="filler text" name="PackageName" style="flex-direction: column;" />
-            <ui:TextField picking-mode="Ignore" label="Package Desc" value="filler text" name="PackageDesc" style="flex-direction: column;" />
+            <ui:TextField picking-mode="Ignore" label="Package Name" name="PackageName" style="flex-direction: column;" />
+            <ui:TextField picking-mode="Ignore" label="Package Desc" name="PackageDesc" style="flex-direction: column;" />
            <ui:ListView focusable="true" name="GroupListView" item-height="20" virtualization-method="DynamicHeight" style="flex-grow: 1;" />
            <ui:VisualElement name="GroupAddContainer" style="height: 20px; flex-direction: row; justify-content: center;">
                <ui:Button text=" - " display-tooltip-when-elided="true" name="RemoveBtn" />
--- a/Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/CollectCommand.cs
@@ -3,75 +3,51 @@ namespace YooAsset.Editor
 {
    public class CollectCommand
    {
-        /// <summary>
-        /// 模拟构建模式
-        /// </summary>
-        public bool SimulateBuild { private set; get; }
-
-        /// <summary>
-        /// 使用资源依赖数据库
-        /// </summary>
-        public bool UseAssetDependencyDB { private set; get; }
-        
        /// <summary>
        /// 包裹名称
        /// </summary>
        public string PackageName { private set; get; }

-        /// <summary>
-        /// 启用可寻址资源定位
-        /// </summary>
-        public bool EnableAddressable { private set; get; }
-
-        /// <summary>
-        /// 资源定位地址大小写不敏感
-        /// </summary>
-        public bool LocationToLower { private set; get; }
-
-        /// <summary>
-        /// 包含资源GUID数据
-        /// </summary>
-        public bool IncludeAssetGUID { private set; get; }
-
-        /// <summary>
-        /// 自动收集所有着色器
-        /// </summary>
-        public bool AutoCollectShaders { private set; get; }
-
-        /// <summary>
-        /// 资源包名唯一化
-        /// </summary>
-        public bool UniqueBundleName { private set; get; }
-
-        /// <summary>
-        /// 着色器统一全名称
-        /// </summary>
-        public string ShadersBundleName { private set; get; }
-
        /// <summary>
        /// 忽略规则实例
        /// </summary>
        public IIgnoreRule IgnoreRule { private set; get; }


-        public CollectCommand(bool simulateBuild, bool useAssetDependencyDB, string packageName,
-            bool enableAddressable, bool locationToLower, bool includeAssetGUID,
-            bool autoCollectShaders, bool uniqueBundleName, IIgnoreRule ignoreRule)
-        {
-            SimulateBuild = simulateBuild;
-            UseAssetDependencyDB = useAssetDependencyDB;
-            PackageName = packageName;
-            EnableAddressable = enableAddressable;
-            LocationToLower = locationToLower;
-            IncludeAssetGUID = includeAssetGUID;
-            AutoCollectShaders = autoCollectShaders;
-            UniqueBundleName = uniqueBundleName;
-            IgnoreRule = ignoreRule;
+        /// <summary>
+        /// 模拟构建模式
+        /// </summary>
+        public bool SimulateBuild { set; get; }

-            // 着色器统一全名称
-            var packRuleResult = DefaultPackRule.CreateShadersPackRuleResult();
-            ShadersBundleName = packRuleResult.GetBundleName(packageName, uniqueBundleName);
-        }
+        /// <summary>
+        /// 资源包名唯一化
+        /// </summary>
+        public bool UniqueBundleName { set; get; }
+
+        /// <summary>
+        /// 使用资源依赖数据库
+        /// </summary>
+        public bool UseAssetDependencyDB { set; get; }
+
+        /// <summary>
+        /// 启用可寻址资源定位
+        /// </summary>
+        public bool EnableAddressable { set; get; }
+
+        /// <summary>
+        /// 资源定位地址大小写不敏感
+        /// </summary>
+        public bool LocationToLower { set; get; }
+
+        /// <summary>
+        /// 包含资源GUID数据
+        /// </summary>
+        public bool IncludeAssetGUID { set; get; }
+
+        /// <summary>
+        /// 自动收集所有着色器
+        /// </summary>
+        public bool AutoCollectShaders { set; get; }

        private AssetDependencyCache _assetDependency;
        public AssetDependencyCache AssetDependency
@@ -83,5 +59,11 @@ namespace YooAsset.Editor
                return _assetDependency;
            }
        }
+
+        public CollectCommand(string packageName, IIgnoreRule ignoreRule)
+        {
+            PackageName = packageName;
+            IgnoreRule = ignoreRule;
+        }
    }
 }
--- a/Assets/YooAsset/Editor/AssetBundleCollector/CollectResult.cs
+++ b/Assets/YooAsset/Editor/AssetBundleCollector/CollectResult.cs
@@ -15,12 +15,9 @@ namespace YooAsset.Editor
        /// </summary>
        public List<CollectAssetInfo> CollectAssets { private set; get; }

-        public CollectResult(CollectCommand command)
+        public CollectResult(CollectCommand command, List<CollectAssetInfo> collectAssets)
        {
            Command = command;
-        }
-        public void SetCollectAssets(List<CollectAssetInfo> collectAssets)
-        {
            CollectAssets = collectAssets;
        }
    }