Skip to content

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

자잘한 오류 수정

parent 70d4f0c5
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 39 deletions
Assets/Scripts/TetrisMap/Door.cs
View file @ 942ba7ef
......@@ -27,7 +27,6 @@ public class Door : MonoBehaviour {
{
if (enteredPosition == position && collision.tag.Equals("Player"))
{
bool a = false;
switch (position)
{
case 0:
......
Assets/Scripts/TetrisMap/MapManager.cs
View file @ 942ba7ef
......@@ -96,11 +96,11 @@ public class MapManager : MonoBehaviour {
/// <summary>
/// Current tetrimino waiting for falling.
/// </summary>
public Tetrimino currentTetrimino;
public static Tetrimino currentTetrimino;
/// <summary>
/// Current ghost following currentTetrimino.
/// </summary>
public Tetrimino currentGhost;
public static Tetrimino currentGhost;
/// <summary>
/// Room player exists.
/// Not related to player's real position, it also consider if player enter the room ordinarily.
......@@ -617,7 +617,6 @@ public class MapManager : MonoBehaviour {
fallSpeed += gravity * fallTime * fallTime;
te.transform.position += new Vector3(0, -fallSpeed, 0);
}
Camera camera = FindObjectOfType<Camera>();
StartCoroutine(GameObject.FindGameObjectWithTag("MainCamera").GetComponent<CameraController>().CameraShake(20 / CameraController.tetrisCameraSize));
EndTetrimino(te);
}
......@@ -678,14 +677,16 @@ public class MapManager : MonoBehaviour {
/// <param name="i">Index of the room in tetrimino. Use this to set ghost room's sprite.</param>
public void SetRoomSprite(Room room, int i)
{
int left = room.leftDoorLocation;
int right = room.rightDoorLocation;
//When start and special rooms' sprites added, modify this.
if (room.specialRoomType == RoomType.Normal)
room.GetComponent<SpriteRenderer>().sprite = roomsSpritesDistributed[room.stage][(int)RoomSpriteType.Normal1 + room.roomConcept];
else if (room.specialRoomType == RoomType.Start)
room.GetComponent<SpriteRenderer>().sprite = roomsSpritesDistributed[room.stage][(int)RoomSpriteType.Normal1 + room.roomConcept];
else
room.GetComponent<SpriteRenderer>().sprite = roomsSpritesDistributed[room.stage][(int)room.specialRoomType - 1];
if (currentGhost != null)
currentGhost.rooms[i].GetComponent<SpriteRenderer>().sprite = room.GetComponent<SpriteRenderer>().sprite;
}
......@@ -708,9 +709,6 @@ public class MapManager : MonoBehaviour {
if (room.specialRoomType == RoomType.Normal)
room.roomInGame = Instantiate(normalRoomsDistributed[room.stage, room.roomConcept, left, right]
[Random.Range(0, normalRoomsDistributed[room.stage, room.roomConcept, left, right].Count)], room.transform.position + new Vector3(0, 0, 2), Quaternion.identity, room.transform);
else if (room.specialRoomType == RoomType.Start)
room.roomInGame = Instantiate(specialRoomsDistributed[room.stage, room.roomConcept, left, right]
[(int)room.specialRoomType], room.transform.position + new Vector3(0, 0, 2), Quaternion.identity, room.transform);
else
room.roomInGame = Instantiate(specialRoomsDistributed[room.stage, room.roomConcept, left, right]
[(int)room.specialRoomType], room.transform.position + new Vector3(0, 0, 2), Quaternion.identity, room.transform);
......
Assets/Scripts/TetrisMap/Test.cs
View file @ 942ba7ef
......@@ -13,8 +13,8 @@ public class Test : MonoBehaviour {
public void ChangeTetrimino()
{
Destroy(mapManager.currentTetrimino.gameObject);
Destroy(mapManager.currentGhost.gameObject);
Destroy(MapManager.currentTetrimino.gameObject);
Destroy(MapManager.currentGhost.gameObject);
tetriminoSpawner.MakeTetrimino();
}
public void SpawnBossTetrimino()
......
Assets/Scripts/TetrisMap/TetriminoSpawner.cs
View file @ 942ba7ef
......@@ -44,30 +44,30 @@ public class TetriminoSpawner : MonoBehaviour {
}
else
randomTetrimino = TetriminoRandomizer();
mapManager.currentTetrimino = Instantiate(tetriminoes[randomTetrimino],
MapManager.currentTetrimino = Instantiate(tetriminoes[randomTetrimino],
MapManager.tetrisMapCoord + MapManager.tetrisMapSize * new Vector3(randomPosition, MapManager.realHeight + 1, MapManager.tetrisMapCoord.z), Quaternion.identity);
mapManager.currentTetrimino.mapCoord = (mapManager.currentTetrimino.transform.position - MapManager.tetrisMapCoord) / MapManager.tetrisMapSize;
mapManager.SetRoomMapCoord(mapManager.currentTetrimino);
mapManager.MakeTetriminoRightPlace(mapManager.currentTetrimino);
MapManager.currentTetrimino.mapCoord = (MapManager.currentTetrimino.transform.position - MapManager.tetrisMapCoord) / MapManager.tetrisMapSize;
mapManager.SetRoomMapCoord(MapManager.currentTetrimino);
mapManager.MakeTetriminoRightPlace(MapManager.currentTetrimino);
int tetriminoConcept = ConceptRandomizer();
for (int i = 0; i < mapManager.currentTetrimino.rotatedPosition.Length; i++)
for (int i = 0; i < MapManager.currentTetrimino.rotatedPosition.Length; i++)
{
if (Tetrimino.rotationInformation[(int)mapManager.currentTetrimino.tetriminoType].horizontalLength[i] + mapManager.currentTetrimino.mapCoord.x > MapManager.width)
mapManager.currentTetrimino.rotatedPosition[i] = MapManager.width - Tetrimino.rotationInformation[(int)mapManager.currentTetrimino.tetriminoType].horizontalLength[i];
if (Tetrimino.rotationInformation[(int)MapManager.currentTetrimino.tetriminoType].horizontalLength[i] + MapManager.currentTetrimino.mapCoord.x > MapManager.width)
MapManager.currentTetrimino.rotatedPosition[i] = MapManager.width - Tetrimino.rotationInformation[(int)MapManager.currentTetrimino.tetriminoType].horizontalLength[i];
else
mapManager.currentTetrimino.rotatedPosition[i] = (int)mapManager.currentTetrimino.mapCoord.x;
MapManager.currentTetrimino.rotatedPosition[i] = (int)MapManager.currentTetrimino.mapCoord.x;
}
for (int i = 0; i < mapManager.currentTetrimino.rooms.Length; i++)
for (int i = 0; i < MapManager.currentTetrimino.rooms.Length; i++)
{
Room room = mapManager.currentTetrimino.rooms[i];
mapManager.currentTetrimino.transform.position = mapManager.currentTetrimino.mapCoord * MapManager.tetrisMapSize + MapManager.tetrisMapCoord;
Room room = MapManager.currentTetrimino.rooms[i];
MapManager.currentTetrimino.transform.position = MapManager.currentTetrimino.mapCoord * MapManager.tetrisMapSize + MapManager.tetrisMapCoord;
room.stage = MapManager.currentStage;
room.roomConcept = tetriminoConcept;
mapManager.SetRoomSprite(room, i);
}
MakeGhost(mapManager.currentTetrimino, randomTetrimino);
MakeGhost(MapManager.currentTetrimino, randomTetrimino);
MapManager.isTetriminoFalling = false;
while (mapManager.roomsWaiting.Count != 0 && mapManager.currentTetrimino.notNormalRoomCount < 4)
while (mapManager.roomsWaiting.Count != 0 && MapManager.currentTetrimino.notNormalRoomCount < 4)
{
mapManager.UpgradeRoom(mapManager.roomsWaiting.Dequeue());
}
......@@ -84,23 +84,23 @@ 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.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.specialRoomType = MapManager.RoomType.Start;
mapManager.currentTetrimino.mapCoord = (mapManager.currentTetrimino.transform.position - MapManager.tetrisMapCoord) / MapManager.tetrisMapSize;
mapManager.SetRoomMapCoord(mapManager.currentTetrimino);
mapManager.MakeTetriminoRightPlace(mapManager.currentTetrimino);
MapManager.currentTetrimino.mapCoord = (MapManager.currentTetrimino.transform.position - MapManager.tetrisMapCoord) / MapManager.tetrisMapSize;
mapManager.SetRoomMapCoord(MapManager.currentTetrimino);
mapManager.MakeTetriminoRightPlace(MapManager.currentTetrimino);
int tetriminoConcept = ConceptRandomizer();
for (int i = 0; i < mapManager.currentTetrimino.rooms.Length; i++)
for (int i = 0; i < MapManager.currentTetrimino.rooms.Length; i++)
{
Room room = mapManager.currentTetrimino.rooms[i];
mapManager.currentTetrimino.transform.position = mapManager.currentTetrimino.mapCoord * MapManager.tetrisMapSize + MapManager.tetrisMapCoord;
Room room = MapManager.currentTetrimino.rooms[i];
MapManager.currentTetrimino.transform.position = MapManager.currentTetrimino.mapCoord * MapManager.tetrisMapSize + MapManager.tetrisMapCoord;
room.stage = MapManager.currentStage;
room.roomConcept = tetriminoConcept;
mapManager.SetRoomSprite(room, i);
}
mapManager.UpdateMap(mapManager.currentTetrimino);
mapManager.CreateRoom(mapManager.currentTetrimino);
mapManager.UpdateMap(MapManager.currentTetrimino);
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)MapManager.RoomSpriteType.Current];
MapManager.tempRoom = MapManager.currentRoom;
......@@ -113,13 +113,13 @@ public class TetriminoSpawner : MonoBehaviour {
/// <param name="te">Which tetrimino to make ghost</param>
public void MakeGhost(Tetrimino te, int ghostType)
{
mapManager.currentGhost = Instantiate(ghosts[ghostType], te.transform.position, Quaternion.identity);
mapManager.currentGhost.mapCoord = te.mapCoord;
MapManager.currentGhost = Instantiate(ghosts[ghostType], te.transform.position, Quaternion.identity);
MapManager.currentGhost.mapCoord = te.mapCoord;
for(int i = 0; i < te.rooms.Length; i++)
{
mapManager.currentGhost.rooms[i].mapCoord = te.rooms[i].mapCoord;
mapManager.currentGhost.rooms[i].GetComponent<SpriteRenderer>().sprite = mapManager.currentTetrimino.rooms[i].GetComponent<SpriteRenderer>().sprite;
mapManager.currentGhost.rooms[i].GetComponent<SpriteRenderer>().color = new Color(1, 1, 1, 0.5f);
MapManager.currentGhost.rooms[i].mapCoord = te.rooms[i].mapCoord;
MapManager.currentGhost.rooms[i].GetComponent<SpriteRenderer>().sprite = MapManager.currentTetrimino.rooms[i].GetComponent<SpriteRenderer>().sprite;
MapManager.currentGhost.rooms[i].GetComponent<SpriteRenderer>().color = new Color(1, 1, 1, 0.5f);
}
}
/// <summary>
......
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