merge(master): S9 类型闸修复批与两条工程条目出账 并入 iter37（收口前最后一次并源）
三处冲突全部按「取我方结构＋确认对方注解已落新址」处置，零丢弃对方改动： - main.gd：四解析函数体已由卡② r1-2 搬入 board_resolvers.gd，master 给 _identity_lookup 补的 -> Variant 在新件 identity_lookup:28 同形在位；build_adventure_params 的 SaveManagerCore/MetaProgressionCore 注解经自动合并落住（main.gd:367） - views/battle_stage_view.gd：卡① d12 已改 (target_id: String, display_name: String) -> Variant，master 对旧一参形态的注解属同址更新，取我方 - views/board_view.gd：查表族/明度归一族已由卡③ r2-1 搬入 tile_palette.gd，master 的 lumas_out: Variant 注解在 tile_palette.gd:134 同形在位 待办清单.md：我方 P0 条目与 master 删两条已完成工程条目自动合并（64 条，S9/S13 条目出账） 合并后复核：13 个触及脚本 --check-only 零 Parse Error；master 修好的 S9 类型闸 PASS（其 26 处补注解零丢失、本批九新件零命中）；gdstyle 216/216 基线内、新违规 0、恶化 0
This commit is contained in:
DKChan committed
commit
2dd3ec5640
18 files changed
+53
-99
No files matched your search
@@ -213,7 +213,6 @@ func _fatal_screen(msg: String) -> void:
|
||||
MainUiBuild.fatal_screen(self, msg)
|
||||
|
||||
|
||||
|
||||
# ==================== 模态 overlay 层级管理（pattern 6 / 缺陷⑤——状态机归 modal_stack.gd） ====================
|
||||
|
||||
func _register_modal(m: Control, tags: Array = []) -> void:
|
||||
@@ -364,7 +363,7 @@ func _wire_adventure() -> void:
|
||||
# 取值=meta.hero_attack_type/hero_armor_type=存档选中路线类型轴，未解锁/异常选中态回退锻造配置默认值）。
|
||||
# 注：runner 侧 resume_adventure 受理面收 attunement/attune_refresh_y/tree_rules 三键
|
||||
# （传参/受理两侧对齐）。
|
||||
static func build_adventure_params(save_manager_ref, meta_ref, extra: Dictionary = {}) -> Dictionary:
|
||||
static func build_adventure_params(save_manager_ref: SaveManagerCore, meta_ref: MetaProgressionCore, extra: Dictionary = {}) -> Dictionary:
|
||||
var params: Dictionary[Variant, Variant] = {
|
||||
"hero_override": meta_ref.hero_override() if meta_ref != null else {},
|
||||
"attack_type": meta_ref.hero_attack_type() if meta_ref != null else "",
|
||||
@@ -402,8 +401,6 @@ func _on_adventure_level_started(level_index: int, display_name: String)-> void:
|
||||
MainAdventureFlow._on_adventure_level_started(self, level_index, display_name)
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_runner_node(node: Dictionary, info: Dictionary)-> void:
|
||||
MainAdventureFlow._on_runner_node(self, node, info)
|
||||
|
||||
@@ -412,32 +409,22 @@ func _on_adventure_finished(summary: Dictionary)-> void:
|
||||
MainAdventureFlow._on_adventure_finished(self, summary)
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_battle_end_continue() -> void:
|
||||
MainAdventureFlow._on_battle_end_continue(self)
|
||||
|
||||
|
||||
|
||||
|
||||
func _start_debug_levels() -> void:
|
||||
MainDebugFlow._start_debug_levels(self)
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_debug_battle_created(settlement_ref: BattleOrchestrator, _level: int, _carry: int)-> void:
|
||||
MainDebugFlow._on_debug_battle_created(self, settlement_ref, _level, _carry)
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_debug_battle_ready(settlement_ref: BattleOrchestrator, _level: int, _carry: int)-> void:
|
||||
MainDebugFlow._on_debug_battle_ready(self, settlement_ref, _level, _carry)
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_inter_next_pressed() -> void:
|
||||
MainAdventureFlow._on_inter_next_pressed(self)
|
||||
|
||||
@@ -612,14 +599,10 @@ func _on_node_continue() -> void:
|
||||
MainAdventureFlow._on_node_continue(self)
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_choices_presented(candidates: Array)-> void:
|
||||
MainAdventureFlow._on_choices_presented(self, candidates)
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_route_chosen(node_id: int)-> void:
|
||||
MainAdventureFlow._on_route_chosen(self, node_id)
|
||||
|
||||
@@ -632,14 +615,10 @@ func _enter_level_screen() -> void:
|
||||
MainAdventureFlow._enter_level_screen(self)
|
||||
|
||||
|
||||
|
||||
|
||||
func _exit_level_screen() -> void:
|
||||
MainAdventureFlow._exit_level_screen(self)
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_abandon_requested() -> void:
|
||||
MainAdventureFlow._on_abandon_requested(self)
|
||||
|
||||
@@ -650,8 +629,6 @@ func _open_settings() -> void:
|
||||
MainOverlayFlow._open_settings(self)
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_settings_closed() -> void:
|
||||
MainOverlayFlow._on_settings_closed(self)
|
||||
|
||||
@@ -660,14 +637,10 @@ func _status_data() -> Dictionary:
|
||||
return MainOverlayFlow._status_data(self)
|
||||
|
||||
|
||||
|
||||
|
||||
func _open_status_panel() -> void:
|
||||
MainOverlayFlow._open_status_panel(self)
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_status_closed() -> void:
|
||||
MainOverlayFlow._on_status_closed(self)
|
||||
|
||||
@@ -679,8 +652,6 @@ func _open_career() -> void:
|
||||
MainOverlayFlow._open_career(self)
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_career_closed() -> void:
|
||||
MainOverlayFlow._on_career_closed(self)
|
||||
|
||||
@@ -689,8 +660,6 @@ func _open_save_select() -> void:
|
||||
MainOverlayFlow._open_save_select(self)
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_save_select_closed() -> void:
|
||||
MainOverlayFlow._on_save_select_closed(self)
|
||||
|
||||
@@ -721,14 +690,10 @@ func _on_camp_closed() -> void:
|
||||
MainOverlayFlow._on_camp_closed(self)
|
||||
|
||||
|
||||
|
||||
|
||||
func _camp_data() -> Dictionary:
|
||||
return MainOverlayFlow._camp_data(self)
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_wallet_changed(event: String, gp: int, extra: Dictionary)-> void:
|
||||
MainOverlayFlow._on_wallet_changed(self, event, gp, extra)
|
||||
|
||||
@@ -917,14 +882,10 @@ func _close_debug_overlay() -> void:
|
||||
MainDebugFlow._close_debug_overlay(self)
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_tune_apply(atk_pct: int, hp_pct: int)-> void:
|
||||
MainDebugFlow._on_tune_apply(self, atk_pct, hp_pct)
|
||||
|
||||
|
||||
|
||||
|
||||
func _on_tune_simulate(n: int)-> void:
|
||||
MainDebugFlow._on_tune_simulate(self, n)
|
||||
|
||||
|
||||
Reference in new issue
Block a user