From 87cc8eff56e39ab5d5203e993c61fb1f3be923da Mon Sep 17 00:00:00 2001 From: "Tau-er\\Bobbster" Date: Sun, 30 Jan 2022 03:19:08 +0100 Subject: [PATCH 1/8] 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 From 48194276a7ee75577d2caddafb71b053888ed276 Mon Sep 17 00:00:00 2001 From: Jeff Date: Sun, 30 Jan 2022 13:26:52 +1100 Subject: [PATCH 2/8] Platform mover --- .../Chars/Moose Angel/face_mask_0.png.meta | 144 ------------------ Assets/Scenes/Level 2.unity | 4 +- Assets/Scenes/WalljumpTest.unity | 4 +- Assets/Scripts/PlatformMover.cs | 30 ++++ Assets/Scripts/PlatformMover.cs.meta | 11 ++ 5 files changed, 45 insertions(+), 148 deletions(-) delete mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta create mode 100644 Assets/Scripts/PlatformMover.cs create mode 100644 Assets/Scripts/PlatformMover.cs.meta 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 deleted file mode 100644 index 3203616..0000000 --- a/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta +++ /dev/null @@ -1,144 +0,0 @@ -fileFormatVersion: 2 -guid: 59dd813e4bd61114da8ecacf6b2f6061 -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/Scenes/Level 2.unity b/Assets/Scenes/Level 2.unity index 208efde..7425011 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:688956b336ae1fe48d882f2e73ecb64b54790f9bc2eb21aa0e228bf9ec0b770d +size 444596 diff --git a/Assets/Scenes/WalljumpTest.unity b/Assets/Scenes/WalljumpTest.unity index 98c09f1..3f6890f 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:74dadf0e7abae9aa3eb00726859b73a50e45d849720fc434d3a27f6faf54b6b6 -size 1728849 +oid sha256:3b53772d9a9f66ad6819f67005db77162cb086ebf7bc819d3d73d1f0af8ea4fb +size 1740290 diff --git a/Assets/Scripts/PlatformMover.cs b/Assets/Scripts/PlatformMover.cs new file mode 100644 index 0000000..cd91b60 --- /dev/null +++ b/Assets/Scripts/PlatformMover.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlatformMover : MonoBehaviour +{ + [SerializeField] private Transform m_StartPos; + [SerializeField] private Transform m_EndPos; + [SerializeField] private float m_Duration = 2f; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + transform.position = Vector2.Lerp(m_StartPos.position, m_EndPos.position, Mathf.PingPong(Time.deltaTime * m_Duration, 1.0f)); + } + +#if UNITY_EDITOR + private void OnDrawGizmos() + { + Gizmos.color = Color.green; + Gizmos.DrawLine(m_StartPos.position, m_EndPos.position); + } +#endif +} diff --git a/Assets/Scripts/PlatformMover.cs.meta b/Assets/Scripts/PlatformMover.cs.meta new file mode 100644 index 0000000..c648773 --- /dev/null +++ b/Assets/Scripts/PlatformMover.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e37b7702510697041a7ae1a25956385b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From a5a31d0962fede90f6d2123a92bb84cfd4c4d964 Mon Sep 17 00:00:00 2001 From: Jeff Date: Sun, 30 Jan 2022 13:34:43 +1100 Subject: [PATCH 3/8] Moving platforms fixed Level 2 ground fixed --- Assets/Scenes/Level 2.unity | 4 ++-- Assets/Scripts/PlatformMover.cs | 2 +- Assets/Variables/Runtime/freezePlayer.asset | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/Level 2.unity index 7425011..6de99e9 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:688956b336ae1fe48d882f2e73ecb64b54790f9bc2eb21aa0e228bf9ec0b770d -size 444596 +oid sha256:a682cca83f7ccc5ce655eccc527b7dfc5712f70e820adde94bb3da99407916dc +size 442128 diff --git a/Assets/Scripts/PlatformMover.cs b/Assets/Scripts/PlatformMover.cs index cd91b60..a088f83 100644 --- a/Assets/Scripts/PlatformMover.cs +++ b/Assets/Scripts/PlatformMover.cs @@ -17,7 +17,7 @@ public class PlatformMover : MonoBehaviour // Update is called once per frame void Update() { - transform.position = Vector2.Lerp(m_StartPos.position, m_EndPos.position, Mathf.PingPong(Time.deltaTime * m_Duration, 1.0f)); + transform.position = Vector2.Lerp(m_StartPos.position, m_EndPos.position, (Mathf.Sin(Time.time * m_Duration) + 1.0f) / 2.0f); } #if UNITY_EDITOR diff --git a/Assets/Variables/Runtime/freezePlayer.asset b/Assets/Variables/Runtime/freezePlayer.asset index f616f65..a81d699 100644 --- a/Assets/Variables/Runtime/freezePlayer.asset +++ b/Assets/Variables/Runtime/freezePlayer.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f374dd84929158d72abba2b7081384c232df90b4e44faaabd3958edc540e7783 +oid sha256:466fdb9107b37543a2ad85e238da069372b91af9605c5eeabd8ce9114f1801eb size 466 From 8609cb3166caf260ee3997772a5efd8668778436 Mon Sep 17 00:00:00 2001 From: "Tau-er\\Bobbster" Date: Sun, 30 Jan 2022 03:51:43 +0100 Subject: [PATCH 4/8] Sky backdrop started... --- ...b7eb71343ea6a91583afc81271a936526016c.meta | 7 + .../Chars/Moose Angel/face_mask_0.png.meta | 144 ------------ .../Environ/backdrop/clouds1.png.meta | 20 +- .../Environ/backdrop/clouds2.png.meta | 20 +- .../Environ/backdrop/clouds3.png.meta | 20 +- .../Textures/Environ/backdrop/sky.png.meta | 20 +- Assets/Art Assets/Tiles/Backdrop.meta | 8 + Assets/Art Assets/Tiles/Backdrop/Sky.prefab | 213 ++++++++++++++++++ .../Art Assets/Tiles/Backdrop/Sky.prefab.meta | 7 + Assets/Art Assets/Tiles/Backdrop/sky.asset | 3 + .../Art Assets/Tiles/Backdrop/sky.asset.meta | 8 + Assets/Scenes/Level 2.unity | 4 +- 12 files changed, 288 insertions(+), 186 deletions(-) create mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta~77db7eb71343ea6a91583afc81271a936526016c.meta delete mode 100644 Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta create mode 100644 Assets/Art Assets/Tiles/Backdrop.meta create mode 100644 Assets/Art Assets/Tiles/Backdrop/Sky.prefab create mode 100644 Assets/Art Assets/Tiles/Backdrop/Sky.prefab.meta create mode 100644 Assets/Art Assets/Tiles/Backdrop/sky.asset create mode 100644 Assets/Art Assets/Tiles/Backdrop/sky.asset.meta diff --git a/Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta~77db7eb71343ea6a91583afc81271a936526016c.meta b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta~77db7eb71343ea6a91583afc81271a936526016c.meta new file mode 100644 index 0000000..3248726 --- /dev/null +++ b/Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta~77db7eb71343ea6a91583afc81271a936526016c.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9d6f5a7c169a6054ca2dd15692b3ace7 +DefaultImporter: + externalObjects: {} + 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 deleted file mode 100644 index 3203616..0000000 --- a/Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta +++ /dev/null @@ -1,144 +0,0 @@ -fileFormatVersion: 2 -guid: 59dd813e4bd61114da8ecacf6b2f6061 -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 index db3be96..cdf1350 100644 --- a/Assets/Art Assets/Textures/Environ/backdrop/clouds1.png.meta +++ b/Assets/Art Assets/Textures/Environ/backdrop/clouds1.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -32,27 +32,27 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 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: 8 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/backdrop/clouds2.png.meta b/Assets/Art Assets/Textures/Environ/backdrop/clouds2.png.meta index e28990e..235de4b 100644 --- a/Assets/Art Assets/Textures/Environ/backdrop/clouds2.png.meta +++ b/Assets/Art Assets/Textures/Environ/backdrop/clouds2.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -32,27 +32,27 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 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: 8 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/backdrop/clouds3.png.meta b/Assets/Art Assets/Textures/Environ/backdrop/clouds3.png.meta index 03ce03a..026a467 100644 --- a/Assets/Art Assets/Textures/Environ/backdrop/clouds3.png.meta +++ b/Assets/Art Assets/Textures/Environ/backdrop/clouds3.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -32,27 +32,27 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 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: 8 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/backdrop/sky.png.meta b/Assets/Art Assets/Textures/Environ/backdrop/sky.png.meta index e9a797d..32678e5 100644 --- a/Assets/Art Assets/Textures/Environ/backdrop/sky.png.meta +++ b/Assets/Art Assets/Textures/Environ/backdrop/sky.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -32,27 +32,27 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 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: 8 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/Tiles/Backdrop.meta b/Assets/Art Assets/Tiles/Backdrop.meta new file mode 100644 index 0000000..7d551aa --- /dev/null +++ b/Assets/Art Assets/Tiles/Backdrop.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 662cef1842dfe5149b97476ba9082809 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Backdrop/Sky.prefab b/Assets/Art Assets/Tiles/Backdrop/Sky.prefab new file mode 100644 index 0000000..9a5e5be --- /dev/null +++ b/Assets/Art Assets/Tiles/Backdrop/Sky.prefab @@ -0,0 +1,213 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5914755547847184165 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 864749052709836562} + - component: {fileID: 8339157246297280736} + - component: {fileID: 2451212738590338858} + m_Layer: 0 + m_Name: Layer1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &864749052709836562 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5914755547847184165} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7372820473633011007} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1839735485 &8339157246297280736 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5914755547847184165} + m_Enabled: 1 + m_Tiles: + - first: {x: 0, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 0162326f021737049a5cbbe51ae9027e, type: 2} + m_TileSpriteArray: + - m_RefCount: 1 + m_Data: {fileID: 21300000, guid: a7c69fe92097f3847aa94f42da7b6c71, type: 3} + m_TileMatrixArray: + - 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: 1 + 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: 1, y: 1, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + 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 +--- !u!483693784 &2451212738590338858 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5914755547847184165} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + 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_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1 &7256323590353982996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7372820473633011007} + - component: {fileID: 1318313152005784632} + m_Layer: 31 + m_Name: Sky + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7372820473633011007 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7256323590353982996} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 864749052709836562} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!156049354 &1318313152005784632 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7256323590353982996} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!114 &4032751931948591108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12395, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Palette Settings + m_EditorClassIdentifier: + cellSizing: 0 + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} diff --git a/Assets/Art Assets/Tiles/Backdrop/Sky.prefab.meta b/Assets/Art Assets/Tiles/Backdrop/Sky.prefab.meta new file mode 100644 index 0000000..a17a5e5 --- /dev/null +++ b/Assets/Art Assets/Tiles/Backdrop/Sky.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 422e93cbbaf34514a9cdbbecd5b5db38 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Tiles/Backdrop/sky.asset b/Assets/Art Assets/Tiles/Backdrop/sky.asset new file mode 100644 index 0000000..f90d58e --- /dev/null +++ b/Assets/Art Assets/Tiles/Backdrop/sky.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:871cbbc5d1b562a7e5af94c662e8c320f06f2d901a0609a14d73ed01e9eb8f48 +size 766 diff --git a/Assets/Art Assets/Tiles/Backdrop/sky.asset.meta b/Assets/Art Assets/Tiles/Backdrop/sky.asset.meta new file mode 100644 index 0000000..89a079a --- /dev/null +++ b/Assets/Art Assets/Tiles/Backdrop/sky.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0162326f021737049a5cbbe51ae9027e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/Level 2.unity index 7737279..9ea2e26 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:c408e0ad1545a773633db567cd7ebdf49773c5f352073aeeaeb69e1e8a65a912 -size 451909 +oid sha256:a327417ddd3a8a97ade829209df0899f1aa0a0f64feb603ce89eb0d8f2cbebb3 +size 459980 From f1e07f21286206fd19b7daccac33bd895749a3b7 Mon Sep 17 00:00:00 2001 From: Jeff Date: Sun, 30 Jan 2022 13:55:28 +1100 Subject: [PATCH 5/8] Platform now moves player --- Assets/Scenes/Level 2.unity | 4 ++-- Assets/Scripts/PlatformMover.cs | 28 ++++++++++++++++++++++------ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/Level 2.unity index 6de99e9..87387aa 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:a682cca83f7ccc5ce655eccc527b7dfc5712f70e820adde94bb3da99407916dc -size 442128 +oid sha256:eb66543789d5acb4f3c8de12d0afaa162d47a93c1b6e058fe981c22a4f214228 +size 441461 diff --git a/Assets/Scripts/PlatformMover.cs b/Assets/Scripts/PlatformMover.cs index a088f83..376085b 100644 --- a/Assets/Scripts/PlatformMover.cs +++ b/Assets/Scripts/PlatformMover.cs @@ -8,16 +8,32 @@ public class PlatformMover : MonoBehaviour [SerializeField] private Transform m_EndPos; [SerializeField] private float m_Duration = 2f; - // Start is called before the first frame update - void Start() + private Transform m_OldParent; + + private void Update() { - + transform.position = Vector2.Lerp(m_StartPos.position, m_EndPos.position, (Mathf.Sin(Time.time * m_Duration) + 1.0f) / 2.0f); } - // Update is called once per frame - void Update() + private void OnCollisionEnter2D(Collision2D collision) { - transform.position = Vector2.Lerp(m_StartPos.position, m_EndPos.position, (Mathf.Sin(Time.time * m_Duration) + 1.0f) / 2.0f); + var playerController = collision.gameObject.GetComponent(); + if(playerController) + { + m_OldParent = playerController.transform.parent; + playerController.transform.parent = transform; + } + } + + private void OnCollisionExit2D(Collision2D collision) + { + var playerController = collision.gameObject.GetComponent(); + if(playerController) + { + playerController.transform.parent = m_OldParent; + m_OldParent = null; + } + } #if UNITY_EDITOR From 4ab8037bb9c8d3da3983f5e23a695cc4a284d4f3 Mon Sep 17 00:00:00 2001 From: Jeff Date: Sun, 30 Jan 2022 14:04:01 +1100 Subject: [PATCH 6/8] Improved camera follower y tracking --- Assets/Scenes/Level 2.unity | 4 ++-- Assets/Scripts/CameraFollower.cs | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/Level 2.unity index 87387aa..3979e39 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:eb66543789d5acb4f3c8de12d0afaa162d47a93c1b6e058fe981c22a4f214228 -size 441461 +oid sha256:1b8d5f220a9df00668e007c4e8b89fefb31291288671038e64e13db4016cf830 +size 441491 diff --git a/Assets/Scripts/CameraFollower.cs b/Assets/Scripts/CameraFollower.cs index 7472137..1695ac9 100644 --- a/Assets/Scripts/CameraFollower.cs +++ b/Assets/Scripts/CameraFollower.cs @@ -9,6 +9,8 @@ public class CameraFollower : MonoBehaviour [SerializeField] private float m_FollowStrength = 3f; [SerializeField] private bool m_FollowX = true; [SerializeField] private bool m_FollowY = false; + [SerializeField] private float m_OffsetX = 0f; + [SerializeField] private float m_OffsetY = 2.0f; private Camera m_Camera; @@ -22,8 +24,8 @@ public class CameraFollower : MonoBehaviour if(Mathf.Abs(Player.transform.position.x - m_Camera.transform.position.x) > m_FollowStrength) { m_Camera.transform.Translate( - m_FollowX ? (m_FollowStrength + Player.transform.position.x - m_Camera.transform.position.x) * Time.deltaTime : 0, - m_FollowY ? (m_FollowStrength + Player.transform.position.y - m_Camera.transform.position.y) * Time.deltaTime : 0, + (m_FollowX ? (m_FollowStrength + Player.transform.position.x - m_Camera.transform.position.x - m_OffsetX) * Time.deltaTime : 0), + (m_FollowY ? (m_FollowStrength + Player.transform.position.y - m_Camera.transform.position.y - m_OffsetY) * Time.deltaTime : 0), 0); } } From 90222b70cee92996dd35eaf7be099e1710f29c77 Mon Sep 17 00:00:00 2001 From: "Tau-er\\Bobbster" Date: Sun, 30 Jan 2022 04:05:41 +0100 Subject: [PATCH 7/8] Paralllaaaaax --- .../Textures/Environ/backdrop/clouds1.png | 4 ++-- .../Textures/Environ/backdrop/clouds2.png | 4 ++-- .../Textures/Environ/backdrop/clouds3.png | 4 ++-- Assets/Scenes/Level 2.unity | 4 ++-- Assets/Scripts/Parallax.cs | 24 +++++++++++++++++++ Assets/Scripts/Parallax.cs.meta | 11 +++++++++ 6 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 Assets/Scripts/Parallax.cs create mode 100644 Assets/Scripts/Parallax.cs.meta diff --git a/Assets/Art Assets/Textures/Environ/backdrop/clouds1.png b/Assets/Art Assets/Textures/Environ/backdrop/clouds1.png index d90c153..d383df1 100644 --- a/Assets/Art Assets/Textures/Environ/backdrop/clouds1.png +++ b/Assets/Art Assets/Textures/Environ/backdrop/clouds1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83d2fcce55cf7320c34e4c275e7b321f5e4b15e5bab29610c5a111a8e743a5fa -size 3575 +oid sha256:df98cf5757fd7573c2aaeb9ea88e7cc556f092bba2b22c0b7e657ba2f6789acc +size 3915 diff --git a/Assets/Art Assets/Textures/Environ/backdrop/clouds2.png b/Assets/Art Assets/Textures/Environ/backdrop/clouds2.png index 6232cac..d52007c 100644 --- a/Assets/Art Assets/Textures/Environ/backdrop/clouds2.png +++ b/Assets/Art Assets/Textures/Environ/backdrop/clouds2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9de5c69b4977d997aa4b93024177ad8ba8d0538c9b123e51ff1b8bc883b72084 -size 4105 +oid sha256:64044a39f1c3f858867c3377c73658bafeed4aff3196c4e40f4f55eee7cd1383 +size 2630 diff --git a/Assets/Art Assets/Textures/Environ/backdrop/clouds3.png b/Assets/Art Assets/Textures/Environ/backdrop/clouds3.png index 1c92bcb..523d236 100644 --- a/Assets/Art Assets/Textures/Environ/backdrop/clouds3.png +++ b/Assets/Art Assets/Textures/Environ/backdrop/clouds3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08749da9e2ffa2c14e1a473c4b0628b57727c5d6d846b918213e6b3be71a34e1 -size 3133 +oid sha256:f6bd96a44903b2cc626e2156a7bcb58316eae1b0d276b06e5931867b37b6ddc2 +size 3325 diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/Level 2.unity index 9ea2e26..ea9bca9 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:a327417ddd3a8a97ade829209df0899f1aa0a0f64feb603ce89eb0d8f2cbebb3 -size 459980 +oid sha256:dddbdbd0de6bbed79859a74b4548808737e48868489f5a17da0982e3417b4fb5 +size 461758 diff --git a/Assets/Scripts/Parallax.cs b/Assets/Scripts/Parallax.cs new file mode 100644 index 0000000..f5857cb --- /dev/null +++ b/Assets/Scripts/Parallax.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Parallax : MonoBehaviour +{ + private float length, startpos; + public GameObject cam; + public float parallaxEffect; + + void Start() + { + startpos = transform.position.x; + length = GetComponent().bounds.size.x; + } + + // Update is called once per frame + void FixedUpdate() + { + float dist = (cam.transform.position.x * parallaxEffect); + + transform.position = new Vector3(startpos + dist, transform.position.y, transform.position.z); + } +} diff --git a/Assets/Scripts/Parallax.cs.meta b/Assets/Scripts/Parallax.cs.meta new file mode 100644 index 0000000..bb21ec6 --- /dev/null +++ b/Assets/Scripts/Parallax.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c27236bc6c2676e4bbfdb1265c9f7936 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 9a307fcc13c68939346baa52f978e8d832f88af5 Mon Sep 17 00:00:00 2001 From: "Tau-er\\Bobbster" Date: Sun, 30 Jan 2022 04:30:21 +0100 Subject: [PATCH 8/8] Parallax finalized --- Assets/Scenes/ParallaxTest.unity | 3 +++ ...st Scene.unity.meta => ParallaxTest.unity.meta} | 2 +- .../Scenes/Test Scenes/THE REAL Test Scene.unity | 3 --- Assets/Scripts/Parallax.cs | 14 ++++++++------ 4 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 Assets/Scenes/ParallaxTest.unity rename Assets/Scenes/{Test Scenes/THE REAL Test Scene.unity.meta => ParallaxTest.unity.meta} (74%) delete mode 100644 Assets/Scenes/Test Scenes/THE REAL Test Scene.unity diff --git a/Assets/Scenes/ParallaxTest.unity b/Assets/Scenes/ParallaxTest.unity new file mode 100644 index 0000000..d72b0cb --- /dev/null +++ b/Assets/Scenes/ParallaxTest.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aeacc24ca98c94a30e390e37aa07773f4ad8a6202d71fa3044ac1fb26c074d58 +size 464125 diff --git a/Assets/Scenes/Test Scenes/THE REAL Test Scene.unity.meta b/Assets/Scenes/ParallaxTest.unity.meta similarity index 74% rename from Assets/Scenes/Test Scenes/THE REAL Test Scene.unity.meta rename to Assets/Scenes/ParallaxTest.unity.meta index 4a7d4b1..37b2d41 100644 --- a/Assets/Scenes/Test Scenes/THE REAL Test Scene.unity.meta +++ b/Assets/Scenes/ParallaxTest.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cffcc2d96aa173a46986be2996cfc11a +guid: 2a9f0adf519794740be3df145ad6ac54 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/Test Scenes/THE REAL Test Scene.unity b/Assets/Scenes/Test Scenes/THE REAL Test Scene.unity deleted file mode 100644 index b96c64f..0000000 --- a/Assets/Scenes/Test Scenes/THE REAL Test Scene.unity +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09040cf4d3c0c8731593f7f51698a9a111a9743b0c09de71b763ab9717961cf8 -size 151242 diff --git a/Assets/Scripts/Parallax.cs b/Assets/Scripts/Parallax.cs index f5857cb..a23e736 100644 --- a/Assets/Scripts/Parallax.cs +++ b/Assets/Scripts/Parallax.cs @@ -4,21 +4,23 @@ using UnityEngine; public class Parallax : MonoBehaviour { - private float length, startpos; + private float startpos_x, startpos_y; public GameObject cam; - public float parallaxEffect; + public float parallaxEffect_x; + public float parallaxEffect_y; void Start() { - startpos = transform.position.x; - length = GetComponent().bounds.size.x; + startpos_x = transform.position.x; + startpos_y = transform.position.y; } // Update is called once per frame void FixedUpdate() { - float dist = (cam.transform.position.x * parallaxEffect); + float dist_x = (cam.transform.position.x * parallaxEffect_x); + float dist_y = (cam.transform.position.y * parallaxEffect_y); - transform.position = new Vector3(startpos + dist, transform.position.y, transform.position.z); + transform.position = new Vector3(startpos_x + dist_x, startpos_y + dist_y, transform.position.z); } }