From 5891b5b31403a946d30ffa8150695f9f9cc9286e Mon Sep 17 00:00:00 2001 From: DKChan <524912269@qq.com> Date: Thu, 8 Oct 2026 16:30:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E5=B0=BE=E8=A3=81?= =?UTF-8?q?=E5=BE=AE=E6=89=B9a=E2=80=94=E2=80=94=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E5=BA=A6=E5=AD=98=E9=87=8F=E8=BF=9D=E4=BE=8B7=E9=A1=B9?= =?UTF-8?q?=E5=85=A8=E4=BF=AE=EF=BC=882026-10-08=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=A3=81=E7=94=B2=EF=BC=9AGP=E8=B4=A6=E8=A1=8C/=E6=A0=91?= =?UTF-8?q?=E5=88=86=E7=BB=84=E5=A4=B4/=E5=B7=A5=E5=9D=8A=E5=B7=B2?= =?UTF-8?q?=E8=A7=A3=E9=94=81=20GOLD=5FDEEP=E2=86=92GOLD=5FINK=E3=80=81?= =?UTF-8?q?=E8=B4=A7=E6=9E=B6=E4=BB=B7=E7=AD=BE=20GOLD=E2=86=92GOLD=5FINK?= =?UTF-8?q?=E3=80=94=E4=B8=89=E9=80=89=E4=B8=80=E4=BB=B7=E7=AD=BE=E6=81=92?= =?UTF-8?q?=E7=A9=BA=E4=B8=B2=E9=9A=90=E8=97=8F=E9=9B=B6=E6=B3=A2=E5=8F=8A?= =?UTF-8?q?=E3=80=95=E3=80=81=E8=A1=8C=E5=8D=A1=E5=90=8D=E6=98=BE=E5=BC=8F?= =?UTF-8?q?=E4=BC=A0=20WARM=5FSOFT=20=E6=9B=BF=20bold=20=E7=BC=BA=E7=9C=81?= =?UTF-8?q?=20INK=5FLABEL=E3=80=81=E9=93=AD=E7=89=8C=E5=89=AF=E9=A2=98/?= =?UTF-8?q?=E8=A1=8C=E4=BB=B7=E6=A0=BC/=E8=A1=8C=E8=BF=9B=E5=BA=A6=20STONE?= =?UTF-8?q?=E2=86=92STONE=5FDEEP=EF=BC=9B=E5=8F=AA=E6=8D=A2=E6=96=87?= =?UTF-8?q?=E5=AD=97=E5=A2=A8=E9=9B=B6=E5=B8=83=E5=B1=80=E9=9B=B6=E6=96=87?= =?UTF-8?q?=E6=A1=88=EF=BC=8C=E8=BE=B9=E6=A1=86=E7=AD=89=E9=9D=9E=E6=96=87?= =?UTF-8?q?=E5=AD=97=E5=85=B1=E7=94=A8=E4=BD=8D=E7=94=84=E5=88=AB=E4=B8=8D?= =?UTF-8?q?=E5=8A=A8=EF=BC=9B=E6=B5=8B=E7=82=B9=E8=A1=A87=E5=AF=B9?= =?UTF-8?q?=E9=9A=8F=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5=E6=94=B9=E6=8C=87?= =?UTF-8?q?=E6=96=B0=E5=B8=B8=E9=87=8F=EF=BC=89=E2=80=94=E2=80=94probe=5Fg?= =?UTF-8?q?ate=20=E9=BB=98=E8=AE=A4=E6=AE=B5=E5=85=A8=E7=BB=BF=20ui=5Fcont?= =?UTF-8?q?rast=2015=E2=86=9238=E5=AF=B9=E5=AD=98=E9=87=8F=E7=BA=A2?= =?UTF-8?q?=E6=B8=85=E9=9B=B6=EF=BC=882.67/1.12/1.46/3.59/4.02/2.67/3.00?= =?UTF-8?q?=E2=86=925.21/9.53/5.21/5.98/6.70/5.21/5.84=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game/presentation/views/battle_end_overlay.gd | 4 ++-- game/presentation/views/camp_overlay_view.gd | 12 ++++++------ game/presentation/views/shop_overlay_view.gd | 2 +- game/presentation/views/ui_kit.gd | 2 +- game/smoke/ui_contrast_probe.gd | 17 +++++++++-------- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/game/presentation/views/battle_end_overlay.gd b/game/presentation/views/battle_end_overlay.gd index 71a2b6ff..0f54298e 100644 --- a/game/presentation/views/battle_end_overlay.gd +++ b/game/presentation/views/battle_end_overlay.gd @@ -83,8 +83,8 @@ func _init() -> void: box.add_child(_rows_box) # 两列对齐账行（审计差距④对齐 demo ⑧——项目名左/数值右，定宽 360） _gp_row = _ledger_row() - _gp_name = _ledger_name(UiKit.FS_SUB, UiKit.GOLD_DEEP, true) - _gp_val = _ledger_value(UiKit.FS_SUB, UiKit.GOLD_DEEP, true) + _gp_name = _ledger_name(UiKit.FS_SUB, UiKit.GOLD_INK, true) # 尾裁微批a 2026-10-08——GOLD_DEEP 对结算板 2.67:1 越带，换深金墨 5.21:1 + _gp_val = _ledger_value(UiKit.FS_SUB, UiKit.GOLD_INK, true) # 同上 _gp_row.add_child(_gp_name) _gp_row.add_child(_gp_val) _rows_box.add_child(_gp_row) diff --git a/game/presentation/views/camp_overlay_view.gd b/game/presentation/views/camp_overlay_view.gd index 01cf6dc9..5061adf6 100644 --- a/game/presentation/views/camp_overlay_view.gd +++ b/game/presentation/views/camp_overlay_view.gd @@ -71,7 +71,7 @@ func _init() -> void: plaque.add_child(plaque_col) var title := UiKit.label("营地 · 永久强化",UiKit.FS_TITLE, true, UiKit.INK_TITLE) plaque_col.add_child(title) - var sub := UiKit.label("跨局成长账本——钥石换永久属性",UiKit.FS_HINT, false, UiKit.STONE) + var sub := UiKit.label("跨局成长账本——钥石换永久属性",UiKit.FS_HINT, false, UiKit.STONE_DEEP) # 尾裁微批a 2026-10-08——STONE 对铭牌板 3.59:1 越带，换灰石深化 5.98:1 plaque_col.add_child(sub) var spacer := Control.new() spacer.size_flags_horizontal = Control.SIZE_EXPAND_FILL @@ -188,7 +188,7 @@ func _rebuild_tree(data: Dictionary) -> void: var vein := String(row.get("vein", "")) if vein != last_vein: last_vein = vein - var vh := UiKit.label(String(vein_names.get(vein, vein)),UiKit.FS_HINT, true, UiKit.GOLD_DEEP) + var vh := UiKit.label(String(vein_names.get(vein, vein)),UiKit.FS_HINT, true, UiKit.GOLD_INK) # 尾裁微批a 2026-10-08——GOLD_DEEP 对柜台板 2.67:1 越带，换深金墨 5.21:1 _tree_holder.add_child(vh) var hb := HBoxContainer.new() hb.add_theme_constant_override("separation", 6) @@ -272,10 +272,10 @@ func refresh_camp(data: Dictionary) -> void: st_col = UiKit.STONE elif bool(row.get("deferred", false)) and unlocked: st_text = "已解锁 · 能力封存中" - st_col = UiKit.GOLD_DEEP + st_col = UiKit.GOLD_INK # 尾裁微批a 2026-10-08——GOLD_DEEP 对行板 3.00:1 越带，换深金墨 5.84:1 elif unlocked: st_text = "已解锁" - st_col = UiKit.GOLD_DEEP + st_col = UiKit.GOLD_INK # 同上 card.status_l.text = st_text card.status_l.add_theme_color_override("font_color", st_col) card.status_l.tooltip_text = st_text # 截断兜底（状态列 EXPAND_FILL 吸余宽——悬停看全文） @@ -339,7 +339,7 @@ func _build_forge_row(holder: VBoxContainer, row: Dictionary) -> Dictionary: level_l.add_theme_stylebox_override("normal", UiKit.panel_flat(UiKit.CAMP_HEADER_BAND, Color(0, 0, 0, 0),UiKit.RADIUS_OBJECT, 0, Vector4(6, 0, 6, 0))) level_l.custom_minimum_size = Vector2(44, 0) line.add_child(level_l) - var price_l := UiKit.label("",UiKit.FS_HINT, false, UiKit.STONE) + var price_l := UiKit.label("",UiKit.FS_HINT, false, UiKit.STONE_DEEP) # 尾裁微批a 2026-10-08——STONE 对行板 4.02:1 越带，换灰石深化 6.70:1 price_l.custom_minimum_size = Vector2(64, 0) price_l.clip_text = true price_l.text_overrun_behavior = TextServer.OVERRUN_TRIM_ELLIPSIS @@ -366,7 +366,7 @@ func _rebuild_workshop(data: Dictionary) -> void: name_l.clip_text = true name_l.text_overrun_behavior = TextServer.OVERRUN_TRIM_ELLIPSIS line.add_child(name_l) - var progress_l := UiKit.label("",UiKit.FS_HINT, false, UiKit.STONE) + var progress_l := UiKit.label("",UiKit.FS_HINT, false, UiKit.STONE_DEEP) # 尾裁微批a 2026-10-08——同行价格墨同案（STONE 对行板 4.02:1 越带→6.70:1） progress_l.custom_minimum_size = Vector2(150, 0) # 2026-10-06 修——110 截掉阈值数字（「累计通关 28 / 2 次」≈154px） progress_l.clip_text = true # 营地溢出修——文字全宽不撑柜 progress_l.text_overrun_behavior = TextServer.OVERRUN_TRIM_ELLIPSIS diff --git a/game/presentation/views/shop_overlay_view.gd b/game/presentation/views/shop_overlay_view.gd index 635dbe1f..960d8cc6 100644 --- a/game/presentation/views/shop_overlay_view.gd +++ b/game/presentation/views/shop_overlay_view.gd @@ -124,7 +124,7 @@ func _build_card(p: Dictionary) -> Dictionary: var row := HBoxContainer.new() row.add_theme_constant_override("separation", 14) card.add_child(row) - var name_l := UiKit.label(_card_title(p),UiKit.FS_BODY, true) + var name_l := UiKit.label(_card_title(p),UiKit.FS_BODY, true, UiKit.WARM_SOFT) # 尾裁微批a 2026-10-08——显式传墨：bold 缺省 INK_LABEL 压暗底行卡 1.12:1 越带，换暖白次级 9.53:1 name_l.custom_minimum_size = Vector2(190, 0) row.add_child(name_l) var price_l := UiKit.label("",UiKit.FS_HINT, false, UiKit.WARM_SOFT) diff --git a/game/presentation/views/ui_kit.gd b/game/presentation/views/ui_kit.gd index 96d22fd0..1e794b04 100644 --- a/game/presentation/views/ui_kit.gd +++ b/game/presentation/views/ui_kit.gd @@ -674,7 +674,7 @@ class BCard: var spacer := Control.new() spacer.size_flags_vertical = Control.SIZE_EXPAND_FILL box.add_child(spacer) - price_l = UiKit.label(price,FS_TITLE, true, GOLD) + price_l = UiKit.label(price,FS_TITLE, true, GOLD_INK) # 尾裁微批a 2026-10-08——GOLD 对货架板 1.46:1 越带，换深金墨 5.21:1（三选一价签恒空串隐藏零波及） price_l.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER price_l.visible = price != "" box.add_child(price_l) diff --git a/game/smoke/ui_contrast_probe.gd b/game/smoke/ui_contrast_probe.gd index b13291d4..07b98716 100644 --- a/game/smoke/ui_contrast_probe.gd +++ b/game/smoke/ui_contrast_probe.gd @@ -34,24 +34,25 @@ func _pairs() -> Array: ["生涯页·组帽墨/暖亮页底", UiKit.INK_L_GOLD, UiKit.BG_BRIGHT, 1.0],# 迭代18卡④——生涯页分组小节头（金亮 bold） # ---- 迭代19卡②旧界面呈现断言回补批（2026-10-08）——旧屏文字位追溯收测；石皮纹面板 # （panel_skinned）缺素材回退牌色 PANEL_DATA，机检按回退牌色计（素材不入 git 冒烟安全惯例）。 - # 存量违例对首跑红=登记呈报不修（处置权归用户——本批红线）。 + # 存量违例对首跑红=登记呈报不修（处置权归用户）→ 2026-10-08 尾裁微批a 用户裁甲另立修复批 + # 回绿：7 对随代码侧换墨同步改指新常量（比率见各行尾注）。 ["结算·判定墨/结算板", UiKit.INK_TITLE, UiKit.PANEL_DATA, 1.0], # 迭代19卡②——battle_end 判定行（INK_TITLE 亮底标题墨） - ["结算·GP账行墨/结算板", UiKit.GOLD_DEEP, UiKit.PANEL_DATA, 1.0], # 迭代19卡②——battle_end 战利品 GP 行名/值（深金 bold） + ["结算·GP账行墨/结算板", UiKit.GOLD_INK, UiKit.PANEL_DATA, 1.0], # 迭代19卡②——battle_end 战利品 GP 行名/值（尾裁微批a 换深金墨 5.21:1；原 GOLD_DEEP 2.67 越带） ["结算·账行墨/结算板", UiKit.INK_LABEL, UiKit.PANEL_DATA, 1.0], # 迭代19卡②——battle_end 钥石/加成账行（标签深墨） - ["商店·行卡名墨/暗底行卡", UiKit.INK_LABEL, UiKit.BG_OVERLAY, 1.0], # 迭代19卡②——legacy 行卡商品名（label 工厂 bold 缺省墨压暗底行卡） + ["商店·行卡名墨/暗底行卡", UiKit.WARM_SOFT, UiKit.BG_OVERLAY, 1.0], # 迭代19卡②——legacy 行卡商品名（尾裁微批a 显式传暖白次级 9.53:1；原 bold 缺省 INK_LABEL 1.12 越带） ["商店·行卡现价墨/暗底行卡", UiKit.WARM_SOFT, UiKit.BG_OVERLAY, 1.0],# 迭代19卡②——legacy 行卡「现价 N 金币」 ["商店·行卡已购墨/暗底行卡", UiKit.WARM_FAINT, UiKit.BG_OVERLAY, 1.0],# 迭代19卡②——legacy 行卡「已购 N 档」 ["商店·爬价规则墨/暖亮页底", UiKit.WARM_SOFT, UiKit.BG_BRIGHT, 1.0],# 迭代19卡②——货架面爬价规则行（page_shell 亮底） ["商店·货架卡名墨/货架板", UiKit.INK_TITLE, UiKit.PANEL_DATA, 1.0], # 迭代19卡②——bcard 货架卡商品名（iter16 换 TG 带后未机检位） - ["商店·货架价签墨/货架板", UiKit.GOLD, UiKit.PANEL_DATA, 1.0], # 迭代19卡②——bcard 价签「N ◈」（奖励金亮墨压亮牌） + ["商店·货架价签墨/货架板", UiKit.GOLD_INK, UiKit.PANEL_DATA, 1.0], # 迭代19卡②——bcard 价签「N ◈」（尾裁微批a 换深金墨 5.21:1；原 GOLD 1.46 越带） ["营地·等级章字/头带深棕", UiKit.INK_ON_DEEP, UiKit.CAMP_HEADER_BAND, 1.0],# 迭代19卡②——锻造行 Lv 章（木底小章亮墨） ["营地·柜台头带字/头带深棕", UiKit.WARM, UiKit.CAMP_HEADER_BAND, 1.0], # 迭代19卡②——三柜台头带标题（暖白 bold） - ["营地·铭牌副题墨/铭牌板", UiKit.STONE, UiKit.PANEL_DATA, 1.0], # 迭代19卡②——营地铭牌副题「跨局成长账本…」 + ["营地·铭牌副题墨/铭牌板", UiKit.STONE_DEEP, UiKit.PANEL_DATA, 1.0],# 迭代19卡②——营地铭牌副题「跨局成长账本…」（尾裁微批a 换灰石深化 5.98:1；原 STONE 3.59 越带） ["营地·行名墨/行板", UiKit.INK, UiKit.CAMP_ROW_PLATE, 1.0], # 迭代19卡②——锻造/工坊行名（墨族压暖米行板） - ["营地·行价格墨/行板", UiKit.STONE, UiKit.CAMP_ROW_PLATE, 1.0], # 迭代19卡②——锻造行「N 钥石」价签/工坊进度行（灰石） - ["营地·树分组头墨/柜台板", UiKit.GOLD_DEEP, UiKit.PANEL_DATA, 1.0],# 迭代19卡②——天赋树脉分组头「·锻造脉·」（深金） + ["营地·行价格墨/行板", UiKit.STONE_DEEP, UiKit.CAMP_ROW_PLATE, 1.0],# 迭代19卡②——锻造行「N 钥石」价签/工坊进度行（尾裁微批a 换灰石深化 6.70:1；原 STONE 4.02 越带） + ["营地·树分组头墨/柜台板", UiKit.GOLD_INK, UiKit.PANEL_DATA, 1.0],# 迭代19卡②——天赋树脉分组头「·锻造脉·」（尾裁微批a 换深金墨 5.21:1；原 GOLD_DEEP 2.67 越带） ["营地·树行名墨/柜台板", UiKit.INK_LABEL, UiKit.PANEL_DATA, 1.0], # 迭代19卡②——天赋树行「名 Lv0/1」（标签深墨） - ["营地·工坊状态墨/行板", UiKit.GOLD_DEEP, UiKit.CAMP_ROW_PLATE, 1.0],# 迭代19卡②——工坊状态字「已解锁」（深金·最不利现役态） + ["营地·工坊状态墨/行板", UiKit.GOLD_INK, UiKit.CAMP_ROW_PLATE, 1.0],# 迭代19卡②——工坊状态字「已解锁」（尾裁微批a 换深金墨 5.84:1；原 GOLD_DEEP 3.00 越带·最不利现役态） ["营地·最近冒险墨/暖亮底", UiKit.WARM_SOFT, UiKit.BG_BRIGHT, 1.0], # 迭代19卡②——底栏最近冒险条带（暖白次级） ["设置·警示文/设置板", UiKit.INK_HINT, UiKit.PANEL_DATA, 1.0], # 迭代19卡②——设置警示文/后果说明（暖棕提示墨） ["设置·选项标签/设置板", UiKit.INK_LABEL, UiKit.PANEL_DATA, 1.0], # 迭代19卡②——设置行标签/状态字（标签深墨）