fix: 가오픈 동안 서버 게임 시계를 정지한다
정식 오픈 시각을 게임 시계 anchor로 전달하고, API가 실제 진행 상태와 시작 경계를 반환하게 한다. 프론트는 추가 조회 없이 경계에서 자동으로 시계를 시작한다.
This commit is contained in:
@@ -34,7 +34,10 @@ type NavigationFixture = {
|
||||
generalName?: string;
|
||||
generalTurnTime?: string;
|
||||
serverTime?: string;
|
||||
serverWallTime?: string;
|
||||
clockMode?: 'realtime' | 'manual';
|
||||
clockRunning?: boolean;
|
||||
clockStartsAt?: string | null;
|
||||
cityDefence?: number;
|
||||
cityState?: number;
|
||||
nationRate?: number;
|
||||
@@ -555,7 +558,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 ?? '',
|
||||
});
|
||||
}
|
||||
@@ -1711,12 +1717,48 @@ 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('message targets keep reply behavior and use nation-color contrast in labels and select options', async ({
|
||||
|
||||
@@ -20,7 +20,10 @@ const props = defineProps<{
|
||||
currentMonth?: number;
|
||||
turnTermMinutes?: number;
|
||||
serverTime?: string;
|
||||
serverWallTime?: string;
|
||||
clockMode?: 'realtime' | 'manual';
|
||||
clockRunning?: boolean;
|
||||
clockStartsAt?: string | null;
|
||||
autorunLimit?: number | null;
|
||||
storageKey?: string;
|
||||
mapData?: CommandMapData | null;
|
||||
@@ -86,8 +89,10 @@ const autonomousUntil = computed(() => {
|
||||
});
|
||||
|
||||
const currentServerTime = ref('--:--:--');
|
||||
const MAX_SERVER_CLOCK_TIMER_DELAY_MS = 60_000;
|
||||
let sampledServerTimeMs: number | null = null;
|
||||
let sampledClientTimeMs = 0;
|
||||
let sampledStartDelayMs: number | null = 0;
|
||||
let serverClockTimer: ReturnType<typeof setTimeout> | undefined;
|
||||
|
||||
const updateServerClock = () => {
|
||||
@@ -97,21 +102,42 @@ const updateServerClock = () => {
|
||||
currentServerTime.value = '--:--:--';
|
||||
return;
|
||||
}
|
||||
const projectedTime = new Date(
|
||||
props.clockMode === 'manual' ? sampledServerTimeMs : sampledServerTimeMs + Date.now() - sampledClientTimeMs
|
||||
);
|
||||
const clientElapsedMs = Math.max(0, Date.now() - sampledClientTimeMs);
|
||||
const elapsedGameMs =
|
||||
props.clockMode === 'manual' || sampledStartDelayMs === null
|
||||
? 0
|
||||
: Math.max(0, clientElapsedMs - sampledStartDelayMs);
|
||||
const projectedTime = new Date(sampledServerTimeMs + elapsedGameMs);
|
||||
currentServerTime.value = formatLocalTimeSeconds(projectedTime);
|
||||
if (props.clockMode !== 'manual') {
|
||||
serverClockTimer = setTimeout(updateServerClock, 1_000 - projectedTime.getMilliseconds());
|
||||
if (props.clockMode !== 'manual' && sampledStartDelayMs !== null) {
|
||||
const untilStartMs = sampledStartDelayMs - 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]) => {
|
||||
() => [props.serverTime, props.serverWallTime, props.clockMode, props.clockRunning, props.clockStartsAt] as const,
|
||||
([serverTime, serverWallTime, clockMode, clockRunning, clockStartsAt]) => {
|
||||
const parsed = serverTime ? new Date(serverTime).getTime() : Number.NaN;
|
||||
sampledServerTimeMs = Number.isFinite(parsed) ? parsed : null;
|
||||
sampledClientTimeMs = Date.now();
|
||||
if (clockMode === 'manual') {
|
||||
sampledStartDelayMs = null;
|
||||
} else if (clockRunning !== false) {
|
||||
sampledStartDelayMs = 0;
|
||||
} else {
|
||||
const wallTimeMs = serverWallTime ? new Date(serverWallTime).getTime() : Number.NaN;
|
||||
const startsAtMs = clockStartsAt ? new Date(clockStartsAt).getTime() : Number.NaN;
|
||||
sampledStartDelayMs =
|
||||
Number.isFinite(wallTimeMs) && Number.isFinite(startsAtMs)
|
||||
? Math.max(0, startsAtMs - wallTimeMs)
|
||||
: null;
|
||||
}
|
||||
updateServerClock();
|
||||
},
|
||||
{ immediate: true }
|
||||
|
||||
@@ -267,7 +267,10 @@ watch(
|
||||
:current-month="lobbyInfo?.month"
|
||||
:turn-term-minutes="lobbyInfo?.turnTerm"
|
||||
:server-time="lobbyInfo?.serverTime"
|
||||
:server-wall-time="lobbyInfo?.serverWallTime"
|
||||
:clock-mode="lobbyInfo?.clockMode"
|
||||
:clock-running="lobbyInfo?.clockRunning"
|
||||
:clock-starts-at="lobbyInfo?.clockStartsAt"
|
||||
:autorun-limit="reservedGeneralAutorunLimit"
|
||||
:map-data="worldMap"
|
||||
:map-layout="mapLayout"
|
||||
@@ -437,7 +440,10 @@ watch(
|
||||
:current-month="lobbyInfo?.month"
|
||||
:turn-term-minutes="lobbyInfo?.turnTerm"
|
||||
:server-time="lobbyInfo?.serverTime"
|
||||
:server-wall-time="lobbyInfo?.serverWallTime"
|
||||
:clock-mode="lobbyInfo?.clockMode"
|
||||
:clock-running="lobbyInfo?.clockRunning"
|
||||
:clock-starts-at="lobbyInfo?.clockStartsAt"
|
||||
:autorun-limit="reservedGeneralAutorunLimit"
|
||||
:map-data="worldMap"
|
||||
:map-layout="mapLayout"
|
||||
|
||||
Reference in New Issue
Block a user