Merge branch 'main' into feature/nation-general-lists

# Conflicts:
#	app/game-frontend/e2e/playwright.config.mjs
This commit is contained in:
2026-07-26 05:18:49 +00:00
35 changed files with 3928 additions and 1007 deletions
+4
View File
@@ -106,6 +106,10 @@ watch(
<RouterLink class="ghost" to="/general-list">장수일람</RouterLink>
<RouterLink class="ghost" to="/current-city">현재 도시</RouterLink>
<RouterLink class="ghost" to="/nation/generals">세력 장수</RouterLink>
<RouterLink v-if="(boardAccess?.permission ?? -1) >= 1" class="ghost" to="/nation/secret"
>암행부</RouterLink
>
<span v-else class="ghost disabled" aria-disabled="true">암행부</span>
<RouterLink class="ghost" to="/nation/personnel">인사부</RouterLink>
<RouterLink class="ghost" to="/troop">부대 편성</RouterLink>
<RouterLink class="ghost" to="/nation/finance">내무부</RouterLink>