싹다 머지하고 빌드함. 이제 모든 방 타일이 제대로 찍힘.

Assets/Prefabs/MapManager.prefab

@@ -122,33 +122,41 @@ MonoBehaviour:
   - {fileID: 114354969614802418, guid: 5d9d617a37ddce4448c92cca0946ab18, type: 2}
   - {fileID: 114950439855047056, guid: bfa57985877d23b46929238f077b40df, type: 2}
   specialRoomList1:
-  - {fileID: 114006867546177498, guid: 8fddb267ac5bdf84b9def0dab7ff2071, type: 2}
-  - {fileID: 114206258087780418, guid: 00a3cc75c0f86a5429975c059b71c269, type: 2}
+  - {fileID: 114631435503427844, guid: 2514de8c1d17b734592b5fe2cdc74560, type: 2}
+  - {fileID: 114870337735843870, guid: ea5defee5777b0044b3d684971c1dc40, type: 2}
+  - {fileID: 114574597939658056, guid: 8e573eb3b8b071c47a4ee92adf1a9644, type: 2}
+  - {fileID: 114261393134231884, guid: 7da800d1a4355fd4aa02e3518cd9e1fb, type: 2}
   - {fileID: 114589998919791384, guid: fe17cba28f910e54faf7b866f86bfd3e, type: 2}
   - {fileID: 114834209009617488, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
-  - {fileID: 114261393134231884, guid: 7da800d1a4355fd4aa02e3518cd9e1fb, type: 2}
-  - {fileID: 114631435503427844, guid: 2514de8c1d17b734592b5fe2cdc74560, type: 2}
+  - {fileID: 114875551757596772, guid: a2dadbc92c7cc7e449233fae6430dee7, type: 2}
+  - {fileID: 114356539767929646, guid: a121f45347e4c3d4faf83b4e681c84f0, type: 2}
+  - {fileID: 114217630873874362, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
+  - {fileID: 114314020785484006, guid: 4643eac2d148bd146be89238dcdfa419, type: 2}
+  - {fileID: 114745063720482226, guid: 7ecb75df9a2e95647b4a221c95b9f4f0, type: 2}
   specialRoomList2:
-  - {fileID: 114006867546177498, guid: 8fddb267ac5bdf84b9def0dab7ff2071, type: 2}
-  - {fileID: 114206258087780418, guid: 00a3cc75c0f86a5429975c059b71c269, type: 2}
+  - {fileID: 114631435503427844, guid: 2514de8c1d17b734592b5fe2cdc74560, type: 2}
+  - {fileID: 114870337735843870, guid: ea5defee5777b0044b3d684971c1dc40, type: 2}
+  - {fileID: 114574597939658056, guid: 8e573eb3b8b071c47a4ee92adf1a9644, type: 2}
+  - {fileID: 114261393134231884, guid: 7da800d1a4355fd4aa02e3518cd9e1fb, type: 2}
   - {fileID: 114589998919791384, guid: fe17cba28f910e54faf7b866f86bfd3e, type: 2}
   - {fileID: 114834209009617488, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
-  - {fileID: 114261393134231884, guid: 7da800d1a4355fd4aa02e3518cd9e1fb, type: 2}
-  - {fileID: 114631435503427844, guid: 2514de8c1d17b734592b5fe2cdc74560, type: 2}
+  - {fileID: 114875551757596772, guid: a2dadbc92c7cc7e449233fae6430dee7, type: 2}
+  - {fileID: 114356539767929646, guid: a121f45347e4c3d4faf83b4e681c84f0, type: 2}
+  - {fileID: 114217630873874362, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
+  - {fileID: 114314020785484006, guid: 4643eac2d148bd146be89238dcdfa419, type: 2}
+  - {fileID: 114745063720482226, guid: 7ecb75df9a2e95647b4a221c95b9f4f0, type: 2}
   roomsSprite1:
-  - {fileID: 21300000, guid: 6ec5fd6f82959204b8518829c7c9e2cc, type: 3}
   - {fileID: 21300000, guid: 5e6d29c00a95b8140a33c81d93aac0b2, type: 3}
   - {fileID: 21300000, guid: 45c68bb908319e942b8dcdaba688c080, type: 3}
   - {fileID: 21300000, guid: ab2da97d516ecf24fb8779aba9a0462d, type: 3}
   - {fileID: 21300000, guid: 7b1e5d37587659842a5a5f3067a60d7e, type: 3}
   - {fileID: 21300000, guid: 0345323fb9396ed4b9d66aa389016f36, type: 3}
-  - {fileID: 21300000, guid: c4a8c8eff83f3324f84a5a7a4d1172d3, type: 3}
-  - {fileID: 21300000, guid: 8936716eac2462547b84170fb6000a28, type: 3}
-  - {fileID: 21300000, guid: 31d8e8c657f655a4ea9afd229fe81d17, type: 3}
-  - {fileID: 21300000, guid: 2569afcbbcfb5c14f90525054a6707c3, type: 3}
+  - {fileID: 21300000, guid: 0f2e022b8373886499dbeb48ec054e8f, type: 3}
+  - {fileID: 21300000, guid: 2d4a5ffd54cb0b643a0a0151351080b0, type: 3}
+  - {fileID: 21300000, guid: 53d3da01722c1354ab7f0a0e5a6d3ba1, type: 3}
+  - {fileID: 21300000, guid: 8044a9fe8c979f141a047ee76dc5a4b3, type: 3}
   - {fileID: 21300000, guid: 5d862de53793b134ba9ac6e49dc42a5c, type: 3}
   roomsSprite2:
-  - {fileID: 21300000, guid: 6ec5fd6f82959204b8518829c7c9e2cc, type: 3}
   - {fileID: 21300000, guid: 990a04fc86d19064abd85a9264ea1784, type: 3}
   - {fileID: 21300000, guid: c7a48bb0766c8ee49b3bfb18aa2d66df, type: 3}
   - {fileID: 21300000, guid: a72bd325e8d5ca24b8106b397c9f1573, type: 3}

Assets/Prefabs/Rooms/NormalRoom/Room 12.prefab

@@ -843,14 +843,6 @@ CompositeCollider2D:
         Y: 130000000
       - X: 30000000
         Y: 130000000
-      - X: 30000000
-        Y: 130039064
-      - X: 20000000
-        Y: 130039064
-      - X: 20000000
-        Y: 125351560
-      - X: 30000000
-        Y: 125351560
       - X: 30000000
         Y: 110000000
       - X: 50000000
@@ -949,10 +941,6 @@ CompositeCollider2D:
       - {x: 8, y: 12}
       - {x: 8, y: 13}
       - {x: 3, y: 13}
-      - {x: 3, y: 13.003906}
-      - {x: 2, y: 13.003906}
-      - {x: 2, y: 12.535156}
-      - {x: 3, y: 12.535156}
       - {x: 3, y: 11}
       - {x: 5, y: 11}
       - {x: 5, y: 10}
@@ -2512,15 +2500,6 @@ Tilemap:
       m_ObjectToInstantiate: {fileID: 0}
       m_TileFlags: 1
       m_ColliderType: 1
-  - first: {x: 2, y: 12, z: 0}
-    second:
-      m_TileIndex: 1
-      m_TileSpriteIndex: 1
-      m_TileMatrixIndex: 0
-      m_TileColorIndex: 0
-      m_ObjectToInstantiate: {fileID: 0}
-      m_TileFlags: 1
-      m_ColliderType: 1
   - first: {x: 3, y: 12, z: 0}
     second:
       m_TileIndex: 10
@@ -3110,7 +3089,7 @@ Tilemap:
   m_TileAssetArray:
   - m_RefCount: 3
     m_Data: {fileID: 11400000, guid: dc3200317ac5d9c45b4116ad7975f166, type: 2}
-  - m_RefCount: 2
+  - m_RefCount: 1
     m_Data: {fileID: 11400000, guid: 60035ce64a779ae4a9eeaaafe33f87e1, type: 2}
   - m_RefCount: 20
     m_Data: {fileID: 11400000, guid: 87f27825f48c3394ea02d8bd4a5c646a, type: 2}
@@ -3145,7 +3124,7 @@ Tilemap:
   m_TileSpriteArray:
   - m_RefCount: 3
     m_Data: {fileID: 21300000, guid: 803035f7f3c2ec24b9951147a4f7fc4d, type: 3}
-  - m_RefCount: 2
+  - m_RefCount: 1
     m_Data: {fileID: 21300000, guid: 35acb4a1959d8114092813b66a3b25de, type: 3}
   - m_RefCount: 20
     m_Data: {fileID: 21300000, guid: b802dd074becb7c45a3998ccae90ce91, type: 3}
@@ -3178,7 +3157,7 @@ Tilemap:
   - m_RefCount: 76
     m_Data: {fileID: 21300000, guid: 8d51b9bc567a640429923a2c09665640, type: 3}
   m_TileMatrixArray:
-  - m_RefCount: 157
+  - m_RefCount: 156
     m_Data:
       e00: 1
       e01: 0
@@ -3197,7 +3176,7 @@ Tilemap:
       e32: 0
       e33: 1
   m_TileColorArray:
-  - m_RefCount: 157
+  - m_RefCount: 156
     m_Data: {r: 1, g: 1, b: 1, a: 1}
   m_AnimationFrameRate: 1
   m_Color: {r: 1, g: 1, b: 1, a: 1}

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

@@ -32,6 +32,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1413407397998784
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4653416975264890}
+  m_Layer: 0
+  m_Name: ItemSpawnPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1577752690474724
 GameObject:
   m_ObjectHideFlags: 0
@@ -175,6 +190,19 @@ Transform:
   m_Father: {fileID: 4897775544821474}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4653416975264890
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1413407397998784}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 12, y: 15, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4897775544821474}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4897775544821474
 Transform:
   m_ObjectHideFlags: 1
@@ -190,6 +218,7 @@ Transform:
   - {fileID: 4973825301145224}
   - {fileID: 4280452263428142}
   - {fileID: 4633372346485254}
+  - {fileID: 4653416975264890}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Prefabs/Rooms/SpecialRoom/Room Item 1-2.prefab

@@ -31,6 +31,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1257208676894460
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4786349110151796}
+  m_Layer: 0
+  m_Name: ItemSpawnPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1463608286577820
 GameObject:
   m_ObjectHideFlags: 0
