S4-07 process 3

- 组件 Tag 数量预算不再写死在 ResolveTagBudget(...) 里，而是走 RarityTagBudget.txt -> DRRarityTagBudget -> RarityTagBudgetRuleRegistry -> InventoryTagRuleService 这条表驱动链。 - TagBudget.txt:1 新增了按品质的 MinCount/MaxCount，预算缓存和加载入口分别在 RarityTagBudgetRuleRegistry.cs:7 和 ProcedurePreload.cs:18。 - 生成逻辑已经接到新规则，InventoryTagRuleService.cs:10 现在会先按 Tag.txt 过滤/加权，再按 RarityTagBudget 决定抽几个 Tag。
2026-03-11 13:16:33 +08:00
parent b1b68ebde5
commit 515fe95441
14 changed files with 303 additions and 39 deletions
@@ -0,0 +1,8 @@
+#	Id	列1	RarityType	MinCount	MaxCount
+#	int		RarityType	int	int
+#	预算编号	策划备注	稀有度	最低Tag数量	最高Tag数量
+	1		White	0	1
+	2		Green	0	2
+	3		Blue	1	3
+	4		Purple	1	3
+	5		Red	2	4
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6b4b5ba2b4cd50e48ae0ef4ea3e6cecf
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,38 @@
+using GeometryTD.CustomUtility;
+using GeometryTD.Definition;
+using UnityGameFramework.Runtime;
+
+namespace GeometryTD.DataTable
+{
+    public sealed class DRRarityTagBudget : DataRowBase
+    {
+        private int m_Id;
+
+        public override int Id => m_Id;
+
+        public RarityType Rarity { get; private set; }
+
+        public int MinCount { get; private set; }
+
+        public int MaxCount { get; private set; }
+
+        public override bool ParseDataRow(string dataRowString, object userData)
+        {
+            string[] columnStrings = dataRowString.Split(DataTableExtension.DataSplitSeparators);
+            for (int i = 0; i < columnStrings.Length; i++)
+            {
+                columnStrings[i] = columnStrings[i].Trim(DataTableExtension.DataTrimSeparators);
+            }
+
+            int index = 0;
+            index++;
+            m_Id = int.Parse(columnStrings[index++]);
+            index++;
+            Rarity = EnumUtility<RarityType>.Get(columnStrings[index++]);
+            MinCount = int.Parse(columnStrings[index++]);
+            MaxCount = int.Parse(columnStrings[index++]);
+
+            return true;
+        }
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d5e6052cd3fe424d8b6ac53c33c063c5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -13,7 +13,8 @@ namespace GeometryTD.Definition
            InventoryTagSourceType sourceType,
            long itemInstanceId,
            int configId,
-            IReadOnlyDictionary<TagType, TagGenerationRuleData> rulesByTag = null)
+            IReadOnlyDictionary<TagType, TagGenerationRuleData> rulesByTag = null,
+            IReadOnlyDictionary<RarityType, RarityTagBudgetRuleData> rarityTagBudgetRulesByRarity = null)
        {
            IReadOnlyDictionary<TagType, TagGenerationRuleData> ruleLookup = rulesByTag ?? TagGenerationRuleRegistry.Rules;
            TagType[] eligibleTags = GetEligibleTags(possibleTags, rarity, ruleLookup);
@@ -23,7 +24,7 @@ namespace GeometryTD.Definition
            }

            Random random = new Random(BuildStableSeed(rarity, sourceType, itemInstanceId, configId));
-            int tagBudget = ResolveTagBudget(rarity, random);
+            int tagBudget = ResolveRarityTagBudget(rarity, random, rarityTagBudgetRulesByRarity);
            if (tagBudget <= 0)
            {
                return Array.Empty<TagType>();
@@ -88,26 +89,25 @@ namespace GeometryTD.Definition
            return result;
        }

