diff --git a/Assets/Art Assets/Sound/SFX/Spikes.m4a b/Assets/Art Assets/Sound/SFX/Spikes.m4a index 1703675..e554fda 100644 Binary files a/Assets/Art Assets/Sound/SFX/Spikes.m4a and b/Assets/Art Assets/Sound/SFX/Spikes.m4a differ diff --git a/Assets/Art Assets/Textures/Chars/Monster Remake.meta b/Assets/Art Assets/Textures/Chars/Monster Remake.meta new file mode 100644 index 0000000..866e1e3 --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Monster Remake.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 010ded6895c289944a73e95fde0c545b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 0.png b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 0.png new file mode 100644 index 0000000..250290b --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 0.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c60374ad027b377054455d24e1679e073abb20d4dfa574d023da5bdfabb76d2 +size 2557 diff --git a/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 0.png.meta b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 0.png.meta new file mode 100644 index 0000000..7873bc5 --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 0.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 130f12623017bbf4fb1671a98ef0a6fd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 2 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + 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 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 1.png b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 1.png new file mode 100644 index 0000000..6ae6679 --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc2ba59bc37d543026384a29894dc2c1a333a41ffcff519f6c9e25d4bb400cec +size 2683 diff --git a/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 1.png.meta b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 1.png.meta new file mode 100644 index 0000000..dc6e1b0 --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 1.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 2bc2f8ee841e5de4da71e60120431b9a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 2 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + 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 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 2.png b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 2.png new file mode 100644 index 0000000..07d0f45 --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13df1a08889861cc429eb395ef67000248dfd4e6384b19b488a3139f8cc92fe4 +size 2654 diff --git a/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 2.png.meta b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 2.png.meta new file mode 100644 index 0000000..5e56dd4 --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 2.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: a538dfd0f5b55c9449be0623784c16b0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 2 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + 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 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 3.png b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 3.png new file mode 100644 index 0000000..13628a0 --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ca20e1aedf7b435216c8e37e54aecf6c615faa10b103663e8a8759735540dc4 +size 2642 diff --git a/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 3.png.meta b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 3.png.meta new file mode 100644 index 0000000..6f71d86 --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Monster Remake/Monster_Remake 3.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 6d5d89360c13cea4d9fc20087ad6125c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 2 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + 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 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/2D Camera.prefab b/Assets/Prefabs/2D Camera.prefab index 70ba2e6..0606794 100644 --- a/Assets/Prefabs/2D Camera.prefab +++ b/Assets/Prefabs/2D Camera.prefab @@ -866,8 +866,8 @@ MonoBehaviour: m_EditorClassIdentifier: Player: {fileID: 0} m_FollowStrength: 3 - m_FollowX: 0 - m_FollowY: 0 + m_FollowX: 1 + m_FollowY: 1 m_OffsetX: 0 m_OffsetY: 2 --- !u!114 &515301201 diff --git a/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset b/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset index c59d2da..3db1186 100644 --- a/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset +++ b/Assets/Scenes/Level 1_Profiles/PostVolume Profile.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:560537574e8f0662421d29463035c674a5f542270af0c0d8b6787617ef68dadd -size 3471 +oid sha256:cfba0fa241674fd226ccd96130bdb150b0e673dc92ee365946e2d089317a7b1a +size 3472 diff --git a/Assets/Scenes/Official Levels/Level 1.unity b/Assets/Scenes/Official Levels/Level 1.unity index dc27739..906ccbc 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:81aa53e1624b2408f88f8edbe5d834a6ed6311b1e9ccf603dc9843d9c320e8fb -size 176902 +oid sha256:dbd11fcd140d341bc5560d41f286869e472d90a7bde29399e000dec6d332f6fd +size 174240 diff --git a/Assets/Scenes/Official Levels/Level 4.unity b/Assets/Scenes/Official Levels/Level 4.unity new file mode 100644 index 0000000..3ce746f --- /dev/null +++ b/Assets/Scenes/Official Levels/Level 4.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abd6c264eebe98fefd6c2e4a013567caeb3864a117a6cc8d445d91145f6eb1de +size 110580 diff --git a/Assets/Scenes/Official Levels/Level 4.unity.meta b/Assets/Scenes/Official Levels/Level 4.unity.meta new file mode 100644 index 0000000..84f27a1 --- /dev/null +++ b/Assets/Scenes/Official Levels/Level 4.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3d23f763dd82096498d6ed83a3795bc9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/OldLevel 1.unity similarity index 100% rename from Assets/Scenes/Level 1.unity rename to Assets/Scenes/OldLevel 1.unity diff --git a/Assets/Scenes/Level 1.unity.meta b/Assets/Scenes/OldLevel 1.unity.meta similarity index 100% rename from Assets/Scenes/Level 1.unity.meta rename to Assets/Scenes/OldLevel 1.unity.meta diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/OldLevel 2.unity similarity index 100% rename from Assets/Scenes/Level 2.unity rename to Assets/Scenes/OldLevel 2.unity diff --git a/Assets/Scenes/Level 2.unity.meta b/Assets/Scenes/OldLevel 2.unity.meta similarity index 100% rename from Assets/Scenes/Level 2.unity.meta rename to Assets/Scenes/OldLevel 2.unity.meta diff --git a/Assets/Scenes/Level 3.unity b/Assets/Scenes/OldLevel 3.unity similarity index 100% rename from Assets/Scenes/Level 3.unity rename to Assets/Scenes/OldLevel 3.unity diff --git a/Assets/Scenes/Level 3.unity.meta b/Assets/Scenes/OldLevel 3.unity.meta similarity index 100% rename from Assets/Scenes/Level 3.unity.meta rename to Assets/Scenes/OldLevel 3.unity.meta diff --git a/Assets/Scripts/Character/CharacterInputController.cs b/Assets/Scripts/Character/CharacterInputController.cs index 164356f..1d465df 100644 --- a/Assets/Scripts/Character/CharacterInputController.cs +++ b/Assets/Scripts/Character/CharacterInputController.cs @@ -52,6 +52,12 @@ public class CharacterInputController : MonoBehaviour m_isVictory.OnValueChanged += OnVictory; } + private void OnDisable() + { + m_isPlayerDead.OnValueChanged -= OnDeath; + m_isVictory.OnValueChanged -= OnVictory; + } + public void OnMove(InputAction.CallbackContext context) { m_movement = context.ReadValue(); diff --git a/Assets/Scripts/LevelManager.cs b/Assets/Scripts/LevelManager.cs index feb5a66..f8c5414 100644 --- a/Assets/Scripts/LevelManager.cs +++ b/Assets/Scripts/LevelManager.cs @@ -143,7 +143,7 @@ public class LevelManager : MonoBehaviour { color.a = elapsedTime / fadeTime; m_backGround.color = color; - Debug.Log(color.a); + yield return new WaitForEndOfFrame(); elapsedTime += Time.deltaTime; } diff --git a/Assets/Scripts/MonsterController.cs b/Assets/Scripts/MonsterController.cs new file mode 100644 index 0000000..3afb748 --- /dev/null +++ b/Assets/Scripts/MonsterController.cs @@ -0,0 +1,83 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using Variables; + +public class MonsterController : MonoBehaviour, IResettable +{ + + [SerializeField, Header("References")] + Reference m_light; + + [SerializeField] + private GameObject[] m_possibleFrames; + + + [SerializeField] + private Transform m_player; + + + [SerializeField] + public GameObject m_defaultObject; + + private void OnEnable() + { + m_light.OnValueChanged += OnLightChange; + } + + private void OnDisable() + { + m_light.OnValueChanged -= OnLightChange; + } + + private void Start() + { + foreach (Transform child in transform) + { + if (child.gameObject.activeInHierarchy) + m_defaultObject = child.gameObject; + } + } + + + + private void ChangeRandomMonster() + { + GameObject[] inactiveFrames = m_possibleFrames.Where(p => !p.activeInHierarchy).ToArray(); + GameObject nextFrame = inactiveFrames[Random.Range(0, inactiveFrames.Length)]; + + foreach(Transform child in transform) + { + child.gameObject.SetActive(child.gameObject == nextFrame); + } + } + + + private void OnLightChange(float value) + { + if (value <= 0) + { + ChangeRandomMonster(); + } + + } + + public void OnLevelLoad() + { + + } + + public IEnumerator OnResetStart(float time) + { + yield break; + } + + public void OnResetEnd() + { + foreach (Transform child in transform) + { + child.gameObject.SetActive(child.gameObject == m_defaultObject); + } + } +} diff --git a/Assets/Scripts/MonsterController.cs.meta b/Assets/Scripts/MonsterController.cs.meta new file mode 100644 index 0000000..9e6ed33 --- /dev/null +++ b/Assets/Scripts/MonsterController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9afc5ecba9d138349baa937b1623eee3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MonsterHitbox.cs b/Assets/Scripts/MonsterHitbox.cs new file mode 100644 index 0000000..b5879db --- /dev/null +++ b/Assets/Scripts/MonsterHitbox.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Variables; + +public class MonsterHitbox : MonoBehaviour, IResettable +{ + [SerializeField] + Variable m_onPlayerDeath; + + public void OnLevelLoad() + { + + } + + public void OnResetEnd() + { + gameObject.layer = LayerMask.NameToLayer("Default"); + } + + public IEnumerator OnResetStart(float time) + { + yield break; + } + + + private void OnTriggerEnter2D(Collider2D collision) + { + Debug.Log($"Collision with {collision.gameObject.name}"); + if (collision.CompareTag("Player")) + { + gameObject.layer = LayerMask.NameToLayer("Always Visible"); + m_onPlayerDeath.Value = true; + } + } + +} diff --git a/Assets/Scripts/MonsterHitbox.cs.meta b/Assets/Scripts/MonsterHitbox.cs.meta new file mode 100644 index 0000000..5748ffe --- /dev/null +++ b/Assets/Scripts/MonsterHitbox.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 90b646f898d10024c8ba725c9a7892a6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: