From 8d012763bbcf9416b48c0af31a33843a38cc05d1 Mon Sep 17 00:00:00 2001
From: NTG_Lenovo <iwnc2020@gmail.com>
Date: Tue, 3 Dec 2024 17:02:15 +0900
Subject: [PATCH] 0.3.5.8

---
 Assets/02.Scripts/Audio/AudioManager.cs       |  40 +++-
 .../Character/Player/Tycoon/TycoonPlayer.cs   |   1 +
 Assets/02.Scripts/EventManager.cs             |  18 +-
 Assets/02.Scripts/PlayerInputKeyManager.cs    |  52 -----
 Assets/02.Scripts/SaveData.cs                 |  15 +-
 Assets/02.Scripts/SceneController.cs          |  15 +-
 .../ScriptableObject/Audio/SfxData.asset      |   2 +
 Assets/02.Scripts/Ui/Title/TitleMenuButton.cs |   5 +
 .../02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs |  12 +-
 .../Outline/BarrelOutlineUnlit.mat            |   1 +
 .../Maps/Tycoon/NewTycoonMap.prefab           | 105 ++++++++-
 .../Props/Environment/Tycoon/Barrel.prefab    |  36 +++-
 .../Props/Environment/Tycoon/Barrel01.prefab  |  36 +++-
 ...erTable02.prefab => BartenderTable.prefab} |   4 +
 ...prefab.meta => BartenderTable.prefab.meta} |   0
 .../BaseInteractionFurniture.prefab           |  14 +-
 .../Interactions/CustomerTable.prefab         |   8 +-
 .../Interactions/LimeTreeGarnish.prefab       |   4 +
 .../Interactions/LiquidBarrel.prefab          |   4 +-
 .../Interactions/LiquidStatue.prefab          |   6 +-
 .../Furniture/Interactions/Mushroom.prefab    |   4 +
 .../Interactions/NormalRewardBox.prefab       |   4 +
 ...domChangeTrashCan.prefab.meta => Old.meta} |   5 +-
 .../Interactions/{ => Old}/Bar01.prefab       |   0
 .../Interactions/{ => Old}/Bar01.prefab.meta  |   0
 .../{ => Old}/BartenderTable01.prefab         |   0
 .../{ => Old}/BartenderTable01.prefab.meta    |   0
 .../{ => Old}/BeverageMachine.prefab          |   0
 .../{ => Old}/BeverageMachine.prefab.meta     |   0
 .../Interactions/{ => Old}/Board.prefab       |   0
 .../Interactions/{ => Old}/Board.prefab.meta  |   0
 .../Interactions/{ => Old}/Brewing.prefab     |   0
 .../{ => Old}/Brewing.prefab.meta             |   0
 .../Interactions/{ => Old}/FireWood.prefab    |   0
 .../{ => Old}/FireWood.prefab.meta            |   0
 .../Interactions/{ => Old}/Grill.prefab       |   0
 .../Interactions/{ => Old}/Grill.prefab.meta  |   0
 .../Interactions/{ => Old}/Pot.prefab         |   0
 .../Interactions/{ => Old}/Pot.prefab.meta    |   0
 .../Interactions/{ => Old}/PowerSwitch.prefab |   0
 .../{ => Old}/PowerSwitch.prefab.meta         |   0
 .../{ => Old}/ServingTable01.prefab           |   0
 .../{ => Old}/ServingTable01.prefab.meta      |   0
 .../Interactions/{ => Old}/Skewer.prefab      |   0
 .../Interactions/{ => Old}/Skewer.prefab.meta |   0
 .../Props/Furniture/Interactions/Pump.prefab  |   4 +
 .../Interactions/RandomChangeTrashCan.prefab  | 204 ------------------
 .../Interactions/RareRewardBox.prefab         |   4 +
 ...vingTable02.prefab => ServingTable.prefab} |   4 +
 ...2.prefab.meta => ServingTable.prefab.meta} |   0
 .../Furniture/Interactions/TrashCan.prefab    |   6 +-
 .../Furniture/Interactions/Vomiting.prefab    |   4 +
 Assets/06.Sounds/Sfx/Uis.meta                 |   8 +
 .../Sfx/Uis/BUTTON_Very_Bright_Click_mono.wav | Bin 0 -> 4852 bytes
 .../BUTTON_Very_Bright_Click_mono.wav.meta    |  23 ++
 .../08.Spines/Props/Barrel/Barrel.skel.bytes  | Bin 10845 -> 10845 bytes
 ProjectSettings/ProjectSettings.asset         |   2 +-
 ProjectSettings/TimeManager.asset             |   6 +-
 58 files changed, 321 insertions(+), 335 deletions(-)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{BartenderTable02.prefab => BartenderTable.prefab} (99%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{BartenderTable02.prefab.meta => BartenderTable.prefab.meta} (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{RandomChangeTrashCan.prefab.meta => Old.meta} (57%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/Bar01.prefab (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/Bar01.prefab.meta (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/BartenderTable01.prefab (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/BartenderTable01.prefab.meta (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/BeverageMachine.prefab (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/BeverageMachine.prefab.meta (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/Board.prefab (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/Board.prefab.meta (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/Brewing.prefab (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/Brewing.prefab.meta (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/FireWood.prefab (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/FireWood.prefab.meta (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/Grill.prefab (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/Grill.prefab.meta (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/Pot.prefab (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/Pot.prefab.meta (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/PowerSwitch.prefab (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/PowerSwitch.prefab.meta (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/ServingTable01.prefab (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/ServingTable01.prefab.meta (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/Skewer.prefab (100%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ => Old}/Skewer.prefab.meta (100%)
 delete mode 100644 Assets/05.Prefabs/Props/Furniture/Interactions/RandomChangeTrashCan.prefab
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ServingTable02.prefab => ServingTable.prefab} (99%)
 rename Assets/05.Prefabs/Props/Furniture/Interactions/{ServingTable02.prefab.meta => ServingTable.prefab.meta} (100%)
 create mode 100644 Assets/06.Sounds/Sfx/Uis.meta
 create mode 100644 Assets/06.Sounds/Sfx/Uis/BUTTON_Very_Bright_Click_mono.wav
 create mode 100644 Assets/06.Sounds/Sfx/Uis/BUTTON_Very_Bright_Click_mono.wav.meta

diff --git a/Assets/02.Scripts/Audio/AudioManager.cs b/Assets/02.Scripts/Audio/AudioManager.cs
index 8fa3b5ab1..07b60886c 100644
--- a/Assets/02.Scripts/Audio/AudioManager.cs
+++ b/Assets/02.Scripts/Audio/AudioManager.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Sirenix.OdinInspector;
 using UnityEngine;
@@ -6,6 +7,22 @@ using UnityEngine.SceneManagement;
 
 namespace BlueWater.Audios
 {
+    [Serializable]
+    public class SfxPitch
+    {
+        [field: SerializeField]
+        public bool IsIgnoreTimeScale { get; set; }
+        
+        [field: SerializeField]
+        public float PitchValue { get; set; }
+        
+        public SfxPitch(bool isIgnoreTimeScale, float pitchValue)
+        {
+            IsIgnoreTimeScale = isIgnoreTimeScale;
+            PitchValue = pitchValue;
+        }
+    }
+    
     public class AudioManager : Singleton<AudioManager>
     {
         [Title("오디오 데이터")]
@@ -37,10 +54,10 @@ namespace BlueWater.Audios
         
         private Dictionary<string, AudioClip> _bgmDictionary;
         private Dictionary<string, AudioClip> _sfxDictionary;
+        private Dictionary<AudioSource, SfxPitch> _sfxPitchDictionary;
+        private Dictionary<string, float> _sfxPlayTimeDictionary;
         
         private AudioSource _bgmAudioSource;
-        private Dictionary<AudioSource, float> _sfxPitchDictionary;
-        private Dictionary<string, float> _sfxPlayTimeDictionary;
         
         protected override void OnAwake()
         {
@@ -84,13 +101,13 @@ namespace BlueWater.Audios
             _bgmAudioSource.outputAudioMixerGroup = _bgmMixerGroup;
             _bgmAudioSource.loop = true;
 
-            _sfxPitchDictionary = new Dictionary<AudioSource, float>(_sfxChannelCount);
+            _sfxPitchDictionary = new Dictionary<AudioSource, SfxPitch>(_sfxChannelCount);
             for (var i = 0; i < _sfxChannelCount; i++)
             {
                 var sfxAudioSource = gameObject.AddComponent<AudioSource>();
                 sfxAudioSource.outputAudioMixerGroup = _sfxMixerGroup;
                 sfxAudioSource.loop = false;
-                _sfxPitchDictionary[sfxAudioSource] = sfxAudioSource.pitch;
+                _sfxPitchDictionary[sfxAudioSource] = new SfxPitch(false, sfxAudioSource.pitch);
             }
         }
 
@@ -131,15 +148,14 @@ namespace BlueWater.Audios
 
                 if (ignoreTimeScale)
                 {
-                    // TimeScale의 영향을 받지 않는 pitch 설정
-                    _sfxPitchDictionary[availableSfxAudioSource] = duration.HasValue ? value.length / duration.Value : 1f;
-                    availableSfxAudioSource.pitch = _sfxPitchDictionary[availableSfxAudioSource];
+                    _sfxPitchDictionary[availableSfxAudioSource] = new SfxPitch(true, 1f);
+                    availableSfxAudioSource.pitch = 1f;
                 }
                 else
                 {
-                    // TimeScale의 영향을 받는 pitch 설정
-                    _sfxPitchDictionary[availableSfxAudioSource] = duration.HasValue ? value.length / duration.Value : 1f;
-                    availableSfxAudioSource.pitch = _sfxPitchDictionary[availableSfxAudioSource] * Time.timeScale;
+                    float pitch = duration.HasValue ? value.length / duration.Value : 1f;
+                    _sfxPitchDictionary[availableSfxAudioSource] = new SfxPitch(false, pitch);
+                    availableSfxAudioSource.pitch = _sfxPitchDictionary[availableSfxAudioSource].PitchValue * Time.timeScale;
                 }
 
                 availableSfxAudioSource.Play();
@@ -223,7 +239,9 @@ namespace BlueWater.Audios
         {
             foreach (var element in _sfxPitchDictionary)
             {
-                element.Key.pitch = element.Value * pitch;
+                if (element.Value.IsIgnoreTimeScale) continue;
+                
+                element.Key.pitch = element.Value.PitchValue * pitch;
             }
         }
     }
diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs
index 9ca8204cd..5cdd553ca 100644
--- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs
+++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs
@@ -169,6 +169,7 @@ namespace BlueWater.Players.Tycoons
         {
             int saveGold = Mathf.RoundToInt(TycoonManager.Instance.TycoonStatus.CurrentGold * TycoonManager.Instance.TycoonStatus.EndGoldMultiplier);
             ES3.Save(SaveData.EndGold, saveGold);
+            ES3.Save(SaveData.CompleteFirstGame, true);
         }
 
         public void MakeCocktailCompleted(CocktailData cocktailData, bool isMadePlayer)
diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs
index 24bac8937..7724492ee 100644
--- a/Assets/02.Scripts/EventManager.cs
+++ b/Assets/02.Scripts/EventManager.cs
@@ -19,22 +19,10 @@ namespace BlueWater
             OnChangedDisplay?.Invoke();
         }
 
-        public static Action OnInitializedPlayerInput;
-        public static void InvokeInitializedPlayerInput()
+        public static Action OnInitializedScene;
+        public static void InvokeInitializedScene()
         {
-            OnInitializedPlayerInput?.Invoke();
-        }
-        
-        public static Action<float> OnCameraZoomOut;
-        public static void InvokeCameraZoomOut(float value)
-        {
-            OnCameraZoomOut?.Invoke(value);
-        }
-
-        public static Action<float> OnCameraZoomIn;
-        public static void InvokeCameraZoomIn(float value)
-        {
-            OnCameraZoomIn?.Invoke(value);
+            OnInitializedScene?.Invoke();
         }
         
         // Ui
diff --git a/Assets/02.Scripts/PlayerInputKeyManager.cs b/Assets/02.Scripts/PlayerInputKeyManager.cs
index 5f92adcc9..321aa3510 100644
--- a/Assets/02.Scripts/PlayerInputKeyManager.cs
+++ b/Assets/02.Scripts/PlayerInputKeyManager.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.InputSystem;
@@ -48,11 +46,6 @@ namespace BlueWater
     {
         [SerializeField]
         private PlayerInput _currentPlayerInput;
-        
-        private Vector3 _lastMousePosition; //마우스 이동 감지용
-        private bool _isKey = false; //키보드 입력상태 == true / 마우스 입력상태 == false (중복 방직용)
-        private readonly List<Action> _onActionKeyboard = new List<Action>();
-        private readonly List<Action> _onActionMouse = new List<Action>();
 
         protected override void OnAwake()
         {
@@ -67,30 +60,6 @@ namespace BlueWater
             
             SceneManager.sceneLoaded += OnSceneLoaded;
         }
-
-        // public void Update()
-        // {
-        //     bool CheckMouse(){return Input.GetMouseButtonDown(0) || Input.GetMouseButtonDown(1)||Input.GetMouseButtonDown(2);}
-        //     
-        //     if(!_isKey && Input.anyKeyDown && !CheckMouse()) //키보드 감지 (최초)
-        //     {
-        //         foreach (var element in _onActionKeyboard)
-        //         {
-        //             element?.Invoke();
-        //         }
-        //         _lastMousePosition = Input.mousePosition;
-        //         _isKey = true;
-        //     }
-        //     else if (_isKey && (Input.anyKeyDown && CheckMouse() || (_isKey && Input.mousePosition != _lastMousePosition))) //마우스 감지 (최초)
-        //     {
-        //         foreach (var element in _onActionMouse)
-        //         {
-        //             element?.Invoke();
-        //         }
-        //         _lastMousePosition = Input.mousePosition;
-        //         _isKey = false;
-        //     }
-        // }
         
         private async void OnSceneLoaded(Scene scene, LoadSceneMode mode)
         {
@@ -116,29 +85,8 @@ namespace BlueWater
             else if (currentSceneName == SceneName.Tycoon)
             {
                 SwitchCurrentActionMap(InputActionMaps.Tycoon);
-                EventManager.InvokeInitializedPlayerInput();
             }
         }
-        
-        public void AddOnActionKeyboard(Action action)
-        {
-            _onActionKeyboard.Add(action);
-        }
-        
-        public void AddOnActionMouse(Action action)
-        {
-            _onActionMouse.Add(action);
-        }
-        
-        public void RemoveOnActionKeyboard(Action action)
-        {
-            _onActionKeyboard.Remove(action);
-        }
-        
-        public void RemoveOnActionMouse(Action action)
-        {
-            _onActionMouse.Remove(action);
-        }
 
         /// <summary>
         /// 현재 실행되고 있는 PlayerInput을 관리할 수 있게
diff --git a/Assets/02.Scripts/SaveData.cs b/Assets/02.Scripts/SaveData.cs
index 37ed9eb8a..d33349d48 100644
--- a/Assets/02.Scripts/SaveData.cs
+++ b/Assets/02.Scripts/SaveData.cs
@@ -2,12 +2,13 @@ namespace BlueWater
 {
     public static class SaveData
     {
-        public static string Locale = "Locale";
-        public static string EndGold = "EndGold";
-        public static string ScreenMode = "ScreenMode";
-        public static string Resolution = "Resolution";
-        public static string MasterVolume = "MasterVolume";
-        public static string BgmVolume = "BgmVolume";
-        public static string SfxVolume = "SfxVolume";
+        public const string Locale = "Locale";
+        public const string EndGold = "EndGold";
+        public const string ScreenMode = "ScreenMode";
+        public const string Resolution = "Resolution";
+        public const string MasterVolume = "MasterVolume";
+        public const string BgmVolume = "BgmVolume";
+        public const string SfxVolume = "SfxVolume";
+        public const string CompleteFirstGame = "CompleteFirstGame";
     }
 }
diff --git a/Assets/02.Scripts/SceneController.cs b/Assets/02.Scripts/SceneController.cs
index 622f48600..10707631c 100644
--- a/Assets/02.Scripts/SceneController.cs
+++ b/Assets/02.Scripts/SceneController.cs
@@ -95,18 +95,13 @@ namespace BlueWater
             _fadeOut.Restart();
             await _fadeOut.AsyncWaitForCompletion();
             
-            // _fadeOut.Restart();
-            // _loadingPanelFadeOut.Restart();
-            // Task[] fadeOutTasks =
-            // {
-            //     _fadeOut.AsyncWaitForCompletion(),
-            //     _loadingPanelFadeOut.AsyncWaitForCompletion()
-            // };
-
-            //await Task.WhenAll(fadeOutTasks);
-            
             PopupUiController.ClearPopup();
             VisualFeedbackManager.Instance.ResetTimeScale();
+            
+            if (sceneName == SceneName.Tycoon)
+            {
+                EventManager.InvokeInitializedScene();
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset b/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset
index a1a802b64..b330f70b7 100644
--- a/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset
+++ b/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset
@@ -93,3 +93,5 @@ MonoBehaviour:
     <Clip>k__BackingField: {fileID: 8300000, guid: f556df27b6add5a49979cc7a158f6110, type: 3}
   - <SfxName>k__BackingField: RareRewardBox
     <Clip>k__BackingField: {fileID: 8300000, guid: 3f98ecaf35492e744bb4dc943e1a39b1, type: 3}
+  - <SfxName>k__BackingField: SelectedButton01
+    <Clip>k__BackingField: {fileID: 8300000, guid: 80adc41542bc901439938907231717a8, type: 3}
diff --git a/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs b/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs
index 7ba7bff26..a173339f0 100644
--- a/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs
+++ b/Assets/02.Scripts/Ui/Title/TitleMenuButton.cs
@@ -1,3 +1,4 @@
+using BlueWater.Audios;
 using Sirenix.OdinInspector;
 using UnityEngine;
 using UnityEngine.EventSystems;
@@ -16,6 +17,9 @@ namespace BlueWater.Titles
         [SerializeField]
         private Color _highlightedColor;
 
+        [SerializeField]
+        private string _selectedSfxName = "SelectedButton01";
+
         private Color _originalColor = Color.white;
         private bool _isQuitting;
 
@@ -38,6 +42,7 @@ namespace BlueWater.Titles
 
         public void OnSelect(BaseEventData eventData)
         {
+            AudioManager.Instance.PlaySfx(_selectedSfxName, ignoreTimeScale:true);
             _selectedImage.color = _originalColor;
             _selectedImage.enabled = true;
         }
diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs
index 8c783f15e..2dcbe8ca5 100644
--- a/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs
+++ b/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs
@@ -53,7 +53,6 @@ namespace BlueWater.Uis
         
         private List<TycoonCard> _tycoonCards = new(5);
         
-        private LevelData _currentLevelData;
         private TycoonManager _tycoonManager;
         private TycoonCardController _tycoonCardController;
         private Sequence _failedPurchaseSequence;
@@ -71,7 +70,7 @@ namespace BlueWater.Uis
 
         private void Awake()
         {
-            EventManager.OnInitializedPlayerInput += CreateCard;
+            EventManager.OnInitializedScene += CreateCard;
         }
 
         private void Start()
@@ -98,7 +97,7 @@ namespace BlueWater.Uis
         {
             _failedPurchaseSequence.Kill();
             
-            EventManager.OnInitializedPlayerInput -= CreateCard;
+            EventManager.OnInitializedScene -= CreateCard;
         }
 
         public override void Open()
@@ -124,10 +123,15 @@ namespace BlueWater.Uis
         private void CreateCard()
         {
             if (!Application.isPlaying) return;
+
+            if (!ES3.Load(SaveData.CompleteFirstGame, false))
+            {
+                EventManager.InvokeTycoonGameStarted();
+                return;
+            }
             
             Utils.StartUniqueCoroutine(this, ref _changeGoldInstance, AnimateGoldChange());
             
-            _currentLevelData = TycoonManager.Instance.GetCurrentLevelData();
             _tycoonCardController.DestroyCardList(_tycoonCards);
             for (int i = 0; i < _tycoonCards.Capacity; i++)
             {
diff --git a/Assets/04.Materials/Outline/BarrelOutlineUnlit.mat b/Assets/04.Materials/Outline/BarrelOutlineUnlit.mat
index 9a097a946..c0eaa457b 100644
--- a/Assets/04.Materials/Outline/BarrelOutlineUnlit.mat
+++ b/Assets/04.Materials/Outline/BarrelOutlineUnlit.mat
@@ -84,6 +84,7 @@ Material:
     m_Floats:
     - _AddPrecomputedVelocity: 0
     - _AlphaClip: 0
+    - _AlphaThreshold: 0.5
     - _AlphaToMask: 0
     - _Blend: 0
     - _BlendModePreserveSpecular: 1
diff --git a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab
index 2479df626..649d9340a 100644
--- a/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab
+++ b/Assets/05.Prefabs/Maps/Tycoon/NewTycoonMap.prefab
@@ -5109,6 +5109,7 @@ Transform:
   - {fileID: 5128199735897506476}
   - {fileID: 11141612720054821}
   - {fileID: 1376671198123935973}
+  - {fileID: 512977381636670004}
   - {fileID: 4715404908742687508}
   - {fileID: 869534564193479129}
   - {fileID: 4307167678708421440}
@@ -7035,6 +7036,84 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d5f9353c4d1012f4ca86098c1a9aff33, type: 3}
   m_PrefabInstance: {fileID: 689594917335105277}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &695120074272338147
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 3500050107750040134}
+    m_Modifications:
+    - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.0377901
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.0377901
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.0377901
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 4.272
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -5.131
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6075426784951483330, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+      propertyPath: m_Name
+      value: Box (9)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+--- !u!4 &512977381636670004 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
+  m_PrefabInstance: {fileID: 695120074272338147}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &768054145390819379
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -9386,7 +9465,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 6.2999997
+      value: 2.96
       objectReference: {fileID: 0}
     - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
       propertyPath: m_LocalPosition.y
@@ -9394,7 +9473,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -2.553
+      value: -3.443
       objectReference: {fileID: 0}
     - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
       propertyPath: m_LocalRotation.w
@@ -9709,6 +9788,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1653087204473300138, guid: 18213e533ac275e429ee601785bff676, type: 3}
+      propertyPath: managedReferences[5889118636641091760].m_Value
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 5897095096647521783, guid: 18213e533ac275e429ee601785bff676, type: 3}
       propertyPath: m_Name
       value: SlimeGarnish
@@ -10875,7 +10958,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -3.04
+      value: -2.346
       objectReference: {fileID: 0}
     - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
       propertyPath: m_LocalPosition.y
@@ -10883,7 +10966,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -5.27
+      value: -5.169
       objectReference: {fileID: 0}
     - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
       propertyPath: m_LocalRotation.w
@@ -12988,7 +13071,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -3.5699997
+      value: -0.92
       objectReference: {fileID: 0}
     - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
       propertyPath: m_LocalPosition.y
@@ -12996,7 +13079,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -3.5423727
+      value: -3.41
       objectReference: {fileID: 0}
     - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3}
       propertyPath: m_LocalRotation.w
@@ -14491,6 +14574,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1653087204473300138, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3}
+      propertyPath: managedReferences[5889118636641091760].m_Value
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 5897095096647521783, guid: 92f5a0c86ec9cef4681b00068e5e7746, type: 3}
       propertyPath: m_Name
       value: LimeTreeGarnish
@@ -15309,7 +15396,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 809828747251277026, guid: 9e5375e8c94af9f49a9661227294f024, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -13.971
+      value: -14.045
       objectReference: {fileID: 0}
     - target: {fileID: 809828747251277026, guid: 9e5375e8c94af9f49a9661227294f024, type: 3}
       propertyPath: m_LocalRotation.w
@@ -16229,7 +16316,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -7.03
+      value: -7.24
       objectReference: {fileID: 0}
     - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3}
       propertyPath: m_LocalPosition.y
@@ -16237,7 +16324,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -14
+      value: -14.07
       objectReference: {fileID: 0}
     - target: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3}
       propertyPath: m_LocalRotation.w
diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab
index 7631ff260..cea0110e2 100644
--- a/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab
+++ b/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel.prefab
@@ -96,8 +96,40 @@ PrefabInstance:
       propertyPath: m_WasSpriteAssigned
       value: 1
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 2170066264100983348}
   m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+--- !u!1 &6075426784951483330 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+  m_PrefabInstance: {fileID: 6949017745149437987}
+  m_PrefabAsset: {fileID: 0}
+--- !u!136 &2170066264100983348
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6075426784951483330}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.2
+  m_Height: 0.8
+  m_Direction: 0
+  m_Center: {x: 0, y: 0.2, z: 0.2}
diff --git a/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel01.prefab b/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel01.prefab
index 21f9b2b89..5a47b9535 100644
--- a/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel01.prefab
+++ b/Assets/05.Prefabs/Props/Environment/Tycoon/Barrel01.prefab
@@ -100,8 +100,40 @@ PrefabInstance:
       propertyPath: m_WasSpriteAssigned
       value: 1
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 8465497525880288504, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      insertIndex: 1
+      addedObject: {fileID: 8672178933073810756}
   m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+--- !u!1 &6075426784951483330 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+  m_PrefabInstance: {fileID: 6949017745149437987}
+  m_PrefabAsset: {fileID: 0}
+--- !u!136 &8672178933073810756
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6075426784951483330}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.2
+  m_Height: 0.8
+  m_Direction: 0
+  m_Center: {x: 0, y: 0.2, z: 0.2}
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable02.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab
similarity index 99%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable02.prefab
rename to Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab
index f20120a70..3d394d399 100644
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable02.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab
@@ -234,6 +234,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_Height
+      value: 0.9
+      objectReference: {fileID: 0}
     - target: {fileID: 2209729715339278869, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_SizeDelta.x
       value: -180
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable02.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab.meta
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable02.prefab.meta
rename to Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable.prefab.meta
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab
index ff3c08e6d..cc477379d 100644
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab
@@ -9,7 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7986070582027999988}
-  - component: {fileID: 2234961990804426782}
+  - component: {fileID: 937530840197856001}
   - component: {fileID: 5891094220003351037}
   m_Layer: 8
   m_Name: BaseInteractionFurniture
@@ -36,8 +36,8 @@ Transform:
   - {fileID: 1180174675498993111}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &2234961990804426782
-BoxCollider:
+--- !u!136 &937530840197856001
+CapsuleCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -54,9 +54,11 @@ BoxCollider:
   m_IsTrigger: 0
   m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 1, y: 1, z: 0.5}
-  m_Center: {x: 0, y: 0.5, z: 0.25}
+  serializedVersion: 2
+  m_Radius: 0.15
+  m_Height: 1
+  m_Direction: 0
+  m_Center: {x: 0, y: 0.15, z: 0.15}
 --- !u!210 &5891094220003351037
 SortingGroup:
   m_ObjectHideFlags: 0
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab
index feec05b06..4e887eb9a 100644
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab
@@ -1562,7 +1562,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 353433a78f14e1b42bef6e12dd1f5700, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _collider: {fileID: 8857736056138880520}
+  _collider: {fileID: 7560392866728606999}
   _visualLookObject: {fileID: 672328621937310823}
   _carpetRenderer: {fileID: 7588633447038655794}
   <TableSeats>k__BackingField:
@@ -1583,9 +1583,9 @@ SortingGroup:
   m_SortingLayer: 0
   m_SortingOrder: 5
   m_SortAtRoot: 0
---- !u!65 &8857736056138880520 stripped
-BoxCollider:
-  m_CorrespondingSourceObject: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+--- !u!136 &7560392866728606999 stripped
+CapsuleCollider:
+  m_CorrespondingSourceObject: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
   m_PrefabInstance: {fileID: 7343451337687172630}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8710013924293209931
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab
index 88514fba4..427b5739a 100644
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LimeTreeGarnish.prefab
@@ -183,6 +183,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_Height
+      value: 0.2
+      objectReference: {fileID: 0}
     - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 40
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab
index 8f406c33f..6d0d42de3 100644
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel.prefab
@@ -407,7 +407,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0.2
+      value: 0.1
       objectReference: {fileID: 0}
     - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_IsActive
@@ -696,7 +696,7 @@ MonoBehaviour:
   <OutlineMaterial>k__BackingField: {fileID: 0}
   <LocalizeStringEvent>k__BackingField: {fileID: 1653087204473300138}
   <EnableInteraction>k__BackingField: 1
-  <InteractionRadius>k__BackingField: 1
+  <InteractionRadius>k__BackingField: 0.9
   <InteractionMessage>k__BackingField: 
   IsOpened: 0
   SpineController: {fileID: 3688680572007923171}
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab
index 6c9c39f61..a99d11f66 100644
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab
@@ -270,6 +270,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_Height
+      value: 0.6
+      objectReference: {fileID: 0}
     - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 40
@@ -441,8 +445,6 @@ MonoBehaviour:
   <IsActivated>k__BackingField: 0
   <IsAutoSupply>k__BackingField: 0
   _liquidImage: {fileID: 6817574259189873408}
-  _fill: {fileID: 7052380446467937511}
-  _colorIntensity: 2
   <IsMoldy>k__BackingField: 0
   _playerHoldingTime: 3
 --- !u!114 &7478245182548380060
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab
index 0e80bb437..73d0a78a0 100644
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab
@@ -8,6 +8,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_IsTrigger
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 40
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab
index 55288b1b7..0cfc4a577 100644
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/NormalRewardBox.prefab
@@ -102,6 +102,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -50
       objectReference: {fileID: 0}
+    - target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_IsTrigger
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 40
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/RandomChangeTrashCan.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/Old.meta
similarity index 57%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/RandomChangeTrashCan.prefab.meta
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old.meta
index f25b18b5f..bc4d514c6 100644
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/RandomChangeTrashCan.prefab.meta
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Old.meta
@@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: eaa55356a4b11e047a47332f0d6a9d1a
-PrefabImporter:
+guid: d38201631f17f58499429d506ba04198
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Bar01.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/Bar01.prefab
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/Bar01.prefab
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/Bar01.prefab
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Bar01.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/Bar01.prefab.meta
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/Bar01.prefab.meta
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/Bar01.prefab.meta
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable01.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/BartenderTable01.prefab
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable01.prefab
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/BartenderTable01.prefab
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable01.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/BartenderTable01.prefab.meta
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/BartenderTable01.prefab.meta
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/BartenderTable01.prefab.meta
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BeverageMachine.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/BeverageMachine.prefab
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/BeverageMachine.prefab
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/BeverageMachine.prefab
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/BeverageMachine.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/BeverageMachine.prefab.meta
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/BeverageMachine.prefab.meta
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/BeverageMachine.prefab.meta
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Board.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/Board.prefab
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/Board.prefab
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/Board.prefab
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Board.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/Board.prefab.meta
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/Board.prefab.meta
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/Board.prefab.meta
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Brewing.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/Brewing.prefab
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/Brewing.prefab
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/Brewing.prefab
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Brewing.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/Brewing.prefab.meta
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/Brewing.prefab.meta
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/Brewing.prefab.meta
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/FireWood.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/FireWood.prefab
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/FireWood.prefab
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/FireWood.prefab
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/FireWood.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/FireWood.prefab.meta
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/FireWood.prefab.meta
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/FireWood.prefab.meta
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Grill.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/Grill.prefab
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/Grill.prefab
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/Grill.prefab
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Grill.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/Grill.prefab.meta
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/Grill.prefab.meta
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/Grill.prefab.meta
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Pot.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/Pot.prefab
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/Pot.prefab
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/Pot.prefab
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Pot.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/Pot.prefab.meta
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/Pot.prefab.meta
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/Pot.prefab.meta
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/PowerSwitch.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/PowerSwitch.prefab
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/PowerSwitch.prefab
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/PowerSwitch.prefab
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/PowerSwitch.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/PowerSwitch.prefab.meta
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/PowerSwitch.prefab.meta
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/PowerSwitch.prefab.meta
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable01.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/ServingTable01.prefab
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable01.prefab
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/ServingTable01.prefab
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable01.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/ServingTable01.prefab.meta
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable01.prefab.meta
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/ServingTable01.prefab.meta
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Skewer.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/Skewer.prefab
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/Skewer.prefab
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/Skewer.prefab
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Skewer.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/Old/Skewer.prefab.meta
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/Skewer.prefab.meta
rename to Assets/05.Prefabs/Props/Furniture/Interactions/Old/Skewer.prefab.meta
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Pump.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Pump.prefab
index 7d7b9241e..e8e5be467 100644
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/Pump.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Pump.prefab
@@ -116,6 +116,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_IsTrigger
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 40
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/RandomChangeTrashCan.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/RandomChangeTrashCan.prefab
deleted file mode 100644
index 75d64423b..000000000
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/RandomChangeTrashCan.prefab
+++ /dev/null
@@ -1,204 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1001 &7343451337687172630
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 40
-      objectReference: {fileID: 0}
-    - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 80
-      objectReference: {fileID: 0}
-    - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 21300000, guid: 3efc550bddc68a345b5400a832fb9a6a, type: 3}
-    - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_WasSpriteAssigned
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_Name
-      value: RandomChangeTrashCan
-      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 21300000, guid: 3efc550bddc68a345b5400a832fb9a6a, type: 3}
-    - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_WasSpriteAssigned
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 2724648112398126851}
-    - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 5411673223561907087}
-  m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
---- !u!1 &5897095096647521783 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-  m_PrefabInstance: {fileID: 7343451337687172630}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &2724648112398126851
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5897095096647521783}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bfafa6669b5fa8a48b8e610286e1a192, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  <CenterTransform>k__BackingField: {fileID: 5927803667513949971}
-  <VisualLook>k__BackingField: {fileID: 6077686033771388879}
-  <InteractionCanvas>k__BackingField: {fileID: 6533109861150454071}
-  <OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
-  <LocalizeStringEvent>k__BackingField: {fileID: 5411673223561907087}
-  <EnableInteraction>k__BackingField: 1
-  <InteractionRadius>k__BackingField: 0.7
-  <InteractionMessage>k__BackingField: 
-  IsOpened: 0
---- !u!114 &5411673223561907087
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5897095096647521783}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_StringReference:
-    m_TableReference:
-      m_TableCollectionName: 
-    m_TableEntryReference:
-      m_KeyId: 0
-      m_Key: 
-    m_FallbackState: 0
-    m_WaitForCompletion: 0
-    m_LocalVariables: []
-  m_FormatArguments: []
-  m_UpdateString:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: BlueWater.Tycoons.InteractionFurniture, Assembly-CSharp
-        m_MethodName: set_InteractionMessage
-        m_Mode: 0
-        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
-  references:
-    version: 2
-    RefIds: []
---- !u!4 &5927803667513949971 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-  m_PrefabInstance: {fileID: 7343451337687172630}
-  m_PrefabAsset: {fileID: 0}
---- !u!212 &6077686033771388879 stripped
-SpriteRenderer:
-  m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-  m_PrefabInstance: {fileID: 7343451337687172630}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &6533109861150454071 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 4558604739080582945, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-  m_PrefabInstance: {fileID: 7343451337687172630}
-  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: 
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab
index 2690c9f9f..8b580a224 100644
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/RareRewardBox.prefab
@@ -102,6 +102,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -50
       objectReference: {fileID: 0}
+    - target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_IsTrigger
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 40
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab
similarity index 99%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab
rename to Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab
index a951dab0b..8e4010773 100644
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab
@@ -203,6 +203,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_Height
+      value: 0.6
+      objectReference: {fileID: 0}
     - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 40
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab.meta
similarity index 100%
rename from Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable02.prefab.meta
rename to Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab.meta
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab
index b7df73ced..4d6598c76 100644
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab
@@ -116,6 +116,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_Height
+      value: 0.7
+      objectReference: {fileID: 0}
     - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 40
@@ -386,7 +390,7 @@ MonoBehaviour:
   physicsMovementRelativeTo: {fileID: 0}
   updateTiming: 1
   unscaledTime: 0
-  _animationName: TrashcanCloseStop
+  _animationName: TrashCanCloseStop
   loop: 0
   timeScale: 1
 --- !u!33 &2469795103172270817
diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab
index 3b22784d8..bcc8b65ff 100644
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab
@@ -8,6 +8,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 937530840197856001, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_IsTrigger
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 40
diff --git a/Assets/06.Sounds/Sfx/Uis.meta b/Assets/06.Sounds/Sfx/Uis.meta
new file mode 100644
index 000000000..b3224f16f
--- /dev/null
+++ b/Assets/06.Sounds/Sfx/Uis.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 481707ec9952c0040a4ddea47c5294d3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/06.Sounds/Sfx/Uis/BUTTON_Very_Bright_Click_mono.wav b/Assets/06.Sounds/Sfx/Uis/BUTTON_Very_Bright_Click_mono.wav
new file mode 100644
index 0000000000000000000000000000000000000000..5e7c733eaa95156e4cc88f8af9c55bbc73595d99
GIT binary patch
literal 4852
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
AZ~y=R

literal 0
HcmV?d00001

diff --git a/Assets/06.Sounds/Sfx/Uis/BUTTON_Very_Bright_Click_mono.wav.meta b/Assets/06.Sounds/Sfx/Uis/BUTTON_Very_Bright_Click_mono.wav.meta
new file mode 100644
index 000000000..3336277d5
--- /dev/null
+++ b/Assets/06.Sounds/Sfx/Uis/BUTTON_Very_Bright_Click_mono.wav.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 80adc41542bc901439938907231717a8
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 8
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/08.Spines/Props/Barrel/Barrel.skel.bytes b/Assets/08.Spines/Props/Barrel/Barrel.skel.bytes
index 0a64cd92a8140ec508fb8c92d1d021d7e94445e5..88d4e5596efc3dd1e2c893b1e3b6617d6021c92e 100644
GIT binary patch
delta 96
zcmcZ`ayNuyx<Gc>*{ANmH*$osOn$}8zd48H0HY-{3lpm#3kN3`8#_NgI|rK}D;vKc
yKL?kf01Kl410#z77dMa(<S=pb@bmKs@bC%<@G%JR@@-CK+abf4xmixxo*e*6LJ@xe

delta 98
zcmcZ`ayNwI%Dqaaz@HOCH*$osurf0+GBIyXVmZZV$tK9k&(6Wd&d<Tg#VW|c%)%tV
z%O}9cz{4xR&m+Li!_UIVB*-to#m&#iBETrXASl4X&%wpUFSt3CZHEk_=Vm!&dv*Zf
C7Z1Mx

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index db7429d13..d724748cc 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -140,7 +140,7 @@ PlayerSettings:
   loadStoreDebugModeEnabled: 0
   visionOSBundleVersion: 1.0
   tvOSBundleVersion: 1.0
-  bundleVersion: 0.3.5.6
+  bundleVersion: 0.3.5.8
   preloadedAssets:
   - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
   - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}
diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset
index 558a017e1..8f68da289 100644
--- a/ProjectSettings/TimeManager.asset
+++ b/ProjectSettings/TimeManager.asset
@@ -3,7 +3,11 @@
 --- !u!5 &1
 TimeManager:
   m_ObjectHideFlags: 0
-  Fixed Timestep: 0.02
+  Fixed Timestep:
+    m_Count: 2822399
+    m_Rate:
+      m_Denominator: 1
+      m_Numerator: 141120000
   Maximum Allowed Timestep: 0.33333334
   m_TimeScale: 1
   Maximum Particle Timestep: 0.03