플레이어 위치 시작방으로 이동

Assets/Scripts/GameManager.cs

@@ -15,6 +15,12 @@ public class GameManager : MonoBehaviour {
     // Use this for initialization
     void Start () {
         gameState = GameState.Tetris;
+        var TS = GameObject.Find("TetriminoSpawner").GetComponent<TetriminoSpawner>();
+        TS.MakeInitialTetrimino();
+        Vector2 coord = GameObject.Find("MapManager").GetComponent<MapManager>().startRoom.transform.position;
+
+        GameObject.Find("Player").transform.position = new Vector2(coord.x, coord.y) + new Vector2(3, 3);
+
     }
 	
 	// Update is called once per frame

Assets/Scripts/TetrisMap/MapManager.cs

@@ -67,6 +67,7 @@ public class MapManager : MonoBehaviour {
     /// </summary>
     public RoomInGame[] specialRoomList;
     public bool controlCurrentTetrimino = false;
+    public Room startRoom;
 
     /*
      * functions
@@ -393,11 +394,12 @@ public class MapManager : MonoBehaviour {
         {
             UpdateMap(currentTetrimino);
             te.rooms[i].transform.parent = grid;
+            te.rooms[i].transform.position += new Vector3(0, 0, -2);
             if (te.rooms[i].itemRoomType != 0) ;
             else if (te.rooms[i].specialRoomType != Room.SpecialRoomType.Normal)
-                Instantiate(specialRoomList[(int)te.rooms[i].specialRoomType], te.rooms[i].transform.position, Quaternion.identity, te.rooms[i].transform);
+                Instantiate(specialRoomList[(int)te.rooms[i].specialRoomType], te.rooms[i].transform.position + new Vector3(0, 0, 2), Quaternion.identity, te.rooms[i].transform);
             else
-                Instantiate(normalRoomList[Random.Range(0, normalRoomList.Length)], te.rooms[i].transform.position, Quaternion.identity, te.rooms[i].transform);
+                Instantiate(normalRoomList[Random.Range(0, normalRoomList.Length)], te.rooms[i].transform.position + new Vector3(0, 0, 2), Quaternion.identity, te.rooms[i].transform);
         }
         Destroy(te.gameObject);
     }
@@ -405,17 +407,6 @@ public class MapManager : MonoBehaviour {
     /*
      * Test
      * */
-
-    public void Test()
-    {
-        if(Input.GetKeyDown(KeyCode.Alpha0))
-        {
-            for (int x = 0; x < width; x++)
-                for (int y = 0; y < height; y++)
-                    if (mapGrid[x, y] != null)
-                        Debug.Log(new Vector3(x, y, 0));
-        }
-    }
     void Awake()
     {
         Tetrimino.rotationInformation[0].horizontalLength = new int[4] { 1, 4, 1, 4 };  //I
@@ -439,7 +430,6 @@ public class MapManager : MonoBehaviour {
     void Update() {
         if(controlCurrentTetrimino)
         {
-            Test();
             TetriminoControl(currentTetrimino);
             currentTetrimino.transform.position = new Vector3(currentTetrimino.mapCoord.x * tetrisMapSize, tetrisYCoord[(int)currentTetrimino.mapCoord.y], currentTetrimino.mapCoord.z * tetrisMapSize);
             //currentTetrimino.transform.position = currentTetrimino.mapCoord * tetrisMapSize + tetrisMapCoord;

Assets/Scripts/TetrisMap/TetriminoSpawner.cs

@@ -60,16 +60,10 @@ public class TetriminoSpawner : MonoBehaviour {
         if (!MM.gameOver)
         {
             int randomPosition = Random.Range(0, MapManager.width);
-            int randomTetrimino;
-            if (MM.spawnBossTetrimino)
-            {
-                randomTetrimino = 7;
-                MM.spawnBossTetrimino = false;
-            }
-            else
-                randomTetrimino = TetriminoRandomizer();
+            int randomTetrimino = TetriminoRandomizer();
             MM.currentTetrimino = Instantiate(tetriminoes[randomTetrimino], MM.tetrisMapCoord + MM.tetrisMapSize * new Vector3(randomPosition, 0, MM.tetrisMapCoord.z), Quaternion.identity);
-            MM.currentTetrimino.rooms[Random.Range(0, MM.currentTetrimino.rooms.Length)].specialRoomType = Room.SpecialRoomType.Start;
+            MM.startRoom = MM.currentTetrimino.rooms[Random.Range(0, MM.currentTetrimino.rooms.Length)];
+            MM.startRoom.specialRoomType = Room.SpecialRoomType.Start;
             MM.currentTetrimino.mapCoord = (MM.currentTetrimino.transform.position - MM.tetrisMapCoord) / MM.tetrisMapSize;
             MM.SetRoomMapCoord(MM.currentTetrimino);
             MM.MakeTetriminoRightPlace(MM.currentTetrimino);
@@ -112,8 +106,6 @@ public class TetriminoSpawner : MonoBehaviour {
 
     // Use this for initialization
     void Start () {
-        MakeInitialTetrimino();
-        MakeTetrimino();
 	}
 	
 	// Update is called once per frame