액체 쉐이더 테스트 중

2024-08-14 19:52:35 +09:00 · 2024-08-14 19:52:35 +09:00 · f8b42ee64c
commit f8b42ee64c
parent a5c698521b
19 changed files with 2843 additions and 917 deletions
--- a/Assets/01.Scenes/01.Tycoon.unity
+++ b/Assets/01.Scenes/01.Tycoon.unity
--- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs
+++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs
@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using BlueWater.Interfaces;
+using BlueWater.Tycoons;
 using BlueWater.Uis;
 using BlueWater.Utility;
 using Sirenix.OdinInspector;
@ -116,6 +117,33 @@ namespace BlueWater.Players.Tycoons
            }
        }
        
+        // Bar
+        public void OnPour(InputAction.CallbackContext context)
+        {
+            var bar = FindAnyObjectByType<Bar>();
+            if (!bar) return;
+            
+            if (context.performed)
+            {
+                bar.ActiveIsPouring();
+            }
+            else if (context.canceled)
+            {
+                bar.InActiveIsPouring();
+            }
+        }
+        
+        public void OnEscapeBar(InputAction.CallbackContext context)
+        {
+            var bar = FindAnyObjectByType<Bar>();
+            if (!bar) return;
+            
+            if (context.performed)
+            {
+                bar.Escape();
+            }
+        }
+        
        #endregion

        #region Methods
--- a/Assets/02.Scripts/Liquid.cs
+++ b/Assets/02.Scripts/Liquid.cs
@ -0,0 +1,17 @@
+using UnityEngine;
+using UnityEngine.Pool;
+
+namespace BlueWater
+{
+    public class Liquid : MonoBehaviour
+    {
+        [SerializeField]
+        private SpriteRenderer _spriteRenderer;
+        
+        private IObjectPool<Liquid> _managedPool;
+
+        public void SetColor(Color color) => _spriteRenderer.color = color;
+        public void SetManagedPool(IObjectPool<Liquid> pool) => _managedPool = pool;
+        public void Destroy() => _managedPool.Release(this);
+    }
+}
--- a/Assets/02.Scripts/Liquid.cs.meta
+++ b/Assets/02.Scripts/Liquid.cs.meta
@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: f725398f0fbd88e43b707a988c2b347a
--- a/Assets/02.Scripts/LiquidController.cs
+++ b/Assets/02.Scripts/LiquidController.cs
@ -1,22 +1,140 @@
+using System.Collections.Generic;
+using System.Linq;
 using Sirenix.OdinInspector;
 using UnityEngine;
