Merge branch 'tetris'

Assets/Animation/Door/CloseDoor.cs

@@ -5,9 +5,8 @@ using UnityEngine;
 public class CloseDoor : StateMachineBehaviour {
 
     // OnStateEnter is called when a transition starts and the state machine starts to evaluate this state
-    override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
-    {
-        MapManager.isDoorWorking = true;
+    override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
+        animator.transform.parent.GetComponent<Room>().isDoorWorking = true;
     }
 
     // OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
@@ -16,9 +15,8 @@ public class CloseDoor : StateMachineBehaviour {
     //}
 
     //OnStateExit is called when a transition ends and the state machine finishes evaluating this state
-    override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
-    {
-        MapManager.isDoorWorking = false;
+    override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
+        animator.transform.parent.GetComponent<Room>().isDoorWorking = false;
     }
 
     // OnStateMove is called right after Animator.OnAnimatorMove(). Code that processes and affects root motion should be implemented here

Assets/Animation/Door/OpenDoor.cs

@@ -6,7 +6,7 @@ public class OpenDoor : StateMachineBehaviour {
 
 	 // OnStateEnter is called when a transition starts and the state machine starts to evaluate this state
 	override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
-        MapManager.isDoorWorking = true;
+        animator.transform.parent.GetComponent<Room>().isDoorWorking = true;
 	}
 
 	// OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
@@ -16,7 +16,7 @@ public class OpenDoor : StateMachineBehaviour {
 
 	//OnStateExit is called when a transition ends and the state machine finishes evaluating this state
 	override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
-        MapManager.isDoorWorking = false;
+        animator.transform.parent.GetComponent<Room>().isDoorWorking = false;
     }
 
 	// OnStateMove is called right after Animator.OnAnimatorMove(). Code that processes and affects root motion should be implemented here

Assets/Images/Tiles/1-1/rope.png.meta

@@ -50,7 +50,7 @@ TextureImporter:
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
-  spriteTessellationDetail: -1
+  spriteTessellationDetail: 0
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
@@ -95,7 +95,11 @@ TextureImporter:
     serializedVersion: 2
     sprites: []
     outline: []
-    physicsShape: []
+    physicsShape:
+    - - {x: 6, y: 32}
+      - {x: -6, y: 32}
+      - {x: -6, y: -32}
+      - {x: 6, y: -32}
     bones: []
     spriteID: 2d96d4533e0163846bffbe339f26e621
     vertices: []

Assets/Images/Tiles/Forest Ruin/Platform/platform_center.png.meta

+fileFormatVersion: 2
+guid: f29465d502250714a9f25df6aaaeab1d
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 6
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 9
+  spritePivot: {x: 0.5, y: -0.475}
+  spritePixelsToUnits: 64
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: d7becf54080f9e6428aee6f71a7fcfe6
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Images/Tiles/Forest Ruin/Platform/platform_left.png.meta

 fileFormatVersion: 2
-guid: 35acb4a1959d8114092813b66a3b25de
+guid: 1be7ce8972ae2fb4a84717e42243e5b4
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1
@@ -44,7 +44,7 @@ TextureImporter:
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 9
-  spritePivot: {x: 0.5, y: -0.075}
+  spritePivot: {x: 0.5, y: -0.475}
   spritePixelsToUnits: 64
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
@@ -80,13 +80,24 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: cb9c233e408643448bf5f29857585bc2
+    spriteID: 2af27cb60dcdd9d4fab584f4cb316982
     vertices: []
     indices: 
     edges: []

Assets/Images/Tiles/Forest Ruin/Platform/platform_right.png.meta

 fileFormatVersion: 2
-guid: 7258c55f6670d424891e2b6b63208168
+guid: 304a5c9639335dc419e62424768222f4
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1
@@ -44,7 +44,7 @@ TextureImporter:
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 9
-  spritePivot: {x: 0.5, y: -0.075}
+  spritePivot: {x: 0.5, y: -0.475}
   spritePixelsToUnits: 64
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
@@ -80,13 +80,24 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 793e583acbc98ba4cb68007cd7238fa4
+    spriteID: 09461831bdaa150419335631c5d7d0f5
     vertices: []
     indices: 
     edges: []

Assets/Palettes/1-1.prefab

@@ -130,7 +130,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, y: 0.5, z: 0}
   m_MaxChunkCount: 16
   m_MaxFrameAge: 16
   m_SortOrder: 0
@@ -326,9 +326,9 @@ Tilemap:
   - m_RefCount: 10
     m_Data: {r: 1, g: 1, b: 1, a: 1}
   - m_RefCount: 1
-    m_Data: {r: 0.9840801, g: 0.4219899, b: 0.4725202, a: 1}
+    m_Data: {r: 0.8524666, g: 0.36087945, b: 0.4447756, a: 1}
   - m_RefCount: 1
-    m_Data: {r: 0.8376917, g: 0.42838743, b: 0.55295527, a: 1}
+    m_Data: {r: 0.84723735, g: 0.36042166, b: 0.49818724, a: 1}
   m_AnimationFrameRate: 1
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Origin: {x: -3, y: -2, z: 0}

Assets/Prefabs/Camera.prefab

@@ -68,7 +68,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1121859575758656}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 7.5802937, y: 6.4033027, z: -0.040029097}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4354682656029732}
@@ -83,7 +83,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1849522522661772}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -1.5002937, y: -3.1933026, z: -0.9599709}
+  m_LocalPosition: {x: 0, y: 0, z: -2}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4133681489306484}
@@ -96,7 +96,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1771541226646862}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 100.41971, y: 233.5967, z: -2.959971}
+  m_LocalPosition: {x: 108, y: 240, z: -3}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4133681489306484}
@@ -188,7 +188,7 @@ AudioListener:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1771541226646862}
-  m_Enabled: 1
+  m_Enabled: 0
 --- !u!81 &81874366432473632
 AudioListener:
   m_ObjectHideFlags: 1
