merge: 최신 main을 가오픈 서버 시계 수정에 통합한다

2026-08-21 16:57:52 +00:00
parent f6f764da7f 5a6295f67a
commit 19111b64ba
43 changed files with 1643 additions and 481 deletions
@@ -175,13 +175,14 @@ export const worldRouter = router({
            const turns = generalIds.length
                ? await ctx.db.generalTurn.findMany({
                      where: { generalId: { in: generalIds }, turnIdx: { lt: 5 } },
+                      select: { generalId: true, turnIdx: true, actionCode: true, arg: true },
                      orderBy: [{ generalId: 'asc' }, { turnIdx: 'asc' }],
                  })
                : [];
-            const turnMap = new Map<number, string[]>();
+            const turnMap = new Map<number, Array<{ action: string; args: unknown }>>();
            for (const turn of turns) {
                const list = turnMap.get(turn.generalId) ?? [];
-                list[turn.turnIdx] = turn.actionCode;
+                list[turn.turnIdx] = { action: turn.actionCode, args: turn.arg };
                turnMap.set(turn.generalId, list);
            }
            const nationMap = new Map(nations.map((item) => [item.id, item]));