Commit 61ee6c98 authored by 18손재민's avatar 18손재민

Merge branch 'wordspace'

parents 7126dc88 025a55ca
...@@ -178,6 +178,7 @@ socket.on('attacked', function(msg) // object attackData ...@@ -178,6 +178,7 @@ socket.on('attacked', function(msg) // object attackData
WordSpace.attackedEvents.push(attackedEvent); WordSpace.attackedEvents.push(attackedEvent);
//console.log(timeout); //console.log(timeout);
}); });
socket.on('defeat', function(msg) // object player socket.on('defeat', function(msg) // object player
{ {
let playerImage = RoomData.findPlayer(msg.id).playerImage; let playerImage = RoomData.findPlayer(msg.id).playerImage;
...@@ -201,7 +202,33 @@ socket.on('defeat', function(msg) // object player ...@@ -201,7 +202,33 @@ socket.on('defeat', function(msg) // object player
{ {
var keys = Object.keys(Enums.item); var keys = Object.keys(Enums.item);
WordSpace.generateWord.Item(ScenesData.gameScene, Enums.item[keys[keys.length * Math.random() << 0]]); 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); let itemBag = ScenesData.gameScene.add.sprite(RoomData.myself.position.x, RoomData.myself.position.y, 'itemBag').setScale(0).setDepth(5);
ScenesData.gameScene.tweens.add({
targets: itemBag,
scaleX: 1,
scaleY: 1,
ease: 'Linear', // 'Cubic', 'Elastic', 'Bounce', 'Back'
duration: 500,
repeat: 0, // -1: infinity
yoyo: false,
onComplete: function () {
setTimeout(function() {
ScenesData.gameScene.tweens.add({
targets: itemBag,
scaleX: 0,
scaleY: 0,
ease: 'Linear', // 'Cubic', 'Elastic', 'Bounce', 'Back'
duration: 500,
repeat: 0, // -1: infinity
yoyo: false });
}, 1500);
},
onCompleteScope: ScenesData.gameScene
});
setTimeout(function() { setTimeout(function() {
itemBag.destroy(); itemBag.destroy();
}, 3000); }, 3000);
......
...@@ -13,7 +13,7 @@ app.get('/', function(req, res) { ...@@ -13,7 +13,7 @@ app.get('/', function(req, res) {
}); });
// http 기본 포트(80)에 서버 열기 // http 기본 포트(80)에 서버 열기
server.listen(80, function() { server.listen(8080, function() {
console.log('[SERVER] Listening on port ' + server.address().port); console.log('[SERVER] Listening on port ' + server.address().port);
GameServer.serverNumber = Math.floor(Math.random() * 1000 + 1); GameServer.serverNumber = Math.floor(Math.random() * 1000 + 1);
console.log('[SERVER] server number is ${GameServer.serverNumber}'); console.log('[SERVER] server number is ${GameServer.serverNumber}');
......
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