버그 수정

This commit is contained in:
2020-03-28 19:56:11 +09:00
parent 8f95d4b279
commit 0087d5784b
7 changed files with 8 additions and 857 deletions
+2 -2
View File
@@ -47,7 +47,7 @@ $templates = new \League\Plates\Engine(__DIR__.'/templates');
</td></tr>
</form>
</table>
<div style="margin:auto;width=1000px;">
<div style="margin:auto;width:1000px;">
<?php
$ownerNameList = [];
@@ -220,7 +220,7 @@ foreach($types as $idx=>[$typeName, $typeValue, $typeFunc]){
}
?>
</div>
<div style="margin:auto;width=1000px;margin-top:5px;">
<div style="margin:auto;width:1000px;margin-top:5px;">
<?php
//유니크 아이템 소유자
$itemTypes = [
@@ -51,7 +51,7 @@ class che_전투태세 extends Command\GeneralCommand{
}
public function getCost():array{
$crew = $this->getVar('crew');
$crew = $this->generalObj->getVar('crew');
$techCost = getTechCost($this->nation['tech']);
return [Util::round($crew / 100 * 3 * $techCost), 0];
}
+1 -1
View File
@@ -61,7 +61,7 @@ class RaiseInvader extends \sammo\Event\Action{
order by rand() limit 1', $nation, $oldCapital);
$db->update('nation', ['capital'=>$newCapital], 'nation=%i', $nation);
$db->update('general', ['city'=>$newCapital], 'nation=%i and city=%i', $nation, $city);
$db->update('general', ['city'=>$newCapital], 'nation=%i and city=%i', $nation, $oldCapital);
}
$generals = [];
+3
View File
@@ -10,7 +10,10 @@ class Scenario{
private $iconPath = '.';
private $data;
/** @var int */
private $year;
/** @var string */
private $title;
private $history;
+1 -1
View File
@@ -104,7 +104,7 @@ class SpecialityConst{
}
$invWar = [];
foreach(static::War as $key=>$val){
foreach(static::WAR as $key=>$val){
$nameKey = $val[0];
$val[0] = $key;
$invWar[$nameKey] = $val;