Liquid Ui 수정 중

2024-09-26 20:50:39 +09:00 · 2024-09-26 20:50:39 +09:00 · 9d7723d0ee
commit 9d7723d0ee
parent 8c959e2016
62 changed files with 21094 additions and 20823 deletions
--- a/Assets/01.Scenes/01.Tycoon.unity
+++ b/Assets/01.Scenes/01.Tycoon.unity
@ -5479,7 +5479,7 @@ MonoBehaviour:
  Lens:
    FieldOfView: 60
    OrthographicSize: 15.39
-    NearClipPlane: 0.3
+    NearClipPlane: 0.01
    FarClipPlane: 300
    Dutch: 0
    ModeOverride: 2
@ -6519,7 +6519,7 @@ MonoBehaviour:
  Lens:
    FieldOfView: 60
    OrthographicSize: 15.39
-    NearClipPlane: 0.3
+    NearClipPlane: 0.01
    FarClipPlane: 300
    Dutch: 0
    ModeOverride: 2
@ -8579,7 +8579,7 @@ Camera:
    y: 0
    width: 1
    height: 1
-  near clip plane: 0.3
+  near clip plane: 0.01
  far clip plane: 300
  field of view: 60
  orthographic: 0
@ -8628,9 +8628,11 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  _persistent: 0
  <MainCamera>k__BackingField: {fileID: 873223991}
+  <LiquidOverlayCamera>k__BackingField: {fileID: 1985878519}
  cameraLocation: {fileID: 1634548838}
  <BaseCamera>k__BackingField: {fileID: 545850352}
  <StorageCamera>k__BackingField: {fileID: 613509651}
+  _transparencySortAxis: {x: 0, y: 0, z: 0}
 --- !u!1001 &874559119
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -9413,7 +9415,7 @@ MonoBehaviour:
  _completeText: {fileID: 321673}
  _spawnTransform: {fileID: 970735072}
  _spawnLocation: {fileID: 218784750}
-  _pushDirection: {x: -5, y: -1, z: 0}
+  _pushDirection: {x: -3, y: -1, z: 0}
  _pushPower: 50
  _liquidObject: {fileID: -7612237390858616641, guid: 231c2f369e2946745a955eb49243702b, type: 3}
  _garnishObject: {fileID: 5803694563079548352, guid: f051d09e1e3043d4285ae8e0ff4c4f12, type: 3}
@ -9423,7 +9425,9 @@ MonoBehaviour:
  _colorIntensity: 2
  _objectPoolCount: 1000
  _moveDuration: 0.5
-  endPosition: {x: -230, y: 23, z: 0}
+  _endPosition: {x: -300, y: 0, z: 0}
+  _endPositionOffset: {x: 0, y: 20, z: 0}
+  _endScale: {x: 0.3, y: 0.3, z: 0.3}
 --- !u!1001 &1011627381
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -11057,7 +11061,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 40, y: 50}
+  m_SizeDelta: {x: 50, y: 50}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1172519050
 MonoBehaviour:
@ -11072,14 +11076,14 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.5882353}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 140fdbe02cd90bf47994129e6be6bafe, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -11801,8 +11805,8 @@ Transform:
  m_GameObject: {fileID: 1247057678}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -130, y: 23, z: 0}
-  m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
+  m_LocalPosition: {x: -300, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 1321215893}
@ -14221,7 +14225,7 @@ Transform:
  m_GameObject: {fileID: 1400792457}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -1}
  m_LocalScale: {x: 16, y: 2, z: 10}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -21734,7 +21738,7 @@ Camera:
    y: 0
    width: 1
    height: 1
-  near clip plane: 0.3
+  near clip plane: 0
  far clip plane: 1000
  field of view: 60
  orthographic: 1
@ -23679,6 +23683,10 @@ PrefabInstance:
      propertyPath: m_LocalRotation.z
      value: -0.38009813
      objectReference: {fileID: 0}
+    - target: {fileID: 1642009094064475822, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1725016498882030345, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
      propertyPath: m_LocalPosition.x
      value: 0.11265747
--- a/Assets/02.Scripts/Character/Npc/Customer.cs
+++ b/Assets/02.Scripts/Character/Npc/Customer.cs
@ -51,14 +51,11 @@ namespace BlueWater.Npcs.Customers
        public BarkTrigger BarkTrigger { get; private set; }
        
        [field: SerializeField]
-        public Canvas InteractionCanvas { get; private set; }
+        public InteractionCanvas InteractionCanvas { get; private set; }

        [field: SerializeField]
        public ParticleSystem PayMoneyParticle { get; private set; }
        
-        [field: SerializeField]
-        public Transform InteractionUi { get; private set; }
-        
        [field: SerializeField]
        public BalloonUi BalloonUi { get; private set; }
        
@ -179,10 +176,7 @@ namespace BlueWater.Npcs.Customers
            MeshRenderer = VisualLook.GetComponent<MeshRenderer>();
            BarkTrigger = transform.Find("DialogueSystem").GetComponent<BarkTrigger>();
            PayMoneyParticle = transform.Find("PayMoneyParticle").GetComponent<ParticleSystem>();
-            InteractionCanvas = transform.Find("InteractionCanvas").GetComponent<Canvas>();
-            //InteractionCanvas.worldCamera = TycoonCameraManager.Instance.UiCamera;
-            InteractionUi = InteractionCanvas.transform.Find("InteractionUi");
-            InteractionUi.localScale = Vector3.one * (1 / transform.localScale.x);
+            InteractionCanvas = transform.GetComponentInChildren<InteractionCanvas>();
            BalloonUi = InteractionCanvas.transform.Find("FoodBalloonUi").GetComponent<BalloonUi>();
            PayMoneyUi = InteractionCanvas.transform.Find("PayMoneyUi").GetComponent<PayMoneyUi>();

@ -258,21 +252,17 @@ namespace BlueWater.Npcs.Customers
        public virtual void CancelInteraction() { }

        public bool CanInteraction() => true;
-
-        public void ShowInteractionUi()
+        
+        public virtual void ShowInteractionUi()
        {
-            if (!InteractionUi) return;
-            
-            InteractionUi.gameObject.SetActive(true);
            SpineController.EnableCustomMaterial();
+            EventManager.OnShowInteractionUi?.Invoke(InteractionMessage);
        }

-        public void HideInteractionUi()
+        public virtual void HideInteractionUi()
        {
-            if (!InteractionUi) return;
-            
-            InteractionUi.gameObject.SetActive(false);
            SpineController.DisableCustomMaterial();
+            EventManager.OnHideInteractionUi?.Invoke();
        }

        public void RegisterPlayerInteraction()
--- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs
+++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs
@ -1,5 +1,4 @@
 using BlueWater.Interfaces;
-using BlueWater.Items;
 using BlueWater.Uis;
 using Sirenix.OdinInspector;
 using Spine.Unity;
@ -43,7 +42,7 @@ namespace BlueWater.Players.Tycoons
        public SkeletonAnimation SkeletonAnimation { get; private set; }
        
        [field: SerializeField]
-        public BalloonUi BalloonUi { get; private set; }
+        public InteractionCanvas InteractionCanvas { get; private set; }
        
        [field: SerializeField]
        public PlayerHealthPoint PlayerHealthPoint { get; private set; }
@ -96,12 +95,16 @@ namespace BlueWater.Players.Tycoons
            PlayerInput = GetComponent<PlayerInput>();
            VisualLook = transform.Find("VisualLook");
            SkeletonAnimation = VisualLook.GetComponent<SkeletonAnimation>();
-            BalloonUi = transform.Find("Canvas/BalloonUi").GetComponent<BalloonUi>();
+            InteractionCanvas = transform.GetComponentInChildren<InteractionCanvas>();

            PlayerHealthPoint = GetComponent<PlayerHealthPoint>();
            TycoonInput = GetComponent<TycoonInput>();
            TycoonMovement = GetComponent<TycoonMovement>();
            TycoonPickupHandler = GetComponent<TycoonPickupHandler>();
+
+            var renderer = VisualLook.GetComponent<Renderer>();
+            renderer.sortingLayerName = "Default";
+            renderer.sortingOrder = 5;
        }

        private void InitializeChileComponents()
@ -119,11 +122,12 @@ namespace BlueWater.Players.Tycoons
            // Input
            TycoonInput.OnMoveInputReceived += TycoonMovement.HandleInputMovement;
            
-            EventManager.OnLiquidRegionEntered += BalloonUi.EnterLiquidRegion;
-            EventManager.OnLiquidRegionExited += BalloonUi.ExitLiquidRegion;
-            EventManager.OnCocktailStarted += BalloonUi.PickupUnfinishedCocktail;
-            EventManager.OnCocktailCompleted += BalloonUi.SetItemImage;
-            EventManager.OnCocktailDiscarded += BalloonUi.DiscardItem;
+            var balloonUi = InteractionCanvas.BalloonUi;
+            EventManager.OnLiquidRegionEntered += balloonUi.EnterLiquidRegion;
+            EventManager.OnLiquidRegionExited += balloonUi.ExitLiquidRegion;
+            EventManager.OnCocktailStarted += balloonUi.PickupUnfinishedCocktail;
+            EventManager.OnCocktailCompleted += balloonUi.SetItemImage;
+            EventManager.OnCocktailDiscarded += balloonUi.DiscardItem;
        }

        private void UnSubscribeEvents()