@@ -138,6 +153,7 @@ Transform:
   - {fileID: 4512777398529060}
   - {fileID: 4117896078337088}
   - {fileID: 4851704477977734}
+  - {fileID: 4786349110151796}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -180,6 +196,19 @@ Transform:
   m_Father: {fileID: 4062861538572612}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4786349110151796
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1257208676894460}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 12, y: 11, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4062861538572612}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4851704477977734
 Transform:
   m_ObjectHideFlags: 1
@@ -342,18 +371,6 @@ CompositeCollider2D:
         Y: 200000000
       - X: 180000000
         Y: 200000000
-    - - X: 240000000
-        Y: 170000000
-      - X: 220000000
-        Y: 170000000
-      - X: 220000000
-        Y: 160000000
-      - X: 230000000
-        Y: 160000000
-      - X: 230000000
-        Y: 110000000
-      - X: 240000000
-        Y: 110000000
     - - X: 10000000
         Y: 160000000
       - X: 20000000
@@ -366,6 +383,18 @@ CompositeCollider2D:
         Y: 110000000
       - X: 10000000
         Y: 110000000
+    - - X: 240000000
+        Y: 170000000
+      - X: 220000000
+        Y: 170000000
+      - X: 220000000
+        Y: 160000000
+      - X: 230000000
+        Y: 160000000
+      - X: 230000000
+        Y: 110000000
+      - X: 240000000
+        Y: 110000000
     - - X: 140000000
         Y: 150000000
       - X: 150000000
