A1 + A2

Assets/GameMain/Scripts/CustomComponent/CombatNode/CombatScheduler/CombatStates/CombatRewardSelectionState.cs

@@ -21,8 +21,8 @@ namespace GeometryTD.CustomComponent
                     Runtime.SettlementContext,
                     Runtime.PhaseLoopRuntime.DisplayPhaseIndex,
                     Coordinator.ResolveCurrentThemeType(),
-                    Runtime.RunSeed,
-                    Runtime.SequenceIndex,
+                    Runtime.NodeContext != null ? Runtime.NodeContext.RunSeed : 0,
+                    Runtime.NodeContext != null ? Runtime.NodeContext.SequenceIndex : -1,
                     ref nextRewardOrdinal,
                     Runtime.RewardSelectFormUseCase,
                     Coordinator.OnFullBaseHpRewardSelected,

Assets/GameMain/Scripts/CustomComponent/CombatNode/CombatScheduler/CombatStates/CombatRunningPhaseState.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using GeometryTD.CustomEvent;
 using GeometryTD.DataTable;
+using GeometryTD.Procedure;
 using UnityGameFramework.Runtime;
 
 namespace GeometryTD.CustomComponent
@@ -41,10 +42,10 @@ namespace GeometryTD.CustomComponent
                 GameEntry.Event.Fire(
                     Coordinator,
                     NodeEnterEventArgs.Create(
-                        Runtime.RunId,
-                        Runtime.NodeId,
-                        Runtime.NodeType,
-                        Runtime.SequenceIndex));
+                        Runtime.NodeContext?.RunId,
+                        Runtime.NodeContext?.NodeId ?? 0,
+                        Runtime.NodeContext?.NodeType ?? RunNodeType.None,
+                        Runtime.NodeContext?.SequenceIndex ?? -1));
             }
 
             Log.Info(