From f6a3df7858b081905f3717b88b1ff26efff3a3d1 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 30 May 2020 02:08:16 +0900
Subject: [PATCH] =?UTF-8?q?=EC=88=98=EB=B9=84=20=EC=BC=AC=EB=81=94=20?=
 =?UTF-8?q?=EB=8B=A4=EC=96=91=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/b_myPage.php                  | 22 +++++++++++++---------
 hwe/sammo/TurnExecutionHelper.php |  2 +-
 hwe/sql/schema.sql                |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php
index c04bf440..36d3eb86 100644
--- a/hwe/b_myPage.php
+++ b/hwe/b_myPage.php
@@ -5,7 +5,7 @@ include "lib.php";
 include "func.php";
 
 $btn = Util::getPost('btn');
-$defence_train = Util::getPost('defence_train', 'int', 2);
+$defence_train = Util::getPost('defence_train', 'int', 80);
 $tnmt = Util::getPost('tnmt', 'int', 1);
 //$detachNPC = Util::getPost('detachNPC', 'bool');
 $detachNPC = false;
@@ -13,11 +13,12 @@ $detachNPC = false;
 $showDieImmediatelyBtn = false;
 $availableDieImmediately = false;
 
-if ($defence_train <= 60) {
-    $defence_train = 60;
+if ($defence_train <= 40) {
+    $defence_train = 40;
 }
-else if($defence_train <= 80){
-    $defence_train = 80;
+
+if($defence_train <= 90){
+    $defence_train = Util::round($defence_train, -1);
 }
 else{
     $defence_train = 999;
@@ -145,10 +146,13 @@ $('#die_immediately').click(function(){
                 <input type=radio name=tnmt value=1 <?=$me->getVar('tnmt')==1?"checked":""; ?>>자동참여
                 】<br>
                ∞<font color=orange>개막직전 남는자리가 있을경우 랜덤하게 참여합니다.</font><br><br>
-                수비 【
-                <input type=radio name=defence_train  value=80 <?=$me->getVar('defence_train')==80?"checked":""; ?>>◎(훈사80)
-                <input type=radio name=defence_train  value=60 <?=$me->getVar('defence_train')==60?"checked":""; ?>>○(훈사60)
-                <input type=radio name=defence_train  value=999 <?=$me->getVar('defence_train')==999?"checked":""; ?>>×
+                수비 【<select name='defence_train'>
+                <option value=90 <?=$me->getVar('defence_train')==90?"selected":""; ?>>☆(훈사90)</option>
+                <option value=80 <?=$me->getVar('defence_train')==80?"selected":""; ?>>◎(훈사80)</option>
+                <option value=60 <?=$me->getVar('defence_train')==60?"selected":""; ?>>○(훈사60)</option>
+                <option value=40 <?=$me->getVar('defence_train')==40?"selected":""; ?>>△(훈사40)</option>
+                <option value=999 <?=$me->getVar('defence_train')==999?"selected":""; ?>>×[훈련, 사기 -3]</option>
+                </select>
                 】<br><br>
                 <input type=<?=$submit?> name=btn style=background-color:<?=GameConst::$basecolor2?>;color:white;width:160px;height:30px;font-size:13px; value=설정저장><br>
                 ∞<font color=orange>설정저장은 이달중 <?=$myset?>회 남았습니다.</font><br><br>
diff --git a/hwe/sammo/TurnExecutionHelper.php b/hwe/sammo/TurnExecutionHelper.php
index 2ba689d3..04c92544 100644
--- a/hwe/sammo/TurnExecutionHelper.php
+++ b/hwe/sammo/TurnExecutionHelper.php
@@ -292,7 +292,7 @@ class TurnExecutionHelper
             pullGeneralCommand($general->getID());
 
             $currentTurn = $general->getTurnTime();
-            $general->increaseVarWithLimit('myset', 1, null, 3);
+            $general->increaseVarWithLimit('myset', 3, null, 9);
 
             $turnObj->updateTurnTime();
             $turnObj->applyDB();
diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql
index 26aae210..f982b627 100644
--- a/hwe/sql/schema.sql
+++ b/hwe/sql/schema.sql
@@ -72,7 +72,7 @@ CREATE TABLE `general` (
 	`specage2` INT(2) NULL DEFAULT '0',
 	`defence_train` INT(3) NULL DEFAULT '80',
 	`tnmt` INT(1) NULL DEFAULT '1',
-	`myset` INT(1) NULL DEFAULT '3',
+	`myset` INT(1) NULL DEFAULT '6',
 	`tournament` INT(1) NULL DEFAULT '0',
 	`vote` INT(1) NULL DEFAULT '0',
 	`newvote` INT(1) NULL DEFAULT '0',