DKChan
2dd3ec5640
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
2026-10-25 18:59:27 +08:00
..
2026-10-20 00:22:18 +08:00
2026-09-24 04:02:21 +08:00
2026-10-25 05:47:01 +08:00
2026-09-24 04:02:21 +08:00
2026-10-20 20:48:59 +08:00
2026-09-24 04:02:21 +08:00
2026-10-25 17:56:36 +08:00
2026-09-24 04:02:21 +08:00
2026-10-24 07:42:46 +08:00
2026-09-24 04:02:21 +08:00
2026-10-20 20:41:50 +08:00
2026-09-24 04:02:21 +08:00
2026-10-25 18:59:27 +08:00
2026-09-24 04:02:21 +08:00
2026-10-25 06:43:03 +08:00
2026-09-24 04:02:21 +08:00
2026-10-24 08:35:39 +08:00
2026-09-24 04:02:21 +08:00
2026-10-25 03:35:55 +08:00
2026-09-24 04:02:21 +08:00
2026-10-20 00:22:18 +08:00
2026-10-07 08:51:35 +08:00
2026-10-19 02:52:38 +08:00
2026-10-17 10:18:14 +08:00
2026-10-17 10:18:14 +08:00
2026-10-17 10:18:14 +08:00
2026-10-20 00:22:18 +08:00
2026-09-29 23:29:40 +08:00
2026-10-20 20:41:50 +08:00
2026-10-05 18:44:51 +08:00
2026-10-25 03:49:05 +08:00
2026-10-05 00:50:13 +08:00
2026-09-24 04:02:21 +08:00
2026-09-24 04:02:21 +08:00
2026-10-25 03:35:55 +08:00
2026-09-24 04:02:21 +08:00
2026-10-25 06:43:03 +08:00
2026-10-25 06:43:03 +08:00
2026-10-24 07:42:46 +08:00
2026-09-24 04:02:21 +08:00
2026-10-24 08:35:39 +08:00
2026-09-28 06:40:16 +08:00
2026-10-16 23:28:07 +08:00
2026-09-24 04:02:21 +08:00
2026-10-06 21:42:08 +08:00
2026-10-22 06:04:59 +08:00
2026-10-22 05:07:51 +08:00
2026-10-20 00:22:18 +08:00
2026-09-29 19:25:19 +08:00
2026-10-25 03:49:05 +08:00
2026-09-24 04:02:21 +08:00
2026-10-16 23:28:07 +08:00
2026-09-24 04:02:21 +08:00
2026-10-25 03:35:55 +08:00
2026-09-24 04:02:21 +08:00
2026-10-20 00:22:18 +08:00
2026-09-26 04:56:05 +08:00
2026-10-25 05:47:01 +08:00
2026-09-26 05:07:36 +08:00
2026-10-24 08:49:39 +08:00
2026-10-14 20:28:53 +08:00
2026-10-24 07:42:46 +08:00
2026-09-24 04:02:21 +08:00
2026-10-25 06:43:03 +08:00
2026-10-25 06:43:03 +08:00
2026-10-20 00:22:18 +08:00
2026-09-24 04:02:21 +08:00
2026-10-25 06:43:03 +08:00
2026-09-24 04:02:21 +08:00