Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
man-in-the-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
4
Issues
4
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MIM
man-in-the-mirror
Commits
5cbb69b2
Commit
5cbb69b2
authored
Aug 09, 2019
by
18신대성
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
not clear -> clear -> not clear로 스쳐갈때 클리어되어버리는 문제 해결
parent
ce6000fc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
13 deletions
+17
-13
GameManager.cs
Assets/Scripts/Managers/GameManager.cs
+16
-12
ClearCondition.cs
Assets/Scripts/Map/ClearCondition.cs
+1
-1
No files found.
Assets/Scripts/Managers/GameManager.cs
View file @
5cbb69b2
...
@@ -90,18 +90,22 @@ public class GameManager : SingletonBehaviour<GameManager>
...
@@ -90,18 +90,22 @@ public class GameManager : SingletonBehaviour<GameManager>
public
IEnumerator
ClearStage
()
public
IEnumerator
ClearStage
()
{
{
if
(
isPlayerShooting
)
yield
return
StartCoroutine
(
Camera
.
main
.
gameObject
.
GetComponent
<
CameraController
>().
ZoomOutFromPlayer
(
PlayerController
.
inst
.
currentPlayer
));
yield
return
new
WaitForSeconds
(
0.1f
);
yield
return
null
;
if
(
clearCounter
==
0
)
clearUINextText
.
text
=
StageSelector
.
nextStage
.
Replace
(
"_"
,
" - "
);
{
clearUI
.
SetActive
(
true
);
if
(
isPlayerShooting
)
yield
return
StartCoroutine
(
Camera
.
main
.
gameObject
.
GetComponent
<
CameraController
>().
ZoomOutFromPlayer
(
PlayerController
.
inst
.
currentPlayer
));
buttonUIs
.
SetActive
(
false
);
yield
return
null
;
Debug
.
Log
(
"Stage Clear!"
);
clearUINextText
.
text
=
StageSelector
.
nextStage
.
Replace
(
"_"
,
" - "
);
clearUI
.
SetActive
(
true
);
Cursor
.
visible
=
true
;
buttonUIs
.
SetActive
(
false
);
Cursor
.
lockState
=
CursorLockMode
.
None
;
Debug
.
Log
(
"Stage Clear!"
);
isGameOver
=
true
;
Cursor
.
visible
=
true
;
StageSelector
.
inst
.
SaveClearData
(
stageStrIdx
,
true
);
Cursor
.
lockState
=
CursorLockMode
.
None
;
isGameOver
=
true
;
StageSelector
.
inst
.
SaveClearData
(
stageStrIdx
,
true
);
}
}
}
public
void
GameOver
(
bool
onlyRestart
=
false
)
public
void
GameOver
(
bool
onlyRestart
=
false
)
...
...
Assets/Scripts/Map/ClearCondition.cs
View file @
5cbb69b2
...
@@ -28,7 +28,7 @@ public class ClearCondition
...
@@ -28,7 +28,7 @@ public class ClearCondition
{
{
GameManager
.
inst
.
clearCounter
--;
GameManager
.
inst
.
clearCounter
--;
isDone
=
true
;
isDone
=
true
;
//Debug.Log(GameManager.inst.clearCounter)
;
//Debug.Log(GameManager.inst.clearCounter)
if
(
GameManager
.
inst
.
clearCounter
==
0
)
if
(
GameManager
.
inst
.
clearCounter
==
0
)
GameManager
.
inst
.
StartCoroutine
(
GameManager
.
inst
.
ClearStage
());
GameManager
.
inst
.
StartCoroutine
(
GameManager
.
inst
.
ClearStage
());
}
}
...
...
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