diff --git a/Assets/Sounds.meta b/Assets/Audio.meta similarity index 77% rename from Assets/Sounds.meta rename to Assets/Audio.meta index 2d2decb..698e5c8 100644 --- a/Assets/Sounds.meta +++ b/Assets/Audio.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 156fccd200883fd9aba8bda19039532e +guid: d8d2a314ed7955440ac5ad6599c91eb2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Audio/AudioLibrary.asset b/Assets/Audio/AudioLibrary.asset new file mode 100644 index 0000000..eb3f45f --- /dev/null +++ b/Assets/Audio/AudioLibrary.asset @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aaa6f7237ea22dc49a4eb9e830e9d69a, type: 3} + m_Name: AudioLibrary + m_EditorClassIdentifier: + Clips: + - {fileID: 8300000, guid: 276c547f501abad43b34fdeaff93d182, type: 3} + - {fileID: 8300000, guid: 75f8c7d8fcd00f74f936d2d3b1ff2770, type: 3} + - {fileID: 8300000, guid: 62eaca0fefd36974a85fd23a5d2bbe5b, type: 3} + - {fileID: 8300000, guid: 7c2f136c8bd7bfc428b1e7fd7b2bd7e0, type: 3} + - {fileID: 8300000, guid: bc62ca94cca42804b9f1d27ff8fdb257, type: 3} + - {fileID: 8300000, guid: 050940d385d7ad4469278c58dfabc6de, type: 3} + - {fileID: 8300000, guid: 4bd536b2747f82c49afef34ebcf0e7fb, type: 3} + - {fileID: 8300000, guid: 2d40b71ac65ecda4ca243dfed66cee2f, type: 3} + - {fileID: 8300000, guid: fb0ae77bbbd11e64fa44bb6e23071458, type: 3} + - {fileID: 8300000, guid: 3a67073d446ad0c4eaebc3e828cab46b, type: 3} + - {fileID: 8300000, guid: 3c5f4ff19d63cc8458b6acb0756192ab, type: 3} + - {fileID: 8300000, guid: fa96879f1e5773e4aa5ba67c98756caf, type: 3} + - {fileID: 8300000, guid: bd37e0997c3891d41960e3d4a2820944, type: 3} + - {fileID: 8300000, guid: 15abfea15ac15c94bb6ac7814c5304b8, type: 3} + - {fileID: 8300000, guid: 1199ff79c1f3044478a1d7fb88f09f20, type: 3} + - {fileID: 8300000, guid: 2680edc40e917f24fb02c267f4eab914, type: 3} + - {fileID: 8300000, guid: b6ec2727446618b44b5af3a511e5e1b1, type: 3} + - {fileID: 8300000, guid: 26c6aabbabe544f45b385c0e978c35ff, type: 3} + - {fileID: 8300000, guid: 07e7ba37a1d069e4cba742b110efe302, type: 3} + - {fileID: 8300000, guid: dff7c8cb2faf9c742a35ef1a58030f92, type: 3} + - {fileID: 8300000, guid: 2fc5510c93077614ea99731a8e690f6b, type: 3} + - {fileID: 8300000, guid: 27f2cebd20efe6a4faf50b23ad487154, type: 3} + - {fileID: 8300000, guid: fc82c40acffc19741a0707c947a1d767, type: 3} + - {fileID: 8300000, guid: 2a5efb61897b6af4ab3ecae350829b5c, type: 3} + - {fileID: 8300000, guid: 6778ae1bc0a92c64d8ba759c3c13727d, type: 3} + - {fileID: 8300000, guid: 7182af998117fba4fa696e5fd33ad99a, type: 3} + - {fileID: 8300000, guid: 88b0c2079547b85458daa063fb59e720, type: 3} + - {fileID: 8300000, guid: cabc6f011eda78b47b6e63de34a4c33e, type: 3} + - {fileID: 8300000, guid: 8abb5f3f03f30f842b9d673933bdafb4, type: 3} + - {fileID: 8300000, guid: f68b9fed55ed886479faaf1b33c59651, type: 3} + - {fileID: 8300000, guid: e24c2fccb4285ab4eacc6da16f5c62eb, type: 3} diff --git a/Assets/Audio/AudioLibrary.asset.meta b/Assets/Audio/AudioLibrary.asset.meta new file mode 100644 index 0000000..8f4e021 --- /dev/null +++ b/Assets/Audio/AudioLibrary.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 90a0ccefc407688499165286d0638124 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Blood_Splatter_Large_SFX.wav b/Assets/Audio/Blood_Splatter_Large_SFX.wav new file mode 100644 index 0000000..5321c7e Binary files /dev/null and b/Assets/Audio/Blood_Splatter_Large_SFX.wav differ diff --git a/Assets/Sounds/squeak.mp3.meta b/Assets/Audio/Blood_Splatter_Large_SFX.wav.meta similarity index 91% rename from Assets/Sounds/squeak.mp3.meta rename to Assets/Audio/Blood_Splatter_Large_SFX.wav.meta index e9afdb2..fce4d4a 100644 --- a/Assets/Sounds/squeak.mp3.meta +++ b/Assets/Audio/Blood_Splatter_Large_SFX.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 06f8108a8e1a3b9aeb66dff63dd1e112 +guid: 276c547f501abad43b34fdeaff93d182 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Blood_Splatter_Medium_SFX.wav b/Assets/Audio/Blood_Splatter_Medium_SFX.wav new file mode 100644 index 0000000..90a2758 Binary files /dev/null and b/Assets/Audio/Blood_Splatter_Medium_SFX.wav differ diff --git a/Assets/Audio/Blood_Splatter_Medium_SFX.wav.meta b/Assets/Audio/Blood_Splatter_Medium_SFX.wav.meta new file mode 100644 index 0000000..b410dbc --- /dev/null +++ b/Assets/Audio/Blood_Splatter_Medium_SFX.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 75f8c7d8fcd00f74f936d2d3b1ff2770 +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/Blood_Splatter_Small.wav b/Assets/Audio/Blood_Splatter_Small.wav new file mode 100644 index 0000000..583c54d Binary files /dev/null and b/Assets/Audio/Blood_Splatter_Small.wav differ diff --git a/Assets/Audio/Blood_Splatter_Small.wav.meta b/Assets/Audio/Blood_Splatter_Small.wav.meta new file mode 100644 index 0000000..25ec653 --- /dev/null +++ b/Assets/Audio/Blood_Splatter_Small.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 62eaca0fefd36974a85fd23a5d2bbe5b +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/Button_Click_SFX.wav b/Assets/Audio/Button_Click_SFX.wav new file mode 100644 index 0000000..a6285bb Binary files /dev/null and b/Assets/Audio/Button_Click_SFX.wav differ diff --git a/Assets/Audio/Button_Click_SFX.wav.meta b/Assets/Audio/Button_Click_SFX.wav.meta new file mode 100644 index 0000000..2c9bb08 --- /dev/null +++ b/Assets/Audio/Button_Click_SFX.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 7c2f136c8bd7bfc428b1e7fd7b2bd7e0 +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/Button_Hover_SFX.wav b/Assets/Audio/Button_Hover_SFX.wav new file mode 100644 index 0000000..9a21093 Binary files /dev/null and b/Assets/Audio/Button_Hover_SFX.wav differ diff --git a/Assets/Audio/Button_Hover_SFX.wav.meta b/Assets/Audio/Button_Hover_SFX.wav.meta new file mode 100644 index 0000000..31983d2 --- /dev/null +++ b/Assets/Audio/Button_Hover_SFX.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: bc62ca94cca42804b9f1d27ff8fdb257 +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/Enemy_Killed_By_Projectile.wav b/Assets/Audio/Enemy_Killed_By_Projectile.wav new file mode 100644 index 0000000..83274c5 Binary files /dev/null and b/Assets/Audio/Enemy_Killed_By_Projectile.wav differ diff --git a/Assets/Audio/Enemy_Killed_By_Projectile.wav.meta b/Assets/Audio/Enemy_Killed_By_Projectile.wav.meta new file mode 100644 index 0000000..14b84a5 --- /dev/null +++ b/Assets/Audio/Enemy_Killed_By_Projectile.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 050940d385d7ad4469278c58dfabc6de +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/Footstep_1.wav b/Assets/Audio/Footstep_1.wav new file mode 100644 index 0000000..0157fb4 Binary files /dev/null and b/Assets/Audio/Footstep_1.wav differ diff --git a/Assets/Audio/Footstep_1.wav.meta b/Assets/Audio/Footstep_1.wav.meta new file mode 100644 index 0000000..307e597 --- /dev/null +++ b/Assets/Audio/Footstep_1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4bd536b2747f82c49afef34ebcf0e7fb +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/Footstep_2.wav b/Assets/Audio/Footstep_2.wav new file mode 100644 index 0000000..db263a0 Binary files /dev/null and b/Assets/Audio/Footstep_2.wav differ diff --git a/Assets/Audio/Footstep_2.wav.meta b/Assets/Audio/Footstep_2.wav.meta new file mode 100644 index 0000000..1bf5783 --- /dev/null +++ b/Assets/Audio/Footstep_2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2d40b71ac65ecda4ca243dfed66cee2f +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/Footstep_3.wav b/Assets/Audio/Footstep_3.wav new file mode 100644 index 0000000..73657d4 Binary files /dev/null and b/Assets/Audio/Footstep_3.wav differ diff --git a/Assets/Audio/Footstep_3.wav.meta b/Assets/Audio/Footstep_3.wav.meta new file mode 100644 index 0000000..eec7f95 --- /dev/null +++ b/Assets/Audio/Footstep_3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: fb0ae77bbbd11e64fa44bb6e23071458 +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/Footstep_4.wav b/Assets/Audio/Footstep_4.wav new file mode 100644 index 0000000..b57909e Binary files /dev/null and b/Assets/Audio/Footstep_4.wav differ diff --git a/Assets/Audio/Footstep_4.wav.meta b/Assets/Audio/Footstep_4.wav.meta new file mode 100644 index 0000000..3f7d280 --- /dev/null +++ b/Assets/Audio/Footstep_4.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 3a67073d446ad0c4eaebc3e828cab46b +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/Footstep_5.wav b/Assets/Audio/Footstep_5.wav new file mode 100644 index 0000000..df0c486 Binary files /dev/null and b/Assets/Audio/Footstep_5.wav differ diff --git a/Assets/Audio/Footstep_5.wav.meta b/Assets/Audio/Footstep_5.wav.meta new file mode 100644 index 0000000..e416294 --- /dev/null +++ b/Assets/Audio/Footstep_5.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 3c5f4ff19d63cc8458b6acb0756192ab +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/Ingame_Theme.wav b/Assets/Audio/Ingame_Theme.wav new file mode 100644 index 0000000..2f924b6 Binary files /dev/null and b/Assets/Audio/Ingame_Theme.wav differ diff --git a/Assets/Audio/Ingame_Theme.wav.meta b/Assets/Audio/Ingame_Theme.wav.meta new file mode 100644 index 0000000..a51a51c --- /dev/null +++ b/Assets/Audio/Ingame_Theme.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: bd37e0997c3891d41960e3d4a2820944 +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/Ingame_demo_1_very_early_accesssss.mp3 b/Assets/Audio/Ingame_demo_1_very_early_accesssss.mp3 new file mode 100644 index 0000000..2006081 Binary files /dev/null and b/Assets/Audio/Ingame_demo_1_very_early_accesssss.mp3 differ diff --git a/Assets/Audio/Ingame_demo_1_very_early_accesssss.mp3.meta b/Assets/Audio/Ingame_demo_1_very_early_accesssss.mp3.meta new file mode 100644 index 0000000..c61f887 --- /dev/null +++ b/Assets/Audio/Ingame_demo_1_very_early_accesssss.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: fa96879f1e5773e4aa5ba67c98756caf +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/Intro_Flatline(1).wav b/Assets/Audio/Intro_Flatline(1).wav new file mode 100644 index 0000000..bc79089 Binary files /dev/null and b/Assets/Audio/Intro_Flatline(1).wav differ diff --git a/Assets/Audio/Intro_Flatline(1).wav.meta b/Assets/Audio/Intro_Flatline(1).wav.meta new file mode 100644 index 0000000..29a61c2 --- /dev/null +++ b/Assets/Audio/Intro_Flatline(1).wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1199ff79c1f3044478a1d7fb88f09f20 +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/Intro_Flatline.wav b/Assets/Audio/Intro_Flatline.wav new file mode 100644 index 0000000..f119313 Binary files /dev/null and b/Assets/Audio/Intro_Flatline.wav differ diff --git a/Assets/Audio/Intro_Flatline.wav.meta b/Assets/Audio/Intro_Flatline.wav.meta new file mode 100644 index 0000000..159a402 --- /dev/null +++ b/Assets/Audio/Intro_Flatline.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 15abfea15ac15c94bb6ac7814c5304b8 +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/MOP_test.wav b/Assets/Audio/MOP_test.wav new file mode 100644 index 0000000..b0387f1 Binary files /dev/null and b/Assets/Audio/MOP_test.wav differ diff --git a/Assets/Audio/MOP_test.wav.meta b/Assets/Audio/MOP_test.wav.meta new file mode 100644 index 0000000..e1e1e4b --- /dev/null +++ b/Assets/Audio/MOP_test.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 26c6aabbabe544f45b385c0e978c35ff +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/Menu_Theme.wav b/Assets/Audio/Menu_Theme.wav new file mode 100644 index 0000000..6f83ab3 Binary files /dev/null and b/Assets/Audio/Menu_Theme.wav differ diff --git a/Assets/Audio/Menu_Theme.wav.meta b/Assets/Audio/Menu_Theme.wav.meta new file mode 100644 index 0000000..165a84e --- /dev/null +++ b/Assets/Audio/Menu_Theme.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2680edc40e917f24fb02c267f4eab914 +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/Menu_Whistle_Intro.wav b/Assets/Audio/Menu_Whistle_Intro.wav new file mode 100644 index 0000000..ceeca4e Binary files /dev/null and b/Assets/Audio/Menu_Whistle_Intro.wav differ diff --git a/Assets/Audio/Menu_Whistle_Intro.wav.meta b/Assets/Audio/Menu_Whistle_Intro.wav.meta new file mode 100644 index 0000000..2ade4a5 --- /dev/null +++ b/Assets/Audio/Menu_Whistle_Intro.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b6ec2727446618b44b5af3a511e5e1b1 +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/Mopping_SFX.wav b/Assets/Audio/Mopping_SFX.wav new file mode 100644 index 0000000..50e0d75 Binary files /dev/null and b/Assets/Audio/Mopping_SFX.wav differ diff --git a/Assets/Audio/Mopping_SFX.wav.meta b/Assets/Audio/Mopping_SFX.wav.meta new file mode 100644 index 0000000..c2bad27 --- /dev/null +++ b/Assets/Audio/Mopping_SFX.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 07e7ba37a1d069e4cba742b110efe302 +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/Player_Damage_SFX.wav b/Assets/Audio/Player_Damage_SFX.wav new file mode 100644 index 0000000..b73ce16 Binary files /dev/null and b/Assets/Audio/Player_Damage_SFX.wav differ diff --git a/Assets/Audio/Player_Damage_SFX.wav.meta b/Assets/Audio/Player_Damage_SFX.wav.meta new file mode 100644 index 0000000..510fdf1 --- /dev/null +++ b/Assets/Audio/Player_Damage_SFX.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: dff7c8cb2faf9c742a35ef1a58030f92 +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/Rette_spor_question_mark.wav b/Assets/Audio/Rette_spor_question_mark.wav new file mode 100644 index 0000000..dd29883 Binary files /dev/null and b/Assets/Audio/Rette_spor_question_mark.wav differ diff --git a/Assets/Audio/Rette_spor_question_mark.wav.meta b/Assets/Audio/Rette_spor_question_mark.wav.meta new file mode 100644 index 0000000..2bce2ee --- /dev/null +++ b/Assets/Audio/Rette_spor_question_mark.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2fc5510c93077614ea99731a8e690f6b +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/Rette_spor_question_mark2.wav b/Assets/Audio/Rette_spor_question_mark2.wav new file mode 100644 index 0000000..80edf28 Binary files /dev/null and b/Assets/Audio/Rette_spor_question_mark2.wav differ diff --git a/Assets/Audio/Rette_spor_question_mark2.wav.meta b/Assets/Audio/Rette_spor_question_mark2.wav.meta new file mode 100644 index 0000000..9e6a576 --- /dev/null +++ b/Assets/Audio/Rette_spor_question_mark2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 27f2cebd20efe6a4faf50b23ad487154 +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/Revive_SFX.wav b/Assets/Audio/Revive_SFX.wav new file mode 100644 index 0000000..121fe1a Binary files /dev/null and b/Assets/Audio/Revive_SFX.wav differ diff --git a/Assets/Audio/Revive_SFX.wav.meta b/Assets/Audio/Revive_SFX.wav.meta new file mode 100644 index 0000000..c8cb2da --- /dev/null +++ b/Assets/Audio/Revive_SFX.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: fc82c40acffc19741a0707c947a1d767 +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/Rope_Tight_SFX.wav b/Assets/Audio/Rope_Tight_SFX.wav new file mode 100644 index 0000000..573105b Binary files /dev/null and b/Assets/Audio/Rope_Tight_SFX.wav differ diff --git a/Assets/Audio/Rope_Tight_SFX.wav.meta b/Assets/Audio/Rope_Tight_SFX.wav.meta new file mode 100644 index 0000000..e9d2e03 --- /dev/null +++ b/Assets/Audio/Rope_Tight_SFX.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2a5efb61897b6af4ab3ecae350829b5c +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/Slice_Enemy_SFX.wav b/Assets/Audio/Slice_Enemy_SFX.wav new file mode 100644 index 0000000..74bab1b Binary files /dev/null and b/Assets/Audio/Slice_Enemy_SFX.wav differ diff --git a/Assets/Audio/Slice_Enemy_SFX.wav.meta b/Assets/Audio/Slice_Enemy_SFX.wav.meta new file mode 100644 index 0000000..e355782 --- /dev/null +++ b/Assets/Audio/Slice_Enemy_SFX.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 6778ae1bc0a92c64d8ba759c3c13727d +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/Small_Blood_Splatter.wav b/Assets/Audio/Small_Blood_Splatter.wav new file mode 100644 index 0000000..583c54d Binary files /dev/null and b/Assets/Audio/Small_Blood_Splatter.wav differ diff --git a/Assets/Audio/Small_Blood_Splatter.wav.meta b/Assets/Audio/Small_Blood_Splatter.wav.meta new file mode 100644 index 0000000..fec8d76 --- /dev/null +++ b/Assets/Audio/Small_Blood_Splatter.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 7182af998117fba4fa696e5fd33ad99a +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/Spawn_Projectile_SFX.wav b/Assets/Audio/Spawn_Projectile_SFX.wav new file mode 100644 index 0000000..bbc0fd3 Binary files /dev/null and b/Assets/Audio/Spawn_Projectile_SFX.wav differ diff --git a/Assets/Audio/Spawn_Projectile_SFX.wav.meta b/Assets/Audio/Spawn_Projectile_SFX.wav.meta new file mode 100644 index 0000000..8c26ef8 --- /dev/null +++ b/Assets/Audio/Spawn_Projectile_SFX.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 88b0c2079547b85458daa063fb59e720 +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/Spring_rebound_sfx.wav b/Assets/Audio/Spring_rebound_sfx.wav new file mode 100644 index 0000000..7a58532 Binary files /dev/null and b/Assets/Audio/Spring_rebound_sfx.wav differ diff --git a/Assets/Audio/Spring_rebound_sfx.wav.meta b/Assets/Audio/Spring_rebound_sfx.wav.meta new file mode 100644 index 0000000..9830603 --- /dev/null +++ b/Assets/Audio/Spring_rebound_sfx.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: cabc6f011eda78b47b6e63de34a4c33e +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/stil_1_demo.mp3 b/Assets/Audio/stil_1_demo.mp3 new file mode 100644 index 0000000..a2e5861 Binary files /dev/null and b/Assets/Audio/stil_1_demo.mp3 differ diff --git a/Assets/Audio/stil_1_demo.mp3.meta b/Assets/Audio/stil_1_demo.mp3.meta new file mode 100644 index 0000000..cfbb69f --- /dev/null +++ b/Assets/Audio/stil_1_demo.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 8abb5f3f03f30f842b9d673933bdafb4 +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/stil_2_demo.mp3 b/Assets/Audio/stil_2_demo.mp3 new file mode 100644 index 0000000..3616692 Binary files /dev/null and b/Assets/Audio/stil_2_demo.mp3 differ diff --git a/Assets/Audio/stil_2_demo.mp3.meta b/Assets/Audio/stil_2_demo.mp3.meta new file mode 100644 index 0000000..4eb1846 --- /dev/null +++ b/Assets/Audio/stil_2_demo.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f68b9fed55ed886479faaf1b33c59651 +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/Sounds/temp_blod_smol.wav b/Assets/Audio/temp_blod_smol.wav similarity index 100% rename from Assets/Sounds/temp_blod_smol.wav rename to Assets/Audio/temp_blod_smol.wav diff --git a/Assets/Sounds/temp_blod_smol.wav.meta b/Assets/Audio/temp_blod_smol.wav.meta similarity index 91% rename from Assets/Sounds/temp_blod_smol.wav.meta rename to Assets/Audio/temp_blod_smol.wav.meta index 65ae831..ec46966 100644 --- a/Assets/Sounds/temp_blod_smol.wav.meta +++ b/Assets/Audio/temp_blod_smol.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b27a091fa88210edeb0c964e7072d56e +guid: e24c2fccb4285ab4eacc6da16f5c62eb AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Prefabs/Managers.prefab b/Assets/Prefabs/Managers.prefab new file mode 100644 index 0000000..bc71297 --- /dev/null +++ b/Assets/Prefabs/Managers.prefab @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &809911508645467208 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3032075919872812610} + - component: {fileID: 6372697238776542044} + m_Layer: 0 + m_Name: Managers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3032075919872812610 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809911508645467208} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6372697238776542044 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809911508645467208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d07fc52b48ce953488ecef079872f5b7, type: 3} + m_Name: + m_EditorClassIdentifier: + audioLibrary: {fileID: 0} diff --git a/Assets/Prefabs/Managers.prefab.meta b/Assets/Prefabs/Managers.prefab.meta new file mode 100644 index 0000000..d59a249 --- /dev/null +++ b/Assets/Prefabs/Managers.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ec5007446d8bbca48bf02b3a7e752da1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Enemies/1/Enemy1V1.prefab b/Assets/Resources/Enemies/1/Enemy1V1.prefab index be7e10a..7959dd1 100644 --- a/Assets/Resources/Enemies/1/Enemy1V1.prefab +++ b/Assets/Resources/Enemies/1/Enemy1V1.prefab @@ -258,19 +258,7 @@ MonoBehaviour: damageTickDelay: 1 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/1/Enemy1V2.prefab b/Assets/Resources/Enemies/1/Enemy1V2.prefab index 9c0bfe0..2dc1a03 100644 --- a/Assets/Resources/Enemies/1/Enemy1V2.prefab +++ b/Assets/Resources/Enemies/1/Enemy1V2.prefab @@ -172,19 +172,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: -4060921817738925561} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/1/Enemy1V3.prefab b/Assets/Resources/Enemies/1/Enemy1V3.prefab index 0d2ffd8..6c36ba0 100644 --- a/Assets/Resources/Enemies/1/Enemy1V3.prefab +++ b/Assets/Resources/Enemies/1/Enemy1V3.prefab @@ -256,19 +256,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1169561095041589923} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/2/Enemy2V1.prefab b/Assets/Resources/Enemies/2/Enemy2V1.prefab index de93794..5e27435 100644 --- a/Assets/Resources/Enemies/2/Enemy2V1.prefab +++ b/Assets/Resources/Enemies/2/Enemy2V1.prefab @@ -173,19 +173,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/2/Enemy2V2.prefab b/Assets/Resources/Enemies/2/Enemy2V2.prefab index 78cdbba..d120a01 100644 --- a/Assets/Resources/Enemies/2/Enemy2V2.prefab +++ b/Assets/Resources/Enemies/2/Enemy2V2.prefab @@ -257,19 +257,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/2/Enemy2V3.prefab b/Assets/Resources/Enemies/2/Enemy2V3.prefab index a1b7926..5104818 100644 --- a/Assets/Resources/Enemies/2/Enemy2V3.prefab +++ b/Assets/Resources/Enemies/2/Enemy2V3.prefab @@ -257,19 +257,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/3/Enemy3V1.prefab b/Assets/Resources/Enemies/3/Enemy3V1.prefab index b5d5a02..30a465f 100644 --- a/Assets/Resources/Enemies/3/Enemy3V1.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V1.prefab @@ -173,19 +173,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/3/Enemy3V2.prefab b/Assets/Resources/Enemies/3/Enemy3V2.prefab index 072073d..de18a86 100644 --- a/Assets/Resources/Enemies/3/Enemy3V2.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V2.prefab @@ -257,19 +257,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/3/Enemy3V3.prefab b/Assets/Resources/Enemies/3/Enemy3V3.prefab index 0cab492..13d34c7 100644 --- a/Assets/Resources/Enemies/3/Enemy3V3.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V3.prefab @@ -257,19 +257,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/4/Enemy4V1.prefab b/Assets/Resources/Enemies/4/Enemy4V1.prefab index c652fd6..72e7682 100644 --- a/Assets/Resources/Enemies/4/Enemy4V1.prefab +++ b/Assets/Resources/Enemies/4/Enemy4V1.prefab @@ -173,19 +173,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/4/Enemy4V2.prefab b/Assets/Resources/Enemies/4/Enemy4V2.prefab index 611e25d..c3c1819 100644 --- a/Assets/Resources/Enemies/4/Enemy4V2.prefab +++ b/Assets/Resources/Enemies/4/Enemy4V2.prefab @@ -257,19 +257,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/4/Enemy4V3.prefab b/Assets/Resources/Enemies/4/Enemy4V3.prefab index 8918004..edcd94b 100644 --- a/Assets/Resources/Enemies/4/Enemy4V3.prefab +++ b/Assets/Resources/Enemies/4/Enemy4V3.prefab @@ -257,19 +257,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/5/Enemy5V1.prefab b/Assets/Resources/Enemies/5/Enemy5V1.prefab index c871edf..e60b1d2 100644 --- a/Assets/Resources/Enemies/5/Enemy5V1.prefab +++ b/Assets/Resources/Enemies/5/Enemy5V1.prefab @@ -257,19 +257,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/5/Enemy5V2.prefab b/Assets/Resources/Enemies/5/Enemy5V2.prefab index dd5a613..b677e31 100644 --- a/Assets/Resources/Enemies/5/Enemy5V2.prefab +++ b/Assets/Resources/Enemies/5/Enemy5V2.prefab @@ -257,19 +257,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/5/Enemy5V3.prefab b/Assets/Resources/Enemies/5/Enemy5V3.prefab index f2d71f2..8529e11 100644 --- a/Assets/Resources/Enemies/5/Enemy5V3.prefab +++ b/Assets/Resources/Enemies/5/Enemy5V3.prefab @@ -257,19 +257,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/6/Enemy6V1.prefab b/Assets/Resources/Enemies/6/Enemy6V1.prefab index f415033..d51db18 100644 --- a/Assets/Resources/Enemies/6/Enemy6V1.prefab +++ b/Assets/Resources/Enemies/6/Enemy6V1.prefab @@ -257,19 +257,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/6/Enemy6V2.prefab b/Assets/Resources/Enemies/6/Enemy6V2.prefab index d09ecbf..94120fc 100644 --- a/Assets/Resources/Enemies/6/Enemy6V2.prefab +++ b/Assets/Resources/Enemies/6/Enemy6V2.prefab @@ -257,19 +257,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/6/Enemy6V3.prefab b/Assets/Resources/Enemies/6/Enemy6V3.prefab index 462dc29..fae5c78 100644 --- a/Assets/Resources/Enemies/6/Enemy6V3.prefab +++ b/Assets/Resources/Enemies/6/Enemy6V3.prefab @@ -257,19 +257,7 @@ MonoBehaviour: maxHealth: 100 OnHealthZero: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2938081276856164938} - m_TargetAssemblyTypeName: HealthComponent, Assembly-CSharp - m_MethodName: SimpleKill - 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 + m_Calls: [] OnHealthChange: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index f2b8b1e..eca3066 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -2084,7 +2084,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 204031495618622841, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 205003529639557450, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder @@ -2108,7 +2108,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 345417292443196300, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 370379603216613205, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_LocalPosition.z @@ -2116,7 +2116,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 420829549692533854, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 423948292859570140, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_LocalPosition.z @@ -2136,7 +2136,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 474291289778153799, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 518040811897931976, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_LocalPosition.z @@ -2240,15 +2240,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1188296123961061510, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1226867100941618726, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1248117058607517531, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1286736717778752383, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_LocalPosition.z @@ -2256,7 +2256,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1306166309550745882, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1312114729465446570, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_LocalPosition.z @@ -2264,7 +2264,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1314348416967425078, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1316546630264019081, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_LocalPosition.z @@ -2468,7 +2468,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2688326620934178760, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2701565387734408324, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder @@ -2492,11 +2492,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2777376881448082900, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2843470166969266601, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2882933229648693303, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_LocalPosition.z @@ -2504,7 +2504,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2920273978197248707, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2942913567265352935, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder @@ -2524,7 +2524,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2993179368871176222, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2999611508190862279, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_LocalPosition.z @@ -2540,7 +2540,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3041378549263182524, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3074571989939982763, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_LocalPosition.z @@ -2584,7 +2584,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3462066938274630491, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3477295116748343974, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder @@ -2664,7 +2664,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3950474771491911942, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3959017408888877880, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_LocalPosition.z @@ -2724,7 +2724,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4383944590839174126, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4416801612616111028, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_LocalPosition.z @@ -2900,7 +2900,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5986174645587177288, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5986486668447781465, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder @@ -2976,7 +2976,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6472418518271119051, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6492360292806616209, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_LocalPosition.z @@ -3048,7 +3048,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6666471973930886002, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6666663905502249404, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder @@ -3096,7 +3096,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6906933915959314052, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6910653825163457375, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_LocalPosition.z @@ -3104,7 +3104,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6962854702719475454, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7023027171542066455, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder @@ -3168,7 +3168,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7431070287896591984, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7611708547693650912, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_LocalScale.x @@ -3256,11 +3256,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8355842165208611031, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8412560244844067422, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8445413365583107412, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder @@ -3312,7 +3312,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8563970499245821802, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8564553704292495912, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder @@ -3328,7 +3328,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8658297059646015289, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8731356196972858425, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_LocalPosition.z @@ -3356,7 +3356,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8909691919785108070, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8976660235134063690, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder @@ -3404,7 +3404,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9173635054939707328, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9218726293146434581, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} propertyPath: m_SortingOrder @@ -3903,6 +3903,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2133226119} m_CullTransparentMesh: 1 +--- !u!1001 &1683288374126251321 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 809911508645467208, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + propertyPath: m_Name + value: Managers + objectReference: {fileID: 0} + - target: {fileID: 3032075919872812610, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3032075919872812610, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3032075919872812610, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3032075919872812610, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3032075919872812610, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3032075919872812610, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3032075919872812610, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3032075919872812610, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3032075919872812610, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3032075919872812610, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6372697238776542044, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + propertyPath: audioLibrary + value: + objectReference: {fileID: 11400000, guid: 90a0ccefc407688499165286d0638124, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} --- !u!1001 &5796191506433166633 PrefabInstance: m_ObjectHideFlags: 0 @@ -3927,6 +3988,10 @@ PrefabInstance: propertyPath: players.Array.data[1] value: objectReference: {fileID: 1579580564} + - target: {fileID: 3603265075407754381, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} + propertyPath: difficultyIncreasePerWave + value: 3 + objectReference: {fileID: 0} - target: {fileID: 5959206239141280122, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -3984,13 +4049,25 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 480860136} m_Modifications: + - target: {fileID: 1542618083108825186, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3} + propertyPath: m_SortingOrder + value: -6 + objectReference: {fileID: 0} - target: {fileID: 1675897312316268218, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3} propertyPath: m_Name value: Ground objectReference: {fileID: 0} + - target: {fileID: 2304728685345815097, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3} + propertyPath: m_SortingOrder + value: -6 + objectReference: {fileID: 0} + - target: {fileID: 2860439650859292841, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3} + propertyPath: m_SortingOrder + value: -6 + objectReference: {fileID: 0} - target: {fileID: 3862814901187971034, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0.1 objectReference: {fileID: 0} - target: {fileID: 3862814901187971034, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3} propertyPath: m_LocalPosition.y @@ -4028,6 +4105,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4095421378541226841, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3} + propertyPath: m_SortingOrder + value: -6 + objectReference: {fileID: 0} + - target: {fileID: 6295918847461186183, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3} + propertyPath: m_SortingOrder + value: -6 + objectReference: {fileID: 0} + - target: {fileID: 6548708967788885172, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3} + propertyPath: m_SortingOrder + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6971216474781649168, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3} + propertyPath: m_SortingOrder + value: -6 + objectReference: {fileID: 0} + - target: {fileID: 8733470461950675567, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3} + propertyPath: m_SortingOrder + value: -6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4037,6 +4134,7 @@ PrefabInstance: SceneRoots: m_ObjectHideFlags: 0 m_Roots: + - {fileID: 1683288374126251321} - {fileID: 1377274212} - {fileID: 1600052934} - {fileID: 480860136} diff --git a/Assets/Scripts/Enemy/EnemyAnimationHandler.cs b/Assets/Scripts/Enemy/EnemyAnimationHandler.cs index f9a66c8..f763da9 100644 --- a/Assets/Scripts/Enemy/EnemyAnimationHandler.cs +++ b/Assets/Scripts/Enemy/EnemyAnimationHandler.cs @@ -11,7 +11,23 @@ public class EnemyAnimationHandler : MonoBehaviour if (animator != animator.enabled) animator.enabled = true; + GetComponent().OnHealthZero.AddListener(EnemyDie); } + void EnemyDie() + { + StartCoroutine(AnimationDie()); + } + + IEnumerator AnimationDie() + { + Strangle(); + yield return new WaitForSecondsRealtime(1f); + Die(); + while (animator.GetCurrentAnimatorStateInfo(0).normalizedTime < 1f) + yield return new WaitForEndOfFrame(); + Destroy(gameObject); + } + public void Strangle() { animator.SetTrigger("Die"); @@ -19,5 +35,6 @@ public class EnemyAnimationHandler : MonoBehaviour public void Die() { animator.SetTrigger("Die"); + } } diff --git a/Assets/Scripts/Managers/AudioManager/AudioManager.cs b/Assets/Scripts/Managers/AudioManager/AudioManager.cs index 6954455..b532890 100644 --- a/Assets/Scripts/Managers/AudioManager/AudioManager.cs +++ b/Assets/Scripts/Managers/AudioManager/AudioManager.cs @@ -5,7 +5,6 @@ using System.Linq; using UnityEngine; -//Photon/pun 2 lightly dependent public class AudioManager : MonoBehaviour { public static AudioManager Instance; @@ -33,7 +32,7 @@ public class AudioManager : MonoBehaviour public static AudioClip FindAudioClip(string nameOfClip) { - return Instance.audioLibrary.Clips.ToList().Find(x => x.name == nameOfClip); + return Instance.audioLibrary.Clips.First(x => x.name == nameOfClip); } public static AudioSource PlaySound(string nameOfClip, Vector3 sourcePos, bool is3D, bool loop = false, bool fadeIn = false) diff --git a/Assets/Scripts/Player/HealthComponent.cs b/Assets/Scripts/Player/HealthComponent.cs index 550d44b..15435da 100644 --- a/Assets/Scripts/Player/HealthComponent.cs +++ b/Assets/Scripts/Player/HealthComponent.cs @@ -78,8 +78,9 @@ public class HealthComponent : MonoBehaviour, ISquezeDamageReceiver TakeDamage((int) Mathf.Round(squezeDamage * squezeDamageScalor)); } - public void SimpleKill() + public void EnemyKill() { + Destroy(gameObject); } } diff --git a/Assets/Sounds/squeak.mp3 b/Assets/Sounds/squeak.mp3 deleted file mode 100644 index c9cf31f..0000000 Binary files a/Assets/Sounds/squeak.mp3 and /dev/null differ