From 9d6181ede13b5f0275a9388636e7309c5d6f413d Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 13 May 2018 00:52:16 +0900 Subject: [PATCH] =?UTF-8?q?game=20table=EC=9D=84=20KVStorage=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=EB=8C=80=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/_119.php | 8 ++- hwe/_119_b.php | 60 +++++++++++++--------- hwe/_admin1_submit.php | 20 +++----- hwe/_admin2.php | 13 +---- hwe/_admin2_submit.php | 4 +- hwe/_admin4.php | 6 +-- hwe/_admin5.php | 4 -- hwe/_simul.php | 42 ++++++++-------- hwe/a_bestGeneral.php | 7 +-- hwe/a_genList.php | 6 +-- hwe/a_history.php | 6 +-- hwe/a_kingdomList.php | 6 +-- hwe/a_status.php | 7 +-- hwe/a_traffic.php | 34 ++++++------- hwe/a_vote.php | 4 +- hwe/b_auction.php | 6 +-- hwe/b_battleCenter.php | 6 +-- hwe/b_betting.php | 2 +- hwe/b_chiefcenter.php | 2 +- hwe/b_dipcenter.php | 2 +- hwe/b_genList.php | 2 +- hwe/b_tournament.php | 2 +- hwe/c_betting.php | 5 +- hwe/c_tournament.php | 14 ++---- hwe/func.php | 88 +++++++++++++++------------------ hwe/func_map.php | 8 +-- hwe/func_process_chief.php | 80 +++++++++--------------------- hwe/func_process_sabotage.php | 16 ++---- hwe/func_template.php | 2 +- hwe/index.php | 2 +- hwe/j_autoreset.php | 6 +-- hwe/j_server_basic_info.php | 4 +- hwe/processing.php | 20 ++------ hwe/sammo/DiplomaticMessage.php | 5 +- hwe/sammo/Engine/Personnel.php | 2 +- hwe/turn.php | 3 +- 36 files changed, 196 insertions(+), 308 deletions(-) diff --git a/hwe/_119.php b/hwe/_119.php index 118d0a40..4d1f8296 100644 --- a/hwe/_119.php +++ b/hwe/_119.php @@ -28,9 +28,7 @@ $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); $connect=$db->get(); -$query = "select turntime,tnmt_time from game"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); -$admin = MYDB_fetch_array($result); +list($turntime, $tnmt_time) = $gameStor->getValuesAsArray(['turntime','tnmt_time']); $query = "select plock from plock"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -46,8 +44,8 @@ $plock = MYDB_fetch_array($result);
- 시간조정 : 최종갱신 :
- 시간조정 : 토너먼트 :
+ 시간조정 : 최종갱신 :
+ 시간조정 : 토너먼트 :
봉급지급 :
락 풀 기 : 현재 : 0?"동결중":"가동중"?>
diff --git a/hwe/_119_b.php b/hwe/_119_b.php index a6a7df24..2e82ecf1 100644 --- a/hwe/_119_b.php +++ b/hwe/_119_b.php @@ -28,32 +28,50 @@ extractMissingPostToGlobals(); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$connect=$db->get(); - switch($btn) { case "분당김": - $query = "update game set turntime=DATE_SUB(turntime, INTERVAL $minute MINUTE),starttime=DATE_SUB(starttime, INTERVAL $minute MINUTE),tnmt_time=DATE_SUB(tnmt_time, INTERVAL $minute MINUTE)"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $query = "update general set turntime=DATE_SUB(turntime, INTERVAL $minute MINUTE)"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $query = "update auction set expire=DATE_SUB(expire, INTERVAL $minute MINUTE)"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $gameStor->cacheValues('turntime', 'starttime', 'tnmt_time'); + $turntime = (new \DateTimeImmutable($gameStor->turntime))->sub(new \DateInterval("PT{$minute}M")); + $starttime = (new \DateTimeImmutable($gameStor->starttime))->sub(new \DateInterval("PT{$minute}M")); + $tnmt_time = (new \DateTimeImmutable($gameStor->tnmt_time))->sub(new \DateInterval("PT{$minute}M")); + + $gameStor->turntime = $turntime->format('Y-m-d H:i:s'); + $gameStor->starttime = $starttime->format('Y-m-d H:i:s'); + $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s'); + + $db->update('general', [ + 'turntime'=>$db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute) + ], true); + $db->update('auction', [ + 'expire'=>$db->sqleval('DATE_ADD(expire, INTERVAL %i MINUTE)', $minute) + ], true); break; case "분지연": - $query = "update game set turntime=DATE_ADD(turntime, INTERVAL $minute MINUTE),starttime=DATE_ADD(starttime, INTERVAL $minute MINUTE),tnmt_time=DATE_ADD(tnmt_time, INTERVAL $minute MINUTE)"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $query = "update general set turntime=DATE_ADD(turntime, INTERVAL $minute MINUTE)"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $query = "update auction set expire=DATE_ADD(expire, INTERVAL $minute MINUTE)"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $gameStor->cacheValues('turntime', 'starttime', 'tnmt_time'); + $turntime = (new \DateTimeImmutable($gameStor->turntime))->add(new \DateInterval("PT{$minute}M")); + $starttime = (new \DateTimeImmutable($gameStor->starttime))->add(new \DateInterval("PT{$minute}M")); + $tnmt_time = (new \DateTimeImmutable($gameStor->tnmt_time))->add(new \DateInterval("PT{$minute}M")); + + $gameStor->turntime = $turntime->format('Y-m-d H:i:s'); + $gameStor->starttime = $starttime->format('Y-m-d H:i:s'); + $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s'); + + $db->update('general', [ + 'turntime'=>$db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute) + ], true); + $db->update('auction', [ + 'expire'=>$db->sqleval('DATE_ADD(expire, INTERVAL %i MINUTE)', $minute) + ], true); break; case "토너분당김": - $query = "update game set tnmt_time=DATE_SUB(tnmt_time, INTERVAL $minute2 MINUTE)"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $tnmt_time = new \DateTime($gameStor->tnmt_time); + $tnmt_time->sub(new \DateInterval("PT{$minute2}M")); + $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s'); break; case "토너분지연": - $query = "update game set tnmt_time=DATE_ADD(tnmt_time, INTERVAL $minute2 MINUTE)"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $tnmt_time = new \DateTimeImmutable($gameStor->tnmt_time); + $tnmt_time->add(new \DateInterval("PT{$minute2}M")); + $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s'); break; case "금지급": processGoldIncome(); @@ -62,12 +80,10 @@ case "쌀지급": processRiceIncome(); break; case "락걸기": - $query = "update plock set plock=1"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $db->update('plock', ['plock'=>1], true); break; case "락풀기": - $query = "update plock set plock=0"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $db->update('plock', ['plock'=>0], true); break; } diff --git a/hwe/_admin1_submit.php b/hwe/_admin1_submit.php index d47f606a..55f7b25e 100644 --- a/hwe/_admin1_submit.php +++ b/hwe/_admin1_submit.php @@ -40,9 +40,7 @@ $admin = getAdmin(); switch ($btn) { case "변경": - $msg = addslashes(SQ2DQ($msg)); - $query = "update game set msg='$msg'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); + $gameStor->msg = $msg; break; case "로그쓰기": $lognum = $admin['historyindex'] + 1; @@ -52,20 +50,16 @@ switch ($btn) { pushWorldHistory(["★{$log}"]); break; case "변경1": - $query = "update game set starttime='$starttime'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); + $gameStor->starttime = (new \DateTime($starttime))->format('Y-m-d H:i:s'); break; case "변경2": - $query = "update game set maxgeneral='$maxgeneral'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); + $gameStor->maxgeneral = $maxgeneral; break; case "변경3": - $query = "update game set maxnation='$maxnation'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); + $gameStor->maxnation = $maxnation; break; case "변경4": - $query = "update game set startyear='$startyear'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); + $gameStor->startyear = $startyear; break; case "1분턴": case "2분턴": @@ -89,8 +83,8 @@ switch ($btn) { $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); - $query = "update game set turnterm='$turnterm',starttime='$starttime'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); + $gameStor->turnterm = $turnterm; + $gameStor->starttime = $starttime; // 턴시간이 길어지는 경우 랜덤턴 배정 if ($turnterm < $admin['turnterm']) { $query = "select no from general"; diff --git a/hwe/_admin2.php b/hwe/_admin2.php index afb6dade..481610d7 100644 --- a/hwe/_admin2.php +++ b/hwe/_admin2.php @@ -26,12 +26,7 @@ if($session->userGrade < 5) { } $db = DB::db(); -$gameStor = KVStorage::getStorage($db, 'game_env'); -$connect=$db->get(); -$query = "select conlimit from game limit 1"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); -$admin = MYDB_fetch_array($result); ?> @@ -60,13 +55,9 @@ $admin = MYDB_fetch_array($result); echo "