build(WIP): printDist를 모든 코드에 적용

- 현재 summernote 미작동
2021-12-12 19:26:27 +09:00
parent 865d3c89bb
commit 8a899c9afe
59 changed files with 961 additions and 954 deletions
@@ -13,13 +13,17 @@ require(__DIR__ . '/../vendor/autoload.php');
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <title>설치</title>
    <?php /* NOTE: 설치 이전에는 ServConfig가 준비되어있지 않으므로 예외로 수동 지정 */ ?>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('../dist_js/vendors.js') ?>
+    <?= WebUtil::printJS('../dist_js/gateway/vendors.js') ?>
-    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
+    <?= WebUtil::printCSS('../dist_js/gateway/vendor.css') ?>
-    <?= WebUtil::printJS('../dist_js/install.js') ?>
+    <?= WebUtil::printJS('../dist_js/gateway/common_ts.js') ?>
-    <?= WebUtil::printCSS('../dist_css/vendor.css') ?>
+    <?= WebUtil::printCSS('../dist_js/gateway/common_ts.css') ?>
-    <?= WebUtil::printCSS('../dist_css/common_ts.css') ?>
+    <?= WebUtil::printJS('../dist_js/gateway/install.js') ?>
    <?= WebUtil::printCSS('../dist_js/gateway/install.css') ?>
    <?= WebUtil::printCSS('../css/install.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
@@ -24,7 +24,7 @@ $plock = $db->queryFirstField('SELECT plock FROM plock');
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('dist_css/common.css')?>
+<?= WebUtil::printDist('ts', 'common', true) ?>
 <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 <body>
@@ -22,7 +22,7 @@ $admin = getAdmin();
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('dist_css/common.css')?>
+<?= WebUtil::printDist('ts', 'common', true) ?>
 <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 <body>
@@ -23,7 +23,7 @@ $db = DB::db();
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=1024" />
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <?= WebUtil::printCSS('dist_css/common.css') ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
@@ -23,8 +23,9 @@ $ipGroupList = Util::arrayGroupBy(
    'ip_c'
 );
-function colorBlockedName($general){
+function colorBlockedName($general)
-    if(!$general['blocked']){
+{
    if (!$general['blocked']) {
        return $general['name'];
    }
    return "<span style='color:magenta;'>{$general['name']}</span>";
@@ -40,7 +41,7 @@ function colorBlockedName($general){
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=1024" />
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <?= WebUtil::printCSS('dist_css/common.css') ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
@@ -108,14 +109,14 @@ function colorBlockedName($general){
                <td align=center width=129>IP</td>
                <td align=center width=100>ID</td>
            </tr>
-<?php foreach($ipGroupList as $ipGroupC=>$users): ?>
+            <?php foreach ($ipGroupList as $ipGroupC => $users) : ?>
-    <tr>
+                <tr>
-        <td><?=join('<br>',array_map('\sammo\colorBlockedName', $users))?></td>
+                    <td><?= join('<br>', array_map('\sammo\colorBlockedName', $users)) ?></td>
-        <td><?=join('<br>',array_column($users, 'lastconnect'))?></td>
+                    <td><?= join('<br>', array_column($users, 'lastconnect')) ?></td>
-        <td><?=join('<br>',array_column($users, 'ip'))?></td>
+                    <td><?= join('<br>', array_column($users, 'ip')) ?></td>
-        <td><?=join('<br>',array_column($users, 'owner'))?></td>
+                    <td><?= join('<br>', array_column($users, 'owner')) ?></td>
-    </tr>
+                </tr>
-<?php endforeach; ?>
+            <?php endforeach; ?>
        </table>
        <?php
        //NOTE: password의 md5 해시가 같은지 확인하는 방식으로는 앞으로 잡아낼 수 없다. 폐기
@@ -39,7 +39,7 @@ $sel2[$type2] = "selected";
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=1024" />
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <?= WebUtil::printCSS('dist_css/common.css') ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
@@ -212,7 +212,7 @@ GROUP BY B.nation
                $query .= " order by avg(B.dex5) desc";
                break;
        }
-        foreach($db->query($query) as $nation){
+        foreach ($db->query($query) as $nation) {
            $gen = $db->queryFirstRow('SELECT COUNT(*) as cnt,
            ROUND(AVG(gold)) as avgg,
            ROUND(AVG(rice)) as avgr,
@@ -221,7 +221,7 @@ GROUP BY B.nation
                                    ROUND(AVG(intel), 1) as avgi,
                                    ROUND(AVG(explevel), 1) as avge,
            SUM(crew) as crew
-from general where nation=%i',$nation['nation']);
+from general where nation=%i', $nation['nation']);
            $city = $db->queryFirstRow('SELECT COUNT(*) as cnt,
            SUM(pop) as pop,    SUM(pop_max) as pop_max,
@@ -312,7 +312,7 @@ from city where nation=%i', $nation['nation']);
            ?>
        </tr>
        <?php
-        foreach($db->query('SELECT * from statistic where month=1 or no=1') as $stat){
+        foreach ($db->query('SELECT * from statistic where month=1 or no=1') as $stat) {
            echo "
    <tr>
        <td align=center>{$stat['year']}</td>
@@ -86,7 +86,7 @@ $generalObj = General::createGeneralObjFromDB($gen);
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=1024" />
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-    <?= WebUtil::printCSS('dist_css/common.css') ?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
@@ -1,4 +1,5 @@
 <?php
 namespace sammo;
 include "lib.php";
@@ -25,76 +26,97 @@ $sel[$type] = "selected";
 ?>
 <!DOCTYPE html>
 <html>
 <head>
-<title>외교정보</title>
+    <title>외교정보</title>
-<meta charset="UTF-8">
+    <meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
+    <meta name="viewport" content="width=1024" />
-<?=WebUtil::printCSS('../d_shared/common.css')?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-<?=WebUtil::printCSS('dist_css/common.css')?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
-<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 <body>
-<table align=center width=1000 class='tb_layout bg0'>
+    <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>외 교 정 보<br><?=closeButton()?></td></tr>
+        <tr>
-    <tr><td>
+            <td>외 교 정 보<br><?= closeButton() ?></td>
-        <form name=form1 method=post>
+        </tr>
-        정렬순서 :
+        <tr>
-        <select name=type size=1>
+            <td>
-            <option <?=$sel[0]??''?> value=0>상태</option>
+                <form name=form1 method=post>
-        </select>
+                    정렬순서 :
-        <input type=submit name=btn value='정렬하기'>
+                    <select name=type size=1>
-        </form>
+                        <option <?= $sel[0] ?? '' ?> value=0>상태</option>
-    </td></tr>
+                    </select>
-</table>
+                    <input type=submit name=btn value='정렬하기'>
-<table width=1000 align=center class='tb_layout bg0'>
+                </form>
-    <tr><td colspan=9 align=center bgcolor=blue>외 교 관 계</td></tr>
+            </td>
        </tr>
    </table>
    <table width=1000 align=center class='tb_layout bg0'>
        <tr>
            <td colspan=9 align=center bgcolor=blue>외 교 관 계</td>
        </tr>
        <tr>
            <td width=130 align=center class='bg1'>국 가 명</td>
            <td width=130 align=center class='bg1'>국 가 명</td>
            <td width=80 align=center class='bg1'>상 태</td>
            <td width=60 align=center class='bg1'>기 간</td>
        </tr>
        <?php
        $nationName = [];
        $nationColor = [];
        foreach (getAllNationStaticInfo() as $nation) {
            $nationName[$nation['nation']] = $nation['name'];
            $nationColor[$nation['nation']] = $nation['color'];
        }
        foreach ($db->query('SELECT * from diplomacy where me < you order by state desc') as $dip) {
            $me = $dip['me'];
            $you = $dip['you'];
            if ($dip['state'] == 2) {
                continue;
            }
            switch ($dip['state']) {
                case 0:
                    $state = "<font color=red>교 전</font>";
                    break;
                case 1:
                    $state = "<font color=magenta>선포중</font>";
                    break;
                case 2:
                    $state = "통 상";
                    break;
                case 7:
                    $state = "<font color=green>불가침</font>";
                    break;
            }
            $date = TimeUtil::now();
            echo "
    <tr>
-        <td width=130 align=center class='bg1'>국 가 명</td>
+        <td align=center style=color:" . newColor($nationColor[$me]) . ";background-color:{$nationColor[$me]};>$nationName[$me]</td>
-        <td width=130 align=center class='bg1'>국 가 명</td>
+        <td align=center style=color:" . newColor($nationColor[$you]) . ";background-color:{$nationColor[$you]};>$nationName[$you]</td>
        <td width=80  align=center class='bg1'>상 태</td>
        <td width=60  align=center class='bg1'>기 간</td>
    </tr>
 <?php
 $nationName = [];
 $nationColor = [];
 foreach (getAllNationStaticInfo() as $nation) {
    $nationName[$nation['nation']] = $nation['name'];
    $nationColor[$nation['nation']] = $nation['color'];
 }
 foreach($db->query('SELECT * from diplomacy where me < you order by state desc') as $dip){
    $me = $dip['me'];
    $you = $dip['you'];
    if ($dip['state'] == 2) {
        continue;
    }
    switch ($dip['state']) {
        case 0: $state = "<font color=red>교 전</font>"; break;
        case 1: $state = "<font color=magenta>선포중</font>"; break;
        case 2: $state = "통 상"; break;
        case 7: $state = "<font color=green>불가침</font>"; break;
    }
    $date = TimeUtil::now();
    echo "
    <tr>
        <td align=center style=color:".newColor($nationColor[$me]).";background-color:{$nationColor[$me]};>$nationName[$me]</td>
        <td align=center style=color:".newColor($nationColor[$you]).";background-color:{$nationColor[$you]};>$nationName[$you]</td>
        <td align=center>$state</td>
        <td align=center>{$dip['term']} 개월</td>
    </tr>";
-}
+        }
-?>
+        ?>
-</table>
+    </table>
-<table align=center width=1000 class='tb_layout bg0'>
+    <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
+        <tr>
-    <tr><td><?=banner()?> </td></tr>
+            <td><?= closeButton() ?></td>
-</table>
+        </tr>
        <tr>
            <td><?= banner() ?> </td>
        </tr>
    </table>
 </body>
 </html>
@@ -27,13 +27,10 @@ $templates = new \League\Plates\Engine(__DIR__ . '/templates');
    <meta name="viewport" content="width=1136" />
    <title><?= UniqueConst::$serverName ?>: 명장일람</title>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printCSS('css/hallOfFame.css') ?>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('dist_js/vendors.js') ?>
+    <?= WebUtil::printDist('ts', 'common') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
 </head>
 <body>
@@ -18,12 +18,9 @@ increaseRefresh("왕조일람", 1);
    <meta name="viewport" content="width=1024" />
    <title><?= UniqueConst::$serverName ?>: 왕조일람</title>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printDist('ts', 'common') ?>
 </head>
@@ -1,4 +1,5 @@
 <?php
 namespace sammo;
 include "lib.php";
@@ -13,8 +14,8 @@ $templates->registerFunction('ConvertLog', '\sammo\ConvertLog');
 $templates->registerFunction('newColor', '\sammo\newColor');
 increaseRefresh("왕조일람", 1);
-$emperior = $db->queryFirstRow('SELECT * FROM emperior WHERE `no`=%i',$select);
+$emperior = $db->queryFirstRow('SELECT * FROM emperior WHERE `no`=%i', $select);
-$serverID = $emperior['server_id']??($emperior['serverID']??null);
+$serverID = $emperior['server_id'] ?? ($emperior['serverID'] ?? null);
 ?>
@@ -22,193 +23,199 @@ $serverID = $emperior['server_id']??($emperior['serverID']??null);
 <html>
 <head>
-<meta charset="UTF-8">
+    <meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
+    <meta name="viewport" content="width=1024" />
-<title><?=UniqueConst::$serverName?>: 왕조일람</title>
+    <title><?= UniqueConst::$serverName ?>: 왕조일람</title>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-<?=WebUtil::printCSS('dist_css/common.css')?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
-<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 <body>
-<table align=center width=1000 class="tb_layout bg0">
+    <table align=center width=1000 class="tb_layout bg0">
-    <tr><td>역 대 왕 조<br>
+        <tr>
-        <button onclick=window.close()>창 닫기</button>
+            <td>역 대 왕 조<br>
-        <div style="float:right;"><a href="a_emperior.php"><button type='button'>전체보기</button></a><div>
+                <button onclick=window.close()>창 닫기</button>
-    </td></tr>
+                <div style="float:right;"><a href="a_emperior.php"><button type='button'>전체보기</button></a>
                    <div>
            </td>
        </tr>
-</table>
+    </table>
-<?php
+    <?php
-if($emperior):
+    if ($emperior) :
-?>
+    ?>
-<table align=center width=1000 class='tb_layout bg0'>
+        <table align=center width=1000 class='tb_layout bg0'>
-    <tr>
+            <tr>
-        <td bgcolor=skyblue align=center colspan=6>
+                <td bgcolor=skyblue align=center colspan=6>
-            <font size=5><?=$emperior['phase']?></font>
+                    <font size=5><?= $emperior['phase'] ?></font>
-        </td>
+                </td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' width=98 align=center>국 가 수<br>(최종 / 최대)</td>
+                <td class='bg1' width=98 align=center>국 가 수<br>(최종 / 최대)</td>
-        <td align=center width=398 colspan=2><?=$emperior['nation_count']?></td>
+                <td align=center width=398 colspan=2><?= $emperior['nation_count'] ?></td>
-        <td class='bg1' width=98 align=center>장 수 수<br>(최종 / 최대)</td>
+                <td class='bg1' width=98 align=center>장 수 수<br>(최종 / 최대)</td>
-        <td align=center width=398 colspan=2><?=$emperior['gen_count']?></td>
+                <td align=center width=398 colspan=2><?= $emperior['gen_count'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' align=center>등 장 국 가</td>
+                <td class='bg1' align=center>등 장 국 가</td>
-        <td colspan=5><?=$emperior['nation_name']?></td>
+                <td colspan=5><?= $emperior['nation_name'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' align=center>국가별 성향</td>
+                <td class='bg1' align=center>국가별 성향</td>
-        <td colspan=5><?=$emperior['nation_hist']?></td>
+                <td colspan=5><?= $emperior['nation_hist'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' align=center>장 수 성 격</td>
+                <td class='bg1' align=center>장 수 성 격</td>
-        <td colspan=5><?=$emperior['personal_hist']?></td>
+                <td colspan=5><?= $emperior['personal_hist'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' align=center>장 수 특 기</td>
+                <td class='bg1' align=center>장 수 특 기</td>
-        <td colspan=5><?=$emperior['special_hist']?></td>
+                <td colspan=5><?= $emperior['special_hist'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td align=center style=color:<?=newColor($emperior['color'])?>; bgcolor=<?=$emperior['color']?> colspan=6>
+                <td align=center style=color:<?= newColor($emperior['color']) ?>; bgcolor=<?= $emperior['color'] ?> colspan=6>
-            <font size=5><?=$emperior['name']?> (<?=$emperior['year']?>年 <?=$emperior['month']?>月)</font>
+                    <font size=5><?= $emperior['name'] ?> (<?= $emperior['year'] ?>年 <?= $emperior['month'] ?>月)</font>
-        </td>
+                </td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' width=98 align=center>국 력</td>
+                <td class='bg1' width=98 align=center>국 력</td>
-        <td align=center width=398 colspan=2><?=$emperior['power']?></td>
+                <td align=center width=398 colspan=2><?= $emperior['power'] ?></td>
-        <td class='bg1' width=98 align=center>성 향</td>
+                <td class='bg1' width=98 align=center>성 향</td>
-        <td align=center width=398 colspan=2><?=$emperior['type']?></td>
+                <td align=center width=398 colspan=2><?= $emperior['type'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' width=98 align=center>장 수</td>
+                <td class='bg1' width=98 align=center>장 수</td>
-        <td align=center width=398 colspan=2><?=$emperior['gennum']?></td>
+                <td align=center width=398 colspan=2><?= $emperior['gennum'] ?></td>
-        <td class='bg1' width=98 align=center>속 령</td>
+                <td class='bg1' width=98 align=center>속 령</td>
-        <td align=center width=398 colspan=2><?=$emperior['citynum']?></td>
+                <td align=center width=398 colspan=2><?= $emperior['citynum'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' align=center>총 인 구</td>
+                <td class='bg1' align=center>총 인 구</td>
-        <td align=center colspan=2><?=$emperior['pop']?></td>
+                <td align=center colspan=2><?= $emperior['pop'] ?></td>
-        <td class='bg1' align=center>인 구 율</td>
+                <td class='bg1' align=center>인 구 율</td>
-        <td align=center colspan=2><?=$emperior['poprate']?></td>
+                <td align=center colspan=2><?= $emperior['poprate'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' align=center>국 고</td>
+                <td class='bg1' align=center>국 고</td>
-        <td align=center colspan=2><?=$emperior['gold']?></td>
+                <td align=center colspan=2><?= $emperior['gold'] ?></td>
-        <td class='bg1' align=center>병 량</td>
+                <td class='bg1' align=center>병 량</td>
-        <td align=center colspan=2><?=$emperior['rice']?></td>
+                <td align=center colspan=2><?= $emperior['rice'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' align=center>황 제</td>
+                <td class='bg1' align=center>황 제</td>
-        <td width=64>&nbsp;</td>
+                <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l12name']?></td>
+                <td width=332><?= $emperior['l12name'] ?></td>
-        <td class='bg1' align=center>승 상</td>
+                <td class='bg1' align=center>승 상</td>
-        <td width=64>&nbsp;</td>
+                <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l11name']?></td>
+                <td width=332><?= $emperior['l11name'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' align=center>위 장 군</td>
+                <td class='bg1' align=center>위 장 군</td>
-        <td width=64>&nbsp;</td>
+                <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l10name']?></td>
+                <td width=332><?= $emperior['l10name'] ?></td>
-        <td class='bg1' align=center>사 공</td>
+                <td class='bg1' align=center>사 공</td>
-        <td width=64>&nbsp;</td>
+                <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l9name']?></td>
+                <td width=332><?= $emperior['l9name'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' align=center>표 기 장 군</td>
+                <td class='bg1' align=center>표 기 장 군</td>
-        <td width=64>&nbsp;</td>
+                <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l8name']?></td>
+                <td width=332><?= $emperior['l8name'] ?></td>
-        <td class='bg1' align=center>태 위</td>
+                <td class='bg1' align=center>태 위</td>
-        <td width=64>&nbsp;</td>
+                <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l7name']?></td>
+                <td width=332><?= $emperior['l7name'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' align=center>거 기 장 군</td>
+                <td class='bg1' align=center>거 기 장 군</td>
-        <td width=64>&nbsp;</td>
+                <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l6name']?></td>
+                <td width=332><?= $emperior['l6name'] ?></td>
-        <td class='bg1' align=center>사 도</td>
+                <td class='bg1' align=center>사 도</td>
-        <td width=64>&nbsp;</td>
+                <td width=64>&nbsp;</td>
-        <td width=332><?=$emperior['l5name']?></td>
+                <td width=332><?= $emperior['l5name'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' align=center>오 호 장 군</td>
+                <td class='bg1' align=center>오 호 장 군</td>
-        <td colspan=5><?=$emperior['tiger']?></td>
+                <td colspan=5><?= $emperior['tiger'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' align=center>건 안 칠 자</td>
+                <td class='bg1' align=center>건 안 칠 자</td>
-        <td colspan=5><?=$emperior['eagle']?></td>
+                <td colspan=5><?= $emperior['eagle'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' align=center>장 수 들<br>(공헌도 순서)</td>
+                <td class='bg1' align=center>장 수 들<br>(공헌도 순서)</td>
-        <td colspan=5><?=$emperior['gen']?></td>
+                <td colspan=5><?= $emperior['gen'] ?></td>
-    </tr>
+            </tr>
-    <tr>
+            <tr>
-        <td class='bg1' align=center>역 사 기 록</td>
+                <td class='bg1' align=center>역 사 기 록</td>
-        <td colspan=5><?=formatHistoryToHTML(Json::decode($emperior['history']))?></td>
+                <td colspan=5><?= formatHistoryToHTML(Json::decode($emperior['history'])) ?></td>
-    </tr>
+            </tr>
-</table>
+        </table>
-<?php
+    <?php
-endif;
+    endif;
-$showServers = $emperior;
+    $showServers = $emperior;
-if(!$serverID){
+    if (!$serverID) {
-    $serverID = UniqueConst::$serverID;
+        $serverID = UniqueConst::$serverID;
 }
 if($showServers){
    $nations = $db->query('SELECT * FROM ng_old_nations WHERE server_id=%s ORDER BY date DESC', $serverID);
    foreach($nations as $nation){
        if(!$nation['nation']??null){
            continue;
        }
        $nation += Json::decode($nation['data']);
        $nation['typeName'] = getNationType($nation['type']);
        $nation['levelName'] = getNationLevel($nation['level']);
        /** @var int[]|null $nationGenerals */
        $nationGenerals = $nation['generals'];
        if($nationGenerals){
            $generals = $db->query('SELECT `general_no`, `name`, `last_yearmonth` FROM ng_old_generals WHERE server_id=%s AND general_no IN %li', $serverID, $nationGenerals);
            if(count($generals) != count($nationGenerals) && $serverID == UniqueConst::$serverID){
                $liveGenerals = $nationGenerals;
                foreach($generals as $general){
                    if(in_array($general['general_no'], $nationGenerals)){
                        unset($nationGenerals[$general['general_no']]);
                    }
                }
                $liveGenerals = $db->query('SELECT `no`as`general_no`, `name` FROM general WHERE no IN %li', $liveGenerals);
                $nation['generalsFull'] = array_merge($liveGenerals, $generals);
            }
            else{
                $nation['generalsFull'] = $generals;
            }
        }
        else{
            $nation['generalsFull'] = [];
        }
        if(key_exists('aux', $nation) && !is_array($nation['aux'])){
            $nation += Json::decode($nation['aux']);
        }
        echo $templates->render('oldNation', $nation);
    }
 }
 ?>
-<table align=center width=1000 class='tb_layout bg0'>
+    if ($showServers) {
-    <tr><td><?=closeButton()?></td></tr>
+        $nations = $db->query('SELECT * FROM ng_old_nations WHERE server_id=%s ORDER BY date DESC', $serverID);
-    <tr><td><?=banner()?></td></tr>
+        foreach ($nations as $nation) {
-</table>
+            if (!$nation['nation'] ?? null) {
                continue;
            }
            $nation += Json::decode($nation['data']);
            $nation['typeName'] = getNationType($nation['type']);
            $nation['levelName'] = getNationLevel($nation['level']);
            /** @var int[]|null $nationGenerals */
            $nationGenerals = $nation['generals'];
            if ($nationGenerals) {
                $generals = $db->query('SELECT `general_no`, `name`, `last_yearmonth` FROM ng_old_generals WHERE server_id=%s AND general_no IN %li', $serverID, $nationGenerals);
                if (count($generals) != count($nationGenerals) && $serverID == UniqueConst::$serverID) {
                    $liveGenerals = $nationGenerals;
                    foreach ($generals as $general) {
                        if (in_array($general['general_no'], $nationGenerals)) {
                            unset($nationGenerals[$general['general_no']]);
                        }
                    }
                    $liveGenerals = $db->query('SELECT `no`as`general_no`, `name` FROM general WHERE no IN %li', $liveGenerals);
                    $nation['generalsFull'] = array_merge($liveGenerals, $generals);
                } else {
                    $nation['generalsFull'] = $generals;
                }
            } else {
                $nation['generalsFull'] = [];
            }
            if (key_exists('aux', $nation) && !is_array($nation['aux'])) {
                $nation += Json::decode($nation['aux']);
            }
            echo $templates->render('oldNation', $nation);
        }
    }
    ?>
    <table align=center width=1000 class='tb_layout bg0'>
        <tr>
            <td><?= closeButton() ?></td>
        </tr>
        <tr>
            <td><?= banner() ?></td>
        </tr>
    </table>
 </body>
 </html>
@@ -45,12 +45,9 @@ if ($gameStor->isunited) {
    <meta name="viewport" content="width=1024" />
    <title><?= UniqueConst::$serverName ?>: 장수일람</title>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('dist_js/vendors.js') ?>
+    <?= WebUtil::printDist('ts', 'common') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
 </head>
@@ -47,13 +47,10 @@ if ($scenarioIdx && key_exists($scenarioIdx, $scenarioList[$seasonIdx] ?? [])) {
    <meta name="viewport" content="width=1136" />
    <title><?= UniqueConst::$serverName ?>: 명예의 전당</title>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printCSS('css/hallOfFame.css') ?>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('dist_js/vendors.js') ?>
+    <?= WebUtil::printDist('ts', ['common', 'hallOfFame']) ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJs('dist_js/hallOfFame.js') ?>
 </head>
 <body>
@@ -99,15 +99,13 @@ $nations = Json::decode($history['nations']);
    <meta name="viewport" content="width=1024" />
    <title><?= UniqueConst::$serverName ?>: 연감</title>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS("js/map/theme_{$mapTheme}.js") ?>
    <?= WebUtil::printJS('dist_js/history.js') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printCSS('css/map.css') ?>
    <?= WebUtil::printCSS('css/history.css') ?>
    <?= WebUtil::printDist('ts', ['common', 'history']) ?>
    <script>
        var startYear = <?= $s_year ?>;
        var startMonth = <?= $s_month ?>;
@@ -30,13 +30,9 @@ if ($con >= 2) {
    <meta name="viewport" content="width=1024" />
    <title><?= UniqueConst::$serverName ?>: 세력일람</title>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/extKingdoms.js') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-
+    <?= WebUtil::printDist('ts', ['common', 'extKingdoms']) ?>
 </head>
 <body>
@@ -28,13 +28,9 @@ $sel[$type] = "selected";
    <meta name="viewport" content="width=1024" />
    <title><?= UniqueConst::$serverName ?>: 빙의일람</title>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-
+    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
 <body>
@@ -32,12 +32,13 @@ if ($con >= 2) {
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=1024" />
    <title><?= UniqueConst::$serverName ?>: 세력도</title>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('css/normalize.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printCSS('css/map.css') ?>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
    <?= WebUtil::printJS('d_shared/base_map.js') ?>
-    <?= WebUtil::printJS('dist_js/map.js') ?>
+    <?= WebUtil::printDist('ts', ['common', 'map']) ?>
    <script>
        window.serverNick = '<?= DB::prefix() ?>';
        window.serverID = '<?= UniqueConst::$serverID ?>';
@@ -51,12 +52,6 @@ if ($con >= 2) {
        });
    </script>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('css/normalize.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printCSS('css/map.css') ?>
 </head>
 <body>
@@ -54,12 +54,7 @@ if ($admin['maxonline'] < $curonline) {
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=1024" />
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <style>
        .big_bar {
@@ -87,6 +82,8 @@ if ($admin['maxonline'] < $curonline) {
            margin-left: 1ch;
        }
    </style>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
 <body>
@@ -30,12 +30,7 @@ $vote = $admin['vote'] ?: ['-'];
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=1024" />
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <style>
        .little_bar {
@@ -46,6 +41,8 @@ $vote = $admin['vote'] ?: ['-'];
            text-align: center;
        }
    </style>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printDist('ts', ['common']) ?>
    <script type="text/javascript">
        function captureKey(e) {
            if (e.keyCode == 13 && e.srcElement.type == 'text') {
@@ -52,12 +52,9 @@ if ($msg2 == "") {
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=1024" />
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
 <body>
@@ -120,12 +120,9 @@ $showGeneral = General::createGeneralObjFromDB($gen);
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=1024" />
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
@@ -87,12 +87,9 @@ if ($str3) {
    <meta name="viewport" content="width=1024" />
    <title><?= UniqueConst::$serverName ?>: 베팅장</title>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/betting.js') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printDist('ts', ['common', 'betting']) ?>
 </head>
 <body>
@@ -18,16 +18,13 @@ $generalObj = General::createGeneralObjFromDB($session->generalID);
    <meta name="viewport" content="width=1024" />
    <title><?= UniqueConst::$serverName ?>: 사령부</title>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/chiefCenter.js') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printCSS('css/chiefCenter.css') ?>
    <script type="text/javascript">
        var maxChiefTurn = <?= GameConst::$maxChiefTurn ?>;
    </script>
    <?= WebUtil::printDist('ts', ['common', 'chiefCenter']) ?>
 </head>
@@ -35,13 +35,9 @@ $templates = new \League\Plates\Engine('templates');
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=1024" />
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/currentCity.js') ?>
    <?= WebUtil::printCSS('../e_lib/select2/select2.min.css') ?>
    <?= WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <style>
        #general_list tr td {
@@ -57,6 +53,7 @@ $templates = new \League\Plates\Engine('templates');
            font-size: x-small;
        }
    </style>
    <?= WebUtil::printDist('ts', ['common', 'currentCity']) ?>
 </head>
 <body>
@@ -62,15 +62,9 @@ $nationStor->cacheValues(['notice', 'scout_msg', 'available_war_setting_cnt']);
                            ]) ?>;
    </script>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/dipcenter.js') ?>
    <?= WebUtil::printCSS('../e_lib/summernote/summernote-bs4.css') ?>
    <?= WebUtil::printCSS('dist_css/vendors.css') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <?= WebUtil::printCSS('css/dipcenter.css') ?>
+    <?= WebUtil::printDist('ts', ['common', 'dipcenter']) ?>
 </head>
 <body>
@@ -92,11 +92,12 @@ $neutralStateCharMap = [
    <meta name="viewport" content="width=1024" />
    <title><?= UniqueConst::$serverName ?>: 중원 정보</title>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
    <?= WebUtil::printJS('d_shared/base_map.js') ?>
-    <?= WebUtil::printJS('dist_js/map.js') ?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printCSS('css/map.css') ?>
    <?= WebUtil::printCSS('css/history.css') ?>
    <?= WebUtil::printDist('ts', ['common', 'map']) ?>
    <script>
        window.serverNick = '<?= DB::prefix() ?>';
        window.serverID = '<?= UniqueConst::$serverID ?>';
@@ -110,12 +111,6 @@ $neutralStateCharMap = [
        });
    </script>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printCSS('css/map.css') ?>
    <?= WebUtil::printCSS('css/history.css') ?>
 </head>
 <body>
@@ -55,12 +55,9 @@ $templates = new \League\Plates\Engine('templates');
    <meta name="viewport" content="width=1024" />
    <title><?= UniqueConst::$serverName ?>: 암행부</title>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('dist_js/vendors.js') ?>
+    <?= WebUtil::printDist('ts', ['common']) ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
 </head>
 <body>
@@ -35,19 +35,15 @@ $nation = $db->queryFirstRow('SELECT nation,name,level,color,chief_set from nati
    <meta name="viewport" content="width=1024" />
    <title><?= UniqueConst::$serverName ?>: 인사부</title>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
    <?= WebUtil::printJS('dist_js/bossInfo.js') ?>
    <?= WebUtil::printCSS('../e_lib/select2/select2.min.css') ?>
    <?= WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <script type="text/javascript">
        var chiefStatMin = <?= GameConst::$chiefStatMin ?>;
        var myLevel = <?= $meLevel ?>;
    </script>
    <?= WebUtil::printDist('ts', ['common', 'bossInfo']) ?>
    <?php
@@ -37,13 +37,9 @@ $sel = [$type => "selected"];
    <meta name="viewport" content="width=1024" />
    <title><?= UniqueConst::$serverName ?>: 세력도시</title>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('dist_js/vendors.js') ?>
+    <?= WebUtil::printDist('ts', ['common', 'extExpandCity']) ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/extExpandCity.js') ?>
 </head>
 <body>
@@ -46,13 +46,9 @@ if ($gameStor->isunited) {
    <meta name="viewport" content="width=1024" />
    <title><?= UniqueConst::$serverName ?>: 세력장수</title>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('dist_js/vendors.js') ?>
+    <?= WebUtil::printDist('ts', ['common']) ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
 </head>
 <body>
@@ -29,13 +29,9 @@ if ($nationID == 0) {
    <meta name="viewport" content="width=1024" />
    <title><?= UniqueConst::$serverName ?>: 세력정보</title>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-
+    <?= WebUtil::printDist('ts', ['common']) ?>
 </head>
 <body>
@@ -53,14 +53,10 @@ $use_auto_nation_turn = $me->getAuxVar('use_auto_nation_turn') ?? 1;
    <script>
        var availableDieImmediately = <?= $availableDieImmediately ? 'true' : 'false' ?>;
    </script>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
    <?= WebUtil::printJS('dist_js/myPage.js') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printDist('ts', ['common', 'myPage']) ?>
 </head>
 <body>
@@ -76,11 +76,7 @@ $cssList = $commandObj->getCSSFiles();
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=1024" />
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
    <?= WebUtil::printJS('d_shared/base_map.js') ?>
    <?= WebUtil::printJS('dist_js/processing.js') ?>
    <script>
        window.serverNick = '<?= DB::prefix() ?>';
        window.serverID = '<?= UniqueConst::$serverID ?>';
@@ -92,17 +88,16 @@ $cssList = $commandObj->getCSSFiles();
    <?= WebUtil::printCSS('../e_lib/select2/select2.min.css') ?>
    <?= WebUtil::printCSS('../e_lib/select2/select2-bootstrap4.css') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printCSS('css/main.css') ?>
    <?= WebUtil::printCSS('css/map.css') ?>
    <?= WebUtil::printCSS('css/processing.css') ?>
    <?php
    foreach ($cssList as $css) {
        print(WebUtil::printCSS($css));
    }
    ?>
    <?= WebUtil::printDist('ts', ['common', 'processing']) ?>
 </head>
 <body class="img_back">
@@ -1,4 +1,5 @@
 <?php
 namespace sammo;
 include "lib.php";
@@ -15,7 +16,7 @@ TurnExecutionHelper::executeAllCommand();
 $me = $db->queryFirstRow('select no,tournament,con,turntime from general where owner=%i', $userID);
-$admin = $gameStor->getValues(['tournament','phase','tnmt_msg','tnmt_type','develcost','tnmt_trig']);
+$admin = $gameStor->getValues(['tournament', 'phase', 'tnmt_msg', 'tnmt_type', 'develcost', 'tnmt_trig']);
 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -24,11 +25,32 @@ if ($con >= 2) {
 }
 switch ($admin['tnmt_type']) {
-default: throw new \RuntimeException('invalid tnmt_type');
+    default:
-case 0: $tnmt_type = "<font color=cyan>전력전</font>"; $tp = "total"; $tp2 = "종합"; $tp3 = "total"; break;
+        throw new \RuntimeException('invalid tnmt_type');
-case 1: $tnmt_type = "<font color=cyan>통솔전</font>"; $tp = "leadership"; $tp2 = "통솔"; $tp3 = "leadership"; break;
+    case 0:
-case 2: $tnmt_type = "<font color=cyan>일기토</font>"; $tp = "strength"; $tp2 = "무력"; $tp3 = "strength"; break;
+        $tnmt_type = "<font color=cyan>전력전</font>";
-case 3: $tnmt_type = "<font color=cyan>설전</font>";   $tp = "intel"; $tp2 = "지력"; $tp3 = "intel"; break;
+        $tp = "total";
        $tp2 = "종합";
        $tp3 = "total";
        break;
    case 1:
        $tnmt_type = "<font color=cyan>통솔전</font>";
        $tp = "leadership";
        $tp2 = "통솔";
        $tp3 = "leadership";
        break;
    case 2:
        $tnmt_type = "<font color=cyan>일기토</font>";
        $tp = "strength";
        $tp2 = "무력";
        $tp3 = "strength";
        break;
    case 3:
        $tnmt_type = "<font color=cyan>설전</font>";
        $tp = "intel";
        $tp2 = "지력";
        $tp3 = "intel";
        break;
 }
 ?>
@@ -37,356 +59,406 @@ case 3: $tnmt_type = "<font color=cyan>설전</font>";   $tp = "intel"; $tp2 = "
 <?php if ($con == 1) {
    MessageBox("접속제한이 얼마 남지 않았습니다! 제한량이 모자라다면 참여를 해보세요^^");
 } ?>
 <head>
-<meta charset="UTF-8">
+    <meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
+    <meta name="viewport" content="width=1024" />
-<title><?=UniqueConst::$serverName?>: 토너먼트</title>
+    <title><?= UniqueConst::$serverName ?>: 토너먼트</title>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
+    <?= WebUtil::printCSS('../d_shared/common.css') ?>
-<?=WebUtil::printCSS('dist_css/common.css')?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
-<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 <body>
-<table align=center width=2000 class='tb_layout bg0'>
+    <table align=center width=2000 class='tb_layout bg0'>
-    <tr><td>삼모전 토너먼트<br><?=closeButton()?></td></tr>
+        <tr>
-</table>
+            <td>삼모전 토너먼트<br><?= closeButton() ?></td>
-<table align=center class='tb_layout bg0'>
+        </tr>
-<?php
+    </table>
-if ($session->userGrade >= 5) {
+    <table align=center class='tb_layout bg0'>
-    $sel = [];
+        <?php
-    echo "
+        if ($session->userGrade >= 5) {
            $sel = [];
            echo "
 <form method=post action=c_tournament.php>
    <tr><td colspan=8><input type=textarea size=150 style=color:white;background-color:black; name=msg><input type=submit name=btn value='메시지'></td></tr>
    <tr><td colspan=8>
        <input type=button value='갱신' onclick='location.reload()'>";
-    switch ($admin['tnmt_trig']) {
+            switch ($admin['tnmt_trig']) {
-    case 0: $sel[0] = "selected"; break;
+                case 0:
-    case 1: $sel[1] = "selected"; break;
+                    $sel[0] = "selected";
-    case 2: $sel[2] = "selected"; break;
+                    break;
-    case 3: $sel[3] = "selected"; break;
+                case 1:
-    case 4: $sel[4] = "selected"; break;
+                    $sel[1] = "selected";
-    case 5: $sel[5] = "selected"; break;
+                    break;
-    case 6: $sel[6] = "selected"; break;
+                case 2:
-    case 7: $sel[7] = "selected"; break;
+                    $sel[2] = "selected";
-    }
+                    break;
                case 3:
                    $sel[3] = "selected";
                    break;
                case 4:
                    $sel[4] = "selected";
                    break;
                case 5:
                    $sel[5] = "selected";
                    break;
                case 6:
                    $sel[6] = "selected";
                    break;
                case 7:
                    $sel[7] = "selected";
                    break;
            }
-    if ($admin['tournament'] == 0) {
+            if ($admin['tournament'] == 0) {
        ?>
-            <select name=auto size=1 style=color:white;background-color:black;>
+                <select name=auto size=1 style=color:white;background-color:black;>
-                <option style=color:white; value=0>수동진행</option>
+                    <option style=color:white; value=0>수동진행</option>
-                <option style=color:white; value=1>12분 05일</option>
+                    <option style=color:white; value=1>12분 05일</option>
-                <option style=color:white; value=2>07분 10시</option>
+                    <option style=color:white; value=2>07분 10시</option>
-                <option style=color:white; value=3>03분 04시</option>
+                    <option style=color:white; value=3>03분 04시</option>
-                <option style=color:white; value=4>01분 82분</option>
+                    <option style=color:white; value=4>01분 82분</option>
-                <option style=color:white; value=5>30초 41분</option>
+                    <option style=color:white; value=5>30초 41분</option>
-                <option style=color:white; value=6>15초 21분</option>
+                    <option style=color:white; value=6>15초 21분</option>
-                <option style=color:white; value=7>05초 07분</option>
+                    <option style=color:white; value=7>05초 07분</option>
-            </select>
+                </select>
-            <select name=type size=1 style=color:white;background-color:black;>
+                <select name=type size=1 style=color:white;background-color:black;>
-                <option style=color:white; value=0>전력전</option>
+                    <option style=color:white; value=0>전력전</option>
-                <option style=color:white; value=1>통솔전</option>
+                    <option style=color:white; value=1>통솔전</option>
-                <option style=color:white; value=2>일기토</option>
+                    <option style=color:white; value=2>일기토</option>
-                <option style=color:white; value=3>설전</option>
+                    <option style=color:white; value=3>설전</option>
-            </select>
+                </select>
-            <input type=submit name=btn value='개최'>
+                <input type=submit name=btn value='개최'>
-            <select name=trig size=1 style=color:white;background-color:black;>
+                <select name=trig size=1 style=color:white;background-color:black;>
-                <option style=color:white; value=0 <?=$sel[0]??''?>>수동진행</option>
+                    <option style=color:white; value=0 <?= $sel[0] ?? '' ?>>수동진행</option>
-                <option style=color:white; value=1 <?=$sel[1]??''?>>12분 05일</option>
+                    <option style=color:white; value=1 <?= $sel[1] ?? '' ?>>12분 05일</option>
-                <option style=color:white; value=2 <?=$sel[2]??''?>>07분 10시</option>
+                    <option style=color:white; value=2 <?= $sel[2] ?? '' ?>>07분 10시</option>
-                <option style=color:white; value=3 <?=$sel[3]??''?>>03분 04시</option>
+                    <option style=color:white; value=3 <?= $sel[3] ?? '' ?>>03분 04시</option>
-                <option style=color:white; value=4 <?=$sel[4]??''?>>01분 82분</option>
+                    <option style=color:white; value=4 <?= $sel[4] ?? '' ?>>01분 82분</option>
-                <option style=color:white; value=5 <?=$sel[5]??''?>>30초 41분</option>
+                    <option style=color:white; value=5 <?= $sel[5] ?? '' ?>>30초 41분</option>
-                <option style=color:white; value=6 <?=$sel[6]??''?>>15초 21분</option>
+                    <option style=color:white; value=6 <?= $sel[6] ?? '' ?>>15초 21분</option>
-                <option style=color:white; value=7 <?=$sel[7]??''?>>05초 07분</option>
+                    <option style=color:white; value=7 <?= $sel[7] ?? '' ?>>05초 07분</option>
-            </select>
+                </select>
-            <input type=submit name=btn value='자동개최설정'>
+                <input type=submit name=btn value='자동개최설정'>
-            <input type=submit name=btn value='포상'>
+                <input type=submit name=btn value='포상'>
-            <input type=submit name=btn value='회수'>
+                <input type=submit name=btn value='회수'>
        <?php
-    } else {
+            } else {
-        echo "<input type=submit name=btn value='중단' onclick='return confirm(\"진짜 중단하시겠습니까?\")'>";
+                echo "<input type=submit name=btn value='중단' onclick='return confirm(\"진짜 중단하시겠습니까?\")'>";
-    }
+            }
-    switch ($admin['tournament']) {
+            switch ($admin['tournament']) {
-    case 1:
+                case 1:
-        echo "<input type=submit name=btn value='랜덤투입'>";
+                    echo "<input type=submit name=btn value='랜덤투입'>";
-        echo "<input type=submit name=btn value='랜덤전부투입'>";
+                    echo "<input type=submit name=btn value='랜덤전부투입'>";
-        break;
+                    break;
-    case 2: echo "<input type=submit name=btn value='예선'><input type=submit name=btn value='예선전부'>"; break;
+                case 2:
-    case 3: echo "<input type=submit name=btn value='추첨'><input type=submit name=btn value='추첨전부'>"; break;
+                    echo "<input type=submit name=btn value='예선'><input type=submit name=btn value='예선전부'>";
-    case 4: echo "<input type=submit name=btn value='본선'><input type=submit name=btn value='본선전부'>"; break;
+                    break;
-    case 5: echo "<input type=submit name=btn value='배정'>"; break;
+                case 3:
-    case 6: echo "<input type=submit name=btn value='베팅마감'>"; break;
+                    echo "<input type=submit name=btn value='추첨'><input type=submit name=btn value='추첨전부'>";
-    case 7: echo "<input type=submit name=btn value='16강'>"; break;
+                    break;
-    case 8: echo "<input type=submit name=btn value='8강'>"; break;
+                case 4:
-    case 9: echo "<input type=submit name=btn value='4강'>"; break;
+                    echo "<input type=submit name=btn value='본선'><input type=submit name=btn value='본선전부'>";
-    case 10: echo "<input type=submit name=btn value='결승'>"; break;
+                    break;
-    }
+                case 5:
                    echo "<input type=submit name=btn value='배정'>";
                    break;
                case 6:
                    echo "<input type=submit name=btn value='베팅마감'>";
                    break;
                case 7:
                    echo "<input type=submit name=btn value='16강'>";
                    break;
                case 8:
                    echo "<input type=submit name=btn value='8강'>";
                    break;
                case 9:
                    echo "<input type=submit name=btn value='4강'>";
                    break;
                case 10:
                    echo "<input type=submit name=btn value='결승'>";
                    break;
            }
-    echo "
+            echo "
    </td></tr>
 </form>";
-} elseif ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) {
+        } elseif ($me['no'] > 0 && $me['tournament'] == 0 && $admin['tournament'] == 1) {
-    echo "<form method=post action=c_tournament.php><tr><td colspan=8><input type=button value='갱신' onclick='location.reload()'><input type=submit name=btn value='참가' onclick='return confirm(\"참가비 금{$admin['develcost']}이 필요합니다. 참가하시겠습니까?\")'></td></tr></form>";
+            echo "<form method=post action=c_tournament.php><tr><td colspan=8><input type=button value='갱신' onclick='location.reload()'><input type=submit name=btn value='참가' onclick='return confirm(\"참가비 금{$admin['develcost']}이 필요합니다. 참가하시겠습니까?\")'></td></tr></form>";
-} else {
+        } else {
-    echo "<tr><td colspan=8><input type=button value='갱신' onclick='location.reload()'></td></tr>";
+            echo "<tr><td colspan=8><input type=button value='갱신' onclick='location.reload()'></td></tr>";
-}
+        }
-$str1 = getTournament($admin['tournament']);
+        $str1 = getTournament($admin['tournament']);
-$str2 = getTournamentTime();
+        $str2 = getTournamentTime();
-if($str2){
+        if ($str2) {
-    $str2 = ', '.$str2;
+            $str2 = ', ' . $str2;
-}
+        }
-$str3 = getTournamentTerm();
+        $str3 = getTournamentTerm();
-if($str3){
+        if ($str3) {
-    $str3 = ', '.$str3;
+            $str3 = ', ' . $str3;
-}
+        }
-?>
+        ?>
-    <tr><td colspan=8>운영자 메세지 : <font color=orange size=5><?=$admin['tnmt_msg']?></font></td></tr>
+        <tr>
-    <tr><td colspan=8 align=center><font color=white size=6><?=$tnmt_type?> (<?=$str1.$str2.$str3?>)</font></td></tr>
+            <td colspan=8>운영자 메세지 : <font color=orange size=5><?= $admin['tnmt_msg'] ?></font>
-    <tr><td colspan=8 align=center class='bg2'><font color=magenta size=5>16강 승자전</font></td></tr>
+            </td>
-    <tr><td height=10 colspan=8 align=center></td></tr>
+        </tr>
-<?php
+        <tr>
            <td colspan=8 align=center>
                <font color=white size=6><?= $tnmt_type ?> (<?= $str1 . $str2 . $str3 ?>)</font>
            </td>
        </tr>
        <tr>
            <td colspan=8 align=center class='bg2'>
                <font color=magenta size=5>16강 승자전</font>
            </td>
        </tr>
        <tr>
            <td height=10 colspan=8 align=center></td>
        </tr>
        <?php
-echo "
+        echo "
    <tr>
        <td colspan=8>
            <table align=center width=2000 class='bg0 mimic_flex'>
               <tr align=center>";
-$generalList = $db->query('SELECT npc,name,win from tournament where grp>=60 order by grp, grp_no LIMIT 1');
+        $generalList = $db->query('SELECT npc,name,win from tournament where grp>=60 order by grp, grp_no LIMIT 1');
-while(count($generalList) < 1){
+        while (count($generalList) < 1) {
-    $generalList[] = [
+            $generalList[] = [
-        'name'=>'-',
+                'name' => '-',
-        'npc'=>0,
+                'npc' => 0,
-        'win'=>0
+                'win' => 0
-    ];
+            ];
-}
+        }
-foreach($generalList as $i=>$general){
+        foreach ($generalList as $i => $general) {
-    if ($general['name'] == "") {
+            if ($general['name'] == "") {
-        $general['name'] = "-";
+                $general['name'] = "-";
-    }
+            }
-    if ($general['npc'] >= 2) {
+            if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
+                $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
-    } elseif ($general['npc'] == 1) {
+            } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
+                $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
-    }
+            }
-    echo "<td colspan=16>{$general['name']}</td>";
+            echo "<td colspan=16>{$general['name']}</td>";
-}
+        }
-echo "
+        echo "
                </tr>
                <tr align=center>";
-$cent = [];
+        $cent = [];
-for ($i=0; $i < 1; $i++) {
+        for ($i = 0; $i < 1; $i++) {
-    $cent[$i] = "<font color=white>";
+            $cent[$i] = "<font color=white>";
-}
+        }
-$line = [];
+        $line = [];
-$gen = [];
+        $gen = [];
-$generalList = $db->query('SELECT npc,name,win from tournament where grp>=50 order by grp, grp_no LIMIT 2');
+        $generalList = $db->query('SELECT npc,name,win from tournament where grp>=50 order by grp, grp_no LIMIT 2');
-while(count($generalList) < 2){
+        while (count($generalList) < 2) {
-    $generalList[] = [
+            $generalList[] = [
-        'name'=>'-',
+                'name' => '-',
-        'npc'=>0,
+                'npc' => 0,
-        'win'=>0
+                'win' => 0
-    ];
+            ];
-}
+        }
-foreach($generalList as $i=>$general){
+        foreach ($generalList as $i => $general) {
-    if ($general['name'] == "") {
+            if ($general['name'] == "") {
-        $general['name'] = "-";
+                $general['name'] = "-";
-    }
+            }
-    if ($general['npc'] >= 2) {
+            if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
+                $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
-    } elseif ($general['npc'] == 1) {
+            } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
+                $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
-    }
+            }
-    if ($general['win'] > 0) {
+            if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
+                $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
+                $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
+            } else {
-        $line[$i] = "<font color=white>";
+                $line[$i] = "<font color=white>";
-    }
+            }
-    $gen[$i] = $general['name'];
+            $gen[$i] = $general['name'];
-}
+        }
-for ($i=0; $i < 1; $i++) {
+        for ($i = 0; $i < 1; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
+            $cent[$i] = $cent[$i] . "┻" . "</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"."</font>";
+            $line[$i * 2] =     $line[$i * 2] . "┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" . "</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓"."</font>";
+            $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓" . "</font>";
-    echo "<td colspan=16>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
+            echo "<td colspan=16>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
-}
+        }
-echo "
+        echo "
                </tr>
                <tr align=center>";
-for ($i=0; $i < 2; $i++) {
+        for ($i = 0; $i < 2; $i++) {
-    echo "<td colspan=8>{$gen[$i]}</td>";
+            echo "<td colspan=8>{$gen[$i]}</td>";
-}
+        }
-echo "
+        echo "
                </tr>
                <tr align=center>";
-for ($i=0; $i < 2; $i++) {
+        for ($i = 0; $i < 2; $i++) {
-    $cent[$i] = "<font color=white>";
+            $cent[$i] = "<font color=white>";
-}
+        }
-$generalList = $db->query('SELECT npc,name,win from tournament where grp>=40 order by grp, grp_no LIMIT 4');
+        $generalList = $db->query('SELECT npc,name,win from tournament where grp>=40 order by grp, grp_no LIMIT 4');
-while(count($generalList) < 4){
+        while (count($generalList) < 4) {
-    $generalList[] = [
+            $generalList[] = [
-        'name'=>'-',
+                'name' => '-',
-        'npc'=>0,
+                'npc' => 0,
-        'win'=>0
+                'win' => 0
-    ];
+            ];
-}
+        }
-foreach($generalList as $i=>$general){
+        foreach ($generalList as $i => $general) {
-    if ($general['name'] == "") {
+            if ($general['name'] == "") {
-        $general['name'] = "-";
+                $general['name'] = "-";
-    }
+            }
-    if ($general['npc'] >= 2) {
+            if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
+                $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
-    } elseif ($general['npc'] == 1) {
+            } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
+                $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
-    }
+            }
-    if ($general['win'] > 0) {
+            if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
+                $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
+                $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
+            } else {
-        $line[$i] = "<font color=white>";
+                $line[$i] = "<font color=white>";
-    }
+            }
-    $gen[$i] = $general['name'];
+            $gen[$i] = $general['name'];
-}
+        }
-for ($i=0; $i < 2; $i++) {
+        for ($i = 0; $i < 2; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
+            $cent[$i] = $cent[$i] . "┻" . "</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━━━━━━━━━━━━━━━"."</font>";
+            $line[$i * 2] =     $line[$i * 2] . "┏━━━━━━━━━━━━━━━━━━" . "</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━━━━━━━━━━━━━━━┓"."</font>";
+            $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━━━━━━━━━━━━━━━┓" . "</font>";
-    echo "<td colspan=8>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
+            echo "<td colspan=8>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
-}
+        }
-echo "
+        echo "
                </tr>
                <tr align=center>";
-for ($i=0; $i < 4; $i++) {
+        for ($i = 0; $i < 4; $i++) {
-    echo "<td colspan=4>{$gen[$i]}</td>";
+            echo "<td colspan=4>{$gen[$i]}</td>";
-}
+        }
-echo "
+        echo "
                </tr>
                <tr align=center>";
-for ($i=0; $i < 4; $i++) {
+        for ($i = 0; $i < 4; $i++) {
-    $cent[$i] = "<font color=white>";
+            $cent[$i] = "<font color=white>";
-}
+        }
-$generalList = $db->query('SELECT npc,name,win from tournament where grp>=30 order by grp, grp_no LIMIT 8');
+        $generalList = $db->query('SELECT npc,name,win from tournament where grp>=30 order by grp, grp_no LIMIT 8');
-while(count($generalList) < 8){
+        while (count($generalList) < 8) {
-    $generalList[] = [
+            $generalList[] = [
-        'name'=>'-',
+                'name' => '-',
-        'npc'=>0,
+                'npc' => 0,
-        'win'=>0
+                'win' => 0
-    ];
+            ];
-}
+        }
-foreach($generalList as $i=>$general){
+        foreach ($generalList as $i => $general) {
-    if ($general['name'] == "") {
+            if ($general['name'] == "") {
-        $general['name'] = "-";
+                $general['name'] = "-";
-    }
+            }
-    if ($general['npc'] >= 2) {
+            if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
+                $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
-    } elseif ($general['npc'] == 1) {
+            } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
+                $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
-    }
+            }
-    if ($general['win'] > 0) {
+            if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
+                $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
+                $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
+            } else {
-        $line[$i] = "<font color=white>";
+                $line[$i] = "<font color=white>";
-    }
+            }
-    $gen[$i] = $general['name'];
+            $gen[$i] = $general['name'];
-}
+        }
-for ($i=0; $i < 4; $i++) {
+        for ($i = 0; $i < 4; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
+            $cent[$i] = $cent[$i] . "┻" . "</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━━━━━━"."</font>";
+            $line[$i * 2] =     $line[$i * 2] . "┏━━━━━━━━━" . "</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━━━━━━┓"."</font>";
+            $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━━━━━━┓" . "</font>";
-    echo "<td colspan=4>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
+            echo "<td colspan=4>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
-}
+        }
-echo "
+        echo "
                </tr>
                <tr align=center>";
-for ($i=0; $i < 8; $i++) {
+        for ($i = 0; $i < 8; $i++) {
-    echo "<td colspan=2>{$gen[$i]}</td>";
+            echo "<td colspan=2>{$gen[$i]}</td>";
-}
+        }
-echo "
+        echo "
                </tr>
                <tr align=center>";
-for ($i=0; $i < 8; $i++) {
+        for ($i = 0; $i < 8; $i++) {
-    $cent[$i] = "<font color=white>";
+            $cent[$i] = "<font color=white>";
-}
+        }
-$generalList = $db->query('SELECT npc,name,win from tournament where grp>=20 order by grp, grp_no LIMIT 16');
+        $generalList = $db->query('SELECT npc,name,win from tournament where grp>=20 order by grp, grp_no LIMIT 16');
-while(count($generalList) < 16){
+        while (count($generalList) < 16) {
-    $generalList[] = [
+            $generalList[] = [
-        'name'=>'-',
+                'name' => '-',
-        'npc'=>0,
+                'npc' => 0,
-        'win'=>0
+                'win' => 0
-    ];
+            ];
-}
+        }
-foreach($generalList as $i=>$general){
+        foreach ($generalList as $i => $general) {
-    if ($general['name'] == "") {
+            if ($general['name'] == "") {
-        $general['name'] = "-";
+                $general['name'] = "-";
-    }
+            }
-    if ($general['npc'] >= 2) {
+            if ($general['npc'] >= 2) {
-        $general['name'] = "<font color=cyan>".$general['name']."</font>";
+                $general['name'] = "<font color=cyan>" . $general['name'] . "</font>";
-    } elseif ($general['npc'] == 1) {
+            } elseif ($general['npc'] == 1) {
-        $general['name'] = "<font color=skyblue>".$general['name']."</font>";
+                $general['name'] = "<font color=skyblue>" . $general['name'] . "</font>";
-    }
+            }
-    if ($general['win'] > 0) {
+            if ($general['win'] > 0) {
-        $line[$i] = "<font color=red>";
+                $line[$i] = "<font color=red>";
-        $cent[intdiv($i, 2)] = "<font color=red>";
+                $cent[intdiv($i, 2)] = "<font color=red>";
-    } else {
+            } else {
-        $line[$i] = "<font color=white>";
+                $line[$i] = "<font color=white>";
-    }
+            }
-    $gen[$i] = $general['name'];
+            $gen[$i] = $general['name'];
-}
+        }
-for ($i=0; $i < 8; $i++) {
+        for ($i = 0; $i < 8; $i++) {
-    $cent[$i] = $cent[$i]."┻"."</font>";
+            $cent[$i] = $cent[$i] . "┻" . "</font>";
-    $line[$i*2] =     $line[$i*2]."┏━━━━"."</font>";
+            $line[$i * 2] =     $line[$i * 2] . "┏━━━━" . "</font>";
-    $line[$i*2+1] = $line[$i*2+1]."━━━━┓"."</font>";
+            $line[$i * 2 + 1] = $line[$i * 2 + 1] . "━━━━┓" . "</font>";
-    echo "<td colspan=2>{$line[$i*2]}{$cent[$i]}{$line[$i*2+1]}</td>";
+            echo "<td colspan=2>{$line[$i * 2]}{$cent[$i]}{$line[$i * 2 + 1]}</td>";
-}
+        }
-echo "
+        echo "
                </tr>
                <tr align=center>";
-for ($i=0; $i < 16; $i++) {
+        for ($i = 0; $i < 16; $i++) {
-    echo "<td width=125>{$gen[$i]}</td>";
+            echo "<td width=125>{$gen[$i]}</td>";
-}
+        }
-echo"
+        echo "
                </tr>";
-$globalBet = $db->queryFirstList('SELECT * FROM betting WHERE general_id = 0')??[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ];
+        $globalBet = $db->queryFirstList('SELECT * FROM betting WHERE general_id = 0') ?? [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,];
-$globalBet = array_splice($globalBet, -16);
+        $globalBet = array_splice($globalBet, -16);
-$globalBetTotal = array_sum($globalBet);
+        $globalBetTotal = array_sum($globalBet);
-$admin = $gameStor->getValues(['tournament', 'phase']);
+        $admin = $gameStor->getValues(['tournament', 'phase']);
-$bet = [];
+        $bet = [];
-for ($i=0; $i < 16; $i++) {
+        for ($i = 0; $i < 16; $i++) {
-    if($globalBet[$i] == 0){
+            if ($globalBet[$i] == 0) {
-        $bet[$i] = '∞';
+                $bet[$i] = '∞';
-        continue;
+                continue;
-    }
+            }
-    $bet[$i]  = round($globalBetTotal /  $globalBet[$i], 2);
+            $bet[$i]  = round($globalBetTotal /  $globalBet[$i], 2);
-}
+        }
-echo "
+        echo "
                <tr align=center>";
-for ($i=0; $i < 16; $i++) {
+        for ($i = 0; $i < 16; $i++) {
-    echo "<td><font color=skyblue>{$bet[$i]}</font></td>";
+            echo "<td><font color=skyblue>{$bet[$i]}</font></td>";
-}
+        }
-echo "
+        echo "
                </tr>
                <tr align=center><td height=10 colspan=16></td></tr>
                <tr align=center><td colspan=16><font color=skyblue size=4>배당률이 낮을수록 베팅된 금액이 많고 유저들이 우승후보로 많이 선택한 장수입니다.</font></td></tr>
@@ -394,87 +466,94 @@ echo "
        </td>
    </tr>";
-if ($admin['tournament'] >= 7 || $admin['tournament'] == 0) {
+        if ($admin['tournament'] >= 7 || $admin['tournament'] == 0) {
-    printFighting($admin['tournament'], $admin['phase']);
+            printFighting($admin['tournament'], $admin['phase']);
-}
+        }
-echo "
+        echo "
    <tr><td height=10 colspan=8 align=center></td></tr>
    <tr><td colspan=8 align=center class='bg2'><font color=orange size=5>조별 본선 순위</font></td></tr>
    <tr>";
-$num = array("一", "二", "三", "四", "五", "六", "七", "八");
+        $num = array("一", "二", "三", "四", "五", "六", "七", "八");
-for ($i=0; $i < 8; $i++) {
+        for ($i = 0; $i < 8; $i++) {
-    $grp = $i + 10;
+            $grp = $i + 10;
-    echo "
+            echo "
        <td>
            <table align=center width=250 class='tb_layout bg0'>
                <tr><td colspan=9 style=background-color:black;>{$num[$i]}조</td></tr>
                <tr class='bg1'><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";
-    $generalList = $db->query('SELECT npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp=%i order by gd desc, gl desc, seq',$grp);
+            $generalList = $db->query('SELECT npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp=%i order by gd desc, gl desc, seq', $grp);
-    foreach($generalList as $k=>$general) {
+            foreach ($generalList as $k => $general) {
-        printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
+                printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
-    }
+            }
-    foreach(Util::range(count($generalList), 4) as $idx){
+            foreach (Util::range(count($generalList), 4) as $idx) {
-        printRow($idx, '', '', '', '', '', '', '', '', '', '');
+                printRow($idx, '', '', '', '', '', '', '', '', '', '');
-    }
+            }
-    echo "
+            echo "
            </table>
        </td>";
-}
+        }
-echo "</tr>";
+        echo "</tr>";
-if ($admin['tournament'] == 4 || $admin['tournament'] == 5) {
+        if ($admin['tournament'] == 4 || $admin['tournament'] == 5) {
-    printFighting($admin['tournament'], $admin['phase']);
+            printFighting($admin['tournament'], $admin['phase']);
-}
+        }
-echo "
+        echo "
    <tr><td colspan=8 align=center class='bg2'><font color=yellow size=5>조별 예선 순위</font></td></tr>
    <tr>";
-for ($i=0; $i < 8; $i++) {
+        for ($i = 0; $i < 8; $i++) {
-    $grp = $i;
+            $grp = $i;
-    echo "
+            echo "
        <td>
            <table align=center width=250 class='tb_layout bg0'>
                <tr><td colspan=9 style=background-color:black;>{$num[$i]}조</td></tr>
                <tr class='bg1'><td align=center>순</td><td align=center>장수</td><td align=center>{$tp2}</td><td align=center>경</td><td align=center>승</td><td align=center>무</td><td align=center>패</td><td align=center>점</td><td align=center>득</td></tr>";
-    $generalList = $db->query('SELECT npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp=%i order by gd desc, gl desc, seq',$grp);
+            $generalList = $db->query('SELECT npc,name,leadership,strength,intel,leadership+strength+intel as total,prmt,win+draw+lose as game,win,draw,lose,gl,win*3+draw as gd from tournament where grp=%i order by gd desc, gl desc, seq', $grp);
-    foreach($generalList as $k=>$general) {
+            foreach ($generalList as $k => $general) {
-        printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
+                printRow($k, $general['npc'], $general['name'], $general[$tp], $general['game'], $general['win'], $general['draw'], $general['lose'], $general['gd'], $general['gl'], $general['prmt']);
-    }
+            }
-    foreach(Util::range(count($generalList), 8) as $idx){
+            foreach (Util::range(count($generalList), 8) as $idx) {
-        printRow($idx, '', '', '', '', '', '', '', '', '', '');
+                printRow($idx, '', '', '', '', '', '', '', '', '', '');
-    }
+            }
-    echo "
+            echo "
            </table>
        </td>";
-}
+        }
-if ($admin['tournament'] == 2 || $admin['tournament'] == 3) {
+        if ($admin['tournament'] == 2 || $admin['tournament'] == 3) {
-    printFighting($admin['tournament'], $admin['phase']);
+            printFighting($admin['tournament'], $admin['phase']);
-}
+        }
-?>
+        ?>
-    </tr>
+        </tr>
-    <tr><td colspan=8>
+        <tr>
-        <font color=white size=2>
+            <td colspan=8>
-ㆍ예선은 홈&amp;어웨이 풀리그로 진행됩니다. (총 14경기)<br>
+                <font color=white size=2>
-ㆍ상위 4명이 본선에 진출하게 되며 조추첨을 통해 조가 배정됩니다.<br>
+                    ㆍ예선은 홈&amp;어웨이 풀리그로 진행됩니다. (총 14경기)<br>
-ㆍ각 조1위가 시드1로 랜덤하게 조에 배정되며, 역시 각 조2위가 시드2로 랜덤하게 조에 배정됩니다.<br>
+                    ㆍ상위 4명이 본선에 진출하게 되며 조추첨을 통해 조가 배정됩니다.<br>
-ㆍ그후 남은 3, 4위는 완전 랜덤하게 모든 조에 랜덤하게 배정됩니다.<br>
+                    ㆍ각 조1위가 시드1로 랜덤하게 조에 배정되며, 역시 각 조2위가 시드2로 랜덤하게 조에 배정됩니다.<br>
-ㆍ본선은 개인당 3경기를 치르게 되며 승점(승3, 무1, 패0), 득실, 참가순서(시드)에 따라 순위를 매깁니다.<br>
+                    ㆍ그후 남은 3, 4위는 완전 랜덤하게 모든 조에 랜덤하게 배정됩니다.<br>
-ㆍ각 조 1, 2위는 16강에 지정된 위치에 배정됩니다.<br>
+                    ㆍ본선은 개인당 3경기를 치르게 되며 승점(승3, 무1, 패0), 득실, 참가순서(시드)에 따라 순위를 매깁니다.<br>
-ㆍ16강부터는 1경기 토너먼트로 진행됩니다.<br>
+                    ㆍ각 조 1, 2위는 16강에 지정된 위치에 배정됩니다.<br>
-ㆍ참가비는 금20~140이며, 성적에 따라 금과 약간의 명성이 포상으로 주어집니다.<br>
+                    ㆍ16강부터는 1경기 토너먼트로 진행됩니다.<br>
-ㆍ16강자 100, 8강자 300, 4강자 600, 준우승자 1200, 우승자 2000 (220년 기준)<br>
+                    ㆍ참가비는 금20~140이며, 성적에 따라 금과 약간의 명성이 포상으로 주어집니다.<br>
-ㆍ즐거운 삼토!
+                    ㆍ16강자 100, 8강자 300, 4강자 600, 준우승자 1200, 우승자 2000 (220년 기준)<br>
-        </font>
+                    ㆍ즐거운 삼토!
-    </td></tr>
+                </font>
-</table>
+            </td>
-<table align=center width=2000 class='tb_layout bg0'>
+        </tr>
-    <tr><td><?=closeButton()?></td></tr>
+    </table>
-    <tr><td><?=banner()?> </td></tr>
+    <table align=center width=2000 class='tb_layout bg0'>
-</table>
+        <tr>
            <td><?= closeButton() ?></td>
        </tr>
        <tr>
            <td><?= banner() ?> </td>
        </tr>
    </table>
 </body>
 </html>
@@ -85,18 +85,10 @@ uasort($troops, function ($lhs, $rhs) {
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=1024" />
    <title><?= UniqueConst::$serverName ?>: 부대편성</title>
    <?= WebUtil::preloadJS('dist_js/troop.js') ?>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-    <?= WebUtil::printCSS('dist_css/troop.css') ?>
+    <?= WebUtil::printDist('ts', ['common', 'troop'], true) ?>
    <script>
    </script>
 </head>
 <body>
@@ -233,7 +225,6 @@ uasort($troops, function ($lhs, $rhs) {
            </tr>
        </table>
    </div>
    <?= WebUtil::printJS('dist_js/troop.js') ?>
 </body>
 </html>
@@ -46,18 +46,15 @@ if ($nationID) {
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=1100" />
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printCSS('css/battle_simulator.css') ?>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <script>
        var defaultSpecialDomestic = '<?= GameConst::$defaultSpecialDomestic ?>';
        var city = <?= Json::encode($city) ?>;
        var nation = <?= Json::encode($nation) ?>;
    </script>
-    <?= WebUtil::printJS('dist_js/battle_simulator.js') ?>
+    <?= WebUtil::printDist('ts', ['common', 'battle_simulator']) ?>
 </head>
 <body>
@@ -1,58 +1,72 @@
 <?php
 namespace sammo;
-function printLimitMsg($turntime) {
+function printLimitMsg($turntime)
 {
    //FIXME: template로 이동.
 ?>
-<!DOCTYPE html>
+    <!DOCTYPE html>
-<html>
+    <html>
-<head>
+
-<title>접속제한</title>
+    <head>
-<meta charset="UTF-8">
+        <title>접속제한</title>
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta charset="UTF-8">
-<meta name="viewport" content="width=1024" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<?=WebUtil::printCSS('../d_shared/common.css')?>
+        <meta name="viewport" content="width=1024" />
-<?=WebUtil::printCSS('dist_css/common.css')?>
+        <?= WebUtil::printCSS('../d_shared/common.css') ?>
-<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+        <?= WebUtil::printDist('ts', 'common', true) ?>
-</head>
+        <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
-<body>
+    </head>
-<font size=4><b>
+
-접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다. (다음 접속 가능 시각 : <?=$turntime?>)<br>
+    <body>
-(자신의 턴이 되면 다시 접속 가능합니다. 당신의 건강을 위해 잠시 쉬어보시는 것은 어떨까요? ^^)<br>
+        <font size=4><b>
-</b></font>
+                접속 제한중입니다. 1턴 이내에 너무 많은 갱신을 하셨습니다. (다음 접속 가능 시각 : <?= $turntime ?>)<br>
-</body>
+                (자신의 턴이 되면 다시 접속 가능합니다. 당신의 건강을 위해 잠시 쉬어보시는 것은 어떨까요? ^^)<br>
-</html>
+            </b></font>
    </body>
    </html>
 <?php
 }
-function bar($per, $h=7) {
+function bar($per, $h = 7)
-    if($h == 7) { $bd = 0; $h =  7; $h2 =  5; }
+{
-    else        { $bd = 1; $h = 12; $h2 =  8; }
+    if ($h == 7) {
        $bd = 0;
        $h =  7;
        $h2 =  5;
    } else {
        $bd = 1;
        $h = 12;
        $h2 =  8;
    }
    $per = round($per, 1);
    $str = "<div class='bar_out' style='height:{$h}px;'>
-    <div class='bar_in' style='background:url(".ServConfig::$gameImagePath."/pr{$h2}.gif)'></div>
+    <div class='bar_in' style='background:url(" . ServConfig::$gameImagePath . "/pr{$h2}.gif)'></div>
-    <div style='width:{$per}%;background:url(".ServConfig::$gameImagePath."/pb{$h2}.gif)'></div>
+    <div style='width:{$per}%;background:url(" . ServConfig::$gameImagePath . "/pb{$h2}.gif)'></div>
    </div>";
    return $str;
 }
-function optionsForCities(callable $infoCall=null) {
+function optionsForCities(callable $infoCall = null)
 {
-    if(!$infoCall){
+    if (!$infoCall) {
-        return join('', array_map(function($city){
+        return join('', array_map(function ($city) {
            return "<option value='{$city->id}'>{$city->name}</option>";
        }, CityConst::all()));
    }
    $infoList = [];
    $noInfoList = [];
-    foreach(CityConst::all() as $city){
+    foreach (CityConst::all() as $city) {
        $info = $infoCall($city);
-        if(!$info){
+        if (!$info) {
            $noInfoList[] = "<option value='{$city->id}'>{$city->name}</option>";
            continue;
        }
@@ -62,7 +76,8 @@ function optionsForCities(callable $infoCall=null) {
    return join('', array_merge($infoList, $noInfoList));
 }
-function Submit($url, $msg="", $msg2="") {
+function Submit($url, $msg = "", $msg2 = "")
 {
    echo "a";   // 파폭 버그 때문
    echo "
 <form method=post name=f1 action='{$url}'>
@@ -74,49 +89,62 @@ function Submit($url, $msg="", $msg2="") {
 }
-function GetNationColors() {
+function GetNationColors()
-    $colors = array("#FF0000", "#800000", "#A0522D", "#FF6347", "#FFA500", "#FFDAB9", "#FFD700", "#FFFF00",
+{
    $colors = array(
        "#FF0000", "#800000", "#A0522D", "#FF6347", "#FFA500", "#FFDAB9", "#FFD700", "#FFFF00",
        "#7CFC00", "#00FF00", "#808000", "#008000", "#2E8B57", "#008080", "#20B2AA", "#6495ED", "#7FFFD4",
        "#AFEEEE", "#87CEEB", "#00FFFF", "#00BFFF", "#0000FF", "#000080", "#483D8B", "#7B68EE", "#BA55D3",
-        "#800080", "#FF00FF", "#FFC0CB", "#F5F5DC", "#E0FFFF", "#FFFFFF", "#A9A9A9");
+        "#800080", "#FF00FF", "#FFC0CB", "#F5F5DC", "#E0FFFF", "#FFFFFF", "#A9A9A9"
    );
    return $colors;
 }
-function backButton() {
+function backButton()
 {
    return "
 <input type=button value='돌아가기' onclick=location.replace('./')><br>
 ";
 }
-function CoreBackButton() {
+function CoreBackButton()
 {
    return "
 <input type=button value='돌아가기' onclick=location.replace('b_chiefcenter.php')><br>
 ";
 }
-function closeButton() {
+function closeButton()
 {
    return "
 <input type=button value='창 닫기' onclick=window.close()><br>
 ";
 }
-function printCitiesBasedOnDistance(int $cityNo, int $maxDistance=1):string {
+function printCitiesBasedOnDistance(int $cityNo, int $maxDistance = 1): string
 {
    $distanceList = searchDistance($cityNo, $maxDistance, true);
    $result = [];
-    for($dist = 1; $dist <= $maxDistance; $dist++){
+    for ($dist = 1; $dist <= $maxDistance; $dist++) {
-        $cityList = array_map(function($cityID){
+        $cityList = array_map(function ($cityID) {
            return CityConst::byID($cityID)->name;
        }, Util::array_get($distanceList[$dist], []));
        $cityStr = join(', ', $cityList);
-        switch($dist) {
+        switch ($dist) {
-            case 1: $color = "magenta"; break;
+            case 1:
-            case 2: $color = "orange"; break;
+                $color = "magenta";
-            default: $color = "yellow"; break;
+                break;
            case 2:
                $color = "orange";
                break;
            default:
                $color = "yellow";
                break;
        }
        $result[] = "{$dist}칸 떨어진 도시 : <span style='color:{$color};font-weight:bold;'>{$cityStr}</span>";
@@ -125,7 +153,8 @@ function printCitiesBasedOnDistance(int $cityNo, int $maxDistance=1):string {
 }
-function info($type=0) {
+function info($type = 0)
 {
    $db = DB::db();
    $gameStor = KVStorage::getStorage($db, 'game_env');
@@ -136,14 +165,14 @@ function info($type=0) {
    $gencount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc < 2');
    $npccount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc >= 2');
-    switch($type) {
+    switch ($type) {
-    case 0:
+        case 0:
-        return "현재 : {$admin['year']}年 {$admin['month']}月 (<font color=cyan>$termtype</font> 서버)<br> 등록 장수 : 유저 {$gencount} / {$admin['maxgeneral']} 명 + <font color=cyan>NPC {$npccount} 명</font>";
+            return "현재 : {$admin['year']}年 {$admin['month']}月 (<font color=cyan>$termtype</font> 서버)<br> 등록 장수 : 유저 {$gencount} / {$admin['maxgeneral']} 명 + <font color=cyan>NPC {$npccount} 명</font>";
-    case 1:
+        case 1:
-        return "현재 : {$admin['year']}年 {$admin['month']}月 (<font color=cyan>$termtype</font> 서버)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 등록 장수 : 유저 {$gencount} / {$admin['maxgeneral']} 명 + <font color=cyan>NPC {$npccount} 명</font>";
+            return "현재 : {$admin['year']}年 {$admin['month']}月 (<font color=cyan>$termtype</font> 서버)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 등록 장수 : 유저 {$gencount} / {$admin['maxgeneral']} 명 + <font color=cyan>NPC {$npccount} 명</font>";
-    case 2:
+        case 2:
-        return "현재 : {$admin['year']}年 {$admin['month']}月 (<font color=cyan>$termtype</font> 서버)";
+            return "현재 : {$admin['year']}年 {$admin['month']}月 (<font color=cyan>$termtype</font> 서버)";
-    case 3:
+        case 3:
-        return "등록 장수 : 유저 {$gencount} / {$admin['maxgeneral']} 명 + <font color=cyan>NPC {$npccount} 명</font>";
+            return "등록 장수 : 유저 {$gencount} / {$admin['maxgeneral']} 명 + <font color=cyan>NPC {$npccount} 명</font>";
    }
 }
@@ -11,10 +11,10 @@ namespace sammo;
 * TODO: side effect를 제거
 */
- /**
+/**
-  * 관리자 권한이 필요함을 출력.
+ * 관리자 권한이 필요함을 출력.
-  * @return void
+ * @return void
-  */
+ */
 function requireAdminPermissionHTML()
 {
    ob_start();
@@ -28,8 +28,8 @@ function requireAdminPermissionHTML()
        <meta http-equiv="X-UA-Compatible" content="IE=edge">
        <meta name="viewport" content="width=1024" />
        <?= WebUtil::printCSS('../d_shared/common.css') ?>
-        <?= WebUtil::printCSS('dist_css/common.css') ?>
+        <?= WebUtil::printDist('ts', 'common', true) ?>
-<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+        <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    </head>
    <body>
@@ -119,7 +119,7 @@ function displaySpecialDomesticInfo(?string $type): string
    ]);
 }
-function allButton(bool $seizeNPCMode, array $opts=[])
+function allButton(bool $seizeNPCMode, array $opts = [])
 {
    if ($seizeNPCMode) {
        $site = "a_npcList.php";
@@ -143,7 +143,7 @@ function allButton(bool $seizeNPCMode, array $opts=[])
 }
-function commandButton(array $opts=[])
+function commandButton(array $opts = [])
 {
    $session = Session::getInstance();
    $userID = Session::getUserID();
@@ -196,13 +196,13 @@ function formatDefenceTrain(int $value): string
 {
    if ($value === 999) {
        return "×";
-    } else if ($value >= 90){
+    } else if ($value >= 90) {
        return "☆";
    } else if ($value >= 80) {
        return "◎";
    } else if ($value >= 60) {
        return "○";
-    } else{
+    } else {
        return "△";
    }
 }
@@ -253,36 +253,49 @@ function getInvitationList(array $nationList)
 }
-function getAutorunInfo($autorunOption){
+function getAutorunInfo($autorunOption)
-    $templates = new \League\Plates\Engine(__DIR__.'/templates');
+{
    $templates = new \League\Plates\Engine(__DIR__ . '/templates');
    $auto_info = [];
-    foreach($autorunOption['options'] as $auto_option => $value){
+    foreach ($autorunOption['options'] as $auto_option => $value) {
        assert($value);
-        switch($auto_option){
+        switch ($auto_option) {
-            case 'develop': $auto_info['내정'] = '내정'; break;
+            case 'develop':
-            case 'warp': $auto_info['순간이동'] = '순간이동'; break;
+                $auto_info['내정'] = '내정';
-            case 'recruit': $auto_info['징병'] = $auto_info['징병']??'징병'; break;
+                break;
-            case 'recruit_high': $auto_info['징병'] = '모병'; break;
+            case 'warp':
-            case 'train': $auto_info['훈사'] = '훈련/사기진작'; break;
+                $auto_info['순간이동'] = '순간이동';
-            case 'battle': $auto_info['출병'] = '출병'; break;
+                break;
-            case 'chief': $auto_info['사령턴'] = '사령턴'; break;
+            case 'recruit':
                $auto_info['징병'] = $auto_info['징병'] ?? '징병';
                break;
            case 'recruit_high':
                $auto_info['징병'] = '모병';
                break;
            case 'train':
                $auto_info['훈사'] = '훈련/사기진작';
                break;
            case 'battle':
                $auto_info['출병'] = '출병';
                break;
            case 'chief':
                $auto_info['사령턴'] = '사령턴';
                break;
        }
    }
    $limit = Util::toInt($autorunOption['limit_minutes']);
-    if($limit >= 43200){
+    if ($limit >= 43200) {
        $auto_info['제한'] = '항상 유효';
-    }
+    } else if ($limit % 60 == 0) {
-    else if($limit % 60 == 0){
+        $auto_info['제한'] = ($limit / 60) . '시간 유효';
-        $auto_info['제한'] = ($limit/60).'시간 유효';
+    } else {
-    }
+        $auto_info['제한'] = ($limit) . '분 유효';
    else{
        $auto_info['제한'] = ($limit).'분 유효';
    }
    $auto_info = join(', ', array_values($auto_info));
    return $templates->render('tooltip', [
-        'text'=>'자율행동',
+        'text' => '자율행동',
-        'info'=>$auto_info,
+        'info' => $auto_info,
-        'style'=>'text-decoration:underline',
+        'style' => 'text-decoration:underline',
-        'copyable_info'=>true
+        'copyable_info' => true
    ]);
 }
@@ -31,11 +31,8 @@ if ($session->userGrade < 5 && !$allowReset) {
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/install.js') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <?= WebUtil::printCSS('css/install.css') ?>
    <?= WebUtil::printDist('ts', ['common', 'install']) ?>
 </head>
 <body>
@@ -24,12 +24,9 @@ if ($session->userGrade == 5) {
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/install_db.js') ?>
    <?= WebUtil::printCSS('css/normalize.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <?= WebUtil::printCSS('css/install.css') ?>
    <?= WebUtil::printDist('ts', ['common', 'install_db']) ?>
 </head>
 <body>
@@ -19,14 +19,12 @@ include "func.php";
        'serverNick' => DB::prefix(),
        'serverID' => UniqueConst::$serverID
    ]) ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('d_shared/base_map.js') ?>
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printCSS('css/map.css') ?>
    <?= WebUtil::printDist('ts', ['common', 'recent_map'], true) ?>
    <style>
        html {
            width: 700px;
@@ -52,7 +50,6 @@ include "func.php";
        <div class="card-body">
        </div>
    </div>
    <?= WebUtil::printJS('dist_js/recent_map.js') ?>
 </body>
 </html>
@@ -1,4 +1,6 @@
-@charset "UTF-8";
+@import '@scss/common/bootstrap5.scss';
@import 'summernote/dist/summernote-bs5.css';
 #scoutMsgForm .viewer{
    max-height:200px;
@@ -48,7 +48,6 @@ foreach (getCharacterList(false) as $id => [$name, $info]) {
    <meta name="viewport" content="width=1024'" />
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('../css/config.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printCSS('css/select_general_from_pool.css') ?>
@@ -66,12 +65,7 @@ foreach (getCharacterList(false) as $id => [$name, $info]) {
    </script>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('dist_js/vendors.js') ?>
+    <?= WebUtil::printDist('ts', ['common', 'join', 'select_general_from_pool']) ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
    <?= WebUtil::printJS('dist_js/join.js') ?>
    <?= WebUtil::printJS('dist_js/select_general_from_pool.js') ?>
 </head>
@@ -38,7 +38,6 @@ foreach ($scoutMsgs as $nationID => $scoutMsg) {
    <meta name="viewport" content="width=1024" />
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('../css/config.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printCSS('css/select_npc.css') ?>
@@ -70,10 +69,7 @@ foreach ($scoutMsgs as $nationID => $scoutMsg) {
    </script>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('dist_js/vendors.js') ?>
+    <?= WebUtil::printDist('ts', ['common', 'join', 'select_npc']) ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/common.js') ?>
    <?= WebUtil::printJS('dist_js/select_npc.js') ?>
 </head>
@@ -43,16 +43,13 @@ if ($permission < 1) {
    <!--<?= WebUtil::printCSS('../e_lib/tui.editor/tui-editor-contents.min.css') ?>-->
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('../css/config.css') ?>
    <?= WebUtil::printCSS('dist_css/common.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <?= WebUtil::printCSS('css/diplomacy.css') ?>
    <script>
        var permissionLevel = <?= $permission ?>; //
    </script>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('dist_js/vendors.js') ?>
+    <?= WebUtil::printDist('ts', ['common', 'diplomacy']) ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/diplomacy.js') ?>
 </head>
@@ -1,11 +1,14 @@
 import '@scss/dipcenter.scss'
 import $ from 'jquery';
 exportWindow($, 'jquery');
 import 'bootstrap';
-import 'summernote/dist/summernote-bs4';
+import 'summernote/dist/summernote-bs5';
 import 'summernote/dist/summernote-bs4.css';
 import '@/summernote-image-flip';
 import '@/summernote-ko-KR';
 import { activateFlip } from "@/legacy/activateFlip";
 import { setAxiosXMLHttpRequest } from '@util/setAxiosXMLHttpRequest';
 import { exportWindow } from './util/exportWindow';
 declare const editable: boolean;
@@ -1,6 +1,6 @@
 /* Forked from https://github.com/asiffermann/summernote-image-title */
 import $ from 'jquery';
-import 'summernote/dist/summernote-bs4.js';
+import 'summernote/dist/summernote-bs5.js';
 $(function ($) {
    $.extend(true, $.summernote.lang, {
@@ -110,13 +110,8 @@ $lastSetters = [
        'defaultStatNPCMax' => GameConst::$defaultStatNPCMax,
        'defaultStatMax' => GameConst::$defaultStatMax,
    ]) ?>
    <?= WebUtil::printCSS('dist_css/vendors_vue.css') ?>
    <?= WebUtil::printCSS('dist_css/common_vue.css') ?>
    <?= WebUtil::printCSS('dist_css/v_NPCControl.css') ?>
    <?= WebUtil::printJS('../d_shared/common_path.js', true) ?>
-    <?= WebUtil::printJS('dist_js/vendors_vue.js', true) ?>
+    <?= WebUtil::printDist('vue', ['v_NPCControl'], true) ?>
    <?= WebUtil::printJS('dist_js/common_vue.js', true) ?>
    <?= WebUtil::printJS('dist_js/v_NPCControl.js', true) ?>
 </head>
 <body>
@@ -44,15 +44,11 @@ $boardName = $isSecretBoard ? '기밀실' : '회의실';
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=1024" />
    <?= WebUtil::printCSS('dist_css/common_vue.css') ?>
    <?= WebUtil::printCSS('dist_css/v_board.css') ?>
    <?= WebUtil::printJS('../d_shared/common_path.js', true) ?>
    <?= WebUtil::printJS('dist_js/vendors_vue.js', true) ?>
    <?= WebUtil::printJS('dist_js/common_vue.js', true) ?>
    <?= WebUtil::printJS('dist_js/v_board.js', true) ?>
    <?= WebUtil::printStaticValues([
        'isSecretBoard' => $isSecretBoard,
    ]) ?>
    <?= WebUtil::printDist('vue', 'v_board', true) ?>
 </head>
 <body>
    <div id="app"></div>
@@ -75,12 +75,8 @@ $lastInheritPointLogs = $db->query('SELECT server_id, year, month, date, text FR
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <?= WebUtil::printCSS('dist_css/common_vue.css') ?>
    <?= WebUtil::printCSS('dist_css/v_inheritPoint.css') ?>
    <?= WebUtil::printJS('../d_shared/common_path.js', true) ?>
-    <?= WebUtil::printJS('dist_js/vendors_vue.js', true) ?>
+    <?= WebUtil::printDist('vue', 'v_inheritPoint', true) ?>
    <?= WebUtil::printJS('dist_js/common_vue.js', true) ?>
    <?= WebUtil::printJS('dist_js/v_inheritPoint.js', true) ?>
    <?= WebUtil::printStaticValues([
        'items' => $items,
        'currentInheritBuff' => $currentInheritBuff,
@@ -81,12 +81,9 @@ foreach(CityConst::all() as $city){
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <?= WebUtil::printCSS('dist_css/common_vue.css') ?>
    <?= WebUtil::printCSS('dist_css/v_join.css') ?>
    <?= WebUtil::printJS('../d_shared/common_path.js', true) ?>
-    <?= WebUtil::printJS('dist_js/vendors_vue.js', true) ?>
+    <?= WebUtil::printDist('vue', 'v_join', true) ?>
-    <?= WebUtil::printJS('dist_js/common_vue.js', true) ?>
+
    <?= WebUtil::printJS('dist_js/v_join.js', true) ?>
    <?= WebUtil::printStaticValues([
        'serverID' => UniqueConst::$serverID,
        'nationList' => array_values($nationList),
@@ -15,14 +15,11 @@ require(__DIR__ . '/../vendor/autoload.php');
    <!-- 스타일 -->
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('../dist_css/vendor.css') ?>
    <?= WebUtil::printCSS('../dist_css/common_ts.css') ?>
    <?= WebUtil::printCSS('../css/admin_member.css') ?>
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('../dist_js/vendors.js') ?>
+    <?= WebUtil::printDist('gateway', 'admin_member', true) ?>
-    <?= WebUtil::printJS('../dist_js/common_ts.js') ?>
+
    <?= WebUtil::printJS('../dist_js/admin_member.js') ?>
 </head>
 <body>
@@ -26,21 +26,16 @@ $acl = $session->acl;
    <!-- 스타일 -->
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('../dist_css/vendor.css') ?>
    <?= WebUtil::printCSS('../dist_css/common_ts.css') ?>
    <?= WebUtil::printCSS('../css/config.css') ?>
    <?= WebUtil::printCSS('../css/entrance.css') ?>
    <?= WebUtil::printCSS('../css/admin_server.css') ?>
    <!-- 액션 -->
    <script>
        var isAdmin = <?= ($userGrade >= 5 || $acl) ? 'true' : 'false' ?>;
    </script>
    <?= WebUtil::printJS('../d_shared/common_path.js', true) ?>
-    <?= WebUtil::printJS('../dist_js/vendors.js', true) ?>
+    <?= WebUtil::printDist('gateway', 'entrance', true) ?>
-    <?= WebUtil::printJS('../dist_js/common_ts.js', true) ?>
+    <?= WebUtil::printCSS('../css/config.css') ?>
-    <?= WebUtil::printJS('../dist_js/entrance.js', true) ?>
+    <?= WebUtil::printCSS('../css/entrance.css') ?>
-
+    <?= WebUtil::printCSS('../css/admin_server.css') ?>
 </head>
 <body>
@@ -15,16 +15,13 @@ require(__DIR__ . '/../vendor/autoload.php');
    <!-- 스타일 -->
    <?= WebUtil::printCSS('../d_shared/common.css') ?>
    <?= WebUtil::printCSS('../dist_css/vendor.css') ?>
    <?= WebUtil::printCSS('../dist_css/common_ts.css') ?>
    <?= WebUtil::printCSS('../css/config.css') ?>
    <?= WebUtil::printCSS('../css/user_info.css') ?>
    <!-- 액션 -->
    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-    <?= WebUtil::printJS('../dist_js/vendors.js') ?>
+    <?= WebUtil::printDist('gateway', 'user_info', true) ?>
-    <?= WebUtil::printJS('../dist_js/common_ts.js') ?>
+
    <?= WebUtil::printJS('../dist_js/user_info.js') ?>
 </head>
 <body>
@@ -52,14 +52,8 @@ foreach (ServConfig::getServerList() as $setting) {
        var kakao_oauth_redirect_uri = '<?= KakaoKey::REDIRECT_URI ?>';
    </script>
    <?= WebUtil::printJS('d_shared/common_path.js') ?>
    <?= WebUtil::printJS('dist_js/vendors.js') ?>
    <?= WebUtil::printJS('dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('dist_js/login.js') ?>
    <?= WebUtil::printCSS('d_shared/common.css') ?>
-    <?= WebUtil::printCSS('dist_css/vendor.css') ?>
+    <?= WebUtil::printDist('gateway', 'login') ?>
    <?= WebUtil::printCSS('dist_css/common_ts.css') ?>
    <?= WebUtil::printCSS('dist_css/login.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
    <meta name="description" content="실시간으로 진행되는 삼국지 웹게임(삼모전)입니다">
    <meta name="keywords" content="삼국지,삼모전,웹게임,힏체,힏체섭,히데체,히데체섭,HiDCHe,체섭">
@@ -30,12 +30,8 @@ if ($canJoin != 'Y') {
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <title>회원가입</title>
    <?= WebUtil::printJS('../dist_js/vendors.js') ?>
    <?= WebUtil::printJS('../dist_js/common_ts.js') ?>
    <?= WebUtil::printJS('../dist_js/join.js') ?>
    <?= WebUtil::printCSS('../dist_css/vendor.css') ?>
    <?= WebUtil::printCSS('../dist_css/common_ts.css') ?>
    <?= WebUtil::printCSS('../css/login.css') ?>
    <?= WebUtil::printDist('gateway', ['join']) ?>
 </head>
 <body>
@@ -57,8 +57,9 @@ $err_logs = $fdb->select('err_log', [
    <!-- 스타일 -->
    <?= WebUtil::printCSS('d_shared/common.css') ?>
-    <?= WebUtil::printCSS('dist_css/vendor.css') ?>
+    <?= WebUtil::printCSS('dist_js/gateway/vendor.css') ?>
-    <?= WebUtil::printCSS('dist_css/common_ts.css') ?>
+    <?= WebUtil::printCSS('dist_js/gateway/common_ts.css') ?>
    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
@@ -139,35 +139,40 @@ class WebUtil
        return static::preloadAsset($path, 'script');
    }
-    public static function printDist(string $type, string|array $entryName, bool $isDefer = false){
+    public static function printDist(string $type, string|array $entryName, bool $isDefer = false)
-        if(is_string($entryName)){
+    {
        if (is_string($entryName)) {
            $entryName = [$entryName];
        }
        if(is_subclass_of('\\sammo\\VersionGit', '\\sammo\\VersionGitDynamic')){
            $version = DB::prefix().'_dynamic';
        }
        else{
            $version = VersionGit::getVersion();
        }
        $basePath = dirname(__DIR__, 2)."/dist_js/{$version}/{$type}";
        $serverBasePath = \phpUri::parse(ServConfig::$serverWebPath)->path;
-        $serverBasePath .= "/dist_js/{$version}/{$type}";
+
        if ($type == 'gateway') {
            $serverBasePath .= "/dist_js/{$type}";
            $basePath = dirname(__DIR__, 2) . "/dist_js/{$type}";
        } else {
            if (!class_exists('\\sammo\\VersionGit') || is_subclass_of('\\sammo\\VersionGit', '\\sammo\\VersionGitDynamic')) {
                $version = DB::prefix() . '_dynamic';
            } else {
                $version = VersionGit::getVersion();
            }
            $serverBasePath .= "/dist_js/{$version}/{$type}";
            $basePath = dirname(__DIR__, 2) . "/dist_js/{$version}/{$type}";
        }
        $outputs = ["\n"];
-        foreach(["vendors", "common_ts", ...$entryName] as $moduleName){
+        foreach (["vendors", "common_ts", ...$entryName] as $moduleName) {
-            foreach(['js', 'css'] as $ext){
+            foreach (['js', 'css'] as $ext) {
-                $checkPath = $basePath."/{$moduleName}.{$ext}";
+                $checkPath = $basePath . "/{$moduleName}.{$ext}";
                if (!file_exists($checkPath)) {
-                    $outputs[] = "<!-- '{$version}/{$type}/{$moduleName}.{$ext}' -->\n";
+                    $outputs[] = "<!-- '{$type}/{$moduleName}.{$ext}' -->\n";
                    continue;
                }
                $mtime = filemtime($checkPath);
-                if($ext == 'css'){
+                if ($ext == 'css') {
                    $outputs[] = "<link  href='{$serverBasePath}/{$moduleName}.{$ext}?{$mtime}' rel='stylesheet' type='text/css' />\n";
-                }
+                } else if ($ext == 'js') {
                else if($ext == 'js'){
                    $typeText = $isDefer ? 'defer' : '';
                    $outputs[] = "<script src='{$serverBasePath}/{$moduleName}.{$ext}?{$mtime}' {$typeText}></script>\n";
                }
@@ -251,13 +256,12 @@ class WebUtil
        return $purifier->purify($text);
    }
-    public static function errorBackMsg(string $msg, ?string $target=null): string
+    public static function errorBackMsg(string $msg, ?string $target = null): string
    {
        $jmsg = Json::encode($msg);
-        if(!$target){
+        if (!$target) {
            $moveNext = 'history.go(-1);';
-        }
+        } else {
        else{
            $moveNext = "location.replace('{$target}');";
        }
@@ -275,7 +275,7 @@ module.exports = (env, argv) => {
        }
    };
    const gateway = {
-        name: `gateway_${versionTarget}`,
+        name: `gateway`,
        resolve: {
            extensions: [".js", ".ts", ".tsx"],
            alias: {
@@ -295,7 +295,7 @@ module.exports = (env, argv) => {
        },
        output: {
            filename: '[name].js',
-            path: resolve(outputPath, 'gateway')
+            path: resolve(__dirname, 'dist_js', 'gateway')
        },
        devtool: 'source-map',
        optimization,