씬까지 다 커밋

Assets/Prefabs/TetrisMap/TetriminoSpawner.prefab

@@ -22,7 +22,7 @@ GameObject:
   - component: {fileID: 114524961967938888}
   m_Layer: 0
   m_Name: TetriminoSpawner
-  m_TagString: Untagged
+  m_TagString: TetriminoSpawner
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0

Assets/Scripts/TetrisMap/MapManager.cs

@@ -36,7 +36,7 @@ public class MapManager : MonoBehaviour {
     /// <summary>
     /// Absolute coordinates on tetris map.
     /// </summary>
-    public static Room[,] mapCoord = new Room[width, height];
+    public static Room[,] mapGrid = new Room[width, height];
     /// <summary>
     /// Tetris Y axis coordinates on Unity.
     /// </summary>
@@ -84,9 +84,9 @@ public class MapManager : MonoBehaviour {
     {
         for (int i = 0; i < TE.rooms.Length; i++)
         {
-            if (TE.rooms[i].transform.position.x < mapLeftEnd.transform.position.x)
+            if (TE.rooms[i].mapCoord.x < 0)
                 return -1;
-            else if (TE.rooms[i].transform.position.x > mapRightEnd.transform.position.x)
+            else if (TE.rooms[i].mapCoord.x > width - 1)
                 return 1;
         }
         return 0;
@@ -101,17 +101,16 @@ public class MapManager : MonoBehaviour {
         {
             if (IsRightTetrimino(TE) == 1)
             {
-                TE.transform.position += new Vector3(-tetrisMapSize, 0, 0);
+                TE.mapCoord += new Vector3(-1, 0, 0);
             }
             else if (IsRightTetrimino(TE) == -1)
             {
-                TE.transform.position += new Vector3(tetrisMapSize, 0, 0);
+                TE.mapCoord += new Vector3(1, 0, 0);
             }
             else
                 break;
         }
     }
-
     /// <summary>
     /// Delete one row.
     /// </summary>
@@ -120,8 +119,8 @@ public class MapManager : MonoBehaviour {
     {
         for(int x = 0; x < width; x++)
         {
-            Destroy(mapCoord[x, row].gameObject);
-            mapCoord[x, row] = null;
+            Destroy(mapGrid[x, row].gameObject);
+            mapGrid[x, row] = null;
         }
     }
     /// <summary>
@@ -134,8 +133,8 @@ public class MapManager : MonoBehaviour {
         {
             for(int x = 0; x < width; x++)
             {
-                mapCoord[x, y - 1] = mapCoord[x, y];
-                mapCoord[x, y] = null;
+                mapGrid[x, y - 1] = mapGrid[x, y];
+                mapGrid[x, y] = null;
             }
         }
     }
@@ -147,7 +146,7 @@ public class MapManager : MonoBehaviour {
     public static bool IsRowFull(int row)
     {
         for (int x = 0; x < width; x++)
-            if (mapCoord[x, row] != null && mapCoord[x, row].specialRoomType == Room.SpecialRoomType.Boss)
+            if (mapGrid[x, row] != null && mapGrid[x, row].specialRoomType == Room.SpecialRoomType.Boss)
                 return false;
         return true;
     }
@@ -190,24 +189,49 @@ public class MapManager : MonoBehaviour {
     {
 
     }
-    public void TetriminoMove(Tetrimino TE)
+    /*public void TetriminoMove(Tetrimino TE)
     {
-        if(Input.GetKeyDown(KeyCode.LeftArrow) && inTetris)
+        if (Input.GetKeyDown(KeyCode.LeftArrow) && inTetris)
         {
             TE.transform.position += new Vector3(-tetrisMapSize, 0, 0);
-            if(IsRightTetrimino(TE) != 0)
+            if (IsRightTetrimino(TE) != 0)
                 TE.transform.position += new Vector3(tetrisMapSize, 0, 0);
         }
-        else if(Input.GetKeyDown(KeyCode.RightArrow) && inTetris)
+        else if (Input.GetKeyDown(KeyCode.RightArrow) && inTetris)
         {
             TE.transform.position += new Vector3(tetrisMapSize, 0, 0);
             if (IsRightTetrimino(TE) != 0)
                 TE.transform.position += new Vector3(-tetrisMapSize, 0, 0);
         }
+    }*/
+    public void TetriminoMove(Tetrimino TE)
+    {
+        if (Input.GetKeyDown(KeyCode.LeftArrow) && inTetris)
+        {
+            TE.mapCoord += new Vector3(-1, 0, 0);
+            SetRoomMapCoord(currentTetrimino);
+            if (IsRightTetrimino(TE) != 0)
+                TE.mapCoord += new Vector3(1, 0, 0);
+        }
+        else if (Input.GetKeyDown(KeyCode.RightArrow) && inTetris)
+        {
+            TE.mapCoord += new Vector3(1, 0, 0);
+            SetRoomMapCoord(currentTetrimino);
+            if (IsRightTetrimino(TE) != 0)
+                TE.mapCoord += new Vector3(-1, 0, 0);
+        }
+        SetRoomMapCoord(currentTetrimino);
     }
     public void TetriminoRotate(Tetrimino TE)
     {
 
+    }
+    public void SetRoomMapCoord(Tetrimino TE)
+    {
+        for (int i = 0; i < TE.rooms.Length; i++)
+        {
+            TE.rooms[i].mapCoord = TE.mapCoord + TE.rooms[i].transform.localPosition;
+        }
     }
     public void InitiateTetrimino()
     {
@@ -217,18 +241,15 @@ public class MapManager : MonoBehaviour {
     /*
      * Test
      * */
-    public void SpawnBossTetrimino()
-    {
-        spawnBossTetrimino = true;
-    }
+
     // Use this for initialization
     void Start () {
         inTetris = true;
     }
 
     // Update is called once per frame
-	void Update () {
+    void Update() {
         TetriminoMove(currentTetrimino);
+        currentTetrimino.transform.position = currentTetrimino.mapCoord * tetrisMapSize + tetrisMapCoord;
     }
-
 }

Assets/Scripts/TetrisMap/Room.cs

@@ -11,7 +11,7 @@ public class Room : MonoBehaviour
     /// Room's Location on tetris map.
     /// Not related to real location.
     /// </summary>
-    public Vector3 mapLocation;
+    public Vector3 mapCoord;
     /// <summary>
     /// Door info per rooms.
     /// 0 for up, 1 for down.

Assets/Scripts/TetrisMap/Test.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Test : MonoBehaviour {
+
+
+    public void ChangeTetrimino()
+    {
+        var MM = GameObject.FindGameObjectWithTag("MapManager").GetComponent<MapManager>();
+        var TS = GameObject.FindGameObjectWithTag("TetriminoSpawner").GetComponent<TetriminoSpawner>();
+        Destroy(MM.currentTetrimino.gameObject);
+        TS.MakeTetrimino();
+    }
+    public void SpawnBossTetrimino()
+    {
+        var MM = GameObject.FindGameObjectWithTag("MapManager").GetComponent<MapManager>();
+        MM.spawnBossTetrimino = true;
+    }
+
+
+    // Use this for initialization
+    void Start () {
+		
+	}
+	
+	// Update is called once per frame
+	void Update () {
+		
+	}
+}

Assets/Scripts/TetrisMap/Test.cs.meta

+fileFormatVersion: 2
+guid: 4f70662cea9642244afe9d8a44fa3211
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/TetrisMap/Tetrimino/Tetrimino.cs

@@ -49,5 +49,4 @@ public class Tetrimino : MonoBehaviour {
 
 
 
-
 }

Assets/Scripts/TetrisMap/TetriminoSpawner.cs

@@ -39,6 +39,8 @@ public class TetriminoSpawner : MonoBehaviour {
                 randomTetrimino = TetriminoRandomizer();
             MM.currentTetrimino = Instantiate(tetriminoes[randomTetrimino], MM.tetrisMapCoord + MM.tetrisMapSize * new Vector3(randomPosition, MapManager.realHeight + 1, MM.tetrisMapCoord.z), Quaternion.identity);
             MM.MakeTetriminoRightPlace(MM.currentTetrimino);
+            MM.currentTetrimino.mapCoord = (MM.currentTetrimino.transform.position - MM.tetrisMapCoord) / MM.tetrisMapSize;
+            MM.SetRoomMapCoord(MM.currentTetrimino);
         }
     }
     /// <summary>
@@ -65,17 +67,10 @@ public class TetriminoSpawner : MonoBehaviour {
         return count;
     }
 
-
-
     /*
      * Test
      * */
-    public void ChangeTetrimino()
-    {
-        var MM = GameObject.FindGameObjectWithTag("MapManager").GetComponent<MapManager>();
-        Destroy(MM.currentTetrimino.gameObject);
-        MakeTetrimino();
-    }
+
     // Use this for initialization
     void Start () {
         MakeTetrimino();

ProjectSettings/TagManager.asset

@@ -6,6 +6,7 @@ TagManager:
   tags:
   - MapManager
   - Tetrimino
+  - TetriminoSpawner
   layers:
   - Default
   - TransparentFX