From cacf0981ce4ae32755dfb778cf854b086cfff8ba Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Sat, 24 Feb 2024 12:05:49 +0000
Subject: [PATCH] =?UTF-8?q?game:=20=ED=84=B4=20=EC=8B=9C=EA=B0=84=EA=B3=BC?=
 =?UTF-8?q?=20=EB=8F=84=EC=8B=9C=20=EC=A7=80=EC=A0=95=EC=9D=84=20=EA=B0=99?=
 =?UTF-8?q?=EC=9D=B4=20=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=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 |  4 ----
 hwe/ts/PageJoin.vue            | 19 -------------------
 2 files changed, 23 deletions(-)

diff --git a/hwe/sammo/API/General/Join.php b/hwe/sammo/API/General/Join.php
index 0d17e34b..26571cff 100644
--- a/hwe/sammo/API/General/Join.php
+++ b/hwe/sammo/API/General/Join.php
@@ -144,10 +144,6 @@ class Join extends \sammo\BaseAPI
         $inheritCity = $this->args['inheritCity'] ?? null;
         $inheritBonusStat = $this->args['inheritBonusStat'] ?? null;
 
-        if ($inheritTurntimeZone !== null && $inheritCity !== null) {
-            return '턴과 도시를 동시에 지정할 수 없습니다.';
-        }
-
         $rootDB = RootDB::db();
         //회원 테이블에서 정보확인
         $member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name`, imgsvr, `penalty` FROM member WHERE no=%i', $userID);
diff --git a/hwe/ts/PageJoin.vue b/hwe/ts/PageJoin.vue
index 0bd26430..be116be3 100644
--- a/hwe/ts/PageJoin.vue
+++ b/hwe/ts/PageJoin.vue
@@ -512,25 +512,6 @@ watch(inheritTurnTimeZone, (newValue: undefined | number) => {
   args.value.inheritTurntimeZone = inheritTurnTimeZone.value;
 });
 
-watch(
-  [inheritCity, inheritTurnTimeZone],
-  ([newInheritCity, newInheritTurnTimeZone], [oldInheritCity, oldInheritTurnTimeZone]) => {
-    if (newInheritCity === undefined || newInheritTurnTimeZone === undefined) {
-      return;
-    }
-    alert("도시와 턴 시간을 동시에 설정할 수 없습니다.");
-
-    if (newInheritCity !== oldInheritCity) {
-      inheritCity.value = undefined;
-    }
-    if (newInheritTurnTimeZone !== oldInheritTurnTimeZone) {
-      inheritTurnTimeZone.value = undefined;
-    }
-  },
-  { immediate: true }
-);
-
-
 </script>
 <style lang="scss">
 @import "@scss/common/base.scss";