UI changes, add fade in/out between SceneLoaded

Assets/Scripts/CameraSystem.cs

@@ -9,8 +9,7 @@ public class CameraSystem : MonoBehaviour
 
     private void Start()
     {
-        //_camera.LookAt = Player.Instance.transform;
-        //_camera.Follow= Player.Instance.transform;
-        //_camera.m_Follow.transform.localPosition=new Vector3(0,9,-4);
+        _camera.LookAt = Player.Instance.transform;
+        _camera.Follow = Player.Instance.transform;
     }
 }

Assets/Scripts/InteractableObjects/Door.cs

@@ -1,5 +1,4 @@
 using UnityEngine;
-using UnityEngine.SceneManagement;
 
 public class Door : BaseInteractableObject
 {
@@ -7,12 +6,10 @@ public class Door : BaseInteractableObject
     private string _scene;
     [SerializeField]
     private string _exitName;
-    [SerializeField]
-    private string _enterName;
 
     private void Start()
     {
-        if (PlayerPrefs.GetString("lastExitName") == _enterName.ToLower())
+        if (PlayerPrefs.GetString("lastExitName") == _exitName.ToLower())
         {
             print($"Player came from to {_scene}");
             Player.Instance.SetPosition(_interactionPoint.position);
@@ -26,6 +23,7 @@ public class Door : BaseInteractableObject
         {
             PlayerPrefs.SetString("lastExitName", _exitName.ToLower());
         }
-        SceneManager.LoadScene(_scene);
+        SceneManager.Instance.ChangeScene(_scene);
     }
 }
+

Assets/Scripts/MouseInputManager.cs

@@ -9,8 +9,6 @@ public class MouseInputManager : MonoBehaviour
     [SerializeField]
     private LayerMask _walkableLayerMask;
     [SerializeField]
-    private Camera _camera;
-    [SerializeField]
     private WaypointVisual _waypointVisual;
 
 
@@ -53,7 +51,7 @@ public class MouseInputManager : MonoBehaviour
             OnSelectedObjectChanged?.Invoke(this, new OnSelectedObjectChangedEventArgs() { SelectedObject = null });
             if (Input.GetMouseButtonDown(0) && !EventSystem.current.IsPointerOverGameObject())
             {
-                if (Physics.Raycast(_camera.ScreenPointToRay(Input.mousePosition), out RaycastHit hit, 100f, _walkableLayerMask))
+                if (Physics.Raycast(ray, out RaycastHit hit, 100f, _walkableLayerMask))
                 {
                     _waypointVisual.SetWaypoint(hit.point);
                     Player.Instance.AddTask(new PlayerTasks(Tasks.Move, _waypointVisual));

Assets/Scripts/SceneManager.cs

@@ -0,0 +1,38 @@
+using UnityEngine;
+
+public class SceneManager : MonoBehaviour
+{
+    [SerializeField]
+    private LevelChanger _levelChanger;
+
+    public static SceneManager Instance { get; private set; }
+
+    private void Awake()
+    {
+        if (Instance == null)
+        {
+            Instance = this;
+            DontDestroyOnLoad(gameObject);
+        }
+        else
+            Destroy(gameObject);
+
+    }
+
+    private void Start()
+    {
+        _levelChanger.gameObject.SetActive(true);
+        _levelChanger.FadeIn(OnSceneChanged);
+    }
+
+    public void ChangeScene(string sceneName)
+    {
+        _levelChanger.gameObject.SetActive(true);
+        _levelChanger.FadeToLevel(sceneName, OnSceneChanged);
+
+    }
+    private void OnSceneChanged()
+    {
+        _levelChanger.gameObject.SetActive(false);
+    }
+}

Assets/Scripts/SpawnManager.cs

@@ -1,18 +0,0 @@
-using UnityEngine;
-
-public class SpawnManager : MonoBehaviour
-{
-    public static SpawnManager Instance { get; private set; }
-
-    private void Awake()
-    {
-        if (Instance == null)
-        {
-            Instance = this;
-            DontDestroyOnLoad(gameObject);
-        }
-        else
-            Destroy(gameObject);
-
-    }
-}