Refactor system code

2025-12-21 21:16:04 +01:00 · 2024-09-30 13:03:01 +02:00 · 2024-09-30 13:03:01 +02:00 · 95f98847ca
commit 95f98847ca
parent d3faa70e5f
20 changed files with 360 additions and 2230 deletions
--- a/Assets/game/Coin/SC_2DCoin.cs
+++ b/Assets/game/Coin/SC_2DCoin.cs
@ -16,8 +16,8 @@ public class SC_2DCoin : MonoBehaviour
    {
        //Make Collider2D as trigger 
        GetComponent<Collider2D>().isTrigger = true;
-        PlayerSaving.LoadingPlayer = true;
-        totalCoins = PlayerSaving.savedCoins;
+        //PlayerSaving.LoadPlayer();
+        totalCoins = PlayerSaving.coins;
    }

    void OnTriggerEnter2D(Collider2D c2d)
@ -28,7 +28,6 @@ public class SC_2DCoin : MonoBehaviour
            //Add coin to counter
            totalCoins++;
            //Test: Print total number of coins
-            Debug.Log("You currently have " + SC_2DCoin.totalCoins + " Coins.");
            IsPlaying = true;
            //Destroy coin
            Destroy(gameObject);
@ -46,11 +45,10 @@ public class SC_2DCoin : MonoBehaviour

    void Update()
    {
-        if (totalCoins != PlayerSaving.savedCoins && PlayerSaving.Deleteing == false)
+        if (totalCoins != PlayerSaving.coins && !PlayerSaving.Deleteing)
        {
-            PlayerSaving.savedCoins = totalCoins;
-            PlayerSaving.SavingPlayer = true;
-            Debug.Log("Saved " + PlayerSaving.savedCoins);
+            PlayerSaving.coins = totalCoins;
+            PlayerSaving.SavePlayer();
        }
    }
 }
--- a/Assets/game/Coin/minusCounter/minusCounter.cs
+++ b/Assets/game/Coin/minusCounter/minusCounter.cs
@ -27,11 +27,10 @@ public class minusCounter : MonoBehaviour
            PlayerHealth.minus = false;
            Destroy(gameObject);
        }
-        if (Endlevel.LevelForCoinBool <= 5 && PlayerHealth.minus == true)
+        if (PlayerSaving.level <= 5 && PlayerHealth.minus == true)
 		{
            if (SC_2DCoin.totalCoins < 5)
            {
-                //counterText.text = "-" + SC_2DCoin.totalCoins + " ";
                Destroy(gameObject);
            }
            if (SC_2DCoin.totalCoins >= 5)
@ -41,11 +40,10 @@ public class minusCounter : MonoBehaviour
            PlayerHealth.minus = false;
            StartCoroutine(Animation());
 		}
-        if (Endlevel.LevelForCoinBool <= 9 && Endlevel.LevelForCoinBool >= 6 && PlayerHealth.minus == true)
+        if (PlayerSaving.level <= 9 && PlayerSaving.level >= 6 && PlayerHealth.minus == true)
 		{
 			if (SC_2DCoin.totalCoins < 10)
            {
-                //counterText.text = "-" + SC_2DCoin.totalCoins;
                Destroy(gameObject);
            }
            if (SC_2DCoin.totalCoins >= 10)
@ -55,11 +53,10 @@ public class minusCounter : MonoBehaviour
            PlayerHealth.minus = false;
            StartCoroutine(Animation());
 		}
-		if (Endlevel.LevelForCoinBool <= 15 && Endlevel.LevelForCoinBool >= 10 && PlayerHealth.minus == true)
+		if (PlayerSaving.level <= 15 && PlayerSaving.level >= 10 && PlayerHealth.minus == true)
 		{
 			if (SC_2DCoin.totalCoins < 15)
            {
-                //counterText.text = "-" + SC_2DCoin.totalCoins;
                Destroy(gameObject);
            }
            if (SC_2DCoin.totalCoins >= 15)
@ -69,11 +66,10 @@ public class minusCounter : MonoBehaviour
            PlayerHealth.minus = false;
            StartCoroutine(Animation());
 		}