@@ -208,9 +208,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mapManager: {fileID: 0}
-  roomLayer:
-    serializedVersion: 2
-    m_Bits: 0
   player: {fileID: 0}
   tetrisCameraCoord: {x: 108, y: 240, z: -1}
   originPos: {x: 0, y: 0, z: 0}

Assets/Prefabs/Characters/Player.prefab

@@ -59,7 +59,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1623439448163086}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -5.64, y: 1.8, z: 0}
+  m_LocalPosition: {x: -0.56, y: 0.08, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4710911479571038}
@@ -312,6 +312,7 @@ MonoBehaviour:
   doubleJumpSpeed: 10
   dashAcceleration: 50
   platformCollider: {fileID: 0}
+  airAttack: 1
   groundLayer:
     serializedVersion: 2
     m_Bits: 6400
@@ -329,7 +330,7 @@ MonoBehaviour:
     m_Bits: 8192
   portalLayer:
     serializedVersion: 2
-    m_Bits: 262144
+    m_Bits: 131072
   rayDistance: 1
   playerState: 0
   previousState: 0
@@ -422,7 +423,7 @@ SpriteRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -2078941185
-  m_SortingLayer: 7
+  m_SortingLayer: 6
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 92d166e0c2a85a14facee45f5a5a8444, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

Assets/Prefabs/MapManager.prefab

@@ -56,7 +56,7 @@ MonoBehaviour:
   grid: {fileID: 0}
   initialFallSpeed: -0.1
   gravity: 0.98
-  timeToFallTetrimino: 30
+  timeToFallTetrimino: 100
   tetriminoWaitedTime: 0
   tetriminoCreatedTime: 0
   collapseTime: 10
