秘宝批T7组E-2：内部标识符全族换词（inventory/unlocked/replace/overlays/slot/settlement use_aux等60+token）+存档键零触碰专项核通过（37文件六键普查零差异，点号访问零存在）+行为探针四件全绿+任务书§1.2基线回填（755/0实测）
This commit is contained in:
DKChan committed
1 parent
f8c6db49c6
commit
cd73e62346
21 files changed
+205
-203
No files matched your search
+12
-12
@@ -36,7 +36,7 @@ const ModalStack := preload("res://presentation/modal_stack.gd")
|
||||
const TuneSimController := preload("res://presentation/tune_sim_controller.gd")
|
||||
const DebugSessionScript := preload("res://presentation/debug_session.gd")
|
||||
const RowPacer := preload("res://presentation/row_pacer.gd") # 结算行排播泵（T3 拆件批）
|
||||
const AuxInteractController := preload("res://presentation/treasure_interact_controller.gd") # 秘宝两步交互（T3 拆件批）
|
||||
const TreasureInteractController := preload("res://presentation/treasure_interact_controller.gd") # 秘宝两步交互（T3 拆件批）
|
||||
const GpShadowLedgerScript := preload("res://presentation/gp_shadow_ledger.gd") # GP 影子账本（T3 拆件批）
|
||||
const BonusInteractController := preload("res://presentation/bonus_interact_controller.gd") # 三选一与替换子交互（T4/D4 拆件批）
|
||||
const CampShopPresenter := preload("res://presentation/camp_shop_presenter.gd") # 营地/商店投影（T4/D4 拆件批）
|
||||
@@ -90,7 +90,7 @@ var settlement_fx: SettlementFxView # 结算演出覆盖层（跨区弹道
|
||||
|
||||
# T3 拆件批（2026-10-02）——三件迁出后的组合根持有面（职责见各类头注；装配见 _build_ui）
|
||||
var _row_pacer = null # 结算行排播泵（row_pacer.gd——本类只入队/排空/读队列）
|
||||
var _aux = null # 秘宝两步交互（treasure_interact_controller.gd——本类只接线与转发意图）
|
||||
var _treasure_ui = null # 秘宝两步交互（treasure_interact_controller.gd——本类只接线与转发意图）
|
||||
var _bonus = null # 三选一与替换子交互（bonus_interact_controller.gd——本类只接线与回调注入）
|
||||
var _camp_pres = null # 营地/商店投影（camp_shop_presenter.gd——本类只接线、探针缝保缝转发）
|
||||
var _gp_ledger := GpShadowLedgerScript.new() # GP 冒险钱包影子账（gp_shadow_ledger.gd——wallet 事件投喂）
|
||||
@@ -219,11 +219,11 @@ func _build_ui() -> void:
|
||||
add_child(_row_pacer)
|
||||
# 秘宝两步交互（T3 拆件批——迁 treasure_interact_controller.gd；settlement/runner 随关卡更替，
|
||||
# 经现值回调注入——仿 identity_resolver 只读回调先例）
|
||||
_aux = AuxInteractController.new(db, meta, info_panel, board_zone.toast, board_view,
|
||||
_treasure_ui = TreasureInteractController.new(db, meta, info_panel, board_zone.toast, board_view,
|
||||
func() -> Variant: return settlement, func() -> Variant: return runner)
|
||||
|
||||
board_zone.action_requested.connect(_on_board_action)
|
||||
info_panel.aux_slot_clicked.connect(_aux.on_slot_clicked) # 迭代 7 T4——两步交互第一步
|
||||
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.legend_toggled.connect(_on_legend_toggled)
|
||||
@@ -434,7 +434,7 @@ func _resume_from_menu() -> void:
|
||||
log_view.clear()
|
||||
logger.start_session(int(bp.get("master_seed", 0)))
|
||||
adventure.set_hero_override(debug_overlay.atk_pct(), debug_overlay.hp_pct())
|
||||
if not adventure.resume_adventure(bp, {"hero_override": meta.hero_override() if meta != null else {}, "aux_unlocked": _aux.unlocked_set()}):
|
||||
if not adventure.resume_adventure(bp, {"hero_override": meta.hero_override() if meta != null else {}, "treasure_unlocked": _treasure_ui.unlocked_set()}):
|
||||
_fatal_screen("续玩恢复失败——见输出日志")
|
||||
return
|
||||
|
||||
@@ -452,7 +452,7 @@ func _wire_adventure() -> void:
|
||||
# 迭代 10 奖励重构批——big_reward_paid 退役，三选一信号族接线
|
||||
adventure.bonus_choice_presented.connect(_bonus.on_presented)
|
||||
adventure.bonus_resolved.connect(_bonus.on_resolved)
|
||||
adventure.aux_replace_presented.connect(_bonus.on_aux_replace_presented)
|
||||
adventure.treasure_replace_presented.connect(_bonus.on_treasure_replace_presented)
|
||||
adventure.adventure_finished.connect(_on_adventure_finished)
|
||||
adventure.level_started.connect(_on_adventure_level_started)
|
||||
adventure.set_save_manager(save_manager) # 断点承载注入（迭代 8 卡①——停点快照写盘；调试/模拟不经过此路径）
|
||||
@@ -472,7 +472,7 @@ func _start_adventure() -> void:
|
||||
# 永久强化注入（元进度实现批）：冒险开始参数面——meta 现算 override 显式传参（全零 = 白板）
|
||||
# 首次冒险脚本（关卡节点图生成 v0.4）：存档布尔位 false = 全关固定模板 0（教学重放）；置位后逐关抽签
|
||||
var first_script: bool = not save_manager.is_first_adventure_done()
|
||||
if not adventure.start_adventure(seed_val, {"hero_override": meta.hero_override() if meta != null else {}, "first_script": first_script, "aux_unlocked": _aux.unlocked_set(), "shop_mode": "pool"}):
|
||||
if not adventure.start_adventure(seed_val, {"hero_override": meta.hero_override() if meta != null else {}, "first_script": first_script, "treasure_unlocked": _treasure_ui.unlocked_set(), "shop_mode": "pool"}):
|
||||
_fatal_screen("冒险启动失败——见输出日志")
|
||||
return
|
||||
|
||||
@@ -956,15 +956,15 @@ func _on_board_action(cell: Vector2i, kind: String) -> void:
|
||||
return
|
||||
# 秘宝选中态劫持（迭代 7 T4——两步交互第二步）：点格=使用目标拾取，不落挖格；
|
||||
# 只劫持挖掘点击（move/flag 语义不冲突——选中期玩家仍可移动/插旗）
|
||||
var aux_sel: int = _aux.active_selection()
|
||||
if aux_sel != 0 and kind == "dig":
|
||||
_aux.attempt_use(aux_sel, cell)
|
||||
var treasure_sel: int = _treasure_ui.active_selection()
|
||||
if treasure_sel != 0 and kind == "dig":
|
||||
_treasure_ui.attempt_use(treasure_sel, cell)
|
||||
return
|
||||
var outcomes: Array = settlement.minesweeper.settle_batch([{"action": kind, "cell": cell}])
|
||||
var accepted: bool = not outcomes.is_empty() and bool(outcomes[0].accepted)
|
||||
logger.log_action(kind, cell, accepted)
|
||||
if runner != null and runner.aux_inventory != null:
|
||||
_aux.refresh_slots() # 迭代 7 T4——授予发生在 settle_batch 结算段内（同步走完，行尾重查）
|
||||
if runner != null and runner.treasure_inventory != null:
|
||||
_treasure_ui.refresh_slots() # 迭代 7 T4——授予发生在 settle_batch 结算段内（同步走完，行尾重查）
|
||||
_handle_outcome_feedback(outcomes[0] if not outcomes.is_empty() else {})
|
||||
# settle_batch 内部同步走完 结算→战斗结束→关卡推进（事件同步发射）——关卡终局时 settlement 已被
|
||||
# runner 置空，清图演出判定须先判 settlement（基线既有重入隐患，2026-09-13 加固）
|
||||
|
||||
Reference in new issue
Block a user