game-group/gplan-2
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iter(36): 卡C+卡A 实现——开场行后缀认加算区（六项布尔＋三路径断言：白板反向/续玩重建正向，卡片②奖励节点前提缺陷改快照喂入形态代拍2）、营地六处灰字STONE_DEEP＋取色/源扫描断言、迷雾测点三关归一后基准＋派生校验（T0对拍L2/L3修值L2条款）、文案禁字清扫钉值表13单元＋player_copy_sweep新宿主24断言入清单、变异验证全套留痕（对照表证据随实现报告）

Browse Source
This commit is contained in:
DKChan committed 2026-10-24 07:42:46 +08:00
1 parent 2931b1f250
commit 9468c70ee2
19 files changed
+489 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

game/presentation/battle_narrator.gd
+3 -3
View File
@@ -139,7 +139,7 @@ static func bonus_result_text(result: Dictionary) -> String:
# 表无 archetype，fallback 兜底词「流派」会实显僵尸文案），卡片=件名+效果摘要两行）
static func feat_card_text(row: Dictionary) -> String:
if row.is_empty() or String(row.get("feat_id", "")) == "":
return "特性\n???"
return "专长\n???"
var summary := String(row.get("desc", ""))
if summary != "":
return "%s\n%s" % [String(row.get("display_name", row.get("feat_id", ""))), summary]
@@ -151,9 +151,9 @@ static func bonus_keystone_line(payload: Dictionary) -> String:
return "钥石 +%d · 累计 %d" % [int(payload.get("keystone_gained", 0)), int(payload.get("keystone_total", 0))]
# 奖励节点三选一头部行（与通关三选一共享同池；node-reward.md v2）
# 奖励节点三选一头部行（与通关三选一共享同库；渠道白名单分流——node-reward.md v2）
static func node_curio_header() -> String:
return "关卡奖励点\n从提升池抽三选一（与通关三选一同池同权重同上限）：\n选择一件带走："
return "关卡奖励点\n从冒险牌库抽三选一（属性值提升与补给；与通关专长三选一同库分流）：\n选择一件带走："
# 冒险结算屏文案（摘要五件事：打穿没有 / 通关几关 / 止步第几关 / 钥石合计 / 主种子）
game/presentation/main.gd
+8 -4
View File
@@ -604,12 +604,16 @@ func _on_adventure_level_started(level_index: int, display_name: String) -> void
run_scope.runner = run_scope.adventure.runner()
# 开场行传当前生效值（runner.effective_atk/effective_max_hp 与战斗面板同源：
# 表值+永久强化 flat+加算区 flat 后乘调试浮窗 pct，本回调时点 runner 已带全部加成）；「含面板加成」
# 后缀判断认局外加成——永久强化 atk/max_hp flat 或调试浮窗 pct 任一存在才带，白板局不带
# 后缀判断认任一加成源——永久强化 atk/max_hp flat 或调试浮窗 pct 或局内加算区 atk/max_hp
#（run_ledger.bonus——属性值提升入账后显示值已含加算区 flat，注记随动；armor_class/ap 不入条件：
# 开场行只显示 atk/max_hp 两值，注记指向不存在的显示轴反成失真），白板局不带
var ov: Dictionary[Variant, Variant] = meta.hero_override()
var boosted: bool = int(ov.get("atk", 0)) > 0 or int(ov.get("max_hp", 0)) > 0 \
or debug_overlay.atk_pct() > 0 or debug_overlay.hp_pct() > 0 \
or int(run_scope.runner.run_ledger.bonus.get("atk", 0)) > 0 \
or int(run_scope.runner.run_ledger.bonus.get("max_hp", 0)) > 0
log_view.append_bb(Narrator.level_open_line(display_name, int(run_scope.adventure.master_seed),
run_scope.runner.effective_atk(), run_scope.runner.effective_max_hp(),
int(ov.get("atk", 0)) > 0 or int(ov.get("max_hp", 0)) > 0
or debug_overlay.atk_pct() > 0 or debug_overlay.hp_pct() > 0))
run_scope.runner.effective_atk(), run_scope.runner.effective_max_hp(), boosted))
func _on_runner_node(node: Dictionary, info: Dictionary) -> void:
game/presentation/views/board_cell_unit.gd
+2 -1
View File
@@ -267,7 +267,8 @@ func _draw() -> void:
elif fog_state == 2:
# 记忆态换装（demo 口径「地板纹理 + 灰罩 α.66」：
# 地板纹理原样直画 + FOG_MEMORY_PLATE α.66 灰罩压顶；素材零改动、格边长零改动。
# 记忆墨 FOG_MEMORY_INK 对合成底实测 ≈6.7:1 ≥4.5:1（§7.2 硬指标；floor avg #453020 复算在册））
# 记忆墨 FOG_MEMORY_INK 对合成底归一后（真实渲染面）三关 5.71–5.93:1 ≥4.5:1（§7.2 硬指标；
# 测点行值与素材随动，见 ui_contrast_probe 迷雾段））
if tex_base != null:
draw_texture_rect(tex_base, Rect2(Vector2.ZERO, Vector2(edge, edge)), false)
draw_rect(Rect2(Vector2.ZERO, Vector2(edge, edge)), Color(UiKit.FOG_MEMORY_PLATE, 0.66), true)
game/presentation/views/board_view.gd
+4 -4
View File
@@ -727,7 +727,7 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void:
var rec: Dictionary[Variant, Variant] = _minesweeper.reveal_record(c) # 已开记录经查询面
if rec.get("kind", "") == "mine":
bg = COL_FLOOR
glyph = "雷"
glyph = "危"
digit_col = UiKit.RED_MINE
else:
bg = COL_FLOOR
@@ -773,13 +773,13 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void:
u.bg_sb = sb
u.glyph = glyph
u.glyph_color = digit_col
# 色牌后备（数字直画退牌；雷/「?」维持牌载保读性）+ v3.4：双峰纹理板
# 色牌后备（数字直画退牌；「危」/「?」维持牌载保读性）+ v3.4：双峰纹理板
#（_digit_plate——underdark 系亮白筋+近黑斑并存的直画不可救纹理）数字落牌，牌上深墨 12:1
var plate_digit := _digit_plate and glyph != "" and glyph != "雷" and glyph != "?" and glyph != "封" and glyph != "人"
var plate_digit := _digit_plate and glyph != "" and glyph != "危" and glyph != "?" and glyph != "封" and glyph != "人"
if plate_digit:
digit_col = COL_DIGIT # 牌上深墨族（素牌 12:1——双峰纹理免疫）
u.glyph_color = digit_col
u.plate = revealed and (glyph == "雷" or glyph == "?" or plate_digit)
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
game/presentation/views/camp_overlay_view.gd
+6 -6
View File
@@ -164,7 +164,7 @@ func _init() -> void:
atlas_panel.size_flags_horizontal = Control.SIZE_EXPAND_FILL
atlas_panel.size_flags_vertical = Control.SIZE_FILL # 四栏等高：任一栏长高时四栏同步拉伸
mid.add_child(atlas_panel)
var lock_l := UiKit.label("　—— 柜台结构位预留：内容排 Alpha（地图战斗资源差异化批）",UiKit.FS_HINT, false, UiKit.STONE)
var lock_l := UiKit.label("　—— 柜台结构位预留：内容排 Alpha（地图战斗资源差异化批）",UiKit.FS_HINT, false, UiKit.STONE_DEEP)
lock_l.size_flags_vertical = Control.SIZE_SHRINK_CENTER # 锁文在等高栏内垂直居中
lock_l.autowrap_mode = TextServer.AUTOWRAP_WORD_SMART
lock_l.custom_minimum_size = Vector2(280, 0)
@@ -414,7 +414,7 @@ func refresh_camp(data: Dictionary) -> void:
card.progress_l.text = prog_text
# 状态色用亮板双色墨制（深墨族替代暖白族——亮板上暖白不可读）
var st_text := "未解锁"
var st_col: Color = UiKit.STONE
var st_col: Color = UiKit.STONE_DEEP
if unlocked:
st_text = "已解锁"
st_col = UiKit.GOLD_INK # GOLD_DEEP 对行板 3.00:1 越带，换深金墨 5.84:1
@@ -473,7 +473,7 @@ func _rebuild_workshop(data: Dictionary) -> void:
progress_l.text_overrun_behavior = TextServer.OVERRUN_TRIM_ELLIPSIS
line.add_child(progress_l)
# 状态色用亮板双色墨制（深墨族替代暖白族）——色随刷新态条件赋值，非机械两行式
var status_l := UiKit.label("",UiKit.FS_HINT, true, UiKit.STONE)
var status_l := UiKit.label("",UiKit.FS_HINT, true, UiKit.STONE_DEEP)
status_l.clip_text = true # 同上——「已解锁 · 能力封存中」不撑柜（余宽吸收者）
status_l.text_overrun_behavior = TextServer.OVERRUN_TRIM_ELLIPSIS
status_l.size_flags_horizontal = Control.SIZE_EXPAND_FILL
@@ -506,11 +506,11 @@ func _rebuild_attune(data: Dictionary) -> void:
name_l.clip_text = true
name_l.text_overrun_behavior = TextServer.OVERRUN_TRIM_ELLIPSIS
line.add_child(name_l)
var form_l := UiKit.label("被动" if String(row.get("form", "")) == "passive" else "主动·充能",UiKit.FS_CAPTION, false, UiKit.STONE)
var form_l := UiKit.label("被动" if String(row.get("form", "")) == "passive" else "主动·充能",UiKit.FS_CAPTION, false, UiKit.STONE_DEEP)
form_l.custom_minimum_size = Vector2(58, 0)
line.add_child(form_l)
# 档位标签（槽位档位显示：件档=普通/优秀/稀有，装入须件档≤格档契约 2 的呈现半边）
var tier_l := UiKit.label(String(UiKit.TREASURE_TIER_LABELS.get(String(row.get("tier", "")), "—")),UiKit.FS_CAPTION, false, UiKit.STONE)
var tier_l := UiKit.label(String(UiKit.TREASURE_TIER_LABELS.get(String(row.get("tier", "")), "—")),UiKit.FS_CAPTION, false, UiKit.STONE_DEEP)
tier_l.custom_minimum_size = Vector2(36, 0)
line.add_child(tier_l)
var btn := UiKit.button("装配", 0.0) # 行板紧凑钮豁免
@@ -522,7 +522,7 @@ func _rebuild_attune(data: Dictionary) -> void:
_attune_btns.append({"item_id": iid, "btn": btn, "unlocked": bool(row.get("unlocked", false)), "equipped": bool(row.get("equipped", false))})
var refresh_line := HBoxContainer.new()
refresh_line.add_theme_constant_override("separation", 6)
_refresh_l = UiKit.label("",UiKit.FS_CAPTION, false, UiKit.STONE)
_refresh_l = UiKit.label("",UiKit.FS_CAPTION, false, UiKit.STONE_DEEP)
refresh_line.add_child(_refresh_l)
_refresh_btn = UiKit.button("升级", 0.0) # 行板紧凑钮豁免
_refresh_btn.pressed.connect(_emit_buy_requested.bind("attune_refresh"))
game/presentation/views/hero_info_panel_view.gd
+2 -2
View File
@@ -70,7 +70,7 @@ func _init() -> void:
_feat_section.add_theme_constant_override("separation", 4)
_feat_section.visible = false
col.add_child(_feat_section)
_feat_section.add_child(UiKit.label("特性",UiKit.FS_BODY, true))
_feat_section.add_child(UiKit.label("专长",UiKit.FS_BODY, true))
_feat_list = VBoxContainer.new()
_feat_list.add_theme_constant_override("separation", 2)
_feat_section.add_child(_feat_list)
@@ -90,7 +90,7 @@ func _init() -> void:
_curio_section.add_theme_constant_override("separation", 4)
_curio_section.visible = false
col.add_child(_curio_section)
_curio_section.add_child(UiKit.label("特性",UiKit.FS_BODY, true))
_curio_section.add_child(UiKit.label("属性值提升",UiKit.FS_BODY, true))
_curio_list = VBoxContainer.new()
_curio_list.add_theme_constant_override("separation", 2)
_curio_section.add_child(_curio_list)
game/presentation/views/legend_overlay.gd
+1 -1
View File
@@ -8,7 +8,7 @@ signal closed
const ENTRIES := [
["#C9AF83", "完整覆尘地砖", "未开格——左键挖开（1AP，须相邻）· 右键封印（1AP）"],
["#B39A78", "碎裂裸土", "已开 0 格——可通行，左键移动（免费）"],
["#000000", "封印", "封印印记（呈现名·不能拔）——轮末自动判定标中；插错可左键直接挖开（安全格零奖励、危险格吃挖雷惩罚）"],
["#000000", "封印", "封印印记（呈现名·不能拔）——轮末自动判定标中；标空可左键直接挖开（安全格零奖励、危险格受挖掘惩罚）"],
["#2e86de", "小人", "探险者——8 向相邻未开格常驻微光 = 可挖域"],
["#F0A828", "金徽章", "已开格奖励身份 icon（封印之下、数值之上，不进数字区）"],
["#F0A828", "九徽章解码", "攻=攻击 · 守=护甲 · 爆=爆裂 · 医=回复 · 弱=削弱 · 穿=穿刺 · 魔=魔法 · 行=行动点 · 金=GP"],
game/presentation/views/level_map_screen.gd
+1 -1
View File
@@ -168,7 +168,7 @@ func _init() -> void:
_bonus_row.add_child(bonus_box)
var bonus_inner := VBoxContainer.new()
bonus_box.add_child(bonus_inner)
var bonus_cap := UiKit.label("特性",UiKit.FS_CAPTION, false, UiKit.INK_HINT) # 深墨（亮板可读）
var bonus_cap := UiKit.label("属性值提升",UiKit.FS_CAPTION, false, UiKit.INK_HINT) # 深墨（亮板可读）
bonus_inner.add_child(bonus_cap)
_bonus_value = UiKit.label("",UiKit.FS_BODY, true, UiKit.INK_TITLE) # 淡墨→深墨（同上）
bonus_inner.add_child(_bonus_value)
game/presentation/views/status_slot_row.gd
+1 -1
View File
@@ -37,7 +37,7 @@ const EFFECT_SEMANTIC := {
"empower": "敌方输出 ×2（enemy_output 池加算——蓄力技施放；持续 1 个有效结算）",
"fortify": "敌方防御 −50（enemy_defense 池——硬化技施放，主角攻击 ×0.5；持续 1 个有效结算）",
}
const SOURCE_NAMES := {"safe_cell": "安全格", "seal_hit": "封印命中", "mine_hit": "踩雷", "clear_reward": "清图奖励"}
const SOURCE_NAMES := {"safe_cell": "安全格", "seal_hit": "封印命中", "mine_hit": "危险格", "clear_reward": "清图奖励"}
# 未知图标键的占位（HUD框架：占位也要可见，禁静默空图标——debug 断言先行，release 回退槽内 ? 文本）
const ICON_PLACEHOLDER := "?"