From 95bd5b539f9424c6d254c2021b650998533686a6 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sat, 11 Dec 2021 04:45:39 +0900 Subject: [PATCH] =?UTF-8?q?fix(WIP):=20bootstrap4=20=EC=9E=94=EC=97=AC=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95=20=EC=A4=91=20-=20?= =?UTF-8?q?=EC=9D=B4=EC=83=81=ED=95=98=EA=B2=8C=EB=8F=84=20ingame=EC=97=90?= =?UTF-8?q?=EC=84=9C=20bootstrap=EC=9D=B4=20=EC=B6=A9=EB=8F=8C=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/b_betting.php | 2 +- hwe/battle_simulator.php | 8 +- hwe/index.php | 504 ++++++++++++++--------------- hwe/install.php | 20 +- hwe/install_db.php | 2 +- hwe/templates/hallOfFrame.php | 2 +- hwe/templates/map.php | 6 +- hwe/templates/tooltip.php | 2 +- hwe/ts/build_exports.json | 3 +- hwe/ts/common_deprecated.ts | 1 - hwe/ts/common_legacy.ts | 4 +- hwe/ts/gateway/entrance.ts | 3 +- hwe/ts/{ => legacy}/main.ts | 16 +- hwe/ts/select_general_from_pool.ts | 2 +- hwe/ts/select_npc.ts | 2 +- hwe/ts/v_main.ts | 15 +- i_entrance/admin_userlist.php | 4 +- i_entrance/entrance.php | 4 +- i_entrance/user_info.php | 6 +- index.php | 6 +- package.json | 1 - 21 files changed, 306 insertions(+), 307 deletions(-) rename hwe/ts/{ => legacy}/main.ts (84%) diff --git a/hwe/b_betting.php b/hwe/b_betting.php index aacb141f..0a8f7bc0 100644 --- a/hwe/b_betting.php +++ b/hwe/b_betting.php @@ -442,7 +442,7 @@ if ($str3) { for ($i = 0; $i < 16; $i++) { echo " - "; + "; } echo ""; diff --git a/hwe/battle_simulator.php b/hwe/battle_simulator.php index 96d6addd..7277f3a7 100644 --- a/hwe/battle_simulator.php +++ b/hwe/battle_simulator.php @@ -138,7 +138,7 @@ if ($nationID) {
수도
-
+
@@ -207,7 +207,7 @@ if ($nationID) {
수도
-
+
@@ -509,7 +509,7 @@ if ($nationID) {
장수 목록
-
@@ -519,7 +519,7 @@ if ($nationID) {
- +
diff --git a/hwe/index.php b/hwe/index.php index 5bb3870c..95596879 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -117,26 +117,8 @@ if (!$otherTextInfo) { - - - - - - @@ -144,6 +126,8 @@ if (!$otherTextInfo) { DB::prefix(), + 'serverID' => UniqueConst::$serverID, 'maxTurn' => GameConst::$maxTurn, 'maxPushTurn' => 12, 'commandList' => getCommandTable($generalObj), @@ -157,261 +141,277 @@ if (!$otherTextInfo) {
npcmode == 1) ?>
-
-
-

삼국지 모의전투 HiDCHe 기 ()

+
+
+
+

삼국지 모의전투 HiDCHe 기 ()

+
+ +
+
+ +
+
+ NPC수 : +
+
+ NPC상성 : +
+
+ NPC선택 : +
+
+ 기타 설정:
-
-
- -
-
- NPC수 : -
-
- NPC상성 : -
-
- NPC선택 : -
-
- 기타 설정: -
- -
-
전체 접속자 수 : online_user_cnt ?> 명
-
턴당 갱신횟수 : conlimit ?>회
-
-
tournament == 0) : ?> - 현재 토너먼트 경기 없음 - - ↑tnmt_type] ?? '' ?> tournament) ?> ↑ +
+
전체 접속자 수 : online_user_cnt ?> 명
+
턴당 갱신횟수 : conlimit ?>회
+
+
tournament == 0) : ?> + 현재 토너먼트 경기 없음 + + ↑tnmt_type] ?? '' ?> tournament) ?> ↑ - -
-
-
동작 시각: " . substr($gameStor->turntime, 5, 14) . "") : ("동작 시각: " . substr($gameStor->turntime, 5, 14) . "") ?>
-
-
- 0) : ?> - 건 거래 진행중 - - 진행중 거래 없음 - -
-
- vote ?: ['']; - $vote_title = Tag2Code($gameStor->vote_title ?? '-'); - ?> - - 진행중 설문 없음 - - 설문 진행중 : - -
+
-
-
접속중인 국가: online_nation ?>
+
+
동작 시각: " . substr($gameStor->turntime, 5, 14) . "") : ("동작 시각: " . substr($gameStor->turntime, 5, 14) . "") ?>
-
-
운영자 메세지 : msg ?>
+
+ 0) : ?> + 건 거래 진행중 + + 진행중 거래 없음 +
-
-
-
【 국가방침 】
-
-
-
-
-
-
-
- 【 접속자 】 -
-
- userGrade >= 5) : ?> -
-
- - - - - - - -
-
- userGrade == 4) : ?> -
-
- -
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
'btn btn-sammo-nation']) ?>
-
+
+ vote ?: ['']; + $vote_title = Tag2Code($gameStor->vote_title ?? '-'); + ?> + + 진행중 설문 없음 + + 설문 진행중 : +
-
-
-
-
-
-
+
+
접속중인 국가: online_nation ?>
+
+
+
운영자 메세지 : msg ?>
+
+
+
+
【 국가방침 】
+
+
-
-
장수 동향
-
+
+ 【 접속자 】
-
-
개인 기록
-
+
+ userGrade >= 5) : ?> +
+
+ + + + + + + +
-
-
중원 정세
-
+ userGrade == 4) : ?> +
+
+ +
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
'btn btn-sammo-nation']) ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
장수 동향
+
+
+
+
개인 기록
+
+
+
+
중원 정세
+
+
+
+
+
npcmode == 1) ?>
+ +
+
+
+ +
+
+ +
+
+
+
+
전체 메시지(최고99자)
+
+
+
+
+
+
국가 메시지(최고99자)
+
+
+
+
+
+
개인 메시지(최고99자)
+
+
+
+
+
+
외교 메시지(최고99자)
+
+
+
-
npcmode == 1) ?>
- -
-
-
- -
-
- -
-
-
-
-
전체 메시지(최고99자)
-
-
-
-
-
-
국가 메시지(최고99자)
-
-
-
-
-
-
개인 메시지(최고99자)
-
-
-
-
-
-
외교 메시지(최고99자)
-
-
-
-
-
-
-
npcmode == 1) ?>
-
+
npcmode == 1) ?>
- develcost * 5; - MessageBox("설문조사에 참여하시면 금{$develcost}과 유니크템을 드립니다! (우측 상단 설문조사 메뉴)"); - } - ?> -
+
+ + + + + \ No newline at end of file diff --git a/hwe/install.php b/hwe/install.php index 1665a749..3a624bc9 100644 --- a/hwe/install.php +++ b/hwe/install.php @@ -54,7 +54,7 @@ if ($session->userGrade < 5 && !$allowReset) {
-
+
@@ -71,7 +71,7 @@ if ($session->userGrade < 5 && !$allowReset) {
-
+
@@ -94,7 +94,7 @@ if ($session->userGrade < 5 && !$allowReset) {
-
+
@@ -104,7 +104,7 @@ if ($session->userGrade < 5 && !$allowReset) {
-
+
@@ -114,7 +114,7 @@ if ($session->userGrade < 5 && !$allowReset) {
-
+
@@ -124,7 +124,7 @@ if ($session->userGrade < 5 && !$allowReset) {
-
+
@@ -136,7 +136,7 @@ if ($session->userGrade < 5 && !$allowReset) {
-
+
@@ -177,7 +177,7 @@ if ($session->userGrade < 5 && !$allowReset) {
-
+
@@ -187,7 +187,7 @@ if ($session->userGrade < 5 && !$allowReset) {
-
+
@@ -199,7 +199,7 @@ if ($session->userGrade < 5 && !$allowReset) {
-
+
diff --git a/hwe/install_db.php b/hwe/install_db.php index be64211d..b815cde4 100644 --- a/hwe/install_db.php +++ b/hwe/install_db.php @@ -48,7 +48,7 @@ if ($session->userGrade == 5) {
-
+
diff --git a/hwe/templates/hallOfFrame.php b/hwe/templates/hallOfFrame.php index 013b4b02..57fa9b0c 100644 --- a/hwe/templates/hallOfFrame.php +++ b/hwe/templates/hallOfFrame.php @@ -7,7 +7,7 @@
-
기 +
기
~ diff --git a/hwe/templates/map.php b/hwe/templates/map.php index b446f6ee..23c2397f 100644 --- a/hwe/templates/map.php +++ b/hwe/templates/map.php @@ -1,5 +1,5 @@
-
+
@@ -9,10 +9,10 @@
-
-
diff --git a/hwe/templates/tooltip.php b/hwe/templates/tooltip.php index 987d1817..57964ee9 100644 --- a/hwe/templates/tooltip.php +++ b/hwe/templates/tooltip.php @@ -1,4 +1,4 @@ ->[]): void { } const template = ``; - const oTooltip = new Tooltip(this, { + const oTooltip = Tooltip.getOrCreateInstance(this, { title: function(){ return trim(this.querySelector('.tooltiptext')?.innerHTML); }, diff --git a/hwe/ts/gateway/entrance.ts b/hwe/ts/gateway/entrance.ts index b0af45ff..dc94cce6 100644 --- a/hwe/ts/gateway/entrance.ts +++ b/hwe/ts/gateway/entrance.ts @@ -10,12 +10,11 @@ import { setAxiosXMLHttpRequest } from '@util/setAxiosXMLHttpRequest'; import { loadPlugin as loadAdminPlugin } from '@/gateway/admin_server'; import '@/gateway/common'; - declare const isAdmin: boolean; const serverListTemplate = "\ \ - \ + \ <%korName%>섭
\ \ \ diff --git a/hwe/ts/main.ts b/hwe/ts/legacy/main.ts similarity index 84% rename from hwe/ts/main.ts rename to hwe/ts/legacy/main.ts index 973f307d..f1d6424e 100644 --- a/hwe/ts/main.ts +++ b/hwe/ts/legacy/main.ts @@ -1,18 +1,10 @@ import $ from 'jquery'; -import 'bootstrap'; import { activateFlip, initTooltip } from '@/common_legacy'; import '@/msg.ts'; import '@/map.ts'; -import { exportWindow } from '@util/exportWindow'; - -import { scrollHardTo } from '@util/scrollHardTo'; - -exportWindow(scrollHardTo, 'scrollHardTo'); -exportWindow($, '$'); import '@scss/main.scss'; import { unwrap } from '@util/unwrap'; -import { auto500px } from '@util/auto500px'; import { htmlReady } from '@util/htmlReady'; htmlReady(() => { @@ -39,9 +31,9 @@ htmlReady(() => { const customCSS = localStorage.getItem('sam_customCSS'); if (customCSS) { - const $style = $(''); - $style.text(customCSS); - $style.appendTo($('head')); + const styleEl = document.createElement('style'); + styleEl.innerHTML = customCSS; + document.head.appendChild(styleEl); } }); @@ -91,5 +83,3 @@ htmlReady(() => { window.addEventListener('orientationchange', onScroll, true); }); })(); - -auto500px(); \ No newline at end of file diff --git a/hwe/ts/select_general_from_pool.ts b/hwe/ts/select_general_from_pool.ts index f5002683..54a9058a 100644 --- a/hwe/ts/select_general_from_pool.ts +++ b/hwe/ts/select_general_from_pool.ts @@ -64,7 +64,7 @@ const templateGeneralCard = '
\
'; const templateSpecial = - '<%text%>\ + '<%text%>\ \ <%info%>\ \ diff --git a/hwe/ts/select_npc.ts b/hwe/ts/select_npc.ts index 841c9756..e124806f 100644 --- a/hwe/ts/select_npc.ts +++ b/hwe/ts/select_npc.ts @@ -104,7 +104,7 @@ const templateGeneralCard =
'; const templateSpecial = - '<%text%>\ + '<%text%>\ \ <%info%>\ \ diff --git a/hwe/ts/v_main.ts b/hwe/ts/v_main.ts index c0a05ee1..07325edb 100644 --- a/hwe/ts/v_main.ts +++ b/hwe/ts/v_main.ts @@ -1,9 +1,22 @@ + +import $ from 'jquery'; + +exportWindow(scrollHardTo, 'scrollHardTo'); +exportWindow($, '$'); + +import { exportWindow } from '@util/exportWindow'; +import { scrollHardTo } from '@util/scrollHardTo'; import { createApp } from 'vue' import ReservedCommand from '@/ReservedCommand.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'; + setAxiosXMLHttpRequest(); -createApp(ReservedCommand).use(BootstrapVue3).component('v-multiselect', Multiselect).mount('#reservedCommandList') \ No newline at end of file +createApp(ReservedCommand).use(BootstrapVue3).component('v-multiselect', Multiselect).mount('#reservedCommandList'); + +auto500px(); \ No newline at end of file diff --git a/i_entrance/admin_userlist.php b/i_entrance/admin_userlist.php index 3d90d26f..3257d92a 100644 --- a/i_entrance/admin_userlist.php +++ b/i_entrance/admin_userlist.php @@ -35,7 +35,7 @@ require(__DIR__ . '/../vendor/autoload.php');
가입 허용  -
+
@@ -45,7 +45,7 @@ require(__DIR__ . '/../vendor/autoload.php');
로그인 허용  -
+
diff --git a/i_entrance/entrance.php b/i_entrance/entrance.php index fa783d10..6663c37f 100644 --- a/i_entrance/entrance.php +++ b/i_entrance/entrance.php @@ -38,7 +38,7 @@ $acl = $session->acl; - + @@ -47,7 +47,7 @@ $acl = $session->acl;