버그 수정, 구조 변경

This commit is contained in:
2019-04-28 03:49:03 +09:00
parent fe2a076558
commit ef40f299ef
52 changed files with 140 additions and 165 deletions
+2 -6
View File
@@ -2,16 +2,12 @@
namespace sammo;
function processWar(array $rawAttacker, array $rawDefenderCity){
function processWar(General $attacker, array $rawNation, array $rawDefenderCity){
$db = DB::db();
$rawAttackerCity = $db->queryFirstRow('SELECT * FROM city WHERE city = %i', $rawAttacker['city']);
$attackerNationID = $rawAttacker['nation'];
$defenderNationID = $rawDefenderCity['nation'];
$rawAttackerNation = $db->queryFirstRow('SELECT nation,`level`,`name`,capital,gennum,tech,`type`,gold,rice FROM nation WHERE nation = %i', $attackerNationID);
if($defenderNationID == 0){
$rawDefenderNation = [
'nation'=>0,
@@ -32,7 +28,7 @@ function processWar(array $rawAttacker, array $rawDefenderCity){
$gameStor = KVStorage::getStorage($db, 'game_env');
[$startYear, $year, $month, $cityRate, $joinMode] = $gameStor->getValuesAsArray(['startyear', 'year', 'month', 'city_rate', 'join_mode']);
$attacker = new WarUnitGeneral($rawAttacker, $rawAttackerCity, $rawAttackerNation, true, $year, $month);
$attacker = new WarUnitGeneral($attacker, $rawNation, true, $year, $month);
$city = new WarUnitCity($rawDefenderCity, $rawDefenderNation, $year, $month, $cityRate);