From 4ca4ddbc4264c4c21daf1b7512599fcce8143c46 Mon Sep 17 00:00:00 2001 From: DKChan <524912269@qq.com> Date: Tue, 27 Oct 2026 16:48:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E4=BB=B6=E6=89=B9v1.3-=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DA(=E6=8C=82=E6=AD=BB=E4=B8=8E=E6=AE=8B=E7=95=99?= =?UTF-8?q?=E4=B8=A4=E7=BC=BA=E9=99=B7):=20trigger=5Fcond=5Ftest=20V6=20?= =?UTF-8?q?=E4=B8=89=E5=A4=84=E6=97=A7=E6=88=90=E5=91=98=E8=AF=BB=E9=9A=8F?= =?UTF-8?q?=20B4=20=E6=8C=87=E6=A0=87=E9=9D=A2=E6=8D=A2=E4=BB=A3=E2=80=94?= =?UTF-8?q?=E2=80=94=5Fmines=5Fhit=5Ftotal/=5Fmines=5Fhit=5Flast/=5Fmines?= =?UTF-8?q?=5Fhit=5Fround=20=E4=B8=89=E8=AE=A1=E6=95=B0=E5=B7=B2=E5=B9=B6?= =?UTF-8?q?=E5=85=A5=20=5Fmines=5Fhits=20=E4=B8=80=E8=B4=A6,=E6=96=AD?= =?UTF-8?q?=E8=A8=80=E5=90=8C=E5=BC=BA=E5=BA=A6=E6=94=B9=E9=94=AE=E8=AF=BB?= =?UTF-8?q?(total/last/round);=E6=97=A7=E8=AF=BB=E5=9C=A8=20=5Finit=20?= =?UTF-8?q?=E4=B8=AD=E6=AE=B5=E5=8D=B3=20SCRIPT=20ERROR=20=E4=B8=AD?= =?UTF-8?q?=E6=AD=A2,quit=20=E6=B0=B8=E4=B8=8D=E8=BE=BE=E2=86=92headless?= =?UTF-8?q?=20=E8=BF=9B=E7=A8=8B=E9=AB=98=20CPU=20=E4=B8=8D=E9=80=80?= =?UTF-8?q?=E5=87=BA(=E4=B8=A4=E8=BD=AE=E8=A7=82=E6=B5=8B=20=E2=89=A518/?= =?UTF-8?q?=E2=89=A525=20=E5=88=86=E9=92=9F=E5=A4=8D=E7=8E=B0,=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=90=8E=201.7=20=E7=A7=92=E5=85=A8=E7=BB=BF);adventu?= =?UTF-8?q?re=5Frunner=20resume=20=E5=B7=B2=E5=85=91=E4=BB=98=E5=88=86?= =?UTF-8?q?=E6=94=AF=E5=88=A0=20reemit=5Fresolved()=20=E6=AE=8B=E7=95=99?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E2=80=94=E2=80=94restore=5Fresolved=20?= =?UTF-8?q?=E5=B7=B2=E6=94=B6=E7=BC=96=E7=BD=AE=E6=80=81+=E9=87=8D?= =?UTF-8?q?=E5=8F=91=E4=B8=80=E6=AD=A5(=E6=97=B6=E5=BA=8F=E9=80=90?= =?UTF-8?q?=E4=BD=8D=E5=90=8C),=E6=AE=8B=E7=95=99=E8=B0=83=20Nonexistent?= =?UTF-8?q?=20function=20=E8=BF=90=E8=A1=8C=E6=9C=9F=E7=BA=A2=E3=80=82?= =?UTF-8?q?=E9=AA=8C=E6=94=B6:trigger=5Fcond=5Ftest=20=E5=8D=95=E8=B7=91?= =?UTF-8?q?=201.7s=20=E5=85=A8=E7=BB=BF=20exit0;bp=5Fresume=5Ftest=20?= =?UTF-8?q?=E5=8D=95=E8=B7=91=202.2s=20=E5=85=A8=E7=BB=BF=20exit0=E3=80=94?= =?UTF-8?q?=E9=A2=86=E5=9F=9F=E6=8B=86=E5=88=86=E6=89=B9=20V1=E3=80=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game/core/adventure_runner.gd | 3 +-- game/tests/unit/battle_settlement/trigger_cond_test.gd | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) 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 池构成纪律（现行全表零违例＋构造全条件池报错——跨表校验真实入口）----