Merge branch 'main' of https://git.joshuareason.com/Jam/GGJ_2022

# Conflicts:
#	Assets/Variables/Runtime/freezePlayer.asset

Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9132b80b553bb3f40b9a29cc65955c79
+guid: fbb382cd1cd301046ad6790c048b0c6c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Art Assets/Tilemaps.meta → Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta~77db7eb71343ea6a91583afc81271a936526016c

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 85233f4a34a589945870b124282bf234
+guid: 9132b80b553bb3f40b9a29cc65955c79
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Scenes/Test Scenes/THE REAL Test Scene.unity.meta → Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta~77db7eb71343ea6a91583afc81271a936526016c.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cffcc2d96aa173a46986be2996cfc11a
+guid: 9d6f5a7c169a6054ca2dd15692b3ace7
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat

@@ -24,7 +24,11 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
+<<<<<<< HEAD
+        m_Texture: {fileID: 2800000, guid: 4f66e39be2d476f46bb700a5268dcfb8, type: 3}
+=======
         m_Texture: {fileID: 2800000, guid: 6ba5faafd9a8ff44b8f96dbe81c4f0f2, type: 3}
+>>>>>>> 77db7eb71343ea6a91583afc81271a936526016c
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:

Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta

@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: 4cfcd558d1d29fe49a8f2d60afff1640
+=======
 guid: ca80fac3bd969f84eaf173691c89d17a
+>>>>>>> 77db7eb71343ea6a91583afc81271a936526016c
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000

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: 

Assets/Art Assets/Textures/Environ/backdrop/clouds1.png (Stored with Git LFS)

+size 3915

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: 

Assets/Art Assets/Textures/Environ/backdrop/clouds2.png (Stored with Git LFS)

+size 2630

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: 

Assets/Art Assets/Textures/Environ/backdrop/clouds3.png (Stored with Git LFS)

+size 3325

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: 

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: 

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: []

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: []

Assets/Art Assets/Textures/Environ/water.png (Stored with Git LFS)

+size 855

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}

Assets/Art Assets/Tiles/Backdrop.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 662cef1842dfe5149b97476ba9082809
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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}

Assets/Art Assets/Tiles/Backdrop/Sky.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 422e93cbbaf34514a9cdbbecd5b5db38
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art Assets/Tiles/Backdrop/sky.asset (Stored with Git LFS)

+size 766

Assets/Art Assets/Tiles/Backdrop/sky.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0162326f021737049a5cbbe51ae9027e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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}

Assets/Art Assets/Tiles/Environment/Decor/decor_dangler.asset (Stored with Git LFS)

+size 787

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_dangler2.asset (Stored with Git LFS)

+size 789

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_dangler3.asset (Stored with Git LFS)

+size 788

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_dangler4.asset (Stored with Git LFS)

+size 787

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_dangler5.asset (Stored with Git LFS)

+size 789

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark1.asset (Stored with Git LFS)

+size 791

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark2.asset (Stored with Git LFS)

+size 791

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark3.asset (Stored with Git LFS)

+size 792

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light1.asset (Stored with Git LFS)

+size 793

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light2.asset (Stored with Git LFS)

+size 792

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light3.asset (Stored with Git LFS)

+size 792

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_leaf.asset (Stored with Git LFS)

+size 785

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_leaf2.asset (Stored with Git LFS)

+size 785

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_plant1.asset (Stored with Git LFS)

+size 787

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_plant2.asset (Stored with Git LFS)

+size 787

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_trunk.asset (Stored with Git LFS)

+size 786

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_vine.asset (Stored with Git LFS)

+size 784

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: 

Assets/Art Assets/Tiles/Environment/Decor/decor_vine2.asset (Stored with Git LFS)

+size 785

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: 

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}

Assets/Art Assets/Tiles/Environment/Rule tiles/Danglers.asset (Stored with Git LFS)

+size 1440

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: 

Assets/Art Assets/Tiles/Environment/Rule tiles/Light_Grass.asset (Stored with Git LFS)

 size 1133

Assets/Scenes/Level 2.unity (Stored with Git LFS)

+size 461758

Assets/Scenes/ParallaxTest.unity (Stored with Git LFS)

+size 464125

Assets/Scenes/ParallaxTest.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2a9f0adf519794740be3df145ad6ac54
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Test Scenes/THE REAL Test Scene.unity (Stored with Git LFS)

-size 151242

Assets/Scenes/WalljumpTest.unity (Stored with Git LFS)

+size 1740290

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);
         }
     }

Assets/Scripts/Parallax.cs

@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Parallax : MonoBehaviour
+{
+    private float startpos_x, startpos_y;
+    public GameObject cam;
+    public float parallaxEffect_x;
+    public float parallaxEffect_y;
+
+    void Start()
+    {
+        startpos_x = transform.position.x;
+        startpos_y = transform.position.y;
+    }
+
+    // Update is called once per frame
+    void FixedUpdate()
+    {
+        float dist_x = (cam.transform.position.x * parallaxEffect_x);
+        float dist_y = (cam.transform.position.y * parallaxEffect_y);
+
+        transform.position = new Vector3(startpos_x + dist_x, startpos_y + dist_y, transform.position.z);
+    }
+}

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: 

Assets/Scripts/PlatformMover.cs

@@ -0,0 +1,46 @@
+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;
+
+    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);
+    }
+
+    private void OnCollisionEnter2D(Collision2D collision)
+    {
+        var playerController = collision.gameObject.GetComponent<CharacterController2D>();
+        if(playerController)
+        {
+            m_OldParent = playerController.transform.parent;
+            playerController.transform.parent = transform;
+        }
+    }
+
+    private void OnCollisionExit2D(Collision2D collision)
+    {
+        var playerController = collision.gameObject.GetComponent<CharacterController2D>();
+        if(playerController)
+        {
+            playerController.transform.parent = m_OldParent;
+            m_OldParent = null;
+        }
+
+    }
+
+#if UNITY_EDITOR
+    private void OnDrawGizmos()
+    {
+        Gizmos.color = Color.green;
+        Gizmos.DrawLine(m_StartPos.position, m_EndPos.position);
+    }
+#endif
+}

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: 

Assets/Variables/Runtime/freezePlayer.asset (Stored with Git LFS)

+size 274