0.3.4.10 업데이트

2024-11-19 16:57:05 +09:00 · 2024-11-19 16:57:05 +09:00 · 63472acde1
commit 63472acde1
parent e3bd934991
16 changed files with 1010 additions and 322 deletions
--- a/Assets/01.Scenes/00.TycoonTitle.unity
+++ b/Assets/01.Scenes/00.TycoonTitle.unity
@ -7514,11 +7514,7 @@ PrefabInstance:
      value: 82.81
      objectReference: {fileID: 0}
    - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
-      propertyPath: m_LocalPosition.y
+      propertyPath: m_AnchoredPosition.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
@ -7538,11 +7534,7 @@ PrefabInstance:
      value: 82.81
      objectReference: {fileID: 0}
    - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
-      propertyPath: m_LocalPosition.y
+      propertyPath: m_AnchoredPosition.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5532522907040737260, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
@ -7686,11 +7678,7 @@ PrefabInstance:
      value: 175.73
      objectReference: {fileID: 0}
    - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
-      propertyPath: m_LocalPosition.y
+      propertyPath: m_AnchoredPosition.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8810811118502247075, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
--- a/Assets/01.Scenes/01.Tycoon.unity
+++ b/Assets/01.Scenes/01.Tycoon.unity
@ -11035,7 +11035,6 @@ GameObject:
  - component: {fileID: 1049919590}
  - component: {fileID: 1049919589}
  - component: {fileID: 1049919593}
-  - component: {fileID: 1049919594}
  m_Layer: 5
  m_Name: Canvas
  m_TagString: Untagged
@ -11153,21 +11152,6 @@ MonoBehaviour:
  <MainCanvas>k__BackingField: {fileID: 1049919591}
  <WorldCanvas>k__BackingField: {fileID: 410235869}
  _fadeImage: {fileID: 2055805162}
--- !u!114 &1049919594
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1049919588}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e393933351b7da9489595d2aeb25135d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _uiIndicator: {fileID: 5148248962339400161, guid: 9c308e38b5681564fbdbad324594baee, type: 3}
-  _widthPadding: {x: 70, y: 70}
-  _heightPadding: {x: 70, y: 70}
 --- !u!1 &1054626872
 GameObject:
  m_ObjectHideFlags: 0
@ -12467,6 +12451,11 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1176872992}
  m_CullTransparentMesh: 1
+--- !u!1 &1184003924 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6766070068783270828, guid: 1fdefb248429af04e82ba61927d1c15d, type: 3}
+  m_PrefabInstance: {fileID: 532586499}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1185670928
 GameObject:
  m_ObjectHideFlags: 0
@ -13687,6 +13676,14 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 192967474504919650, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 206150334458064667, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 271976367226201846, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
      propertyPath: m_SizeDelta.x
      value: 0
@ -13823,6 +13820,10 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 854623182969124375, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 906431724544234919, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
@ -13875,6 +13876,10 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 1123204253135645794, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 1200502737992636705, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
      propertyPath: m_SizeDelta.x
      value: 0
@ -14135,6 +14140,14 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2378963517708785758, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2410038165437406503, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 2505930409410496090, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
@ -14255,6 +14268,10 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2914518436451484715, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 2936459360025051519, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
      propertyPath: m_Mesh
      value: 
@ -14295,6 +14312,10 @@ PrefabInstance:
      propertyPath: m_SizeDelta.x
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 3186336333613178462, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 3277011480977519073, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
      propertyPath: m_SizeDelta.x
      value: 0
@ -14663,6 +14684,10 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 4966564567404332244, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 4987975325252724506, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
@ -14719,6 +14744,10 @@ PrefabInstance:
      propertyPath: m_SizeDelta.x
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 5140175868285499029, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 5227324930555586236, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
@ -14971,6 +15000,10 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 6097027034377089568, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 6198619660343708688, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
      propertyPath: m_Mesh
      value: 
@ -15131,6 +15164,10 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 7276650302940742825, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 7304138290650449805, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
      propertyPath: m_SizeDelta.x
      value: 0
@ -15159,6 +15196,10 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 7440650799058384616, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 7456244596060221628, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
@ -15355,6 +15396,10 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 8589127114732290076, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 8742177585021775170, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
@ -18909,7 +18954,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
+  m_FirstSelected: {fileID: 1184003924}
  m_sendNavigationEvents: 1
  m_DragThreshold: 10
 --- !u!4 &1619849090
--- a/Assets/02.Scripts/Character/Npc/Customer/Customer.cs
+++ b/Assets/02.Scripts/Character/Npc/Customer/Customer.cs
@ -505,7 +505,7 @@ namespace BlueWater.Npcs.Customers
            IsOrderedCorrected = false;
            OrderedCocktailData = TycoonManager.Instance.TycoonIngredientController.GetRandomCocktailData();
            var hurryTime = CurrentLevelData.HurryTime + TycoonManager.Instance.TycoonStatus.CustomerHurryTimeIncrease;
-            CurrentTableSeat.MenuBalloonUi.OrderItem(OrderedCocktailData.Idx, CurrentLevelData.WaitTime, hurryTime, true, _startColor, _endColor);
+            CurrentTableSeat.MenuBalloonUi.OrderItem(OrderedCocktailData.Idx, CurrentLevelData.WaitTime, hurryTime, startColor: _startColor, endColor: _endColor);
            _customerInteractionType = CustomerInteractionType.ServedCocktail;
            RegisterPlayerInteraction();
            
--- a/Assets/02.Scripts/SceneController.cs
+++ b/Assets/02.Scripts/SceneController.cs
@ -17,8 +17,8 @@ namespace BlueWater

        protected override void OnAwake()
        {
-            _fadeIn = _fadeImage.DOFade(1f, 2f).From(0f).SetUpdate(true).SetAutoKill(false).Pause().OnComplete(MoveCombatScene);
-            _fadeOut = _fadeImage.DOFade(0f, 2f).From(1f).SetUpdate(true).SetAutoKill(false).Pause().SetDelay(3f).OnComplete(EventManager.InvokeInitializedPlayerInput);
+            _fadeIn = _fadeImage.DOFade(1f, 1f).From(0f).SetUpdate(true).SetAutoKill(false).Pause().OnComplete(MoveCombatScene);
+            _fadeOut = _fadeImage.DOFade(0f, 0.5f).From(1f).SetUpdate(true).SetAutoKill(false).Pause().SetDelay(3f).OnComplete(EventManager.InvokeInitializedPlayerInput);
            _fadeImage.color = new Color(0, 0, 0, 0);
        }

