diff --git a/hwe/sammo/API/Nation/GetGeneralLog.php b/hwe/sammo/API/Nation/GetGeneralLog.php
index 09128e69..7b1aa603 100644
--- a/hwe/sammo/API/Nation/GetGeneralLog.php
+++ b/hwe/sammo/API/Nation/GetGeneralLog.php
@@ -9,11 +9,11 @@ use sammo\Validator;
use function sammo\checkLimit;
use function sammo\checkSecretPermission;
use function sammo\getBattleDetailLogMore;
+use function sammo\getBattleDetailLogRecent;
use function sammo\getBattleResultMore;
use function sammo\getBattleResultRecent;
use function sammo\getGeneralActionLogMore;
use function sammo\getGeneralActionLogRecent;
-use function sammo\getGeneralHistoryLogAll;
use function sammo\getGeneralHistoryLogWithLogID;
class GetGeneralLog extends \sammo\BaseAPI
@@ -157,7 +157,7 @@ class GetGeneralLog extends \sammo\BaseAPI
'reqType' => $reqType,
'generalID' => $targetGeneralID,
'log' => $reqTo === null
- ? getBattleResultRecent($targetGeneralID, 30)
+ ? getBattleDetailLogRecent($targetGeneralID, 30)
: getBattleDetailLogMore($targetGeneralID, $reqTo, 30)
];
}
diff --git a/hwe/ts/PageBattleCenter.vue b/hwe/ts/PageBattleCenter.vue
index 1a1d3593..b3849b61 100644
--- a/hwe/ts/PageBattleCenter.vue
+++ b/hwe/ts/PageBattleCenter.vue
@@ -5,7 +5,11 @@
-
+
{{ orderName }}
@@ -17,7 +21,9 @@
:style="{
color: getNpcColor(general.npc),
}"
- >{{ general.name }}({{ general.turntime.slice(-5) }}){{ textMap[orderBy][3](general) }}{{ general.officerLevel > 5 ? `*${general.name}*` : general.name }}({{ general.turntime.slice(-5) }}){{
+ textMap[orderBy][3](general)
+ }}
@@ -82,10 +88,15 @@ const toasts = unwrap(useToast());
const generalList = ref(new Map());
const textMap = {
- recent_war: ["최근 전투", (gen: GeneralListItemP1) => gen.recent_war, false, (gen: GeneralListItemP1) => `[${gen.recent_war.slice(-5)}]`],
+ recent_war: [
+ "최근 전투",
+ (gen: GeneralListItemP1) => gen.recent_war,
+ false,
+ (gen: GeneralListItemP1) => `[${gen.recent_war.slice(-5)}]`,
+ ],
warnum: ["전투 횟수", (gen: GeneralListItemP1) => gen.warnum, false, (gen: GeneralListItemP1) => `[${gen.warnum}회]`],
- turntime: ["최근 턴", (gen: GeneralListItemP1) => gen.turntime, false, (gen: GeneralListItemP1) => ''],
- name: ["이름", (gen: GeneralListItemP1) => `${gen.npc} ${gen.name}`, false, (gen: GeneralListItemP1) => ''],
+ turntime: ["최근 턴", (gen: GeneralListItemP1) => gen.turntime, false, (gen: GeneralListItemP1) => ""],
+ name: ["이름", (gen: GeneralListItemP1) => `${gen.npc} ${gen.name}`, false, (gen: GeneralListItemP1) => ""],
} as const;
const orderedGeneralList = ref([]);
@@ -102,10 +113,10 @@ const targetGeneralLogs = ref();
const nationInfo = ref();
watch([generalList, targetGeneralID], async ([generalList, targetGeneralID]) => {
- if (targetGeneralID === undefined){
+ if (targetGeneralID === undefined) {
targetGeneral.value = undefined;
return;
- };
+ }
targetGeneral.value = generalList.get(targetGeneralID);
const logs: GeneralLogs = {
@@ -149,13 +160,13 @@ watch([generalList, targetGeneralID], async ([generalList, targetGeneralID]) =>
watch([generalList, orderBy], ([generalList, orderBy], [, oldOrderBy]) => {
console.log(generalList);
const list = Array.from(generalList.values());
- if(orderBy != oldOrderBy){
+ if (orderBy != oldOrderBy) {
targetGeneralID.value = undefined;
}
const idSet = new Set(list.map((gen) => gen.no));
list.sort((a, b) => {
- const [, getter, isAsc, ] = textMap[orderBy];
+ const [, getter, isAsc] = textMap[orderBy];
const aVal = getter(a);
const bVal = getter(b);
if (aVal === bVal) return 0;