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..e922a6c 100644 --- a/che_close/func_process.php +++ b/che_close/func_process.php @@ -1,5 +1,8 @@ = 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); @@ -3039,17 +3042,17 @@ function process_41($connect, &$general) { if($ratio < 33) { // 숙련도 증가 - addGenDex($connect, $general[no], $general[crewtype], $crewexp); + addGenDex($connect, $general[no], DEFAULT_ATMOS, DEFAULT_TRAIN, $general[crewtype], $crewexp); $log[count($log)] = "●{$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); // 국가보정