From 8345201cd0ee78c5701074e379c18643b0bda1cc Mon Sep 17 00:00:00 2001 From: hide_d Date: Thu, 29 Mar 2018 22:15:35 +0900 Subject: [PATCH] =?UTF-8?q?turnterm=EC=9D=84=200~7=EC=9D=B4=20=EC=95=84?= =?UTF-8?q?=EB=8B=88=EB=9D=BC=20=EB=B6=84=20=EB=8B=A8=EC=9C=84=EB=A1=9C=20?= =?UTF-8?q?=EB=8F=8C=EB=8F=84=EB=A1=9D=20=EA=B0=9C=EC=84=A0=20-=20addTurn,?= =?UTF-8?q?=20cutTurn=20=ED=95=A8=EC=88=98=EB=93=A4=EC=9D=84=20=EC=9E=AC?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- twe/_admin1_submit.php | 17 +- twe/b_chiefcenter.php | 5 - twe/c_auction.php | 11 +- twe/func.php | 382 +++++++----------------------------- twe/func_auction.php | 11 +- twe/func_legacy.php | 11 +- twe/func_process_chief.php | 4 +- twe/index.php | 8 +- twe/j_server_basic_info.php | 12 +- twe/sql/schema.sql | 2 +- 10 files changed, 85 insertions(+), 378 deletions(-) diff --git a/twe/_admin1_submit.php b/twe/_admin1_submit.php index 8030fd10..023081ef 100644 --- a/twe/_admin1_submit.php +++ b/twe/_admin1_submit.php @@ -59,15 +59,16 @@ switch($btn) { case "60분턴": case "120분턴": switch($btn) { - case "1분턴": $turnterm = 7; $unit = 60; break; - case "2분턴": $turnterm = 6; $unit = 120; break; - case "5분턴": $turnterm = 5; $unit = 300; break; - case "10분턴": $turnterm = 4; $unit = 600; break; - case "20분턴": $turnterm = 3; $unit = 1200; break; - case "30분턴": $turnterm = 2; $unit = 1800; break; - case "60분턴": $turnterm = 1; $unit = 3600; break; - case "120분턴": $turnterm = 0; $unit = 7200; break; + case "1분턴": $turnterm = 1; break; + case "2분턴": $turnterm = 2; break; + case "5분턴": $turnterm = 5; break; + case "10분턴": $turnterm = 10; break; + case "20분턴": $turnterm = 20; break; + case "30분턴": $turnterm = 30; break; + case "60분턴": $turnterm = 60; break; + case "120분턴": $turnterm = 120; break; } + $unit = $turnterm * 60; $turn = ($admin['year'] - $admin['startyear']) * 12 + $admin['month'] - 1; $starttime = date("Y-m-d H:i:s", strtotime($admin['turntime']) - $turn * $unit); $starttime = cutTurn($starttime, $turnterm); diff --git a/twe/b_chiefcenter.php b/twe/b_chiefcenter.php index 335a8aef..e6aa7e3c 100644 --- a/twe/b_chiefcenter.php +++ b/twe/b_chiefcenter.php @@ -31,11 +31,6 @@ if($me['level'] == 0 || ($me['level'] == 1 && $me['belong'] < $nation['secretlim if($me['level'] >= 5) { $btn = "submit"; $btn2 = "button"; } else { $btn = "hidden"; $btn2 = "hidden"; } -if($me['skin'] < 1) { - $tempColor = $_basecolor; $tempColor2 = $_basecolor2; $tempColor3 = $_basecolor3; $tempColor4 = $_basecolor4; - $_basecolor = "000000"; $_basecolor2 = "000000"; $_basecolor3 = "000000"; $_basecolor4 = "000000"; -} - $date = date('Y-m-d H:i:s'); // 명령 목록 diff --git a/twe/c_auction.php b/twe/c_auction.php index 04d05fa2..6be9529f 100644 --- a/twe/c_auction.php +++ b/twe/c_auction.php @@ -26,16 +26,7 @@ $bidCount = MYDB_num_rows($result); $btCount = $tradeCount + $bidCount; -switch($admin['turnterm']) { -case 0: $unit = 7200; break; -case 1: $unit = 3600; break; -case 2: $unit = 1800; break; -case 3: $unit = 1200; break; -case 4: $unit = 600; break; -case 5: $unit = 300; break; -case 6: $unit = 120; break; -case 7: $unit = 60; break; -} +$unit = $admin['turnterm'] * 60; $amount = round($amount / 10) * 10; $cost = round($cost / 10) * 10; diff --git a/twe/func.php b/twe/func.php index 92717143..0043e3cc 100644 --- a/twe/func.php +++ b/twe/func.php @@ -1522,224 +1522,49 @@ function banner() { return sprintf('%s / %s
%s', GameConst::$version, GameConst::$banner, GameConst::$helper); } -function addTurn($date, $turnterm=1) { - $lastday = array(0,31,28,31,30,31,30,31,31,30,31,30,31); - - $year = $date[0].$date[1].$date[2].$date[3]; - $month = floor($date[5].$date[6]); - $day = $date[8].$date[9]; - $hour = $date[11].$date[12]; - $min = $date[14].$date[15]; - $sec = $date[17].$date[18]; - - //윤년계산 - if((($year % 4 == 0) && ($year % 100 != 0)) || ($year % 400 == 0)) { $lastday[2] = 29; } - - if($turnterm == 0) { $hour += 2; } - elseif($turnterm == 1) { $hour += 1; } - elseif($turnterm == 2) { $min += 30; } - elseif($turnterm == 3) { $min += 20; } - elseif($turnterm == 4) { $min += 10; } - elseif($turnterm == 5) { $min += 5; } - elseif($turnterm == 6) { $min += 2; } - elseif($turnterm == 7) { $min += 1; } - - if($min >= 60) { $min %= 60; $hour++; } - if($hour >= 24) { $hour %= 24; $day++; } - if($day > $lastday[$month]) { $month++; $day = 1; } - if($month >= 13) { $year++; $month = 1; } - - $month = StringUtil::Fill2($month, 2, "0"); - $day = StringUtil::Fill2($day, 2, "0"); - $hour = StringUtil::Fill2($hour, 2, "0"); - $min = StringUtil::Fill2($min, 2, "0"); - $sec = StringUtil::Fill2($sec, 2, "0"); - - return "{$year}-{$month}-{$day} {$hour}:{$min}:{$sec}"; +function addTurn($date, int $turnterm, int $turn=1) { + $date = new \DateTime($date); + $target = $turnterm*$turn; + $date->add(new \DateInterval("PT{$target}M")); + return $date->format('Y-m-d H:i:s'); } -function add12Turn($date, $turnterm=1) { - $lastday = array(0,31,28,31,30,31,30,31,31,30,31,30,31); - - $year = $date[0].$date[1].$date[2].$date[3]; - $month = floor($date[5].$date[6]); - $day = $date[8].$date[9]; - $hour = $date[11].$date[12]; - $min = $date[14].$date[15]; - $sec = $date[17].$date[18]; - - //윤년계산 - if((($year % 4 == 0) && ($year % 100 != 0)) || ($year % 400 == 0)) { $lastday[2] = 29; } - - if($turnterm == 0) { $day += 1; } - elseif($turnterm == 1) { $hour += 12; } - elseif($turnterm == 2) { $hour += 6; } - elseif($turnterm == 3) { $hour += 4; } - elseif($turnterm == 4) { $hour += 2; } - elseif($turnterm == 5) { $hour += 1; } - elseif($turnterm == 6) { $min += 24; } - elseif($turnterm == 7) { $min += 12; } - - if($min >= 60) { $min %= 60; $hour++; } - if($hour >= 24) { $hour %= 24; $day++; } - if($day > $lastday[$month]) { $month++; $day = 1; } - if($month >= 13) { $year++; $month = 1; } - - $month = StringUtil::Fill2($month, 2, "0"); - $day = StringUtil::Fill2($day, 2, "0"); - $hour = StringUtil::Fill2($hour, 2, "0"); - $min = StringUtil::Fill2($min, 2, "0"); - $sec = StringUtil::Fill2($sec, 2, "0"); - - return "{$year}-{$month}-{$day} {$hour}:{$min}:{$sec}"; +function subTurn($date, int $turnterm, int $turn=1) { + $date = new \DateTime($date); + $target = $turnterm*$turn; + $date->sub(new \DateInterval("PT{$target}M")); + return $date->format('Y-m-d H:i:s'); } -function subTurn($date, $turnterm=1) { - $lastday = array(0,31,28,31,30,31,30,31,31,30,31,30,31); +function cutTurn($date, int $turnterm) { + $date = new \DateTime($date); + + $baseDate = new \DateTime($date->format('Y-m-d')); + $baseDate->sub(new \DateInterval("P1D")); - $year = $date[0].$date[1].$date[2].$date[3]; - $month = floor($date[5].$date[6]); - $day = $date[8].$date[9]; - $hour = $date[11].$date[12]; - $min = $date[14].$date[15]; - $sec = $date[17].$date[18]; + $diffMin = intdiv($date->getTimeStamp() - $baseDate->getTimeStamp(), 60); + $diffMin -= $diffMin % $turnterm; - if($turnterm == 0) { $hour -= 2; } - elseif($turnterm == 1) { $hour -= 1; } - elseif($turnterm == 2) { $min -= 30; } - elseif($turnterm == 3) { $min -= 20; } - elseif($turnterm == 4) { $min -= 10; } - elseif($turnterm == 5) { $min -= 5; } - elseif($turnterm == 6) { $min -= 2; } - elseif($turnterm == 7) { $min -= 1; } - - //윤년계산 - if((($year % 4 == 0) && ($year % 100 != 0)) || ($year % 400 == 0)) { $lastday[2] = 29; } - - if($min < 0) { $min = 60 + $min; $hour--; } - if($hour < 0) { $hour = 24 + $hour; $day--; } - if($day <= 0) { $month--; $day = $lastday[$month]; } - if($month <= 0) { $year--; $month = 12; } - - $year = StringUtil::Fill2($year, 2, "0"); - $month = StringUtil::Fill2($month, 2, "0"); - $day = StringUtil::Fill2($day, 2, "0"); - $hour = StringUtil::Fill2($hour, 2, "0"); - $min = StringUtil::Fill2($min, 2, "0"); - $sec = StringUtil::Fill2($sec, 2, "0"); - - return "{$year}-{$month}-{$day} {$hour}:{$min}:{$sec}"; + $baseDate->add(new \DateInterval("PT{$diffMin}M")); + return $baseDate->format('Y-m-d H:i:s'); } -function cutTurn($date, $turnterm=1) { - // 0123456789012345678 - // $date = "2000-01-01 00:00:00"; - // 0 : 120분, 1 : 60분, 2 : 30분, 3 : 10분, 4 : 5분 - switch($turnterm) { - case 0: - $hour = $date[11].$date[12]; - if($hour % 2 == 1) { $hour--; } - $date[11] = floor($hour / 10); - $date[12] = $hour % 10; - $date[14] = "0"; - $date[15] = "0"; - $date[17] = "0"; - $date[18] = "0"; - break; - case 1: - $date[14] = "0"; - $date[15] = "0"; - $date[17] = "0"; - $date[18] = "0"; - break; - case 2: - $min = $date[14].$date[15]; - if($min < 30) { $min = 0; } - else { $min = 30; } - $date[14] = floor($min / 10); - $date[15] = $min % 10; - $date[17] = "0"; - $date[18] = "0"; - break; - case 3: - $min = $date[14].$date[15]; - if($min < 20) { $min = 0; } - elseif($min < 40) { $min = 20; } - else { $min = 40; } - $date[14] = floor($min / 10); - $date[15] = $min % 10; - $date[17] = "0"; - $date[18] = "0"; - break; - case 4: - $min = $date[14].$date[15]; - if($min < 10) { $min = 0; } - elseif($min < 20) { $min = 10; } - elseif($min < 30) { $min = 20; } - elseif($min < 40) { $min = 30; } - elseif($min < 50) { $min = 40; } - else { $min = 50; } - $date[14] = floor($min / 10); - $date[15] = $min % 10; - $date[17] = "0"; - $date[18] = "0"; - break; - case 5: - $min = $date[14].$date[15]; - if($min < 5) { $min = 0; } - elseif($min < 10) { $min = 5; } - elseif($min < 15) { $min = 10; } - elseif($min < 20) { $min = 15; } - elseif($min < 25) { $min = 20; } - elseif($min < 30) { $min = 25; } - elseif($min < 35) { $min = 30; } - elseif($min < 40) { $min = 35; } - elseif($min < 45) { $min = 40; } - elseif($min < 50) { $min = 45; } - elseif($min < 55) { $min = 50; } - else { $min = 55; } - $date[14] = floor($min / 10); - $date[15] = $min % 10; - $date[17] = "0"; - $date[18] = "0"; - break; - case 6: - $min = $date[14].$date[15]; - $min = floor($min / 2) * 2; - $date[14] = floor($min / 10); - $date[15] = $min % 10; - $date[17] = "0"; - $date[18] = "0"; - break; - case 7: - $date[17] = "0"; - $date[18] = "0"; - break; +function cutDay($date, int $turnterm) { + $date = new \DateTime($date); + + $baseDate = new \DateTime($date->format('Y-m-d')); + $baseDate->sub(new \DateInterval("P1D")); + + $baseGap = 60*24 / $turnterm; + + $diffMin = intdiv($date->getTimeStamp() - $baseDate->getTimeStamp(), 60); + if($diffMin % $baseGap != 0){ + $diffMin += $baseGap; } + $diffMin -= $diffMin % $baseGap; - return $date; -} - -function CutDay($date) { - $hour = $date[11].$date[12]; - if($hour >= 19) { - $date[11] = "0"; - $date[12] = "1"; - - $date = add12Turn($date, 1); - $date = add12Turn($date, 1); - } elseif($hour < 07) { - $date[11] = "0"; - $date[12] = "1"; - } else { - $date[11] = "1"; - $date[12] = "3"; - } - $date[14] = "0"; - $date[15] = "0"; - $date[17] = "0"; - $date[18] = "0"; - return $date; + $baseDate->add(new \DateInterval("PT{$diffMin}M")); + return $baseDate->format('Y-m-d H:i:s'); } function increaseRefresh($type="", $cnt=1) { @@ -1822,51 +1647,24 @@ function updateTraffic() { fclose($fp); } -function CheckOverhead($connect) { +function CheckOverhead() { //서버정보 - $query = "select conweight,turnterm,conlimit from game where no='1'"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $admin = MYDB_fetch_array($result); + $db = DB::db(); + $admin = $db->queryFirstRow('SELECT conweight, turnterm, conlimit from GAME LIMIT 1'); - $onlineNumber = getOnlineNum(); - switch($admin['turnterm']) { - case 0: $thr1 = 30; $thr2 = 60; $thr3 = 120; $con1 = 480; $con2 = 360; $con3 = 240; $con4 = 120; break; // 120분턴 - case 1: $thr1 = 30; $thr2 = 60; $thr3 = 120; $con1 = 480; $con2 = 360; $con3 = 240; $con4 = 120; break; // 60분턴 - case 2: $thr1 = 10; $thr2 = 20; $thr3 = 30; $con1 = 360; $con2 = 240; $con3 = 120; $con4 = 60; break; // 30분턴 - case 3: $thr1 = 10; $thr2 = 20; $thr3 = 30; $con1 = 240; $con2 = 180; $con3 = 120; $con4 = 60; break; // 20분턴 - case 4: $thr1 = 10; $thr2 = 20; $thr3 = 30; $con1 = 240; $con2 = 180; $con3 = 120; $con4 = 60; break; // 10분턴 - case 5: $thr1 = 5; $thr2 = 10; $thr3 = 20; $con1 = 120; $con2 = 90; $con3 = 60; $con4 = 30; break; // 5분턴 - case 6: $thr1 = 5; $thr2 = 10; $thr3 = 20; $con1 = 90; $con2 = 60; $con3 = 40; $con4 = 30; break; // 2분턴 - case 7: $thr1 = 5; $thr2 = 10; $thr3 = 20; $con1 = 90; $con2 = 60; $con3 = 40; $con4 = 30; break; // 1분턴 - } + $con = $admin['turnterm'] * 6; + $con *= $admin['conweight'] / 100; - $thr1 *= $admin['conweight'] / 100; - $thr2 *= $admin['conweight'] / 100; - $thr3 *= $admin['conweight'] / 100; - $con1 *= $admin['conweight'] / 100; - $con2 *= $admin['conweight'] / 100; - $con3 *= $admin['conweight'] / 100; - $con4 *= $admin['conweight'] / 100; - //if($onlineNumber > $thr2) { $me['map'] = 1; } - if ($onlineNumber > $thr3 && $admin['conlimit'] != $con4) { - $query = "update game set conlimit='$con4' where no='1'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - } elseif($onlineNumber > $thr2 && $admin['conlimit'] != $con3) { - $query = "update game set conlimit='$con3' where no='1'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - } elseif($onlineNumber > $thr1 && $admin['conlimit'] != $con2) { - $query = "update game set conlimit='$con2' where no='1'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - } elseif($onlineNumber <= $thr1 && $admin['conlimit'] != $con1) { - $query = "update game set conlimit='$con1' where no='1'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - } else { + if($con != $admin['conlimit']){ + $db->update('game', [ + 'conlimit' => $con + ], true); } } function isLock() { - return DB::db()->queryFirstField("select plock from plock where no=1") != 0; + return DB::db()->queryFirstField("SELECT plock from plock limit 1") != 0; } function tryLock() { @@ -1875,10 +1673,11 @@ function tryLock() { //테이블 락 $db->query("lock tables plock write"); // 잠금 - $isUnlocked = $db->queryFirstField("select plock from plock where no=1") != 0; - if($isUnlocked){ - $db->query("update plock set plock=1 where no=1"); - } + $db->update('plock', [ + 'plock'=>1 + ], true); + + $isUnlocked = $db->affectedRows() > 0; //테이블 언락 $db->query("unlock tables"); @@ -1892,21 +1691,12 @@ function unlock() { DB::db()->query("update plock set plock=0 where no=1"); } -function timeover($connect) { - $query = "select turnterm,TIMESTAMPDIFF(SECOND,turntime,now()) as diff from game where no=1"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $admin = MYDB_fetch_array($result); +function timeover() { + $admin = DB::db()->queryFirstRow( + 'SELECT turnterm,TIMESTAMPDIFF(SECOND,turntime,now()) as diff from game limit 1' + ); - switch($admin['turnterm']) { - case 0: $t = 20; break; // 120분턴 - case 1: $t = 10; break; // 60분턴 - case 2: $t = 10; break; // 30분턴 - case 3: $t = 10; break; // 20분턴 - case 4: $t = 10; break; // 10분턴 - case 5: $t = 5; break; // 5분턴 - case 6: $t = 2; break; // 2분턴 - case 7: $t = 1; break; // 1분턴 - } + $t = min($admin['turnterm'], 5); $term = $admin['diff']; if($term >= $t || $term < 0) { return 1; } @@ -1919,15 +1709,15 @@ function checkDelay($connect) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); // 1턴이상 갱신 없었으면 서버 지연 - switch($admin['turnterm']) { - case 0: $term = 120; $threshold = 1; break; - case 1: $term = 60; $threshold = 1; break; - case 2: $term = 30; $threshold = 1; break; - case 3: $term = 20; $threshold = 1; break; - case 4: $term = 10; $threshold = 2; break; - case 5: $term = 5; $threshold = 3; break; - case 6: $term = 2; $threshold = 3; break; - case 7: $term = 1; $threshold = 3; break; + $term = $admin['turnterm']; + if($term >= 20){ + $threshold = 1; + } + else if($term >= 10){ + $threshold = 2; + } + else{ + $threshold = 3; } //지연 해야할 밀린 턴 횟수 $iter = floor($admin['offset'] / $term); @@ -1988,8 +1778,8 @@ function updateOnline($connect) { } function checkTurn($connect) { - // 잦은 갱신 금지 현재 10초당 1회 - if(!timeover($connect)) { return; } + // 잦은 갱신 금지 현재 5초당 1회 + if(!timeover()) { return; } // 현재 처리중이면 접근 불가 // 파일락 획득 @@ -2034,7 +1824,7 @@ function checkTurn($connect) { updateOnline($connect); //접속자 수 따라서 갱신제한 변경 //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', CheckOverhead'); - CheckOverhead($connect); + CheckOverhead(); //서버정보 $query = "select * from game where no='1'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -2196,10 +1986,7 @@ function checkTurn($connect) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 3턴 전 시간 - $letterdate = $date; - $letterdate = subTurn($letterdate, $admin['turnterm']); - $letterdate = subTurn($letterdate, $admin['turnterm']); - $letterdate = subTurn($letterdate, $admin['turnterm']); + $letterdate = subTurn($date, $admin['turnterm'], 3); //기한 지난 외교 메세지 지움(3개월 유지) //if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', '.__LINE__); for($i=0; $i < 5; $i++) { @@ -2278,16 +2065,7 @@ function turnDate($connect, $curtime) { $turn = $admin['starttime']; $curturn = cutTurn($curtime, $admin['turnterm']); $num = 0; - switch($admin['turnterm']) { - case 0: $term = 7200; break; - case 1: $term = 3600; break; - case 2: $term = 1800; break; - case 3: $term = 1200; break; - case 4: $term = 600; break; - case 5: $term = 300; break; - case 6: $term = 120; break; - case 7: $term = 60; break; - } + $term = $admin['turnterm']*60; $num = floor((strtotime($curturn) - strtotime($turn)) / $term); $year = $admin['startyear'] + floor($num / 12); @@ -3150,36 +2928,14 @@ function TrickInjury($connect, $city, $type=0) { } function getRandTurn($term) { - switch($term) { - case 0: $randtime = rand() % 7200; break; - case 1: $randtime = rand() % 3600; break; - case 2: $randtime = rand() % 1800; break; - case 3: $randtime = rand() % 1200; break; - case 4: $randtime = rand() % 600; break; - case 5: $randtime = rand() % 300; break; - case 6: $randtime = rand() % 120; break; - case 7: $randtime = rand() % 60; break; - default:$randtime = rand() % 3600; break; - } - + $randtime = $rand(0, 60 * $term - 1); $turntime = date('Y-m-d H:i:s', strtotime('now') + $randtime); return $turntime; } function getRandTurn2($term) { - switch($term) { - case 0: $randtime = rand() % 7200; break; - case 1: $randtime = rand() % 3600; break; - case 2: $randtime = rand() % 1800; break; - case 3: $randtime = rand() % 1200; break; - case 4: $randtime = rand() % 600; break; - case 5: $randtime = rand() % 300; break; - case 6: $randtime = rand() % 120; break; - case 7: $randtime = rand() % 60; break; - default:$randtime = rand() % 3600; break; - } - + $randtime = $rand(0, 60 * $term - 1); $turntime = date('Y-m-d H:i:s', strtotime('now') - $randtime); return $turntime; diff --git a/twe/func_auction.php b/twe/func_auction.php index 48317180..65aed423 100644 --- a/twe/func_auction.php +++ b/twe/func_auction.php @@ -21,16 +21,7 @@ function registerAuction($connect) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); - switch($admin['turnterm']) { - case 0: $unit = 7200; break; - case 1: $unit = 3600; break; - case 2: $unit = 1800; break; - case 3: $unit = 1200; break; - case 4: $unit = 600; break; - case 5: $unit = 300; break; - case 6: $unit = 120; break; - case 7: $unit = 60; break; - } + $unit = 60 * $admin['turnterm']; // 장수들 평금,평쌀 $query = "select avg(gold) as gold, avg(rice) as rice,max(gold) as maxgold from general where npc<2"; diff --git a/twe/func_legacy.php b/twe/func_legacy.php index d9ba5efe..dbf09750 100644 --- a/twe/func_legacy.php +++ b/twe/func_legacy.php @@ -137,16 +137,7 @@ function info($connect, $type=0, $skin=1) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); - switch($admin['turnterm']) { - case 0: $termtype="120분 턴"; break; - case 1: $termtype="60분 턴"; break; - case 2: $termtype="30분 턴"; break; - case 3: $termtype="20분 턴"; break; - case 4: $termtype="10분 턴"; break; - case 5: $termtype="5분 턴"; break; - case 6: $termtype="2분 턴"; break; - case 7: $termtype="1분 턴"; break; - } + $termtype = "{$admin['turnterm']}분 턴"; $query = "select no from general where npc<2"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/twe/func_process_chief.php b/twe/func_process_chief.php index 58ed001b..88262a23 100644 --- a/twe/func_process_chief.php +++ b/twe/func_process_chief.php @@ -575,9 +575,7 @@ function process_61($connect, &$general) { MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); // 3턴후 - $date = addTurn($date, $admin['turnterm']); - $date = addTurn($date, $admin['turnterm']); - $date = addTurn($date, $admin['turnterm']); + $date = addTurn($date, $admin['turnterm'], 3); //조건 표시기한 설정 $query = "update diplomacy set showing='{$date}' where me='{$general['nation']}' and you='{$younation['nation']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/twe/index.php b/twe/index.php index 0fcb546c..8ed57f78 100644 --- a/twe/index.php +++ b/twe/index.php @@ -54,11 +54,6 @@ $plock = MYDB_fetch_array($result); $con = checkLimit($me['con'], $admin['conlimit']); if($con >= 2) { printLimitMsg($me['turntime']); exit(); } -if($me['skin'] < 1) { - $tempColor = $_basecolor; $tempColor2 = $_basecolor2; $tempColor3 = $_basecolor3; $tempColor4 = $_basecolor4; - $_basecolor = "000000"; $_basecolor2 = "000000"; $_basecolor3 = "000000"; $_basecolor4 = "000000"; -} - $scenario = getScenario(); ?> @@ -102,8 +97,7 @@ if($admin['fiction'] == 0) { $fiction = "사실"; } else { $fiction = "가상"; $valid = 1; } if($admin['npcmode'] == 0) { $npcmode = "불가능"; } else { $npcmode = "가능"; $valid = 1; } -if($me['skin'] > 0) { $color = "cyan"; } -else { $color = "white"; } +$color = "cyan"; if($valid == 1) { echo " diff --git a/twe/j_server_basic_info.php b/twe/j_server_basic_info.php index 2f20fed5..b3aed371 100644 --- a/twe/j_server_basic_info.php +++ b/twe/j_server_basic_info.php @@ -44,17 +44,7 @@ function getScenarioName($scenario) { } function getTurnTerm($term) { - switch($term) { - case 0: $str = "120분 턴 서버"; break; - case 1: $str = "60분 턴 서버"; break; - case 2: $str = "30분 턴 서버"; break; - case 3: $str = "20분 턴 서버"; break; - case 4: $str = "10분 턴 서버"; break; - case 5: $str = "5분 턴 서버"; break; - case 6: $str = "2분 턴 서버"; break; - case 7: $str = "1분 턴 서버"; break; - } - return $str; + return "{$term}분 턴 서버"; } $db = DB::db(); diff --git a/twe/sql/schema.sql b/twe/sql/schema.sql index 0dbff72a..ee567744 100644 --- a/twe/sql/schema.sql +++ b/twe/sql/schema.sql @@ -379,7 +379,7 @@ create table game ( gold_rate int(3) default 100, rice_rate int(3) default 100, city_rate int(3) default 50, - turnterm int(1) default 1, + turnterm int(3) default 60, killturn int(6) default 80, turntime datetime, starttime datetime,