@ -34,7 +34,7 @@ namespace BlueWater
            SceneManager.sceneLoaded -= OnSceneLoaded;

            _fadeIn.Kill();
-            _fadeIn.Kill();
+            _fadeOut.Kill();
        }

        public void FadeIn()
--- a/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset
+++ b/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset
@ -20,8 +20,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 100
-      <WaitTime>k__BackingField: 25
-      <HurryTime>k__BackingField: 25
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 50
      <EatingTime>k__BackingField: 15
      <OpenUpgrade>k__BackingField: Upgrade0
      <RewardBoxType>k__BackingField: 0
@ -33,8 +33,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 200
-      <WaitTime>k__BackingField: 25
-      <HurryTime>k__BackingField: 25
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 50
      <EatingTime>k__BackingField: 15
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -46,8 +46,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 200
-      <WaitTime>k__BackingField: 25
-      <HurryTime>k__BackingField: 25
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 50
      <EatingTime>k__BackingField: 15
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -59,8 +59,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 200
-      <WaitTime>k__BackingField: 25
-      <HurryTime>k__BackingField: 25
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 50
      <EatingTime>k__BackingField: 15
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -72,8 +72,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 200
-      <WaitTime>k__BackingField: 25
-      <HurryTime>k__BackingField: 25
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 50
      <EatingTime>k__BackingField: 15
      <OpenUpgrade>k__BackingField: Upgrade1
      <RewardBoxType>k__BackingField: 1
@ -85,8 +85,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 300
-      <WaitTime>k__BackingField: 23
-      <HurryTime>k__BackingField: 23
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 46
      <EatingTime>k__BackingField: 13
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -98,8 +98,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 300
-      <WaitTime>k__BackingField: 23
-      <HurryTime>k__BackingField: 23
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 46
      <EatingTime>k__BackingField: 13
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -111,8 +111,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 300
-      <WaitTime>k__BackingField: 23
-      <HurryTime>k__BackingField: 23
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 46
      <EatingTime>k__BackingField: 13
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -124,8 +124,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 300
-      <WaitTime>k__BackingField: 23
-      <HurryTime>k__BackingField: 23
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 46
      <EatingTime>k__BackingField: 13
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -137,8 +137,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 300
-      <WaitTime>k__BackingField: 23
-      <HurryTime>k__BackingField: 23
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 46
      <EatingTime>k__BackingField: 13
      <OpenUpgrade>k__BackingField: Upgrade2
      <RewardBoxType>k__BackingField: 1
@ -150,8 +150,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 400
-      <WaitTime>k__BackingField: 20
-      <HurryTime>k__BackingField: 20
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 40
      <EatingTime>k__BackingField: 10
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -163,8 +163,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 400
-      <WaitTime>k__BackingField: 20
-      <HurryTime>k__BackingField: 20
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 40
      <EatingTime>k__BackingField: 10
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -176,8 +176,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 400
-      <WaitTime>k__BackingField: 20
-      <HurryTime>k__BackingField: 20
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 40
      <EatingTime>k__BackingField: 10
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -189,8 +189,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 400
-      <WaitTime>k__BackingField: 20
-      <HurryTime>k__BackingField: 20
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 40
      <EatingTime>k__BackingField: 10
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -202,8 +202,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 400
-      <WaitTime>k__BackingField: 20
-      <HurryTime>k__BackingField: 20
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 40
      <EatingTime>k__BackingField: 10
      <OpenUpgrade>k__BackingField: Upgrade3
      <RewardBoxType>k__BackingField: 1
@ -215,8 +215,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 500
-      <WaitTime>k__BackingField: 18
-      <HurryTime>k__BackingField: 18
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 36
      <EatingTime>k__BackingField: 8
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -228,8 +228,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 500
-      <WaitTime>k__BackingField: 18
-      <HurryTime>k__BackingField: 18
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 36
      <EatingTime>k__BackingField: 8
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -241,8 +241,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 500
-      <WaitTime>k__BackingField: 18
-      <HurryTime>k__BackingField: 18
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 36
      <EatingTime>k__BackingField: 8
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -254,8 +254,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 500
-      <WaitTime>k__BackingField: 18
-      <HurryTime>k__BackingField: 18
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 36
      <EatingTime>k__BackingField: 8
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -267,8 +267,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 500
-      <WaitTime>k__BackingField: 18
-      <HurryTime>k__BackingField: 18
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 36
      <EatingTime>k__BackingField: 8
      <OpenUpgrade>k__BackingField: Upgrade4
      <RewardBoxType>k__BackingField: 1
@ -280,8 +280,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 600
-      <WaitTime>k__BackingField: 16
-      <HurryTime>k__BackingField: 16
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 32
      <EatingTime>k__BackingField: 6
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -293,8 +293,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 600
-      <WaitTime>k__BackingField: 16
-      <HurryTime>k__BackingField: 16
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 32
      <EatingTime>k__BackingField: 6
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -306,8 +306,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 600
-      <WaitTime>k__BackingField: 16
-      <HurryTime>k__BackingField: 16
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 32
      <EatingTime>k__BackingField: 6
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -319,8 +319,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 600
-      <WaitTime>k__BackingField: 16
-      <HurryTime>k__BackingField: 16
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 32
      <EatingTime>k__BackingField: 6
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -332,8 +332,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 600
-      <WaitTime>k__BackingField: 16
-      <HurryTime>k__BackingField: 16
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 32
      <EatingTime>k__BackingField: 6
      <OpenUpgrade>k__BackingField: Upgrade5
      <RewardBoxType>k__BackingField: 1
