iter44-卡1：卡①(组合根注册面批): ui_registry+三域容器建件·main.gd 49→15·全消费面改址main.ui.*·四闸主证行为零变化

2026-10-30 07:13:23 +08:00
1 parent 14054d9dfb
commit d2b36e59cb
@@ -51,10 +51,10 @@ func _ready() -> void:
 	var top: Node = null
 	var top_rx := -1
 	var top_ry := -1
-	for c: Node in [main._start_overlay, main._battle_root, main._inter_overlay,
-			main.legend_overlay, main.node_overlay, main.level_screen, main.curio_overlay,
-			main._end_overlay, main.shop_overlay, main.camp_overlay, main.settings_overlay,
-			main.status_panel, main.career_overlay, main.confirm_dialog, main.debug_overlay]:
+	for c: Node in [main.ui.screens.start_overlay, main.ui.screens.battle_root, main.ui.screens.inter_overlay,
+			main.ui.modals.legend_overlay, main.ui.modals.node_overlay, main.ui.modals.level_screen, main.ui.modals.curio_overlay,
+			main.ui.modals.end_overlay, main.ui.modals.shop_overlay, main.ui.modals.camp_overlay, main.ui.modals.settings_overlay,
+			main.ui.modals.status_panel, main.ui.modals.career_overlay, main.ui.modals.confirm_dialog, main.ui.modals.debug_overlay]:
 		if c == null or not (c is CanvasItem) or not (c as CanvasItem).visible:
 			continue
 		var rx: int = c.get_parent().get_index()
@@ -63,14 +63,14 @@ func _ready() -> void:
 			top = c
 			top_rx = rx
 			top_ry = ry
-	if top != main._start_overlay:
+	if top != main.ui.screens.start_overlay:
 		_problems.append("boot 态顶层可见层≠start_overlay（实测 %s——菜单被埋）〔装配生命批 V4〕"
 			% (top.name if top != null else "null"))
 	# 自检二：菜单标题 label 必须 is_visible_in_tree 且 rect 落屏内
 	#（对比度只判反差不判「字在」——本条+checker 墨色占比共同补内容判据）
 	var vp := get_viewport().get_visible_rect()
 	for pair in [["menu_title", "Dungeon Sweeper"]]:
-		var lbl: Label = ProbeUiUtil.find_label(main._start_overlay, String(pair[1]))
+		var lbl: Label = ProbeUiUtil.find_label(main.ui.screens.start_overlay, String(pair[1]))
 		if lbl == null:
 			_problems.append("菜单文字缺失: %s（find_label 零命中）〔装配生命批 V4〕" % String(pair[1]))
 			continue
@@ -79,22 +79,22 @@ func _ready() -> void:
 		var gr: Rect2 = lbl.get_global_rect()
 		if not vp.encloses(gr):
 			_problems.append("菜单文字 rect 越出视口: %s（%s ⊄ %s）〔装配生命批 V4〕" % [String(pair[1]), str(gr), str(vp)])
-		_meta[String(pair[0])] = ProbeUiUtil.label_rect(main._start_overlay, String(pair[1]))
+		_meta[String(pair[0])] = ProbeUiUtil.label_rect(main.ui.screens.start_overlay, String(pair[1]))
 	await _snap("menu")
 	# ①b 设置面（settingsbtn 真实信号路径，开合同款真实钮）
-	var setbtn: Button = ProbeUiUtil.find_button(main._start_overlay, "设置", "prefix")
+	var setbtn: Button = ProbeUiUtil.find_button(main.ui.screens.start_overlay, "设置", "prefix")
 	if setbtn == null:
 		_problems.append("设置入口缺失（开始层 settingsbtn）")
 	else:
 		setbtn.pressed.emit()
 		for i in 3:
 			await get_tree().process_frame
-		if not main.settings_overlay.visible:
+		if not main.ui.modals.settings_overlay.visible:
 			_problems.append("设置面未打开（settingsbtn 路径）")
 		else:
-			_meta["settings_title"] = ProbeUiUtil.label_rect(main.settings_overlay, "设置")
+			_meta["settings_title"] = ProbeUiUtil.label_rect(main.ui.modals.settings_overlay, "设置")
 			await _snap("settings")
-			var set_close: Button = ProbeUiUtil.find_button(main.settings_overlay, "返回", "prefix")
+			var set_close: Button = ProbeUiUtil.find_button(main.ui.modals.settings_overlay, "返回", "prefix")
 			if set_close == null:
 				_problems.append("设置面返回钮缺失")
 			else:
@@ -105,19 +105,19 @@ func _ready() -> void:
 		main._open_career()
 		for i in 3:
 			await get_tree().process_frame
-		if not main.career_overlay.visible or main._start_overlay.visible:
+		if not main.ui.modals.career_overlay.visible or main.ui.screens.start_overlay.visible:
 			_problems.append("生涯页未打开或开始层未隐藏（函数直调中间态路径）")
 		else:
-			_meta["career_title"] = ProbeUiUtil.label_rect(main.career_overlay, "生 涯")
+			_meta["career_title"] = ProbeUiUtil.label_rect(main.ui.modals.career_overlay, "生 涯")
 			await _snap("career")
