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/core/effect_engine.gd

@@ -101,7 +101,7 @@ func rebuild(feat_ids: Array, item_ids: Array, tree_rules: Array = []) -> void:
 
 ## 特性订阅装载域（feats 表序→按持有集过滤→行内数组序——装载声明序第一段）
 func _load_feat_triggers(feat_ids: Array) -> void:
-	if db != null and db.feats != null:
+	if db != null and db.crossrun.feats != null:
 		for row in db.crossrun.feats.rows:
 			var fid := String(row.get("feat_id", ""))
 			if not feat_ids.has(fid):