iter16ui T5：P4乙panel切片8→16（PANEL_SLICE单点，button 8/仪式框12维持）+Q1丙panel_skinned工厂content margin clamp（低于切片自动抬平，9消费面7处受益调用点零改）+P5甲圆角收敛RADIUS_OBJECT=5单点（26处2/3/4/5/6/8档归一；例外17底座/200金印/100脉冲环保留）+bcard选中底字面量退役归PANEL_DATA+art-bible §7.1圆角单点与九宫格切片两条注记双侧落文；轻闸冒烟782/0+probe_gate --click全绿（click done=true 问题=0）
This commit is contained in:
DKChan committed
1 parent
b26e3fb064
commit
2f74da830b
8 files changed
+42
-31
No files matched your search
@@ -739,10 +739,10 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void:
|
||||
tile = _floor_tile_for(c) if revealed else _wall_tile_for(c)
|
||||
else:
|
||||
# 素材整批缺位回退 = 现行程序化平色路径（fresh checkout 冒烟不炸——任务书 §2.2）
|
||||
sb = UiKit.panel_flat(bg, bg.darkened(0.15), 3)
|
||||
sb = UiKit.panel_flat(bg, bg.darkened(0.15),UiKit.RADIUS_OBJECT)
|
||||
if is_hero:
|
||||
if sb == null:
|
||||
sb = UiKit.panel_flat(Color.TRANSPARENT, Color.TRANSPARENT, 3, 0)
|
||||
sb = UiKit.panel_flat(Color.TRANSPARENT, Color.TRANSPARENT,UiKit.RADIUS_OBJECT, 0)
|
||||
sb.set_border_width_all(3)
|
||||
sb.border_color = COL_HERO
|
||||
if glyph == "" and _hero_tex_idle == null:
|
||||
|
||||
@@ -67,7 +67,7 @@ func _init() -> void:
|
||||
col.add_child(top)
|
||||
var plaque := PanelContainer.new()
|
||||
plaque.add_theme_stylebox_override("panel",
|
||||
UiKit.panel_flat(UiKit.PANEL_DATA, UiKit.PANEL_BORDER, 2, 1, Vector4(14, 8, 14, 8)))
|
||||
UiKit.panel_flat(UiKit.PANEL_DATA, UiKit.PANEL_BORDER,UiKit.RADIUS_OBJECT, 1, Vector4(14, 8, 14, 8)))
|
||||
top.add_child(plaque)
|
||||
var plaque_col := VBoxContainer.new()
|
||||
plaque.add_child(plaque_col)
|
||||
@@ -82,7 +82,7 @@ func _init() -> void:
|
||||
# M3（UI 落码批 2026-10-04）：钥石徽章烛光黄底+深墨字（demo ②——旧暗底 CAMP_BADGE_PANEL 退役；
|
||||
# BADGE_PANEL_COL 常量保留他用不动）
|
||||
badge.add_theme_stylebox_override("panel",
|
||||
UiKit.panel_flat(UiKit.CANDLE, UiKit.CAMP_HEADER_BAND, 2, 1, Vector4(14, 8, 14, 8)))
|
||||
UiKit.panel_flat(UiKit.CANDLE, UiKit.CAMP_HEADER_BAND,UiKit.RADIUS_OBJECT, 1, Vector4(14, 8, 14, 8)))
|
||||
top.add_child(badge)
|
||||
var bal_row := HBoxContainer.new()
|
||||
bal_row.add_theme_constant_override("separation", 6)
|
||||
@@ -151,12 +151,12 @@ func _counter_panel(title_text: String, icon_path: String, holder: Control, min_
|
||||
var panel := PanelContainer.new()
|
||||
panel.custom_minimum_size = Vector2(min_w, 0)
|
||||
panel.add_theme_stylebox_override("panel",
|
||||
UiKit.panel_flat(UiKit.PANEL_DATA, UiKit.PANEL_BORDER, 3, 1, Vector4(10, 10, 10, 10)))
|
||||
UiKit.panel_flat(UiKit.PANEL_DATA, UiKit.PANEL_BORDER,UiKit.RADIUS_OBJECT, 1, Vector4(10, 10, 10, 10)))
|
||||
var vbox := VBoxContainer.new()
|
||||
vbox.add_theme_constant_override("separation", 8)
|
||||
panel.add_child(vbox)
|
||||
var band := PanelContainer.new()
|
||||
band.add_theme_stylebox_override("panel", UiKit.panel_flat(HEADER_BAND_COL, UiKit.PANEL_BORDER, 2, 1, Vector4(10, 5, 10, 5)))
|
||||
band.add_theme_stylebox_override("panel", UiKit.panel_flat(HEADER_BAND_COL, UiKit.PANEL_BORDER,UiKit.RADIUS_OBJECT, 1, Vector4(10, 5, 10, 5)))
|
||||
vbox.add_child(band)
|
||||
var head := HBoxContainer.new()
|
||||
head.add_theme_constant_override("separation", 6)
|
||||
@@ -307,7 +307,7 @@ func _rebuild_forge(data: Dictionary) -> void:
|
||||
|
||||
func _build_forge_row(holder: VBoxContainer, row: Dictionary) -> Dictionary:
|
||||
var card := PanelContainer.new()
|
||||
card.add_theme_stylebox_override("panel", UiKit.panel_flat(ROW_PLATE_COL, UiKit.PANEL_BORDER, 2, 1, Vector4(10, 4, 10, 4)))
|
||||
card.add_theme_stylebox_override("panel", UiKit.panel_flat(ROW_PLATE_COL, UiKit.PANEL_BORDER,UiKit.RADIUS_OBJECT, 1, Vector4(10, 4, 10, 4)))
|
||||
var line := HBoxContainer.new()
|
||||
line.add_theme_constant_override("separation", 12)
|
||||
card.add_child(line)
|
||||
@@ -332,7 +332,7 @@ func _build_forge_row(holder: VBoxContainer, row: Dictionary) -> Dictionary:
|
||||
line.add_child(name_l)
|
||||
var level_l := UiKit.label("", 13, true, UiKit.INK_ON_DEEP)
|
||||
# M3：Lv 章化（木底小章——demo lvtag；Label normal 槽挂样式盒）
|
||||
level_l.add_theme_stylebox_override("normal", UiKit.panel_flat(UiKit.CAMP_HEADER_BAND, Color(0, 0, 0, 0), 2, 0, Vector4(6, 0, 6, 0)))
|
||||
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("", 14, false, UiKit.STONE)
|
||||
@@ -351,7 +351,7 @@ func _rebuild_workshop(data: Dictionary) -> void:
|
||||
child.queue_free()
|
||||
for row in data.get("workshop", []):
|
||||
var card := PanelContainer.new()
|
||||
card.add_theme_stylebox_override("panel", UiKit.panel_flat(ROW_PLATE_COL, UiKit.PANEL_BORDER, 2, 1, Vector4(10, 4, 10, 4)))
|
||||
card.add_theme_stylebox_override("panel", UiKit.panel_flat(ROW_PLATE_COL, UiKit.PANEL_BORDER,UiKit.RADIUS_OBJECT, 1, Vector4(10, 4, 10, 4)))
|
||||
var line := HBoxContainer.new()
|
||||
line.add_theme_constant_override("separation", 12)
|
||||
card.add_child(line)
|
||||
|
||||
@@ -127,7 +127,7 @@ func play_round_banner(ri: int) -> void:
|
||||
_fx_banners += 1
|
||||
var banner := Panel.new()
|
||||
banner.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||
banner.add_theme_stylebox_override("panel", UiKit.panel_flat(Color(UiKit.BG_OVERLAY, 0.88), UiKit.GOLD_DEEP, 8, 2))
|
||||
banner.add_theme_stylebox_override("panel", UiKit.panel_flat(Color(UiKit.BG_OVERLAY, 0.88), UiKit.GOLD_DEEP,UiKit.RADIUS_OBJECT, 2))
|
||||
var lab := UiKit.label("第 %d 轮" % ri, 22, true, UiKit.GOLD)
|
||||
lab.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT)
|
||||
lab.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
|
||||
@@ -156,7 +156,7 @@ func play_board_variant_banner(text: String) -> void:
|
||||
_fx_banners += 1
|
||||
var banner := Panel.new()
|
||||
banner.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||
banner.add_theme_stylebox_override("panel", UiKit.panel_flat(Color(UiKit.BG_OVERLAY, 0.88), UiKit.GOLD_DEEP, 8, 2))
|
||||
banner.add_theme_stylebox_override("panel", UiKit.panel_flat(Color(UiKit.BG_OVERLAY, 0.88), UiKit.GOLD_DEEP,UiKit.RADIUS_OBJECT, 2))
|
||||
var lab := UiKit.label(text, 22, true, UiKit.GOLD)
|
||||
lab.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT)
|
||||
lab.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
|
||||
|
||||
@@ -52,7 +52,7 @@ func _init() -> void:
|
||||
_refresh_btn.add_child(stock_badge)
|
||||
var gp_chip := PanelContainer.new()
|
||||
gp_chip.add_theme_stylebox_override("panel",
|
||||
UiKit.panel_flat(UiKit.CANDLE, UiKit.CAMP_HEADER_BAND, 2, 1, Vector4(12, 4, 12, 4)))
|
||||
UiKit.panel_flat(UiKit.CANDLE, UiKit.CAMP_HEADER_BAND,UiKit.RADIUS_OBJECT, 1, Vector4(12, 4, 12, 4)))
|
||||
top.add_child(gp_chip)
|
||||
_gp_label = UiKit.label("金币 0", 16, true, UiKit.INK_ON_GOLD)
|
||||
gp_chip.add_child(_gp_label)
|
||||
@@ -94,7 +94,7 @@ func refresh_state(products: Array, gp: int) -> void:
|
||||
# 商品卡（显示名 + 档位文案 | 现价 | 已购档数 | 购买按钮）
|
||||
func _build_card(p: Dictionary) -> Dictionary:
|
||||
var card := PanelContainer.new()
|
||||
card.add_theme_stylebox_override("panel", UiKit.panel_flat(UiKit.BG_OVERLAY, UiKit.GOLD_DIM, 4, 1, Vector4(12, 6, 12, 6)))
|
||||
card.add_theme_stylebox_override("panel", UiKit.panel_flat(UiKit.BG_OVERLAY, UiKit.GOLD_DIM,UiKit.RADIUS_OBJECT, 1, Vector4(12, 6, 12, 6)))
|
||||
var row := HBoxContainer.new()
|
||||
row.add_theme_constant_override("separation", 14)
|
||||
card.add_child(row)
|
||||
|
||||
@@ -62,7 +62,7 @@ func _init() -> void:
|
||||
_tip.z_index = 10
|
||||
_tip.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||
_tip.visible = false
|
||||
var sb := UiKit.panel_flat(UiKit.TIP_BG, UiKit.GOLD, 2, 1, Vector4(6, 3, 6, 3))
|
||||
var sb := UiKit.panel_flat(UiKit.TIP_BG, UiKit.GOLD,UiKit.RADIUS_OBJECT, 1, Vector4(6, 3, 6, 3))
|
||||
_tip.add_theme_stylebox_override("panel", sb)
|
||||
_tip_label = UiKit.label("", 13, false, UiKit.WARM)
|
||||
_tip_label.autowrap_mode = TextServer.AUTOWRAP_WORD_SMART
|
||||
@@ -107,7 +107,7 @@ func _make_slot() -> PanelContainer:
|
||||
# 槽底不透明（2026-09-26 用户反馈：图标显示不清晰——半透明底叠 B 区米色面板吃掉白图标对比度；
|
||||
# 改深墨棕实底 = 白色纹样图标对比承载，槽界同时可辨）
|
||||
slot.add_theme_stylebox_override("panel",
|
||||
UiKit.panel_flat(UiKit.SLOT_BACKDROP, UiKit.PANEL_BORDER, 2, 1, Vector4(2, 1, 2, 1)))
|
||||
UiKit.panel_flat(UiKit.SLOT_BACKDROP, UiKit.PANEL_BORDER,UiKit.RADIUS_OBJECT, 1, Vector4(2, 1, 2, 1)))
|
||||
else:
|
||||
slot.custom_minimum_size = Vector2(50, 46)
|
||||
slot.add_theme_stylebox_override("panel", UiKit.panel_flat(UiKit.PANEL_DATA, UiKit.PANEL_BORDER))
|
||||
|
||||
@@ -35,7 +35,7 @@ func show_toast(text: String, tone: String = "info") -> void:
|
||||
row.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||
row.clip_contents = true # 缺陷①约束：固定槽高裁剪，不回流布局
|
||||
row.custom_minimum_size = Vector2(0, 24)
|
||||
var sb := UiKit.panel_flat(UiKit.TOAST_BG, COL_INFO, 2, 1, Vector4(8, 2, 8, 2))
|
||||
var sb := UiKit.panel_flat(UiKit.TOAST_BG, COL_INFO,UiKit.RADIUS_OBJECT, 1, Vector4(8, 2, 8, 2))
|
||||
var col := COL_INFO
|
||||
if tone == "warn":
|
||||
col = COL_WARN
|
||||
|
||||
@@ -228,6 +228,11 @@ static func load_font(path: String) -> Font:
|
||||
|
||||
# ── StyleBox 工厂 ──
|
||||
# margin = (左, 上, 右, 下)；border_w = 0 即无边框（根底/遮罩用）
|
||||
# 圆角率单点（UI 设计对齐批 P5 甲 2026-10-06——容器/按钮全站唯一圆角值；数据框/数字牌/AP 点阵/准线/血条
|
||||
# =0 直角不变；底座椭圆 17/结算金印 200/状态脉冲环 100 圆形 = §7.1 明示例外保留。取值=代拍板 5，可推翻）
|
||||
const RADIUS_OBJECT := 5
|
||||
# 九宫格切片（P4 乙 2026-10-06——panel 石皮 8→16 与 demo .plate9 slice16 对齐；button 维持 8、仪式框维持 12）
|
||||
const PANEL_SLICE := 16.0
|
||||
static func panel_flat(bg: Color, border: Color, corner: int = 0, border_w: int = 1, margin: Vector4 = Vector4.ZERO) -> StyleBoxFlat:
|
||||
var sb := StyleBoxFlat.new()
|
||||
sb.bg_color = bg
|
||||
@@ -320,15 +325,19 @@ static func _tex_sb(tex: Texture2D, margin: float, tint := Color.WHITE) -> Style
|
||||
|
||||
|
||||
# 石板亮面板(B 区舞台/C 区主面板/图例——容器穿戏服;数据框仍 panel_flat 素面 §7.1)
|
||||
# Q1 丙（2026-10-06）：content margin 低于切片的分量自动抬到切片——切片加大到 16 后石框纹理不吃内容
|
||||
# （T0 实查 9 消费面 7 处 margin<16；工厂单点 clamp，调用点零改）
|
||||
static func panel_skinned(margin: Vector4 = Vector4.ZERO, tint := Color.WHITE) -> StyleBox:
|
||||
var m := Vector4(maxf(margin.x, PANEL_SLICE), maxf(margin.y, PANEL_SLICE),
|
||||
maxf(margin.z, PANEL_SLICE), maxf(margin.w, PANEL_SLICE))
|
||||
var tex := load_tex(TEX_PANEL_STONE)
|
||||
if tex == null:
|
||||
return panel_flat(PANEL_DATA, PANEL_BORDER, 4, 1, margin)
|
||||
var sb := _tex_sb(tex, 8.0, tint)
|
||||
sb.content_margin_left = margin.x
|
||||
sb.content_margin_top = margin.y
|
||||
sb.content_margin_right = margin.z
|
||||
sb.content_margin_bottom = margin.w
|
||||
return panel_flat(PANEL_DATA, PANEL_BORDER, RADIUS_OBJECT, 1, m)
|
||||
var sb := _tex_sb(tex, PANEL_SLICE, tint)
|
||||
sb.content_margin_left = m.x
|
||||
sb.content_margin_top = m.y
|
||||
sb.content_margin_right = m.z
|
||||
sb.content_margin_bottom = m.w
|
||||
return sb
|
||||
|
||||
|
||||
@@ -336,7 +345,7 @@ static func panel_skinned(margin: Vector4 = Vector4.ZERO, tint := Color.WHITE) -
|
||||
static func frame_skinned(margin: Vector4 = Vector4.ZERO) -> StyleBox:
|
||||
var tex := load_tex(TEX_BORDER_STONE)
|
||||
if tex == null:
|
||||
return panel_flat(BG_OVERLAY, PANEL_BORDER, 6, 1, margin)
|
||||
return panel_flat(BG_OVERLAY, PANEL_BORDER,RADIUS_OBJECT, 1, margin)
|
||||
var sb := _tex_sb(tex, 12.0)
|
||||
sb.content_margin_left = margin.x
|
||||
sb.content_margin_top = margin.y
|
||||
@@ -396,10 +405,10 @@ static func verb_button(text: String, icon_path: String, tip := "") -> Button:
|
||||
# 主操作钮（烛光黄平涂+木描边——非奖励金；配色总纲「主按钮禁亮金」；缺 panel_stone 依赖=纯色可靠）
|
||||
static func primary_button(text: String, tip := "") -> Button:
|
||||
var b := button(text)
|
||||
var sb := panel_flat(CANDLE, Color8(110, 69, 52), 5, 2, Vector4(10, 2, 10, 2))
|
||||
var sb := panel_flat(CANDLE, Color8(110, 69, 52),RADIUS_OBJECT, 2, Vector4(10, 2, 10, 2))
|
||||
b.add_theme_stylebox_override("normal", sb)
|
||||
b.add_theme_stylebox_override("hover", panel_flat(CANDLE.lightened(0.06), Color8(110, 69, 52), 5, 2, Vector4(10, 2, 10, 2)))
|
||||
b.add_theme_stylebox_override("pressed", panel_flat(Color8(214, 172, 88), Color8(110, 69, 52), 5, 2, Vector4(10, 2, 10, 2)))
|
||||
b.add_theme_stylebox_override("hover", panel_flat(CANDLE.lightened(0.06), Color8(110, 69, 52),RADIUS_OBJECT, 2, Vector4(10, 2, 10, 2)))
|
||||
b.add_theme_stylebox_override("pressed", panel_flat(Color8(214, 172, 88), Color8(110, 69, 52),RADIUS_OBJECT, 2, Vector4(10, 2, 10, 2)))
|
||||
b.add_theme_color_override("font_color", Color8(58, 42, 8))
|
||||
b.add_theme_color_override("font_hover_color", Color8(58, 42, 8))
|
||||
b.add_theme_color_override("font_pressed_color", Color8(58, 42, 8))
|
||||
@@ -412,9 +421,9 @@ static func primary_button(text: String, tip := "") -> Button:
|
||||
# 危险钮（深红平涂——放弃/删除类；破坏性确认位置纪律=不得与常规确认同位）
|
||||
static func danger_button(text: String, tip := "") -> Button:
|
||||
var b := button(text)
|
||||
var sb := panel_flat(Color8(180, 78, 54), Color8(110, 42, 28), 5, 2, Vector4(10, 2, 10, 2))
|
||||
var sb := panel_flat(Color8(180, 78, 54), Color8(110, 42, 28),RADIUS_OBJECT, 2, Vector4(10, 2, 10, 2))
|
||||
b.add_theme_stylebox_override("normal", sb)
|
||||
b.add_theme_stylebox_override("hover", panel_flat(Color8(196, 90, 62), Color8(110, 42, 28), 5, 2, Vector4(10, 2, 10, 2)))
|
||||
b.add_theme_stylebox_override("hover", panel_flat(Color8(196, 90, 62), Color8(110, 42, 28),RADIUS_OBJECT, 2, Vector4(10, 2, 10, 2)))
|
||||
b.add_theme_color_override("font_color", Color8(255, 244, 224))
|
||||
b.add_theme_color_override("font_hover_color", Color8(255, 244, 224))
|
||||
b.add_theme_color_override("font_pressed_color", Color8(255, 244, 224))
|
||||
@@ -439,8 +448,8 @@ class BCard:
|
||||
|
||||
func _init(title: String, desc: String, band: Color, icon_path: String, price := "", footnote := "") -> void:
|
||||
var tex := UiKit.load_tex(UiKit.TEX_PANEL_STONE)
|
||||
_sb_normal = UiKit.panel_skinned(Vector4(12, 10, 12, 10)) if tex != null else UiKit.panel_flat(PANEL_DATA, PANEL_BORDER, 5, 1, Vector4(12, 10, 12, 10)) # 回退=数据板单点（P7 乙后同值，字面量退役）
|
||||
_sb_sel = UiKit.panel_flat(Color8(233, 217, 184), Color8(138, 90, 52), 5, 2, Vector4(12, 10, 12, 10))
|
||||
_sb_normal = UiKit.panel_skinned(Vector4(12, 10, 12, 10)) if tex != null else UiKit.panel_flat(PANEL_DATA, PANEL_BORDER,RADIUS_OBJECT, 1, Vector4(12, 10, 12, 10)) # 回退=数据板单点（P7 乙后同值，字面量退役）
|
||||
_sb_sel = UiKit.panel_flat(PANEL_DATA, Color8(138, 90, 52), RADIUS_OBJECT, 2, Vector4(12, 10, 12, 10)) # 选中底=数据板单点（P7 乙后同值）
|
||||
add_theme_stylebox_override("panel", _sb_normal)
|
||||
custom_minimum_size = Vector2(216, 300)
|
||||
var box := VBoxContainer.new()
|
||||
@@ -506,7 +515,7 @@ class SwitchToggle:
|
||||
toggle_mode = true
|
||||
button_pressed = initial
|
||||
custom_minimum_size = Vector2(46, 22)
|
||||
var track := UiKit.panel_flat(Color8(184, 165, 130), Color8(120, 110, 88), 3, 2)
|
||||
var track := UiKit.panel_flat(Color8(184, 165, 130), Color8(120, 110, 88),RADIUS_OBJECT, 2)
|
||||
add_theme_stylebox_override("normal", track)
|
||||
add_theme_stylebox_override("hover", track)
|
||||
add_theme_stylebox_override("pressed", track)
|
||||
|
||||
Reference in new issue
Block a user