-		if (Endlevel.LevelForCoinBool <= 20 && Endlevel.LevelForCoinBool >= 16 && PlayerHealth.minus == true)
+		if (PlayerSaving.level <= 20 && PlayerSaving.level >= 16 && PlayerHealth.minus == true)
 		{
 			if (SC_2DCoin.totalCoins < 20)
            {
-                //counterText.text = "-" + SC_2DCoin.totalCoins;
                Destroy(gameObject);
            }
            if (SC_2DCoin.totalCoins >= 20)
--- a/Assets/game/Scenes/levelTutorial.unity
+++ b/Assets/game/Scenes/levelTutorial.unity
--- a/Assets/game/Scripts/Endlevel.cs
+++ b/Assets/game/Scripts/Endlevel.cs
@ -7,22 +7,21 @@ public class Endlevel : MonoBehaviour
    public string levelToLoad = "Level2";
    public SceneFader sceneFader;
    public static int level = 0;
-    public int SetLevel = 1;
+    private int SetLevel;
    public static bool nextLevel = false;
-    public static int LevelForCoinBool = 0;

    void Awake()
    {
        //Make Collider2D as trigger 
        GetComponent<Collider2D>().isTrigger = true;
-        level = PlayerSaving.levels;
-        PlayerSaving.LoadingPlayer = true;
+        level = PlayerSaving.level;
+        //PlayerSaving.LoadPlayer();
        Debug.Log(level);
+        SetLevel = GetValueForSetLevel();
    }

    void OnTriggerEnter2D(Collider2D c2d)
    {
-        //Destroy the coin if Object tagged Player comes in contact with it
        if (c2d.CompareTag("Player"))
        {
            level = SetLevel;
@ -34,19 +33,16 @@ public class Endlevel : MonoBehaviour
    void Update()
    {
        //Debug.Log(level);
-        if (level != PlayerSaving.levels && PlayerSaving.Deleteing == false)
+        if (level != PlayerSaving.level && !PlayerSaving.Deleteing)
        {
-            if (PlayerSaving.levels < level)
+            if (PlayerSaving.level < level)
            {
-                PlayerSaving.levels = level;
-                PlayerSaving.SavingPlayer = true;
+                PlayerSaving.level = level;
+                PlayerSaving.SavePlayer();
                //Debug.Log("Saved " + PlayerSaving.levels + " Level");
            }
        }

-        // this one is not just for coin bool used. It's used in Pause.cs too!
-        LevelForCoinBool = SetLevel;
-
        if (nextLevel == true)
        {
            nextLevel = false;
@ -55,4 +51,17 @@ public class Endlevel : MonoBehaviour
            sceneFader.FadeTo(levelToLoad);
        }
    }
+
+    public int GetValueForSetLevel()
+    {
+        string levelInString = "";
+        for(int i = 0; i < levelToLoad.Length; i++)
+        {
+            if (char.IsDigit(levelToLoad[i]))
+            {
+                levelInString += levelToLoad[i];
+            }
+        }
+        return int.Parse(levelInString);
+    }
 }
--- a/Assets/game/Scripts/Save/PlayerData.cs
+++ b/Assets/game/Scripts/Save/PlayerData.cs
@ -5,16 +5,16 @@ using UnityEngine;
 [System.Serializable]
 public class PlayerData
 {
-    public int level = 0;
-    public int coins = 0;
-    public int tutorial = 0;
-    public int cloudsMoveData = 0;
+    public int savedLevels = 0;
+    public int savedCoins = 0;
+    public bool tutorial = false;
+    public bool cloudsMove = true;

-    public PlayerData (PlayerSaving player)
+    public PlayerData ()
    {
-        level = PlayerSaving.levels;
-        coins = PlayerSaving.savedCoins;
-        tutorial = PlayerSaving.tutorial;
-        cloudsMoveData = PlayerSaving.cloudMove;
+        savedLevels = PlayerSaving.level;
+        savedCoins = PlayerSaving.coins;
+        tutorial = PlayerSaving.hasCompletedTutorial;
+        cloudsMove = PlayerSaving.movingClouds;
    }
 }
--- a/Assets/game/Scripts/Save/PlayerSaving.cs
+++ b/Assets/game/Scripts/Save/PlayerSaving.cs
@ -4,74 +4,46 @@ using UnityEngine;

 public class PlayerSaving : MonoBehaviour
 {
-    public static int levels = 0;
-    public static int savedCoins = 0;
-    public static int tutorial = 0;
-    public static int cloudMove = 0;
-    public static bool SavingPlayer = false;
-    public static bool LoadingPlayer = false;
-    public static bool DeleteingPlayer = false;
+    public static int level = 0;
+    public static int coins = 0;
+    public static bool hasCompletedTutorial = false;
+    public static bool movingClouds = true;
    public static bool Deleteing = false;

-    void Update()
+    void Awake()
    {
-        /*if (levels != Endlevel.level)
-        {
-            Endlevel.level = levels;
-        }
-        if (savedCoins != SC_2DCoin.totalCoins && Loading == false)
-        {
-            SC_2DCoin.totalCoins = savedCoins;
-        }*/
-        if(SavingPlayer == true)
-        {
-            SavingPlayer = false;
-            SavePlayer();
-        }
-        if (LoadingPlayer == true)
-        {
-            LoadingPlayer = false;
        LoadPlayer();
    }
-        if (DeleteingPlayer == true)
-        {
-            DeleteingPlayer = false;
-            DeletePlayer();
-        }
-        /*if (Input.GetKeyDown(KeyCode.L))
-        {
-            levels = 1;
-            SavingPlayer = true;
-        }*/
-    }

-    public void SavePlayer()
+    public static void SavePlayer()
    {
-        SaveSystem.SavePlayer(this);
+        SaveSystem.SavePlayer();
        Debug.Log("Saved");
+        Debug.Log($"Saved level: {level}, coins: {coins}, tutorial: {hasCompletedTutorial}, cloudsMove: {movingClouds}");
    }

-    public void LoadPlayer()
+    public static void LoadPlayer()
    {
        PlayerData data = SaveSystem.LoadPlayer();

-        levels = data.level;
-        savedCoins = data.coins;
-        tutorial = data.tutorial;
-        cloudMove = data.cloudsMoveData;
+        level = data.savedLevels;
+        coins = data.savedCoins;
+        hasCompletedTutorial = data.tutorial;
+        movingClouds = data.cloudsMove;

        Debug.Log("Loaded");
-        SC_2DCoin.totalCoins = savedCoins;
-        Endlevel.level = levels;
+        Debug.Log($"Loaded level: {level}, coins: {coins}, tutorial: {hasCompletedTutorial}, cloudsMove: {movingClouds}");
+        SC_2DCoin.totalCoins = coins;
+        Endlevel.level = level;
    }

-    public void DeletePlayer()
+    public static void DeletePlayer()
    {
        Deleteing = true;
-        savedCoins = 0;
-        levels = 0;
-        tutorial = 0;
-        cloudMove = 0;
+        level = 0;
+        coins = 0;
+        hasCompletedTutorial = false;
+        movingClouds = true;

        // For MusicToggle.cs
        PlayerPrefs.SetInt("MusicToggled", 1);
@ -81,7 +53,7 @@ public class PlayerSaving : MonoBehaviour
        PlayerPrefs.SetFloat("SoundVolume", 0.75f);
        PlayerPrefs.Save();

-        SaveSystem.SavePlayer(this);
+        SaveSystem.SavePlayer();
        Debug.Log("Deleted");
    }
 }
--- a/Assets/game/Scripts/Save/PlayerSaving.cs.meta
+++ b/Assets/game/Scripts/Save/PlayerSaving.cs.meta
@ -4,7 +4,7 @@ MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
-  executionOrder: 0
+  executionOrder: -32000
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
--- a/Assets/game/Scripts/Save/SaveSystem.cs
+++ b/Assets/game/Scripts/Save/SaveSystem.cs
@ -4,13 +4,13 @@ using System.Runtime.Serialization.Formatters.Binary;

 public static class SaveSystem
 {
-    public static void SavePlayer (PlayerSaving player)
+    public static void SavePlayer ()
    {
        BinaryFormatter formatter = new BinaryFormatter();
        string path = Application.persistentDataPath + "/player.save";
        FileStream stream = new FileStream(path, FileMode.Create);

-        PlayerData data = new PlayerData(player);
+        PlayerData data = new PlayerData();

        formatter.Serialize(stream, data);
        stream.Close();
--- a/Assets/game/Scripts/SkyBackground/Clouds.cs
+++ b/Assets/game/Scripts/SkyBackground/Clouds.cs
@ -21,13 +21,13 @@ public class Clouds : MonoBehaviour

    void Update()
    {
-        float distance = Vector2.Distance(transform.position, destroyPoint.position);
-        int distanceOfDestroyPoint = (int)Math.Round(distance);
+        float distanceX = destroyPoint.position.x - transform.position.x;
+
        if (!Pause.IsPause && CloudsToggle.cloudsCanMove)
        {
            transform.position += Vector3.right * Time.deltaTime * speed;
            //rb.velocity = transform.right * speed;
-            if (distanceOfDestroyPoint <= 0)
+            if (distanceX <= 0)
            {
                Instantiate(cloudPrefab, clonePoint.position, Quaternion.identity);
                Destroy(gameObject);
@ -35,7 +35,6 @@ public class Clouds : MonoBehaviour
        }

        UpdateYPosition(transform);
-        UpdateYPosition(destroyPoint);
        UpdateYPosition(clonePoint);
    }

--- a/Assets/game/Scripts/SkyBackground/CloudsToggle.cs
+++ b/Assets/game/Scripts/SkyBackground/CloudsToggle.cs
@ -5,108 +5,51 @@ using UnityEngine.UI;

 public class CloudsToggle : MonoBehaviour
 {
-    public static int cloudsMoveInt;
-    public static bool cloudsCanMove = true;
+    public static bool cloudsCanMove;
    public Toggle cloudsToggle;
-    //public GameObject imageOfToggleOn;
-
-    int checkInStorage = 0;
    bool previousCloudsCanMoveState;
-    bool loaded = false;
+    bool changingStates = false;

    void Start()
    {
-        PlayerSaving.LoadingPlayer = true;
-        checkInStorage = 0;
-        StartCoroutine(waitToLoadData());
+        changingStates = true;
+
+        cloudsCanMove = PlayerSaving.movingClouds;
+        cloudsToggle.isOn = cloudsCanMove;
+        previousCloudsCanMoveState = cloudsCanMove;
+
+        changingStates = false;
    }

    // Update is called once per frame
    void Update()
    {
-        if(checkInStorage == 0)
-        {
-            checkInStorage++;
-            cloudsMoveInt = PlayerSaving.cloudMove;
-            if(cloudsMoveInt == 0)
-            {
-                cloudsToggle.isOn = true;
-                //imageOfToggleOn.SetActive(true);
-                cloudsCanMove = true;
-            }
-            if(cloudsMoveInt == 1)
-            {
-                //imageOfToggleOn.SetActive(false);
-                cloudsToggle.isOn = false;
-                cloudsCanMove = false;
-            }
-        }
-
        if (Input.GetKeyDown(KeyCode.C))
        {
            ChangeBool();
        }

-        /*if ((PlayerSaving.cloudMove != 0 && cloudsCanMove) && checkInStorage != 1)
-        {
-            PlayerSaving.cloudMove = 0;
-            PlayerSaving.SavingPlayer = true;
-        }
-        else if ((PlayerSaving.cloudMove != 1 && !cloudsCanMove) && checkInStorage != 1)
-        {
-            PlayerSaving.cloudMove = 1;
-            PlayerSaving.SavingPlayer = true;
-        }*/
-
-        if (cloudsCanMove != previousCloudsCanMoveState && loaded)
+        if (cloudsCanMove != previousCloudsCanMoveState)
        {
            //Debug.Log("State changed. Saving Clouds state: " + cloudsCanMove);
-            PlayerSaving.cloudMove = cloudsCanMove ? 0 : 1;
-            PlayerSaving.SavingPlayer = true;
+            PlayerSaving.movingClouds = cloudsCanMove;
+            PlayerSaving.SavePlayer();
            previousCloudsCanMoveState = cloudsCanMove;
        }
-
-        checkInStorage++;
    }

    public void ChangeBool()
    {
-        if(cloudsCanMove)
+        if (changingStates)
        {
-            cloudsToggle.isOn = false;
-            //imageOfToggleOn.SetActive(false);
-            cloudsCanMove = false;
-        }
-        else if(!cloudsCanMove)
-        {
-            cloudsToggle.isOn = true;
-            //imageOfToggleOn.SetActive(true);
-            cloudsCanMove = true;
+            return;
        }
+        changingStates = true;
+
+        cloudsToggle.isOn = !cloudsCanMove;
+        cloudsCanMove = !cloudsCanMove;
+        
+        changingStates = false;
        //Debug.Log("Clouds state changed by user: " + cloudsCanMove);
    }
-
-    IEnumerator waitToLoadData()
-    {
-        yield return new WaitForSeconds(0.1f);
-
-        cloudsMoveInt = PlayerSaving.cloudMove;
-        /*if(cloudsMoveInt == 0)
-        {
-            cloudsToggle.isOn = true;
-            //imageOfToggleOn.SetActive(true);
-            cloudsCanMove = true;
-        }
-        if(cloudsMoveInt == 1)
-        {
-            //imageOfToggleOn.SetActive(false);
-            cloudsToggle.isOn = false;
-            cloudsCanMove = false;
-        }*/
-        cloudsToggle.isOn = (cloudsMoveInt == 0);
-        cloudsCanMove = (cloudsMoveInt == 0);
-        previousCloudsCanMoveState = cloudsCanMove;
-        //Debug.Log("Clouds state changed by user: " + cloudsCanMove);
-        loaded = true;
-    }
 }
--- a/Assets/game/Scripts/UI/CheckDeleted.cs
+++ b/Assets/game/Scripts/UI/CheckDeleted.cs
@ -41,7 +41,7 @@ public class CheckDeleted : MonoBehaviour
            }
            count++;
            Exit = 0;
-            if (PlayerSaving.levels == 0 && PlayerSaving.savedCoins == 0 && PlayerSaving.tutorial == 0 && PlayerSaving.cloudMove == 0)
+            if (PlayerSaving.level == 0 && PlayerSaving.coins == 0 && !PlayerSaving.hasCompletedTutorial && PlayerSaving.movingClouds)
            {
                
                Deleted.SetActive(true);
@ -52,7 +52,7 @@ public class CheckDeleted : MonoBehaviour
        }
        if (count == 1 || count == 2)
        {
-            PlayerSaving.DeleteingPlayer = true;
+            PlayerSaving.DeletePlayer();
            if (Delete == 0)
            {
                StartCoroutine(WaitForDelete());
@ -61,10 +61,10 @@ public class CheckDeleted : MonoBehaviour
            {
                return;
            }
-            PlayerSaving.LoadingPlayer = true;
+            PlayerSaving.LoadPlayer();
        	count++;
            Delete = 0;
-            if (PlayerSaving.levels == 0 && PlayerSaving.savedCoins == 0 && PlayerSaving.tutorial == 0 && PlayerSaving.cloudMove == 0)
+            if (PlayerSaving.level == 0 && PlayerSaving.coins == 0 && !PlayerSaving.hasCompletedTutorial && PlayerSaving.movingClouds)
            {
                Deleted.SetActive(true);
                Debug.Log("Done Stage: " + count);
--- a/Assets/game/Scripts/UI/Pause.cs
+++ b/Assets/game/Scripts/UI/Pause.cs
@ -49,7 +49,7 @@ public class Pause : MonoBehaviour
            Jump.SetActive(!IsPause);
            Crouch.SetActive(!IsPause);
            Fire.SetActive(!IsPause);
-            if (Image != null && !IsPause)
+            if (Image != null && IsPause)
            {
                Image.SetActive(false);
            }
--- a/Assets/game/Scripts/UI/Tutorial.cs
+++ b/Assets/game/Scripts/UI/Tutorial.cs
@ -5,40 +5,59 @@ using UnityEngine.UI;

 public class Tutorial : MonoBehaviour
 {
-    public Button level1;
-    public static bool pressedBack = true;
+    public Button button;
+    public GameObject[] menus;
+    MainMenu mainMenu;
+    int currentPage = 0;

    void Awake()
    {
-        //level1 = GetComponent<Button>();
-        level1.interactable = false;
-        StartCoroutine(WaitForTutorial());
+        mainMenu = FindObjectOfType<MainMenu>().GetComponent<MainMenu>();
+        button.interactable = false;
+        button.onClick.AddListener(() => StartCoroutine(StartGame()));
    }

-    void Update()
+    public void NextPage()
    {
-        if(!pressedBack)
+        if (currentPage < menus.Length - 1)
        {
-            StartCoroutine(WaitForTutorial());
+            menus[currentPage].SetActive(false);
+            currentPage++;
+            menus[currentPage].SetActive(true);
+        }
+
+        if (currentPage == menus.Length - 1)
+        {
+            StartCoroutine(ActivateStartLevelButton());
        }
    }

-    IEnumerator WaitForTutorial()
+    public void PreviousPage()
+    {
+        if (currentPage > 0)
+        {
+            menus[currentPage].SetActive(false);
+            currentPage--;
+            menus[currentPage].SetActive(true);
+        }
+
+        if (currentPage == menus.Length - 2)
+        {
+            StopAllCoroutines();
+        }
+    }
+
+    IEnumerator StartGame()
+    {
+        PlayerSaving.hasCompletedTutorial = true;
+        PlayerSaving.SavePlayer();
+        yield return new WaitForSeconds(0.5f);
+        mainMenu.StartLevel(1);
+    }
+
+    IEnumerator ActivateStartLevelButton()
    {
        yield return new WaitForSeconds(4.0f);
-        if(!pressedBack)
-        {
-            level1.interactable = true;
-        }
-    }
-
-    public void backButton()
-    {
-        pressedBack = true;
-    }
-
-    public void nextButton()
-    {
-        pressedBack = false;
+        button.interactable = true;
    }
 }
--- a/Assets/game/Scripts/UI_start/LevelButtons.cs
+++ b/Assets/game/Scripts/UI_start/LevelButtons.cs
@ -21,8 +21,8 @@ public class LevelButtons : MonoBehaviour
        }
        mainMenu = FindObjectOfType<MainMenu>().GetComponent<MainMenu>();

-        PlayerSaving.LoadingPlayer = true;
-        level = PlayerSaving.levels;
+        PlayerSaving.LoadPlayer();
+        level = PlayerSaving.level;

        InitializeButtonListeners();
        UpdateButtons();
@ -52,7 +52,7 @@ public class LevelButtons : MonoBehaviour
        {
            if (data.button.interactable)
            {
-                data.button.onClick.AddListener(() => mainMenu.StartLevels(data.level));
+                data.button.onClick.AddListener(() => mainMenu.StartLevel(data.level));
            }
        }
    }
--- a/Assets/game/Scripts/UI_start/MainMenu.cs
+++ b/Assets/game/Scripts/UI_start/MainMenu.cs
@ -3,13 +3,13 @@ using UnityEngine.SceneManagement;

 public class MainMenu : MonoBehaviour {

-	public string[] scenes = {"Start", "LevelSelect", "levelTutorial", "level1", "level2", "level3", "level4", "level5", "level6", "level7", "level8", "level9", "level10", "level11", "level12", "level13", "level14", "level15", "level16", "level17", "level18", "level19", "level20", "bonus", "About"};
+	private string[] scenes = {"MarcPresents", "Start", "LevelSelect", "levelTutorial", "level1", "level2", "level3", "level4", "level5", "level6", "level7", "level8", "level9", "level10", "level11", "level12", "level13", "level14", "level15", "level16", "level17", "level18", "level19", "level20", "bonus", "About"};

 	public GameObject[] standardUI;
 	public GameObject[] secondUI;
 	public GameObject[] changeWhenEnabledUI;
 	public GameObject[] changeWhenDisabledUI;
-	public static int Tutorial;
+	public static bool tutorial;

 	public SceneFader sceneFader;

@ -17,31 +17,32 @@ public class MainMenu : MonoBehaviour {

 	void Awake()
 	{
-		PlayerSaving.LoadingPlayer = true;
-		Tutorial = PlayerSaving.tutorial;
+		//PlayerSaving.LoadPlayer();
+		tutorial = PlayerSaving.hasCompletedTutorial;
 	}

 	public void StartScene()
-	{
-		sceneFader.FadeTo(scenes[0]);
-		ExitLevel = true;
-	}
-
-	public void LevelSelect()
 	{
 		sceneFader.FadeTo(scenes[1]);
 		ExitLevel = true;
 	}

-	public void StartLevels(int level)
-	{
-		if (level == 1 && Tutorial == 0)
+	public void LevelSelect()
 	{
 		sceneFader.FadeTo(scenes[2]);
+		ExitLevel = true;
+	}
+
+	public void StartLevel(int level)
+	{
+		tutorial = PlayerSaving.hasCompletedTutorial;
+		if (level == 1 && !tutorial)
+		{
+			sceneFader.FadeTo(scenes[3]);
 			ExitLevel = false;
 			return;
 		}
-		level += 2;
+		level += 3;
 		sceneFader.FadeTo(scenes[level]);
 		ExitLevel = false;
 	}
--- a/Assets/game/Scripts/UI_start/levelTutorial.cs
+++ b/Assets/game/Scripts/UI_start/levelTutorial.cs
@ -1,19 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-public class levelTutorial : MonoBehaviour
-{
-    public string level1 = "level1";
-
-    public SceneFader sceneFader;
-
-    public void StartLevel1()
-    {
-        PlayerSaving.tutorial = 1;
-        PlayerSaving.SavingPlayer = true;
-        sceneFader.FadeTo(level1);
-		MainMenu.ExitLevel = false;
-    }
-}
--- a/Assets/game/Scripts/UI_start/levelTutorial.cs.meta
+++ b/Assets/game/Scripts/UI_start/levelTutorial.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: caa2afd4c3425f740aed46f2905bac07
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/game/player/scripts/PlayerHealth.cs
+++ b/Assets/game/player/scripts/PlayerHealth.cs
@ -304,22 +304,22 @@ public class PlayerHealth : MonoBehaviour
 		if (SC_2DCoin.totalCoins > 0 && health <= 0)
        {
            // Subtract coins based on the level
-            if (Endlevel.LevelForCoinBool <= 5)
+            if (PlayerSaving.level <= 5)
            {
                SC_2DCoin.totalCoins -= 5;
                minus = true;
            }
-            else if (Endlevel.LevelForCoinBool <= 9 && Endlevel.LevelForCoinBool >= 6)
+            else if (PlayerSaving.level <= 9 && PlayerSaving.level >= 6)
            {
                SC_2DCoin.totalCoins -= 10;
                minus = true;
            }
-            else if (Endlevel.LevelForCoinBool <= 15 && Endlevel.LevelForCoinBool >= 10)
+            else if (PlayerSaving.level <= 15 && PlayerSaving.level >= 10)
            {
                SC_2DCoin.totalCoins -= 15;
                minus = true;
            }
-            else if (Endlevel.LevelForCoinBool <= 20 && Endlevel.LevelForCoinBool >= 16)
+            else if (PlayerSaving.level <= 20 && PlayerSaving.level >= 16)
            {
                SC_2DCoin.totalCoins -= 20;
                minus = true;
@ -332,9 +332,9 @@ public class PlayerHealth : MonoBehaviour
            }

            // Save the updated coin count
-            PlayerSaving.savedCoins = SC_2DCoin.totalCoins;
-            PlayerSaving.SavingPlayer = true;
-            Debug.Log("Saved " + PlayerSaving.savedCoins);
+            PlayerSaving.coins = SC_2DCoin.totalCoins;
+            PlayerSaving.SavePlayer();
+            Debug.Log("Saved " + PlayerSaving.coins);
        }
 		SoundBar.SceneReloaded = true;
 		SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex);
--- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
+++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
@ -20,12 +20,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 30
-    width: 1440
-    height: 767
+    width: 1536
+    height: 730.8
  m_MinSize: {x: 300, y: 200}
  m_MaxSize: {x: 24288, y: 16192}
  vertical: 0
-  controlID: -1
+  controlID: 137
 --- !u!114 &2
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -42,14 +42,14 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Game
-    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 467
-    width: 605
-    height: 352
+    y: 448
+    width: 645.4
+    height: 335.4
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -61,7 +61,7 @@ MonoBehaviour:
  m_ShowGizmos: 0
  m_TargetDisplay: 0
  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 605, y: 331}
+  m_TargetSize: {x: 806.75, y: 393}
  m_TextureFilterMode: 0
  m_TextureHideFlags: 61
  m_RenderIMGUI: 1
@ -76,10 +76,10 @@ MonoBehaviour:
    m_VRangeLocked: 0
    hZoomLockedByDefault: 0
    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -302.5
-    m_HBaseRangeMax: 302.5
-    m_VBaseRangeMin: -165.5
-    m_VBaseRangeMax: 165.5
+    m_HBaseRangeMin: -322.7
+    m_HBaseRangeMax: 322.7
+    m_VBaseRangeMin: -157.2
+    m_VBaseRangeMax: 157.2
    m_HAllowExceedBaseRangeMin: 1
    m_HAllowExceedBaseRangeMax: 1
    m_VAllowExceedBaseRangeMin: 1
@ -88,7 +88,7 @@ MonoBehaviour:
    m_HSlider: 0
    m_VSlider: 0
    m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
+    m_EnableMouseInput: 1
    m_EnableSliderZoomHorizontal: 0
    m_EnableSliderZoomVertical: 0
    m_UniformScale: 1
@ -97,26 +97,26 @@ MonoBehaviour:
      serializedVersion: 2
      x: 0
      y: 21
-      width: 605
-      height: 331
+      width: 645.4
+      height: 314.4
    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 302.5, y: 165.5}
+    m_Translation: {x: 322.7, y: 157.2}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
    m_MarginBottom: 0
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
-      x: -302.5
-      y: -165.5
-      width: 605
-      height: 331
+      x: -322.7
+      y: -157.2
+      width: 645.4
+      height: 314.4
    m_MinimalGUI: 1
  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 605, y: 352}
+  m_LastWindowPixelSize: {x: 806.75, y: 419.25}
  m_ClearInEditMode: 1
  m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000001000000000000
+  m_LowResolutionForAspectRatios: 00000001000000000000
  m_XRRenderMode: 0
  m_RenderTexture: {fileID: 0}
 --- !u!114 &3
@ -138,12 +138,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 606
-    height: 767
+    width: 646.4
+    height: 730.8
  m_MinSize: {x: 100, y: 200}
  m_MaxSize: {x: 8096, y: 16192}
  vertical: 1
-  controlID: -1
+  controlID: 138
 --- !u!114 &4
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -161,8 +161,8 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 606
-    height: 394
+    width: 646.4
+    height: 374.4
  m_MinSize: {x: 201, y: 221}
  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 5}
@ -187,14 +187,14 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Scene
-    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 73
-    width: 605
-    height: 373
+    y: 73.6
+    width: 645.4
+    height: 353.4
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -205,7 +205,7 @@ MonoBehaviour:
      collapsed: 0
      displayed: 1
      snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: -101, y: -26}
+      snapOffsetDelta: {x: -100, y: -25.600006}
      snapCorner: 3
      id: Tool Settings
      index: 0
@ -419,9 +419,9 @@ MonoBehaviour:
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: 170.84305, y: 7.3114862, z: -1.2178346}
+    m_Target: {x: 282.73828, y: 122.85923, z: -3.3159134}
    speed: 2
-    m_Value: {x: 170.84305, y: 7.3114862, z: -1.2178346}
+    m_Value: {x: 282.73828, y: 122.85923, z: -3.3159134}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@ -472,9 +472,9 @@ MonoBehaviour:
    speed: 2
    m_Value: {x: 0, y: 0, z: 0, w: 1}
  m_Size:
-    m_Target: 54.449482
+    m_Target: 249.90207
    speed: 2
-    m_Value: 54.449482
+    m_Value: 249.90207
  m_Ortho:
    m_Target: 1
    speed: 2
@ -515,14 +515,14 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Animator
-    m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 73
-    width: 605
-    height: 373
+    y: 73.6
+    width: 645.4
+    height: 353.4
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -636,14 +636,14 @@ MonoBehaviour:
      e31: 0
      e32: 0
      e33: 1
-    - e00: 0.32395834
+    - e00: 0.6596369
      e01: 0
      e02: 0
-      e03: 2.041687
+      e03: -109.53493
      e10: 0
-      e11: 0.32395834
+      e11: 0.6596369
      e12: 0
-      e13: 149.1823
+      e13: 126.76031
      e20: 0
      e21: 0
      e22: 1
@ -685,9 +685,9 @@ MonoBehaviour:
      e32: 0
      e33: 1
  m_PreviewAnimator: {fileID: 0}
-  m_AnimatorController: {fileID: 9100000, guid: 0dca35214bd7a3a469d10a7210211701, type: 2}
+  m_AnimatorController: {fileID: 9100000, guid: 6f62eb45989cd644f9ef12c806a26e11, type: 2}
  m_BreadCrumbs:
-  - m_Target: {fileID: 3999337838961725336, guid: 0dca35214bd7a3a469d10a7210211701, type: 2}
+  - m_Target: {fileID: 1086148805416401830, guid: 6f62eb45989cd644f9ef12c806a26e11, type: 2}
    m_ScrollPosition: {x: 0, y: 0}
  stateMachineGraph: {fileID: 0}
  stateMachineGraphGUI: {fileID: 0}
@ -716,9 +716,9 @@ MonoBehaviour:
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 394
-    width: 606
-    height: 373
+    y: 374.4
+    width: 646.4
+    height: 356.4
  m_MinSize: {x: 201, y: 221}
  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 2}
