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-07 00:39:25 +09:00
parent b8a8776c2e
commit 5a50476e9d
9 changed files with 54 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/ActionSpecialWar/che_견고.php
+3 -2
View File
@@ -23,13 +23,14 @@ class che_견고 extends \sammo\BaseSpecial{
public function getBattleInitSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
return new WarUnitTriggerCaller(
new che_부상무효($unit, BaseWarUnitTrigger::TYPE_NONE)
new che_부상무효($unit, BaseWarUnitTrigger::TYPE_NONE),
new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '저격불가')
);
}
public function getBattlePhaseSkillTriggerList(WarUnit $unit):?WarUnitTriggerCaller{
return new WarUnitTriggerCaller(
new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '필살불가', '위압불가', '격노불가', '계략약화')
new WarActivateSkills($unit, BaseWarUnitTrigger::TYPE_NONE, false, '필살불가', '위압불가', '격노불가', '계략약화', '저격불가')
);
}
hwe/sammo/Command/Nation/che_국기변경.php
+2 -2
View File
@@ -73,7 +73,7 @@ class che_국기변경 extends Command\NationCommand
ConstraintHelper::OccupiedCity(),
ConstraintHelper::BeChief(),
ConstraintHelper::SuppliedCity(),
ConstraintHelper::ReqNationAuxValue("can_{$actionName}", null, '>', 0, '더이상 변경이 불가능합니다.')
ConstraintHelper::ReqNationAuxValue("can_{$actionName}", 0, '>', 0, '더이상 변경이 불가능합니다.')
];
}
@@ -85,7 +85,7 @@ class che_국기변경 extends Command\NationCommand
ConstraintHelper::OccupiedCity(),
ConstraintHelper::BeChief(),
ConstraintHelper::SuppliedCity(),
ConstraintHelper::ReqNationAuxValue("can_{$actionName}", null, '>', 0, '더이상 변경이 불가능합니다.')
ConstraintHelper::ReqNationAuxValue("can_{$actionName}", 0, '>', 0, '더이상 변경이 불가능합니다.')
];
}
hwe/sammo/Scenario/Nation.php
+10
View File
@@ -4,6 +4,7 @@ use \sammo\DB;
use \sammo\GameConst;
use \sammo\Util;
use \sammo\KVStorage;
use \sammo\Json;
use function \sammo\getNationChiefLevel;
class Nation{
@@ -86,6 +87,14 @@ class Nation{
$nationStor = KVStorage::getStorage($db, $this->id, 'nation_env');
$otherNations = $db->queryFirstColumn('SELECT nation FROM nation');
$aux = [
'can_국기변경'=>1
];
if($this->nationLevel==7){
$aux['can_국호변경']=1;
}
$db->insert('nation', [
'nation'=>$this->id,
'name'=>$this->name,
@@ -103,6 +112,7 @@ class Nation{
'tech'=>$this->tech,
'level'=>$this->nationLevel,
'type'=>$type,
'aux'=>Json::encode($aux),
]);
if($cities){