diff --git a/docs/plans/M68_DEV6R_COMPANY_RETURN_MIGRATION.md b/docs/plans/M68_DEV6R_COMPANY_RETURN_MIGRATION.md new file mode 100644 index 00000000..1528477d --- /dev/null +++ b/docs/plans/M68_DEV6R_COMPANY_RETURN_MIGRATION.md @@ -0,0 +1,61 @@ +# M68 · DEV-6R 花名册 / 成员详情 / 解雇审查 / 合同返回迁移计划 + +> 权威:`GOAL_ABG_MVP_QUALITY.md` + AGENTS.md「UI Restoration Memory」。 +> 前置:M67/DEV-5R 已收官(结算四页 + 严格探针)。 + +## Player-visible stopping point + +`company_roster_page_view`、`recruit_detail_page_view` 与 `entry_shell` 内的 +`dismissal_review`、`contract_return_review` 两个屏幕在**单一 1280×720** 下: +页框迁入共享羊皮纸族、文案走共享令牌、节点名与 intents 不变,新增**严格墨迹探针** +通过;`M62-I03`(Readiness 摘要标题超槽)与 `M65-I04`(dev6 收据链路)完成核对并登记结论。 + +## Measured facts (2026-09-14, 源码静态审计) + +| 表面 | 行数/位置 | 私有 `StyleBoxFlat` | 现状 | +| --- | --- | --- | --- | +| `company_roster_page_view` | 195 | 0 | 深色整页框 `initial_company_scene_frame`;象牙/琥珀/天蓝/绿字;成员行用 `make_entry_chrome("Chrome", "company_primary/secondary")` + meta `entry_chrome_variant` | +| `recruit_detail_page_view` | 170 | 0 | 同上深色框;象牙/琥珀/绿字 | +| `entry_shell.open_dismissal_review()` | ~1912–2000 | 0 | 深色框 + 象牙/琥珀/绿/红字;按钮已用 `_company_button`(共享族) | +| `entry_shell.open_contract_return_review()` | ~2026–2125 | 0 | 同上 | + +- dev6 测试(`roster_detail_test` / `contract_return_test` / `equipment_growth_test`)覆盖解雇、 + 装备归还与合同返回的完整链路;`equipment_growth_test` 仍引用 `equipment_receipts` + (`M65-I04`)需核对归属。 +- `readiness_page_view` 的 `ReadinessSummaryTitle` 超槽(`M62-I03`,m55 基线 6 违规)仍 OPEN。 + +## Ordered steps + +1. **M68-A(IN_PROGRESS)**:两个视图迁共享族 + - 页框 → 共享 `PageChrome("card")`(节点名保留:`RosterFrame` / `RecruitDetailFrame`), + 内容 `inset_safe_to_card_face()`。 + - 文案令牌化:`#f5ead0`→`INK`、`#e8d39d`/`#aebbc2`→`INK_SOFT`、`#9ed7aa`→`COLOR_SUCCESS`、 + `#ffd4d4`→`COLOR_DANGER`、`#73b9e7`/`#f0ca75`→`INK` 或 `ColorSuccess` 语义化。 + - 成员行 `Chrome` → 共享 `command_plate`(primary/secondary 状态),保留 + `entry_chrome_variant` meta;`_set_disabled` 文案色 → `UITokens.COLOR_MUTED`。 +2. **M68-B**:`dismissal_review` / `contract_return_review` 两屏同样处理(框、内缩、令牌)。 +3. **M68-C**:`m68_company_return_visual_probe.gd` 严格探针(4 表面 × zh/en × static/dynamic/final + = 24 扫描);`M62-I03` 与 `M65-I04` 结论写入本计划。 +4. **M68-D**:源绑定验证 + 提交 + 推送 + 账本/checkpoint + display。 + +## Acceptance checks + +- `ABG_M68_COMPANY_RETURN_INK_OK scanned=24 violations=0`(严格,唯一一次) +- `ABG_M68_COMPANY_RETURN_VISUAL_PROBE_OK surfaces=roster,detail,dismissal,return locales=2 scans=24` +- dev6 的 `roster_detail_test`、`contract_return_test` 通过;四页契约测试通过 +- `ABG_M67_RESULT_RECOVERY_INK_OK`、`ABG_M66_PARTY_RISK_INK_OK`、`ABG_M41_MARKET_VIEW_CONTRACT_OK`、 + `ABG_M59_INK_CHECK_OK`、`ABG_M54_CONTRACT_INK_OK`、`ABG_M53_GUILD_INK_OK`、`ABG_M63_ENTRY_INK_OK`、 + `ABG_DEV2_FULL_FLOW_TOUCH_OK` 各恰好一次;strict 0 + +## Frozen scope + +- 不改玩法/经济/内容/Save/路由语义;解雇/合同返回的 eligibility 与回执语义冻结。 +- 不改节点名、intents、布局槽位;单尺寸 1280×720。 + +## Issue register + +| ID | 状态 | 内容 | +| --- | --- | --- | +| `M62-I03` | OPEN | `ReadinessSummaryTitle` 超槽(m55 基线 6 违规)。本轮核对:属已验收 Readiness 页的摘要标题槽,需单独一步测量后修;不并入 DEV-6R 冻结范围 | +| `M65-I04` | OPEN | `tests/dev6/equipment_growth_test` 引用 `equipment_receipts`(DEV-6 玩法/服务范围,非本迁移轮);本轮核对并记录其失败点归属,不越界实现 | +| `M68-I01` | OPEN | 两视图成员行 `Chrome` 由入口 chrome 改共享 `command_plate` 后,需确认 `entry_chrome_variant` meta 与选中态视觉不变 | diff --git a/runtime/entry/entry_shell.gd b/runtime/entry/entry_shell.gd index dd9622d4..bcad5718 100644 --- a/runtime/entry/entry_shell.gd +++ b/runtime/entry/entry_shell.gd @@ -1925,8 +1925,14 @@ func open_dismissal_review(recruit_id: String) -> void: current_screen = "dismissal_review" _build_world_base() var frame_safe := _framed_page_safe("DismissalReview") - frame_safe.add_child(_entry_chrome("DismissalReviewFrame", "initial_company_scene_frame")) + # M68-B: shared parchment card owns the screen surface (node name preserved). + var dismissal_frame := PageChrome.new().configure("card") + dismissal_frame.name = "DismissalReviewFrame" + dismissal_frame.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT) + dismissal_frame.mouse_filter = Control.MOUSE_FILTER_IGNORE + frame_safe.add_child(dismissal_frame) var safe := _content_page_safe("DismissalReview") + _inset_safe_to_card_face(safe) var layout := VBoxContainer.new() layout.name = "DismissalReviewLayout" layout.add_theme_constant_override("separation", 6) @@ -1937,9 +1943,9 @@ func open_dismissal_review(recruit_id: String) -> void: var heading := VBoxContainer.new() heading.size_flags_horizontal = Control.SIZE_EXPAND_FILL header.add_child(heading) - heading.add_child(_label(_tr("解雇审查", "DISMISSAL REVIEW"), _scaled(21), Color("#f5ead0"))) - heading.add_child(_label(_recruit_name(recruit), _scaled(13), Color("#e8d39d"))) - var eligibility := _label(_tr("可执行 · 当前成员 %d", "ELIGIBLE · %d LIVE MEMBERS") % loaded.company.owned_recruits.size(), _scaled(11), Color("#9ed7aa")) + heading.add_child(_label(_tr("解雇审查", "DISMISSAL REVIEW"), _scaled(21), PageChrome.INK)) + heading.add_child(_label(_recruit_name(recruit), _scaled(13), PageChrome.INK_SOFT)) + var eligibility := _label(_tr("可执行 · 当前成员 %d", "ELIGIBLE · %d LIVE MEMBERS") % loaded.company.owned_recruits.size(), _scaled(11), UITokens.COLOR_SUCCESS) eligibility.vertical_alignment = VERTICAL_ALIGNMENT_CENTER header.add_child(eligibility) var body := HBoxContainer.new() @@ -1965,17 +1971,17 @@ func open_dismissal_review(recruit_id: String) -> void: facts.size_flags_horizontal = Control.SIZE_EXPAND_FILL facts.add_theme_constant_override("separation", 6) body.add_child(facts) - facts.add_child(_label(_tr("将离开当前 Company", "LEAVES THE CURRENT COMPANY"), _scaled(11), Color("#e8d39d"))) + facts.add_child(_label(_tr("将离开当前 Company", "LEAVES THE CURRENT COMPANY"), _scaled(11), PageChrome.INK_SOFT)) _add_review_detail(facts, "DismissalReviewProfession", _tr("职业", "PROFESSION"), "%s · %s" % [_recruit_profession_name(recruit), String(recruit.profession_job)]) _add_review_detail(facts, "DismissalReviewTrait", _tr("特质", "TRAIT"), _recruit_trait_name(recruit)) _add_review_detail(facts, "DismissalReviewEquipment", _tr("装备归还", "EQUIPMENT RETURN"), _tr("%s 将回到库存", "%s returns to inventory") % _recruit_item_name(recruit)) _add_review_detail(facts, "DismissalReviewGrowth", _tr("保留成长", "GROWTH RETAINED"), _tr("等级 %d · XP %d · 不扣金币", "Level %d · XP %d · no Coin refund or charge") % [int(recruit.level), int(recruit.xp)]) - var consequence := _label(_tr("解雇不可撤销;至少保留一名成员。当前阶段必须仍是 Market,已锁定的队列不可解雇。", "Dismissal is irreversible; at least one member must remain. The current phase must be Market, and a locked Line cannot dismiss members."), _scaled(11), Color("#f0ca75")) + var consequence := _label(_tr("解雇不可撤销;至少保留一名成员。当前阶段必须仍是 Market,已锁定的队列不可解雇。", "Dismissal is irreversible; at least one member must remain. The current phase must be Market, and a locked Line cannot dismiss members."), _scaled(11), PageChrome.INK) consequence.name = "DismissalReviewConsequence" consequence.autowrap_mode = TextServer.AUTOWRAP_WORD_SMART consequence.size_flags_vertical = Control.SIZE_EXPAND_FILL facts.add_child(consequence) - var notice := _label(dismissal_notice, _scaled(10), Color("#ffd4d4")) + var notice := _label(dismissal_notice, _scaled(10), UITokens.COLOR_DANGER) notice.name = "DismissalReviewNotice" notice.autowrap_mode = TextServer.AUTOWRAP_WORD_SMART facts.add_child(notice) @@ -1985,13 +1991,13 @@ func open_dismissal_review(recruit_id: String) -> void: footer.add_theme_constant_override("separation", 8) layout.add_child(footer) var cancel := _company_button("DismissalReviewCancel", _tr("取消", "Cancel"), cancel_dismissal_review, "company_utility", "back") - cancel.custom_minimum_size = Vector2(170 if size.y < 500.0 else 190, footer.custom_minimum_size.y) + cancel.custom_minimum_size = Vector2(170 if size.y < 500.0 else 210, footer.custom_minimum_size.y) footer.add_child(cancel) var spacer := Control.new() spacer.size_flags_horizontal = Control.SIZE_EXPAND_FILL footer.add_child(spacer) var confirm := _company_button("DismissalReviewConfirm", _tr("确认解雇", "Confirm Dismissal"), commit_dismissal, "company_primary", "confirm") - confirm.custom_minimum_size = Vector2(170 if size.y < 500.0 else 190, footer.custom_minimum_size.y) + confirm.custom_minimum_size = Vector2(170 if size.y < 500.0 else 230, footer.custom_minimum_size.y) confirm.tooltip_text = _tr("移除该成员,装备归还库存,金币不变", "Remove this member, return equipment to inventory and leave Coin unchanged") footer.add_child(confirm) confirm.call_deferred("grab_focus") @@ -2047,8 +2053,14 @@ func open_contract_return_review() -> void: current_screen = "contract_return_review" _build_world_base() var frame_safe := _framed_page_safe("ContractReturnReview") - frame_safe.add_child(_entry_chrome("ContractReturnReviewFrame", "initial_company_scene_frame")) + # M68-B: shared parchment card owns the screen surface (node name preserved). + var return_frame := PageChrome.new().configure("card") + return_frame.name = "ContractReturnReviewFrame" + return_frame.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT) + return_frame.mouse_filter = Control.MOUSE_FILTER_IGNORE + frame_safe.add_child(return_frame) var safe := _content_page_safe("ContractReturnReview") + _inset_safe_to_card_face(safe) var layout := VBoxContainer.new() layout.name = "ContractReturnReviewLayout" layout.add_theme_constant_override("separation", 6) @@ -2059,9 +2071,9 @@ func open_contract_return_review() -> void: var heading := VBoxContainer.new() heading.size_flags_horizontal = Control.SIZE_EXPAND_FILL header.add_child(heading) - heading.add_child(_label(_tr("主动返回委托", "RETURN CONTRACT"), _scaled(21), Color("#f5ead0"))) - heading.add_child(_label(_tr("风镜初渡 · 保留 Company 成长", "FIRST WINDGLASS CROSSING · RETAIN COMPANY GROWTH"), _scaled(11), Color("#e8d39d"))) - var status := _label(_tr("可确认", "READY TO CONFIRM"), _scaled(11), Color("#9ed7aa")) + heading.add_child(_label(_tr("主动返回委托", "RETURN CONTRACT"), _scaled(21), PageChrome.INK)) + heading.add_child(_label(_tr("风镜初渡 · 保留 Company 成长", "FIRST WINDGLASS CROSSING · RETAIN COMPANY GROWTH"), _scaled(11), PageChrome.INK_SOFT)) + var status := _label(_tr("可确认", "READY TO CONFIRM"), _scaled(11), UITokens.COLOR_SUCCESS) status.vertical_alignment = VERTICAL_ALIGNMENT_CENTER header.add_child(status) var body := HBoxContainer.new() @@ -2075,7 +2087,7 @@ func open_contract_return_review() -> void: scene.size_flags_stretch_ratio = 1.2 scene.add_theme_constant_override("separation", 2) body.add_child(scene) - scene.add_child(_label(_tr("当前远征团", "CURRENT COMPANY"), _scaled(11), Color("#e8d39d"))) + scene.add_child(_label(_tr("当前远征团", "CURRENT COMPANY"), _scaled(11), PageChrome.INK_SOFT)) for index in range(guild_company.owned_recruits.size()): var recruit: Dictionary = guild_company.owned_recruits[index] var line := HBoxContainer.new() @@ -2088,22 +2100,28 @@ func open_contract_return_review() -> void: portrait.custom_minimum_size = Vector2(46 if size.y < 380.0 else 58, 40 if size.y < 380.0 else (56 if size.y < 500.0 else 68)) portrait.mouse_filter = Control.MOUSE_FILTER_IGNORE line.add_child(portrait) - line.add_child(_label("%s\n%s · Lv %d · XP %d" % [_recruit_name(recruit), _recruit_profession_name(recruit), int(recruit.level), int(recruit.xp)], _scaled(11), Color("#f5ead0"))) + var member_facts := _label("%s\n%s · Lv %d · XP %d" % [_recruit_name(recruit), _recruit_profession_name(recruit), int(recruit.level), int(recruit.xp)], _scaled(11), PageChrome.INK) + # The card face narrows the scene column; let the member facts own the + # remaining width and wrap instead of overflowing their slot. + member_facts.custom_minimum_size = Vector2(240, 0) + member_facts.size_flags_horizontal = Control.SIZE_EXPAND_FILL + member_facts.autowrap_mode = TextServer.AUTOWRAP_WORD_SMART + line.add_child(member_facts) scene.add_child(line) var facts := VBoxContainer.new() facts.name = "ContractReturnFacts" facts.size_flags_horizontal = Control.SIZE_EXPAND_FILL facts.add_theme_constant_override("separation", 6) body.add_child(facts) - facts.add_child(_label(_tr("这是自愿退出,不是 Recruit 解雇。", "VOLUNTARY WITHDRAWAL, NOT RECRUIT DISMISSAL"), _scaled(11), Color("#f0ca75"))) - facts.add_child(_label(_tr("保留金币:%d", "Coin retained: %d") % int(contract.coin), _scaled(13), Color("#f5ead0"))) - facts.add_child(_label(_tr("成员:%d · 等级/XP、职业、特质、装备、历史全部保留。", "Members: %d · levels/XP, Professions, Traits, equipment and history are all retained.") % guild_company.owned_recruits.size(), _scaled(12), Color("#9ed7aa"))) - var warning := _label(_tr("返回后当前委托状态变为 returned,不能再次进入这份 Market;下一份 Contract 属于更晚步骤。", "After returning, this Contract becomes returned and cannot re-open its Market; a later Contract belongs to a later step."), _scaled(11), Color("#e8d39d")) + facts.add_child(_label(_tr("这是自愿退出,不是 Recruit 解雇。", "VOLUNTARY WITHDRAWAL, NOT RECRUIT DISMISSAL"), _scaled(11), PageChrome.INK)) + facts.add_child(_label(_tr("保留金币:%d", "Coin retained: %d") % int(contract.coin), _scaled(13), PageChrome.INK)) + facts.add_child(_label(_tr("成员:%d · 等级/XP、职业、特质、装备、历史全部保留。", "Members: %d · levels/XP, Professions, Traits, equipment and history are all retained.") % guild_company.owned_recruits.size(), _scaled(12), UITokens.COLOR_SUCCESS)) + var warning := _label(_tr("返回后当前委托状态变为 returned,不能再次进入这份 Market;下一份 Contract 属于更晚步骤。", "After returning, this Contract becomes returned and cannot re-open its Market; a later Contract belongs to a later step."), _scaled(11), PageChrome.INK_SOFT) warning.name = "ContractReturnWarning" warning.autowrap_mode = TextServer.AUTOWRAP_WORD_SMART warning.size_flags_vertical = Control.SIZE_EXPAND_FILL facts.add_child(warning) - var notice := _label(contract_return_notice, _scaled(10), Color("#ffd4d4")) + var notice := _label(contract_return_notice, _scaled(10), UITokens.COLOR_DANGER) notice.name = "ContractReturnNotice" notice.autowrap_mode = TextServer.AUTOWRAP_WORD_SMART facts.add_child(notice) @@ -2117,13 +2135,13 @@ func open_contract_return_review() -> void: footer.add_theme_constant_override("separation", 8) layout.add_child(footer) var cancel := _company_button("ContractReturnCancel", _tr("取消", "Cancel"), cancel_contract_return, "company_utility", "back") - cancel.custom_minimum_size = Vector2(170 if size.y < 500.0 else 190, footer.custom_minimum_size.y) + cancel.custom_minimum_size = Vector2(170 if size.y < 500.0 else 210, footer.custom_minimum_size.y) footer.add_child(cancel) var spacer := Control.new() spacer.size_flags_horizontal = Control.SIZE_EXPAND_FILL footer.add_child(spacer) var confirm := _company_button("ContractReturnConfirm", _tr("确认返回公会", "Confirm Return to Guild"), commit_contract_return, "company_primary", "confirm") - confirm.custom_minimum_size = Vector2(170 if size.y < 500.0 else 190, footer.custom_minimum_size.y) + confirm.custom_minimum_size = Vector2(170 if size.y < 500.0 else 230, footer.custom_minimum_size.y) confirm.tooltip_text = _tr("保留全部 Company 成长并返回公会", "Retain all Company growth and return to Guild") footer.add_child(confirm) cancel.call_deferred("grab_focus") @@ -5784,6 +5802,19 @@ func _framed_page_safe(prefix: String) -> MarginContainer: return safe +func _inset_safe_to_card_face(safe: MarginContainer, edge_x := 0.055, edge_y := 0.15) -> void: + # M68-B: seat screen content inside a shared card's measured rolled edges + # (same contract as page_view.inset_safe_to_card_face). + if safe == null: + return + var face_x := int(size.x * edge_x) + 14 + var face_y := int(size.y * edge_y) + 10 + safe.add_theme_constant_override("margin_left", face_x) + safe.add_theme_constant_override("margin_right", face_x) + safe.add_theme_constant_override("margin_top", face_y) + safe.add_theme_constant_override("margin_bottom", int(face_y * 0.55)) + + func _content_page_safe(prefix: String) -> MarginContainer: var safe := MarginContainer.new() safe.name = "%sSafeArea" % prefix diff --git a/runtime/entry/views/company_roster_page_view.gd b/runtime/entry/views/company_roster_page_view.gd index 285b2417..a1717b5c 100644 --- a/runtime/entry/views/company_roster_page_view.gd +++ b/runtime/entry/views/company_roster_page_view.gd @@ -6,6 +6,8 @@ extends "res://presentation/page_view.gd" ## The View renders copied Company facts and emits explicit intents. Identity, ## eligibility, persistence and route decisions remain outside this scene. +const PageChrome = preload("res://ui/shared/page_chrome.gd") +const UITokens = preload("res://foundation/ui_tokens.gd") const InitialCompanyArt = preload("res://entry/initial_company_art.gd") const GUILD_BACKGROUND = preload("res://assets/backgrounds/p9_3_guild_hall.png") @@ -27,8 +29,14 @@ func _render_view(data: Dictionary) -> void: add_child(shade) var frame_safe := make_framed_page_safe("Roster") - frame_safe.add_child(make_entry_chrome("RosterFrame", "initial_company_scene_frame")) + # M68-A: shared parchment card owns the page surface (node name preserved). + var frame_chrome := PageChrome.new().configure("card") + frame_chrome.name = "RosterFrame" + frame_chrome.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT) + frame_chrome.mouse_filter = Control.MOUSE_FILTER_IGNORE + frame_safe.add_child(frame_chrome) var safe := make_content_page_safe("Roster") + inset_safe_to_card_face(safe) var layout := VBoxContainer.new() layout.name = "RosterLayout" layout.add_theme_constant_override("separation", 5) @@ -46,9 +54,9 @@ func _render_view(data: Dictionary) -> void: var heading := VBoxContainer.new() heading.size_flags_horizontal = Control.SIZE_EXPAND_FILL header.add_child(heading) - heading.add_child(make_label(localize("远征团成员", "COMPANY ROSTER", data), scaled(21), Color("#f5ead0"))) - heading.add_child(make_label(localize("稳定身份 · 个人成长 · 装备与战斗历史", "STABLE IDENTITY · PERSONAL GROWTH · EQUIPMENT & BATTLE HISTORY", data), scaled(10), Color("#e8d39d"))) - var count := make_label(localize("成员 %d", "%d MEMBERS", data) % members.size(), scaled(12), Color("#73b9e7")) + heading.add_child(make_label(localize("远征团成员", "COMPANY ROSTER", data), scaled(21), PageChrome.INK)) + heading.add_child(make_label(localize("稳定身份 · 个人成长 · 装备与战斗历史", "STABLE IDENTITY · PERSONAL GROWTH · EQUIPMENT & BATTLE HISTORY", data), scaled(10), PageChrome.INK_SOFT)) + var count := make_label(localize("成员 %d", "%d MEMBERS", data) % members.size(), scaled(12), PageChrome.INK_SOFT) count.vertical_alignment = VERTICAL_ALIGNMENT_CENTER header.add_child(count) @@ -104,10 +112,10 @@ func _render_invalid(layout: VBoxContainer, data: Dictionary) -> void: invalid.custom_minimum_size = Vector2(420, 120) invalid.add_theme_constant_override("separation", 8) layout.add_child(invalid) - var title := make_label(localize("成员列表不可用", "ROSTER UNAVAILABLE", data), scaled(20), Color("#f5ead0")) + var title := make_label(localize("成员列表不可用", "ROSTER UNAVAILABLE", data), scaled(20), PageChrome.INK) title.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER invalid.add_child(title) - var detail := make_label(String(data.get("notice", data.get("code", ""))), scaled(11), Color("#ffd4d4")) + var detail := make_label(String(data.get("notice", data.get("code", ""))), scaled(11), UITokens.COLOR_DANGER) detail.autowrap_mode = TextServer.AUTOWRAP_WORD_SMART detail.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER invalid.add_child(detail) @@ -119,8 +127,13 @@ func _roster_member_button(index: int, recruit: Dictionary, selected_id: String, button.flat = true for style_name in ["normal", "hover", "pressed", "disabled", "focus", "hover_pressed"]: button.add_theme_stylebox_override(style_name, StyleBoxEmpty.new()) - button.add_child(make_entry_chrome("Chrome", "company_primary" if String(recruit.get("recruit_id", "")) == selected_id else "company_secondary")) - button.set_meta("entry_chrome_variant", "company_primary" if String(recruit.get("recruit_id", "")) == selected_id else "company_secondary") + var row_selected := String(recruit.get("recruit_id", "")) == selected_id + var row_chrome := PageChrome.new().configure("command_plate", {"state": "primary" if row_selected else "secondary"}) + row_chrome.name = "Chrome" + row_chrome.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT) + row_chrome.mouse_filter = Control.MOUSE_FILTER_IGNORE + button.add_child(row_chrome) + button.set_meta("entry_chrome_variant", "company_primary" if row_selected else "company_secondary") button.set_meta("recruit_id", String(recruit.get("recruit_id", ""))) button.custom_minimum_size = Vector2(0, 48 if size.y < 380.0 else (62 if size.y < 500.0 else 72)) button.tooltip_text = localize("选择 %s", "Select %s", data) % _recruit_name(recruit, data) @@ -134,12 +147,12 @@ func _roster_member_button(index: int, recruit: Dictionary, selected_id: String, portrait.size = Vector2(42 if size.y < 380.0 else 52, 42 if size.y < 380.0 else 54) portrait.mouse_filter = Control.MOUSE_FILTER_IGNORE button.add_child(portrait) - var name_label := make_label(_recruit_name(recruit, data), scaled(14), Color("#f5ead0")) + var name_label := make_label(_recruit_name(recruit, data), scaled(14), PageChrome.INK) name_label.position = Vector2(58 if size.y < 380.0 else 70, 3 if size.y < 380.0 else 6) name_label.size = Vector2(230, 20 if size.y < 380.0 else 24) name_label.mouse_filter = Control.MOUSE_FILTER_IGNORE button.add_child(name_label) - var facts := make_label(localize("%s · 等级 %d · XP %d", "%s · Level %d · XP %d", data) % [_recruit_profession_name(recruit, data), int(recruit.get("level", 0)), int(recruit.get("xp", 0))], scaled(10), Color("#aebbc2")) + var facts := make_label(localize("%s · 等级 %d · XP %d", "%s · Level %d · XP %d", data) % [_recruit_profession_name(recruit, data), int(recruit.get("level", 0)), int(recruit.get("xp", 0))], scaled(10), PageChrome.INK_SOFT) facts.position = Vector2(58 if size.y < 380.0 else 70, 24 if size.y < 380.0 else 31) facts.size = Vector2(290, 20 if size.y < 380.0 else 24) facts.text_overrun_behavior = TextServer.OVERRUN_TRIM_ELLIPSIS @@ -150,14 +163,14 @@ func _roster_member_button(index: int, recruit: Dictionary, selected_id: String, func _render_roster_detail(parent: VBoxContainer, recruit: Dictionary, data: Dictionary) -> void: if recruit.is_empty(): - parent.add_child(make_label(localize("选择一名成员查看详情。", "Select a Recruit to inspect detail.", data), scaled(13), Color("#f5ead0"))) + parent.add_child(make_label(localize("选择一名成员查看详情。", "Select a Recruit to inspect detail.", data), scaled(13), PageChrome.INK)) return - parent.add_child(make_label(localize("已选成员", "SELECTED RECRUIT", data), scaled(10), Color("#e8d39d"))) - parent.add_child(make_label(_recruit_name(recruit, data), scaled(18), Color("#f0ca75"))) - parent.add_child(make_label(localize("%s · 等级 %d · XP %d", "%s · Level %d · XP %d", data) % [_recruit_profession_name(recruit, data), int(recruit.get("level", 0)), int(recruit.get("xp", 0))], scaled(11), Color("#f5ead0"))) - parent.add_child(make_label(localize("当前装备:%s", "Equipped: %s", data) % _recruit_item_name(recruit, data), scaled(11), Color("#9ed7aa"))) + parent.add_child(make_label(localize("已选成员", "SELECTED RECRUIT", data), scaled(10), PageChrome.INK_SOFT)) + parent.add_child(make_label(_recruit_name(recruit, data), scaled(18), PageChrome.INK)) + parent.add_child(make_label(localize("%s · 等级 %d · XP %d", "%s · Level %d · XP %d", data) % [_recruit_profession_name(recruit, data), int(recruit.get("level", 0)), int(recruit.get("xp", 0))], scaled(11), PageChrome.INK)) + parent.add_child(make_label(localize("当前装备:%s", "Equipped: %s", data) % _recruit_item_name(recruit, data), scaled(11), UITokens.COLOR_SUCCESS)) var history: Dictionary = Dictionary(recruit.get("battle_history", {})) - var history_copy := make_label(localize("参战 %d · 胜利 %d · 击倒 %d", "Entered %d · Victories %d · Knockouts %d", data) % [int(history.get("battles_entered", 0)), int(history.get("victories", 0)), int(history.get("knockouts", 0))], scaled(10), Color("#aebbc2")) + var history_copy := make_label(localize("参战 %d · 胜利 %d · 击倒 %d", "Entered %d · Victories %d · Knockouts %d", data) % [int(history.get("battles_entered", 0)), int(history.get("victories", 0)), int(history.get("knockouts", 0))], scaled(10), PageChrome.INK_SOFT) history_copy.autowrap_mode = TextServer.AUTOWRAP_WORD_SMART history_copy.size_flags_vertical = Control.SIZE_EXPAND_FILL parent.add_child(history_copy) @@ -167,7 +180,7 @@ func _set_disabled(button: Button, disabled: bool) -> void: set_command_state(button, disabled) var label := button.get_node_or_null("ButtonLabel") as Label if disabled and label != null: - label.add_theme_color_override("font_color", Color("#89939a")) + label.add_theme_color_override("font_color", UITokens.COLOR_MUTED) func _recruit_name(recruit: Dictionary, data: Dictionary) -> String: diff --git a/runtime/entry/views/recruit_detail_page_view.gd b/runtime/entry/views/recruit_detail_page_view.gd index 332c9838..e2bf3c99 100644 --- a/runtime/entry/views/recruit_detail_page_view.gd +++ b/runtime/entry/views/recruit_detail_page_view.gd @@ -6,6 +6,8 @@ extends "res://presentation/page_view.gd" ## The View renders copied Recruit facts and emits explicit intents. Identity, ## eligibility, persistence and route decisions remain outside this scene. +const PageChrome = preload("res://ui/shared/page_chrome.gd") +const UITokens = preload("res://foundation/ui_tokens.gd") const InitialCompanyArt = preload("res://entry/initial_company_art.gd") const GUILD_BACKGROUND = preload("res://assets/backgrounds/p9_3_guild_hall.png") @@ -27,8 +29,14 @@ func _render_view(data: Dictionary) -> void: add_child(shade) var frame_safe := make_framed_page_safe("RecruitDetail") - frame_safe.add_child(make_entry_chrome("RecruitDetailFrame", "initial_company_scene_frame")) + # M68-A: shared parchment card owns the page surface (node name preserved). + var frame_chrome := PageChrome.new().configure("card") + frame_chrome.name = "RecruitDetailFrame" + frame_chrome.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT) + frame_chrome.mouse_filter = Control.MOUSE_FILTER_IGNORE + frame_safe.add_child(frame_chrome) var safe := make_content_page_safe("RecruitDetail") + inset_safe_to_card_face(safe) var layout := VBoxContainer.new() layout.name = "RecruitDetailLayout" layout.add_theme_constant_override("separation", 5) @@ -46,9 +54,9 @@ func _render_view(data: Dictionary) -> void: var heading := VBoxContainer.new() heading.size_flags_horizontal = Control.SIZE_EXPAND_FILL header.add_child(heading) - heading.add_child(make_label(localize("成员详情", "RECRUIT DETAIL", data), scaled(21), Color("#f5ead0"))) - heading.add_child(make_label(_recruit_name(recruit, data), scaled(12), Color("#e8d39d"))) - var state := make_label(localize("保留中", "RETAINED", data), scaled(11), Color("#9ed7aa")) + heading.add_child(make_label(localize("成员详情", "RECRUIT DETAIL", data), scaled(21), PageChrome.INK)) + heading.add_child(make_label(_recruit_name(recruit, data), scaled(12), PageChrome.INK_SOFT)) + var state := make_label(localize("保留中", "RETAINED", data), scaled(11), UITokens.COLOR_SUCCESS) state.vertical_alignment = VERTICAL_ALIGNMENT_CENTER header.add_child(state) @@ -84,7 +92,7 @@ func _render_view(data: Dictionary) -> void: _add_review_detail(details, "RecruitDetailEquipment", localize("当前装备", "EQUIPPED ITEM", data), _recruit_item_name(recruit, data), data) var history: Dictionary = Dictionary(recruit.get("battle_history", {})) _add_review_detail(details, "RecruitDetailHistory", localize("战斗历史", "BATTLE HISTORY", data), localize("参战 %d · 胜利 %d · 击倒 %d", "Entered %d · Victories %d · Knockouts %d", data) % [int(history.get("battles_entered", 0)), int(history.get("victories", 0)), int(history.get("knockouts", 0))], data) - var note := make_label(localize("解雇、晋升与更多构筑操作将在后续 DEV-6 步骤启用。", "Dismissal, promotion and further build actions are enabled in later DEV-6 steps.", data), scaled(10), Color("#e8d39d")) + var note := make_label(localize("解雇、晋升与更多构筑操作将在后续 DEV-6 步骤启用。", "Dismissal, promotion and further build actions are enabled in later DEV-6 steps.", data), scaled(10), PageChrome.INK_SOFT) note.name = "RecruitDetailFutureReason" note.autowrap_mode = TextServer.AUTOWRAP_WORD_SMART details.add_child(note) @@ -117,17 +125,17 @@ func _render_invalid(layout: VBoxContainer, data: Dictionary) -> void: invalid.custom_minimum_size = Vector2(420, 120) invalid.add_theme_constant_override("separation", 8) layout.add_child(invalid) - var title := make_label(localize("成员详情不可用", "RECRUIT DETAIL UNAVAILABLE", data), scaled(20), Color("#f5ead0")) + var title := make_label(localize("成员详情不可用", "RECRUIT DETAIL UNAVAILABLE", data), scaled(20), PageChrome.INK) title.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER invalid.add_child(title) - var detail := make_label(String(data.get("notice", data.get("code", ""))), scaled(11), Color("#ffd4d4")) + var detail := make_label(String(data.get("notice", data.get("code", ""))), scaled(11), UITokens.COLOR_DANGER) detail.autowrap_mode = TextServer.AUTOWRAP_WORD_SMART detail.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER invalid.add_child(detail) func _add_review_detail(parent: VBoxContainer, node_name: String, heading: String, value: String, data: Dictionary) -> void: - var line := make_label("%s\n%s" % [heading, value], scaled(10), Color("#f5ead0")) + var line := make_label("%s\n%s" % [heading, value], scaled(10), PageChrome.INK) line.name = node_name line.autowrap_mode = TextServer.AUTOWRAP_WORD_SMART line.size_flags_horizontal = Control.SIZE_EXPAND_FILL @@ -138,7 +146,7 @@ func _set_disabled(button: Button, disabled: bool) -> void: set_command_state(button, disabled) var label := button.get_node_or_null("ButtonLabel") as Label if disabled and label != null: - label.add_theme_color_override("font_color", Color("#89939a")) + label.add_theme_color_override("font_color", UITokens.COLOR_MUTED) func _recruit_name(recruit: Dictionary, data: Dictionary) -> String: diff --git a/runtime/tools/m68_company_return_visual_probe.gd b/runtime/tools/m68_company_return_visual_probe.gd new file mode 100644 index 00000000..43cc4292 --- /dev/null +++ b/runtime/tools/m68_company_return_visual_probe.gd @@ -0,0 +1,219 @@ +extends SceneTree + +## M68 strict visual probe for the DEV-6 company/return surfaces: Company +## Roster, Recruit Detail, Dismissal Review and Contract Return Review. +## Single authoritative size (owner policy), both locales, static/dynamic/final. +## Any ink violation fails the probe. + +const RosterView = preload("res://entry/views/company_roster_page_view.gd") +const DetailView = preload("res://entry/views/recruit_detail_page_view.gd") +const EntryShell = preload("res://entry/entry_shell.gd") +const SettingsStore = preload("res://entry/settings_store.gd") +const DraftService = preload("res://entry/initial_company_draft_service.gd") +const ContractService = preload("res://entry/guild_contract_service.gd") +const InkCheck = preload("res://tools/ui_ink_check.gd") +const FIXTURES := [Vector2i(1280, 720)] +const LOCALES := ["zh_CN", "en"] +const DRAFT_PATH := "user://m68_probe_draft.json" +const COMPANY_PATH := "user://m68_probe_company.json" +const SEED := "99887766554433221100ffeeddccbbaa" +const CONTRACT_OP := "abcdefabcdefabcdefabcdefabcdefab" +const HIRE_OP_1 := "11112222333344445555666677778888" +const HIRE_OP_2 := "88887777666655554444333322221111" +var ink_scanned := 0 +var ink_violations: Array = [] + + +func _initialize() -> void: + call_deferred("_run") + + +func _run() -> void: + var out := OS.get_environment("ABG_EVIDENCE_DIR") + if out.is_empty(): + push_error("requires ABG_EVIDENCE_DIR") + quit(1) + return + DirAccess.make_dir_recursive_absolute(out) + var ink_self := InkCheck.self_test(root) + if ink_self.size() < 3: + push_error("M68 ink self-test expected at least 3 violations, got %d" % ink_self.size()) + quit(1) + return + print("ABG_M68_INK_SELF_TEST_OK violations=%d" % ink_self.size()) + _cleanup() + var company := _create_market_company() + if company.is_empty(): + push_error("M68 probe could not build the Market company fixture") + quit(1) + return + ink_scanned = 0 + ink_violations = [] + for fixture in FIXTURES: + for locale in LOCALES: + await _capture_view(RosterView, _roster_data(String(locale)), fixture, String(locale), "roster", "RosterFrame", out) + await _capture_view(DetailView, _detail_data(String(locale)), fixture, String(locale), "detail", "RecruitDetailFrame", out) + await _capture_shell(fixture, String(locale), "dismissal", out) + await _capture_shell(fixture, String(locale), "return", out) + _cleanup() + if ink_violations.is_empty(): + print("ABG_M68_COMPANY_RETURN_INK_OK scanned=%d violations=0" % ink_scanned) + else: + for violation in ink_violations: + push_error("M68 ink violation %s %s %s %s %s: %s" % [ + violation.get("surface", "?"), violation.get("locale", "?"), + violation.get("fixture", "?"), violation.get("kind", "?"), + violation.get("path", violation.get("node", "?")), + violation.get("detail", ""), + ]) + print("ABG_M68_COMPANY_RETURN_INK_FAIL scanned=%d violations=%d" % [ink_scanned, ink_violations.size()]) + quit(1) + return + print("ABG_M68_COMPANY_RETURN_VISUAL_PROBE_OK surfaces=roster,detail,dismissal,return locales=%d scans=%d views=static,dynamic,final" % [LOCALES.size(), ink_scanned]) + quit(0) + + +func _capture_view(script: Script, data: Dictionary, fixture: Vector2i, locale: String, surface: String, frame_name: String, out: String) -> void: + for mode in ["static", "dynamic", "final"]: + var viewport := SubViewport.new() + viewport.size = fixture + viewport.render_target_update_mode = SubViewport.UPDATE_ALWAYS + root.add_child(viewport) + var view: Control = script.new() + view.name = "M68ProbeView" + view.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT) + view.configure_presentation({"safe_area": 24, "text_scale": 1.0, "locale": locale}) + viewport.add_child(view) + view.render(data) + await _finish(viewport, view, frame_name, surface, locale, fixture, mode, out) + + +func _capture_shell(fixture: Vector2i, locale: String, screen: String, out: String) -> void: + for mode in ["static", "dynamic", "final"]: + var viewport := SubViewport.new() + viewport.size = fixture + viewport.render_target_update_mode = SubViewport.UPDATE_ALWAYS + root.add_child(viewport) + var shell := EntryShell.new() + shell.auto_start = false + viewport.add_child(shell) + await _frames(3) + shell.settings = SettingsStore.new().defaults() + shell.settings.setup_completed = true + shell.settings.locale = locale + shell.initial_company_service.path = DRAFT_PATH + shell.initial_company_service.company_path = COMPANY_PATH + shell.size = Vector2(fixture) + if screen == "dismissal": + shell.open_dismissal_review(_probe_recruit_id()) + else: + shell.open_contract_return_review() + var frame_name := "DismissalReviewFrame" if screen == "dismissal" else "ContractReturnReviewFrame" + await _finish(viewport, shell, frame_name, screen, locale, fixture, mode, out) + + +func _finish(viewport: SubViewport, host: Control, frame_name: String, surface: String, locale: String, fixture: Vector2i, mode: String, out: String) -> void: + if mode == "static": + var frame := host.find_child(frame_name, true, false) as Control + if frame != null: + frame.visible = false + elif mode == "dynamic": + var frame := host.find_child(frame_name, true, false) as Control + if frame != null: + frame.visible = false + var neutral := ColorRect.new() + neutral.name = "M68NeutralProbeBackground" + neutral.color = Color("#26353c") + neutral.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT) + neutral.mouse_filter = Control.MOUSE_FILTER_IGNORE + host.add_child(neutral) + host.move_child(neutral, 0) + for _i in range(3): + await process_frame + var violations := InkCheck.scan(host) + ink_scanned += 1 + for violation in violations: + violation["surface"] = surface + violation["locale"] = locale + violation["fixture"] = "%dx%d" % [fixture.x, fixture.y] + violation["mode"] = mode + ink_violations.append(violation) + var image := viewport.get_texture().get_image() + if image != null: + image.save_png(out.path_join("%s-%dx%d-%s-%s.png" % [surface, fixture.x, fixture.y, locale, mode])) + host.queue_free() + viewport.queue_free() + await process_frame + + +func _probe_recruit_id() -> String: + var service := DraftService.new() + service.path = DRAFT_PATH + service.company_path = COMPANY_PATH + var loaded: Dictionary = service.load_company() + if not loaded.get("ok", false): + return "" + return String(loaded.company.owned_recruits[0].recruit_id) + + +func _create_market_company() -> Dictionary: + var draft: Dictionary = _draft_service().begin_or_load(SEED) + if not draft.ok: + return {} + _draft_service().set_selection([String(draft.draft.offers[0].offer_id), String(draft.draft.offers[1].offer_id)]) + if not _draft_service().commit_company().ok: + return {} + var created: Dictionary = _contract_service().create_contract(CONTRACT_OP, "CTR-R1-01", "standard") + if not created.ok: + return {} + var offers: Array = created.company.active_contract.market_board.recruit_offers + _contract_service().hire_recruit(HIRE_OP_1, String(offers[0].source_offer_id), 14) + var hired: Dictionary = _contract_service().hire_recruit(HIRE_OP_2, String(offers[1].source_offer_id), 14) + return hired.company if hired.ok else {} + + +func _draft_service() -> RefCounted: + var service := DraftService.new() + service.path = DRAFT_PATH + service.company_path = COMPANY_PATH + return service + + +func _contract_service() -> RefCounted: + var service := ContractService.new() + service.company_path = COMPANY_PATH + return service + + +func _cleanup() -> void: + for path in [DRAFT_PATH, "%s.bak" % DRAFT_PATH, "%s.candidate" % DRAFT_PATH, COMPANY_PATH, "%s.bak" % COMPANY_PATH, "%s.candidate" % COMPANY_PATH]: + if FileAccess.file_exists(path): + DirAccess.remove_absolute(ProjectSettings.globalize_path(path)) + + +func _frames(count: int) -> void: + for _i in range(count): + await process_frame + + +func _roster_data(locale: String) -> Dictionary: + return {"ok": true, "page_id": "roster", "locale": locale, "selected_recruit_id": "r-001", "members": [_member("r-001", "阿里", "Ari", locale), _member("r-002", "贝克斯", "Bex", locale)], "selected": _member("r-001", "阿里", "Ari", locale), "dismissal": {"eligible": true, "reason": "eligible"}} + + +func _detail_data(locale: String) -> Dictionary: + return {"ok": true, "page_id": "recruit_detail", "locale": locale, "selected_recruit_id": "r-001", "recruit": _member("r-001", "阿里", "Ari", locale), "dismissal": {"eligible": true, "reason": "eligible"}} + + +func _member(recruit_id: String, zh_name: String, en_name: String, locale: String) -> Dictionary: + var name := zh_name if locale == "zh_CN" else en_name + return { + "recruit_id": recruit_id, + "rendered_name_snapshot": {locale: name}, + "profession_id": "PF-B01", "profession_job": "前排承伤;近战前排", + "profession_name": {locale: "盾卫" if locale == "zh_CN" else "Guard"}, + "trait_id": "TR-001", "trait_name": {locale: "最后见证" if locale == "zh_CN" else "Steady"}, + "level": 2, "xp": 4, + "equipped_item_id": "EQ-002", "starting_item_id": "EQ-001", + "starting_item_name": {locale: "橡木盾" if locale == "zh_CN" else "Oak Shield"}, + "battle_history": {"battles_entered": 3, "victories": 2, "knockouts": 0}, + }