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-04-13 01:35:47 +09:00
parent cea015bd4d
commit 3a472506cf
4 changed files with 43 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/b_currentCity.php
+37 -40
View File
@@ -3,6 +3,9 @@ namespace sammo;
include "lib.php"; include "lib.php";
include "func.php"; include "func.php";
$citylist = Util::getReq('citylist', 'int');
//로그인 검사 //로그인 검사
$session = Session::requireGameLogin()->setReadOnly(); $session = Session::requireGameLogin()->setReadOnly();
$userID = Session::getUserID(); $userID = Session::getUserID();
@@ -42,7 +45,9 @@ $myNation = MYDB_fetch_array($result);
<form name=cityselect method=get>도시선택 : <form name=cityselect method=get>도시선택 :
<select name=citylist size=1 style=color:white;background-color:black;width:798;> <select name=citylist size=1 style=color:white;background-color:black;width:798;>
<?php <?php
if(!array_key_exists('citylist', $_REQUEST) || $_REQUEST['citylist'] == '') { $_REQUEST['citylist'] = $me['city']; } if(!$citylist){
$citylist = $me['city'];
}
// 재야일때는 현재 도시만 // 재야일때는 현재 도시만
$valid = 0; $valid = 0;
@@ -52,7 +57,7 @@ if($me['level'] == 0) {
$city = MYDB_fetch_array($cityresult); $city = MYDB_fetch_array($cityresult);
echo " echo "
<option value={$city['city']}"; <option value={$city['city']}";
if($city['city'] == $_REQUEST['citylist']) { echo " selected"; $valid = 1; } if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】"; echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
if($city['nation'] == 0) echo "공백지"; if($city['nation'] == 0) echo "공백지";
elseif($me['nation'] == $city['nation']) echo "본국=="; elseif($me['nation'] == $city['nation']) echo "본국==";
@@ -68,7 +73,7 @@ if($me['level'] == 0) {
$city = MYDB_fetch_array($cityresult); $city = MYDB_fetch_array($cityresult);
echo " echo "
<option value={$city['city']}"; <option value={$city['city']}";
if($city['city'] == $_REQUEST['citylist']) { echo " selected"; $valid = 1; } if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】"; echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
if($city['nation'] == 0) echo "공백지"; if($city['nation'] == 0) echo "공백지";
elseif($me['nation'] == $city['nation']) echo "본국=="; elseif($me['nation'] == $city['nation']) echo "본국==";
@@ -85,7 +90,7 @@ if($me['level'] == 0) {
$city = MYDB_fetch_array($cityresult); $city = MYDB_fetch_array($cityresult);
echo " echo "
<option value={$city['city']}"; <option value={$city['city']}";
if($city['city'] == $_REQUEST['citylist']) { echo " selected"; $valid = 1; } if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】"; echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
if($city['nation'] == 0) echo "공백지"; if($city['nation'] == 0) echo "공백지";
elseif($me['nation'] == $city['nation']) echo "본국=="; elseif($me['nation'] == $city['nation']) echo "본국==";
@@ -111,7 +116,7 @@ if($myNation['level'] > 0) {
$city = MYDB_fetch_array($cityresult); $city = MYDB_fetch_array($cityresult);
echo " echo "
<option value={$city['city']}"; <option value={$city['city']}";
if($city['city'] == $_REQUEST['citylist']) { echo " selected"; $valid = 1; } if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】"; echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
if($city['nation'] == 0) echo "공백지"; if($city['nation'] == 0) echo "공백지";
elseif($me['nation'] == $city['nation']) echo "본국=="; elseif($me['nation'] == $city['nation']) echo "본국==";
@@ -131,28 +136,21 @@ echo "
</table> </table>
<br>"; <br>";
unset($city);
// 첩보된 도시까지만 허용 // 첩보된 도시까지만 허용
if($valid == 0 && $session->userGrade < 5) { if($valid == 0 && $session->userGrade < 5) {
$_REQUEST['citylist'] = $me['city']; $citylist = $me['city'];
} }
$query = "select * from city where city='{$_REQUEST['citylist']}'"; // 도시 이름 목록
$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($cityresult);
$city = $db->queryFirstRow('SELECT * FROM city WHERE city=%i', $citylist);
$nation = getNationStaticInfo($city['nation']); $nation = getNationStaticInfo($city['nation']);
$query = "select name from general where no='{$city['gen1']}'"; // 태수 이름 //태수, 군사, 시중
$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen1 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $city['gen1']);
$gen1 = MYDB_fetch_array($genresult); $gen2 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $city['gen2']);
$gen3 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $city['gen3']);
$query = "select name from general where no='{$city['gen2']}'"; // 군사 이름
$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gen2 = MYDB_fetch_array($genresult);
$query = "select name from general where no='{$city['gen3']}'"; // 시중 이름
$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gen3 = MYDB_fetch_array($genresult);
if($city['trade'] == 0) { if($city['trade'] == 0) {
$city['trade'] = "- "; $city['trade'] = "- ";
@@ -163,44 +161,43 @@ if($city['trade'] == 0) {
<tr><td><?=backButton()?></td></tr> <tr><td><?=backButton()?></td></tr>
</table> </table>
<?php
echo "
<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2> <table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
<tr> <tr>
<td colspan=12 align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}>【 ".CityConst::$regionMap[$city['region']]." | ".CityConst::$levelMap[$city['level']]." 】 {$city['name']}</td> <td colspan=12 align=center style=color:"<?=newColor($nation['color'])?>"; bgcolor=<?=$nation['color']?>>【 <?=CityConst::$regionMap[$city['region']]?> | <?=CityConst::$levelMap[$city['level']]?> 】 <?=$city['name']?></td>
</tr> </tr>
<tr> <tr>
<td align=center width=48 id=bg1>주민</td> <td align=center width=48 id=bg1>주민</td>
<td align=center width=112>{$city['pop']}/{$city['pop2']}</td> <td align=center width=112><?=$city['pop']?>/<?=$city['pop2']?></td>
<td align=center width=48 id=bg1>농업</td> <td align=center width=48 id=bg1>농업</td>
<td align=center width=108>{$city['agri']}/{$city['agri2']}</td> <td align=center width=108><?=$city['agri']?>/<?=$city['agri2']?></td>
<td align=center width=48 id=bg1>상업</td> <td align=center width=48 id=bg1>상업</td>
<td align=center width=108>{$city['comm']}/{$city['comm2']}</td> <td align=center width=108><?=$city['comm']?>/<?=$city['comm2']?></td>
<td align=center width=48 id=bg1>치안</td> <td align=center width=48 id=bg1>치안</td>
<td align=center width=108>{$city['secu']}/{$city['secu2']}</td> <td align=center width=108><?=$city['secu']?>/<?=$city['secu2']?></td>
<td align=center width=48 id=bg1>수비</td> <td align=center width=48 id=bg1>수비</td>
<td align=center width=108>{$city['def']}/{$city['def2']}</td> <td align=center width=108><?=$city['def']?>/<?=$city['def2']?></td>
<td align=center width=48 id=bg1>성벽</td> <td align=center width=48 id=bg1>성벽</td>
<td align=center width=108>{$city['wall']}/{$city['wall2']}</td> <td align=center width=108><?=$city['wall']?>/<?=$city['wall2']?></td>
</tr> </tr>
<tr> <tr>
<td align=center id=bg1>민심</td> <td align=center id=bg1>민심</td>
<td align=center>{$city['rate']}</td> <td align=center><?=$city['rate']?></td>
<td align=center id=bg1>시세</td> <td align=center id=bg1>시세</td>
<td align=center>{$city['trade']}%</td> <td align=center><?=$city['trade']?>%</td>
<td align=center id=bg1>인구</td> <td align=center id=bg1>인구</td>
<td align=center>".round($city['pop']/$city['pop2']*100, 2)." %</td> <td align=center><?=round($city['pop']/$city['pop2']*100, 2)?>%</td>
<td align=center id=bg1>태수</td> <td align=center id=bg1>태수</td>
<td align=center>";echo $gen1['name']==''?"-":"{$gen1['name']}";echo "</td> <td align=center><?=$gen1['name']??'-'?></td>
<td align=center id=bg1>군사</td> <td align=center id=bg1>군사</td>
<td align=center>";echo $gen2['name']==''?"-":"{$gen2['name']}";echo "</td> <td align=center><?=$gen2['name']??'-'?></td>
<td align=center id=bg1>시중</td> <td align=center id=bg1>시중</td>
<td align=center>";echo $gen3['name']==''?"-":"{$gen3['name']}";echo "</td> <td align=center><?=$gen3['name']??'-'?></td>
</tr> </tr>
<tr> <tr>
<td align=center id=bg1>장수</td> <td align=center id=bg1>장수</td>
<td colspan=11>"; <td colspan=11>
$query = "select name from general where city='{$city['city']}' and nation='{$city['nation']}'"; // 장수 목록 <?php
$query = "select name, npc from general where city='{$city['city']}' and nation='{$city['nation']}'"; // 장수 목록
$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($genresult); $gencount = MYDB_num_rows($genresult);
if($gencount == 0) echo "-"; if($gencount == 0) echo "-";
@@ -208,11 +205,11 @@ echo "
$general = MYDB_fetch_array($genresult); $general = MYDB_fetch_array($genresult);
echo "{$general['name']}, "; echo "{$general['name']}, ";
} }
echo " ?>
</td> </td>
</tr> </tr>
</table>"; </table>
<?php
$query = "select npc,mode,no,picture,imgsvr,name,injury,leader,power,intel,level,nation,crewtype,crew,train,atmos,term,turn0,turn1,turn2,turn3,turn4,turn5 from general where city='{$city['city']}' order by dedication desc"; // 장수 목록 $query = "select npc,mode,no,picture,imgsvr,name,injury,leader,power,intel,level,nation,crewtype,crew,train,atmos,term,turn0,turn1,turn2,turn3,turn4,turn5 from general where city='{$city['city']}' order by dedication desc"; // 장수 목록
$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($genresult); $gencount = MYDB_num_rows($genresult);
hwe/b_genList.php
+4 -1
View File
@@ -3,6 +3,9 @@ namespace sammo;
include "lib.php"; include "lib.php";
include "func.php"; include "func.php";
$type = Util::getReq('type', 'int');
//로그인 검사 //로그인 검사
$session = Session::requireGameLogin()->setReadOnly(); $session = Session::requireGameLogin()->setReadOnly();
$userID = Session::getUserID(); $userID = Session::getUserID();
@@ -116,7 +119,7 @@ echo"
for ($j=0; $j < $gencount; $j++) { for ($j=0; $j < $gencount; $j++) {
$general = MYDB_fetch_array($genresult); $general = MYDB_fetch_array($genresult);
$city = CityConst::byID($general['city'])->name; $city = CityConst::byID($general['city'])->name;
$troop = $troopName[$general['troop']] == "" ? "-" : $troopName[$general['troop']]; $troop = $troopName[$general['troop']]??'-';
if ($general['level'] == 12) { if ($general['level'] == 12) {
$lbonus = $nation['level'] * 2; $lbonus = $nation['level'] * 2;
hwe/func_command.php
+1 -1
View File
@@ -14,9 +14,9 @@ function getTurn($general, $type, $font=1) {
$turn[2] = $general["turn2"]; $turn[2] = $general["turn2"];
$turn[3] = $general["turn3"]; $turn[3] = $general["turn3"];
$turn[4] = $general["turn4"]; $turn[4] = $general["turn4"];
$turn[5] = $general["turn5"];
} }
if($type >= 2) { if($type >= 2) {
$turn[5] = $general["turn5"];
$turn[6] = $general["turn6"]; $turn[6] = $general["turn6"];
$turn[7] = $general["turn7"]; $turn[7] = $general["turn7"];
$turn[8] = $general["turn8"]; $turn[8] = $general["turn8"];
hwe/process_war.php
+1 -8
View File
@@ -1691,7 +1691,7 @@ function DeleteConflict($nation) {
if(!$conflict || !is_array($conflict)){ if(!$conflict || !is_array($conflict)){
continue; continue;
} }
if(!key_exists(!$nation)){ if(!key_exists($nation, $conflict)){
continue; continue;
} }
@@ -1705,10 +1705,6 @@ function DeleteConflict($nation) {
function getConquerNation($city) : int { function getConquerNation($city) : int {
$conflict = Json::decode($city['conflict']); $conflict = Json::decode($city['conflict']);
if(!$conflict){
//FIXME: 사실 이건 이상한 상황이다.
return 0;
}
return Util::array_first_key($conflict); return Util::array_first_key($conflict);
} }
@@ -1907,9 +1903,6 @@ function ConquerCity($game, $general, $city, $nation, $destnation) {
if($general['atmos'] > $_maximumatmos) { $general['atmos'] = $_maximumatmos; } if($general['atmos'] > $_maximumatmos) { $general['atmos'] = $_maximumatmos; }
$conquerNation = getConquerNation($city); $conquerNation = getConquerNation($city);
if(!$conquerNation){
$conquerNation = $general['nation'];
}
if($conquerNation == $general['nation']) { if($conquerNation == $general['nation']) {
// 이동 및 사기 변경 // 이동 및 사기 변경