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

버그 수정

Browse Source
This commit is contained in:
Hide_D
2020-05-06 02:13:40 +09:00
parent 169edd4f9c
commit a2823b3c29
7 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/a_emperior.php
+1 -1
View File
@@ -79,7 +79,7 @@ foreach($emperiors as $emperior){
</td>
</tr>
<tr>
<td align=center style=color:".newColor($emperior['color'])."; bgcolor=<?=$emperior['color']?> colspan=8>
<td align=center style='color:<?=newColor($emperior['color'])?>;background-color:<?=$emperior['color']?>' colspan=8>
<font size=5><?=$emperior['name']?> (<?=$emperior['year']?>年 <?=$emperior['month']?>月)</font>
</td>
</tr>
hwe/b_auction.php
+1 -1
View File
@@ -62,7 +62,7 @@ if ($msg2 == "") {
<body>
<table align=center width=1000 class='tb_layout bg0'>
<tr><td>거 래 장<br><?=closeButton()?></td></tr>
<tr><td align=center id=bg2><font color=orange size=6><b>거 래 장</b></font><input type=button value='갱신' onclick=location.replace('b_auction.php')></td></tr>
<tr><td align=center id=bg2><font color=orange size=6><b>거 래 장</b></font><input type=button value='갱신' onclick="location.replace('b_auction.php')"></td></tr>
</table>
<table align=center width=1000 class='tb_layout bg0'>
<form method=post action=c_auction.php>
hwe/b_currentCity.php
+1 -1
View File
@@ -321,7 +321,7 @@ foreach($generals as $general){
];
}
$generalsName = array_map(function($gen){return $gen['name'];}, $generalsFormat);
$generalsName = array_map(function($gen){return getColoredName($gen['name'], $gen['npc']);}, $generals);
$enemyCrew = 0;
$enemyCnt = 0;
hwe/func.php
+1 -1
View File
@@ -273,7 +273,7 @@ function myNationInfo(General $generalObj)
$nation['tech'] = "$techCall / {$nation['tech']}";
if ($nationID===0 == 0) {
if ($nationID===0) {
$nation['strategic_cmd_limit'] = "<font color=white>해당 없음</font>";
$nation['surlimit'] = "<font color=white>해당 없음</font>";
$nation['scout'] = "<font color=white>해당 없음</font>";
hwe/func_gamerule.php
+3 -3
View File
@@ -420,7 +420,7 @@ function postUpdateMonthly()
}
//휴전국 로그
$stopWarList = [];
foreach($db->queryAllLists('SELECT me,you WHERE state=0 AND term <= 1 ORDER BY me desc, you desc') as [$me, $you]){
foreach($db->queryAllLists('SELECT me,you FROM diplomacy WHERE state=0 AND term <= 1 ORDER BY me desc, you desc') as [$me, $you]){
if($me < $you){
$key = "{$me}_{$you}";
}
@@ -456,11 +456,11 @@ function postUpdateMonthly()
'term'=>$db->sqleval('greatest(0, term-1)'),
], true);
//불가침 끝나면 통상으로
$db->update('diploacy', [
$db->update('diplomacy', [
'state'=>2,
], 'state = 7 AND term = 0');
//선포 끝나면 교전으로
$db->update('diploacy', [
$db->update('diplomacy', [
'state'=>0,
'term'=>6,
], 'state = 1 AND term = 0');
hwe/sammo/Command/Nation/che_감축.php
+9
View File
@@ -51,8 +51,17 @@ class che_감축 extends Command\NationCommand{
return;
}
$this->setCity();
$this->setNation(['gold', 'rice', 'capset', 'capital']);
if(!$this->nation['capital']){
$this->fullConditionConstraints=[
ConstraintHelper::AlwaysFail('방랑상태에서는 불가능합니다.')
];
return;
}
$this->setDestCity($this->nation['capital']);
[$reqGold, $reqRice] = $this->getCost();
hwe/sammo/Command/Nation/che_증축.php
+8
View File
@@ -52,6 +52,14 @@ class che_증축 extends Command\NationCommand{
$this->setCity();
$this->setNation(['gold', 'rice', 'capset', 'capital']);
if(!$this->nation['capital']){
$this->fullConditionConstraints=[
ConstraintHelper::AlwaysFail('방랑상태에서는 불가능합니다.')
];
return;
}
$this->setDestCity($this->nation['capital']);
[$reqGold, $reqRice] = $this->getCost();