@ -131,11 +135,12 @@ namespace BlueWater.Players.Tycoons
            // Input
            TycoonInput.OnMoveInputReceived -= TycoonMovement.HandleInputMovement;
            
-            EventManager.OnLiquidRegionEntered -= BalloonUi.EnterLiquidRegion;
-            EventManager.OnLiquidRegionExited -= BalloonUi.ExitLiquidRegion;
-            EventManager.OnCocktailStarted -= BalloonUi.PickupUnfinishedCocktail;
-            EventManager.OnCocktailCompleted -= BalloonUi.SetItemImage;
-            EventManager.OnCocktailDiscarded -= BalloonUi.DiscardItem;
+            var balloonUi = InteractionCanvas.BalloonUi;
+            EventManager.OnLiquidRegionEntered -= balloonUi.EnterLiquidRegion;
+            EventManager.OnLiquidRegionExited -= balloonUi.ExitLiquidRegion;
+            EventManager.OnCocktailStarted -= balloonUi.PickupUnfinishedCocktail;
+            EventManager.OnCocktailCompleted -= balloonUi.SetItemImage;
+            EventManager.OnCocktailDiscarded -= balloonUi.DiscardItem;
        }
        
        // Wrapping
@ -155,8 +160,10 @@ namespace BlueWater.Players.Tycoons
        public void GiveItem()
        {
            TycoonPickupHandler.GiveItem();
-            BalloonUi.HideUi();
-            BalloonUi.SetItemImage(null);
+            
+            var balloonUi = InteractionCanvas.BalloonUi;
+            balloonUi.HideUi();
+            balloonUi.SetItemImage(null);
        }

        // public void DiscardItem()
--- a/Assets/02.Scripts/Interface/IPlayerInteraction.cs
+++ b/Assets/02.Scripts/Interface/IPlayerInteraction.cs
@ -1,4 +1,4 @@
-using System;
+using BlueWater.Uis;
 using UnityEngine;

 namespace BlueWater.Interfaces
@ -6,8 +6,7 @@ namespace BlueWater.Interfaces
    public interface IPlayerInteraction
    {
        Transform CenterTransform { get; }
-        Canvas InteractionCanvas { get; }
-        Transform InteractionUi { get; }
+        InteractionCanvas InteractionCanvas { get; }
        bool EnableInteraction { get; }
        float InteractionRadius { get; }
        string InteractionMessage { get; }
--- a/Assets/02.Scripts/Item/Item.cs
+++ b/Assets/02.Scripts/Item/Item.cs
@ -27,9 +27,7 @@ namespace BlueWater.Items
        protected SpriteRenderer SpriteRenderer;
        
        [field: SerializeField]
-        public Canvas InteractionCanvas { get; private set; }
-
-        public Transform InteractionUi { get; private set; }
+        public InteractionCanvas InteractionCanvas { get; private set; }

        [field: Title("드랍 옵션")]
        [field: SerializeField, Tooltip("키 입력을 통한 아이템 획득")]
@ -139,9 +137,7 @@ namespace BlueWater.Items
            Collider = GetComponent<Collider>();
            VisualLook = transform.Find("VisualLook");
            SpriteRenderer = VisualLook.GetComponent<SpriteRenderer>();
-            InteractionCanvas = transform.Find("InteractionCanvas").GetComponent<Canvas>();
-            InteractionCanvas.GetComponent<Canvas>().worldCamera = CombatCameraManager.Instance.UiCamera;
-            InteractionUi = transform.Find("InteractionUi");
+            InteractionCanvas = transform.GetComponentInChildren<InteractionCanvas>();
        }
        
        protected virtual void OnAcquired()
@ -216,17 +212,11 @@ namespace BlueWater.Items
        {
            InteractionMessage = $"{ItemData.Name} 줍기";
            EventManager.OnShowInteractionUi?.Invoke(InteractionMessage);
-            // if (!InteractionCanvas) return;
-            //
-            // InteractionCanvas.gameObject.SetActive(true);
        }

        public void HideInteractionUi()
        {
            EventManager.OnHideInteractionUi?.Invoke();
-            // if (!InteractionCanvas) return;
-            //
-            // InteractionCanvas.gameObject.SetActive(false);
        }

        private void DestroySelf() => Destroy(gameObject);
--- a/Assets/02.Scripts/Prop/Tycoon/Cookware.cs
+++ b/Assets/02.Scripts/Prop/Tycoon/Cookware.cs
@ -142,21 +142,21 @@ namespace BlueWater.Tycoons
            return IsOpened && !isEmptyFoodData && ((isCarriedItem && !isFullFireWood) || !isCarriedItem && !isEmptyFinishedFood);
        }
        
-        public override void ShowInteractionUi()
-        {
-            if (!InteractionUi) return;
-            
-            InteractionUi.gameObject.SetActive(true);
-            VisualLook.material = OutlineMaterial;
-        }
-
-        public override void HideInteractionUi()
-        {
-            if (!InteractionUi) return;
-            
-            InteractionUi.gameObject.SetActive(false);
-            VisualLook.material = OriginalMaterial;
-        }
+        // public override void ShowInteractionUi()
+        // {
+        //     if (!InteractionUi) return;
+        //     
+        //     InteractionUi.gameObject.SetActive(true);
+        //     VisualLook.material = OutlineMaterial;
+        // }
+        //
+        // public override void HideInteractionUi()
+        // {
+        //     if (!InteractionUi) return;
+        //     
+        //     InteractionUi.gameObject.SetActive(false);
+        //     VisualLook.material = OriginalMaterial;
+        // }

        protected override void OpenTycoonSwitch()
        {
--- a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs
+++ b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs
@ -1,6 +1,6 @@
-using System;
 using BlueWater.Interfaces;
 using BlueWater.Players.Tycoons;
+using BlueWater.Uis;
 using Sirenix.OdinInspector;
 using UnityEngine;

@ -16,10 +16,7 @@ namespace BlueWater.Tycoons
        public SpriteRenderer VisualLook { get; private set; }
        
        [field: SerializeField, BoxGroup("컴포넌트")]
-        public Canvas InteractionCanvas { get; private set; }
-        
-        [field: SerializeField, BoxGroup("컴포넌트")]
-        public Transform InteractionUi { get; private set; }
+        public InteractionCanvas InteractionCanvas { get; private set; }
        
        [field: SerializeField, Required, BoxGroup("컴포넌트")]
        public Material OutlineMaterial { get; private set; }
@ -88,10 +85,7 @@ namespace BlueWater.Tycoons
            }

            VisualLook = transform.Find("VisualLook").GetComponent<SpriteRenderer>();
-            InteractionCanvas = transform.Find("InteractionCanvas").GetComponent<Canvas>();
-            InteractionCanvas.GetComponent<Canvas>().worldCamera = Camera.main;
-            InteractionUi = InteractionCanvas.transform.Find("InteractionUi");
-            InteractionUi.localScale = Vector3.one * (1 / transform.localScale.x);
+            InteractionCanvas = transform.GetComponentInChildren<InteractionCanvas>();

            CurrentTycoonPlayer = GameManager.Instance.CurrentTycoonPlayer;
        }
@ -104,19 +98,12 @@ namespace BlueWater.Tycoons

        public virtual void ShowInteractionUi()
        {
-            // if (!InteractionCanvas) return;
-            //
-            // InteractionCanvas.gameObject.SetActive(true);
-            
            VisualLook.material = OutlineMaterial;
            EventManager.OnShowInteractionUi?.Invoke(InteractionMessage);
        }

        public virtual void HideInteractionUi()
        {
-            // if (!InteractionCanvas) return;
-            //
-            // InteractionCanvas.gameObject.SetActive(false);
            VisualLook.material = OriginalMaterial;
            EventManager.OnHideInteractionUi?.Invoke();
        }
