closed #12 Add island camera setting (ref.Bad North)

Camera function - Zoom-in, Zoom-out, rotation Additional commit content - Add scene 02.Main_TG2
2023-08-08 01:43:26 +09:00 · 2023-08-08 01:43:26 +09:00 · 517ebcf21f
commit 517ebcf21f
parent 6051afd27c
48 changed files with 39796 additions and 38 deletions
--- a/BlueWater/Assets/01.Scenes/02.Main_TG2.unity
+++ b/BlueWater/Assets/01.Scenes/02.Main_TG2.unity
--- a/BlueWater/Assets/01.Scenes/02.Main_TG2.unity.meta
+++ b/BlueWater/Assets/01.Scenes/02.Main_TG2.unity.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f4227764308e84f89a765fbf315e2945
+guid: 53949a967a6ab1b4a8c16c6eaaa8157c
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/BlueWater/Assets/02.Scripts/BlueWater.cs
+++ b/BlueWater/Assets/02.Scripts/BlueWater.cs
@ -94,6 +94,54 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
                    ""isPartOfComposite"": true
                }
            ]
+        },
+        {
+            ""name"": ""Camera"",
+            ""id"": ""06b461c0-220a-44f8-a03e-0302537ffe0c"",
+            ""actions"": [
+                {
+                    ""name"": ""Zoom"",
+                    ""type"": ""Value"",
+                    ""id"": ""26cdda4e-9797-43df-a511-7745f1de2567"",
+                    ""expectedControlType"": ""Axis"",
+                    ""processors"": """",
+                    ""interactions"": """",
+                    ""initialStateCheck"": true
+                },
+                {
+                    ""name"": ""Rotate"",
+                    ""type"": ""Button"",
+                    ""id"": ""d9db46b6-0228-4e7f-8b51-53cae3ccc330"",
+                    ""expectedControlType"": ""Button"",
+                    ""processors"": """",
+                    ""interactions"": """",
+                    ""initialStateCheck"": false
+                }
+            ],
+            ""bindings"": [
+                {
+                    ""name"": """",
+                    ""id"": ""6cbe83f3-bb32-4b85-9419-f88897bd4fc4"",
+                    ""path"": ""<Mouse>/scroll/y"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": """",
+                    ""action"": ""Zoom"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
+                },
+                {
+                    ""name"": """",
+                    ""id"": ""e68715cb-964b-4648-9cef-3afefbe84441"",
+                    ""path"": ""<Mouse>/rightButton"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": """",
+                    ""action"": ""Rotate"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
+                }
+            ]
        }
    ],
    ""controlSchemes"": [
@ -118,6 +166,10 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
        // Player
        m_Player = asset.FindActionMap("Player", throwIfNotFound: true);
        m_Player_Move = m_Player.FindAction("Move", throwIfNotFound: true);
+        // Camera
+        m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true);
+        m_Camera_Zoom = m_Camera.FindAction("Zoom", throwIfNotFound: true);
+        m_Camera_Rotate = m_Camera.FindAction("Rotate", throwIfNotFound: true);
    }

    public void Dispose()
@ -221,6 +273,60 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
        }
    }
    public PlayerActions @Player => new PlayerActions(this);
