diff --git a/hwe/ts/PageBattleCenter.vue b/hwe/ts/PageBattleCenter.vue index 7bc3f473..4a6c694c 100644 --- a/hwe/ts/PageBattleCenter.vue +++ b/hwe/ts/PageBattleCenter.vue @@ -38,7 +38,12 @@
장수 정보
- +
@@ -89,6 +94,7 @@ import type { NationStaticItem } from "./defs"; import type { GeneralLogType } from "./defs/API/General"; import { isString } from "lodash"; import { formatLog } from "./utilGame/formatLog"; +import { parseTime } from "./util/parseTime"; const toasts = unwrap(useToast()); @@ -104,6 +110,8 @@ const textMap = { turntime: ["최근 턴", (gen: GeneralListItemP1) => gen.turntime, false, (gen: GeneralListItemP1) => ""], name: ["이름", (gen: GeneralListItemP1) => `${gen.npc} ${gen.name}`, true, (gen: GeneralListItemP1) => ""], } as const; +const turnTerm = ref(1); +const lastExecuted = ref(new Date()); const orderedGeneralList = ref([]); const orderedInvGeneralKeyIndex = ref(new Map()); @@ -240,6 +248,9 @@ async function reload(): Promise { throw "권한이 부족합니다."; } + turnTerm.value = env.turnterm; + lastExecuted.value = parseTime(env.turntime); + console.log(list); const rawGeneralList = merge2DArrToObjectArr(column, list); diff --git a/hwe/ts/PageTroop.vue b/hwe/ts/PageTroop.vue index cca4cf6f..2d0acf16 100644 --- a/hwe/ts/PageTroop.vue +++ b/hwe/ts/PageTroop.vue @@ -127,6 +127,8 @@ :general="popupGeneralTarget" :troopInfo="convBasicCardTroopInfo(popupGeneralTarget)" :nation="nationInfo" + :turnTerm="turnTerm" + :lastExecuted="lastExecuted" /> @@ -154,6 +156,7 @@ import type { NationStaticItem } from "./defs"; import GeneralLiteCard from "./components/GeneralLiteCard.vue"; import GeneralSupplementCard from "./components/GeneralSupplementCard.vue"; import { pick } from "./util/JosaUtil"; +import { parseTime } from "./util/parseTime"; const toasts = unwrap(useToast()); const asyncReady = ref(false); @@ -225,6 +228,8 @@ type TroopInfo = { const me = ref({} as GeneralListItem); const myPermission = ref<0 | 1 | 2 | 3 | 4>(0); +const turnTerm = ref(1); +const lastExecuted = ref(new Date()); const troopList = ref(new Map()); const generalList = ref(new Map()); @@ -249,6 +254,8 @@ async function refresh() { const nationP = SammoAPI.Nation.GetNationInfo({}); nationInfo.value = (await nationP).nation; const { column, list, permission, troops, env, myGeneralID } = await generalListP; + turnTerm.value = env.turnterm; + lastExecuted.value = parseTime(env.turntime); //빠른 턴 순서로 정렬되어있다. diff --git a/hwe/ts/components/GeneralBasicCard.vue b/hwe/ts/components/GeneralBasicCard.vue index ece1e410..61d36f3c 100644 --- a/hwe/ts/components/GeneralBasicCard.vue +++ b/hwe/ts/components/GeneralBasicCard.vue @@ -148,7 +148,7 @@