diff --git a/hwe/sammo/Command/General/che_출병.php b/hwe/sammo/Command/General/che_출병.php index c70a1109..47ea16be 100644 --- a/hwe/sammo/Command/General/che_출병.php +++ b/hwe/sammo/Command/General/che_출병.php @@ -201,10 +201,10 @@ class che_출병 extends Command\GeneralCommand $defenderCityName = $this->destCity['name']; $josaRo = JosaUtil::pick($defenderCityName, '로'); if($this->arg['destCityID'] == $defenderCityID){ - $logger->pushGeneralActionLog("본국입니다. {$defenderCityName}{$josaRo} 으로 이동합니다. <1>$date"); + $logger->pushGeneralActionLog("본국입니다. {$defenderCityName}{$josaRo} 이동합니다. <1>$date"); } else{ - $logger->pushGeneralActionLog("가까운 경로에 적군 도시가 없습니다. {$defenderCityName}{$josaRo} 으로 이동합니다. <1>$date"); + $logger->pushGeneralActionLog("가까운 경로에 적군 도시가 없습니다. {$defenderCityName}{$josaRo} 이동합니다. <1>$date"); } $this->alternative = new che_이동($general, $this->env, ['destCityID' => $defenderCityID]); diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php index 80174190..25355008 100644 --- a/hwe/sammo/General.php +++ b/hwe/sammo/General.php @@ -1066,7 +1066,7 @@ class General implements iAction{ $db = DB::db(); $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){ $generalID = $general->getID(); if(!key_exists($generalID, $rawCmds)){