diff --git a/hwe/sammo/Command/General/che_임관.php b/hwe/sammo/Command/General/che_임관.php index dc54b8ac..c50447c5 100644 --- a/hwe/sammo/Command/General/che_임관.php +++ b/hwe/sammo/Command/General/che_임관.php @@ -200,8 +200,8 @@ class che_임관 extends Command\GeneralCommand $rawNationList = Util::convertArrayToDict($db->query('SELECT nation,`name`,color,gennum,`power` FROM nation'), 'nation'); $scoutMsgs = KVStorage::getValuesFromInterNamespace($db, 'nation_env', 'scout_msg'); - foreach ($scoutMsgs as $nationID => $scoutMsg) { - $rawNationList[$nationID]['scoutmsg'] = $scoutMsg; + foreach ($scoutMsgs as $destNationID => $scoutMsg) { + $rawNationList[$destNationID]['scoutmsg'] = $scoutMsg; } foreach ($rawNationList as $destNation) { $testCommand = new static($generalObj, $this->env, ['destNationID' => $destNation['nation']]); diff --git a/hwe/select_general_from_pool.php b/hwe/select_general_from_pool.php index 72743912..0b5d4aa4 100644 --- a/hwe/select_general_from_pool.php +++ b/hwe/select_general_from_pool.php @@ -27,8 +27,8 @@ shuffle($nationList); $nationList = Util::convertArrayToDict($nationList, 'nation'); //NOTE: join 안할것임 $scoutMsgs = KVStorage::getValuesFromInterNamespace($db, 'nation_env', 'scout_msg'); -foreach ($scoutMsgs as $nationID => $scoutMsg) { - $nationList[$nationID]['scoutmsg'] = $scoutMsg; +foreach ($scoutMsgs as $destNationID => $scoutMsg) { + $nationList[$destNationID]['scoutmsg'] = $scoutMsg; } $characterAll = []; //선택용 diff --git a/hwe/select_npc.php b/hwe/select_npc.php index 90e44f28..573f09d9 100644 --- a/hwe/select_npc.php +++ b/hwe/select_npc.php @@ -24,8 +24,8 @@ shuffle($nationList); $nationList = Util::convertArrayToDict($nationList, 'nation'); //NOTE: join 안할것임 $scoutMsgs = KVStorage::getValuesFromInterNamespace($db, 'nation_env', 'scout_msg'); -foreach ($scoutMsgs as $nationID => $scoutMsg) { - $nationList[$nationID]['scoutmsg'] = $scoutMsg; +foreach ($scoutMsgs as $destNationID => $scoutMsg) { + $nationList[$destNationID]['scoutmsg'] = $scoutMsg; } ?> diff --git a/hwe/v_join.php b/hwe/v_join.php index a405877d..51e4759c 100644 --- a/hwe/v_join.php +++ b/hwe/v_join.php @@ -44,8 +44,8 @@ $nationList = $db->query('SELECT nation,`name`,color,scout FROM nation'); $nationList = Util::convertArrayToDict($nationList, 'nation'); //NOTE: join 안할것임 $scoutMsgs = KVStorage::getValuesFromInterNamespace($db, 'nation_env', 'scout_msg'); -foreach ($scoutMsgs as $nationID => $scoutMsg) { - $nationList[$nationID]['scoutmsg'] = $scoutMsg; +foreach ($scoutMsgs as $destNationID => $scoutMsg) { + $nationList[$destNationID]['scoutmsg'] = $scoutMsg; }