--- a/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs
+++ b/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs
@ -8,9 +8,6 @@ namespace BlueWater.Tycoons
    {
        [SerializeField]
        private SpriteRenderer _cocktailGlassImage;
-
-        [SerializeField]
-        private BalloonUi _balloonUi;
        
        // 서빙 테이블 기준 아이템이 있는지 없는지
        private IPickup _currentPickupItem;
@ -30,9 +27,9 @@ namespace BlueWater.Tycoons
            {
                EventManager.OnTakeFromServingTable?.Invoke();
                CurrentTycoonPlayer.TycoonPickupHandler.PickupItem(_currentPickupItem);
-                CurrentTycoonPlayer.BalloonUi.SetItemImage(_currentPickupItem);
+                CurrentTycoonPlayer.InteractionCanvas.BalloonUi.SetItemImage(_currentPickupItem);
                _cocktailGlassImage.enabled = false;
-                _balloonUi.DiscardItem();
+                InteractionCanvas.BalloonUi.DiscardItem();
                _currentPickupItem = null;
            }
            // 테이블에 칵테일을 놓는 경우
@ -41,8 +38,8 @@ namespace BlueWater.Tycoons
                EventManager.OnPlaceOnServingTable?.Invoke();
                _currentPickupItem = CurrentTycoonPlayer.TycoonPickupHandler.GetCurrentPickupItem();
                CurrentTycoonPlayer.TycoonPickupHandler.GiveItem();
-                CurrentTycoonPlayer.BalloonUi.DiscardItem();
-                _balloonUi.SetItemImage(_currentPickupItem);
+                CurrentTycoonPlayer.InteractionCanvas.BalloonUi.DiscardItem();
+                InteractionCanvas.BalloonUi.SetItemImage(_currentPickupItem);
                _cocktailGlassImage.enabled = true;
            }
        }
--- a/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset
+++ b/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset
@ -56,7 +56,7 @@ MonoBehaviour:
  - <Key>k__BackingField: Garnish1
    <Value>k__BackingField:
      <Idx>k__BackingField: Garnish1
-      <Name>k__BackingField: "\uAC00\uB098\uC26C1"
+      <Name>k__BackingField: "\uAC00\uB2C8\uC26C1"
      <Type>k__BackingField: 2
      <Amount>k__BackingField: 2000
      <Sprite>k__BackingField: {fileID: 21300000, guid: ddde5976023f9be4e83dc3d867c2dc30, type: 3}
@ -64,7 +64,7 @@ MonoBehaviour:
  - <Key>k__BackingField: Garnish2
    <Value>k__BackingField:
      <Idx>k__BackingField: Garnish2
-      <Name>k__BackingField: "\uAC00\uB098\uC26C2"
+      <Name>k__BackingField: "\uAC00\uB2C8\uC26C2"
      <Type>k__BackingField: 2
      <Amount>k__BackingField: 2000
      <Sprite>k__BackingField: {fileID: 21300000, guid: 1506abfb2ff26fa4aacdeb4b0efc9663, type: 3}
--- a/Assets/02.Scripts/Tycoon/LiquidController.cs
+++ b/Assets/02.Scripts/Tycoon/LiquidController.cs
@ -3,12 +3,14 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using BlueWater.Items;
+using BlueWater.Players.Tycoons;
 using BlueWater.Tycoons;
 using DG.Tweening;
 using Sirenix.OdinInspector;
 using TMPro;
 using UnityEngine;
 using UnityEngine.Pool;
+using UnityEngine.Serialization;
 using UnityEngine.UI;

 namespace BlueWater
@ -83,7 +85,13 @@ namespace BlueWater
        private float _moveDuration = 0.5f;

        [SerializeField]
-        private Vector3 endPosition = new(-230f, 23f, 0f);
+        private Vector3 _endPosition = new(-300f, 0f, 0f);
+
+        [SerializeField]
+        private Vector3 _endPositionOffset = new(0f, 20f, 0f);
+
+        [SerializeField]
+        private Vector3 _endScale = new(0.3f, 0.3f, 0.3f);

        private Barrel _currentBarrel;
        private IObjectPool<Liquid> _liquidObjectPool;
@ -104,6 +112,9 @@ namespace BlueWater
        private float _timeInterval;
        private Color _currentMixedColor = Color.black;
        private Color _targetColor;
+        private Camera _overlayCamera;
+        private TycoonPlayer _tycoonPlayer;
+        private Vector3 _lastPlayerPosition;

        // Hashes
        private static readonly int LiquidAmountHash = Shader.PropertyToID("_LiquidAmount");
@ -119,10 +130,10 @@ namespace BlueWater
            _liquidObjectPool = new ObjectPool<Liquid>(CreateLiquidObject, OnGetLiquidObject, OnReleaseLiquidObject, OnDestroyLiquidObject, maxSize: _objectPoolCount);
            _garnishObjectPool = new ObjectPool<Garnish>(CreateGarnishObject, OnGetGarnishObject, OnReleaseGarnishObject, OnDestroyGarnishObject, maxSize: _objectPoolCount);

-            _hideTween = _liquidPanel.transform.DOMoveX(endPosition.x + 100f, _moveDuration).Pause()
+            _hideTween = _liquidPanel.transform.DOMoveX(_endPosition.x + 100f, _moveDuration).Pause()
                .SetAutoKill(false);

-            _showTween = _liquidPanel.transform.DOMoveX(endPosition.x, _moveDuration).Pause()
+            _showTween = _liquidPanel.transform.DOMoveX(_endPosition.x, _moveDuration).Pause()
                .SetAutoKill(false);
        }

@ -135,7 +146,9 @@ namespace BlueWater
            LiquidIngredient.OnReachedTarget += OnTargetReached;
            Barrel.OnBarrelInteracted += HandleBarrelInteraction;
            Barrel.OnBarrelCancelInteracted += HandleBarrelCancelInteraction;
-            
+
+            _overlayCamera = TycoonCameraManager.Instance.LiquidOverlayCamera;
+            _tycoonPlayer = GameManager.Instance.CurrentTycoonPlayer;
            _instanceMaterial = Instantiate(_liquidRenderer.material);
            _liquidRenderer.material = _instanceMaterial;
            
@ -188,6 +201,22 @@ namespace BlueWater
                    _startTime = Time.time;
                }
            }
