From beea5d6b069c88109090fc00d17ed1221aac9804 Mon Sep 17 00:00:00 2001 From: DKChan <524912269@qq.com> Date: Tue, 29 Sep 2026 09:25:28 +0800 Subject: [PATCH] =?UTF-8?q?fix(merge-t7):=20=E4=B8=BB=E5=8C=BA=E5=90=88?= =?UTF-8?q?=E6=88=90=E6=80=81=E4=B8=89=E4=BF=AE=E2=80=94=E2=80=94grant=5Fa?= =?UTF-8?q?p=20=E5=AF=B9=E9=BD=90=E7=9B=B8=E4=BD=8D=20enum(=E5=AE=A1?= =?UTF-8?q?=E6=9F=A5=E6=89=B93=20Phase.ACTIVE)/outline=5Fsides=20typed=20A?= =?UTF-8?q?rray=20assign(=E5=AE=A1=E6=9F=A5=E6=89=B93=20=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=94=B6=E7=B4=A7)/mutation=5Fmark=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E4=BC=AA=E5=BD=B1=E5=BD=92=E9=9B=B6=EF=BC=9B=E5=86=92?= =?UTF-8?q?=E7=83=9F577/0+=E4=BA=94=E6=8E=A2=E9=92=88=E5=85=A8=E7=BB=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game/core/action_economy.gd | 2 +- game/presentation/views/board_cell_unit.gd | 2 +- game/presentation/views/board_view.gd | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/game/core/action_economy.gd b/game/core/action_economy.gd index 604f9f68..0ac8c035 100644 --- a/game/core/action_economy.gd +++ b/game/core/action_economy.gd @@ -138,7 +138,7 @@ func notify_settlement_done(next_round_mode: String) -> bool: # 当轮行动点加量（GDD「加行动点效果给当轮」——区别于 queue_ap_delta 的下轮排队语义）。Active 受理、 # 无上限域、零随机；使用道具本身零扣费（成本在获取时已付——捡道具格不出战斗奖励）。 func grant_ap(amount: int) -> bool: - if amount <= 0 or _phase != PHASE_ACTIVE: + if amount <= 0 or _phase != Phase.ACTIVE: _reject("grant_ap") return false _ap += amount diff --git a/game/presentation/views/board_cell_unit.gd b/game/presentation/views/board_cell_unit.gd index b6391214..7187ebd4 100644 --- a/game/presentation/views/board_cell_unit.gd +++ b/game/presentation/views/board_cell_unit.gd @@ -90,7 +90,7 @@ var aux_mark := "": if aux_mark != v: aux_mark = v queue_redraw() -var mutation_mark := ":": +var mutation_mark := "": set(v): if mutation_mark != v: mutation_mark = v diff --git a/game/presentation/views/board_view.gd b/game/presentation/views/board_view.gd index 5e0dd835..484ec1b9 100644 --- a/game/presentation/views/board_view.gd +++ b/game/presentation/views/board_view.gd @@ -711,7 +711,7 @@ func _paint_cell(c: Vector2i, hero: Vector2i) -> void: u.glyph = glyph u.glyph_color = digit_col u.plate = revealed and glyph != "" # 数字色牌（原则二——已开格字形全垫牌；旗在未开格不垫） - u.outline_sides = [] + u.outline_sides.assign([]) # typed Array[int]（代码审查批 3 类型收紧——assign 保持引用语义） u.facade_south = false u.proj_band = 0.0 var south_n: Vector2i = c + Vector2i(0, 1)