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
@@ -54,7 +54,7 @@ func _screen_seals() -> Dictionary:
|
||||
"菜单": main.ui.screens.start_overlay != null and main.ui.screens.start_overlay.visible,
|
||||
"营地": main.ui.modals.camp.scene != null and main.ui.modals.camp.scene.visible,
|
||||
"冒险": main.run_scope != null and main.run_scope.is_adventure,
|
||||
"终局": main.ui.modals.end_overlay != null and main.ui.modals.end_overlay.visible,
|
||||
"终局": main.ui.modals.run.end_overlay != null and main.ui.modals.run.end_overlay.visible,
|
||||
}
|
||||
|
||||
|
||||
@@ -102,7 +102,7 @@ func _frames(n: int = 2) -> void:
|
||||
func _step_boot_menu() -> void:
|
||||
_expect_exclusive("①boot", "菜单")
|
||||
_expect_adventure_seal("①boot", false)
|
||||
if main.ui.modals.debug_overlay != null and main.ui.modals.debug_overlay.visible:
|
||||
if main.ui.modals.menu.debug_overlay != null and main.ui.modals.menu.debug_overlay.visible:
|
||||
_problems.append("①boot：调试浮窗 boot 自动开（菜单优先失守）")
|
||||
|
||||
|
||||
@@ -123,9 +123,9 @@ func _step_camp_back_to_menu() -> void:
|
||||
return
|
||||
main.ui.modals.camp.scene.object_pressed.emit(&"campfire")
|
||||
await _frames()
|
||||
if not main.ui.modals.confirm_dialog.visible:
|
||||
if not main.ui.modals.menu.confirm_dialog.visible:
|
||||
_problems.append("③篝火：二次确认弹窗未现（camp.md v2.2 必须先确认）〔营地图批 V7〕")
|
||||
main.ui.modals.confirm_dialog.confirmed.emit() # 二次确认离场（confirmed 先于关层——卡④ T4）
|
||||
main.ui.modals.menu.confirm_dialog.confirmed.emit() # 二次确认离场（confirmed 先于关层——卡④ T4）
|
||||
await _frames()
|
||||
_expect_exclusive("③营地→菜单（回退）", "菜单")
|
||||
|
||||
@@ -143,15 +143,15 @@ func _step_save_select_open_back() -> void:
|
||||
esb.pressed.emit() # 真实按钮信号路径 → _open_save_select（卡② mn3 点击链——卡③ 直调中间态就此闭环）
|
||||
await get_tree().process_frame
|
||||
var seals := _screen_seals()
|
||||
if not main.ui.modals.save_select_overlay.visible or not seals_check_single(seals):
|
||||
_problems.append("[savesel] sl10 开层后屏级互斥失守（选档=%s）" % str(main.ui.modals.save_select_overlay.visible))
|
||||
var back_btn: Button = ProbeUiUtil.find_button(main.ui.modals.save_select_overlay, "返回", "prefix")
|
||||
if not main.ui.modals.menu.save_select_overlay.visible or not seals_check_single(seals):
|
||||
_problems.append("[savesel] sl10 开层后屏级互斥失守（选档=%s）" % str(main.ui.modals.menu.save_select_overlay.visible))
|
||||
var back_btn: Button = ProbeUiUtil.find_button(main.ui.modals.menu.save_select_overlay, "返回", "prefix")
|
||||
if back_btn == null:
|
||||
_problems.append("[savesel] sl10 返回钮缺失（页壳顶条）")
|
||||
else:
|
||||
back_btn.pressed.emit()
|
||||
await get_tree().process_frame
|
||||
if main.ui.modals.save_select_overlay.visible or not main.ui.screens.start_overlay.visible:
|
||||
if main.ui.modals.menu.save_select_overlay.visible or not main.ui.screens.start_overlay.visible:
|
||||
_problems.append("[savesel] sl10 返回后选档未隐藏或开始层未恢复（关闭链失守）")
|
||||
# ESC 语境：再开选档→合成 ESC 键→层不关、流程零扰动（ESC 不属选档语境——零实现断言）
|
||||
main._open_save_select()
|
||||
@@ -162,7 +162,7 @@ func _step_save_select_open_back() -> void:
|
||||
ev.pressed = true
|
||||
main.get_viewport().push_input(ev, true)
|
||||
await get_tree().process_frame
|
||||
if not main.ui.modals.save_select_overlay.visible:
|
||||
if not main.ui.modals.menu.save_select_overlay.visible:
|
||||
_problems.append("[savesel] sl10 ESC 关闭了选档层（选档语境 ESC 应不响应——卡⑤ 范围外）")
|
||||
main._on_save_select_closed()
|
||||
await get_tree().process_frame
|
||||
@@ -174,7 +174,7 @@ func seals_check_single(f: Dictionary) -> bool:
|
||||
for k in f:
|
||||
if bool(f[k]):
|
||||
on += 1
|
||||
if main.ui.modals.save_select_overlay.visible:
|
||||
if main.ui.modals.menu.save_select_overlay.visible:
|
||||
on += 1 # 选档自身计入（调用点已开层）
|
||||
return on == 1
|
||||
|
||||
@@ -187,25 +187,25 @@ func _step_menu_to_adventure() -> void:
|
||||
_expect_adventure_seal("④菜单→冒险", true)
|
||||
if main.run_scope != null and main.run_scope.adventure == null:
|
||||
_problems.append("④菜单→冒险：冒险实例未建立（入口停点未达）")
|
||||
if main.ui.modals.level_screen != null and not main.ui.modals.level_screen.visible:
|
||||
if main.ui.modals.run.level_screen != null and not main.ui.modals.run.level_screen.visible:
|
||||
_problems.append("④菜单→冒险：入口停点未落在关卡地图屏（level_screen 不可见）")
|
||||
|
||||
|
||||
# ---- ⑤ 冒险内屏切换：关卡地图屏 ⇄ 战斗屏（屏内两态，屏级仍独占）----
|
||||
func _step_level_to_battle_and_back() -> void:
|
||||
if not main.ui.modals.level_screen.visible:
|
||||
if not main.ui.modals.run.level_screen.visible:
|
||||
_problems.append("⑤冒险内切换：前置不在关卡地图屏")
|
||||
return
|
||||
main._exit_level_screen()
|
||||
await _frames()
|
||||
if main.ui.modals.level_screen.visible:
|
||||
if main.ui.modals.run.level_screen.visible:
|
||||
_problems.append("⑤冒险内切换：退出关卡屏后 level_screen 仍可见")
|
||||
if main.ui.screens.battle_root != null and not main.ui.screens.battle_root.visible:
|
||||
_problems.append("⑤冒险内切换：战斗屏未接手（battle_root 不可见）")
|
||||
_expect_exclusive("⑤冒险内切换（关卡→战斗）", "冒险")
|
||||
main._enter_level_screen()
|
||||
await _frames()
|
||||
if not main.ui.modals.level_screen.visible:
|
||||
if not main.ui.modals.run.level_screen.visible:
|
||||
_problems.append("⑤冒险内切换：回到关卡地图屏失败")
|
||||
_expect_exclusive("⑤冒险内切换（战斗→关卡）", "冒险")
|
||||
|
||||
@@ -218,16 +218,16 @@ func _step_abandon_to_end() -> void:
|
||||
main._on_abandon_requested()
|
||||
await _frames(4)
|
||||
_expect_exclusive("⑥放弃→终局", "终局")
|
||||
if main.ui.modals.end_overlay != null and not main.ui.modals.end_overlay.visible:
|
||||
if main.ui.modals.run.end_overlay != null and not main.ui.modals.run.end_overlay.visible:
|
||||
_problems.append("⑥放弃→终局：终局覆盖层未开")
|
||||
|
||||
|
||||
# ---- ⑦ 终局 → 菜单（终局出口返回开始界面）----
|
||||
func _step_end_back_to_menu() -> void:
|
||||
if main.ui.modals.end_overlay == null or not main.ui.modals.end_overlay.visible:
|
||||
if main.ui.modals.run.end_overlay == null or not main.ui.modals.run.end_overlay.visible:
|
||||
_problems.append("⑦终局→菜单：前置不在终局")
|
||||
return
|
||||
main.ui.modals.end_overlay.continue_pressed.emit()
|
||||
main.ui.modals.run.end_overlay.continue_pressed.emit()
|
||||
await _frames(3)
|
||||
_expect_exclusive("⑦终局→菜单", "菜单")
|
||||
if main.run_scope != null and main.run_scope.is_adventure:
|
||||
@@ -273,7 +273,7 @@ func _step_camp_esc_and_hud() -> void:
|
||||
await _frames()
|
||||
main._on_esc_settings()
|
||||
await _frames()
|
||||
if not main.ui.modals.settings_overlay.visible:
|
||||
if not main.ui.modals.menu.settings_overlay.visible:
|
||||
_problems.append("[esc] 浮窗设置出口断裂〔ESC批 V4〕")
|
||||
_push_esc()
|
||||
await _frames()
|
||||
@@ -286,7 +286,7 @@ func _step_camp_esc_and_hud() -> void:
|
||||
# 返回主菜单动线（契约 4——浮窗自收＋营地隐＋选档收＋菜单显）
|
||||
main.ui.modals.camp.esc_overlay.return_requested.emit()
|
||||
await _frames()
|
||||
if main.ui.modals.camp.esc_overlay.visible or main.ui.modals.camp.scene.visible or main.ui.modals.save_select_overlay.visible or not main.ui.screens.start_overlay.visible:
|
||||
if main.ui.modals.camp.esc_overlay.visible or main.ui.modals.camp.scene.visible or main.ui.modals.menu.save_select_overlay.visible or not main.ui.screens.start_overlay.visible:
|
||||
_problems.append("[esc] 返回主菜单动线失守（浮窗自收/营地隐/选档收/菜单显）〔ESC批 V3〕〔ESC批 B3〕")
|
||||
# 非营地语境（boot 菜单）Esc→无响应（契约 9④ 回归面）
|
||||
_push_esc()
|
||||
|
||||
Reference in new issue
Block a user