@ -744,14 +744,14 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Console
-    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 467
-    width: 605
-    height: 352
+    y: 448
+    width: 645.4
+    height: 335.4
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -773,14 +773,14 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Animation
-    m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 467
-    width: 605
-    height: 352
+    y: 448
+    width: 645.4
+    height: 335.4
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -788,7 +788,7 @@ MonoBehaviour:
    m_OverlaysVisible: 1
  m_LockTracker:
    m_IsLocked: 0
-  m_LastSelectedObjectID: 26266
+  m_LastSelectedObjectID: 115384
 --- !u!114 &10
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -806,14 +806,14 @@ MonoBehaviour:
  - {fileID: 13}
  m_Position:
    serializedVersion: 2
-    x: 606
+    x: 646.4
    y: 0
-    width: 501
-    height: 767
+    width: 534.4
+    height: 730.8
  m_MinSize: {x: 100, y: 200}
  m_MaxSize: {x: 8096, y: 16192}
  vertical: 1
-  controlID: 110
+  controlID: 84
 --- !u!114 &11
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -831,8 +831,8 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 501
-    height: 469
+    width: 534.4
+    height: 446.4
  m_MinSize: {x: 202, y: 221}
  m_MaxSize: {x: 4002, y: 4021}
  m_ActualView: {fileID: 12}
