#12 카메라 앞의 물체 가리기 기능 추가

+ CharacterHighlighting (캐릭터 오브젝트에 부착) + FadeableObject (투명화 시킬 오브젝트에 부착)따로 투명화 시킬 오브젝트에 bool값 true로 변경 + BasePropsOpaqueLit.prefab, BaseFurnitureOpaqueLit.prefab의 visualLook 추가
2024-06-13 18:49:37 +09:00 · 2024-06-13 18:49:37 +09:00 · 451ee36fdb
commit 451ee36fdb
parent 66ee152be1
20 changed files with 511 additions and 51 deletions
--- a/Assets/02.Scripts/CharacterHighlighting.cs
+++ b/Assets/02.Scripts/CharacterHighlighting.cs
@ -0,0 +1,59 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace BlueWater
+{
+    public class CharacterHighlighting : MonoBehaviour
+    {
+        [SerializeField]
+        private LayerMask _obstacleLayer;
+
+        [SerializeField, Range(1, 16)]
+        private int _maxHitCount = 8;
+
+        private Camera _mainCamera;
+        private RaycastHit[] _raycastHits;
+        private List<FadeableObject> _currentFadeables;
+        private List<FadeableObject> _previousFadeables;
+
+        private void Start()
+        {
+            _mainCamera = Camera.main;
+            _raycastHits = new RaycastHit[_maxHitCount];
+            _currentFadeables = new List<FadeableObject>(_maxHitCount);
+            _previousFadeables = new List<FadeableObject>(_maxHitCount);
+        }
+
+        private void Update()
+        {
+            _currentFadeables.Clear();
+            
+            var cameraPosition = _mainCamera.transform.position;
+            var direction = transform.position - cameraPosition;
+            var distance = direction.magnitude;
+            var size = Physics.RaycastNonAlloc(cameraPosition, direction, _raycastHits, distance,
+                _obstacleLayer, QueryTriggerInteraction.Collide);
+
+            for (var i = 0; i < size; i++)
+            {
+                var hitObject = _raycastHits[i].collider.GetComponentInChildren<FadeableObject>();
+                if (!hitObject || _currentFadeables.Contains(hitObject)) continue;
+
+                if (hitObject.IsFadeable)
+                {
+                    hitObject.SetTransparent();
+                    _currentFadeables.Add(hitObject);
+                }
+            }
+
+            foreach (var element in _previousFadeables)
+            {
+                if (_currentFadeables.Contains(element)) continue;
+
+                element.RestoreOriginal();
+            }
+
+            (_previousFadeables, _currentFadeables) = (_currentFadeables, _previousFadeables);
+        }
+    }
+}
--- a/Assets/02.Scripts/CharacterHighlighting.cs.meta
+++ b/Assets/02.Scripts/CharacterHighlighting.cs.meta
@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5534bdef0c121a34eb71394c0c70fe0c
--- a/Assets/02.Scripts/FadeableObject.cs
+++ b/Assets/02.Scripts/FadeableObject.cs
@ -0,0 +1,101 @@
+using System.Collections;
+using Sirenix.OdinInspector;
+using UnityEngine;
+
+namespace BlueWater
+{
+    public class FadeableObject : MonoBehaviour
+    {
+        [field: SerializeField]
+        public bool IsFadeable { get; private set; }
+        
+        [SerializeField, ShowIf("@IsFadeable")]
+        private Material _transparentMaterial;
+        
+        [SerializeField, Range(0f, 1f), ShowIf("@IsFadeable")]
+        private float _transparency = 0.5f;
+
+        [SerializeField, Range(0f, 2f), ShowIf("@IsFadeable")]
+        private float _fadeDuration = 0.5f;
+
+        private Renderer _originalRenderer;
+        private Material _originalMaterial;
+        private Coroutine _currentCoroutine;
+        private bool _isTransparent;
+
+        private void Start()
+        {
+            _originalRenderer = GetComponentInChildren<Renderer>();
+            _originalMaterial = _originalRenderer.material;
+        }
+        
+        public void SetTransparent()
+        {
+            if (_isTransparent) return;
+            
+            if (_currentCoroutine != null)
+            {
+                StopCoroutine(_currentCoroutine);
+            }
+            _currentCoroutine = StartCoroutine(FadeToTransparent());
+        }
+        
+        public void RestoreOriginal()
+        {
+            if (!_isTransparent) return;
+            
+            if (_currentCoroutine != null)
+            {
+                StopCoroutine(_currentCoroutine);
+            }
+            _currentCoroutine = StartCoroutine(RestoreMaterial());
+        }
+
+        private IEnumerator FadeToTransparent()
+        {
+            _isTransparent = true;
+            var material = new Material(_transparentMaterial);
+            _originalRenderer.material = material;
+            var startAlpha = material.color.a;
+            var duration = _fadeDuration * Mathf.Abs(startAlpha - _transparency);
+            var elapsedTime = 0f;
+
+            while (elapsedTime < duration)
+            {
+                var alpha = Mathf.Lerp(startAlpha, _transparency, elapsedTime / duration);
+                var color = material.color;
+                color.a = alpha;
+                material.color = color;
+
+                elapsedTime += Time.deltaTime;
+                yield return null;
+            }
+
+            var finalColor = material.color;
+            finalColor.a = _transparency;
+            material.color = finalColor;
+        }
+
+        private IEnumerator RestoreMaterial()
+        {
+            _isTransparent = false;
+            var startAlpha = _originalRenderer.material.color.a;
+            var targetAlpha = _originalMaterial.color.a;
+            var duration = _fadeDuration * Mathf.Abs(startAlpha - targetAlpha);
+            var elapsedTime = 0f;
+
+            while (elapsedTime < duration)
+            {
+                var alpha = Mathf.Lerp(startAlpha, targetAlpha, elapsedTime / duration);
+                var color = _originalRenderer.material.color;
+                color.a = alpha;
+                _originalRenderer.material.color = color;
+
+                elapsedTime += Time.deltaTime;
+                yield return null;
+            }
+
+            _originalRenderer.material = _originalMaterial;
+        }
+    }
+}
--- a/Assets/02.Scripts/FadeableObject.cs.meta
+++ b/Assets/02.Scripts/FadeableObject.cs.meta
@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3dd675e72755b2149b85d9ea1e470eea
--- a/Assets/04.Materials/TransparentLit.mat
+++ b/Assets/04.Materials/TransparentLit.mat
@ -38,7 +38,6 @@ Material:
  disabledShaderPasses:
  - MOTIONVECTORS
  - DepthOnly
