iter41-卡2：呈现层结构收敛批：67清＋2豁免＋2展平改善——拆私有族＋六状态件＋ui_kit收敛＋束收拢＋print删；含u14补做、并master并案与收尾产出物
This commit is contained in:
DKChan committed
1 parent
bc75dab615
commit
7beb9bfdd5
94 files changed
+3417
-5314
No files matched your search
@@ -182,7 +182,7 @@ func set_treasure_overlays(reveal_cells: Array, preview_cells: Array) -> void:
|
||||
func set_world_font(f: Font) -> void:
|
||||
_world.board_font = f
|
||||
for c in _cells:
|
||||
_cells[c].font = f
|
||||
_cells[c].st.font = f
|
||||
_cells[c].queue_redraw()
|
||||
|
||||
|
||||
@@ -201,7 +201,7 @@ func set_cell_area(avail: Vector2) -> void:
|
||||
var stride := _cell + float(SEP)
|
||||
for c in _cells:
|
||||
var u: Node2D = _cells[c]
|
||||
u.edge = _cell
|
||||
u.st.edge = _cell
|
||||
u.position = Vector2(c) * stride
|
||||
if _world.hero != null and _hero_sprite.last.x >= 0:
|
||||
_place_hero(_hero_sprite.last, _hero_sprite.last, true) # 格边长变更（窗口缩放）——英雄即时随格重置（杀位移 tween 防飞陈旧落点）
|
||||
@@ -247,17 +247,17 @@ func rebuild(board: BoardData, minesweeper: MinesweeperRules) -> void:
|
||||
for x in _board.width:
|
||||
var c := Vector2i(x, y)
|
||||
var u: Node2D = _CELL_UNIT.new()
|
||||
u.cell = c
|
||||
u.edge = _cell
|
||||
u.st.cell = c
|
||||
u.st.edge = _cell
|
||||
u.position = Vector2(c) * stride
|
||||
u.bevel = DEPTH_BEVEL # 新建格单元继承
|
||||
u.st.bevel = DEPTH_BEVEL # 新建格单元继承
|
||||
u.use_parent_material = true # 去饱和材质挂 BoardWorld——单元随世界材质灰化
|
||||
if _palette.tiles_ok:
|
||||
# NEAREST 采样（32×32 源 × 45/36px 格边非整数缩放接受档，
|
||||
# 与英雄小人 1.5× 豁免同级（圣经 §8.2）；只在瓦片
|
||||
# 模式启用——程序化回退路径渲染零扰动（含格面文字采样不回退不变化）
|
||||
u.texture_filter = CanvasItem.TEXTURE_FILTER_NEAREST
|
||||
u.font = _world.board_font
|
||||
u.st.font = _world.board_font
|
||||
_world.add_child(u)
|
||||
_cells[c] = u
|
||||
set_cell_area(size)
|
||||
@@ -509,21 +509,21 @@ func _apply_hover_visuals(c: Vector2i) -> void:
|
||||
var seal: bool = _minesweeper.has_seal(c)
|
||||
var adjacent: bool = _diggable.has(c)
|
||||
if revealed:
|
||||
u.hl_visible = true
|
||||
u.hl_color = COL_HL_TARGET # 移动目标格边框（金）
|
||||
u.st.hl_visible = true
|
||||
u.st.hl_color = COL_HL_TARGET # 移动目标格边框（金）
|
||||
_set_cursor_shape(c, CURSOR_MOVE_SEM)
|
||||
_show_path_preview(c)
|
||||
elif adjacent:
|
||||
u.hl_visible = true
|
||||
u.hl_color = COL_HL_TARGET # 挖掘目标格边框（相邻封印格同此——左键直接挖）
|
||||
u.st.hl_visible = true
|
||||
u.st.hl_color = COL_HL_TARGET # 挖掘目标格边框（相邻封印格同此——左键直接挖）
|
||||
_set_cursor_shape(c, CURSOR_DIG)
|
||||
elif seal:
|
||||
u.hl_visible = true
|
||||
u.hl_color = COL_SEAL # 已承诺封印标记（封印黑；无交互可供）
|
||||
u.st.hl_visible = true
|
||||
u.st.hl_color = COL_SEAL # 已承诺封印标记（封印黑；无交互可供）
|
||||
_set_cursor_shape(c, Input.CURSOR_FORBIDDEN)
|
||||
else:
|
||||
u.hl_visible = true
|
||||
u.hl_color = UiKit.RED_FORBID # 不可及域灰禁框（禁止光标+首遇 toast 双通道）
|
||||
u.st.hl_visible = true
|
||||
u.st.hl_color = UiKit.RED_FORBID # 不可及域灰禁框（禁止光标+首遇 toast 双通道）
|
||||
_set_cursor_shape(c, Input.CURSOR_FORBIDDEN)
|
||||
hover_forbidden.emit(c)
|
||||
|
||||
@@ -531,7 +531,7 @@ func _apply_hover_visuals(c: Vector2i) -> void:
|
||||
func _clear_hover_visuals(c: Vector2i) -> void:
|
||||
if not _cells.has(c):
|
||||
return
|
||||
_cells[c].hl_visible = false
|
||||
_cells[c].st.hl_visible = false
|
||||
_hide_path_preview()
|
||||
|
||||
|
||||
@@ -546,12 +546,12 @@ func _show_path_preview(c: Vector2i) -> void:
|
||||
var path: Array[Variant] = _minesweeper.compute_move_path(c)
|
||||
for pc in path:
|
||||
if _cells.has(pc):
|
||||
_cells[pc].dot_visible = true
|
||||
_cells[pc].st.dot_visible = true
|
||||
|
||||
|
||||
func _hide_path_preview() -> void:
|
||||
for c in _cells:
|
||||
_cells[c].dot_visible = false
|
||||
_cells[c].st.dot_visible = false
|
||||
|
||||
|
||||
# ---- 奖励徽章（已开格身份 icon——封印之下、纹带之上、不进数字区） ----
|
||||
@@ -611,11 +611,11 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void:
|
||||
var digit_col := COL_DIGIT
|
||||
# 封印槽统一维护：封印格=封印印记纹理；其余格清 null（封印格挖开后残留在 tex_seal
|
||||
# 会让 _draw 无条件把封印印画在已开格上——tex_seal 绘制无 revealed 条件）。缺盘走字形回退。
|
||||
u.tex_seal = _palette.seal_tex if (seal and not revealed and _palette.seal_tex != null) else null
|
||||
u.st.tex_seal = _palette.seal_tex if (seal and not revealed and _palette.seal_tex != null) else null
|
||||
if removed:
|
||||
revealed = false # 移除格固定未开呈现基座（退色暗幕层承载；危险格本无数字，周边数字冻结）
|
||||
seal = false
|
||||
u.tex_seal = null
|
||||
u.st.tex_seal = null
|
||||
if revealed:
|
||||
var rec: Dictionary[Variant, Variant] = _minesweeper.reveal_record(c) # 已开记录经查询面
|
||||
if rec.get("kind", "") == "mine":
|
||||
@@ -662,8 +662,8 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void:
|
||||
# 贴图缺位回退字形「人」（项目纹理槽惯例——贴图在位=格内字形退役，单位本体由独立精灵承载）
|
||||
glyph = "人"
|
||||
digit_col = COL_HERO
|
||||
u.tex_base = tile
|
||||
u.bg_sb = sb
|
||||
u.st.tex_base = tile
|
||||
u.st.bg_sb = sb
|
||||
u.glyph = glyph
|
||||
u.glyph_color = digit_col
|
||||
# 色牌后备（数字直画退牌；「危」/「?」维持牌载保读性）+ v3.4：双峰纹理板
|
||||
@@ -673,11 +673,11 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void:
|
||||
digit_col = COL_DIGIT # 牌上深墨族（素牌 12:1——双峰纹理免疫）
|
||||
u.glyph_color = digit_col
|
||||
u.plate = revealed and (glyph == "危" or glyph == "?" or plate_digit)
|
||||
u.outline_sides.assign([]) # typed Array[int]（assign 保持引用语义）
|
||||
u.facade_south = false
|
||||
u.proj_band = 0.0
|
||||
u.tex_facade = null
|
||||
u.facade_strip = false
|
||||
u.st.outline_sides.assign([]) # typed Array[int]（assign 保持引用语义）
|
||||
u.st.facade_south = false
|
||||
u.st.proj_band = 0.0
|
||||
u.st.tex_facade = null
|
||||
u.st.facade_strip = false
|
||||
# 封印槽不在此重置：尾部重置会与此上方条件赋值构成双写踩踏（把封印纹理恒清 null=素材在位时封印不可见）；
|
||||
# 上方 else 分支已是全路径清残留，尾部重置系冗余且有害
|
||||
var south_n: Vector2i = c + Vector2i(0, 1)
|
||||
@@ -687,44 +687,44 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void:
|
||||
if not revealed:
|
||||
# 高墙感 D 投影档：南邻地面格 → 墙格南缘立「口沿高光+双段暗带」立面
|
||||
#（邻地面才画——墙-墙内界保墙群内聚）；板外=墙不画
|
||||
u.facade_south = south_in and _minesweeper.is_revealed(south_n)
|
||||
u.st.facade_south = south_in and _minesweeper.is_revealed(south_n)
|
||||
# 轮廓加强：墙格四邻中已开(地面)格朝向记描边码（板外=墙不描——保墙群外轮廓只在墙/地交界）
|
||||
for d in [Vector2i(0, -1), Vector2i(0, 1), Vector2i(-1, 0), Vector2i(1, 0)]:
|
||||
var n: Vector2i = c + d
|
||||
if n.x >= 0 and n.y >= 0 and n.x < _board.width and n.y < _board.height and _minesweeper.is_revealed(n):
|
||||
var code := 0 if d.y < 0 else (1 if d.y > 0 else (2 if d.x < 0 else 3))
|
||||
if code == 1 and u.facade_south:
|
||||
if code == 1 and u.st.facade_south:
|
||||
continue # 南缘由立面件承载（高光+双段暗带）——2px 描边让位防三重叠黑
|
||||
if code == 0 and _palette.tiles_ok:
|
||||
continue # v3.5 冻结① (b)-(c) 交界无边框：墙面直贴接墙顶（E 格墙面件在邻格承载）——北向描边不画（平色回退态保留描边）
|
||||
u.outline_sides.append(code)
|
||||
u.st.outline_sides.append(code)
|
||||
else:
|
||||
# 地面投影：北邻墙格在本已开格北缘投渐隐暗带（ITB 同款高度线索——带宽按格边比例常量）
|
||||
if north_in and not _minesweeper.is_revealed(north_n):
|
||||
u.proj_band = u.edge * WALL_PROJECTION_FRAC
|
||||
u.st.proj_band = u.st.edge * WALL_PROJECTION_FRAC
|
||||
# E 格高墙面（圣经 v3.5 冻结①——方向稿 is_facade_cell 口径）：已开格南邻未开墙 → 南部 30%
|
||||
# 承接墙面（材质=同板墙顶 center 瓦片，原亮度直贴）；仅瓦片态启用——平色回退保持原语义
|
||||
if south_in and not _minesweeper.is_revealed(south_n) and _palette.tiles_ok:
|
||||
u.facade_strip = true
|
||||
u.tex_facade = _palette.tiles.get("wall_center")
|
||||
u.st.facade_strip = true
|
||||
u.st.tex_facade = _palette.tiles.get("wall_center")
|
||||
# ②( 秘宝叠加层：真视格=红内缩框；预读格=奖励身份徽章（identity_resolver 既有
|
||||
# 只读面取字形——零数据复制，badge 位复用）；已开格标记自然退位（refresh 逐拍重算）
|
||||
if not revealed:
|
||||
u.treasure_mark = "mine_reveal" if _treasure_reveal.has(c) else ""
|
||||
u.st.treasure_mark = "mine_reveal" if _treasure_reveal.has(c) else ""
|
||||
if _treasure_preview.has(c) and glyph == "":
|
||||
var pid = _identity_cb.call(c) if _identity_cb.is_valid() else null
|
||||
if pid != null and REWARD_BADGE.has(String(pid.get("cell_type", ""))):
|
||||
glyph = String(REWARD_BADGE[String(pid.get("cell_type", ""))])
|
||||
digit_col = COL_GOLD
|
||||
u.badge_glyph = glyph
|
||||
u.st.badge_glyph = glyph
|
||||
# ②' 变异角标：未开格带伤害型变异 → 危险红角标（已开=威胁已兑现标记退位）；
|
||||
# 回调缺位 = 无标记（程序化角标，tex_mutation 纹带槽暂留）
|
||||
if not revealed and _vmark_cb.is_valid():
|
||||
u.mutation_mark = String(_vmark_cb.call(c))
|
||||
u.st.mutation_mark = String(_vmark_cb.call(c))
|
||||
else:
|
||||
u.mutation_mark = ""
|
||||
u.badge_glyph = _update_badge(c)
|
||||
u.glow_group = int(_glow.get(c, UiKit.GLOW_NONE))
|
||||
u.st.mutation_mark = ""
|
||||
u.st.badge_glyph = _update_badge(c)
|
||||
u.st.glow_group = int(_glow.get(c, UiKit.GLOW_NONE))
|
||||
# 视野迷雾呈态：曼哈顿距离 > 半径 → 区外——未开格全黑（现行事实源照抄）/
|
||||
# 已开格记忆态（灰显可读）；以英雄格为心逐格重算，refresh()/notify_hero_move() 既有重绘驱动=移动实时跟随。
|
||||
# 纯呈现零逻辑——格态/数字真值/清图判定零触碰（🔴 契约 1）；结算期去饱和叠加互斥由 CellUnit 记忆态终态档承载。
|
||||
@@ -734,7 +734,7 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void:
|
||||
u.fog_state = (2 if revealed else 1) if fogged else 0
|
||||
else:
|
||||
u.fog_state = 0
|
||||
u.removed_dim = removed
|
||||
u.st.removed_dim = removed
|
||||
u.queue_redraw()
|
||||
|
||||
|
||||
@@ -765,7 +765,7 @@ func _sync_glow_to_units() -> void:
|
||||
for c in touched:
|
||||
var u: Node2D = _cells.get(c)
|
||||
if u != null:
|
||||
u.glow_group = int(_glow.get(c, UiKit.GLOW_NONE))
|
||||
u.st.glow_group = int(_glow.get(c, UiKit.GLOW_NONE))
|
||||
|
||||
|
||||
func _process(delta: float) -> void:
|
||||
@@ -777,14 +777,14 @@ func _process(delta: float) -> void:
|
||||
if UiKit.motion_scale < 1.0:
|
||||
return # 减动效：呼吸停格（refresh/enable 时已施静态色——静态可辨、无持续运动）
|
||||
var k := 0.5 + 0.5 * sin(_breath_t * 3.0) # 3 rad/s≈0.48Hz——无 >3 次/秒频闪（AC 基线）
|
||||
_contact_unit.contact_col = COL_CONTACT.lerp(UiKit.CONTACT_GLOW_DEEP, 0.55 - 0.35 * k)
|
||||
_contact_unit.st.contact_col = COL_CONTACT.lerp(UiKit.CONTACT_GLOW_DEEP, 0.55 - 0.35 * k)
|
||||
_contact_unit.queue_redraw()
|
||||
|
||||
|
||||
# 带几何写入（refresh / set_dig_glow_enabled(true) 挂点）：清旧承载件→按英雄格可挖域写边/角码→施色
|
||||
func _apply_contact_bands() -> void:
|
||||
if _contact_unit != null and is_instance_valid(_contact_unit) and (_cells.get(_minesweeper.hero_pos()) != _contact_unit if _minesweeper != null else true):
|
||||
_contact_unit.contact_col = Color(0, 0, 0, 0)
|
||||
_contact_unit.st.contact_col = Color(0, 0, 0, 0)
|
||||
_contact_unit.queue_redraw()
|
||||
_contact_unit = null
|
||||
if _board == null or _minesweeper == null or not _dig_glow:
|
||||
@@ -801,19 +801,19 @@ func _apply_contact_bands() -> void:
|
||||
for d in [Vector2i(-1, -1), Vector2i(1, -1), Vector2i(-1, 1), Vector2i(1, 1)]:
|
||||
if _diggable.has(_minesweeper.hero_pos() + d):
|
||||
corners.append(0 if (d.x < 0 and d.y < 0) else (1 if d.x > 0 and d.y < 0 else (2 if d.x < 0 else 3)))
|
||||
hu.contact_bands = bands
|
||||
hu.contact_corners = corners
|
||||
hu.st.contact_bands = bands
|
||||
hu.st.contact_corners = corners
|
||||
# 减动效：呼吸停格——refresh/enable 重放时施**静态**色（本件头注「已施静态色」的落実）；
|
||||
# 0.5 = 呼吸周期中值（正常态 k 的均值）。否则减动效下每次 refresh 都会按当前相位重施色，
|
||||
# 带色在 refresh 间跳变＝持续运动假象，且令 on/off 双帧取证无法隔离单一变量。
|
||||
var k := 0.5 if UiKit.motion_scale < 1.0 else 0.5 + 0.5 * sin(_breath_t * 3.0)
|
||||
hu.contact_col = COL_CONTACT.lerp(UiKit.CONTACT_GLOW_DEEP, 0.55 - 0.35 * k)
|
||||
hu.st.contact_col = COL_CONTACT.lerp(UiKit.CONTACT_GLOW_DEEP, 0.55 - 0.35 * k)
|
||||
hu.queue_redraw()
|
||||
|
||||
|
||||
func _reset_breath() -> void:
|
||||
if _contact_unit != null and is_instance_valid(_contact_unit):
|
||||
_contact_unit.contact_col = Color(0, 0, 0, 0)
|
||||
_contact_unit.st.contact_col = Color(0, 0, 0, 0)
|
||||
_contact_unit.queue_redraw()
|
||||
|
||||
|
||||
@@ -888,5 +888,5 @@ func cell_rect_probe(c: Vector2i) -> Rect2:
|
||||
if host.size.x <= 0.0 or host.size.y <= 0.0 or vp_size.x <= 0.0 or vp_size.y <= 0.0:
|
||||
return Rect2()
|
||||
var k: Vector2 = host.size / vp_size
|
||||
var local := Rect2(u.global_position, Vector2(u.edge, u.edge))
|
||||
var local := Rect2(u.global_position, Vector2(u.st.edge, u.st.edge))
|
||||
return Rect2(host.position + local.position * k, local.size * k)
|
||||
Reference in new issue
Block a user