merge: 최신 main을 메인 갱신 제어 작업에 통합

app/game-frontend/src/components/command/ReservedCommandEditor.vue

@@ -142,11 +142,12 @@ const isRecruitmentCommand = computed(
     () => selectedCommand.value?.key === 'che_징병' || selectedCommand.value?.key === 'che_모병'
 );
 const isRecruitmentOverlayOpen = computed(() => pickerOpen.value && isRecruitmentCommand.value);
-const rowLabel = (row: ReservedCommandRow): string =>
-    formatReservedCommandBrief(props.scope, row.action, row.args, props.commandTable) ||
-    row.label ||
-    labelMap.value.get(row.action) ||
-    row.action;
+const commandBrief = (entry: { action: string; args: unknown; label?: string }): string =>
+    formatReservedCommandBrief(props.scope, entry.action, entry.args, props.commandTable) ||
+    entry.label ||
+    labelMap.value.get(entry.action) ||
+    entry.action;
+const rowLabel = (row: ReservedCommandRow): string => commandBrief(row);
 const selectedIndices = () => normalizedSelection(selected.value, previousSelected.value, props.rows.length);
 const pattern = () => extractPattern(props.rows, selectedIndices());
 const touchMenus = () => (menuRevision.value += 1);
@@ -467,7 +468,7 @@ const clickOutsideMenu = (event: Event) => {
                                     clickOutsideMenu($event);
                                 "
                             >
-                                {{ entry.label ?? labelMap.get(entry.action) ?? entry.action }}
+                                {{ commandBrief(entry) }}
                             </button>
                             <span v-if="!storage?.recent.size" class="empty-menu">비어 있음</span>
                         </div>

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

@@ -796,12 +796,12 @@ onMounted(() => {
     width: min(100%, 1000px);
     margin: 0 auto;
     border: 1px solid #888;
-    overflow: hidden;
+    overflow-x: hidden;
     box-sizing: border-box;
     position: relative;
     padding: 0 7px;
     color: #fff;
-    height: 1597px;
+    min-height: 1597px;
     font: 14px/21px var(--sammo-font-sans);
 }
 
@@ -1017,7 +1017,7 @@ a:not(.legacy-button):focus-visible {
     }
 
     .inherit-page {
-        height: 3047.5px;
+        min-height: 3047.5px;
     }
 
     .shop-item .buy-button {

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

@@ -136,6 +136,9 @@ const statusLine = computed(() =>
 
 const canSave = computed(() => (data.value?.settings.myset ?? 1) > 0);
 const penalties = computed(() => Object.entries(data.value?.penalties ?? {}));
+const numberText = (value: number): string => value.toLocaleString('ko-KR');
+const percentText = (numerator: number, denominator: number): string =>
+    `${((numerator / Math.max(denominator, 1)) * 100).toFixed(2)}%`;
 const noDefencePenaltyWaived = computed(() => {
     const environment = asRecord(world.value?.config.environment);
     return isDefenceTrainPenaltyWaivedByScenarioEffect(
@@ -437,9 +440,22 @@ onMounted(() => {
                                     }})</strong
                                 >
                             </div>
-                            <div>전투 0 · 계략 0 · 사관 7년</div>
-                            <div>승률 0% · 승리 0 · 패배 0</div>
-                            <div>살상률 0% · 사살 0 · 피살 0</div>
+                            <div>
+                                전투 {{ numberText(data.general.records.battles) }} · 계략
+                                {{ numberText(data.general.records.strategies) }} · 사관
+                                {{ numberText(data.general.records.serviceYears) }}년
+                            </div>
+                            <div>
+                                승률 {{ percentText(data.general.records.wins, data.general.records.battles) }} · 승리
+                                {{ numberText(data.general.records.wins) }} · 패배
+                                {{ numberText(data.general.records.losses) }}
+                            </div>
+                            <div>
+                                살상률
+                                {{ percentText(data.general.records.killedCrew, data.general.records.lostCrew) }} · 사살
+                                {{ numberText(data.general.records.killedCrew) }} · 피살
+                                {{ numberText(data.general.records.lostCrew) }}
+                            </div>
                             <div>
                                 소속 {{ data.nation?.name ?? '재야' }} · 도시 {{ data.city?.name ?? '-' }} · 병종
                                 {{ data.general.crewTypeName ?? '-' }} · 내정특기