From efb728ab5eb9009ed69afedca11062fec4563f48 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, 5 Aug 2019 17:47:50 +0900 Subject: [PATCH] Add: keyboard icon --- resources/image/icon/keyboard.png | Bin 0 -> 660 bytes resources/image/icon/ui.sketch | Bin 0 -> 4776 bytes src/game/lib/flat_button/basic_tab.js | 4 +++- src/game/main_menu/main_menu.js | 31 ++++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 resources/image/icon/keyboard.png create mode 100644 resources/image/icon/ui.sketch diff --git a/resources/image/icon/keyboard.png b/resources/image/icon/keyboard.png new file mode 100644 index 0000000000000000000000000000000000000000..06d4f4e747b7b652a3aef164ab5d155929ab1de3 GIT binary patch literal 660 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 Ni@Vt4s*zv4{SO(3Z3O@T literal 0 HcmV?d00001 diff --git a/src/game/lib/flat_button/basic_tab.js b/src/game/lib/flat_button/basic_tab.js index eb2b18c..03a8447 100644 --- a/src/game/lib/flat_button/basic_tab.js +++ b/src/game/lib/flat_button/basic_tab.js @@ -105,7 +105,9 @@ BasicTab.prototype.addIcon = function(spriteName) { this.iconSprite.x = this.buttonSprite.width / 2; this.iconSprite.y = this.buttonSprite.height / 2; this.iconSprite.anchor.setTo(0.5, 0.5); - this.setIconSize(40); + // this.setIconSize(40); + this.setIconWidth(42); + this.setIconHeight(25); this.buttonSprite.addChild(this.iconSprite); this.mainText.text = ""; diff --git a/src/game/main_menu/main_menu.js b/src/game/main_menu/main_menu.js index 2842cc0..503962a 100644 --- a/src/game/main_menu/main_menu.js +++ b/src/game/main_menu/main_menu.js @@ -7,6 +7,8 @@ function MainMenu() { MainMenu.prototype.preload = function() { game.load.image('tile_choco', '../../../resources/image/background/tile_choco.png'); game.load.image('home', '../../../resources/image/icon/home.png'); + + game.load.image('keyboard', '../../../resources/image/icon/keyboard.png'); game.load.script('webfont', '//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js'); } @@ -188,6 +190,34 @@ MainMenu.prototype.makeAppGroupButtons = function() { this.appGroupTabLayout = new TabLayout(80, 0, 864, 70); + + var typingFingerGroupTab = new AppGroupTab( (function() { console.log("typing finger position"); }).bind(this) ); + typingFingerGroupTab.reserveIcon("keyboard"); + typingFingerGroupTab.reserveShortcutText("손가락 위치"); + this.appGroupTabLayout.add(typingFingerGroupTab); + + var typingPracticeGroupTab = new AppGroupTab( (function() { console.log("typing practice"); }).bind(this) ); + typingPracticeGroupTab.reserveIcon("keyboard"); + typingPracticeGroupTab.reserveShortcutText("연습"); + this.appGroupTabLayout.add(typingPracticeGroupTab); + + var typingTestGroupTab = new AppGroupTab( (function() { console.log("typing exam"); }).bind(this) ); + typingTestGroupTab.reserveIcon("keyboard"); + typingTestGroupTab.reserveShortcutText("시험"); + this.appGroupTabLayout.add(typingTestGroupTab); + + var typingPlayGroupTab = new AppGroupTab( (function() { console.log("typing exam"); }).bind(this) ); + typingPlayGroupTab.reserveIcon("keyboard"); + typingPlayGroupTab.reserveShortcutText("놀이"); + this.appGroupTabLayout.add(typingPlayGroupTab); + + var mousePlayGroupTab = new AppGroupTab( (function() { console.log("mouse exam"); }).bind(this) ); + mousePlayGroupTab.reserveIcon("home"); + mousePlayGroupTab.reserveShortcutText("놀이"); + this.appGroupTabLayout.add(mousePlayGroupTab); + + + /* // typing practice var typingPracticeKoreanAppGroupTab = new AppGroupTab( (function() { console.log("typing practice"); }).bind(this) @@ -259,6 +289,7 @@ MainMenu.prototype.makeAppGroupButtons = function() { mousePlayAppGroupTab.reserveMainText("Mouse game"); mousePlayAppGroupTab.reserveShortcutText("마우스놀이"); this.appGroupTabLayout.add(mousePlayAppGroupTab); + */ this.appGroupTabLayout.createTabs(); }