Merge branch 'master' into m3-iter10-20261001
# Conflicts: # game/smoke/level_autoplay.gd # game/smoke/smoke_all.gd
This commit is contained in:
commit
bc737fb0cb
24 files changed
+1471
-112
No files matched your search
@@ -73,7 +73,7 @@ var review_overlay: SettlementReviewOverlay
|
||||
var node_overlay: NodeOverlay
|
||||
var shop_overlay: ShopOverlay # 商店覆盖层(GP+商店房实施批——商店房节点兑付呈现)
|
||||
var _adventure_gp_view := 0 # GP 冒险钱包呈现侧影子(迭代 6 T7——终局面板 GP 行取数面,
|
||||
# wallet_changed gain/buy 载荷=入账后总额 level_runner.gd:482/539)
|
||||
# wallet_changed gain/buy 载荷=入账后总额 level_runner.gd:482/539)
|
||||
var _adventure_gp_final := 0 # 收束清零拍暂存的最终合计("clear" 到达时自影子转存)
|
||||
var _aux_use_selection := 0 # 魔法道具选中句柄(迭代 7 T4——0=未选中;选中期棋盘点击=使用目标拾取)
|
||||
var _aux_unlocked := {} # aux 解锁门控集(迭代 7 T5——工坊解锁×活行交集,冒险开始组装)
|
||||
@@ -610,7 +610,7 @@ func _on_battle_end_continue() -> void:
|
||||
func _on_end_review() -> void:
|
||||
review_overlay.open(log_view.parsed_text())
|
||||
_open_modal(review_overlay) # 迭代 6 T7——走模态栈:终局层在册上方的可见遮挡被显式隐藏,
|
||||
# 修复「回看层被终局层全屏 STOP 遮罩压死」(直开绕栈缺陷)
|
||||
# 修复「回看层被终局层全屏 STOP 遮罩压死」(直开绕栈缺陷)
|
||||
|
||||
|
||||
# ==================== 调试模式(连续两层——编排归 debug_session.gd;
|
||||
|
||||
Reference in new issue
Block a user