Merge branch 'master' into iter41

# Conflicts:
#	game/tests/unit/battle_settlement/roll_multiplier_test.gd
#	game/tests/unit/core/adventure_feats_test.gd
#	game/tests/unit/core/config_db_resolver_test.gd
#	game/tests/unit/core/level_shop_economy_test.gd
#	game/tests/unit/core/save_boot_no_activate_test.gd

game/tests/integration/cross_system_flow_test.gd

@@ -73,8 +73,8 @@ func _feats_breakpoint_roundtrip() -> void:
 		{"feat_id": "x5", "display_name": "试五", "rarity": "legendary", "desc": "测试AC", "cap": 1,
 			"triggers": [{"on": "seal_hit", "do": {"kind": "ac_bonus", "value": 1, "mode": "round"}}]},
 	]
-	var live_rows: FeatTable = _db.feats
-	_db.feats = rt
+	var live_rows: FeatTable = _db.crossrun.feats
+	_db.crossrun.feats = rt
 	var a_r = load("res://core/adventure_runner.gd").new(_db, _fresh_rng(72))
 	a_r.start_adventure(72)   # 源 :723（受理断言留单元宿主）
 	a_r.stop()._pending = {"candidates": [{"kind": "relic", "tier": "rare", "feat_id": "x3"}, {"kind": "gp", "tier": "common"}], "payload": {}}
@@ -98,7 +98,7 @@ func _feats_breakpoint_roundtrip() -> void:
 	sm_r.clear_breakpoint()
 	if FileAccess.file_exists(bp_path):   # 段尾清理（与段首清场对称）
 		DirAccess.remove_absolute(bp_path)
-	_db.feats = live_rows   # 还原现行表（共享 _db 防污染——后续集成块零感知）
+	_db.crossrun.feats = live_rows   # 还原现行表（共享 _db 防污染——后续集成块零感知）
 
 
 # ---- ③ 存档摘要集成（源 `_smoke_save` ⑨ 基点 :6807–6831 十条，主会话裁决三改判集成——