Conjure/ludumdare50
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added volume control

Browse Source
This commit is contained in:
Soulaha Balde 2022-05-03 14:45:22 -04:00
parent 37fe0935fb
commit 56e91240c4
6 changed files with 2465 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/AudioMixer.mixer
View File

@ -54,6 +54,8 @@ AudioMixerController:
m_EnableSuspend: 1
m_UpdateMode: 0
m_ExposedParameters:
- guid: 62f505468629cc94787f4d287871bf5d
name: MasterVolume
- guid: b4c728c2be83f854eb4a09dfd2b94843
name: MusicVolume
- guid: eba37aa9cd8baf64fbdcd36b73b938aa

2242
Assets/Prefabs/MainMenu.prefab
View File

File diff suppressed because it is too large Load Diff

5
Assets/Prefabs/SceneStuff.prefab
View File

@ -284,7 +284,7 @@ AudioSource:
m_GameObject: {fileID: 2593205999227463710}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
OutputAudioMixerGroup: {fileID: -6704577497106887138, guid: 06ed4a4573fabf84580596dba3e0c116, type: 2}
m_audioClip: {fileID: 8300000, guid: a51c0c2435653b64cbfea4c1a1d92ef6, type: 3}
m_PlayOnAwake: 1
m_Volume: 0.7
@ -483,6 +483,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
audioMixer: {fileID: 24100000, guid: 06ed4a4573fabf84580596dba3e0c116, type: 2}
masterSlider: {fileID: 0}
musicSlider: {fileID: 0}
sfxSlider: {fileID: 0}
--- !u!1 &8365024801038495441
GameObject:
m_ObjectHideFlags: 0

160
Assets/Scenes/SampleScene.unity
View File