@ -345,8 +345,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 700
-      <WaitTime>k__BackingField: 14
-      <HurryTime>k__BackingField: 14
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 28
      <EatingTime>k__BackingField: 6
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -358,8 +358,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 700
-      <WaitTime>k__BackingField: 14
-      <HurryTime>k__BackingField: 14
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 28
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -371,8 +371,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 700
-      <WaitTime>k__BackingField: 14
-      <HurryTime>k__BackingField: 14
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 28
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -384,8 +384,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 700
-      <WaitTime>k__BackingField: 14
-      <HurryTime>k__BackingField: 14
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 28
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -397,8 +397,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 700
-      <WaitTime>k__BackingField: 14
-      <HurryTime>k__BackingField: 14
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 28
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: Upgrade6
      <RewardBoxType>k__BackingField: 1
@ -410,8 +410,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 800
-      <WaitTime>k__BackingField: 12
-      <HurryTime>k__BackingField: 12
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 24
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -423,8 +423,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 800
-      <WaitTime>k__BackingField: 12
-      <HurryTime>k__BackingField: 12
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 24
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -436,8 +436,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 800
-      <WaitTime>k__BackingField: 12
-      <HurryTime>k__BackingField: 12
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 24
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -449,8 +449,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 800
-      <WaitTime>k__BackingField: 12
-      <HurryTime>k__BackingField: 12
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 24
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -462,8 +462,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 800
-      <WaitTime>k__BackingField: 12
-      <HurryTime>k__BackingField: 12
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 24
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 1
@ -475,8 +475,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 900
-      <WaitTime>k__BackingField: 10
-      <HurryTime>k__BackingField: 10
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 20
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -488,8 +488,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 900
-      <WaitTime>k__BackingField: 10
-      <HurryTime>k__BackingField: 10
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 20
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -501,8 +501,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 900
-      <WaitTime>k__BackingField: 10
-      <HurryTime>k__BackingField: 10
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 20
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -514,8 +514,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 900
-      <WaitTime>k__BackingField: 10
-      <HurryTime>k__BackingField: 10
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 20
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -527,8 +527,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 900
-      <WaitTime>k__BackingField: 10
-      <HurryTime>k__BackingField: 10
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 20
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 1
@ -540,8 +540,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 900
-      <WaitTime>k__BackingField: 8
-      <HurryTime>k__BackingField: 8
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 16
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -553,8 +553,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 900
-      <WaitTime>k__BackingField: 8
-      <HurryTime>k__BackingField: 8
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 16
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -566,8 +566,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 900
-      <WaitTime>k__BackingField: 8
-      <HurryTime>k__BackingField: 8
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 16
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -579,8 +579,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 900
-      <WaitTime>k__BackingField: 8
-      <HurryTime>k__BackingField: 8
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 16
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -592,8 +592,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 900
-      <WaitTime>k__BackingField: 8
-      <HurryTime>k__BackingField: 8
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 16
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 1
@ -605,8 +605,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 900
-      <WaitTime>k__BackingField: 6
-      <HurryTime>k__BackingField: 6
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 12
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -618,8 +618,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 900
-      <WaitTime>k__BackingField: 6
-      <HurryTime>k__BackingField: 6
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 12
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -631,8 +631,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 900
-      <WaitTime>k__BackingField: 6
-      <HurryTime>k__BackingField: 6
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 12
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -644,8 +644,8 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 900
-      <WaitTime>k__BackingField: 6
-      <HurryTime>k__BackingField: 6
+      <WaitTime>k__BackingField: 0
+      <HurryTime>k__BackingField: 12
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
      <RewardBoxType>k__BackingField: 0
@ -657,7 +657,7 @@ MonoBehaviour:
      <Gold>k__BackingField: 100
      <Exp>k__BackingField: 100
      <RequiredExp>k__BackingField: 900
-      <WaitTime>k__BackingField: 6
+      <WaitTime>k__BackingField: 0
      <HurryTime>k__BackingField: 6
      <EatingTime>k__BackingField: 4
      <OpenUpgrade>k__BackingField: 
--- a/Assets/02.Scripts/Ui/Title/TitleOptions.cs
+++ b/Assets/02.Scripts/Ui/Title/TitleOptions.cs
@ -1,12 +1,15 @@
+using System;
 using System.Collections;
 using BlueWater;
 using BlueWater.Audios;
+using BlueWater.Uis;
 using TMPro;
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityEngine.InputSystem;
 using UnityEngine.UI;

-public class TitleOptions : MonoBehaviour
+public class TitleOptions : PopupUi
 {
    [SerializeField]
    private GameObject _panel;
@ -25,11 +28,14 @@ public class TitleOptions : MonoBehaviour

    private AudioManager _audioManager;

-    public InputAction CancelAction { get; private set; }
+    private InputAction _interactionEAction;
+    private InputAction _closeOptionsAction;
+    public Action CloseOptions;

    private void Start()
    {
-        CancelAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel);
+        _interactionEAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.InteractionE);
+        _closeOptionsAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel);

        _audioManager = AudioManager.Instance;

@ -45,6 +51,45 @@ public class TitleOptions : MonoBehaviour
        StartCoroutine(nameof(InitializeLanguage));
    }

+    private void OnDestroy()
+    {
+        if (_interactionEAction != null)
+        {
+            _interactionEAction.performed -= OnInteractionE;
+        }
+
+        if (_closeOptionsAction != null)
+        {
+            _closeOptionsAction.performed -= OnCloseOptions;
+        }
+    }
+
+    public override void Open()
+    {
+        PopupUiController.RegisterPopup(this);
+        _panel.SetActive(true);
+        IsOpened = true;
+    }
+
+    public override void Close()
+    {
+        _panel.SetActive(false);
+        PopupUiController.UnregisterPopup(this);
+        IsOpened = false;
+    }
+    
+    public override void EnableInput()
+    {
+        _interactionEAction.performed += OnInteractionE;
+        _closeOptionsAction.performed += OnCloseOptions;
+    }
+
+    public override void DisableInput()
+    {
+        _interactionEAction.performed -= OnInteractionE;
+        _closeOptionsAction.performed -= OnCloseOptions;
+    }
+
    public void SetMasterVolume(float value)
    {
        _audioManager.SetMasterVolume(value);
@ -80,13 +125,17 @@ public class TitleOptions : MonoBehaviour
        LocalizationManager.Instance.ChangeLocale((LocaleType)localeType);
    }
    
