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

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

parent 94301cf4
...@@ -112,7 +112,7 @@ GameServer.enterEmptyRoom = function(playerData) ...@@ -112,7 +112,7 @@ GameServer.enterEmptyRoom = function(playerData)
var toEnter = -1; var toEnter = -1;
for (let i = 0; i < this.playingRoom.length; i++) 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; toEnter = i;
break; break;
......
...@@ -55,7 +55,7 @@ var roomScene = new Phaser.Class( ...@@ -55,7 +55,7 @@ var roomScene = new Phaser.Class(
update: function() update: function()
{ {
this.peopleText.setText(peopleCount + ' / 10'); this.peopleText.setText(this.peopleCount + ' / 10');
if (this.isCounting) if (this.isCounting)
{ {
this.countText.setText(((this.endTime - Date.now()) / 1000).toFixed(1)); this.countText.setText(((this.endTime - Date.now()) / 1000).toFixed(1));
......
...@@ -144,7 +144,7 @@ io.on('connection', function(socket) ...@@ -144,7 +144,7 @@ io.on('connection', function(socket)
if (data.currentRoom.aliveCount < GameServer.startCount) if (data.currentRoom.aliveCount < GameServer.startCount)
{ {
GameServer.announceToRoom(GameServer.findRoomIndex(data.currentRoom.roomNum), 'setCount', {isEnable: false, endTime: 0}); 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) 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