diff --git a/game/core/adventure_runner.gd b/game/core/adventure_runner.gd index a9c1f120..cdd1a2dc 100644 --- a/game/core/adventure_runner.gd +++ b/game/core/adventure_runner.gd @@ -158,9 +158,8 @@ func resume_adventure(bp: Dictionary, params: Dictionary = {}) -> bool: return true if not bp_result.is_empty(): _pending_next_level = true - _stop.restore_resolved(bp_result) + _stop.restore_resolved(bp_result) # 已兑付不重兑付只重发(置态+重发收编一步——信号面归停点件) _state = State.RUNNING - _stop.reemit_resolved() # 已兑付不重兑付只重发(信号面归停点件) return true _resume_bp = bp.duplicate(true) # 充能读侧以行集为源(键值仅校验读数——回填时点在首关 bind 行集就位后,经 _loadout_on_level_inventory) diff --git a/game/tests/unit/battle_settlement/trigger_cond_test.gd b/game/tests/unit/battle_settlement/trigger_cond_test.gd index 33d9ab12..826c0e49 100644 --- a/game/tests/unit/battle_settlement/trigger_cond_test.gd +++ b/game/tests/unit/battle_settlement/trigger_cond_test.gd @@ -116,17 +116,17 @@ func _init() -> void: "feats": [], "tree_rules": [], "battle_index": 1, "voucher_rap": 0, "voucher_time_sand": 0, "node_type": "battle", "adv_bucket": {}}), "V6 前置:战斗受理") # facts 组包经真实摇号路径消费(mines 全零时条件技 sneak_ambush 不入集合——facts 四键在位的可观察面) - Kit.check_quiet(orch._mines_hit_total == 0 and orch._mines_hit_last == 0 and orch._mines_hit_round == 0, + Kit.check_quiet(int(orch._mines_hits["total"]) == 0 and int(orch._mines_hits["last"]) == 0 and int(orch._mines_hits["round"]) == 0, "V6 开战清零:三计数全零起〔触发器批 V6〕") # 正向 blast(spark_aoe)不递增——负向计数守卫 orch._apply_flat_row({"cell_type": "blast", "polarity": "positive", "power": 2, "display_name": "爆裂", "reward_id": "spark_aoe"}, "reward", Vector2i(-1, -1), 1) - Kit.check_quiet(orch._mines_hit_total == 0 and orch._mines_hit_round == 0, + Kit.check_quiet(int(orch._mines_hits["total"]) == 0 and int(orch._mines_hits["round"]) == 0, "V6 正向 blast(spark_aoe)不递增(负向守卫——清图/爆裂格零误计)〔触发器批 V6〕") # 负向 blast(雷)递增 orch._apply_flat_row({"cell_type": "blast", "polarity": "negative", "power": 2, "display_name": "警觉", "reward_id": "enemy_alert"}, "reward", Vector2i(-1, -1), 1) - Kit.check_quiet(orch._mines_hit_total == 1 and orch._mines_hit_round == 1, + Kit.check_quiet(int(orch._mines_hits["total"]) == 1 and int(orch._mines_hits["round"]) == 1, "V6 负向 blast(雷)递增恰一次〔触发器批 V6〕") # ---- V7 池构成纪律(现行全表零违例+构造全条件池报错——跨表校验真实入口)----