@@ -133,7 +133,6 @@ MonoBehaviour:
   - {fileID: 114384035641513528, guid: a2dadbc92c7cc7e449233fae6430dee7, type: 2}
   - {fileID: 114704192105535744, guid: a121f45347e4c3d4faf83b4e681c84f0, type: 2}
   - {fileID: 114792926073732986, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
-  - {fileID: 114155825416261646, guid: 7ecb75df9a2e95647b4a221c95b9f4f0, type: 2}
   - {fileID: 114844722971494232, guid: 4643eac2d148bd146be89238dcdfa419, type: 2}
   specialRoomList2:
   - {fileID: 114330503780891850, guid: 7da800d1a4355fd4aa02e3518cd9e1fb, type: 2}
@@ -145,7 +144,6 @@ MonoBehaviour:
   - {fileID: 114384035641513528, guid: a2dadbc92c7cc7e449233fae6430dee7, type: 2}
   - {fileID: 114704192105535744, guid: a121f45347e4c3d4faf83b4e681c84f0, type: 2}
   - {fileID: 114792926073732986, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
-  - {fileID: 114155825416261646, guid: 7ecb75df9a2e95647b4a221c95b9f4f0, type: 2}
   - {fileID: 114844722971494232, guid: 4643eac2d148bd146be89238dcdfa419, type: 2}
   roomSurfaceSprite1:
   - {fileID: 21300000, guid: 5e6d29c00a95b8140a33c81d93aac0b2, type: 3}
@@ -188,7 +186,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: adab373df646d5f4fb794a3b6ffdf2d7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  allTiles:
+  allWallTiles:
   - {fileID: 11400000, guid: cad5b727dcc80234584fe4c3d4bac3ac, type: 2}
   - {fileID: 11400000, guid: 648b887233c145948994a645b8a15292, type: 2}
   - {fileID: 11400000, guid: ac15a9d37231f6d4f94081f8ea438ca2, type: 2}
@@ -208,6 +206,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: be5b9f120ea162a4fae348edd1700256, type: 2}
   - {fileID: 11400000, guid: c161c4b186dd4aa40941aa3873d6c5ec, type: 2}
   - {fileID: 11400000, guid: 4bc30c62b57fe2b4ea26b12ed4f64616, type: 2}
+  - {fileID: 11400000, guid: 4fb31c87ddf259948b8873bc66601f9d, type: 2}
   - {fileID: 11400000, guid: fed924c0de37ea54d9cf7f8c1b023415, type: 2}
   - {fileID: 11400000, guid: c20cd0b9e189f6843a083d396400fc3f, type: 2}
   - {fileID: 11400000, guid: 04f046ca64f78cf46ad40b850a92eb82, type: 2}
@@ -215,6 +214,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 043ac57223c8ae54fa327e6bcc9e7521, type: 2}
   - {fileID: 11400000, guid: 669e8afc72c10884ea7947b22f2b2fc3, type: 2}
   - {fileID: 11400000, guid: f2e0d651aceb3794684dc5054419e5ac, type: 2}
+  - {fileID: 11400000, guid: 38e0da454028d824eb49f43f987ad562, type: 2}
   - {fileID: 11400000, guid: 0138237a8bdcade46a3fbc010a084e2d, type: 2}
   - {fileID: 11400000, guid: 0052bfa029fde2d4da209f3a415d4d13, type: 2}
   - {fileID: 11400000, guid: dd57f268277a5cb4c8d4565b2e147589, type: 2}
@@ -240,12 +240,14 @@ MonoBehaviour:
   - {fileID: 11400000, guid: f221214a2c33408408e6465b9b62707b, type: 2}
   - {fileID: 11400000, guid: 658696c04dfc5c4438eb2f0306e10f12, type: 2}
   - {fileID: 11400000, guid: 78b3f2e87b92cee4e88fe15a5aabef92, type: 2}
+  - {fileID: 11400000, guid: 8efe05cd62495f24cb1155c956789098, type: 2}
   - {fileID: 11400000, guid: e098a71dffeef434782b487a75cfaab6, type: 2}
   - {fileID: 11400000, guid: 43ce5674905ab684096018dc998da9bf, type: 2}
   - {fileID: 11400000, guid: 928a04c9f7e45fb4180c93cd01cd0bab, type: 2}
   - {fileID: 11400000, guid: ba7bc116ed9339d409f01707034be181, type: 2}
   - {fileID: 11400000, guid: 2967ea61b7da1db4c82ad335fabe0a79, type: 2}
   - {fileID: 11400000, guid: 891953fcb438d3d43b96fbe5346a10d0, type: 2}
+  - {fileID: 11400000, guid: 12c5767f0650c0c4a85c5a32a133eaf6, type: 2}
   - {fileID: 11400000, guid: 2548ea7ff23f65e44ab5230199dd5ffd, type: 2}
   - {fileID: 11400000, guid: 41e7ff0cd05627b4e8748e9f8710ae4a, type: 2}
   - {fileID: 11400000, guid: 7967111718d293949b91d353e305d41b, type: 2}
