Merge branch 'ntg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg

# Conflicts:
#	Assets/02.Scripts/Ui/Tycoon/Manual.cs
#	Assets/02.Scripts/Ui/Tycoon/ManualBook.cs

Assets/01.Scenes/01.Tycoon.unity

@@ -5778,6 +5778,20 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1360757596}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &480314625
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
+  m_Name: UI/Point
+  m_EditorClassIdentifier: 
+  m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
+  m_ActionId: 52083aa7-62f5-41d7-b37e-4db100ef2cda
 --- !u!1 &510358306
 GameObject:
   m_ObjectHideFlags: 0
@@ -6026,6 +6040,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 510483949}
   m_CullTransparentMesh: 1
+--- !u!114 &512160919
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
+  m_Name: UI/TrackedDeviceOrientation
+  m_EditorClassIdentifier: 
+  m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
+  m_ActionId: 7f4f45c6-67b1-47bf-9a74-fea6f6b5fde1
 --- !u!1001 &515003792
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -6628,6 +6656,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 547484572}
   m_CullTransparentMesh: 1
+--- !u!114 &561341741
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
+  m_Name: UI/ScrollWheel
+  m_EditorClassIdentifier: 
+  m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
+  m_ActionId: 30ef3965-cc51-452e-8df9-6a3567a53f4d
 --- !u!1001 &566176540
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -10365,7 +10407,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _persistent: 0
   <MainCamera>k__BackingField: {fileID: 873223991}
-  <UiCamera>k__BackingField: {fileID: 0}
+  <UiCamera>k__BackingField: {fileID: 1355183327}
   <LiquidOverlayCamera>k__BackingField: {fileID: 1985878519}
   cameraLocation: {fileID: 1634548838}
   <BaseCamera>k__BackingField: {fileID: 545850352}
@@ -11414,6 +11456,20 @@ MonoBehaviour:
   m_Spacing: {x: 10, y: 10}
   m_Constraint: 0
   m_ConstraintCount: 2
+--- !u!114 &992297820
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
+  m_Name: UI/TrackedDevicePosition
+  m_EditorClassIdentifier: 
+  m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
+  m_ActionId: 49ed4722-bfe5-47b7-b724-008d9ca57edc
 --- !u!1 &1006730364
 GameObject:
   m_ObjectHideFlags: 0
@@ -12060,6 +12116,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1058006973}
   m_CullTransparentMesh: 1
+--- !u!114 &1063900526
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
+  m_Name: UI/Navigate
+  m_EditorClassIdentifier: 
+  m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
+  m_ActionId: 66824a18-0819-44a4-92c2-6395511e3d0d
 --- !u!1 &1070845212
 GameObject:
   m_ObjectHideFlags: 0
@@ -18806,6 +18876,20 @@ MonoBehaviour:
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
+--- !u!114 &1543616885
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
+  m_Name: UI/RightClick
+  m_EditorClassIdentifier: 
+  m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
+  m_ActionId: 4849bf4c-7b3b-43c4-8bbf-7178f536fb94
 --- !u!1 &1543999676
 GameObject:
   m_ObjectHideFlags: 0
@@ -19611,17 +19695,17 @@ MonoBehaviour:
   m_MoveRepeatDelay: 0.5
   m_MoveRepeatRate: 0.1
   m_XRTrackingOrigin: {fileID: 0}
-  m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_ActionsAsset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
-  m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_PointAction: {fileID: 480314625}
-  m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_MoveAction: {fileID: 1063900526}
-  m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_SubmitAction: {fileID: 1861358548}
-  m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_CancelAction: {fileID: -1967631576421560919, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
-  m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_LeftClickAction: {fileID: 1688493664}
-  m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_MiddleClickAction: {fileID: 1972034606}
-  m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_RightClickAction: {fileID: 1543616885}
-  m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_ScrollWheelAction: {fileID: 561341741}
-  m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_TrackedDevicePositionAction: {fileID: 992297820}
-  m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
+  m_TrackedDeviceOrientationAction: {fileID: 512160919}
   m_DeselectOnBackgroundClick: 1
   m_PointerBehavior: 0
   m_CursorLockBehavior: 0
@@ -21021,6 +21105,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1676572567}
   m_CullTransparentMesh: 1
+--- !u!114 &1688493664
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
+  m_Name: UI/Click
+  m_EditorClassIdentifier: 
+  m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
+  m_ActionId: 42e6067b-0d00-4787-92d8-ddf60510de83
 --- !u!1 &1688541096
 GameObject:
   m_ObjectHideFlags: 0
@@ -24382,6 +24480,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1858836598}
   m_CullTransparentMesh: 1
+--- !u!114 &1861358548
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
+  m_Name: UI/Submit
+  m_EditorClassIdentifier: 
+  m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
+  m_ActionId: 93ed1c14-2900-4d30-91fb-a9f2353a9540
 --- !u!1 &1862417069
 GameObject:
   m_ObjectHideFlags: 0
@@ -25791,6 +25903,20 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1966407669}
   m_CullTransparentMesh: 1
+--- !u!114 &1972034606
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3}
+  m_Name: UI/MiddleClick
+  m_EditorClassIdentifier: 
+  m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
+  m_ActionId: b99f7e4b-30f0-4936-9e55-c383951d6f58
 --- !u!1 &1978509263
 GameObject:
   m_ObjectHideFlags: 0
@@ -29267,6 +29393,10 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: 0.32760355
       objectReference: {fileID: 0}
+    - target: {fileID: 6054159730444663926, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
+      propertyPath: m_UIInputModule
+      value: 
+      objectReference: {fileID: 1619849091}
     - target: {fileID: 6110939913361161778, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0.01015869

Assets/01.Scenes/99.T44.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0a2032ff5c88e1c449499aed2760e8ab
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/01.Scenes/Old/99.Tycoon43.unity

@@ -5339,7 +5339,7 @@ Transform:
   m_GameObject: {fileID: 545850347}
   serializedVersion: 2
   m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
-  m_LocalPosition: {x: -4.418, y: 5.4995136, z: -12.200313}
+  m_LocalPosition: {x: -2.03, y: 5.499513, z: -20.442312}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -8520,7 +8520,7 @@ Transform:
   m_GameObject: {fileID: 873223985}
   serializedVersion: 2
   m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
-  m_LocalPosition: {x: -4.418, y: 5.4995136, z: -12.200313}
+  m_LocalPosition: {x: -2.03, y: 5.499513, z: -20.442312}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -16498,6 +16498,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: TycoonMap 2
       objectReference: {fileID: 0}
+    - target: {fileID: 9041926907780427371, guid: ce2b3fd9915ecde4198836ba25112492, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -17016,6 +17020,8 @@ MonoBehaviour:
   <TycoonStageController>k__BackingField: {fileID: 1665075872}
   <TycoonIngredientController>k__BackingField: {fileID: 1665075873}
   <CrewController>k__BackingField: {fileID: 0}
+  <CustomerController>k__BackingField: {fileID: 0}
+  <ServingTableController>k__BackingField: {fileID: 0}
   _dailyBgm: TycoonDailyBgm1
   <TycoonStatus>k__BackingField:
     _maxLevel: 0
@@ -21260,6 +21266,63 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3}
   m_PrefabInstance: {fileID: 1957839369}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1958159149
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2700294535905665279, guid: d00863a976850a54e87df1f93d3c243e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2700294535905665279, guid: d00863a976850a54e87df1f93d3c243e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2700294535905665279, guid: d00863a976850a54e87df1f93d3c243e, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2700294535905665279, guid: d00863a976850a54e87df1f93d3c243e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2700294535905665279, guid: d00863a976850a54e87df1f93d3c243e, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2700294535905665279, guid: d00863a976850a54e87df1f93d3c243e, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2700294535905665279, guid: d00863a976850a54e87df1f93d3c243e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2700294535905665279, guid: d00863a976850a54e87df1f93d3c243e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2700294535905665279, guid: d00863a976850a54e87df1f93d3c243e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2700294535905665279, guid: d00863a976850a54e87df1f93d3c243e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9041926907780427371, guid: d00863a976850a54e87df1f93d3c243e, type: 3}
+      propertyPath: m_Name
+      value: TycoonMapUpsideDown
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d00863a976850a54e87df1f93d3c243e, type: 3}
 --- !u!1001 &1962247112
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -23772,7 +23835,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -4.418
+      value: -2.03
       objectReference: {fileID: 0}
     - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
       propertyPath: m_LocalPosition.y
