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-03-05 23:53:59 +09:00
parent 4f4045363b
commit 13da80ee85
4 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/b_dipcenter.php
+3 -3
View File
@@ -144,12 +144,12 @@ foreach(getAllNationStaticInfo() as $staticNation):
$cityList = $db->query('SELECT * FROM city WHERE nation=%i', $nationID); $cityList = $db->query('SELECT * FROM city WHERE nation=%i', $nationID);
$dedicationList = $db->query('SELECT dedication FROM general WHERE nation=%i AND npc!=5', $nationID); $dedicationList = $db->query('SELECT dedication FROM general WHERE nation=%i AND npc!=5', $nationID);
$goldIncome = getGoldIncome($nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList); $goldIncome = getGoldIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
$warIncome = getWarGoldIncome($nation['type'], $cityList); $warIncome = getWarGoldIncome($nation['type'], $cityList);
$totalGoldIncome = $goldIncome + $warIncome; $totalGoldIncome = $goldIncome + $warIncome;
$riceIncome = getRiceIncome($nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList); $riceIncome = getRiceIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
$wallIncome = getWallIncome($nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList); $wallIncome = getWallIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
$totalRiceIncome = $riceIncome + $wallIncome; $totalRiceIncome = $riceIncome + $wallIncome;
$outcome = getOutcome($nation['bill'], $dedicationList); $outcome = getOutcome($nation['bill'], $dedicationList);
hwe/b_myKingdomInfo.php
+3 -3
View File
@@ -64,12 +64,12 @@ foreach($cityList as $city){
[$currCrew, $maxCrew] = $db->queryFirstList('SELECT sum(crew), sum(leadership)*100 FROM general WHERE nation=%i AND npc != 5', $nation['nation']); [$currCrew, $maxCrew] = $db->queryFirstList('SELECT sum(crew), sum(leadership)*100 FROM general WHERE nation=%i AND npc != 5', $nation['nation']);
$dedicationList = $db->query('SELECT dedication FROM general WHERE nation=%i AND npc!=5', $nationID); $dedicationList = $db->query('SELECT dedication FROM general WHERE nation=%i AND npc!=5', $nationID);
$goldIncome = getGoldIncome($nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList); $goldIncome = getGoldIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
$warIncome = getWarGoldIncome($nation['type'], $cityList); $warIncome = getWarGoldIncome($nation['type'], $cityList);
$totalGoldIncome = $goldIncome + $warIncome; $totalGoldIncome = $goldIncome + $warIncome;
$riceIncome = getRiceIncome($nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList); $riceIncome = getRiceIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
$wallIncome = getWallIncome($nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList); $wallIncome = getWallIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
$totalRiceIncome = $riceIncome + $wallIncome; $totalRiceIncome = $riceIncome + $wallIncome;
$outcome = getOutcome($nation['bill'], $dedicationList); $outcome = getOutcome($nation['bill'], $dedicationList);
hwe/func_time_event.php
+24 -12
View File
@@ -46,7 +46,7 @@ function processGoldIncome() {
$adminLog = []; $adminLog = [];
$nationList = $db->query('SELECT name,nation,capital,gold,rate_tmp,bill,type from nation'); $nationList = $db->query('SELECT name,nation,capital,gold,level,rate_tmp,bill,type from nation');
$cityListByNation = Util::arrayGroupBy($db->query('SELECT * FROM city'), 'nation'); $cityListByNation = Util::arrayGroupBy($db->query('SELECT * FROM city'), 'nation');
$generalRawListByNation = Util::arrayGroupBy($db->query('SELECT no,name,nation,gold,level,dedication,city FROM general'), 'nation'); $generalRawListByNation = Util::arrayGroupBy($db->query('SELECT no,name,nation,gold,level,dedication,city FROM general'), 'nation');
@@ -55,7 +55,7 @@ function processGoldIncome() {
$nationID = $nation['nation']; $nationID = $nation['nation'];
$generalRawList = $generalRawListByNation[$nationID]; $generalRawList = $generalRawListByNation[$nationID];
$income = getGoldIncome($nation['level'], $nation['type'], $nation['rate_tmp'], $nation['capital'], $cityListByNation[$nationID]); $income = getGoldIncome($nationID, $nation['level'], $nation['rate_tmp'], $nation['capital'], $nation['type'], $cityListByNation[$nationID]??[]);
$originoutcome = getOutcome(100, $generalRawList); $originoutcome = getOutcome(100, $generalRawList);
$outcome= Util::round($nation['bill'] / 100 * $originoutcome); $outcome= Util::round($nation['bill'] / 100 * $originoutcome);
@@ -219,11 +219,15 @@ function calcCityWallRiceIncome(array $rawCity, int $officerCnt, bool $isCapital
return $wallIncome; return $wallIncome;
} }
function getGoldIncome(int $nationLevel, string $nationType, float $taxRate, int $capitalID, array $cityList){ function getGoldIncome(int $nationID, int $nationLevel, float $taxRate, int $capitalID, string $nationType, ?array $cityList){
if(!$cityList){
return 0;
}
$db = DB::db(); $db = DB::db();
$officers = []; $officers = [];
foreach($db->queryAllLists('SELECT no, city FROM general WHERE nation = %i AND level IN (2,3,4)') as [$genID, $cityID]){ foreach($db->queryAllLists('SELECT no, city FROM general WHERE nation = %i AND level IN (2,3,4)', $nationID) as [$genID, $cityID]){
$officers[$genID] = $cityID; $officers[$genID] = $cityID;
} }
@@ -320,7 +324,7 @@ function processRiceIncome() {
[$year, $month] = $gameStor->getValuesAsArray(['year', 'month']); [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
$adminLog = []; $adminLog = [];
$nationList = $db->query('SELECT name,nation,capital,rice,rate_tmp,bill,type from nation'); $nationList = $db->query('SELECT name,level,nation,capital,rice,rate_tmp,bill,type from nation');
$cityListByNation = Util::arrayGroupBy($db->query('SELECT * FROM city'), 'nation'); $cityListByNation = Util::arrayGroupBy($db->query('SELECT * FROM city'), 'nation');
$generalRawListByNation = Util::arrayGroupBy($db->query('SELECT no,name,nation,rice,level,dedication,city FROM general'), 'nation'); $generalRawListByNation = Util::arrayGroupBy($db->query('SELECT no,name,nation,rice,level,dedication,city FROM general'), 'nation');
@@ -329,8 +333,8 @@ function processRiceIncome() {
$nationID = $nation['nation']; $nationID = $nation['nation'];
$generalRawList = $generalRawListByNation[$nationID]; $generalRawList = $generalRawListByNation[$nationID];
$income = getRiceIncome($nation['level'], $nation['type'], $nation['rate_tmp'], $nation['capital'], $cityListByNation[$nationID]); $income = getRiceIncome($nation['nation'], $nation['level'], $nation['rate_tmp'], $nation['capital'], $nation['type'], $cityListByNation[$nationID]??[]);
$income += getWallIncome($nation['level'], $nation['type'], $nation['rate_tmp'], $nation['capital'], $cityListByNation[$nationID]); $income += getWallIncome($nation['nation'], $nation['level'], $nation['rate_tmp'], $nation['capital'], $nation['type'], $cityListByNation[$nationID]??[]);
$originoutcome = getOutcome(100, $generalRawList); $originoutcome = getOutcome(100, $generalRawList);
$outcome= Util::round($nation['bill'] / 100 * $originoutcome); $outcome= Util::round($nation['bill'] / 100 * $originoutcome);
@@ -388,11 +392,15 @@ function processRiceIncome() {
pushAdminLog($adminLog); pushAdminLog($adminLog);
} }
function getRiceIncome(int $nationLevel, string $nationType, float $taxRate, int $capitalID, array $cityList) { function getRiceIncome(int $nationID, int $nationLevel, float $taxRate, int $capitalID, string $nationType, ?array $cityList) {
if(!$cityList){
return 0;
}
$db = DB::db(); $db = DB::db();
$officers = []; $officers = [];
foreach($db->queryAllLists('SELECT no, city FROM general WHERE nation = %i AND level IN (2,3,4)') as [$genID, $cityID]){ foreach($db->queryAllLists('SELECT no, city FROM general WHERE nation = %i AND level IN (2,3,4)', $nationID) as [$genID, $cityID]){
$officers[$genID] = $cityID; $officers[$genID] = $cityID;
} }
@@ -403,7 +411,7 @@ function getRiceIncome(int $nationLevel, string $nationType, float $taxRate, int
$cityID = $rawCity['city']; $cityID = $rawCity['city'];
foreach ([2,3,4] as $officerLevel) { foreach ([2,3,4] as $officerLevel) {
$officerCnt = 0; $officerCnt = 0;
if($officers[$rawCity['officer'.$officerLevel]] == $cityID){ if($officers[$rawCity['officer'.$officerLevel]]??0 == $cityID){
$officerCnt += 1; $officerCnt += 1;
} }
} }
@@ -416,11 +424,15 @@ function getRiceIncome(int $nationLevel, string $nationType, float $taxRate, int
return $cityIncome; return $cityIncome;
} }
function getWallIncome(int $nationLevel, string $nationType, float $taxRate, int $capitalID, array $cityList) { function getWallIncome(int $nationID, int $nationLevel, float $taxRate, int $capitalID, string $nationType, ?array $cityList) {
if(!$cityList){
return 0;
}
$db = DB::db(); $db = DB::db();
$officers = []; $officers = [];
foreach($db->queryAllLists('SELECT no, city FROM general WHERE nation = %i AND level IN (2,3,4)') as [$genID, $cityID]){ foreach($db->queryAllLists('SELECT no, city FROM general WHERE nation = %i AND level IN (2,3,4)', $nationID) as [$genID, $cityID]){
$officers[$genID] = $cityID; $officers[$genID] = $cityID;
} }
hwe/sammo/GeneralAI.php
+14 -4
View File
@@ -53,7 +53,7 @@ class GeneralAI{
} }
$this->city = $general->getRawCity(); $this->city = $general->getRawCity();
$this->nation = $db->queryFirstRow( $this->nation = $db->queryFirstRow(
'SELECT nation,level,tech,gold,rice,rate,type,color,name,war FROM nation WHERE nation = %i', 'SELECT nation,level,capital,tech,gold,rice,rate,type,color,name,war FROM nation WHERE nation = %i',
$general->getNationID() $general->getNationID()
)??[ )??[
'nation'=>0, 'nation'=>0,
@@ -1865,9 +1865,14 @@ class GeneralAI{
$nationID = $nation['nation']; $nationID = $nation['nation'];
$cityList = $db->query('SELECT * FROM city WHERE nation=%i', $nationID); $cityList = $db->query('SELECT * FROM city WHERE nation=%i', $nationID);
if(!$cityList){
return 20;
}
$dedicationList = $db->query('SELECT dedication FROM general WHERE nation=%i AND npc!=5', $nationID); $dedicationList = $db->query('SELECT dedication FROM general WHERE nation=%i AND npc!=5', $nationID);
$goldIncome = getGoldIncome($nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList); $goldIncome = getGoldIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
$warIncome = getWarGoldIncome($nation['type'], $cityList); $warIncome = getWarGoldIncome($nation['type'], $cityList);
$income = $goldIncome + $warIncome; $income = $goldIncome + $warIncome;
@@ -1893,10 +1898,15 @@ class GeneralAI{
$nationID = $nation['nation']; $nationID = $nation['nation'];
$cityList = $db->query('SELECT * FROM city WHERE nation=%i', $nationID); $cityList = $db->query('SELECT * FROM city WHERE nation=%i', $nationID);
if(!$cityList){
return 20;
}
$dedicationList = $db->query('SELECT dedication FROM general WHERE nation=%i AND npc!=5', $nationID); $dedicationList = $db->query('SELECT dedication FROM general WHERE nation=%i AND npc!=5', $nationID);
$riceIncome = getRiceIncome($nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList); $riceIncome = getRiceIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
$wallIncome = getWallIncome($nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList); $wallIncome = getWallIncome($nation['nation'], $nation['level'], $nation['rate'], $nation['capital'], $nation['type'], $cityList);
$income = $riceIncome + $wallIncome; $income = $riceIncome + $wallIncome;
$outcome = getOutcome(100, $dedicationList); $outcome = getOutcome(100, $dedicationList);