T5(迭代22秘宝批): 存档面+死通道拆除——treasure_inventory保留注记(主动件骑库存承载在役:线香/天眼handle+断点aux_items快照+set_attune_charges差额注入全链保留); 替换子交互整体拆除(CURIO_KINDS除名后不可达死通道=装配不可变契约1实现面保证): adventure_runner六函数删(_pick_treasure_item/resolve_treasure_replace/_resolve_node_replace/_replace_in_transit/_draw_pending_treasure/resolve_curio_replace)+_bonus_treasure_carry跨关携带/_last_draw_treasure掷定链/_roll_from/_bonus_treasure_pool/bonus_aux_carry断点键; level_runner.grant_treasure_item/treasure_items.holding_records删; 呈现面=controller替换子态三函数+aux_detail卡片直显链/curio_pick_overlay replace状态机(信号+面板+open_replace)/main两接线/level_autoplay替换策略; smoke与ui_click_probe替换分支摘除+reward_overlay_test替换段摘除; 修正则贪吃误删=apply_node_curio普通兑付主体补回。冒烟895/0+run_all 22套+探针全绿〔秘宝批 V15/V16拆除路线/V13〕
This commit is contained in:
DKChan committed
1 parent
b7a2eadd2c
commit
73db171cb4
13 files changed
+42
-346
No files matched your search
@@ -5,7 +5,7 @@
|
||||
# 装配纪律（ADR-0001，仿 treasure_interact_controller 先例）：信号连接不在此发生——curio_overlay
|
||||
# 四信号与 adventure 两信号由组合根接至本类 on_* 入口；模态栈/演播后排窗/呈现刷新/终局面/
|
||||
# 推进失败 fatal 经组合根回调注入；adventure/runner 随局更替——现值回调注入；兑付写调用唯一
|
||||
# 经 adventure.pick_curio/apply_node_curio/resolve_curio_replace（core 侧单口，本类零直写）。
|
||||
# 经 adventure.pick_curio/apply_node_curio（core 侧单口，本类零直写；替换子交互随迭代 22 T5 拆除——装配不可变契约 1，冒险中零更换途径）。
|
||||
extends RefCounted
|
||||
|
||||
const Narrator := preload("res://presentation/battle_narrator.gd")
|
||||
@@ -29,8 +29,6 @@ var _gp_summary: Callable # () → 战斗总结 GP 行文案（组
|
||||
|
||||
var _pending_curio := {} # 三选一停点载荷暂存（迭代 10——战斗总结结算确认后开三选一面；续玩停点复用）
|
||||
var _curio_context := "level_clear" # 三选一面上下文（level_clear=通关停点→推进下一关 / reward_node=奖励节点→回图选路）
|
||||
var _last_replace_items: Array = [] # 替换子态续玩重建缓存（treasure_replace_presented 载荷）
|
||||
var _last_replace_incoming := {} # 同上——incoming 记录
|
||||
|
||||
|
||||
func _init(db_ref, meta_get: Callable, curio_overlay_ref: CurioPickOverlay, end_overlay_ref: BattleEndOverlay,
|
||||
@@ -112,8 +110,7 @@ func on_presented(payload: Dictionary) -> void:
|
||||
toast.show_toast("上关剩余 %d 件秘宝已随关卡结束清空" % int(payload.get("aux_cleared", 0)), "info") # 迭代 7 T4 清空反馈
|
||||
_pending_curio = payload.duplicate(true)
|
||||
_curio_context = "level_clear"
|
||||
if bool(payload.get("replace_pending", false)) or bool(payload.get("refreshed", false)):
|
||||
# 续玩：替换子交互在途中断——重建三选一面后直落替换子态（候选不重抽）
|
||||
if bool(payload.get("refreshed", false)):
|
||||
# 刷新重发（2026-10-06）：refreshed 标直落选择面——不再重开胜利总结面
|
||||
show_pick()
|
||||
return
|
||||
@@ -124,9 +121,8 @@ func on_presented(payload: Dictionary) -> void:
|
||||
_refresh_presentations.call()
|
||||
|
||||
|
||||
# 三选一面开出（战斗总结结算确认 / 续玩停点恢复；替换在途由 treasure_replace_presented 续发直落子态）
|
||||
# 奖励节点三选一（迭代 10 追加批——与通关三选一共享同池同权重同上限；CurioPickOverlay 共用面，
|
||||
# 道具件满位替换子交互同构）。原「秘宝投放渠道」三选一（迭代 7 过渡形态）随批退役。
|
||||
# 奖励节点三选一（迭代 10 追加批——与通关三选一共享同池同权重同上限；CurioPickOverlay 共用面）。
|
||||
# 原「秘宝投放渠道」三选一（迭代 7 过渡形态）随批退役；替换子交互随迭代 22 T5 拆除。
|
||||
func present_node_curio() -> void:
|
||||
var adventure = _adventure_get.call()
|
||||
_curio_context = "reward_node"
|
||||
@@ -141,16 +137,16 @@ func present_node_curio() -> void:
|
||||
runner.continue_after_node()
|
||||
return
|
||||
_open_modal.call(curio_overlay)
|
||||
curio_overlay.open_pick(Narrator.node_curio_header(), _curio_card_texts(node_cands, node_draw.get("aux_detail", []) as Array))
|
||||
adventure.present_node_curio(node_cands, node_draw.get("aux_detail", []) as Array)
|
||||
curio_overlay.open_pick(Narrator.node_curio_header(), _curio_card_texts(node_cands))
|
||||
adventure.present_node_curio(node_cands)
|
||||
_feed_refresh_display(adventure) # 迭代 11 第①批 T5b + 2026-10-06 对齐商店——刷新面投喂单点
|
||||
|
||||
|
||||
# 三选一面开出（战斗总结结算确认 / 续玩停点恢复；替换在途由 treasure_replace_presented 续发直落子态）
|
||||
# 三选一面开出（战斗总结结算确认 / 续玩停点恢复）
|
||||
func show_pick() -> void:
|
||||
var payload: Dictionary = _pending_curio
|
||||
_open_modal.call(curio_overlay)
|
||||
curio_overlay.open_pick(Narrator.curio_pick_header(payload), _curio_card_texts(payload.get("candidates", []) as Array, payload.get("aux_detail", []) as Array))
|
||||
curio_overlay.open_pick(Narrator.curio_pick_header(payload), _curio_card_texts(payload.get("candidates", []) as Array))
|
||||
var adventure = _adventure_get.call()
|
||||
if adventure != null:
|
||||
_feed_refresh_display(adventure) # 迭代 11 第①批 T5b + 2026-10-06 对齐商店——刷新面投喂单点
|
||||
@@ -165,11 +161,10 @@ func _feed_refresh_display(adventure) -> void:
|
||||
curio_overlay.set_refresh_display(adventure.attune_refresh_left(), cost, gp >= cost)
|
||||
|
||||
|
||||
func _curio_card_texts(candidates: Array, treasure_detail: Array = []) -> Array:
|
||||
func _curio_card_texts(candidates: Array) -> Array:
|
||||
# TP0 令牌池——候选 = {"kind","tier"} 令牌字典；卡片 id = "kind|tier|feat_id" 复合键（同 kind
|
||||
# 大小两档/同档多 relic 可同屏，kind 单键不构成唯一身份），确认回程拆键（on_pick_confirmed）
|
||||
var out: Array = []
|
||||
var treasure_i := 0
|
||||
for tok in candidates:
|
||||
var kind := String((tok as Dictionary).get("kind", ""))
|
||||
var tier := String((tok as Dictionary).get("tier", ""))
|
||||
@@ -181,10 +176,6 @@ func _curio_card_texts(candidates: Array, treasure_detail: Array = []) -> Array:
|
||||
选定即开一次奇物三选一（T5 门票——拿到即开不进持有集）"
|
||||
elif kind == "relic":
|
||||
text = Narrator.feat_card_text(db.feat_row(rid))
|
||||
elif kind == "treasure_item":
|
||||
var iid := String(treasure_detail[treasure_i]) if treasure_i < treasure_detail.size() else ""
|
||||
treasure_i += 1
|
||||
text = Narrator.bonus_card_text(kind, tier, int(db.adventure.curio_value(kind, tier)), _treasure_card_line(iid))
|
||||
else:
|
||||
text = Narrator.bonus_card_text(kind, tier, int(db.adventure.curio_value(kind, tier)))
|
||||
out.append({"id": cid, "text": text})
|
||||
@@ -194,17 +185,6 @@ func _curio_card_texts(candidates: Array, treasure_detail: Array = []) -> Array:
|
||||
# 道具件卡片行（掷定前置——具体道具名 + 效果摘要；空 iid = 无预掷回退态显示通用文案）。
|
||||
# 内容数据驱动扩展批 T4 文案表值化：效果摘要=数据行 desc 字段直读（零 kind 硬编码映射——
|
||||
# 新件写行即有名有姓）
|
||||
func _treasure_card_line(iid: String) -> String:
|
||||
if iid == "":
|
||||
return ""
|
||||
var row: Dictionary = db.treasure_item_row(iid)
|
||||
if row.is_empty():
|
||||
return ""
|
||||
var desc := String(row.get("desc", ""))
|
||||
if desc != "":
|
||||
return "%s · %s" % [String(row.get("display_name", iid)), desc]
|
||||
return String(row.get("display_name", iid))
|
||||
|
||||
|
||||
# 三选一刷新（迭代 11 第①批 T5b X/Y 双源 + 2026-10-06 用户令对齐商店 MC-1——免费位用尽转 GP 付费档：
|
||||
# 同 shop_refresh_cost_base/curve 旋钮、同冒险钱包 runner.gp；通关停点经重发 curio_choice_presented 直落
|
||||
@@ -227,7 +207,7 @@ func on_refresh() -> void:
|
||||
return
|
||||
if _curio_context == "reward_node":
|
||||
var st: Dictionary = adventure.node_curio_pending_state()
|
||||
curio_overlay.open_pick(Narrator.node_curio_header(), _curio_card_texts(st.get("candidates", []) as Array, st.get("aux_detail", []) as Array))
|
||||
curio_overlay.open_pick(Narrator.node_curio_header(), _curio_card_texts(st.get("candidates", []) as Array))
|
||||
_feed_refresh_display(adventure)
|
||||
|
||||
|
||||
@@ -251,30 +231,6 @@ func on_pick_confirmed(item_id: String) -> void:
|
||||
curio_overlay.open_pick(Narrator.node_curio_header(), _curio_card_texts(st2.get("candidates", []) as Array))
|
||||
|
||||
|
||||
func on_treasure_replace_presented(items: Array, incoming: Dictionary) -> void:
|
||||
_last_replace_items = items.duplicate(true)
|
||||
_last_replace_incoming = incoming.duplicate(true)
|
||||
if not curio_overlay.visible:
|
||||
_open_modal.call(curio_overlay) # 续玩替换在途直落——三选一面未开时先入栈（模态栈纪律）
|
||||
_open_replace(items, incoming)
|
||||
|
||||
|
||||
func _open_replace(items: Array, incoming: Dictionary) -> void:
|
||||
var named: Array = []
|
||||
for it in items:
|
||||
var rec: Dictionary = it.duplicate()
|
||||
rec["display_name"] = String(item_name_lookup().get(String(rec.get("item_id", "")), String(rec.get("item_id", ""))))
|
||||
named.append(rec)
|
||||
curio_overlay.open_replace(named, String(item_name_lookup().get(String(incoming.get("item_id", "")), String(incoming.get("item_id", "")))),
|
||||
named.size(), Attunement.slots(db, _save_get.call())) # 迭代 11 第①批 T7——呈现读数源切谓词表求值（过渡键退役）
|
||||
|
||||
|
||||
func on_replace_chosen(discard: int) -> void:
|
||||
var adventure = _adventure_get.call()
|
||||
if adventure == null or not adventure.resolve_curio_replace(discard):
|
||||
push_error("[bonus_interact] 同调位替换受理被拒——见输出日志")
|
||||
|
||||
|
||||
# 兑付反馈（curio_resolved 到达——结果行上屏，唯一出口 = 继续）
|
||||
func on_resolved(result: Dictionary) -> void:
|
||||
_pending_curio = {}
|
||||
|
||||
Reference in new issue
Block a user