Commit ece8a72e authored by 18손재민's avatar 18손재민

이제 호패가 랜덤하게 생성됨. 호패를 가진 플레이어를 공격 시 공격 단어가 전송 됨

parent 44c46a35
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 = 5;
GameServer.currentPlayer = []; GameServer.currentPlayer = [];
GameServer.playingRoom = []; GameServer.playingRoom = [];
......
...@@ -60,8 +60,7 @@ var gameScene = new Phaser.Class( ...@@ -60,8 +60,7 @@ var gameScene = new Phaser.Class(
WordSpace.setPlayerTyping.initiate(this); WordSpace.setPlayerTyping.initiate(this);
WordSpace.nameWordTextForTest = WordSpace.gameSceneForTest.add.text(50,400,'현재 가진 호패들 : 없음').setDepth(10).setColor('#000000'); WordSpace.nameWordTextForTest = WordSpace.gameSceneForTest.add.text(50,400,'현재 가진 호패들 : 없음').setDepth(10).setColor('#000000');
WordSpace.nameQueue.shuffle(); WordSpace.nameQueue.initiate();
}, },
update: function() update: function()
......
...@@ -148,14 +148,11 @@ class NameWord extends WordObject ...@@ -148,14 +148,11 @@ class NameWord extends WordObject
{ {
constructor(name, _isStrong = false) constructor(name, _isStrong = false)
{ {
super(name); super(name.nickname);
this.ownerId = RoomData.players.find(function(element) this.ownerId = name.id;
{
return element.nickname === name;
}).id;
this.wordWeight = 2; this.wordWeight = 2;
this.isStrong = _isStrong; this.isStrong = _isStrong;
console.log('Name : ' + name + ', Strong : ' + this.isStrong + ', Weight : ' + this.wordWeight); console.log('Name : ' + name.nickname + ', Strong : ' + this.isStrong + ', Weight : ' + this.wordWeight);
} }
destroy() destroy()
{ {
......
...@@ -252,12 +252,7 @@ WordSpace.generateWord = ...@@ -252,12 +252,7 @@ WordSpace.generateWord =
}, },
Name: function(scene, isStrong, lenRate) Name: function(scene, isStrong, lenRate)
{ {
//To do word = new NameWord(WordSpace.nameQueue.pop(), isStrong);
/*RoomData.players.forEach(function(element)
{
WordSpace.generateWord.Attack(WordSpace.gameSceneForTest, wordText, grade, PlayerData.nickname, element.isStrong);
});*/
word = new NameWord(PlayerData.nickname, isStrong);
WordSpace.pushWord(scene, word, lenRate); WordSpace.pushWord(scene, word, lenRate);
} }
} }
...@@ -280,6 +275,7 @@ function gameOver() ...@@ -280,6 +275,7 @@ function gameOver()
{ {
WordSpace.wordCycle.currentCycle.remove(); WordSpace.wordCycle.currentCycle.remove();
WordSpace.nameCycle.currentCycle.remove(); WordSpace.nameCycle.currentCycle.remove();
WordSpace.varAdjustCycle.currentCycle.remove();
//To Do //To Do
console.log('defeat'); console.log('defeat');
} }
...@@ -368,7 +364,6 @@ WordSpace.attack = function(wordText, grade) ...@@ -368,7 +364,6 @@ WordSpace.attack = function(wordText, grade)
if (wordText != '') if (wordText != '')
{ {
console.log('attack ' + wordText + ', grade: ' + grade); console.log('attack ' + wordText + ', grade: ' + grade);
//호패에 따른 isStrong 구분 필요함
WordSpace.nameGroup.forEach(function(element) WordSpace.nameGroup.forEach(function(element)
{ {
let attackData = let attackData =
...@@ -384,7 +379,6 @@ WordSpace.attack = function(wordText, grade) ...@@ -384,7 +379,6 @@ WordSpace.attack = function(wordText, grade)
//WordSpace.generateWord.Attack(WordSpace.gameSceneForTest, wordText, grade, PlayerData.nickname, element.isStrong); //WordSpace.generateWord.Attack(WordSpace.gameSceneForTest, wordText, grade, PlayerData.nickname, element.isStrong);
}); });
WordSpace.nameGroup = []; WordSpace.nameGroup = [];
WordSpace.attackGauge.resetValue(); WordSpace.attackGauge.resetValue();
WordSpace.setPlayerTyping.add(wordText); WordSpace.setPlayerTyping.add(wordText);
} }
...@@ -396,6 +390,7 @@ WordSpace.attack = function(wordText, grade) ...@@ -396,6 +390,7 @@ WordSpace.attack = function(wordText, grade)
Input.attackMode = false; Input.attackMode = false;
WordSpace.attackGauge.pauseCycle(false); WordSpace.attackGauge.pauseCycle(false);
} }
WordSpace.nameQueue = WordSpace.nameQueue =
{ {
queue: [], queue: [],
...@@ -414,13 +409,18 @@ WordSpace.nameQueue = ...@@ -414,13 +409,18 @@ WordSpace.nameQueue =
if(element.nickname != PlayerData.nickname && element.isAlive) if(element.nickname != PlayerData.nickname && element.isAlive)
WordSpace.nameQueue.queue.push(element); WordSpace.nameQueue.queue.push(element);
}); });
console.log(WordSpace.nameQueue.queue); /*console.log(WordSpace.nameQueue.queue);
console.log(RoomData.aliveCount); console.log(RoomData.aliveCount);*/
}, },
pop: function() pop: function()
{ {
let tempElement = WordSpace.nameQueue.queue.pop(); let tempElement = WordSpace.nameQueue.queue.shift();
if(WordSpace.nameQueue.queue.length <= RoomData.aliveCount) this.shuffle(); if(WordSpace.nameQueue.queue.length <= RoomData.aliveCount) this.shuffle();
return tempElement; return tempElement;
},
initiate: function()
{
this.shuffle();
this.shuffle();
} }
} }
\ No newline at end of file
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