devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

fix: inheritSkill 연산을 위해 aux 필요

Browse Source
This commit is contained in:
Hide_D
2021-09-15 19:06:15 +00:00
committed by Gitea
parent dc835b86e9
commit 5e1267bc64
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func_gamerule.php
+1 -1
View File
@@ -623,7 +623,7 @@ function updateNationState()
$nation['nation'], $nation['nation'],
$targetKillTurn $targetKillTurn
); );
$nationGenList = General::createGeneralObjListFromDB($nationGenIDList, ['belong', 'npc'], 2); $nationGenList = General::createGeneralObjListFromDB($nationGenIDList, ['belong', 'npc', 'aux'], 2);
$chiefObj = null; $chiefObj = null;
$uniqueLotteryWeightList = []; $uniqueLotteryWeightList = [];
hwe/sammo/General.php
+5 -3
View File
@@ -139,9 +139,11 @@ class General implements iAction{
$this->itemObjs['book'] = buildItemClass($raw['book']); $this->itemObjs['book'] = buildItemClass($raw['book']);
$this->itemObjs['item'] = buildItemClass($raw['item']); $this->itemObjs['item'] = buildItemClass($raw['item']);
$rawInheritBuff = $this->getAuxVar('inheritBuff'); if(key_exists('aux', $this->raw)){
if($rawInheritBuff !== null){ $rawInheritBuff = $this->getAuxVar('inheritBuff');
$this->inheritBuffObj = new TriggerInheritBuff($rawInheritBuff); if($rawInheritBuff !== null){
$this->inheritBuffObj = new TriggerInheritBuff($rawInheritBuff);
}
} }
} }