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

사망 시 인풋 필드 작동안하게 바꿈

parent 1b56caf0
......@@ -82,7 +82,7 @@ class GameRoom
{
this.roomId = GameServer.getRoomNumber();
this.roomIndex = -1;
this.startCount = 3;
this.startCount = 2;
this.maxPlayer = 100;
this.nextRank = 100;
......
......@@ -282,6 +282,8 @@ var backToMenu = function(isWin)
earnedMoney += Math.max(20, Math.pow(RoomData.myself.attackSucceed, 2));
earnedMoney += parseInt(20 * (1 - (RoomData.myself.rank - 1) / (RoomData.players.length - 1)));
Input.inputField.text.destroy();
var temp = function(){
socket.emit('exitFromRoom', RoomData.myself.id);
......
......@@ -21,7 +21,7 @@ Input.attackOption = {
Input.gameSceneEnterReaction = function()
{
if (!Input.isEntered)
if (RoomData.myself.isAlive && !Input.isEntered)
{
if (Input.attackMode) WordSpace.attack(Input.removeConVow(Input.finalInput), Input.attackOption.wordGrade);
else WordSpace.findWord(Input.finalInput);
......@@ -384,7 +384,7 @@ Input.inputField =
Input.pushInput = function(inputKey)
{
if (this.justPressed != inputKey)
if ((ScenesData.currentScene != 'gameScene' || RoomData.myself.isAlive) && this.justPressed != inputKey)
{
this.justPressed = inputKey;
let output;
......
......@@ -445,6 +445,7 @@ var gameScene = new Phaser.Class(
BackGround.drawBrain(this);
BackGround.drawCharacter(this);
Audio.playSound(this, 'startGame');
WordSpace.attackPaperGroup = this.physics.add.group();
WordSpace.wordPhysicsGroup = this.physics.add.group();
Input.inputField.generate(this, Input.gameSceneEnterReaction,
......@@ -476,7 +477,7 @@ var gameScene = new Phaser.Class(
{
element.attract();
})
WordSpace.attackPaperGroup.forEach(function(element){
WordSpace.attackPaperGroup.getChildren().forEach(function(element){
element.moveObject(element);
});
......
......@@ -17,7 +17,7 @@ WordSpace.pyeongminAnims = [];
WordSpace.wordGroup = [];
WordSpace.nameGroup = [];
WordSpace.attackPaperGroup = [];
WordSpace.attackPaperGroup = null;
WordSpace.wordForcedGroup = [];
WordSpace.wordPhysicsGroup = null;
......@@ -161,6 +161,8 @@ WordSpace.attackGauge =
WordSpace.genWordByProb = function(scene)
{
let wordRnd = Math.random();
console.log(wordRnd);
console.log(WordSpace);
let wordIdx = wordRnd < WordSpace.GradeProb[0] ? 3 :
wordRnd < WordSpace.GradeProb[1] ? 2 :
wordRnd < WordSpace.GradeProb[2] ? 1 : 0;
......@@ -433,8 +435,7 @@ WordSpace.makeAttackPaper = function(scene, attackFrom, attackTo, multiple)
duration: 4000,
repeat: 0,
onComplete: function() {
attackPaper.destroy();
WordSpace.attackPaperGroup = [];
WordSpace.attackPaperGroup.remove(attackPaper, true);
}
});
attackPaper.moveObject = function(obj)
......@@ -443,7 +444,7 @@ WordSpace.makeAttackPaper = function(scene, attackFrom, attackTo, multiple)
obj.setPosition(obj.follower.vec.x, obj.follower.vec.y);
obj.angle = 720 * obj.follower.t;
}
WordSpace.attackPaperGroup.push(attackPaper);
WordSpace.attackPaperGroup.add(attackPaper);
}
WordSpace.nameQueue =
......@@ -506,7 +507,7 @@ WordSpace.resetGame = function()
WordSpace.wordGroup = [];
WordSpace.nameGroup = [];
WordSpace.attackPaperGroup = [];
WordSpace.attackPaperGroup = null;
WordSpace.wordForcedGroup = [];
WordSpace.wordPhysicsGroup = null;
......
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