From 943e2be676f5e562cfa64ce5cbd382a42998442f Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 9 May 2019 01:59:06 +0900
Subject: [PATCH] =?UTF-8?q?=EC=BB=A4=EB=A7=A8=EB=93=9C=20=EC=B0=BD?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EA=B0=80=EC=98=A4=ED=94=88=20=EB=95=8C?=
 =?UTF-8?q?=EB=AC=B8=EC=97=90=20=ED=84=B4=EC=9D=B4=20=EC=9D=B4=EC=83=81?=
 =?UTF-8?q?=ED=95=98=EA=B2=8C=20=EB=B3=B4=EC=9D=B4=EB=8A=94=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/commandlist.php       | 4 ++--
 hwe/sammo/ResetHelper.php | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hwe/commandlist.php b/hwe/commandlist.php
index 9662029b..35ec1877 100644
--- a/hwe/commandlist.php
+++ b/hwe/commandlist.php
@@ -78,7 +78,7 @@ function myCommandList() {
     $date = date('Y-m-d H:i:s');
 
     // 명령 목록
-    $admin = $gameStor->getValues(['year','month','turnterm','turntime']);
+    $admin = $gameStor->getValues(['year','month','turnterm','turntime','opentime']);
 
     $me = $db->queryFirstRow("SELECT `no`,turntime,term,turn0,turn1,turn2,turn3,turn4,turn5,turn6,turn7,turn8,turn9,turn10,turn11,turn12,turn13,turn14,turn15,turn16,turn17,turn18,turn19,turn20,turn21,turn22,turn23 FROM general WHERE `owner`=%s", $userID);
     if(!$me){
@@ -97,7 +97,7 @@ function myCommandList() {
     $month = $admin['month'];
     // 실행된 턴시간이면 +1
     $cutTurn = cutTurn($me['turntime'], $admin['turnterm']);
-    if($date <= $cutTurn && $date < $admin['tuntime']) { $month++; }
+    if($date <= $cutTurn && $date >= $admin['opentime']) { $month++; }
 
     $totaldate = $me['turntime'];
 
diff --git a/hwe/sammo/ResetHelper.php b/hwe/sammo/ResetHelper.php
index e5e6d057..bf1bf6ef 100644
--- a/hwe/sammo/ResetHelper.php
+++ b/hwe/sammo/ResetHelper.php
@@ -228,6 +228,7 @@ class ResetHelper{
             'develcost'=>$develcost,
             'turntime'=>$turntime,
             'starttime'=>$starttime,
+            'opentime'=>$turntime,
             'turnterm'=>$turnterm,
             'killturn'=>$killturn,
             'genius'=>GameConst::$defaultMaxGenius,