diff --git a/hwe/sammo/DiplomaticMessage.php b/hwe/sammo/DiplomaticMessage.php index 9c065ada..7464ed30 100644 --- a/hwe/sammo/DiplomaticMessage.php +++ b/hwe/sammo/DiplomaticMessage.php @@ -181,7 +181,7 @@ class DiplomaticMessage extends Message{ $josaWa = JosaUtil::pick($this->src->nationName, '와'); pushGeneralHistory( ['no'=>$this->dest->generalID], - ["●{$helper->year}년 {$helper->month}월:{$this->src->nationName}{$josaWa} 통합 시도"] + "●{$helper->year}년 {$helper->month}월:{$this->src->nationName}{$josaWa} 통합 시도" ); pushGenLog( ['no'=>$this->dest->generalID], @@ -200,7 +200,7 @@ class DiplomaticMessage extends Message{ $josaWa = JosaUtil::pick($this->dest->nationName, '와'); pushGeneralHistory( ['no'=>$this->src->generalID], - ["●{$helper->year}년 {$helper->month}월:{$this->dest->nationName}{$josaWa} 통합 시도"] + "●{$helper->year}년 {$helper->month}월:{$this->dest->nationName}{$josaWa} 통합 시도" ); $josaYi = JosaUtil::pick($this->dest->nationName, '이'); pushGenLog( diff --git a/hwe/sammo/Engine/Diplomacy.php b/hwe/sammo/Engine/Diplomacy.php index 54ba46f2..29f418a0 100644 --- a/hwe/sammo/Engine/Diplomacy.php +++ b/hwe/sammo/Engine/Diplomacy.php @@ -29,12 +29,12 @@ class Diplomacy{ $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); $srcNation = $db->queryFirstRow( - 'SELECT nation, `name`, `power`, capital, gold, rice, surlimit, color, `level` FROM nation WHERE nation=%i', + 'SELECT nation, `name`, `power`, capital, gold, rice, gennum, surlimit, color, `level` FROM nation WHERE nation=%i', $srcNationID ); $destNation = $db->queryFirstRow( - 'SELECT nation, `name`, `power`, capital, gold, rice, surlimit, color, `level` FROM nation WHERE nation=%i', + 'SELECT nation, `name`, `power`, capital, gold, rice, gennum, surlimit, color, `level` FROM nation WHERE nation=%i', $destNationID );