+
+    // Camera
+    private readonly InputActionMap m_Camera;
+    private List<ICameraActions> m_CameraActionsCallbackInterfaces = new List<ICameraActions>();
+    private readonly InputAction m_Camera_Zoom;
+    private readonly InputAction m_Camera_Rotate;
+    public struct CameraActions
+    {
+        private @BlueWater m_Wrapper;
+        public CameraActions(@BlueWater wrapper) { m_Wrapper = wrapper; }
+        public InputAction @Zoom => m_Wrapper.m_Camera_Zoom;
+        public InputAction @Rotate => m_Wrapper.m_Camera_Rotate;
+        public InputActionMap Get() { return m_Wrapper.m_Camera; }
+        public void Enable() { Get().Enable(); }
+        public void Disable() { Get().Disable(); }
+        public bool enabled => Get().enabled;
+        public static implicit operator InputActionMap(CameraActions set) { return set.Get(); }
+        public void AddCallbacks(ICameraActions instance)
+        {
+            if (instance == null || m_Wrapper.m_CameraActionsCallbackInterfaces.Contains(instance)) return;
+            m_Wrapper.m_CameraActionsCallbackInterfaces.Add(instance);
+            @Zoom.started += instance.OnZoom;
+            @Zoom.performed += instance.OnZoom;
+            @Zoom.canceled += instance.OnZoom;
+            @Rotate.started += instance.OnRotate;
+            @Rotate.performed += instance.OnRotate;
+            @Rotate.canceled += instance.OnRotate;
+        }
+
+        private void UnregisterCallbacks(ICameraActions instance)
+        {
+            @Zoom.started -= instance.OnZoom;
+            @Zoom.performed -= instance.OnZoom;
+            @Zoom.canceled -= instance.OnZoom;
+            @Rotate.started -= instance.OnRotate;
+            @Rotate.performed -= instance.OnRotate;
+            @Rotate.canceled -= instance.OnRotate;
+        }
+
+        public void RemoveCallbacks(ICameraActions instance)
+        {
+            if (m_Wrapper.m_CameraActionsCallbackInterfaces.Remove(instance))
+                UnregisterCallbacks(instance);
+        }
+
+        public void SetCallbacks(ICameraActions instance)
+        {
+            foreach (var item in m_Wrapper.m_CameraActionsCallbackInterfaces)
+                UnregisterCallbacks(item);
+            m_Wrapper.m_CameraActionsCallbackInterfaces.Clear();
+            AddCallbacks(instance);
+        }
+    }
+    public CameraActions @Camera => new CameraActions(this);
    private int m_KeyboardSchemeIndex = -1;
    public InputControlScheme KeyboardScheme
    {
@ -234,4 +340,9 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
    {
        void OnMove(InputAction.CallbackContext context);
    }
+    public interface ICameraActions
+    {
+        void OnZoom(InputAction.CallbackContext context);
+        void OnRotate(InputAction.CallbackContext context);
+    }
 }
--- a/BlueWater/Assets/02.Scripts/BlueWater.inputactions
+++ b/BlueWater/Assets/02.Scripts/BlueWater.inputactions
@ -72,6 +72,54 @@
                    "isPartOfComposite": true
                }
            ]
