Skip to content

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

플레이어가 윗 방 올라갈때 일어나는 버그 고침 이제 없음

parent 8463c204
Hide whitespace changes
Inline Side-by-side
Showing with 270 additions and 11 deletions
Assets/Animation/Door/Down/DoorInGameDownOpen.anim
View file @ 0f0c42e1
...@@ -28,6 +28,15 @@ AnimationClip: ...@@ -28,6 +28,15 @@ AnimationClip:
weightedMode: 0 weightedMode: 0
inWeight: 0 inWeight: 0
outWeight: 0 outWeight: 0
- serializedVersion: 3
time: 0.48333332
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
...@@ -35,6 +44,71 @@ AnimationClip: ...@@ -35,6 +44,71 @@ AnimationClip:
path: path:
classID: 60 classID: 60
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.48333332
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.x
path:
classID: 60
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.48333332
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: -0.08
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path:
classID: 60
script: {fileID: 0}
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 0 - time: 0
...@@ -47,6 +121,8 @@ AnimationClip: ...@@ -47,6 +121,8 @@ AnimationClip:
value: {fileID: 21300000, guid: 935285ddea962df41be32175f0fe0ba3, type: 3} value: {fileID: 21300000, guid: 935285ddea962df41be32175f0fe0ba3, type: 3}
- time: 0.4 - time: 0.4
value: {fileID: 21300000, guid: a37f351d87ba66f47a4b0e9d85e740d8, type: 3} value: {fileID: 21300000, guid: a37f351d87ba66f47a4b0e9d85e740d8, type: 3}
- time: 0.48333332
value: {fileID: 21300000, guid: a37f351d87ba66f47a4b0e9d85e740d8, type: 3}
- time: 0.5 - time: 0.5
value: {fileID: 21300000, guid: a8235f24ca822f24b912091055050393, type: 3} value: {fileID: 21300000, guid: a8235f24ca822f24b912091055050393, type: 3}
attribute: m_Sprite attribute: m_Sprite
...@@ -67,6 +143,13 @@ AnimationClip: ...@@ -67,6 +143,13 @@ AnimationClip:
typeID: 60 typeID: 60
customType: 0 customType: 0
isPPtrCurve: 0 isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 1872933342
script: {fileID: 0}
typeID: 60
customType: 0
isPPtrCurve: 0
- serializedVersion: 2 - serializedVersion: 2
path: 0 path: 0
attribute: 0 attribute: 0
...@@ -74,12 +157,20 @@ AnimationClip: ...@@ -74,12 +157,20 @@ AnimationClip:
typeID: 212 typeID: 212
customType: 23 customType: 23
isPPtrCurve: 1 isPPtrCurve: 1
- serializedVersion: 2
path: 0
attribute: 413499720
script: {fileID: 0}
typeID: 60
customType: 0
isPPtrCurve: 0
pptrCurveMapping: pptrCurveMapping:
- {fileID: 21300000, guid: 4bf37e6344e74cd498f32e9340517a02, type: 3} - {fileID: 21300000, guid: 4bf37e6344e74cd498f32e9340517a02, type: 3}
- {fileID: 21300000, guid: 59ea7e1f4821333459b19a88e8082c4c, type: 3} - {fileID: 21300000, guid: 59ea7e1f4821333459b19a88e8082c4c, type: 3}
- {fileID: 21300000, guid: 0b50e1890646c6142a1a224442c0d3d4, type: 3} - {fileID: 21300000, guid: 0b50e1890646c6142a1a224442c0d3d4, type: 3}
- {fileID: 21300000, guid: 935285ddea962df41be32175f0fe0ba3, type: 3} - {fileID: 21300000, guid: 935285ddea962df41be32175f0fe0ba3, type: 3}
- {fileID: 21300000, guid: a37f351d87ba66f47a4b0e9d85e740d8, type: 3} - {fileID: 21300000, guid: a37f351d87ba66f47a4b0e9d85e740d8, type: 3}
- {fileID: 21300000, guid: a37f351d87ba66f47a4b0e9d85e740d8, type: 3}
- {fileID: 21300000, guid: a8235f24ca822f24b912091055050393, type: 3} - {fileID: 21300000, guid: a8235f24ca822f24b912091055050393, type: 3}
m_AnimationClipSettings: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
...@@ -114,6 +205,15 @@ AnimationClip: ...@@ -114,6 +205,15 @@ AnimationClip:
weightedMode: 0 weightedMode: 0
inWeight: 0 inWeight: 0
outWeight: 0 outWeight: 0
- serializedVersion: 3
time: 0.48333332
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
...@@ -121,6 +221,71 @@ AnimationClip: ...@@ -121,6 +221,71 @@ AnimationClip:
path: path:
classID: 60 classID: 60
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.48333332
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.x
path:
classID: 60
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.48333332
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: -0.08
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path:
classID: 60
script: {fileID: 0}
m_EulerEditorCurves: [] m_EulerEditorCurves: []
m_HasGenericRootTransform: 0 m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0 m_HasMotionFloatCurves: 0
......
Assets/Animation/Door/Down/DoorInGameDownOpened.anim
View file @ 0f0c42e1
...@@ -54,6 +54,44 @@ AnimationClip: ...@@ -54,6 +54,44 @@ AnimationClip:
path: path:
classID: 60 classID: 60
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.x
path:
classID: 60
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path:
classID: 60
script: {fileID: 0}
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 0 - time: 0
...@@ -90,6 +128,20 @@ AnimationClip: ...@@ -90,6 +128,20 @@ AnimationClip:
typeID: 212 typeID: 212
customType: 23 customType: 23
isPPtrCurve: 1 isPPtrCurve: 1
- serializedVersion: 2
path: 0
attribute: 413499720
script: {fileID: 0}
typeID: 60
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 1872933342
script: {fileID: 0}
typeID: 60
customType: 0
isPPtrCurve: 0
pptrCurveMapping: pptrCurveMapping:
- {fileID: 21300000, guid: a8235f24ca822f24b912091055050393, type: 3} - {fileID: 21300000, guid: a8235f24ca822f24b912091055050393, type: 3}
m_AnimationClipSettings: m_AnimationClipSettings:
...@@ -151,6 +203,44 @@ AnimationClip: ...@@ -151,6 +203,44 @@ AnimationClip:
path: path:
classID: 60 classID: 60
script: {fileID: 0} script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.x
path:
classID: 60
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path:
classID: 60
script: {fileID: 0}
m_EulerEditorCurves: [] m_EulerEditorCurves: []
m_HasGenericRootTransform: 0 m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0 m_HasMotionFloatCurves: 0
......
Assets/Prefabs/Rooms/InGameDoor/DoorInGameDown.prefab
View file @ 0f0c42e1
...@@ -67,14 +67,14 @@ PolygonCollider2D: ...@@ -67,14 +67,14 @@ PolygonCollider2D:
m_AutoTiling: 0 m_AutoTiling: 0
m_Points: m_Points:
m_Paths: m_Paths:
- - {x: 0, y: -0.1} - - {x: 0, y: 0}
- {x: 0, y: 0.4} - {x: 0, y: 0.5}
- {x: 0.5, y: 0.4} - {x: 0.5, y: 0.5}
- {x: 0.5, y: 0.15} - {x: 0.5, y: 0.25}
- {x: 1.5, y: 0.15} - {x: 1.5, y: 0.25}
- {x: 1.5, y: 0.4} - {x: 1.5, y: 0.5}
- {x: 2, y: 0.4} - {x: 2, y: 0.5}
- {x: 2, y: -0.1} - {x: 2, y: 0}
--- !u!95 &95049867913064836 --- !u!95 &95049867913064836
Animator: Animator:
serializedVersion: 3 serializedVersion: 3
......
Assets/Scripts/Characters/Player.cs
View file @ 0f0c42e1
...@@ -28,14 +28,14 @@ public class Player : MonoBehaviour { ...@@ -28,14 +28,14 @@ public class Player : MonoBehaviour {
void Start () { void Start () {
displayText = Instantiate(displayText, GameManager.Instance.textCanvas.transform); displayText = Instantiate(displayText, GameManager.Instance.textCanvas.transform);
ttx = (int)(transform.position.x / 24f); ttx = (int)(transform.position.x / 24f);
tty = (int)(transform.position.y-0.9f / 24f); tty = (int)(transform.position.y - 0.8f / 24f);
lifeStoneManager = LifeStoneManager.Instance; lifeStoneManager = LifeStoneManager.Instance;
} }
// Update is called once per frame // Update is called once per frame
void Update () { void Update () {
tx = (int)(transform.position.x / 24f); tx = (int)(transform.position.x / 24f);
ty = (int)((transform.position.y-0.9f) / 24f); ty = (int)((transform.position.y - 0.8f) / 24f);
if ((ttx != tx || tty != ty) && MapManager.isRoomFalling != true) if ((ttx != tx || tty != ty) && MapManager.isRoomFalling != true)
{ {
MapManager.tempRoom = MapManager.mapGrid[tx, ty]; MapManager.tempRoom = MapManager.mapGrid[tx, ty];
...@@ -53,6 +53,7 @@ public class Player : MonoBehaviour { ...@@ -53,6 +53,7 @@ public class Player : MonoBehaviour {
} }
else if (ty > tty) else if (ty > tty)
{ {
transform.position += new Vector3(0, 0.5f, 0);
MapManager.currentRoom.CloseDoor("Up", true); MapManager.currentRoom.CloseDoor("Up", true);
} }
} }
......
Assets/Scripts/TetrisMap/Door.cs
View file @ 0f0c42e1
...@@ -35,7 +35,7 @@ public class Door : MonoBehaviour { ...@@ -35,7 +35,7 @@ public class Door : MonoBehaviour {
enteredPosition = 2; enteredPosition = 2;
break; break;
case 1: case 1:
if (collision.transform.position.x < GetComponent<PolygonCollider2D>().transform.position.x + 0.6f) if (collision.transform.position.x < GetComponent<PolygonCollider2D>().transform.position.x)
return; return;
enteredPosition = 3; enteredPosition = 3;
break; break;
......
Assets/Scripts/TetrisMap/Room.cs
View file @ 0f0c42e1
...@@ -364,6 +364,9 @@ public class Room : MonoBehaviour ...@@ -364,6 +364,9 @@ public class Room : MonoBehaviour
} }
} }
} }
/// <summary> /// <summary>
/// Clear the cleared room. /// Clear the cleared room.
/// Open all the doors and change fog to cleared fog. /// Open all the doors and change fog to cleared fog.
......
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