Merge branch 'image'

# Conflicts:
#	js/ResourceLoader.js

GameServer.js

@@ -80,7 +80,7 @@ class GameRoom
     {
         this.roomId = GameServer.getRoomNumber();
         this.roomIndex = -1;
-        this.startCount = 2;
+        this.startCount = 3;
         this.maxPlayer = 100;
         this.nextRank = 100;
 

js/Client.js

@@ -200,6 +200,10 @@ socket.on('defeat', function(msg) // object player
         {
             var keys = Object.keys(Enums.item);
             WordSpace.generateWord.Item(ScenesData.gameScene, Enums.item[keys[keys.length * Math.random() << 0]]);
+            let itemBag = ScenesData.gameScene.add.sprite(RoomData.myself.position.x, RoomData.myself.position.y, 'itemBag').setScale(1).setDepth(5);
+            setTimeout(function() {
+                itemBag.destroy();
+            }, 3000);
         }
     }
     else 

js/ResourceLoader.js

@@ -16,7 +16,7 @@ ResourceLoader.loadImage = function(scene)
     {
         for (let j = 2; j < 7; j++)
         {
-            scene.load.image(('wordBgr' + i + '_' + j), ('assets/placeholder/'+i + '_' + j + '.png'));
+            scene.load.image(('wordBgr' + i + '_' + j), ('assets/image/word/'+i + '_' + j + '.png'));
         }
     }
     for (let i = 0; i < 4; i++)
@@ -29,11 +29,10 @@ ResourceLoader.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.image('nameBgr' + i, 'assets/image/word/name' + i + '.png');
+        scene.load.image('strongBgr' + i, 'assets/image/word/strong' + i + '.png');
     }
     
-    scene.load.spritesheet('wordBreak', 'assets/image/word/wordbreak.png', { frameWidth: 180, frameHeight: 180 });
     scene.load.spritesheet('pyeongminSit', 'assets/image/character/pyeongmin/pyeong_sit.png', { frameWidth: 521, frameHeight: 610 });
     scene.load.spritesheet('pyeongminWrite', 'assets/image/character/pyeongmin/write/pyeong_write.png', { frameWidth: 521, frameHeight: 610 });
     scene.load.spritesheet('pyeongminThrow', 'assets/image/character/pyeongmin/throw/pyeong_throw.png', { frameWidth: 521, frameHeight: 610 });
@@ -41,11 +40,13 @@ ResourceLoader.loadImage = function(scene)
     scene.load.spritesheet('pyeongminBurningBig', 'assets/image/character/pyeongmin/burning/pyeong_burning_big.png', { frameWidth: 521, frameHeight: 610 });
     scene.load.spritesheet('pyeongminGameOver', 'assets/image/character/pyeongmin/balladang/pyeong_balladang.png', { frameWidth: 720, frameHeight: 700 });
     scene.load.image('pyeongminStand', 'assets/image/character/pyeongmin/pyeong_stand.png');
-
+    
+    scene.load.spritesheet('wordBreak', 'assets/image/word/wordbreak.png', { frameWidth: 180, frameHeight: 180 });
     scene.load.image('phaseChangeBgr', 'assets/placeholder/phaseChange.png');
     scene.load.image('attackPaper', 'assets/image/etc/paper_crumbled.png');
     scene.load.image('panel', 'assets/placeholder/panel.png');
     scene.load.image('button', 'assets/placeholder/button.png');
+    scene.load.image('itemBag', 'assets/image/etc/itembag2.png');
 }
 
 ResourceLoader.loadAnimation = function(scene)

js/WordObject.js

@@ -14,7 +14,7 @@ class WordObject
 
     instantiate(scene, spriteName, textColor, lenRate)
     {
-        let p = [{x : 3, y : 1.05}, {x : 20, y : 1.85}];
+        let p = [{x : 3, y : 1.25}, {x : 20, y : 2.05}];
         this.scale = ((p[1].y - p[0].y) / (p[1].x - p[0].x)) * (this.wordWeight - p[0].x) + p[0].y;
         this.fontScale = 25;
         var random = WordSpace.getSpawnPoint(lenRate);