@ -145,6 +145,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 72794012913ccd840a73788b90573212, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &381333058 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1910143536416793018, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
m_PrefabInstance: {fileID: 1896701250}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!82 &462706131 stripped
AudioSource:
m_CorrespondingSourceObject: {fileID: 2620472400489621842, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
@ -161,6 +172,18 @@ PrefabInstance:
propertyPath: m_FirstSelected
value:
objectReference: {fileID: 1484020797}
- target: {fileID: 1884319524323261887, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
propertyPath: sfxSlider
value:
objectReference: {fileID: 1685207727}
- target: {fileID: 1884319524323261887, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
propertyPath: musicSlider
value:
objectReference: {fileID: 381333058}
- target: {fileID: 1884319524323261887, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
propertyPath: masterSlider
value:
objectReference: {fileID: 1986484024}
- target: {fileID: 8365024801073869718, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
propertyPath: m_Follow
value:
@ -498,67 +521,17 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 3328484984159178892, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
m_PrefabInstance: {fileID: 647315810}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1638714736 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 632081106300030536, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
--- !u!114 &1685207727 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7969914763486325717, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
m_PrefabInstance: {fileID: 1896701250}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1638714737 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
m_PrefabInstance: {fileID: 1896701250}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1638714736}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1638714738
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1638714736}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Delegates:
- eventID: 0
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1638714737}
m_TargetAssemblyTypeName: UnityEngine.UI.Selectable, UnityEngine.UI
m_MethodName: Select
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- eventID: 9
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 462706131}
m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine
m_MethodName: Play
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!82 &1880914075 stripped
AudioSource:
m_CorrespondingSourceObject: {fileID: 2620472401436852063, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
@ -583,6 +556,10 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 1880914075}
- target: {fileID: 1638714738, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 462706131}
- target: {fileID: 41466623430070692, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
@ -591,10 +568,18 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 1880914075}
- target: {fileID: 731870447262878912, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1146810209712999217, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 462706131}
- target: {fileID: 1398237036769021352, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1568061621804763920, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: gameTimer
value:
@ -607,14 +592,18 @@ PrefabInstance:
propertyPath: gameFlowManager
value:
objectReference: {fileID: 171858601}
- target: {fileID: 2455565202027235687, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 462706131}
- target: {fileID: 2298367244552140660, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2648330820146913686, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 462706131}
- target: {fileID: 2763861373830208011, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3172333708518609768, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
@ -623,33 +612,13 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 1880914075}
- target: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 1880914075}
- target: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
value: Play
objectReference: {fileID: 0}
- target: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
value: UnityEngine.AudioSource, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
- target: {fileID: 4216170274203962031, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4394421820928219480, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_Name
@ -739,6 +708,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4394421822421386398, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4779039434676126976, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
@ -755,6 +728,10 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 1880914075}
- target: {fileID: 5925177658220566142, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5968224638988248000, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
@ -763,6 +740,10 @@ PrefabInstance:
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 462706131}
- target: {fileID: 6771546498555141229, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6772135975917909564, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
@ -775,6 +756,10 @@ PrefabInstance:
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 462706131}
- target: {fileID: 7184746465596186799, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7911327139372840143, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
@ -910,3 +895,14 @@ PrefabInstance:
objectReference: {fileID: 171858601}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
--- !u!114 &1986484024 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2370386507810622567, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
m_PrefabInstance: {fileID: 1896701250}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
m_Name:
m_EditorClassIdentifier:

44
Assets/Scripts/SoundManager.cs
View File

@ -1,24 +1,41 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.Audio;
public class SoundManager : MonoBehaviour {
public AudioMixer audioMixer;
float masterVol;
float musicVol;
float SFXVol;
float sfxVol;
[SerializeField]Slider masterSlider;
[SerializeField]Slider musicSlider;
[SerializeField]Slider sfxSlider;
void Awake() {
musicVol = PlayerPrefs.GetFloat("MusicVolume", 1f);
SFXVol = PlayerPrefs.GetFloat("SFXVolume", 1f);
masterVol = PlayerPrefs.GetFloat("MasterVolume", masterSlider.maxValue);
musicVol = PlayerPrefs.GetFloat("MusicVolume", musicSlider.maxValue);
sfxVol = PlayerPrefs.GetFloat("SFXVolume", sfxSlider.maxValue);
masterSlider.value = masterVol;
musicSlider.value = musicVol;
sfxSlider.value = sfxVol;
masterSlider.onValueChanged.AddListener((float _) => SetMasterVolume(_));
musicSlider.onValueChanged.AddListener((float _) => SetMusicVolume(_));
sfxSlider.onValueChanged.AddListener((float _) => SetSFXVolume(_));
}
void Start() {
SetMasterVolume(masterVol);
SetMusicVolume(musicVol);
SetSFXVolume(SFXVol);
SetSFXVolume(sfxVol);
}
public void PlaySound(AudioSource source, bool randomPitch=false, bool createTempSourceIfBusy=true, bool createTempSource = false, float delay = 0f) {
@ -92,6 +109,13 @@ public class SoundManager : MonoBehaviour {
source.Play();
}
public void SetMasterVolume(float value) {
// Slider should go from 0.0001 to 1
masterVol = value;
audioMixer.SetFloat("MasterVolume", Mathf.Log10(masterVol) * 20);
PlayerPrefs.SetFloat("MasterVolume", masterVol);
}
public void SetMusicVolume(float value) {
// Slider should go from 0.0001 to 1
@ -104,9 +128,13 @@ public class SoundManager : MonoBehaviour {
public void SetSFXVolume(float value) {
// Slider should go from 0.0001 to 1
SFXVol = value;
audioMixer.SetFloat("SFXVolume", Mathf.Log10(SFXVol) * 20);
PlayerPrefs.SetFloat("SFXVolume", SFXVol);
sfxVol = value;
audioMixer.SetFloat("SFXVolume", Mathf.Log10(sfxVol) * 20);
PlayerPrefs.SetFloat("SFXVolume", sfxVol);
}
public float GetMasterVolume() {
return masterVol;
}
public float GetMusicVolume() {
@ -114,7 +142,7 @@ public class SoundManager : MonoBehaviour {
}
public float GetSFXVolume() {
return SFXVol;
return sfxVol;
}
}

208
Assets/TextMesh Pro/Fonts/MatchupPro SDF.asset
View File

File diff suppressed because one or more lines are too long