merge(迭代34 卡④ 信息迷雾可见性批): 层距 N 类型可见性＋Boss/候选豁免＋单圈回雾（N 读表）＋呈现决策面与绘制记录观测面＋画布大图断言与探针常数同源＋两轮独立验收审计通过（首轮不通过 D1/D2→甲案回炉 T2→复审闭合；回执 commit=1b4a4acf，--code 全绿）
域判定依据：本批 diff 触及 game/（代码域触发面）与 reports/ 产出物，按迭代批既定口径与卡③先例（43c0f3c1）以 --code 全绿回执合回，design/ 与根规则文件零改动。
This commit is contained in:
DKChan committed
commit
16a7ec8012
16 files changed
+1030
-23
No files matched your search
@@ -48,6 +48,7 @@ var _hover_id := -1 # 悬停预承诺候选（-1 = 无）
|
||||
var abandon_btn: Button # 放弃入口（可见性归组合根 set_abandon_available——只在冒险模式开）
|
||||
var status_badge: Button # 状态面板入口角标（顶栏 GP 徽右侧；连接归组合根）
|
||||
var _abandon_timer := ArmedTimer.new() # 放弃确认窗（_process 帧驱动倒计时机制收口；窗口=CONFIRM_WINDOW_S）
|
||||
var _drawn_disp: Dictionary[int, Dictionary] = {} # 本停点实际绘制记录（_draw_graph 逐帧在实际绘制点重建——display_probe 消费面）
|
||||
var _node_icons := {} # 节点图标贴图（load_tex 守卫——缺位 null → 字形回退，冒烟/无素材检出安全）
|
||||
var _noise_rect: TextureRect # 屏底石纹（换层色板渐变承载面——null = 纯色回退无挂点）
|
||||
var _tint_level := 0 # 当前已应用 tint 的层号（0 = 未应用）
|
||||
@@ -415,17 +416,39 @@ func _id_of(node: Dictionary) -> int:
|
||||
return _runner.node_id_of(node)
|
||||
|
||||
|
||||
# ---- 节点呈现决策面（信息迷雾 v2.1：类型仅在可见集内出示，Boss 标记不入雾）----
|
||||
# 纯函数、零内容读取：只消费类型与状态（节点内详情＝打谁/给什么，图上从不显示）。
|
||||
static func node_display(node: Dictionary, nid: int, type_vis: Array,
|
||||
is_current: bool, is_candidate: bool) -> Dictionary:
|
||||
var t := String(node.get("type", ""))
|
||||
var is_boss: bool = t == "boss"
|
||||
var type_shown: bool = is_boss or type_vis.has(nid)
|
||||
var label_text := String(NODE_TYPE_NAMES.get(t, t))
|
||||
if is_current:
|
||||
label_text = "当前位置"
|
||||
elif is_candidate:
|
||||
label_text += " · 可选"
|
||||
return {
|
||||
"draw_icon": type_shown,
|
||||
"draw_label": type_shown,
|
||||
"label_text": label_text,
|
||||
"boss_border": is_boss,
|
||||
}
|
||||
|
||||
|
||||
# ---- 整图自绘（程序化占位——分层布局：层 = 入口 BFS 深度，同层垂直排布）----
|
||||
|
||||
func _draw_graph(canvas: Control) -> void:
|
||||
if _runner == null or not visible:
|
||||
return
|
||||
_drawn_disp.clear() # 绘制记录随本帧重建——只反映实际发生的绘制（接线坏的判据面）
|
||||
var nodes: Array[Variant] = _runner.nodes()
|
||||
var pos := _layout(nodes, canvas)
|
||||
var current_id: int = _runner.current_node_id()
|
||||
# 当前节点 id（单链=下标 / 图=编号）——visited_ids() 已按编号空间解析
|
||||
var visited: Array[Variant] = _runner.visited_ids()
|
||||
var cand_ids: Array[Variant] = _runner.next_candidate_ids()
|
||||
var type_vis: Array[int] = _runner.type_visible_ids() # 本停点类型可见集（每帧一取——纯函数零状态）
|
||||
# 连线（通道）先行画（方块覆盖其上）；悬停预承诺 = 所属通道再增亮（加粗）
|
||||
# 选路停点（候选非空）非候选通道降透明——金岔路从结构网分离（干线共线重叠缺陷的
|
||||
# 视觉主因：不同源通道共用同一垂直干线，金边与石色边焊接成「整列可走」假象）
|
||||
@@ -454,39 +477,44 @@ func _draw_graph(canvas: Control) -> void:
|
||||
col = COL_ROOM_CURRENT
|
||||
var rect := Rect2(p - NODE_HALF, NODE_HALF * 2.0)
|
||||
canvas.draw_rect(rect, col)
|
||||
if t == "boss":
|
||||
var disp := node_display(node, nid, type_vis, nid == current_id, cand_ids.has(nid))
|
||||
var rec: Dictionary[String, Variant] = {"draw_icon": false, "draw_label": false,
|
||||
"label_text": "", "boss_border": false}
|
||||
if bool(disp["boss_border"]):
|
||||
# Boss 描边 = 紫赤 2px（§4.2 色相独占）+ 外缘 1px 深墨环（灰度冗余通道强制：
|
||||
# 紫赤灰度 72 对石纹噪底 65 灰度不可辨；灰度/色弱下 Boss 环经深墨环可辨）
|
||||
canvas.draw_rect(Rect2(rect.position - Vector2(3, 3), rect.size + Vector2(6, 6)), UiKit.INK_ROUTE, false, 1.0)
|
||||
canvas.draw_rect(rect, COL_BOSS_BORDER, false, 2.0)
|
||||
rec["boss_border"] = true
|
||||
elif cand_ids.has(nid):
|
||||
# 悬停预承诺 = 亮金描边加粗（4px），常态候选 = 亮金描边 2px（spec States 悬停预承诺行）
|
||||
canvas.draw_rect(rect, COL_PASSAGE_LIT, false, 4.0 if _hover_id == nid else 2.0)
|
||||
# 节点图标（20px 烘焙 1:1 消费；双色墨制=乘法调制——当前金底深墨，暗底系 WARM 原色；
|
||||
# 贴图缺位 → 字形回退=贴图在位字形退役惯例）
|
||||
var icon: Texture2D = _node_icons.get(t)
|
||||
if icon != null:
|
||||
var tint := UiKit.ICON_TINT_ON_GOLD if col == COL_ROOM_CURRENT else Color(1.0, 1.0, 1.0)
|
||||
canvas.draw_texture_rect(icon, Rect2(p - Vector2(NODE_ICON_PX, NODE_ICON_PX) / 2.0,
|
||||
Vector2(NODE_ICON_PX, NODE_ICON_PX)), false, tint)
|
||||
else:
|
||||
var font := get_theme_default_font()
|
||||
var label := String(NODE_LABELS.get(t, "?"))
|
||||
canvas.draw_string(font, p + Vector2(-6, 2), label, HORIZONTAL_ALIGNMENT_LEFT, -1, 16, UiKit.INK_ROUTE)
|
||||
if bool(disp["draw_icon"]):
|
||||
rec["draw_icon"] = true
|
||||
var icon: Texture2D = _node_icons.get(t)
|
||||
if icon != null:
|
||||
var tint := UiKit.ICON_TINT_ON_GOLD if col == COL_ROOM_CURRENT else Color(1.0, 1.0, 1.0)
|
||||
canvas.draw_texture_rect(icon, Rect2(p - Vector2(NODE_ICON_PX, NODE_ICON_PX) / 2.0,
|
||||
Vector2(NODE_ICON_PX, NODE_ICON_PX)), false, tint)
|
||||
else:
|
||||
var font := get_theme_default_font()
|
||||
var label := String(NODE_LABELS.get(t, "?"))
|
||||
canvas.draw_string(font, p + Vector2(-6, 2), label, HORIZONTAL_ALIGNMENT_LEFT, -1, 16, UiKit.INK_ROUTE)
|
||||
# 编号（右上角——与图标占位区零重叠；双色墨随态）
|
||||
var num_ink := UiKit.INK_ROUTE if col == COL_ROOM_CURRENT else UiKit.WARM
|
||||
canvas.draw_string(get_theme_default_font(), Vector2(rect.end.x - 16.0, rect.position.y + 8.0),
|
||||
str(nid), HORIZONTAL_ALIGNMENT_RIGHT, 14, 10, num_ink)
|
||||
# 类型文字标签（demo ④：节点下方 11px；当前位=「当前位置」金、候选=类型名+「 · 可选」烛光黄、
|
||||
# 其余=类型名暖米弱化；文字+图标+形状三通道）
|
||||
var type_text := String(NODE_TYPE_NAMES.get(t, t))
|
||||
if nid == current_id:
|
||||
type_text = "当前位置"
|
||||
elif cand_ids.has(nid):
|
||||
type_text += " · 可选"
|
||||
var type_ink := COL_ROOM_CURRENT if nid == current_id else (UiKit.CANDLE if cand_ids.has(nid) else UiKit.WARM_FAINT)
|
||||
canvas.draw_string(get_theme_default_font(), Vector2(p.x - 44.0, rect.end.y + 15.0),
|
||||
type_text, HORIZONTAL_ALIGNMENT_CENTER, 88, 11, type_ink)
|
||||
if bool(disp["draw_label"]):
|
||||
rec["draw_label"] = true
|
||||
rec["label_text"] = String(disp["label_text"])
|
||||
var type_ink := COL_ROOM_CURRENT if nid == current_id else (UiKit.CANDLE if cand_ids.has(nid) else UiKit.WARM_FAINT)
|
||||
canvas.draw_string(get_theme_default_font(), Vector2(p.x - 44.0, rect.end.y + 15.0),
|
||||
String(disp["label_text"]), HORIZONTAL_ALIGNMENT_CENTER, 88, 11, type_ink)
|
||||
_drawn_disp[nid] = rec
|
||||
|
||||
|
||||
func _layout(nodes: Array, canvas: Control) -> Dictionary:
|
||||
@@ -513,6 +541,12 @@ func canvas_probe() -> Dictionary:
|
||||
return {"origin": _canvas.get_global_position(), "min_size": _canvas.custom_minimum_size}
|
||||
|
||||
|
||||
# 类型可见性绘制只读记录（id → 本帧实际绘制事实：图标/文字/描边/文案；_draw_graph 在实际绘制点写入——
|
||||
# 接线层断言消费点：绕开决策面直接画，这里就露出「雾下也画了」）
|
||||
func display_probe() -> Dictionary:
|
||||
return _drawn_disp
|
||||
|
||||
|
||||
# 分层（layout/fit 共享件）：layer = 入口 BFS 深度；同层 slot 垂直排布；未达节点兜底排末层
|
||||
func _assign_layers(nodes: Array, layer: Dictionary, slot: Dictionary) -> void:
|
||||
var layer_counts := {}
|
||||
|
||||
Reference in new issue
Block a user