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

fix: GetCityInfo에서 출력됨

Browse Source
This commit is contained in:
Hide_D
2023-03-26 02:55:42 +09:00
parent 75d88d48b6
commit 3762d9050c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/sammo/API/City/GetCityInfo.php
+4 -3
View File
@@ -143,7 +143,7 @@ class GetCityInfo extends \sammo\BaseAPI
$nationStaticList = getAllNationStaticInfo(); $nationStaticList = getAllNationStaticInfo();
$rawGeneralList = Util::convertArrayToDict($db->query('SELECT %l from general WHERE city = %i ORDER BY turntime ASC', Util::formatListOfBackticks(array_keys(static::$viewColumns)), $cityID), 'city'); $rawGeneralList = Util::convertArrayToDict($db->query('SELECT %l from general WHERE city = %i ORDER BY turntime ASC', Util::formatListOfBackticks(array_keys(static::$viewColumns)), $cityID), 'no');
$ourNationGeneralIDList = new Set(); $ourNationGeneralIDList = new Set();
foreach ($rawGeneralList as $rawGeneral) { foreach ($rawGeneralList as $rawGeneral) {
if ($rawGeneral['nation'] == $nationID) { if ($rawGeneral['nation'] == $nationID) {
@@ -307,12 +307,12 @@ class GetCityInfo extends \sammo\BaseAPI
$currentCityID = $me['city']; $currentCityID = $me['city'];
//TODO: 조건 조사 //TODO: 조건 조사
$cityList = new Set($db->queryFirstField('SELECT city FROM city WHERE nation=%i', $nationID)); $cityList = new Set($db->queryFirstColumn('SELECT city FROM city WHERE nation=%i', $nationID));
$spyList = JSON::decode($db->queryFirstField('SELECT spy FROM nation WHERE nation=%i', $nationID)); $spyList = JSON::decode($db->queryFirstField('SELECT spy FROM nation WHERE nation=%i', $nationID));
$showLevel = $this->calcShowLevel($cityID, $currentCityID, $nationID, $cityList, key_exists($cityID, $spyList)); $showLevel = $this->calcShowLevel($cityID, $currentCityID, $nationID, $cityList, key_exists($cityID, $spyList));
$rawCity = $db->queryFirstRow('SELECT * FROM city WHERE no=%i', $cityID); $rawCity = $db->queryFirstRow('SELECT * FROM city WHERE city=%i', $cityID);
$filteredCity = $this->filterCity($rawCity, $showLevel); $filteredCity = $this->filterCity($rawCity, $showLevel);
$result = [ $result = [
@@ -323,6 +323,7 @@ class GetCityInfo extends \sammo\BaseAPI
'nationCityList' => $cityList->toArray(), 'nationCityList' => $cityList->toArray(),
'myGeneralID' => $session->generalID, 'myGeneralID' => $session->generalID,
'currentCityID' => $currentCityID, 'currentCityID' => $currentCityID,
'showLevel' => $showLevel,
'cityGeneralList' => $this->getGeneralList($cityID, $nationID, $showLevel) 'cityGeneralList' => $this->getGeneralList($cityID, $nationID, $showLevel)
]; ];