devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

버그 수정

Browse Source
This commit is contained in:
Hide_D
2020-05-11 01:37:37 +09:00
parent c02581978d
commit ed6d19e8ab
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Command/General/che_출병.php
+2 -2
View File
@@ -201,10 +201,10 @@ class che_출병 extends Command\GeneralCommand
$defenderCityName = $this->destCity['name']; $defenderCityName = $this->destCity['name'];
$josaRo = JosaUtil::pick($defenderCityName, '로'); $josaRo = JosaUtil::pick($defenderCityName, '로');
if($this->arg['destCityID'] == $defenderCityID){ if($this->arg['destCityID'] == $defenderCityID){
$logger->pushGeneralActionLog("본국입니다. <G><b>{$defenderCityName}</b></>{$josaRo} 으로 이동합니다. <1>$date</>"); $logger->pushGeneralActionLog("본국입니다. <G><b>{$defenderCityName}</b></>{$josaRo} 이동합니다. <1>$date</>");
} }
else{ else{
$logger->pushGeneralActionLog("가까운 경로에 적군 도시가 없습니다. <G><b>{$defenderCityName}</b></>{$josaRo} 으로 이동합니다. <1>$date</>"); $logger->pushGeneralActionLog("가까운 경로에 적군 도시가 없습니다. <G><b>{$defenderCityName}</b></>{$josaRo} 이동합니다. <1>$date</>");
} }
$this->alternative = new che_이동($general, $this->env, ['destCityID' => $defenderCityID]); $this->alternative = new che_이동($general, $this->env, ['destCityID' => $defenderCityID]);
hwe/sammo/General.php
+1 -1
View File
@@ -1066,7 +1066,7 @@ class General implements iAction{
$db = DB::db(); $db = DB::db();
$result = []; $result = [];
$rawCmds = Util::convertArrayToDict($db->queryFirstRow('SELECT * FROM general_turn WHERE general_id IN %li AND turn_idx = %i', $generalIDList, $turnIdx), 'general_id'); $rawCmds = Util::convertArrayToDict($db->query('SELECT * FROM general_turn WHERE general_id IN %li AND turn_idx = %i', $generalIDList, $turnIdx), 'general_id');
foreach($generalList as $general){ foreach($generalList as $general){
$generalID = $general->getID(); $generalID = $general->getID();
if(!key_exists($generalID, $rawCmds)){ if(!key_exists($generalID, $rawCmds)){