diff --git a/Assets/Prefabs/Asteroid_1.prefab b/Assets/Prefabs/Asteroid_1.prefab index cac643a..557cacc 100644 --- a/Assets/Prefabs/Asteroid_1.prefab +++ b/Assets/Prefabs/Asteroid_1.prefab @@ -121,7 +121,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: a3f64933040804d488869ec82332a6a5, type: 3} m_PlayOnAwake: 0 - m_Volume: 1 + m_Volume: 0.01 m_Pitch: 1 Loop: 0 Mute: 0 @@ -200,7 +200,7 @@ MonoBehaviour: rotationSpeed: 1 rotationDirection: 1 RandomRotationSpeed: 1 - CrashFlamesEmitter: {fileID: 105122, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} + CrashFlamesEmitter: {fileID: 120238, guid: 1a5b0b5645fa6104087fd9f96b6104b9, type: 2} TrailFlamesEmitter: {fileID: 0} --- !u!135 &13502558 SphereCollider: diff --git a/Assets/Prefabs/Asteroid_2.prefab b/Assets/Prefabs/Asteroid_2.prefab index dfe6dec..a3634fb 100644 --- a/Assets/Prefabs/Asteroid_2.prefab +++ b/Assets/Prefabs/Asteroid_2.prefab @@ -121,7 +121,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: a3f64933040804d488869ec82332a6a5, type: 3} m_PlayOnAwake: 0 - m_Volume: 1 + m_Volume: 0.01 m_Pitch: 1 Loop: 0 Mute: 0 @@ -200,7 +200,7 @@ MonoBehaviour: rotationSpeed: 1 rotationDirection: 1 RandomRotationSpeed: 1 - CrashFlamesEmitter: {fileID: 105122, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} + CrashFlamesEmitter: {fileID: 120238, guid: 1a5b0b5645fa6104087fd9f96b6104b9, type: 2} TrailFlamesEmitter: {fileID: 0} --- !u!135 &13502558 SphereCollider: diff --git a/Assets/Prefabs/Asteroid_3.prefab b/Assets/Prefabs/Asteroid_3.prefab index 0f0c300..a78545a 100644 --- a/Assets/Prefabs/Asteroid_3.prefab +++ b/Assets/Prefabs/Asteroid_3.prefab @@ -121,7 +121,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: a3f64933040804d488869ec82332a6a5, type: 3} m_PlayOnAwake: 0 - m_Volume: 1 + m_Volume: 0.01 m_Pitch: 1 Loop: 0 Mute: 0 @@ -200,7 +200,7 @@ MonoBehaviour: rotationSpeed: 1 rotationDirection: 1 RandomRotationSpeed: 1 - CrashFlamesEmitter: {fileID: 105122, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} + CrashFlamesEmitter: {fileID: 120238, guid: 1a5b0b5645fa6104087fd9f96b6104b9, type: 2} TrailFlamesEmitter: {fileID: 0} --- !u!135 &13502558 SphereCollider: diff --git a/Assets/Prefabs/Asteroid_4.prefab b/Assets/Prefabs/Asteroid_4.prefab index 80b9d12..6b010a7 100644 --- a/Assets/Prefabs/Asteroid_4.prefab +++ b/Assets/Prefabs/Asteroid_4.prefab @@ -121,7 +121,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: a3f64933040804d488869ec82332a6a5, type: 3} m_PlayOnAwake: 0 - m_Volume: 1 + m_Volume: 0.01 m_Pitch: 1 Loop: 0 Mute: 0 @@ -200,7 +200,7 @@ MonoBehaviour: rotationSpeed: 1 rotationDirection: 1 RandomRotationSpeed: 1 - CrashFlamesEmitter: {fileID: 105122, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} + CrashFlamesEmitter: {fileID: 120238, guid: 1a5b0b5645fa6104087fd9f96b6104b9, type: 2} TrailFlamesEmitter: {fileID: 0} --- !u!135 &13502558 SphereCollider: diff --git a/Assets/Prefabs/Astronaut.prefab b/Assets/Prefabs/Astronaut.prefab index d6d4cce..7573c56 100644 --- a/Assets/Prefabs/Astronaut.prefab +++ b/Assets/Prefabs/Astronaut.prefab @@ -236,7 +236,8 @@ MonoBehaviour: WalkAnimSpeed: 4 WalkAnimAngle: 15 EjectSpinSpeed: 80 - DashParticleSystem: {fileID: 174982, guid: d876c44c9925f0b45b8c53bfb4f4967f, type: 2} + DashImpactSound: {fileID: 191714, guid: df0221176ed8d3c4a91e31e791e5c0cc, type: 2} + DashParticleSystem: {fileID: 138982, guid: 6233079c5a9a756458811f283fdca112, type: 2} DustParticlesEmitter: {fileID: 138982, guid: 6233079c5a9a756458811f283fdca112, type: 2} --- !u!114 &11494368 MonoBehaviour: diff --git a/Assets/Prefabs/DashSound.prefab b/Assets/Prefabs/DashSound.prefab new file mode 100644 index 0000000..6a5cb61 --- /dev/null +++ b/Assets/Prefabs/DashSound.prefab @@ -0,0 +1,115 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &191714 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 404630} + - 82: {fileID: 8279444} + m_Layer: 0 + m_Name: DashSound + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &404630 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 191714} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.8385537, y: -1.2472175, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!82 &8279444 +AudioSource: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 191714} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: f018620a0cec23042bca100d556e0c53, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 1 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 0 +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 191714} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/DashSound.prefab.meta b/Assets/Prefabs/DashSound.prefab.meta new file mode 100644 index 0000000..22a9044 --- /dev/null +++ b/Assets/Prefabs/DashSound.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df0221176ed8d3c4a91e31e791e5c0cc +timeCreated: 1460229916 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AstronautAnimator.cs b/Assets/Scripts/AstronautAnimator.cs index 5259129..bd63cde 100644 --- a/Assets/Scripts/AstronautAnimator.cs +++ b/Assets/Scripts/AstronautAnimator.cs @@ -10,7 +10,7 @@ public class AstronautAnimator : MonoBehaviour { public float EjectSpinSpeed; private GameObject runninParticleEmitter; - + public GameObject DashImpactSound; public GameObject DashParticleSystem; public GameObject DustParticlesEmitter; // Use this for initialization @@ -43,6 +43,10 @@ public class AstronautAnimator : MonoBehaviour { Destroy(runninParticleEmitter, runninParticleEmitter.GetComponent().duration); + var impactAudio = DashImpactSound.GetComponent(); + impactAudio.bypassListenerEffects = true; + AudioSource.PlayClipAtPoint(impactAudio.clip, transform.position, impactAudio.volume); + aspi.SpriteWalk.gameObject.SetActive(true); aspi.SpriteDash.gameObject.SetActive(false); diff --git a/Assets/Sounds/A_SFX_Dash_Impact_01.wav b/Assets/Sounds/A_SFX_Dash_Impact_01.wav new file mode 100644 index 0000000..28de754 Binary files /dev/null and b/Assets/Sounds/A_SFX_Dash_Impact_01.wav differ diff --git a/Assets/Sounds/A_SFX_Dash_Impact_01.wav.meta b/Assets/Sounds/A_SFX_Dash_Impact_01.wav.meta new file mode 100644 index 0000000..bb3dce6 --- /dev/null +++ b/Assets/Sounds/A_SFX_Dash_Impact_01.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f018620a0cec23042bca100d556e0c53 +timeCreated: 1460229772 +licenseType: Pro +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Scenes/Main.unity b/Assets/_Scenes/Main.unity index c7fb6fa..711bbc3 100644 --- a/Assets/_Scenes/Main.unity +++ b/Assets/_Scenes/Main.unity @@ -261,48 +261,6 @@ Transform: - {fileID: 10252813} m_Father: {fileID: 0} m_RootOrder: 6 ---- !u!1001 &395306152 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} - propertyPath: m_LocalPosition.x - value: -0.4592259 - objectReference: {fileID: 0} - - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} - propertyPath: m_LocalPosition.y - value: -3.4073124 - objectReference: {fileID: 0} - - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} - propertyPath: m_LocalPosition.z - value: 0.11328125 - objectReference: {fileID: 0} - - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 421276, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: a3879b7846092334e88b712c1b5a4edf, type: 2} - m_IsPrefabParent: 0 --- !u!4 &780956563 stripped Transform: m_PrefabParentObject: {fileID: 494126, guid: acd71c7b2f995984d9033c9dc4e257dc, type: 2}