From c307c69d8bc5be29a0cba1e5868bc04e67dff511 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: Wed, 16 May 2018 10:26:40 +0900 Subject: [PATCH] Fix: remove game argument for ScreenBottom constructor --- src/game/lib/screen_bottom.js | 14 ++++++-------- src/game/menu/menu_app.js | 2 +- src/game/mouse/space_invaders/game.js | 2 +- src/game/result/result.js | 18 +++++------------- src/game/start/start.js | 2 +- 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/src/game/lib/screen_bottom.js b/src/game/lib/screen_bottom.js index 9b68199..c7fef02 100644 --- a/src/game/lib/screen_bottom.js +++ b/src/game/lib/screen_bottom.js @@ -3,19 +3,17 @@ class ScreenBottom { - constructor(game) { - this.game = game; - + constructor() { this.BOTTOM_BAR_HEIGHT = 50; this.BOTTOM_BAR_NAME_WIDTH = 200; this.BOTTOM_BAR_TEXT_OFFSET = 10; - this.bottomAreaPositionY = this.game.world.height - this.BOTTOM_BAR_HEIGHT; + this.bottomAreaPositionY = game.world.height - this.BOTTOM_BAR_HEIGHT; let style = { font: "32px Arial", fill: "#fff", align: "left", boundsAlignH: "left", boundsAlignV: "bottom" }; let posX = this.BOTTOM_BAR_TEXT_OFFSET; - this.leftText = this.game.add.text(posX, this.bottomAreaPositionY, "", style) + this.leftText = game.add.text(posX, this.bottomAreaPositionY, "", style) .setTextBounds(0, 0, this.BOTTOM_BAR_NAME_WIDTH, this.BOTTOM_BAR_HEIGHT) .addColor('#ffffff', 0); // .setShadow(3, 3, 'rgba(0, 0, 0, 0.5)', 2); @@ -24,7 +22,7 @@ class ScreenBottom { style.align = "center"; style.boundsAlignH = "center"; posX = game.world.width / 2 - this.BOTTOM_BAR_NAME_OFFSET_RIGHT; - this.centerText = this.game.add.text(0, this.bottomAreaPositionY, "", style) + this.centerText = game.add.text(0, this.bottomAreaPositionY, "", style) .setTextBounds(0, 0, game.world.width, this.BOTTOM_BAR_HEIGHT) .addColor('#ffffff', 0); // .setShadow(3, 3, 'rgba(0, 0, 0, 0.5)', 2); @@ -34,14 +32,14 @@ class ScreenBottom { style.align = "right"; style.boundsAlignH = "right"; posX = game.world.width - this.BOTTOM_BAR_NAME_WIDTH - this.BOTTOM_BAR_TEXT_OFFSET; - this.rightText = this.game.add.text(posX, this.bottomAreaPositionY, "", style) + this.rightText = game.add.text(posX, this.bottomAreaPositionY, "", style) .setTextBounds(0, 0, this.BOTTOM_BAR_NAME_WIDTH, this.BOTTOM_BAR_HEIGHT) .addColor('#ffffff', 0); // .setShadow(3, 3, 'rgba(0, 0, 0, 0.5)', 2); } makeBottomLine() { - this.game.add.graphics() + game.add.graphics() .beginFill(0xffffff, 0.1) .drawRect(0, this.bottomAreaPositionY, game.world.width, this.BOTTOM_BAR_HEIGHT); diff --git a/src/game/menu/menu_app.js b/src/game/menu/menu_app.js index df9a54a..7be910c 100644 --- a/src/game/menu/menu_app.js +++ b/src/game/menu/menu_app.js @@ -38,7 +38,7 @@ class MenuApp { // bottom - let screenBottom = new ScreenBottom(game); + let screenBottom = new ScreenBottom(); screenBottom.makeBottomLine(); // screenBottom.printBottomLeftText("게임 진행 정보"); let playingAppName = appInfoManager.getAppNameKorean(sessionStorageManager.playingAppName); diff --git a/src/game/mouse/space_invaders/game.js b/src/game/mouse/space_invaders/game.js index 67501af..971ff7b 100644 --- a/src/game/mouse/space_invaders/game.js +++ b/src/game/mouse/space_invaders/game.js @@ -53,7 +53,7 @@ class Game { // bottom - let screenBottom = new ScreenBottom(game); + let screenBottom = new ScreenBottom(); screenBottom.makeBottomLine(); let highScore = NumberUtil.numberWithCommas(scoreManager.getHighScore()); screenBottom.printBottomLeftText("최고 기록 : " + highScore); diff --git a/src/game/result/result.js b/src/game/result/result.js index e436608..a434bd0 100644 --- a/src/game/result/result.js +++ b/src/game/result/result.js @@ -30,7 +30,7 @@ class Result { // bottom - let screenBottom = new ScreenBottom(game); + let screenBottom = new ScreenBottom(); screenBottom.makeBottomLine(); screenBottom.printBottomLeftText("게임 진행 정보"); let playingAppName = appInfoManager.getAppNameKorean(sessionStorageManager.playingAppName); @@ -44,12 +44,12 @@ class Result { } printScore() { - const style = { font: "52px Arial", fill: "#fff", align: "left", boundsAlignH: "center", boundsAlignV: "middle" }; + const style = { font: "64px Arial", fill: "#fff", align: "left", boundsAlignH: "center", boundsAlignV: "middle" }; game.add.text(0, 0, "결과", style) - .setTextBounds(0, 0, game.world.width, 80) + .setTextBounds(0, 0, game.world.width, 100) .setShadow(3, 3, 'rgba(0, 0, 0, 0.5)', 2); - let posY = 100; + let posY = 120; let score = NumberUtil.numberWithCommas(sessionStorageManager.score); console.log(score); style.font = "bold 80px Arial"; @@ -68,20 +68,12 @@ class Result { } - printHowToPlay(text) { - const style = { font: "32px Arial", fill: "#fff", align: "left", boundsAlignH: "center", boundsAlignV: "middle" }; - let howToPlayText = game.add.text(0, 0, appInfoManager.getHowToPlayText(sessionStorageManager.playingAppName), style); - howToPlayText.setTextBounds(100, 100, game.world.width - 100, 200); - howToPlayText.stroke = "#333"; - howToPlayText.strokeThickness = 5; - } - makeStartButton() { let setting = new RoundRectButtonSetting(200, 100); setting.fontStyle.fontWeight = "bold"; let startButton = new RoundRectButton(setting, "다시 시작", this.startStage); - startButton.move(game.world.centerX, game.world.height / 2 - 60); + startButton.move(game.world.centerX, game.world.height / 2 - 70); } loadHistoryRecords() { diff --git a/src/game/start/start.js b/src/game/start/start.js index a5ded96..eeb0230 100644 --- a/src/game/start/start.js +++ b/src/game/start/start.js @@ -31,7 +31,7 @@ class Start { // bottom - let screenBottom = new ScreenBottom(game); + let screenBottom = new ScreenBottom(); screenBottom.makeBottomLine(); screenBottom.printBottomLeftText("게임 진행 정보"); let playingAppName = appInfoManager.getAppNameKorean(sessionStorageManager.playingAppName);