Merge branch 'wordspace'

js/Client.js

@@ -82,6 +82,7 @@ socket.on('gameEnd', function(msg) // object player
 
 socket.on('attackSucceed', function(msg)
 {
+    console.log('client');
     let tempWord = WordSpace.generateWord.Name(ScenesData.gameScene, true, msg.victim);
     tempWord.destroy();
 });

js/ScenesData.js

@@ -123,7 +123,14 @@ var gameScene = new Phaser.Class(
             }
         });
         console.log(RoomData.myself);
-        WordSpace.test = WordSpace.generateWord.Name(this, false, null);
+        WordSpace.attackGauge.add(11);
+        WordSpace.wordBreakAnim = this.anims.create({
+            key: 'break',
+            frames: this.anims.generateFrameNumbers('wordBreak'),
+            frameRate: 10,
+            repeat: 0,
+            hideOnComplete: false
+        });
     },
 
     update: function()
@@ -140,6 +147,7 @@ var gameScene = new Phaser.Class(
         let tempNames = '';
         WordSpace.nameGroup.forEach(function(element)
         {
+            //테스트용
             tempNames += element.wordText + (element.isStrong?' [강]':'') + '\n';
         });
         

js/WordObject.js

@@ -30,7 +30,7 @@ class WordObject
         }
         else
         {
-            this.physicsObj = scene.physics.add.sprite(random.x, random.y, 'nameBgr' + Math.min(Math.max(2, this.wordText.length), 6))
+            this.physicsObj = scene.physics.add.sprite(random.x, random.y, (this.isStrong ? 'strongBgr' : 'nameBgr') + Math.min(Math.max(2, this.wordText.length), 6))
             .setMass(this.wordWeight * 10)
             .setScale(this.scale)
             .setFrictionX(0)
@@ -70,6 +70,10 @@ class WordObject
         const forceIdx = WordSpace.wordForcedGroup.findIndex(function(item) {return this.isEqualObject(item.generationCode)}, this);
         if (forceIdx > -1) WordSpace.wordForcedGroup.splice(forceIdx, 1);
         WordSpace.wordPhysicsGroup.remove(this.physicsObj);
+        let breakAnim = ScenesData.gameScene.add.sprite(this.physicsObj.x, this.physicsObj.y, 'wordBreak').setScale(0.5).setDepth(3).play('break');
+        setTimeout(function() {
+            breakAnim.destroy();
+        }, 200);
         if(!this.isNameWord)
         {
             this.wordObj.destroy();
@@ -158,6 +162,7 @@ class AttackWord extends WordObject
         }
         if(WordSpace.gameTimer.now < this.counterTime)
         {
+            console.log(this.attacker);
             let tempWord = WordSpace.generateWord.Name(ScenesData.gameScene, true, this.attacker);
             tempWord.destroy();
         }

js/WordSpace.js

@@ -14,6 +14,7 @@ WordSpace.totalWordNum = 0;
 WordSpace.brainCapacity = 200; //수용 가능한 단어 무게 최대치
 WordSpace.gameTimer = null; //현재 게임 플레이 시간 타이머
 WordSpace.isTimerOn = false;
+WordSpace.wordBreakAnim = null;
 
 WordSpace.wordGroup = [];
 WordSpace.nameGroup = [];
@@ -238,9 +239,11 @@ WordSpace.loadImage = function(scene)
     for (let i = 2; i < 7; i++)
     {
         scene.load.image('nameBgr' + i, 'assets/placeholder/name' + i + '.png');
+        scene.load.image('strongBgr' + i, 'assets/placeholder/strong' + i + '.png');
     }
+    scene.load.spritesheet('wordBreak', 'assets/image/word/wordbreak.png', { frameWidth: 180, frameHeight: 180 });
 
-    WordSpace.weightTextObjForTest = scene.add.text(100, 75, '뇌의 무게: (현재) 0 / 100 (전체)').setDepth(10).setColor('#000000');
+    WordSpace.weightTextObjForTest = scene.add.text(100, 75, '뇌의 무게: (현재) 0 / ' + this.brainCapacity + ' (전체)').setDepth(10).setColor('#000000');
     WordSpace.killLogTextForTest = scene.add.text(1000, 50, WordSpace.killLogForTest).setDepth(10).setColor('#000000').setAlign('right');
 }
 
@@ -368,7 +371,7 @@ WordSpace.findWord = function(wordText)
                 {
                     roomNum: RoomData.roomNum,
                     victim: RoomData.myself, 
-                    target: element.attacker.idNum
+                    target: element.attacker.id
                 }
                 socket.emit('defenseFailed', victimData);
                 return true;
@@ -406,7 +409,7 @@ WordSpace.attack = function(wordText, grade)
             let attackData = 
             {
                 roomNum: RoomData.roomNum,
-                attacker: PlayerData, 
+                attacker: RoomData.myself, 
                 target: element.ownerId,
                 text: wordText, 
                 grade: grade, 

server.js

@@ -89,7 +89,7 @@ io.on('connection', function(socket)
         {
             let dataToPush = 
             {
-                attackerId: msg.attacker.idNum,
+                attackerId: msg.attacker.id,
                 attacker: msg.attacker.nickname,
                 word: msg.text,
                 wordGrade: msg.grade,