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

warning 메시지 수정

Browse Source
This commit is contained in:
Hide_D
2021-09-05 23:02:52 +09:00
parent e64812da72
commit 2bce6e4f02
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/b_currentCity.php
+6 -7
View File
@@ -229,7 +229,7 @@ $generalTurnList = [];
if($generals){ if($generals){
foreach($db->queryAllLists( foreach($db->queryAllLists(
'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC', 'SELECT general_id, turn_idx, brief FROM general_turn WHERE general_id IN %li AND turn_idx < 5 ORDER BY general_id ASC, turn_idx ASC',
array_column($generals, 'no') array_column($generals, 'no')
) as [$generalID, $turnIdx, $brief] ) as [$generalID, $turnIdx, $brief]
){ ){
@@ -268,7 +268,7 @@ foreach($generals as $general){
$isNPC = $general['npc']>1; $isNPC = $general['npc']>1;
$wounded = $general['injury']; $wounded = $general['injury'];
$name = $general['name']; $name = $general['name'];
$nameText = formatName($name, $general['npc']); $nameText = formatName($name, $general['npc']);
@@ -325,7 +325,7 @@ foreach($generals as $general){
else{ else{
$turnText = ''; $turnText = '';
} }
$generalsFormat[] = [ $generalsFormat[] = [
'ourGeneral'=>$ourGeneral, 'ourGeneral'=>$ourGeneral,
'iconPath'=>GetImageURL($general['imgsvr']).'/'.$general['picture'], 'iconPath'=>GetImageURL($general['imgsvr']).'/'.$general['picture'],
@@ -377,7 +377,7 @@ $genTotal = 0;
foreach($generalsFormat as $general){ foreach($generalsFormat as $general){
if($general['nation'] == 0){ if(!$general['nation'] || !$myNation['nation']){
continue; continue;
} }
if($general['nation'] != $myNation['nation']){ if($general['nation'] != $myNation['nation']){
@@ -407,7 +407,7 @@ foreach($generalsFormat as $general){
} }
$chkDef = false; $chkDef = false;
if($minTrain >= 80){ if($minTrain >= 80){
$crew80 += $general['crew']; $crew80 += $general['crew'];
$gen80 += 1; $gen80 += 1;
@@ -424,7 +424,7 @@ foreach($generalsFormat as $general){
$chkDef = true; $chkDef = true;
} }
} }
@@ -520,4 +520,3 @@ foreach($generalsFormat as $general){
</table> </table>
</body> </body>
</html> </html>