@@ -23780,7 +23843,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -6.838
+      value: -15.08
       objectReference: {fileID: 0}
     - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
       propertyPath: m_LocalRotation.w
@@ -25590,6 +25653,7 @@ SceneRoots:
   - {fileID: 852387592}
   - {fileID: 7827484746149782377}
   - {fileID: 1645568092}
+  - {fileID: 1958159149}
   - {fileID: 5626406452199475265}
   - {fileID: 1006730365}
   - {fileID: 20736010}

Assets/02.Scripts/Character/Npc/Crew/Bartender/BartenderCrew.cs

@@ -1,4 +1,5 @@
 using BlueWater.Interfaces;
+using BlueWater.Items;
 using BlueWater.Npcs.Customers;
 using BlueWater.Tycoons;
 
@@ -14,6 +15,8 @@ namespace BlueWater.Npcs.Crews.Bartender
         public IStateMachine<BartenderCrew> IdleState { get; private set; }
         public IStateMachine<BartenderCrew> MakingCocktailState { get; private set; }
 
+        private CocktailData _makingCocktailData;
+        
         protected override void Update()
         {
             StateMachineController.UpdateState(this);
@@ -38,6 +41,7 @@ namespace BlueWater.Npcs.Crews.Bartender
             
             OrderedCustomer = null;
             IsMakingCocktail = false;
+            _makingCocktailData = null;
         }
 
         public override bool IsCompletedMission()
@@ -50,26 +54,29 @@ namespace BlueWater.Npcs.Crews.Bartender
         public void SetOrderedCustomer(Customer orderedCustomer)
         {
             OrderedCustomer = orderedCustomer;
+            _makingCocktailData = OrderedCustomer.OrderedCocktailData;
             IsOnMission = true;
         }
 
         public void MakingCocktail()
+        {
+            if (OrderedCustomer && OrderedCustomer.CurrentBill)
             {
                 OrderedCustomer.CurrentBill.BartenderMakingCocktail();
-            BalloonUi.OrderItem(OrderedCustomer.OrderedCocktailData.Idx, 0, 15);
+            }
+            BalloonUi.OrderItem(_makingCocktailData.Idx, 0, 15);
 
             IsMakingCocktail = true;
         }
 
         public void CompletedMakingCocktail()
         {
-            if (OrderedCustomer.CurrentBill)
+            if (OrderedCustomer && OrderedCustomer.CurrentBill)
             {
                 OrderedCustomer.CurrentBill.BartenderCompleteMakingCocktail();
             }
-            BalloonUi.DiscardItem();
+            
-            MyBartenderTable.CompleteMakingCocktail(OrderedCustomer.OrderedCocktailData);
+            MyBartenderTable.CompleteMakingCocktail(_makingCocktailData);
-            IsMakingCocktail = false;
             ResetMission();
         }
     }

Assets/02.Scripts/Character/Player/Combat/CombatInput.cs

@@ -144,7 +144,7 @@ namespace BlueWater.Players.Combat
         {
             if (context.performed)
             {
-                CombatUiManager.Instance.CombatItemInventoryUi.Open(CombatUiManager.Instance.PopupUiList);
+                CombatUiManager.Instance.CombatItemInventoryUi.Open();
             }
         }
         
@@ -162,7 +162,7 @@ namespace BlueWater.Players.Combat
         {
             if (context.performed)
             {
-                CombatUiManager.Instance.CombatMenuPopupUi.Open(CombatUiManager.Instance.PopupUiList);
+                CombatUiManager.Instance.CombatMenuPopupUi.Open();
             }
         }
         
@@ -170,7 +170,7 @@ namespace BlueWater.Players.Combat
         {
             if (context.performed)
             {
-                CombatUiManager.Instance.DevelopMenuPopupUi.Open(CombatUiManager.Instance.PopupUiList);
+                CombatUiManager.Instance.DevelopMenuPopupUi.Open();
             }
         }
         
@@ -194,7 +194,7 @@ namespace BlueWater.Players.Combat
         {
             if (context.performed)
             {
-                CombatUiManager.Instance.CloseLastPopup();
+                PopupUiController.CloseLastPopup();
             }
         }
         

Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs

@@ -170,7 +170,7 @@ namespace BlueWater.Players.Combat
 
             yield return new WaitForSeconds(1f);
             Destroy(gameObject);
-            CombatUiManager.Instance.GameOverPopupUi.Open(CombatUiManager.Instance.PopupUiList);
+            CombatUiManager.Instance.GameOverPopupUi.Open();
         }
 
         public void ActivateInvincibility() => PlayerHealthPoint.ActivateInvincibility();

Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using BlueWater.Interfaces;
 using BlueWater.Tycoons;
@@ -37,7 +38,7 @@ namespace BlueWater.Players.Tycoons
 
         private void Start()
         {
-            Initialize();
+            StartCoroutine(nameof(Initialize));
         }
 
         private void Update()
@@ -71,11 +72,14 @@ namespace BlueWater.Players.Tycoons
             _playerInput = GetComponent<PlayerInput>();
         }
         
-        private void Initialize()
+        private IEnumerator Initialize()
         {
-            _playerInput.enabled = true;
             PlayerInputKeyManager.Instance.SetCurrentPlayerInput(_playerInput);
+            yield return new WaitUntil(() => _playerInput.IsInitialized());
+            
+            PlayerInputKeyManager.Instance.DisableAllActionMaps();
             PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon);
+            EventManager.InvokeInitializedPlayerInput();
         }
         
         #endregion
@@ -116,7 +120,7 @@ namespace BlueWater.Players.Tycoons
         {
             if (context.performed)
             {
-                TycoonUiManager.Instance.ManualBook.Open(TycoonUiManager.Instance.PopupUiList);
+                TycoonUiManager.Instance.ManualBook.Open();
             }
         }
         
@@ -125,7 +129,7 @@ namespace BlueWater.Players.Tycoons
         {
             if (context.performed)
             {
-                TycoonUiManager.Instance.CloseLastPopup();
+                PopupUiController.CloseLastPopup();
             }
         }
         