@ -856,14 +856,14 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Hierarchy
-    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 606
-    y: 73
-    width: 499
-    height: 448
+    x: 646.4
+    y: 73.6
+    width: 532.4
+    height: 425.4
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -874,7 +874,7 @@ MonoBehaviour:
      scrollPos: {x: 0, y: 0}
      m_SelectedIDs: 
      m_LastClickedID: 0
-      m_ExpandedIDs: 
+      m_ExpandedIDs: dae2ffff52e8ffff06fbffff08fbffff0cfbffff0efbffff2e6a0000846a0000a86a00002ead000062ad00007ead00004ebb000082bb00009ebb0000a0bc0000d4bc0000f0bc0000d8c301008ac4010042c50100
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@ -914,9 +914,9 @@ MonoBehaviour:
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 469
-    width: 501
-    height: 298
+    y: 446.4
+    width: 534.4
+    height: 284.4
  m_MinSize: {x: 232, y: 271}
  m_MaxSize: {x: 10002, y: 10021}
  m_ActualView: {fileID: 14}
@ -940,14 +940,14 @@ MonoBehaviour:
  m_MaxSize: {x: 10000, y: 10000}
  m_TitleContent:
    m_Text: Project
-    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 606
-    y: 542
-    width: 499
-    height: 277
+    x: 646.4
+    y: 520
+    width: 532.4
+    height: 263.4
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -964,23 +964,23 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets/game/enemy/Kimberley/Scripts
+    - Assets/game/Scripts/UI
    m_Globs: []
    m_OriginalText: 
    m_FilterByTypeIntersection: 0
  m_ViewMode: 1
  m_StartGridSize: 64
  m_LastFolders:
