diff --git a/Assets/Art Assets/Sound/SFX/Bubbles.wav b/Assets/Art Assets/Sound/SFX/Bubbles.wav new file mode 100644 index 0000000..8252dd4 --- /dev/null +++ b/Assets/Art Assets/Sound/SFX/Bubbles.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39cfbab9bf6f2d674f60dc0256c56c96a274228aa06601aba8448321d9cf5003 +size 852012 diff --git a/Assets/Art Assets/Sound/SFX/Bubbles.wav.meta b/Assets/Art Assets/Sound/SFX/Bubbles.wav.meta new file mode 100644 index 0000000..d9668d4 --- /dev/null +++ b/Assets/Art Assets/Sound/SFX/Bubbles.wav.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: 11663ba7809f4aa45995d75901b53577 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 4: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 3 + quality: 1 + conversionMode: 0 + 7: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Sound/SFX/Death by Bubbles.m4a b/Assets/Art Assets/Sound/SFX/Death by Bubbles.m4a deleted file mode 100644 index d962bfb..0000000 Binary files a/Assets/Art Assets/Sound/SFX/Death by Bubbles.m4a and /dev/null differ diff --git a/Assets/Art Assets/Sound/SFX/Moose.m4a b/Assets/Art Assets/Sound/SFX/Moose.m4a deleted file mode 100644 index 1c00261..0000000 Binary files a/Assets/Art Assets/Sound/SFX/Moose.m4a and /dev/null differ diff --git a/Assets/Art Assets/Sound/SFX/Moose.m4a.meta b/Assets/Art Assets/Sound/SFX/Moose.m4a.meta deleted file mode 100644 index 5b14acf..0000000 --- a/Assets/Art Assets/Sound/SFX/Moose.m4a.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2da7414b340831347833b9f5052daff9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Art Assets/Sound/SFX/Moose.wav b/Assets/Art Assets/Sound/SFX/Moose.wav new file mode 100644 index 0000000..6838fae --- /dev/null +++ b/Assets/Art Assets/Sound/SFX/Moose.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7583ad81ed6680421ccef2e9ac5fadb9cab0c9331cd3a2d85019e69b0d9c2bb3 +size 614444 diff --git a/Assets/Art Assets/Sound/SFX/Moose.wav.meta b/Assets/Art Assets/Sound/SFX/Moose.wav.meta new file mode 100644 index 0000000..29cdb85 --- /dev/null +++ b/Assets/Art Assets/Sound/SFX/Moose.wav.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: fbd9f7d460551bc4d9eec8e9176e11eb +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 4: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 3 + quality: 1 + conversionMode: 0 + 7: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Sound/SFX/Spikes.m4a b/Assets/Art Assets/Sound/SFX/Spikes.m4a deleted file mode 100644 index e554fda..0000000 Binary files a/Assets/Art Assets/Sound/SFX/Spikes.m4a and /dev/null differ diff --git a/Assets/Art Assets/Sound/SFX/Spikes.m4a.meta b/Assets/Art Assets/Sound/SFX/Spikes.m4a.meta deleted file mode 100644 index 16a1b1f..0000000 --- a/Assets/Art Assets/Sound/SFX/Spikes.m4a.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a1f366c5983d2964bb552e793299244a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Art Assets/Sound/SFX/Spikes.wav b/Assets/Art Assets/Sound/SFX/Spikes.wav index b8d3d01..74d717a 100644 --- a/Assets/Art Assets/Sound/SFX/Spikes.wav +++ b/Assets/Art Assets/Sound/SFX/Spikes.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50671c6b1429be59a0344e11eaed82f267cf8ffb877c3d9dbde899d8952a4fcf -size 353536 +oid sha256:8567447830872c0db3e9552401768f29cf6d3277a9d67db795261b527a4e813a +size 368684 diff --git a/Assets/Art Assets/Sound/SFX/Wail 1.m4a b/Assets/Art Assets/Sound/SFX/Wail 1.m4a deleted file mode 100644 index 1c34e48..0000000 Binary files a/Assets/Art Assets/Sound/SFX/Wail 1.m4a and /dev/null differ diff --git a/Assets/Art Assets/Sound/SFX/Wail 1.m4a.meta b/Assets/Art Assets/Sound/SFX/Wail 1.m4a.meta deleted file mode 100644 index ef358bd..0000000 --- a/Assets/Art Assets/Sound/SFX/Wail 1.m4a.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 93db27fcc9fc5a94f867db8beb2f1749 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Art Assets/Sound/SFX/Wail 1.wav b/Assets/Art Assets/Sound/SFX/Wail 1.wav new file mode 100644 index 0000000..2a9e574 --- /dev/null +++ b/Assets/Art Assets/Sound/SFX/Wail 1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fedbff54a260a9a3092419cfb4bd565162623c9f60819b9ebfd3eb025d08f2e6 +size 446508 diff --git a/Assets/Art Assets/Sound/SFX/Wail 1.wav.meta b/Assets/Art Assets/Sound/SFX/Wail 1.wav.meta new file mode 100644 index 0000000..3bc7f14 --- /dev/null +++ b/Assets/Art Assets/Sound/SFX/Wail 1.wav.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: 1a74f1ff24f65654997e85bcf3ca03fa +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 4: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 3 + quality: 1 + conversionMode: 0 + 7: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Sound/SFX/Wail 2.m4a b/Assets/Art Assets/Sound/SFX/Wail 2.m4a deleted file mode 100644 index c9c6ee4..0000000 Binary files a/Assets/Art Assets/Sound/SFX/Wail 2.m4a and /dev/null differ diff --git a/Assets/Art Assets/Sound/SFX/Wail 2.m4a.meta b/Assets/Art Assets/Sound/SFX/Wail 2.m4a.meta deleted file mode 100644 index 5ad07aa..0000000 --- a/Assets/Art Assets/Sound/SFX/Wail 2.m4a.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 16a34df2e332cc34e843f978891aaf61 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Art Assets/Sound/SFX/Wail 2.wav b/Assets/Art Assets/Sound/SFX/Wail 2.wav new file mode 100644 index 0000000..43e93eb --- /dev/null +++ b/Assets/Art Assets/Sound/SFX/Wail 2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58a59bd1060dcd4d153119451ec614437921d1b411627204b13f53432c5a5768 +size 360492 diff --git a/Assets/Art Assets/Sound/SFX/Wail 2.wav.meta b/Assets/Art Assets/Sound/SFX/Wail 2.wav.meta new file mode 100644 index 0000000..b815736 --- /dev/null +++ b/Assets/Art Assets/Sound/SFX/Wail 2.wav.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: 12af1f5dccd0f3542917bf567276dca6 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 4: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 3 + quality: 1 + conversionMode: 0 + 7: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Sound/SFX/Wail 3.m4a b/Assets/Art Assets/Sound/SFX/Wail 3.m4a deleted file mode 100644 index fbf1cf0..0000000 Binary files a/Assets/Art Assets/Sound/SFX/Wail 3.m4a and /dev/null differ diff --git a/Assets/Art Assets/Sound/SFX/Wail 3.m4a.meta b/Assets/Art Assets/Sound/SFX/Wail 3.m4a.meta deleted file mode 100644 index 3cb1491..0000000 --- a/Assets/Art Assets/Sound/SFX/Wail 3.m4a.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b28cb801e315a014d87e36bb653afc6e -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Art Assets/Sound/SFX/Wail 3.wav b/Assets/Art Assets/Sound/SFX/Wail 3.wav new file mode 100644 index 0000000..343fe32 --- /dev/null +++ b/Assets/Art Assets/Sound/SFX/Wail 3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75ca9bf3653ccfbec7d60997263e12aed7e77b6fb255431d53f422c1a7dea84b +size 430124 diff --git a/Assets/Art Assets/Sound/SFX/Wail 3.wav.meta b/Assets/Art Assets/Sound/SFX/Wail 3.wav.meta new file mode 100644 index 0000000..2f21a9f --- /dev/null +++ b/Assets/Art Assets/Sound/SFX/Wail 3.wav.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: 6f2f464b02926f44f8fa5b53f025fa11 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 4: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 3 + quality: 1 + conversionMode: 0 + 7: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Sound/SFX/jump.wav b/Assets/Art Assets/Sound/SFX/jump.wav new file mode 100644 index 0000000..aad72e0 --- /dev/null +++ b/Assets/Art Assets/Sound/SFX/jump.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a842b6e3c52519a15223ab7e4e7ad4f08fb9856009a0609475a2ec922ea2012d +size 14710 diff --git a/Assets/Art Assets/Sound/SFX/jump.wav.meta b/Assets/Art Assets/Sound/SFX/jump.wav.meta new file mode 100644 index 0000000..b6b2f96 --- /dev/null +++ b/Assets/Art Assets/Sound/SFX/jump.wav.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: bffb6f938c9fac646a5a89ce20cf9784 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 4: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 3 + quality: 1 + conversionMode: 0 + 7: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Sound/SFX/land.wav b/Assets/Art Assets/Sound/SFX/land.wav new file mode 100644 index 0000000..b7c0d8f --- /dev/null +++ b/Assets/Art Assets/Sound/SFX/land.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2feea36607c36de08c3d502732b1645e67f30beacb933c7cef9d6e4ec684f455 +size 3914 diff --git a/Assets/Art Assets/Sound/SFX/land.wav.meta b/Assets/Art Assets/Sound/SFX/land.wav.meta new file mode 100644 index 0000000..a273b36 --- /dev/null +++ b/Assets/Art Assets/Sound/SFX/land.wav.meta @@ -0,0 +1,36 @@ +fileFormatVersion: 2 +guid: a65d6f4ee7e4f434e90abae4c80a20fb +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 0 + quality: 1 + conversionMode: 0 + platformSettingOverrides: + 4: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 3 + quality: 1 + conversionMode: 0 + 7: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/UI/Arrow Keys.png.meta b/Assets/Art Assets/Textures/UI/Arrow Keys.png.meta index 5fbfa7a..be5022c 100644 --- a/Assets/Art Assets/Textures/UI/Arrow Keys.png.meta +++ b/Assets/Art Assets/Textures/UI/Arrow Keys.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 8a23e75d544e7154ca3b6e33c7feaff3 +guid: 726fd95ca373d3248a57a14c7d0532ae TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,7 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 1 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -32,16 +32,16 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: 1 aniso: 2 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,9 +50,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -123,25 +123,13 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: diff --git a/Assets/Art Assets/Textures/UI/WASD Empty.png.meta b/Assets/Art Assets/Textures/UI/WASD Empty.png.meta index 1c2aad8..9478b2b 100644 --- a/Assets/Art Assets/Textures/UI/WASD Empty.png.meta +++ b/Assets/Art Assets/Textures/UI/WASD Empty.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 3b602cd9815cf5342b732566bbeefbb8 +guid: 33920aea8c0cbdb48b5fba14844962f4 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,7 +20,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 1 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -32,27 +32,27 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: 1 aniso: 2 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 1, y: 1, z: 1, w: 1} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -123,25 +123,13 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 8192 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: diff --git a/Assets/Art Assets/Tiles/Environment/DarkCastle/DarkCastle.prefab b/Assets/Art Assets/Tiles/Environment/DarkCastle/DarkCastle.prefab index 0a47e1e..8289f68 100644 --- a/Assets/Art Assets/Tiles/Environment/DarkCastle/DarkCastle.prefab +++ b/Assets/Art Assets/Tiles/Environment/DarkCastle/DarkCastle.prefab @@ -145,36 +145,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -4, y: 2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 31 - m_TileSpriteIndex: 4294967295 - m_TileMatrixIndex: 2 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -3, y: 2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 32 - m_TileSpriteIndex: 4294967295 - m_TileMatrixIndex: 2 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -2, y: 2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 33 - m_TileSpriteIndex: 4294967295 - m_TileMatrixIndex: 2 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: -6, y: 3, z: 0} second: serializedVersion: 2 @@ -579,12 +549,12 @@ Tilemap: m_Data: {fileID: 11400000, guid: eb5ddf22e6f14a44486b5b17a727a017, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: ce562978a15d99049bff2ec05706bff0, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 5e1bf77115502d542b5a27af5f0a9d20, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: e62437393bcd29b4eb2367e2af0f8993, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 5e20722eb5a14d541a883ae6b814d959, type: 2} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: de0da1b32039d8c47a1fac19dca06dfd, type: 2} - m_RefCount: 1 @@ -688,6 +658,8 @@ Tilemap: m_Data: {fileID: 3274938886112375931, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 m_Data: {fileID: -1078892822073738303, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} m_TileMatrixArray: - m_RefCount: 0 m_Data: @@ -725,7 +697,7 @@ Tilemap: e31: 0 e32: 4.5905e-41 e33: 5.8e-43 - - m_RefCount: 43 + - m_RefCount: 40 m_Data: e00: 1 e01: 0 @@ -744,8 +716,14 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 43 + - m_RefCount: 40 m_Data: {r: 1, g: 1, b: 1, a: 1} + - m_RefCount: 0 + m_Data: {r: -8.322315e-26, g: -8.322315e-26, b: -8.322315e-26, a: -8.322315e-26} + - m_RefCount: 0 + m_Data: {r: -8.322315e-26, g: -8.322315e-26, b: -8.322315e-26, a: -8.322315e-26} + - m_RefCount: 0 + m_Data: {r: -8.322315e-26, g: -8.322315e-26, b: -8.322315e-26, a: -8.322315e-26} m_TileObjectToInstantiateArray: - m_RefCount: 0 m_Data: {fileID: 0} @@ -813,14 +791,14 @@ TilemapRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 0.7950001, y: 1.4256251, z: 0} + m_ChunkCullingBounds: {x: 1, y: 1.4256251, z: 0} m_MaxChunkCount: 16 m_MaxFrameAge: 16 m_SortOrder: 0 m_Mode: 0 m_DetectChunkCullingBounds: 0 m_MaskInteraction: 0 ---- !u!114 &8879933024101859601 +--- !u!114 &3605636499598611819 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset.meta b/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset.meta index 2a1d19a..1b31580 100644 --- a/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset.meta +++ b/Assets/Art Assets/Tiles/Environment/Death/Spikes.asset.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 074912d52a78cb14ead26e018f885e97 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Prefabs/Level Manager.prefab b/Assets/Prefabs/Level Manager.prefab index b85d1f0..420d06a 100644 --- a/Assets/Prefabs/Level Manager.prefab +++ b/Assets/Prefabs/Level Manager.prefab @@ -993,8 +993,8 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 26b05661b72f11741a80e5126f2256f2, type: 3} m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 + m_Volume: 0.25 + m_Pitch: 1.1 Loop: 1 Mute: 0 Spatialize: 0 diff --git a/Assets/Prefabs/Monster.prefab b/Assets/Prefabs/Monster.prefab index 6683cad..785adee 100644 --- a/Assets/Prefabs/Monster.prefab +++ b/Assets/Prefabs/Monster.prefab @@ -81,7 +81,7 @@ GameObject: - component: {fileID: 8153717063344422898} m_Layer: 0 m_Name: Monster_Remake 2 - m_TagString: Untagged + m_TagString: Moose m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -292,7 +292,7 @@ GameObject: - component: {fileID: 8153717063755334254} m_Layer: 0 m_Name: Monster_Remake 1 - m_TagString: Untagged + m_TagString: Moose m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -439,7 +439,7 @@ GameObject: - component: {fileID: 8153717063860972747} m_Layer: 0 m_Name: Monster - m_TagString: Untagged + m_TagString: Moose m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -455,8 +455,8 @@ Transform: m_LocalPosition: {x: -8.64, y: -6.937, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8153717064370397267} - {fileID: 8153717064551339369} + - {fileID: 8153717064370397267} - {fileID: 8153717063755334255} - {fileID: 8153717063344422899} m_Father: {fileID: 0} @@ -632,12 +632,12 @@ GameObject: - component: {fileID: 8153717064370397266} - component: {fileID: 8153717064370397265} m_Layer: 0 - m_Name: Monster_Idle - m_TagString: Untagged + m_Name: Monster_Remake 0 + m_TagString: Moose m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &8153717064370397267 Transform: m_ObjectHideFlags: 0 @@ -651,7 +651,7 @@ Transform: m_Children: - {fileID: 8153717064227352809} m_Father: {fileID: 8153717063860972740} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8153717064370397260 SpriteRenderer: @@ -769,12 +769,12 @@ GameObject: - component: {fileID: 8153717064551339368} - component: {fileID: 8153717064551339375} m_Layer: 0 - m_Name: Monster_Remake 0 + m_Name: Monster_Idle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &8153717064551339369 Transform: m_ObjectHideFlags: 0 @@ -788,7 +788,7 @@ Transform: m_Children: - {fileID: 8153717063737432819} m_Father: {fileID: 8153717063860972740} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8153717064551339370 SpriteRenderer: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 43913b1..fd032c7 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -280,9 +280,13 @@ MonoBehaviour: m_useLocal: 0 m_localValue: 0 m_animator: {fileID: 4668322655423991002} - m_DeathSound: {fileID: 0} - m_VictoryClip: {fileID: 0} - m_JumpSound: {fileID: 0} + m_DeathSound: {fileID: 8300000, guid: 12af1f5dccd0f3542917bf567276dca6, type: 3} + m_VictoryClip: {fileID: 8300000, guid: 25300bf305e2f6e49a92b4a22d34ad6b, type: 3} + m_JumpSound: {fileID: 8300000, guid: bffb6f938c9fac646a5a89ce20cf9784, type: 3} + m_LandSound: {fileID: 8300000, guid: a65d6f4ee7e4f434e90abae4c80a20fb, type: 3} + m_SpikeSound: {fileID: 8300000, guid: 3342524d5a4ccda4283d0a1afdaf6307, type: 3} + m_PoisonSound: {fileID: 8300000, guid: 11663ba7809f4aa45995d75901b53577, type: 3} + m_MooseSound: {fileID: 8300000, guid: fbd9f7d460551bc4d9eec8e9176e11eb, type: 3} m_speed: 2 --- !u!95 &4668322654876184631 Animator: diff --git a/Assets/Prefabs/Poison_collider.prefab b/Assets/Prefabs/Poison_collider.prefab new file mode 100644 index 0000000..149ac25 --- /dev/null +++ b/Assets/Prefabs/Poison_collider.prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2154476793473934435 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1980415253054155446} + - component: {fileID: 4516277136031929514} + m_Layer: 0 + m_Name: Poison_collider + m_TagString: Poison + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1980415253054155446 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2154476793473934435} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.43, y: -0.52, z: -10.397948} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &4516277136031929514 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2154476793473934435} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 1.0333968, y: 0.023756295} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 3.0667937, y: 0.9524874} + m_EdgeRadius: 0 diff --git a/Assets/Prefabs/spikes_3.prefab.meta b/Assets/Prefabs/Poison_collider.prefab.meta similarity index 74% rename from Assets/Prefabs/spikes_3.prefab.meta rename to Assets/Prefabs/Poison_collider.prefab.meta index 6ff7f94..2a16d16 100644 --- a/Assets/Prefabs/spikes_3.prefab.meta +++ b/Assets/Prefabs/Poison_collider.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bbc251b61efff9b49a4a402c3cdc304c +guid: afe64e51e03cfa1469e671d4172f52f4 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Spikes_collider.prefab b/Assets/Prefabs/Spikes_collider.prefab new file mode 100644 index 0000000..7a82480 --- /dev/null +++ b/Assets/Prefabs/Spikes_collider.prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5152073237699574872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5152073237699574874} + - component: {fileID: 5152073237699574873} + m_Layer: 0 + m_Name: Spikes_collider + m_TagString: Spikes + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5152073237699574874 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5152073237699574872} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.43, y: -0.52, z: -10.397948} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &5152073237699574873 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5152073237699574872} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 1.0333968, y: 0.023756295} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 3.0667937, y: 0.9524874} + m_EdgeRadius: 0 diff --git a/Assets/Art Assets/Sound/SFX/Death by Bubbles.m4a.meta b/Assets/Prefabs/Spikes_collider.prefab.meta similarity index 63% rename from Assets/Art Assets/Sound/SFX/Death by Bubbles.m4a.meta rename to Assets/Prefabs/Spikes_collider.prefab.meta index 1cbc065..df11d9b 100644 --- a/Assets/Art Assets/Sound/SFX/Death by Bubbles.m4a.meta +++ b/Assets/Prefabs/Spikes_collider.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 0cad3f85e92e64147b21b6c3a03a88df -DefaultImporter: +guid: 850bab5fba35f5d4a935d9ee85025bc3 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Prefabs/spikes_3.prefab b/Assets/Prefabs/spikes_3.prefab deleted file mode 100644 index ad11019..0000000 --- a/Assets/Prefabs/spikes_3.prefab +++ /dev/null @@ -1,211 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2568405382520894643 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8078117592371321287} - - component: {fileID: 1043124044502169818} - - component: {fileID: 1793437425226485100} - - component: {fileID: 5792353894968254291} - m_Layer: 0 - m_Name: spikes_3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8078117592371321287 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2568405382520894643} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -8.62, y: -4.87, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 6045522938640616061} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1043124044502169818 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2568405382520894643} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: -8328159106608433595, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!61 &1793437425226485100 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2568405382520894643} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!114 &5792353894968254291 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2568405382520894643} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1ac34d7ad4f935b4a92bff7901ea1180, type: 3} - m_Name: - m_EditorClassIdentifier: - m_isDead: - Variable: {fileID: 0} - m_useLocal: 1 - m_localValue: 0 ---- !u!1 &2740308402194940216 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6045522938640616061} - - component: {fileID: 2090863402335022966} - m_Layer: 0 - m_Name: we - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6045522938640616061 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2740308402194940216} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.47, y: 0.79, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 8078117592371321287} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2090863402335022966 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2740308402194940216} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 diff --git a/Assets/Scenes/How To Play.unity.meta b/Assets/Scenes/How To Play.unity.meta index adff247..279767c 100644 --- a/Assets/Scenes/How To Play.unity.meta +++ b/Assets/Scenes/How To Play.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8d22d24360cdbac4e9cfef8f8dbec2a9 +guid: ac7ddd06074651a40836cfa82dd7ae6a DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/Official Levels/Level 1.unity b/Assets/Scenes/Official Levels/Level 1.unity index 637e3bb..491b0e6 100644 --- a/Assets/Scenes/Official Levels/Level 1.unity +++ b/Assets/Scenes/Official Levels/Level 1.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67a47526339f949f4f87f1c087c70b41c553fdd1e06bf81ac4ad92017fdc46ad -size 190944 +oid sha256:50a445aea59dc9748b83083b4162f40d09b290cd6b63900fe9719c91c02cc433 +size 184256 diff --git a/Assets/Scenes/Official Levels/Level 2.unity b/Assets/Scenes/Official Levels/Level 2.unity index cd6ddce..19ffbd6 100644 --- a/Assets/Scenes/Official Levels/Level 2.unity +++ b/Assets/Scenes/Official Levels/Level 2.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62d67ae68b12964d69d557602953068a49affa89358619f15c645cc43db95141 -size 1966240 +oid sha256:e90904e38f20967e8317b591a93c22edd56412016f714a7a214ab3b309e045c2 +size 1964462 diff --git a/Assets/Scenes/Official Levels/Level 3.unity b/Assets/Scenes/Official Levels/Level 3.unity index 0f51fc2..057d15d 100644 --- a/Assets/Scenes/Official Levels/Level 3.unity +++ b/Assets/Scenes/Official Levels/Level 3.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cf52cda8084b88d44de609af71c9acb8d9a426752ad668797eec4b62d04ff85 -size 594148 +oid sha256:5ae66edd8f4bb3c5b5e87aa88b8a5eeb9fff4efaad02a01dd6c881abadbff0ac +size 597890 diff --git a/Assets/Scenes/Official Levels/Level 4.unity b/Assets/Scenes/Official Levels/Level 4.unity index 8f26257..0e93f9f 100644 --- a/Assets/Scenes/Official Levels/Level 4.unity +++ b/Assets/Scenes/Official Levels/Level 4.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1dbba7d15df216251245b8eb40e9550b5053e09dde8dfaa757e1bccd2f4e213f -size 398600 +oid sha256:d1dcc0854f35dd001581e8f4e875fbc71153d27f12682dfb886f31f0b85d3571 +size 404576 diff --git a/Assets/Scenes/Template Level.unity b/Assets/Scenes/Template Level.unity index f8424a6..a162127 100644 --- a/Assets/Scenes/Template Level.unity +++ b/Assets/Scenes/Template Level.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80489f6145d1c1dd47e934421d25a572722cb7eec7eb9631f9536ac7127aa6fa -size 47739 +oid sha256:2866e1a43a9589240aa47780870cf005a33c8d2423bb2eb0abe91344c80eef3a +size 51078 diff --git a/Assets/Scripts/Character/CharacterInputController.cs b/Assets/Scripts/Character/CharacterInputController.cs index 613e4ca..70070ef 100644 --- a/Assets/Scripts/Character/CharacterInputController.cs +++ b/Assets/Scripts/Character/CharacterInputController.cs @@ -35,6 +35,18 @@ public class CharacterInputController : MonoBehaviour [SerializeField] private AudioClip m_JumpSound; + [SerializeField] + private AudioClip m_LandSound; + + [SerializeField] + private AudioClip m_SpikeSound; + + [SerializeField] + private AudioClip m_PoisonSound; + + [SerializeField] + private AudioClip m_MooseSound; + [SerializeField, BoxGroup("Settings")] private float m_speed = 2.0f; @@ -88,12 +100,13 @@ public class CharacterInputController : MonoBehaviour public void OnLandHappened() { m_animator.SetTrigger("Land"); + AudioSource.PlayClipAtPoint(m_LandSound, transform.position); } public void OnJumpHappened() { m_animator.SetTrigger("Land"); - //AudioSource.PlayClipAtPoint(m_JumpSound, transform.position); + AudioSource.PlayClipAtPoint(m_JumpSound, transform.position); } public void OnDeath(bool value) { @@ -115,6 +128,22 @@ public class CharacterInputController : MonoBehaviour } } + private void OnTriggerEnter2D(Collider2D collision) + { + Debug.Log($"Collision with {collision.gameObject.name}"); + if (collision.CompareTag("Spikes")) + { + AudioSource.PlayClipAtPoint(m_SpikeSound, transform.position); + } + if (collision.CompareTag("Poison")) + { + AudioSource.PlayClipAtPoint(m_PoisonSound, transform.position); + } + if (collision.CompareTag("Moose")) + { + AudioSource.PlayClipAtPoint(m_MooseSound, transform.position); + } + } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 7946bbe..4fe3b00 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:baeb03a1cb6743100a7eaf3fd9def4225e3f67dcccf003a33bfc6bf0209c603d -size 659 +oid sha256:376da76e455c52307b2624cb327ed6666164ca3fb76d75524784e5ba122b5d76 +size 688