시즌 10.1호 머지

js/Client.js

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

js/ScenesData.js

@@ -122,20 +122,6 @@ var gameScene = new Phaser.Class(
         });
         console.log(RoomData.myself);
         WordSpace.test = WordSpace.generateWord.Name(this, false, null);
-        console.log('1' + WordSpace.test.physicsObj.body.width);
-        WordSpace.generateWord.Name(this, false, null);
-        WordSpace.generateWord.Name(this, false, null);
-        WordSpace.generateWord.Name(this, false, null);
-        WordSpace.generateWord.Name(this, false, null);
-        WordSpace.generateWord.Name(this, false, null);
-        WordSpace.generateWord.Name(this, false, null);
-        WordSpace.generateWord.Name(this, false, null);
-        WordSpace.generateWord.Name(this, false, null);
-        WordSpace.generateWord.Name(this, false, null);
-        WordSpace.attackGauge.add(5);
-
-
-
     },
 
     update: function()

js/WordObject.js

@@ -156,7 +156,12 @@ class AttackWord extends WordObject
             case 3: WordSpace.attackGauge.add(0.5); break;
             default: console.log('[ERR] wrong grade of word'); break;
         }
-        if(WordSpace.gameTimer.now < this.counterTime) WordSpace.nameGroup.push(new NameWord(this.attacker, true));
+        if(WordSpace.gameTimer.now < this.counterTime)
+        {
+            let tempWord = WordSpace.generateWord.Name(ScenesData.gameScene, true, this.attacker);
+            tempWord.destroy();
+        }
+        //WordSpace.nameGroup.push(new NameWord(this.attacker, true));
         super.destroy();
     }
 }
@@ -195,11 +200,11 @@ class NameWord extends WordObject
     destroy()
     {
         super.destroy();
-        WordSpace.gameSceneForTest.physics.world.removeCollider(this.physicsObj.wordCollider);
+        ScenesData.gameScene.physics.world.removeCollider(this.physicsObj.wordCollider);
         WordSpace.wordGroup.forEach(function(element)
         {
-            WordSpace.gameSceneForTest.physics.world.removeCollider(element.physicsObj.wordCollider);
-            element.physicsObj.wordCollider = WordSpace.gameSceneForTest.physics.add.collider(element.physicsObj, WordSpace.wordPhysicsGroup, function(object1) 
+            ScenesData.gameScene.physics.world.removeCollider(element.physicsObj.wordCollider);
+            element.physicsObj.wordCollider = ScenesData.gameScene.physics.add.collider(element.physicsObj, WordSpace.wordPhysicsGroup, function(object1) 
             {
                 object1.topObj.attract();
             });
@@ -215,7 +220,7 @@ class NameWord extends WordObject
             (this.physicsObj.x + 500 + WordSpace.nameGroup.length * 15) / 2, this.physicsObj.y - 50,
             500 + WordSpace.nameGroup.length * 15, 680 + this.wordText.length * 10 + (Math.random() * 20 - 10)
         ]);
-        WordSpace.gameSceneForTest.tweens.add({
+        ScenesData.gameScene.tweens.add({
             targets: this.follower,
             t: 1,
             ease: 'Sine',
@@ -224,7 +229,7 @@ class NameWord extends WordObject
         });
 
         //이동경로 디버그
-        /*var graphics = WordSpace.gameSceneForTest.add.graphics();
+        /*var graphics = ScenesData.gameScene.add.graphics();
         graphics.lineStyle(2, 0xffffff, 1);
         this.path.draw(graphics);*/
     }

js/WordSpace.js

@@ -38,7 +38,7 @@ WordSpace.delay =
 WordSpace.playerTypingCycle = null;
 WordSpace.NameSpawnReduce = 1000;
 
-WordSpace.gravityPoint = {x: 640, y: 300};
+WordSpace.gravityPoint = {x: 640, y: 280};
 
 class Cycle //앞으로 cycle은 이 클래스를 사용해서 구현할 것
 {
@@ -241,7 +241,7 @@ WordSpace.loadImage = function(scene)
     }
 
     WordSpace.weightTextObjForTest = scene.add.text(100, 75, '뇌의 무게: (현재) 0 / 100 (전체)').setDepth(10).setColor('#000000');
-    WordSpace.killLogTextForTest = scene.add.text(1100, 50, WordSpace.killLogForTest).setDepth(10).setColor('#000000').setAlign('right');
+    WordSpace.killLogTextForTest = scene.add.text(1000, 50, WordSpace.killLogForTest).setDepth(10).setColor('#000000').setAlign('right');
 }
 
 WordSpace.generateWord =