5 Commits

8 changed files with 22 additions and 32 deletions

View File

@@ -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;
}

View File

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

View File

@@ -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
{
@@ -57,14 +51,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 +70,6 @@ public class ConfigManager : MonoBehaviour
}
}
Config config = JsonUtility.FromJson<Config>(File.ReadAllText(configFilePath));
/*FileStream fileStream = new FileStream(configFilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
StreamReader reader = new StreamReader(fileStream);
Config config = JsonUtility.FromJson<Config>(reader.ReadToEnd());
reader.Close();
fileStream.Close();*/
return config;
}
@@ -129,7 +111,7 @@ public class ConfigManager : MonoBehaviour
SaveConfigToFile();
}
public float getVolumeMaster()
public float GetVolumeMaster()
{
return currentConfig.volumeMaster;
@@ -140,7 +122,7 @@ public class ConfigManager : MonoBehaviour
SaveConfigToFile();
}
public float getVolumeAmbient()
public float GetVolumeAmbient()
{
return currentConfig.volumeAmbient;
@@ -151,7 +133,7 @@ public class ConfigManager : MonoBehaviour
SaveConfigToFile();
}
public float getVolumeMusic()
public float GetVolumeMusic()
{
return currentConfig.volumeMusic;
@@ -162,7 +144,7 @@ public class ConfigManager : MonoBehaviour
SaveConfigToFile();
}
public float getVolumeSFX()
public float GetVolumeSFX()
{
return currentConfig.volumeSFX;
@@ -173,7 +155,7 @@ public class ConfigManager : MonoBehaviour
SaveConfigToFile();
}
public float getVolumeUI()
public float GetVolumeUI()
{
return currentConfig.volumeUI;
@@ -184,7 +166,7 @@ public class ConfigManager : MonoBehaviour
SaveConfigToFile();
}
public float getVolumeVO()
public float GetVolumeVO()
{
return currentConfig.volumeVO;

View File

@@ -66,7 +66,7 @@ Technical sound design.
**Raimond Tunnel**<br/>
Project management, visual design.
Developed in the [Computer Graphcis and Virtual Reality Study Lab](https://cgvr.cs.ut.ee/) of the [Institute of Computer Science, University of Tartu](https://cs.ut.ee).
Developed in the [Computer Graphics and Virtual Reality Study Lab](https://cgvr.cs.ut.ee/) of the [Institute of Computer Science, University of Tartu](https://cs.ut.ee).
### Used Attributions