-        public static int ResolveTagBudget(RarityType rarity, Random random)
+        public static int ResolveRarityTagBudget(
+            RarityType rarity,
+            Random random,
+            IReadOnlyDictionary<RarityType, RarityTagBudgetRuleData> rarityTagBudgetRulesByRarity = null)
        {
            RarityType normalizedRarity = InventoryRarityRuleService.NormalizeComponentRarity(rarity);
-            random ??= new Random(0);
+            IReadOnlyDictionary<RarityType, RarityTagBudgetRuleData> ruleLookup = rarityTagBudgetRulesByRarity ?? RarityTagBudgetRuleRegistry.Rules;
+            RarityTagBudgetRuleData rule = GetRarityTagBudgetRule(normalizedRarity, ruleLookup);

-            switch (normalizedRarity)
+            Debug.Assert(rule.MinCount >= 0);
+            Debug.Assert(rule.MaxCount >= rule.MinCount);
+
+            if (rule.MinCount == rule.MaxCount)
            {
-                case RarityType.White:
-                    return random.Next(0, 2);
-                case RarityType.Green:
-                    return 1;
-                case RarityType.Blue:
-                    return random.Next(1, 3);
-                case RarityType.Purple:
-                    return 2;
-                case RarityType.Red:
-                    return random.Next(2, 4);
-                default:
-                    return 0;
+                return rule.MinCount;
            }
+
+            random ??= new Random(0);
+            return random.Next(rule.MinCount, rule.MaxCount + 1);
        }

        private static bool IsSupportedLaunchTag(TagType tagType)
@@ -131,6 +131,15 @@ namespace GeometryTD.Definition
            return false;
        }

+        private static RarityTagBudgetRuleData GetRarityTagBudgetRule(
+            RarityType rarity,
+            IReadOnlyDictionary<RarityType, RarityTagBudgetRuleData> ruleLookup)
+        {
+            Debug.Assert(ruleLookup != null);
+            Debug.Assert(ruleLookup.TryGetValue(rarity, out _));
+            return ruleLookup[rarity];
+        }
+
        private static int RollWeightedIndex(
            IReadOnlyList<TagType> pool,
            IReadOnlyDictionary<TagType, TagGenerationRuleData> ruleLookup,
@@ -0,0 +1,9 @@
+namespace GeometryTD.Definition
+{
+    public sealed class RarityTagBudgetRuleData
+    {
+        public RarityType Rarity { get; set; }
+        public int MinCount { get; set; }
+        public int MaxCount { get; set; }
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2c0b098910eb4f8486d306ecf1812423
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,73 @@
+using System.Collections.Generic;
+using GeometryTD.DataTable;
+using UnityEngine;
+
+namespace GeometryTD.Definition
+{
+    public static class RarityTagBudgetRuleRegistry
+    {
+        private static readonly Dictionary<RarityType, RarityTagBudgetRuleData> RulesByRarity = CreateDefaultRules();
+
+        public static IReadOnlyDictionary<RarityType, RarityTagBudgetRuleData> Rules => RulesByRarity;
+
+        public static void ResetToDefaults()
+        {
+            RulesByRarity.Clear();
+            foreach (KeyValuePair<RarityType, RarityTagBudgetRuleData> pair in CreateDefaultRules())
+            {
+                RulesByRarity.Add(pair.Key, pair.Value);
+            }
+        }
+
+        public static void LoadFromRows(IEnumerable<DRRarityTagBudget> rows)
+        {
+            ResetToDefaults();
+            foreach (DRRarityTagBudget row in rows)
+            {
+                ApplyRow(row);
+            }
+        }
+
+        public static bool TryGetRule(RarityType rarity, out RarityTagBudgetRuleData rule)
+        {
+            return RulesByRarity.TryGetValue(rarity, out rule);
+        }
+
+        private static Dictionary<RarityType, RarityTagBudgetRuleData> CreateDefaultRules()
+        {
+            return new Dictionary<RarityType, RarityTagBudgetRuleData>
+            {
+                [RarityType.White] = CreateRule(RarityType.White, 0, 1),
+                [RarityType.Green] = CreateRule(RarityType.Green, 1, 1),
+                [RarityType.Blue] = CreateRule(RarityType.Blue, 1, 2),
+                [RarityType.Purple] = CreateRule(RarityType.Purple, 2, 2),
+                [RarityType.Red] = CreateRule(RarityType.Red, 2, 3)
+            };
+        }
+
+        private static RarityTagBudgetRuleData CreateRule(RarityType rarity, int minCount, int maxCount)
+        {
+            Debug.Assert(rarity >= RarityType.White && rarity <= RarityType.Red);
+            Debug.Assert(minCount >= 0);
+            Debug.Assert(maxCount >= minCount);
+
+            return new RarityTagBudgetRuleData
+            {
+                Rarity = rarity,
+                MinCount = minCount,
+                MaxCount = maxCount
+            };
+        }
+
+        private static void ApplyRow(DRRarityTagBudget row)
+        {
+            Debug.Assert(row != null);
+            Debug.Assert(row.Id > 0);
+            Debug.Assert(row.Rarity >= RarityType.White && row.Rarity <= RarityType.Red);
+            Debug.Assert(row.MinCount >= 0);
+            Debug.Assert(row.MaxCount >= row.MinCount);
+
+            RulesByRarity[row.Rarity] = CreateRule(row.Rarity, row.MinCount, row.MaxCount);
+        }
+    }
+}
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bc43423fff7c416fa0a8396e670da212
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -31,6 +31,7 @@ namespace GeometryTD.Procedure
            "ShopPrice",
            "Sound",
            "Tag",
+            "RarityTagBudget",
            "TagConfig",
            "OutGameDropPool",
            "UIForm",
@@ -213,6 +214,15 @@ namespace GeometryTD.Procedure
                    TagGenerationRuleRegistry.LoadFromRows(tagTable.GetAllDataRows());
                }
            }
+
+            if (ne.DataTableAssetName == AssetUtility.GetDataTableAsset("RarityTagBudget", false))
+            {
+                var tagBudgetTable = GameEntry.DataTable.GetDataTable<DRRarityTagBudget>();
+                if (tagBudgetTable != null)
+                {
+                    RarityTagBudgetRuleRegistry.LoadFromRows(tagBudgetTable.GetAllDataRows());
+                }
+            }
        }

        private void OnLoadDataTableFailure(object sender, GameEventArgs e)
