-
diff --git a/hwe/func.php b/hwe/func.php
index e1ab09ce..c734626e 100644
--- a/hwe/func.php
+++ b/hwe/func.php
@@ -461,6 +461,37 @@ function commandGroup($typename, $type = 0)
}
}
+function getCommandTable(General $general){
+ $db = DB::db();
+ $gameStor = KVStorage::getStorage($db, 'game_env');
+ $gameStor->turnOnCache();
+ $env = $gameStor->getAll();
+
+ $result = [];
+ foreach (GameConst::$availableGeneralCommand as $commandCategory => $commandList) {
+ $subList = [];
+ foreach ($commandList as $commandClassName) {
+ $commandObj = buildGeneralCommandClass($commandClassName, $general, $env);
+ if (!$commandObj->canDisplay()) {
+ continue;
+ }
+ $subList[Util::getClassNameFromObj($commandObj)] = [
+ 'compansation'=>$commandObj->getCompensationStyle(),
+ 'possible'=>$commandObj->hasMinConditionMet(),
+ 'title'=>$commandObj->getCommandDetailTitle(),
+ 'reqArg'=>$commandObj::$reqArg,
+ ];
+ }
+
+ $result[] = [
+ 'category'=>$commandCategory,
+ 'values'=>$subList
+ ];
+ }
+
+ return $result;
+}
+
function printCommandTable(General $generalObj)
{
$db = DB::db();
diff --git a/hwe/func_command.php b/hwe/func_command.php
index a42e78f3..22936254 100644
--- a/hwe/func_command.php
+++ b/hwe/func_command.php
@@ -63,7 +63,7 @@ function pullGeneralCommand(int $generalID, int $turnCnt=1){
if($turnCnt >= GameConst::$maxTurn){
return;
}
-
+
$db = DB::db();
$db->update('general_turn', [
@@ -96,7 +96,7 @@ function repeatGeneralCommand(int $generalId, int $turnCnt){
foreach($turnList as $turnItem){
$turnIdx = $turnItem['turn_idx'];
$turnTarget = iterator_to_array(Util::range($turnIdx+$turnCnt, GameConst::$maxTurn, $turnCnt));
-
+
$db->update('general_turn', [
'action'=>$turnItem['action'],
'arg'=>$turnItem['arg'],
@@ -116,7 +116,7 @@ function pushNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){
return;
}
if($turnCnt < 0){
- pullNationCommand($nationID, $officerLevel, -$turnCnt);
+ pullNationCommand($nationID, $officerLevel, -$turnCnt);
return;
}
if($turnCnt >= GameConst::$maxChiefTurn){
@@ -153,7 +153,7 @@ function pullNationCommand(int $nationID, int $officerLevel, int $turnCnt=1){
if($turnCnt >= GameConst::$maxChiefTurn){
return;
}
-
+
$db = DB::db();
$db->update('nation_turn', [
@@ -269,7 +269,7 @@ function checkCommandArg(?array $arg):?string{
}
function setGeneralCommand(int $generalID, array $rawTurnList, string $command, ?array $arg = null):array{
-
+
$turnList = [];
foreach($rawTurnList as $turnIdx){
if(!is_int($turnIdx) || $turnIdx < -3 || $turnIdx >= GameConst::$maxTurn){
diff --git a/hwe/func_template.php b/hwe/func_template.php
index 61fe96d2..b1fc4397 100644
--- a/hwe/func_template.php
+++ b/hwe/func_template.php
@@ -5,7 +5,7 @@ namespace sammo;
/**
* 템플릿 생성과 관련된 함수들을 모아두는 파일
- *
+ *
* NOTE: 아직 converter와 명확한 구분이 되어있지 않음.
* TODO: legacy template들을 전부 template 폴더로 모아둘 필요 있음
* TODO: side effect를 제거
@@ -13,7 +13,7 @@ namespace sammo;
/**
* 관리자 권한이 필요함을 출력.
- * @return void
+ * @return void
*/
function requireAdminPermissionHTML()
{
@@ -41,28 +41,6 @@ function requireAdminPermissionHTML()
return ob_get_clean();
}
-function turnTable()
-{
-
- $turnList = [];
- $turnList[] = "
1턴 ";
- foreach (Util::range(1, GameConst::$maxTurn) as $turnIdx) {
- $turnText = $turnIdx + 1;
- $turnList[] = "
{$turnText}턴 ";
- }
-
- $turnText = join("\n", $turnList);
-
- return "
-
- 전체
- 홀턴
- 짝턴
- {$turnText}
-
-";
-}
-
function chiefTurnTable()
{
$turnList = [];
@@ -272,3 +250,38 @@ function getInvitationList(array $nationList)
'nationList' => $nationList
]);
}
+
+
+function getAutorunInfo($autorunOption){
+ $templates = new \League\Plates\Engine(__DIR__.'/templates');
+ $auto_info = [];
+ foreach($autorunOption['options'] as $auto_option => $value){
+ assert($value);
+ switch($auto_option){
+ case 'develop': $auto_info['내정'] = '내정'; break;
+ case 'warp': $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){
+ $auto_info['제한'] = '항상 유효';
+ }
+ else if($limit % 60 == 0){
+ $auto_info['제한'] = ($limit/60).'시간 유효';
+ }
+ else{
+ $auto_info['제한'] = ($limit).'분 유효';
+ }
+ $auto_info = join(', ', array_values($auto_info));
+ return $templates->render('tooltip', [
+ 'text'=>'자율행동',
+ 'info'=>$auto_info,
+ 'style'=>'text-decoration:underline',
+ 'copyable_info'=>true
+ ]);
+}
\ No newline at end of file
diff --git a/hwe/func_tournament.php b/hwe/func_tournament.php
index 51345b8d..0c1c1f8f 100644
--- a/hwe/func_tournament.php
+++ b/hwe/func_tournament.php
@@ -156,17 +156,17 @@ function getTournamentTime() {
function getTournament(int $tnmt) {
return [
- "
경기 없음 ",
- "
참가 모집중 ",
- "
예선 진행중 ",
- "
본선 추첨중 ",
- "
본선 진행중 ",
- "
16강 배정중 ",
- "
베팅 진행중 ",
- "
16강 진행중 ",
- "
8강 진행중 ",
- "
4강 진행중 ",
- "
결승 진행중 ",
+ "
경기 없음 ",
+ "
참가 모집중 ",
+ "
예선 진행중 ",
+ "
본선 추첨중 ",
+ "
본선 진행중 ",
+ "
16강 배정중 ",
+ "
베팅 진행중 ",
+ "
16강 진행중 ",
+ "
8강 진행중 ",
+ "
4강 진행중 ",
+ "
결승 진행중 ",
][$tnmt]??"TOURNAMENT_TYPE_ERR_{$tnmt}";
}
diff --git a/hwe/index.php b/hwe/index.php
index f50bf567..e2a99fc8 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -1,4 +1,5 @@
isGameLoggedIn()){
+if (!$session->isGameLoggedIn()) {
header('Location:..');
die();
}
@@ -41,8 +42,8 @@ $gameStor->cacheAll(true);
if ($me['newmsg'] == 1 || $me['newvote'] == 1) {
$db->update('general', [
- 'newmsg'=>0,
- 'newvote'=>0
+ 'newmsg' => 0,
+ 'newvote' => 0
], 'owner=%i', $userID);
}
@@ -59,29 +60,25 @@ $generalObj->setRawCity($db->queryFirstRow('SELECT * FROM city WHERE city = %i',
$scenario = $gameStor->scenario_text;
$nationID = $generalObj->getNationID();
-if($nationID){
+if ($nationID) {
$nationStor = KVStorage::getStorage($db, $nationID, 'nation_env');
$nationStor->cacheAll();
}
-$valid = 0;
if ($gameStor->extended_general == 0) {
$extend = "표준";
} else {
$extend = "확장";
- $valid = 1;
}
if ($gameStor->fiction == 0) {
$fiction = "사실";
} else {
$fiction = "가상";
- $valid = 1;
}
if ($gameStor->npcmode == 0) {
$npcmode = "불가능";
-} else if($gameStor->npcmode == 1){
+} else if ($gameStor->npcmode == 1) {
$npcmode = "가능";
- $valid = 1;
} else {
$npcmode = "선택 생성";
}
@@ -89,285 +86,281 @@ $color = "cyan";
$mapTheme = $gameStor->map_theme;
$serverName = UniqueConst::$serverName;
$serverCnt = $gameStor->server_cnt;
+
+$auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
+
+$myNationStatic = getNationStaticInfo($generalObj->getNationID());
+$nationColorType = substr($myNationStatic['color'] ?? '#000000', 1);
+
+$autorunUser = ($gameStor->autorun_user) ?? [];
+$otherTextInfo = [];
+
+if ($gameStor->join_mode == 'onlyRandom') {
+ $otherTextInfo[] = '랜덤 임관 전용';
+}
+if ($autorunUser['limit_minutes'] ?? false) {
+ $otherTextInfo[] = getAutorunInfo($autorunUser);
+}
+
+if (!$otherTextInfo) {
+ $otherTextInfo = '표준';
+} else {
+ $otherTextInfo = join(', ', $otherTextInfo);
+}
?>
-
-
<?=$serverName?>: 메인
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
<?= $serverName ?>: 메인
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GameConst::$maxTurn,
+ 'maxPushTurn' => 12,
+ 'commandList' => getCommandTable($generalObj),
+ 'serverNow' => TimeUtil::now(false),
+ 'baseColor2' => GameConst::$basecolor2,
+ ]) ?>
+
+
-
-
-
npcmode==1)?>
-
-
- 삼국지 모의전투 HiDCHe 기 (
-
-
- > >NPC수 : >NPC상성 : >NPC선택 :
-
-
-
- 전체 접속자 수 : online_user_cnt?> 명
- 턴당 갱신횟수 : conlimit?>회
-
-
-
-동작 시각: ".substr($gameStor->turntime, 5, 14)."";
-} else {
- echo "동작 시각: ".substr($gameStor->turntime, 5, 14)." ";
-}
-
-echo "
-
-
-";
-
-if ($gameStor->tournament == 0) {
- echo "현재 토너먼트 경기 없음 ";
-} else {
- switch ($gameStor->tnmt_type) {
- case 0: $str = "전력전"; break;
- case 1: $str = "통솔전"; break;
- case 2: $str = "일기토"; break;
- case 3: $str = "설전"; break;
- }
- $str2 = getTournament($gameStor->tournament);
- $str3 = getTournamentTime();
- echo "↑{$str} {$str2} {$str3}↑ ";
-}
-
-echo "
-
-
-";
-
-$auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
-if ($auctionCount > 0) {
- echo "{$auctionCount}건 거래 진행중진행중 거래 없음 ";
-}
-
-echo "
-
-
-";
-
-$vote = $gameStor->vote?:[''];
-$vote_title = Tag2Code($gameStor->vote_title??'-');
-if ($vote[0] == "") {
- echo "진행중 설문 없음 ";
-} else {
- echo "설문 진행중 : $vote_title
- ";
-?>
- 접속중인 국가: online_nation?> 운영자 메세지 : msg?> 【 국가방침 】
【 접속자 】
- 게임관리 회원관리 멀티관리 일제정보 로그정보 외교정보 119
- 119
-
-
-
-
- 장수 동향 개인 기록
-
-
- 중원 정세
-
-develcost*5;
- MessageBox("설문조사에 참여하시면 금{$develcost}과 유니크템을 드립니다! (우측 상단 설문조사 메뉴)");
-}
-?>
+
+
+
+
+
+
+
+
+
+
주민
+
bar($pop / $pop_max * 100) ?>/
+
+
+
+
농업
+
bar($agri / $agri_max * 100) ?>/
+
+
+
상업
+
bar($comm / $comm_max * 100) ?>/
+
+
+
치안
+
bar($secu / $secu_max * 100) ?>/
+
+
+
수비
+
bar($def / $def_max * 100) ?>/
+
+
+
성벽
+
bar($wall / $wall_max * 100) ?>/
+
+
+
시세
+
bar(($trade - 95) * 10) ?>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hwe/ts/ReservedCommand.vue b/hwe/ts/ReservedCommand.vue
new file mode 100644
index 00000000..81593a8e
--- /dev/null
+++ b/hwe/ts/ReservedCommand.vue
@@ -0,0 +1,516 @@
+
+
+
+
명령 목록
+
+
+
+
+
+ {{ turnIdx }}턴
+
+
+
+
+ {{ serverNow }}
+
+
+
+ {{ turnIdx }}턴
+
+
+
+
+
+
+
+
+ {{ turnIdx + 1 }}
+
+
+ {{ turnObj.year ? `${turnObj.year}年` : "" }}
+ {{ turnObj.month ? `${turnObj.month}月` : "" }}
+
+
+ {{ turnObj.time }}
+
+
+
+
+
+
+
+
+ {{ turnIdx }}턴
+
+
+
+
+
+ 모든턴
+ 홀수턴
+ 짝수턴
+
+ {{ spanIdx }}턴 간격
+ {{ beginIdx }}
+
+
+
+
+
+ {{
+ flippedMaxTurn == viewMaxTurn ? "펼치기" : "접기"
+ }}
+
+
+
+
+ {{ citem.title
+ }}{{ citem.possible ? "" : "(불가)" }}
+
+
+ 실행
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hwe/ts/build_exports.json b/hwe/ts/build_exports.json
index 4f185db8..d64ecacf 100644
--- a/hwe/ts/build_exports.json
+++ b/hwe/ts/build_exports.json
@@ -13,7 +13,6 @@
"bossInfo": "bossInfo.ts",
"myPage": "myPage.ts",
"extExpandCity": "extExpandCity.ts",
- "main": "main.ts",
"dipcenter": "dipcenter.ts",
"diplomacy": "diplomacy.ts",
"currentCity": "currentCity.ts",
@@ -21,12 +20,14 @@
"history": "history.ts",
"select_general_from_pool": "select_general_from_pool.ts",
"extKingdoms": "extKingdoms.ts",
- "common": "common_deprecated.ts"
+ "common": "common_deprecated.ts",
+ "main": "main.ts"
},
"ingame_vue": {
"v_inheritPoint": "v_inheritPoint.ts",
"v_board": "v_board.ts",
"v_NPCControl": "v_NPCControl.ts",
- "v_join": "v_join.ts"
+ "v_join": "v_join.ts",
+ "v_main": "v_main.ts"
}
}
\ No newline at end of file
diff --git a/hwe/ts/chiefCenter.ts b/hwe/ts/chiefCenter.ts
index 808ee5de..6fd6468b 100644
--- a/hwe/ts/chiefCenter.ts
+++ b/hwe/ts/chiefCenter.ts
@@ -10,6 +10,9 @@ import { unwrap_any } from "./util/unwrap_any";
import { parseTime } from './util/parseTime';
import { formatTime } from './util/formatTime';
import { stringifyUrl } from 'query-string';
+import { setAxiosXMLHttpRequest } from './util/setAxiosXMLHttpRequest';
+
+setAxiosXMLHttpRequest();
declare const maxChiefTurn: number;
diff --git a/hwe/ts/common_deprecated.ts b/hwe/ts/common_deprecated.ts
index bd161546..35852e94 100644
--- a/hwe/ts/common_deprecated.ts
+++ b/hwe/ts/common_deprecated.ts
@@ -11,6 +11,8 @@ import Popper from 'popper.js';
exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가?
import 'bootstrap';
+import "../scss/common_legacy.scss";
+
exportWindow(jQuery, '$');
exportWindow(jQuery, 'jQuery');
diff --git a/hwe/ts/common_legacy.ts b/hwe/ts/common_legacy.ts
index 5a686eda..35a2d316 100644
--- a/hwe/ts/common_legacy.ts
+++ b/hwe/ts/common_legacy.ts
@@ -1,7 +1,6 @@
import $ from "jquery";
import axios from "axios";
-axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
/**
* object의 array를 id를 key로 삼는 object로 재 변환
*/
diff --git a/hwe/ts/main.ts b/hwe/ts/main.ts
index 28b390df..69b290a7 100644
--- a/hwe/ts/main.ts
+++ b/hwe/ts/main.ts
@@ -2,213 +2,30 @@ import $ from 'jquery';
import Popper from 'popper.js';
exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가?
import 'bootstrap';
-import { parseTime } from './util/parseTime';
-import { addMilliseconds, addMinutes, differenceInMilliseconds } from 'date-fns';
-import { formatTime } from './util/formatTime';
-import { unwrap_any } from './util/unwrap_any';
-import { activateFlip, errUnknown, initTooltip } from './common_legacy';
-import { unwrap } from './util/unwrap';
-import { setAxiosXMLHttpRequest } from './util/setAxiosXMLHttpRequest';
+import { activateFlip, initTooltip } from './common_legacy';
import './msg.ts';
import './map.ts';
import { exportWindow } from './util/exportWindow';
-import {stringifyUrl} from 'query-string';
-import { joinYearMonth } from './util/joinYearMonth';
-import { parseYearMonth } from './util/parseYearMonth';
+
+
exportWindow($, '$');
-type TurnArg = {
- //TODO: 채울것
-}
-
-type TurnItem = {
- action: string,
- brief: string,
- arg: TurnArg,
-}
-
-type ReservedTurnResponse = {
- result: true,
- turnTime: string,
- turnTerm: number,
- year: number,
- month: number,
- date: string,
- turn: TurnItem[],
- autorun_limit: number|null,
-}
+import '../scss/main.scss';
+import { unwrap } from './util/unwrap';
+import { number } from 'vue-types';
$(function ($) {
- setAxiosXMLHttpRequest();
-
- $('#refreshPage').click(function () {
+ $('.refreshPage').click(function () {
document.location.reload();
return false;
});
-
- function reloadCommandList() {
- void $.get({
- url: 'j_get_reserved_command.php',
- dataType: 'json',
- cache: false,
- }).then(function (data: ReservedTurnResponse) {
- if (!data) {
- return;
- }
- if (!data.result) {
- return;
- }
- const game_clock = parseTime(data.date);
- const now_clock = new Date();
- const $clock = $('#clock');
- $clock.data('time-diff', differenceInMilliseconds(game_clock, now_clock));
- $clock.val(formatTime(game_clock));
-
- const turnTime = parseTime(data.turnTime);
- let nextTurnTime = new Date(turnTime);
-
- let nowYearMonth = joinYearMonth(data.year, data.month);
- const autorunLimitYearMonth = data.autorun_limit ?? nowYearMonth - 1;
- const [autorunLimitYear, autorunLimitMonth] = parseYearMonth(autorunLimitYearMonth);
-
- for (const [turnIdx, turnInfo] of Object.entries(data.turn)) {
- const [year, month] = parseYearMonth(nowYearMonth);
- const $tr = $(`#command_${turnIdx}`);
-
- $tr.find('.time_pad').text(formatTime(nextTurnTime, 'HH:mm'));
- $tr.find('.month_pad').text(`${year}年 ${month}月`);
- const $turn_pad = $tr.find('.turn_pad');
- const $turn_text = $turn_pad.find('.turn_text');
- $turn_text.text(turnInfo.brief).css('font-size', '13px');
- if(nowYearMonth <= autorunLimitYearMonth){
- const brief = turnInfo.brief != '휴식'? turnInfo.brief :'휴식
(자율 행동) ';
- const autorunTooltip = `
${brief} 자율 행동 기간: ${autorunLimitYear}년 ${autorunLimitMonth}월까지 `;
- $turn_text.html(autorunTooltip);
- initTooltip($turn_text);
- }
-
-
- const oWidth = unwrap($turn_pad.innerWidth());
- const iWidth = unwrap($turn_text.outerWidth());
- if (iWidth > oWidth * 0.95) {
- const newFontSize = 13 * oWidth / iWidth * 0.9;
- $turn_text.css('font-size', `${newFontSize}px`);
- }
-
- nextTurnTime = addMinutes(nextTurnTime, data.turnTerm);
- nowYearMonth += 1;
- }
- console.log(data);
-
-
- });
- }
-
- function myclock() {
-
- const $clock = $('#clock');
- const now_clock = new Date();
-
- const rawTimeDiff = $clock.data('time-diff');
- if (rawTimeDiff === null || rawTimeDiff === undefined) {
- return;
- }
- const timeDiff = unwrap_any
(rawTimeDiff);
-
- const gameClock = addMilliseconds(now_clock, timeDiff);
-
- $('#clock').val(formatTime(gameClock));
- }
-
- function pushTurn(pushAmount: number) {
- $.post({
- url: 'j_general_turn.php',
- dataType: 'json',
- data: {
- amount: pushAmount
- }
- }).then(function (data) {
- if (!data.result) {
- alert(data.reason);
- }
- reloadCommandList();
- }, errUnknown);
- }
-
- function repeatTurn(repeatAmount: number) {
- $.post({
- url: 'j_general_turn.php',
- dataType: 'json',
- data: {
- amount: repeatAmount,
- is_repeat: true
- }
- }).then(function (data) {
- if (!data.result) {
- alert(data.reason);
- }
- reloadCommandList();
- }, errUnknown);
- }
-
- $('#pullTurn').click(function () {
- pushTurn(-parseInt(unwrap_any($('#repeatAmount').val())));
- });
-
- $('#pushTurn').click(function () {
- pushTurn(parseInt(unwrap_any($('#repeatAmount').val())));
- });
-
- $('#repeatTurn').click(function () {
- repeatTurn(parseInt(unwrap_any($('#repeatAmount').val())));
- });
-
-
- function reserveTurn(turnList: number[], command: string) {
- console.log(turnList, command);
- $.post({
- url: 'j_set_general_command.php',
- dataType: 'json',
- data: {
- action: command,
- turnList: turnList
- }
- }).then(function (data) {
- if (!data.result) {
- alert(data.reason);
- }
- reloadCommandList();
- }, errUnknown);
- }
-
- $('#reserveTurn').click(function () {
- const turnList = unwrap_any($('#generalTurnSelector').val()).map(v => parseInt(v));
- const $command = $('#generalCommandList option:selected');
- if ($command.data('reqarg')) {
- document.location.href = stringifyUrl({
- url: 'b_processing.php',
- query: {
- command: unwrap_any($command.val()),
- turnList: turnList.join('_')
- }
- });
- }
- else {
- reserveTurn(turnList, unwrap_any($command.val()));
- }
- return false;
- })
-
- $('.open-window').on('click', function(e){
+ $('.open-window').on('click', function (e) {
e.preventDefault();
let target = $(e.target as HTMLAnchorElement);
- while(target.attr('href') === undefined){
+ while (target.attr('href') === undefined) {
target = target.parent('a');
- if(target.length == 0){
+ if (target.length == 0) {
return;
}
}
@@ -216,8 +33,136 @@ $(function ($) {
window.open(href);
});
- setInterval(myclock, 500);
- reloadCommandList();
activateFlip();
initTooltip();
-});
\ No newline at end of file
+});
+
+function ready(fn: () => unknown) {
+ if (document.readyState != 'loading') {
+ fn();
+ } else {
+ document.addEventListener('DOMContentLoaded', fn);
+ }
+}
+
+(() => {
+
+ let finInit = false;
+ const objects: {
+ target: HTMLElement,
+ button: HTMLAnchorElement,
+ }[] = [];
+
+ let nationMsgBox!: HTMLElement;
+ let nationMsg!: HTMLElement;
+ let nationMsgHeight : number|undefined = undefined;
+
+ let commandSelector!: HTMLElement;
+ let deviceWidth = -1;
+ let viewportMeta! : HTMLMetaElement;
+
+ function init() {
+ const buttons = document.querySelectorAll('#float-tabs a.btn');
+ if (!buttons) {
+ return false;
+ }
+ finInit = true;
+
+ for (const button of buttons) {
+ const targetQuery = button.href.split('#');
+ if (!targetQuery || targetQuery.length < 2) {
+ continue;
+ }
+ const target = document.getElementById(targetQuery[1]);
+ if (!target) {
+ continue;
+ }
+ objects.push({ target, button });
+ }
+
+ nationMsgBox = unwrap(document.getElementById('nation-msg-box'));
+ nationMsg = unwrap(document.getElementById('nation-msg'));
+
+ commandSelector = unwrap(document.getElementById('reservedCommandList'));
+ viewportMeta = unwrap(document.querySelector("meta[name=viewport]"));
+ }
+
+ function adjustViewportWidth() {
+ if(deviceWidth == window.screen.availWidth){
+ return;
+ }
+ deviceWidth = window.screen.availWidth;
+ const innerHeight = window.innerHeight;
+ const selectorHeight = commandSelector.offsetHeight*1.1;
+
+ if(deviceWidth < 500){
+ viewportMeta.content = 'width=500, initial-scale=1';
+ console.log(`2`);
+ return;
+ }
+
+ if(innerHeight < selectorHeight){
+ const maybeNextWidth = deviceWidth / innerHeight * selectorHeight;
+ if(maybeNextWidth >= 750){
+ viewportMeta.content = 'width=1000, initial-scale=1';
+ }
+ else{
+ viewportMeta.content = `height=${Math.ceil(selectorHeight)}, initial-scale=1`;
+ }
+ return;
+ }
+ }
+ function onScroll() {
+ if (!finInit && !init()) return;
+
+ for (const { button } of objects) {
+ button.classList.remove('active');
+ }
+
+ const screenHeight = window.innerHeight
+ for (const { target, button } of objects) {
+ const { top, bottom, height } = target.getBoundingClientRect();
+
+ if (top >= 0 && bottom <= screenHeight) {
+ //valid
+ }
+ else if (top <= 0 && bottom >= screenHeight) {
+ //valid
+ }
+ else if (top < 0) {
+ if (bottom / height < 0.8) {
+ continue;
+ }
+ }
+ else if (bottom > screenHeight) {
+ if ((screenHeight - top) / height < 0.8) {
+ continue;
+ }
+ }
+
+ button.classList.add('active');
+ }
+
+ if(nationMsgBox.offsetWidth < nationMsg.offsetWidth){
+ if(nationMsgHeight === undefined){
+ nationMsgHeight = nationMsgBox.offsetHeight;
+ nationMsgBox.style.height = `${nationMsgHeight / 2}px`;
+ }
+ }
+ else{
+ if(nationMsgBox.style.height){
+ nationMsgHeight = undefined;
+ nationMsgBox.style.height = '';
+ }
+ }
+
+ adjustViewportWidth();
+ }
+
+ ready(() => {
+ init();
+ onScroll();
+ window.addEventListener('scroll', onScroll, true);
+ window.addEventListener('orientationchange', onScroll, true);
+ });
+})();
\ No newline at end of file
diff --git a/hwe/ts/map.ts b/hwe/ts/map.ts
index 61cd1ff2..4ce3f2eb 100644
--- a/hwe/ts/map.ts
+++ b/hwe/ts/map.ts
@@ -18,7 +18,7 @@ declare global {
interface Window {
sam_toggleSingleTap?: boolean,
getCityPosition: () => CityPositionMap;
- formatCityInfo: (city: MapCityParsedRaw)=>MapCityParsedRegionLevelText
+ formatCityInfo: (city: MapCityParsedRaw) => MapCityParsedRegionLevelText
}
}
@@ -323,7 +323,7 @@ export async function reloadWorldMap(option: loadMapOption, drawTarget = '.world
};
}
- function mergeNationInfo(city: MapCityParsedName):MapCityParsedNation{
+ function mergeNationInfo(city: MapCityParsedName): MapCityParsedNation {
//nationID 값으로 isCapital, color, nation을 통합
const nationID = city.nationID;
@@ -343,7 +343,7 @@ export async function reloadWorldMap(option: loadMapOption, drawTarget = '.world
};
}
- function mergeClickable(city:MapCityParsedNation): MapCityParsedClickable {
+ function mergeClickable(city: MapCityParsedNation): MapCityParsedClickable {
//clickable = (defaultCity << 4 ) | (remainSpy << 3) | (ourCity << 2) | (shownByGeneral << 1) | clickableAll
const id = city.id;
const nationID = city.nationID;
@@ -436,7 +436,7 @@ export async function reloadWorldMap(option: loadMapOption, drawTarget = '.world
});
- if(myCity){
+ if (myCity) {
$world_map.find(`.city_base_${myCity} .city_filler`).addClass('my_city');
}
@@ -444,7 +444,7 @@ export async function reloadWorldMap(option: loadMapOption, drawTarget = '.world
return obj;
}
- function drawBasicWorldMap(obj:MapCityDrawable) {
+ function drawBasicWorldMap(obj: MapCityDrawable) {
const $map_body = $(`${drawTarget} .map_body`);
@@ -496,7 +496,7 @@ export async function reloadWorldMap(option: loadMapOption, drawTarget = '.world
$map_body.append($cityObj);
});
- if(myCity){
+ if (myCity) {
$world_map.find(`.city_base_${myCity} .city_filler`).addClass('my_city');
}
@@ -504,7 +504,7 @@ export async function reloadWorldMap(option: loadMapOption, drawTarget = '.world
return obj;
}
- function setMouseWork(obj:MapCityDrawable) {
+ function setMouseWork(obj: MapCityDrawable) {
const $tooltip = $(drawTarget + ' .city_tooltip');
const $tooltip_city = $tooltip.find('.city_name');
const $tooltip_nation = $tooltip.find('.nation_name');
@@ -552,16 +552,17 @@ export async function reloadWorldMap(option: loadMapOption, drawTarget = '.world
$tooltip_nation.html('').hide();
}
- let left = position.left;
- let top = position.top;
+ const left = position.left;
+ const top = position.top;
- const scale = $map_body.data('scale');
- if (scale) {
- left /= scale;
- top /= scale;
+ const tooltipWidth = unwrap($tooltip.width());
+
+ if (left + tooltipWidth + 35 > window.innerWidth) {
+ $tooltip.css({ 'top': top + 45, 'left': left - tooltipWidth - 10 }).show();
+ }
+ else {
+ $tooltip.css({ 'top': top + 45, 'left': left + 35 }).show();
}
-
- $tooltip.css({ 'top': top + 25, 'left': left + 35 }).show();
const touchMode = $this.data('touchMode') as number;
if (touchMode <= 1) {
@@ -590,16 +591,19 @@ export async function reloadWorldMap(option: loadMapOption, drawTarget = '.world
}
const rect = this.getBoundingClientRect();
- let left = (e.clientX - rect.left - this.clientLeft + this.scrollLeft);
- let top = (e.clientY - rect.top - this.clientTop + this.scrollTop);
+ const left = (e.clientX - rect.left - this.clientLeft + this.scrollLeft);
+ const top = (e.clientY - rect.top - this.clientTop + this.scrollTop);
- const scale = $map_body.data('scale');
- if (scale) {
- left /= scale;
- top /= scale;
+ const tooltipWidth = unwrap($tooltip.width());
+
+ if (e.clientX + rect.left + tooltipWidth + 10 > window.innerWidth) {
+ $tooltip.css({ 'top': top + 30, 'left': left - tooltipWidth - 10 });
+ }
+ else {
+ $tooltip.css({ 'top': top + 30, 'left': left + 10 });
}
- $tooltip.css({ 'top': top + 10, 'left': left + 10 });
+
});
$objs.on('mouseenter', function () {
@@ -627,7 +631,7 @@ export async function reloadWorldMap(option: loadMapOption, drawTarget = '.world
$objs.on('click', function () {
//xxx: touchend 다음 click 이벤트가 갈 수도 있고, 안 갈 수도 있다.
- const touchMode = $(this).data('touchMode') as number|undefined;
+ const touchMode = $(this).data('touchMode') as number | undefined;
if (touchMode === undefined) {
return;
}
@@ -641,7 +645,7 @@ export async function reloadWorldMap(option: loadMapOption, drawTarget = '.world
return obj;
}
- function setCityClickable(obj:MapCityDrawable) {
+ function setCityClickable(obj: MapCityDrawable) {
obj.cityList.forEach(function (city) {
const $cityLink = $world_map.find(`.city_base_${city.id} .city_link`);
@@ -746,7 +750,7 @@ export async function reloadWorldMap(option: loadMapOption, drawTarget = '.world
if ($world_map.hasClass('draw_required')) {
if (useCachedMap) {
//일단 불러옴
- await (async ()=>{
+ await (async () => {
const rawStoredMap = localStorage.getItem(storedOldMapKey);
if (!rawStoredMap) {
return;
@@ -757,14 +761,14 @@ export async function reloadWorldMap(option: loadMapOption, drawTarget = '.world
}
await setMapBackground(storedMap)
- .then(convertCityObjs)
- .then(isDetailMap?drawDetailWorldMap:drawBasicWorldMap)
- .then(setMouseWork)
- .then(setCityClickable)
- .then(saveCityInfo);
+ .then(convertCityObjs)
+ .then(isDetailMap ? drawDetailWorldMap : drawBasicWorldMap)
+ .then(setMouseWork)
+ .then(setCityClickable)
+ .then(saveCityInfo);
})();
} else if (option.year && option.month) {
- const rawStartYear = localStorage.getItem(storedStartYear) as string|undefined;
+ const rawStartYear = localStorage.getItem(storedStartYear) as string | undefined;
let startYear: number;
if (rawStartYear) {
startYear = JSON.parse(rawStartYear);
diff --git a/hwe/ts/util/sammoAPI.ts b/hwe/ts/util/sammoAPI.ts
new file mode 100644
index 00000000..2897242e
--- /dev/null
+++ b/hwe/ts/util/sammoAPI.ts
@@ -0,0 +1,28 @@
+import axios from "axios";
+import { isArray } from "lodash";
+import { InvalidResponse } from "../defs";
+
+type ValidResponse = {
+ result: true
+}
+
+export async function sammoAPI(path: string | string[], args?: Record): Promise {
+ if (isArray(path)) {
+ path = path.join('/');
+ }
+
+ const response = await axios({
+ url: "api.php",
+ method: "post",
+ responseType: "json",
+ data: {
+ path,
+ args,
+ },
+ });
+ const result: InvalidResponse | ResultType = response.data;
+ if (!result.result) {
+ throw result.reason;
+ }
+ return result;
+}
\ No newline at end of file
diff --git a/hwe/ts/v_main.ts b/hwe/ts/v_main.ts
new file mode 100644
index 00000000..7141ad33
--- /dev/null
+++ b/hwe/ts/v_main.ts
@@ -0,0 +1,9 @@
+import { createApp } from 'vue'
+import ReservedCommand from './ReservedCommand.vue';
+import BootstrapVue3 from 'bootstrap-vue-3'
+import { setAxiosXMLHttpRequest } from './util/setAxiosXMLHttpRequest';
+
+
+setAxiosXMLHttpRequest();
+
+createApp(ReservedCommand).use(BootstrapVue3).mount('#reservedCommandList')
\ No newline at end of file
diff --git a/package.json b/package.json
index 47cab1be..79aecc61 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
"async-validator": "^4.0.3",
"axios": "^0.21.4",
"bootstrap": "^4.6.0",
- "bootstrap5": "npm:bootstrap@^5.1.1",
+ "bootstrap5": "npm:bootstrap@^5.1.3",
"core-js": "^3.17.3",
"date-fns": "^2.24.0",
"downloadjs": "^1.4.7",
@@ -58,8 +58,8 @@
"@vue/eslint-config-typescript": "^7.0.0",
"babel-plugin-lodash": "^3.3.4",
"babel-preset-modern-browsers": "^15.0.2",
- "bootstrap-vue-3": "^0.0.3",
- "bootswatch": "^5.1.1",
+ "bootstrap-vue-3": "^0.0.5",
+ "bootswatch": "^5.1.3",
"clean-terminal-webpack-plugin": "^3.0.0",
"css-loader": "^6.2.0",
"esbuild-loader": "^2.15.1",