-  - SHADOWCASTER
  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
--- a/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab
+++ b/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab
@ -73,6 +73,7 @@ GameObject:
  - component: {fileID: 326920787583948413}
  - component: {fileID: 3677775080446906429}
  - component: {fileID: 9129295631914427799}
+  - component: {fileID: 260539324676461127}
  m_Layer: 9
  m_Name: CombatPlayer
  m_TagString: Untagged
@ -337,6 +338,10 @@ MonoBehaviour:
      m_Calls: []
    m_ActionId: 43781cf6-335d-402e-957c-7a27f3e627b6
    m_ActionName: 'TycoonUi/Cancel[/Keyboard/escape]'
+  - m_PersistentCalls:
+      m_Calls: []
+    m_ActionId: 70079543-a5e9-4137-85af-1ad206da8794
+    m_ActionName: 'CombatTitle/MoveScene[/Keyboard/anyKey,/Mouse/leftButton]'
  m_NeverAutoSwitchControlSchemes: 0
  m_DefaultControlScheme: 
  m_DefaultActionMap: Combat
@ -482,6 +487,25 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  _stunParticle: {fileID: 8979130989535966673}
  _slowEffectColor: {r: 0.5921569, g: 0.9843137, b: 0.5882353, a: 0}
+--- !u!114 &260539324676461127
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6290149650087484560}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5534bdef0c121a34eb71394c0c70fe0c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _transparentMaterial: {fileID: 2100000, guid: cc9b0fce917bc9548bd1bf66aa23a269, type: 2}
+  _obstacleLayer:
+    serializedVersion: 2
+    m_Bits: 256
+  _transparency: 0.5
+  _fadeDuration: 0.5
+  _maxHitCount: 8
 --- !u!1 &7185106063436424164
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/05.Prefabs/Maps/RhinocerosMapController.prefab
+++ b/Assets/05.Prefabs/Maps/RhinocerosMapController.prefab
@ -610,6 +610,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallTree02 (3)
      objectReference: {fileID: 0}