+using UnityEngine.Pool;

 namespace BlueWater
 {
    public class LiquidController : MonoBehaviour
    {
+        [SerializeField]
+        private MeshRenderer _liquidRenderTexture;
+        
        [SerializeField, Required]
-        private GameObject _liquidObject;
+        private Liquid _liquidObject;
        
        [SerializeField, Required]
        private Transform _spawnTransform;

+        [SerializeField]
+        private Transform _spawnLocation;
+
+        [SerializeField]
+        private int _objectPoolCount = 1000;
+
+        [SerializeField]
+        private Color _liquidColor = new(0f, 0.7294118f, 1f, 1f);
+        
+        private IObjectPool<Liquid> _objectPool;
+        private List<Liquid> _activeLiquids = new();
+        private Dictionary<Color, float> _colorTimes = new();
+        
+        private bool _isPouring;
+        private float _startTime = float.PositiveInfinity;
+        
+        // Hashes
+        private static readonly int _colorHash = Shader.PropertyToID("_Color");
+
+        private void Awake()
+        {
+            _objectPool = new ObjectPool<Liquid>(CreateObject, OnGetObject, OnReleaseObject, OnDestroyObject, maxSize: _objectPoolCount);
+        }
+
        private void Update()
        {
-            if (Input.GetKey(KeyCode.Space))
+            if (_isPouring)
            {
-                Instantiate(_liquidObject, _spawnTransform.position, Quaternion.identity);
+                _objectPool.Get();
+                
+                if (_colorTimes.ContainsKey(_liquidColor))
+                {
+                    _colorTimes[_liquidColor] += Time.time - _startTime;
+                }
+                else
+                {
+                    _colorTimes[_liquidColor] = Time.time - _startTime;
+                }
+                
+                _startTime = Time.time;
+                
+                _liquidRenderTexture.material.SetColor(_colorHash, MixColorsByTime());
            }
        }
+
+        private Liquid CreateObject()
+        {
+            var instance = Instantiate(_liquidObject, _spawnTransform.position, Quaternion.identity, _spawnLocation);
+            instance.SetManagedPool(_objectPool);
+            instance.SetColor(_liquidColor);
+            return instance;
+        }
+
+        private void OnGetObject(Liquid liquid)
+        {
+            liquid.transform.position = _spawnTransform.position;
+            liquid.transform.rotation = Quaternion.identity;
+            liquid.gameObject.SetActive(true);
+            _activeLiquids.Add(liquid);
+        }
+
+        private void OnReleaseObject(Liquid liquid)
+        {
+            liquid.gameObject.SetActive(false);
+            _activeLiquids.Remove(liquid);
+        }
+
+        private void OnDestroyObject(Liquid liquid)
+        {
+            Destroy(liquid.gameObject);
+            _activeLiquids.Remove(liquid);
+        }
+        
+        [Button("기본 색상")]
+        private void DefaultColor() => _liquidColor = new Color(0f, 0.7294118f, 1f, 1f);
+
+        public void ReleaseAllObject()
+        {
+            // 뒤에서부터 Remove해야 오류가 없음
+            for (var i = _activeLiquids.Count - 1; i >= 0; i--)
+            {
+                _activeLiquids[i].Destroy();
+            }
+            
+            _colorTimes.Clear();
+        }
+
+        public void ActiveIsPouring()
+        {
+            _startTime = Time.time;
+            _isPouring = true;
+        }
+
+        public void InActiveIsPouring()
+        {
+            _isPouring = false;
+        }
+        
+        private Color MixColorsByTime()
+        {
+            var totalTime = _colorTimes.Values.Sum();
+
+            // 혼합된 색상 초기화 (검은색)
+            var mixedColor = Color.black;
+
+            // 색상 혼합
+            foreach (var element in _colorTimes)
+            {
+                var color = element.Key;
+                var time = element.Value;
+                var ratio = time / totalTime;
+
+                mixedColor += color * ratio;
+            }
+            
+            mixedColor.a = 1f;
+
+            return mixedColor;
+        }
    }
 }
--- a/Assets/02.Scripts/NewBlueWater.inputactions
+++ b/Assets/02.Scripts/NewBlueWater.inputactions
@ -1015,6 +1015,54 @@
                    "isPartOfComposite": false
                }
            ]
+        },
+        {
+            "name": "Bar",
+            "id": "63082564-263a-4430-8f7a-13c3cd4e93e7",
+            "actions": [
+                {
+                    "name": "Pour",
+                    "type": "Button",
+                    "id": "b02d861a-39ed-4c5e-abd0-7ce3c2a44707",
+                    "expectedControlType": "",
+                    "processors": "",
+                    "interactions": "Press",
+                    "initialStateCheck": false
+                },
+                {
+                    "name": "EscapeBar",
+                    "type": "Button",
+                    "id": "4752dd64-7a31-42ae-bfc9-45a01927bd07",
+                    "expectedControlType": "",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
+                }
+            ],
+            "bindings": [
+                {
+                    "name": "",
+                    "id": "01fa3267-e5c0-48c1-8194-592530fbca87",
+                    "path": "<Keyboard>/space",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Pour",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "646d58bf-d879-47c1-99c9-c534c83eb9f4",
+                    "path": "<Keyboard>/escape",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "EscapeBar",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                }
+            ]
        }
    ],
    "controlSchemes": [
--- a/Assets/02.Scripts/PlayerInputKeyManager.cs
+++ b/Assets/02.Scripts/PlayerInputKeyManager.cs
@ -11,6 +11,7 @@ namespace BlueWater
        CombatTitle,
        Combat,
        CombatUi,
+        Bar
    }
    
    public class PlayerInputKeyManager : Singleton<PlayerInputKeyManager>
--- a/Assets/02.Scripts/Prop/Tycoon/Bar.cs
+++ b/Assets/02.Scripts/Prop/Tycoon/Bar.cs
@ -0,0 +1,33 @@
+using UnityEngine;
+
+namespace BlueWater.Tycoons
+{
+    public class Bar : InteractionFurniture
+    {
+        [SerializeField]
+        private LiquidController _liquidController;
+
+        protected override void Awake()
+        {
+            base.Awake();
+
+            _liquidController = FindAnyObjectByType<LiquidController>();
+        }
+
+        public override void Interaction()
+        {
+            PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Bar);
+            TycoonCameraManager.Instance.SetMainCamera(TycoonCameraType.Bar);
+        }
+
+        public void Escape()
+        {
+            PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon);
+            TycoonCameraManager.Instance.SetMainCamera(TycoonCameraType.Base);
+            _liquidController.ReleaseAllObject();
+        }
+
+        public void ActiveIsPouring() => _liquidController.ActiveIsPouring();
+        public void InActiveIsPouring() => _liquidController.InActiveIsPouring();
+    }
+}
--- a/Assets/02.Scripts/Prop/Tycoon/Bar.cs.meta
+++ b/Assets/02.Scripts/Prop/Tycoon/Bar.cs.meta
@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: cca1e48d802f0c34b9bb14d0e6e83a1d
--- a/Assets/02.Scripts/TycoonCameraManager.cs
+++ b/Assets/02.Scripts/TycoonCameraManager.cs
@ -1,29 +1,48 @@
+using System;
 using System.Collections;