@@ -20,6 +20,16 @@ namespace GeometryTD.Tests.EditMode
                { TagType.Execution, new TagGenerationRuleData { TagType = TagType.Execution, MinRarity = RarityType.Purple, Weight = 5 } },
            };

+        private static readonly IReadOnlyDictionary<RarityType, RarityTagBudgetRuleData> RarityTagBudgetRulesByRarity =
+            new Dictionary<RarityType, RarityTagBudgetRuleData>
+            {
+                { RarityType.White, new RarityTagBudgetRuleData { Rarity = RarityType.White, MinCount = 0, MaxCount = 1 } },
+                { RarityType.Green, new RarityTagBudgetRuleData { Rarity = RarityType.Green, MinCount = 1, MaxCount = 1 } },
+                { RarityType.Blue, new RarityTagBudgetRuleData { Rarity = RarityType.Blue, MinCount = 1, MaxCount = 2 } },
+                { RarityType.Purple, new RarityTagBudgetRuleData { Rarity = RarityType.Purple, MinCount = 2, MaxCount = 2 } },
+                { RarityType.Red, new RarityTagBudgetRuleData { Rarity = RarityType.Red, MinCount = 2, MaxCount = 3 } },
+            };
+
        [Test]
        public void GetEligibleTags_Filters_Invalid_Unsupported_And_HighRarity_Tags()
        {
@@ -70,7 +80,8 @@ namespace GeometryTD.Tests.EditMode
                InventoryTagSourceType.Drop,
                9001,
                4,
-                RulesByTag);
+                RulesByTag,
+                RarityTagBudgetRulesByRarity);

            Assert.That(result.Length, Is.EqualTo(2));
            Assert.That(new HashSet<TagType>(result).Count, Is.EqualTo(result.Length));
@@ -85,7 +96,8 @@ namespace GeometryTD.Tests.EditMode
                InventoryTagSourceType.Seed,
                42,
                1,
