From bcf5b5cb7db86e2cbf08f1f8d0cbc621250caba9 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Sat, 24 Feb 2024 11:46:32 +0000
Subject: [PATCH] =?UTF-8?q?game:=20=ED=84=B4=20=EC=A7=80=EC=A0=95=20?=
 =?UTF-8?q?=EB=8B=A8=EC=9C=84=EB=A5=BC=201/30=EC=97=90=EC=84=9C=201/60?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/API/General/Join.php | 6 +++---
 hwe/ts/PageJoin.vue            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hwe/sammo/API/General/Join.php b/hwe/sammo/API/General/Join.php
index d9b14f87..0d17e34b 100644
--- a/hwe/sammo/API/General/Join.php
+++ b/hwe/sammo/API/General/Join.php
@@ -73,7 +73,7 @@ class Join extends \sammo\BaseAPI
             ->rule('in', 'character', array_merge(GameConst::$availablePersonality, ['Random']))
             ->rule('in', 'inheritSpecial', GameConst::$availableSpecialWar)
             ->rule('min', 'inheritTurntimeZone', 0)
-            ->rule('max', 'inheritTurntimeZone', 29)
+            ->rule('max', 'inheritTurntimeZone', 59)
             ->rule('in', 'inheritCity', array_keys(CityConst::all()))
             ->rule('integerArray', 'inheritBonusStat');
 
@@ -352,8 +352,8 @@ class Join extends \sammo\BaseAPI
         }
 
         if ($inheritTurntimeZone !== null) {
-            $inheritTurntime = $inheritTurntimeZone * ($admin['turnterm'] * 2);
-            $inheritTurntime += $rng->nextRangeInt(0, Util::clamp($admin['turnterm'] * 2 - 1, 0));
+            $inheritTurntime = $inheritTurntimeZone * $admin['turnterm'];
+            $inheritTurntime += $rng->nextRangeInt(0, Util::clamp($admin['turnterm'] - 1, 0));
 
             $userLogger->push(sprintf("턴 시간 %02d:%02d 로 지정", intdiv($inheritTurntime, 60), $inheritTurntime % 60), "inheritPoint");
 
diff --git a/hwe/ts/PageJoin.vue b/hwe/ts/PageJoin.vue
index e6743b75..0bd26430 100644
--- a/hwe/ts/PageJoin.vue
+++ b/hwe/ts/PageJoin.vue
@@ -485,9 +485,9 @@ watch(inheritCity, (newValue: undefined | number) => {
 const inheritTurnTimeZone = ref<number>();
 const turnTimeZoneList: string[] = (()=>{
   const result: string[] = [];
-  const zoneSec = turnterm * (60 / 30); // 1 / 60
+  const zoneSec = turnterm; // * 60 / 60
   let zoneCur = 0;
-  for(const idx of range(30)){
+  for(const idx of range(60)){
     const zoneNext = zoneCur + zoneSec;
 
     const zoneCurMin = Math.floor(zoneCur / 60);