+using System.Collections.Generic;
 using BlueWater.Utility;
 using Sirenix.OdinInspector;
 using Unity.Cinemachine;
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.Universal;
+using UnityEngine.Serialization;

 namespace BlueWater
 {
+    public enum TycoonCameraType
+    {
+        Base = 0,
+        Bar
+    }
+    
    public class TycoonCameraManager : Singleton<TycoonCameraManager>
    {
        // Components
        #region Components
        
        [Title("카메라")]
+        [field: SerializeField]
+        public Camera MainCamera { get; private set; }
+        
+        [field: SerializeField]
+        public Camera UiCamera { get; private set; }
+        
+        [FormerlySerializedAs("_cinemachineCameras")]
        [SerializeField]
-        private Transform _cinemachineCameras;
+        private Transform cameraLocation;
        
        [field: SerializeField]
        public CinemachineCamera BaseCamera { get; private set; }
        
-        public Camera MainCamera { get; private set; }
-        public Camera UiCamera { get; private set; }
+        [field: SerializeField]
+        public CinemachineCamera BarCamera { get; private set; }
        
        // Variables
+        private CinemachineBrain _cinemachineBrain;
+        private List<CinemachineCamera> _cinemachineCameras = new();
+        
        private Vignette _vignette;
        private Coroutine _lowHpVignetteCoroutine;
        
@ -59,16 +78,22 @@ namespace BlueWater
        [Button("셋팅 초기화")]
        private void Initialize()
        {
-            _cinemachineCameras = GameObject.Find("CinemachineCameras").transform;
-            BaseCamera = _cinemachineCameras.Find("BaseCamera").GetComponent<CinemachineCamera>();
-
-            BaseCamera.Priority = 1;
+            cameraLocation = GameObject.Find("CinemachineCameras").transform;

            MainCamera = GetComponent<Camera>();
+            _cinemachineBrain = GetComponent<CinemachineBrain>();
            UiCamera = MainCamera.transform.Find("UiCamera").GetComponent<Camera>();
            
+            BaseCamera = cameraLocation.Find("BaseCamera").GetComponent<CinemachineCamera>();
+            BarCamera = cameraLocation.Find("BarCamera").GetComponent<CinemachineCamera>();
+            
            _vignette = GetEffect<Vignette>();
            _vignette.active = false;
+            
+            _cinemachineCameras.Add(BaseCamera);
+            _cinemachineCameras.Add(BarCamera);
+
+            SetMainCamera(TycoonCameraType.Base);
        }

        #endregion
@ -87,6 +112,24 @@ namespace BlueWater
        //     BaseCombatCamera.LookAt = target;
        // }

+        public void SetMainCamera(TycoonCameraType tycoonCameraType, CinemachineBlendDefinition.Styles styles = CinemachineBlendDefinition.Styles.Cut)
+        {
+            var newMainCamera = tycoonCameraType switch
+            {
+                TycoonCameraType.Base => BaseCamera,
+                TycoonCameraType.Bar => BarCamera,
+                _ => throw new ArgumentOutOfRangeException(nameof(tycoonCameraType), tycoonCameraType, null)
+            };
+
+            foreach (var element in _cinemachineCameras)
+            {
+                element.Priority = 0;
+            }
+
+            _cinemachineBrain.DefaultBlend.Style = styles;
+            newMainCamera.Priority = 1;
+        }
+
        #endregion
        
        // PostProcessing
--- a/Assets/04.Materials/Liquid2.mat
+++ b/Assets/04.Materials/Liquid2.mat
@ -0,0 +1,137 @@
+%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: Liquid2
+  m_Shader: {fileID: -6465566751694194690, guid: b54386a114fa71c45b3ee91b7a2b05f2, 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}
+    - _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
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _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
+    - _Visibility: 0.1
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, 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
--- a/Assets/04.Materials/Liquid2.mat.meta
+++ b/Assets/04.Materials/Liquid2.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a78a1dbfadbe3444891c1d321dd8649a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab
+++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab
@ -494,6 +494,38 @@ MonoBehaviour:
      m_Calls: []
    m_ActionId: 0dbf1015-499a-43fe-b252-11c232b9a1ae
    m_ActionName: 'Combat/HealthPointMax[/Keyboard/f3]'
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1674052485383758547}
+        m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp
+        m_MethodName: OnPour
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: b02d861a-39ed-4c5e-abd0-7ce3c2a44707
+    m_ActionName: 'Bar/Pour[/Keyboard/e]'
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1674052485383758547}
+        m_TargetAssemblyTypeName: BlueWater.Players.Tycoons.TycoonInput, Assembly-CSharp
+        m_MethodName: OnEscapeBar
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+    m_ActionId: 4752dd64-7a31-42ae-bfc9-45a01927bd07
+    m_ActionName: 'Bar/EscapeBar[/Keyboard/escape]'
  m_NeverAutoSwitchControlSchemes: 0
  m_DefaultControlScheme: 
  m_DefaultActionMap: Tycoon
