From 7573ac032d5ba33016e8e25a6c5a7c179a6b8af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?= =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?= Date: Fri, 7 Sep 2018 10:32:48 +0900 Subject: [PATCH] Fix: AlienTimer bug, change heart image --- resources/image/ui/heart_full.png | Bin 4621 -> 6055 bytes src/game/lib/announce_box.js | 2 -- src/game/lib/heart_gauge.js | 11 +++++++---- src/game/mouse/space_invaders/alien.js | 2 +- src/game/mouse/space_invaders/alien_timer.js | 2 +- src/game/mouse/space_invaders/game.js | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/resources/image/ui/heart_full.png b/resources/image/ui/heart_full.png index 469b13a39c13e3bae0e51804fe17755d36cbcfd0..347ac9ce0458641d957de492f61e6ea586478146 100644 GIT binary patch delta 3373 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 { this.onChangeMaxCountListener(); } ); - let startPosX = 950; + let startPosX = GAME_SCREEN_SIZE.x - HeartGauge.GAP * 4; let posY = 30; for(let i = 0; i < HeartManager.HEART_MAX_COUNT; i++) { - let heart = game.add.sprite(startPosX - i * 30, posY, "heart_full"); + let heart = game.add.sprite(startPosX - i * HeartGauge.GAP, posY, "heart_full"); heart.anchor.set(0.5); - heart.scale.set(1); + heart.scale.set(HeartGauge.HEART_SCALE); heart.alpha = 0; this.hearts.push(heart); } @@ -45,4 +45,7 @@ class HeartGauge { this.hearts[i].alpha = 1; } } -} \ No newline at end of file +} + +HeartGauge.GAP = 35; +HeartGauge.HEART_SCALE = 0.6; \ No newline at end of file diff --git a/src/game/mouse/space_invaders/alien.js b/src/game/mouse/space_invaders/alien.js index edd27d5..bf65f96 100644 --- a/src/game/mouse/space_invaders/alien.js +++ b/src/game/mouse/space_invaders/alien.js @@ -49,7 +49,6 @@ class Alien extends Phaser.Sprite { return; if(this.isOnWaitingRoom) { - this.isOnWaitingRoom = false; this.goOnstage(); return; } else { @@ -96,6 +95,7 @@ class Alien extends Phaser.Sprite { } goOnstage() { + this.isOnWaitingRoom = false; this.goRandomPosition(); if(typeof this.onGoOnstageFunction !== "undefined") diff --git a/src/game/mouse/space_invaders/alien_timer.js b/src/game/mouse/space_invaders/alien_timer.js index 26efee2..a7a3347 100644 --- a/src/game/mouse/space_invaders/alien_timer.js +++ b/src/game/mouse/space_invaders/alien_timer.js @@ -96,4 +96,4 @@ AlienTimer.DEFAULT_TEXT_FONT = { }; AlienTimer.DEFAULT_TIME_GAP_SEC = 10; -AlienTimer.MOVE_UP_AMOUNT_PX = 60; \ No newline at end of file +AlienTimer.MOVE_UP_AMOUNT_PX = 48; \ No newline at end of file diff --git a/src/game/mouse/space_invaders/game.js b/src/game/mouse/space_invaders/game.js index ffcd8fe..65ed36c 100644 --- a/src/game/mouse/space_invaders/game.js +++ b/src/game/mouse/space_invaders/game.js @@ -4,7 +4,7 @@ class Game { create() { - this.game.stage.backgroundColor = '#4d4d4d'; + this.game.stage.backgroundColor = "#000000"; // '#4d4d4d'; sessionStorageManager.isNewBestRecrd = false; @@ -47,7 +47,7 @@ class Game { // waiting room this.game.add.graphics() - .beginFill(0xffffff, 0.1) + .beginFill(0xffffff, 0.3) .drawRect(0, 100, game.world.width, 100);