-  - Assets/game/enemy/Kimberley/Scripts
+  - Assets/game/Scripts/UI
  m_LastFoldersGridSize: 64
-  m_LastProjectPath: C:\Users\Marc Tismonar\unity\Shanti Manti
+  m_LastProjectPath: C:\Users\MarcUs7\unity\ShantiManti
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
-    scrollPos: {x: 0, y: 879}
-    m_SelectedIDs: 70690000
-    m_LastClickedID: 26992
-    m_ExpandedIDs: 00000000ba680000bc680000be680000c0680000c2680000c4680000c6680000c8680000ca680000cc680000ce680000d0680000d2680000d4680000d6680000d8680000da680000dc680000de680000e0680000e2680000e4680000e6680000e8680000ea680000ec680000ee680000f0680000f2680000f4680000f6680000f8680000fa680000fc680000fe68000000690000026900000469000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 172.6}
+    m_SelectedIDs: 1a690000
+    m_LastClickedID: 26906
+    m_ExpandedIDs: 00000000ba680000ce6800001c6900002a69000000ca9a3bffffff7f
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -1008,7 +1008,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 00000000ba680000bc680000be680000c0680000c2680000c4680000c6680000c8680000ca680000cc680000ce680000d0680000d2680000d4680000d6680000d8680000da680000dc680000de680000e0680000e2680000e4680000e6680000e8680000ea680000ec680000ee680000f0680000f2680000f4680000f6680000f8680000fa680000fc680000fe680000006900000269000004690000
+    m_ExpandedIDs: 00000000ba680000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -1035,7 +1035,7 @@ MonoBehaviour:
  m_ListAreaState:
    m_SelectedInstanceIDs: 
    m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
    m_ExpandedInstanceIDs: 
    m_RenameOverlay:
      m_UserAcceptedRename: 0