@@ -382,14 +411,6 @@ CompositeCollider2D:
         Y: 140000000
       - X: 140000000
         Y: 140000000
-    - - X: 90000000
-        Y: 130000000
-      - X: 70000000
-        Y: 130000000
-      - X: 70000000
-        Y: 110000000
-      - X: 90000000
-        Y: 110000000
     - - X: 170000000
         Y: 130000000
       - X: 150000000
@@ -398,6 +419,14 @@ CompositeCollider2D:
         Y: 110000000
       - X: 170000000
         Y: 110000000
+    - - X: 90000000
+        Y: 130000000
+      - X: 70000000
+        Y: 130000000
+      - X: 70000000
+        Y: 110000000
+      - X: 90000000
+        Y: 110000000
     - - X: 150000000
         Y: 90000000
       - X: 140000000
@@ -414,18 +443,6 @@ CompositeCollider2D:
         Y: 80000000
       - X: 150000000
         Y: 80000000
-    - - X: 240000000
-        Y: 90000000
-      - X: 220000000
-        Y: 90000000
-      - X: 220000000
-        Y: 80000000
-      - X: 230000000
-        Y: 80000000
-      - X: 230000000
-        Y: 30000000
-      - X: 240000000
-        Y: 30000000
     - - X: 10000000
         Y: 80000000
       - X: 20000000