+            else
+            {
+                if (_instanceLiquidCount <= 0) return;
+                
+                var playerPosition = _tycoonPlayer.transform.position;
+                var playerScreenPosition = TycoonCameraManager.Instance.MainCamera.WorldToScreenPoint(playerPosition);
+                var panelWorldPosition = _overlayCamera.ScreenToWorldPoint(new Vector3(playerScreenPosition.x,
+                    playerScreenPosition.y, _overlayCamera.nearClipPlane));
+                panelWorldPosition += _endPositionOffset;
+                
+                if (_activeLiquidDatas.Count == 0 && _activeGarnishDatas.Count == 0)
+                {
+                    _liquidPanel.transform.DOScale(_endScale, _moveDuration).SetEase(Ease.Linear);
+                    _liquidPanel.transform.DOMove(panelWorldPosition, _moveDuration).SetEase(Ease.Linear);
+                }
+            }

            if (_liquidReachedTime + _colorLerpSpeed >= Time.time)
            {
@ -495,7 +524,8 @@ namespace BlueWater
        {
            if (_isShowingPanel) return;

-            _liquidPanel.transform.position = endPosition;
+            _liquidPanel.transform.localScale = Vector3.one;
+            _liquidPanel.transform.position = _endPosition;
            _liquidPanel.SetActive(true);
            _isShowingPanel = true;
            _hideTween.Pause();
--- a/Assets/02.Scripts/TycoonCameraManager.cs
+++ b/Assets/02.Scripts/TycoonCameraManager.cs
@ -1,11 +1,8 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using BlueWater.Utility;
 using Sirenix.OdinInspector;
 using Unity.Cinemachine;
 using UnityEngine;
-using UnityEngine.Serialization;

 namespace BlueWater
 {
@ -24,6 +21,9 @@ namespace BlueWater
        [field: SerializeField]
        public Camera MainCamera { get; private set; }
        
+        [field: SerializeField]
+        public Camera LiquidOverlayCamera { get; private set; }
+        
        [SerializeField]
        private Transform cameraLocation;
        
@ -32,6 +32,9 @@ namespace BlueWater
        
        [field: SerializeField]
        public CinemachineCamera StorageCamera { get; private set; }
+
+        [SerializeField]
+        private Vector3 _transparencySortAxis;
        
        // Variables
        private CinemachineBrain _cinemachineBrain;
@ -115,6 +118,14 @@ namespace BlueWater

            //_cinemachineBrain.DefaultBlend.Style = styles;
            newMainCamera.Priority = 1;
+            SetTransparencySortAxis();
+        }
+
+        private void SetTransparencySortAxis()
+        {
+            var camera = Camera.main;
+            camera.transparencySortMode = TransparencySortMode.CustomAxis;
+            camera.transparencySortAxis = _transparencySortAxis;
        }
        
        #endregion
--- a/Assets/02.Scripts/Ui/InteractionCanvas.cs
+++ b/Assets/02.Scripts/Ui/InteractionCanvas.cs
@ -0,0 +1,15 @@
+using UnityEngine;
+
+namespace BlueWater.Uis
+{
+    public class InteractionCanvas : MonoBehaviour
+    {
+        [field: SerializeField]
+        public BalloonUi BalloonUi { get; private set; }
+
+        private void Awake()
+        {
+            BalloonUi = transform.GetComponentInChildren<BalloonUi>();
+        }
+    }
+}
--- a/Assets/02.Scripts/Ui/InteractionCanvas.cs.meta
+++ b/Assets/02.Scripts/Ui/InteractionCanvas.cs.meta
@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9ebe6250da0dfa044937230037499988
--- a/Assets/03.Images/Props/Mini/BarrelFront.png
+++ b/Assets/03.Images/Props/Mini/BarrelFront.png
--- a/Assets/03.Images/Props/Mini/GroundTile01.png
+++ b/Assets/03.Images/Props/Mini/GroundTile01.png
--- a/Assets/03.Images/Props/Mini/GroundTile01.png.meta
+++ b/Assets/03.Images/Props/Mini/GroundTile01.png.meta
--- a/Assets/03.Images/Props/Mini/GroundTile02.png
+++ b/Assets/03.Images/Props/Mini/GroundTile02.png
--- a/Assets/03.Images/Props/Mini/GroundTile02.png.meta
+++ b/Assets/03.Images/Props/Mini/GroundTile02.png.meta
@ -45,7 +45,7 @@ TextureImporter:
  compressionQuality: 50
  spriteMode: 1
  spriteExtrude: 1
-  spriteMeshType: 1
+  spriteMeshType: 0
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 512
--- a/Assets/03.Images/Props/Mini/LiquidBarrel.png
+++ b/Assets/03.Images/Props/Mini/LiquidBarrel.png
--- a/Assets/03.Images/Props/Mini/LiquidBarrel.png.meta
+++ b/Assets/03.Images/Props/Mini/LiquidBarrel.png.meta
--- a/Assets/03.Images/Props/Mini/LiquidBarrel01.png
+++ b/Assets/03.Images/Props/Mini/LiquidBarrel01.png
--- a/Assets/03.Images/Props/Mini/LiquidBarrelBack.png
+++ b/Assets/03.Images/Props/Mini/LiquidBarrelBack.png
--- a/Assets/03.Images/Props/Mini/LiquidBarrelBack.png.meta
+++ b/Assets/03.Images/Props/Mini/LiquidBarrelBack.png.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dc898802dffd29648918e86867a22ee9
+guid: 11d1c47204e2d8b4d94e7b57e388252f
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
--- a/Assets/03.Images/Props/Mini/LiquidBarrelFill.png
+++ b/Assets/03.Images/Props/Mini/LiquidBarrelFill.png
--- a/Assets/03.Images/Props/Mini/LiquidBarrelFill.png.meta
+++ b/Assets/03.Images/Props/Mini/LiquidBarrelFill.png.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 76cc7f947fec33b488919688cf130e73
+guid: c7ce7fbf3a68ec040ab6006a84f75785
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
--- a/Assets/03.Images/Props/Mini/LiquidBarrelFront.png
+++ b/Assets/03.Images/Props/Mini/LiquidBarrelFront.png
--- a/Assets/03.Images/Props/Mini/LiquidBarrelFront.png.meta
+++ b/Assets/03.Images/Props/Mini/LiquidBarrelFront.png.meta
@ -0,0 +1,143 @@
+fileFormatVersion: 2
+guid: 324c91ab3ca459f4bad7e4187c5fe278
+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: 
--- a/Assets/03.Images/Props/Mini/Sign.png
+++ b/Assets/03.Images/Props/Mini/Sign.png
--- a/Assets/03.Images/Props/Mini/Sign.png.meta
+++ b/Assets/03.Images/Props/Mini/Sign.png.meta
@ -0,0 +1,143 @@
+fileFormatVersion: 2
+guid: 8c4b435ee4066134f8150ed44ebe72f0
+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: 
--- a/Assets/03.Images/Ui/Tycoon/SquareTalkBalloon.png
+++ b/Assets/03.Images/Ui/Tycoon/SquareTalkBalloon.png
--- a/Assets/03.Images/Ui/Tycoon/SquareTalkBalloon.png.meta
+++ b/Assets/03.Images/Ui/Tycoon/SquareTalkBalloon.png.meta
@ -0,0 +1,143 @@
+fileFormatVersion: 2
+guid: 140fdbe02cd90bf47994129e6be6bafe
+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: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 1024
+  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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/03.Images/Ui/Tycoon/SquareTalkBalloontail.png
+++ b/Assets/03.Images/Ui/Tycoon/SquareTalkBalloontail.png
--- a/Assets/03.Images/Ui/Tycoon/SquareTalkBalloontail.png.meta
+++ b/Assets/03.Images/Ui/Tycoon/SquareTalkBalloontail.png.meta
@ -0,0 +1,143 @@
+fileFormatVersion: 2
+guid: e7b746bc5bff9d64fb1129b9aa8ccf3e
+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: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 1024
+  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: 
--- a/Assets/04.Materials/BarrelLiquid.mat
+++ b/Assets/04.Materials/BarrelLiquid.mat
@ -1,166 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1230891944636227791
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 9
--- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: BarrelLiquid
-  m_Shader: {fileID: -6465566751694194690, guid: 97fd64b40784bc24090f74d74b2ebea5, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap: {}
-  disabledShaderPasses:
-  - MOTIONVECTORS
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BaseMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SampleTexture2D_4768904af7ef4db18a183030cfecc457_Texture_1_Texture2D:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SampleTexture2D_a242d45af0654b8eadd44eaaf8c380c1_Texture_1_Texture2D:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SpecGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_Lightmaps:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_LightmapsInd:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_ShadowMasks:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _AddPrecomputedVelocity: 0
-    - _AlphaClip: 0
-    - _AlphaToMask: 0
-    - _Blend: 0
-    - _BlendModePreserveSpecular: 1
-    - _BumpScale: 1
-    - _ClearCoatMask: 0
-    - _ClearCoatSmoothness: 0
-    - _Cull: 2
-    - _Cutoff: 0.5
-    - _DetailAlbedoMapScale: 1
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _DstBlendAlpha: 0
-    - _EnvironmentReflections: 1
-    - _FillAmount: 0.5
-    - _GlossMapScale: 0
-    - _Glossiness: 0
-    - _GlossyReflections: 0
-    - _LiquidAmount: 1
-    - _LiquidFrequency: 18
-    - _LiquidSpeed: 1
-    - _LiquidTopWidth: 15
-    - _Metallic: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.005
-    - _QueueControl: 1
-    - _QueueOffset: 0
-    - _ReceiveShadows: 1
-    - _RefractionNoise: 70
-    - _RefractionSpeed: 3.56
-    - _RefractionStrength: 0.7
-    - _Smoothness: 0.5
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _SrcBlendAlpha: 1
-    - _Surface: 0
-    - _Test: 0
-    - _TopMaskHeight: 0.035
-    - _Visibility: 0.1
-    - _WaterFrequency: 10
-    - _WaterLevel: 1
-    - _WaterSpeed: 2
-    - _WaterTopWidth: 10
-    - _WaveDepth: 1.5
-    - _WorkflowMode: 1
-    - _ZWrite: 1
-    m_Colors:
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 0, g: 0.68668544, b: 0.9559735, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _FillAmount: {r: 0, g: 0, b: 0, a: 0}
-    - _FormColor: {r: 0.4078431, g: 1.317647, b: 1.4980392, a: 0}
-    - _LiquidColor: {r: 2, g: 1.6862745, b: 0, a: 0}
-    - _LiquidTopColor: {r: 1, g: 1, b: 1, a: 0}
-    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
-    - _WaterColor: {r: 0, g: 1.5319147, b: 2, a: 0}
-    - _WaterTopColor: {r: 1, g: 1, b: 1, a: 0}
-  m_BuildTextureStacks: []
-  m_AllowLocking: 1
--- a/Assets/04.Materials/BarrelOutlineUnlit.mat
+++ b/Assets/04.Materials/BarrelOutlineUnlit.mat
@ -1,145 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: BarrelOutlineUnlit
-  m_Shader: {fileID: -6465566751694194690, guid: 35052d46233d61b4fa6a8f340ff50c8b, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses:
-  - MOTIONVECTORS
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BaseMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MinusTexture:
-        m_Texture: {fileID: 2800000, guid: 9f7d82fbc664fbb4d98842fc46db319d, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SpecGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_Lightmaps:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_LightmapsInd:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_ShadowMasks:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _AddPrecomputedVelocity: 0
-    - _AlphaClip: 0
-    - _AlphaToMask: 0
-    - _Blend: 0
-    - _BlendModePreserveSpecular: 1
-    - _BumpScale: 1
-    - _CastShadows: 1
-    - _ClearCoatMask: 0
-    - _ClearCoatSmoothness: 0
-    - _Cull: 2
-    - _Cutoff: 0.5
-    - _DetailAlbedoMapScale: 1
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _DstBlendAlpha: 0
-    - _EnvironmentReflections: 1
-    - _FadeDistance: 150
-    - _GlossMapScale: 0
-    - _Glossiness: 0
-    - _GlossyReflections: 0
-    - _ISCORNER: 0
-    - _IsCorner: 1
-    - _Metallic: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.005
-    - _QueueControl: 0
-    - _QueueOffset: 0
-    - _ReceiveShadows: 1
-    - _Smoothness: 0.5
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _SrcBlendAlpha: 1
-    - _Surface: 0
-    - _Thickness: 0.01
-    - _WorkflowMode: 1
-    - _ZWrite: 1
-    m_Colors:
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 12.708291, g: 12.708291, b: 12.708291, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
-  m_BuildTextureStacks: []
-  m_AllowLocking: 1
--- !u!114 &6323663459513743005
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 9
--- a/Assets/04.Materials/BarrelOutlineUnlit.mat.meta
+++ b/Assets/04.Materials/BarrelOutlineUnlit.mat.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9bce0db68fc4c4d428fa601508de489d
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/04.Materials/Liquid.mat
+++ b/Assets/04.Materials/Liquid.mat
@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1230891944636227791
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
@ -8,7 +21,7 @@ Material:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Liquid
-  m_Shader: {fileID: -6465566751694194690, guid: 76f4814e6282a974bb7855c3eeb05744, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: 97fd64b40784bc24090f74d74b2ebea5, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
  m_ValidKeywords: []
@ -16,7 +29,7 @@ Material:
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3010
+  m_CustomRenderQueue: 3000
  stringTagMap: {}
  disabledShaderPasses:
  - MOTIONVECTORS
@ -25,7 +38,7 @@ Material:
    serializedVersion: 3
    m_TexEnvs:
    - _BaseMap:
-        m_Texture: {fileID: 8400000, guid: 8e8b4ed6ab8541d44aed8cc8f69d3eff, type: 2}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _BumpMap:
@ -49,7 +62,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
-        m_Texture: {fileID: 8400000, guid: 8e8b4ed6ab8541d44aed8cc8f69d3eff, type: 2}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
@ -64,6 +77,14 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_4768904af7ef4db18a183030cfecc457_Texture_1_Texture2D:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_a242d45af0654b8eadd44eaaf8c380c1_Texture_1_Texture2D:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
    - _SpecGlossMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
@ -94,47 +115,52 @@ Material:
    - _Cutoff: 0.5
    - _DetailAlbedoMapScale: 1
    - _DetailNormalMapScale: 1
-    - _DstBlend: 10
-    - _DstBlendAlpha: 10
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
    - _EnvironmentReflections: 1
-    - _FoamStep: 0.2
-    - _FoamThickness: 0.5
+    - _FillAmount: 0.5
    - _GlossMapScale: 0
    - _Glossiness: 0
    - _GlossyReflections: 0
+    - _LiquidAmount: 1
+    - _LiquidFrequency: 18
+    - _LiquidSpeed: 1
+    - _LiquidTopWidth: 15
    - _Metallic: 0
    - _OcclusionStrength: 1
    - _Parallax: 0.005
-    - _QueueControl: 0
-    - _QueueOffset: 10
+    - _QueueControl: 1
+    - _QueueOffset: 0
    - _ReceiveShadows: 1
+    - _RefractionNoise: 70
+    - _RefractionSpeed: 3.56
+    - _RefractionStrength: 0.7
    - _Smoothness: 0.5
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
    - _SrcBlendAlpha: 1
-    - _Surface: 1
-    - _Thickness: 0.1
+    - _Surface: 0
+    - _Test: 0
+    - _TopMaskHeight: 0.035
+    - _Visibility: 0.1
+    - _WaterFrequency: 10
+    - _WaterLevel: 1
+    - _WaterSpeed: 2
+    - _WaterTopWidth: 10
+    - _WaveDepth: 1.5
    - _WorkflowMode: 1
-    - _ZWrite: 0
+    - _ZWrite: 1
    m_Colors:
    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 0.020659646, g: 0.4924028, b: 1.490809, a: 1}
+    - _Color: {r: 0, g: 0.68668544, b: 0.9559735, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _FormColor: {r: 0.4027747, g: 1.3137894, b: 1.4980392, a: 0}
+    - _FillAmount: {r: 0, g: 0, b: 0, a: 0}
+    - _FormColor: {r: 0.4078431, g: 1.317647, b: 1.4980392, a: 0}
+    - _LiquidColor: {r: 2, g: 1.6862745, b: 0, a: 0}
+    - _LiquidTopColor: {r: 1, g: 1, b: 1, a: 0}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+    - _WaterColor: {r: 0, g: 1.5319147, b: 2, a: 0}
+    - _WaterTopColor: {r: 1, g: 1, b: 1, a: 0}
  m_BuildTextureStacks: []
  m_AllowLocking: 1
--- !u!114 &5494214456535538623
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 9
--- a/Assets/04.Materials/Liquid.mat.meta
+++ b/Assets/04.Materials/Liquid.mat.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9fe24a2fb24bf734cb466d3a0d8d9c1e
+guid: d5d9120849e43474aaafba12ab84fc47
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 2100000
--- a/Assets/04.Materials/Liquid2.mat.meta
+++ b/Assets/04.Materials/Liquid2.mat.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a78a1dbfadbe3444891c1d321dd8649a
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/04.Materials/Liquid3.mat
+++ b/Assets/04.Materials/Liquid3.mat
@ -1,166 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1230891944636227791
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 9
--- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Liquid3
-  m_Shader: {fileID: -6465566751694194690, guid: 97fd64b40784bc24090f74d74b2ebea5, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses:
-  - MOTIONVECTORS
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BaseMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SampleTexture2D_4768904af7ef4db18a183030cfecc457_Texture_1_Texture2D:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SampleTexture2D_a242d45af0654b8eadd44eaaf8c380c1_Texture_1_Texture2D:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SpecGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_Lightmaps:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_LightmapsInd:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_ShadowMasks:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _AddPrecomputedVelocity: 0
-    - _AlphaClip: 0
-    - _AlphaToMask: 0
-    - _Blend: 0
-    - _BlendModePreserveSpecular: 1
-    - _BumpScale: 1
-    - _ClearCoatMask: 0
-    - _ClearCoatSmoothness: 0
-    - _Cull: 2
-    - _Cutoff: 0.5
-    - _DetailAlbedoMapScale: 1
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _DstBlendAlpha: 0
-    - _EnvironmentReflections: 1
-    - _FillAmount: 0.5
-    - _GlossMapScale: 0
-    - _Glossiness: 0
-    - _GlossyReflections: 0
-    - _LiquidAmount: 1
-    - _LiquidFrequency: 18
-    - _LiquidSpeed: 1
-    - _LiquidTopWidth: 15
-    - _Metallic: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.005
-    - _QueueControl: 1
-    - _QueueOffset: 0
-    - _ReceiveShadows: 1
-    - _RefractionNoise: 70
-    - _RefractionSpeed: 3.56
-    - _RefractionStrength: 0.7
-    - _Smoothness: 0.5
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _SrcBlendAlpha: 1
-    - _Surface: 0
-    - _Test: 0
-    - _TopMaskHeight: 0.035
-    - _Visibility: 0.1
-    - _WaterFrequency: 10
-    - _WaterLevel: 1
-    - _WaterSpeed: 2
-    - _WaterTopWidth: 10
-    - _WaveDepth: 1.5
-    - _WorkflowMode: 1
-    - _ZWrite: 1
-    m_Colors:
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 0, g: 0.68668544, b: 0.9559735, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _FillAmount: {r: 0, g: 0, b: 0, a: 0}
-    - _FormColor: {r: 0.4078431, g: 1.317647, b: 1.4980392, a: 0}
-    - _LiquidColor: {r: 2, g: 1.6862745, b: 0, a: 0}
-    - _LiquidTopColor: {r: 1, g: 1, b: 1, a: 0}
-    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
-    - _WaterColor: {r: 0, g: 1.5319147, b: 2, a: 0}
-    - _WaterTopColor: {r: 1, g: 1, b: 1, a: 0}
-  m_BuildTextureStacks: []
-  m_AllowLocking: 1
--- a/Assets/04.Materials/Liquid3.mat.meta
+++ b/Assets/04.Materials/Liquid3.mat.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d5d9120849e43474aaafba12ab84fc47
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/04.Materials/LiquidRenderTexture.mat
+++ b/Assets/04.Materials/LiquidRenderTexture.mat
@ -1,18 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1230891944636227791
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 9
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
@ -20,8 +7,8 @@ Material:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: Liquid2
-  m_Shader: {fileID: -6465566751694194690, guid: b54386a114fa71c45b3ee91b7a2b05f2, type: 3}
+  m_Name: LiquidRenderTexture
+  m_Shader: {fileID: -6465566751694194690, guid: 76f4814e6282a974bb7855c3eeb05744, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
  m_ValidKeywords: []
@ -29,7 +16,7 @@ Material:
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 3010
  stringTagMap: {}
  disabledShaderPasses:
  - MOTIONVECTORS
@ -38,7 +25,7 @@ Material:
    serializedVersion: 3
    m_TexEnvs:
    - _BaseMap:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 8400000, guid: 8e8b4ed6ab8541d44aed8cc8f69d3eff, type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _BumpMap:
@ -62,7 +49,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 8400000, guid: 8e8b4ed6ab8541d44aed8cc8f69d3eff, type: 2}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
@ -107,9 +94,11 @@ Material:
    - _Cutoff: 0.5
    - _DetailAlbedoMapScale: 1
    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _DstBlendAlpha: 0
+    - _DstBlend: 10
+    - _DstBlendAlpha: 10
    - _EnvironmentReflections: 1
+    - _FoamStep: 0.2
+    - _FoamThickness: 0.5
    - _GlossMapScale: 0
    - _Glossiness: 0
    - _GlossyReflections: 0
@ -117,21 +106,35 @@ Material:
    - _OcclusionStrength: 1
    - _Parallax: 0.005
    - _QueueControl: 0
-    - _QueueOffset: 0
+    - _QueueOffset: 10
    - _ReceiveShadows: 1
    - _Smoothness: 0.5
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
    - _SrcBlendAlpha: 1
-    - _Surface: 0
-    - _Visibility: 0.1
+    - _Surface: 1
+    - _Thickness: 0.1
    - _WorkflowMode: 1
-    - _ZWrite: 1
+    - _ZWrite: 0
    m_Colors:
    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.020659646, g: 0.4924028, b: 1.490809, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _FormColor: {r: 0.4027747, g: 1.3137894, b: 1.4980392, a: 0}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
  m_AllowLocking: 1
+--- !u!114 &5494214456535538623
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 9
--- a/Assets/04.Materials/LiquidRenderTexture.mat.meta
+++ b/Assets/04.Materials/LiquidRenderTexture.mat.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d48d5f3b84c4ea2489ae5fbbd92f781b
+guid: 9fe24a2fb24bf734cb466d3a0d8d9c1e
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 2100000
--- a/Assets/05.Prefabs/Characters/Npcs/Customer.prefab
+++ b/Assets/05.Prefabs/Characters/Npcs/Customer.prefab
@ -1110,7 +1110,7 @@ MonoBehaviour:
  <InteractionCanvas>k__BackingField: {fileID: 7800018367225963417}
  <PayMoneyParticle>k__BackingField: {fileID: 6080095273351670320}
  <InteractionUi>k__BackingField: {fileID: 7689708008984027505}
-  <FoodBalloonUi>k__BackingField: {fileID: 8566491437687787454}
+  <BalloonUi>k__BackingField: {fileID: 0}
  <PayMoneyUi>k__BackingField: {fileID: 1188822424991952652}
  <CustomerData>k__BackingField:
    <Idx>k__BackingField: 0
@ -1718,14 +1718,3 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
  m_PrefabInstance: {fileID: 5882202591468924078}
  m_PrefabAsset: {fileID: 0}
--- !u!114 &8566491437687787454 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 2829248495233098512, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-  m_PrefabInstance: {fileID: 5882202591468924078}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
--- a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab
+++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab
@ -12,6 +12,7 @@ GameObject:
  - component: {fileID: 6379312009059766371}
  - component: {fileID: 5910700114136101566}
  - component: {fileID: 7125556968546628472}
+  - component: {fileID: 4764720756731101052}
  m_Layer: 9
  m_Name: VisualLook
  m_TagString: Untagged
@ -131,6 +132,18 @@ MonoBehaviour:
  _animationName: Idle
  loop: 1
  timeScale: 1
+--- !u!210 &4764720756731101052
+SortingGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 569530817952539991}
+  m_Enabled: 1
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 5
+  m_SortAtRoot: 0
 --- !u!1 &1731013725373434356
 GameObject:
  m_ObjectHideFlags: 0
@ -257,7 +270,7 @@ Transform:
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 6509241874729291456}
-  - {fileID: 6051745290350077377}
+  - {fileID: 3452808590865560956}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!54 &6925146187533612706
@ -549,7 +562,7 @@ MonoBehaviour:
  <PlayerInput>k__BackingField: {fileID: 6054159730444663926}
  <VisualLook>k__BackingField: {fileID: 6509241874729291456}
  <SkeletonAnimation>k__BackingField: {fileID: 7125556968546628472}
-  <BalloonUi>k__BackingField: {fileID: 2412195434237916265}
+  <InteractionCanvas>k__BackingField: {fileID: 0}
  <PlayerHealthPoint>k__BackingField: {fileID: 3359549505901716120}
  <TycoonInput>k__BackingField: {fileID: 1674052485383758547}
  <TycoonMovement>k__BackingField: {fileID: 4836489897218844789}
@ -631,238 +644,49 @@ MonoBehaviour:
  _itemRenderer: {fileID: 5527707380059080408}
  _isUnfinishedCocktailPickedUp: 0
  _isPickedUpItem: 0
--- !u!1 &5191424939574625822
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6051745290350077377}
-  - component: {fileID: 4305710624286070672}
-  - component: {fileID: 4147673107254452202}
-  - component: {fileID: 469224649320123586}
-  m_Layer: 9
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &6051745290350077377
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5191424939574625822}
-  m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.01069167, y: 0.01069167, z: 0.01069167}
-  m_ConstrainProportionsScale: 1
-  m_Children:
-  - {fileID: 2494354617667434336}
-  m_Father: {fileID: 2798544366308408093}
-  m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 800, y: 600}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &4305710624286070672
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5191424939574625822}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 1
-  m_AdditionalShaderChannelsFlag: 0
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 5
-  m_TargetDisplay: 0
--- !u!114 &4147673107254452202
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5191424939574625822}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
--- !u!114 &469224649320123586
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5191424939574625822}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 2147614719
--- !u!1001 &448763968479860601
+--- !u!1001 &8027897071964512356
 PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
    serializedVersion: 3