@ -1079,10 +1079,10 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1107
+    x: 1180.8
    y: 0
-    width: 333
-    height: 767
+    width: 355.19995
+    height: 730.8
  m_MinSize: {x: 276, y: 71}
  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 16}
@ -1106,14 +1106,14 @@ MonoBehaviour:
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Inspector
-    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1107
-    y: 73
-    width: 332
-    height: 746
+    x: 1180.8
+    y: 73.6
+    width: 354.19995
+    height: 709.8
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
--- a/UserSettings/Layouts/default-2021.dwlt
+++ b/UserSettings/Layouts/default-2021.dwlt
@ -19,7 +19,7 @@ MonoBehaviour:
    width: 1536
    height: 780.8
  m_ShowMode: 4
-  m_Title: Hierarchy
+  m_Title: Game
  m_RootView: {fileID: 2}
  m_MinSize: {x: 875, y: 300}
  m_MaxSize: {x: 10000, y: 10000}
@ -120,7 +120,7 @@ MonoBehaviour:
  m_MinSize: {x: 300, y: 200}
  m_MaxSize: {x: 24288, y: 16192}
  vertical: 0
-  controlID: 56
+  controlID: 36
 --- !u!114 &6
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -140,12 +140,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 646.4
+    width: 644
    height: 730.8
  m_MinSize: {x: 100, y: 200}
  m_MaxSize: {x: 8096, y: 16192}
  vertical: 1
