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-04-19 06:18:35 +09:00
parent b98df58c76
commit c611e98cf7
7 changed files with 38 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Command/General/che_군량매매.php
+1 -1
View File
@@ -38,7 +38,7 @@ class che_군량매매 extends Command\GeneralCommand{
if(!is_int($amount)){
return false;
}
$amount = Util::valueFit($amount, 100, GameConst::$maxIncentiveAmount);
$amount = Util::valueFit($amount, 100, GameConst::$maxResourceActionAmount);
$this->arg = [
'buyRice'=>$buyRice,
hwe/sammo/Command/General/che_징병.php
+2 -3
View File
@@ -165,12 +165,11 @@ class che_징병 extends Command\GeneralCommand{
$currCrewType = $this->currCrewType;
$crewTypeName = $reqCrewType->name;
$josaUl = JosaUtil::pick($crewTypeName, '을');
$logger = $general->getLogger();
if($reqCrewType->id == $currCrewType->id && $currCrew > 0){
$logger->pushGeneralActionLog("{$crewTypeName}{$josaUl} <C>{$reqCrewText}</>명을 추가{$this->getName()}했습니다. <1>$date</>");
$logger->pushGeneralActionLog("{$crewTypeName} <C>{$reqCrewText}</>명을 추가{$this->getName()}했습니다. <1>$date</>");
$train = ($currCrew * $general->getVar('train') + $reqCrew * static::$defaultTrain) / ($currCrew + $reqCrew);
$atmos = ($currCrew * $general->getVar('atmos') + $reqCrew * static::$defaultAtmos) / ($currCrew + $reqCrew);
@@ -179,7 +178,7 @@ class che_징병 extends Command\GeneralCommand{
$general->setVar('atmos', $atmos);
}
else{
$logger->pushGeneralActionLog("{$crewTypeName}{$josaUl} <C>{$reqCrewText}</>명을 {$this->getName()}했습니다. <1>$date</>");
$logger->pushGeneralActionLog("{$crewTypeName} <C>{$reqCrewText}</>명을 {$this->getName()}했습니다. <1>$date</>");
$general->setVar('crewtype', $reqCrewType->id);
$general->setVar('crew', $reqCrew);
$general->setVar('train', static::$defaultTrain);