-    m_TransformParent: {fileID: 6051745290350077377}
+    m_TransformParent: {fileID: 2798544366308408093}
    m_Modifications:
-    - target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_Name
-      value: BalloonUi
-      objectReference: {fileID: 0}
-    - target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1505211282054036597, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
+    - target: {fileID: 179937079751348093, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
+    - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
+    - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
      propertyPath: m_LocalPosition.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: -20
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 150
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
+    - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
+      value: 40
      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
+    - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
+    - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+      propertyPath: m_Name
+      value: InteractionCanvas
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
--- !u!114 &2412195434237916265 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 2829248495233098512, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-  m_PrefabInstance: {fileID: 448763968479860601}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
--- !u!224 &2494354617667434336 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+--- !u!224 &3452808590865560956 stripped
 RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-  m_PrefabInstance: {fileID: 448763968479860601}
+  m_CorrespondingSourceObject: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+  m_PrefabInstance: {fileID: 8027897071964512356}
  m_PrefabAsset: {fileID: 0}
--- a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab
+++ b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/BaseInteractionFurniture.prefab
@ -97,6 +97,7 @@ GameObject:
  m_Component:
  - component: {fileID: 7438534416270888028}
  - component: {fileID: 3580758810857167321}
+  - component: {fileID: 1702261025824090784}
  m_Layer: 8
  m_Name: VisualLook
  m_TagString: Untagged
@ -163,7 +164,7 @@ SpriteRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 5
+  m_SortingOrder: 0
  m_Sprite: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@ -175,6 +176,18 @@ SpriteRenderer:
  m_WasSpriteAssigned: 0
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
+--- !u!210 &1702261025824090784
+SortingGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7835622629792856689}
+  m_Enabled: 1
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 5
+  m_SortAtRoot: 0
 --- !u!1 &8884531212319162473
 GameObject:
  m_ObjectHideFlags: 0