+    - target: {fileID: 7050571487355227770, guid: 7765b4f67268ac943aafbb5a0dff85bd, type: 3}
+      propertyPath: m_LocalScale.x
+      value: -1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -692,7 +696,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 1759992658637499492, guid: 8cdddf62848ee2049bc6fb454f55e9d6, type: 3}
      propertyPath: m_LocalScale.x
-      value: -26.5
+      value: 26.5
      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: 8cdddf62848ee2049bc6fb454f55e9d6, type: 3}
      propertyPath: m_LocalPosition.x
@ -742,6 +746,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallTree01 (2)
      objectReference: {fileID: 0}
+    - target: {fileID: 7050571487355227770, guid: 8cdddf62848ee2049bc6fb454f55e9d6, type: 3}
+      propertyPath: m_LocalScale.x
+      value: -1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -1350,7 +1358,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
      propertyPath: m_LocalScale.x
-      value: -6.1
+      value: 6.1
      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
      propertyPath: m_LocalScale.y
@ -1408,6 +1416,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallBush01 (10)
      objectReference: {fileID: 0}
+    - target: {fileID: 7050571487355227770, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalScale.x
+      value: -1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -1580,7 +1592,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
      propertyPath: m_LocalScale.x
-      value: -9.43
+      value: 9.43
      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
      propertyPath: m_LocalScale.y
@ -1638,6 +1650,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallBush01 (5)
      objectReference: {fileID: 0}
+    - target: {fileID: 7050571487355227770, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalScale.x
+      value: -1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -1658,7 +1674,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
      propertyPath: m_LocalScale.x
-      value: -7.3
+      value: 7.3
      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
      propertyPath: m_LocalScale.y
@ -1716,6 +1732,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallBush01 (15)
      objectReference: {fileID: 0}
+    - target: {fileID: 7050571487355227770, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalScale.x
+      value: -1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -1852,6 +1872,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallTree02 (2)
      objectReference: {fileID: 0}
+    - target: {fileID: 7050571487355227770, guid: 7765b4f67268ac943aafbb5a0dff85bd, type: 3}
+      propertyPath: m_LocalScale.x
+      value: -1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -2486,6 +2510,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallTree02 (1)
      objectReference: {fileID: 0}
+    - target: {fileID: 7050571487355227770, guid: 7765b4f67268ac943aafbb5a0dff85bd, type: 3}
+      propertyPath: m_LocalScale.x
+      value: -1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -2972,6 +3000,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallTree02
      objectReference: {fileID: 0}
+    - target: {fileID: 7050571487355227770, guid: 7765b4f67268ac943aafbb5a0dff85bd, type: 3}
+      propertyPath: m_LocalScale.x
+      value: -1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -3152,7 +3184,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: 8cdddf62848ee2049bc6fb454f55e9d6, type: 3}
      propertyPath: m_LocalScale.x
-      value: -21.14
+      value: 21.14
      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: 8cdddf62848ee2049bc6fb454f55e9d6, type: 3}
      propertyPath: m_LocalScale.y
@ -3210,6 +3242,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallTree01 (6)
      objectReference: {fileID: 0}
+    - target: {fileID: 7050571487355227770, guid: 8cdddf62848ee2049bc6fb454f55e9d6, type: 3}
+      propertyPath: m_LocalScale.x
+      value: -1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -3304,7 +3340,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 1759992658637499492, guid: 8cdddf62848ee2049bc6fb454f55e9d6, type: 3}
      propertyPath: m_LocalScale.x
-      value: -26.5
+      value: 26.5
      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: 8cdddf62848ee2049bc6fb454f55e9d6, type: 3}
      propertyPath: m_LocalPosition.x
@ -3354,6 +3390,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallTree01 (4)
      objectReference: {fileID: 0}
+    - target: {fileID: 7050571487355227770, guid: 8cdddf62848ee2049bc6fb454f55e9d6, type: 3}
+      propertyPath: m_LocalScale.x
+      value: -1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -3374,7 +3414,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
      propertyPath: m_LocalScale.x
