Compare commits
3 Commits
30c0652453
...
95ea7a2625
| Author | SHA1 | Date | |
|---|---|---|---|
| 95ea7a2625 | |||
| 2f12ef4aff | |||
| 2ba8b4d1b5 |
@@ -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;
|
||||
}
|
||||
|
||||
8
Assets/_PROJECT/Prefabs/Managers.meta
Normal file
8
Assets/_PROJECT/Prefabs/Managers.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 963bbf549b806584b8b059c31e469ac5
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -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<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 +117,7 @@ public class ConfigManager : MonoBehaviour
|
||||
SaveConfigToFile();
|
||||
}
|
||||
|
||||
public float getVolumeMaster()
|
||||
public float GetVolumeMaster()
|
||||
{
|
||||
|
||||
return currentConfig.volumeMaster;
|
||||
@@ -140,7 +128,7 @@ public class ConfigManager : MonoBehaviour
|
||||
SaveConfigToFile();
|
||||
}
|
||||
|
||||
public float getVolumeAmbient()
|
||||
public float GetVolumeAmbient()
|
||||
{
|
||||
|
||||
return currentConfig.volumeAmbient;
|
||||
@@ -151,7 +139,7 @@ public class ConfigManager : MonoBehaviour
|
||||
SaveConfigToFile();
|
||||
}
|
||||
|
||||
public float getVolumeMusic()
|
||||
public float GetVolumeMusic()
|
||||
{
|
||||
|
||||
return currentConfig.volumeMusic;
|
||||
@@ -162,7 +150,7 @@ public class ConfigManager : MonoBehaviour
|
||||
SaveConfigToFile();
|
||||
}
|
||||
|
||||
public float getVolumeSFX()
|
||||
public float GetVolumeSFX()
|
||||
{
|
||||
|
||||
return currentConfig.volumeSFX;
|
||||
@@ -173,7 +161,7 @@ public class ConfigManager : MonoBehaviour
|
||||
SaveConfigToFile();
|
||||
}
|
||||
|
||||
public float getVolumeUI()
|
||||
public float GetVolumeUI()
|
||||
{
|
||||
|
||||
return currentConfig.volumeUI;
|
||||
@@ -184,7 +172,7 @@ public class ConfigManager : MonoBehaviour
|
||||
SaveConfigToFile();
|
||||
}
|
||||
|
||||
public float getVolumeVO()
|
||||
public float GetVolumeVO()
|
||||
{
|
||||
|
||||
return currentConfig.volumeVO;
|
||||
Reference in New Issue
Block a user