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

[php5_debug] 명장일람 디스플레이 부분 수정

Browse Source
This commit is contained in:
revofpla
2018-01-17 23:48:12 +09:00
parent fb84886f94
commit 711600403f
2 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
twe/a_bestGeneral.php
+41 -15
View File
@@ -40,8 +40,11 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
</table> </table>
<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13;word-break:break-all; id=bg0> <table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13;word-break:break-all; id=bg0>
<?php <?php
if($btn == "NPC 보기") { $sel = "npc>=2"; } if(isset($btn) && $btn == "NPC 보기") {
else { $sel = "npc<2"; } $sel = "npc>=2";
} else {
$sel = "npc<2";
}
$query = "select nation,name,color from nation"; $query = "select nation,name,color from nation";
$nationresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $nationresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -109,12 +112,21 @@ for($i=0; $i < 21; $i++) {
for($k=0; $k < 10; $k++) { for($k=0; $k < 10; $k++) {
$gen = MYDB_fetch_array($result); $gen = MYDB_fetch_array($result);
if($i != 2) { if($i != 2) {
$name[$k] = $gen['name']; if(isset($gen)) {
$nation[$k] = $nationName[$gen['nation']]; $name[$k] = $gen['name'];
$data[$k] = $gen['data']; $nation[$k] = $gen['nation'] == 0 ? "재야" : $nationName[$gen['nation']];
$color[$k] = $nationColor[$gen['nation']]; $data[$k] = $gen['data'];
$pic[$k] = $gen['picture']; $color[$k] = $gen['nation'] == 0 ? "FFFFFF" : $nationColor[$gen['nation']];
$pic[$k] = $gen['picture'];
}else{
$name[$k] = "-";
$nation[$k] = "-";
$data[$k] = "-";
$color[$k] = $_basecolor4;
$pic[$k] = "";
}
} else { } else {
$name[$k] = "???"; $name[$k] = "???";
$nation[$k] = "???"; $nation[$k] = "???";
@@ -197,10 +209,17 @@ for($i=0; $i < 4; $i++) {
$query = "select nation,no,name,picture,imgsvr from general where {$call[$i]}={$k}"; $query = "select nation,no,name,picture,imgsvr from general where {$call[$i]}={$k}";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gen = MYDB_fetch_array($result); $gen = MYDB_fetch_array($result);
$name[$k] = $gen['name']; if(isset($gen)) {
$nation[$k] = $nationName[$gen['nation']]; $name[$k] = $gen['name'];
$color[$k] = $nationColor[$gen['nation']]; $nation[$k] = $gen['nation'] == 0 ? "재야" : $nationName[$gen['nation']];
$pic[$k] = $gen['picture']; $color[$k] = $gen['nation'] == 0 ? "FFFFFF" : $nationColor[$gen['nation']];
$pic[$k] = $gen['picture'];
}else{
$name[$k] = "미발견";
$nation[$k] = "-";
$color[$k] = "";
$pic[$k] = "";
}
if($color[$k] == "") $color[$k] = $_basecolor4; if($color[$k] == "") $color[$k] = $_basecolor4;
if($nation[$k] == "") $nation[$k] = "&nbsp;"; if($nation[$k] == "") $nation[$k] = "&nbsp;";
if($pic[$k] == "") { if($pic[$k] == "") {
@@ -238,10 +257,17 @@ for($i=0; $i < 4; $i++) {
$query = "select nation,no,name,picture,imgsvr from general where {$call[$i]}={$k}"; $query = "select nation,no,name,picture,imgsvr from general where {$call[$i]}={$k}";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gen = MYDB_fetch_array($result); $gen = MYDB_fetch_array($result);
$name[$k] = $gen['name']; if(isset($gen)) {
$nation[$k] = $nationName[$gen['nation']]; $name[$k] = $gen['name'];
$color[$k] = $nationColor[$gen['nation']]; $nation[$k] = $gen['nation'] == 0 ? "재야" : $nationName[$gen['nation']];
$pic[$k] = $gen['picture']; $color[$k] = $gen['nation'] == 0 ? "FFFFFF" : $nationColor[$gen['nation']];
$pic[$k] = $gen['picture'];
}else{
$name[$k] = "미발견";
$nation[$k] = "-";
$color[$k] = "";
$pic[$k] = "";
}
if($color[$k] == "") $color[$k] = $_basecolor4; if($color[$k] == "") $color[$k] = $_basecolor4;
if($nation[$k] == "") $nation[$k] = "&nbsp;"; if($nation[$k] == "") $nation[$k] = "&nbsp;";
if($pic[$k] == "") { if($pic[$k] == "") {
twe/func.php
+2 -1
View File
@@ -4427,7 +4427,7 @@ function checkSupply($connect) {
if($label[$i] == 0) { if($label[$i] == 0) {
$label[$i] = $labelling; $label[$i] = $labelling;
$labelMapping[$labelling] = $cityNation[$i]; $labelMapping[$labelling] = $cityNation[$i];
$comCount[$cityNation[$i]]++; isset($comCount[$cityNation[$i]]) ? $comCount[$cityNation[$i]]++ : $comCount[$cityNation[$i]] = 1;
$q->push($i); $q->push($i);
$marked++; $marked++;
break; break;
@@ -5527,6 +5527,7 @@ function processCommand($connect, $no) {
$query = "select month,killturn from game where no='1'"; $query = "select month,killturn from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result); $admin = MYDB_fetch_array($result);
$log = array();
// 블럭자는 미실행. 삭턴 감소 // 블럭자는 미실행. 삭턴 감소
if($general['block'] == 2) { if($general['block'] == 2) {