-      value: -6.1
+      value: 6.1
      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
      propertyPath: m_LocalScale.y
@ -3432,6 +3472,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallBush01 (9)
      objectReference: {fileID: 0}
+    - target: {fileID: 7050571487355227770, guid: a8ae15b27b4fbfc42ad735a4e2cddee0, type: 3}
+      propertyPath: m_LocalScale.x
+      value: -1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/05.Prefabs/Maps/TitanSlimeMapController.prefab
+++ b/Assets/05.Prefabs/Maps/TitanSlimeMapController.prefab
@ -591,6 +591,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 9204511615658943849, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -863,6 +867,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 9204511615658943849, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -1135,6 +1143,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 9204511615658943849, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -1297,6 +1309,10 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 7604816022990125953}
    m_Modifications:
+    - target: {fileID: 746926837324079264, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3}
      propertyPath: m_LocalScale.x
      value: 5.87939
@ -1915,6 +1931,10 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 7604816022990125953}
    m_Modifications:
+    - target: {fileID: 746926837324079264, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3}
      propertyPath: m_LocalScale.x
      value: 5.87939
@ -2177,6 +2197,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 9204511615658943849, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -2251,6 +2275,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 9204511615658943849, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -2960,6 +2988,10 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 7699592165048296756}
    m_Modifications:
+    - target: {fileID: 746926837324079264, guid: d9df3ae075dd3f84985147cdb1a27bbb, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: d9df3ae075dd3f84985147cdb1a27bbb, type: 3}
      propertyPath: m_LocalScale.y
      value: 25.28
@ -3816,6 +3848,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 9204511615658943849, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -3896,6 +3932,10 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 7604816022990125953}
    m_Modifications:
+    - target: {fileID: 746926837324079264, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3}
      propertyPath: m_LocalScale.x
      value: 11.002782
@ -4242,6 +4282,10 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 441090525453070194}
    m_Modifications:
+    - target: {fileID: 746926837324079264, guid: 4894430045828234fa523041eb483b69, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: 4894430045828234fa523041eb483b69, type: 3}
      propertyPath: m_LocalScale.y
      value: 24.8
@ -5140,6 +5184,10 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 7699592165048296756}
    m_Modifications:
+    - target: {fileID: 746926837324079264, guid: d9df3ae075dd3f84985147cdb1a27bbb, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: d9df3ae075dd3f84985147cdb1a27bbb, type: 3}
      propertyPath: m_LocalScale.x
      value: 13.880205
@ -6306,6 +6354,10 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 7699592165048296756}
    m_Modifications:
+    - target: {fileID: 746926837324079264, guid: d9df3ae075dd3f84985147cdb1a27bbb, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: d9df3ae075dd3f84985147cdb1a27bbb, type: 3}
      propertyPath: m_LocalScale.y
      value: 25.28
@ -6446,6 +6498,10 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 7604816022990125953}
    m_Modifications:
+    - target: {fileID: 746926837324079264, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3}
      propertyPath: m_LocalScale.x
      value: 6.5923004
@ -6664,6 +6720,10 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 7699592165048296756}
    m_Modifications:
+    - target: {fileID: 746926837324079264, guid: d9df3ae075dd3f84985147cdb1a27bbb, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1375792957138567903, guid: d9df3ae075dd3f84985147cdb1a27bbb, type: 3}
      propertyPath: m_CastShadows
      value: 3
@ -7022,6 +7082,10 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 7604816022990125953}
    m_Modifications:
+    - target: {fileID: 746926837324079264, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3}
      propertyPath: m_LocalScale.x
      value: 7.75896
@ -7096,6 +7160,10 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 7604816022990125953}
    m_Modifications:
+    - target: {fileID: 746926837324079264, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 1759992658637499492, guid: 6d17f81a406ca69439ac4e8f87c6b3ec, type: 3}
      propertyPath: m_LocalScale.x
      value: 9.117151
