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-05-11 02:14:33 +09:00
parent 780169962d
commit b0dcf14d96
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/Command/General/che_등용.php
+1 -1
View File
@@ -78,7 +78,7 @@ class che_등용 extends Command\GeneralCommand{
protected function initWithArg()
{
$destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['nation'], 0);
$destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['nation', 'experience', 'dedication'], 0);
$this->setDestGeneral($destGeneral);
[$reqGold, $reqRice] = $this->getCost();
hwe/sammo/Command/General/che_등용수락.php
+2 -2
View File
@@ -83,14 +83,14 @@ class che_등용수락 extends Command\GeneralCommand{
protected function initWithArg()
{
$destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['nation'], 0);
$destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], null, 2);
$this->setDestGeneral($destGeneral);
$this->setDestNation($this->arg['destNationID'], ['gennum', 'scout']);
$relYear = $this->env['year'] - $this->env['startyear'];
$this->fullConditionConstraints=[
ConstraintHelper::ReqEnvValue('join_mode', '==', 'onlyRandom', '랜덤 임관만 가능합니다'),
ConstraintHelper::ReqEnvValue('join_mode', '!=', 'onlyRandom', '랜덤 임관만 가능합니다'),
ConstraintHelper::NotOpeningPart($relYear),
ConstraintHelper::ExistsDestNation(),
ConstraintHelper::AllowJoinDestNation($relYear),