@@ -438,6 +455,18 @@ CompositeCollider2D:
         Y: 30000000
       - X: 10000000
         Y: 30000000
+    - - X: 240000000
+        Y: 90000000
+      - X: 220000000
+        Y: 90000000
+      - X: 220000000
+        Y: 80000000
+      - X: 230000000
+        Y: 80000000
+      - X: 230000000
+        Y: 30000000
+      - X: 240000000
+        Y: 30000000
     - - X: 110000000
         Y: 10000000
       - X: 0
@@ -472,18 +501,18 @@ CompositeCollider2D:
       - {x: 6, y: 21}
       - {x: 6, y: 20}
       - {x: 18, y: 20}
-    - - {x: 24, y: 17}
-      - {x: 22, y: 17}
-      - {x: 22, y: 16}
-      - {x: 23, y: 16}
-      - {x: 23, y: 11}
-      - {x: 24, y: 11}
     - - {x: 1, y: 16}
       - {x: 2, y: 16}
       - {x: 2, y: 17}
       - {x: 0, y: 17}
       - {x: 0, y: 11}
       - {x: 1, y: 11}
+    - - {x: 24, y: 17}
+      - {x: 22, y: 17}
+      - {x: 22, y: 16}
+      - {x: 23, y: 16}
+      - {x: 23, y: 11}
+      - {x: 24, y: 11}
     - - {x: 14, y: 15}
       - {x: 15, y: 15}
       - {x: 15, y: 16}
@@ -492,14 +521,14 @@ CompositeCollider2D:
       - {x: 10, y: 15}
       - {x: 10, y: 14}
       - {x: 14, y: 14}
-    - - {x: 9, y: 13}
-      - {x: 7, y: 13}
-      - {x: 7, y: 11}
-      - {x: 9, y: 11}
     - - {x: 17, y: 13}
       - {x: 15, y: 13}
       - {x: 15, y: 11}
       - {x: 17, y: 11}
+    - - {x: 9, y: 13}
+      - {x: 7, y: 13}
+      - {x: 7, y: 11}
+      - {x: 9, y: 11}
     - - {x: 15, y: 9}
       - {x: 14, y: 9}
       - {x: 14, y: 10}
@@ -508,18 +537,18 @@ CompositeCollider2D:
       - {x: 9, y: 9}
       - {x: 9, y: 8}
       - {x: 15, y: 8}
-    - - {x: 24, y: 9}
-      - {x: 22, y: 9}
-      - {x: 22, y: 8}
-      - {x: 23, y: 8}
-      - {x: 23, y: 3}
-      - {x: 24, y: 3}
     - - {x: 1, y: 8}
       - {x: 2, y: 8}
       - {x: 2, y: 9}
       - {x: 0, y: 9}
       - {x: 0, y: 3}
       - {x: 1, y: 3}
+    - - {x: 24, y: 9}
+      - {x: 22, y: 9}
+      - {x: 22, y: 8}
+      - {x: 23, y: 8}
+      - {x: 23, y: 3}
+      - {x: 24, y: 3}
     - - {x: 11, y: 1}
       - {x: 0, y: 1}
       - {x: 0, y: 0}

Assets/Scripts/CameraController.cs

@@ -138,7 +138,7 @@ public class CameraController : MonoBehaviour {
             //방의 중심과 비교하여 어느게 더 가까운가
         }
         if (MapManager.isRoomFalling != true)
-            transform.position = Vector3.Lerp(transform.position, new Vector3(posx, posy, -1), 4f * Time.deltaTime);
+            transform.position = Vector3.Lerp(transform.position, new Vector3(posx, posy, -1), 8f * Time.deltaTime);
         else if (MapManager.isRoomFalling == true)
             transform.position = Vector3.Lerp(transform.position, new Vector3(posx, posy, -1), 0.9f);
         transform.position = new Vector3(transform.position.x, transform.position.y, -1);

Assets/Scripts/Characters/PlayerAttack.cs

 using System.Collections;
 using System.Collections.Generic;