Assets/02.Scripts/EventManager.cs

@@ -4,7 +4,6 @@ using BlueWater.Npcs.Crews.Bartender;
 using BlueWater.Npcs.Crews.Cleaner;
 using BlueWater.Npcs.Crews.Server;
 using BlueWater.Npcs.Customers;
-using BlueWater.Tycoons;
 using UnityEngine;
 
 namespace BlueWater
@@ -14,6 +13,12 @@ namespace BlueWater
         // Global events
         #region Global events
 
+        public static Action OnInitializedPlayerInput;
+        public static void InvokeInitializedPlayerInput()
+        {
+            OnInitializedPlayerInput?.Invoke();
+        }
+        
         // Ui
         public static Action<float, float, Color?, float> OnFadeInOut;
         public static void InvokeFadeInOut(float fadeInTime, float fadeOutTime, Color? fadeColor = null, float delayAfterFadeIn = 0f)

Assets/02.Scripts/NewBlueWater.inputactions

@@ -620,7 +620,7 @@
                     "path": "<Keyboard>/e",
                     "interactions": "",
                     "processors": "",
-                    "groups": "",
+                    "groups": ";Keyboard&Mouse",
                     "action": "Interaction",
                     "isComposite": false,
                     "isPartOfComposite": false
@@ -631,7 +631,7 @@
                     "path": "<Keyboard>/f1",
                     "interactions": "",
                     "processors": "",
-                    "groups": "",
+                    "groups": ";Keyboard&Mouse",
                     "action": "DevelopKey01",
                     "isComposite": false,
                     "isPartOfComposite": false
@@ -1055,54 +1055,6 @@
                     "isPartOfComposite": false
                 }
             ]