@@ -277,7 +279,6 @@ MonoBehaviour:
   - {fileID: 11400000, guid: da9aae37520c9aa4ab16621fa2143b4f, type: 2}
   - {fileID: 11400000, guid: 8053217ed4b04674990f6fd04049e6a4, type: 2}
   - {fileID: 11400000, guid: b5fcd2f2e4c67fc43a358769246cbc31, type: 2}
-  - {fileID: 11400000, guid: 12c5767f0650c0c4a85c5a32a133eaf6, type: 2}
   - {fileID: 11400000, guid: 25f7a0be713ce754d98b870dae1dae86, type: 2}
   - {fileID: 11400000, guid: a3565f5943a1f284ab63d05dc8201a90, type: 2}
   - {fileID: 11400000, guid: b88eb1e8a0c6c0f4ba5d4c976857b2e3, type: 2}
@@ -297,6 +298,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 9e71e2279417c3e459818ff17dc2aa6f, type: 2}
   - {fileID: 11400000, guid: f9a5831fc493fda4e93cbac99e6c2989, type: 2}
   - {fileID: 11400000, guid: 8e4e19774b53b3b479fa49ae4531846d, type: 2}
+  - {fileID: 11400000, guid: 985d2d01d390234479b19ba82d087c9a, type: 2}
   - {fileID: 11400000, guid: fa36548597559674ba8ede1df55ff446, type: 2}
   - {fileID: 11400000, guid: f38eb44ce290981488b1f0a6650a1321, type: 2}
   - {fileID: 11400000, guid: 74d06422771b0a74fad67f27f43ab99d, type: 2}
@@ -304,6 +306,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 2725f2e13258bfa408f04b5d4c938e91, type: 2}
   - {fileID: 11400000, guid: 630f50efb34ebce4783e3ab8f181a083, type: 2}
   - {fileID: 11400000, guid: 6a3814c0058eac04495b715af3003a24, type: 2}
+  - {fileID: 11400000, guid: 4b7c85e4ddcad124e8dcb69e856229ce, type: 2}
   - {fileID: 11400000, guid: 42712b4bca9b6cb49bda3a74bd6948d3, type: 2}
   - {fileID: 11400000, guid: e86502c95a7831241aced30d4a3a82f2, type: 2}
   - {fileID: 11400000, guid: 1872608f0bf4efb44b36692b5e975fe1, type: 2}
@@ -329,6 +332,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 4d99cea3393676849837d044c18df92e, type: 2}
   - {fileID: 11400000, guid: b7e02c7a90dcb394891abe252e79fab7, type: 2}
   - {fileID: 11400000, guid: 16a4ad4d15aa9a74f90ae19f1a5f3295, type: 2}
+  - {fileID: 11400000, guid: 11005e6e7c04a3f429b4364af2397029, type: 2}
   - {fileID: 11400000, guid: e708c99b2707b8f45996315fd5371a41, type: 2}
   - {fileID: 11400000, guid: b32979c2652abc747876e31c8bb0009d, type: 2}
   - {fileID: 11400000, guid: a0d815bc368d4a64ea57aa62df7bdc64, type: 2}
@@ -367,3 +371,26 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 6c9bb38cfe5980245989e834385f7b2c, type: 2}
   - {fileID: 11400000, guid: 16924b8ecf8bd1940902343766fc4cdc, type: 2}
   - {fileID: 11400000, guid: b556ab3a4d3d2db4b89081d94cca006c, type: 2}
