diff --git a/Assets/Audios/SFX/Decompte.mp3 b/Assets/Audios/SFX/Decompte.mp3 index 1a25489..9cb3ef2 100644 --- a/Assets/Audios/SFX/Decompte.mp3 +++ b/Assets/Audios/SFX/Decompte.mp3 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd2386e769fd6c160309a0ad936ccbb8162e4514284d106a8734e99d7a36753c -size 133583 +oid sha256:c38b3b2c3f047a17f5eeb08ee7046cb36d6edab8ed3cec50175b45f71827942c +size 50793 diff --git a/Assets/Audios/SFX/Flash.mp3 b/Assets/Audios/SFX/Flash.mp3 new file mode 100644 index 0000000..bdde804 --- /dev/null +++ b/Assets/Audios/SFX/Flash.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:926f4c968a696739b20aebf4ac3b7ebdef80e5fa2455b88466683d92f81df62d +size 15900 diff --git a/Assets/Audios/SFX/camera-flash-sound-effect.mp3.meta b/Assets/Audios/SFX/Flash.mp3.meta similarity index 91% rename from Assets/Audios/SFX/camera-flash-sound-effect.mp3.meta rename to Assets/Audios/SFX/Flash.mp3.meta index d4da1a3..b287ff0 100644 --- a/Assets/Audios/SFX/camera-flash-sound-effect.mp3.meta +++ b/Assets/Audios/SFX/Flash.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b4d0bdddc893f476a8eb330e58108608 +guid: 9801e8fc8c9fa9a47afa7517b107e45e AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audios/SFX/camera-flash-sound-effect.mp3 b/Assets/Audios/SFX/camera-flash-sound-effect.mp3 deleted file mode 100644 index 5f0933e..0000000 --- a/Assets/Audios/SFX/camera-flash-sound-effect.mp3 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58f18e86e44bfeff7f980abbb29e1050edc4b66f0c3dbda376b224b772ff0b20 -size 33364 diff --git a/Assets/Audios/SFX/incorrect-buzzer-sound-147336.mp3 b/Assets/Audios/SFX/incorrect-buzzer-sound-147336.mp3 deleted file mode 100644 index b88a452..0000000 --- a/Assets/Audios/SFX/incorrect-buzzer-sound-147336.mp3 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7793c4f4799f7f9b2d7b858352d8af0c7f93733efa676d2b33d727577e9775e -size 100310 diff --git a/Assets/Audios/SFX/voteEnds.mp3 b/Assets/Audios/SFX/voteEnds.mp3 new file mode 100644 index 0000000..a837820 --- /dev/null +++ b/Assets/Audios/SFX/voteEnds.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:344edc26b90dccd70fffaf20e790a5f68fcc9f26f2b526760b5778d1fc6a3a30 +size 47898 diff --git a/Assets/Audios/SFX/incorrect-buzzer-sound-147336.mp3.meta b/Assets/Audios/SFX/voteEnds.mp3.meta similarity index 100% rename from Assets/Audios/SFX/incorrect-buzzer-sound-147336.mp3.meta rename to Assets/Audios/SFX/voteEnds.mp3.meta diff --git a/Assets/Scenes/PhoneView.unity b/Assets/Scenes/PhoneView.unity index 66d7366..e1d5303 100644 --- a/Assets/Scenes/PhoneView.unity +++ b/Assets/Scenes/PhoneView.unity @@ -536,6 +536,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 429358655} + m_TargetAssemblyTypeName: AudioManager, Assembly-CSharp + m_MethodName: PlaySFX + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9801e8fc8c9fa9a47afa7517b107e45e, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &223773139 MonoBehaviour: m_ObjectHideFlags: 0 @@ -869,6 +881,7 @@ GameObject: - component: {fileID: 429358652} - component: {fileID: 429358653} - component: {fileID: 429358654} + - component: {fileID: 429358655} m_Layer: 0 m_Name: '[Managers]' m_TagString: Untagged @@ -900,7 +913,9 @@ Transform: m_LocalPosition: {x: 117.24013, y: 248.68315, z: -1.7392539} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 665178701} + - {fileID: 993463148} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &429358652 @@ -973,6 +988,32 @@ MonoBehaviour: k__BackingField: k__BackingField: k__BackingField: +--- !u!114 &429358655 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 429358648} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ccc6142918f2946509e0c02fbe0df427, type: 3} + m_Name: + m_EditorClassIdentifier: + mixer: {fileID: 24100000, guid: 23695c8b913f2468f8e11226c7661601, type: 2} + defaultSnapshot: {fileID: 24500006, guid: 23695c8b913f2468f8e11226c7661601, type: 2} + muteSnapshot: {fileID: -1355774588778556265, guid: 23695c8b913f2468f8e11226c7661601, type: 2} + musicSource: {fileID: 665178700} + sfxSource: {fileID: 993463147} + musics: + - title: 0 + clip: {fileID: 8300000, guid: 7ac3efdb5c840704aafbf19188b3e61e, type: 3} + - title: 1 + clip: {fileID: 8300000, guid: 0e86c0433979a2d4c884b368808d3cdf, type: 3} + - title: 2 + clip: {fileID: 8300000, guid: d782d7e00ee5a0d40a3c005d87c15b3a, type: 3} + - title: 3 + clip: {fileID: 8300000, guid: e1135788bf319bd42b6ca512976f9028, type: 3} --- !u!1 &436596783 GameObject: m_ObjectHideFlags: 0 @@ -1714,6 +1755,134 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 663085868} m_CullTransparentMesh: 1 +--- !u!1 &665178699 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 665178701} + - component: {fileID: 665178700} + m_Layer: 0 + m_Name: MusicSource + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &665178700 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665178699} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: -9193339872731100694, guid: 23695c8b913f2468f8e11226c7661601, type: 2} + m_audioClip: {fileID: 8300000, guid: 7ac3efdb5c840704aafbf19188b3e61e, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &665178701 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665178699} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 429358650} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &668577473 GameObject: m_ObjectHideFlags: 0 @@ -2830,6 +2999,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 429358655} + m_TargetAssemblyTypeName: AudioManager, Assembly-CSharp + m_MethodName: PlaySFX + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 306e5c4ea2b2e504da793aa2dc9b58ec, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &903645288 GameObject: m_ObjectHideFlags: 0 @@ -3192,6 +3373,134 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 991600091} m_CullTransparentMesh: 1 +--- !u!1 &993463146 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 993463148} + - component: {fileID: 993463147} + m_Layer: 0 + m_Name: SFXSource + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &993463147 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993463146} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 5041602002061892305, guid: 23695c8b913f2468f8e11226c7661601, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &993463148 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993463146} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 429358650} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1034781733 GameObject: m_ObjectHideFlags: 0 @@ -3726,6 +4035,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 429358655} + m_TargetAssemblyTypeName: AudioManager, Assembly-CSharp + m_MethodName: PlaySFX + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 270d50df6e448c846956988bfe5af08b, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1114535087 MonoBehaviour: m_ObjectHideFlags: 0