Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
tetra-tower
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Oenos
tetra-tower
Commits
00b03568
Commit
00b03568
authored
Feb 26, 2019
by
18손재민
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
미니맵 및 UI 위치 및 크기 수정함, 방 일부 수정함
parent
cb8d562e
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
26 additions
and
24 deletions
+26
-24
ropejungle_lower.png.meta
...s/Images/Tiles/Forest Ruin/Rope/ropejungle_lower.png.meta
+2
-2
ropejungle_one.png.meta
Assets/Images/Tiles/Forest Ruin/Rope/ropejungle_one.png.meta
+2
-2
ropeice_lower.png.meta
Assets/Images/Tiles/Ice Temple/Rope/ropeice_lower.png.meta
+2
-2
ropeice_one.png.meta
Assets/Images/Tiles/Ice Temple/Rope/ropeice_one.png.meta
+2
-2
LifeStoneManager.prefab
Assets/Prefabs/LifeStoneManager.prefab
+2
-2
MapManager.prefab
Assets/Prefabs/MapManager.prefab
+2
-0
Room 1.prefab
Assets/Prefabs/Rooms/NormalRoom/Room 1.prefab
+1
-1
Room 12.prefab
Assets/Prefabs/Rooms/NormalRoom/Room 12.prefab
+1
-1
Room 13.prefab
Assets/Prefabs/Rooms/NormalRoom/Room 13.prefab
+1
-1
Room 14.prefab
Assets/Prefabs/Rooms/NormalRoom/Room 14.prefab
+1
-1
Room 9.prefab
Assets/Prefabs/Rooms/NormalRoom/Room 9.prefab
+1
-1
DisplayText.prefab
Assets/Prefabs/UI/DisplayText.prefab
+1
-1
LeftRoom.prefab
Assets/Prefabs/UI/LeftRoom.prefab
+1
-1
Price.prefab
Assets/Prefabs/UI/Price.prefab
+1
-1
MapManager.cs
Assets/Scripts/TetrisMap/MapManager.cs
+3
-3
TagManager.asset
ProjectSettings/TagManager.asset
+3
-3
No files found.
Assets/Images/Tiles/Forest Ruin/Rope/ropejungle_lower.png.meta
View file @
00b03568
...
...
@@ -86,8 +86,8 @@ TextureImporter:
outline: []
physicsShape:
- - {x: -6, y: 32}
- {x: -6, y: -
2
6}
- {x: 6, y: -
23
}
- {x: -6, y: -6}
- {x: 6, y: -
6
}
- {x: 6, y: 32}
bones: []
spriteID: 23ccad02a0a011a4f9bd0f23dd95cb0e
...
...
Assets/Images/Tiles/Forest Ruin/Rope/ropejungle_one.png.meta
View file @
00b03568
...
...
@@ -87,8 +87,8 @@ TextureImporter:
physicsShape:
- - {x: 6, y: 32}
- {x: -6, y: 32}
- {x: -6, y: -
2
6}
- {x: 6, y: -
22
}
- {x: -6, y: -6}
- {x: 6, y: -
6
}
bones: []
spriteID: f157af5bff22f7f45a3c694eb7f90c0c
vertices: []
...
...
Assets/Images/Tiles/Ice Temple/Rope/ropeice_lower.png.meta
View file @
00b03568
...
...
@@ -86,8 +86,8 @@ TextureImporter:
outline: []
physicsShape:
- - {x: -6, y: 32}
- {x: -6, y: -
25
}
- {x: 6, y: -
19
}
- {x: -6, y: -
6
}
- {x: 6, y: -
6
}
- {x: 6, y: 32}
bones: []
spriteID: 0fe6201c1ed070b42ae8058485f39eb2
...
...
Assets/Images/Tiles/Ice Temple/Rope/ropeice_one.png.meta
View file @
00b03568
...
...
@@ -86,8 +86,8 @@ TextureImporter:
outline: []
physicsShape:
- - {x: -6, y: 32}
- {x: -6, y: -
25
}
- {x: 6, y: -
19
}
- {x: -6, y: -
6
}
- {x: 6, y: -
6
}
- {x: 6, y: 32}
bones: []
spriteID: f44bc2c99539ea6488c6b37b1ebe6bb7
...
...
Assets/Prefabs/LifeStoneManager.prefab
View file @
00b03568
...
...
@@ -34,7 +34,7 @@ Transform:
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1420923890547556
}
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_Children
:
[]
m_Father
:
{
fileID
:
0
}
...
...
@@ -51,7 +51,7 @@ MonoBehaviour:
m_Script
:
{
fileID
:
11500000
,
guid
:
7fe540ec78947fc449eabc76bd87823d
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
lifeStoneLocation
:
{
x
:
7
,
y
:
7
}
lifeStoneLocation
:
{
x
:
30
,
y
:
30
}
standardImage
:
{
fileID
:
1001509239983906
,
guid
:
a48de94a6ab80f746aec69a02812f1e3
,
type
:
2
}
lifeStoneRowNum
:
6
...
...
Assets/Prefabs/MapManager.prefab
View file @
00b03568
...
...
@@ -328,6 +328,8 @@ MonoBehaviour:
-
{
fileID
:
11400000
,
guid
:
3f98057d9994a2e4a8d0ec5440a90958
,
type
:
2
}
-
{
fileID
:
11400000
,
guid
:
91a64287c95a30148b2006752ae54704
,
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
:
2a9d0781b46cfec49897a6d10aa54f5c
,
type
:
2
}
-
{
fileID
:
11400000
,
guid
:
1d307637a0d7a59428cd700ec237af23
,
type
:
2
}
...
...
Assets/Prefabs/Rooms/NormalRoom/Room 1.prefab
View file @
00b03568
...
...
@@ -930,7 +930,7 @@ MonoBehaviour:
roomSize
:
{
x
:
24
,
y
:
24
}
leftDoorInfo
:
010001
rightDoorInfo
:
010100
concept
:
010
1
0001
concept
:
010
0
0001
---
!u!114
&114924180447888386
MonoBehaviour
:
m_ObjectHideFlags
:
1
...
...
Assets/Prefabs/Rooms/NormalRoom/Room 12.prefab
View file @
00b03568
...
...
@@ -854,7 +854,7 @@ MonoBehaviour:
roomSize
:
{
x
:
24
,
y
:
24
}
leftDoorInfo
:
010101
rightDoorInfo
:
010101
concept
:
0
1
010001
concept
:
0
0
010001
---
!u!114
&114650033964154756
MonoBehaviour
:
m_ObjectHideFlags
:
1
...
...
Assets/Prefabs/Rooms/NormalRoom/Room 13.prefab
View file @
00b03568
...
...
@@ -869,7 +869,7 @@ MonoBehaviour:
roomSize
:
{
x
:
24
,
y
:
24
}
leftDoorInfo
:
010001
rightDoorInfo
:
010101
concept
:
0
10101
01
concept
:
0
00100
01
---
!u!212
&212707924519819326
SpriteRenderer
:
m_ObjectHideFlags
:
1
...
...
Assets/Prefabs/Rooms/NormalRoom/Room 14.prefab
View file @
00b03568
...
...
@@ -831,7 +831,7 @@ MonoBehaviour:
roomSize
:
{
x
:
24
,
y
:
24
}
leftDoorInfo
:
010101
rightDoorInfo
:
010001
concept
:
010
1
0001
concept
:
010
0
0001
---
!u!212
&212090793936808880
SpriteRenderer
:
m_ObjectHideFlags
:
1
...
...
Assets/Prefabs/Rooms/NormalRoom/Room 9.prefab
View file @
00b03568
...
...
@@ -815,7 +815,7 @@ MonoBehaviour:
roomSize
:
{
x
:
24
,
y
:
24
}
leftDoorInfo
:
010001
rightDoorInfo
:
010001
concept
:
0
1
010001
concept
:
0
0
010001
---
!u!212
&212628425562944954
SpriteRenderer
:
m_ObjectHideFlags
:
1
...
...
Assets/Prefabs/UI/DisplayText.prefab
View file @
00b03568
...
...
@@ -48,7 +48,7 @@ MonoBehaviour:
m_TypeName
:
UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData
:
m_Font
:
{
fileID
:
1
0102
,
guid
:
0000000000000000e000000000000000
,
type
:
0
}
m_Font
:
{
fileID
:
1
2800000
,
guid
:
81778bb508bfec649a5df19c4d050170
,
type
:
3
}
m_FontSize
:
1
m_FontStyle
:
0
m_BestFit
:
0
...
...
Assets/Prefabs/UI/LeftRoom.prefab
View file @
00b03568
...
...
@@ -48,7 +48,7 @@ MonoBehaviour:
m_TypeName
:
UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData
:
m_Font
:
{
fileID
:
1
0102
,
guid
:
0000000000000000e000000000000000
,
type
:
0
}
m_Font
:
{
fileID
:
1
2800000
,
guid
:
81778bb508bfec649a5df19c4d050170
,
type
:
3
}
m_FontSize
:
30
m_FontStyle
:
0
m_BestFit
:
0
...
...
Assets/Prefabs/UI/Price.prefab
View file @
00b03568
...
...
@@ -48,7 +48,7 @@ MonoBehaviour:
m_TypeName
:
UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData
:
m_Font
:
{
fileID
:
1
0102
,
guid
:
0000000000000000e000000000000000
,
type
:
0
}
m_Font
:
{
fileID
:
1
2800000
,
guid
:
81778bb508bfec649a5df19c4d050170
,
type
:
3
}
m_FontSize
:
1
m_FontStyle
:
0
m_BestFit
:
0
...
...
Assets/Scripts/TetrisMap/MapManager.cs
View file @
00b03568
...
...
@@ -703,8 +703,6 @@ public class MapManager : Singleton<MapManager> {
isTetriminoFalling
=
true
;
TetriminoMapCoordDown
(
currentTetrimino
);
}
if
(
GameManager
.
gameState
==
GameState
.
Tetris
)
{
if
(
Input
.
GetButtonDown
(
"TetriminoVertical"
))
{
TetriminoRotate
(
currentTetrimino
,
(
int
)
Input
.
GetAxisRaw
(
"TetriminoVertical"
));
...
...
@@ -713,7 +711,9 @@ public class MapManager : Singleton<MapManager> {
{
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
;
TetriminoMapCoordDown
(
currentTetrimino
);
...
...
ProjectSettings/TagManager.asset
View file @
00b03568
...
...
@@ -54,6 +54,9 @@ TagManager:
-
name
:
Background
uniqueID
:
2317547663
locked
:
0
-
name
:
Spike
uniqueID
:
3612720217
locked
:
0
-
name
:
Wall
uniqueID
:
3278214247
locked
:
0
...
...
@@ -69,9 +72,6 @@ TagManager:
-
name
:
Player
uniqueID
:
2216026111
locked
:
0
-
name
:
Spike
uniqueID
:
3612720217
locked
:
0
-
name
:
Door
uniqueID
:
343148499
locked
:
0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment