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

버그 수정

Browse Source
This commit is contained in:
Hide_D
2019-10-06 16:14:41 +09:00
parent 026d72d68a
commit 323cf47417
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/a_kingdomList.php
+6 -2
View File
@@ -44,8 +44,11 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
$nations = getAllNationStaticInfo(); $nations = getAllNationStaticInfo();
uasort($nations, function($lhs, $rhs){return $rhs['power']<=>$lhs['power'];}); uasort($nations, function($lhs, $rhs){return $rhs['power']<=>$lhs['power'];});
$nations[0] = getNationStaticInfo(0);
foreach($db->query('SELECT npc,name,city,nation,level,penalty,permission FROM general ORDER BY dedication DESC') as $general){ foreach($db->query('SELECT npc,name,city,nation,level,penalty,permission FROM general ORDER BY dedication DESC') as $general){
$nationID = $general['nation']; $nationID = $general['nation'];
if(!key_exists('generals', $nations[$nationID])){ if(!key_exists('generals', $nations[$nationID])){
$nations[$nationID]['generals'] = []; $nations[$nationID]['generals'] = [];
} }
@@ -61,6 +64,7 @@ foreach ($db->queryAllLists('SELECT city, name, nation FROM city') as [$cityID,
foreach ($nations as $nation) { foreach ($nations as $nation) {
if ($nation['nation'] == 0) { if ($nation['nation'] == 0) {
//재야 도시, 장수
continue; continue;
} }
$generals = $nation['generals']; $generals = $nation['generals'];
@@ -159,11 +163,11 @@ echo "
<td width=123 align=center id=bg1>장 수</td> <td width=123 align=center id=bg1>장 수</td>
<td width=123 align=center>".count($nations[0]['generals'])."</td> <td width=123 align=center>".count($nations[0]['generals'])."</td>
<td width=123 align=center id=bg1>속 령</td> <td width=123 align=center id=bg1>속 령</td>
<td width=123 align=center>".count($nations[0]['cities'])."</td> <td width=123 align=center>".count($nations[0]['cities']??[])."</td>
</tr> </tr>
<tr> <tr>
<td colspan=5> 속령 일람 : "; <td colspan=5> 속령 일람 : ";
foreach($nations[0]['cities'] as $cityName) { foreach($nations[0]['cities']??[] as $cityName) {
echo "{$cityName}, "; echo "{$cityName}, ";
} }
echo" echo"
hwe/sammo/General.php
+1 -1
View File
@@ -645,7 +645,7 @@ class General implements iAction{
'personal', 'special', 'special2', 'defence_train', 'tnmt', 'npc', 'npc_org', 'deadyear', 'npcmsg', 'personal', 'special', 'special2', 'defence_train', 'tnmt', 'npc', 'npc_org', 'deadyear', 'npcmsg',
'dex0', 'dex10', 'dex20', 'dex30', 'dex40', 'dex0', 'dex10', 'dex20', 'dex30', 'dex40',
'warnum', 'firenum', 'killnum', 'deathnum', 'killcrew', 'deathcrew', 'recwar', 'last_turn', 'myset', 'warnum', 'firenum', 'killnum', 'deathnum', 'killcrew', 'deathcrew', 'recwar', 'last_turn', 'myset',
'specage', 'specage2', 'con', 'connect' 'specage', 'specage2', 'con', 'connect', 'owner'
]; ];
if($column === null){ if($column === null){