@ -7650,6 +7718,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 9204511615658943849, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -8338,6 +8410,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 9204511615658943849, guid: 33d204c504259424fa44b92c62d27dc3, type: 3}
+      propertyPath: <IsFadeable>k__BackingField
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/05.Prefabs/Props/BasePropsOpaqueLit.prefab
+++ b/Assets/05.Prefabs/Props/BasePropsOpaqueLit.prefab
@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1 &3210918493867778633
+--- !u!1 &2752040085647730666
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -8,38 +8,37 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 1831005550125549082}
-  - component: {fileID: 1302237661634242721}
-  - component: {fileID: 2571230942754482898}
+  - component: {fileID: 6979769420770763780}
+  - component: {fileID: 7250046307267553722}
  m_Layer: 8
-  m_Name: BasePropsOpaqueLit
+  m_Name: VisualLook
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &1831005550125549082
+--- !u!4 &6979769420770763780
 Transform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3210918493867778633}
+  m_GameObject: {fileID: 2752040085647730666}
  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: 1
+  m_ConstrainProportionsScale: 0
  m_Children: []
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 1831005550125549082}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1302237661634242721
+--- !u!212 &7250046307267553722
 SpriteRenderer:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3210918493867778633}
+  m_GameObject: {fileID: 2752040085647730666}
  m_Enabled: 1
  m_CastShadows: 1
  m_ReceiveShadows: 1
@ -77,7 +76,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 0219d87b87623eb4fa891ab7272aa8b9, type: 3}
+  m_Sprite: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
  m_FlipY: 0
@ -85,9 +84,43 @@ SpriteRenderer:
  m_Size: {x: 1, y: 1}
  m_AdaptiveModeThreshold: 0.5
  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
+  m_WasSpriteAssigned: 0
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
+--- !u!1 &3210918493867778633
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1831005550125549082}
+  - component: {fileID: 2571230942754482898}
+  - component: {fileID: 817447480463117022}
+  m_Layer: 8
+  m_Name: BasePropsOpaqueLit
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1831005550125549082
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3210918493867778633}
+  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: 1
+  m_Children:
+  - {fileID: 6979769420770763780}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &2571230942754482898
 BoxCollider:
  m_ObjectHideFlags: 0
@ -105,7 +138,23 @@ BoxCollider:
  m_LayerOverridePriority: 0
  m_IsTrigger: 1
  m_ProvidesContacts: 0
-  m_Enabled: 0
+  m_Enabled: 1
  serializedVersion: 3
  m_Size: {x: 1, y: 0.5, z: 0.2}
  m_Center: {x: 0, y: 0.25, z: 0}
+--- !u!114 &817447480463117022
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3210918493867778633}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3dd675e72755b2149b85d9ea1e470eea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  <IsFadeable>k__BackingField: 0
+  _transparentMaterial: {fileID: 2100000, guid: cc9b0fce917bc9548bd1bf66aa23a269, type: 2}
+  _transparency: 0.5
+  _fadeDuration: 0.5
--- a/Assets/05.Prefabs/Props/Environment/Bush01.prefab
+++ b/Assets/05.Prefabs/Props/Environment/Bush01.prefab
@ -50,7 +50,15 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3210918493867778633, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
      propertyPath: m_Name
-      value: BasePropsOpaqueLit
+      value: Bush01
+      objectReference: {fileID: 0}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 0219d87b87623eb4fa891ab7272aa8b9, type: 3}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
--- a/Assets/05.Prefabs/Props/Environment/Bush02.prefab
+++ b/Assets/05.Prefabs/Props/Environment/Bush02.prefab
@ -76,6 +76,14 @@ PrefabInstance:
      propertyPath: m_Name
      value: Bush02
      objectReference: {fileID: 0}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 1e4f6370b1ee51c4abcb3afe57c544b9, type: 3}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/05.Prefabs/Props/Environment/DeathTree01.prefab
+++ b/Assets/05.Prefabs/Props/Environment/DeathTree01.prefab
@ -84,6 +84,14 @@ PrefabInstance:
      propertyPath: m_Name
      value: DeathTree01
      objectReference: {fileID: 0}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 5e74747e4e39bf2419f318c89e37023e, type: 3}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/05.Prefabs/Props/Environment/DeathTree02.prefab
+++ b/Assets/05.Prefabs/Props/Environment/DeathTree02.prefab
@ -84,6 +84,14 @@ PrefabInstance:
      propertyPath: m_Name
      value: DeathTree02
      objectReference: {fileID: 0}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 313182f781376c24d82f90aa512b629c, type: 3}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/05.Prefabs/Props/Environment/FallBush01.prefab
