diff --git a/hwe/j_myBossInfo.php b/hwe/j_myBossInfo.php index a2366694..fd2fd583 100644 --- a/hwe/j_myBossInfo.php +++ b/hwe/j_myBossInfo.php @@ -47,7 +47,7 @@ else{ 'name', 'leadership', 'strength', 'intel', 'gold','rice', 'troop','officer_level','npc','picture','imgsvr', 'permission','penalty','belong', 'crewtype', - 'experience', 'dedication', 'betray', 'dedlevel', 'explevel', 'makelimit', + 'experience', 'dedication', 'betray', 'dedlevel', 'explevel', 'makelimit', 'aux', ], 1); if($general instanceof DummyGeneral){ @@ -104,7 +104,7 @@ function do수뇌임명(General $general, int $targetOfficerLevel):?string{ if($general->getVar('strength') < GameConst::$chiefStatMin){ return '무력이 부족합니다.'; } - + } else{ if($general->getVar('intel') < GameConst::$chiefStatMin){ @@ -175,7 +175,7 @@ function do추방(General $general, int $myOfficerLevel):?string{ $generalName = $general->getVar('name'); $nationID = $general->getNationID(); - + //추방할사람이 외교권자이면 불가 $permission = checkSecretPermission($general->getRaw()); @@ -252,7 +252,7 @@ function do추방(General $general, int $myOfficerLevel):?string{ ]); $src = new MessageTarget( - $generalID, + $generalID, $generalName, $nationID, $nation['name'], @@ -260,7 +260,7 @@ function do추방(General $general, int $myOfficerLevel):?string{ GetImageURL($general->getVar('imgsvr'), $general->getVar('picture')) ); $msg = new Message( - Message::MSGTYPE_PUBLIC, + Message::MSGTYPE_PUBLIC, $src, $src, $str, diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php index b8ebd788..32b9dd30 100644 --- a/hwe/sammo/General.php +++ b/hwe/sammo/General.php @@ -981,7 +981,7 @@ class General implements iAction{ $defaultEventColumn = [ 'no', 'name', 'owner', 'city', 'nation', 'officer_level', 'officer_city', 'special', 'special2', 'personal', - 'horse', 'weapon', 'book', 'item', 'last_turn' + 'horse', 'weapon', 'book', 'item', 'last_turn', 'aux', ]; $fullColumn = [ 'no', 'name', 'owner', 'owner_name', 'picture', 'imgsvr', 'nation', 'city', 'troop', 'injury', 'affinity',