Commit 12fc1bd9 authored by 18신대성's avatar 18신대성

머지 한 후 오류 수정했습니다. 죄송합니다

parent 94301cf4
......@@ -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;
......
......@@ -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));
......
......@@ -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)
......
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