시즌 7호 머지

js/Client.js

@@ -29,7 +29,8 @@ socket.on('changePhase', function(msg) // number Phase
     WordSpace.CurrentPhase = msg;
 });
 
-socket.on('userDisconnect', function(msg) // {num id, str nickname}
+socket.on('userDisconnect', function(msg) // {num index , num id, str nickname}
 {
-    console.log(msg.id + ' / ' + msg.nickname + ' disconnected');
+    console.log(msg.index + ' / ' + msg.id + ' / ' + msg.nickname + ' disconnected');
+    RoomData.players[msg.index].isAlive = false;
 });
\ No newline at end of file

server.js

@@ -69,19 +69,10 @@ io.on('connection', function(socket)
             // 룸에서도 제거
             if (socket.playerData.currentRoom != null)
             {
-                GameServer.announceToRoom(GameServer.findRoomIndex(socket.playerData.currentRoom.roomNum), 'userDisconnect', 
-                {
-                    id: socket.playerData.id,
-                    nickname: socket.playerData.nickname
-                });
-                let _idxToDel = socket.playerData.currentRoom.currentPlayer.findIndex(function(element)
-                {
-                    return element.id === socket.playerData.id;
-                });
-                if (idxToDel != -1)
-                {
-                    socket.playerData.currentRoom.currentPlayer.splice(_idxToDel, 1);
-                }
+                socket.playerData.playingData.isAlive = false;
+                socket.playerData.playingData.rank = socket.playerData.currentRoom.nextRank--;
+                socket.playerData.currentRoom.currentSocket.splice(socket.playerData.playingData.index, 1);
+                GameServer.announceToRoom(GameServer.findRoomIndex(socket.playerData.currentRoom.roomNum), 'userDisconnect', socket.playerData.playingData);
             }
         }
     });