diff --git a/.phan/config.php b/.phan/config.php index b6a5feea..5639e603 100644 --- a/.phan/config.php +++ b/.phan/config.php @@ -60,7 +60,7 @@ return [ 'hwe/b_myGenInfo.php', 'hwe/b_myKingdomInfo.php', 'hwe/b_myPage.php', - 'hwe/b_processing.php', + 'hwe/v_processing.php', 'hwe/b_tournament.php', 'hwe/b_troop.php', 'hwe/c_auction.php', diff --git a/hwe/sammo/Command/BaseCommand.php b/hwe/sammo/Command/BaseCommand.php index b7ce2565..469d07be 100644 --- a/hwe/sammo/Command/BaseCommand.php +++ b/hwe/sammo/Command/BaseCommand.php @@ -475,18 +475,9 @@ abstract class BaseCommand{ abstract public function run():bool; - public function getJSPlugins():array { - return []; - } public function exportJSVars():array { return []; } - public function getCSSFiles():array { - return []; - } - public function getForm():string{ - throw new \sammo\MustNotBeReachedException(); - } public function getLastTurn():LastTurn{ return $this->generalObj->getLastTurn(); diff --git a/hwe/sammo/Command/General/che_강행.php b/hwe/sammo/Command/General/che_강행.php index 602f05ef..2c6b035a 100644 --- a/hwe/sammo/Command/General/che_강행.php +++ b/hwe/sammo/Command/General/che_강행.php @@ -170,13 +170,6 @@ class che_강행 extends Command\GeneralCommand return true; } - public function getJSPlugins(): array - { - return [ - 'defaultSelectCityByMap' - ]; - } - public function exportJSVars(): array { return [ @@ -185,25 +178,4 @@ class che_강행 extends Command\GeneralCommand 'distanceList' => \sammo\JSCitiesBasedOnDistance($this->generalObj->getCityID(), 3), ]; } - - public function getForm(): string - { - $currentCityID = $this->generalObj->getCityID(); - $currentCityName = CityConst::byID($currentCityID)->name; - - ob_start(); -?> -
- 선택된 도시로 강행합니다.
- 최대 3칸내 도시로만 강행이 가능합니다.
- 목록을 선택하거나 도시를 클릭하세요.
- =>

-
-
-
-
- - \sammo\JSOptionsForCities() + 'cities' => \sammo\JSOptionsForCities(), + 'mapTheme' => getMapTheme(), + 'distanceList' => \sammo\JSCitiesBasedOnDistance($this->generalObj->getCityID(), 1), ]; } diff --git a/hwe/scss/processing.scss b/hwe/scss/processing.scss index d97ababa..e61818f1 100644 --- a/hwe/scss/processing.scss +++ b/hwe/scss/processing.scss @@ -32,6 +32,23 @@ #container { width: 500px; margin: 0 auto; - margin-bottom: 100px; + + .world_map { + width: 500px; + height: calc((500px + 20px) * 500 / 700); + } + + .map_title { + transform-origin: 0px 0px; + transform: scale(calc(500 / 700)); + margin-bottom: calc(-20px * 200 / 700); + } + + .map_body { + transform-origin: 0px 0px; + transform: scale(calc(500 / 700)); + } } -} + + +} \ No newline at end of file diff --git a/hwe/ts/PartialReservedCommand.vue b/hwe/ts/PartialReservedCommand.vue index 35dab1eb..380a3c98 100644 --- a/hwe/ts/PartialReservedCommand.vue +++ b/hwe/ts/PartialReservedCommand.vue @@ -449,7 +449,7 @@ export default defineComponent({ if (listReqArgCommand.has(commandName)) { document.location.href = stringifyUrl({ - url: "b_processing.php", + url: "v_processing.php", query: { command: commandName, turnList: turnList.join("_"), diff --git a/hwe/ts/chiefCenter.ts b/hwe/ts/chiefCenter.ts index c9a3d8cc..83e8a98d 100644 --- a/hwe/ts/chiefCenter.ts +++ b/hwe/ts/chiefCenter.ts @@ -237,7 +237,7 @@ $(function ($) { const $command = $('#chiefCommandList option:selected'); if ($command.data('reqarg')) { document.location.href = stringifyUrl({ - url: 'b_processing.php', + url: 'v_processing.php', query: { command: unwrap_any($command.val()), turnList: turnList.join('_'), diff --git a/hwe/ts/components/BottomBar.vue b/hwe/ts/components/BottomBar.vue index 37058fe3..68c85a72 100644 --- a/hwe/ts/components/BottomBar.vue +++ b/hwe/ts/components/BottomBar.vue @@ -1,15 +1,10 @@ diff --git a/hwe/ts/processing/General/index.ts b/hwe/ts/processing/General/index.ts index 03de46d6..8d1d5e1c 100644 --- a/hwe/ts/processing/General/index.ts +++ b/hwe/ts/processing/General/index.ts @@ -1 +1,2 @@ -export { default as che_강행 } from "./che_강행.vue"; \ No newline at end of file +export { default as che_강행 } from "./che_강행.vue"; +export { default as che_이동 } from "./che_이동.vue"; \ No newline at end of file diff --git a/hwe/ts/v_processing.ts b/hwe/ts/v_processing.ts index 2cbe54e2..9c1ee8c7 100644 --- a/hwe/ts/v_processing.ts +++ b/hwe/ts/v_processing.ts @@ -72,9 +72,6 @@ async function submitCommand(isChiefTurn: boolean, turnList: number[], comman declare const entryInfo: ['General', keyof typeof GeneralActions] | ['Nation', keyof typeof NationActions]; -console.log('entry', entryInfo); - -auto500px(); const app: App | undefined = (function () { //NOTE: route를 쓴다? const groupName = entryInfo[0]; @@ -96,7 +93,7 @@ const app: App | undefined = (function () { console.error('알수') return undefined; }()); -console.log(app); + if (app === undefined) { console.error(`모듈이 지정되지 않음`, entryInfo); } @@ -110,3 +107,6 @@ else { app.use(BootstrapVue3).component('v-multiselect', Multiselect).mount('#container'); } + + +auto500px(); \ No newline at end of file diff --git a/hwe/b_processing.php b/hwe/v_processing.php similarity index 91% rename from hwe/b_processing.php rename to hwe/v_processing.php index 3ca90ab5..1fd72a27 100644 --- a/hwe/b_processing.php +++ b/hwe/v_processing.php @@ -63,8 +63,6 @@ if (!$commandObj->hasPermissionToReserve()) { die_redirect(); } -$jsList = $commandObj->getJSPlugins(); -$cssList = $commandObj->getCSSFiles(); ?> @@ -74,7 +72,7 @@ $cssList = $commandObj->getCSSFiles(); <?= $commandObj->getName() ?> - + getCSSFiles(); 'entryInfo' => [$isChiefTurn?'Nation':'General', $commandType] ])?> exportJSVars(), false) ?> -