From 794eaced98b99d85c686ab83f92216e48b952cfc Mon Sep 17 00:00:00 2001 From: Hide_D Date: Tue, 26 Apr 2022 00:33:54 +0900 Subject: [PATCH] =?UTF-8?q?misc:=20auto500px,=20insertCustomCSS=20?= =?UTF-8?q?=EB=88=84=EB=9D=BD=EB=90=9C=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=A0=95=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/ts/legacy/main.ts | 3 --- hwe/ts/v_NPCControl.ts | 8 ++++++++ hwe/ts/v_board.ts | 5 +++++ hwe/ts/v_chiefCenter.ts | 5 +++++ hwe/ts/v_inheritPoint.ts | 8 ++++++++ hwe/ts/v_main.ts | 7 ++++++- hwe/ts/v_nationBetting.ts | 5 +++++ hwe/ts/v_nationGeneral.ts | 6 ++++++ hwe/ts/v_nationStratFinan.ts | 6 ++++++ hwe/ts/v_processing.ts | 8 +++++++- hwe/v_NPCControl.php | 2 +- hwe/v_inheritPoint.php | 2 +- hwe/v_join.php | 2 +- 13 files changed, 59 insertions(+), 8 deletions(-) diff --git a/hwe/ts/legacy/main.ts b/hwe/ts/legacy/main.ts index d72a9aae..7ae06c08 100644 --- a/hwe/ts/legacy/main.ts +++ b/hwe/ts/legacy/main.ts @@ -6,7 +6,6 @@ import { initTooltip } from './initTooltip'; import { exportWindow } from '@/util/exportWindow'; import { reloadWorldMap } from '@/map'; import { refreshMsg } from '@/msg'; -import { insertCustomCSS } from '@/util/customCSS'; exportWindow(jQuery, '$'); @@ -50,8 +49,6 @@ htmlReady(() => { setInterval(function() { void refreshMsg(); }, 5000); - - insertCustomCSS(); }); (() => { diff --git a/hwe/ts/v_NPCControl.ts b/hwe/ts/v_NPCControl.ts index cdfba45a..e1d32fe7 100644 --- a/hwe/ts/v_NPCControl.ts +++ b/hwe/ts/v_NPCControl.ts @@ -4,6 +4,14 @@ import { createApp } from 'vue' import NPCControl from '@/PageNPCControl.vue'; import { BootstrapVue3, BToastPlugin } from 'bootstrap-vue-3' import { setAxiosXMLHttpRequest } from '@util/setAxiosXMLHttpRequest'; +import { auto500px } from "./util/auto500px"; +import { htmlReady } from "./util/htmlReady"; +import { insertCustomCSS } from "./util/customCSS"; setAxiosXMLHttpRequest(); +auto500px(); + +htmlReady(() => { + insertCustomCSS(); +}); createApp(NPCControl).use(BootstrapVue3).use(BToastPlugin).mount('#app') \ No newline at end of file diff --git a/hwe/ts/v_board.ts b/hwe/ts/v_board.ts index 219ca779..0a966f81 100644 --- a/hwe/ts/v_board.ts +++ b/hwe/ts/v_board.ts @@ -4,6 +4,8 @@ import PageBoard from '@/PageBoard.vue'; import BootstrapVue3 from 'bootstrap-vue-3' import { setAxiosXMLHttpRequest } from '@util/setAxiosXMLHttpRequest'; import { auto500px } from "./util/auto500px"; +import { insertCustomCSS } from "./util/customCSS"; +import { htmlReady } from "./util/htmlReady"; declare const isSecretBoard: boolean; @@ -12,6 +14,9 @@ declare const isSecretBoard: boolean; setAxiosXMLHttpRequest(); auto500px(); +htmlReady(() => { + insertCustomCSS(); + }); createApp(PageBoard, { isSecretBoard }).use(BootstrapVue3).mount('#app') \ No newline at end of file diff --git a/hwe/ts/v_chiefCenter.ts b/hwe/ts/v_chiefCenter.ts index 0ce8a01b..e1d352f8 100644 --- a/hwe/ts/v_chiefCenter.ts +++ b/hwe/ts/v_chiefCenter.ts @@ -5,6 +5,8 @@ import 'bootstrap-vue-3/dist/bootstrap-vue-3.css' import { setAxiosXMLHttpRequest } from '@util/setAxiosXMLHttpRequest'; import Multiselect from 'vue-multiselect'; import { auto500px } from './util/auto500px'; +import { htmlReady } from './util/htmlReady'; +import { insertCustomCSS } from './util/customCSS'; declare const maxChiefTurn: number; @@ -12,6 +14,9 @@ declare const maxChiefTurn: number; setAxiosXMLHttpRequest(); auto500px(); +htmlReady(() => { + insertCustomCSS(); + }); createApp(PageChiefCenter, { maxChiefTurn, diff --git a/hwe/ts/v_inheritPoint.ts b/hwe/ts/v_inheritPoint.ts index 1868b7e5..401497cd 100644 --- a/hwe/ts/v_inheritPoint.ts +++ b/hwe/ts/v_inheritPoint.ts @@ -3,5 +3,13 @@ import "@scss/common/bootstrap5.scss"; import { createApp } from 'vue' import PageInheritPoint from '@/PageInheritPoint.vue'; import BootstrapVue3 from 'bootstrap-vue-3' +import { auto500px } from "./util/auto500px"; +import { htmlReady } from "./util/htmlReady"; +import { insertCustomCSS } from "./util/customCSS"; +auto500px(); + +htmlReady(() => { + insertCustomCSS(); +}); createApp(PageInheritPoint).use(BootstrapVue3).mount('#app'); \ No newline at end of file diff --git a/hwe/ts/v_main.ts b/hwe/ts/v_main.ts index 6496f677..1c98e8cf 100644 --- a/hwe/ts/v_main.ts +++ b/hwe/ts/v_main.ts @@ -10,10 +10,15 @@ import PartialReservedCommand from '@/PartialReservedCommand.vue'; import BootstrapVue3 from 'bootstrap-vue-3' import { setAxiosXMLHttpRequest } from '@util/setAxiosXMLHttpRequest'; import Multiselect from 'vue-multiselect'; - import "@/legacy/main"; import { auto500px } from './util/auto500px'; +import { htmlReady } from './util/htmlReady'; +import { insertCustomCSS } from './util/customCSS'; setAxiosXMLHttpRequest(); auto500px(); + +htmlReady(() => { + insertCustomCSS(); +}); createApp(PartialReservedCommand).use(BootstrapVue3).component('v-multiselect', Multiselect).mount('#reservedCommandList'); diff --git a/hwe/ts/v_nationBetting.ts b/hwe/ts/v_nationBetting.ts index d838df4d..60017648 100644 --- a/hwe/ts/v_nationBetting.ts +++ b/hwe/ts/v_nationBetting.ts @@ -4,9 +4,14 @@ import { createApp } from 'vue' import PageNationBetting from '@/PageNationBetting.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(PageNationBetting).use(BootstrapVue3).use(BToastPlugin).mount('#app'); \ No newline at end of file diff --git a/hwe/ts/v_nationGeneral.ts b/hwe/ts/v_nationGeneral.ts index e877b3d5..00a748d4 100644 --- a/hwe/ts/v_nationGeneral.ts +++ b/hwe/ts/v_nationGeneral.ts @@ -6,9 +6,15 @@ import { createApp } from 'vue' import PageNationGeneral from '@/PageNationGeneral.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(PageNationGeneral).use(BootstrapVue3).use(BToastPlugin).mount('#app'); \ No newline at end of file diff --git a/hwe/ts/v_nationStratFinan.ts b/hwe/ts/v_nationStratFinan.ts index 792ff2a2..8d751b94 100644 --- a/hwe/ts/v_nationStratFinan.ts +++ b/hwe/ts/v_nationStratFinan.ts @@ -4,9 +4,15 @@ import { createApp } from 'vue' import PageNationStratFinan from '@/PageNationStratFinan.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(PageNationStratFinan).use(BootstrapVue3).use(BToastPlugin).mount('#app'); \ No newline at end of file diff --git a/hwe/ts/v_processing.ts b/hwe/ts/v_processing.ts index 579c4e10..0a56956e 100644 --- a/hwe/ts/v_processing.ts +++ b/hwe/ts/v_processing.ts @@ -12,6 +12,8 @@ import { type Args, testSubmitArgs } from './processing/args'; import { SammoAPI } from './SammoAPI'; import { StoredActionsHelper } from './util/StoredActionsHelper'; import type { ReserveCommandResponse } from './defs/API/Command'; +import { htmlReady } from './util/htmlReady'; +import { insertCustomCSS } from './util/customCSS'; declare const staticValues: { serverNick: string, @@ -108,4 +110,8 @@ else { } -auto500px(); \ No newline at end of file +auto500px(); + +htmlReady(() => { + insertCustomCSS(); + }); \ No newline at end of file diff --git a/hwe/v_NPCControl.php b/hwe/v_NPCControl.php index 6989b4a6..5118c93b 100644 --- a/hwe/v_NPCControl.php +++ b/hwe/v_NPCControl.php @@ -89,7 +89,7 @@ $lastSetters = [ - + <?= UniqueConst::$serverName ?>: 임시 NPC 정책 [ 'nationID' => $nationID, diff --git a/hwe/v_inheritPoint.php b/hwe/v_inheritPoint.php index c2d4db99..a41eb761 100644 --- a/hwe/v_inheritPoint.php +++ b/hwe/v_inheritPoint.php @@ -74,7 +74,7 @@ $lastInheritPointLogs = $db->query('SELECT server_id, year, month, date, text FR <?= UniqueConst::$serverName ?>: 유산 관리 - + $scoutMsg) { <?= UniqueConst::$serverName ?>: 장수 생성 - +