主卡T5(拆件批wr7): 转发属性25条撤除＋测量面改址收口——adv 4条(_curio_taken/_curio_deck/_feat_ticket_pity/_feat_ticket_sold直指件成员改写后删)、level 7条白盒属性删(内部直指_shop)、board 13条删(内部消费约30处改直引_palette/_hero_sprite件成员);A类直读47处+ui_input_probe 6处改指件;C类方法面调用全仓改adventure.stop().X(委托壳退役——契约5纯转传清偿,adv删pick_curio/apply_node_curio/skip_empty/refresh族/pool_stock/凭证委托11个,ctx组包改直引_curio.deck/feat_ticket_consider/cap_ok);新件压默认阈值(hero_ledger删_gain_seq序派生15变量合规;curio_stop删_attunement改_refresh_x_cap预算注入——装配集冒险期间锁死契约8等价,start/resume双路注入);battle_orchestrator压行还债(begin_battle局部变量归位);验证集清单重生成(66源文件/1596调用点,标签cond计数三对齐零差异)。S13读数:三宿主全部改善——adventure_runner类变量42→23(-19)/公开方法23→≤20归零、level_runner 38→28(-10,达标约30)/54→50、board_view 45→32(-13,精确达标);存量红面=新件5条NEW(接口块公开面29/31方法+迁移函数既有超标形态,原基线adventure_runner同函数同值登记)+恶化4条(battle拆件接线3条+level_map_screen 1条iter38存量漏登记——本批零触碰),收口前呈报用户裁决〔拆件批 V7〕
This commit is contained in:
DKChan committed
1 parent
fa1409f491
commit
659d59edd3
19 files changed
+431
-552
No files matched your search
@@ -78,51 +78,7 @@ var _cell := 46.0 # 当前格边长（set_cell_area 按容器尺寸重
|
||||
var _palette = _TILE_PALETTE.new() # 瓦片件：装载缓存＋查表＋明度/墨族静态算法
|
||||
var _hero_sprite = _HERO_SPRITE.new() # 英雄精灵件：_init 挂为本件子级（tween 需在树上）
|
||||
|
||||
# ── 件成员同名转发（探针直读面零改动：读 _seal_tex、读写 _hero_tex_idle；其余为随迁状态单点再导出）──
|
||||
var _tiles: Dictionary[String, Texture2D]:
|
||||
get:
|
||||
return _palette.tiles
|
||||
var _floor_tiles: Array[Texture2D]:
|
||||
get:
|
||||
return _palette.floor_tiles
|
||||
var _tiles_ok: bool:
|
||||
get:
|
||||
return _palette.tiles_ok
|
||||
var _seal_tex: Texture2D:
|
||||
get:
|
||||
return _palette.seal_tex
|
||||
var _tiles_board_type: String:
|
||||
get:
|
||||
return _palette.tiles_board_type
|
||||
var _digit_dark_ink: bool:
|
||||
get:
|
||||
return _palette.digit_dark_ink
|
||||
var _digit_plate: bool:
|
||||
get:
|
||||
return _palette.digit_plate
|
||||
var _hero_tex_idle: Texture2D:
|
||||
get:
|
||||
return _hero_sprite.tex_idle
|
||||
set(v):
|
||||
_hero_sprite.tex_idle = v
|
||||
var _hero_tex_walk: Texture2D:
|
||||
get:
|
||||
return _hero_sprite.tex_walk
|
||||
var _hero_last: Vector2i:
|
||||
get:
|
||||
return _hero_sprite.last
|
||||
set(v):
|
||||
_hero_sprite.last = v
|
||||
var _hero_move_tw: Tween:
|
||||
get:
|
||||
return _hero_sprite.move_tw
|
||||
var _hero_bump_tw: Tween:
|
||||
get:
|
||||
return _hero_sprite.bump_tw
|
||||
var _hero_dig_tw: Tween:
|
||||
get:
|
||||
return _hero_sprite.dig_tw
|
||||
|
||||
# ── 件成员同名转发（探针直读面零改动：读 _palette.seal_tex、读写 _hero_sprite.tex_idle；其余为随迁状态单点再导出）──
|
||||
# ---- 视野迷雾（纯呈现层；现行事实源=HUD框架「视野迷雾」节 v0.13，渲染规格=art-bible §6.5 v3.5）----
|
||||
const FOG_RADIUS := 8 # 菱形灯光区基准半径（曼哈顿距离 ≤R——与微光环「周围 8 格」同圈起步；半径基准值改动=非白名单须用户）
|
||||
var _fog_enabled := true # 迷雾开关（呈现态布尔——真实游戏恒 on；探针/夹具可 off=无迷雾基线，两态结算逐位一致断言面）
|
||||
@@ -161,8 +117,8 @@ func _init() -> void:
|
||||
_desat_mat = ShaderMaterial.new()
|
||||
_desat_mat.shader = load("res://presentation/views/desaturation.gdshader")
|
||||
_desat_mat.set_shader_parameter("strength", 0.0)
|
||||
_hero_tex_idle = UiKit.load_tex(UiKit.TEX_HERO_IDLE)
|
||||
_hero_tex_walk = UiKit.load_tex(UiKit.TEX_HERO_WALK)
|
||||
_hero_sprite.tex_idle = UiKit.load_tex(UiKit.TEX_HERO_IDLE)
|
||||
_hero_sprite.tex_walk = UiKit.load_tex(UiKit.TEX_HERO_WALK)
|
||||
_palette.load_board_tiles() # 高墙/地面瓦片整批守卫装载（缺位静默回退——英雄同款纪律，禁刷屏）
|
||||
|
||||
|
||||
@@ -247,8 +203,8 @@ func set_cell_area(avail: Vector2) -> void:
|
||||
var u: Node2D = _cells[c]
|
||||
u.edge = _cell
|
||||
u.position = Vector2(c) * stride
|
||||
if _world.hero != null and _hero_last.x >= 0:
|
||||
_place_hero(_hero_last, _hero_last, true) # 格边长变更（窗口缩放）——英雄即时随格重置（杀位移 tween 防飞陈旧落点）
|
||||
if _world.hero != null and _hero_sprite.last.x >= 0:
|
||||
_place_hero(_hero_sprite.last, _hero_sprite.last, true) # 格边长变更（窗口缩放）——英雄即时随格重置（杀位移 tween 防飞陈旧落点）
|
||||
_refresh_slab()
|
||||
_update_world_size()
|
||||
|
||||
@@ -276,15 +232,15 @@ func rebuild(board: BoardData, minesweeper: MinesweeperRules) -> void:
|
||||
_glow.clear()
|
||||
_glow_errors.clear()
|
||||
_contact_unit = null
|
||||
_hero_last = Vector2i(-99, -99)
|
||||
_hero_sprite.last = Vector2i(-99, -99)
|
||||
_r0.clear()
|
||||
_hover = Vector2i(-9, -9)
|
||||
for c in _board.compute_r0():
|
||||
_r0[c] = true
|
||||
# 瓦片套随板图型切换（board_gen 词表 v1.1 dungeon/underdark/deep_underdark；
|
||||
# 同图型重复 rebuild 零重载，_tiles_board_type 守卫）
|
||||
# 同图型重复 rebuild 零重载，_palette.tiles_board_type 守卫）
|
||||
var bt: String = _board.board_type if _board.board_type != "" else "dungeon"
|
||||
if bt != _tiles_board_type:
|
||||
if bt != _palette.tiles_board_type:
|
||||
_palette.load_board_tiles(bt)
|
||||
var stride := _cell + float(SEP)
|
||||
for y in _board.height:
|
||||
@@ -296,7 +252,7 @@ func rebuild(board: BoardData, minesweeper: MinesweeperRules) -> void:
|
||||
u.position = Vector2(c) * stride
|
||||
u.bevel = DEPTH_BEVEL # 新建格单元继承
|
||||
u.use_parent_material = true # 去饱和材质挂 BoardWorld——单元随世界材质灰化
|
||||
if _tiles_ok:
|
||||
if _palette.tiles_ok:
|
||||
# NEAREST 采样（32×32 源 × 45/36px 格边非整数缩放接受档，
|
||||
# 与英雄小人 1.5× 豁免同级（圣经 §8.2）；只在瓦片
|
||||
# 模式启用——程序化回退路径渲染零扰动（含格面文字采样不回退不变化）
|
||||
@@ -629,7 +585,7 @@ func _badge_glyph(category: String) -> String:
|
||||
#（dungeon 瓦片实测达标维持）；深墨族 1-3 青墨/4-5 赭墨/6-8 锈墨（色温语义同构——underdark/
|
||||
# deep_underdark 亮白筋纹瓦片上亮墨对亮斑 CR 1.0–1.9 融字，深墨族 5.7–11.1；选族判据见 TilePalette.digit_ink_mode）
|
||||
func _digit_ink(d: int) -> Color:
|
||||
if _digit_dark_ink:
|
||||
if _palette.digit_dark_ink:
|
||||
if d <= 3:
|
||||
return UiKit.INK_COLD
|
||||
if d <= 5:
|
||||
@@ -655,7 +611,7 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void:
|
||||
var digit_col := COL_DIGIT
|
||||
# 封印槽统一维护：封印格=封印印记纹理；其余格清 null（封印格挖开后残留在 tex_seal
|
||||
# 会让 _draw 无条件把封印印画在已开格上——tex_seal 绘制无 revealed 条件）。缺盘走字形回退。
|
||||
u.tex_seal = _seal_tex if (seal and not revealed and _seal_tex != null) else null
|
||||
u.tex_seal = _palette.seal_tex if (seal and not revealed and _palette.seal_tex != null) else null
|
||||
if removed:
|
||||
revealed = false # 移除格固定未开呈现基座（退色暗幕层承载；危险格本无数字，周边数字冻结）
|
||||
seal = false
|
||||
@@ -678,7 +634,7 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void:
|
||||
else:
|
||||
if seal:
|
||||
bg = COL_BRICK
|
||||
if _seal_tex == null:
|
||||
if _palette.seal_tex == null:
|
||||
glyph = "封"
|
||||
digit_col = COL_SEAL
|
||||
else:
|
||||
@@ -692,7 +648,7 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void:
|
||||
#（绘制路径零像素变化），仅英雄格保留蓝框载体。
|
||||
var sb: StyleBoxFlat = null
|
||||
var tile: Texture2D = null
|
||||
if _tiles_ok:
|
||||
if _palette.tiles_ok:
|
||||
tile = _floor_tile_for(c) if revealed else _wall_tile_for(c)
|
||||
else:
|
||||
# 素材整批缺位回退 = 现行程序化平色路径（fresh checkout 冒烟不炸——需求卡片 §2.2）
|
||||
@@ -702,7 +658,7 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void:
|
||||
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:
|
||||
if glyph == "" and _hero_sprite.tex_idle == null:
|
||||
# 贴图缺位回退字形「人」（项目纹理槽惯例——贴图在位=格内字形退役，单位本体由独立精灵承载）
|
||||
glyph = "人"
|
||||
digit_col = COL_HERO
|
||||
@@ -711,8 +667,8 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void:
|
||||
u.glyph = glyph
|
||||
u.glyph_color = digit_col
|
||||
# 色牌后备（数字直画退牌；「危」/「?」维持牌载保读性）+ v3.4：双峰纹理板
|
||||
#（_digit_plate——underdark 系亮白筋+近黑斑并存的直画不可救纹理）数字落牌，牌上深墨 12:1
|
||||
var plate_digit := _digit_plate and glyph != "" and glyph != "危" and glyph != "?" and glyph != "封" and glyph != "人"
|
||||
#（_palette.digit_plate——underdark 系亮白筋+近黑斑并存的直画不可救纹理）数字落牌，牌上深墨 12:1
|
||||
var plate_digit: bool = _palette.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
|
||||
@@ -739,7 +695,7 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void:
|
||||
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:
|
||||
continue # 南缘由立面件承载（高光+双段暗带）——2px 描边让位防三重叠黑
|
||||
if code == 0 and _tiles_ok:
|
||||
if code == 0 and _palette.tiles_ok:
|
||||
continue # v3.5 冻结① (b)-(c) 交界无边框：墙面直贴接墙顶（E 格墙面件在邻格承载）——北向描边不画（平色回退态保留描边）
|
||||
u.outline_sides.append(code)
|
||||
else:
|
||||
@@ -748,9 +704,9 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void:
|
||||
u.proj_band = u.edge * WALL_PROJECTION_FRAC
|
||||
# E 格高墙面（圣经 v3.5 冻结①——方向稿 is_facade_cell 口径）：已开格南邻未开墙 → 南部 30%
|
||||
# 承接墙面（材质=同板墙顶 center 瓦片，原亮度直贴）；仅瓦片态启用——平色回退保持原语义
|
||||
if south_in and not _minesweeper.is_revealed(south_n) and _tiles_ok:
|
||||
if south_in and not _minesweeper.is_revealed(south_n) and _palette.tiles_ok:
|
||||
u.facade_strip = true
|
||||
u.tex_facade = _tiles.get("wall_center")
|
||||
u.tex_facade = _palette.tiles.get("wall_center")
|
||||
# ②( 秘宝叠加层：真视格=红内缩框；预读格=奖励身份徽章（identity_resolver 既有
|
||||
# 只读面取字形——零数据复制，badge 位复用）；已开格标记自然退位（refresh 逐拍重算）
|
||||
if not revealed:
|
||||
|
||||
Reference in new issue
Block a user