Merge branch 'main' into fix/main-turn-timezone-20260813

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

@@ -14,6 +14,7 @@ interface GeneralStats {
 interface GeneralProgression {
     experienceLevel: number;
     dedicationLevel: number;
+    dedicationText?: string;
     statExperience?: { leadership: number; strength: number; intelligence: number };
     statUpgradeLimit?: number;
 }
@@ -23,6 +24,7 @@ interface GeneralInfo {
     name: string;
     npcState: number;
     officerLevel: number;
+    officerLevelText: string;
     stats: GeneralStats;
     gold: number;
     rice: number;
@@ -35,6 +37,7 @@ interface GeneralInfo {
     age?: number;
     turnTime?: string;
     crewTypeId?: number;
+    crewTypeName?: string;
     traits?: { personal: string; specialWar: string; specialDomestic: string };
     progression?: GeneralProgression;
 }
@@ -79,7 +82,7 @@ const experiencePercent = computed(() =>
         <div v-else-if="!props.general" class="empty">장수 정보를 불러오지 못했습니다.</div>
         <div v-else class="general-body">
             <div class="general-title">
-                {{ props.general.name }} · 관직 {{ props.general.officerLevel }} · {{ props.general.age ?? '-' }}세 ·
+                {{ props.general.name }} · {{ props.general.officerLevelText }} · {{ props.general.age ?? '-' }}세 ·
                 다음 턴
                 {{ props.general.turnTime ? formatSeoulHourMinute(props.general.turnTime) : '-' }}
             </div>
@@ -103,11 +106,11 @@ const experiencePercent = computed(() =>
                 ><strong>{{ props.general.crew.toLocaleString() }}</strong> <span>훈련</span
                 ><strong>{{ props.general.train }}</strong> <span>사기</span><strong>{{ props.general.atmos }}</strong>
                 <span>부상</span><strong>{{ props.general.injury }}</strong> <span>병종</span
-                ><strong>{{ props.general.crewTypeId || '-' }}</strong> <span>성격</span
+                ><strong>{{ props.general.crewTypeName ?? '-' }}</strong> <span>성격</span
                 ><strong>{{ props.general.traits?.personal ?? '-' }}</strong> <span>전투특기</span
                 ><strong>{{ props.general.traits?.specialWar ?? '-' }}</strong> <span>내정특기</span
                 ><strong>{{ props.general.traits?.specialDomestic ?? '-' }}</strong> <span>계급</span
-                ><strong>Lv {{ props.general.progression?.dedicationLevel ?? 0 }}</strong> <span>공헌</span
+                ><strong>{{ props.general.progression?.dedicationText ?? '무품관' }}</strong> <span>공헌</span
                 ><strong>{{ props.general.dedication.toLocaleString() }}</strong>
             </div>