-  controlID: 42
+  controlID: 137
 --- !u!114 &7
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -163,10 +163,10 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 646.4
+    width: 644
    height: 374.4
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 14}
  m_Panes:
  - {fileID: 14}
@ -190,10 +190,10 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 374.4
-    width: 646.4
+    width: 644
    height: 356.4
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 13}
  m_Panes:
  - {fileID: 13}
@ -218,14 +218,14 @@ MonoBehaviour:
  - {fileID: 11}
  m_Position:
    serializedVersion: 2
-    x: 646.4
+    x: 644
    y: 0
-    width: 534.4
+    width: 536.80005
    height: 730.8
  m_MinSize: {x: 100, y: 200}
  m_MaxSize: {x: 8096, y: 16192}
  vertical: 1
-  controlID: 57
+  controlID: 37
 --- !u!114 &10
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -243,7 +243,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 534.4
+    width: 536.80005
    height: 446.4
  m_MinSize: {x: 202, y: 221}
  m_MaxSize: {x: 4002, y: 4021}
@ -269,7 +269,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 446.4
-    width: 534.4
+    width: 536.80005
    height: 284.4
  m_MinSize: {x: 232, y: 271}
  m_MaxSize: {x: 10002, y: 10021}
@ -326,7 +326,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 448
-    width: 645.4
+    width: 643
    height: 335.4
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
@ -339,7 +339,7 @@ MonoBehaviour:
  m_ShowGizmos: 0
  m_TargetDisplay: 0
  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 806.75, y: 393}
