diff --git a/Assets/Resources/Audio.meta b/Assets/Audio.meta similarity index 100% rename from Assets/Resources/Audio.meta rename to Assets/Audio.meta diff --git a/Assets/Resources/Audio/AudioLibrary.asset b/Assets/Audio/AudioLibrary.asset similarity index 100% rename from Assets/Resources/Audio/AudioLibrary.asset rename to Assets/Audio/AudioLibrary.asset diff --git a/Assets/Resources/Audio/AudioLibrary.asset.meta b/Assets/Audio/AudioLibrary.asset.meta similarity index 100% rename from Assets/Resources/Audio/AudioLibrary.asset.meta rename to Assets/Audio/AudioLibrary.asset.meta diff --git a/Assets/Resources/Audio/Blood_Splatter_Large_SFX.wav b/Assets/Audio/Blood_Splatter_Large_SFX.wav similarity index 100% rename from Assets/Resources/Audio/Blood_Splatter_Large_SFX.wav rename to Assets/Audio/Blood_Splatter_Large_SFX.wav diff --git a/Assets/Resources/Audio/Blood_Splatter_Large_SFX.wav.meta b/Assets/Audio/Blood_Splatter_Large_SFX.wav.meta similarity index 100% rename from Assets/Resources/Audio/Blood_Splatter_Large_SFX.wav.meta rename to Assets/Audio/Blood_Splatter_Large_SFX.wav.meta diff --git a/Assets/Resources/Audio/Blood_Splatter_Medium_SFX.wav b/Assets/Audio/Blood_Splatter_Medium_SFX.wav similarity index 100% rename from Assets/Resources/Audio/Blood_Splatter_Medium_SFX.wav rename to Assets/Audio/Blood_Splatter_Medium_SFX.wav diff --git a/Assets/Resources/Audio/Blood_Splatter_Medium_SFX.wav.meta b/Assets/Audio/Blood_Splatter_Medium_SFX.wav.meta similarity index 100% rename from Assets/Resources/Audio/Blood_Splatter_Medium_SFX.wav.meta rename to Assets/Audio/Blood_Splatter_Medium_SFX.wav.meta diff --git a/Assets/Resources/Audio/Blood_Splatter_Small.wav b/Assets/Audio/Blood_Splatter_Small.wav similarity index 100% rename from Assets/Resources/Audio/Blood_Splatter_Small.wav rename to Assets/Audio/Blood_Splatter_Small.wav diff --git a/Assets/Resources/Audio/Blood_Splatter_Small.wav.meta b/Assets/Audio/Blood_Splatter_Small.wav.meta similarity index 100% rename from Assets/Resources/Audio/Blood_Splatter_Small.wav.meta rename to Assets/Audio/Blood_Splatter_Small.wav.meta diff --git a/Assets/Resources/Audio/Button_Click_SFX.wav b/Assets/Audio/Button_Click_SFX.wav similarity index 100% rename from Assets/Resources/Audio/Button_Click_SFX.wav rename to Assets/Audio/Button_Click_SFX.wav diff --git a/Assets/Resources/Audio/Button_Click_SFX.wav.meta b/Assets/Audio/Button_Click_SFX.wav.meta similarity index 100% rename from Assets/Resources/Audio/Button_Click_SFX.wav.meta rename to Assets/Audio/Button_Click_SFX.wav.meta diff --git a/Assets/Resources/Audio/Button_Hover_SFX.wav b/Assets/Audio/Button_Hover_SFX.wav similarity index 100% rename from Assets/Resources/Audio/Button_Hover_SFX.wav rename to Assets/Audio/Button_Hover_SFX.wav diff --git a/Assets/Resources/Audio/Button_Hover_SFX.wav.meta b/Assets/Audio/Button_Hover_SFX.wav.meta similarity index 100% rename from Assets/Resources/Audio/Button_Hover_SFX.wav.meta rename to Assets/Audio/Button_Hover_SFX.wav.meta diff --git a/Assets/Resources/Audio/Enemy_Killed_By_Projectile.wav b/Assets/Audio/Enemy_Killed_By_Projectile.wav similarity index 100% rename from Assets/Resources/Audio/Enemy_Killed_By_Projectile.wav rename to Assets/Audio/Enemy_Killed_By_Projectile.wav diff --git a/Assets/Resources/Audio/Enemy_Killed_By_Projectile.wav.meta b/Assets/Audio/Enemy_Killed_By_Projectile.wav.meta similarity index 100% rename from Assets/Resources/Audio/Enemy_Killed_By_Projectile.wav.meta rename to Assets/Audio/Enemy_Killed_By_Projectile.wav.meta diff --git a/Assets/Resources/Audio/Footstep_1.wav b/Assets/Audio/Footstep_1.wav similarity index 100% rename from Assets/Resources/Audio/Footstep_1.wav rename to Assets/Audio/Footstep_1.wav diff --git a/Assets/Resources/Audio/Footstep_1.wav.meta b/Assets/Audio/Footstep_1.wav.meta similarity index 100% rename from Assets/Resources/Audio/Footstep_1.wav.meta rename to Assets/Audio/Footstep_1.wav.meta diff --git a/Assets/Resources/Audio/Footstep_2.wav b/Assets/Audio/Footstep_2.wav similarity index 100% rename from Assets/Resources/Audio/Footstep_2.wav rename to Assets/Audio/Footstep_2.wav diff --git a/Assets/Resources/Audio/Footstep_2.wav.meta b/Assets/Audio/Footstep_2.wav.meta similarity index 100% rename from Assets/Resources/Audio/Footstep_2.wav.meta rename to Assets/Audio/Footstep_2.wav.meta diff --git a/Assets/Resources/Audio/Footstep_3.wav b/Assets/Audio/Footstep_3.wav similarity index 100% rename from Assets/Resources/Audio/Footstep_3.wav rename to Assets/Audio/Footstep_3.wav diff --git a/Assets/Resources/Audio/Footstep_3.wav.meta b/Assets/Audio/Footstep_3.wav.meta similarity index 100% rename from Assets/Resources/Audio/Footstep_3.wav.meta rename to Assets/Audio/Footstep_3.wav.meta diff --git a/Assets/Resources/Audio/Footstep_4.wav b/Assets/Audio/Footstep_4.wav similarity index 100% rename from Assets/Resources/Audio/Footstep_4.wav rename to Assets/Audio/Footstep_4.wav diff --git a/Assets/Resources/Audio/Footstep_4.wav.meta b/Assets/Audio/Footstep_4.wav.meta similarity index 100% rename from Assets/Resources/Audio/Footstep_4.wav.meta rename to Assets/Audio/Footstep_4.wav.meta diff --git a/Assets/Resources/Audio/Footstep_5.wav b/Assets/Audio/Footstep_5.wav similarity index 100% rename from Assets/Resources/Audio/Footstep_5.wav rename to Assets/Audio/Footstep_5.wav diff --git a/Assets/Resources/Audio/Footstep_5.wav.meta b/Assets/Audio/Footstep_5.wav.meta similarity index 100% rename from Assets/Resources/Audio/Footstep_5.wav.meta rename to Assets/Audio/Footstep_5.wav.meta diff --git a/Assets/Resources/Audio/Ingame_Theme.wav b/Assets/Audio/Ingame_Theme.wav similarity index 100% rename from Assets/Resources/Audio/Ingame_Theme.wav rename to Assets/Audio/Ingame_Theme.wav diff --git a/Assets/Resources/Audio/Ingame_Theme.wav.meta b/Assets/Audio/Ingame_Theme.wav.meta similarity index 100% rename from Assets/Resources/Audio/Ingame_Theme.wav.meta rename to Assets/Audio/Ingame_Theme.wav.meta diff --git a/Assets/Resources/Audio/Ingame_demo_1_very_early_accesssss.mp3 b/Assets/Audio/Ingame_demo_1_very_early_accesssss.mp3 similarity index 100% rename from Assets/Resources/Audio/Ingame_demo_1_very_early_accesssss.mp3 rename to Assets/Audio/Ingame_demo_1_very_early_accesssss.mp3 diff --git a/Assets/Resources/Audio/Ingame_demo_1_very_early_accesssss.mp3.meta b/Assets/Audio/Ingame_demo_1_very_early_accesssss.mp3.meta similarity index 100% rename from Assets/Resources/Audio/Ingame_demo_1_very_early_accesssss.mp3.meta rename to Assets/Audio/Ingame_demo_1_very_early_accesssss.mp3.meta diff --git a/Assets/Resources/Audio/Intro_Flatline(1).wav b/Assets/Audio/Intro_Flatline(1).wav similarity index 100% rename from Assets/Resources/Audio/Intro_Flatline(1).wav rename to Assets/Audio/Intro_Flatline(1).wav diff --git a/Assets/Resources/Audio/Intro_Flatline(1).wav.meta b/Assets/Audio/Intro_Flatline(1).wav.meta similarity index 100% rename from Assets/Resources/Audio/Intro_Flatline(1).wav.meta rename to Assets/Audio/Intro_Flatline(1).wav.meta diff --git a/Assets/Resources/Audio/Intro_Flatline.wav b/Assets/Audio/Intro_Flatline.wav similarity index 100% rename from Assets/Resources/Audio/Intro_Flatline.wav rename to Assets/Audio/Intro_Flatline.wav diff --git a/Assets/Resources/Audio/Intro_Flatline.wav.meta b/Assets/Audio/Intro_Flatline.wav.meta similarity index 100% rename from Assets/Resources/Audio/Intro_Flatline.wav.meta rename to Assets/Audio/Intro_Flatline.wav.meta diff --git a/Assets/Resources/Audio/MOP_test.wav b/Assets/Audio/MOP_test.wav similarity index 100% rename from Assets/Resources/Audio/MOP_test.wav rename to Assets/Audio/MOP_test.wav diff --git a/Assets/Resources/Audio/MOP_test.wav.meta b/Assets/Audio/MOP_test.wav.meta similarity index 100% rename from Assets/Resources/Audio/MOP_test.wav.meta rename to Assets/Audio/MOP_test.wav.meta diff --git a/Assets/Resources/Audio/Menu_Theme.wav b/Assets/Audio/Menu_Theme.wav similarity index 100% rename from Assets/Resources/Audio/Menu_Theme.wav rename to Assets/Audio/Menu_Theme.wav diff --git a/Assets/Resources/Audio/Menu_Theme.wav.meta b/Assets/Audio/Menu_Theme.wav.meta similarity index 100% rename from Assets/Resources/Audio/Menu_Theme.wav.meta rename to Assets/Audio/Menu_Theme.wav.meta diff --git a/Assets/Resources/Audio/Menu_Whistle_Intro.wav b/Assets/Audio/Menu_Whistle_Intro.wav similarity index 100% rename from Assets/Resources/Audio/Menu_Whistle_Intro.wav rename to Assets/Audio/Menu_Whistle_Intro.wav diff --git a/Assets/Resources/Audio/Menu_Whistle_Intro.wav.meta b/Assets/Audio/Menu_Whistle_Intro.wav.meta similarity index 100% rename from Assets/Resources/Audio/Menu_Whistle_Intro.wav.meta rename to Assets/Audio/Menu_Whistle_Intro.wav.meta diff --git a/Assets/Resources/Audio/Mopping_SFX.wav b/Assets/Audio/Mopping_SFX.wav similarity index 100% rename from Assets/Resources/Audio/Mopping_SFX.wav rename to Assets/Audio/Mopping_SFX.wav diff --git a/Assets/Resources/Audio/Mopping_SFX.wav.meta b/Assets/Audio/Mopping_SFX.wav.meta similarity index 100% rename from Assets/Resources/Audio/Mopping_SFX.wav.meta rename to Assets/Audio/Mopping_SFX.wav.meta diff --git a/Assets/Resources/Audio/Player_Damage_SFX.wav b/Assets/Audio/Player_Damage_SFX.wav similarity index 100% rename from Assets/Resources/Audio/Player_Damage_SFX.wav rename to Assets/Audio/Player_Damage_SFX.wav diff --git a/Assets/Resources/Audio/Player_Damage_SFX.wav.meta b/Assets/Audio/Player_Damage_SFX.wav.meta similarity index 100% rename from Assets/Resources/Audio/Player_Damage_SFX.wav.meta rename to Assets/Audio/Player_Damage_SFX.wav.meta diff --git a/Assets/Resources/Audio/Rette_spor_question_mark.wav b/Assets/Audio/Rette_spor_question_mark.wav similarity index 100% rename from Assets/Resources/Audio/Rette_spor_question_mark.wav rename to Assets/Audio/Rette_spor_question_mark.wav diff --git a/Assets/Resources/Audio/Rette_spor_question_mark.wav.meta b/Assets/Audio/Rette_spor_question_mark.wav.meta similarity index 100% rename from Assets/Resources/Audio/Rette_spor_question_mark.wav.meta rename to Assets/Audio/Rette_spor_question_mark.wav.meta diff --git a/Assets/Resources/Audio/Rette_spor_question_mark2.wav b/Assets/Audio/Rette_spor_question_mark2.wav similarity index 100% rename from Assets/Resources/Audio/Rette_spor_question_mark2.wav rename to Assets/Audio/Rette_spor_question_mark2.wav diff --git a/Assets/Resources/Audio/Rette_spor_question_mark2.wav.meta b/Assets/Audio/Rette_spor_question_mark2.wav.meta similarity index 100% rename from Assets/Resources/Audio/Rette_spor_question_mark2.wav.meta rename to Assets/Audio/Rette_spor_question_mark2.wav.meta diff --git a/Assets/Resources/Audio/Revive_SFX.wav b/Assets/Audio/Revive_SFX.wav similarity index 100% rename from Assets/Resources/Audio/Revive_SFX.wav rename to Assets/Audio/Revive_SFX.wav diff --git a/Assets/Resources/Audio/Revive_SFX.wav.meta b/Assets/Audio/Revive_SFX.wav.meta similarity index 100% rename from Assets/Resources/Audio/Revive_SFX.wav.meta rename to Assets/Audio/Revive_SFX.wav.meta diff --git a/Assets/Resources/Audio/Rope_Tight_SFX.wav b/Assets/Audio/Rope_Tight_SFX.wav similarity index 100% rename from Assets/Resources/Audio/Rope_Tight_SFX.wav rename to Assets/Audio/Rope_Tight_SFX.wav diff --git a/Assets/Resources/Audio/Rope_Tight_SFX.wav.meta b/Assets/Audio/Rope_Tight_SFX.wav.meta similarity index 100% rename from Assets/Resources/Audio/Rope_Tight_SFX.wav.meta rename to Assets/Audio/Rope_Tight_SFX.wav.meta diff --git a/Assets/Resources/Audio/Slice_Enemy_SFX.wav b/Assets/Audio/Slice_Enemy_SFX.wav similarity index 100% rename from Assets/Resources/Audio/Slice_Enemy_SFX.wav rename to Assets/Audio/Slice_Enemy_SFX.wav diff --git a/Assets/Resources/Audio/Slice_Enemy_SFX.wav.meta b/Assets/Audio/Slice_Enemy_SFX.wav.meta similarity index 100% rename from Assets/Resources/Audio/Slice_Enemy_SFX.wav.meta rename to Assets/Audio/Slice_Enemy_SFX.wav.meta diff --git a/Assets/Resources/Audio/Small_Blood_Splatter.wav b/Assets/Audio/Small_Blood_Splatter.wav similarity index 100% rename from Assets/Resources/Audio/Small_Blood_Splatter.wav rename to Assets/Audio/Small_Blood_Splatter.wav diff --git a/Assets/Resources/Audio/Small_Blood_Splatter.wav.meta b/Assets/Audio/Small_Blood_Splatter.wav.meta similarity index 100% rename from Assets/Resources/Audio/Small_Blood_Splatter.wav.meta rename to Assets/Audio/Small_Blood_Splatter.wav.meta diff --git a/Assets/Resources/Audio/Spawn_Projectile_SFX.wav b/Assets/Audio/Spawn_Projectile_SFX.wav similarity index 100% rename from Assets/Resources/Audio/Spawn_Projectile_SFX.wav rename to Assets/Audio/Spawn_Projectile_SFX.wav diff --git a/Assets/Resources/Audio/Spawn_Projectile_SFX.wav.meta b/Assets/Audio/Spawn_Projectile_SFX.wav.meta similarity index 100% rename from Assets/Resources/Audio/Spawn_Projectile_SFX.wav.meta rename to Assets/Audio/Spawn_Projectile_SFX.wav.meta diff --git a/Assets/Resources/Audio/Spring_rebound_sfx.wav b/Assets/Audio/Spring_rebound_sfx.wav similarity index 100% rename from Assets/Resources/Audio/Spring_rebound_sfx.wav rename to Assets/Audio/Spring_rebound_sfx.wav diff --git a/Assets/Resources/Audio/Spring_rebound_sfx.wav.meta b/Assets/Audio/Spring_rebound_sfx.wav.meta similarity index 100% rename from Assets/Resources/Audio/Spring_rebound_sfx.wav.meta rename to Assets/Audio/Spring_rebound_sfx.wav.meta diff --git a/Assets/Resources/Audio/stil_1_demo.mp3 b/Assets/Audio/stil_1_demo.mp3 similarity index 100% rename from Assets/Resources/Audio/stil_1_demo.mp3 rename to Assets/Audio/stil_1_demo.mp3 diff --git a/Assets/Resources/Audio/stil_1_demo.mp3.meta b/Assets/Audio/stil_1_demo.mp3.meta similarity index 100% rename from Assets/Resources/Audio/stil_1_demo.mp3.meta rename to Assets/Audio/stil_1_demo.mp3.meta diff --git a/Assets/Resources/Audio/stil_2_demo.mp3 b/Assets/Audio/stil_2_demo.mp3 similarity index 100% rename from Assets/Resources/Audio/stil_2_demo.mp3 rename to Assets/Audio/stil_2_demo.mp3 diff --git a/Assets/Resources/Audio/stil_2_demo.mp3.meta b/Assets/Audio/stil_2_demo.mp3.meta similarity index 100% rename from Assets/Resources/Audio/stil_2_demo.mp3.meta rename to Assets/Audio/stil_2_demo.mp3.meta diff --git a/Assets/Resources/Audio/temp_blod_smol.wav b/Assets/Audio/temp_blod_smol.wav similarity index 100% rename from Assets/Resources/Audio/temp_blod_smol.wav rename to Assets/Audio/temp_blod_smol.wav diff --git a/Assets/Resources/Audio/temp_blod_smol.wav.meta b/Assets/Audio/temp_blod_smol.wav.meta similarity index 100% rename from Assets/Resources/Audio/temp_blod_smol.wav.meta rename to Assets/Audio/temp_blod_smol.wav.meta diff --git a/Assets/Prefabs/Managers.prefab b/Assets/Prefabs/Managers.prefab index 5dad033..bc71297 100644 --- a/Assets/Prefabs/Managers.prefab +++ b/Assets/Prefabs/Managers.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3032075919872812610} + - component: {fileID: 6372697238776542044} m_Layer: 0 m_Name: Managers m_TagString: Untagged @@ -31,3 +32,16 @@ Transform: 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/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 3f1073c..16abbf1 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -3842,6 +3842,10 @@ PrefabInstance: 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: [] diff --git a/Assets/Sounds.meta b/Assets/Sounds.meta deleted file mode 100644 index 2d2decb..0000000 --- a/Assets/Sounds.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 156fccd200883fd9aba8bda19039532e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: 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 diff --git a/Assets/Sounds/squeak.mp3.meta b/Assets/Sounds/squeak.mp3.meta deleted file mode 100644 index e9afdb2..0000000 --- a/Assets/Sounds/squeak.mp3.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: 06f8108a8e1a3b9aeb66dff63dd1e112 -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/Sounds/temp_blod_smol.wav deleted file mode 100644 index c74dfdc..0000000 Binary files a/Assets/Sounds/temp_blod_smol.wav and /dev/null differ diff --git a/Assets/Sounds/temp_blod_smol.wav.meta b/Assets/Sounds/temp_blod_smol.wav.meta deleted file mode 100644 index 65ae831..0000000 --- a/Assets/Sounds/temp_blod_smol.wav.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: b27a091fa88210edeb0c964e7072d56e -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: