포켓몬스터 전콘 안뜨는 문제 수정

This commit is contained in:
2019-10-03 20:52:51 +09:00
parent 94a00dbdac
commit 158068273e
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -354,7 +354,7 @@ class Scenario{
'npc_cnt'=>count($this->getNPC()), 'npc_cnt'=>count($this->getNPC()),
'npcEx_cnt'=>count($this->getNPCex()), 'npcEx_cnt'=>count($this->getNPCex()),
'npcNeutral_cnt'=>count($this->getNPCneutral()), 'npcNeutral_cnt'=>count($this->getNPCneutral()),
'nation'=>array_map(function($nation) use ($nationGeneralCnt, $nationGeneralExCnt){ 'nation'=>array_map(function($nation) use ($nationGeneralCnt, $nationGeneralExCnt, $nationGeneralNeutralCnt){
$brief = $nation->getBrief(); $brief = $nation->getBrief();
$brief['generals'] = Util::array_get($nationGeneralCnt[$nation->getID()], 0); $brief['generals'] = Util::array_get($nationGeneralCnt[$nation->getID()], 0);
$brief['generalsEx'] = Util::array_get($nationGeneralExCnt[$nation->getID()], 0); $brief['generalsEx'] = Util::array_get($nationGeneralExCnt[$nation->getID()], 0);
+1 -1
View File
@@ -12,7 +12,7 @@
"npcMax": 90, "npcMax": 90,
"chiefMin": 65 "chiefMin": 65
}, },
"iconPath": "pokemon_v1", "iconPath": "포켓몬스터",
"fiction": 1, "fiction": 1,
"nation":[ "nation":[