merge: 최신 main을 턴 입력기 연월 경계 수정에 통합한다

app/game-frontend/src/components/main/CommandListPanel.vue

@@ -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;
@@ -90,8 +93,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 = () => {
@@ -101,21 +106,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 }

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(() => {
         <template v-else>
             <span>명성</span><strong>{{ numberText(summary.experience) }}</strong> <span>계급</span
             ><strong>{{ summary.dedicationText || '-' }}</strong>
-            <span class="battle-general-extra__empty" aria-hidden="true"></span>
-            <strong class="battle-general-extra__empty" aria-hidden="true"></strong>
+            <template v-if="summary.bill !== undefined">
+                <span>봉급</span><strong>{{ numberText(summary.bill) }}</strong>
+            </template>
+            <template v-else>
+                <span class="battle-general-extra__empty" aria-hidden="true"></span>
+                <strong class="battle-general-extra__empty" aria-hidden="true"></strong>
+            </template>
             <span>전투</span
             ><strong>{{ numberText(summary.warnum) }}<template v-if="summary.warnum != null">회</template></strong>
             <span>계략</span><strong>{{ numberText(summary.strategies) }}</strong>

app/game-frontend/src/views/BattleCenterView.vue

@@ -291,6 +291,7 @@ onMounted(() => {
                                       available: true,
                                       experience: selectedGeneral.experience,
                                       dedicationText: selectedGeneral.progression.dedicationText,
+                                      bill: selectedGeneral.bill,
                                       warnum: selectedGeneral.warnum,
                                       wins: selectedGeneral.battleStats.kills,
                                       losses: selectedGeneral.battleStats.deaths,

app/game-frontend/src/views/MainView.vue

@@ -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"

app/game-frontend/src/views/MyPageView.vue

@@ -421,6 +421,7 @@ onMounted(() => {
                                   available: true,
                                   experience: data.general.experience,
                                   dedicationText: data.general.progression?.dedicationText,
+                                  bill: data.general.bill,
                                   warnum: data.general.records.battles,
                                   wins: data.general.records.wins,
                                   losses: data.general.records.losses,