-    public void ShowUi()
+    public void OnInteractionE(InputAction.CallbackContext context)
    {
-        _panel.SetActive(true);
+        var current = EventSystem.current.currentSelectedGameObject;
+        if (!current) return;
+
+        var currenButton = current.GetComponent<Button>();
+        currenButton.onClick.Invoke();
    }

-    public void HideUi()
+    public void OnCloseOptions(InputAction.CallbackContext context)
    {
-        _panel.SetActive(false);
+        CloseOptions?.Invoke();
    }
 }
--- a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs
+++ b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs
@ -1,4 +1,3 @@
-using System;
 using BlueWater.Audios;
 using BlueWater.Uis;
 using TMPro;
@ -26,10 +25,16 @@ namespace BlueWater.Titles
        private Button _startGameButton;
        
        [SerializeField]
-        private Button _settingButton;
+        private Button _resumeGameButton;
        
        [SerializeField]
-        private Button _exitButton;
+        private Button _optionsButton;
+        
+        [SerializeField]
+        private Button _lobbyButton;
+        
+        [SerializeField]
+        private Button _quitGameButton;

        [SerializeField]
        private bool _isTitleScene = true;
@ -40,7 +45,6 @@ namespace BlueWater.Titles
        [SerializeField]
        private string _dailyBgm = "DailyBgm1";
        
-        private PlayerInputKeyManager _playerInputKeyManager;
        private SceneController _sceneController;
        private InputAction _interactionEAction;
        private InputAction _openAction;
@ -50,10 +54,9 @@ namespace BlueWater.Titles

        private void Start()
        {
-            _playerInputKeyManager = PlayerInputKeyManager.Instance;
-            _interactionEAction = _playerInputKeyManager.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.InteractionE);
-            _openAction = _playerInputKeyManager.GetAction(InputActionMaps.Tycoon, TycoonActions.Options);
-            _closeAction = _playerInputKeyManager.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel);
+            _interactionEAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.InteractionE);
+            _openAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.Tycoon, TycoonActions.Options);
+            _closeAction = PlayerInputKeyManager.Instance.GetAction(InputActionMaps.TycoonUi, TycoonUiActions.Cancel);
            
            if (_isTitleScene)
            {
@ -69,30 +72,44 @@ namespace BlueWater.Titles
                _openAction.performed += OnOpen;
            }
            
-            _startGameButton.onClick.AddListener(() => { _onButtonClicked = true; });
-            _settingButton.onClick.AddListener(() => { _onButtonClicked = true; });
-            _exitButton.onClick.AddListener(() => { _onButtonClicked = true; });
+            _startGameButton?.onClick.AddListener(() => { _onButtonClicked = true; });
+            _resumeGameButton?.onClick.AddListener(() => { _onButtonClicked = true; });
+            _optionsButton?.onClick.AddListener(() => { _onButtonClicked = true; });
+            _lobbyButton?.onClick.AddListener(() => { _onButtonClicked = true; });
+            _quitGameButton?.onClick.AddListener(() => { _onButtonClicked = true; });

-            _playerInputKeyManager.AddOnActionKeyboard(OnKeyboard);
-            _playerInputKeyManager.AddOnActionMouse(OnMouse);
+            PlayerInputKeyManager.Instance.AddOnActionKeyboard(OnKeyboard);
+            PlayerInputKeyManager.Instance.AddOnActionMouse(OnMouse);

+            titleOptions.CloseOptions = HideSettingUi;
            _versionText.text = GetVersion();
        }

        private void OnDestroy()
        {
            if (_isTitleScene)
+            {
+                if (_startGameButton != null && _sceneController != null)
                {
                    _startGameButton.onClick.RemoveListener(_sceneController.FadeIn);
                }
+            }

-            _playerInputKeyManager.RemoveOnActionKeyboard(OnKeyboard);
-            _playerInputKeyManager.RemoveOnActionMouse(OnMouse);
+            PlayerInputKeyManager.Instance.RemoveOnActionKeyboard(OnKeyboard);
+            PlayerInputKeyManager.Instance.RemoveOnActionMouse(OnMouse);

+            if (_interactionEAction != null)
+            {
                _interactionEAction.performed -= OnInteractionE;
+            }
+            if (_openAction != null)
+            {
                _openAction.performed -= OnOpen;
+            }
+            if (_closeAction != null)
+            {
                _closeAction.performed -= OnClose;
-            titleOptions.CancelAction.performed -= OnSettingCancel;
+            }
        }
        
        public void OnOpen(InputAction.CallbackContext context)
@ -102,25 +119,15 @@ namespace BlueWater.Titles
        
        public override void Open()
        {
-            if (_isTitleScene)
+            if (!_isTitleScene)
            {
-                _playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.TycoonUi);
-                PopupUiController.RegisterPopup(this);
-                _panel.SetActive(true);
-                IsOpened = true;
-            }
-            else
-            {
-                _openAction.performed -= OnOpen;
                VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f);
-                _playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.TycoonUi);
-                PopupUiController.RegisterPopup(this);
-                _panel.SetActive(true);
-                IsOpened = true;
-                _closeAction.performed += OnClose;
            }
            
-            _interactionEAction.performed += OnInteractionE;
+            PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi);
+            PopupUiController.RegisterPopup(this);
+            _panel.SetActive(true);
+            IsOpened = true;
        }
        
        public void OnClose(InputAction.CallbackContext context)
@ -129,6 +136,32 @@ namespace BlueWater.Titles
        }

        public override void Close()
