merge: 최신 main을 세력일람 장수 hover 작업에 통합

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

@@ -7,6 +7,7 @@ import { formatLocalTimeSeconds } from '../../utils/legacyDateTime';
 import { legacyExperiencePercent, ratioPercent } from '../../utils/legacyProgress';
 import { DEFAULT_GENERAL_ICON_URL, resolveGeneralIconBackgroundImage } from '../../utils/generalIcon';
 import { configuredGameAssetUrl } from '../../utils/imageAssets';
+import { legacyLuminanceTextColor } from '../../utils/legacyNationColor';
 
 interface GeneralStats {
     leadership: number;
@@ -155,19 +156,11 @@ const injuryInfo = computed(() => {
     return { text: '건강', color: '#ffffff' };
 });
 
-const isBrightColor = (color: string): boolean => {
-    const normalized = /^#[0-9a-f]{6}$/iu.test(color) ? color.slice(1) : '173d27';
-    const red = Number.parseInt(normalized.slice(0, 2), 16);
-    const green = Number.parseInt(normalized.slice(2, 4), 16);
-    const blue = Number.parseInt(normalized.slice(4, 6), 16);
-    return (red * 299 + green * 587 + blue * 114) / 1000 >= 150;
-};
-
 const titleStyle = computed(() => {
     const backgroundColor = props.nationColor || '#173d27';
     return {
         backgroundColor,
-        color: isBrightColor(backgroundColor) ? '#000000' : '#ffffff',
+        color: legacyLuminanceTextColor(backgroundColor),
     };
 });
 

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

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { computed, reactive } from 'vue';
 import type { MessageType } from '@sammo-ts/logic';
+import { legacyLuminanceTextColor } from '../../utils/legacyNationColor';
 import SkeletonLines from '../ui/SkeletonLines.vue';
 import MessagePlate from './MessagePlate.vue';
 
@@ -172,14 +173,20 @@ const forwardResponse = (messageId: number, response: boolean) => {
                         v-for="group in mailboxGroups"
                         :key="group.label"
                         :label="group.label"
-                        :style="{ backgroundColor: group.color ?? '#000000', color: '#ffffff' }"
+                        :style="{
+                            backgroundColor: group.color ?? '#000000',
+                            color: legacyLuminanceTextColor(group.color ?? '#000000'),
+                        }"
                     >
                         <option
                             v-for="option in group.options"
                             :key="`${group.label}-${option.value}`"
                             :value="option.value"
                             :disabled="option.disabled"
-                            :style="{ backgroundColor: option.color ?? '#000000', color: '#ffffff' }"
+                            :style="{
+                                backgroundColor: option.color ?? '#000000',
+                                color: legacyLuminanceTextColor(option.color ?? '#000000'),
+                            }"
                         >
                             {{ option.label }}
                         </option>

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

@@ -2,6 +2,7 @@
 import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
 import type { MessageType } from '@sammo-ts/logic';
 import { DEFAULT_GENERAL_ICON_URL, resolveMessageGeneralIconUrl, useDefaultGeneralIcon } from '../../utils/generalIcon';
+import { isLegacyNationColorBright } from '../../utils/legacyNationColor';
 
 interface MessageTarget {
     generalId: number;
@@ -95,25 +96,13 @@ const scheduleDeleteExpiry = () => {
     }, delay);
 };
 
-const isBright = (color: string): boolean => {
-    const match = /^#([0-9a-f]{6})$/i.exec(color);
-    if (!match) {
-        return false;
-    }
-    const value = Number.parseInt(match[1]!, 16);
-    const red = (value >> 16) & 0xff;
-    const green = (value >> 8) & 0xff;
-    const blue = value & 0xff;
-    return red * 0.299 + green * 0.587 + blue * 0.114 > 160;
-};
-
 const iconUrl = computed(() => resolveMessageGeneralIconUrl(props.message.src.icon));
 const canReplyToGeneral = (target: MessageTarget): boolean => props.replyableGeneralIds.includes(target.generalId);
 
 const targetClass = (target: MessageTarget) => ({
     'msg-target': true,
-    'msg-bright': isBright(target.color),
-    'msg-dark': !isBright(target.color),
+    'msg-bright': isLegacyNationColorBright(target.color),
+    'msg-dark': !isLegacyNationColorBright(target.color),
 });
 
 const setTarget = (target: MessageTarget) => {

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

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import SkeletonLines from '../ui/SkeletonLines.vue';
-import { legacyNationTextColor } from '../../utils/legacyNationColor';
+import { legacyLuminanceTextColor } from '../../utils/legacyNationColor';
 import { formatOfficerLevelText } from '../../utils/nationFormat';
 import { getNpcColor } from '../../utils/npcColor';
 
@@ -60,7 +60,7 @@ const displayChiefName = (chief: NationChief | undefined): string => {
         <div v-else class="nation-grid">
             <div
                 class="title"
-                :style="{ backgroundColor: props.nation.color, color: legacyNationTextColor(props.nation.color) }"
+                :style="{ backgroundColor: props.nation.color, color: legacyLuminanceTextColor(props.nation.color) }"
             >
                 {{ props.nation.name }}
             </div>