From e959b1df06f29fe6542cc6cbe2f9005f620d5dc9 Mon Sep 17 00:00:00 2001 From: "Somhairle H. Marisol" Date: Tue, 29 Sep 2026 11:18:01 +0800 Subject: p75: HUD 顶部条去整宽深色带（改紧凑半透明药丸） MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit HudLayout：BarTop/BarBottom alpha=0，新增 pillHairline 1px 发丝线与 pillHeight；DrawHudBar 不再铺整条底色与整宽 accent，改画每段半透明药丸+发丝线，图标+数值并排、右侧留白充足。布局/语义/快捷键不变，HUD 结构仅视觉层次。新增 P75HudStripTests（4 例）；LV_P43_SHOT 同机位昼/夜证据 + analyze-p75（顶部条近黑 2.6% vs 整宽带 100%、无实心黑块、亮字仍在，verdict=PASS）。Desktop 354/354、Kernel 120/120、digest 与 p70 一致。 --- src/LivingVillage.Desktop/Game.fs | 8 +++----- src/LivingVillage.Desktop/HudLayout.fs | 25 ++++++++++++++++++------- 2 files changed, 21 insertions(+), 12 deletions(-) (limited to 'src/LivingVillage.Desktop') diff --git a/src/LivingVillage.Desktop/Game.fs b/src/LivingVillage.Desktop/Game.fs index a4f994b..c6408aa 100644 --- a/src/LivingVillage.Desktop/Game.fs +++ b/src/LivingVillage.Desktop/Game.fs @@ -3405,17 +3405,14 @@ type LivingVillageGame() as this = /// 顶部窄信息条：时段/时间/倍速/体力/钱币，半透明渐变 + 强调线，绝非大黑块。 member private this.DrawHudBar() = - let viewport = this.GraphicsDevice.Viewport let profile = M6Presentation.profileAtTick world.Tick let palette = HudLayout.palette profile.Mode let placed = HudLayout.layout (HudLayout.segments world simulationControl) let barHeight = HudLayout.barHeight let textY = (barHeight - 8 * HudLayout.textScale) / 2 spriteBatch.Begin() - // 竖向渐变：上半略亮、下半压暗，避免整条纯色。 - spriteBatch.Draw(pixel, Rectangle(0, 0, viewport.Width, barHeight / 2), palette.BarTop) - spriteBatch.Draw(pixel, Rectangle(0, barHeight / 2, viewport.Width, barHeight - barHeight / 2), palette.BarBottom) - spriteBatch.Draw(pixel, Rectangle(0, barHeight, viewport.Width, HudLayout.accentHeight), palette.Accent) + // P75：去掉整宽深色渐变带（palette 的 BarTop/BarBottom alpha=0），信息只靠各段的 + // 半透明药丸承载——紧凑的图标+数值并排、留白充足，HUD 区域黑块面积大幅下降。 // 图标用 pixel 贴图按 7x7 点阵绘制（无外部素材），先描边后填充，保证昼夜可读。 let drawIcon (iconX: int) (iconY: int) (color: Color) (icon: HudLayout.HudIcon) = HudLayout.iconRows icon @@ -3434,6 +3431,7 @@ type LivingVillageGame() as this = let iconY = (barHeight - HudLayout.iconHeight) / 2 for (x, width, segment) in placed do spriteBatch.Draw(pixel, HudLayout.segmentBackdrop x width, palette.SegmentBackdrop) + spriteBatch.Draw(pixel, HudLayout.pillHairline x width, palette.Accent) let textX = HudLayout.textOrigin x let labelAdvanced = FloatingPrompt.measureWidth (segment.Label + " ") HudLayout.textScale let isEnergy = segment.Icon = HudLayout.EnergyIcon diff --git a/src/LivingVillage.Desktop/HudLayout.fs b/src/LivingVillage.Desktop/HudLayout.fs index b19df4b..cd06224 100644 --- a/src/LivingVillage.Desktop/HudLayout.fs +++ b/src/LivingVillage.Desktop/HudLayout.fs @@ -122,6 +122,17 @@ module HudLayout = let y = (barHeight - height) / 2 Microsoft.Xna.Framework.Rectangle(x - 6, y, width + 12, height) + /// P75：药丸底部 1px 强调发丝线（取代整条铺满的 accent 带，让留白更足）。 + let pillHairline (x: int) (width: int) : Microsoft.Xna.Framework.Rectangle = + let pill = segmentBackdrop x width + Microsoft.Xna.Framework.Rectangle(pill.X + 1, pill.Y + pill.Height - 2, max 1 (pill.Width - 2), 1) + + /// P75：顶部不再铺整宽深色带（0 = 仅靠半透明药丸承载信息，去掉「整块深色底」）。 + let bandAlpha : byte = 0uy + + /// P75：药丸高度的紧凑上界（须 < barHeight 以留出上下留白）。 + let pillHeight : int = 8 * textScale + 10 + type Palette = { BarTop: Color BarBottom: Color @@ -131,25 +142,25 @@ module HudLayout = SegmentBackdrop: Color Outline: Color } - /// 白天暖色 / 夜晚（冬夜）冷色微调；均为半透明渐变窄条，无大黑块。 - /// 每个常驻片段再叠一层半透明底色 + 1px 深色描边，双时段都能读清。 + /// 白天暖色 / 夜晚（冬夜）冷色微调；半透明药丸承载信息，无整宽深色带、无大黑块。 + /// P75 起 `BarTop/BarBottom` 保留字段但 alpha=0（不再铺整条底色）。 let palette (mode: M6DayNight) : Palette = match mode with | Day -> - { BarTop = Color(40, 56, 62, 200) - BarBottom = Color(22, 34, 40, 200) + { BarTop = Color(40, 56, 62, 0) + BarBottom = Color(22, 34, 40, 0) Accent = Color(212, 168, 96) Label = Color(206, 220, 208) Value = Color(242, 248, 234) SegmentBackdrop = Color(8, 14, 20, 150) Outline = Color(6, 10, 14, 255) } | Night -> - { BarTop = Color(22, 30, 48, 205) - BarBottom = Color(13, 19, 33, 205) + { BarTop = Color(22, 30, 48, 0) + BarBottom = Color(13, 19, 33, 0) Accent = Color(120, 168, 196) Label = Color(176, 196, 214) Value = Color(228, 238, 246) - SegmentBackdrop = Color(4, 8, 16, 160) + SegmentBackdrop = Color(4, 8, 16, 170) Outline = Color(3, 6, 12, 255) } // ---- P43：右上日历钟卡（纯模型；季节/天数/时段/时钟全部由真实 tick 导出）---- -- cgit v1.2.3