From 463baac08e122753a1887408ef8d2e09479a769e Mon Sep 17 00:00:00 2001 From: DKChan <524912269@qq.com> Date: Tue, 29 Sep 2026 05:49:17 +0800 Subject: [PATCH] =?UTF-8?q?fix(review-batch1):=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=AE=A1=E6=9F=A5=E6=89=B91=E4=B8=89=E5=88=80=E2=80=94?= =?UTF-8?q?=E2=80=94fatal=20=E9=80=9A=E9=81=93=E7=BD=AE=20fatal=5Ferror=20?= =?UTF-8?q?=E9=98=BB=E6=96=AD=E5=8F=97=E7=90=86(P1-1)+=5Freject=20?= =?UTF-8?q?=E5=B1=95=E5=B9=B3(P2-5)+=E5=BF=AB=E7=85=A7=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E4=BD=93=E6=8D=A2=E8=A1=8C(P2-6)=EF=BC=9B=E5=AE=A1=E8=AE=A1?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=E4=B8=8D=E5=8A=A8(83/240)=EF=BC=8C=E5=8D=95?= =?UTF-8?q?=E6=B5=8B7=E5=A5=97=E5=85=A8=E8=BF=87=EF=BC=8C=E5=86=92?= =?UTF-8?q?=E7=83=9F576/0=E5=90=8C=E5=9F=BA=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game/core/action_economy.gd | 5 ++++- game/core/battle_orchestrator.gd | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/game/core/action_economy.gd b/game/core/action_economy.gd index 9912d707..a80b0455 100644 --- a/game/core/action_economy.gd +++ b/game/core/action_economy.gd @@ -164,4 +164,7 @@ func _finish_round(path_tag: String, continuation_hint: String) -> void: func _reject(source: String) -> void: - push_warning("[行动经济] 动作被拒（%s 相位守卫/资源）" % source if source == "phase" else "[行动经济] 资源不足拒绝") + if source == "phase": + push_warning("[行动经济] 动作被拒（%s 相位守卫/资源）" % source) + else: + push_warning("[行动经济] 资源不足拒绝") diff --git a/game/core/battle_orchestrator.gd b/game/core/battle_orchestrator.gd index 60ef62b6..2bce5d59 100644 --- a/game/core/battle_orchestrator.gd +++ b/game/core/battle_orchestrator.gd @@ -54,7 +54,7 @@ var _damage: DamageController # 伤害控制器（伤害管线单据化批 202 var encounter: Dictionary = {} var round_index := 0 -var battle_result := "" # "" / "victory" / "defeat" +var battle_result := "" # "" / "victory" / "defeat" / "fatal_error" var escrow := 0 # 战斗内 GP 缓冲（战斗域中间态——begin_battle 清零；gp_gain/gp_loss 兑付累记；随 gp_dropped 上抛即弃，不入钱包） var _facts_reveals: Array = [] @@ -802,7 +802,8 @@ func query_reward_identity(cell: Vector2i): # 诊断观测面（组合根诊断转储 / 行为探针消费）：私有编排状态的成文只读出口—— # 消费方禁止再直读本类下划线字段（code-review 2026-09-12 封装收口批） -func diagnostic_snapshot() -> Dictionary: return { +func diagnostic_snapshot() -> Dictionary: + return { "battle_result": battle_result, "round": round_index, "settling": _settling, @@ -861,4 +862,5 @@ func _assert_row_source(type: String, source_class: String, origin_cell: Vector2 func _fatal(msg: String) -> void: push_error("[战斗结算/fatal] " + msg) + battle_result = "fatal_error" # release 构建剥离 assert 后的唯一阻断面——受理/结算/刷新入口全查 battle_result == "" assert(false, msg)