+        },
+        {
+            "name": "Camera",
+            "id": "06b461c0-220a-44f8-a03e-0302537ffe0c",
+            "actions": [
+                {
+                    "name": "Zoom",
+                    "type": "Value",
+                    "id": "26cdda4e-9797-43df-a511-7745f1de2567",
+                    "expectedControlType": "Axis",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": true
+                },
+                {
+                    "name": "Rotate",
+                    "type": "Button",
+                    "id": "d9db46b6-0228-4e7f-8b51-53cae3ccc330",
+                    "expectedControlType": "Button",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
+                }
+            ],
+            "bindings": [
+                {
+                    "name": "",
+                    "id": "6cbe83f3-bb32-4b85-9419-f88897bd4fc4",
+                    "path": "<Mouse>/scroll/y",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Zoom",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "e68715cb-964b-4648-9cef-3afefbe84441",
+                    "path": "<Mouse>/rightButton",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Rotate",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                }
+            ]
        }
    ],
    "controlSchemes": [
--- a/BlueWater/Assets/02.Scripts/IslandCameraController.cs
+++ b/BlueWater/Assets/02.Scripts/IslandCameraController.cs
@ -0,0 +1,157 @@
+using UnityEngine;
+using UnityEngine.InputSystem;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public class IslandCameraController : MonoBehaviour
+    {
+        #region Property and variable
+
+        [Header("카메라 설정")]
+        [Tooltip("카메라의 중심축이 될 Transform")]
+        [SerializeField] private Transform centerOfCamera;
+        
+        [Tooltip("줌 인, 아웃 속도")]
+        [SerializeField] private float zoomSpeed = 5f;
+        
+        [Tooltip("줌 인을 통해 가능한 FieldOfView의 최솟값")]
+        [SerializeField] private float minZoom = 20f;
+        
+        [Tooltip("줌 아웃을 통해 가능한 FieldOfView의 최댓값")]
+        [SerializeField] private float maxZoom = 50f;
+
+        [Tooltip("마우스 우클릭을 통해 움직이는 회전 속도")]
+        [SerializeField] private float rotationSpeed = 10f;
+
+        private float rotationInertia;  // 마우스 우클릭을 뗏을 때, 회전 관성
+        private float desiredZoom;      // 목표 Camera.fieldOfView 값
+        private float currentZoom;      // 현재 Camera.fieldOfView 값
+        private bool isRotating;        // 마우스 우클릭을 통한 회전 진행 여부
+        private float startCameraPosY;  // 시작할 때, 카메라의 Y좌표
+
+        private Camera islandCamera;
+
+        #endregion
+
+        #region Unity built-in function
+
+        private void Reset()
+        {
+            centerOfCamera = GameObject.Find("CenterOfCamera")?.transform;
+            
+            if (!centerOfCamera)
+            {
+                Debug.LogError("CenterOfCamera object not found");
+            }
+
+            zoomSpeed = 5f;
+            minZoom = 20f;
+            maxZoom = 50f;
+            rotationSpeed = 10f;
+        }
+
+        private void Awake()
+        {
+            islandCamera = Utils.GetComponentAndAssert<Camera>(transform);
+            desiredZoom = islandCamera.fieldOfView;
+            startCameraPosY = islandCamera.transform.position.y;
+
+            var controls = new BlueWater();
+            
+            controls.Camera.Zoom.performed += OnZoom;
+            
+            controls.Camera.Rotate.performed += _ => isRotating = true;
+            controls.Camera.Rotate.canceled += _ => isRotating = false;
+
+            controls.Enable();
+        }
+
+        private void LateUpdate()
+        {
+            SmoothZoom();
+            HandleRotation();
+        }
+
+        #endregion
+
+        #region Custom function
+        
+        /// <summary>
+        /// New input system을 이용한 줌 인, 아웃 기능
+        /// </summary>
+        public void OnZoom(InputAction.CallbackContext context)
+        {
+            var scrollValue = Mouse.current.scroll.ReadValue().normalized.y;
+            desiredZoom = Mathf.Clamp(desiredZoom - scrollValue * zoomSpeed, minZoom, maxZoom);
+        }
+
+        /// <summary>
+        /// 자연스러운 줌 인, 아웃 기능
+        /// </summary>
+        private void SmoothZoom()
+        {
+            if (Mathf.Approximately(islandCamera.fieldOfView, desiredZoom)) return;
+    
+            islandCamera.fieldOfView = Mathf.Lerp(islandCamera.fieldOfView, desiredZoom, Time.deltaTime * zoomSpeed);
+
+            if (islandCamera.fieldOfView > desiredZoom) return;
+            
+            var maxVisibleHeight = GetVisibleHeightAtZoom(maxZoom);
+            var currentVisibleHeight = GetVisibleHeightAtZoom(islandCamera.fieldOfView);
+            var allowedMovement = (maxVisibleHeight - currentVisibleHeight) / 2;
+                
+            var myPos = transform.position;
+            var min = startCameraPosY - allowedMovement;
+            var max = startCameraPosY + allowedMovement;
+
+            if (myPos.y > max)
+            {
+                transform.position = Vector3.Lerp(transform.position, new Vector3(myPos.x, max, myPos.z), Time.deltaTime * zoomSpeed);
+            }
+            else if (myPos.y < min)
+            {
+                transform.position = Vector3.Lerp(transform.position, new Vector3(myPos.x, min, myPos.z), Time.deltaTime * zoomSpeed);
+            }
+        }
+        
+        /// <summary>
+        /// 관성을 이용한 자연스러운 카메라 회전 기능
+        /// </summary>
+        private void HandleRotation()
+        {
+            rotationInertia = isRotating ?
+                Mouse.current.delta.ReadValue().x :
+                Mathf.Lerp(rotationInertia, 0, Time.deltaTime * 2);
+
+            var rotation = rotationInertia * rotationSpeed * Time.deltaTime;
+            transform.RotateAround(centerOfCamera.position, Vector3.up, rotation);
+            
+            if (!isRotating) return;
+            
+            var maxVisibleHeight = GetVisibleHeightAtZoom(maxZoom);
+            var currentVisibleHeight = GetVisibleHeightAtZoom(islandCamera.fieldOfView);
+            var allowedMovement = (maxVisibleHeight - currentVisibleHeight) / 2;
+
+            if (Mathf.Abs(allowedMovement) <= 0.01f) return;
+            
+            var verticalMove = -Mouse.current.delta.ReadValue().y * rotationSpeed * Time.deltaTime;
+            var myPos = transform.position;
+            var min = startCameraPosY - allowedMovement;
+            var max = startCameraPosY + allowedMovement;
+            var newY = Mathf.Clamp(myPos.y + verticalMove, min, max);
+            transform.position = new Vector3(myPos.x, newY, myPos.z);
+        }
+        
+        /// <summary>
+        /// 카메라의 FieldOfView값에 따라서 보여지는 카메라 영역의 높이 반환 기능
+        /// </summary>
+        private float GetVisibleHeightAtZoom(float fov)
+        {
+            var distanceToCenter = (centerOfCamera.position - transform.position).magnitude;
+            return 2.0f * (distanceToCenter) * Mathf.Tan(fov * 0.5f * Mathf.Deg2Rad);
+        }
+
+        #endregion
+    }
+}
--- a/BlueWater/Assets/02.Scripts/IslandCameraController.cs.meta
+++ b/BlueWater/Assets/02.Scripts/IslandCameraController.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4937ec4acd582f4449185a78986ee729
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example12_Procedural/TopDownOverlay.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example12_Procedural/TopDownOverlay.mat
@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-851356479156946667
+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: 7
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example13_Moving/Materials/No
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example13_Moving/Materials/No
@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-6090164276918149499
+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: 7
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example13_Moving/WaterPlane.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example13_Moving/WaterPlane.mat
@ -89,3 +89,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
  m_BuildTextureStacks: []
