jyp9/core
1
0
Fork 0
forked from devsam/core
Code Pull Requests Activity

string $

Browse Source
This commit is contained in:
Hide_D
2018-01-16 04:33:19 +09:00
parent 131c5319ec
commit fdefd49bea
28 changed files with 136 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
twe/_admin3.php
+2 -2
View File
@@ -57,10 +57,10 @@ for($i=0; $i < $gencount; $i++) {
$general = MYDB_fetch_array($result);
if($general['power'] >= $general['intel']) {
echo "
<option value=$general['no'] style=color:orange;>{$general['name']}</option>";
<option value={$general['no']} style=color:orange;>{$general['name']}</option>";
} else {
echo "
<option value=$general['no'] style=color:skyblue;>{$general['name']}</option>";
<option value={$general['no']} style=color:skyblue;>{$general['name']}</option>";
}
}
twe/_admin4.php
+1 -1
View File
@@ -66,7 +66,7 @@ for($i=0; $i < $gencount; $i++) {
if($general['userlevel'] > 2) { $style .= "color:blue;"; }
echo "
<option value=$general['no'] $style>{$general['name']}</option>";
<option value={$general['no']} $style>{$general['name']}</option>";
}
echo "
twe/_admin5.php
+2 -2
View File
@@ -213,7 +213,7 @@ for($i=0; $i < $nationCount; $i++) {
echo "
<tr>
<td align=center style=background-color:$nation['color'];color:".newColor($nation['color']).";>{$nation['name']}</td>
<td align=center style=background-color:{$nation['color']};color:".newColor($nation['color']).";>{$nation['name']}</td>
<td align=center>&nbsp;{$nation['connect']}&nbsp;</td>
<td align=center>&nbsp;{$nation['con']}&nbsp;</td>
<td align=center>&nbsp;{$nation['power']}&nbsp;</td>
@@ -243,7 +243,7 @@ for($i=0; $i < $nationCount; $i++) {
<td align=center>&nbsp;{$city['secu']}%&nbsp;</td>
<td align=center>&nbsp;{$city['wall']}%&nbsp;</td>
<td align=center>&nbsp;{$city['def']}%&nbsp;</td>
<td align=center style=background-color:$nation['color'];color:".newColor($nation['color']).";>{$nation['name']}</td>
<td align=center style=background-color:{$nation['color']};color:".newColor($nation['color']).";>{$nation['name']}</td>
</tr>
";
}
twe/a_genList.php
+1 -1
View File
@@ -141,7 +141,7 @@ for($j=0; $j < $gencount; $j++) {
if($general['npc'] >= 2) { $name = "<font color=cyan>{$general['name']}</font>"; }
elseif($general['npc'] == 1) { $name = "<font color=skyblue>{$general['name']}</font>"; }
else { $name = "$general['name']"; }
else { $name = "{$general['name']}"; }
$general['connect'] = round($general['connect'] / 10, 0) * 10;
twe/a_kingdomList.php
+4 -4
View File
@@ -163,7 +163,7 @@ for($i=1; $i <= $count; $i++) {
if($city['city'] == $nation['capital']) {
echo "<font color=cyan>[{$city['name']}]</font>, ";
} else {
echo "$city['name'], ";
echo "{$city['name']}, ";
}
}
} else {
@@ -182,7 +182,7 @@ for($i=1; $i <= $count; $i++) {
$general = MYDB_fetch_array($genresult);
if($general['npc'] >= 2) { echo "<font color=cyan>{$general['name']}</font>, "; }
elseif($general['npc'] == 1) { echo "<font color=skyblue>{$general['name']}</font>, "; }
else { echo "$general['name'], "; }
else { echo "{$general['name']}, "; }
}
echo"
</td>
@@ -216,7 +216,7 @@ echo "
<td colspan=5> 속령 일람 : ";
for($j=0; $j < $citycount; $j++) {
$city = MYDB_fetch_array($cityresult);
echo "$city['name'], ";
echo "{$city['name']}, ";
}
echo"
</td>
@@ -227,7 +227,7 @@ echo"
$general = MYDB_fetch_array($genresult);
if($general['npc'] >= 2) { echo "<font color=cyan>{$general['name']}</font>, "; }
elseif($general['npc'] == 1) { echo "<font color=skyblue>{$general['name']}</font>, "; }
else { echo "$general['name'], "; }
else { echo "{$general['name']}, "; }
}
echo"
</td>
twe/a_npcList.php
+1 -1
View File
@@ -82,7 +82,7 @@ for($j=0; $j < $gencount; $j++) {
if($general['npc'] >= 2) { $name = "<font color=cyan>{$general['name']}</font>"; }
elseif($general['npc'] == 1) { $name = "<font color=skyblue>{$general['name']}</font>"; }
else { $name = "$general['name']"; }
else { $name = "{$general['name']}"; }
echo "
<tr>
twe/b_currentCity.php
+9 -9
View File
@@ -48,7 +48,7 @@ if($me['level'] == 0) {
$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($cityresult);
echo "
<option value=$city['city']";
<option value={$city['city']}";
if($city['city'] == $_POST['citylist']) { echo " selected"; $valid = 1; }
echo ">==================================================【"._String::Fill($city['name'], 4, '_')."】";
if($city['nation'] == 0) echo "공백지";
@@ -64,7 +64,7 @@ if($me['level'] == 0) {
for($i=0; $i < $citycount; $i++) {
$city = MYDB_fetch_array($cityresult);
echo "
<option value=$city['city']";
<option value={$city['city']}";
if($city['city'] == $_POST['citylist']) { echo " selected"; $valid = 1; }
echo ">==================================================【"._String::Fill($city['name'], 4, '_')."】";
if($city['nation'] == 0) echo "공백지";
@@ -81,7 +81,7 @@ if($me['level'] == 0) {
for($i=0; $i < $citycount; $i++) {
$city = MYDB_fetch_array($cityresult);
echo "
<option value=$city['city']";
<option value={$city['city']}";
if($city['city'] == $_POST['citylist']) { echo " selected"; $valid = 1; }
echo ">==================================================【"._String::Fill($city['name'], 4, '_')."】";
if($city['nation'] == 0) echo "공백지";
@@ -107,7 +107,7 @@ if($myNation['level'] > 0) {
for($i=0; $i < $citycount; $i++) {
$city = MYDB_fetch_array($cityresult);
echo "
<option value=$city['city']";
<option value={$city['city']}";
if($city['city'] == $_POST['citylist']) { echo " selected"; $valid = 1; }
echo ">==================================================【"._String::Fill($city['name'], 4, '_')."】";
if($city['nation'] == 0) echo "공백지";
@@ -166,7 +166,7 @@ if($city['trade'] == 0) {
echo "
<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13;word-break:break-all; id=bg2>
<tr>
<td colspan=12 align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}>【 ".getRegion($city['region'])." | ".getCityLevel($city['level'])." 】 $city['name']</td>
<td colspan=12 align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}>【 ".getRegion($city['region'])." | ".getCityLevel($city['level'])." 】 {$city['name']}</td>
</tr>
<tr>
<td align=center width=48 id=bg1>주민</td>
@@ -190,11 +190,11 @@ echo "
<td align=center id=bg1>인구</td>
<td align=center>".round($city['pop']/$city[pop2]*100, 2)." %</td>
<td align=center id=bg1>태수</td>
<td align=center>";echo $gen1['name']==''?"-":"$gen1['name']";echo "</td>
<td align=center>";echo $gen1['name']==''?"-":"{$gen1['name']}";echo "</td>
<td align=center id=bg1>군사</td>
<td align=center>";echo $gen2['name']==''?"-":"$gen2['name']";echo "</td>
<td align=center>";echo $gen2['name']==''?"-":"{$gen2['name']}";echo "</td>
<td align=center id=bg1>시중</td>
<td align=center>";echo $gen3['name']==''?"-":"$gen3['name']";echo "</td>
<td align=center>";echo $gen3['name']==''?"-":"{$gen3['name']}";echo "</td>
</tr>
<tr>
<td align=center id=bg1>장수</td>
@@ -205,7 +205,7 @@ echo "
if($gencount == 0) echo "-";
for($i=0; $i < $gencount; $i++) {
$general = MYDB_fetch_array($genresult);
echo "$general['name'], ";
echo "{$general['name']}, ";
}
echo "
</td>
twe/b_diplomacy.php
+1 -1
View File
@@ -30,7 +30,7 @@ for($i=0; $i < $nationcount; $i++) {
$nationname[$nation['nation']] = $nation['name'];
$nationcolor[$nation['nation']] = $nation['color'];
$nationStr .= "<font color=cyan>◆</font> <font style=color:".newColor($nation['color']).";background-color:$nation['color'];>{$nation['name']}</font><br>";
$nationStr .= "<font color=cyan>◆</font> <font style=color:".newColor($nation['color']).";background-color:{$nation['color']};>{$nation['name']}</font><br>";
$powerStr .= "국력 {$nation['power']}<br>";
$genStr .= "장수 {$nation['gennum']}<br>";
$cityStr .= "속령 $citycount<br>";
twe/b_genList.php
+1 -1
View File
@@ -138,7 +138,7 @@ for($j=0; $j < $gencount; $j++) {
if($general['npc'] >= 2) { $name = "<font color=cyan>{$general['name']}</font>"; }
elseif($general['npc'] == 1) { $name = "<font color=skyblue>{$general['name']}</font>"; }
else { $name = "$general['name']"; }
else { $name = "{$general['name']}"; }
switch($general['mode']) {
case 0: $mode = "×"; break;
twe/b_myBossInfo.php
+1 -1
View File
@@ -71,7 +71,7 @@ echo "
<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>
<tr>
<td align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']} colspan=6>
<font size=5>【 $nation['name'] 】</font>
<font size=5>【 {$nation['name']} 】</font>
</td>
</tr>
";
twe/b_myCityInfo.php
+4 -4
View File
@@ -135,11 +135,11 @@ for($j=0; $j < $citycount; $j++) {
<td align=center id=bg1>인구</td>
<td align=center>".round($city['pop']/$city[pop2]*100, 2)." %</td>
<td align=center id=bg1>태수</td>
<td align=center>";echo $gen1['name']==''?"-":"$gen1['name']";echo "</td>
<td align=center>";echo $gen1['name']==''?"-":"{$gen1['name']}";echo "</td>
<td align=center id=bg1>군사</td>
<td align=center>";echo $gen2['name']==''?"-":"$gen2['name']";echo "</td>
<td align=center>";echo $gen2['name']==''?"-":"{$gen2['name']}";echo "</td>
<td align=center id=bg1>시중</td>
<td align=center>";echo $gen3['name']==''?"-":"$gen3['name']";echo "</td>
<td align=center>";echo $gen3['name']==''?"-":"{$gen3['name']}";echo "</td>
</tr>
<tr>
<td align=center id=bg1>장수</td>
@@ -152,7 +152,7 @@ for($j=0; $j < $citycount; $j++) {
$general = MYDB_fetch_array($genresult);
if($general['npc'] >= 2) { echo "<font color=cyan>{$general['name']}, </font>"; }
elseif($general['npc'] == 1) { echo "<font color=skyblue>{$general['name']}, </font>"; }
else { echo "$general['name'], "; }
else { echo "{$general['name']}, "; }
}
echo "
</td>
twe/b_myGenInfo.php
+1 -1
View File
@@ -134,7 +134,7 @@ for($j=0; $j < $gencount; $j++) {
if($general['npc'] >= 2) { $name = "<font color=cyan>{$general['name']}</font>"; }
elseif($general['npc'] == 1) { $name = "<font color=skyblue>{$general['name']}</font>"; }
else { $name = "$general['name']"; }
else { $name = "{$general['name']}"; }
$imageTemp = GetImageURL($general['imgsvr']);
echo "
twe/b_myKingdomInfo.php
+5 -5
View File
@@ -80,7 +80,7 @@ else { $budgetricediff = "$budgetricediff"; }
echo "
<table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13;word-break:break-all; id=bg2>
<tr>
<td colspan=8 align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}>【 ";echo $me['nation']==0?"공 백 지":"$nation['name']";echo " 】</td>
<td colspan=8 align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}>【 ";echo $me['nation']==0?"공 백 지":"{$nation['name']}";echo " 】</td>
</tr>
<tr>
<td width=98 align=center id=bg1>총주민</td>
@@ -92,11 +92,11 @@ echo "
</tr>
<tr>
<td align=center id=bg1>국 고</td>
<td align=center>"; echo $nation['gold']==0?"-":"$nation['gold']"; echo "</td>
<td align=center>"; echo $nation['gold']==0?"-":"{$nation['gold']}"; echo "</td>
<td align=center id=bg1>병 량</td>
<td align=center>"; echo $nation['rice']==0?"-":"$nation['rice']"; echo "</td>
<td align=center>"; echo $nation['rice']==0?"-":"{$nation['rice']}"; echo "</td>
<td align=center id=bg1>세 율</td>
<td align=center colspan=3>"; echo $me['nation']==0?"해당 없음":"$nation['rate'] %"; echo "</td>
<td align=center colspan=3>"; echo $me['nation']==0?"해당 없음":"{$nation['rate']} %"; echo "</td>
</td>
</tr>
<tr>
@@ -105,7 +105,7 @@ echo "
<td align=center id=bg1>세곡/둔전</td>
<td align=center>+$riceincomeList[0] / +$riceincomeList[1]</td>
<td align=center id=bg1>지급율</td>
<td align=center colspan=3>"; echo $me['nation']==0?"해당 없음":"$nation['bill'] %"; echo "</td>
<td align=center colspan=3>"; echo $me['nation']==0?"해당 없음":"{$nation['bill']} %"; echo "</td>
</tr>
<tr>
<td align=center id=bg1>수입/지출</td>
twe/b_troop.php
+1 -1
View File
@@ -102,7 +102,7 @@ for($i=0; $i < $troopcount; $i++) {
for($k=0; $k < $genCount; $k++) {
$general = MYDB_fetch_array($genresult);
echo "
<option value=$general['no']>{$general['name']}</option>";
<option value={$general['no']}>{$general['name']}</option>";
}
echo "
</select><br>
twe/c_myBossInfo.php
+1 -1
View File
@@ -251,6 +251,6 @@ if($btn == "추방") {
}
//echo "<script>location.replace('b_myBossInfo.php');</script>";
echo 'b_myBossInfo.php'//TODO:replace
echo 'b_myBossInfo.php';//TODO:replace
twe/d_ally.php
+2 -2
View File
@@ -77,8 +77,8 @@ if($ok == "수락") {
$me = addHistory($connect, $me, "<C>●</>{$admin['year']}년 {$admin['month']}월:<D><b>{$younation['name']}</b></>(와)과 {$when}년 불가침 수락");
//국메로 저장
$msg = "【외교】{$admin['year']}년 {$admin['month']}월:$younation['name'](와)과 {$when}년 불가침 합의, 비고: {$dip2['reserved']}";
$youmsg = "【외교】{$admin['year']}년 {$admin['month']}월:$mynation['name'](와)과 {$when}년 불가침 합의, 비고: {$dip2['reserved']}";
$msg = "【외교】{$admin['year']}년 {$admin['month']}월:{$younation['name']}(와)과 {$when}년 불가침 합의, 비고: {$dip2['reserved']}";
$youmsg = "【외교】{$admin['year']}년 {$admin['month']}월:{$mynation['name']}(와)과 {$when}년 불가침 합의, 비고: {$dip2['reserved']}";
PushMsg(2, $me['nation'], $me['picture'], $me['imgsvr'], "{$me['name']}:{$mynation['name']}▶", $mynation['color'], $younation['name'], $younation['color'], $msg);
PushMsg(3, $you['nation'], $me['picture'], $me['imgsvr'], "{$me['name']}:{$mynation['name']}▶", $mynation['color'], $younation['name'], $younation['color'], $youmsg);
twe/d_cancel.php
+2 -2
View File
@@ -69,8 +69,8 @@ if($ok == "수락") {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//국메로 저장
$msg = "【외교】{$admin['year']}년 {$admin['month']}월:$younation['name'](와)과 불가침 파기 동의";
$youmsg = "【외교】{$admin['year']}년 {$admin['month']}월:$mynation['name'](와)과 불가침 파기 동의";
$msg = "【외교】{$admin['year']}년 {$admin['month']}월:{$younation['name']}(와)과 불가침 파기 동의";
$youmsg = "【외교】{$admin['year']}년 {$admin['month']}월:{$mynation['name']}(와)과 불가침 파기 동의";
PushMsg(2, $me['nation'], $me['picture'], $me['imgsvr'], "{$me['name']}:{$mynation['name']}▶", $mynation['color'], $younation['name'], $younation['color'], $msg);
PushMsg(3, $you['nation'], $me['picture'], $me['imgsvr'], "{$me['name']}:{$mynation['name']}▶", $mynation['color'], $younation['name'], $younation['color'], $youmsg);
twe/d_cease.php
+2 -2
View File
@@ -74,8 +74,8 @@ if($ok == "수락") {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//국메로 저장
$msg = "【외교】{$admin['year']}년 {$admin['month']}월:$younation['name'](와)과 종전 동의";
$youmsg = "【외교】{$admin['year']}년 {$admin['month']}월:$mynation['name'](와)과 종전 동의";
$msg = "【외교】{$admin['year']}년 {$admin['month']}월:{$younation['name']}(와)과 종전 동의";
$youmsg = "【외교】{$admin['year']}년 {$admin['month']}월:{$mynation['name']}(와)과 종전 동의";
PushMsg(2, $mynation['nation'], $me['picture'], $me['imgsvr'], "{$me['name']}:{$mynation['name']}▶", $mynation['color'], $younation['name'], $younation['color'], $msg);
PushMsg(3, $younation['nation'], $me['picture'], $me['imgsvr'], "{$me['name']}:{$mynation['name']}▶", $mynation['color'], $younation['name'], $younation['color'], $youmsg);
twe/d_merge.php
+2 -2
View File
@@ -108,8 +108,8 @@ if($ok == "수락") {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//국메로 저장
$msg = "【외교】{$admin['year']}년 {$admin['month']}월:$younation['name'](와)과 통합에 합의";
$youmsg = "【외교】{$admin['year']}년 {$admin['month']}월:$mynation['name'](와)과 통합에 합의";
$msg = "【외교】{$admin['year']}년 {$admin['month']}월:{$younation['name']}(와)과 통합에 합의";
$youmsg = "【외교】{$admin['year']}년 {$admin['month']}월:{$mynation['name']}(와)과 통합에 합의";
PushMsg(2, $mynation['nation'], $me['picture'], $me['imgsvr'], "{$me['name']}:{$mynation['name']}▶", $mynation['color'], $younation['name'], $younation['color'], $msg);
PushMsg(3, $younation['nation'], $me['picture'], $me['imgsvr'], "{$me['name']}:{$mynation['name']}▶", $mynation['color'], $younation['name'], $younation['color'], $youmsg);
twe/d_scout.php
+7 -7
View File
@@ -112,44 +112,44 @@ if($ok == "수락" && $me['level'] < 12 && $nation['level'] > 0 && $nation['scou
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//현 메세지 수정
$query = "update general set msg{$num}='$nation['name'](으)로 등용 제의 수락',msg{$num}_type='10' where no='{$me['no']}'";
$query = "update general set msg{$num}='{$nation['name']}(으)로 등용 제의 수락',msg{$num}_type='10' where no='{$me['no']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} elseif($me['level'] == 12) {
$mylog[count($mylog)] = "<C>●</>군주입니다. 등용 수락 불가.";
//현 메세지 지움
$query = "update general set msg{$num}='$nation['name'](으)로 등용 제의 수락 불가',msg{$num}_type='10' where no='{$me['no']}'";
$query = "update general set msg{$num}='{$nation['name']}(으)로 등용 제의 수락 불가',msg{$num}_type='10' where no='{$me['no']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} elseif($nation['level'] == 0) {
$mylog[count($mylog)] = "<C>●</>없는 국가이거나 방랑군입니다. 등용 수락 불가.";
//현 메세지 지움
$query = "update general set msg{$num}='$nation['name'](으)로 등용 제의 수락 불가',msg{$num}_type='10' where no='{$me['no']}'";
$query = "update general set msg{$num}='{$nation['name']}(으)로 등용 제의 수락 불가',msg{$num}_type='10' where no='{$me['no']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} elseif($nation['scout'] != 0) {
$mylog[count($mylog)] = "<C>●</>임관 금지중입니다. 등용 수락 불가.";
//현 메세지 지움
$query = "update general set msg{$num}='$nation['name'](으)로 등용 제의 수락 불가',msg{$num}_type='10' where no='{$me['no']}'";
$query = "update general set msg{$num}='{$nation['name']}(으)로 등용 제의 수락 불가',msg{$num}_type='10' where no='{$me['no']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} elseif($admin['year'] < $admin['startyear']+3) {
$mylog[count($mylog)] = "<C>●</>초반 제한중입니다. 등용 수락 불가.";
//현 메세지 지움
$query = "update general set msg{$num}='$nation['name'](으)로 등용 제의 수락 불가',msg{$num}_type='10' where no='{$me['no']}'";
$query = "update general set msg{$num}='{$nation['name']}(으)로 등용 제의 수락 불가',msg{$num}_type='10' where no='{$me['no']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} elseif(strpos($me['nations'], ",{$nation['nation']},") > 0) {
$mylog[count($mylog)] = "<C>●</>이미 임관했었던 국가입니다. 등용 수락 불가.";
//현 메세지 지움
$query = "update general set msg{$num}='$nation['name'](으)로 등용 제의 수락 불가',msg{$num}_type='10' where no='{$me['no']}'";
$query = "update general set msg{$num}='{$nation['name']}(으)로 등용 제의 수락 불가',msg{$num}_type='10' where no='{$me['no']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} else {
$youlog[count($youlog)] = "<C>●</><Y>{$me['name']}</>(이)가 등용을 거부했습니다.";
$mylog[count($mylog)] = "<C>●</><D>{$nation['name']}</>(으)로 망명을 거부했습니다.";
//현 메세지 지움
$query = "update general set msg{$num}='$nation['name'](으)로 등용 제의 거부',msg{$num}_type='10' where no='{$me['no']}'";
$query = "update general set msg{$num}='{$nation['name']}(으)로 등용 제의 거부',msg{$num}_type='10' where no='{$me['no']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
twe/d_surrender.php
+2 -2
View File
@@ -98,8 +98,8 @@ if($ok == "수락") {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//국메로 저장
$msg = "【외교】{$admin['year']}년 {$admin['month']}월:$younation['name'](와)과 합병에 동의";
$youmsg = "【외교】{$admin['year']}년 {$admin['month']}월:$mynation['name'](와)과 합병에 동의";
$msg = "【외교】{$admin['year']}년 {$admin['month']}월:{$younation['name']}(와)과 합병에 동의";
$youmsg = "【외교】{$admin['year']}년 {$admin['month']}월:{$mynation['name']}(와)과 합병에 동의";
PushMsg(2, $mynation['nation'], $me['picture'], $me['imgsvr'], "{$me['name']}:{$mynation['name']}▶", $mynation['color'], $younation['name'], $younation['color'], $msg);
PushMsg(3, $younation['nation'], $me['picture'], $me['imgsvr'], "{$me['name']}:{$mynation['name']}▶", $mynation['color'], $younation['name'], $younation['color'], $youmsg);
twe/func.php
+41 -41
View File
@@ -1886,8 +1886,8 @@ function cityInfo($connect) {
if($nation['color'] == "" || $me['skin'] < 1) { $nation['color'] = "000000"; }
echo "<table width=640 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13;word-break:break-all; id=bg2>
<tr><td colspan=8 align=center style=height:20;color:".newColor($nation['color']).";background-color:$nation['color'];font-weight:bold;font-size:13;>【 ".getRegion($city['region'])." | ".getCityLevel($city['level'])." 】 $city['name']</td></tr>
<tr><td colspan=8 align=center style=height:20;color:".newColor($nation['color']).";background-color:$nation['color']><b>";
<tr><td colspan=8 align=center style=height:20;color:".newColor($nation['color']).";background-color:{$nation['color']};font-weight:bold;font-size:13;>【 ".getRegion($city['region'])." | ".getCityLevel($city['level'])." 】 {$city['name']}</td></tr>
<tr><td colspan=8 align=center style=height:20;color:".newColor($nation['color']).";background-color:{$nation['color']}><b>";
if($city['nation'] == 0) {
echo "공 백 지";
@@ -2021,22 +2021,22 @@ function myNationInfo($connect) {
</tr>
<tr>
<td width=68 align=center id=bg1><b>".getLevel(12, $nation['level'])."</b></td>
<td width=178 align=center>";echo $level12==''?"-":"$level12['name']"; echo "</td>
<td width=178 align=center>";echo $level12==''?"-":"{$level12['name']}"; echo "</td>
<td width=68 align=center id=bg1><b>".getLevel(11, $nation['level'])."</b></td>
<td width=178 align=center>";echo $level11==''?"-":"$level11['name']"; echo "</td>
<td width=178 align=center>";echo $level11==''?"-":"{$level11['name']}"; echo "</td>
</tr>
<tr>
<td align=center id=bg1><b>총주민</b></td>
<td align=center>";echo $me['nation']==0?"해당 없음":"$city['totpop']/$city['maxpop']";echo "</td>
<td align=center>";echo $me['nation']==0?"해당 없음":"{$city['totpop']}/{$city['maxpop']}";echo "</td>
<td align=center id=bg1><b>총병사</b></td>
<td align=center>";echo $me['nation']==0?"해당 없음":"$general['totcrew']/$general['maxcrew']"; echo "</td>
<td align=center>";echo $me['nation']==0?"해당 없음":"{$general['totcrew']}/{$general['maxcrew']}"; echo "</td>
</td>
</tr>
<tr>
<td align=center id=bg1><b>국 고</b></td>
<td align=center>";echo $me['nation']==0?"해당 없음":"$nation['gold']";echo "</td>
<td align=center>";echo $me['nation']==0?"해당 없음":"{$nation['gold']}";echo "</td>
<td align=center id=bg1><b>병 량</b></td>
<td align=center>";echo $me['nation']==0?"해당 없음":"$nation['rice']";echo "</td>
<td align=center>";echo $me['nation']==0?"해당 없음":"{$nation['rice']}";echo "</td>
</tr>
<tr>
<td align=center id=bg1><b>지급율</b></td>
@@ -2044,7 +2044,7 @@ function myNationInfo($connect) {
if($me['nation'] == 0) {
echo "해당 없음";
} else {
echo $nation['bill']==0?"0 %":"$nation['bill'] %";
echo $nation['bill']==0?"0 %":"{$nation['bill']} %";
}
echo "
</td>
@@ -2053,7 +2053,7 @@ function myNationInfo($connect) {
if($me['nation'] == 0) {
echo "해당 없음";
} else {
echo $nation['rate']==0?"0 %":"$nation['rate'] %";
echo $nation['rate']==0?"0 %":"{$nation['rate']} %";
}
$techCall = getTechCall($nation['tech']);
@@ -2061,7 +2061,7 @@ function myNationInfo($connect) {
if(TechLimit($admin['startyear'], $admin['year'], $nation['tech'])) { $nation['tech'] = "<font color=magenta>{$nation['tech']}</font>"; }
else { $nation['tech'] = "<font color=limegreen>{$nation['tech']}</font>"; }
$nation['tech'] = "$techCall / $nation['tech']";
$nation['tech'] = "$techCall / {$nation['tech']}";
if($nation['tricklimit'] != 0) { $nation['tricklimit'] = "<font color=red>{$nation['tricklimit']}턴</font>"; }
else { $nation['tricklimit'] = "<font color=limegreen>가 능</font>"; }
@@ -2088,15 +2088,15 @@ function myNationInfo($connect) {
</tr>
<tr>
<td align=center id=bg1><b>속 령</b></td>
<td align=center>";echo $me['nation']==0?"-":"$city['cnt']"; echo "</td>
<td align=center>";echo $me['nation']==0?"-":"{$city['cnt']}"; echo "</td>
<td align=center id=bg1><b>장 수</b></td>
<td align=center>";echo $me['nation']==0?"-":"$general['cnt']"; echo "</td>
<td align=center>";echo $me['nation']==0?"-":"{$general['cnt']}"; echo "</td>
</tr>
<tr>
<td align=center id=bg1><b>국 력</b></td>
<td align=center>{$nation['power']}</td>
<td align=center id=bg1><b>기술력</b></td>
<td align=center>";echo $me['nation']==0?"-":"$nation['tech']"; echo "</td>
<td align=center>";echo $me['nation']==0?"-":"{$nation['tech']}"; echo "</td>
</tr>
<tr>
<td align=center id=bg1><b>전 략</b></td>
@@ -2491,22 +2491,22 @@ function commandButton($connect) {
<table align=center border=0 cellspacing=0 cellpadding=0 style=font-size:13;word-break:break-all; id=bg2>
<tr>";
if($me['level'] >= 1) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='회 의 실' onclick='refreshing(1,1)'></td>"; }
if($me['level'] >= 1) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='회 의 실' onclick='refreshing(1,1)'></td>"; }
else { echo "<td width=111 height=30 align=center><font size=2 color=gray>【회 의 실】</font></td>"; }
if($me['level'] >= 5) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='기 밀 실' onclick='refreshing(1,4)'></td>"; }
if($me['level'] >= 5) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='기 밀 실' onclick='refreshing(1,4)'></td>"; }
else { echo "<td width=111 height=30 align=center><font size=2 color=gray>【기 밀 실】</font></td>"; }
if($me['level'] >= 1) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='부대 편성' onclick='refreshing(1,2)'></td>"; }
if($me['level'] >= 1) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='부대 편성' onclick='refreshing(1,2)'></td>"; }
else { echo "<td width=111 height=30 align=center><font size=2 color=gray>【부대 편성】</font></td>"; }
if($me['level'] >= 1) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='인 사 부' onclick='refreshing(1,10)'></td>"; }
if($me['level'] >= 1) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='인 사 부' onclick='refreshing(1,10)'></td>"; }
else { echo "<td width=111 height=30 align=center><font size=2 color=gray>【인 사 부】</font></td>"; }
if($me['level'] >= 2 || ($me['level'] == 1 && $me['belong'] >= $nation['secretlimit'])) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='내 무 부' onclick='refreshing(1,13)'></td>"; }
if($me['level'] >= 2 || ($me['level'] == 1 && $me['belong'] >= $nation['secretlimit'])) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='내 무 부' onclick='refreshing(1,13)'></td>"; }
else { echo "<td width=111 height=30 align=center><font size=2 color=gray>【내 무 부】</font></td>"; }
if($me['level'] >= 2 || ($me['level'] == 1 && $me['belong'] >= $nation['secretlimit'])) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='사 령 부' onclick='refreshing(1,5)'></td>"; }
if($me['level'] >= 2 || ($me['level'] == 1 && $me['belong'] >= $nation['secretlimit'])) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='사 령 부' onclick='refreshing(1,5)'></td>"; }
else { echo "<td width=111 height=30 align=center><font size=2 color=gray>【사 령 부】</font></td>"; }
if($me['level'] >= 2 || ($me['level'] == 1 && $me['belong'] >= $nation['secretlimit'])) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='암 행 부' onclick='refreshing(1,6)'></td>"; }
if($me['level'] >= 2 || ($me['level'] == 1 && $me['belong'] >= $nation['secretlimit'])) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='암 행 부' onclick='refreshing(1,6)'></td>"; }
else { echo "<td width=111 height=30 align=center><font size=2 color=gray>【암 행 부】</font></td>"; }
echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='토 너 먼 트' onclick='refreshing(1,15)'></td>";
echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='베 팅 장' onclick='refreshing(1,16)'></td>";
echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='토 너 먼 트' onclick='refreshing(1,15)'></td>";
echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='베 팅 장' onclick='refreshing(1,16)'></td>";
echo "
</tr>
</table>";
@@ -2515,20 +2515,20 @@ function commandButton($connect) {
<table align=center border=0 cellspacing=0 cellpadding=0 style=font-size:13;word-break:break-all; id=bg2>
<tr>";
if($me['level'] >= 1) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='세력 정보' onclick='refreshing(1,7)'></td>"; }
if($me['level'] >= 1) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='세력 정보' onclick='refreshing(1,7)'></td>"; }
else { echo "<td width=111 height=30 align=center><font size=2 color=gray>【세력 정보】</font></td>"; }
if($me['level'] >= 1) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='세력 도시' onclick='refreshing(1,8)'></td>"; }
if($me['level'] >= 1) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='세력 도시' onclick='refreshing(1,8)'></td>"; }
else { echo "<td width=111 height=30 align=center><font size=2 color=gray>【세력 도시】</font></td>"; }
if($me['level'] >= 1) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='세력 장수' onclick='refreshing(1,9)'></td>"; }
if($me['level'] >= 1) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='세력 장수' onclick='refreshing(1,9)'></td>"; }
else { echo "<td width=111 height=30 align=center><font size=2 color=gray>【세력 장수】</font></td>"; }
if($me['level'] >= 1) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='국 법' onclick='refreshing(1,3)'></td>"; }
if($me['level'] >= 1) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='국 법' onclick='refreshing(1,3)'></td>"; }
else { echo "<td width=111 height=30 align=center><font size=2 color=gray>【국 법】</font></td>"; }
echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='중원 정보' onclick='refreshing(1,14)'></td>";
echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='현재 도시' onclick='refreshing(1,11)'></td>";
if($me['level'] >= 2 || ($me['level'] == 1 && $me['belong'] >= $nation['secretlimit'])) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='감 찰 부' onclick='refreshing(1,18)'></td>"; }
echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='중원 정보' onclick='refreshing(1,14)'></td>";
echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='현재 도시' onclick='refreshing(1,11)'></td>";
if($me['level'] >= 2 || ($me['level'] == 1 && $me['belong'] >= $nation['secretlimit'])) { echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='감 찰 부' onclick='refreshing(1,18)'></td>"; }
else { echo "<td width=111 height=30 align=center><font size=2 color=gray>【감 찰 부】</font></td>"; }
echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='내 정보 & 설정' onclick='refreshing(1,12)'></td>";
echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:$nation['color'];color:".newColor($nation['color']).";font-weight:bold; type=button value='거 래 장' onclick='refreshing(1,17)'></td>";
echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='내 정보 & 설정' onclick='refreshing(1,12)'></td>";
echo "<td width=111 height=30 align=center><input style=width:111;height:30;background-color:{$nation['color']};color:".newColor($nation['color']).";font-weight:bold; type=button value='거 래 장' onclick='refreshing(1,17)'></td>";
echo "
</tr>
</table>";
@@ -2638,7 +2638,7 @@ function generalInfo($connect, $no, $skin) {
case 0: case 9: case 10:
$atmos = "<font color=magenta>{$general['atmos']} (-5)</font>"; break;
default:
$atmos = "$general['atmos']"; break;
$atmos = "{$general['atmos']}"; break;
}
switch($general['personal']) {
case 3: case 5:
@@ -2646,7 +2646,7 @@ function generalInfo($connect, $no, $skin) {
case 1: case 8: case 10:
$train = "<font color=magenta>{$general['train']} (-5)</font>"; break;
default:
$train = "$general['train']"; break;
$train = "{$general['train']}"; break;
}
if($general['troop'] == 0) { $troop['name'] = "-"; }
if($general['mode'] == 2) { $general['mode'] = "<font color=limegreen>수비 함(훈사80)</font>"; }
@@ -2733,7 +2733,7 @@ function generalInfo($connect, $no, $skin) {
<td align=center id=bg1><b>부대</b></td>
<td align=center colspan=3>{$troop['name']}</td>
<td align=center id=bg1><b>벌점</b></td>
<td align=center colspan=5>".getConnect($general['connect'])." $general['connect']($general['con'])</td>
<td align=center colspan=5>".getConnect($general['connect'])." {$general['connect']}({$general['con']})</td>
</tr>
</table>";
}
@@ -2758,17 +2758,17 @@ function generalInfo2($connect, $no, $skin) {
switch($general['personal']) {
case 0: case 1; case 6:
$experience = "<font color=cyan>".getHonor($general['experience'])." ($general['experience'])</font>"; break;
$experience = "<font color=cyan>".getHonor($general['experience'])." ({$general['experience']})</font>"; break;
case 4: case 5: case 7: case 10:
$experience = "<font color=magenta>".getHonor($general['experience'])." ($general['experience'])</font>"; break;
$experience = "<font color=magenta>".getHonor($general['experience'])." ({$general['experience']})</font>"; break;
default:
$experience = getHonor($general['experience'])." ($general['experience'])"; break;
$experience = getHonor($general['experience'])." ({$general['experience']})"; break;
}
switch($general['personal']) {
case 10:
$dedication = "<font color=magenta>".getDed($general['dedication'])." ($general['dedication'])</font>"; break;
$dedication = "<font color=magenta>".getDed($general['dedication'])." ({$general['dedication']})</font>"; break;
default:
$dedication = getDed($general['dedication'])." ($general['dedication'])"; break;
$dedication = getDed($general['dedication'])." ({$general['dedication']})"; break;
}
if($skin == 0) {
@@ -5901,7 +5901,7 @@ function CheckHall($connect, $no) {
$count = MYDB_num_rows($result);
//승률,살상률인데 10회 미만 전투시 스킵
if(($k == 5 || $k == 7) && {$general['warnum']}<10) { continue; }
if(($k == 5 || $k == 7) && $general['warnum']<10) { continue; }
//토너승률인데 50회 미만시 스킵
if($k == 13 && $general['tt'] < 50) { continue; }
//토너승률인데 50회 미만시 스킵
twe/func_history.php
+1 -1
View File
@@ -109,7 +109,7 @@ function LogHistory($connect, $isFirst=0) {
$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$citycount = MYDB_num_rows($cityresult);
$nationStr .= "<font color=cyan>◆</font> <font style=color:".newColor($nation['color']).";background-color:$nation['color'];>{$nation['name']}</font><br>";
$nationStr .= "<font color=cyan>◆</font> <font style=color:".newColor($nation['color']).";background-color:{$nation['color']};>{$nation['name']}</font><br>";
$powerStr .= "국력 {$nation['power']}<br>";
$genStr .= "장수 {$nation['gennum']}<br>";
$cityStr .= "속령 $citycount<br>";
twe/func_process.php
+5 -5
View File
@@ -2191,12 +2191,12 @@ function process_31($connect, &$general) {
if($dist[$destination] > 2) {
$alllog[count($alllog)] = "<C>●</>{$admin['month']}월:누군가가 <G><b>{$city['name']}</b></>(을)를 살피는 것 같습니다.";
$log[count($log)] = "<C>●</>{$admin['month']}월:<G><b>{$city['name']}</b></>의 소문만 들을 수 있었습니다. <1>$date</>";
$log[count($log)] = "【<G>{$city['name']}</>】주민:$city['pop'], 민심:$city['rate'], 장수:$gencount, 병력:$crew";
$log[count($log)] = "【<G>{$city['name']}</>】주민:{$city['pop']}, 민심:{$city['rate']}, 장수:$gencount, 병력:$crew";
} elseif($dist[$destination] == 2) {
$alllog[count($alllog)] = "<C>●</>{$admin['month']}월:누군가가 <G><b>{$city['name']}</b></>(을)를 살피는 것 같습니다.";
$log[count($log)] = "<C>●</>{$admin['month']}월:<G><b>{$city['name']}</b></>의 어느정도 정보를 얻었습니다. <1>$date</>";
$log[count($log)] = "【<M>첩보</>】농업:$city['agri'], 상업:$city['comm'], 치안:$city['secu'], 수비:$city['def'], 성벽:$city['wall']";
$log[count($log)] = "【<G>{$city['name']}</>】주민:$city['pop'], 민심:$city['rate'], 장수:$gencount, 병력:$crew";
$log[count($log)] = "【<M>첩보</>】농업:{$city['agri']}, 상업:{$city['comm']}, 치안:{$city['secu']}, 수비:{$city['def']}, 성벽:{$city['wall']}";
$log[count($log)] = "【<G>{$city['name']}</>】주민:{$city['pop']}, 민심:{$city['rate']}, 장수:$gencount, 병력:$crew";
} else {
$alllog[count($alllog)] = "<C>●</>{$admin['month']}월:누군가가 <G><b>{$city['name']}</b></>(을)를 살피는 것 같습니다.";
$log[count($log)] = "<C>●</>{$admin['month']}월:<G><b>{$city['name']}</b></>의 많은 정보를 얻었습니다. <1>$date</>";
@@ -2211,8 +2211,8 @@ function process_31($connect, &$general) {
for($i=$count; $i > 0; $i-=8) {
$log[count($log)] = "{$msg[$i-8]} {$msg[$i-7]} {$msg[$i-6]} {$msg[$i-5]} {$msg[$i-4]} {$msg[$i-3]} {$msg[$i-2]} {$msg[$i-1]}";
}
$log[count($log)] = "【<M>첩보</>】농업:$city['agri'], 상업:$city['comm'], 치안:$city['secu'], 수비:$city['def'], 성벽:$city['wall']";
$log[count($log)] = "【<G>{$city['name']}</>】주민:$city['pop'], 민심:$city['rate'], 장수:$gencount, 병력:$crew";
$log[count($log)] = "【<M>첩보</>】농업:{$city['agri']}, 상업:{$city['comm']}, 치안:{$city['secu']}, 수비:{$city['def']}, 성벽:{$city['wall']}";
$log[count($log)] = "【<G>{$city['name']}</>】주민:{$city['pop']}, 민심:{$city['rate']}, 장수:$gencount, 병력:$crew";
if($general['nation'] != 0 && $city['nation'] != 0) {
$query = "select name,tech from nation where nation='{$city['nation']}'";
twe/join.php
+3 -3
View File
@@ -1,7 +1,7 @@
<?php
include "lib.php";
include "func.php";
require("new_lib.php")
require("new_lib.php");
$id = $_POST['id'];
$pw = $_POST['pw'];
@@ -135,10 +135,10 @@ for($i=0; $i < $nationcount; $i++) {
$nation = MYDB_fetch_array($nationresult);
if($nation['scoutmsg'] == "") {
echo "
<tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:{newColor($nation['color'])};background-color:{$nation['color']}>-</td></tr>";
<tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:{newColor({$nation['color']})};background-color:{$nation['color']}>-</td></tr>";
} else {
echo "
<tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:{newColor($nation['color'])};background-color:{$nation['color']}>{$nation['scoutmsg']}</td></tr>";
<tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:{newColor({$nation['color']})};background-color:{$nation['color']}>{$nation['scoutmsg']}</td></tr>";
}
}
?>
twe/process_war.php
+6 -6
View File
@@ -353,7 +353,7 @@ function processWar($connect, $general, $city) {
$general['crew'] = round($general['crew']);
$cityCrew = round($cityCrew);
$myCrew = round($myCrew);
$batlog[count($batlog)] = "<C>●</> $phase : <Y1>【$general['name']】</> <C>{$general['crew']} (-$myCrew)</> VS <C>{$city['def']} (-$cityCrew)</> <Y1>【$city['name']】</>";
$batlog[count($batlog)] = "<C>●</> $phase : <Y1>【{$general['name']}】</> <C>{$general['crew']} (-$myCrew)</> VS <C>{$city['def']} (-$cityCrew)</> <Y1>【{$city['name']}】</>";
$mykillnum += $cityCrew; $mydeathnum += $myCrew;
@@ -371,7 +371,7 @@ function processWar($connect, $general, $city) {
if($city['def'] <= 0) { break; }
if($general['crew'] <= 0) { break; }
}
$res = "성 <1>"._String::SubStr(getTypename($general['crewtype']), 0, 2)."</><Y1>【$general['name']】</> <O>{$general['crew']} (-$mydeathnum)</> VS <O>{$city['def']} (-$mykillnum)</> <Y1>【$city['name']】</><1>성벽</>";
$res = "성 <1>"._String::SubStr(getTypename($general['crewtype']), 0, 2)."</><Y1>【{$general['name']}】</> <O>{$general['crew']} (-$mydeathnum)</> VS <O>{$city['def']} (-$mykillnum)</> <Y1>【{$city['name']}】</><1>성벽</>";
$log[count($log)] = "<O>◆</>".$res;
$batlog[count($batlog)] = "<O>◆</>".$res;
$batres[count($batres)] = "<O>◆</>{$game['year']}년 {$game['month']}월: ".$res;
@@ -1190,8 +1190,8 @@ function processWar($connect, $general, $city) {
$oppose['crew'] = round($oppose['crew']);
$myCrew = round($myCrew);
$opCrew = round($opCrew);
$batlog[count($batlog)] = "<C>●</> $phase : <Y1>【$general['name']】</> <C>{$general['crew']} (-$myCrew)</> VS <C>{$oppose['crew']} (-$opCrew)</> <Y1>【$oppose['name']】</>";
$oppbatlog[count($oppbatlog)] = "<C>●</> $phase : <Y1>【$oppose['name']】</> <C>{$oppose['crew']} (-$opCrew)</> VS <C>{$general['crew']} (-$myCrew)</> <Y1>【$general['name']】</>";
$batlog[count($batlog)] = "<C>●</> $phase : <Y1>【{$general['name']}】</> <C>{$general['crew']} (-$myCrew)</> VS <C>{$oppose['crew']} (-$opCrew)</> <Y1>【{$oppose['name']}】</>";
$oppbatlog[count($oppbatlog)] = "<C>●</> $phase : <Y1>【{$oppose['name']}】</> <C>{$oppose['crew']} (-$opCrew)</> VS <C>{$general['crew']} (-$myCrew)</> <Y1>【{$general['name']}】</>";
$mykillnum += $opCrew; $mydeathnum += $myCrew;
$opkillnum += $myCrew; $opdeathnum += $opCrew;
@@ -1220,11 +1220,11 @@ function processWar($connect, $general, $city) {
if($oppose['crew'] <= 0) { break; }
if($general['crew'] <= 0) { break; }
}
$res = "<C>공</> <1>"._String::SubStr(getTypename($general['crewtype']), 0, 2)."</><Y1>【$general['name']】</> <O>{$general['crew']} (-$mydeathnum)</> VS <O>{$oppose['crew']} (-$opdeathnum)</> <Y1>【$oppose['name']】</><1>"._String::SubStr(getTypename($oppose['crewtype']), 0, 2)."</>";
$res = "<C>공</> <1>"._String::SubStr(getTypename($general['crewtype']), 0, 2)."</><Y1>【{$general['name']}】</> <O>{$general['crew']} (-$mydeathnum)</> VS <O>{$oppose['crew']} (-$opdeathnum)</> <Y1>【{$oppose['name']}】</><1>"._String::SubStr(getTypename($oppose['crewtype']), 0, 2)."</>";
$log[count($log)] = "<O>◆</>".$res;
$batlog[count($batlog)] = "<O>◆</>".$res;
$batres[count($batres)] = "<O>◆</>{$game['year']}년 {$game['month']}월: ".$res;
$oppres = "<M>수</> <1>"._String::SubStr(getTypename($oppose['crewtype']), 0, 2)."</><Y1>【$oppose['name']】</> <O>{$oppose['crew']} (-$opdeathnum)</> VS <O>{$general['crew']} (-$mydeathnum)</> <Y1>【$general['name']】</><1>"._String::SubStr(getTypename($general['crewtype']), 0, 2)."</>";
$oppres = "<M>수</> <1>"._String::SubStr(getTypename($oppose['crewtype']), 0, 2)."</><Y1>【{$oppose['name']}】</> <O>{$oppose['crew']} (-$opdeathnum)</> VS <O>{$general['crew']} (-$mydeathnum)</> <Y1>【{$general['name']}】</><1>"._String::SubStr(getTypename($general['crewtype']), 0, 2)."</>";
$opplog[count($opplog)] = "<O>◆</>".$oppres;
$oppbatlog[count($oppbatlog)] = "<O>◆</>".$oppres;
$oppbatres[count($oppbatres)] = "<O>◆</>{$game['year']}년 {$game['month']}월: ".$oppres;
twe/processing.php
+26 -26
View File
@@ -359,8 +359,8 @@ function calc(cost, formnum) {
현재 기술력 : <input type=text style=text-align:right;color:white;background-color:black size=5 readonly value=".getTechCall($nation['tech']).">
현재 통솔 : <input type=text style=text-align:right;color:white;background-color:black size=3 readonly value=$leader>
현재 병종 : <input type=text size=8 style=text-align:right;color:white;background-color:black readonly value=".getTypename($me['crewtype']).">
현재 병사 : <input type=text size=5 style=text-align:right;color:white;background-color:black readonly value=$me['crew']>
현재 자금 : <input type=text size=5 style=text-align:right;color:white;background-color:black readonly value=$me['gold']>
현재 병사 : <input type=text size=5 style=text-align:right;color:white;background-color:black readonly value={$me['crew']}>
현재 자금 : <input type=text size=5 style=text-align:right;color:white;background-color:black readonly value={$me['gold']}>
</td>
</tr>
<tr>
@@ -793,8 +793,8 @@ function calc(cost, formnum) {
현재 기술력 : <input type=text style=text-align:right;color:white;background-color:black size=5 readonly value=".getTechCall($nation['tech']).">
현재 통솔 : <input type=text style=text-align:right;color:white;background-color:black size=3 readonly value=$leader>
현재 병종 : <input type=text size=8 style=text-align:right;color:white;background-color:black readonly value=".getTypename($me['crewtype']).">
현재 병사 : <input type=text size=5 style=text-align:right;color:white;background-color:black readonly value=$me['crew']>
현재 자금 : <input type=text size=5 style=text-align:right;color:white;background-color:black readonly value=$me['gold']>
현재 병사 : <input type=text size=5 style=text-align:right;color:white;background-color:black readonly value={$me['crew']}>
현재 자금 : <input type=text size=5 style=text-align:right;color:white;background-color:black readonly value={$me['gold']}>
</td>
</tr>
<tr>
@@ -1123,7 +1123,7 @@ function command_16($connect, $turn, $command) {
선택된 도시로 침공을 합니다.<br>
목록을 선택하거나 도시를 클릭하세요.<br>
<form name=form1 action=c_double.php method=post>
$currentcity['name'] =>
{$currentcity['name']} =>
<select name=double size=1 style=color:white;background-color:black>";
OptionsForCitys();
@@ -1164,7 +1164,7 @@ function command_21($connect, $turn, $command) {
인접 도시로만 이동이 가능합니다.<br>
목록을 선택하거나 도시를 클릭하세요.<br>
<form name=form1 action=c_double.php method=post>
$currentcity['name'] =>
{$currentcity['name']} =>
<select name=double size=1 style=color:white;background-color:black>";
OptionsForCitys();
@@ -1544,7 +1544,7 @@ function command_30($connect, $turn, $command) {
최대 3칸내 도시로만 강행이 가능합니다.<br>
목록을 선택하거나 도시를 클릭하세요.<br>
<form name=form1 action=c_double.php method=post>
$currentcity['name'] =>
{$currentcity['name']} =>
<select name=double size=1 style=color:white;background-color:black>";
OptionsForCitys();
@@ -1586,7 +1586,7 @@ function command_31($connect, $turn, $command) {
인접도시일 경우 많은 정보를 얻을 수 있습니다.<br>
목록을 선택하거나 도시를 클릭하세요.<br>
<form name=form1 action=c_double.php method=post>
$currentcity['name'] =>
{$currentcity['name']} =>
<select name=double size=1 style=color:white;background-color:black>";
OptionsForCitys();
@@ -1630,7 +1630,7 @@ function command_32($connect, $turn, $command) {
선택된 도시에 화계를 실행합니다.<br>
목록을 선택하거나 도시를 클릭하세요.<br>
<form name=form1 action=c_double.php method=post>
$currentcity['name'] =>
{$currentcity['name']} =>
<select name=double size=1 style=color:white;background-color:black>";
OptionsForCitys();
@@ -1670,7 +1670,7 @@ function command_33($connect, $turn, $command) {
선택된 도시에 탈취를 실행합니다.<br>
목록을 선택하거나 도시를 클릭하세요.<br>
<form name=form1 action=c_double.php method=post>
$currentcity['name'] =>
{$currentcity['name']} =>
<select name=double size=1 style=color:white;background-color:black>";
OptionsForCitys();
@@ -1710,7 +1710,7 @@ function command_34($connect, $turn, $command) {
선택된 도시에 파괴를 실행합니다.<br>
목록을 선택하거나 도시를 클릭하세요.<br>
<form name=form1 action=c_double.php method=post>
$currentcity['name'] =>
{$currentcity['name']} =>
<select name=double size=1 style=color:white;background-color:black>";
OptionsForCitys();
@@ -1750,7 +1750,7 @@ function command_35($connect, $turn, $command) {
선택된 도시에 선동을 실행합니다.<br>
목록을 선택하거나 도시를 클릭하세요.<br>
<form name=form1 action=c_double.php method=post>
$currentcity['name'] =>
{$currentcity['name']} =>
<select name=double size=1 style=color:white;background-color:black>";
OptionsForCitys();
@@ -1790,7 +1790,7 @@ function command_36($connect, $turn, $command) {
선택된 도시에 기습을 실행합니다.<br>
목록을 선택하거나 도시를 클릭하세요.<br>
<form name=form1 action=c_double.php method=post>
$currentcity['name'] =>
{$currentcity['name']} =>
<select name=double size=1 style=color:white;background-color:black>";
OptionsForCitys();
@@ -2045,7 +2045,7 @@ function command_48($connect, $turn, $command) {
echo "
장비를 구입하거나 매각합니다.<br>
현재 구입 불가능한 것은 <font color=red>붉은색</font>으로 표시됩니다.<br>
현재 도시 치안 : $city['secu'] &nbsp;&nbsp;&nbsp;현재 자금 : {$me['gold']}<br>
현재 도시 치안 : {$city['secu']} &nbsp;&nbsp;&nbsp;현재 자금 : {$me['gold']}<br>
<form name=form1 action=c_double.php method=post>
장비 : <select name=double size=1 style=color:white;background-color:black>
<option value=0 style=color:skyblue>_____무기매각(반값)____</option>
@@ -2163,9 +2163,9 @@ function command_51($connect, $turn, $command) {
$nation = MYDB_fetch_array($result);
if($myNation['power'] / $nation['power'] <= 3 || !isClose($connect, $me['nation'], $nation['nation'])) {
echo "<option style=color:{$nation['color']};background-color:red; value=$nation['nation']>【 {$nation['name']} 】</option>";
echo "<option style=color:{$nation['color']};background-color:red; value={$nation['nation']}>【 {$nation['name']} 】</option>";
} else {
echo "<option style=color:{$nation['color']} value=$nation['nation']>【 {$nation['name']} 】</option>";
echo "<option style=color:{$nation['color']} value={$nation['nation']}>【 {$nation['name']} 】</option>";
}
}
echo "
@@ -2219,7 +2219,7 @@ function command_52($connect, $turn, $command) {
for($i=1; $i <= $count; $i++) {
$nation = MYDB_fetch_array($result);
echo "<option style=color:{$nation['color']} value=$nation['nation']>【 {$nation['name']} 】</option>";
echo "<option style=color:{$nation['color']} value={$nation['nation']}>【 {$nation['name']} 】</option>";
}
echo "
</select>
@@ -2306,9 +2306,9 @@ function command_53($connect, $turn, $command) {
$nation = MYDB_fetch_array($result);
if($myNation['power']+$nation['power'] > $cond1 || $myNation['gennum']+$nation['gennum'] > $cond2 || !isClose($connect, $me['nation'], $nation['nation'])) {
echo "<option style=color:{$nation['color']};background-color:red; value=$nation['nation']>【 {$nation['name']} 】</option>";
echo "<option style=color:{$nation['color']};background-color:red; value={$nation['nation']}>【 {$nation['name']} 】</option>";
} else {
echo "<option style=color:{$nation['color']} value=$nation['nation']>【 {$nation['name']} 】</option>";
echo "<option style=color:{$nation['color']} value={$nation['nation']}>【 {$nation['name']} 】</option>";
}
}
@@ -2416,7 +2416,7 @@ function command_61($connect, $turn, $command) {
case 6: $color = "red"; break;
case 7: $color = "blue"; break;
}
echo "<option style=background-color:$color;color:$nation['color']; value=$nation['nation']>【 {$nation['name']} 】</option>";
echo "<option style=background-color:$color;color:{$nation['color']}; value={$nation['nation']}>【 {$nation['name']} 】</option>";
}
echo "
</select>
@@ -2505,7 +2505,7 @@ function command_62($connect, $turn, $command) {
case 6: $color = "black"; break;
case 7: $color = "blue"; break;
}
echo "<option style=background-color:$color;color:$nation['color']; value=$nation['nation']>【 {$nation['name']} 】</option>";
echo "<option style=background-color:$color;color:{$nation['color']}; value={$nation['nation']}>【 {$nation['name']} 】</option>";
}
echo "
</select>
@@ -2561,7 +2561,7 @@ function command_63($connect, $turn, $command) {
case 6: $color = "red"; break;
case 7: $color = "red"; break;
}
echo "<option style=background-color:$color;color:$nation['color']; value=$nation['nation']>【 {$nation['name']} 】</option>";
echo "<option style=background-color:$color;color:{$nation['color']}; value={$nation['nation']}>【 {$nation['name']} 】</option>";
}
echo "
</select>
@@ -2617,7 +2617,7 @@ function command_64($connect, $turn, $command) {
case 6: $color = "red"; break;
case 7: $color = "blue"; break;
}
echo "<option style=background-color:$color;color:$nation['color']; value=$nation['nation']>【 {$nation['name']} 】</option>";
echo "<option style=background-color:$color;color:{$nation['color']}; value={$nation['nation']}>【 {$nation['name']} 】</option>";
}
echo "
</select>
@@ -2939,7 +2939,7 @@ function command_75($connect, $turn, $command) {
case 6: $color = "red"; break;
case 7: $color = "blue"; break;
}
echo "<option style=background-color:$color;color:$nation['color']; value=$nation['nation']>【 {$nation['name']} 】</option>";
echo "<option style=background-color:$color;color:{$nation['color']}; value={$nation['nation']}>【 {$nation['name']} 】</option>";
}
echo "
</select>
@@ -2996,7 +2996,7 @@ function command_77($connect, $turn, $command) {
case 6: $color = "red"; break;
case 7: $color = "blue"; break;
}
echo "<option style=background-color:$color;color:$nation['color']; value=$nation['nation']>【 {$nation['name']} 】</option>";
echo "<option style=background-color:$color;color:{$nation['color']}; value={$nation['nation']}>【 {$nation['name']} 】</option>";
}
echo "
</select>
@@ -3053,7 +3053,7 @@ function command_78($connect, $turn, $command) {
case 6: $color = "red"; break;
case 7: $color = "blue"; break;
}
echo "<option style=background-color:$color;color:$nation['color']; value=$nation['nation']>【 {$nation['name']} 】</option>";
echo "<option style=background-color:$color;color:{$nation['color']}; value={$nation['nation']}>【 {$nation['name']} 】</option>";
}
echo "
</select>
twe/select_npc.php
+2 -2
View File
@@ -71,10 +71,10 @@ for($i=0; $i < $nationcount; $i++) {
$nation = MYDB_fetch_array($nationresult);
if($nation['scoutmsg'] == "") {
echo "
<tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:{newColor($nation['color'])};background-color:{$nation['color']}>-</td></tr>";
<tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:{newColor({$nation['color']})};background-color:{$nation['color']}>-</td></tr>";
} else {
echo "
<tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:{newColor($nation['color'])};background-color:{$nation['color']}>{$nation['scoutmsg']}</td></tr>";
<tr><td align=center width=98 style=color:".newColor($nation['color']).";background-color:{$nation['color']}>{$nation['name']}</td><td width=898 style=color:{newColor({$nation['color']})};background-color:{$nation['color']}>{$nation['scoutmsg']}</td></tr>";
}
}
?>