Merge branch 'master' into iter23-forge-20261012

# Conflicts:
#	design/gdd/systems/表现与支撑/存档序列化.md
This commit is contained in:
DKChan committed 2026-10-13 01:34:15 +08:00
commit 3392ea7e2d
19 files changed
+257 -332

No files matched your search

+1 -24
View File
@@ -235,7 +235,6 @@ func _build_ui() -> void:
info_panel.treasure_slot_clicked.connect(_treasure_ui.on_slot_clicked) # 迭代 7 T4——两步交互第一步
board_zone.stop_pressed.connect(_on_stop_pressed)
board_zone.refresh_confirmed.connect(_on_refresh_confirmed)
board_zone.convert_pressed.connect(_on_convert_pressed) # 积点兑换(迭代 22 秘宝批 T4——试炼镐 HUD 入口)
board_zone.legend_toggled.connect(_on_legend_toggled)
board_zone.hover_forbidden.connect(_on_hover_forbidden)
board_zone.chord_attempted.connect(_on_chord_attempted)
@@ -1240,32 +1239,10 @@ func _refresh_presentations() -> void:
# 每个核心信号/写调用返回后的全量重查装配(更新触发注记——无推送信号,命令式重查)
var refresh_remaining: int = maxi(0, int(db.action_economy.refresh_cap_per_round) - _refresh_used_round)
HudPresenter.refresh(stage, info_panel, ap_bar, settlement, runner, _level_active, db, refresh_remaining)
_sync_convert_button()
_treasure_ui.refresh_slots() # C 区秘宝槽重查(反哺批⑤——试炼镐积点进度随挖格刷新悬停浮窗)
_sync_settlement_visuals()
# 积点兑换钮态(迭代 22 秘宝批 T4——读数口命令式重查;未装配=隐藏零占位)
func _sync_convert_button() -> void:
if settlement == null:
board_zone.ap_bar.set_convert_state(false, 0, 0, "")
return
var cs: Dictionary = settlement.attune_convert_state()
board_zone.ap_bar.set_convert_state(bool(cs.get("assembled", false)), int(cs.get("points", 0)),
int(cs.get("need", 0)), String(cs.get("display_name", "")))
func _on_convert_pressed() -> void:
if settlement == null:
return
var v: Dictionary = settlement.use_attune_convert("trial_pick")
if not bool(v.get("ok", false)):
board_zone.toast.show_toast(String(v.get("reason", "无法兑换")), "warn")
return
logger.log_action("convert", Vector2i(-1, -1), true)
board_view.refresh()
_refresh_presentations()
func _sync_settlement_visuals() -> void:
# 结算阶段(round_end → 下一轮):D 区去饱和+金橙偏移锁输入(明度不变)+ 明细带展开 84px
var settling := _is_settling()