@ -533,6 +565,8 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  <SkeletonAnimation>k__BackingField: {fileID: 7125556968546628472}
+  _originalMaterial: {fileID: 0}
+  _replacementMaterial: {fileID: 0}
  _initialSkinName: 01-1
  _isRandomSkin: 0
  _randomRange: {x: 0, y: 0}
--- a/Assets/05.Prefabs/LiquidObject.prefab
+++ b/Assets/05.Prefabs/LiquidObject.prefab
@ -12,6 +12,7 @@ GameObject:
  - component: {fileID: 3772201455671009312}
  - component: {fileID: 7204670366666436681}
  - component: {fileID: 3470010340248184897}
+  - component: {fileID: -7612237390858616641}
  m_Layer: 17
  m_Name: LiquidObject
  m_TagString: Untagged
@ -137,7 +138,7 @@ Rigidbody2D:
  m_Simulated: 1
  m_UseFullKinematicContacts: 0
  m_UseAutoMass: 0
-  m_Mass: 1
+  m_Mass: 10
  m_LinearDamping: 0
  m_AngularDamping: 0
  m_GravityScale: 3
@ -152,3 +153,16 @@ Rigidbody2D:
  m_SleepingMode: 1
  m_CollisionDetection: 0
  m_Constraints: 0
+--- !u!114 &-7612237390858616641
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8577553974540900224}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f725398f0fbd88e43b707a988c2b347a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _spriteRenderer: {fileID: 3772201455671009312}
--- a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab
+++ b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab
@ -2058,7 +2058,6 @@ Transform:
  - {fileID: 3761582068579457947}
  - {fileID: 4068649883988211428}
  - {fileID: 625538338881475774}
-  - {fileID: 8902303721943049359}
  - {fileID: 7582037073008409459}
  - {fileID: 3458041048788596166}
  m_Father: {fileID: 4449232531499695111}
@ -3088,6 +3087,7 @@ Transform:
  - {fileID: 607897003010389427}
  - {fileID: 1147213678061483695}
  - {fileID: 5816752459512434123}
+  - {fileID: 4860166872716204781}
  - {fileID: 3685666716780329301}
  - {fileID: 2653731595491371991}
  - {fileID: 4218287217843781513}
@ -3758,6 +3758,68 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3}
  m_PrefabInstance: {fileID: 495480733007110197}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &574945224391748185
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1402113424960589398}
+    m_Modifications:
+    - target: {fileID: 2189862042643724705, guid: c6d6332703a98a34c919156060788f34, type: 3}
+      propertyPath: m_Name
+      value: Bar
+      objectReference: {fileID: 0}
+    - target: {fileID: 4938291169650258100, guid: c6d6332703a98a34c919156060788f34, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 17.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4938291169650258100, guid: c6d6332703a98a34c919156060788f34, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4938291169650258100, guid: c6d6332703a98a34c919156060788f34, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.75
+      objectReference: {fileID: 0}
+    - target: {fileID: 4938291169650258100, guid: c6d6332703a98a34c919156060788f34, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4938291169650258100, guid: c6d6332703a98a34c919156060788f34, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4938291169650258100, guid: c6d6332703a98a34c919156060788f34, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4938291169650258100, guid: c6d6332703a98a34c919156060788f34, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4938291169650258100, guid: c6d6332703a98a34c919156060788f34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4938291169650258100, guid: c6d6332703a98a34c919156060788f34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4938291169650258100, guid: c6d6332703a98a34c919156060788f34, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c6d6332703a98a34c919156060788f34, type: 3}
+--- !u!4 &4860166872716204781 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4938291169650258100, guid: c6d6332703a98a34c919156060788f34, type: 3}
+  m_PrefabInstance: {fileID: 574945224391748185}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &684458854489471985
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -8689,68 +8751,6 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 7686860294138350331, guid: c625f910e02ef344c8b7071d43ed0e8c, type: 3}
  m_PrefabInstance: {fileID: 8124482328605545903}
  m_PrefabAsset: {fileID: 0}
