修复已知问题

2026-03-13 14:55:17 +08:00
parent aa44170d56
commit 777c58b812
11 changed files with 346 additions and 97 deletions
@@ -100,7 +100,8 @@ namespace GeometryTD.CustomComponent
            _runtime.NodeId = nodeId;
            _runtime.NodeType = nodeType;
            _runtime.SequenceIndex = sequenceIndex;
-            GameEntry.InventoryGeneration.ConfigureRunContext(runSeed, sequenceIndex);
+            _runtime.NextDropOrdinal = 0;
+            _runtime.NextRewardOrdinal = 0;
            _runtime.CombatRunResourceStore.InitializeForCombat(level);
            for (int i = 0; i < phases.Count; i++)
            {
@@ -201,7 +202,13 @@ namespace GeometryTD.CustomComponent
                enemy,
                _runtime.PhaseLoopRuntime.DisplayPhaseIndex,
                _coordinator.ResolveCurrentThemeType());
-            EnemyDropResult result = GameEntry.InventoryGeneration.ResolveEnemyDrop(context);
+            int nextDropOrdinal = _runtime.NextDropOrdinal;
+            EnemyDropResult result = GameEntry.InventoryGeneration.ResolveEnemyDrop(
+                context,
+                _runtime.RunSeed,
+                _runtime.SequenceIndex,
+                ref nextDropOrdinal);
+            _runtime.NextDropOrdinal = nextDropOrdinal;
            _runtime.CombatRunResourceStore.AddEnemyDefeatedReward(result.Coin, result.Gold);
            _runtime.CombatRunResourceStore.AddEnemyDefeatedLoot(result.LootItem);
        }
@@ -60,6 +60,8 @@ namespace GeometryTD.CustomComponent
            _runtime.NodeId = 0;
            _runtime.NodeType = RunNodeType.None;
            _runtime.SequenceIndex = -1;
+            _runtime.NextDropOrdinal = 0;
+            _runtime.NextRewardOrdinal = 0;
        }

        public void CleanupAllCombatEntities()
@@ -34,5 +34,7 @@ namespace GeometryTD.CustomComponent
        public int NodeId { get; set; }
        public RunNodeType NodeType { get; set; }
        public int SequenceIndex { get; set; }
+        public int NextDropOrdinal { get; set; }
+        public int NextRewardOrdinal { get; set; }
    }
 }
@@ -36,6 +36,9 @@ namespace GeometryTD.CustomComponent
            CombatSettlementContext settlementContext,
            int displayPhaseIndex,
            LevelThemeType themeType,
+            int runSeed,
+            int sequenceIndex,
+            ref int nextRewardOrdinal,
            RewardSelectFormUseCase rewardSelectFormUseCase,
            Action<RewardSelectItemRawData> onRewardSelected,
            Action onGiveUp)
@@ -48,7 +51,10 @@ namespace GeometryTD.CustomComponent
            IReadOnlyList<TowerCompItemData> candidateItems = GameEntry.InventoryGeneration.BuildRewardCandidates(
                displayPhaseIndex,
                themeType,
-                RewardSelectDisplayCount);
+                RewardSelectDisplayCount,
+                runSeed,
+                sequenceIndex,
+                ref nextRewardOrdinal);
            if (candidateItems == null || candidateItems.Count <= 0)
            {
                settlementContext.Flags.ShouldOpenRewardSelection = false;
@@ -60,7 +66,7 @@ namespace GeometryTD.CustomComponent
                candidateItems,
                displayCount: RewardSelectDisplayCount,
                refreshCost: 0,
-                allowRefreshOnce: false,
+                allowRotateOnce: false,
                allowGiveUp: false,
                tipText: "基地满血奖励：请选择 1 个组件");

@@ -16,16 +16,23 @@ namespace GeometryTD.CustomComponent
            }

            Coordinator.EnsureRewardSelectFormUseCaseBound();
+            int nextRewardOrdinal = Runtime.NextRewardOrdinal;
            if (!Runtime.CombatSettlementService.TryPrepareRewardSelection(
                    Runtime.SettlementContext,
                    Runtime.PhaseLoopRuntime.DisplayPhaseIndex,
                    Coordinator.ResolveCurrentThemeType(),
+                    Runtime.RunSeed,
+                    Runtime.SequenceIndex,
+                    ref nextRewardOrdinal,
                    Runtime.RewardSelectFormUseCase,
                    Coordinator.OnFullBaseHpRewardSelected,
                    Coordinator.OnFullBaseHpRewardGiveUp))
            {
                Coordinator.ChangeState(new CombatFinishFormState(Runtime, Coordinator));
+                return;
            }
+
+            Runtime.NextRewardOrdinal = nextRewardOrdinal;
        }

        public override void OnExit()