devsam/core2026
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: 최신 main을 서버 시계와 첫 턴 수정에 통합

Browse Source
This commit is contained in:
Hide_D
2026-08-15 18:27:10 +00:00
parent d0b9b8f211 09777ef843
commit 952e141ca0
14 changed files with 607 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/game-frontend/src/views/CurrentCityView.vue
+8 -7
View File
@@ -299,7 +299,7 @@ const generalImage = (general: General): string => resolveGeneralIconUrl(general
<td>{{ general.crew ?? '?' }}</td>
<td>{{ general.train ?? '?' }}</td>
<td>{{ general.atmos ?? '?' }}</td>
<td class="turns">
<td class="turns" :class="{ 'turns--reserved': general.turns.length > 0 }">
<template v-if="general.turns.length">
<span v-for="(turn, index) in general.turns" :key="index" class="turn-line"
>{{ index + 1 }} : {{ turn }}</span
@@ -321,8 +321,8 @@ const generalImage = (general: General): string => resolveGeneralIconUrl(general
</tr>
<tr>
<td class="legacy-banner">
삼국지 모의전투 HiDCHe / KOEI의 이미지를 사용, 응용하였습니다 / 제작 :
HideD(hided62@gmail.com) /
삼국지 모의전투 HiDCHe / KOEI의 이미지를 사용, 응용하였습니다 / 제작 : HideD(hided62@gmail.com)
/
<a href="https://sam.hided.net/wiki/hidche/credit" target="_blank" rel="noreferrer">Credit</a>
</td>
</tr>
@@ -335,9 +335,9 @@ const generalImage = (general: General): string => resolveGeneralIconUrl(general
.city-page {
width: 1000px;
margin: 0 auto;
font-family: 'Times New Roman', serif;
font-size: 16px;
line-height: normal;
font-family: var(--sammo-font-sans);
font-size: 14px;
line-height: 1.3;
}
.legacy-table {
width: 100%;
@@ -419,6 +419,7 @@ const generalImage = (general: General): string => resolveGeneralIconUrl(general
}
.general-names {
text-align: left !important;
white-space: normal !important;
}
.unknown {
color: gray;
@@ -447,7 +448,7 @@ const generalImage = (general: General): string => resolveGeneralIconUrl(general
height: 64px;
object-fit: fill;
}
.turns {
.turns--reserved {
font-size: x-small;
}
.turn-line {
app/game-frontend/src/views/JoinView.vue
+27 -16
View File
@@ -726,10 +726,26 @@ onUnmounted(() => {
</div>
<div class="stat-actions" role="group" aria-label="능력치 빠른 설정">
<button type="button" @click="applyRandomStats">랜덤형</button>
<button type="button" @click="applyLeadpowStats">통솔무력형</button>
<button type="button" @click="applyLeadintStats">통솔지력형</button>
<button type="button" @click="applyPowintStats">무력지력형</button>
<button class="legacy-button legacy-button--navigation" type="button" @click="applyRandomStats">
랜덤형
</button>
<button
class="legacy-button legacy-button--navigation"
type="button"
@click="applyLeadpowStats"
>
통솔무력형
</button>
<button
class="legacy-button legacy-button--navigation"
type="button"
@click="applyLeadintStats"
>
통솔지력형
</button>
<button class="legacy-button legacy-button--navigation" type="button" @click="applyPowintStats">
무력지력형
</button>
</div>
<div v-if="accountIcons.length" class="icon-choice">
@@ -1385,26 +1401,21 @@ onUnmounted(() => {
.stat-actions button {
flex: 1 1 140px;
height: 40px;
min-height: 40px;
border: 1px solid #004f28;
border-radius: 3px;
background: #00582c;
padding: 8px 14px;
color: #fff;
font-size: 0.875rem;
font-weight: 700;
line-height: 1.2;
cursor: pointer;
}
.stat-actions button:hover {
border-color: #005f30;
background: #006d37;
.stat-actions button:not(:disabled):hover {
height: 39px;
min-height: 39px;
}
.stat-actions button:active {
border-color: #003d1f;
background: #004523;
.stat-actions button:not(:disabled):active {
height: 38px;
min-height: 38px;
}
.stat-summary {
app/game-frontend/src/views/MainView.vue
+10
View File
@@ -670,11 +670,21 @@ button {
}
.record-line {
box-sizing: border-box;
height: 21px;
margin: 0;
overflow: hidden;
overflow-wrap: normal;
line-height: 21px;
white-space: nowrap;
}
.record-line :deep(.small_war_log) {
height: 21px;
line-height: 21px;
vertical-align: top;
}
.record-line :deep(.hidden_but_copyable) {
color: transparent !important;
font-size: 0;