+  allPlatformTiles:
+  - {fileID: 11400000, guid: c25a20f570a6e474bb000881122106f7, type: 2}
+  - {fileID: 11400000, guid: 60035ce64a779ae4a9eeaaafe33f87e1, type: 2}
+  - {fileID: 11400000, guid: 9e0a3a715e976bb489ec8bedeeb2ab32, type: 2}
+  - {fileID: 11400000, guid: 3d63c558a17627b4c8a6eff233ae9aff, type: 2}
+  - {fileID: 11400000, guid: 0aa25d9458a285146be0f80438fbcac8, type: 2}
+  - {fileID: 11400000, guid: 8e289c63850dcb34a94a8cc69a245ed7, type: 2}
+  allRopeTiles:
+  - {fileID: 11400000, guid: 7fcb9c110fd1807479e950e97e3a09e4, type: 2}
+  - {fileID: 11400000, guid: 9f29d7f8294254245ba40ce099df2eda, type: 2}
+  - {fileID: 11400000, guid: 3c532ce77a13dca448f232a5f07b30b0, type: 2}
+  - {fileID: 11400000, guid: 6194ca365d1997a42979814a8ea47551, type: 2}
+  - {fileID: 11400000, guid: 7fe9bb41f3464d64c89f13c75fc4382f, type: 2}
+  - {fileID: 11400000, guid: f5d78fcc466db9a4183678471465678b, type: 2}
+  allSpikeTiles:
+  - {fileID: 11400000, guid: f411e29431b787c4ab84b5ff59ca5e6e, type: 2}
+  - {fileID: 11400000, guid: 85440e0dd81e48840947ce485614bab6, type: 2}
+  - {fileID: 11400000, guid: 7dbb7c55a3417f54fbd38fafb369478e, type: 2}
+  - {fileID: 11400000, guid: 7f2c5cb43ad7207499b22fb5e0acd41a, type: 2}
+  - {fileID: 11400000, guid: 034d5fb04a013124cb432284fdc8c423, type: 2}
+  - {fileID: 11400000, guid: f6a8681f94ddcf24eac96d8e4a5c82f6, type: 2}
+  - {fileID: 11400000, guid: 69359808565f98f4297a6efb8da5c4da, type: 2}
+  - {fileID: 11400000, guid: f9cdf78c8a087c94a9279cc07fc03a25, type: 2}

Assets/Prefabs/Rooms/SpecialRoom/Room Amethyst.prefab

@@ -905,6 +905,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c08ccd80c2fc50441b54dc681acedf3e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  roomSize: {x: 24, y: 24}
   leftDoorInfo: 010101
   rightDoorInfo: 010101
   concept: 01010101
@@ -943,7 +944,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: c2e87589a128b824c8f621c5a34bfe5e, type: 3}
+  m_Sprite: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -951,7 +952,7 @@ SpriteRenderer:
   m_Size: {x: 24, y: 24}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
+  m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
 --- !u!251 &251787293196198618

Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-3.prefab

@@ -392,6 +392,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 670b1c4e0ae0aff4a99f20c7fb01e3dc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  roomSize: {x: 24, y: 24}
   leftDoorInfo: 010101
   rightDoorInfo: 010101
   concept: 01010101
@@ -430,7 +431,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: c2e87589a128b824c8f621c5a34bfe5e, type: 3}
+  m_Sprite: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -438,7 +439,7 @@ SpriteRenderer:
   m_Size: {x: 24, y: 24}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
+  m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
 --- !u!251 &251411377765194978

Assets/Prefabs/Rooms/SpecialRoom/Room Gold.prefab

@@ -993,6 +993,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6ff5decceea685f41b81b6ab573b9f51, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  roomSize: {x: 24, y: 24}
   leftDoorInfo: 010101
   rightDoorInfo: 010101
   concept: 01010101
@@ -1031,7 +1032,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: c2e87589a128b824c8f621c5a34bfe5e, type: 3}
+  m_Sprite: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1039,7 +1040,7 @@ SpriteRenderer:
   m_Size: {x: 24, y: 24}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
+  m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
 --- !u!251 &251905760715613600

Assets/Prefabs/Rooms/SpecialRoom/Room Item.prefab

@@ -946,6 +946,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4970a764e59870046814a6c66e011fa1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  roomSize: {x: 24, y: 24}
   leftDoorInfo: 010101
   rightDoorInfo: 010101
   concept: 01010101
@@ -984,7 +985,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: c2e87589a128b824c8f621c5a34bfe5e, type: 3}
+  m_Sprite: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -992,7 +993,7 @@ SpriteRenderer:
   m_Size: {x: 24, y: 24}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
+  m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
 --- !u!251 &251036638880317042

Assets/Prefabs/Rooms/SpecialRoom/Room Start.prefab

@@ -1002,6 +1002,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 91f53a6169652364c98a033f08ee84bd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  roomSize: {x: 24, y: 24}
   leftDoorInfo: 010101
   rightDoorInfo: 010101
   concept: 01010101