--- !u!1001 &8444442962073540184
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 7906693004392999617}
-    m_Modifications:
-    - target: {fileID: 1061695247072719575, guid: a73831d2b67c50d48a33129436f92c58, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 17.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1061695247072719575, guid: a73831d2b67c50d48a33129436f92c58, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1061695247072719575, guid: a73831d2b67c50d48a33129436f92c58, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -0.75
-      objectReference: {fileID: 0}
-    - target: {fileID: 1061695247072719575, guid: a73831d2b67c50d48a33129436f92c58, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1061695247072719575, guid: a73831d2b67c50d48a33129436f92c58, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1061695247072719575, guid: a73831d2b67c50d48a33129436f92c58, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1061695247072719575, guid: a73831d2b67c50d48a33129436f92c58, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1061695247072719575, guid: a73831d2b67c50d48a33129436f92c58, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1061695247072719575, guid: a73831d2b67c50d48a33129436f92c58, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1061695247072719575, guid: a73831d2b67c50d48a33129436f92c58, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6075426784951483330, guid: a73831d2b67c50d48a33129436f92c58, type: 3}
-      propertyPath: m_Name
-      value: Bar
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a73831d2b67c50d48a33129436f92c58, type: 3}
--- !u!4 &8902303721943049359 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: a73831d2b67c50d48a33129436f92c58, type: 3}
-  m_PrefabInstance: {fileID: 8444442962073540184}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8459888864537640777
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/Bar.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Bar.prefab
@ -0,0 +1,164 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &3052434796820720192
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1068087645040165886, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_fontSize
+      value: 28.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.22222222
+      objectReference: {fileID: 0}
+    - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.22222222
+      objectReference: {fileID: 0}
+    - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.22222222
+      objectReference: {fileID: 0}
+    - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 12.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 25e4dff43f330fb4dbb8eb657862d399, type: 3}
+    - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_Name
+      value: Bar
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 4.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 4.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 4.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 25e4dff43f330fb4dbb8eb657862d399, type: 3}
+    - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 3106560718697687924}
+  m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+--- !u!212 &2012269473762358169 stripped
+SpriteRenderer:
+  m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+  m_PrefabInstance: {fileID: 3052434796820720192}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2189862042643724705 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+  m_PrefabInstance: {fileID: 3052434796820720192}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &3106560718697687924
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2189862042643724705}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cca1e48d802f0c34b9bb14d0e6e83a1d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  <CenterTransform>k__BackingField: {fileID: 4938291169650258100}
+  <VisualLook>k__BackingField: {fileID: 2012269473762358169}
+  <InteractionCanvas>k__BackingField: {fileID: 3691532428932153809}
+  <InteractionUi>k__BackingField: {fileID: 3869325448641545017}
+  <OutlineMaterial>k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2}
+  <EnableInteraction>k__BackingField: 1
+  <InteractionRadius>k__BackingField: 2
+  IsOpened: 0
+  _liquidController: {fileID: 0}
+--- !u!223 &3691532428932153809 stripped
+Canvas:
+  m_CorrespondingSourceObject: {fileID: 1830317875510668177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+  m_PrefabInstance: {fileID: 3052434796820720192}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &3869325448641545017 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+  m_PrefabInstance: {fileID: 3052434796820720192}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &4938291169650258100 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
+  m_PrefabInstance: {fileID: 3052434796820720192}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/05.Prefabs/Props/Furniture/Interactions/Bar.prefab.meta
+++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Bar.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c6d6332703a98a34c919156060788f34
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/09.Shaders/Liquid2.shadergraph
+++ b/Assets/09.Shaders/Liquid2.shadergraph
--- a/Assets/09.Shaders/Liquid2.shadergraph.meta
+++ b/Assets/09.Shaders/Liquid2.shadergraph.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: b54386a114fa71c45b3ee91b7a2b05f2
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}