+++ b/Assets/05.Prefabs/Props/Environment/FallBush01.prefab
@ -72,6 +72,14 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallBush01
      objectReference: {fileID: 0}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: e26e9a617b709fd41947c5f469a1eebf, type: 3}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/05.Prefabs/Props/Environment/FallTree01.prefab
+++ b/Assets/05.Prefabs/Props/Environment/FallTree01.prefab
@ -84,6 +84,14 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallTree01
      objectReference: {fileID: 0}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: ced301df377952a40be862302a141a75, type: 3}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/05.Prefabs/Props/Environment/FallTree02.prefab
+++ b/Assets/05.Prefabs/Props/Environment/FallTree02.prefab
@ -18,7 +18,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1831005550125549082, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
      propertyPath: m_LocalScale.x
-      value: -31.6
+      value: 31.6
      objectReference: {fileID: 0}
    - target: {fileID: 1831005550125549082, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
      propertyPath: m_LocalScale.y
@ -70,7 +70,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1831005550125549082, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
      propertyPath: m_ConstrainProportionsScale
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 2571230942754482898, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
      propertyPath: m_Size.x
@ -88,6 +88,14 @@ PrefabInstance:
      propertyPath: m_Name
      value: FallTree02
      objectReference: {fileID: 0}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 88c813499efd0c7428ce84cf6196a38f, type: 3}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/05.Prefabs/Props/Environment/SmallGrass01.prefab
+++ b/Assets/05.Prefabs/Props/Environment/SmallGrass01.prefab
@ -76,6 +76,14 @@ PrefabInstance:
      propertyPath: m_Name
      value: SmallGrass01
      objectReference: {fileID: 0}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: aae9027cd095fc24d91ced9cfe88bf5e, type: 3}
+    - target: {fileID: 7250046307267553722, guid: e985c83e28c6c974788e1324afc1706b, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
--- a/Assets/05.Prefabs/Props/Furniture/BaseFurnitureOpaqueLit.prefab
+++ b/Assets/05.Prefabs/Props/Furniture/BaseFurnitureOpaqueLit.prefab
@ -9,10 +9,9 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 7986070582027999988}
-  - component: {fileID: 2953167904248670954}
  - component: {fileID: 4147700776997737566}
  m_Layer: 8
-  m_Name: BaseFurnitrueOpaqueLit
+  m_Name: BaseFurnitureOpaqueLit
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -30,16 +29,70 @@ Transform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 1
-  m_Children: []
+  m_Children:
+  - {fileID: 7438534416270888028}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2953167904248670954
-SpriteRenderer:
+--- !u!65 &4147700776997737566
+BoxCollider:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3764902268943045601}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 0.5, z: 0.2}
+  m_Center: {x: 0, y: 0.25, z: 0}
+--- !u!1 &7835622629792856689
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7438534416270888028}
+  - component: {fileID: 3580758810857167321}
+  m_Layer: 8
+  m_Name: VisualLook
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7438534416270888028
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7835622629792856689}
+  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: 7986070582027999988}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &3580758810857167321
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7835622629792856689}
  m_Enabled: 1
  m_CastShadows: 1
  m_ReceiveShadows: 1
@ -88,24 +141,3 @@ SpriteRenderer:
  m_WasSpriteAssigned: 0
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
--- !u!65 &4147700776997737566
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3764902268943045601}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 1
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 1, y: 0.5, z: 0.2}
-  m_Center: {x: 0, y: 0.25, z: 0}
--- a/Assets/05.Prefabs/Props/Furniture/BaseFurnitureOpaqueLit.prefab.meta
+++ b/Assets/05.Prefabs/Props/Furniture/BaseFurnitureOpaqueLit.prefab.meta
--- a/Assets/05.Prefabs/Props/Furniture/Table
+++ b/Assets/05.Prefabs/Props/Furniture/Table
@ -28,6 +28,14 @@ PrefabInstance:
      propertyPath: m_WasSpriteAssigned
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3}
+    - target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
+      propertyPath: m_WasSpriteAssigned
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
      propertyPath: m_Name
      value: Table 1