-                RulesByTag);
+                RulesByTag,
+                RarityTagBudgetRulesByRarity);

            Assert.That(result, Is.EqualTo(new[] { TagType.Fire }));
        }
@@ -107,7 +119,8 @@ namespace GeometryTD.Tests.EditMode
                InventoryTagSourceType.Shop,
                1,
                1,
-                weightedRules);
+                weightedRules,
+                RarityTagBudgetRulesByRarity);

            Assert.That(result, Has.Length.EqualTo(1));
            Assert.That(result[0], Is.EqualTo(TagType.Fire));
@@ -134,7 +147,8 @@ namespace GeometryTD.Tests.EditMode
                    InventoryTagSourceType.Shop,
                    1000 + i,
                    1,
-                    weightedRules);
+                    weightedRules,
+                    RarityTagBudgetRulesByRarity);

                Assert.That(result, Has.Length.EqualTo(1));
                if (result[0] == TagType.Fire)
@@ -161,6 +175,69 @@ namespace GeometryTD.Tests.EditMode
            TagGenerationRuleRegistry.ResetToDefaults();
        }

+        [Test]
+        public void ResolveRarityTagBudget_Uses_TableDriven_Range_Rules()
+        {
+            int whiteBudget = InventoryTagRuleService.ResolveRarityTagBudget(
+                RarityType.White,
+                new System.Random(0),
+                RarityTagBudgetRulesByRarity);
+            int greenBudget = InventoryTagRuleService.ResolveRarityTagBudget(
+                RarityType.Green,
+                new System.Random(0),
+                RarityTagBudgetRulesByRarity);
+            int redBudget = InventoryTagRuleService.ResolveRarityTagBudget(
+                RarityType.Red,
+                new System.Random(0),
+                RarityTagBudgetRulesByRarity);
+
+            Assert.That(whiteBudget, Is.InRange(0, 1));
+            Assert.That(greenBudget, Is.EqualTo(1));
+            Assert.That(redBudget, Is.InRange(2, 3));
+        }
+
+        [Test]
+        public void ResolveComponentTags_Uses_Custom_Purple_Budget_From_Rules()
+        {
+            IReadOnlyDictionary<RarityType, RarityTagBudgetRuleData> customBudgetRules =
+                new Dictionary<RarityType, RarityTagBudgetRuleData>(RarityTagBudgetRulesByRarity)
+                {
+                    [RarityType.Purple] = new RarityTagBudgetRuleData
+                    {
+                        Rarity = RarityType.Purple,
+                        MinCount = 3,
+                        MaxCount = 3
+                    }
+                };
+
+            TagType[] result = InventoryTagRuleService.ResolveComponentTags(
+                new[] { TagType.Fire, TagType.Ice, TagType.Crit, TagType.Shatter, TagType.Inferno, TagType.Execution },
+                RarityType.Purple,
+                InventoryTagSourceType.Drop,
+                99,
+                7,
+                RulesByTag,
+                customBudgetRules);
+
+            Assert.That(result, Has.Length.EqualTo(3));
+            Assert.That(new HashSet<TagType>(result).Count, Is.EqualTo(3));
+        }
+
+        [Test]
+        public void RarityTagBudgetRuleRegistry_LoadFromRows_Overrides_Purple_Budget()
+        {
+            DRRarityTagBudget purpleRow = new DRRarityTagBudget();
+            Assert.That(purpleRow.ParseDataRow("\t4\t\tPurple\t3\t3", null), Is.True);
+
+            RarityTagBudgetRuleRegistry.LoadFromRows(new[] { purpleRow });
+
+            Assert.That(RarityTagBudgetRuleRegistry.TryGetRule(RarityType.Purple, out RarityTagBudgetRuleData rule), Is.True);
+            Assert.That(rule.MinCount, Is.EqualTo(3));
+            Assert.That(rule.MaxCount, Is.EqualTo(3));
+
+            RarityTagBudgetRuleRegistry.ResetToDefaults();
+        }
+
        [Test]
        public void CreateSampleInventory_Generates_SeedTags_Within_Launch_Set_And_Matches_Tower_Stats()
        {