iter49-卡2：模态句柄分域批(句柄册三域化):UiModals 14→3纯字段容器+run/menu两新子容器+ModalFlow升格注册面直驻+全仓寻址换代+V1结构断言
This commit is contained in:
DKChan committed
1 parent
11beb4fc59
commit
240f1a1769
28 files changed
+552
-513
No files matched your search
@@ -1,15 +1,15 @@
|
||||
## VERTICAL SLICE - NOT FOR PRODUCTION
|
||||
## 组合根覆盖层流程承接件：设置/状态面板/生涯页/选档界面/图例/钱包事件的开合与数据投喂。
|
||||
## 本件是 main.gd 同名函数的逐字搬运（成员访问改 root 前缀）——main 侧留同名薄委托，探针 main.X 路径零改动。
|
||||
## 全部开合走组合根模态编排口（root.ui.modals.flow.open/close）；本件零成员态。
|
||||
## 全部开合走组合根模态编排口（root.ui.flow.open/close）；本件零成员态。
|
||||
extends RefCounted
|
||||
|
||||
static func _open_settings(root: Variant) -> void:
|
||||
root.ui.screens.start_overlay.visible = false
|
||||
root.ui.modals.flow.open(root.ui.modals.settings_overlay) # 模态栈单口
|
||||
root.ui.flow.open(root.ui.modals.menu.settings_overlay) # 模态栈单口
|
||||
|
||||
static func _on_settings_closed(root: Variant) -> void:
|
||||
root.ui.modals.flow.close(root.ui.modals.settings_overlay) # 模态栈单口
|
||||
root.ui.flow.close(root.ui.modals.menu.settings_overlay) # 模态栈单口
|
||||
# 语境分支（卡⑤ 契约 3——谓词=camp_esc_overlay.visible，谁开的设置谁收）：
|
||||
# 营地浮窗路径关设置回浮窗不回主菜单（栈语义：浮窗登记在下、由树序遮挡非属性隐藏）；
|
||||
# 菜单路径保留开始层恢复硬副作用。
|
||||
@@ -29,21 +29,21 @@ static func _status_data(root: Variant) -> Dictionary:
|
||||
return HudPresenter.status_data(root.db, root.meta, root.run_scope.runner, root._treasure_ui)
|
||||
|
||||
static func _open_status_panel(root: Variant) -> void:
|
||||
root.ui.modals.flow.open(root.ui.modals.status_panel) # 模态栈单口（开层前排空排播队列——既有层同款行为，目检确认项）
|
||||
root.ui.modals.status_panel.open_status(_status_data(root))
|
||||
root.ui.flow.open(root.ui.modals.run.status_panel) # 模态栈单口（开层前排空排播队列——既有层同款行为，目检确认项）
|
||||
root.ui.modals.run.status_panel.open_status(_status_data(root))
|
||||
|
||||
static func _on_status_closed(root: Variant) -> void:
|
||||
root.ui.modals.flow.close(root.ui.modals.status_panel) # 模态栈单口
|
||||
root.ui.flow.close(root.ui.modals.run.status_panel) # 模态栈单口
|
||||
|
||||
|
||||
|
||||
static func _open_career(root: Variant) -> void:
|
||||
root.ui.screens.start_overlay.visible = false
|
||||
root.ui.modals.flow.open(root.ui.modals.career_overlay) # 模态栈单口
|
||||
root.ui.modals.career_overlay.open_career(HudPresenter.career_data(root.db, root.save_manager, root.meta))
|
||||
root.ui.flow.open(root.ui.modals.menu.career_overlay) # 模态栈单口
|
||||
root.ui.modals.menu.career_overlay.open_career(HudPresenter.career_data(root.db, root.save_manager, root.meta))
|
||||
|
||||
static func _on_career_closed(root: Variant) -> void:
|
||||
root.ui.modals.flow.close(root.ui.modals.career_overlay) # 模态栈单口
|
||||
root.ui.flow.close(root.ui.modals.menu.career_overlay) # 模态栈单口
|
||||
if not root.ui.modals.camp.scene.visible: # 营地语境关生涯不回开始层（笔记本入口——卡④ T3；栈已复现场景根）
|
||||
root.ui.screens.start_overlay.visible = true
|
||||
|
||||
@@ -70,17 +70,17 @@ static func _on_camp_object_pressed(root: Variant, key: StringName) -> void:
|
||||
_open_gate_confirm(root)
|
||||
&"campfire":
|
||||
root._confirm_consumer = "campfire_leave"
|
||||
root.ui.modals.confirm_dialog.open("确定离开营地回到主菜单？", "离开", "留下")
|
||||
root.ui.modals.menu.confirm_dialog.open("确定离开营地回到主菜单？", "离开", "留下")
|
||||
|
||||
|
||||
static func _open_gate_confirm(root: Variant) -> void:
|
||||
if root.save_manager.has_breakpoint():
|
||||
root._confirm_consumer = "gate"
|
||||
root.ui.modals.confirm_dialog.open_three("有未完成的冒险——继续上一段冒险，还是开始新冒险？",
|
||||
root.ui.modals.menu.confirm_dialog.open_three("有未完成的冒险——继续上一段冒险，还是开始新冒险？",
|
||||
"继续上一段冒险", "开始新冒险", "取消")
|
||||
return
|
||||
root._confirm_consumer = "gate_new"
|
||||
root.ui.modals.confirm_dialog.open("是否开始新冒险？", "是", "否")
|
||||
root.ui.modals.menu.confirm_dialog.open("是否开始新冒险？", "是", "否")
|
||||
|
||||
|
||||
# 生涯页快照投影 —— 承接体见 HudPresenter.career_data（开层调用点直接改引）
|
||||
@@ -93,11 +93,11 @@ static func _open_gate_confirm(root: Variant) -> void:
|
||||
# 该钮的唯一落点（卡③ 批内探针函数直调=中间态，实现报告「已知中间态」登记）。
|
||||
static func _open_save_select(root: Variant) -> void:
|
||||
root.ui.screens.start_overlay.visible = false
|
||||
root.ui.modals.flow.open(root.ui.modals.save_select_overlay) # 模态栈单口
|
||||
root.ui.modals.save_select_overlay.open_save_select(HudPresenter.save_select_data(root.save_manager))
|
||||
root.ui.flow.open(root.ui.modals.menu.save_select_overlay) # 模态栈单口
|
||||
root.ui.modals.menu.save_select_overlay.open_save_select(HudPresenter.save_select_data(root.save_manager))
|
||||
|
||||
static func _on_save_select_closed(root: Variant) -> void:
|
||||
root.ui.modals.flow.close(root.ui.modals.save_select_overlay) # 模态栈单口
|
||||
root.ui.flow.close(root.ui.modals.menu.save_select_overlay) # 模态栈单口
|
||||
root.ui.screens.start_overlay.visible = true
|
||||
|
||||
|
||||
@@ -125,18 +125,18 @@ static func _on_save_select_load(root: Variant, slot: int) -> void:
|
||||
static func _on_save_select_delete(root: Variant, slot: int) -> void:
|
||||
root._confirm_consumer = "delete_slot"
|
||||
root._confirm_consumer_slot = slot
|
||||
root.ui.modals.flow.open(root.ui.modals.confirm_dialog) # 模态栈单口（显示编排/挂起兜底/遮挡记账——与其余覆盖层同口）
|
||||
root.ui.modals.confirm_dialog.open("删除存档位 %d？删除后该档不可恢复。" % slot, "删除", "取消")
|
||||
root.ui.flow.open(root.ui.modals.menu.confirm_dialog) # 模态栈单口（显示编排/挂起兜底/遮挡记账——与其余覆盖层同口）
|
||||
root.ui.modals.menu.confirm_dialog.open("删除存档位 %d？删除后该档不可恢复。" % slot, "删除", "取消")
|
||||
|
||||
|
||||
|
||||
# 入口角标点击（两屏同款处理器）：P1 守卫兜底——其他模态开着即拒开（常态防线=角标置灰，
|
||||
# 探针 pressed.emit 绕过 disabled 时由此兜住；地图屏自身的登记开态不计——has_open_excluding）
|
||||
static func _on_status_badge_pressed(root: Variant) -> void:
|
||||
var map_on: bool = root.ui.modals.level_screen != null and root.ui.modals.level_screen.visible
|
||||
var map_on: bool = root.ui.modals.run.level_screen != null and root.ui.modals.run.level_screen.visible
|
||||
# P1 守卫兜底——其他模态开着即拒开（常态防线=角标置灰，探针 pressed.emit 绕过 disabled 时由此兜住；
|
||||
# 地图屏自身的登记开态不计；判据排除调试浮窗：对局中浮窗开着时状态角标仍可点）
|
||||
if (map_on and root.ui.modals.flow.badge_greyed_map()) or (not map_on and root.ui.modals.flow.badge_greyed_battle()):
|
||||
if (map_on and root.ui.flow.badge_greyed_map()) or (not map_on and root.ui.flow.badge_greyed_battle()):
|
||||
return
|
||||
_open_status_panel(root)
|
||||
|
||||
@@ -146,14 +146,14 @@ static func _on_status_badge_pressed(root: Variant) -> void:
|
||||
# 地图屏角标=随屏；置灰=登记册上除地图屏自身外任一层开着（防「看得见点不着」态）。
|
||||
# 调用面=模态开合单口与屏级互斥口（凡影响开态/屏态的路径必经其一）。
|
||||
static func _sync_status_entry(root: Variant) -> void:
|
||||
if root.ui.modals.status_panel == null or root.ui.modals.flow == null or root.ui.battle.board_zone == null or root.ui.modals.level_screen == null:
|
||||
if root.ui.modals.run.status_panel == null or root.ui.flow == null or root.ui.battle.board_zone == null or root.ui.modals.run.level_screen == null:
|
||||
return
|
||||
var map_on: bool = root.ui.modals.level_screen.visible
|
||||
var map_on: bool = root.ui.modals.run.level_screen.visible
|
||||
root.ui.battle.board_zone.status_badge.visible = root.run_scope.level_active and not map_on
|
||||
root.ui.modals.level_screen.status_badge.visible = map_on
|
||||
root.ui.modals.run.level_screen.status_badge.visible = map_on
|
||||
# 置灰判据为排除式（调试浮窗开态不计入：对局中浮窗开着时角标仍可点）
|
||||
root.ui.battle.board_zone.status_badge.disabled = root.ui.modals.flow.badge_greyed_battle() # 互斥域谓词
|
||||
root.ui.modals.level_screen.status_badge.disabled = root.ui.modals.flow.badge_greyed_map()
|
||||
root.ui.battle.board_zone.status_badge.disabled = root.ui.flow.badge_greyed_battle() # 互斥域谓词
|
||||
root.ui.modals.run.level_screen.status_badge.disabled = root.ui.flow.badge_greyed_map()
|
||||
# 调试浮层角标（全局浮层任何 UI 不遮挡——可见性不随场景变，只抬 offset
|
||||
# 避让：地图屏底栏 85px 常驻，角标抬至底栏上方 16px；其余场景右下角 16px 贴底）
|
||||
root.ui.screens.debug_badge.offset_bottom = -101.0 if map_on else -16.0
|
||||
@@ -171,19 +171,19 @@ static func _on_wallet_changed(root: Variant, event: String, gp: int, extra: Dic
|
||||
root.logger.log_wallet(event, gp, extra)
|
||||
if String(event) == "gain":
|
||||
root.run_scope.last_gain_amount = int(extra.get("amount", 0)) # GP 增量取数（每战恰一笔 gain）
|
||||
if root.ui.modals.shop_overlay.visible and root.run_scope.runner != null:
|
||||
if root.ui.modals.menu.shop_overlay.visible and root.run_scope.runner != null:
|
||||
if root.run_scope.runner.shop.is_shop_pool():
|
||||
root.ui.modals.shop_overlay.refresh_shelf_state(int(root.run_scope.runner.gp)) # pool 面余额联动（货架内容仅买后重抽变）
|
||||
root.ui.modals.menu.shop_overlay.refresh_shelf_state(int(root.run_scope.runner.gp)) # pool 面余额联动（货架内容仅买后重抽变）
|
||||
else:
|
||||
root.ui.modals.shop_overlay.refresh_state(root.run_scope.runner.shop.shop_products(), int(root.run_scope.runner.gp))
|
||||
root.ui.modals.menu.shop_overlay.refresh_state(root.run_scope.runner.shop.shop_products(), int(root.run_scope.runner.gp))
|
||||
root._refresh_presentations()
|
||||
|
||||
|
||||
|
||||
static func _on_legend_toggled(root: Variant) -> void:
|
||||
if root.ui.modals.legend_overlay.is_open():
|
||||
root.ui.modals.flow.close(root.ui.modals.legend_overlay)
|
||||
if root.ui.modals.run.legend_overlay.is_open():
|
||||
root.ui.flow.close(root.ui.modals.run.legend_overlay)
|
||||
else:
|
||||
root.ui.modals.flow.open(root.ui.modals.legend_overlay)
|
||||
root.ui.flow.open(root.ui.modals.run.legend_overlay)
|
||||
|
||||
|
||||
Reference in new issue
Block a user