등용장 버그 수정
등용장 초반에도 보낼 수 있도록, 리스트에서 optgroup 작성 실수
This commit is contained in:
@@ -18,7 +18,8 @@ use function \sammo\{
|
|||||||
CriticalScoreEx,
|
CriticalScoreEx,
|
||||||
tryUniqueItemLottery,
|
tryUniqueItemLottery,
|
||||||
getAllNationStaticInfo,
|
getAllNationStaticInfo,
|
||||||
getNationStaticInfo
|
getNationStaticInfo,
|
||||||
|
newColor
|
||||||
};
|
};
|
||||||
|
|
||||||
use \sammo\Constraint\Constraint;
|
use \sammo\Constraint\Constraint;
|
||||||
@@ -70,7 +71,6 @@ class che_등용 extends Command\GeneralCommand{
|
|||||||
$this->minConditionConstraints=[
|
$this->minConditionConstraints=[
|
||||||
ConstraintHelper::ReqEnvValue('join_mode', '!=', 'onlyRandom', '랜덤 임관만 가능합니다'),
|
ConstraintHelper::ReqEnvValue('join_mode', '!=', 'onlyRandom', '랜덤 임관만 가능합니다'),
|
||||||
ConstraintHelper::NotBeNeutral(),
|
ConstraintHelper::NotBeNeutral(),
|
||||||
ConstraintHelper::NotOpeningPart($relYear),
|
|
||||||
ConstraintHelper::OccupiedCity(),
|
ConstraintHelper::OccupiedCity(),
|
||||||
ConstraintHelper::SuppliedCity(),
|
ConstraintHelper::SuppliedCity(),
|
||||||
];
|
];
|
||||||
@@ -87,7 +87,6 @@ class che_등용 extends Command\GeneralCommand{
|
|||||||
$this->fullConditionConstraints=[
|
$this->fullConditionConstraints=[
|
||||||
ConstraintHelper::ReqEnvValue('join_mode', '!=', 'onlyRandom', '랜덤 임관만 가능합니다'),
|
ConstraintHelper::ReqEnvValue('join_mode', '!=', 'onlyRandom', '랜덤 임관만 가능합니다'),
|
||||||
ConstraintHelper::NotBeNeutral(),
|
ConstraintHelper::NotBeNeutral(),
|
||||||
ConstraintHelper::NotOpeningPart($relYear),
|
|
||||||
ConstraintHelper::OccupiedCity(),
|
ConstraintHelper::OccupiedCity(),
|
||||||
ConstraintHelper::SuppliedCity(),
|
ConstraintHelper::SuppliedCity(),
|
||||||
ConstraintHelper::ExistsDestGeneral(),
|
ConstraintHelper::ExistsDestGeneral(),
|
||||||
@@ -199,7 +198,7 @@ class che_등용 extends Command\GeneralCommand{
|
|||||||
등용할 장수를 목록에서 선택하세요.<br>
|
등용할 장수를 목록에서 선택하세요.<br>
|
||||||
<select class='formInput' name="destGeneralID" id="destGeneralID" size='1' style='color:white;background-color:black;'>
|
<select class='formInput' name="destGeneralID" id="destGeneralID" size='1' style='color:white;background-color:black;'>
|
||||||
<?php foreach($nationList as $destNation): ?>
|
<?php foreach($nationList as $destNation): ?>
|
||||||
<optgroup style='color:<?=$destNation['color']?>'>【<?=$destNation['name']?>】
|
<optgroup style='background-color:<?=$destNation['color']?>;color:<?=newColor($destNation['color'])?>;' label="【<?=$destNation['name']?>】" >
|
||||||
<?php foreach($destGenerals[$destNation['nation']]??[] as $destGeneral):
|
<?php foreach($destGenerals[$destNation['nation']]??[] as $destGeneral):
|
||||||
$nameColor = \sammo\getNameColor($destGeneral['npc']);
|
$nameColor = \sammo\getNameColor($destGeneral['npc']);
|
||||||
if($nameColor){
|
if($nameColor){
|
||||||
|
|||||||
@@ -91,7 +91,6 @@ class che_등용수락 extends Command\GeneralCommand{
|
|||||||
|
|
||||||
$this->fullConditionConstraints=[
|
$this->fullConditionConstraints=[
|
||||||
ConstraintHelper::ReqEnvValue('join_mode', '!=', 'onlyRandom', '랜덤 임관만 가능합니다'),
|
ConstraintHelper::ReqEnvValue('join_mode', '!=', 'onlyRandom', '랜덤 임관만 가능합니다'),
|
||||||
ConstraintHelper::NotOpeningPart($relYear),
|
|
||||||
ConstraintHelper::ExistsDestNation(),
|
ConstraintHelper::ExistsDestNation(),
|
||||||
ConstraintHelper::AllowJoinDestNation($relYear),
|
ConstraintHelper::AllowJoinDestNation($relYear),
|
||||||
ConstraintHelper::ReqDestNationValue('level', '국가규모', '>', 0, '방랑군에는 임관할 수 없습니다.'),
|
ConstraintHelper::ReqDestNationValue('level', '국가규모', '>', 0, '방랑군에는 임관할 수 없습니다.'),
|
||||||
|
|||||||
Reference in New Issue
Block a user