diff --git a/Assets/Audio/Audio Mixer.mixer b/Assets/Audio/Audio Mixer.mixer index 997c891..d8fd03a 100644 --- a/Assets/Audio/Audio Mixer.mixer +++ b/Assets/Audio/Audio Mixer.mixer @@ -61,6 +61,20 @@ AudioMixerGroupController: m_Mute: 0 m_Solo: 0 m_BypassEffects: 0 +--- !u!244 &-1435410429410537098 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 5b00762822cfd2843bd06e5a02255375 + m_EffectName: Attenuation + m_MixLevel: e7fa564adc975a544964404badaba43b + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 --- !u!244 &-671410346139079125 AudioMixerEffectController: m_ObjectHideFlags: 3 @@ -119,6 +133,7 @@ AudioMixerController: - 08116dbf9979b7b4d8fcce772ec5ebfc - dd1cda19a45ef294d8789a2af47afcf7 - fcd09f92e84dbb2498492d6cb9c06bcd + - 17d772ec976972c4ca0d201034c8d9d1 name: View m_CurrentViewIndex: 0 m_TargetSnapshot: {fileID: 24500006} @@ -137,6 +152,7 @@ AudioMixerGroupController: - {fileID: 8377903610078173799} - {fileID: 6090405236815604520} - {fileID: 1886016463503660043} + - {fileID: 7051737336861099880} m_Volume: c8ed3e32c19202b4daadc5c4fb90bf76 m_Pitch: d51ab31c176e6894b94b24c01f74415f m_Send: 00000000000000000000000000000000 @@ -237,6 +253,25 @@ AudioMixerEffectController: m_SendTarget: {fileID: 0} m_EnableWetMix: 0 m_Bypass: 0 +--- !u!243 &7051737336861099880 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Button + m_AudioMixer: {fileID: 24100000} + m_GroupID: 17d772ec976972c4ca0d201034c8d9d1 + m_Children: [] + m_Volume: 357a4eef3e901c24a86499d91a27adca + m_Pitch: ac2db1d54ca691e43989238d88f22626 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: -1435410429410537098} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 --- !u!243 &8377903610078173799 AudioMixerGroupController: m_ObjectHideFlags: 0 diff --git a/Assets/Audio/Sound Effects/ButtonClick.bfxrsound b/Assets/Audio/Sound Effects/ButtonClick.bfxrsound new file mode 100644 index 0000000..e6b40ac --- /dev/null +++ b/Assets/Audio/Sound Effects/ButtonClick.bfxrsound @@ -0,0 +1 @@ +2,0.5,,0.0239,0.3097,0.1586,0.3,0.7824,,,,,,,,,,,,,,,,,,1,,,,,,,masterVolume \ No newline at end of file diff --git a/Assets/Audio/Sound Effects/ButtonClick.bfxrsound.meta b/Assets/Audio/Sound Effects/ButtonClick.bfxrsound.meta new file mode 100644 index 0000000..42c13d4 --- /dev/null +++ b/Assets/Audio/Sound Effects/ButtonClick.bfxrsound.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: de491cd1aed6a4740b25ebbf1bfc55c5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects/ButtonClick.wav b/Assets/Audio/Sound Effects/ButtonClick.wav new file mode 100644 index 0000000..96eb1cd Binary files /dev/null and b/Assets/Audio/Sound Effects/ButtonClick.wav differ diff --git a/Assets/Audio/Sound Effects/ButtonClick.wav.meta b/Assets/Audio/Sound Effects/ButtonClick.wav.meta new file mode 100644 index 0000000..d0ca903 --- /dev/null +++ b/Assets/Audio/Sound Effects/ButtonClick.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 077bbd63db51b5145838abe533b7a657 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/UI/Button.prefab b/Assets/Prefabs/UI/Button.prefab index e45993b..b0bb8af 100644 --- a/Assets/Prefabs/UI/Button.prefab +++ b/Assets/Prefabs/UI/Button.prefab @@ -122,7 +122,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7680983655018497081} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 0} + 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!114 &6181795050297466372 MonoBehaviour: m_ObjectHideFlags: 0 @@ -229,7 +241,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 48 + m_fontSize: 32 m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 1 diff --git a/Assets/Scripts/UI/ButtonBehaviour.cs b/Assets/Scripts/UI/ButtonBehaviour.cs index 0e3805a..c18e376 100644 --- a/Assets/Scripts/UI/ButtonBehaviour.cs +++ b/Assets/Scripts/UI/ButtonBehaviour.cs @@ -18,6 +18,7 @@ namespace UI public void OnPointerUp(PointerEventData eventData) { text.transform.localPosition = initialTextPosition; + UIManager.Instance.PlayClickSound(); } private void Start() diff --git a/Assets/Scripts/UI/UIManager.cs b/Assets/Scripts/UI/UIManager.cs index dcf83e0..185c775 100644 --- a/Assets/Scripts/UI/UIManager.cs +++ b/Assets/Scripts/UI/UIManager.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using Pausable; using UnityEngine; @@ -8,8 +9,10 @@ namespace UI { private static UIManager _instance = null; public static UIManager Instance => _instance; - private Dictionary canvases = null; + public Pauser Pauser { get; private set; } = null; + private Dictionary canvases = null; + private AudioSource audioSource = null; private void Awake() { @@ -20,7 +23,11 @@ namespace UI Destroy(this); } - private void Start() => Pauser = gameObject.AddComponent(); + private void Start() + { + Pauser = gameObject.AddComponent(); + audioSource = gameObject.GetComponent(); + } public void SwitchToCanvas(string canvasName) { @@ -54,5 +61,7 @@ namespace UI canvases.Add(child.name, child.GetComponent()); } } + + public void PlayClickSound() => audioSource.Play(); } }