@ -294,14 +307,6 @@ PrefabInstance:
      propertyPath: m_AnchorMin.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 800
-      objectReference: {fileID: 0}
-    - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 600
-      objectReference: {fileID: 0}
    - target: {fileID: 4648285208244819224, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
@ -338,6 +343,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: InteractionCanvas
      objectReference: {fileID: 0}
+    - target: {fileID: 8764364725249863370, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab
@ -1,5 +1,180 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &808268910254764035
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6100785980319710662}
+  - component: {fileID: 2324181370382069895}
+  m_Layer: 8
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6100785980319710662
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 808268910254764035}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 203741387490724426}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &2324181370382069895
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 808268910254764035}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 2
+  m_Sprite: {fileID: 21300000, guid: 324c91ab3ca459f4bad7e4187c5fe278, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!1 &5773649549535946419
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3774058579297377381}
+  - component: {fileID: 7243116579515171002}
+  m_Layer: 8
+  m_Name: LiquidImageBackground
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3774058579297377381
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  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_LocalScale: {x: -1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5506324081944544526}
+  m_Father: {fileID: 203741387490724426}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &7243116579515171002
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5773649549535946419}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 3
+  m_Sprite: {fileID: 21300000, guid: 8c4b435ee4066134f8150ed44ebe72f0, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &6581422458203868687
 GameObject:
  m_ObjectHideFlags: 0
@ -25,12 +200,12 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6581422458203868687}
  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.652, y: 0.289, z: -0.001}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.279, z: 0}
  m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
  m_ConstrainProportionsScale: 1
  m_Children: []