-        },
-        {
-            "name": "Bar",
-            "id": "63082564-263a-4430-8f7a-13c3cd4e93e7",
-            "actions": [
-                {
-                    "name": "Pour",
-                    "type": "Button",
-                    "id": "b02d861a-39ed-4c5e-abd0-7ce3c2a44707",
-                    "expectedControlType": "",
-                    "processors": "",
-                    "interactions": "Press",
-                    "initialStateCheck": false
-                },
-                {
-                    "name": "EscapeBar",
-                    "type": "Button",
-                    "id": "4752dd64-7a31-42ae-bfc9-45a01927bd07",
-                    "expectedControlType": "",
-                    "processors": "",
-                    "interactions": "",
-                    "initialStateCheck": false
-                }
-            ],
-            "bindings": [
-                {
-                    "name": "",
-                    "id": "01fa3267-e5c0-48c1-8194-592530fbca87",
-                    "path": "<Keyboard>/space",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
-                    "action": "Pour",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                },
-                {
-                    "name": "",
-                    "id": "646d58bf-d879-47c1-99c9-c534c83eb9f4",
-                    "path": "<Keyboard>/escape",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "",
-                    "action": "EscapeBar",
-                    "isComposite": false,
-                    "isPartOfComposite": false
-                }
-            ]
         }
     ],
     "controlSchemes": [

Assets/02.Scripts/PlayerInputExtensions.cs

@@ -0,0 +1,14 @@
+using UnityEngine.InputSystem;
+
+namespace BlueWater
+{
+    // PlayerInput 확장
+    public static class PlayerInputExtensions
+    {
+        public static bool IsInitialized(this PlayerInput playerInput)
+        {
+            // currentActionMap이 할당되면 초기화 완료로 간주
+            return playerInput.currentActionMap != null;
+        }
+    }
+}

Assets/02.Scripts/PlayerInputExtensions.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: cfdd20a7e0c8ae649b5c4a6ca553133c

Assets/02.Scripts/Prop/Tycoon/Board.cs

@@ -7,7 +7,7 @@ namespace BlueWater.Tycoons
         public override void Interaction()
         {
             var tycoonUiManager = TycoonUiManager.Instance;
-            tycoonUiManager.TycoonManagementUi.Open(tycoonUiManager.PopupUiList);
+            tycoonUiManager.TycoonManagementUi.Open();
         }
         
         public override bool CanInteraction()

Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset

@@ -134,7 +134,7 @@ MonoBehaviour:
     <Value>k__BackingField:
       <Idx>k__BackingField: Cocktail006
       <Name>k__BackingField: "\uCE75\uD14C\uC77CAC"
-      <RatioRange>k__BackingField: 5
+      <RatioRange>k__BackingField: 10
       <IngredientIdx1>k__BackingField: LiquidA
       <IngredientRatio1>k__BackingField: 50
       <IngredientIdx2>k__BackingField: LiquidC
@@ -157,7 +157,7 @@ MonoBehaviour:
     <Value>k__BackingField:
       <Idx>k__BackingField: Cocktail007
       <Name>k__BackingField: "\uCE75\uD14C\uC77CBD"
-      <RatioRange>k__BackingField: 5
+      <RatioRange>k__BackingField: 10
       <IngredientIdx1>k__BackingField: LiquidB
       <IngredientRatio1>k__BackingField: 50
       <IngredientIdx2>k__BackingField: LiquidD
@@ -180,7 +180,7 @@ MonoBehaviour:
     <Value>k__BackingField:
       <Idx>k__BackingField: Cocktail008
       <Name>k__BackingField: "\uCE75\uD14C\uC77CCD"
-      <RatioRange>k__BackingField: 5
+      <RatioRange>k__BackingField: 10
       <IngredientIdx1>k__BackingField: LiquidC
       <IngredientRatio1>k__BackingField: 50
       <IngredientIdx2>k__BackingField: LiquidD

Assets/02.Scripts/ScriptableObject/LevelDataTable.asset

@@ -16,7 +16,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 1
     <Value>k__BackingField:
       <Idx>k__BackingField: 1
-      <CustomerRespawn>k__BackingField: 15
+      <CustomerRespawn>k__BackingField: 13
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 100
@@ -27,7 +27,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 2
     <Value>k__BackingField:
       <Idx>k__BackingField: 2
-      <CustomerRespawn>k__BackingField: 15
+      <CustomerRespawn>k__BackingField: 13
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 200
@@ -38,7 +38,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 3
     <Value>k__BackingField:
       <Idx>k__BackingField: 3
-      <CustomerRespawn>k__BackingField: 15
+      <CustomerRespawn>k__BackingField: 13
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 200
@@ -49,7 +49,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 4
     <Value>k__BackingField:
       <Idx>k__BackingField: 4
-      <CustomerRespawn>k__BackingField: 15
+      <CustomerRespawn>k__BackingField: 13
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 200
@@ -60,7 +60,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 5
     <Value>k__BackingField:
       <Idx>k__BackingField: 5
-      <CustomerRespawn>k__BackingField: 15
+      <CustomerRespawn>k__BackingField: 13
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 200
@@ -126,7 +126,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 11
     <Value>k__BackingField:
       <Idx>k__BackingField: 11
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 8
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 400
@@ -137,7 +137,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 12
     <Value>k__BackingField:
       <Idx>k__BackingField: 12
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 8
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 400
@@ -148,7 +148,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 13
     <Value>k__BackingField:
       <Idx>k__BackingField: 13
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 8
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 400
@@ -159,7 +159,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 14
     <Value>k__BackingField:
       <Idx>k__BackingField: 14
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 8
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 400
@@ -170,7 +170,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 15
     <Value>k__BackingField:
       <Idx>k__BackingField: 15
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 8
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 400
@@ -181,7 +181,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 16
     <Value>k__BackingField:
       <Idx>k__BackingField: 16
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 6
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 500
@@ -192,7 +192,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 17
     <Value>k__BackingField:
       <Idx>k__BackingField: 17
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 6
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 500
@@ -203,7 +203,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 18
     <Value>k__BackingField:
       <Idx>k__BackingField: 18
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 6
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 500
@@ -214,7 +214,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 19
     <Value>k__BackingField:
       <Idx>k__BackingField: 19
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 6
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 500
@@ -225,7 +225,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 20
     <Value>k__BackingField:
       <Idx>k__BackingField: 20
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 6
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 500
@@ -236,7 +236,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 21
     <Value>k__BackingField:
       <Idx>k__BackingField: 21
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 4
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 600
@@ -247,7 +247,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 22
     <Value>k__BackingField:
       <Idx>k__BackingField: 22
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 4
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 600
@@ -258,7 +258,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 23
     <Value>k__BackingField:
       <Idx>k__BackingField: 23
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 4
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 600
@@ -269,7 +269,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 24
     <Value>k__BackingField:
       <Idx>k__BackingField: 24
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 4
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 600
@@ -280,7 +280,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 25
     <Value>k__BackingField:
       <Idx>k__BackingField: 25
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 4
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 600
@@ -291,7 +291,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 26
     <Value>k__BackingField:
       <Idx>k__BackingField: 26
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 4
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 700
@@ -302,7 +302,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 27
     <Value>k__BackingField:
       <Idx>k__BackingField: 27
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 2
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 700
@@ -313,7 +313,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 28
     <Value>k__BackingField:
       <Idx>k__BackingField: 28
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 2
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 700
@@ -324,7 +324,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 29
     <Value>k__BackingField:
       <Idx>k__BackingField: 29
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 2
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 700
@@ -335,7 +335,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 30
     <Value>k__BackingField:
       <Idx>k__BackingField: 30
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 2
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 700
@@ -346,7 +346,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 31
     <Value>k__BackingField:
       <Idx>k__BackingField: 31
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 2
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 800
@@ -357,7 +357,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 32
     <Value>k__BackingField:
       <Idx>k__BackingField: 32
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 2
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 800
@@ -368,7 +368,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 33
     <Value>k__BackingField:
       <Idx>k__BackingField: 33
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 2
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 800
@@ -379,7 +379,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 34
     <Value>k__BackingField:
       <Idx>k__BackingField: 34
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 2
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 800
@@ -390,7 +390,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 35
     <Value>k__BackingField:
       <Idx>k__BackingField: 35
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 2
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 800
@@ -401,7 +401,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 36
     <Value>k__BackingField:
       <Idx>k__BackingField: 36
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 2
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 900
@@ -412,7 +412,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 37
     <Value>k__BackingField:
       <Idx>k__BackingField: 37
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 2
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 900
@@ -423,7 +423,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 38
     <Value>k__BackingField:
       <Idx>k__BackingField: 38
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 2
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 900
@@ -434,7 +434,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 39
     <Value>k__BackingField:
       <Idx>k__BackingField: 39
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 2
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 900
@@ -445,7 +445,7 @@ MonoBehaviour:
   - <Key>k__BackingField: 40
     <Value>k__BackingField:
       <Idx>k__BackingField: 40
-      <CustomerRespawn>k__BackingField: 5
+      <CustomerRespawn>k__BackingField: 2
       <Gold>k__BackingField: 100
       <Exp>k__BackingField: 100
       <RequiredExp>k__BackingField: 900

Assets/02.Scripts/ScriptableObject/StageData.asset

@@ -14,6 +14,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   <WaitTimeInStarted>k__BackingField: 5
   <VomitingPercent>k__BackingField: 20
-  <VomitingWaitTime>k__BackingField: 30
+  <VomitingWaitTime>k__BackingField: 20
-  <DirtyTablePercent>k__BackingField: 40
+  <DirtyTablePercent>k__BackingField: 100
   <DirtyTableWaitTime>k__BackingField: 30

Assets/02.Scripts/Tycoon/CrewController.cs

@@ -132,6 +132,9 @@ namespace BlueWater.Tycoons
         {
             var waitTime = new WaitForSeconds(2f);
             var tycoonIngredientController = TycoonManager.Instance.TycoonIngredientController;
+            
+            yield return new WaitForSeconds(0.5f);
+            
             while (true)
             {
                 foreach (var element in BartenderCrews)

Assets/02.Scripts/Tycoon/TycoonStageController.cs

@@ -23,19 +23,20 @@ namespace BlueWater.Tycoons
 
         private void Start()
         {
-            EventManager.OnTycoonGameOvered += GameOver;
-            
             _tycoonManager = TycoonManager.Instance;
             
             _dailyCustomerVisitInfos = new List<CustomerVisitInfo>();
 
-            StartStage();
+            EventManager.OnInitializedPlayerInput += StartStage;
+        }
+
+        private void OnDestroy()
+        {
+            EventManager.OnInitializedPlayerInput -= StartStage;
         }
 
         private void StartStage()
         {
-            EventManager.OnTycoonGameOvered -= GameOver;
-            
             _dailyCustomerVisitInfos.Clear();
             Utils.StartUniqueCoroutine(this, ref _startStageCoroutineInstance, StartStageCoroutine());
             

Assets/02.Scripts/Ui/Combat/ClearPopupUi.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Sirenix.OdinInspector;
 using UnityEngine;
 using UnityEngine.UI;
@@ -17,9 +16,9 @@ namespace BlueWater.Uis
             _moveNextStageButton = transform.Find("ClearPanel/Popup Base - Concave/Bottom/Background/Border/MoveNextStageButton").GetComponent<Button>();
         }
         
-        public override void Open(List<PopupUi> popupUiList)
+        public override void Open()
         {
-            base.Open(popupUiList);
+            base.Open();
             VisualFeedbackManager.Instance.SetBaseTimeScale(1f);
             PlayerInputKeyManager.Instance.DisableCurrentPlayerInput();
             _moveNextStageButton.interactable = (int)DataManager.Instance.CurrentSaveStage < Enum.GetValues(typeof(SaveStage)).Length - 1;

Assets/02.Scripts/Ui/Combat/CombatUiManager.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using BlueWater.Items;
 using BlueWater.Maps;
 using DG.Tweening;
 using Sirenix.OdinInspector;
@@ -51,8 +50,6 @@ namespace BlueWater.Uis
         [SerializeField]
         private Image _fadeImage;
         
-        public List<PopupUi> PopupUiList { get; private set; }
-        
         protected override void OnAwake()
         {
             InitializeComponents();
@@ -60,8 +57,6 @@ namespace BlueWater.Uis
 
         private void Start()
         {
-            PopupUi.OnPopupUiOpenEvent += RegisterPopup;
-            PopupUi.OnPopupUiCloseEvent += UnregisterPopup;
             EventManager.OnFadeInOut += FadeInOut;
             
             Invoke(nameof(StartTutorial), 0.1f);
@@ -76,8 +71,6 @@ namespace BlueWater.Uis
         {
             if (Quitting) return;
             
-            PopupUi.OnPopupUiOpenEvent -= RegisterPopup;
-            PopupUi.OnPopupUiCloseEvent -= UnregisterPopup;
             EventManager.OnFadeInOut -= FadeInOut;
         }
         
@@ -97,43 +90,6 @@ namespace BlueWater.Uis
             CombatTutorialUi = MainCanvas.transform.Find("CombatTutorialUi").GetComponent<CombatTutorialUi>();
             DevelopMenuPopupUi = MainCanvas.transform.Find("DevelopMenuPopupUi").GetComponent<MenuPopupUi>();
             _fadeImage = MainCanvas.transform.Find("FadeImage").GetComponent<Image>();
-
-            PopupUiList = new List<PopupUi>(8);
-        }
-        
-        private void RegisterPopup(PopupUi popup)
-        {
-            if (!PopupUiList.Contains(popup))
-            {
-                PopupUiList.Add(popup);
-            }
-        }
-
-        private void UnregisterPopup(PopupUi popup)
-        {
-            if (PopupUiList.Contains(popup))
-            {
-                PopupUiList.Remove(popup);
-            }
-        }
-        
-        public void CloseLastPopup()
-        {
-            if (PopupUiList.Count <= 0) return;
-            
-            PopupUiList[^1].Close();
-        }
-
-        public void CloseAllPopup()
-        {
-            var tempList = new List<PopupUi>(PopupUiList);
-            
-            foreach (var popup in tempList)
-            {
-                popup.Close();
-            }
-            
-            PopupUiList.Clear();
         }
         
         public void FadeInOut(float fadeInTime, float fadeOutTime, Color? fadeColor = null, float delayAfterFadeIn = 0f)
@@ -160,19 +116,19 @@ namespace BlueWater.Uis
         public void HardResetAllMaps()
         {
             MapManager.Instance.HardResetAllMaps();
-            CloseAllPopup();
+            PopupUiController.CloseAllPopup();
         }
         
         public void RestartCurrentStage()
         {
             MapManager.Instance.RestartCurrentMap();
-            CloseAllPopup();
+            PopupUiController.CloseAllPopup();
         }
 
         public void MoveSelectStage(int stage)
         {
             MapManager.Instance.MoveSelectStage(stage);
-            CloseAllPopup();
+            PopupUiController.CloseAllPopup();
         }
 
         public void MoveTitleScene()

Assets/02.Scripts/Ui/Combat/DiscardPopupUi.cs

@@ -55,7 +55,7 @@ namespace BlueWater.Uis
             _countText.text = _currentCount.ToString();
             
             _countSelectUi.SetActive(true);
-            Open(CombatUiManager.Instance.PopupUiList);
+            Open();
         }
         
         public void DiscardAllMessage(List<ItemSlotUi> selectedSlotList)
@@ -65,7 +65,7 @@ namespace BlueWater.Uis
             _contentText.text = "선택한 물품을 모두 버리시겠습니까?";
             
             _countSelectUi.SetActive(false);
-            Open(CombatUiManager.Instance.PopupUiList);
+            Open();
         }
 
         public void CountDownButton()

Assets/02.Scripts/Ui/Combat/GameOverPopupUi.cs

@@ -4,9 +4,9 @@ namespace BlueWater.Uis
 {
     public class GameOverPopupUi : PopupUi
     {
-        public override void Open(List<PopupUi> popupUiList)
+        public override void Open()
         {
-            base.Open(popupUiList);
+            base.Open();
             VisualFeedbackManager.Instance.SetBaseTimeScale(0f);
             PlayerInputKeyManager.Instance.DisableCurrentPlayerInput();
         }

Assets/02.Scripts/Ui/MenuPopupUi.cs

@@ -1,12 +1,10 @@
-using System.Collections.Generic;
-
 namespace BlueWater.Uis
 {
     public class MenuPopupUi : SwitchActionPopupUi
     {
-        public override void Open(List<PopupUi> popupUiList)
+        public override void Open()
         {
-            base.Open(popupUiList);
+            base.Open();
             VisualFeedbackManager.Instance.SetBaseTimeScale(0f);
         }
 

Assets/02.Scripts/Ui/PopupUi.cs

@@ -1,29 +1,25 @@
-using System;
-using System.Collections.Generic;
 using UnityEngine;
 
 namespace BlueWater.Uis
 {
     public class PopupUi : MonoBehaviour
     {
-        public static event Action<PopupUi> OnPopupUiOpenEvent;
+        public bool IsOpened { get; protected set; }
-        public static event Action<PopupUi> OnPopupUiCloseEvent;
         
-        protected List<PopupUi> PopupUiList;
+        public virtual void Open()
-        
-        public virtual void Open(List<PopupUi> popupUiList)
         {
-            PopupUiList = popupUiList;
             // 화면의 가장 앞으로 가져오기
             transform.SetAsLastSibling();
             gameObject.SetActive(true);
-            OnPopupUiOpenEvent?.Invoke(this);
+            PopupUiController.RegisterPopup(this);
+            IsOpened = true;
         }
 
         public virtual void Close()
         {
             gameObject.SetActive(false);
-            OnPopupUiCloseEvent?.Invoke(this);
+            PopupUiController.UnregisterPopup(this);
+            IsOpened = false;
         }
     }
 }

Assets/02.Scripts/Ui/PopupUiController.cs

@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using BlueWater.Uis;
+
+namespace BlueWater
+{
+    public static class PopupUiController
+    {
+        public static List<PopupUi> PopupUis { get; private set; } = new();
+        
+        // Popup 등록
+        public static void RegisterPopup(PopupUi popup)
+        {
+            if (!PopupUis.Contains(popup))
+            {
+                PopupUis.Add(popup);
+            }
+        }
+
+        // Popup 해제
+        public static void UnregisterPopup(PopupUi popup)
+        {
+            if (PopupUis.Contains(popup))
+            {
+                PopupUis.Remove(popup);
+            }
+        }
+
+        // 마지막 Popup 닫기
+        public static void CloseLastPopup()
+        {
+            if (PopupUis.Count <= 0) return;
+            
+            PopupUis[^1].Close();
+        }
+
+        // 모든 Popup 닫기
+        public static void CloseAllPopup()
+        {
+            foreach (var element in PopupUis)
+            {
+                if (!element.IsOpened) continue;
+                
+                element.Close();
+            }
+        }
+
+        // Popup 목록이 비어 있는지 확인
+        public static bool IsPopupListEmpty() => PopupUis.Count == 0;
+    }
+}

Assets/02.Scripts/Ui/PopupUiController.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: ea2b34c9f4db83a409013e9bf6bcb82a

Assets/02.Scripts/Ui/SwitchActionPopupUi.cs

@@ -11,9 +11,9 @@ namespace BlueWater.Uis
         [SerializeField]
         protected InputActionMaps SwitchMapsClosed;
         
-        public override void Open(List<PopupUi> popupUiList)
+        public override void Open()
         {
-            base.Open(popupUiList);
+            base.Open();
             
             PlayerInputKeyManager.Instance.SwitchCurrentActionMap(SwitchMapsOpened);
         }
@@ -22,7 +22,7 @@ namespace BlueWater.Uis
         {
             base.Close();
             
-            if (PopupUiList.Count > 0) return;
+            if (!PopupUiController.IsPopupListEmpty()) return;
             
             PlayerInputKeyManager.Instance.SwitchCurrentActionMap(SwitchMapsClosed);
         }

Assets/02.Scripts/Ui/Tycoon/Bill.cs

@@ -50,6 +50,8 @@ namespace BlueWater
         public BillInfo CurrentBillInfo { get; private set; }
 
         private Tween _sliderTween;
+        private Sequence _moveSequence;
+        private Sequence _arrivedSequence;
         private Vector3 _spawnPosition;
         private float _maxDistance;
 
@@ -74,7 +76,6 @@ namespace BlueWater
 
         public void SetTween(int waitTime, int hurryTime)
         {
-            _sliderTween?.Kill();
             _sliderTween = _slider.DOValue(0f, hurryTime)
                 .From(1f)
                 .SetEase(Ease.Linear)
@@ -85,7 +86,8 @@ namespace BlueWater
         private void OnDestroy()
         {
             _slider.onValueChanged.RemoveListener(OnSliderValueChanged);
-            DOTween.Kill(_rect);
+            _moveSequence.Kill();
+            _arrivedSequence.Kill();
         }
 
         private void OnSliderValueChanged(float value)
@@ -95,8 +97,6 @@ namespace BlueWater
 
         public void Move(BillInfo billInfo)
         {
-            if (!_rect) return;
-            
             if (CurrentBillInfo != null)
             {
                 CurrentBillInfo.IsEmpty = true;
@@ -111,27 +111,26 @@ namespace BlueWater
             var rotationAngle = Mathf.Lerp(8f, 40f, distance / _maxDistance);
             var punchStrength = Mathf.Lerp(1f, 5f, distance / _maxDistance);
             
-            var moveSequence = DOTween.Sequence().SetAutoKill(true);
+            _moveSequence = DOTween.Sequence().SetAutoKill(true);
-            moveSequence.Append(_rect.DOLocalMoveX(CurrentBillInfo.Position.x, moveTime));
+            _moveSequence.Append(_rect.DOLocalMoveX(CurrentBillInfo.Position.x, moveTime));
-            moveSequence.Join(_rect.DOLocalRotate(new Vector3(0, 0, rotationAngle), moveTime / 5f));
+            _moveSequence.Join(_rect.DOLocalRotate(new Vector3(0, 0, rotationAngle), moveTime / 5f));
-            moveSequence.Join(_rect.DOPunchRotation(new Vector3(0f, 0f, punchStrength), moveTime * 4f / 5f, 3, 0.2f)
+            _moveSequence.Join(_rect.DOPunchRotation(new Vector3(0f, 0f, punchStrength), moveTime * 4f / 5f, 3, 0.2f)
                 .SetDelay(0.2f)
                 .SetEase(Ease.InOutBounce));
-            moveSequence.AppendCallback(OnArrivedTarget);
+            _moveSequence.AppendCallback(OnArrivedTarget);
         }
 
         private void OnArrivedTarget()
         {
-            if (!_rect) return;
+            if (!gameObject || !_rect) return;
             
             CurrentBillInfo.IsMoving = false;
             var randomZ = Random.Range(-15f, 15f);
-            var arrivedSequence = DOTween.Sequence();
+            _arrivedSequence = DOTween.Sequence();
-            
+            _arrivedSequence.Append(_rect.DOLocalRotate(Vector3.zero, 0.2f).SetEase(Ease.InQuad));
-            arrivedSequence.Append(_rect.DOLocalRotate(Vector3.zero, 0.2f).SetEase(Ease.InQuad));
+            _arrivedSequence.Append(_rect.DOPunchRotation(new Vector3(0f, 0f, -20f), 1f, 5, 0.5f)
-            arrivedSequence.Append(_rect.DOPunchRotation(new Vector3(0f, 0f, -20f), 1f, 5, 0.5f)
                 .SetEase(Ease.InOutBounce));
-            arrivedSequence.Append(_rect.DOLocalRotate(new Vector3(0f, 0f, randomZ), 0.2f).SetEase(Ease.InQuad));
+            _arrivedSequence.Append(_rect.DOLocalRotate(new Vector3(0f, 0f, randomZ), 0.2f).SetEase(Ease.InQuad));
         }
         
         public void OrderResult(bool isSucceed, Action onDestroyAction)
@@ -154,7 +153,7 @@ namespace BlueWater
             }
             
             _stampImageObject.SetActive(true);
-            _sliderTween.Kill();
+            _sliderTween?.Kill();
             var isTrigger = false;
             while (_animationController.IsComparingCurrentAnimation(animationName) &&
                    _animationController.GetCurrentAnimationNormalizedTime() < 1f)
@@ -179,14 +178,14 @@ namespace BlueWater
 
         public void BartenderMakingCocktail()
         {
-            _makingCocktailPivotObject?.gameObject.SetActive(true);
+            _makingCocktailPivotObject.gameObject.SetActive(true);
         }
         
         public void BartenderCompleteMakingCocktail()
         {
-            _makingCocktailPivotObject?.gameObject.SetActive(false);
+            _makingCocktailPivotObject.gameObject.SetActive(false);
-            _checkImageObject?.gameObject.SetActive(true);
+            _checkImageObject.gameObject.SetActive(true);
-            _animationController?.SetAnimationParameter("isBartenderChecked", true);
+            _animationController.SetAnimationParameter("isBartenderChecked", true);
         }
 
         public void ResetGauge()

Assets/02.Scripts/Ui/Tycoon/TycoonManagementUi.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using BlueWater.Tycoons;
 using DG.Tweening;
 using Sirenix.OdinInspector;
 using UnityEngine;
@@ -38,10 +36,10 @@ namespace BlueWater.Uis
             _closeTween.Kill();
         }
 
-        public override void Open(List<PopupUi> popupUiList)
+        public override void Open()
         {
             _rectTransform.anchoredPosition = new Vector2(-960f, 0f);
-            base.Open(popupUiList);
+            base.Open();
             _openTween = _rectTransform.DOAnchorPosX(960f, 0.5f).SetAutoKill(false);
         }
 

Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using BlueWater.Tycoons;
 using DG.Tweening;
 using Sirenix.OdinInspector;
 using UnityEngine;
@@ -36,10 +35,6 @@ namespace BlueWater.Uis
         [SerializeField]
         private Image _fadeImage;
         
-        
-        // Variables
-        public List<PopupUi> PopupUiList { get; private set; }
-        
         #endregion
         
         // Unity events
@@ -52,8 +47,6 @@ namespace BlueWater.Uis
         
         private void Start()
         {
-            PopupUi.OnPopupUiOpenEvent += RegisterPopup;
-            PopupUi.OnPopupUiCloseEvent += UnregisterPopup;
             EventManager.OnTycoonGameStarted += TycoonOpenEvent;
             EventManager.OnTycoonGameOvered += TycoonClosedEvent;
             EventManager.OnFadeInOut += FadeInOut;
@@ -63,8 +56,6 @@ namespace BlueWater.Uis
         {
             if (Quitting) return;
             
-            PopupUi.OnPopupUiOpenEvent -= RegisterPopup;
-            PopupUi.OnPopupUiCloseEvent -= UnregisterPopup;
             EventManager.OnTycoonGameStarted -= TycoonOpenEvent;
             EventManager.OnTycoonGameOvered -= TycoonClosedEvent;
             EventManager.OnFadeInOut -= FadeInOut;
@@ -86,7 +77,6 @@ namespace BlueWater.Uis
             //BrewingUi = GetComponentInChildren<BrewingUi>(true);
             ManualBook = GetComponentInChildren<ManualBook>(true);
             _fadeImage = MainCanvas.transform.Find("FadeImage").GetComponent<Image>();
-            PopupUiList = new List<PopupUi>(8);
         }
         
         #endregion
@@ -94,43 +84,6 @@ namespace BlueWater.Uis
         // Methods
         #region Methods
 
-        private void RegisterPopup(PopupUi popup)
-        {
-            if (!PopupUiList.Contains(popup))
-            {
-                PopupUiList.Add(popup);
-            }
-        }
-
-        private void UnregisterPopup(PopupUi popup)
-        {
-            if (PopupUiList.Contains(popup))
-            {
-                PopupUiList.Remove(popup);
-            }
-        }
-        
-        public void CloseLastPopup()
-        {
-            if (PopupUiList.Count <= 0) return;
-            
-            PopupUiList[^1].Close();
-        }
-
-        public void CloseAllPopup()
-        {
-            var tempList = new List<PopupUi>(PopupUiList);
-            
-            foreach (var popup in tempList)
-            {
-                popup.Close();
-            }
-            
-            PopupUiList.Clear();
-        }
-
-        public bool IsPopupListEmpty() => PopupUiList.Count == 0;
-
         private void TycoonOpenEvent()
         {
             TycoonStageUi.TycoonOpenUi();

Assets/03.Images/Props/Mini/BarTable05Long.png.meta

@@ -0,0 +1,143 @@
+fileFormatVersion: 2
+guid: e9275315ca60c1f479efa8f9393c7627
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 7
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 512
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/03.Images/Props/Mini/Sign02.png.meta

@@ -0,0 +1,143 @@
+fileFormatVersion: 2
+guid: d2ba40b4f14eca14e816e51ee69cf81a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 7
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 512
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/03.Images/Props/Mini/Statue03.png.meta

@@ -0,0 +1,143 @@
+fileFormatVersion: 2
+guid: 6054b1d07e3c28d4eaf1af80ac6ad385
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 7
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 512
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/03.Images/Props/Mini/WallBar2.png.meta

@@ -0,0 +1,143 @@
+fileFormatVersion: 2
+guid: e8b27b82f6af50849b71aa8fbabb80f4
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 7
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 512
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab

@@ -594,8 +594,8 @@ MonoBehaviour:
   <PlayerInput>k__BackingField: {fileID: 6054159730444663926}
   <VisualLook>k__BackingField: {fileID: 6509241874729291456}
   <SkeletonAnimation>k__BackingField: {fileID: 7125556968546628472}
-  <InteractionCanvas>k__BackingField: {fileID: 0}
+  <InteractionCanvas>k__BackingField: {fileID: 56698895639349130}
-  <SpineController>k__BackingField: {fileID: 0}
+  <SpineController>k__BackingField: {fileID: 6662554121718997272}
   <PlayerHealthPoint>k__BackingField: {fileID: 3359549505901716120}
   <TycoonInput>k__BackingField: {fileID: 1674052485383758547}
   <TycoonMovement>k__BackingField: {fileID: 4836489897218844789}
@@ -748,6 +748,17 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+--- !u!114 &56698895639349130 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8043919875794167790, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+  m_PrefabInstance: {fileID: 8027897071964512356}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &3452808590865560956 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}

Assets/05.Prefabs/Maps/Tycoon/TycoonMap 3.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 42db7535356402a4a8b24b8ef7f15b9d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/05.Prefabs/Maps/Tycoon/TycoonMapUpsideDown.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d00863a976850a54e87df1f93d3c243e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab

@@ -113,7 +113,7 @@ Transform:
   m_GameObject: {fileID: 5773649549535946419}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.6, y: 0, z: 0}
+  m_LocalPosition: {x: -0.508, y: 0, z: 0}
   m_LocalScale: {x: -1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -164,7 +164,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 3
-  m_Sprite: {fileID: 21300000, guid: 8c4b435ee4066134f8150ed44ebe72f0, type: 3}
+  m_Sprite: {fileID: 21300000, guid: d2ba40b4f14eca14e816e51ee69cf81a, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -459,15 +459,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalScale.x
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalScale.y
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalScale.z
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalPosition.x

Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab

@@ -301,7 +301,7 @@ PrefabInstance:
     - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_Sprite
       value: 
-      objectReference: {fileID: 21300000, guid: 8a17cc1d4bb99d24f9643918915415a3, type: 3}
+      objectReference: {fileID: 21300000, guid: 6054b1d07e3c28d4eaf1af80ac6ad385, type: 3}
     - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_WasSpriteAssigned
       value: 1
@@ -369,7 +369,7 @@ PrefabInstance:
     - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_Sprite
       value: 
-      objectReference: {fileID: 21300000, guid: 8a17cc1d4bb99d24f9643918915415a3, type: 3}
+      objectReference: {fileID: 21300000, guid: 6054b1d07e3c28d4eaf1af80ac6ad385, type: 3}
     - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_WasSpriteAssigned
       value: 1

Assets/05.Prefabs/Props/Mini/BarTable04 1.prefab

@@ -0,0 +1,99 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &2866474732463670273
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2395388827384788821, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: e9275315ca60c1f479efa8f9393c7627, type: 3}
+    - target: {fileID: 2643849317649087853, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_Name
+      value: BarTable04 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7854536393926979320, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: e9275315ca60c1f479efa8f9393c7627, type: 3}
+    - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9396927
+      objectReference: {fileID: 0}
+    - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.3420201
+      objectReference: {fileID: 0}
+    - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 40
+      objectReference: {fileID: 0}
+    - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}

Assets/05.Prefabs/Props/Mini/BarTable04 1.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 79b3f905c4984cc4e8e8ba87d8dc663d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/05.Prefabs/Props/Mini/BarTableLong Variant2.prefab

@@ -14,12 +14,20 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5796819295798372049, guid: 76b794a931e63304f88a6cb498795c4c, type: 3}
       propertyPath: m_LocalScale.x
-      value: 2.96
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5796819295798372049, guid: 76b794a931e63304f88a6cb498795c4c, type: 3}
       propertyPath: m_LocalScale.y
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5796819295798372049, guid: 76b794a931e63304f88a6cb498795c4c, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5796819295798372049, guid: 76b794a931e63304f88a6cb498795c4c, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6457232975130062969, guid: 76b794a931e63304f88a6cb498795c4c, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0

Assets/05.Prefabs/Props/Mini/WallBar.prefab

@@ -10,12 +10,12 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1784444314929232576, guid: b51ba0e08743f4947898c76771fa87e2, type: 3}
       propertyPath: m_Name
-      value: WoodenBeerMug 1
+      value: WallBar
       objectReference: {fileID: 0}
     - target: {fileID: 2111459413474029816, guid: b51ba0e08743f4947898c76771fa87e2, type: 3}
       propertyPath: m_Sprite
       value: 
-      objectReference: {fileID: 21300000, guid: ce3081c06d7752f49a60a4506c5518e3, type: 3}
+      objectReference: {fileID: 21300000, guid: e8b27b82f6af50849b71aa8fbabb80f4, type: 3}
     - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -59,7 +59,7 @@ PrefabInstance:
     - target: {fileID: 5869214406492465493, guid: b51ba0e08743f4947898c76771fa87e2, type: 3}
       propertyPath: m_Sprite
       value: 
-      objectReference: {fileID: 21300000, guid: ce3081c06d7752f49a60a4506c5518e3, type: 3}
+      objectReference: {fileID: 21300000, guid: e8b27b82f6af50849b71aa8fbabb80f4, type: 3}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/05.Prefabs/Props/Mini/WallMiddlePart.prefab

@@ -16,6 +16,10 @@ PrefabInstance:
       propertyPath: m_WasSpriteAssigned
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2395388827384788821, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
+      propertyPath: 'm_Materials.Array.data[0]'
+      value: 
+      objectReference: {fileID: 2100000, guid: 470021da37a3b244ab004fb80b151574, type: 2}
     - target: {fileID: 2643849317649087853, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
       propertyPath: m_Name
       value: WallMiddlePart
@@ -30,15 +34,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.9659258
+      value: 0.9396927
       objectReference: {fileID: 0}
     - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.2588191
+      value: 0.3420201
       objectReference: {fileID: 0}
     - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: 30
+      value: 40
       objectReference: {fileID: 0}
     - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
       propertyPath: m_LocalPosition.x

Assets/05.Prefabs/Props/Mini/WallPassPart01.prefab

@@ -30,15 +30,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.9396927
+      value: 0.9063079
       objectReference: {fileID: 0}
     - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.3420201
+      value: 0.42261827
       objectReference: {fileID: 0}
     - target: {fileID: 8625998552772928208, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: 40
+      value: 50
       objectReference: {fileID: 0}
     - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3}
       propertyPath: m_LocalPosition.x

Assets/Resources/JSON/CocktailDataTable.json

@@ -92,7 +92,7 @@
   {
     "Idx": "Cocktail006",
     "Name": "칵테일AC",
-    "RatioRange": 5,
+    "RatioRange": 10,
     "IngredientIdx1": "LiquidA",
     "IngredientRatio1": 50,
     "IngredientIdx2": "LiquidC",
@@ -107,7 +107,7 @@
   {
     "Idx": "Cocktail007",
     "Name": "칵테일BD",
-    "RatioRange": 5,
+    "RatioRange": 10,
     "IngredientIdx1": "LiquidB",
     "IngredientRatio1": 50,
     "IngredientIdx2": "LiquidD",
@@ -122,7 +122,7 @@
   {
     "Idx": "Cocktail008",
     "Name": "칵테일CD",
-    "RatioRange": 5,
+    "RatioRange": 10,
     "IngredientIdx1": "LiquidC",
     "IngredientRatio1": 50,
     "IngredientIdx2": "LiquidD",

Assets/Resources/JSON/LevelDataTable.json

@@ -1,7 +1,7 @@
 [
   {
     "Idx": 1,
-    "CustomerRespawn": 15,
+    "CustomerRespawn": 13,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 100,
@@ -12,7 +12,7 @@
   },
   {
     "Idx": 2,
-    "CustomerRespawn": 15,
+    "CustomerRespawn": 13,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 200,
@@ -23,7 +23,7 @@
   },
   {
     "Idx": 3,
-    "CustomerRespawn": 15,
+    "CustomerRespawn": 13,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 200,
@@ -34,7 +34,7 @@
   },
   {
     "Idx": 4,
-    "CustomerRespawn": 15,
+    "CustomerRespawn": 13,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 200,
@@ -45,7 +45,7 @@
   },
   {
     "Idx": 5,
-    "CustomerRespawn": 15,
+    "CustomerRespawn": 13,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 200,
@@ -111,7 +111,7 @@
   },
   {
     "Idx": 11,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 8,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 400,
@@ -122,7 +122,7 @@
   },
   {
     "Idx": 12,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 8,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 400,
@@ -133,7 +133,7 @@
   },
   {
     "Idx": 13,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 8,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 400,
@@ -144,7 +144,7 @@
   },
   {
     "Idx": 14,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 8,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 400,
@@ -155,7 +155,7 @@
   },
   {
     "Idx": 15,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 8,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 400,
@@ -166,7 +166,7 @@
   },
   {
     "Idx": 16,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 6,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 500,
@@ -177,7 +177,7 @@
   },
   {
     "Idx": 17,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 6,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 500,
@@ -188,7 +188,7 @@
   },
   {
     "Idx": 18,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 6,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 500,
@@ -199,7 +199,7 @@
   },
   {
     "Idx": 19,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 6,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 500,
@@ -210,7 +210,7 @@
   },
   {
     "Idx": 20,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 6,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 500,
@@ -221,7 +221,7 @@
   },
   {
     "Idx": 21,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 4,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 600,
@@ -232,7 +232,7 @@
   },
   {
     "Idx": 22,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 4,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 600,
@@ -243,7 +243,7 @@
   },
   {
     "Idx": 23,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 4,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 600,
@@ -254,7 +254,7 @@
   },
   {
     "Idx": 24,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 4,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 600,
@@ -265,7 +265,7 @@
   },
   {
     "Idx": 25,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 4,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 600,
@@ -276,7 +276,7 @@
   },
   {
     "Idx": 26,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 4,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 700,
@@ -287,7 +287,7 @@
   },
   {
     "Idx": 27,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 2,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 700,
@@ -298,7 +298,7 @@
   },
   {
     "Idx": 28,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 2,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 700,
@@ -309,7 +309,7 @@
   },
   {
     "Idx": 29,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 2,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 700,
@@ -320,7 +320,7 @@
   },
   {
     "Idx": 30,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 2,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 700,
@@ -331,7 +331,7 @@
   },
   {
     "Idx": 31,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 2,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 800,
@@ -342,7 +342,7 @@
   },
   {
     "Idx": 32,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 2,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 800,
@@ -353,7 +353,7 @@
   },
   {
     "Idx": 33,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 2,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 800,
@@ -364,7 +364,7 @@
   },
   {
     "Idx": 34,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 2,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 800,
@@ -375,7 +375,7 @@
   },
   {
     "Idx": 35,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 2,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 800,
@@ -386,7 +386,7 @@
   },
   {
     "Idx": 36,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 2,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 900,
@@ -397,7 +397,7 @@
   },
   {
     "Idx": 37,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 2,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 900,
@@ -408,7 +408,7 @@
   },
   {
     "Idx": 38,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 2,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 900,
@@ -419,7 +419,7 @@
   },
   {
     "Idx": 39,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 2,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 900,
@@ -430,7 +430,7 @@
   },
   {
     "Idx": 40,
-    "CustomerRespawn": 5,
+    "CustomerRespawn": 2,
     "Gold": 100,
     "Exp": 100,
     "RequiredExp": 900,