+        {
+            if (!_isTitleScene)
+            {
+                _panel.SetActive(false);
+                PopupUiController.UnregisterPopup(this);
+                PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon);
+                IsOpened = false;
+                VisualFeedbackManager.Instance.ResetTimeScale();
+            }
+        }
+
+        public override void EnableInput()
+        {
+            if (_isTitleScene)
+            {
+                
+            }
+            else
+            {
+                _closeAction.performed += OnClose;
+            }
+            
+            _interactionEAction.performed += OnInteractionE;
+        }
+
+        public override void DisableInput()
        {
            if (_isTitleScene)
            {
@ -137,21 +170,22 @@ namespace BlueWater.Titles
            else
            {
                _closeAction.performed -= OnClose;
-                _panel.SetActive(false);
-                PopupUiController.UnregisterPopup(this);
-                _playerInputKeyManager.SwitchCurrentActionMap(InputActionMaps.Tycoon);
-                IsOpened = false;
-                VisualFeedbackManager.Instance.ResetTimeScale();
-                _openAction.performed += OnOpen;
            }
            
            _interactionEAction.performed -= OnInteractionE;
        }

        private void OnKeyboard()
+        {
+            if (_isTitleScene)
            {
                EventSystem.current.SetSelectedGameObject(_startGameButton.gameObject);
            }
+            else
+            {
+                EventSystem.current.SetSelectedGameObject(_resumeGameButton.gameObject);
+            }
+        }
        
        private void OnMouse()
        {
@ -188,25 +222,16 @@ namespace BlueWater.Titles
 #endif
        }

-        public void OnSettingCancel(InputAction.CallbackContext context)
-        {
-            HideSettingUi();
-        }
-
        public void ShowSettingUi()
        {
-            _interactionEAction.performed -= OnInteractionE;
            _titleMenuUiPanel.SetActive(false);
-            titleOptions.ShowUi();
-            titleOptions.CancelAction.performed += OnSettingCancel;
+            titleOptions.Open();
        }

        public void HideSettingUi()
        {
-            titleOptions.CancelAction.performed -= OnSettingCancel;
-            titleOptions.HideUi();
+            titleOptions.Close();
            _titleMenuUiPanel.SetActive(true);
-            _interactionEAction.performed += OnInteractionE;
        }

        public void MoveLobbyScene()
--- a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs
+++ b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs
@ -112,6 +112,7 @@ namespace BlueWater.Uis
            float startValue = isReverse ? 1f : 0f;
            float endValue = isReverse ? 0f : 1f;
            
+            _fillTween?.Kill();
            _fillTween = _fillImage.DOFillAmount(endValue, hurryTime)
                .From(startValue)
                .SetEase(Ease.Linear)
@ -121,6 +122,7 @@ namespace BlueWater.Uis

            if (startColor != null && endColor != null)
            {
+                _colorTween?.Kill();
                _colorTween = _fillImage.DOColor((Color)endColor, hurryTime)
                    .From((Color)startColor)
                    .SetEase(Ease.Linear)
--- a/Assets/02.Scripts/Ui/Tycoon/Bill.cs
+++ b/Assets/02.Scripts/Ui/Tycoon/Bill.cs
@ -79,8 +79,8 @@ namespace BlueWater

        public void SetTween(int waitTime, int hurryTime)
        {
-            _sliderTween = _slider.DOValue(0f, hurryTime)
-                .From(1f)
+            _sliderTween = _slider.DOValue(1f, hurryTime)
+                .From(0f)
                .SetEase(Ease.Linear)
                .SetDelay(waitTime)
                .SetAutoKill(true);
@ -95,7 +95,7 @@ namespace BlueWater

        private void OnSliderValueChanged(float value)
        {
-            _filledImage.color = Color.Lerp(_endColor, _startColor, value);
+            _filledImage.color = Color.Lerp(_startColor, _endColor, value);
        }

        public void Move(BillInfo billInfo)
--- a/Assets/04.Materials/Ink.mat
+++ b/Assets/04.Materials/Ink.mat
@ -93,7 +93,7 @@ Material:
    - _ClearCoatMask: 0
    - _ClearCoatSmoothness: 0
    - _Cull: 2
-    - _CustomTime: 70.406334
+    - _CustomTime: 43.2106
    - _Cutoff: 0.5
    - _DetailAlbedoMapScale: 1
    - _DetailNormalMapScale: 1
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab
@ -752,6 +752,10 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 8549903804392921738, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -881,6 +885,10 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 8549903804392921738, guid: 659c0c56362b31b47ac12feb1a51d0b3, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -942,10 +950,34 @@ PrefabInstance:
      propertyPath: m_FillOrigin
      value: 2
      objectReference: {fileID: 0}
+    - target: {fileID: 2964810709115633174, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.6666667
+      objectReference: {fileID: 0}
+    - target: {fileID: 2964810709115633174, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.6666667
+      objectReference: {fileID: 0}
+    - target: {fileID: 2964810709115633174, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.6666667
+      objectReference: {fileID: 0}
    - target: {fileID: 2971245722111912602, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
      propertyPath: m_Sprite
      value: 
      objectReference: {fileID: 21300000, guid: b93d1d9adc811a74fb4192ade70fd3cc, type: 3}
+    - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.6666667
+      objectReference: {fileID: 0}
+    - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.6666667
+      objectReference: {fileID: 0}
+    - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.6666667
+      objectReference: {fileID: 0}
    - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
      propertyPath: m_AnchoredPosition.x
      value: 0.25
@ -1301,17 +1333,41 @@ PrefabInstance:
      propertyPath: m_FillOrigin
      value: 2
      objectReference: {fileID: 0}
+    - target: {fileID: 2964810709115633174, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.6666667
+      objectReference: {fileID: 0}
+    - target: {fileID: 2964810709115633174, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.6666667
+      objectReference: {fileID: 0}
+    - target: {fileID: 2964810709115633174, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.6666667
+      objectReference: {fileID: 0}
    - target: {fileID: 2971245722111912602, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
      propertyPath: m_Sprite
      value: 
      objectReference: {fileID: 21300000, guid: b93d1d9adc811a74fb4192ade70fd3cc, type: 3}
+    - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.6666667
+      objectReference: {fileID: 0}
+    - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.6666667
+      objectReference: {fileID: 0}
+    - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.6666667
+      objectReference: {fileID: 0}
    - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
      propertyPath: m_AnchoredPosition.x
      value: -0.25
      objectReference: {fileID: 0}
    - target: {fileID: 3619548578334970641, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 1.1
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
      propertyPath: m_Pivot.x
--- a/Assets/05.Prefabs/Uis/Tycoons/TycoonGameMenuCanvas.prefab
+++ b/Assets/05.Prefabs/Uis/Tycoons/TycoonGameMenuCanvas.prefab
@ -1,5 +1,439 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1783093215036953515
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3406864863717099403}
+  - component: {fileID: 7007680036530545365}
+  - component: {fileID: 9207469817372238632}
+  - component: {fileID: 7135868163081440694}
+  m_Layer: 5
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3406864863717099403
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1783093215036953515}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 6023463152304223989}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &7007680036530545365
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1783093215036953515}
+  m_CullTransparentMesh: 1
+--- !u!114 &9207469817372238632
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1783093215036953515}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: "\uC885\uB8CC"
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
+  m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 45
+  m_fontSizeBase: 45
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 36
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_TextWrappingMode: 0
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 0
+  m_ActiveFontFeatures: 6e72656b
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!114 &7135868163081440694
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1783093215036953515}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_StringReference:
+    m_TableReference:
+      m_TableCollectionName: GUID:0f00ef9cea8f57e4e952e1881becfed7
+    m_TableEntryReference:
+      m_KeyId: 652745837969408
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
+  m_FormatArguments: []
+  m_UpdateString:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 9207469817372238632}
+        m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro
+        m_MethodName: set_text
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: 
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 1
+  references:
+    version: 2
+    RefIds: []
+--- !u!1 &6636453121499202241
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2282892633984535475}
+  - component: {fileID: 5393267343056684930}
+  - component: {fileID: 1004229113393079187}
+  - component: {fileID: 6327958462794368542}
+  m_Layer: 5
+  m_Name: SelectedImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2282892633984535475
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6636453121499202241}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6023463152304223989}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5393267343056684930
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6636453121499202241}
+  m_CullTransparentMesh: 1
+--- !u!114 &1004229113393079187
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6636453121499202241}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 5a6a33286645736499caef60e479872d, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &6327958462794368542
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6636453121499202241}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &7743520951332944107
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6023463152304223989}
+  - component: {fileID: 1841050712205587428}
+  - component: {fileID: 4330707241455583970}
+  - component: {fileID: 9048322436433618005}
+  - component: {fileID: 3360581519817642802}
+  - component: {fileID: 2507619975434679060}
+  m_Layer: 5
+  m_Name: QuitGameButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6023463152304223989
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7743520951332944107}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2282892633984535475}
+  - {fileID: 3406864863717099403}
+  m_Father: {fileID: 4307839890443455075}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -440}
+  m_SizeDelta: {x: 82.81, y: 120}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &1841050712205587428
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7743520951332944107}
+  m_CullTransparentMesh: 1
+--- !u!114 &4330707241455583970
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7743520951332944107}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 4
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 8544529456743054919}
+    m_SelectOnDown: {fileID: 8317783694176110988}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 1, g: 1, b: 1, a: 1}
+    m_PressedColor: {r: 1, g: 1, b: 1, a: 1}
+    m_SelectedColor: {r: 1, g: 1, b: 1, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 9207469817372238632}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1794702731584971318}
+        m_TargetAssemblyTypeName: BlueWater.Titles.TycoonTitle, Assembly-CSharp
+        m_MethodName: QuitGame
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &9048322436433618005
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7743520951332944107}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e5ca384211ab6ab4cbf2a58b976108c8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _targetButton: {fileID: 4330707241455583970}
+  _selectedImage: {fileID: 1004229113393079187}
+  _highlightedColor: {r: 1, g: 1, b: 1, a: 0.19607843}
+--- !u!114 &3360581519817642802
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7743520951332944107}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &2507619975434679060
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7743520951332944107}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1001 &2932361312694498582
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -100,10 +534,30 @@ PrefabInstance:
      propertyPath: m_StringReference.m_TableEntryReference.m_KeyId
      value: 2961027900911616
      objectReference: {fileID: 0}
