From 584b7b8e45a0a0bb94b772602564564edc76e378 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sat, 4 May 2019 16:18:53 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=98=81=EB=A6=89=20=EC=9E=A5=EC=82=AC=20?= =?UTF-8?q?=EA=B5=AC=EC=A7=80=EB=8F=84=20=EB=B3=B5=EA=B5=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/CityConstBase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hwe/sammo/CityConstBase.php b/hwe/sammo/CityConstBase.php index c7673351..18a28c71 100644 --- a/hwe/sammo/CityConstBase.php +++ b/hwe/sammo/CityConstBase.php @@ -70,7 +70,7 @@ class CityConstBase{ [11, '수춘', '대', 5143, 99, 96, 80, 99, 95, '중원', 395, 270, ['서주', '여남', '초', '합비']], [12, '서주', '대', 4853,101, 98, 80,102, 97, '중원', 440, 250, ['수춘', '하비', '초', '패']], [13, '강릉', '대', 4850,105, 96, 80, 95, 96, '초', 245, 335, ['장사', '무릉', '이릉', '장판']], - [14, '장사', '대', 4710, 97, 99, 80,100,105, '초', 255, 375, ['강릉', '시상', '계양', '무릉']], + [14, '장사', '대', 4710, 97, 99, 80,100,105, '초', 255, 375, ['강릉', '시상', '계양', '무릉', '영릉']], [15, '시상', '대', 5252, 98,100,100, 99, 96, '오월', 360, 360, ['장사', '여강', '고창', '적벽', '파양']], [16, '위례', '대', 4926,100, 93, 80, 98,103, '동이', 620, 145, ['평양', '사비', '계림', '안평', '동황']], [17, '계', '중', 3885, 75, 80, 60, 78, 81, '하북', 365, 35, ['진양', '역경']], @@ -110,7 +110,7 @@ class CityConstBase{ [51, '신야', '소', 2786, 60, 62, 40, 58, 55, '초', 250, 260, ['양양', '완', '상용']], [52, '강하', '소', 3074, 55, 56, 40, 57, 60, '초', 315, 295, ['장판', '적벽']], [53, '무릉', '소', 3196, 58, 63, 40, 63, 58, '초', 195, 355, ['강릉', '장사', '영릉']], - [54, '영릉', '소', 2849, 62, 58, 40, 62, 62, '초', 190, 395, ['계양', '남영', '무릉']], + [54, '영릉', '소', 2849, 62, 58, 40, 62, 62, '초', 190, 395, ['계양', '남영', '무릉', '장사']], [55, '상동', '소', 2767, 58, 59, 40, 62, 58, '초', 210, 435, ['남해', '계양', '고창']], [56, '여강', '소', 2905, 56, 58, 40, 60, 55, '오월', 380, 315, ['시상', '합비', '적벽', '파양']], [57, '회계', '소', 3005, 64, 59, 40, 62, 64, '오월', 480, 395, ['오', '산월']], From 8f9ae78b8cb4b98a0d53e06b1c7d0eeaf2caf6d8 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sat, 4 May 2019 16:38:44 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EB=A6=AC=EC=85=8B=20?= =?UTF-8?q?=EA=B6=8C=ED=95=9C=EC=9E=90=EB=8A=94=20=EC=84=9C=EB=B2=84=20?= =?UTF-8?q?=EC=8B=9C=EC=9E=91,=20=EB=98=90=EB=8A=94=20=EC=B2=9C=ED=86=B5?= =?UTF-8?q?=EC=8B=9C=20=EB=8B=AB=EC=9D=84=20=EC=88=98=20=EC=9E=88=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i_entrance/j_server_change_status.php | 34 ++++++++++++++++++++++++++- js/admin_server.js | 2 +- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/i_entrance/j_server_change_status.php b/i_entrance/j_server_change_status.php index 6b791b41..5a7f336b 100644 --- a/i_entrance/j_server_change_status.php +++ b/i_entrance/j_server_change_status.php @@ -39,7 +39,39 @@ function doServerModeSet($server, $action, &$response, $session){ $serverPath = $settingObj->getBasePath(); $realServerPath = realpath(dirname(__FILE__)).'/'.$serverPath; - if($action == 'close' && ($userGrade >= 5 || in_array('openClose', $serverAcl))) { //폐쇄 + if($action == 'close') { //폐쇄 + $doClose = false; + if($userGrade >= 5){ + $doClose = true; + } + else if(in_array('openClose', $serverAcl)){ + $doClose = true; + } + + if(!$doClose && in_array('reset', $serverAcl) && file_exists($serverPath.'/d_setting/DB.php')){ + require($serverPath.'/lib.php'); + $localGameStorage = KVStorage::getStorage(DB::db(), 'game_env'); + //천통 이후, 오픈 직후는 닫을 수 있음 + $localGameStorage->cacheValues(['isunited', 'startyear', 'year']); + + if($localGameStorage->isunited){ + $doClose = true; + } + else if($localGameStorage->year < $localGameStorage->startyear + 2){ + $doClose = true; + } + + } + + if(!$doClose){ + if(in_array('reset', $serverAcl)){ + $response['msg'] = '서버 시작 직후, 또는 천하통일 이후에만 닫을 수 있습니다.'; + } + else{ + $response['msg'] = '서버 닫기 권한이 부족합니다.'; + } + return false; + } return $settingObj->closeServer(); } elseif($action == 'reset' && $userGrade >= 6) {//리셋 //FIXME: reset, reset_full 구현 diff --git a/js/admin_server.js b/js/admin_server.js index 4467efc9..e2c4475d 100644 --- a/js/admin_server.js +++ b/js/admin_server.js @@ -131,7 +131,7 @@ function drawServerAdminList(serverList){ if(!server.installed){ return true; } - $tr.find('.serv_act_reset').prop('disabled', false); + $tr.find('.serv_act_reset, .serv_act_close').prop('disabled', false); } }); });