+  m_TargetSize: {x: 803.75, y: 393}
  m_TextureFilterMode: 0
  m_TextureHideFlags: 61
  m_RenderIMGUI: 1
@ -354,8 +354,8 @@ MonoBehaviour:
    m_VRangeLocked: 0
    hZoomLockedByDefault: 0
    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -322.7
-    m_HBaseRangeMax: 322.7
+    m_HBaseRangeMin: -321.5
+    m_HBaseRangeMax: 321.5
    m_VBaseRangeMin: -157.2
    m_VBaseRangeMax: 157.2
    m_HAllowExceedBaseRangeMin: 1
@ -375,23 +375,23 @@ MonoBehaviour:
      serializedVersion: 2
      x: 0
      y: 21
-      width: 645.4
+      width: 643
      height: 314.4
    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 322.7, y: 157.2}
+    m_Translation: {x: 321.5, y: 157.2}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
    m_MarginBottom: 0
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
-      x: -322.7
+      x: -321.5
      y: -157.2
-      width: 645.4
+      width: 643
      height: 314.4
    m_MinimalGUI: 1
  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 806.75, y: 419.25}
+  m_LastWindowPixelSize: {x: 803.75, y: 419.25}
  m_ClearInEditMode: 1
  m_NoCameraWarning: 1
  m_LowResolutionForAspectRatios: 00000001000000000000
@ -419,7 +419,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 73.6
-    width: 645.4
+    width: 643
    height: 353.4
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
@ -948,7 +948,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 448
-    width: 645.4
+    width: 643
    height: 335.4
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
@ -986,7 +986,7 @@ MonoBehaviour:
    m_OverlaysVisible: 1
  m_LockTracker:
    m_IsLocked: 0
-  m_LastSelectedObjectID: -17232
+  m_LastSelectedObjectID: 115384
 --- !u!114 &18
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -1007,9 +1007,9 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 646.4
+    x: 644
    y: 73.6
-    width: 532.4
+    width: 534.80005
    height: 425.4
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
@ -1019,9 +1019,9 @@ MonoBehaviour:
  m_SceneHierarchy:
    m_TreeViewState:
      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 04fbffff
-      m_LastClickedID: -1276
-      m_ExpandedIDs: b0bcffffb4d2ffffdefaffff06fbffff0afbffff0cfbffff0efbffff9c670000286e0000bc000100ce120100b0130100e01b0100283c010038410100cc410100084201002c480100
+      m_SelectedIDs: 
+      m_LastClickedID: 0
+      m_ExpandedIDs: 06fbffff
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@ -1065,9 +1065,9 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 646.4
+    x: 644
    y: 520
-    width: 532.4
+    width: 534.80005
    height: 263.4
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
@ -1098,10 +1098,10 @@ MonoBehaviour:
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
-    scrollPos: {x: 0, y: 124.600006}
-    m_SelectedIDs: 0a700000
-    m_LastClickedID: 28682
-    m_ExpandedIDs: 00000000d66a0000ea6a0000506b000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 172.6}
+    m_SelectedIDs: 2c6d0000
+    m_LastClickedID: 27948
+    m_ExpandedIDs: 00000000cc6c0000e06c00002e6d000000ca9a3bffffff7f
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -1129,7 +1129,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 00000000d66a0000
+    m_ExpandedIDs: 00000000cc6c0000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: