From dd7007461cfe2bf95708333c438cdc054c7836e4 Mon Sep 17 00:00:00 2001 From: sars Date: Mon, 19 Feb 2018 09:05:40 -0800 Subject: [PATCH 1/2] =?UTF-8?q?=EC=88=99=EB=A0=A8=EB=8F=84=EC=97=90=20?= =?UTF-8?q?=ED=9B=88=EB=A0=A8=EA=B3=BC=20=EC=82=AC=EA=B8=B0=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- che_close/func.php | 3 ++- che_close/func_process.php | 19 +++++++++++-------- che_close/process_war.php | 12 ++++++------ 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/che_close/func.php b/che_close/func.php index 51c6b78..cd662c1 100644 --- a/che_close/func.php +++ b/che_close/func.php @@ -1080,11 +1080,12 @@ function getGenDex($general, $type) { return $general["dex{$type}"]; } -function addGenDex($connect, $no, $type, $exp) { +function addGenDex($connect, $no, $atmos, $train, $type, $exp) { $type = floor($type / 10) * 10; $dexType = "dex{$type}"; if($type == 30) { $exp = round($exp * 0.90); } //귀병은 90%효율 elseif($type == 40) { $exp = round($exp * 0.90); } //차병은 90%효율 + $exp = $exp * ($atmos+$train)/200; // 사기 + 훈련 / 200 $query = "update general set {$dexType}={$dexType}+{$exp} where no='$no'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/che_close/func_process.php b/che_close/func_process.php index a492a9b..1ae4cde 100644 --- a/che_close/func_process.php +++ b/che_close/func_process.php @@ -1,5 +1,8 @@ ●{$admin[month]}월:$crewstr 숙련도 향상이 지지부진했습니다. <1>$date"; } elseif($ratio < 66) { $exp = $exp * 2; // 숙련도 증가 - addGenDex($connect, $general[no], $general[crewtype], $crewexp * 2); + addGenDex($connect, $general[no],DEFAULT_ATMOS, DEFAULT_TRAIN, $general[crewtype], $crewexp * 2); $log[count($log)] = "●{$admin[month]}월:$crewstr 숙련도가 향상되었습니다. <1>$date"; } else { $exp = $exp * 3; // 숙련도 증가 - addGenDex($connect, $general[no], $general[crewtype], $crewexp * 3); + addGenDex($connect, $general[no], DEFAULT_ATMOS, DEFAULT_TRAIN, $general[crewtype], $crewexp * 3); $log[count($log)] = "●{$admin[month]}월:$crewstr 숙련도가 일취월장했습니다. <1>$date"; } diff --git a/che_close/process_war.php b/che_close/process_war.php index 66917f9..e69f014 100644 --- a/che_close/process_war.php +++ b/che_close/process_war.php @@ -404,8 +404,8 @@ function processWar($connect, $general, $city) { $query = "update general set crew='$general[crew]',killcrew=killcrew+'$mykillnum',deathcrew=deathcrew+'$mydeathnum' where no='$general[no]'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 숙련도 증가 - addGenDex($connect, $general[no], $general[crewtype], $mykillnum); - addGenDex($connect, $general[no], 40, $mydeathnum); + addGenDex($connect, $general[no], $general[atmos], $general[train], $general[crewtype], $mykillnum); + addGenDex($connect, $general[no], $general[atmos], $general[train], 40, $mydeathnum); // 죽은수 기술로 누적 $num = round($mydeathnum * 0.01); // 국가보정 @@ -1243,8 +1243,8 @@ function processWar($connect, $general, $city) { $query = "update general set injury='$oppose[injury]',crew='$oppose[crew]',killcrew=killcrew+'$opkillnum',deathcrew=deathcrew+'$opdeathnum' where no='$oppose[no]'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 숙련도 증가 - addGenDex($connect, $oppose[no], $oppose[crewtype], $opkillnum * 0.9); - addGenDex($connect, $oppose[no], $general[crewtype], $opdeathnum * 0.9); + addGenDex($connect, $oppose[no], $oppose[atmos], $oppose[train], $oppose[crewtype], $opkillnum * 0.9); + addGenDex($connect, $oppose[no], $oppose[atmos], $oppose[train], $general[crewtype], $opdeathnum * 0.9); // 죽은수 기술로 누적 $num = round($mydeathnum * 0.01); // 국가보정 @@ -1266,8 +1266,8 @@ function processWar($connect, $general, $city) { $query = "update general set injury='$general[injury]',crew='$general[crew]',killcrew=killcrew+'$mykillnum',deathcrew=deathcrew+'$mydeathnum' where no='$general[no]'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 숙련도 증가 - addGenDex($connect, $general[no], $general[crewtype], $mykillnum); - addGenDex($connect, $general[no], $oppose[crewtype], $mydeathnum); + addGenDex($connect, $general[no], $general[atmos], $general[train], $general[crewtype], $mykillnum); + addGenDex($connect, $general[no], $general[atmos], $general[train], $oppose[crewtype], $mydeathnum); // 죽은수 기술로 누적 $num = round($opdeathnum * 0.01); // 국가보정 From d76404ad968314ad7fce6b8a9f79c4db6ec53b97 Mon Sep 17 00:00:00 2001 From: hide_d Date: Fri, 23 Feb 2018 01:25:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=84=A0=EB=8F=99=20=EC=8B=A4=ED=8C=A8?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- che_close/func_process.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/che_close/func_process.php b/che_close/func_process.php index 1ae4cde..e922a6c 100644 --- a/che_close/func_process.php +++ b/che_close/func_process.php @@ -2788,7 +2788,7 @@ function process_35($connect, &$general) { } elseif($dip[state] >= 7) { $log[count($log)] = "●{$admin[month]}월:불가침국입니다. $destcity[name]에 선동 실패. <1>$date"; } else { - $query = "select leader,horse,power,weap,intel,book,injury from general where city='$destination' and nation='$destcity[nation]' order by sum desc"; + $query = "select leader,horse,power,weap,intel,book,injury from general where city='$destination' and nation='$destcity[nation]' order by leader desc"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gen = MYDB_fetch_array($result);