From 83a3a85e752fdd964e8407555a61bf9b45542a47 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: Mon, 7 May 2018 17:12:52 +0900 Subject: [PATCH] Add: RoundRectButton icon --- resources/image/icon/fullscreen.png | Bin 0 -> 2281 bytes resources/image/icon/fullscreen_white.png | Bin 0 -> 3083 bytes src/game/lib/fullscreen_button.js | 47 ++++++++++++++++++++++ src/game/lib/round_rect_button.js | 21 ++++++++++ src/game/login/login.js | 5 +++ src/game/menu/menu_app.js | 11 ++++- src/web/client/menu_app.html | 1 + 7 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 resources/image/icon/fullscreen.png create mode 100644 resources/image/icon/fullscreen_white.png create mode 100644 src/game/lib/fullscreen_button.js diff --git a/resources/image/icon/fullscreen.png b/resources/image/icon/fullscreen.png new file mode 100644 index 0000000000000000000000000000000000000000..857df12c951106336a57dbc9c0ec8c271671587c GIT binary patch literal 2281 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 z this.clickEvent()); + button.move(this.game.world.width - 30, 30); + + let icon_fullscreen = game.add.sprite(0, 0, 'icon_fullscreen'); + icon_fullscreen.width = 20; + icon_fullscreen.height = 20; + button.setIcon(icon_fullscreen); + } + + clickEvent() { + if(this.game.scale.isFullScreen) { + this.game.scale.stopFullScreen(); + } else { + this.game.scale.startFullScreen(); + } + } + +} \ No newline at end of file diff --git a/src/game/lib/round_rect_button.js b/src/game/lib/round_rect_button.js index 04273d6..1200914 100644 --- a/src/game/lib/round_rect_button.js +++ b/src/game/lib/round_rect_button.js @@ -146,29 +146,50 @@ class RoundRectButton { return btnText; } + setIcon(icon) { + this.buttonIcon = this.button.addChild(icon); + this.buttonIcon.x = this.button.width / 2; + this.buttonIcon.y = this.button.height / 2; + this.buttonIcon.anchor.setTo(0.5, 0.5); + + this.mouseOut(); + } + mouseOut() { this.text.fill = this.setting.textColors.out; this.buttonStroke.tint = this.setting.strokeColors.out; this.button.tint = this.setting.buttonColors.out; + if(typeof this.buttonIcon !== "undefined") { + this.buttonIcon.tint = this.setting.strokeColors.out; + } } mouseOver() { this.text.fill = this.setting.textColors.over; this.buttonStroke.tint = this.setting.strokeColors.over; this.button.tint = this.setting.buttonColors.over; + if(typeof this.buttonIcon !== "undefined") { + this.buttonIcon.tint = this.setting.strokeColors.over; + } } mouseDown() { this.text.fill = this.setting.textColors.down; this.buttonStroke.tint = this.setting.strokeColors.down; this.button.tint = this.setting.buttonColors.down; + if(typeof this.buttonIcon !== "undefined") { + this.buttonIcon.tint = this.setting.strokeColors.down; + } } buttonDisabled() { this.text.fill = this.setting.textColors.disabled; this.buttonStroke.tint = this.setting.strokeColors.disabled; this.button.tint = this.setting.buttonColors.disabled; + if(typeof this.buttonIcon !== "undefined") { + this.buttonIcon.tint = this.setting.strokeColors.disabled; + } } diff --git a/src/game/login/login.js b/src/game/login/login.js index 896ac7a..61ccc0b 100644 --- a/src/game/login/login.js +++ b/src/game/login/login.js @@ -71,6 +71,11 @@ let Login = { let startButton = new RoundRectButton(setting, "시작", this.startMenu); startButton.move(game.world.centerX, game.world.centerY + 140); + + icon_fullscreen = game.add.sprite(0, 0, 'icon_fullscreen'); + icon_fullscreen.width = 20; + icon_fullscreen.height = 20; + startButton.setIcon(icon_fullscreen); }, startMenu: function() { diff --git a/src/game/menu/menu_app.js b/src/game/menu/menu_app.js index cec401e..e1f08e8 100644 --- a/src/game/menu/menu_app.js +++ b/src/game/menu/menu_app.js @@ -3,16 +3,25 @@ let MenuApp = { + preload: function() { + game.load.image('icon_fullscreen', '../../../resources/image/icon/fullscreen_white.png'); + }, + create: function() { this.game.stage.backgroundColor = '#4d4d4d'; let backButton = new BackButton( () => { + sessionStorage.removeItem("playerName"); + sessionStorage.removeItem("playerUserID"); + location.href = '../../web/client/login.html'; }); + let fullscreenButton = new FullscreenButton(this.game); + let screenBottom = new ScreenBottom(game); screenBottom.makeBottomLine(); - screenBottom.printBottomLeftText("게임 진행 정보"); + // screenBottom.printBottomLeftText("게임 진행 정보"); screenBottom.printBottomCenterText("메뉴"); screenBottom.printBottomRightText(playerName); diff --git a/src/web/client/menu_app.html b/src/web/client/menu_app.html index 062ddd1..98bf0db 100644 --- a/src/web/client/menu_app.html +++ b/src/web/client/menu_app.html @@ -15,6 +15,7 @@ +