+--- !u!114 &2330820829877852326
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example14_TurnBased_Hexagon/Materials/hexagon_blue.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example14_TurnBased_Hexagon/Materials/hexagon_blue.mat
@ -121,3 +121,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &9091432929559570276
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example14_TurnBased_Hexagon/Materials/hexagon_green.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example14_TurnBased_Hexagon/Materials/hexagon_green.mat
@ -121,3 +121,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &4942435099640300214
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example14_TurnBased_Hexagon/Materials/hexagon_purple.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example14_TurnBased_Hexagon/Materials/hexagon_purple.mat
@ -121,3 +121,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &4527623257328823169
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example14_TurnBased_Hexagon/Materials/hexagon_red.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example14_TurnBased_Hexagon/Materials/hexagon_red.mat
@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7567643309591028639
+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: 7
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example14_TurnBased_Hexagon/Materials/hexagon_yellow.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example14_TurnBased_Hexagon/Materials/hexagon_yellow.mat
@ -121,3 +121,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &2914248366099196389
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example14_TurnBased_Hexagon/Materials/hexagon_yellow_transparent.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example14_TurnBased_Hexagon/Materials/hexagon_yellow_transparent.mat
@ -123,3 +123,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &3547121570425955278
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example3_Recast_Navmesh1/Materials/Material.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example3_Recast_Navmesh1/Materials/Material.mat
@ -87,3 +87,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
  m_BuildTextureStacks: []
+--- !u!114 &3292715819469428055
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example3_Recast_Navmesh1/Materials/structure2-Material.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example3_Recast_Navmesh1/Materials/structure2-Material.mat
@ -87,3 +87,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
  m_BuildTextureStacks: []
+--- !u!114 &8038436114083475975
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example6_Navmesh/Materials/navmesh-navmesh_example6navmeshMat.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Example6_Navmesh/Materials/navmesh-navmesh_example6navmeshMat.mat
@ -87,3 +87,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
  m_BuildTextureStacks: []
+--- !u!114 &5355640833492333649
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/BlueBox.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/BlueBox.mat
@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5505000216685430255
+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: 7
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/BlueGround.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/BlueGround.mat
@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1773171460079381559
+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: 7
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/Door.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/Door.mat
@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5032558296978739701
+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: 7
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/Ground.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/Ground.mat
@ -88,3 +88,16 @@ Material:
 --- !u!1002 &2100001
 EditorExtensionImpl:
  serializedVersion: 6
+--- !u!114 &5764247826848226601
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/GroundRTS.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/GroundRTS.mat
@ -90,3 +90,16 @@ Material:
 --- !u!1002 &2100001
 EditorExtensionImpl:
  serializedVersion: 6
+--- !u!114 &4370894583465833637
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/OrangeGround.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/OrangeGround.mat
@ -90,3 +90,16 @@ Material:
 --- !u!1002 &2100001
 EditorExtensionImpl:
  serializedVersion: 6
+--- !u!114 &7018753112032589948
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/PathBlueArea.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/PathBlueArea.mat
@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-6156118352791376729
+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: 7
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/PathGreyCube.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/PathGreyCube.mat
@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-873501437846899594
+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: 7
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/PathRedArea.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/PathRedArea.mat
@ -91,3 +91,16 @@ Material:
 --- !u!1002 &2100001
 EditorExtensionImpl:
  serializedVersion: 6
+--- !u!114 &1100065246363724119
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/SomeBox.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/SomeBox.mat
@ -93,3 +93,16 @@ Material:
 --- !u!1002 &2100001
 EditorExtensionImpl:
  serializedVersion: 6
+--- !u!114 &8125058429987762439
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/Wall.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Materials/Wall.mat
@ -90,3 +90,16 @@ Material:
 --- !u!1002 &2100001
 EditorExtensionImpl:
  serializedVersion: 6
