diff --git a/hwe/sammo/API/Nation/GetNationInfo.php b/hwe/sammo/API/Nation/GetNationInfo.php new file mode 100644 index 00000000..4394c363 --- /dev/null +++ b/hwe/sammo/API/Nation/GetNationInfo.php @@ -0,0 +1,108 @@ +userID; + + $db = DB::db(); + $nationID = $db->queryFirstField('SELECT nation FROM general WHERE `owner` = %i', $userID); + + if(!$nationID){ + return [ + 'result' => true, + 'nation' => getNationStaticInfo(0) + ]; + } + + + + $targetGeneralID = $this->getTargetGeneralID($session); + $reqType = $this->args['type']; + $reqTo = $this->args['reqTo'] ?? null; + + + $me = $db->queryFirstRow('SELECT no,nation,officer_level,con,turntime,belong,permission,penalty from general where owner=%i', $userID); + + $con = checkLimit($me['con']); + if ($con >= 2) { + return '접속 제한입니다.'; + } + + $permissionResult = $this->checkPermission($me); + if ($permissionResult !== null) { + return $permissionResult; + } + + if ($reqType == static::GENERAL_HISTORY) { + return [ + 'result' => true, + 'reqType' => $reqType, + 'generalID' => $targetGeneralID, + 'log' => getGeneralHistoryLogAll($targetGeneralID) + ]; + } + + if ($reqType == static::GENERAL_ACTION) { + return [ + 'result' => true, + 'reqType' => $reqType, + 'generalID' => $targetGeneralID, + 'log' => $reqTo === null + ? getGeneralActionLogRecent($targetGeneralID, 30) + : getGeneralActionLogMore($targetGeneralID, $reqTo, 30) + ]; + } + + if ($reqType == static::BATTLE_RESULT) { + return [ + 'result' => true, + 'reqType' => $reqType, + 'generalID' => $targetGeneralID, + 'log' => $reqTo === null + ? getBattleResultRecent($targetGeneralID, 30) + : getBattleResultMore($targetGeneralID, $reqTo, 30) + ]; + } + + if ($reqType == static::BATTLE_DETAIL) { + return [ + 'result' => true, + 'reqType' => $reqType, + 'generalID' => $targetGeneralID, + 'log' => $reqTo === null + ? getBattleResultRecent($targetGeneralID, 30) + : getBattleDetailLogMore($targetGeneralID, $reqTo, 30) + ]; + } + + return '잘못된 요청입니다: ' . $reqType; + } +} diff --git a/hwe/ts/PageBattleCenter.vue b/hwe/ts/PageBattleCenter.vue new file mode 100644 index 00000000..408e6af2 --- /dev/null +++ b/hwe/ts/PageBattleCenter.vue @@ -0,0 +1,115 @@ + + + + diff --git a/hwe/ts/components/GeneralSupplementCard.vue b/hwe/ts/components/GeneralSupplementCard.vue index 44220ff4..6bd27e6b 100644 --- a/hwe/ts/components/GeneralSupplementCard.vue +++ b/hwe/ts/components/GeneralSupplementCard.vue @@ -38,7 +38,7 @@
피살
{{ general.deathcrew.toLocaleString() }}
-
+
숙련도
-
+
예약턴
- -
NPC
+
+ {{ turn.brief }} +
@@ -69,6 +66,7 @@ import { formatDexLevel, type DexInfo } from "@/utilGame/formatDexLevel"; import { formatHonor } from "@/utilGame/formatHonor"; const props = defineProps<{ general: GeneralListItemP1; + showCommandList?: boolean; }>(); const dexList = computed((): [string, number, DexInfo][] => { diff --git a/hwe/ts/v_battleCenter.ts b/hwe/ts/v_battleCenter.ts new file mode 100644 index 00000000..e098d642 --- /dev/null +++ b/hwe/ts/v_battleCenter.ts @@ -0,0 +1,20 @@ +import "@scss/nationGeneral.scss"; +import "ag-grid-community/dist/styles/ag-grid.css"; +import "ag-grid-community/dist/styles/ag-theme-balham-dark.css"; + +import { createApp } from 'vue' +import PageBattleCenter from '@/PageBattleCenter.vue'; +import { BootstrapVue3, BToastPlugin } from 'bootstrap-vue-3'; +import { auto500px } from './util/auto500px'; +import { htmlReady } from "./util/htmlReady"; +import { insertCustomCSS } from "./util/customCSS"; + + + + +auto500px(); + +htmlReady(() => { + insertCustomCSS(); +}); +createApp(PageBattleCenter).use(BootstrapVue3).use(BToastPlugin).mount('#app'); \ No newline at end of file diff --git a/hwe/v_battleCenter.php b/hwe/v_battleCenter.php new file mode 100644 index 00000000..0bdcbb64 --- /dev/null +++ b/hwe/v_battleCenter.php @@ -0,0 +1,43 @@ +setReadOnly(); +$userID = Session::getUserID(); + +$db = DB::db(); +$gameStor = KVStorage::getStorage($db, 'game_env'); +$gen = Util::getReq('gen', 'int'); +?> + + + + + + + + <?= UniqueConst::$serverName ?>: 감찰부 + [ + 'serverNick' => DB::prefix(), + 'mapName' => GameConst::$mapName, + 'unitSet' => GameConst::$unitSet, + ], + 'queryValues' => [ + 'generalID' => $gen, + ] + ], false) ?> + + + + + + + +
+ + + \ No newline at end of file