-  m_Father: {fileID: 203741387490724426}
+  m_Father: {fileID: 3774058579297377381}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &6817574259189873408
 SpriteRenderer:
@ -75,7 +250,7 @@ SpriteRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 5
+  m_SortingOrder: 4
  m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@ -113,9 +288,9 @@ Transform:
  m_GameObject: {fileID: 8294670532554988959}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.02, z: 0.017}
-  m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
-  m_ConstrainProportionsScale: 1
+  m_LocalPosition: {x: -0.02, y: 0, z: 0}
+  m_LocalScale: {x: 0.85, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 203741387490724426}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -162,8 +337,8 @@ SpriteRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 5
-  m_Sprite: {fileID: 21300000, guid: dc898802dffd29648918e86867a22ee9, type: 3}
+  m_SortingOrder: 1
+  m_Sprite: {fileID: 21300000, guid: c7ce7fbf3a68ec040ab6006a84f75785, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
  m_FlipY: 0
@ -209,11 +384,15 @@ PrefabInstance:
    - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_Sprite
      value: 
-      objectReference: {fileID: 21300000, guid: dc898802dffd29648918e86867a22ee9, type: 3}
+      objectReference: {fileID: 21300000, guid: 11d1c47204e2d8b4d94e7b57e388252f, type: 3}
    - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_WasSpriteAssigned
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: 'm_Materials.Array.data[0]'
+      value: 
+      objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
    - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_Name
      value: LiquidBarrel01
@ -333,7 +512,7 @@ PrefabInstance:
    - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_Sprite
      value: 
-      objectReference: {fileID: 21300000, guid: da4663a54bef1094f9c7f065f937281a, type: 3}
+      objectReference: {fileID: 21300000, guid: 11d1c47204e2d8b4d94e7b57e388252f, type: 3}
    - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_WasSpriteAssigned
      value: 1
@ -343,10 +522,13 @@ PrefabInstance:
    m_AddedGameObjects:
    - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      insertIndex: -1
-      addedObject: {fileID: 5506324081944544526}
+      addedObject: {fileID: 3774058579297377381}
    - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      insertIndex: -1
      addedObject: {fileID: 3246572212746126634}
+    - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 6100785980319710662}
    m_AddedComponents:
    - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      insertIndex: -1
@ -377,7 +559,6 @@ MonoBehaviour:
  <CenterTransform>k__BackingField: {fileID: 5927803667513949971}
  <VisualLook>k__BackingField: {fileID: 6077686033771388879}
  <InteractionCanvas>k__BackingField: {fileID: 8975593228546502023}
-  <InteractionUi>k__BackingField: {fileID: 8793236136028073839}
  <OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
  <EnableInteraction>k__BackingField: 1
  <InteractionRadius>k__BackingField: 0.8
@ -405,11 +586,6 @@ SpriteRenderer:
  m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
  m_PrefabInstance: {fileID: 7343451337687172630}
  m_PrefabAsset: {fileID: 0}
--- !u!224 &8793236136028073839 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-  m_PrefabInstance: {fileID: 7343451337687172630}
-  m_PrefabAsset: {fileID: 0}
 --- !u!223 &8975593228546502023 stripped
 Canvas:
  m_CorrespondingSourceObject: {fileID: 1830317875510668177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidStatue.prefab
@ -1,5 +1,93 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4411916891894562758
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8718002841982411133}
+  - component: {fileID: 8995990958000548815}
+  m_Layer: 8
+  m_Name: LiquidImageBackground
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &8718002841982411133
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4411916891894562758}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.0495, z: -0.0084}
+  m_LocalScale: {x: 0.075, y: 0.075, z: 0.075}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 5506324081944544526}
+  m_Father: {fileID: 203741387490724426}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &8995990958000548815
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4411916891894562758}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 5
+  m_Sprite: {fileID: -738154133, guid: 8549b299e8d6b894e9a11c4becb528a3, type: 3}
+  m_Color: {r: 0.47058827, g: 0.3254902, b: 0.2509804, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &6581422458203868687
 GameObject:
  m_ObjectHideFlags: 0
@ -16,7 +104,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &5506324081944544526
 Transform:
  m_ObjectHideFlags: 0
@ -25,12 +113,12 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6581422458203868687}
  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.152, y: 0.431, z: -0.001}
-  m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.001}
+  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 1
  m_Children: []
-  m_Father: {fileID: 203741387490724426}
+  m_Father: {fileID: 8718002841982411133}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &6817574259189873408
 SpriteRenderer:
@ -76,7 +164,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 5
-  m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a8c45767f0a3ec245a47087c7ada2b50, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
  m_FlipY: 0
@ -226,33 +314,17 @@ PrefabInstance:
      propertyPath: m_LocalPosition.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_ConstrainProportionsScale
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_LocalScale.x
-      value: 2
+      value: 6
      objectReference: {fileID: 0}
    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_LocalScale.y
-      value: 2
+      value: 6
      objectReference: {fileID: 0}
    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_LocalScale.z
-      value: 2
+      value: 6
      objectReference: {fileID: 0}
    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_LocalPosition.x
@ -307,7 +379,7 @@ PrefabInstance:
    m_AddedGameObjects:
    - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      insertIndex: -1
-      addedObject: {fileID: 5506324081944544526}
+      addedObject: {fileID: 8718002841982411133}
    - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      insertIndex: -1
      addedObject: {fileID: 3246572212746126634}
@ -341,10 +413,10 @@ MonoBehaviour:
  <CenterTransform>k__BackingField: {fileID: 5927803667513949971}
  <VisualLook>k__BackingField: {fileID: 6077686033771388879}
  <InteractionCanvas>k__BackingField: {fileID: 8975593228546502023}
-  <InteractionUi>k__BackingField: {fileID: 8793236136028073839}
-  <OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9bce0db68fc4c4d428fa601508de489d, type: 2}
+  <OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
  <EnableInteraction>k__BackingField: 1
  <InteractionRadius>k__BackingField: 0.8
+  <InteractionMessage>k__BackingField: 
  IsOpened: 0
  _liquidImage: {fileID: 6817574259189873408}
  _fill: {fileID: 7052380446467937511}
@ -353,6 +425,7 @@ MonoBehaviour:
  _liquidData:
    <Idx>k__BackingField: 
    <Name>k__BackingField: 
+    <Type>k__BackingField: 0
    <Amount>k__BackingField: 0
    <Sprite>k__BackingField: {fileID: 0}
    <Color>k__BackingField: {r: 0, g: 0, b: 0, a: 0}
@ -367,11 +440,6 @@ SpriteRenderer:
  m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
  m_PrefabInstance: {fileID: 7343451337687172630}
  m_PrefabAsset: {fileID: 0}
