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

통합 안되는 버그 수정

Browse Source
This commit is contained in:
Hide_D
2018-09-04 15:48:18 +09:00
parent 0eee613a95
commit a277ac182b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/DiplomaticMessage.php
+2 -2
View File
@@ -181,7 +181,7 @@ class DiplomaticMessage extends Message{
$josaWa = JosaUtil::pick($this->src->nationName, '와'); $josaWa = JosaUtil::pick($this->src->nationName, '와');
pushGeneralHistory( pushGeneralHistory(
['no'=>$this->dest->generalID], ['no'=>$this->dest->generalID],
["<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->src->nationName}</b></>{$josaWa} 통합 시도"] "<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->src->nationName}</b></>{$josaWa} 통합 시도"
); );
pushGenLog( pushGenLog(
['no'=>$this->dest->generalID], ['no'=>$this->dest->generalID],
@@ -200,7 +200,7 @@ class DiplomaticMessage extends Message{
$josaWa = JosaUtil::pick($this->dest->nationName, '와'); $josaWa = JosaUtil::pick($this->dest->nationName, '와');
pushGeneralHistory( pushGeneralHistory(
['no'=>$this->src->generalID], ['no'=>$this->src->generalID],
["<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->dest->nationName}</b></>{$josaWa} 통합 시도"] "<C>●</>{$helper->year}년 {$helper->month}월:<D><b>{$this->dest->nationName}</b></>{$josaWa} 통합 시도"
); );
$josaYi = JosaUtil::pick($this->dest->nationName, '이'); $josaYi = JosaUtil::pick($this->dest->nationName, '이');
pushGenLog( pushGenLog(
hwe/sammo/Engine/Diplomacy.php
+2 -2
View File
@@ -29,12 +29,12 @@ class Diplomacy{
$db = DB::db(); $db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env'); $gameStor = KVStorage::getStorage($db, 'game_env');
$srcNation = $db->queryFirstRow( $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 $srcNationID
); );
$destNation = $db->queryFirstRow( $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 $destNationID
); );