Merge branch 'master' into iter23-forge-20261012

# Conflicts:
#	design/gdd/systems/表现与支撑/存档序列化.md

game/presentation/views/ap_bar_view.gd

@@ -13,7 +13,6 @@ extends PanelContainer
 signal stop_pressed
 signal refresh_confirmed
 signal legend_toggled
-signal convert_pressed   # 积点兑换意图（迭代 22 秘宝批 T4——写口唯一=BattleOrchestrator.use_attune_convert）
 
 const COL_GOLD := UiKit.GOLD
 const COL_DOT_OFF := UiKit.DOT_OFF
@@ -22,7 +21,6 @@ const COL_INK := UiKit.INK
 var _dots: HBoxContainer
 var _ap_label: Label
 var _btn_stop: Button
-var _btn_convert: Button   # 积点兑换钮（迭代 22 秘宝批 T4——试炼镐 HUD 入口；未装配隐藏）
 var _btn_legend: Button
 var _btn_refresh: Button
 var _refresh_sub: Label
@@ -63,12 +61,6 @@ func _init() -> void:
 	_btn_stop.pressed.connect(_emit_stop_pressed)
 	row.add_child(_btn_stop)
 
-	_btn_convert = UiKit.button("兑换", 0.0)   # 行板紧凑钮豁免——积点兑换（试炼镐；未装配隐藏）
-	_btn_convert.size_flags_vertical = Control.SIZE_SHRINK_CENTER
-	_btn_convert.visible = false
-	_btn_convert.pressed.connect(func(): convert_pressed.emit())
-	row.add_child(_btn_convert)
-
 	var spacer := Control.new()
 	spacer.size_flags_horizontal = Control.SIZE_EXPAND_FILL
 	row.add_child(spacer)
@@ -136,15 +128,6 @@ func set_refresh_cost(cost: int) -> void:
 	_confirm_lab.text = "RAP−%d · 旧板旗作废" % cost
 
 
-# 积点兑换钮（迭代 22 秘宝批 T4——试炼镐转化获取 HUD 入口：装配时在列〔visible〕、
-# 积点未达 disabled；文案=件名+进度。未装配=隐藏零占位）
-func set_convert_state(assembled: bool, points: int, need: int, display_name: String) -> void:
-	_btn_convert.visible = assembled
-	if assembled:
-		_btn_convert.text = "%s %d/%d" % [display_name, points, need]
-		_btn_convert.disabled = points < need
-
-
 func set_refresh_state(remaining: int, ready: bool) -> void:
 	_refresh_sub.text = "RAP−%d · 剩 %d 次" % [refresh_cost, remaining]
 	_btn_refresh.disabled = not ready

game/presentation/views/board_zone_view.gd

@@ -18,7 +18,6 @@ var _board_area: Control   # resized 命名转发用（原 lambda 局部捕获
 signal action_requested(cell: Vector2i, kind: String)
 signal stop_pressed
 signal refresh_confirmed
-signal convert_pressed   # 积点兑换意图转发（迭代 22 秘宝批 T4——试炼镐 HUD 入口，源=ap_bar）
 signal legend_toggled
 signal hover_forbidden(cell: Vector2i)
 signal chord_attempted(cell: Vector2i)
@@ -83,7 +82,6 @@ func _init() -> void:
 	board_view.chord_attempted.connect(_forward_chord)
 	ap_bar.stop_pressed.connect(_emit_stop_pressed)
 	ap_bar.refresh_confirmed.connect(_emit_refresh_confirmed)
-	ap_bar.convert_pressed.connect(_emit_convert_pressed)
 	ap_bar.legend_toggled.connect(_emit_legend_toggled)
 
 
@@ -107,10 +105,6 @@ func _emit_stop_pressed() -> void:
 	stop_pressed.emit()
 
 
-func _emit_convert_pressed() -> void:
-	convert_pressed.emit()
-
-
 func _emit_refresh_confirmed() -> void:
 	refresh_confirmed.emit()
 

game/presentation/views/hero_info_panel_view.gd

@@ -220,4 +220,8 @@ func set_treasure_inventory(items: Array, selected_handle: int) -> void:
 		var border_col: Color = UiKit.GOLD if selected else UiKit.PANEL_BORDER
 		slot.add_theme_stylebox_override("panel",
 			UiKit.panel_flat(UiKit.PANEL_DATA, border_col, 0, 1 if not selected else 2, Vector4(4, 4, 4, 4)))
-		slot.tooltip_text = "%s%s" % [String(rec.get("name", "")), "（已用）" if used else ("（不可用——当前无有效目标）" if not usable else "")]
+		# note=积点进度行（反哺批⑤——自动兑付件悬停浮窗补「积点 N/M」，进度随挖格经组合根重查刷新）
+		var note := String(rec.get("note", ""))
+		slot.tooltip_text = "%s%s%s" % [String(rec.get("name", "")),
+			"（%s）" % note if note != "" else "",
+			"（已用）" if used else ("（不可用——当前无有效目标）" if not usable else "")]