--- !u!224 &8793236136028073839 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-  m_PrefabInstance: {fileID: 7343451337687172630}
-  m_PrefabAsset: {fileID: 0}
 --- !u!223 &8975593228546502023 stripped
 Canvas:
  m_CorrespondingSourceObject: {fileID: 1830317875510668177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab
@ -87,151 +87,6 @@ SpriteRenderer:
  m_WasSpriteAssigned: 1
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
--- !u!1001 &5250851799384046169
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 8469578238684922817}
-    m_Modifications:
-    - target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_Name
-      value: BalloonUi
-      objectReference: {fileID: 0}
-    - target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1505211282054036597, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 70
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 70
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: -14.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 139.4
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: -40
-      objectReference: {fileID: 0}
-    - target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: -42
-      objectReference: {fileID: 0}
-    - target: {fileID: 6400894162898819538, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 5
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
--- !u!224 &7816326837915687488 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-  m_PrefabInstance: {fileID: 5250851799384046169}
-  m_PrefabAsset: {fileID: 0}
--- !u!114 &8042662987685484873 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 2829248495233098512, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
-  m_PrefabInstance: {fileID: 5250851799384046169}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &7343451337687172630
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -240,14 +95,6 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 1
-      objectReference: {fileID: 0}
    - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 40
@ -272,6 +119,10 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.y
      value: 80
      objectReference: {fileID: 0}
+    - target: {fileID: 2973381882573389317, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_Sprite
      value: 
@ -290,7 +141,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7624213675240184438, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_IsActive
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      propertyPath: m_LocalScale.x
@ -358,9 +209,6 @@ PrefabInstance:
    - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      insertIndex: -1
      addedObject: {fileID: 8080204312657253144}
-    - targetCorrespondingSourceObject: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 7816326837915687488}
    m_AddedComponents:
    - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
      insertIndex: -1
@ -391,13 +239,14 @@ MonoBehaviour:
  <CenterTransform>k__BackingField: {fileID: 5927803667513949971}
  <VisualLook>k__BackingField: {fileID: 6077686033771388879}
  <InteractionCanvas>k__BackingField: {fileID: 8975593228546502023}
-  <InteractionUi>k__BackingField: {fileID: 8793236136028073839}
+  <InteractionUi>k__BackingField: {fileID: 0}
  <OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
  <EnableInteraction>k__BackingField: 1
  <InteractionRadius>k__BackingField: 0.7
+  <InteractionMessage>k__BackingField: 
  IsOpened: 0
  _cocktailGlassImage: {fileID: 535721072425912087}
-  _balloonUi: {fileID: 8042662987685484873}
+  _balloonUi: {fileID: 0}
 --- !u!4 &5927803667513949971 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
@ -408,16 +257,6 @@ SpriteRenderer:
  m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
  m_PrefabInstance: {fileID: 7343451337687172630}
  m_PrefabAsset: {fileID: 0}
--- !u!224 &8469578238684922817 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-  m_PrefabInstance: {fileID: 7343451337687172630}
-  m_PrefabAsset: {fileID: 0}
--- !u!224 &8793236136028073839 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
-  m_PrefabInstance: {fileID: 7343451337687172630}
-  m_PrefabAsset: {fileID: 0}
 --- !u!223 &8975593228546502023 stripped
 Canvas:
  m_CorrespondingSourceObject: {fileID: 1830317875510668177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
--- a/Assets/05.Prefabs/Uis/BalloonUi.prefab
+++ b/Assets/05.Prefabs/Uis/BalloonUi.prefab
@ -26,7 +26,7 @@ RectTransform:
  m_GameObject: {fileID: 271498015662217203}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 5, y: 5, z: 5}
+  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 674323407039969650}
@ -34,8 +34,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_AnchoredPosition: {x: -0.2, y: 1.5}
+  m_SizeDelta: {x: 1, y: 1}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2829248495233098512
 MonoBehaviour:
@ -70,7 +70,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &674323407039969650
 RectTransform:
  m_ObjectHideFlags: 0
@ -202,8 +202,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 6}
-  m_SizeDelta: {x: -60, y: -60}
+  m_AnchoredPosition: {x: 0, y: 0.049999237}
+  m_SizeDelta: {x: -0.6, y: -0.6}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7693093380867172793
 CanvasRenderer:
--- a/Assets/05.Prefabs/Uis/InteractionCanvas.prefab
+++ b/Assets/05.Prefabs/Uis/InteractionCanvas.prefab
@ -1,117 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1 &4119792729305172665
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5695967080072346038}
-  m_Layer: 5
-  m_Name: InteractionUi
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &5695967080072346038
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4119792729305172665}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 1
-  m_Children:
-  - {fileID: 2297006036420256553}
-  m_Father: {fileID: 4648285208244819224}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 120}
-  m_SizeDelta: {x: 50, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4197599924312940524
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2297006036420256553}
-  - component: {fileID: 5761809819344674326}
-  - component: {fileID: 6806093191539099653}
-  m_Layer: 5
-  m_Name: Circle
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &2297006036420256553
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4197599924312940524}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5376847255443313178}
-  m_Father: {fileID: 5695967080072346038}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5761809819344674326
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4197599924312940524}
-  m_CullTransparentMesh: 1
--- !u!114 &6806093191539099653
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4197599924312940524}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c7ef1b7221f0b5b4f94a1d2685ff92c2, type: 3}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5611097802189151736
 GameObject:
  m_ObjectHideFlags: 0
@ -124,13 +12,14 @@ GameObject:
  - component: {fileID: 5297442833789713246}
  - component: {fileID: 8764364725249863370}
  - component: {fileID: 5028824454365225125}
+  - component: {fileID: 8043919875794167790}
  m_Layer: 5
  m_Name: InteractionCanvas
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &4648285208244819224
 RectTransform:
  m_ObjectHideFlags: 0
@ -143,7 +32,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 1
  m_Children:
-  - {fileID: 5695967080072346038}
+  - {fileID: 3619548578334970641}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
@ -214,139 +103,69 @@ MonoBehaviour:
  m_BlockingMask:
    serializedVersion: 2
    m_Bits: 65535
--- !u!1 &7975211372598651755
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5376847255443313178}
-  - component: {fileID: 5731642412004777909}
-  - component: {fileID: 6787004165701718833}
-  m_Layer: 5
-  m_Name: Text (TMP)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &5376847255443313178
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7975211372598651755}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2297006036420256553}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 1.5}
-  m_SizeDelta: {x: -6, y: -9}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5731642412004777909
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7975211372598651755}
-  m_CullTransparentMesh: 1
--- !u!114 &6787004165701718833
+--- !u!114 &8043919875794167790
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7975211372598651755}
+  m_GameObject: {fileID: 5611097802189151736}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Script: {fileID: 11500000, guid: 9ebe6250da0dfa044937230037499988, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: E
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
-  m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 28.3
-  m_fontSizeBase: 36
-  m_fontWeight: 400
-  m_enableAutoSizing: 1
-  m_fontSizeMin: 18
-  m_fontSizeMax: 200
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 0
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 0
-  m_ActiveFontFeatures: 6e72656b
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_EmojiFallbackSupport: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+  <BalloonUi>k__BackingField: {fileID: 3593684458396504088}
+--- !u!1001 &1629413000685138696
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4648285208244819224}
+    m_Modifications:
+    - target: {fileID: 271498015662217203, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
+      propertyPath: m_Name
+      value: BalloonUi
+      objectReference: {fileID: 0}
+    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
+--- !u!114 &3593684458396504088 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 2829248495233098512, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
+  m_PrefabInstance: {fileID: 1629413000685138696}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &3619548578334970641 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2641341650102689817, guid: bb0dfd08f3e9d944f808e61d886581e7, type: 3}
+  m_PrefabInstance: {fileID: 1629413000685138696}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/09.Shaders/Liquid.shadergraph
+++ b/Assets/09.Shaders/Liquid.shadergraph
--- a/Assets/09.Shaders/Liquid.shadergraph.meta
+++ b/Assets/09.Shaders/Liquid.shadergraph.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 76f4814e6282a974bb7855c3eeb05744
+guid: 97fd64b40784bc24090f74d74b2ebea5
 ScriptedImporter:
  internalIDToNameTable: []
  externalObjects: {}
--- a/Assets/09.Shaders/Liquid2.shadergraph
+++ b/Assets/09.Shaders/Liquid2.shadergraph
--- a/Assets/09.Shaders/Liquid3.shadergraph
+++ b/Assets/09.Shaders/Liquid3.shadergraph
--- a/Assets/09.Shaders/Liquid3.shadergraph.meta
+++ b/Assets/09.Shaders/Liquid3.shadergraph.meta
@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 97fd64b40784bc24090f74d74b2ebea5
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
--- a/Assets/09.Shaders/LiquidRenderTexture.shadergraph
+++ b/Assets/09.Shaders/LiquidRenderTexture.shadergraph
--- a/Assets/09.Shaders/LiquidRenderTexture.shadergraph.meta
+++ b/Assets/09.Shaders/LiquidRenderTexture.shadergraph.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b54386a114fa71c45b3ee91b7a2b05f2
+guid: 76f4814e6282a974bb7855c3eeb05744
 ScriptedImporter:
  internalIDToNameTable: []
  externalObjects: {}
--- a/Assets/Resources/Excel/LiquidDataTable.xlsx
+++ b/Assets/Resources/Excel/LiquidDataTable.xlsx
--- a/Assets/Resources/JSON/LiquidDataTable.json
+++ b/Assets/Resources/JSON/LiquidDataTable.json
@ -31,13 +31,13 @@
  },
  {
    "Idx": "Garnish1",
-    "Name": "가나쉬1",
+    "Name": "가니쉬1",
    "Type": 2,
    "Amount": 2000
  },
  {
    "Idx": "Garnish2",
-    "Name": "가나쉬2",
+    "Name": "가니쉬2",
    "Type": 2,
    "Amount": 2000
  }
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@ -38,7 +38,7 @@ GraphicsSettings:
  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
  m_CustomRenderPipeline: {fileID: 11400000, guid: 3ca7fde3304d0a74ab996047791cd149, type: 2}
  m_TransparencySortMode: 0
-  m_TransparencySortAxis: {x: 0, y: 0, z: 1}
+  m_TransparencySortAxis: {x: 0, y: 0.766, z: 0.643}
  m_DefaultRenderingPath: 1
  m_DefaultMobileRenderingPath: 1
  m_TierSettings: []