|
|
861442e2c1
|
Merge main into feature/slay-deck-controller — B~E6a 카드시스템 통합 + 메인 메뉴 이식
main의 35커밋(B 전투통합~E6a 멀티act)을 브랜치에 통합. 충돌 해결:
- tools/gen-slaydeck.mjs: main(B~E6a) 생성기 채택 + 브랜치 메인 메뉴(MainMenu UI·ShowMainMenu/BindMenuButtons/StartNewGame/SetEntityEnabled·OnBeginPlay→메뉴) 이식
- ui/DefaultGroup.ui·SlayDeckController.codeblock: 통합 생성기로 재생성
- map10·모델: main 채택 후 freeze 도구(freeze-turn-monsters/player) 재적용
정적 검증: 문법·JSON 유효·생성기 결정적·메뉴/B~E6a 양쪽 유지·freeze 적용.
⚠️ Maker 연결 해제로 메뉴→게임 런타임 검증은 미수행(사용자 메이커 확인 필요).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
|
2026-06-09 13:29:28 +09:00 |
|
|
|
14449373e0
|
Merge pull request 'Add main menu flow' (#7) from feature/main-menu into feature/slay-deck-controller
Reviewed-on: #7
|
2026-06-08 00:38:29 +09:00 |
|
maple
|
27818e92c7
|
Fix turn combat facing and player movement
|
2026-06-08 00:01:46 +09:00 |
|
maple
|
1299d718e2
|
Disable monster patrol movement
|
2026-06-07 23:56:20 +09:00 |
|
maple
|
913b4f1721
|
Avoid client state transition for monsters
|
2026-06-07 23:42:05 +09:00 |
|
maple
|
a9926feea3
|
Freeze monsters for turn combat
|
2026-06-07 23:39:58 +09:00 |
|
maple
|
8eab9a75ac
|
Fix generated UI GUIDs
|
2026-06-07 23:33:44 +09:00 |
|
maple
|
8c397cbc09
|
Add main menu flow
|
2026-06-07 23:27:44 +09:00 |
|
