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

현재 진행중인 깃수인 경우 장수가 안 죽었으면 안나타나는 문제 해결

Browse Source
This commit is contained in:
Hide_D
2018-07-05 00:24:03 +09:00
parent 51b376add2
commit 14d9b0dd31
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/a_emperior_detail.php
+16 -3
View File
@@ -173,14 +173,27 @@ if($showServers){
$nation['typeName'] = getNationType($nation['type']); $nation['typeName'] = getNationType($nation['type']);
$nation['levelName'] = getNationLevel($nation['level']); $nation['levelName'] = getNationLevel($nation['level']);
if($nation['generals']){ if($nation['generals']){
$generals = $db->query('SELECT `general_no`, `name` FROM ng_old_generals WHERE server_id=%s AND general_no IN %li', $serverID, $nation['generals']); $generals = $db->query('SELECT `general_no`, `name`, `last_yearmonth` FROM ng_old_generals WHERE server_id=%s AND general_no IN %li', $serverID, $nation['generals']);
$nation['generalsFull'] = $generals;
if(count($generals) != $nation['generals'] && $serverID == UniqueConst::$serverID){
$liveGenerals = $nation['generals'];
foreach($generals as $general){
if(in_array($general['general_no'], $nation['generals'])){
unset($nation['generals'][$general['general_no']]);
}
}
$liveGenerals = $db->query('SELECT `no`as`general_no`, `name` FROM general WHERE no IN %li', $liveGenerals);
$nation['generalsFull'] = array_merge($liveGenerals, $generals);
}
else{
$nation['generalsFull'] = $generals;
}
} }
else{ else{
$nation['generalsFull'] = []; $nation['generalsFull'] = [];
} }
if(key_exists('aux', $nation)){ if(key_exists('aux', $nation) && !is_array($nation['aux'])){
$nation += Json::decode($nation['aux']); $nation += Json::decode($nation['aux']);
} }