Commit 00b03568 authored by 18손재민's avatar 18손재민

미니맵 및 UI 위치 및 크기 수정함, 방 일부 수정함

parent cb8d562e
...@@ -86,8 +86,8 @@ TextureImporter: ...@@ -86,8 +86,8 @@ TextureImporter:
outline: [] outline: []
physicsShape: physicsShape:
- - {x: -6, y: 32} - - {x: -6, y: 32}
- {x: -6, y: -26} - {x: -6, y: -6}
- {x: 6, y: -23} - {x: 6, y: -6}
- {x: 6, y: 32} - {x: 6, y: 32}
bones: [] bones: []
spriteID: 23ccad02a0a011a4f9bd0f23dd95cb0e spriteID: 23ccad02a0a011a4f9bd0f23dd95cb0e
......
...@@ -87,8 +87,8 @@ TextureImporter: ...@@ -87,8 +87,8 @@ TextureImporter:
physicsShape: physicsShape:
- - {x: 6, y: 32} - - {x: 6, y: 32}
- {x: -6, y: 32} - {x: -6, y: 32}
- {x: -6, y: -26} - {x: -6, y: -6}
- {x: 6, y: -22} - {x: 6, y: -6}
bones: [] bones: []
spriteID: f157af5bff22f7f45a3c694eb7f90c0c spriteID: f157af5bff22f7f45a3c694eb7f90c0c
vertices: [] vertices: []
......
...@@ -86,8 +86,8 @@ TextureImporter: ...@@ -86,8 +86,8 @@ TextureImporter:
outline: [] outline: []
physicsShape: physicsShape:
- - {x: -6, y: 32} - - {x: -6, y: 32}
- {x: -6, y: -25} - {x: -6, y: -6}
- {x: 6, y: -19} - {x: 6, y: -6}
- {x: 6, y: 32} - {x: 6, y: 32}
bones: [] bones: []
spriteID: 0fe6201c1ed070b42ae8058485f39eb2 spriteID: 0fe6201c1ed070b42ae8058485f39eb2
......
...@@ -86,8 +86,8 @@ TextureImporter: ...@@ -86,8 +86,8 @@ TextureImporter:
outline: [] outline: []
physicsShape: physicsShape:
- - {x: -6, y: 32} - - {x: -6, y: 32}
- {x: -6, y: -25} - {x: -6, y: -6}
- {x: 6, y: -19} - {x: 6, y: -6}
- {x: 6, y: 32} - {x: 6, y: 32}
bones: [] bones: []
spriteID: f44bc2c99539ea6488c6b37b1ebe6bb7 spriteID: f44bc2c99539ea6488c6b37b1ebe6bb7
......
...@@ -34,7 +34,7 @@ Transform: ...@@ -34,7 +34,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1420923890547556} m_GameObject: {fileID: 1420923890547556}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -6.9766555, y: 2.569394, z: 0.0049343775} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
...@@ -51,7 +51,7 @@ MonoBehaviour: ...@@ -51,7 +51,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7fe540ec78947fc449eabc76bd87823d, type: 3} m_Script: {fileID: 11500000, guid: 7fe540ec78947fc449eabc76bd87823d, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
lifeStoneLocation: {x: 7, y: 7} lifeStoneLocation: {x: 30, y: 30}
standardImage: {fileID: 1001509239983906, guid: a48de94a6ab80f746aec69a02812f1e3, standardImage: {fileID: 1001509239983906, guid: a48de94a6ab80f746aec69a02812f1e3,
type: 2} type: 2}
lifeStoneRowNum: 6 lifeStoneRowNum: 6
......
...@@ -328,6 +328,8 @@ MonoBehaviour: ...@@ -328,6 +328,8 @@ MonoBehaviour:
- {fileID: 11400000, guid: 3f98057d9994a2e4a8d0ec5440a90958, type: 2} - {fileID: 11400000, guid: 3f98057d9994a2e4a8d0ec5440a90958, type: 2}
- {fileID: 11400000, guid: 91a64287c95a30148b2006752ae54704, type: 2} - {fileID: 11400000, guid: 91a64287c95a30148b2006752ae54704, type: 2}
- {fileID: 11400000, guid: 6c9bb38cfe5980245989e834385f7b2c, type: 2} - {fileID: 11400000, guid: 6c9bb38cfe5980245989e834385f7b2c, type: 2}
- {fileID: 11400000, guid: 16924b8ecf8bd1940902343766fc4cdc, type: 2}
- {fileID: 11400000, guid: b556ab3a4d3d2db4b89081d94cca006c, type: 2}
- {fileID: 11400000, guid: 0b73064f0ef6e38499bfa75f0ff87a78, type: 2} - {fileID: 11400000, guid: 0b73064f0ef6e38499bfa75f0ff87a78, type: 2}
- {fileID: 11400000, guid: 2a9d0781b46cfec49897a6d10aa54f5c, type: 2} - {fileID: 11400000, guid: 2a9d0781b46cfec49897a6d10aa54f5c, type: 2}
- {fileID: 11400000, guid: 1d307637a0d7a59428cd700ec237af23, type: 2} - {fileID: 11400000, guid: 1d307637a0d7a59428cd700ec237af23, type: 2}
......
...@@ -930,7 +930,7 @@ MonoBehaviour: ...@@ -930,7 +930,7 @@ MonoBehaviour:
roomSize: {x: 24, y: 24} roomSize: {x: 24, y: 24}
leftDoorInfo: 010001 leftDoorInfo: 010001
rightDoorInfo: 010100 rightDoorInfo: 010100
concept: 01010001 concept: 01000001
--- !u!114 &114924180447888386 --- !u!114 &114924180447888386
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
...@@ -854,7 +854,7 @@ MonoBehaviour: ...@@ -854,7 +854,7 @@ MonoBehaviour:
roomSize: {x: 24, y: 24} roomSize: {x: 24, y: 24}
leftDoorInfo: 010101 leftDoorInfo: 010101
rightDoorInfo: 010101 rightDoorInfo: 010101
concept: 01010001 concept: 00010001
--- !u!114 &114650033964154756 --- !u!114 &114650033964154756
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
...@@ -869,7 +869,7 @@ MonoBehaviour: ...@@ -869,7 +869,7 @@ MonoBehaviour:
roomSize: {x: 24, y: 24} roomSize: {x: 24, y: 24}
leftDoorInfo: 010001 leftDoorInfo: 010001
rightDoorInfo: 010101 rightDoorInfo: 010101
concept: 01010101 concept: 00010001
--- !u!212 &212707924519819326 --- !u!212 &212707924519819326
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
...@@ -831,7 +831,7 @@ MonoBehaviour: ...@@ -831,7 +831,7 @@ MonoBehaviour:
roomSize: {x: 24, y: 24} roomSize: {x: 24, y: 24}
leftDoorInfo: 010101 leftDoorInfo: 010101
rightDoorInfo: 010001 rightDoorInfo: 010001
concept: 01010001 concept: 01000001
--- !u!212 &212090793936808880 --- !u!212 &212090793936808880
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
...@@ -815,7 +815,7 @@ MonoBehaviour: ...@@ -815,7 +815,7 @@ MonoBehaviour:
roomSize: {x: 24, y: 24} roomSize: {x: 24, y: 24}
leftDoorInfo: 010001 leftDoorInfo: 010001
rightDoorInfo: 010001 rightDoorInfo: 010001
concept: 01010001 concept: 00010001
--- !u!212 &212628425562944954 --- !u!212 &212628425562944954
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
...@@ -48,7 +48,7 @@ MonoBehaviour: ...@@ -48,7 +48,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_Font: {fileID: 12800000, guid: 81778bb508bfec649a5df19c4d050170, type: 3}
m_FontSize: 1 m_FontSize: 1
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
......
...@@ -48,7 +48,7 @@ MonoBehaviour: ...@@ -48,7 +48,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_Font: {fileID: 12800000, guid: 81778bb508bfec649a5df19c4d050170, type: 3}
m_FontSize: 30 m_FontSize: 30
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
......
...@@ -48,7 +48,7 @@ MonoBehaviour: ...@@ -48,7 +48,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_Font: {fileID: 12800000, guid: 81778bb508bfec649a5df19c4d050170, type: 3}
m_FontSize: 1 m_FontSize: 1
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
......
...@@ -703,8 +703,6 @@ public class MapManager : Singleton<MapManager> { ...@@ -703,8 +703,6 @@ public class MapManager : Singleton<MapManager> {
isTetriminoFalling = true; isTetriminoFalling = true;
TetriminoMapCoordDown(currentTetrimino); TetriminoMapCoordDown(currentTetrimino);
} }
if(GameManager.gameState == GameState.Tetris)
{
if (Input.GetButtonDown("TetriminoVertical")) if (Input.GetButtonDown("TetriminoVertical"))
{ {
TetriminoRotate(currentTetrimino, (int)Input.GetAxisRaw("TetriminoVertical")); TetriminoRotate(currentTetrimino, (int)Input.GetAxisRaw("TetriminoVertical"));
...@@ -713,7 +711,9 @@ public class MapManager : Singleton<MapManager> { ...@@ -713,7 +711,9 @@ public class MapManager : Singleton<MapManager> {
{ {
MoveTetriminoHorizontal(currentTetrimino, new Vector3((int)Input.GetAxisRaw("TetriminoHorizontal"), 0, 0)); MoveTetriminoHorizontal(currentTetrimino, new Vector3((int)Input.GetAxisRaw("TetriminoHorizontal"), 0, 0));
} }
else if (Input.GetKeyDown(KeyCode.Space) && LifeStoneManager.Instance.CountType(LifeStoneType.Gold) >= tetriminoCost) if(GameManager.gameState == GameState.Tetris)
{
if (Input.GetKeyDown(KeyCode.Space) && LifeStoneManager.Instance.CountType(LifeStoneType.Gold) >= tetriminoCost)
{ {
isTetriminoFalling = true; isTetriminoFalling = true;
TetriminoMapCoordDown(currentTetrimino); TetriminoMapCoordDown(currentTetrimino);
......
...@@ -54,6 +54,9 @@ TagManager: ...@@ -54,6 +54,9 @@ TagManager:
- name: Background - name: Background
uniqueID: 2317547663 uniqueID: 2317547663
locked: 0 locked: 0
- name: Spike
uniqueID: 3612720217
locked: 0
- name: Wall - name: Wall
uniqueID: 3278214247 uniqueID: 3278214247
locked: 0 locked: 0
...@@ -69,9 +72,6 @@ TagManager: ...@@ -69,9 +72,6 @@ TagManager:
- name: Player - name: Player
uniqueID: 2216026111 uniqueID: 2216026111
locked: 0 locked: 0
- name: Spike
uniqueID: 3612720217
locked: 0
- name: Door - name: Door
uniqueID: 343148499 uniqueID: 343148499
locked: 0 locked: 0
......
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