game: 턴 시간과 도시 지정을 같이 가능하도록 변경

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);

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";