diff --git a/app/game-api/src/router/general/index.ts b/app/game-api/src/router/general/index.ts index 29f39cbb..23e6d3c1 100644 --- a/app/game-api/src/router/general/index.ts +++ b/app/game-api/src/router/general/index.ts @@ -1,7 +1,7 @@ import { TRPCError } from '@trpc/server'; import { z } from 'zod'; -import { LogCategory, LogScope } from '@sammo-ts/logic'; +import { getBillByLevel, LogCategory, LogScope } from '@sammo-ts/logic'; import { asRecord, type RankDataType } from '@sammo-ts/common'; import type { GameApiContext } from '../../context.js'; @@ -45,6 +45,7 @@ import { import { resolveGeneralTypeCall, resolveLeadershipBonus, + resolveNextTurnMonthOffset, resolveRefreshScoreText, resolveRemainingMinutes, } from '../../services/generalBasicCardProjection.js'; @@ -265,6 +266,7 @@ export const getGeneralContext = async (ctx: GameApiContext) => { dedication: true, age: true, turnTime: true, + turnTick: true, recentWarTime: true, crewTypeId: true, personalCode: true, @@ -333,7 +335,14 @@ export const getGeneralContext = async (ctx: GameApiContext) => { }) : Promise.resolve(NEUTRAL_NATION_CONTEXT), ctx.db.worldState.findFirst({ - select: { currentYear: true, currentMonth: true, tickSeconds: true, config: true, meta: true }, + select: { + currentYear: true, + currentMonth: true, + tickSeconds: true, + lastTurnTick: true, + config: true, + meta: true, + }, }), officerCityId > 0 ? ctx.db.city.findUnique({ where: { id: officerCityId }, select: { name: true } }) @@ -517,9 +526,17 @@ export const getGeneralContext = async (ctx: GameApiContext) => { injury: general.injury, experience: general.experience, dedication: general.dedication, + bill: getBillByLevel(dedicationLevel), age: general.age, retirementYear, turnTime: general.turnTime.toISOString(), + nextTurnMonthOffset: resolveNextTurnMonthOffset({ + turnTime: general.turnTime, + turnTick: general.turnTick, + lastExecuted: parsedLastExecuted, + lastTurnTick: worldState?.lastTurnTick, + turnSeconds: worldState?.tickSeconds ?? 0, + }), recentWar: general.recentWarTime?.toISOString() ?? null, defenceTrain: settings.defence_train, killTurn: readNumber(metaRecord.killturn ?? metaRecord.killTurn, 0), diff --git a/app/game-api/src/router/lobby/index.ts b/app/game-api/src/router/lobby/index.ts index 0b611078..a2fe2dde 100644 --- a/app/game-api/src/router/lobby/index.ts +++ b/app/game-api/src/router/lobby/index.ts @@ -68,7 +68,10 @@ export const lobbyRouter = router({ preopenAt: worldState.meta.preopenAt ?? '', turntime: worldState.meta.turntime ?? '', serverTime: gameTime.now.toISOString(), + serverWallTime: gameTime.wallNow.toISOString(), clockMode: gameTime.mode ?? 'realtime', + clockRunning: gameTime.running, + clockStartsAt: gameTime.startsAt?.toISOString() ?? null, otherTextInfo: worldState.meta.otherTextInfo ?? '', npcMode: worldState.config.npcMode ?? 0, defaultStatTotal: asNumber(asRecord(rawConfig.stat).total, 165), diff --git a/app/game-api/src/router/nation/endpoints/getBattleCenter.ts b/app/game-api/src/router/nation/endpoints/getBattleCenter.ts index 0601df8a..502adbca 100644 --- a/app/game-api/src/router/nation/endpoints/getBattleCenter.ts +++ b/app/game-api/src/router/nation/endpoints/getBattleCenter.ts @@ -1,7 +1,7 @@ import { TRPCError } from '@trpc/server'; import { asRecord, type RankDataType } from '@sammo-ts/common'; -import { LogCategory } from '@sammo-ts/logic'; +import { getBillByLevel, LogCategory } from '@sammo-ts/logic'; import { accessAuthedProcedure } from '../../../trpc.js'; import { @@ -201,6 +201,7 @@ export const getBattleCenter = accessAuthedProcedure.query(async ({ ctx }) => { }, experience: general.experience, dedication: general.dedication, + bill: getBillByLevel(dedicationLevel), injury: general.injury, gold: general.gold, rice: general.rice, diff --git a/app/game-api/src/router/troop/index.ts b/app/game-api/src/router/troop/index.ts index 54370c7a..810eb1d1 100644 --- a/app/game-api/src/router/troop/index.ts +++ b/app/game-api/src/router/troop/index.ts @@ -79,7 +79,7 @@ export const troopRouter = router({ troopLeaderIds.length === 0 ? [] : await ctx.db.generalTurn.findMany({ - where: { generalId: { in: troopLeaderIds } }, + where: { generalId: { in: troopLeaderIds }, turnIdx: { lt: 5 } }, select: { generalId: true, turnIdx: true, actionCode: true }, orderBy: [{ generalId: 'asc' }, { turnIdx: 'asc' }], }); @@ -94,7 +94,8 @@ export const troopRouter = router({ : 30; for (const turn of turns) { const list = reservedByLeader.get(turn.generalId) ?? []; - list.push(turn.actionCode); + // Ref 부대 편성은 앞쪽 슬롯이 집합인지 여부만 공개하고 다른 명령은 가립니다. + list.push(turn.actionCode === 'che_집합' ? '집합' : '-'); reservedByLeader.set(turn.generalId, list); } diff --git a/app/game-api/src/services/gameClock.ts b/app/game-api/src/services/gameClock.ts index d8862e96..d64a103d 100644 --- a/app/game-api/src/services/gameClock.ts +++ b/app/game-api/src/services/gameClock.ts @@ -4,14 +4,25 @@ import type { DatabaseClient } from '../context.js'; export interface CurrentGameTime { now: Date; + wallNow: Date; tick: number | null; mode: GameClockMode | null; + running: boolean; + startsAt: Date | null; dateToTick(date: Date): number | null; } export const loadCurrentGameTime = async (db: DatabaseClient, wallNow = new Date()): Promise => { if (!db.worldState) { - return { now: wallNow, tick: null, mode: null, dateToTick: () => null }; + return { + now: wallNow, + wallNow, + tick: null, + mode: null, + running: true, + startsAt: null, + dateToTick: () => null, + }; } const state = await db.worldState.findFirst({ orderBy: { id: 'asc' }, @@ -24,7 +35,15 @@ export const loadCurrentGameTime = async (db: DatabaseClient, wallNow = new Date }, }); if (!state?.clockBaseTime || state.clockTick === null || !state.clockWallAnchor) { - return { now: wallNow, tick: null, mode: null, dateToTick: () => null }; + return { + now: wallNow, + wallNow, + tick: null, + mode: null, + running: true, + startsAt: null, + dateToTick: () => null, + }; } const mode: GameClockMode = state.clockMode === 'manual' ? 'manual' : 'realtime'; const storedTick = Number(state.clockTick); @@ -39,10 +58,14 @@ export const loadCurrentGameTime = async (db: DatabaseClient, wallNow = new Date turnSeconds: state.tickSeconds, }); const tick = clock.nowTick(wallNow); + const running = mode === 'realtime' && wallNow.getTime() >= state.clockWallAnchor.getTime(); return { now: clock.tickToDate(tick), + wallNow, tick, mode, + running, + startsAt: mode === 'realtime' && !running ? state.clockWallAnchor : null, dateToTick: (date) => clock.dateToTick(date), }; }; diff --git a/app/game-api/src/services/generalBasicCardProjection.ts b/app/game-api/src/services/generalBasicCardProjection.ts index 556c53aa..3f389efb 100644 --- a/app/game-api/src/services/generalBasicCardProjection.ts +++ b/app/game-api/src/services/generalBasicCardProjection.ts @@ -1,3 +1,5 @@ +import { GAME_TICKS_PER_TURN } from '@sammo-ts/common'; + export interface GeneralBasicStats { leadership: number; strength: number; @@ -53,3 +55,41 @@ export const resolveRemainingMinutes = ( } return Math.floor(Math.min(999, Math.max(0, (nextTurnMillis - lastExecuted.getTime()) / 60_000))); }; + +export interface NextTurnMonthOffsetInput { + turnTime: Date; + turnTick?: bigint | number | null; + lastExecuted: Date | null; + lastTurnTick?: bigint | number | null; + turnSeconds: number; +} + +const normalizeTick = (value: bigint | number | null | undefined): bigint | null => { + if (typeof value === 'bigint') return value; + if (typeof value === 'number' && Number.isSafeInteger(value)) return BigInt(value); + return null; +}; + +const turnBucket = (tick: bigint): bigint => { + const ticksPerTurn = BigInt(GAME_TICKS_PER_TURN); + const quotient = tick / ticksPerTurn; + return tick % ticksPerTurn < 0 ? quotient - 1n : quotient; +}; + +/** + * Ref Command.GetReservedCommand cuts both clocks to a gameplay-turn bucket. + * A general in the next bucket has already acted in the displayed world month, + * so the first reserved command belongs to the following month. + */ +export const resolveNextTurnMonthOffset = (input: NextTurnMonthOffsetInput): 0 | 1 => { + const turnTick = normalizeTick(input.turnTick); + const lastTurnTick = normalizeTick(input.lastTurnTick); + if (turnTick !== null && lastTurnTick !== null) { + return turnBucket(turnTick) > turnBucket(lastTurnTick) ? 1 : 0; + } + + const turnTimeMs = input.turnTime.getTime(); + const lastExecutedMs = input.lastExecuted?.getTime() ?? Number.NaN; + if (!Number.isFinite(turnTimeMs) || !Number.isFinite(lastExecutedMs) || input.turnSeconds <= 0) return 0; + return turnTimeMs >= lastExecutedMs + input.turnSeconds * 1_000 ? 1 : 0; +}; diff --git a/app/game-api/test/auctionWorker.test.ts b/app/game-api/test/auctionWorker.test.ts index 8c98cd83..cab054e9 100644 --- a/app/game-api/test/auctionWorker.test.ts +++ b/app/game-api/test/auctionWorker.test.ts @@ -57,8 +57,11 @@ describe('auction worker clock-shift race', () => { const now = new Date('2026-07-30T12:00:00.000Z'); const time = { now, + wallNow: now, tick: 36_000_000, mode: 'manual' as const, + running: false, + startsAt: null, dateToTick: () => 72_000_000, }; const closeAt = new Date('2099-01-01T00:00:00.000Z'); diff --git a/app/game-api/test/gameClock.test.ts b/app/game-api/test/gameClock.test.ts new file mode 100644 index 00000000..9d746e11 --- /dev/null +++ b/app/game-api/test/gameClock.test.ts @@ -0,0 +1,52 @@ +import { describe, expect, it, vi } from 'vitest'; + +import type { DatabaseClient } from '../src/context.js'; +import { loadCurrentGameTime } from '../src/services/gameClock.js'; + +const buildDatabase = (mode: 'realtime' | 'manual' = 'realtime'): DatabaseClient => + ({ + worldState: { + findFirst: vi.fn(async () => ({ + clockBaseTime: new Date('2026-08-21T09:50:00.000Z'), + clockTick: 36_000_000n, + clockMode: mode, + clockWallAnchor: new Date('2026-08-21T11:00:00.000Z'), + tickSeconds: 600, + })), + }, + }) as unknown as DatabaseClient; + +describe('current game time projection', () => { + it('holds a realtime clock at its persisted tick until the future wall anchor', async () => { + const db = buildDatabase(); + + const preopen = await loadCurrentGameTime(db, new Date('2026-08-21T10:30:00.000Z')); + expect(preopen).toMatchObject({ + now: new Date('2026-08-21T10:00:00.000Z'), + wallNow: new Date('2026-08-21T10:30:00.000Z'), + tick: 36_000_000, + mode: 'realtime', + running: false, + startsAt: new Date('2026-08-21T11:00:00.000Z'), + }); + + const opened = await loadCurrentGameTime(db, new Date('2026-08-21T11:00:05.000Z')); + expect(opened).toMatchObject({ + now: new Date('2026-08-21T10:00:05.000Z'), + tick: 36_300_000, + running: true, + startsAt: null, + }); + }); + + it('keeps a manual clock stopped without scheduling an automatic start', async () => { + const result = await loadCurrentGameTime(buildDatabase('manual'), new Date('2026-08-21T12:00:00.000Z')); + + expect(result).toMatchObject({ + now: new Date('2026-08-21T10:00:00.000Z'), + tick: 36_000_000, + running: false, + startsAt: null, + }); + }); +}); diff --git a/app/game-api/test/generalBasicCardProjection.test.ts b/app/game-api/test/generalBasicCardProjection.test.ts index 9df312ad..250661f4 100644 --- a/app/game-api/test/generalBasicCardProjection.test.ts +++ b/app/game-api/test/generalBasicCardProjection.test.ts @@ -3,6 +3,7 @@ import { describe, expect, it } from 'vitest'; import { resolveGeneralTypeCall, resolveLeadershipBonus, + resolveNextTurnMonthOffset, resolveRefreshScoreText, resolveRemainingMinutes, } from '../src/services/generalBasicCardProjection.js'; @@ -41,4 +42,55 @@ describe('general basic card Ref projection', () => { expect(resolveRemainingMinutes(new Date('2026-08-12T23:59:00.000Z'), lastExecuted, 3_600)).toBe(59); expect(resolveRemainingMinutes(new Date('2026-08-13T00:07:06.000Z'), null, 3_600)).toBeNull(); }); + + it('moves the first reserved month only after the general turn bucket has passed', () => { + const lastExecuted = new Date('2026-08-13T00:00:00.000Z'); + const lastTurnTick = 36_000_000n * 11n; + + expect( + resolveNextTurnMonthOffset({ + turnTime: new Date('2026-08-13T00:07:00.000Z'), + turnTick: lastTurnTick + 12_000_000n, + lastExecuted, + lastTurnTick, + turnSeconds: 600, + }) + ).toBe(0); + expect( + resolveNextTurnMonthOffset({ + turnTime: new Date('2026-08-13T00:17:00.000Z'), + turnTick: lastTurnTick + 48_000_000n, + lastExecuted, + lastTurnTick, + turnSeconds: 600, + }) + ).toBe(1); + expect( + resolveNextTurnMonthOffset({ + turnTime: new Date('2026-08-13T00:10:00.000Z'), + turnTick: 1n, + lastExecuted, + lastTurnTick: -1n, + turnSeconds: 600, + }) + ).toBe(1); + }); + + it('keeps the same boundary for legacy Date-only schedules', () => { + const lastExecuted = new Date('2026-08-13T00:00:00.000Z'); + expect( + resolveNextTurnMonthOffset({ + turnTime: new Date('2026-08-13T00:07:00.000Z'), + lastExecuted, + turnSeconds: 600, + }) + ).toBe(0); + expect( + resolveNextTurnMonthOffset({ + turnTime: new Date('2026-08-13T00:10:00.000Z'), + lastExecuted, + turnSeconds: 600, + }) + ).toBe(1); + }); }); diff --git a/app/game-api/test/inGameMenuPermissions.test.ts b/app/game-api/test/inGameMenuPermissions.test.ts index 4ed4e01f..9cd5752f 100644 --- a/app/game-api/test/inGameMenuPermissions.test.ts +++ b/app/game-api/test/inGameMenuPermissions.test.ts @@ -297,6 +297,7 @@ describe('in-game my information ownership', () => { statUpgradeLimit: 20, dex: [350, 1_375, 3_500, 7_125, 12_650], }, + bill: 1_000, }, city: { population: 322_886, @@ -433,6 +434,7 @@ describe('in-game my information ownership', () => { stats: { attack: 100, defence: 150, speed: 7, avoid: 10, magicCoef: 0, cost: 9, rice: 9 }, }, progression: { experienceLevel: 4, dedicationLevel: 2, dedicationText: '29품관' }, + bill: 800, itemNames: { horse: '노새(+3)' }, itemInfo: { horse: '통솔 +3' }, }, @@ -855,6 +857,7 @@ describe('battle-center general and user permissions', () => { statUpgradeLimit: 20, dex: [0, 0, 0, 0, 0], }, + bill: 600, serviceYears: 3, battleStats: { kills: 5, diff --git a/app/game-api/test/lobbyRouter.test.ts b/app/game-api/test/lobbyRouter.test.ts index fe228c12..c9c09ec8 100644 --- a/app/game-api/test/lobbyRouter.test.ts +++ b/app/game-api/test/lobbyRouter.test.ts @@ -68,6 +68,32 @@ describe('lobby season state', () => { expect(result.serverTime).toBe('2026-08-15T02:00:00.000Z'); expect(result.clockMode).toBe('manual'); + expect(result.clockRunning).toBe(false); + expect(result.clockStartsAt).toBeNull(); + expect(new Date(result.serverWallTime).getTime()).not.toBeNaN(); + }); + + it('exposes the future realtime wall anchor without advancing the preopen clock', async () => { + const wallAnchor = new Date('2099-08-21T11:00:00.000Z'); + const result = await appRouter + .createCaller( + buildContext( + {}, + { + baseTime: new Date('2026-08-21T09:00:00.000Z'), + tick: 36_000_000n, + mode: 'realtime', + wallAnchor, + } + ) + ) + .lobby.info(); + + expect(result.serverTime).toBe('2026-08-21T10:00:00.000Z'); + expect(result.clockMode).toBe('realtime'); + expect(result.clockRunning).toBe(false); + expect(result.clockStartsAt).toBe(wallAnchor.toISOString()); + expect(new Date(result.serverWallTime).getTime()).toBeLessThan(wallAnchor.getTime()); }); it('preserves zero as the first official game index', async () => { diff --git a/app/game-api/test/troopRouter.test.ts b/app/game-api/test/troopRouter.test.ts index 704c1398..9102d215 100644 --- a/app/game-api/test/troopRouter.test.ts +++ b/app/game-api/test/troopRouter.test.ts @@ -77,10 +77,12 @@ const buildContext = (options: { auth?: GameSessionTokenPayload | null; requestId?: string; transaction?: ReturnType; + turns?: Array<{ generalId: number; turnIdx: number; actionCode: string }>; result: Awaited>; }) => { const me = options.me ?? buildGeneral(); const requestCommand = vi.fn(async () => options.result); + const generalTurnFindMany = vi.fn(async () => options.turns ?? []); const db = { ...(options.transaction ? { $transaction: options.transaction } : {}), general: { @@ -110,7 +112,7 @@ const buildContext = (options: { }, city: { findMany: vi.fn(async () => [{ id: 1, name: '북평' }]) }, worldState: { findFirst: vi.fn(async () => ({ config: { const: { upgradeLimit: 20 } } })) }, - generalTurn: { findMany: vi.fn(async () => []) }, + generalTurn: { findMany: generalTurnFindMany }, }; const accessTokenStore = new RedisAccessTokenStore( { @@ -134,7 +136,7 @@ const buildContext = (options: { flushStore: new InMemoryFlushStore(), gameTokenSecret: 'test-secret', }; - return { context, requestCommand }; + return { context, requestCommand, generalTurnFindMany }; }; describe('troop router permissions and mutations', () => { @@ -175,6 +177,30 @@ describe('troop router permissions and mutations', () => { }); }); + it('returns only the first five Ref-redacted troop command labels without exposing action codes', async () => { + const fixture = buildContext({ + me: buildGeneral({ troopId: 1 }), + turns: [ + { generalId: 1, turnIdx: 0, actionCode: 'che_집합' }, + { generalId: 1, turnIdx: 1, actionCode: 'che_이동' }, + { generalId: 1, turnIdx: 2, actionCode: 'che_징병' }, + { generalId: 1, turnIdx: 3, actionCode: '휴식' }, + { generalId: 1, turnIdx: 4, actionCode: 'che_화계' }, + ], + result: null, + }); + + const result = await appRouter.createCaller(fixture.context).troop.getList(); + + expect(result.troops[0]?.reservedCommands).toEqual(['집합', '-', '-', '-', '-']); + expect(JSON.stringify(result.troops)).not.toContain('che_'); + expect(fixture.generalTurnFindMany).toHaveBeenCalledWith({ + where: { generalId: { in: [1] }, turnIdx: { lt: 5 } }, + select: { generalId: true, turnIdx: true, actionCode: true }, + orderBy: [{ generalId: 'asc' }, { turnIdx: 'asc' }], + }); + }); + it('creates a troop only for the general owned by the authenticated user', async () => { const { context, requestCommand } = buildContext({ result: { type: 'troopCreate', ok: true, generalId: 1, troopId: 1, troopName: '백마대' }, diff --git a/app/game-engine/src/scenario/scenarioSeeder.ts b/app/game-engine/src/scenario/scenarioSeeder.ts index 5bf328fe..fabe1c5d 100644 --- a/app/game-engine/src/scenario/scenarioSeeder.ts +++ b/app/game-engine/src/scenario/scenarioSeeder.ts @@ -50,6 +50,7 @@ export interface ScenarioInstallOptions { joinMode?: 'full' | 'onlyRandom'; autorunUser?: ScenarioAutorunOptions | null; preopenAt?: Date | null; + openAt?: Date | null; season?: number; firstGameIdx?: number; serverId?: string; @@ -229,11 +230,14 @@ export const seedScenarioToDatabase = async (options: ScenarioSeedOptions): Prom const sync = install?.sync ?? false; const startState = resolveStartState(scenario.startYear ?? null, now, turnTermMinutes, sync); const gameClockMode = options.gameClockMode ?? 'realtime'; + // A realtime season prepared before its formal opening must not consume + // wall time while users are only allowed to edit reserved commands. + const initialClockWallAnchor = install?.openAt && install.openAt.getTime() > now.getTime() ? install.openAt : now; const initialClock = new GameClock({ baseTime: startState.startTime, tick: 0, mode: gameClockMode, - wallAnchor: now, + wallAnchor: initialClockWallAnchor, turnSeconds: tickSeconds, }); const initialClockTick = initialClock.dateToTick(now); @@ -410,7 +414,7 @@ export const seedScenarioToDatabase = async (options: ScenarioSeedOptions): Prom clockBaseTime: initialClock.baseTime, clockTick: BigInt(initialClockTick), clockMode: gameClockMode, - clockWallAnchor: now, + clockWallAnchor: initialClock.wallAnchor, lastTurnTick: BigInt(initialClockTick), config: asJson({ ...scenarioConfig, ...worldConfig }), meta: asJson(worldMeta), diff --git a/app/game-engine/test/scenarioSeeder.test.ts b/app/game-engine/test/scenarioSeeder.test.ts index 112b16a1..b81d9a3e 100644 --- a/app/game-engine/test/scenarioSeeder.test.ts +++ b/app/game-engine/test/scenarioSeeder.test.ts @@ -50,6 +50,7 @@ type ScenarioSeederPrismaClient = { tickSeconds: number; currentYear: number; currentMonth: number; + clockWallAnchor: Date | null; } | null>; }; gameHistory: { @@ -364,6 +365,8 @@ describeDb('scenario database seed', () => { develop: true, }, }, + preopenAt: new Date('2030-01-01T01:00:00Z'), + openAt: new Date('2030-01-01T02:00:00Z'), }, }); @@ -385,6 +388,7 @@ describeDb('scenario database seed', () => { } expect(worldState.tickSeconds).toBe(180); expect(worldState.currentMonth).toBe(1); + expect(worldState.clockWallAnchor).toEqual(new Date('2030-01-01T02:00:00.000Z')); const config = (worldState.config ?? {}) as Record; expect(config.extendedGeneral).toBe(false); diff --git a/app/game-frontend/e2e/directoryLists.spec.ts b/app/game-frontend/e2e/directoryLists.spec.ts index bcd7b16b..06edbb51 100644 --- a/app/game-frontend/e2e/directoryLists.spec.ts +++ b/app/game-frontend/e2e/directoryLists.spec.ts @@ -629,6 +629,10 @@ test('nation directory reuses only the public general-directory row on hover and await expect(preview.locator('[data-general-card-id="10"]')).toContainText('대담'); await expect(preview.locator('[data-directory-tooltip="card-special-domestic-10"]')).toContainText('상재'); await expect(preview.locator('[data-directory-tooltip="card-special-war-10"]')).toContainText('귀모'); + await expect(preview.locator('[data-directory-tooltip="card-special-domestic-10"]')).toHaveCSS( + 'text-decoration-line', + 'none' + ); await expect(preview).not.toContainText('user-'); await expect(preview).not.toContainText('secret'); diff --git a/app/game-frontend/e2e/inGameMenus.spec.ts b/app/game-frontend/e2e/inGameMenus.spec.ts index cb5265b8..5e0c0e8c 100644 --- a/app/game-frontend/e2e/inGameMenus.spec.ts +++ b/app/game-frontend/e2e/inGameMenus.spec.ts @@ -112,6 +112,7 @@ const myGeneral = (state: FixtureState) => ({ injury: 0, experience: 100, dedication: 200, + bill: 800, age: 30, turnTime: '2026-01-01 00:10:00', recentWar: '2026-01-01 00:00:00', @@ -296,6 +297,7 @@ const battleCenter = (state: FixtureState) => ({ stats: { leadership: 70, strength: 60, intelligence: 50 }, experience: 100, dedication: 200, + bill: 800, injury: 0, gold: 1_000, rice: 2_000, @@ -334,6 +336,7 @@ const battleCenter = (state: FixtureState) => ({ stats: { leadership: 50, strength: 50, intelligence: 50 }, experience: 0, dedication: 0, + bill: 400, injury: 0, gold: 500, rice: 500, @@ -1245,6 +1248,7 @@ test('내 정보&설정 keeps desktop density and becomes a 390px horizontal-ide await expect(page.locator('.general-table')).toContainText('병종보병'); await expect(page.locator('.general-table')).toContainText('삭턴6 턴'); await expect(page.locator('.battle-general-extra')).toContainText('계급29품관'); + await expect(page.locator('.battle-general-extra')).toContainText('봉급800'); await expect(page.locator('.battle-general-extra')).toContainText('전투8회'); await expect(page.locator('.battle-general-extra')).toContainText('계략12'); await expect(page.locator('.battle-general-extra')).toContainText('사관4년'); @@ -1255,7 +1259,7 @@ test('내 정보&설정 keeps desktop density and becomes a 390px horizontal-ide await expect(page.locator('.battle-general-extra__recent-value')).toHaveText('01-01 00:00'); await expect(page.locator('.legacy-general-details')).toHaveCount(0); expect(await readGeneralSummaryRows(page.locator('.battle-general-extra'))).toEqual([ - ['명성', '계급', ''], + ['명성', '계급', '봉급'], ['전투', '계략', '사관'], ['승률', '승리', '패배'], ['살상률', '사살', '피살'], @@ -1429,6 +1433,7 @@ test('내 정보 항목과 국가 성향은 HTML 리치 툴팁을 마우스와 const showWithMouse = async (testId: string, expectedTexts: readonly string[]) => { const trigger = page.locator(`[data-rich-tooltip="${testId}"]`); await expect(trigger).toHaveAttribute('tabindex', '0'); + await expect(trigger).toHaveCSS('text-decoration-line', 'none'); await trigger.hover(); await expect(visibleTooltip).toHaveCount(1); await expect(visibleTooltip).toHaveAttribute('role', 'tooltip'); @@ -2039,6 +2044,7 @@ test('감찰부 keeps the selector interaction and shows the permission error pa await expect(page.locator('.battle-general-name')).toContainText('간의대부'); await expect(page.locator('.battle-general-name')).toContainText('건강'); await expect(page.locator('.battle-general-extra')).toContainText('계급29품관'); + await expect(page.locator('.battle-general-extra')).toContainText('봉급800'); await expect(page.locator('.battle-general-card')).toContainText('병종보병'); await expect(page.locator('.battle-general-card')).not.toContainText('che_'); await expect(page.locator('.battle-general-card')).toHaveAttribute('data-general-basic-card', ''); @@ -2049,7 +2055,7 @@ test('감찰부 keeps the selector interaction and shows the permission error pa await expect(page.locator('.battle-general-extra')).toContainText('승률62.50%'); await expect(page.locator('.battle-general-extra')).toContainText('살상률181.84%'); expect(await readGeneralSummaryRows(page.locator('.battle-general-extra'))).toEqual([ - ['명성', '계급', ''], + ['명성', '계급', '봉급'], ['전투', '계략', '사관'], ['승률', '승리', '패배'], ['살상률', '사살', '피살'], diff --git a/app/game-frontend/e2e/mainNavigation.spec.ts b/app/game-frontend/e2e/mainNavigation.spec.ts index db786009..0e0aa0ba 100644 --- a/app/game-frontend/e2e/mainNavigation.spec.ts +++ b/app/game-frontend/e2e/mainNavigation.spec.ts @@ -34,8 +34,12 @@ type NavigationFixture = { operations: string[]; generalName?: string; generalTurnTime?: string; + nextTurnMonthOffset?: 0 | 1; serverTime?: string; + serverWallTime?: string; clockMode?: 'realtime' | 'manual'; + clockRunning?: boolean; + clockStartsAt?: string | null; cityDefence?: number; cityState?: number; nationRate?: number; @@ -437,6 +441,7 @@ const generalContext = (state: NavigationFixture) => ({ crewTypeName: '보병', traits: { personal: '대담', specialDomestic: '상재', specialWar: '무쌍' }, turnTime: state.generalTurnTime ?? '0185-01-01T00:00:00.000Z', + nextTurnMonthOffset: state.nextTurnMonthOffset ?? 0, }, city: { id: 1, @@ -587,7 +592,10 @@ const installFixture = async (page: Page, state: NavigationFixture) => { month: state.currentMonth ?? 1, turnTerm: 10, serverTime: state.serverTime ?? '2026-08-13T00:00:00.000Z', + serverWallTime: state.serverWallTime ?? '2026-08-13T00:00:00.000Z', clockMode: state.clockMode ?? 'realtime', + clockRunning: state.clockRunning ?? true, + clockStartsAt: state.clockStartsAt ?? null, scenarioTitle: state.scenarioTitle ?? '', }); } @@ -1182,7 +1190,7 @@ test('desktop menus preserve ref columns, prefix-safe routes, and controlled dro await expect(page.locator('.legacy-game-info')).toContainText('현재: 185년 1월'); await expect(page.locator('.legacy-game-info')).toContainText('턴: 10분'); await expect(page.locator('.legacy-game-info')).not.toContainText('최근 턴:'); - await expect(page.locator('.execution-status')).toHaveText('동작 시각: 08-13 09:05'); + await expect(page.locator('.execution-status')).toHaveText('현재 시각: 08-13 09:00'); await expect(page.locator('.tournament-status')).toHaveText('토너먼트: 참가 모집중'); await expect(page.locator('.vote-status')).toHaveText('설문: 메뉴 설문'); const headerStatusGeometry = await page.locator('.main-page').evaluate((element) => { @@ -1617,6 +1625,105 @@ test('the repeated bottom global menu opens upward on the mobile document', asyn await persistArtifact(page, `${basePath.slice(1)}-mobile-bottom-dropup`); }); +test('first reserved month crosses December only after the general turn has passed', async ({ page }, testInfo) => { + const state: NavigationFixture = { + officerLevel: 0, + permission: 0, + nationLevel: 0, + stage: 0, + npcMode: 1, + generalMeCalls: 0, + operations: [], + currentYear: 179, + currentMonth: 12, + nextTurnMonthOffset: 0, + validMapImages: true, + reservedTurns: [ + { index: 0, action: '휴식', args: {} }, + { index: 1, action: '휴식', args: {} }, + ], + }; + await installRealtimeHarness(page); + await installFixture(page, state); + await page.setViewportSize({ width: 1200, height: 900 }); + await waitForMain(page); + await waitForMainRealtime(page); + + const map = page.locator('[data-main-target="map"] .map-viewer').first(); + const commandPanel = page.locator('[data-main-target="commands"]').first(); + const firstDate = commandPanel.locator('.date-column [data-turn-index="0"]'); + const secondDate = commandPanel.locator('.date-column [data-turn-index="1"]'); + + await expect(map).toContainText('179年 12月'); + await expect(firstDate).toHaveText('179年 12月'); + await expect(secondDate).toHaveText('180年 1月'); + const before = await firstDate.evaluate((element) => { + const rect = element.getBoundingClientRect(); + const style = getComputedStyle(element); + return { + rect: rect.toJSON(), + fontSize: style.fontSize, + lineHeight: style.lineHeight, + color: style.color, + documentScrollWidth: document.documentElement.scrollWidth, + viewportWidth: window.innerWidth, + }; + }); + await commandPanel.screenshot({ path: testInfo.outputPath('turn-month-before.png') }); + + state.nextTurnMonthOffset = 1; + state.contextRevision = 'BBBBBBBBBBBBBBBBBBBBBB'; + state.contextOperations = [{ op: 'replace', path: '/general/nextTurnMonthOffset', value: 1 }]; + await emitReadModelInvalidation(page, readModelInvalidation({ context: true })); + + await expect(map).toContainText('179年 12月'); + await expect(firstDate).toHaveText('180年 1月'); + await expect(secondDate).toHaveText('180年 2月'); + await firstDate.hover(); + const after = await firstDate.evaluate((element) => { + const rect = element.getBoundingClientRect(); + const style = getComputedStyle(element); + return { + rect: rect.toJSON(), + fontSize: style.fontSize, + lineHeight: style.lineHeight, + color: style.color, + documentScrollWidth: document.documentElement.scrollWidth, + viewportWidth: window.innerWidth, + }; + }); + expect(after.rect.width).toBe(before.rect.width); + expect(after.rect.height).toBe(before.rect.height); + expect(after.rect.left).toBe(before.rect.left); + expect(after.rect.right).toBe(before.rect.right); + expect(after.fontSize).toBe(before.fontSize); + expect(after.lineHeight).toBe(before.lineHeight); + expect(after.color).toBe(before.color); + expect(before.documentScrollWidth).toBe(before.viewportWidth); + expect(after.documentScrollWidth).toBe(after.viewportWidth); + await commandPanel.screenshot({ path: testInfo.outputPath('turn-month-after.png') }); + + await page.setViewportSize({ width: 390, height: 844 }); + await firstDate.scrollIntoViewIfNeeded(); + await expect(firstDate).toHaveText('180年 1月'); + const mobile = await firstDate.evaluate((element) => { + const rect = element.getBoundingClientRect(); + const style = getComputedStyle(element); + return { + rect: rect.toJSON(), + fontSize: style.fontSize, + lineHeight: style.lineHeight, + documentScrollWidth: document.documentElement.scrollWidth, + }; + }); + expect(mobile.rect.left).toBeGreaterThanOrEqual(0); + expect(mobile.rect.right).toBeLessThanOrEqual(500); + expect(mobile.fontSize).toBe(before.fontSize); + expect(mobile.lineHeight).toBe(before.lineHeight); + expect(mobile.documentScrollWidth).toBe(500); + await commandPanel.screenshot({ path: testInfo.outputPath('turn-month-mobile.png') }); +}); + test('main general card uses local turn time and command clock tracks corrected server time', async ({ page }) => { const state: NavigationFixture = { officerLevel: 0, @@ -1743,12 +1850,131 @@ test('main general card uses local turn time and command clock tracks corrected } state.clockMode = 'manual'; + state.clockRunning = false; state.serverTime = '2026-08-13T00:08:30.000Z'; await page.reload(); const frozenClock = page.locator('[data-main-target="commands"] [data-command-current-time]').first(); await expect(frozenClock).toHaveText('09:08:30'); await page.clock.runFor(2_000); await expect(frozenClock).toHaveText('09:08:30'); + + state.clockMode = 'realtime'; + state.clockRunning = false; + state.serverTime = '2026-08-13T00:10:00.000Z'; + state.serverWallTime = '2026-08-21T10:00:00.000Z'; + state.clockStartsAt = '2026-08-21T10:00:02.000Z'; + await page.reload(); + const preopenClock = page.locator('[data-main-target="commands"] [data-command-current-time]').first(); + await expect(preopenClock).toHaveText('09:10:00'); + const operationsBeforePreopenBoundary = state.operations.length; + await page.clock.runFor(1_500); + await expect(preopenClock).toHaveText('09:10:00'); + if (artifactRoot) { + const preopenGeometry = await preopenClock.evaluate((element) => ({ + rect: element.getBoundingClientRect().toJSON(), + overflow: element.scrollWidth - element.clientWidth, + fontSize: getComputedStyle(element).fontSize, + lineHeight: getComputedStyle(element).lineHeight, + value: element.textContent, + })); + expect(preopenGeometry.overflow).toBeLessThanOrEqual(0); + await Promise.all([ + page.screenshot({ + path: resolve(artifactRoot, 'main-preopen-clock-frozen-mobile-500.png'), + fullPage: true, + }), + writeFile( + resolve(artifactRoot, 'main-preopen-clock-frozen-mobile-500.json'), + `${JSON.stringify(preopenGeometry, null, 2)}\n` + ), + ]); + } + await page.clock.runFor(1_500); + await expect(preopenClock).toHaveText('09:10:01'); + expect(state.operations).toHaveLength(operationsBeforePreopenBoundary); +}); + +test('main header clock follows minute boundaries only while game-server contact is recent', async ({ + page, +}, testInfo) => { + const state: NavigationFixture = { + officerLevel: 0, + permission: 0, + nationLevel: 0, + stage: 0, + npcMode: 1, + generalMeCalls: 0, + operations: [], + serverTime: '2026-08-13T00:00:35.000Z', + serverWallTime: '2026-08-13T00:00:00.000Z', + clockMode: 'realtime', + clockRunning: true, + }; + await installRealtimeHarness(page); + await installFixture(page, state); + await page.clock.install({ time: new Date('2026-08-13T00:00:00.000Z') }); + await page.setViewportSize({ width: 1200, height: 900 }); + await waitForMain(page); + await waitForMainRealtime(page); + + const clock = page.locator('.execution-status'); + const initialRequestCount = state.trpcRequests?.length ?? 0; + await expect(clock).toHaveText('현재 시각: 08-13 09:00'); + await expect(clock).not.toHaveClass(/execution-status--stale/u); + + await page.clock.runFor(25_000); + await expect(clock).toHaveText('현재 시각: 08-13 09:01'); + + await page.clock.runFor(21_000); + await expect(clock).toHaveClass(/execution-status--stale/u); + await expect(clock).toHaveAttribute('title', '최근 45초 동안 서버 통신이 없어 시각 갱신을 멈췄습니다.'); + await expect.poll(() => clock.evaluate((element) => getComputedStyle(element).color)).toBe('rgb(255, 0, 255)'); + const staleDesktopGeometry = await clock.evaluate((element) => ({ + rect: element.getBoundingClientRect().toJSON(), + overflow: element.scrollWidth - element.clientWidth, + color: getComputedStyle(element).color, + fontSize: getComputedStyle(element).fontSize, + lineHeight: getComputedStyle(element).lineHeight, + })); + expect(staleDesktopGeometry.rect.width).toBeCloseTo(333.33, 0); + expect(staleDesktopGeometry.rect.height).toBeGreaterThanOrEqual(36); + expect(staleDesktopGeometry.overflow).toBeLessThanOrEqual(0); + await clock.screenshot({ path: testInfo.outputPath('main-header-clock-stale-desktop-1200.png') }); + await page.clock.runFor(60_000); + await expect(clock).toHaveText('현재 시각: 08-13 09:01'); + + await page.evaluate(() => { + (window as unknown as { __emitMainRealtime: (type: string, value: unknown) => void }).__emitMainRealtime( + 'ping', + {} + ); + }); + await expect(clock).toHaveText('현재 시각: 08-13 09:02'); + await expect(clock).not.toHaveClass(/execution-status--stale/u); + await page.clock.runFor(39_000); + await expect(clock).toHaveText('현재 시각: 08-13 09:03'); + await expect.poll(() => clock.evaluate((element) => getComputedStyle(element).color)).toBe('rgb(0, 255, 255)'); + + await page.setViewportSize({ width: 500, height: 900 }); + const freshMobileGeometry = await clock.evaluate((element) => ({ + rect: element.getBoundingClientRect().toJSON(), + overflow: element.scrollWidth - element.clientWidth, + color: getComputedStyle(element).color, + fontSize: getComputedStyle(element).fontSize, + lineHeight: getComputedStyle(element).lineHeight, + documentScrollWidth: document.documentElement.scrollWidth, + })); + expect(freshMobileGeometry.rect.width).toBeCloseTo(166.67, 0); + expect(freshMobileGeometry.overflow).toBeLessThanOrEqual(0); + expect(freshMobileGeometry.documentScrollWidth).toBe(500); + await Promise.all([ + clock.screenshot({ path: testInfo.outputPath('main-header-clock-fresh-mobile-500.png') }), + writeFile( + testInfo.outputPath('main-header-clock-geometry.json'), + `${JSON.stringify({ staleDesktopGeometry, freshMobileGeometry }, null, 2)}\n` + ), + ]); + expect(state.trpcRequests?.length ?? 0).toBe(initialRequestCount); }); test('message targets keep reply behavior and use nation-color contrast in labels and select options', async ({ @@ -2064,6 +2290,7 @@ test('main cards and command input stay inside their Ref-sized grid slots', asyn expect(Math.max(...nationRowHeights) - Math.min(...nationRowHeights)).toBeLessThanOrEqual(0.01); const strategicCell = nationCard.locator('.strategic'); const strategicTooltip = strategicCell.getByRole('tooltip'); + await expect(strategicCell).toHaveCSS('text-decoration-line', 'none'); await expect(strategicTooltip).toBeHidden(); await strategicCell.hover(); await expect(strategicTooltip).toBeVisible(); diff --git a/app/game-frontend/e2e/npcPossession.spec.ts b/app/game-frontend/e2e/npcPossession.spec.ts index 8a035639..975e93a7 100644 --- a/app/game-frontend/e2e/npcPossession.spec.ts +++ b/app/game-frontend/e2e/npcPossession.spec.ts @@ -266,6 +266,7 @@ test('renders Ref-shaped token cards, preserves keep cooldown and retries posses }); const tooltip = page.locator('.npc-tooltip').first(); const tooltipPopup = tooltip.getByRole('tooltip'); + await expect(tooltip).toHaveCSS('text-decoration-line', 'none'); await expect(tooltipPopup).toBeHidden(); await tooltip.hover(); await expect(tooltipPopup).toBeVisible(); diff --git a/app/game-frontend/e2e/troop.spec.ts b/app/game-frontend/e2e/troop.spec.ts index 67fc7e71..583f52b4 100644 --- a/app/game-frontend/e2e/troop.spec.ts +++ b/app/game-frontend/e2e/troop.spec.ts @@ -80,7 +80,7 @@ const baseTroops = (): TroopFixture[] => [ name: '백마대', nationId: 1, turnTime: '2026-07-25T08:20:30.000Z', - reservedCommands: ['che_집합', 'che_이동'], + reservedCommands: ['집합', '-'], leader: { id: 1, name: '공손찬', @@ -96,7 +96,7 @@ const baseTroops = (): TroopFixture[] => [ name: '청룡대', nationId: 1, turnTime: '2026-07-25T08:30:30.000Z', - reservedCommands: ['che_징병'], + reservedCommands: ['-'], leader: { id: 2, name: '관우', @@ -224,6 +224,27 @@ const installApiFixture = async (page: Page, state: FixtureState) => { }); }; +test('shows only the Ref-safe first-five troop command labels on desktop and mobile', async ({ page }) => { + await installApiFixture(page, { + me: { id: 1, troopId: 1 }, + permission: 4, + troops: baseTroops(), + }); + + for (const viewport of [ + { width: 1000, height: 800 }, + { width: 500, height: 800 }, + ]) { + await page.setViewportSize(viewport); + await gotoTroop(page); + + const firstTroopCommands = page.locator('.troopReservedCommand').first(); + await expect(firstTroopCommands).toContainText('1: 집합'); + await expect(firstTroopCommands).toContainText('2: -'); + await expect(page.locator('#troopList')).not.toContainText('che_'); + } +}); + test('renders the legacy desktop grid with matching computed geometry and states', async ({ page }) => { await installApiFixture(page, { me: { id: 1, troopId: 1 }, @@ -233,6 +254,9 @@ test('renders the legacy desktop grid with matching computed geometry and states await page.setViewportSize({ width: 1000, height: 800 }); await gotoTroop(page); await expect(page.locator('.troopInfo').filter({ hasText: '백마대' })).toBeVisible(); + await expect(page.locator('.troopReservedCommand').first()).toContainText('1: 집합'); + await expect(page.locator('.troopReservedCommand').first()).toContainText('2: -'); + await expect(page.locator('#troopList')).not.toContainText('che_'); const geometry = await page .locator('.troopItem') @@ -319,6 +343,9 @@ test('matches the legacy 500px responsive placement', async ({ page }) => { await page.setViewportSize({ width: 500, height: 800 }); await gotoTroop(page); await expect(page.locator('.troopInfo').filter({ hasText: '백마대' })).toBeVisible(); + await expect(page.locator('.troopReservedCommand').first()).toContainText('1: 집합'); + await expect(page.locator('.troopReservedCommand').first()).toContainText('2: -'); + await expect(page.locator('#troopList')).not.toContainText('che_'); const geometry = await page .locator('.troopItem') diff --git a/app/game-frontend/src/components/directory/DirectoryTooltip.vue b/app/game-frontend/src/components/directory/DirectoryTooltip.vue index 9106f8e3..9110bbc4 100644 --- a/app/game-frontend/src/components/directory/DirectoryTooltip.vue +++ b/app/game-frontend/src/components/directory/DirectoryTooltip.vue @@ -29,8 +29,6 @@ defineProps<{ } .directory-tooltip--enabled { cursor: help; - text-decoration: underline dotted rgb(150 210 255 / 85%); - text-underline-offset: 2px; } .directory-tooltip--enabled:focus-visible { border-radius: 2px; diff --git a/app/game-frontend/src/components/main/CommandListPanel.vue b/app/game-frontend/src/components/main/CommandListPanel.vue index 82846b40..23588718 100644 --- a/app/game-frontend/src/components/main/CommandListPanel.vue +++ b/app/game-frontend/src/components/main/CommandListPanel.vue @@ -3,6 +3,7 @@ import { computed, onUnmounted, ref, watch } from 'vue'; import { addMinutes } from 'date-fns'; import ReservedCommandEditor from '../command/ReservedCommandEditor.vue'; import { formatLocalDateTime, formatLocalTimeSeconds } from '../../utils/legacyDateTime'; +import { projectServerClock, sampleServerClock, type SampledServerClock } from '../../utils/serverClockProjection'; import type { CommandMapData, CommandMapLayout, @@ -15,12 +16,15 @@ const props = defineProps<{ commandTable: CommandTable | null; loading: boolean; reservedGeneralTurns: Array<{ index: number; action: string; args?: unknown }> | null; - general: { id: number; turnTime?: string } | null; + general: { id: number; turnTime?: string; nextTurnMonthOffset?: 0 | 1 } | null; currentYear?: number; currentMonth?: number; turnTermMinutes?: number; serverTime?: string; + serverWallTime?: string; clockMode?: 'realtime' | 'manual'; + clockRunning?: boolean; + clockStartsAt?: string | null; autorunLimit?: number | null; storageKey?: string; mapData?: CommandMapData | null; @@ -41,13 +45,19 @@ const labelMap = computed(() => { return result; }); +const firstReservedMonth = computed( + () => + (props.currentYear ?? 0) * 12 + + (props.currentMonth ?? 1) - + 1 + + (props.general?.nextTurnMonthOffset ?? 0) +); + const rows = computed(() => { const base = props.general?.turnTime ? new Date(props.general.turnTime) : null; const term = props.turnTermMinutes ?? 0; - const baseYear = props.currentYear ?? 0; - const baseMonth = props.currentMonth ?? 1; return (props.reservedGeneralTurns ?? []).map((turn, offset) => { - const absoluteMonth = baseYear * 12 + baseMonth - 1 + offset; + const absoluteMonth = firstReservedMonth.value + offset; const date = base && Number.isFinite(base.getTime()) ? addMinutes(base, offset * term) : null; return { ...turn, @@ -67,9 +77,7 @@ const rows = computed(() => { const autonomousUntil = computed(() => { if (props.autorunLimit == null) return null; - const baseYear = props.currentYear ?? 0; - const baseMonth = props.currentMonth ?? 1; - const currentAbsoluteMonth = baseYear * 12 + baseMonth - 1; + const currentAbsoluteMonth = firstReservedMonth.value; const lastAutonomousMonth = props.autorunLimit - 1; if (lastAutonomousMonth < currentAbsoluteMonth) return null; @@ -86,32 +94,34 @@ const autonomousUntil = computed(() => { }); const currentServerTime = ref('--:--:--'); -let sampledServerTimeMs: number | null = null; -let sampledClientTimeMs = 0; +const MAX_SERVER_CLOCK_TIMER_DELAY_MS = 60_000; +let serverClockSample: SampledServerClock | null = null; let serverClockTimer: ReturnType | undefined; const updateServerClock = () => { if (serverClockTimer !== undefined) clearTimeout(serverClockTimer); serverClockTimer = undefined; - if (sampledServerTimeMs === null) { + if (serverClockSample === null) { currentServerTime.value = '--:--:--'; return; } - const projectedTime = new Date( - props.clockMode === 'manual' ? sampledServerTimeMs : sampledServerTimeMs + Date.now() - sampledClientTimeMs - ); + const { clientElapsedMs, time: projectedTime } = projectServerClock(serverClockSample); currentServerTime.value = formatLocalTimeSeconds(projectedTime); - if (props.clockMode !== 'manual') { - serverClockTimer = setTimeout(updateServerClock, 1_000 - projectedTime.getMilliseconds()); + if (serverClockSample.clockMode !== 'manual' && serverClockSample.startDelayMs !== null) { + const untilStartMs = serverClockSample.startDelayMs - clientElapsedMs; + serverClockTimer = setTimeout( + updateServerClock, + untilStartMs > 0 + ? Math.min(untilStartMs, MAX_SERVER_CLOCK_TIMER_DELAY_MS) + : 1_000 - projectedTime.getMilliseconds() + ); } }; watch( - () => [props.serverTime, props.clockMode] as const, - ([serverTime]) => { - const parsed = serverTime ? new Date(serverTime).getTime() : Number.NaN; - sampledServerTimeMs = Number.isFinite(parsed) ? parsed : null; - sampledClientTimeMs = Date.now(); + () => [props.serverTime, props.serverWallTime, props.clockMode, props.clockRunning, props.clockStartsAt] as const, + ([serverTime, serverWallTime, clockMode, clockRunning, clockStartsAt]) => { + serverClockSample = sampleServerClock({ serverTime, serverWallTime, clockMode, clockRunning, clockStartsAt }); updateServerClock(); }, { immediate: true } diff --git a/app/game-frontend/src/components/main/GeneralBattleSummary.vue b/app/game-frontend/src/components/main/GeneralBattleSummary.vue index 7b2ec503..b7b97216 100644 --- a/app/game-frontend/src/components/main/GeneralBattleSummary.vue +++ b/app/game-frontend/src/components/main/GeneralBattleSummary.vue @@ -7,6 +7,7 @@ export type GeneralBattleSummaryData = { available?: boolean; experience?: number | null; dedicationText?: string | null; + bill?: number | null; warnum?: number | null; wins?: number | null; losses?: number | null; @@ -62,8 +63,13 @@ const killRate = computed(() => {