Skip to content

tetra-tower
tetra-tower
Commit 48956904 authored by 18손재민's avatar 18손재민
Browse files
Options

이동 및 회전, 드랍 관련 기능 대부분 구현 완료

parent 38c052e9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 280 additions and 98 deletions
Assets/Prefabs/Tetrimino/TetriminoI.prefab
View file @ 48956904
...@@ -180,7 +180,7 @@ MonoBehaviour: ...@@ -180,7 +180,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114323397412866622 --- !u!114 &114323397412866622
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -197,7 +197,7 @@ MonoBehaviour: ...@@ -197,7 +197,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114753577101051656 --- !u!114 &114753577101051656
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -214,7 +214,7 @@ MonoBehaviour: ...@@ -214,7 +214,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114851979720776072 --- !u!114 &114851979720776072
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -252,7 +252,7 @@ MonoBehaviour: ...@@ -252,7 +252,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!212 &212152418876382836 --- !u!212 &212152418876382836
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
Assets/Prefabs/Tetrimino/TetriminoJ.prefab
View file @ 48956904
...@@ -180,7 +180,7 @@ MonoBehaviour: ...@@ -180,7 +180,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114163463770396558 --- !u!114 &114163463770396558
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -197,7 +197,7 @@ MonoBehaviour: ...@@ -197,7 +197,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114466843507187060 --- !u!114 &114466843507187060
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -214,7 +214,7 @@ MonoBehaviour: ...@@ -214,7 +214,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114787691033818184 --- !u!114 &114787691033818184
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -231,7 +231,7 @@ MonoBehaviour: ...@@ -231,7 +231,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114826030636358216 --- !u!114 &114826030636358216
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
Assets/Prefabs/Tetrimino/TetriminoL.prefab
View file @ 48956904
...@@ -180,7 +180,7 @@ MonoBehaviour: ...@@ -180,7 +180,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114135637264954520 --- !u!114 &114135637264954520
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -197,7 +197,7 @@ MonoBehaviour: ...@@ -197,7 +197,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114317610525364840 --- !u!114 &114317610525364840
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -214,7 +214,7 @@ MonoBehaviour: ...@@ -214,7 +214,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114346591663730294 --- !u!114 &114346591663730294
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -231,7 +231,7 @@ MonoBehaviour: ...@@ -231,7 +231,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114568813863931164 --- !u!114 &114568813863931164
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
Assets/Prefabs/Tetrimino/TetriminoO.prefab
View file @ 48956904
...@@ -180,7 +180,7 @@ MonoBehaviour: ...@@ -180,7 +180,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114213829136544718 --- !u!114 &114213829136544718
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -197,7 +197,7 @@ MonoBehaviour: ...@@ -197,7 +197,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114426654816215182 --- !u!114 &114426654816215182
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -235,7 +235,7 @@ MonoBehaviour: ...@@ -235,7 +235,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114908975501692068 --- !u!114 &114908975501692068
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -252,7 +252,7 @@ MonoBehaviour: ...@@ -252,7 +252,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!212 &212207191686043862 --- !u!212 &212207191686043862
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
Assets/Prefabs/Tetrimino/TetriminoS.prefab
View file @ 48956904
...@@ -180,7 +180,7 @@ MonoBehaviour: ...@@ -180,7 +180,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114184053320687194 --- !u!114 &114184053320687194
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -197,7 +197,7 @@ MonoBehaviour: ...@@ -197,7 +197,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114316302151506316 --- !u!114 &114316302151506316
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -214,7 +214,7 @@ MonoBehaviour: ...@@ -214,7 +214,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114491658978157548 --- !u!114 &114491658978157548
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -252,7 +252,7 @@ MonoBehaviour: ...@@ -252,7 +252,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!212 &212368084699848572 --- !u!212 &212368084699848572
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
Assets/Prefabs/Tetrimino/TetriminoT.prefab
View file @ 48956904
...@@ -180,7 +180,7 @@ MonoBehaviour: ...@@ -180,7 +180,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114250342630536598 --- !u!114 &114250342630536598
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -197,7 +197,7 @@ MonoBehaviour: ...@@ -197,7 +197,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114555629497930862 --- !u!114 &114555629497930862
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -214,7 +214,7 @@ MonoBehaviour: ...@@ -214,7 +214,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114609423914388260 --- !u!114 &114609423914388260
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -231,7 +231,7 @@ MonoBehaviour: ...@@ -231,7 +231,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114813872723638092 --- !u!114 &114813872723638092
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
Assets/Prefabs/Tetrimino/TetriminoZ.prefab
View file @ 48956904
...@@ -180,7 +180,7 @@ MonoBehaviour: ...@@ -180,7 +180,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114116348516849362 --- !u!114 &114116348516849362
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -218,7 +218,7 @@ MonoBehaviour: ...@@ -218,7 +218,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114930072884505966 --- !u!114 &114930072884505966
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -235,7 +235,7 @@ MonoBehaviour: ...@@ -235,7 +235,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!114 &114970417993025404 --- !u!114 &114970417993025404
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -252,7 +252,7 @@ MonoBehaviour: ...@@ -252,7 +252,7 @@ MonoBehaviour:
stage: 0 stage: 0
roomConcept: 0 roomConcept: 0
itemRoomType: 0 itemRoomType: 0
specialRoomType: 0 specialRoomType: 5
--- !u!212 &212024274712184554 --- !u!212 &212024274712184554
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
Assets/Scripts/TetrisMap/MapManager.cs
View file @ 48956904
This diff is collapsed.
Assets/Scripts/TetrisMap/Room.cs
View file @ 48956904
...@@ -48,10 +48,4 @@ public class Room : MonoBehaviour ...@@ -48,10 +48,4 @@ public class Room : MonoBehaviour
{ {
} }
void Awake()
{
doorInfo = new int[2] { 0, 0 };
}
} }
Assets/Scripts/TetrisMap/Test.cs
View file @ 48956904
...@@ -7,14 +7,14 @@ public class Test : MonoBehaviour { ...@@ -7,14 +7,14 @@ public class Test : MonoBehaviour {
public void ChangeTetrimino() public void ChangeTetrimino()
{ {
var MM = GameObject.FindGameObjectWithTag("MapManager").GetComponent<MapManager>(); var MM = GameObject.Find("MapManager").GetComponent<MapManager>();
var TS = GameObject.FindGameObjectWithTag("TetriminoSpawner").GetComponent<TetriminoSpawner>(); var TS = GameObject.Find("TetriminoSpawner").GetComponent<TetriminoSpawner>();
Destroy(MM.currentTetrimino.gameObject); Destroy(MM.currentTetrimino.gameObject);
TS.MakeTetrimino(); TS.MakeTetrimino();
} }
public void SpawnBossTetrimino() public void SpawnBossTetrimino()
{ {
var MM = GameObject.FindGameObjectWithTag("MapManager").GetComponent<MapManager>(); var MM = GameObject.Find("MapManager").GetComponent<MapManager>();
MM.spawnBossTetrimino = true; MM.spawnBossTetrimino = true;
} }
......
Assets/Scripts/TetrisMap/Tetrimino/Tetrimino.cs
View file @ 48956904
...@@ -36,17 +36,22 @@ public class Tetrimino : MonoBehaviour { ...@@ -36,17 +36,22 @@ public class Tetrimino : MonoBehaviour {
/// Each rooms for this tetrimino. /// Each rooms for this tetrimino.
/// </summary> /// </summary>
public Room[] rooms; public Room[] rooms;
/// <summary>
/// Tetrimino rotated angle.
/// </summary>
public int rotatedAngle = 0;
/// <summary>
/// Tetrimino rotated position;
/// </summary>
public int[] rotatedPosition = { 0, 0, 0, 0 };
public struct RotationInformation
{
public int[] horizontalLength;
}
public static RotationInformation[] rotationInformation = new RotationInformation[7];
/* /*
* functions * functions
* */ * */
} }
Assets/Scripts/TetrisMap/TetriminoSpawner.cs
View file @ 48956904
...@@ -25,7 +25,7 @@ public class TetriminoSpawner : MonoBehaviour { ...@@ -25,7 +25,7 @@ public class TetriminoSpawner : MonoBehaviour {
/// </summary> /// </summary>
public void MakeTetrimino() public void MakeTetrimino()
{ {
var MM = GameObject.FindGameObjectWithTag("MapManager").GetComponent<MapManager>(); var MM = GameObject.Find("MapManager").GetComponent<MapManager>();
if (!MM.gameOver) if (!MM.gameOver)
{ {
int randomPosition = Random.Range(0, MapManager.width); int randomPosition = Random.Range(0, MapManager.width);
...@@ -41,6 +41,14 @@ public class TetriminoSpawner : MonoBehaviour { ...@@ -41,6 +41,14 @@ public class TetriminoSpawner : MonoBehaviour {
MM.currentTetrimino.mapCoord = (MM.currentTetrimino.transform.position - MM.tetrisMapCoord) / MM.tetrisMapSize; MM.currentTetrimino.mapCoord = (MM.currentTetrimino.transform.position - MM.tetrisMapCoord) / MM.tetrisMapSize;
MM.SetRoomMapCoord(MM.currentTetrimino); MM.SetRoomMapCoord(MM.currentTetrimino);
MM.MakeTetriminoRightPlace(MM.currentTetrimino); MM.MakeTetriminoRightPlace(MM.currentTetrimino);
for(int i = 0; i < MM.currentTetrimino.rotatedPosition.Length;i++)
{
if (Tetrimino.rotationInformation[(int)MM.currentTetrimino.tetriminoType].horizontalLength[i] + MM.currentTetrimino.mapCoord.x > MapManager.width)
MM.currentTetrimino.rotatedPosition[i] = MapManager.width - Tetrimino.rotationInformation[(int)MM.currentTetrimino.tetriminoType].horizontalLength[i];
else
MM.currentTetrimino.rotatedPosition[i] = (int)MM.currentTetrimino.mapCoord.x;
}
MM.controlCurrentTetrimino = true;
} }
} }
/// <summary> /// <summary>
...@@ -48,7 +56,7 @@ public class TetriminoSpawner : MonoBehaviour { ...@@ -48,7 +56,7 @@ public class TetriminoSpawner : MonoBehaviour {
/// </summary> /// </summary>
public void MakeInitialTetrimino() public void MakeInitialTetrimino()
{ {
var MM = GameObject.FindGameObjectWithTag("MapManager").GetComponent<MapManager>(); var MM = GameObject.Find("MapManager").GetComponent<MapManager>();
if (!MM.gameOver) if (!MM.gameOver)
{ {
int randomPosition = Random.Range(0, MapManager.width); int randomPosition = Random.Range(0, MapManager.width);
...@@ -65,6 +73,11 @@ public class TetriminoSpawner : MonoBehaviour { ...@@ -65,6 +73,11 @@ public class TetriminoSpawner : MonoBehaviour {
MM.currentTetrimino.mapCoord = (MM.currentTetrimino.transform.position - MM.tetrisMapCoord) / MM.tetrisMapSize; MM.currentTetrimino.mapCoord = (MM.currentTetrimino.transform.position - MM.tetrisMapCoord) / MM.tetrisMapSize;
MM.SetRoomMapCoord(MM.currentTetrimino); MM.SetRoomMapCoord(MM.currentTetrimino);
MM.MakeTetriminoRightPlace(MM.currentTetrimino); MM.MakeTetriminoRightPlace(MM.currentTetrimino);
for (int i = 0; i < MM.currentTetrimino.rooms.Length; i++)
{
MM.currentTetrimino.transform.position = MM.currentTetrimino.mapCoord * MM.tetrisMapSize + MM.tetrisMapCoord;
}
MM.UpdateMap(MM.currentTetrimino);
MM.CreateRoom(MM.currentTetrimino); MM.CreateRoom(MM.currentTetrimino);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment