Commit 80e1e2f6 authored by 18손재민's avatar 18손재민

Merge branch 'image'

# Conflicts:
#	js/ScenesData.js
parents e328b615 a21bec98
...@@ -95,7 +95,7 @@ var gameScene = new Phaser.Class( ...@@ -95,7 +95,7 @@ var gameScene = new Phaser.Class(
update: function() update: function()
{ {
WordSpace.deltaTime = this.sys.game.loop.delta;
WordSpace.wordForcedGroup.forEach(function(element) WordSpace.wordForcedGroup.forEach(function(element)
{ {
element.attract(); element.attract();
......
...@@ -104,8 +104,7 @@ class WordObject ...@@ -104,8 +104,7 @@ class WordObject
} }
this.physicsObj.setVelocity(accel.x, accel.y); this.physicsObj.setVelocity(accel.x, accel.y);
this.wordObj.setPosition(this.physicsObj.x, this.physicsObj.y); this.wordObj.setPosition(this.physicsObj.x + (accel.x / 1000 * WordSpace.deltaTime), this.physicsObj.y + (accel.y / 1000 * WordSpace.deltaTime));
} }
isEqualObject(_generationCode) { return _generationCode === this.generationCode; } isEqualObject(_generationCode) { return _generationCode === this.generationCode; }
......
...@@ -25,6 +25,8 @@ WordSpace.CurrentPhase = WordSpace.Phase.READY; ...@@ -25,6 +25,8 @@ WordSpace.CurrentPhase = WordSpace.Phase.READY;
WordSpace.playerTyping = 0; WordSpace.playerTyping = 0;
WordSpace.playerTypingRate = 0; WordSpace.playerTypingRate = 0;
WordSpace.deltaTime = 10;
WordSpace.delay = WordSpace.delay =
{ {
WordSpawn: 3000, WordSpawn: 3000,
......
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