diff --git a/Assets/Audio/Dirt Impact.mp3 b/Assets/Audio/Dirt Impact.mp3 new file mode 100644 index 00000000..042545a9 Binary files /dev/null and b/Assets/Audio/Dirt Impact.mp3 differ diff --git a/Assets/Audio/Dirt Impact.mp3.meta b/Assets/Audio/Dirt Impact.mp3.meta new file mode 100644 index 00000000..9ff6dd5d --- /dev/null +++ b/Assets/Audio/Dirt Impact.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 5e7f699e41f608845a96ddc5c2d50e93 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + 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/Assets/Audio/Glass Impact.mp3 b/Assets/Audio/Glass Impact.mp3 new file mode 100644 index 00000000..6c74eb46 Binary files /dev/null and b/Assets/Audio/Glass Impact.mp3 differ diff --git a/Assets/Audio/Glass Impact.mp3.meta b/Assets/Audio/Glass Impact.mp3.meta new file mode 100644 index 00000000..c272669e --- /dev/null +++ b/Assets/Audio/Glass Impact.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1664b18c0656ef44ba4bd418c4f1d1c3 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + 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/Assets/Audio/Metal Impact.mp3 b/Assets/Audio/Metal Impact.mp3 new file mode 100644 index 00000000..69ef4e59 Binary files /dev/null and b/Assets/Audio/Metal Impact.mp3 differ diff --git a/Assets/Audio/Metal Impact.mp3.meta b/Assets/Audio/Metal Impact.mp3.meta new file mode 100644 index 00000000..03b15e7b --- /dev/null +++ b/Assets/Audio/Metal Impact.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 316176373bc43e5428c0ebff428e8096 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + 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/Assets/Audio/Water Impact.mp3 b/Assets/Audio/Water Impact.mp3 new file mode 100644 index 00000000..7bd800d3 Binary files /dev/null and b/Assets/Audio/Water Impact.mp3 differ diff --git a/Assets/Audio/Water Impact.mp3.meta b/Assets/Audio/Water Impact.mp3.meta new file mode 100644 index 00000000..80f6c0da --- /dev/null +++ b/Assets/Audio/Water Impact.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 3badd6002b8ef284e81ec1de47731fb6 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + 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/Assets/Audio/Wood Impact.mp3 b/Assets/Audio/Wood Impact.mp3 new file mode 100644 index 00000000..4db1dbda Binary files /dev/null and b/Assets/Audio/Wood Impact.mp3 differ diff --git a/Assets/Audio/Wood Impact.mp3.meta b/Assets/Audio/Wood Impact.mp3.meta new file mode 100644 index 00000000..3134571e --- /dev/null +++ b/Assets/Audio/Wood Impact.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c2bf71b1d47491348bac1b31e2e9bb9d +AudioImporter: + externalObjects: {} + serializedVersion: 7 + 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/Assets/Models/BulletImpacts/impactMetal.prefab b/Assets/Models/BulletImpacts/impactMetal.prefab index 355b499b..1d4583bd 100644 Binary files a/Assets/Models/BulletImpacts/impactMetal.prefab and b/Assets/Models/BulletImpacts/impactMetal.prefab differ diff --git a/Assets/Prefabs/Resources/PolicemanController.prefab b/Assets/Prefabs/Resources/PolicemanController.prefab index a23ccbe4..b83c0fe0 100644 Binary files a/Assets/Prefabs/Resources/PolicemanController.prefab and b/Assets/Prefabs/Resources/PolicemanController.prefab differ diff --git a/Assets/Prefabs/Resources/RobotXController.prefab b/Assets/Prefabs/Resources/RobotXController.prefab index c5164388..540f4d15 100644 Binary files a/Assets/Prefabs/Resources/RobotXController.prefab and b/Assets/Prefabs/Resources/RobotXController.prefab differ diff --git a/Assets/Prefabs/Resources/RobotYController.prefab b/Assets/Prefabs/Resources/RobotYController.prefab index 3ebcb134..a02cc8c5 100644 Binary files a/Assets/Prefabs/Resources/RobotYController.prefab and b/Assets/Prefabs/Resources/RobotYController.prefab differ diff --git a/Assets/Prefabs/Resources/impactBrick.prefab b/Assets/Prefabs/Resources/impactBrick.prefab index cbfb9039..a63d6eee 100644 Binary files a/Assets/Prefabs/Resources/impactBrick.prefab and b/Assets/Prefabs/Resources/impactBrick.prefab differ diff --git a/Assets/Prefabs/Resources/impactConcrete.prefab b/Assets/Prefabs/Resources/impactConcrete.prefab index dec7a3ee..4d1ef0ad 100644 Binary files a/Assets/Prefabs/Resources/impactConcrete.prefab and b/Assets/Prefabs/Resources/impactConcrete.prefab differ diff --git a/Assets/Prefabs/Resources/impactDirt.prefab b/Assets/Prefabs/Resources/impactDirt.prefab index e1409f1e..b580d08e 100644 Binary files a/Assets/Prefabs/Resources/impactDirt.prefab and b/Assets/Prefabs/Resources/impactDirt.prefab differ diff --git a/Assets/Prefabs/Resources/impactGlass.prefab b/Assets/Prefabs/Resources/impactGlass.prefab index 132da809..d46dba2f 100644 Binary files a/Assets/Prefabs/Resources/impactGlass.prefab and b/Assets/Prefabs/Resources/impactGlass.prefab differ diff --git a/Assets/Prefabs/Resources/impactMetal.prefab b/Assets/Prefabs/Resources/impactMetal.prefab index 8705ecef..90480b8e 100644 Binary files a/Assets/Prefabs/Resources/impactMetal.prefab and b/Assets/Prefabs/Resources/impactMetal.prefab differ diff --git a/Assets/Prefabs/Resources/impactWater.prefab b/Assets/Prefabs/Resources/impactWater.prefab index fcb8840e..c204646a 100644 Binary files a/Assets/Prefabs/Resources/impactWater.prefab and b/Assets/Prefabs/Resources/impactWater.prefab differ diff --git a/Assets/Prefabs/Resources/impactWood.prefab b/Assets/Prefabs/Resources/impactWood.prefab index 54bbad89..02248fe3 100644 Binary files a/Assets/Prefabs/Resources/impactWood.prefab and b/Assets/Prefabs/Resources/impactWood.prefab differ diff --git a/Assets/Scripts/ImpactAudioPlayer.cs b/Assets/Scripts/ImpactAudioPlayer.cs new file mode 100644 index 00000000..759bf206 --- /dev/null +++ b/Assets/Scripts/ImpactAudioPlayer.cs @@ -0,0 +1,18 @@ +using UnityEngine; + + +[RequireComponent(typeof(AudioSource))] +public class ImpactAudioPlayer : MonoBehaviour +{ + private AudioSource audioSource; + private void OnEnable() + { + audioSource = GetComponent(); + audioSource?.Play(); + Debug.Log($"Playing with {audioSource}"); + } + private void OnDisable() + { + audioSource?.Stop(); + } +} diff --git a/Assets/Scripts/ImpactAudioPlayer.cs.meta b/Assets/Scripts/ImpactAudioPlayer.cs.meta new file mode 100644 index 00000000..fa2c36cb --- /dev/null +++ b/Assets/Scripts/ImpactAudioPlayer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a9254691c752d994ebbb06091bc55cfa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: