refac, wip: 벌점(connect, con) 변경
- 벌점: refreshScoreTotal - 순간벌점: refreshScore
This commit is contained in:
@@ -151,8 +151,8 @@
|
||||
</span>
|
||||
</div>
|
||||
<div class="bg1">벌점</div>
|
||||
<div class="general-connect-score">
|
||||
{{ formatConnectScore(general.connect) }} {{ general.connect.toLocaleString() }}점({{ general.con }})
|
||||
<div class="general-refresh-score-total">
|
||||
{{ formatRefreshScore(general.refreshScoreTotal) }} {{ general.refreshScoreTotal.toLocaleString() }}점({{ general.refreshScore }})
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -168,7 +168,7 @@ import { unwrap } from "@/util/unwrap";
|
||||
import type { GameConstStore } from "@/GameConstStore";
|
||||
import { formatGeneralTypeCall } from "@/utilGame/formatGeneralTypeCall";
|
||||
import { nextExpLevelRemain } from "@/utilGame/nextExpLevelRemain";
|
||||
import { formatConnectScore } from "@/utilGame/formatConnectScore";
|
||||
import { formatRefreshScore } from "@/utilGame/formatRefreshScore";
|
||||
import SammoBar from "@/components/SammoBar.vue";
|
||||
import { parseTime } from "@/util/parseTime";
|
||||
import { clamp } from "lodash-es";
|
||||
@@ -341,7 +341,7 @@ watch(
|
||||
grid-column: 2 / 4;
|
||||
}
|
||||
|
||||
.general-connect-score {
|
||||
.general-refresh-score-total {
|
||||
grid-column: 5 / 8;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -106,7 +106,7 @@ import type { GameConstStore } from "@/GameConstStore";
|
||||
import { unwrap } from "@/util/unwrap";
|
||||
import SimpleTooltipCell from "@/gridCellRenderer/SimpleTooltipCell.vue";
|
||||
import GridTooltipCell, { type GridCellInfo } from "@/gridCellRenderer/GridTooltipCell.vue";
|
||||
import { formatConnectScore } from "@/utilGame/formatConnectScore";
|
||||
import { formatRefreshScore } from "@/utilGame/formatRefreshScore";
|
||||
import { convertSearch초성 } from "@/util/convertSearch초성";
|
||||
import { isString } from "lodash-es";
|
||||
import { formatDefenceTrain } from "@/utilGame/formatDefenceTrain";
|
||||
@@ -353,7 +353,7 @@ type headerType =
|
||||
| "trainAtmos"
|
||||
| "specials"
|
||||
| "reservedCommandShort"
|
||||
| "killturnAndConnect"
|
||||
| "killturnAndRefresh"
|
||||
| "years"
|
||||
| "warResults";
|
||||
|
||||
@@ -1117,18 +1117,18 @@ const columnRawDefs = ref<Partial<Record<headerType, GenColDef | GenColGroupDef>
|
||||
},
|
||||
],
|
||||
},
|
||||
killturnAndConnect: {
|
||||
groupId: "killturnAndConnect",
|
||||
killturnAndRefresh: {
|
||||
groupId: "killturnAndRefresh",
|
||||
headerName: "기타",
|
||||
children: [
|
||||
{
|
||||
colId: "killturnAndConnect",
|
||||
colId: "killturnAndRefresh",
|
||||
headerName: "삭/벌",
|
||||
cellRenderer: ({ data }: GenValueParams) => {
|
||||
if (data === undefined) {
|
||||
return "?";
|
||||
}
|
||||
return `${data.killturn.toLocaleString()}턴<br>${data.connect.toLocaleString()}점`;
|
||||
return `${data.killturn.toLocaleString()}턴<br>${data.refreshScoreTotal.toLocaleString()}점`;
|
||||
},
|
||||
cellClass: rightAlignClass,
|
||||
columnGroupShow: "closed",
|
||||
@@ -1149,14 +1149,14 @@ const columnRawDefs = ref<Partial<Record<headerType, GenColDef | GenColGroupDef>
|
||||
columnGroupShow: "open",
|
||||
},
|
||||
{
|
||||
colId: "connect",
|
||||
colId: "refreshScoreTotal",
|
||||
headerName: "벌점",
|
||||
field: "connect",
|
||||
field: "refreshScoreTotal",
|
||||
cellRenderer: ({ data }: GenValueParams) => {
|
||||
if (data === undefined) {
|
||||
return "?";
|
||||
}
|
||||
return `${data.connect.toLocaleString()}점<br>(${formatConnectScore(data.connect)})`;
|
||||
return `${data.refreshScoreTotal.toLocaleString()}점<br>(${formatRefreshScore(data.refreshScoreTotal)})`;
|
||||
},
|
||||
...sortableNumber,
|
||||
width: 70,
|
||||
|
||||
@@ -78,8 +78,8 @@
|
||||
<div>{{ general.killturn }} 턴</div>
|
||||
|
||||
<div class="bg1">벌점</div>
|
||||
<div class="general-connect-score">
|
||||
{{ formatConnectScore(general.connect) }} {{ general.connect.toLocaleString() }}점
|
||||
<div class="general-refresh-score-total">
|
||||
{{ formatRefreshScore(general.refreshScoreTotal) }} {{ general.refreshScoreTotal.toLocaleString() }}점
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -94,7 +94,7 @@ import type { NationStaticItem } from "@/defs";
|
||||
import { unwrap } from "@/util/unwrap";
|
||||
import type { GameConstStore } from "@/GameConstStore";
|
||||
import { formatGeneralTypeCall } from "@/utilGame/formatGeneralTypeCall";
|
||||
import { formatConnectScore } from "@/utilGame/formatConnectScore";
|
||||
import { formatRefreshScore } from "@/utilGame/formatRefreshScore";
|
||||
import { calcInjury } from "@/utilGame/calcInjury";
|
||||
import type { GameIActionInfo } from "@/defs/GameObj";
|
||||
import { isValidObjKey } from "@/utilGame/isValidObjKey";
|
||||
@@ -204,7 +204,7 @@ watch(
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.general-connect-score {
|
||||
.general-refresh-score-total {
|
||||
grid-column: 5 / 8;
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user