Commit d51c3d3c authored by 18신대성's avatar 18신대성 Committed by 18손재민

게임 끝나고도 두번째룸 입장'은' 됨

parent 15a3a82b
...@@ -35,7 +35,9 @@ GameServer.enterEmptyRoom = function(playerSocket) ...@@ -35,7 +35,9 @@ GameServer.enterEmptyRoom = function(playerSocket)
let emptyRoomIndex = -1; let emptyRoomIndex = -1;
for (let i = 0; i < this.playingRoom.length; i++) for (let i = 0; i < this.playingRoom.length; i++)
{ {
if ((this.playingRoom[i].currentPhase === this.Phase.READY || this.playingRoom[i].currentPhase === this.Phase.COUNT) && this.playingRoom[i].maxPlayer > this.playingRoom[i].currentPlayer.length) if ((this.playingRoom[i].currentPhase === this.Phase.READY || this.playingRoom[i].currentPhase === this.Phase.COUNT)
&& this.playingRoom[i].maxPlayer > this.playingRoom[i].currentPlayer.length
&& this.playingRoom[i].checkHopae(playerSocket.playerData.nickname))
{ {
emptyRoomIndex = i; emptyRoomIndex = i;
break; break;
...@@ -116,6 +118,11 @@ class GameRoom ...@@ -116,6 +118,11 @@ class GameRoom
console.log('[LOG] new room #'+this.roomId+' made, roomCount: ' + GameServer.playingRoom.length); console.log('[LOG] new room #'+this.roomId+' made, roomCount: ' + GameServer.playingRoom.length);
} }
checkHopae(newHopae)
{
return !this.currentPlayer.includes((element) => element.nickname === newHopae);
}
enterRoom(playerSocket) enterRoom(playerSocket)
{ {
let playerInst = new Player(this, playerSocket.playerData); let playerInst = new Player(this, playerSocket.playerData);
......
...@@ -47,20 +47,11 @@ io.on('connection', function(socket) ...@@ -47,20 +47,11 @@ io.on('connection', function(socket)
{ {
if(msg.length < 1) socket.emit('alert' ,'errNicknameEmpty'); if(msg.length < 1) socket.emit('alert' ,'errNicknameEmpty');
else else
{
let isAlreadyHave = false;
GameServer.currentPlayer.forEach(function(element)
{
if (element.playerData.nickname === msg) isAlreadyHave = true;
});
if (isAlreadyHave) socket.emit('alert' ,'errNicknameOverlaped');
else
{ {
socket.playerData.nickname = msg; socket.playerData.nickname = msg;
console.log('['+socket.playerData.id+'] nickname set to ' + msg); console.log('['+socket.playerData.id+'] nickname set to ' + msg);
GameServer.enterEmptyRoom(socket); GameServer.enterEmptyRoom(socket);
} }
}
}); });
socket.on('setPlayerTyping', function(msg) // number playerTyping socket.on('setPlayerTyping', function(msg) // number playerTyping
......
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