organize scripts

Assets/GameManager.prefab

@@ -438,6 +438,7 @@ GameObject:
   - component: {fileID: 7681847596368765025}
   - component: {fileID: 4444498079052879519}
   - component: {fileID: 5173819118098093347}
+  - component: {fileID: 1410439939888368689}
   m_Layer: 0
   m_Name: GameManager
   m_TagString: Untagged
@@ -560,3 +561,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: Assembly-CSharp::PlayerManager
   CurrentToolIndex: 0
+--- !u!114 &1410439939888368689
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8685480739473632986}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ab14394efecbd6540af369ced75e81d0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::SoundSettingManager

Assets/MiniMapRenderTexture.renderTexture

@@ -0,0 +1,39 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!84 &8400000
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MiniMapRenderTexture
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 6
+  m_Width: 256
+  m_Height: 256
+  m_AntiAliasing: 1
+  m_MipCount: -1
+  m_DepthStencilFormat: 90
+  m_ColorFormat: 4
+  m_MipMap: 1
+  m_GenerateMips: 1
+  m_SRGB: 1
+  m_UseDynamicScale: 0
+  m_UseDynamicScaleExplicit: 0
+  m_BindMS: 0
+  m_EnableCompatibleFormat: 1
+  m_EnableRandomWrite: 0
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 0
+    m_MipBias: 0
+    m_WrapU: 1
+    m_WrapV: 1
+    m_WrapW: 1
+  m_Dimension: 2
+  m_VolumeDepth: 1
+  m_ShadowSamplingMode: 2

Assets/MiniMapRenderTexture.renderTexture.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 93d78654fc891634d9bbf8c77c58e435
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 8400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Management/GameManager.cs

@@ -14,7 +14,8 @@ public class GameManager : MonoBehaviour
     public PlayerManager PlayerManager { get; private set; }
     public Inventory Inventory { get; private set; }
     public Storybools Storybools { get; private set; }
-    public PauseMenu PauseMenu { get; private set; }
+    public MenuController MenuController { get; private set; }
+    public SoundSettingManager SoundSettingManager { get; private set; }
     public PlayerController PlayerController { get; private set; }
     public Image BlackScreen { get; private set; }
 
@@ -56,13 +57,15 @@ private void ReloadReferences()
         Instance.DialogueManager = GetComponent<DialogueManager>();
         Instance.DialogueManager.ReloadReferences();
 
-        Instance.PauseMenu = GameObject.FindWithTag("PauseMenu").GetComponent<PauseMenu>();
-        Instance.PauseMenu.ReloadReferences();
-        Instance.PauseMenu.gameObject.SetActive(false);
-
         Instance.Inventory = GetComponent<Inventory>();
         Instance.TimeManager = GetComponent<TimeManager>();
         Instance.PlayerManager = GetComponent<PlayerManager>();
+
+        Instance.SoundSettingManager = GetComponent<SoundSettingManager>();
+        Instance.SoundSettingManager.ReloadReferences();
+
+        Instance.MenuController = GameObject.FindWithTag("MenuController").GetComponent<MenuController>();
+        Instance.MenuController.HideAllScreens();
     }
 
     #region Map Load Handling

Assets/Scripts/Management/PlayerController.cs

@@ -50,14 +50,14 @@ void Update()
                 Time.timeScale = 0;
                 canUseTools = false;
                 hasControl = false;
-                GameManager.Instance.PauseMenu.gameObject.SetActive(true);
+                GameManager.Instance.MenuController.ShowScreen("Pause");
             }
             else
             {
                 Time.timeScale = 1;
                 canUseTools = true;
                 hasControl = true;
-                GameManager.Instance.PauseMenu.gameObject.SetActive(false);
+                GameManager.Instance.MenuController.HideAllScreens();
             }
 
             paused = !paused;

Assets/Scripts/Management/Questing/QuestRegistry.cs.meta

@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: -2
+  executionOrder: -501
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

Assets/Scripts/Management/SaveSystem.cs

@@ -14,6 +14,7 @@ public struct SaveData
         public InventorySaveData InventorySaveData;
         public TimeSaveData TimeSaveData;
         public PlayerSaveData PlayerSaveData;
+        public SoundSettingSaveData SoundSettingSaveData;
     }
 
     public static string SaveFileName()
@@ -61,6 +62,7 @@ private static void HandleSaveData()
         GameManager.Instance.TimeManager.SaveTime(ref _saveData.TimeSaveData);
         GameManager.Instance.PlayerManager.SavePlayerData(ref _saveData.PlayerSaveData);
         QuestRegistry.Instance.SaveQuestData(ref _saveData.QuestData);
+        GameManager.Instance.SoundSettingManager.SaveSoundSettingsData(ref _saveData.SoundSettingSaveData);
     }
 
     public static void Load()
@@ -101,5 +103,6 @@ public static void HandleLoadData()
         GameManager.Instance.TimeManager.LoadTime(_saveData.TimeSaveData);
         GameManager.Instance.PlayerManager.LoadPlayerData(_saveData.PlayerSaveData);
         QuestRegistry.Instance.LoadQuestData(_saveData.QuestData);
+        GameManager.Instance.SoundSettingManager.LoadSoundSettingsData(_saveData.SoundSettingSaveData);
     }
 }

Assets/Scripts/UI.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 83ac1cbbc254d804499b8f2508119340
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/MenuController.cs

@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+public class MenuController : MonoBehaviour
+{
+    public List<MenuScreen> screens;
+
+    public void ShowScreen(string screenName)
+    {
+        HideAllScreens();
+        
+        MenuScreen selScreen = screens.Find(x => x.screenName == screenName);
+        if (selScreen != null)
+        {
+            selScreen.Show();
+        }
+        else
+        {
+            throw new System.Exception("Screen name was not found in list of screens!");
+        }
+    }
+
+    public void HideAllScreens()
+    {
+        foreach (var screen in screens)
+        {
+            screen.Hide();
+        }
+    }
+}

Assets/Scripts/UI/MenuController.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 2289f767f0db35c459c4aae4d94b05c5

Assets/Scripts/UI/MenuScreen.cs

@@ -0,0 +1,16 @@
+using UnityEngine;
+
+public class MenuScreen : MonoBehaviour
+{
+    public string screenName;
+
+    public void Show()
+    {
+        gameObject.SetActive(true);
+    }
+
+    public void Hide()
+    {
+        gameObject.SetActive(false);
+    }
+}

Assets/Scripts/UI/MenuScreen.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3ba23d5f6c337c34caaac9a4d8aab191

Assets/Scripts/UI/MiniMapCam.cs

@@ -0,0 +1,25 @@
+using UnityEngine;
+
+public class MiniMapCam : MonoBehaviour
+{
+    Transform playerTransform;
+    Transform camHomeTransform;
+
+    void LateUpdate()
+    {
+        if (playerTransform == null)
+        {
+            playerTransform = GameManager.Instance.PlayerController.transform;
+        }
+        if (camHomeTransform == null)
+        {
+            camHomeTransform = GameManager.Instance.PlayerController.cameraController.playerCamHome;
+        }
+
+        Vector3 newPosition = playerTransform.position;
+        newPosition.y = transform.position.y;
+        transform.position = newPosition;
+
+        transform.rotation = Quaternion.Euler(90, camHomeTransform.eulerAngles.y, 0);
+    }
+}

Assets/Scripts/UI/MiniMapCam.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 64af30c5f595a904b9beb633d468cbff

Assets/Scripts/UI/PauseMenu.cs

@@ -7,19 +7,9 @@ public class PauseMenu : MonoBehaviour
     public Button DeleteSaveButton;
     public Button QuitButton;
 
-    public void ReloadReferences()
-    {
-        // pull all game objs here
-    }
-
     void Start()
     {
         SaveButton.onClick.AddListener(SaveSystem.Save);
         DeleteSaveButton.onClick.AddListener(SaveSystem.ClearSave);
     }
-
-    void Update()
-    {
-        
-    }
 }

Assets/Scripts/UI/SoundSettingManager.cs

@@ -0,0 +1,71 @@
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEngine.UI;
+
+public class SoundSettingManager : MonoBehaviour
+{
+    float masterVolume;
+    float musicVolume;
+    float sfxVolume;
+    
+    Slider MasterSlider;
+    Slider SfxSlider;
+    Slider MusicSlider;
+
+    private void Start()
+    {
+        MasterSlider.value = masterVolume;
+        SfxSlider.value = sfxVolume;
+        MusicSlider.value = musicVolume;
+    }
+
+    public void ReloadReferences()
+    {
+        MasterSlider = GameObject.FindWithTag("MasterSlider").GetComponent<Slider>();
+        SfxSlider = GameObject.FindWithTag("SfxSlider").GetComponent<Slider>();
+        MusicSlider = GameObject.FindWithTag("MusicSlider").GetComponent<Slider>();
+
+        MasterSlider.onValueChanged.AddListener(OnMasterValueChanged);
+        SfxSlider.onValueChanged.AddListener(OnSfxValueChanged);
+        MusicSlider.onValueChanged.AddListener(OnMusicValueChanged);
+    }
+
+    public void OnMasterValueChanged(float newValue)
+    {
+        masterVolume = newValue;
+    }
+
+    public void OnSfxValueChanged(float newValue)
+    {
+        sfxVolume = newValue;
+    }
+
+    public void OnMusicValueChanged(float newValue)
+    {
+        musicVolume = newValue;
+    }
+
+    #region Sound Settings Data Save/Load
+    public void SaveSoundSettingsData(ref SoundSettingSaveData data)
+    {
+        data.musicVolume = musicVolume;
+        data.sfxVolume = sfxVolume;
+        data.masterVolume = masterVolume;
+    }
+
+    public void LoadSoundSettingsData(SoundSettingSaveData data)
+    {
+       musicVolume = data.musicVolume;
+       sfxVolume = data.sfxVolume;
+       masterVolume = data.masterVolume;
+    }
+    #endregion
+}
+
+[System.Serializable]
+public struct SoundSettingSaveData
+{
+    public float musicVolume;
+    public float sfxVolume;
+    public float masterVolume;
+}

Assets/Scripts/UI/SoundSettingManager.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: ab14394efecbd6540af369ced75e81d0

Assets/Scripts/Utils.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6a123f00b4942dc4091340ce72744309
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/TagManager.asset

@@ -13,7 +13,10 @@ TagManager:
   - DialogItemText
   - ItemPickupText
   - DialogContainer
-  - PauseMenu
+  - MasterSlider
+  - SfxSlider
+  - MusicSlider
+  - MenuController
   layers:
   - Default
   - TransparentFX