diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs index 3100cf2d..b6000402 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs @@ -35,17 +35,17 @@ public class SliderToVCA : AbstractValueController switch (target) { case VCATarget.Master: - return ConfigManager.instance.getVolumeMaster(); + return ConfigManager.instance.GetVolumeMaster(); case VCATarget.Ambiences: - return ConfigManager.instance.getVolumeAmbient(); + return ConfigManager.instance.GetVolumeAmbient(); case VCATarget.Music: - return ConfigManager.instance.getVolumeMusic(); + return ConfigManager.instance.GetVolumeMusic(); case VCATarget.SFX: - return ConfigManager.instance.getVolumeSFX(); + return ConfigManager.instance.GetVolumeSFX(); case VCATarget.UI: - return ConfigManager.instance.getVolumeUI(); + return ConfigManager.instance.GetVolumeUI(); case VCATarget.Voiceovers: - return ConfigManager.instance.getVolumeVO(); + return ConfigManager.instance.GetVolumeVO(); default: return 0.5f; } diff --git a/Assets/_PROJECT/Prefabs/Managers.meta b/Assets/_PROJECT/Prefabs/Managers.meta new file mode 100644 index 00000000..5136921a --- /dev/null +++ b/Assets/_PROJECT/Prefabs/Managers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 963bbf549b806584b8b059c31e469ac5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Managers/ConfigManager.prefab b/Assets/_PROJECT/Prefabs/Managers/ConfigManager.prefab similarity index 100% rename from Assets/_PROJECT/Managers/ConfigManager.prefab rename to Assets/_PROJECT/Prefabs/Managers/ConfigManager.prefab diff --git a/Assets/_PROJECT/Managers/ConfigManager.prefab.meta b/Assets/_PROJECT/Prefabs/Managers/ConfigManager.prefab.meta similarity index 100% rename from Assets/_PROJECT/Managers/ConfigManager.prefab.meta rename to Assets/_PROJECT/Prefabs/Managers/ConfigManager.prefab.meta diff --git a/Assets/_PROJECT/Managers.meta b/Assets/_PROJECT/Scripts/Managers.meta similarity index 100% rename from Assets/_PROJECT/Managers.meta rename to Assets/_PROJECT/Scripts/Managers.meta diff --git a/Assets/_PROJECT/Managers/ConfigManager.cs b/Assets/_PROJECT/Scripts/Managers/ConfigManager.cs similarity index 81% rename from Assets/_PROJECT/Managers/ConfigManager.cs rename to Assets/_PROJECT/Scripts/Managers/ConfigManager.cs index dd081ca8..3a310871 100644 --- a/Assets/_PROJECT/Managers/ConfigManager.cs +++ b/Assets/_PROJECT/Scripts/Managers/ConfigManager.cs @@ -1,11 +1,5 @@ -using FishNet.Component.Spawning; -using System.Collections; -using System.Collections.Generic; using System.IO; -using System.Runtime.Serialization.Formatters.Binary; using UnityEngine; -using Valve.Newtonsoft.Json; -using static ConfigManager; public class ConfigManager : MonoBehaviour { @@ -59,14 +53,8 @@ public class ConfigManager : MonoBehaviour fileStream = File.Create(configFilePath); fileStream.Close(); - } else - { - //fileStream = new FileStream(configFilePath, FileMode.Open, FileAccess.Write, FileShare.ReadWrite); } - //StreamWriter writer = new StreamWriter(fileStream); - //writer.Write(JsonUtility.ToJson(currentConfig)); - //writer.Close(); - //fileStream.Close(); + string json = JsonUtility.ToJson(currentConfig, true); File.WriteAllText(configFilePath, json); } @@ -84,12 +72,6 @@ public class ConfigManager : MonoBehaviour } } Config config = JsonUtility.FromJson(File.ReadAllText(configFilePath)); - - /*FileStream fileStream = new FileStream(configFilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); - StreamReader reader = new StreamReader(fileStream); - Config config = JsonUtility.FromJson(reader.ReadToEnd()); - reader.Close(); - fileStream.Close();*/ return config; } @@ -131,7 +113,7 @@ public class ConfigManager : MonoBehaviour SaveConfigToFile(); } - public float getVolumeMaster() + public float GetVolumeMaster() { return currentConfig.volumeMaster; @@ -142,7 +124,7 @@ public class ConfigManager : MonoBehaviour SaveConfigToFile(); } - public float getVolumeAmbient() + public float GetVolumeAmbient() { return currentConfig.volumeAmbient; @@ -153,7 +135,7 @@ public class ConfigManager : MonoBehaviour SaveConfigToFile(); } - public float getVolumeMusic() + public float GetVolumeMusic() { return currentConfig.volumeMusic; @@ -164,7 +146,7 @@ public class ConfigManager : MonoBehaviour SaveConfigToFile(); } - public float getVolumeSFX() + public float GetVolumeSFX() { return currentConfig.volumeSFX; @@ -175,7 +157,7 @@ public class ConfigManager : MonoBehaviour SaveConfigToFile(); } - public float getVolumeUI() + public float GetVolumeUI() { return currentConfig.volumeUI; @@ -186,7 +168,7 @@ public class ConfigManager : MonoBehaviour SaveConfigToFile(); } - public float getVolumeVO() + public float GetVolumeVO() { return currentConfig.volumeVO; diff --git a/Assets/_PROJECT/Managers/ConfigManager.cs.meta b/Assets/_PROJECT/Scripts/Managers/ConfigManager.cs.meta similarity index 100% rename from Assets/_PROJECT/Managers/ConfigManager.cs.meta rename to Assets/_PROJECT/Scripts/Managers/ConfigManager.cs.meta