Merge branch 'map'

Assets/Prefabs/MapManager.prefab

@@ -52,7 +52,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   grid: {fileID: 0}
-  tetrisMapSize: 1
+  tetrisMapSize: 24
   tetrisMapCoord: {x: 0, y: 0, z: 0}
   speed: 0
   gravity: 0
@@ -62,5 +62,12 @@ MonoBehaviour:
   spawnBossTetrimino: 0
   tetrisMap: {fileID: 0}
   currentTetrimino: {fileID: 0}
-  halfRoomList:
-  - {fileID: 114931030853536078, guid: 279f5b34ed5c53545990e499c74cbbe7, type: 2}
+  normalRoomList:
+  - {fileID: 114608209787691684, guid: 702a2175c3762fd4b9bc1fac0357a1a0, type: 2}
+  itemRoomList: []
+  specialRoomList:
+  - {fileID: 114076836714455396, guid: 1ec0004bbafe6764d9462251b866e6e6, type: 2}
+  - {fileID: 114589998919791384, guid: fe17cba28f910e54faf7b866f86bfd3e, type: 2}
+  - {fileID: 114834209009617488, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
+  - {fileID: 114310635400106216, guid: 7da800d1a4355fd4aa02e3518cd9e1fb, type: 2}
+  - {fileID: 114495009210863316, guid: 4b147f1162668f44aa55982681399aec, type: 2}

Assets/Prefabs/Rooms/ItemRoom.meta

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

Assets/Prefabs/Rooms/NormalRoom.meta

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

Assets/Prefabs/Rooms/NormalRoom/Room 0.prefab.meta

+fileFormatVersion: 2
+guid: 702a2175c3762fd4b9bc1fac0357a1a0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Rooms/Room0.prefab → Assets/Prefabs/Rooms/Room 0(half).prefab

@@ -26,7 +26,7 @@ GameObject:
   - component: {fileID: 66289433936503254}
   - component: {fileID: 2113883504774285740}
   m_Layer: 8
-  m_Name: Room0
+  m_Name: Room 0(half)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/Rooms/SpecialRoom.meta

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

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

+fileFormatVersion: 2
+guid: 7da800d1a4355fd4aa02e3518cd9e1fb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Rooms/SpecialRoom/Room Boss.prefab.meta

+fileFormatVersion: 2
+guid: 1ec0004bbafe6764d9462251b866e6e6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Rooms/SpecialRoom/Room BothSide.prefab.meta

+fileFormatVersion: 2
+guid: fe17cba28f910e54faf7b866f86bfd3e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

+fileFormatVersion: 2
+guid: f6834170b7152ee4db0dc7e165dcca70
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

+fileFormatVersion: 2
+guid: 4b147f1162668f44aa55982681399aec
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Tetrimino/TetriminoI.prefab

@@ -180,7 +180,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114323397412866622
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -197,7 +197,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114753577101051656
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -214,7 +214,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114851979720776072
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -252,7 +252,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!212 &212152418876382836
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Prefabs/Tetrimino/TetriminoJ.prefab

@@ -180,7 +180,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114163463770396558
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -197,7 +197,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114466843507187060
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -214,7 +214,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114787691033818184
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -231,7 +231,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114826030636358216
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Prefabs/Tetrimino/TetriminoL.prefab

@@ -180,7 +180,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114135637264954520
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -197,7 +197,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114317610525364840
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -214,7 +214,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114346591663730294
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -231,7 +231,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114568813863931164
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Prefabs/Tetrimino/TetriminoO.prefab

@@ -180,7 +180,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114213829136544718
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -197,7 +197,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114426654816215182
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -235,7 +235,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114908975501692068
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -252,7 +252,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!212 &212207191686043862
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Prefabs/Tetrimino/TetriminoS.prefab

@@ -180,7 +180,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114184053320687194
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -197,7 +197,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114316302151506316
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -214,7 +214,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114491658978157548
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -252,7 +252,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!212 &212368084699848572
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Prefabs/Tetrimino/TetriminoT.prefab

@@ -180,7 +180,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114250342630536598
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -197,7 +197,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114555629497930862
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -214,7 +214,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114609423914388260
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -231,7 +231,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114813872723638092
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Prefabs/Tetrimino/TetriminoZ.prefab

@@ -180,7 +180,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114116348516849362
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -218,7 +218,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114930072884505966
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -235,7 +235,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!114 &114970417993025404
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -252,7 +252,7 @@ MonoBehaviour:
   stage: 0
   roomConcept: 0
   itemRoomType: 0
-  specialRoomType: 0
+  specialRoomType: 5
 --- !u!212 &212024274712184554
 SpriteRenderer:
   m_ObjectHideFlags: 1

Assets/Scripts/CameraController.cs

@@ -5,6 +5,13 @@ using UnityEngine;
 public class CameraController : MonoBehaviour {
 
 
+    /*
+     * If camera is in Tetris view, ideal position is (108, 240, -2)
+     * size 300
+     * */
+
+
+
     GameManager.GameState lastGameState;
 
     Vector3 destination;

Assets/Scripts/GameManager.cs

@@ -14,7 +14,13 @@ public class GameManager : MonoBehaviour {
 
     // Use this for initialization
     void Start () {
-        gameState = GameState.Ingame;
+        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/Room.cs

@@ -35,7 +35,7 @@ public class Room : MonoBehaviour
     /// <summary>
     /// Enum for special room types.
     /// </summary>
-    public enum SpecialRoomType { Normal, Boss, BothSide, Gold, Amethyst };
+    public enum SpecialRoomType { Boss, BothSide, Gold, Amethyst, Start, Normal };
     /// <summary>
     /// Special room types.
     /// </summary>
@@ -48,10 +48,4 @@ public class Room : MonoBehaviour
     {
 
     }
-
-    void Awake()
-    {
-        doorInfo = new int[2] { 0, 0 };
-    }
-
 }

Assets/Scripts/TetrisMap/HalfRoom.cs → Assets/Scripts/TetrisMap/RoomInGame.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class HalfRoom : MonoBehaviour {
+public class RoomInGame : MonoBehaviour {
 
     /// <summary>
     /// The enum for door information.

Assets/Scripts/TetrisMap/Test.cs

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