From 30652155cb564cba2fd5c68c76d0a7ccdbfdd229 Mon Sep 17 00:00:00 2001 From: jreason Date: Sun, 30 Jan 2022 12:56:41 +1100 Subject: [PATCH 1/2] Did some things --- .../Textures/Chars/Moose Angel.meta | 8 + .../Textures/Chars/Moose Angel/Materials.meta | 8 + .../Chars/Moose Angel/Materials/monster_0.mat | 37 ++ .../Moose Angel/Materials/monster_0.mat.meta | 8 + .../Chars/Moose Angel/face_mask_0.png.meta | 144 ++++++ .../Chars/Moose Angel/face_mask_1.png.meta | 144 ++++++ .../Chars/Moose Angel/face_mask_2.png.meta | 144 ++++++ .../Chars/Moose Angel/monster_0.png.meta | 156 ++++++ .../Chars/Moose Angel/monster_1.png.meta | 144 ++++++ .../Chars/Moose Angel/monster_2.png.meta | 144 ++++++ .../Environ/backdrop/clouds1.png.meta | 144 ++++++ .../Environ/backdrop/clouds2.png.meta | 144 ++++++ .../Environ/backdrop/clouds3.png.meta | 144 ++++++ .../Environment/DarkCastle/DarkCastle.prefab | 24 +- .../DarkCastle/Rule tiles/Spike.asset | 3 + .../DarkCastle/Rule tiles/Spike.asset.meta | 8 + Assets/Prefabs/Player.prefab | 473 ++++++++++++++++++ Assets/Prefabs/Player.prefab.meta | 7 + Assets/Prefabs/spikes_3.prefab | 211 ++++++++ Assets/Prefabs/spikes_3.prefab.meta | 7 + Assets/Scenes/Level 1.unity | 4 +- Assets/Scenes/WalljumpTest.unity | 4 +- Assets/Scripts/Character/CharacterReset.cs | 37 ++ .../Scripts/Character/CharacterReset.cs.meta | 11 + Assets/Scripts/DarknessController.cs | 22 +- Assets/Scripts/IResettable.cs | 14 + Assets/Scripts/IResettable.cs.meta | 11 + Assets/Scripts/KillPlayer.cs | 19 + Assets/Scripts/KillPlayer.cs.meta | 11 + Assets/Scripts/LevelManager.cs | 113 +++++ Assets/Scripts/LevelManager.cs.meta | 11 + Assets/Scripts/SneakyTextController.cs | 62 +++ Assets/Scripts/SneakyTextController.cs.meta | 11 + Assets/Scripts/TextController.cs | 16 +- Assets/Scripts/TimerController.cs | 34 ++ Assets/Scripts/TimerController.cs.meta | 11 + Assets/Variables/Runtime/LightAmount.asset | 3 + .../Variables/Runtime/LightAmount.asset.meta | 8 + Assets/Variables/Runtime/Timer.asset | 3 + Assets/Variables/Runtime/Timer.asset.meta | 8 + Assets/Variables/Runtime/freezePlayer.asset | 3 + ...put.asset.meta => freezePlayer.asset.meta} | 0 Assets/Variables/Runtime/isNoInput.asset | 3 - Assets/Variables/Runtime/isPlayerDead.asset | 3 + .../Variables/Runtime/isPlayerDead.asset.meta | 8 + 45 files changed, 2510 insertions(+), 22 deletions(-) create mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel.meta create mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta create mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat create mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta create mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta create mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_1.png.meta create mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_2.png.meta create mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel/monster_0.png.meta create mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel/monster_1.png.meta create mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel/monster_2.png.meta create mode 100644 Assets/Art Assets/Textures/Environ/backdrop/clouds1.png.meta create mode 100644 Assets/Art Assets/Textures/Environ/backdrop/clouds2.png.meta create mode 100644 Assets/Art Assets/Textures/Environ/backdrop/clouds3.png.meta create mode 100644 Assets/Art Assets/Tilemaps/Environment/DarkCastle/Rule tiles/Spike.asset create mode 100644 Assets/Art Assets/Tilemaps/Environment/DarkCastle/Rule tiles/Spike.asset.meta create mode 100644 Assets/Prefabs/Player.prefab create mode 100644 Assets/Prefabs/Player.prefab.meta create mode 100644 Assets/Prefabs/spikes_3.prefab create mode 100644 Assets/Prefabs/spikes_3.prefab.meta create mode 100644 Assets/Scripts/Character/CharacterReset.cs create mode 100644 Assets/Scripts/Character/CharacterReset.cs.meta create mode 100644 Assets/Scripts/IResettable.cs create mode 100644 Assets/Scripts/IResettable.cs.meta create mode 100644 Assets/Scripts/KillPlayer.cs create mode 100644 Assets/Scripts/KillPlayer.cs.meta create mode 100644 Assets/Scripts/LevelManager.cs create mode 100644 Assets/Scripts/LevelManager.cs.meta create mode 100644 Assets/Scripts/SneakyTextController.cs create mode 100644 Assets/Scripts/SneakyTextController.cs.meta create mode 100644 Assets/Scripts/TimerController.cs create mode 100644 Assets/Scripts/TimerController.cs.meta create mode 100644 Assets/Variables/Runtime/LightAmount.asset create mode 100644 Assets/Variables/Runtime/LightAmount.asset.meta create mode 100644 Assets/Variables/Runtime/Timer.asset create mode 100644 Assets/Variables/Runtime/Timer.asset.meta create mode 100644 Assets/Variables/Runtime/freezePlayer.asset rename Assets/Variables/Runtime/{isNoInput.asset.meta => freezePlayer.asset.meta} (100%) delete mode 100644 Assets/Variables/Runtime/isNoInput.asset create mode 100644 Assets/Variables/Runtime/isPlayerDead.asset create mode 100644 Assets/Variables/Runtime/isPlayerDead.asset.meta diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel.meta b/Assets/Art Assets/Textures/Chars/Moose Angel.meta new file mode 100644 index 0000000..9dc8acb --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Moose Angel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b29729daec588934da564d1b8b8c4b42 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta new file mode 100644 index 0000000..78961aa --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9132b80b553bb3f40b9a29cc65955c79 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat new file mode 100644 index 0000000..6cb179b --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: monster_0 + m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 6ba5faafd9a8ff44b8f96dbe81c4f0f2, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta new file mode 100644 index 0000000..dd82d73 --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca80fac3bd969f84eaf173691c89d17a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta b/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta new file mode 100644 index 0000000..1feb131 --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: e60d936cba62c8a4c895e3ac949ef009 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + aniso: 2 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_1.png.meta b/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_1.png.meta new file mode 100644 index 0000000..48f3bd2 --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_1.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: c2d89277c0068f94b9754a90b39d44b5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + aniso: 2 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_2.png.meta b/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_2.png.meta new file mode 100644 index 0000000..a0bfe9e --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_2.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: 57a126ed703a7ba4fa0e200cfec809ae +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + aniso: 2 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/monster_0.png.meta b/Assets/Art Assets/Textures/Chars/Moose Angel/monster_0.png.meta new file mode 100644 index 0000000..7f219dc --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/monster_0.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 6ba5faafd9a8ff44b8f96dbe81c4f0f2 +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/Moose Angel/monster_1.png.meta b/Assets/Art Assets/Textures/Chars/Moose Angel/monster_1.png.meta new file mode 100644 index 0000000..53a70be --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/monster_1.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: 6c52f73d62163e4458302ec560e7d204 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + aniso: 2 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/monster_2.png.meta b/Assets/Art Assets/Textures/Chars/Moose Angel/monster_2.png.meta new file mode 100644 index 0000000..8301e1c --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/monster_2.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: dfb03b3288de4a1468bd3ee8cf401636 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + aniso: 2 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Environ/backdrop/clouds1.png.meta b/Assets/Art Assets/Textures/Environ/backdrop/clouds1.png.meta new file mode 100644 index 0000000..80ad610 --- /dev/null +++ b/Assets/Art Assets/Textures/Environ/backdrop/clouds1.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: 14cf6daff22a0504cb56d3068b8cfaae +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + aniso: 2 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Environ/backdrop/clouds2.png.meta b/Assets/Art Assets/Textures/Environ/backdrop/clouds2.png.meta new file mode 100644 index 0000000..e66d5c4 --- /dev/null +++ b/Assets/Art Assets/Textures/Environ/backdrop/clouds2.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: ca781b73b75b7de41a45438092b59696 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + aniso: 2 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Environ/backdrop/clouds3.png.meta b/Assets/Art Assets/Textures/Environ/backdrop/clouds3.png.meta new file mode 100644 index 0000000..08fe380 --- /dev/null +++ b/Assets/Art Assets/Textures/Environ/backdrop/clouds3.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: 3a5199ffb499e5440881e125d906c183 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 1 + aniso: 2 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tilemaps/Environment/DarkCastle/DarkCastle.prefab b/Assets/Art Assets/Tilemaps/Environment/DarkCastle/DarkCastle.prefab index 0c569a6..793032c 100644 --- a/Assets/Art Assets/Tilemaps/Environment/DarkCastle/DarkCastle.prefab +++ b/Assets/Art Assets/Tilemaps/Environment/DarkCastle/DarkCastle.prefab @@ -95,6 +95,16 @@ Tilemap: m_TileObjectToInstantiateIndex: 0 dummyAlignment: 0 m_AllTileFlags: 1073741826 + - first: {x: 5, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 9 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 1 + dummyAlignment: 0 + m_AllTileFlags: 1073741826 - first: {x: -3, y: -2, z: 0} second: serializedVersion: 2 @@ -212,7 +222,7 @@ Tilemap: - {fileID: -1301010405072374266, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - {fileID: -6372375123409887586, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - {fileID: 2886372406120980275, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_AnimationSpeed: 0.27590805 + m_AnimationSpeed: 0.22959995 m_AnimationTimeOffset: 0 m_IsLooping: 1 m_TileAssetArray: @@ -238,6 +248,8 @@ Tilemap: m_Data: {fileID: 11400000, guid: ce1bdc952b6e7c94b9b8357c51bf797c, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 665af33f7dc34634286c1c3b729efe77, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 01ebb801010b7bd43b959b1e147fc6af, type: 2} m_TileSpriteArray: - m_RefCount: 1 m_Data: {fileID: 2514963777356231920, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} @@ -257,8 +269,10 @@ Tilemap: m_Data: {fileID: -6709542322131757786, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} - m_RefCount: 2 m_Data: {fileID: -3558780021574804381, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -6668061196424841238, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3} m_TileMatrixArray: - - m_RefCount: 11 + - m_RefCount: 12 m_Data: e00: 1 e01: 0 @@ -313,11 +327,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 12 + - m_RefCount: 13 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: - m_RefCount: 1 m_Data: {fileID: 3797238539615131223, guid: 589e6f72e06cd9148a2902d5bd140728, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 2568405382520894643, guid: bbc251b61efff9b49a4a402c3cdc304c, type: 3} m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Origin: {x: -3, y: -3, z: 0} @@ -389,7 +405,7 @@ TilemapRenderer: m_Mode: 0 m_DetectChunkCullingBounds: 0 m_MaskInteraction: 0 ---- !u!114 &8171381666637026880 +--- !u!114 &8670512219069320494 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Art Assets/Tilemaps/Environment/DarkCastle/Rule tiles/Spike.asset b/Assets/Art Assets/Tilemaps/Environment/DarkCastle/Rule tiles/Spike.asset new file mode 100644 index 0000000..fdbb377 --- /dev/null +++ b/Assets/Art Assets/Tilemaps/Environment/DarkCastle/Rule tiles/Spike.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff6ea120d779a1c7143226521c4049af2317a98991970546f6c3aafacded3f53 +size 1194 diff --git a/Assets/Art Assets/Tilemaps/Environment/DarkCastle/Rule tiles/Spike.asset.meta b/Assets/Art Assets/Tilemaps/Environment/DarkCastle/Rule tiles/Spike.asset.meta new file mode 100644 index 0000000..f3835a4 --- /dev/null +++ b/Assets/Art Assets/Tilemaps/Environment/DarkCastle/Rule tiles/Spike.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 01ebb801010b7bd43b959b1e147fc6af +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab new file mode 100644 index 0000000..f61feaa --- /dev/null +++ b/Assets/Prefabs/Player.prefab @@ -0,0 +1,473 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4668322654876184655 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4668322654876184626} + - component: {fileID: 4668322654876184653} + - component: {fileID: 4668322654876184652} + - component: {fileID: 4668322654876184627} + - component: {fileID: 4668322654876184630} + - component: {fileID: 4668322654876184625} + - component: {fileID: 4668322654876184624} + - component: {fileID: 4668322654876184631} + - component: {fileID: -4453463038580551382} + m_Layer: 7 + m_Name: Player + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4668322654876184626 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -13.03, y: -5.21, z: -0.17} + m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} + m_Children: + - {fileID: 4668322656625073464} + - {fileID: 4668322656710469013} + - {fileID: 4668322655870949457} + - {fileID: 4668322655423990997} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4668322654876184653 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_Enabled: 0 + 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: -9095717837082945937, guid: bd3cb4af8406d4436a2ae8c2aafe1f8d, 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: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!50 &4668322654876184652 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 6200000, guid: 6c2f9af082941ef45abc8e6a22e1c9ef, type: 2} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!70 &4668322654876184627 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_Size: {x: 1, y: 2} + m_Direction: 0 +--- !u!114 &4668322654876184630 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 34d55f77ac416ab45b29345bb7e6a913, type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4668322654876184624} + m_TargetAssemblyTypeName: CharacterInputController, Assembly-CSharp + m_MethodName: OnMove + m_Mode: 0 + 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_ActionId: d1943f36-92e5-4335-a3f3-dd2e9e553ba6 + m_ActionName: Level/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d,/Keyboard/upArrow,/Keyboard/downArrow,/Keyboard/leftArrow,/Keyboard/rightArrow] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4668322654876184624} + m_TargetAssemblyTypeName: CharacterInputController, Assembly-CSharp + m_MethodName: OnJump + m_Mode: 0 + 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_ActionId: e7ae7276-c64d-43bb-8719-ef3178e194a0 + m_ActionName: Level/Jump[/Keyboard/space,/Keyboard/w] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Level + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!114 &4668322654876184625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 32250bba13a1233448b3ff49db05c141, type: 3} + m_Name: + m_EditorClassIdentifier: + m_JumpForce: 100 + m_WallJumpMultiplier: 3 + m_CrouchSpeed: 0.36 + m_MovementSmoothing: 0.05 + m_AirControl: 1 + m_WhatIsGround: + serializedVersion: 2 + m_Bits: 512 + m_GroundCheck: {fileID: 4668322656625073464} + m_CeilingCheck: {fileID: 4668322656710469013} + m_WallCheck: {fileID: 4668322655870949457} + m_CrouchDisableCollider: {fileID: 0} + OnLandEvent: + m_PersistentCalls: + m_Calls: [] + OnCrouchEvent: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4668322654876184624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0511d3cc433b7e41906b4911f68a962, type: 3} + m_Name: + m_EditorClassIdentifier: + m_characterController: {fileID: 4668322654876184625} + m_playerInput: + Variable: {fileID: 11400000, guid: ae129d59580dbe94fa385299e3dfb47d, type: 2} + m_useLocal: 0 + m_localValue: 0 + m_noInputAllowed: + Variable: {fileID: 11400000, guid: ea1cffffa7e1ed34ca1fe3d3af13777c, type: 2} + m_useLocal: 0 + m_localValue: 0 + m_speed: 2 +--- !u!95 &4668322654876184631 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &-4453463038580551382 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322654876184655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 49dda9eea2761864e9eac5cdb5c83f57, type: 3} + m_Name: + m_EditorClassIdentifier: + m_isPlayerDead: + Variable: {fileID: 11400000, guid: a1586014535831a4e80b30178ff5ced4, type: 2} + m_useLocal: 0 + m_localValue: 0 +--- !u!1 &4668322655423990996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4668322655423990997} + - component: {fileID: 4668322655423991003} + - component: {fileID: 4668322655423991002} + m_Layer: 7 + m_Name: char_dude_sheet_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4668322655423990997 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322655423990996} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.063, y: 0.383, z: 0} + m_LocalScale: {x: 1.6666665, y: 1.6666665, z: 1.6666665} + m_Children: [] + m_Father: {fileID: 4668322654876184626} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4668322655423991003 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322655423990996} + 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: 8758575904115477578, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.23, y: 0.25} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &4668322655423991002 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322655423990996} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 49a569a83db15b14bb24e4093bd3b6de, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &4668322655870949456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4668322655870949457} + m_Layer: 7 + m_Name: Hand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4668322655870949457 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322655870949456} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.5, y: -0.3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4668322654876184626} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4668322656625073467 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4668322656625073464} + m_Layer: 7 + m_Name: Feet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4668322656625073464 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322656625073467} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4668322654876184626} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4668322656710469012 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4668322656710469013} + m_Layer: 7 + m_Name: Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4668322656710469013 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4668322656710469012} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.61, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4668322654876184626} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Player.prefab.meta b/Assets/Prefabs/Player.prefab.meta new file mode 100644 index 0000000..86765be --- /dev/null +++ b/Assets/Prefabs/Player.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b4a65ba6dfdde8742903c22557f538a1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/spikes_3.prefab b/Assets/Prefabs/spikes_3.prefab new file mode 100644 index 0000000..ad11019 --- /dev/null +++ b/Assets/Prefabs/spikes_3.prefab @@ -0,0 +1,211 @@ +%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/Prefabs/spikes_3.prefab.meta b/Assets/Prefabs/spikes_3.prefab.meta new file mode 100644 index 0000000..6ff7f94 --- /dev/null +++ b/Assets/Prefabs/spikes_3.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bbc251b61efff9b49a4a402c3cdc304c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/Level 1.unity index cf896b3..b43c3e3 100644 --- a/Assets/Scenes/Level 1.unity +++ b/Assets/Scenes/Level 1.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4541491005ac04171605d41fbf5e862ebd149e86e7175a3859800d1cead2ffc0 -size 272425 +oid sha256:d6977daa994f59ff7bee89a90dbccb0753b93a78048705abf801f666e8fcfac3 +size 285040 diff --git a/Assets/Scenes/WalljumpTest.unity b/Assets/Scenes/WalljumpTest.unity index 6abbb04..635f15d 100644 --- a/Assets/Scenes/WalljumpTest.unity +++ b/Assets/Scenes/WalljumpTest.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cad676d600bd9af5447b2280a2a11e71976aeb8ede54c16ee5489740f57eeae -size 276836 +oid sha256:a4918662fc41172b606a46721924dbad304780dea3f1c93fd8cf30de3a303b48 +size 263613 diff --git a/Assets/Scripts/Character/CharacterReset.cs b/Assets/Scripts/Character/CharacterReset.cs new file mode 100644 index 0000000..ab56992 --- /dev/null +++ b/Assets/Scripts/Character/CharacterReset.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Variables; + +public class CharacterReset : MonoBehaviour, IResettable +{ + + [SerializeField, Header("References")] + Reference m_isPlayerDead; + + + private Vector3 m_startPosition; + private Quaternion m_startRotation; + + + + public void OnLevelLoad() + { + m_startPosition = transform.position; + m_startRotation = transform.rotation; + } + + public void OnResetEnd() + { + + } + + public IEnumerator OnResetStart(float time) + { + transform.position = m_startPosition; + transform.rotation = m_startRotation; + + m_isPlayerDead.Value = false; + yield break; + } +} diff --git a/Assets/Scripts/Character/CharacterReset.cs.meta b/Assets/Scripts/Character/CharacterReset.cs.meta new file mode 100644 index 0000000..4f76547 --- /dev/null +++ b/Assets/Scripts/Character/CharacterReset.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 49dda9eea2761864e9eac5cdb5c83f57 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/DarknessController.cs b/Assets/Scripts/DarknessController.cs index 7fa9bff..950af94 100644 --- a/Assets/Scripts/DarknessController.cs +++ b/Assets/Scripts/DarknessController.cs @@ -10,6 +10,9 @@ public class DarknessController : MonoBehaviour [SerializeField, Header("References")] private Material m_darknessMat; + [SerializeField] + private Reference m_lightLevel; + [SerializeField] private Reference m_isInputDown; @@ -23,8 +26,7 @@ public class DarknessController : MonoBehaviour private AnimationCurve m_lightCurve = AnimationCurve.Linear(0,0,1,1); - [ShowNonSerializedField] - private float m_currentDarknessLevel = 1; + [ShowNonSerializedField] private bool m_isDarknessChanging; @@ -32,13 +34,15 @@ public class DarknessController : MonoBehaviour private void OnEnable() { m_isInputDown.OnValueChanged += OnInputChange; - m_darknessMat.SetFloat("_Apply",1); + m_darknessMat.SetFloat("_Apply", 1); + m_lightLevel.Value = 1; } private void OnDisable() { m_isInputDown.OnValueChanged -= OnInputChange; m_darknessMat.SetFloat("_Apply", 1); + m_lightLevel.Value = 1; } @@ -69,24 +73,24 @@ public class DarknessController : MonoBehaviour private IEnumerator ChangeDarkness(float end, float time, AnimationCurve curve) { - float start = m_currentDarknessLevel; + float start = m_lightLevel; float elapsedTime = 0; - time = Mathf.InverseLerp(end, start, m_currentDarknessLevel) * time; + time = Mathf.InverseLerp(end, start, m_lightLevel) * time; m_isDarknessChanging = true; while(elapsedTime < time) { - m_currentDarknessLevel = Mathf.Lerp(start, end, curve.Evaluate(elapsedTime / time)); - m_darknessMat.SetFloat("_Apply", m_currentDarknessLevel); + m_lightLevel.Value = Mathf.Lerp(start, end, curve.Evaluate(elapsedTime / time)); + m_darknessMat.SetFloat("_Apply", m_lightLevel); yield return new WaitForEndOfFrame(); elapsedTime += Time.deltaTime; } m_isDarknessChanging = false; - m_currentDarknessLevel = end; - m_darknessMat.SetFloat("_Apply", m_currentDarknessLevel); + m_lightLevel.Value = end; + m_darknessMat.SetFloat("_Apply", m_lightLevel); } diff --git a/Assets/Scripts/IResettable.cs b/Assets/Scripts/IResettable.cs new file mode 100644 index 0000000..cc74654 --- /dev/null +++ b/Assets/Scripts/IResettable.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public interface IResettable +{ + public void OnLevelLoad(); + + public IEnumerator OnResetStart(float time); + + public void OnResetEnd(); + + +} diff --git a/Assets/Scripts/IResettable.cs.meta b/Assets/Scripts/IResettable.cs.meta new file mode 100644 index 0000000..081dd4c --- /dev/null +++ b/Assets/Scripts/IResettable.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ad996d168724ecc4e88b3854210fcbfc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/KillPlayer.cs b/Assets/Scripts/KillPlayer.cs new file mode 100644 index 0000000..0bf7002 --- /dev/null +++ b/Assets/Scripts/KillPlayer.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Variables; + +public class KillPlayer : MonoBehaviour +{ + [SerializeField] + private Reference m_isDead; + + + private void OnTriggerEnter2D(Collider2D collision) + { + if (collision.CompareTag("Player")) + m_isDead.Value = true; + } + + +} diff --git a/Assets/Scripts/KillPlayer.cs.meta b/Assets/Scripts/KillPlayer.cs.meta new file mode 100644 index 0000000..930173d --- /dev/null +++ b/Assets/Scripts/KillPlayer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1ac34d7ad4f935b4a92bff7901ea1180 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/LevelManager.cs b/Assets/Scripts/LevelManager.cs new file mode 100644 index 0000000..e6898ec --- /dev/null +++ b/Assets/Scripts/LevelManager.cs @@ -0,0 +1,113 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using NaughtyAttributes; +using Variables; + +public class LevelManager : MonoBehaviour +{ + [SerializeField, Header("References")] + Reference m_isPlayerDead; + + [SerializeField] + Reference m_freezePlayer; + + [SerializeField] + Reference m_isVictory; + + [SerializeField] + Reference m_timer; + + + [SerializeField, BoxGroup("Level Settings")] + private string m_levelName = "Level 1"; + + [SerializeField, BoxGroup("Level Settings")] + private float m_timeInLevel = 10; + + [SerializeField] + private float m_resetTime = 1; + + [SerializeField] + private string m_nextSceneToLoad = "Level 2"; + + + private IResettable[] m_allResetable; + + private void Start() + { + m_allResetable = FindObjectsOfType().OfType().ToArray(); + m_timer.Value = m_timeInLevel; + + foreach (IResettable resettable in m_allResetable) + { + resettable.OnLevelLoad(); + } + } + + private void Update() + { + if (!m_freezePlayer) + m_timer.Value -= Time.deltaTime; + } + + + + private void OnEnable() + { + m_isPlayerDead.OnValueChanged += OnPlayerDeadChange; + m_isVictory.OnValueChanged += OnPlayerVictoryChange; + } + + private void OnDisable() + { + m_isPlayerDead.OnValueChanged -= OnPlayerDeadChange; + m_isVictory.OnValueChanged -= OnPlayerVictoryChange; + } + + + private IEnumerator DeathRoutine() + { + m_freezePlayer.Value = true; + + + + m_timer.Value = m_timeInLevel; + foreach (IResettable resettable in m_allResetable) + StartCoroutine(resettable.OnResetStart(m_resetTime)); + + yield return new WaitForSeconds(m_resetTime); + + foreach (IResettable resettable in m_allResetable) + resettable.OnResetEnd(); + + + m_freezePlayer.Value = false; + } + + + + + + private void OnPlayerDeadChange(bool value) + { + if (value) + { + StartCoroutine(DeathRoutine()); + } + + + } + + private void OnPlayerVictoryChange(bool value) + { + + } + + + + + + +} diff --git a/Assets/Scripts/LevelManager.cs.meta b/Assets/Scripts/LevelManager.cs.meta new file mode 100644 index 0000000..2af79f6 --- /dev/null +++ b/Assets/Scripts/LevelManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2022aae2eff786945bf401469695230a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SneakyTextController.cs b/Assets/Scripts/SneakyTextController.cs new file mode 100644 index 0000000..25d280f --- /dev/null +++ b/Assets/Scripts/SneakyTextController.cs @@ -0,0 +1,62 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Variables; + +public class SneakyTextController : MonoBehaviour +{ + [SerializeField] + private Reference m_lightLevel; + + [SerializeField] + private Reference m_freezePlayer; + + [SerializeField] + private float m_time = 10; + + [SerializeField] + private TMPro.TextMeshProUGUI m_text; + + private bool m_hasTriggered = false; + + private void OnEnable() + { + m_lightLevel.OnValueChanged += OnLightChange; + } + + private void OnDisable() + { + m_lightLevel.OnValueChanged -= OnLightChange; + } + + + private void Start() + { + m_text.gameObject.SetActive(false); + } + + + private void OnLightChange(float value) + { + + Color color = m_text.color; + color.a = 1 - m_lightLevel; + m_text.color = color; + + if (!m_hasTriggered && !m_freezePlayer) + { + m_hasTriggered = true; + StartCoroutine(Timer( m_time)); + } + + } + + private IEnumerator Timer(float time) + { + Debug.Log("here"); + m_text.gameObject.SetActive(true); + yield return new WaitForSeconds(time); + m_text.gameObject.SetActive(false); + } + +} diff --git a/Assets/Scripts/SneakyTextController.cs.meta b/Assets/Scripts/SneakyTextController.cs.meta new file mode 100644 index 0000000..83d3495 --- /dev/null +++ b/Assets/Scripts/SneakyTextController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d6f991527b7c3d5419b9f5e0f73d598d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/TextController.cs b/Assets/Scripts/TextController.cs index 06c16e7..63b5746 100644 --- a/Assets/Scripts/TextController.cs +++ b/Assets/Scripts/TextController.cs @@ -5,7 +5,7 @@ using UnityEngine.UI; using TMPro; using NaughtyAttributes; -public class TextController : MonoBehaviour +public class TextController : MonoBehaviour, IResettable { [SerializeField] @@ -139,10 +139,22 @@ public class TextController : MonoBehaviour m_goText.gameObject.SetActive(false); } + public void OnLevelLoad() + { + } + public IEnumerator OnResetStart(float time) + { + yield return new WaitForSeconds(time - gotime); + m_goText.gameObject.SetActive(true); + yield return new WaitForSeconds(gotime); + m_goText.gameObject.SetActive(false); + } - + public void OnResetEnd() + { + } } diff --git a/Assets/Scripts/TimerController.cs b/Assets/Scripts/TimerController.cs new file mode 100644 index 0000000..ec739a6 --- /dev/null +++ b/Assets/Scripts/TimerController.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using TMPro; +using Variables; + +public class TimerController : MonoBehaviour +{ + + [SerializeField] + private Reference m_time; + + private Color m_defaultColor; + + + private void OnEnable() + { + m_time.OnValueChanged += OnTimeChange; + } + + private void OnDisable() + { + m_time.OnValueChanged -= OnTimeChange; + } + + private void OnTimeChange(float value) + { + + + + } + + +} diff --git a/Assets/Scripts/TimerController.cs.meta b/Assets/Scripts/TimerController.cs.meta new file mode 100644 index 0000000..4974f73 --- /dev/null +++ b/Assets/Scripts/TimerController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5e65af424b40dd845ae91bb2d24af0c9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Variables/Runtime/LightAmount.asset b/Assets/Variables/Runtime/LightAmount.asset new file mode 100644 index 0000000..19a0d2a --- /dev/null +++ b/Assets/Variables/Runtime/LightAmount.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:965d4f6151fb166d5495eabf7d7c024ec4ad82b2ae8d08e22684d43e9026122d +size 465 diff --git a/Assets/Variables/Runtime/LightAmount.asset.meta b/Assets/Variables/Runtime/LightAmount.asset.meta new file mode 100644 index 0000000..f15ee1b --- /dev/null +++ b/Assets/Variables/Runtime/LightAmount.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca17925be533f0e488952f6fe4d4563b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Variables/Runtime/Timer.asset b/Assets/Variables/Runtime/Timer.asset new file mode 100644 index 0000000..e9a135c --- /dev/null +++ b/Assets/Variables/Runtime/Timer.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb84f9102a37896deb5dce6340b78e9027405f1bf3b96e7dc584d86891343fca +size 459 diff --git a/Assets/Variables/Runtime/Timer.asset.meta b/Assets/Variables/Runtime/Timer.asset.meta new file mode 100644 index 0000000..bdbb37e --- /dev/null +++ b/Assets/Variables/Runtime/Timer.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a36c9e2ffbc2b20429e4486eba03312a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Variables/Runtime/freezePlayer.asset b/Assets/Variables/Runtime/freezePlayer.asset new file mode 100644 index 0000000..f616f65 --- /dev/null +++ b/Assets/Variables/Runtime/freezePlayer.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f374dd84929158d72abba2b7081384c232df90b4e44faaabd3958edc540e7783 +size 466 diff --git a/Assets/Variables/Runtime/isNoInput.asset.meta b/Assets/Variables/Runtime/freezePlayer.asset.meta similarity index 100% rename from Assets/Variables/Runtime/isNoInput.asset.meta rename to Assets/Variables/Runtime/freezePlayer.asset.meta diff --git a/Assets/Variables/Runtime/isNoInput.asset b/Assets/Variables/Runtime/isNoInput.asset deleted file mode 100644 index 4d17850..0000000 --- a/Assets/Variables/Runtime/isNoInput.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ecb22b8aba55149d6ccaa0fd21d39d0fe679b567bb33be4855bcd3dfc83e5dd3 -size 463 diff --git a/Assets/Variables/Runtime/isPlayerDead.asset b/Assets/Variables/Runtime/isPlayerDead.asset new file mode 100644 index 0000000..9a44f06 --- /dev/null +++ b/Assets/Variables/Runtime/isPlayerDead.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09bd38903b041010fb34210e17c1ea48ae59bb39468dd067f64fba554dfc864a +size 466 diff --git a/Assets/Variables/Runtime/isPlayerDead.asset.meta b/Assets/Variables/Runtime/isPlayerDead.asset.meta new file mode 100644 index 0000000..fd7819f --- /dev/null +++ b/Assets/Variables/Runtime/isPlayerDead.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a1586014535831a4e80b30178ff5ced4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: From 87cc8eff56e39ab5d5203e993c61fb1f3be923da Mon Sep 17 00:00:00 2001 From: "Tau-er\\Bobbster" Date: Sun, 30 Jan 2022 03:19:08 +0100 Subject: [PATCH 2/2] Palette upgrades --- .../Chars/Moose Angel/Materials.meta} | 2 +- .../Chars/Moose Angel/Materials/monster_0.mat | 37 ++ .../Moose Angel/Materials/monster_0.mat.meta | 8 + .../Chars/Moose Angel/monster_0.png.meta | 18 +- .../Textures/Environ/castle_tileset.png.meta | 12 +- .../Textures/Environ/decor.png.meta | 58 +-- Assets/Art Assets/Textures/Environ/water.png | 4 +- .../Textures/Environ/water.png.meta | 2 +- .../Tiles/Environment/Decor/Decor.prefab | 348 +++++++++++++++++- .../Environment/Decor/decor_dangler.asset | 3 + .../Decor/decor_dangler.asset.meta | 8 + .../Environment/Decor/decor_dangler2.asset | 3 + .../Decor/decor_dangler2.asset.meta | 8 + .../Environment/Decor/decor_dangler3.asset | 3 + .../Decor/decor_dangler3.asset.meta | 8 + .../Environment/Decor/decor_dangler4.asset | 3 + .../Decor/decor_dangler4.asset.meta | 8 + .../Environment/Decor/decor_dangler5.asset | 3 + .../Decor/decor_dangler5.asset.meta | 8 + .../Environment/Decor/decor_grass_dark1.asset | 3 + .../Decor/decor_grass_dark1.asset.meta | 8 + .../Environment/Decor/decor_grass_dark2.asset | 3 + .../Decor/decor_grass_dark2.asset.meta | 8 + .../Environment/Decor/decor_grass_dark3.asset | 3 + .../Decor/decor_grass_dark3.asset.meta | 8 + .../Decor/decor_grass_light1.asset | 3 + .../Decor/decor_grass_light1.asset.meta | 8 + .../Decor/decor_grass_light2.asset | 3 + .../Decor/decor_grass_light2.asset.meta | 8 + .../Decor/decor_grass_light3.asset | 3 + .../Decor/decor_grass_light3.asset.meta | 8 + .../Tiles/Environment/Decor/decor_leaf.asset | 3 + .../Environment/Decor/decor_leaf.asset.meta | 8 + .../Tiles/Environment/Decor/decor_leaf2.asset | 3 + .../Environment/Decor/decor_leaf2.asset.meta | 8 + .../Environment/Decor/decor_plant1.asset | 3 + .../Environment/Decor/decor_plant1.asset.meta | 8 + .../Environment/Decor/decor_plant2.asset | 3 + .../Environment/Decor/decor_plant2.asset.meta | 8 + .../Tiles/Environment/Decor/decor_trunk.asset | 3 + .../Environment/Decor/decor_trunk.asset.meta | 8 + .../Tiles/Environment/Decor/decor_vine.asset | 3 + .../Environment/Decor/decor_vine.asset.meta | 8 + .../Tiles/Environment/Decor/decor_vine2.asset | 3 + .../Environment/Decor/decor_vine2.asset.meta | 8 + .../Tiles/Environment/Main Palette.prefab | 46 +-- .../Environment/Rule tiles/Danglers.asset | 3 + .../Rule tiles/Danglers.asset.meta | 8 + .../Environment/Rule tiles/Light_Grass.asset | 2 +- Assets/Scenes/Level 2.unity | 4 +- 50 files changed, 655 insertions(+), 95 deletions(-) rename Assets/Art Assets/{Tilemaps.meta => Textures/Chars/Moose Angel/Materials.meta} (77%) create mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat create mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_dangler.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_dangler.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_dangler2.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_dangler2.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_dangler3.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_dangler3.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_dangler4.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_dangler4.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_dangler5.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_dangler5.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark1.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark1.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark2.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark2.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark3.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark3.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light1.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light1.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light2.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light2.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light3.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light3.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_leaf.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_leaf.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_leaf2.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_leaf2.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_plant1.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_plant1.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_plant2.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_plant2.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_trunk.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_trunk.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_vine.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_vine.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_vine2.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/decor_vine2.asset.meta create mode 100644 Assets/Art Assets/Tiles/Environment/Rule tiles/Danglers.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Rule tiles/Danglers.asset.meta diff --git a/Assets/Art Assets/Tilemaps.meta b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta similarity index 77% rename from Assets/Art Assets/Tilemaps.meta rename to Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta index ff6b107..adae701 100644 --- a/Assets/Art Assets/Tilemaps.meta +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 85233f4a34a589945870b124282bf234 +guid: fbb382cd1cd301046ad6790c048b0c6c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat new file mode 100644 index 0000000..f4e145a --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: monster_0 + m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 4f66e39be2d476f46bb700a5268dcfb8, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta new file mode 100644 index 0000000..888a93a --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4cfcd558d1d29fe49a8f2d60afff1640 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/monster_0.png.meta b/Assets/Art Assets/Textures/Chars/Moose Angel/monster_0.png.meta index f3ded91..d7c7fae 100644 --- a/Assets/Art Assets/Textures/Chars/Moose Angel/monster_0.png.meta +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/monster_0.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -35,24 +35,24 @@ TextureImporter: filterMode: 1 aniso: 2 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 48 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -129,7 +129,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/Art Assets/Textures/Environ/castle_tileset.png.meta b/Assets/Art Assets/Textures/Environ/castle_tileset.png.meta index 4942fbe..fd53908 100644 --- a/Assets/Art Assets/Textures/Environ/castle_tileset.png.meta +++ b/Assets/Art Assets/Textures/Environ/castle_tileset.png.meta @@ -155,8 +155,8 @@ TextureImporter: y: 149 width: 18 height: 23 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.4854355, y: 0.64819} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -176,8 +176,8 @@ TextureImporter: y: 146 width: 7 height: 26 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.4625484, y: 0.7117621} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -386,8 +386,8 @@ TextureImporter: y: 115 width: 16 height: 39 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.5, y: 0.21} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Assets/Art Assets/Textures/Environ/decor.png.meta b/Assets/Art Assets/Textures/Environ/decor.png.meta index db49503..cc64510 100644 --- a/Assets/Art Assets/Textures/Environ/decor.png.meta +++ b/Assets/Art Assets/Textures/Environ/decor.png.meta @@ -229,9 +229,9 @@ TextureImporter: x: 110 y: 87 width: 22 - height: 22 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + height: 26 + alignment: 9 + pivot: {x: 0.5, y: 0.3} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -250,7 +250,7 @@ TextureImporter: x: 134 y: 87 width: 21 - height: 11 + height: 16 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -269,9 +269,9 @@ TextureImporter: rect: serializedVersion: 2 x: 63 - y: 84 - width: 11 - height: 11 + y: 79 + width: 12 + height: 16 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -290,9 +290,9 @@ TextureImporter: rect: serializedVersion: 2 x: 78 - y: 85 + y: 80 width: 11 - height: 11 + height: 16 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -313,7 +313,7 @@ TextureImporter: x: 17 y: 64 width: 11 - height: 8 + height: 16 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -333,8 +333,8 @@ TextureImporter: serializedVersion: 2 x: 31 y: 64 - width: 12 - height: 13 + width: 13 + height: 16 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -377,8 +377,8 @@ TextureImporter: y: 60 width: 16 height: 16 - alignment: 9 - pivot: {x: 0.30898008, y: 0.3043206} + alignment: 0 + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -395,9 +395,9 @@ TextureImporter: rect: serializedVersion: 2 x: 114 - y: 63 - width: 13 - height: 13 + y: 60 + width: 14 + height: 16 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -416,9 +416,9 @@ TextureImporter: rect: serializedVersion: 2 x: 130 - y: 66 - width: 10 - height: 10 + y: 60 + width: 16 + height: 16 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -436,10 +436,10 @@ TextureImporter: name: decor_leaf2 rect: serializedVersion: 2 - x: 146 - y: 69 - width: 7 - height: 7 + x: 140 + y: 60 + width: 16 + height: 16 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -524,8 +524,8 @@ TextureImporter: y: 64 width: 16 height: 16 - alignment: 9 - pivot: {x: 0.5029521, y: 0.52519226} + alignment: 0 + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -541,12 +541,12 @@ TextureImporter: name: decor_grass_light3 rect: serializedVersion: 2 - x: 63 + x: 69 y: 64 width: 16 height: 16 - alignment: 9 - pivot: {x: 0.5275324, y: 0.7190136} + alignment: 0 + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Assets/Art Assets/Textures/Environ/water.png b/Assets/Art Assets/Textures/Environ/water.png index ff124f6..b62b0e0 100644 --- a/Assets/Art Assets/Textures/Environ/water.png +++ b/Assets/Art Assets/Textures/Environ/water.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f21b9f1bba33cb3bca2c61cb31257f40deebd2cd8c91cfef8d502b73d5d8f1a -size 853 +oid sha256:770de55499d050641f1120832f5af12e33882f469e7bb7d222c2e904422a11fe +size 855 diff --git a/Assets/Art Assets/Textures/Environ/water.png.meta b/Assets/Art Assets/Textures/Environ/water.png.meta index 5cdd353..03072bc 100644 --- a/Assets/Art Assets/Textures/Environ/water.png.meta +++ b/Assets/Art Assets/Textures/Environ/water.png.meta @@ -234,7 +234,7 @@ TextureImporter: serializedVersion: 2 x: 81 y: 34 - width: 15 + width: 16 height: 16 alignment: 0 pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Art Assets/Tiles/Environment/Decor/Decor.prefab b/Assets/Art Assets/Tiles/Environment/Decor/Decor.prefab index 79ab514..d26b0a0 100644 --- a/Assets/Art Assets/Tiles/Environment/Decor/Decor.prefab +++ b/Assets/Art Assets/Tiles/Environment/Decor/Decor.prefab @@ -40,17 +40,343 @@ Tilemap: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 207219532527442833} m_Enabled: 1 - m_Tiles: {} + m_Tiles: + - first: {x: -3, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 3 + m_TileSpriteIndex: 4 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 16 + m_TileSpriteIndex: 16 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 17 + m_TileSpriteIndex: 17 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -3, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 10 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -2, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 4 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 12 + m_TileSpriteIndex: 12 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 13 + m_TileSpriteIndex: 13 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 14 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 15 + m_TileSpriteIndex: 15 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -3, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 6 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 8 + m_TileSpriteIndex: 8 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 9 + m_TileSpriteIndex: 9 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 11 + m_TileSpriteIndex: 11 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -3, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -2, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 5 + m_TileSpriteIndex: 5 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 6 + m_TileSpriteIndex: 7 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 7 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 18 + m_TileSpriteIndex: 9 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741826 + - first: {x: 0, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 19 + m_TileSpriteIndex: 4 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741826 + - first: {x: 1, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 20 + m_TileSpriteIndex: 6 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741826 m_AnimatedTiles: {} - m_TileAssetArray: [] - m_TileSpriteArray: [] - m_TileMatrixArray: [] - m_TileColorArray: [] + m_TileAssetArray: + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 42887f6d5043c584cbeba66d2c292997, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 468577ca5eb83ee4fa2dcf002db111bb, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 17b5769bf11658642aa1398c84b52de5, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 608a5dae37280714f8cf223d1e55af36, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: b89b2c71c6d19024d8a0e8b8d4dffae0, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 3f6b88bc87c349d4c846678526efec67, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: dedb652534fdf8e479c2c9e13c289cb3, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: ceaa9ad119734f445adb9d2afe46c5b5, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: dc21ae937ccab774e877f26dc76e3663, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 20053426a2883e840acf35a3daf6e2c7, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 4d5934146a24cc448807d80ee0ea7ac4, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 4a791de422e6b974ebabf5477f5e6910, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 5db14b24781d4604ebf310a4506120e2, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: ae0527ae03ebba64c844879e3ae11f07, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 4ec242bb4dc92dd4891f18687f108d10, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 75af4365a47098c47813c84ba5591cac, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 82d8acd40f132eb41b356d9628d41ff5, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: fc758a4a2e9715f4182e31a103aebed3, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 801e7deada1d1f74aa59f589a72283ba, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: a27d337ded5adbe40a4529f815645d59, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: d184dcfeb2570c643849848d0f87bbe1, type: 2} + m_TileSpriteArray: + - m_RefCount: 1 + m_Data: {fileID: 3977439943124479116, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -6252805913084083930, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -3553767443181825458, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 5492486684686113971, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 2 + m_Data: {fileID: 2940010051858493779, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 6892907418128013141, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 2 + m_Data: {fileID: -667873837454055024, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -6709542322131757786, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 968779181053603064, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 2 + m_Data: {fileID: -2484269097896370145, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -626145753933744596, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -5763186658515932357, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 3772985552029500671, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -8736868614615867972, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -2603311821418127281, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -3579472602480421216, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 8843726661577706292, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 2004466711981498611, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + m_TileMatrixArray: + - m_RefCount: 20 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - m_RefCount: 1 + m_Data: + e00: -1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 21 + m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0, z: 1} + m_Origin: {x: -3, y: -4, z: 0} + m_Size: {x: 6, y: 7, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -80,7 +406,7 @@ TilemapRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_DynamicOccludee: 1 + m_DynamicOccludee: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -111,7 +437,7 @@ TilemapRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_ChunkCullingBounds: {x: 0.1875, y: 0.6374999, z: 0} m_MaxChunkCount: 16 m_MaxFrameAge: 16 m_SortOrder: 0 @@ -128,7 +454,7 @@ GameObject: m_Component: - component: {fileID: 7576806196340136164} - component: {fileID: 1997545516578526669} - m_Layer: 0 + m_Layer: 31 m_Name: Decor m_TagString: Untagged m_Icon: {fileID: 0} @@ -162,7 +488,7 @@ Grid: m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 ---- !u!114 &-2098696893971261258 +--- !u!114 &6939106024771849074 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler.asset new file mode 100644 index 0000000..2605dbb --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4ca06bdbd34a59c48d3c26d8972bd1819a822783ea752ae59ff0a1bae5d86cb +size 787 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler.asset.meta new file mode 100644 index 0000000..963bb81 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f6b88bc87c349d4c846678526efec67 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler2.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler2.asset new file mode 100644 index 0000000..1f7e308 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler2.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1df349ca2feabce6abe18df133c7322108234c22c410bc4d955412333510fc8b +size 789 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler2.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler2.asset.meta new file mode 100644 index 0000000..c3ca268 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dedb652534fdf8e479c2c9e13c289cb3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler3.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler3.asset new file mode 100644 index 0000000..ad14521 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler3.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff17391fa32ab6d508bd4f58c771a1d45603035b9fa44608ac865d23949c91cb +size 788 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler3.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler3.asset.meta new file mode 100644 index 0000000..d3f402c --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ceaa9ad119734f445adb9d2afe46c5b5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler4.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler4.asset new file mode 100644 index 0000000..b3e6e6f --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler4.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:690ffb9fc55b09c5bb6139997262a2ca70bd91cd5cc05e91da6a8e6bb3e40308 +size 787 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler4.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler4.asset.meta new file mode 100644 index 0000000..098dce2 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dc21ae937ccab774e877f26dc76e3663 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler5.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler5.asset new file mode 100644 index 0000000..4aaf0b2 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler5.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d94994d4bd07ac5cc81af7cedeb68554316e708b1ae6a0fb78eee0a667a6ab6 +size 789 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler5.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler5.asset.meta new file mode 100644 index 0000000..4e820a4 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_dangler5.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 20053426a2883e840acf35a3daf6e2c7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark1.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark1.asset new file mode 100644 index 0000000..604fbb6 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark1.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4f096985606824820fc93b296ae70e9f18aaac4517d652de22a32e552e8a2ab +size 791 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark1.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark1.asset.meta new file mode 100644 index 0000000..3bb63ff --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 468577ca5eb83ee4fa2dcf002db111bb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark2.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark2.asset new file mode 100644 index 0000000..f814844 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark2.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44d5e0410acbbdf91bc02786122348337da3288c665d25451a071264aea3fcb5 +size 791 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark2.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark2.asset.meta new file mode 100644 index 0000000..5301f8a --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 42887f6d5043c584cbeba66d2c292997 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark3.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark3.asset new file mode 100644 index 0000000..e6b6268 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark3.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6590fc46a380242ee22063d23e69d5c9acd60df225783ef4cc223277661b4d6e +size 792 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark3.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark3.asset.meta new file mode 100644 index 0000000..2c2cb32 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17b5769bf11658642aa1398c84b52de5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light1.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light1.asset new file mode 100644 index 0000000..43a24b7 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light1.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:287a691e5a8fdea9b58b1d5748d797c36b20c8380cd594fcb7ce4b2b74e37f91 +size 793 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light1.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light1.asset.meta new file mode 100644 index 0000000..dd5b231 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b89b2c71c6d19024d8a0e8b8d4dffae0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light2.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light2.asset new file mode 100644 index 0000000..a9fb7fe --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light2.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7522df3dcc24b77e4384bca0c582782f044c731a67953e564dc7e4e0d9e245d5 +size 792 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light2.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light2.asset.meta new file mode 100644 index 0000000..1ae2b80 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 608a5dae37280714f8cf223d1e55af36 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light3.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light3.asset new file mode 100644 index 0000000..a669814 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light3.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67454ae790cf33884498cf2b8731f757c5066af111838eec0e5983d3568ca8ae +size 792 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light3.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light3.asset.meta new file mode 100644 index 0000000..1b6b565 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4d5934146a24cc448807d80ee0ea7ac4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_leaf.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_leaf.asset new file mode 100644 index 0000000..3c6272d --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_leaf.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91745da3ae4cd8b16359beefd22fd655fd5443cd5ee431a46b49906ae974cce3 +size 785 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_leaf.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_leaf.asset.meta new file mode 100644 index 0000000..92e0855 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_leaf.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4a791de422e6b974ebabf5477f5e6910 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_leaf2.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_leaf2.asset new file mode 100644 index 0000000..176ff6b --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_leaf2.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28a767f910cd2f2fb8d620116ac1c843af094c2242e35d4ac290b81d25c25923 +size 785 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_leaf2.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_leaf2.asset.meta new file mode 100644 index 0000000..d43ed68 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_leaf2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5db14b24781d4604ebf310a4506120e2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_plant1.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_plant1.asset new file mode 100644 index 0000000..8bee1c1 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_plant1.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b0513e7ff30285d12687cf532e06c936f7f77da748063685457e06db1a5e1ce +size 787 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_plant1.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_plant1.asset.meta new file mode 100644 index 0000000..a376b36 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_plant1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae0527ae03ebba64c844879e3ae11f07 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_plant2.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_plant2.asset new file mode 100644 index 0000000..2da860b --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_plant2.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7aff51f8d5b46e243745a66a0bb497ade326e0cedec428e1e29c531934cd8a51 +size 787 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_plant2.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_plant2.asset.meta new file mode 100644 index 0000000..6428c3d --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_plant2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4ec242bb4dc92dd4891f18687f108d10 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_trunk.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_trunk.asset new file mode 100644 index 0000000..73c7939 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_trunk.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97d78506c19371278a56c6ad149691fb822b535ddde4f2a594e9ab101a256702 +size 786 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_trunk.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_trunk.asset.meta new file mode 100644 index 0000000..171fcee --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_trunk.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 75af4365a47098c47813c84ba5591cac +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_vine.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_vine.asset new file mode 100644 index 0000000..4b78823 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_vine.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55f8356fda65d469e1f07f052eea09dfaf54e453215867394d94f5f642118aa8 +size 784 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_vine.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_vine.asset.meta new file mode 100644 index 0000000..f5b919c --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_vine.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 82d8acd40f132eb41b356d9628d41ff5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_vine2.asset b/Assets/Art Assets/Tiles/Environment/Decor/decor_vine2.asset new file mode 100644 index 0000000..f12babf --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_vine2.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f58221e09b853d385773fde2b76d48cc50dc4de9223e3ca3b6c6c10ebb5c12ad +size 785 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/decor_vine2.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/decor_vine2.asset.meta new file mode 100644 index 0000000..193e990 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/decor_vine2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fc758a4a2e9715f4182e31a103aebed3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Main Palette.prefab b/Assets/Art Assets/Tiles/Environment/Main Palette.prefab index 548d100..951f6cb 100644 --- a/Assets/Art Assets/Tiles/Environment/Main Palette.prefab +++ b/Assets/Art Assets/Tiles/Environment/Main Palette.prefab @@ -85,32 +85,12 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741826 - - first: {x: -1, y: 1, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 1 m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741826 - - first: {x: 0, y: 1, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741826 m_AnimatedTiles: - first: {x: -3, y: -1, z: 0} second: @@ -132,16 +112,16 @@ Tilemap: - {fileID: -8328159106608433595, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3} - {fileID: -6668061196424841238, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3} - {fileID: 9092607584915671340, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3} - m_AnimationSpeed: 0.1 + m_AnimationSpeed: 10 m_AnimationTimeOffset: 0 m_IsLooping: 1 m_TileAssetArray: - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 41dc0ce13e6dac749be38cdb2fd3f82c, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: a27d337ded5adbe40a4529f815645d59, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: d184dcfeb2570c643849848d0f87bbe1, type: 2} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 2d0fbfd998c41a54490519bec3c02a68, type: 2} - m_RefCount: 1 @@ -151,12 +131,12 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 11400000, guid: d74d57b7ff7cf6f4abb145381fdcf614, type: 2} m_TileSpriteArray: + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: -1039700332371458674, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - - m_RefCount: 1 - m_Data: {fileID: -3553767443181825458, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} - - m_RefCount: 1 - m_Data: {fileID: -667873837454055024, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: -1078892822073738303, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} - m_RefCount: 1 @@ -166,7 +146,7 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 7149751655148466542, guid: 907033fa4bb32a0429d4c09e84be38c5, type: 3} m_TileMatrixArray: - - m_RefCount: 6 + - m_RefCount: 4 m_Data: e00: 1 e01: 0 @@ -203,7 +183,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 7 + - m_RefCount: 5 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -317,11 +297,11 @@ Grid: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6929633759649683794} m_Enabled: 1 - m_CellSize: {x: 0.9375, y: 1, z: 0} + m_CellSize: {x: 1, y: 1, z: 0} m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 ---- !u!114 &1276535526792874766 +--- !u!114 &8641224787687036702 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Art Assets/Tiles/Environment/Rule tiles/Danglers.asset b/Assets/Art Assets/Tiles/Environment/Rule tiles/Danglers.asset new file mode 100644 index 0000000..287adb7 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Rule tiles/Danglers.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b116a57b91a3e324a2b04d860477baace633248cde60c1acdbfb6c027ecc6db4 +size 1440 diff --git a/Assets/Art Assets/Tiles/Environment/Rule tiles/Danglers.asset.meta b/Assets/Art Assets/Tiles/Environment/Rule tiles/Danglers.asset.meta new file mode 100644 index 0000000..93cf81c --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Rule tiles/Danglers.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 801e7deada1d1f74aa59f589a72283ba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Environment/Rule tiles/Light_Grass.asset b/Assets/Art Assets/Tiles/Environment/Rule tiles/Light_Grass.asset index e6e2cae..3444bca 100644 --- a/Assets/Art Assets/Tiles/Environment/Rule tiles/Light_Grass.asset +++ b/Assets/Art Assets/Tiles/Environment/Rule tiles/Light_Grass.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c339b59fc140ba5b0a5b4ada1b61e8e30984d669eff41ce2fdf78ce8f6e07e6 +oid sha256:40e4ab66ec7e6f87761dc4bd47af96c941b20f45efc0aca9b2deacdc8d102d8f size 1133 diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/Level 2.unity index 208efde..7737279 100644 --- a/Assets/Scenes/Level 2.unity +++ b/Assets/Scenes/Level 2.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eca0f48288f2244de93949aafed1a6fb1269abd1dba6ec53d13194cf3b9c7a00 -size 440802 +oid sha256:c408e0ad1545a773633db567cd7ebdf49773c5f352073aeeaeb69e1e8a65a912 +size 451909