Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sejong25
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
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Tear of Sejong
sejong25
Commits
12fc1bd9
Commit
12fc1bd9
authored
Jul 17, 2019
by
18신대성
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
머지 한 후 오류 수정했습니다. 죄송합니다
parent
94301cf4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
GameServer.js
GameServer.js
+1
-1
ScenesData.js
js/ScenesData.js
+1
-1
server.js
server.js
+1
-1
No files found.
GameServer.js
View file @
12fc1bd9
...
...
@@ -112,7 +112,7 @@ GameServer.enterEmptyRoom = function(playerData)
var
toEnter
=
-
1
;
for
(
let
i
=
0
;
i
<
this
.
playingRoom
.
length
;
i
++
)
{
if
(
this
.
playingRoom
[
i
].
currentPlayer
.
length
<
this
.
playingRoom
[
i
].
maxPlayer
&&
this
.
playingRoom
[
i
].
currentPhase
==
this
.
Phase
.
READY
)
if
(
this
.
playingRoom
[
i
].
currentPlayer
.
length
<
this
.
playingRoom
[
i
].
maxPlayer
&&
(
this
.
playingRoom
[
i
].
currentPhase
==
this
.
Phase
.
READY
||
this
.
playingRoom
[
i
].
currentPhase
==
this
.
Phase
.
COUNT
)
)
{
toEnter
=
i
;
break
;
...
...
js/ScenesData.js
View file @
12fc1bd9
...
...
@@ -55,7 +55,7 @@ var roomScene = new Phaser.Class(
update
:
function
()
{
this
.
peopleText
.
setText
(
peopleCount
+
'
/ 10
'
);
this
.
peopleText
.
setText
(
this
.
peopleCount
+
'
/ 10
'
);
if
(
this
.
isCounting
)
{
this
.
countText
.
setText
(((
this
.
endTime
-
Date
.
now
())
/
1000
).
toFixed
(
1
));
...
...
server.js
View file @
12fc1bd9
...
...
@@ -144,7 +144,7 @@ io.on('connection', function(socket)
if
(
data
.
currentRoom
.
aliveCount
<
GameServer
.
startCount
)
{
GameServer
.
announceToRoom
(
GameServer
.
findRoomIndex
(
data
.
currentRoom
.
roomNum
),
'
setCount
'
,
{
isEnable
:
false
,
endTime
:
0
});
room
.
currentPhase
=
this
.
Phase
.
READY
;
data
.
currentRoom
.
currentPhase
=
GameServer
.
Phase
.
READY
;
}
}
else
if
(
data
.
playingData
.
isAlive
)
...
...
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