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
9d93cfd6
Commit
9d93cfd6
authored
Jan 12, 2019
by
18손재민
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
오류난거 수정함
parent
5c170031
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
TetrisMap.prefab
Assets/Prefabs/TetrisMap/TetrisMap.prefab
+1
-1
CameraController.cs
Assets/Scripts/CameraController.cs
+1
-1
MapManager.cs
Assets/Scripts/TetrisMap/MapManager.cs
+1
-1
No files found.
Assets/Prefabs/TetrisMap/TetrisMap.prefab
View file @
9d93cfd6
...
@@ -74,7 +74,7 @@ SpriteRenderer:
...
@@ -74,7 +74,7 @@ SpriteRenderer:
m_LightmapParameters
:
{
fileID
:
0
}
m_LightmapParameters
:
{
fileID
:
0
}
m_SortingLayerID
:
0
m_SortingLayerID
:
0
m_SortingLayer
:
0
m_SortingLayer
:
0
m_SortingOrder
:
-
1
m_SortingOrder
:
-
2
m_Sprite
:
{
fileID
:
21300000
,
guid
:
b24577721d6695a42ad348deb62c5b55
,
type
:
3
}
m_Sprite
:
{
fileID
:
21300000
,
guid
:
b24577721d6695a42ad348deb62c5b55
,
type
:
3
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_FlipX
:
0
m_FlipX
:
0
...
...
Assets/Scripts/CameraController.cs
View file @
9d93cfd6
...
@@ -89,7 +89,7 @@ public class CameraController : MonoBehaviour {
...
@@ -89,7 +89,7 @@ public class CameraController : MonoBehaviour {
pos.z = -1;
pos.z = -1;
transform.position = pos;*/
transform.position = pos;*/
if
(
GameManager
.
gameState
==
GameManager
.
GameState
.
Ingame
&&
sceneChanger
!=
null
)
if
(
GameManager
.
gameState
==
GameManager
.
GameState
.
Ingame
&&
isSceneChanging
!=
true
)
{
{
if
(
MapManager
.
isRoomFalling
!=
true
)
if
(
MapManager
.
isRoomFalling
!=
true
)
{
{
...
...
Assets/Scripts/TetrisMap/MapManager.cs
View file @
9d93cfd6
...
@@ -801,7 +801,7 @@ public class MapManager : MonoBehaviour {
...
@@ -801,7 +801,7 @@ public class MapManager : MonoBehaviour {
room
.
GetComponent
<
SpriteRenderer
>().
color
=
new
Color
(
1
,
1
,
1
,
alpha
);
room
.
GetComponent
<
SpriteRenderer
>().
color
=
new
Color
(
1
,
1
,
1
,
alpha
);
room
.
leftTetrisDoor
.
GetComponent
<
SpriteRenderer
>().
color
=
new
Color
(
1
,
1
,
1
,
alpha
);
room
.
leftTetrisDoor
.
GetComponent
<
SpriteRenderer
>().
color
=
new
Color
(
1
,
1
,
1
,
alpha
);
room
.
rightTetrisDoor
.
GetComponent
<
SpriteRenderer
>().
color
=
new
Color
(
1
,
1
,
1
,
alpha
);
room
.
rightTetrisDoor
.
GetComponent
<
SpriteRenderer
>().
color
=
new
Color
(
1
,
1
,
1
,
alpha
);
if
(
room
.
isRoomCleared
==
false
&&
alpha
<
clearedFogAlpha
)
if
(
!(
room
.
isRoomCleared
==
true
&&
alpha
>=
clearedFogAlpha
)
)
room
.
fog
.
GetComponent
<
SpriteRenderer
>().
color
=
new
Color
(
1
,
1
,
1
,
alpha
);
room
.
fog
.
GetComponent
<
SpriteRenderer
>().
color
=
new
Color
(
1
,
1
,
1
,
alpha
);
yield
return
null
;
yield
return
null
;
}
}
...
...
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