From efd92d340c223a2528d232c422f8ad627082e032 Mon Sep 17 00:00:00 2001 From: Hide_D Date: Wed, 23 Mar 2022 19:57:47 +0900 Subject: [PATCH] =?UTF-8?q?misc:=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/ts/PartialReservedCommand.vue | 4 +++- hwe/ts/v_processing.ts | 4 +++- hwe/v_processing.php | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hwe/ts/PartialReservedCommand.vue b/hwe/ts/PartialReservedCommand.vue index cf28ab14..5823b871 100644 --- a/hwe/ts/PartialReservedCommand.vue +++ b/hwe/ts/PartialReservedCommand.vue @@ -293,6 +293,8 @@ declare const staticValues: { }[], serverNow: string, serverNick: string, + mapName: string, + unitSet: string, } @@ -745,7 +747,7 @@ watch(isEditMode, newEditMode => { const emptyTurnObj: TurnObj = { action: '휴식', brief: '휴식', arg: {} }; -const storedActionsHelper = new StoredActionsHelper(staticValues.serverNick, 'general'); +const storedActionsHelper = new StoredActionsHelper(staticValues.serverNick, 'general', staticValues.mapName, staticValues.unitSet); const recentActions = storedActionsHelper.recentActions; const storedActions = storedActionsHelper.storedActions; diff --git a/hwe/ts/v_processing.ts b/hwe/ts/v_processing.ts index 4e48ab7f..ce31d859 100644 --- a/hwe/ts/v_processing.ts +++ b/hwe/ts/v_processing.ts @@ -16,6 +16,8 @@ import type { ReserveCommandResponse } from './defs'; declare const staticValues: { serverNick: string, turnList: number[], + mapName: string, + unitSet: string, }; const { turnList } = staticValues; @@ -35,7 +37,7 @@ async function submitCommand(isChiefTurn: bool arg, }); - const storedActionsHelper = new StoredActionsHelper(staticValues.serverNick, isChiefTurn?'nation':'general'); + const storedActionsHelper = new StoredActionsHelper(staticValues.serverNick, isChiefTurn?'nation':'general', staticValues.mapName, staticValues.unitSet); const response = await responseP; storedActionsHelper.pushRecentActions({ diff --git a/hwe/v_processing.php b/hwe/v_processing.php index cfe3db1c..3dd203ca 100644 --- a/hwe/v_processing.php +++ b/hwe/v_processing.php @@ -83,13 +83,15 @@ if (!$commandObj->hasPermissionToReserve()) { 'turnList' => $turnList, 'currentCity' => $general->getCityID(), 'currentNation' => $general->getNationID(), - 'entryInfo' => [$isChiefTurn?'Nation':'General', $commandType] + 'entryInfo' => [$isChiefTurn?'Nation':'General', $commandType], + 'mapName' => GameConst::$mapName, + 'unitSet' => GameConst::$unitSet, ], 'commandName' => $commandObj->getName(), 'turnList' => $turnList, 'currentCity' => $general->getCityID(), 'currentNation' => $general->getNationID(), - 'entryInfo' => [$isChiefTurn?'Nation':'General', $commandType] + 'entryInfo' => [$isChiefTurn?'Nation':'General', $commandType], ])?> exportJSVars(), false) ?>