From 37f86a7622810b506de57f0a339b314b4b4e3e83 Mon Sep 17 00:00:00 2001 From: hide_d Date: Thu, 30 Aug 2018 09:08:19 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=9E=A5=EC=88=98=20=EC=9D=BC=EB=9E=8C=20?= =?UTF-8?q?=EC=97=B0=EB=8F=99=20=EC=BD=94=EB=93=9C=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/js/ext.kingdoms.js | 1 + 1 file changed, 1 insertion(+) diff --git a/hwe/js/ext.kingdoms.js b/hwe/js/ext.kingdoms.js index 38518165..1363e600 100644 --- a/hwe/js/ext.kingdoms.js +++ b/hwe/js/ext.kingdoms.js @@ -86,6 +86,7 @@ $(function(){ if(!(국가 in 국가별)){ 국가별[국가] = {}; 국가별[국가].만능 = []; + 국가별[국가].통 = []; 국가별[국가].무 = []; 국가별[국가].지 = []; 국가별[국가].평범 = []; From 9460291eef228cbb0da19d20a972183f6b432060 Mon Sep 17 00:00:00 2001 From: hide_d Date: Thu, 30 Aug 2018 11:49:06 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=B2=9C=EB=8F=84=20=EC=8B=9C=20=EC=8C=80?= =?UTF-8?q?=EC=9D=B4=202000=20=EB=AF=B8=EB=A7=8C=EC=9D=B4=EC=96=B4?= =?UTF-8?q?=EB=8F=84=20=EA=B0=80=EB=8A=A5=ED=95=9C=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/func_process_chief.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hwe/func_process_chief.php b/hwe/func_process_chief.php index 17a2ae98..6a701a57 100644 --- a/hwe/func_process_chief.php +++ b/hwe/func_process_chief.php @@ -1032,7 +1032,7 @@ function process_66(&$general) { $log[] = "●{$admin['month']}월:인접도시가 아닙니다. 천도 실패. <1>$date"; } elseif($nation['capset'] == 1) { $log[] = "●{$admin['month']}월:다음 분기에 가능합니다. 천도 실패. <1>$date"; - } elseif($nation['gold']-GameConst::$basegold < $amount || $nation['rice']-GameConst::$basegold < $amount) { + } elseif($nation['gold']-GameConst::$basegold < $amount || $nation['rice']-GameConst::$baserice < $amount) { $log[] = "●{$admin['month']}월:물자가 부족합니다. 천도 실패. <1>$date"; } elseif($term < 3) { $log[] = "●{$admin['month']}월:천도중... ({$term}/3) <1>$date"; From d7b2272a20c5b682eddde56d4f4e4bb8967b43b1 Mon Sep 17 00:00:00 2001 From: hide_d Date: Thu, 30 Aug 2018 11:49:37 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=A6=9D=EC=B6=95=20=EC=8B=9C=20=EC=8C=80?= =?UTF-8?q?=202000=EC=9D=B4=20=EC=95=84=EB=8B=8C=200=20=EA=B8=B0=EC=A4=80?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EA=B3=84=EC=82=B0=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/func_process_chief.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hwe/func_process_chief.php b/hwe/func_process_chief.php index 6a701a57..7a629ebd 100644 --- a/hwe/func_process_chief.php +++ b/hwe/func_process_chief.php @@ -1114,7 +1114,7 @@ function process_67(&$general) { $log[] = "●{$admin['month']}월:수뇌부가 아닙니다. 증축 실패. <1>$date"; } elseif($nation['capset'] == 1) { $log[] = "●{$admin['month']}월:다음 분기에 가능합니다. 증축 실패. <1>$date"; - } elseif($nation['gold']-GameConst::$basegold < $amount || $nation['rice']-GameConst::$basegold < $amount) { + } elseif($nation['gold']-GameConst::$basegold < $amount || $nation['rice']-GameConst::$baserice < $amount) { $log[] = "●{$admin['month']}월:물자가 부족합니다. 증축 실패. <1>$date"; } elseif($term < 6) { $log[] = "●{$admin['month']}월:증축중... ({$term}/6) <1>$date"; From 45e3aeaed453f46994b0697ea5566b5d052b56c9 Mon Sep 17 00:00:00 2001 From: hide_d Date: Thu, 30 Aug 2018 11:51:02 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=9B=90=EC=A1=B0=EC=8B=9C=20=ED=8A=B9?= =?UTF-8?q?=EC=A0=95=20=EA=B2=BD=EC=9A=B0=EC=97=90=20=EC=8C=80=20=EC=86=8C?= =?UTF-8?q?=EB=AA=A8=EB=A5=BC=20=EC=A4=84=EC=9D=BC=20=EC=88=98=20=EC=9E=88?= =?UTF-8?q?=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/func_process_chief.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hwe/func_process_chief.php b/hwe/func_process_chief.php index 7a629ebd..555cc256 100644 --- a/hwe/func_process_chief.php +++ b/hwe/func_process_chief.php @@ -397,7 +397,7 @@ function process_52(&$general) { $younation = MYDB_fetch_array($result); if($gold > $mynation['gold']-GameConst::$basegold) { $gold = $mynation['gold'] - GameConst::$basegold; } - if($rice > $mynation['rice']-GameConst::$baserice) { $rice = $mynation['rice'] - GameConst::$basegold; } + if($rice > $mynation['rice']-GameConst::$baserice) { $rice = $mynation['rice'] - GameConst::$baserice; } if($younation['nation'] == 0) { $log[] = "●{$admin['month']}월:멸망한 국가입니다. 원조 실패. <1>$date";