From 2ba8b4d1b510a115426c811516052baf61f214ce Mon Sep 17 00:00:00 2001 From: jee7 Date: Sat, 7 Feb 2026 15:11:12 +0200 Subject: [PATCH 1/4] Moved the ConfigManager script to the Scripts folder and ConfigManager prefab to the Prefabs folder. --- Assets/_PROJECT/Prefabs/Managers.meta | 8 ++++++++ .../_PROJECT/{ => Prefabs}/Managers/ConfigManager.prefab | 0 .../{ => Prefabs}/Managers/ConfigManager.prefab.meta | 0 Assets/_PROJECT/{ => Scripts}/Managers.meta | 0 Assets/_PROJECT/{ => Scripts}/Managers/ConfigManager.cs | 0 .../_PROJECT/{ => Scripts}/Managers/ConfigManager.cs.meta | 0 6 files changed, 8 insertions(+) create mode 100644 Assets/_PROJECT/Prefabs/Managers.meta rename Assets/_PROJECT/{ => Prefabs}/Managers/ConfigManager.prefab (100%) rename Assets/_PROJECT/{ => Prefabs}/Managers/ConfigManager.prefab.meta (100%) rename Assets/_PROJECT/{ => Scripts}/Managers.meta (100%) rename Assets/_PROJECT/{ => Scripts}/Managers/ConfigManager.cs (100%) rename Assets/_PROJECT/{ => Scripts}/Managers/ConfigManager.cs.meta (100%) 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 100% rename from Assets/_PROJECT/Managers/ConfigManager.cs rename to Assets/_PROJECT/Scripts/Managers/ConfigManager.cs 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 From 2f12ef4aff45e8ead9bb089347c3e5d78eb21960 Mon Sep 17 00:00:00 2001 From: jee7 Date: Sat, 7 Feb 2026 15:13:03 +0200 Subject: [PATCH 2/4] Formatting fix. C# functions start with a uppercase letter. --- .../Prefabs/XROrigin Scripts/SliderToVCA.cs | 12 ++++++------ Assets/_PROJECT/Scripts/Managers/ConfigManager.cs | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) 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/Scripts/Managers/ConfigManager.cs b/Assets/_PROJECT/Scripts/Managers/ConfigManager.cs index f381aad5..d22ff178 100644 --- a/Assets/_PROJECT/Scripts/Managers/ConfigManager.cs +++ b/Assets/_PROJECT/Scripts/Managers/ConfigManager.cs @@ -129,7 +129,7 @@ public class ConfigManager : MonoBehaviour SaveConfigToFile(); } - public float getVolumeMaster() + public float GetVolumeMaster() { return currentConfig.volumeMaster; @@ -140,7 +140,7 @@ public class ConfigManager : MonoBehaviour SaveConfigToFile(); } - public float getVolumeAmbient() + public float GetVolumeAmbient() { return currentConfig.volumeAmbient; @@ -151,7 +151,7 @@ public class ConfigManager : MonoBehaviour SaveConfigToFile(); } - public float getVolumeMusic() + public float GetVolumeMusic() { return currentConfig.volumeMusic; @@ -162,7 +162,7 @@ public class ConfigManager : MonoBehaviour SaveConfigToFile(); } - public float getVolumeSFX() + public float GetVolumeSFX() { return currentConfig.volumeSFX; @@ -173,7 +173,7 @@ public class ConfigManager : MonoBehaviour SaveConfigToFile(); } - public float getVolumeUI() + public float GetVolumeUI() { return currentConfig.volumeUI; @@ -184,7 +184,7 @@ public class ConfigManager : MonoBehaviour SaveConfigToFile(); } - public float getVolumeVO() + public float GetVolumeVO() { return currentConfig.volumeVO; From 95ea7a2625f865be859bd8a8934ceda4c03f016f Mon Sep 17 00:00:00 2001 From: jee7 Date: Sat, 7 Feb 2026 15:14:26 +0200 Subject: [PATCH 3/4] Removed dead code. File.WriteAllText and File.ReadAllText seem to work fine (no need for file streaming). --- Assets/_PROJECT/Scripts/Managers/ConfigManager.cs | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/Assets/_PROJECT/Scripts/Managers/ConfigManager.cs b/Assets/_PROJECT/Scripts/Managers/ConfigManager.cs index d22ff178..7b999fdf 100644 --- a/Assets/_PROJECT/Scripts/Managers/ConfigManager.cs +++ b/Assets/_PROJECT/Scripts/Managers/ConfigManager.cs @@ -57,14 +57,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); } @@ -82,12 +76,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; } From 449953b39332068da9adc3b5e0045c1f51e8804d Mon Sep 17 00:00:00 2001 From: jee7 Date: Sat, 7 Feb 2026 16:45:20 +0200 Subject: [PATCH 4/4] Removed unused namespaces from ConfigManager. --- Assets/_PROJECT/Scripts/Managers/ConfigManager.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Assets/_PROJECT/Scripts/Managers/ConfigManager.cs b/Assets/_PROJECT/Scripts/Managers/ConfigManager.cs index 7b999fdf..11a115be 100644 --- a/Assets/_PROJECT/Scripts/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 {