@@ -1053,7 +1054,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: c2e87589a128b824c8f621c5a34bfe5e, type: 3}
+  m_Sprite: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -1061,7 +1062,7 @@ SpriteRenderer:
   m_Size: {x: 24, y: 24}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
+  m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
 --- !u!251 &251975355083752976

Assets/Prefabs/Rooms/SpecialRoom/Room Start 1-3.prefab.meta → Assets/Prefabs/Rooms/SpecialRoom/Room Tutorial.prefab.meta

 fileFormatVersion: 2
-guid: 7ecb75df9a2e95647b4a221c95b9f4f0
+guid: 3d15a9a1539f86044aa1a8350041478f
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 100100000

Assets/Prefabs/Rooms/SpecialRoom/Room Boss.prefab.meta → Assets/Prefabs/TetrisMap/Tetrimino/Room Tutorial.prefab.meta

 fileFormatVersion: 2
-guid: 1ec0004bbafe6764d9462251b866e6e6
+guid: 29d5569197813594db51adf0d061bc36
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 100100000

Assets/Resources/Tiles/ForestRuin/Platform/11platformc.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 11platformc
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: 21300000, guid: f29465d502250714a9f25df6aaaeab1d, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Transform:
+    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_InstancedGameObject: {fileID: 0}
+  m_Flags: 1
+  m_ColliderType: 1

Assets/Resources/Tiles/ForestRuin/Platform/11platformc.asset.meta

+fileFormatVersion: 2
+guid: c25a20f570a6e474bb000881122106f7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Tiles/ForestRuin/Platform/11platforml.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 11platforml
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: 21300000, guid: 1be7ce8972ae2fb4a84717e42243e5b4, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Transform:
+    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_InstancedGameObject: {fileID: 0}
+  m_Flags: 1
+  m_ColliderType: 1

Assets/Resources/Tiles/ForestRuin/Platform/11platformr.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 11platformr
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: 21300000, guid: 304a5c9639335dc419e62424768222f4, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Transform:
+    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_InstancedGameObject: {fileID: 0}
+  m_Flags: 1
+  m_ColliderType: 1

Assets/Resources/Tiles/ForestRuin/Rope.meta

+fileFormatVersion: 2
+guid: bcd281c1dc90f034ba740838bd9d4e34
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Tiles/rope.asset → Assets/Resources/Tiles/ForestRuin/Rope/11ropec.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: rope
+  m_Name: 11ropec
   m_EditorClassIdentifier: 
   m_Sprite: {fileID: 21300000, guid: 57dcdd6fd2364b24ea278d98c99953f8, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

Assets/Resources/Tiles/ForestRuin/Rope/11roped.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 11roped
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: 21300000, guid: a7ade53056ed4934c87daaec91a44354, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Transform:
+    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_InstancedGameObject: {fileID: 0}
+  m_Flags: 1
+  m_ColliderType: 1

Assets/Prefabs/Rooms/SpecialRoom/Room Item 1-3.prefab.meta → Assets/Resources/Tiles/ForestRuin/Rope/11roped.asset.meta

 fileFormatVersion: 2
-guid: 605480f421d8a99499d2a18f171f59f8
+guid: 9f29d7f8294254245ba40ce099df2eda
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 0

Assets/Resources/Tiles/ForestRuin/Rope/11ropeu.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 11ropeu
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: 21300000, guid: 45bbd91799285994eb276ebedd1d1469, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Transform:
+    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_InstancedGameObject: {fileID: 0}
+  m_Flags: 1
+  m_ColliderType: 1

Assets/Prefabs/Rooms/NormalRoom/Room 21.prefab.meta → Assets/Resources/Tiles/ForestRuin/Rope/11ropeu.asset.meta

 fileFormatVersion: 2
-guid: f33122f108dee304694094731aa8ec4f
+guid: 7fcb9c110fd1807479e950e97e3a09e4
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 0

Assets/Resources/Tiles/ForestRuin/Spike.meta

+fileFormatVersion: 2
+guid: 10767297791584c499054e78459055e3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Tiles/spikedown.asset → Assets/Resources/Tiles/ForestRuin/Spike/11spiked.asset

@@ -9,7 +9,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: spikedown
+  m_Name: 11spiked
   m_EditorClassIdentifier: 
   m_Sprite: {fileID: 21300000, guid: d17f08c78e4eeee4d9720ba726b4944a, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}