Commit 13860f74 authored by 18신대성's avatar 18신대성 Committed by 18류지석

시즌 8호 머지

parent 01a8a5a3
var GameServer = GameServer || {}; var GameServer = GameServer || {};
GameServer.Phase = {READY: 0, START: 1, MAIN: 2, MUSIC: 3}; GameServer.Phase = {READY: 0, START: 1, MAIN: 2, MUSIC: 3};
GameServer.startCount = 3; GameServer.startCount = 4;
GameServer.currentPlayer = []; GameServer.currentPlayer = [];
GameServer.playingRoom = []; GameServer.playingRoom = [];
...@@ -117,8 +117,8 @@ GameServer.announceToTarget = function(roomIdx, targetNum, _message, _data = nul ...@@ -117,8 +117,8 @@ GameServer.announceToTarget = function(roomIdx, targetNum, _message, _data = nul
let targetSocket = this.playingRoom[roomIdx].currentSocket.find(function(element) let targetSocket = this.playingRoom[roomIdx].currentSocket.find(function(element)
{ {
return element.id === targetNum; return element.id === targetNum;
}).socketId; });
if (targetSocket != 'undefined') targetSocket.emit(_message, _data); if (targetSocket != undefined) targetSocket.socketId.emit(_message, _data);
} }
// 데이터 동기화 함수 만들기 // 데이터 동기화 함수 만들기
// 동기화할것: 유저리스트(id - nickname 쌍) // 동기화할것: 유저리스트(id - nickname 쌍)
......
...@@ -426,7 +426,8 @@ WordSpace.nameQueue = ...@@ -426,7 +426,8 @@ WordSpace.nameQueue =
tempQueue[tempIdx] = tempElement; tempQueue[tempIdx] = tempElement;
} }
tempQueue.forEach(function(element){ tempQueue.forEach(function(element){
if(element.ownerId != PlayerData.idNum && element.isAlive) //console.log(element.id + ' ' + PlayerData.idNum);
if(element.id != PlayerData.idNum && element.isAlive)
WordSpace.nameQueue.queue.push(element); WordSpace.nameQueue.queue.push(element);
}); });
}, },
......
...@@ -5,7 +5,7 @@ var config = { ...@@ -5,7 +5,7 @@ var config = {
physics: { physics: {
default: 'arcade', default: 'arcade',
arcade: { arcade: {
debug: true debug: false
} }
}, },
backgroundColor: Phaser.Display.Color.HexStringToColor('#F0CB85').color,//GetColor(245,208,138), backgroundColor: Phaser.Display.Color.HexStringToColor('#F0CB85').color,//GetColor(245,208,138),
......
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