카메라 갈아 엎음. 이제 카메라는 벽에 부딪혀서 벽 밖으로는 조금만 보여주게 되고 그 외 기타 자잘한 오류들 고침

Assets/Prefabs/Rooms/InGameDoor/DoorInGameDown.prefab

@@ -23,7 +23,7 @@ GameObject:
   - component: {fileID: 95049867913064836}
   - component: {fileID: 60595704614928888}
   - component: {fileID: 114295912794569440}
-  m_Layer: 8
+  m_Layer: 12
   m_Name: DoorInGameDown
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/Prefabs/Rooms/InGameDoor/DoorInGameLeft.prefab

@@ -23,7 +23,7 @@ GameObject:
   - component: {fileID: 95177593216515702}
   - component: {fileID: 60996771576975244}
   - component: {fileID: 114082229687600582}
-  m_Layer: 8
+  m_Layer: 12
   m_Name: DoorInGameLeft
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/Prefabs/Rooms/InGameDoor/DoorInGameRight.prefab

@@ -23,7 +23,7 @@ GameObject:
   - component: {fileID: 95627112181051082}
   - component: {fileID: 60158907655368212}
   - component: {fileID: 114434671980411926}
-  m_Layer: 8
+  m_Layer: 12
   m_Name: DoorInGameRight
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/Prefabs/Rooms/InGameDoor/DoorInGameUp.prefab

@@ -23,7 +23,7 @@ GameObject:
   - component: {fileID: 95785122911416600}
   - component: {fileID: 60354718583369946}
   - component: {fileID: 114142621642518908}
-  m_Layer: 8
+  m_Layer: 12
   m_Name: DoorInGameUp
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/Scripts/GameManager.cs

@@ -16,6 +16,7 @@ public class GameManager : MonoBehaviour {
         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("Main Camera").transform.position = GameObject.Find("Player").transform.position;
     }
 	
 	// Update is called once per frame

Assets/Scripts/Item/Addons.meta

-fileFormatVersion: 2
-guid: 3eeb43e73bfaf1f48901afcdbe4f6d11
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/TetrisMap/MapManager.cs

@@ -76,11 +76,11 @@ public class MapManager : MonoBehaviour {
     /// <summary>
     /// Check if this row is being deleted.
     /// </summary>
-    private static bool[] isRowDeleting = new bool[20];
+    public static bool[] isRowDeleting = new bool[20];
     /// <summary>
     /// Tetris Y axis coordinates on Unity.
     /// </summary>
-    private static float[] tetrisYCoord = new float[height];
+    public static float[] tetrisYCoord = new float[height];
     /// <summary>
     /// Array that saves presses.
     /// </summary>
@@ -292,6 +292,8 @@ public class MapManager : MonoBehaviour {
                 mapGrid[doorCloseCounter, row].CloseDoor("Down", false);
                 mapGrid[width - doorCloseCounter - 1, row].CloseDoor("Up", false);
                 mapGrid[width - doorCloseCounter - 1, row].CloseDoor("Down", false);
+                mapGrid[doorCloseCounter, row].isRoomDestroyed = true;
+                mapGrid[width - doorCloseCounter - 1, row].isRoomDestroyed = true;
                 doorCloseCounter++;
             }
             if(collapseRate - roomDestroyCounter * 0.2f > 0.2f)
@@ -415,6 +417,7 @@ public class MapManager : MonoBehaviour {
             SetRoomsYCoord();
             if(currentRoom.mapCoord.y >= bottom)
                 player.transform.position += new Vector3(0, - yFallSpeed, 0);
+            previousPlayerRelativePosition = player.transform.position - currentRoom.transform.position;
         }
         if (shakeCamera)
         {
@@ -908,6 +911,5 @@ public class MapManager : MonoBehaviour {
         }
         else
             Debug.Log("Game Over");
-
     }
 }

Assets/Scripts/TetrisMap/Room.cs

@@ -80,6 +80,10 @@ public class Room : MonoBehaviour
     /// Check if room is clear and escapable.
     /// </summary>
     public bool isRoomCleared;
+    /// <summary>
+    /// Check if room is destroyed.
+    /// </summary>
+    public bool isRoomDestroyed = false;
 
     /*
      *  functions
@@ -138,7 +142,7 @@ public class Room : MonoBehaviour
         switch (direction)
         {
             case "Up":
-                if (mapCoord.y < MapManager.realHeight && MapManager.mapGrid[(int)mapCoord.x, (int)mapCoord.y + 1] != null)
+                if (mapCoord.y < MapManager.realHeight && MapManager.mapGrid[(int)mapCoord.x, (int)mapCoord.y + 1] != null && MapManager.mapGrid[(int)mapCoord.x, (int)mapCoord.y + 1].isRoomDestroyed != true)
                 {
                     door = inGameDoorUp;
                     animatorThisRoom = door.GetComponent<Animator>();
@@ -146,7 +150,7 @@ public class Room : MonoBehaviour
                 }
                 break;
             case "Down":
-                if (mapCoord.y > 0 && MapManager.mapGrid[(int)mapCoord.x, (int)mapCoord.y - 1] != null)
+                if (mapCoord.y > 0 && MapManager.mapGrid[(int)mapCoord.x, (int)mapCoord.y - 1] != null && MapManager.mapGrid[(int)mapCoord.x, (int)mapCoord.y - 1].isRoomDestroyed != true)
                 {
                     door = inGameDoorDown;
                     animatorThisRoom = door.GetComponent<Animator>();

Assets/Scripts/TetrisMap/TetriminoSpawner.cs

@@ -85,7 +85,7 @@ public class TetriminoSpawner : MonoBehaviour {
             int randomPosition = Random.Range(0, MapManager.width);
             int randomTetrimino = TetriminoRandomizer();
             MapManager.currentTetrimino = Instantiate(tetriminoes[randomTetrimino], MapManager.tetrisMapCoord + MapManager.tetrisMapSize * new Vector3(randomPosition, 0, MapManager.tetrisMapCoord.z), Quaternion.identity);
-            MapManager.currentRoom = MapManager.currentTetrimino.rooms[Random.Range(0, MapManager.currentTetrimino.rooms.Length)];
+            MapManager.currentRoom = MapManager.currentTetrimino.rooms[0];
             MapManager.currentRoom.specialRoomType = RoomType.Start;
             MapManager.currentTetrimino.mapCoord = (MapManager.currentTetrimino.transform.position - MapManager.tetrisMapCoord) / MapManager.tetrisMapSize;
             mapManager.SetRoomMapCoord(MapManager.currentTetrimino);
@@ -103,6 +103,7 @@ public class TetriminoSpawner : MonoBehaviour {
             mapManager.CreateRoom(MapManager.currentTetrimino);
             MapManager.currentRoom.fog.GetComponent<SpriteRenderer>().color = new Color(1, 1, 1, 0);
             MapManager.currentRoom.GetComponent<SpriteRenderer>().sprite = mapManager.roomsSpritesDistributed[MapManager.currentStage][(int)RoomSpriteType.Current];
+            MapManager.currentRoom.ClearRoom();
             MapManager.tempRoom = MapManager.currentRoom;
             MakeTetrimino();
         }