Merge origin/main into frontend parity worktree

2026-07-25 11:16:03 +00:00
parent a83f7a44e3 06c7197a1a
commit f7311385ce
34 changed files with 2358 additions and 244 deletions
@@ -106,6 +106,7 @@ watch(
                <RouterLink class="ghost" to="/battle-simulator">전투 시뮬레이터</RouterLink>
                <RouterLink class="ghost" to="/my-page">내 정보</RouterLink>
                <RouterLink class="ghost" to="/tournament">토너먼트</RouterLink>
+                <RouterLink class="ghost" to="/auction">거래장</RouterLink>
                <RouterLink class="ghost" to="/survey">설문조사</RouterLink>
                <RouterLink class="ghost" to="/npc-control">NPC 정책</RouterLink>
                <RouterLink class="ghost" to="/inherit">유산 강화</RouterLink>