-using UnityEditor.Animations;
 using UnityEngine;
 using UnityEngine.UI;
 public class PlayerAttack : MonoBehaviour {

Assets/Scripts/Enumerators.cs

@@ -54,4 +54,4 @@ public enum RoomType { Start, Item, BothSide, Gold, Amethyst, Boss, Normal }
 /// <summary>
 /// Enum for room's sprite types.
 /// </summary>
-public enum RoomSpriteType { Start, Item, BothSide, Gold, Amethyst, Boss, Normal1, Normal2, Nomal3, Normal4, Current }
+public enum RoomSpriteType { Item, BothSide, Gold, Amethyst, Boss, Normal1, Normal2, Nomal3, Normal4, Current }
\ No newline at end of file

Assets/Scripts/GameManager.cs

@@ -11,6 +11,8 @@ public class GameManager : MonoBehaviour {
     /// </summary>
     public static GameState gameState;
 
+    Vector3 warpPosition = new Vector3(2, 1, 0);
+
     public Canvas gameOverCanvas;
     public Canvas inventoryCanvas;
 
@@ -26,7 +28,7 @@ public class GameManager : MonoBehaviour {
         gameState = GameState.Ingame;
         GameObject.Find("TetriminoSpawner").GetComponent<TetriminoSpawner>().MakeInitialTetrimino();
         Vector2 coord = MapManager.currentRoom.transform.position;
-        GameObject.Find("Player").transform.position = new Vector2(coord.x, coord.y) + new Vector2(3, 3);
+        GameObject.Find("Player").transform.position = MapManager.currentRoom.portal.transform.position + warpPosition;
         GameObject.Find("Main Camera").transform.position = GameObject.Find("Player").transform.position;
     }
 	
@@ -63,7 +65,7 @@ public class GameManager : MonoBehaviour {
             {
                 if (gameState == GameState.Portal && MapManager.currentRoom != MapManager.mapGrid[(int)MapManager.portalDestination.x, (int)MapManager.portalDestination.y])
                 {
-                    GameObject.Find("Player").transform.position = MapManager.mapGrid[(int)MapManager.portalDestination.x, (int)MapManager.portalDestination.y].portal.transform.position + new Vector3(2, 1, 0);
+                    GameObject.Find("Player").transform.position = MapManager.mapGrid[(int)MapManager.portalDestination.x, (int)MapManager.portalDestination.y].portal.transform.position + warpPosition;
                     GameObject.Find("MapManager").GetComponent<MapManager>().ChangeRoom(MapManager.mapGrid[(int)MapManager.portalDestination.x, (int)MapManager.portalDestination.y]);
                     MapManager.mapGrid[(int)MapManager.portalDestination.x, (int)MapManager.portalDestination.y].portalSurface.GetComponent<SpriteRenderer>().sprite =
                         GameObject.Find("MapManager").GetComponent<MapManager>().portalExist;
@@ -74,6 +76,8 @@ public class GameManager : MonoBehaviour {
             {
                 if(gameState == GameState.Portal)
                 {
+                    MapManager.mapGrid[(int)MapManager.currentRoom.mapCoord.x, (int)MapManager.currentRoom.mapCoord.y].portalSurface.GetComponent<SpriteRenderer>().sprite =
+                        GameObject.Find("MapManager").GetComponent<MapManager>().portalExist;
                     MapManager.mapGrid[(int)MapManager.currentRoom.mapCoord.x, (int)MapManager.currentRoom.mapCoord.y].portalSurface.GetComponent<SpriteRenderer>().sprite =
                         GameObject.Find("MapManager").GetComponent<MapManager>().portalExist;
                     StartCoroutine(GameObject.FindGameObjectWithTag("MainCamera").GetComponent<CameraController>().ChangeScene(GameState.Ingame));

Assets/Scripts/TetrisMap/Test.cs

@@ -11,6 +11,9 @@ public class Test : MonoBehaviour {
     public static Vector3 tetrisCameraCoord = new Vector3(180, 0, -1);
     public static float tetrisMapSize = 300;
     public Text timer;
+    public GameObject testUI;
+    public GameObject lifeStoneTestUI;
+    bool isTestUiActive = true;
 
     public void ChangeTetrimino()
     {
@@ -55,10 +58,6 @@ public class Test : MonoBehaviour {
     {
         enemyManager.SpawnEnemy();
     }
-    public void ChangeTile()
-    {
-        GameObject.Find("MapManager").GetComponent<TileManager>().SetAllTiles(MapManager.currentRoom.roomInGame);
-    }
 
 
     private void Awake()
@@ -79,7 +78,22 @@ public class Test : MonoBehaviour {
             ChangeTetrimino();
         if (Input.GetKeyDown(KeyCode.Alpha2))
             SpawnBossTetrimino();
-        if(!MapManager.isTetriminoFalling)
+        if (Input.GetKeyDown(KeyCode.BackQuote))
+        {
+            if (isTestUiActive)
+            {
+                testUI.SetActive(false);
+                lifeStoneTestUI.SetActive(false);
+                isTestUiActive = false;
+            }
+            else if (!isTestUiActive)
+            {
+                testUI.SetActive(true);
+                lifeStoneTestUI.SetActive(true);
+                isTestUiActive = true;
+            }
+        }
+        if (!MapManager.isTetriminoFalling)
             Timer();
     }
 }

Assets/Scripts/TileManager.cs

@@ -97,11 +97,12 @@ public class TileManager : MonoBehaviour
     /// </summary>
     /// <param name="roomInGame">Room you want to set.</param>
     /// <returns></returns>
-    public IEnumerator SetAllTiles(RoomInGame roomInGame)
+    public IEnumerator SetAllTiles(Room room)
     {
         int stage = MapManager.currentStage;
         //int concept = room.roomConcept;
-        int concept = 0;
+        int concept = room.roomConcept % 2;
+        RoomInGame roomInGame = room.roomInGame;
         Tilemap roomTileMap = roomInGame.transform.Find("wall").GetComponent<Tilemap>();
         CheckAllTiles(roomInGame);
         for(int y = 0; y < 24; y++)
@@ -134,7 +135,7 @@ public class TileManager : MonoBehaviour
         for(int i = 0; i < tetrimino.rooms.Length; i++)
         {
             yield return null;
-            StartCoroutine(SetAllTiles(tetrimino.rooms[i].roomInGame));
+            StartCoroutine(SetAllTiles(tetrimino.rooms[i]));
         }
     }
 }

Assets/Sprites/Rooms/Stage1/RoomNormal1_0.png.meta

 fileFormatVersion: 2
-guid: c4a8c8eff83f3324f84a5a7a4d1172d3
+guid: 0f2e022b8373886499dbeb48ec054e8f
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -45,7 +45,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 6
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 10.66667
+  spritePixelsToUnits: 1.3333334
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -97,7 +97,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 1ccbbb2c33e2c75499cdb463b1b3d3af
+    spriteID: 52510b936352fb743aa5b89fd956c843
     vertices: []
     indices: 
     edges: []

Assets/Sprites/Rooms/Stage1/RoomNormal1_1.png.meta

 fileFormatVersion: 2
-guid: 8936716eac2462547b84170fb6000a28
+guid: 2d4a5ffd54cb0b643a0a0151351080b0
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -45,7 +45,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 6
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 10.66667
+  spritePixelsToUnits: 1.3333334
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -97,7 +97,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: a140b178921540a498f2536a30994f48
+    spriteID: 44e169318be1b0445a4ae60fd65342bd
     vertices: []
     indices: 
     edges: []

Assets/Sprites/Rooms/Stage1/RoomNormal1_2.png.meta

 fileFormatVersion: 2
-guid: 31d8e8c657f655a4ea9afd229fe81d17
+guid: 53d3da01722c1354ab7f0a0e5a6d3ba1
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -45,7 +45,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 6
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 10.66667
+  spritePixelsToUnits: 1.3333334
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -97,7 +97,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 51ca76bb6acf6fb4f81cdbd8f76ae50d
+    spriteID: 8e69da60398ed074d9df507e6b2bc313
     vertices: []
     indices: 
     edges: []

Assets/Sprites/Rooms/Stage1/RoomNormal1_3.png.meta

 fileFormatVersion: 2
-guid: 2569afcbbcfb5c14f90525054a6707c3
+guid: 8044a9fe8c979f141a047ee76dc5a4b3
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -45,7 +45,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 6
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 10.66667
+  spritePixelsToUnits: 1.3333334
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -97,7 +97,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 4a3573fda37d698439b98ed5eb3ca2ed
+    spriteID: a697ff3f19ddda2458f17676999c6e6f
     vertices: []
     indices: 
     edges: []