* generalID, generalName 동작 안하는 문제 해결

* Event 관련 클래스 표기 실수 해결
This commit is contained in:
2018-04-02 01:50:21 +09:00
parent 0cac139f65
commit c0e2ed7013
7 changed files with 26 additions and 22 deletions
+8 -3
View File
@@ -187,6 +187,11 @@ function popIncrease($connect) {
}
function getGoldIncome($connect, $nationNo, $rate, $admin_rate, $type) {
$level2 = [];
$level3 = [];
$level4 = [];
$query = "select no,city from general where nation='$nationNo' and level=4"; // 태수
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$count = MYDB_num_rows($result);
@@ -225,9 +230,9 @@ function getGoldIncome($connect, $nationNo, $rate, $admin_rate, $type) {
$tax1 = ($city['pop'] * $city['comm'] / $city['comm2'] * $ratio / 1000) / 3;
$tax1 *= (1 + $city['secu']/$city['secu2']/10); //치안에 따라 최대 10% 추가
//도시 관직 추가 세수
if($level4[$city['gen1']] == $city['city']) { $tax1 *= 1.05; }
if($level3[$city['gen2']] == $city['city']) { $tax1 *= 1.05; }
if($level2[$city['gen3']] == $city['city']) { $tax1 *= 1.05; }
if(Util::array_get($level4[$city['gen1']]) == $city['city']) { $tax1 *= 1.05; }
if(Util::array_get($level3[$city['gen2']]) == $city['city']) { $tax1 *= 1.05; }
if(Util::array_get($level2[$city['gen3']]) == $city['city']) { $tax1 *= 1.05; }
//수도 추가 세수 130%~105%
if($city['city'] == $nation['capital']) { $tax1 *= 1+(1/3/$nation['level']); };