+--- !u!114 &7132246659775346651
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot-01
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot-01
@ -90,3 +90,16 @@ Material:
 --- !u!1002 &2100001
 EditorExtensionImpl:
  serializedVersion: 6
+--- !u!114 &3876693046906022448
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot-minebot.mat
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot-minebot.mat
@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2997648082733732838
+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: 7
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@awake-01
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@awake-01
@ -90,3 +90,16 @@ Material:
 --- !u!1002 &2100001
 EditorExtensionImpl:
  serializedVersion: 6
+--- !u!114 &7059453153236795953
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@back-01
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@back-01
@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5063292972492528777
+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: 7
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@forward
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@forward
@ -120,3 +120,16 @@ Material:
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &4131716299511814156
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@forward-01
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@forward-01
@ -90,3 +90,16 @@ Material:
 --- !u!1002 &2100001
 EditorExtensionImpl:
  serializedVersion: 6
+--- !u!114 &2597294213898615946
+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: 7
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@left-01
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@left-01
@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2256705821437605745
+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: 7
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
--- a/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@right-01
+++ b/BlueWater/Assets/AstarPathfindingProject/ExampleScenes/Prefabs/MineBot/Materials/mine_bot@right-01
@ -90,3 +90,16 @@ Material:
 --- !u!1002 &2100001
 EditorExtensionImpl:
  serializedVersion: 6
+--- !u!114 &1807793399051874177
+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: 7
--- a/BlueWater/Assets/FlatKit/[Render
+++ b/BlueWater/Assets/FlatKit/[Render
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 41e59f562b69648719f2424c438758f3
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/NWH/Common/Scripts/Input/InputSystem/SceneInputActions.cs
+++ b/BlueWater/Assets/NWH/Common/Scripts/Input/InputSystem/SceneInputActions.cs
@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.6.1
+//     version 1.6.3
 //     from Assets/NWH/Common/Scripts/Input/InputSystem/SceneInputActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
--- a/2/Scripts/ShipController/Input/InputProviders/InputSystemProvider/ShipInputActions.cs
+++ b/2/Scripts/ShipController/Input/InputProviders/InputSystemProvider/ShipInputActions.cs
@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.6.1
+//     version 1.6.3
 //     from Assets/NWH/Dynamic Water Physics 2/Scripts/ShipController/Input/InputProviders/InputSystemProvider/ShipInputActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
--- a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom
+++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f597f19f656ba56eae4f6a3a7cc528f4
-timeCreated: 1488828285
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom
+++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 48e08dc33330d11e9d4a1b246c52e4f6
-timeCreated: 1488828285
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/Plugins/Sirenix/Demos/Editor
+++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Editor
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ed09910c0094cb27be8f3ca264680da3
-timeCreated: 1488828285
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/Plugins/Sirenix/Demos/Sample
+++ b/BlueWater/Assets/Plugins/Sirenix/Demos/Sample
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: cc355dd4cf1e6173beaeb22c2858cbe1
-timeCreated: 1488828285
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/Quibli/Demos/City/Scene
+++ b/BlueWater/Assets/Quibli/Demos/City/Scene
@ -97,6 +97,8 @@ MonoBehaviour:
      type: 3}
    objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486,
      type: 3}
+    dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92,
+      type: 3}
  m_AssetVersion: 2
  m_OpaqueLayerMask:
    serializedVersion: 2
--- a/BlueWater/Assets/Quibli/Demos/Nature/Scene
+++ b/BlueWater/Assets/Quibli/Demos/Nature/Scene
@ -41,6 +41,8 @@ MonoBehaviour:
      type: 3}
    objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486,
      type: 3}
+    dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92,
+      type: 3}
  m_AssetVersion: 2
  m_OpaqueLayerMask:
    serializedVersion: 2
--- a/BlueWater/Assets/Quibli/Demos/Sample
+++ b/BlueWater/Assets/Quibli/Demos/Sample
@ -97,6 +97,8 @@ MonoBehaviour:
      type: 3}
    objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486,
      type: 3}
+    dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92,
+      type: 3}
  m_AssetVersion: 2
  m_OpaqueLayerMask:
    serializedVersion: 2
--- a/BlueWater/Assets/Quibli/Example
+++ b/BlueWater/Assets/Quibli/Example
@ -61,6 +61,8 @@ MonoBehaviour:
      type: 3}
    objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486,
      type: 3}
+    dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92,
+      type: 3}
  m_AssetVersion: 2
  m_OpaqueLayerMask:
    serializedVersion: 2