S3-01 + S3-02

2026-03-09 17:50:49 +08:00
parent 793a87c171
commit 88641f17b0
19 changed files with 838 additions and 46 deletions
@@ -75,6 +75,26 @@ namespace GeometryTD.Procedure
        }
    }

+    public static class ProcedureMainNodeEventGuardService
+    {
+        public static bool MatchesCurrentNode(
+            RunState runState,
+            int nodeId,
+            RunNodeType nodeType,
+            int sequenceIndex)
+        {
+            RunNodeState currentNode = runState?.CurrentNode;
+            if (currentNode == null)
+            {
+                return false;
+            }
+
+            return (nodeId <= 0 || nodeId == currentNode.NodeId) &&
+                   (nodeType == RunNodeType.None || nodeType == currentNode.NodeType) &&
+                   (sequenceIndex < 0 || sequenceIndex == currentNode.SequenceIndex);
+        }
+    }
+
    public class ProcedureMain : ProcedureBase
    {
        public override bool UseNativeDialog => false;
@@ -177,19 +197,21 @@ namespace GeometryTD.Procedure
            }

            RunNodeState currentNode = _currentRunState?.CurrentNode;
-            if (currentNode != null &&
-                ((args.NodeId > 0 && args.NodeId != currentNode.NodeId) ||
-                 (args.NodeType != RunNodeType.None && args.NodeType != currentNode.NodeType) ||
-                 (args.SequenceIndex >= 0 && args.SequenceIndex != currentNode.SequenceIndex)))
+            if (!ProcedureMainNodeEventGuardService.MatchesCurrentNode(
+                    _currentRunState,
+                    args.NodeId,
+                    args.NodeType,
+                    args.SequenceIndex))
            {
                Log.Warning(
                    "ProcedureMain.OnNodeEnter() node mismatch. EventNodeId={0}, EventNodeType={1}, EventSequenceIndex={2}; CurrentNodeId={3}, CurrentNodeType={4}, CurrentSequenceIndex={5}.",
                    args.NodeId,
                    args.NodeType,
                    args.SequenceIndex,
-                    currentNode.NodeId,
-                    currentNode.NodeType,
-                    currentNode.SequenceIndex);
+                    currentNode?.NodeId ?? 0,
+                    currentNode?.NodeType ?? RunNodeType.None,
+                    currentNode?.SequenceIndex ?? -1);
+                return;
            }

            Log.Info(
@@ -220,6 +242,24 @@ namespace GeometryTD.Procedure
                return;
            }

+            RunNodeState currentNode = _currentRunState?.CurrentNode;
+            if (!ProcedureMainNodeEventGuardService.MatchesCurrentNode(
+                    _currentRunState,
+                    args.NodeId,
+                    args.NodeType,
+                    args.SequenceIndex))
+            {
+                Log.Warning(
+                    "ProcedureMain.OnNodeComplete() node mismatch. EventNodeId={0}, EventNodeType={1}, EventSequenceIndex={2}; CurrentNodeId={3}, CurrentNodeType={4}, CurrentSequenceIndex={5}.",
+                    args.NodeId,
+                    args.NodeType,
+                    args.SequenceIndex,
+                    currentNode?.NodeId ?? 0,
+                    currentNode?.NodeType ?? RunNodeType.None,
+                    currentNode?.SequenceIndex ?? -1);
+                return;
+            }
+
            Log.Info(
                "ProcedureMain.OnNodeComplete() accepted. RunId={0}, NodeId={1}, NodeType={2}, SequenceIndex={3}, CompletionStatus={4}, CombatWon={5}.",
                string.IsNullOrWhiteSpace(args.RunId) ? _currentRunState?.RunId : args.RunId,