diff --git a/Game/Assets/Music/leafe_soundeffect.mp3 b/Game/Assets/Music/leafe_soundeffect.mp3 new file mode 100644 index 0000000..30a4682 Binary files /dev/null and b/Game/Assets/Music/leafe_soundeffect.mp3 differ diff --git a/Game/Assets/Music/leafe_soundeffect.mp3.meta b/Game/Assets/Music/leafe_soundeffect.mp3.meta new file mode 100644 index 0000000..dfda782 --- /dev/null +++ b/Game/Assets/Music/leafe_soundeffect.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 232101579b799754f9e1b5a79181c7cc +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Prefabs/ObstaclePreFabs/DryLeafNew_0 1.prefab b/Game/Assets/Prefabs/ObstaclePreFabs/DryLeafNew_0 1.prefab index d4b75c5..7653e9c 100644 --- a/Game/Assets/Prefabs/ObstaclePreFabs/DryLeafNew_0 1.prefab +++ b/Game/Assets/Prefabs/ObstaclePreFabs/DryLeafNew_0 1.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: -1492744888846132070} - component: {fileID: -3335685204144903253} - component: {fileID: 7517693285539812101} + - component: {fileID: 2032703659837756860} m_Layer: 0 m_Name: DryLeafNew_0 1 m_TagString: Platform @@ -172,3 +173,102 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::LeafDissolve maxStandingTime: 1 + speaker: {fileID: 2032703659837756860} + leafesound: {fileID: 8300000, guid: 232101579b799754f9e1b5a79181c7cc, type: 3} +--- !u!82 &2032703659837756860 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1463382805851734624} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: 232101579b799754f9e1b5a79181c7cc, type: 3} + m_PlayOnAwake: 0 + 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 diff --git a/Game/Assets/Scenes/0_MainScene.unity b/Game/Assets/Scenes/0_MainScene.unity index e83a5fb..8a30b85 100644 --- a/Game/Assets/Scenes/0_MainScene.unity +++ b/Game/Assets/Scenes/0_MainScene.unity @@ -1322,7 +1322,7 @@ AudioSource: m_audioClip: {fileID: 0} m_Resource: {fileID: 0} m_PlayOnAwake: 1 - m_Volume: 1 + m_Volume: 0.5 m_Pitch: 1 Loop: 0 Mute: 0 diff --git a/Game/Assets/Scripts/LeafDissolve.cs b/Game/Assets/Scripts/LeafDissolve.cs index 3627d29..df4ffeb 100644 --- a/Game/Assets/Scripts/LeafDissolve.cs +++ b/Game/Assets/Scripts/LeafDissolve.cs @@ -15,6 +15,10 @@ public class LeafDissolve : MonoBehaviour private float disolveTime; private BoxCollider2D collider; + + //audio stuff + public AudioSource speaker; + public AudioClip leafesound; // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() @@ -58,6 +62,9 @@ public class LeafDissolve : MonoBehaviour if (!isDissolving && standingTime >= maxStandingTime / 2) { isDissolving = true; + + //audio + speaker.PlayOneShot(leafesound); } }