From 4ed4305bb3ed6987efa0a2bef48c586f06360d89 Mon Sep 17 00:00:00 2001 From: wusumac <736139669@qq.com> Date: Mon, 14 Sep 2026 18:13:33 +0800 Subject: [PATCH] feat(m60-i03): hired market offers declare their state on the card (owner option A) --- docs/EVIDENCE_LEDGER.md | 1 + docs/MVP_QUALITY_CLOSURE.md | 4 +-- docs/runtime/M52_SHARED_UI_RULES.md | 1 + docs/runtime/M60_PLAYABILITY_TRUTH.md | 5 +-- runtime/entry/views/market_page_view.gd | 1 + runtime/tools/m52_market_visual_probe.gd | 20 ++++++++++- runtime/ui/m52/recruit_card.gd | 42 ++++++++++++++++++++++++ 7 files changed, 69 insertions(+), 5 deletions(-) diff --git a/docs/EVIDENCE_LEDGER.md b/docs/EVIDENCE_LEDGER.md index a1798e0b..8804bb5f 100644 --- a/docs/EVIDENCE_LEDGER.md +++ b/docs/EVIDENCE_LEDGER.md @@ -12,6 +12,7 @@ | 2026-09-13 | M60 可玩性真相(W1) | `e1cad068`/`dac5de40` | `m60-playthrough` `20260913T145904Z-38281` | runtime_verified | 34 步 0 阻断;视频与逐步截图 | | 2026-09-13 | M61 设计/密度(W2) | `310d2620` | `m61-five-profile` `20260913T162625Z-2172` | simulation_verified | decisions=330, max_gap=31.3s, 反支配/存档/可达通过 | | 2026-09-13 | M62 组件统一(W3) | `2e5540ed` | `m62-ink-baselines` `20260913T164335Z-38711` | runtime_verified | 组件库+矩阵+探针接入;基线 Guild 0 / Contract 1 / Readiness+Result 6 / Market 严格 0 | +| 2026-09-14 | M60-I03 已招募卡状态明示(owner 方案 A) | `feat(m60-i03)` 提交 | `m72-hired` | runtime_verified | 卡顶状态牌 + 16% 降调、保持可查看;m52 严格探针新增 hired 变体 scanned=8 violations=0 | | 2026-09-14 | M71 DEV-6 回执链验证(解雇/合同返回/装备购买) | `test(m71)` `6c246ea4` | `m71-dev6` `20260914T095702Z-52977` | runtime_verified | 七个 dev6 测试单尺寸+条件等待后全过;服务层回执/幂等/冲突/锁定语义由规格测试证明;结清 M65-I04/M68-I02 | | 2026-09-14 | M70 清理:组件测试过期几何/退出码 + 历史测试登记 | `fix(m70)` `207f3b50`/`31c9c640` | `m70-cleanup` `20260914T091225Z-19468` | runtime_verified | 修详情栏 1px 真实重叠、适配器单尺寸契约、`quit(0)+quit(1)` 退出码缺陷;P9.x 114 测试登记为历史(99 通过/15 记录);全 foundation rc=0 | | 2026-09-14 | M69 角色形象统一(柔绘 Q 版 12 立绘 + 委托底图去角色) | `feat(m69)` `3d717209` | `m69-characters` `20260914T082832Z-86243` | runtime_verified | owner 确认 V3 风格;12 张新立绘 + 底图重绘;104 扫描 0 违规;全页面全景交付 | diff --git a/docs/MVP_QUALITY_CLOSURE.md b/docs/MVP_QUALITY_CLOSURE.md index 01ca7bb8..0f67c60c 100644 --- a/docs/MVP_QUALITY_CLOSURE.md +++ b/docs/MVP_QUALITY_CLOSURE.md @@ -57,7 +57,7 @@ | `M68-I03` | OPEN | `m52_candidate_ledger_component_test`("profession and detail do not overlap")与 `m52_market_slot_adapter_test`(几何契约)为既有失败(HEAD worktree 复核),不在现行链 | 组件级测试的过期几何断言 | | `M64-I05` / `M67-I03` | OPEN(已定论) | `tests/p9_*` 历史里程碑测试仍用旧多尺寸/`EXPAND`;属历史证据,非现行门 | 独立清理步骤(如需统一) | | `M63-I06` | OPEN | Settings 滑杆仍用令牌色直绘(非共享材质) | 设置页后续轮或收尾 | -| `M60-I03` | OPEN | 待 owner 决策项 | **owner 决定** | +| `M60-I03` | RESOLVED | 已招募卡占位 → owner 选方案 A(状态牌 + 降调,保持可查看) | — | | `M62-I01`…`I05` | RESOLVED | 逐页一致性矩阵的迁移项全部结案(I02 删死 overlay、I03 槽加宽、I04 事实槽 56) | — | ## 5. 仍需 owner 的验收(机器门之外) @@ -65,7 +65,7 @@ 1. **实机目视**:以 owner 的显示设备按 1280×720 逐页查看(本轮提供 panorama 拼图 + 每页 static/dynamic/final 三视图证据在 attempt artifact 内)。 2. **P9.0R3 之外的战斗/结算手感**:本轮只做材质/文字/槽位,未改玩法与节奏。 -3. **`M60-I03` 决策**与后续打包/发布步骤(按 AGENTS:打包发布需 owner 明确授权)。 +3. **打包/发布步骤**(按 AGENTS:需 owner 明确授权)。 ## 6. 证据索引 diff --git a/docs/runtime/M52_SHARED_UI_RULES.md b/docs/runtime/M52_SHARED_UI_RULES.md index f421d3d4..ea5f5970 100644 --- a/docs/runtime/M52_SHARED_UI_RULES.md +++ b/docs/runtime/M52_SHARED_UI_RULES.md @@ -39,6 +39,7 @@ | `Tokens.seal_style(color)`(M66) | 彩色小徽记:页面给语义色,边框/圆角/线宽共享 | 风险事实图标、风险身份标记 | | `Tokens.hit_area_style(state)`(M66) | 透明命中反馈:normal 微海军蓝、hover 金、pressed/focus 天蓝 | 纸质卡片的悬停/按压/焦点反馈 | | `Tokens.font_size("caption")` = 8(M68 收口) | 窄卡面(市场招募卡姓名/特质芯片)的合法降档字号;宽槽位仍用 `micro` | 招募卡姓名、特质芯片 | +| 市场卡状态徽记(M60-I03 / M72) | 已招募候选卡保留在卡列但必须明示:顶部丝带位换共享 `card` 材质的状态牌("已招募/HIRED")+ 整卡 `INK` 16% 降调;卡片仍可点开查看(inspect-only) | Market 招募卡;同类"已购/已用"状态可复用 | | `Tokens.COLOR_SUCCESS`(M67) | 羊皮纸上的成功/存活墨绿 `#3d7449`(深于旧深色底用的亮绿) | 结果存活、恢复承诺、无击倒状态、风险页正向后 | ## 资产九宫格材质(M57) diff --git a/docs/runtime/M60_PLAYABILITY_TRUTH.md b/docs/runtime/M60_PLAYABILITY_TRUTH.md index f389a353..316e4cfa 100644 --- a/docs/runtime/M60_PLAYABILITY_TRUTH.md +++ b/docs/runtime/M60_PLAYABILITY_TRUTH.md @@ -53,8 +53,9 @@ Risk Board → 选风险 → Review → 承认后果 → 开始战斗 → 开始 ## Issue Register -- `M60-I03` OPEN:已招募 Offer 仍占市场卡位(inspect-only)。建议在 - owner 确认后改为置灰标注或移出卡列;本轮不改产品。 +- `M60-I03` RESOLVED(2026-09-14,owner 选方案 A):已招募 Offer 仍留在卡列但 + 顶部丝带位改为共享材质的"已招募"状态牌并整卡 16% 降调,卡片保持可点开查看; + `m52` 严格探针新增 `hired` 变体(`scanned=8 violations=0`)。 - `M60-I04` OPEN:存在可恢复远征团(含 `.bak`)时 `TitleNewGame` 被禁用。 需要 owner 决定新档策略;当前仅记录。 - `M60-I05` OPEN:战斗回放加速仅用于驱动测试(`battle_speed` 表现层), diff --git a/runtime/entry/views/market_page_view.gd b/runtime/entry/views/market_page_view.gd index 0ba4463a..b1f53a8b 100644 --- a/runtime/entry/views/market_page_view.gd +++ b/runtime/entry/views/market_page_view.gd @@ -274,6 +274,7 @@ func _m52_recruit_card_component(index: int, offer: Dictionary, area: Rect2, sel "profession": String(presentation.get("profession_name", "")), "trait": String(presentation.get("trait_name", "")), "availability": _tr("可招募", "AVAILABLE", data) if is_available else _tr("已招募", "HIRED", data), + "hired": not is_available, # The card already renders the generated coin icon. Keep only the numeric # amount here so COIN/金币 cannot be truncated in the narrow slot; the # ledger carries the full localized currency label. diff --git a/runtime/tools/m52_market_visual_probe.gd b/runtime/tools/m52_market_visual_probe.gd index 0ea4446e..52cd25ec 100644 --- a/runtime/tools/m52_market_visual_probe.gd +++ b/runtime/tools/m52_market_visual_probe.gd @@ -37,6 +37,7 @@ func _run() -> void: await _capture_fixture(int(fixture.width), int(fixture.height), String(locale), false, "recruit") await _capture_fixture(int(fixture.width), int(fixture.height), String(locale), true, "recruit") await _capture_fixture(int(fixture.width), int(fixture.height), String(locale), false, "equipment") + await _capture_fixture(int(fixture.width), int(fixture.height), String(locale), true, "hired") if not ink_violations.is_empty(): for violation in ink_violations: push_error("M59 ink violation %s %s %s %s [%s] %s: %s" % [ @@ -47,7 +48,7 @@ func _run() -> void: quit(1) return print("ABG_M59_INK_CHECK_OK scanned=%d violations=0" % ink_scanned) - print("ABG_M52_MARKET_VISUAL_PROBE_OK fixtures=1 locales=2 variants=normal,longest,equipment scans=%d views=static,dynamic,final" % ink_scanned) + print("ABG_M52_MARKET_VISUAL_PROBE_OK fixtures=1 locales=2 variants=normal,longest,equipment,hired scans=%d views=static,dynamic,final" % ink_scanned) quit(0) func _variant_label(longest: bool, kind: String) -> String: @@ -110,6 +111,8 @@ func _save_image(path: String) -> void: func _fixture_data(locale: String, longest := false, kind: String = "recruit") -> Dictionary: if kind == "equipment": return _equipment_fixture(locale, longest) + if kind == "hired": + return _hired_fixture(locale) var is_zh := locale == "zh_CN" var names := ( ["卡珊德拉", "奥莉薇娅", "风语者"] @@ -143,6 +146,21 @@ func _fixture_data(locale: String, longest := false, kind: String = "recruit") - } +func _hired_fixture(locale: String) -> Dictionary: + # M60-I03: one offer is already hired; the card must say so clearly while + # staying inspectable, and the ledger must read HIRED. + var is_zh := locale == "zh_CN" + var hired_offer := _recruit("R-001", "甘尼特", locale, true) + var available_offer := _recruit("R-002", "卡珊德拉", locale, true) + var data := _fixture_data(locale, true, "recruit") + data["offers"] = {"recruit": [hired_offer, available_offer]} + data["selected_offer_id"] = "R-001" + data["selected_offer"] = hired_offer + data["available"] = {"recruit": ["R-002"]} + data["review"] = {"available": true, "action": "recruit_review", "reason": "inspectable"} + return data + + func _equipment_fixture(locale: String, longest: bool) -> Dictionary: # Real catalog identity: EQ-002 定步护胫 / Frontpin Greaves and EQ-012 # 开线绳结 / Open-Line Cord with their shipped effect/fit/tradeoff copy. diff --git a/runtime/ui/m52/recruit_card.gd b/runtime/ui/m52/recruit_card.gd index abc03f86..3d9606d7 100644 --- a/runtime/ui/m52/recruit_card.gd +++ b/runtime/ui/m52/recruit_card.gd @@ -10,6 +10,7 @@ const PortraitModule = preload("res://ui/m52/portrait_module.gd") const IdentityModule = preload("res://ui/m52/identity_module.gd") const TraitModule = preload("res://ui/m52/trait_module.gd") const CostModule = preload("res://ui/m52/cost_module.gd") +const PageChrome = preload("res://ui/shared/page_chrome.gd") var recruit_name := "" var profession_name := "" @@ -19,6 +20,9 @@ var cost_text := "14 金币" var portrait_texture: Texture2D var accent := "blue" var text_scale := 1.0 +# M60-I03: a hired offer stays on the board for inspection, but the card must +# say so unambiguously (dim field + authored HIRED seal). +var hired := false func configure(data: Dictionary) -> ABGM52RecruitCard: recruit_name = String(data.get("name", "未命名候选人")) @@ -29,6 +33,7 @@ func configure(data: Dictionary) -> ABGM52RecruitCard: portrait_texture = data.get("portrait") as Texture2D accent = String(data.get("accent", "blue")) text_scale = float(data.get("text_scale", 1.0)) + hired = bool(data.get("hired", false)) return self func _ready() -> void: @@ -40,11 +45,48 @@ func _ready() -> void: add_theme_stylebox_override(state, StyleBoxEmpty.new()) _build() _adapt_for_size() + _apply_hired_state() func _notification(what: int) -> void: if what == NOTIFICATION_RESIZED and is_inside_tree(): _adapt_for_size() +func _apply_hired_state() -> void: + if not hired: + return + var visual := get_node_or_null("VisualLayer") as Control + if visual == null: + return + var dim := ColorRect.new() + dim.name = "HiredDim" + dim.color = Color(MarketChrome.INK, 0.16) + dim.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT) + dim.mouse_filter = Control.MOUSE_FILTER_IGNORE + visual.add_child(dim) + var badge := Control.new() + badge.name = "HiredBadge" + badge.anchor_left = 0.06 + badge.anchor_top = 0.045 + badge.anchor_right = 0.94 + badge.anchor_bottom = 0.145 + badge.mouse_filter = Control.MOUSE_FILTER_IGNORE + visual.add_child(badge) + var plate := PageChrome.new().configure("card") + plate.name = "BadgeChrome" + plate.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT) + plate.mouse_filter = Control.MOUSE_FILTER_IGNORE + badge.add_child(plate) + var label := UIFactory.label(availability, "micro", text_scale, MarketChrome.INK) + label.name = "HiredBadgeLabel" + label.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT) + label.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER + label.vertical_alignment = VERTICAL_ALIGNMENT_CENTER + label.clip_text = true + label.text_overrun_behavior = TextServer.OVERRUN_TRIM_ELLIPSIS + label.mouse_filter = Control.MOUSE_FILTER_IGNORE + badge.add_child(label) + + func _adapt_for_size() -> void: # The card now lives in the fixed design root. Use transformed play-size # for the variant decision so resize order cannot leave it in one-way