-			var career_close: Button = ProbeUiUtil.find_button(main.career_overlay, "返回", "prefix")
+			var career_close: Button = ProbeUiUtil.find_button(main.ui.modals.career_overlay, "返回", "prefix")
 			if career_close == null:
 				_problems.append("生涯页返回钮缺失")
 			else:
 				career_close.pressed.emit()
 				for i in 3:
 					await get_tree().process_frame
-				if main.career_overlay.visible or not main._start_overlay.visible:
+				if main.ui.modals.career_overlay.visible or not main.ui.screens.start_overlay.visible:
 					_problems.append("生涯页关闭后页未隐藏或开始层未恢复")
 	# ② 营地（进档开层新路径——卡② mn9；槽模板注入隔离命名空间）
 	if not ProbeUiUtil.open_camp_via_savesel(main, "smoke_shot_probe_camp"):
@@ -125,7 +125,7 @@ func _ready() -> void:
 	else:
 		await get_tree().process_frame
 		await _snap("camp")
-		var close_btn: Button = ProbeUiUtil.find_button(main.camp_overlay, "关闭营地", "contains")
+		var close_btn: Button = ProbeUiUtil.find_button(main.ui.modals.camp_overlay, "关闭营地", "contains")
 		if close_btn != null:
 			close_btn.pressed.emit()
 			await get_tree().process_frame
@@ -137,24 +137,24 @@ func _ready() -> void:
 			await get_tree().process_frame
 			await _snap("level")
 			# GP 常驻徽章断言（读数=runner.gp 现值，刷新=写路径回执后重查〔open_choices〕）
-			var gp_label: Label = ProbeUiUtil.find_label(main.level_screen, "◈ ")
+			var gp_label: Label = ProbeUiUtil.find_label(main.ui.modals.level_screen, "◈ ")
 			if gp_label == null or not gp_label.is_visible_in_tree():
 				_problems.append("GP 徽章不可见（关卡画面顶栏）")
-			elif main.level_screen.get("_runner") != null:
-				var expect := "◈ %d" % int(main.level_screen.get("_runner").gp)
+			elif main.ui.modals.level_screen.get("_runner") != null:
+				var expect := "◈ %d" % int(main.ui.modals.level_screen.get("_runner").gp)
 				if gp_label.text != expect:
 					_problems.append("GP 徽章读数不符: %s != %s" % [gp_label.text, expect])
 		# ④ 战斗（节点一——真实选路提交路径 press_candidate，ui_click_probe :199 同款）
-		if main.level_screen != null and main.level_screen.visible:
-			main.level_screen.press_candidate(0)
+		if main.ui.modals.level_screen != null and main.ui.modals.level_screen.visible:
+			main.ui.modals.level_screen.press_candidate(0)
 			for i in 10:
 				await get_tree().process_frame
 			await _snap("battle")
 			# 战斗屏文字框/明度带锚点（全局 rect——checker 取样坐标源；明细带锚 S1 裁后改认现行文案）
-			_meta["battle_log_hint"] = ProbeUiUtil.label_rect(main.stage, "上轮摘要")
+			_meta["battle_log_hint"] = ProbeUiUtil.label_rect(main.ui.battle.stage, "上轮摘要")
 			_meta["hero_panel"] = _node_rect(ProbeUiUtil.find_by_script(main, "hero_info_panel_view"))
-			_meta["stage_view"] = _node_rect(main.stage)
-			_meta["board_zone"] = _node_rect(main.board_zone)
+			_meta["stage_view"] = _node_rect(main.ui.battle.stage)
+			_meta["board_zone"] = _node_rect(main.ui.battle.board_zone)
 			# draw calls 真机测量（基线 270→目标 <200；窗口化渲染帧读数，
 			# 取值时机=战斗截图同帧后一帧——呈现终态满负荷）
 			await get_tree().process_frame
@@ -162,25 +162,25 @@ func _ready() -> void:
 			_meta["battle_draw_calls"] = dc
 			print("[shot_probe] battle draw_calls=%d（基线 270/目标 <200）" % dc)
 			# ⑤ 状态面板（战斗屏状态角标真实信号路径；层在战斗屏之上开合）
-			var pb: Button = main.board_zone.status_badge
+			var pb: Button = main.ui.battle.board_zone.status_badge
 			if pb == null or not pb.visible or pb.disabled:
 				_problems.append("状态面板入口角标缺失/置灰（战斗屏 board_zone）")
 			else:
 				pb.pressed.emit()
 				for i in 3:
 					await get_tree().process_frame
-				if not main.status_panel.visible:
+				if not main.ui.modals.status_panel.visible:
 					_problems.append("状态面板未打开（角标路径）")
 				else:
-					_meta["status_title"] = ProbeUiUtil.label_rect(main.status_panel, "状态")
+					_meta["status_title"] = ProbeUiUtil.label_rect(main.ui.modals.status_panel, "状态")
 					await _snap("status")
-					var status_close: Button = ProbeUiUtil.find_button(main.status_panel, "继续", "prefix")
+					var status_close: Button = ProbeUiUtil.find_button(main.ui.modals.status_panel, "继续", "prefix")
 					if status_close == null:
 						_problems.append("状态面板继续钮缺失")
 					else:
 						status_close.pressed.emit()
 						await get_tree().process_frame
-						if main.status_panel.visible:
+						if main.ui.modals.status_panel.visible:
 							_problems.append("状态面板关闭后未隐藏（继续钮路径）")
 		else:
 			_problems.append("关卡画面未出现（函数直调中间态路径）")