From efd0d4ee220e90074c0af2a6f0d5528117a417ce 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: Sun, 11 Aug 2019 18:45:00 +0900 Subject: [PATCH] Fix: make buttons first --- src/game/lib/flat_button/typing_app_button.js | 5 ++++- src/game/main_menu/main_menu.js | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/game/lib/flat_button/typing_app_button.js b/src/game/lib/flat_button/typing_app_button.js index 7eb7994..c61371e 100644 --- a/src/game/lib/flat_button/typing_app_button.js +++ b/src/game/lib/flat_button/typing_app_button.js @@ -4,7 +4,7 @@ TypingAppButton.constructor = TypingAppButton; function TypingAppButton(x, y) { this.appData = null; - var setting = new ButtonSetting(x, y, 400, 80); + var setting = new ButtonSetting(x, y, TypingAppButton.WIDTH, TypingAppButton.HEIGHT); setting.setStrokeWidth(0); setting.setRound(30); // setting.setFont("Nanum Brush Script"); @@ -86,6 +86,9 @@ TypingAppButton.TYPING_APP_KOREAN_NAME = "타자검정"; */ +TypingAppButton.WIDTH = 460; +TypingAppButton.HEIGHT = 80; + TypingAppButton.STROKE_COLOR_OUT_HEX = MainColor.DARK_CHOCO_HEX; TypingAppButton.STROKE_COLOR_OVER_HEX = MainColor.DARK_CHOCO_HEX; TypingAppButton.STROKE_COLOR_DOWN_HEX = MainColor.DARK_CHOCO_HEX; diff --git a/src/game/main_menu/main_menu.js b/src/game/main_menu/main_menu.js index 424901b..d37fac7 100644 --- a/src/game/main_menu/main_menu.js +++ b/src/game/main_menu/main_menu.js @@ -169,11 +169,13 @@ MainMenu.prototype.loadAppData = function() { } MainMenu.prototype.makeTypingAppButtons = function() { + var offsetX = 50; for(var i = 0; i < MainMenu.TYPING_APP_COUNT; i++) { - var x = (i % 2) === 0 ? 300 : 800; + var x = (i % 2) === 0 ? TypingAppButton.WIDTH / 2 + offsetX : 800; var y = 200 + Math.floor(i / 2) * 100; var button = new TypingAppButton(x, y); + button.setActive(false); this.typingAppButtons.push(button); } }