+    - target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
+      propertyPath: _exitButton
+      value: 
+      objectReference: {fileID: 4330707241455583970}
+    - target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
+      propertyPath: _lobbyButton
+      value: 
+      objectReference: {fileID: 8544529456743054919}
    - target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
      propertyPath: _isTitleScene
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
+      propertyPath: _quitGameButton
+      value: 
+      objectReference: {fileID: 4330707241455583970}
+    - target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
+      propertyPath: _startGameButton
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 3484035362484606752, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
+      propertyPath: _resumeGameButton
+      value: 
+      objectReference: {fileID: 8317783694176110988}
    - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
      propertyPath: m_AnchorMax.y
      value: 1
@ -304,6 +758,10 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 6620118968858819738, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
+      propertyPath: m_Navigation.m_SelectOnUp
+      value: 
+      objectReference: {fileID: 4330707241455583970}
    - target: {fileID: 6620118968858819738, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
      value: 1
@ -348,6 +806,14 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: -460
      objectReference: {fileID: 0}
+    - target: {fileID: 6783990415546059601, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
+      propertyPath: m_Navigation.m_SelectOnUp
+      value: 
+      objectReference: {fileID: 5137543705323593814}
+    - target: {fileID: 6783990415546059601, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
+      propertyPath: m_Navigation.m_SelectOnDown
+      value: 
+      objectReference: {fileID: 4330707241455583970}
    - target: {fileID: 6783990415546059601, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
      value: MoveLobbyScene
@ -558,7 +1024,10 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 1403243596108480373, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 6023463152304223989}
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
 --- !u!114 &1794702731584971318 stripped
@ -572,3 +1041,41 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: ea8c10e9f7ec1834ca9d8152c4c0cdae, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!224 &4307839890443455075 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 1403243596108480373, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
+  m_PrefabInstance: {fileID: 2932361312694498582}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &5137543705323593814 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8069869802901706048, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
+  m_PrefabInstance: {fileID: 2932361312694498582}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &8317783694176110988 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6620118968858819738, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
+  m_PrefabInstance: {fileID: 2932361312694498582}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &8544529456743054919 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6783990415546059601, guid: fbbace4abceeb19418e16840f571e2bd, type: 3}
+  m_PrefabInstance: {fileID: 2932361312694498582}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab
+++ b/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab
@ -1124,7 +1124,7 @@ GameObject:
  - component: {fileID: 5599562783423079371}
  - component: {fileID: 4742968242575636212}
  m_Layer: 5
-  m_Name: ExitButton
+  m_Name: QuitGameButton
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -7377,6 +7377,7 @@ GameObject:
  - component: {fileID: 8176578426720088375}
  - component: {fileID: 374304938684502356}
  - component: {fileID: 8241840109796323035}
+  - component: {fileID: 3654003405128029727}
  m_Layer: 5
  m_Name: BackGroundImage
  m_TagString: Untagged
@ -7441,6 +7442,19 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3654003405128029727
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6990643379758234813}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bf906d99280c73d45a290761969d7bc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  material: {fileID: 2100000, guid: 10f8236f36b04a54aaf175b5763f7ef6, type: 2}
 --- !u!1 &7055048572422567791
 GameObject:
  m_ObjectHideFlags: 0
@ -8428,8 +8442,10 @@ MonoBehaviour:
  _titleMenuUiPanel: {fileID: 7860688818721824856}
  titleOptions: {fileID: 9207272460605448926}
  _startGameButton: {fileID: 6620118968858819738}
-  _settingButton: {fileID: 8069869802901706048}
-  _exitButton: {fileID: 6783990415546059601}
+  _resumeGameButton: {fileID: 0}
+  _optionsButton: {fileID: 8069869802901706048}
+  _lobbyButton: {fileID: 0}
+  _quitGameButton: {fileID: 6783990415546059601}
  _isTitleScene: 1
  _versionText: {fileID: 408792858244141541}
  _dailyBgm: TycoonTitleBgm02
--- a/Assets/Resources/Excel/LevelDataTable.xlsx
+++ b/Assets/Resources/Excel/LevelDataTable.xlsx
--- a/Assets/Resources/JSON/LevelDataTable.json
+++ b/Assets/Resources/JSON/LevelDataTable.json
@ -5,8 +5,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 100,
-    "WaitTime": 25,
-    "HurryTime": 25,
+    "WaitTime": 0,
+    "HurryTime": 50,
    "EatingTime": 15,
    "OpenUpgrade": "Upgrade0",
    "RewardBoxType": 0,
@ -18,8 +18,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 200,
-    "WaitTime": 25,
-    "HurryTime": 25,
+    "WaitTime": 0,
+    "HurryTime": 50,
    "EatingTime": 15,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -31,8 +31,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 200,
-    "WaitTime": 25,
-    "HurryTime": 25,
+    "WaitTime": 0,
+    "HurryTime": 50,
    "EatingTime": 15,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -44,8 +44,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 200,
-    "WaitTime": 25,
-    "HurryTime": 25,
+    "WaitTime": 0,
+    "HurryTime": 50,
    "EatingTime": 15,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -57,8 +57,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 200,
-    "WaitTime": 25,
-    "HurryTime": 25,
+    "WaitTime": 0,
+    "HurryTime": 50,
    "EatingTime": 15,
    "OpenUpgrade": "Upgrade1",
    "RewardBoxType": 1,
@ -70,8 +70,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 300,
-    "WaitTime": 23,
-    "HurryTime": 23,
+    "WaitTime": 0,
+    "HurryTime": 46,
    "EatingTime": 13,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -83,8 +83,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 300,
-    "WaitTime": 23,
-    "HurryTime": 23,
+    "WaitTime": 0,
+    "HurryTime": 46,
    "EatingTime": 13,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -96,8 +96,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 300,
-    "WaitTime": 23,
-    "HurryTime": 23,
+    "WaitTime": 0,
+    "HurryTime": 46,
    "EatingTime": 13,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -109,8 +109,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 300,
-    "WaitTime": 23,
-    "HurryTime": 23,
+    "WaitTime": 0,
+    "HurryTime": 46,
    "EatingTime": 13,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -122,8 +122,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 300,
-    "WaitTime": 23,
-    "HurryTime": 23,
+    "WaitTime": 0,
+    "HurryTime": 46,
    "EatingTime": 13,
    "OpenUpgrade": "Upgrade2",
    "RewardBoxType": 1,
@ -135,8 +135,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 400,
-    "WaitTime": 20,
-    "HurryTime": 20,
+    "WaitTime": 0,
+    "HurryTime": 40,
    "EatingTime": 10,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -148,8 +148,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 400,
-    "WaitTime": 20,
-    "HurryTime": 20,
+    "WaitTime": 0,
+    "HurryTime": 40,
    "EatingTime": 10,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -161,8 +161,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 400,
-    "WaitTime": 20,
-    "HurryTime": 20,
+    "WaitTime": 0,
+    "HurryTime": 40,
    "EatingTime": 10,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -174,8 +174,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 400,
-    "WaitTime": 20,
-    "HurryTime": 20,
+    "WaitTime": 0,
+    "HurryTime": 40,
    "EatingTime": 10,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -187,8 +187,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 400,
-    "WaitTime": 20,
-    "HurryTime": 20,
+    "WaitTime": 0,
+    "HurryTime": 40,
    "EatingTime": 10,
    "OpenUpgrade": "Upgrade3",
    "RewardBoxType": 1,
@ -200,8 +200,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 500,
-    "WaitTime": 18,
-    "HurryTime": 18,
+    "WaitTime": 0,
+    "HurryTime": 36,
    "EatingTime": 8,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -213,8 +213,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 500,
-    "WaitTime": 18,
-    "HurryTime": 18,
+    "WaitTime": 0,
+    "HurryTime": 36,
    "EatingTime": 8,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -226,8 +226,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 500,
-    "WaitTime": 18,
-    "HurryTime": 18,
+    "WaitTime": 0,
+    "HurryTime": 36,
    "EatingTime": 8,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -239,8 +239,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 500,
-    "WaitTime": 18,
-    "HurryTime": 18,
+    "WaitTime": 0,
+    "HurryTime": 36,
    "EatingTime": 8,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -252,8 +252,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 500,
-    "WaitTime": 18,
-    "HurryTime": 18,
+    "WaitTime": 0,
+    "HurryTime": 36,
    "EatingTime": 8,
    "OpenUpgrade": "Upgrade4",
    "RewardBoxType": 1,
@ -265,8 +265,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 600,
-    "WaitTime": 16,
-    "HurryTime": 16,
+    "WaitTime": 0,
+    "HurryTime": 32,
    "EatingTime": 6,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -278,8 +278,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 600,
-    "WaitTime": 16,
-    "HurryTime": 16,
+    "WaitTime": 0,
+    "HurryTime": 32,
    "EatingTime": 6,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -291,8 +291,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 600,
-    "WaitTime": 16,
-    "HurryTime": 16,
+    "WaitTime": 0,
+    "HurryTime": 32,
    "EatingTime": 6,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -304,8 +304,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 600,
-    "WaitTime": 16,
-    "HurryTime": 16,
+    "WaitTime": 0,
+    "HurryTime": 32,
    "EatingTime": 6,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -317,8 +317,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 600,
-    "WaitTime": 16,
-    "HurryTime": 16,
+    "WaitTime": 0,
+    "HurryTime": 32,
    "EatingTime": 6,
    "OpenUpgrade": "Upgrade5",
    "RewardBoxType": 1,
@ -330,8 +330,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 700,
-    "WaitTime": 14,
-    "HurryTime": 14,
+    "WaitTime": 0,
+    "HurryTime": 28,
    "EatingTime": 6,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -343,8 +343,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 700,
-    "WaitTime": 14,
-    "HurryTime": 14,
+    "WaitTime": 0,
+    "HurryTime": 28,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -356,8 +356,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 700,
-    "WaitTime": 14,
-    "HurryTime": 14,
+    "WaitTime": 0,
+    "HurryTime": 28,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -369,8 +369,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 700,
-    "WaitTime": 14,
-    "HurryTime": 14,
+    "WaitTime": 0,
+    "HurryTime": 28,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -382,8 +382,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 700,
-    "WaitTime": 14,
-    "HurryTime": 14,
+    "WaitTime": 0,
+    "HurryTime": 28,
    "EatingTime": 4,
    "OpenUpgrade": "Upgrade6",
    "RewardBoxType": 1,
@ -395,8 +395,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 800,
-    "WaitTime": 12,
-    "HurryTime": 12,
+    "WaitTime": 0,
+    "HurryTime": 24,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -408,8 +408,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 800,
-    "WaitTime": 12,
-    "HurryTime": 12,
+    "WaitTime": 0,
+    "HurryTime": 24,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -421,8 +421,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 800,
-    "WaitTime": 12,
-    "HurryTime": 12,
+    "WaitTime": 0,
+    "HurryTime": 24,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -434,8 +434,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 800,
-    "WaitTime": 12,
-    "HurryTime": 12,
+    "WaitTime": 0,
+    "HurryTime": 24,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -447,8 +447,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 800,
-    "WaitTime": 12,
-    "HurryTime": 12,
+    "WaitTime": 0,
+    "HurryTime": 24,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 1,
@ -460,8 +460,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 900,
-    "WaitTime": 10,
-    "HurryTime": 10,
+    "WaitTime": 0,
+    "HurryTime": 20,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -473,8 +473,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 900,
-    "WaitTime": 10,
-    "HurryTime": 10,
+    "WaitTime": 0,
+    "HurryTime": 20,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -486,8 +486,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 900,
-    "WaitTime": 10,
-    "HurryTime": 10,
+    "WaitTime": 0,
+    "HurryTime": 20,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -499,8 +499,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 900,
-    "WaitTime": 10,
-    "HurryTime": 10,
+    "WaitTime": 0,
+    "HurryTime": 20,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -512,8 +512,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 900,
-    "WaitTime": 10,
-    "HurryTime": 10,
+    "WaitTime": 0,
+    "HurryTime": 20,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 1,
@ -525,8 +525,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 900,
-    "WaitTime": 8,
-    "HurryTime": 8,
+    "WaitTime": 0,
+    "HurryTime": 16,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -538,8 +538,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 900,
-    "WaitTime": 8,
-    "HurryTime": 8,
+    "WaitTime": 0,
+    "HurryTime": 16,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -551,8 +551,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 900,
-    "WaitTime": 8,
-    "HurryTime": 8,
+    "WaitTime": 0,
+    "HurryTime": 16,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -564,8 +564,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 900,
-    "WaitTime": 8,
-    "HurryTime": 8,
+    "WaitTime": 0,
+    "HurryTime": 16,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -577,8 +577,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 900,
-    "WaitTime": 8,
-    "HurryTime": 8,
+    "WaitTime": 0,
+    "HurryTime": 16,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 1,
@ -590,8 +590,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 900,
-    "WaitTime": 6,
-    "HurryTime": 6,
+    "WaitTime": 0,
+    "HurryTime": 12,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -603,8 +603,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 900,
-    "WaitTime": 6,
-    "HurryTime": 6,
+    "WaitTime": 0,
+    "HurryTime": 12,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -616,8 +616,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 900,
-    "WaitTime": 6,
-    "HurryTime": 6,
+    "WaitTime": 0,
+    "HurryTime": 12,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -629,8 +629,8 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 900,
-    "WaitTime": 6,
-    "HurryTime": 6,
+    "WaitTime": 0,
+    "HurryTime": 12,
    "EatingTime": 4,
    "OpenUpgrade": "",
    "RewardBoxType": 0,
@ -642,7 +642,7 @@
    "Gold": 100,
    "Exp": 100,
    "RequiredExp": 900,
-    "WaitTime": 6,
+    "WaitTime": 0,
    "HurryTime": 6,
    "EatingTime": 4,
    "OpenUpgrade": "",
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -140,7 +140,7 @@ PlayerSettings:
  loadStoreDebugModeEnabled: 0
  visionOSBundleVersion: 1.0
  tvOSBundleVersion: 1.0
-  bundleVersion: 0.3.4.8
+  bundleVersion: 0.3.4.10
  preloadedAssets:
  - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
  - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}