diff --git a/resources/image/character/mole.afdesign b/resources/image/character/mole.afdesign index 6b07787..7ce1eb3 100644 Binary files a/resources/image/character/mole.afdesign and b/resources/image/character/mole.afdesign differ diff --git a/resources/image/icon/alien.png b/resources/image/icon/alien.png new file mode 100644 index 0000000..5ac5a96 Binary files /dev/null and b/resources/image/icon/alien.png differ diff --git a/resources/image/icon/alienship.png b/resources/image/icon/alienship.png index b8593fd..5826f99 100644 Binary files a/resources/image/icon/alienship.png and b/resources/image/icon/alienship.png differ diff --git a/resources/image/icon/card.png b/resources/image/icon/card.png index 5e884b5..b811269 100644 Binary files a/resources/image/icon/card.png and b/resources/image/icon/card.png differ diff --git a/resources/image/icon/chocoball.png b/resources/image/icon/chocoball.png index 1168bf5..33006db 100644 Binary files a/resources/image/icon/chocoball.png and b/resources/image/icon/chocoball.png differ diff --git a/resources/image/icon/green_alien.afdesign b/resources/image/icon/green_alien.afdesign deleted file mode 100644 index 008aa8e..0000000 Binary files a/resources/image/icon/green_alien.afdesign and /dev/null differ diff --git a/resources/image/icon/grill.png b/resources/image/icon/grill.png index a8106d8..1f45a71 100644 Binary files a/resources/image/icon/grill.png and b/resources/image/icon/grill.png differ diff --git a/resources/image/icon/misile.png b/resources/image/icon/misile.png new file mode 100644 index 0000000..1678482 Binary files /dev/null and b/resources/image/icon/misile.png differ diff --git a/resources/image/icon/mole.png b/resources/image/icon/mole.png new file mode 100644 index 0000000..b4e7dc2 Binary files /dev/null and b/resources/image/icon/mole.png differ diff --git a/resources/image/icon/spaceship.png b/resources/image/icon/spaceship.png index dde14ee..cafc417 100644 Binary files a/resources/image/icon/spaceship.png and b/resources/image/icon/spaceship.png differ diff --git a/resources/image/icon/src/alienship.png b/resources/image/icon/src/alienship.png new file mode 100644 index 0000000..b8593fd Binary files /dev/null and b/resources/image/icon/src/alienship.png differ diff --git a/resources/image/icon/src/button_icons.sketch b/resources/image/icon/src/button_icons.sketch new file mode 100644 index 0000000..5b4e206 Binary files /dev/null and b/resources/image/icon/src/button_icons.sketch differ diff --git a/resources/image/icon/src/card.png b/resources/image/icon/src/card.png new file mode 100644 index 0000000..5e884b5 Binary files /dev/null and b/resources/image/icon/src/card.png differ diff --git a/resources/image/icon/src/chocoball.png b/resources/image/icon/src/chocoball.png new file mode 100644 index 0000000..1168bf5 Binary files /dev/null and b/resources/image/icon/src/chocoball.png differ diff --git a/resources/image/icon/src/green_alien.afdesign b/resources/image/icon/src/green_alien.afdesign new file mode 100644 index 0000000..6647bf8 Binary files /dev/null and b/resources/image/icon/src/green_alien.afdesign differ diff --git a/resources/image/icon/src/green_alien.png b/resources/image/icon/src/green_alien.png new file mode 100644 index 0000000..b85472b Binary files /dev/null and b/resources/image/icon/src/green_alien.png differ diff --git a/resources/image/icon/src/grill.png b/resources/image/icon/src/grill.png new file mode 100644 index 0000000..a8106d8 Binary files /dev/null and b/resources/image/icon/src/grill.png differ diff --git a/resources/image/icon/src/mole.png b/resources/image/icon/src/mole.png new file mode 100644 index 0000000..e346d64 Binary files /dev/null and b/resources/image/icon/src/mole.png differ diff --git a/resources/image/icon/green_alien.png b/resources/image/icon/src/spaceship.png similarity index 50% rename from resources/image/icon/green_alien.png rename to resources/image/icon/src/spaceship.png index 80eb6c9..dde14ee 100644 Binary files a/resources/image/icon/green_alien.png and b/resources/image/icon/src/spaceship.png differ diff --git a/src/game/lib/flat_button/app_group_tab.js b/src/game/lib/flat_button/app_group_tab.js index 85a17a2..bb108bd 100644 --- a/src/game/lib/flat_button/app_group_tab.js +++ b/src/game/lib/flat_button/app_group_tab.js @@ -83,6 +83,10 @@ AppGroupTab.prototype.createTab = function(index) { this.setSubText(this.reservedSubText); } +AppGroupTab.loadResources = function() { + game.load.image('keyboard', '../../../resources/image/icon/keyboard.png'); + game.load.image('mouse', '../../../resources/image/icon/mouse.png'); +} AppGroupTab.BUTTON_COLOR_OUT_HEX = MainColor.CHOCO_HEX; diff --git a/src/game/lib/flat_button/play_app_button.js b/src/game/lib/flat_button/play_app_button.js index b37b89d..c3aec29 100644 --- a/src/game/lib/flat_button/play_app_button.js +++ b/src/game/lib/flat_button/play_app_button.js @@ -84,7 +84,7 @@ PlayAppButton.prototype.getIconName = function(appID) { switch(appID) { case 50: case 51: - return "keyboard"; // mole + return "mole"; case 52: case 53: @@ -137,24 +137,18 @@ PlayAppButton.prototype.clickEvent = function() { location.href = '../../web/client/start.html'; } -/* -PlayAppButton.prototype.onClick = function() { - sessionStorageManager.setPlayingAppID(PlayAppButton.TYPING_APP_ID); - sessionStorageManager.setPlayingAppName(PlayAppButton.TYPING_APP_NAME); - sessionStorageManager.setPlayingAppKoreanName(PlayAppButton.TYPING_APP_KOREAN_NAME); - sessionStorageManager.setWritingID(this.writingData.writingID); - // location.href = '../../web/client/typing_exam.html'; - location.href = '../../web/client/start.html'; - // printSessionStorage(); +PlayAppButton.loadResources = function() { + game.load.image('mole', '../../../resources/image/icon/mole.png'); + game.load.image('alienship', '../../../resources/image/icon/alienship.png'); + + game.load.image('alien', '../../../resources/image/icon/alien.png'); + game.load.image('card', '../../../resources/image/icon/card.png'); + game.load.image('grill', '../../../resources/image/icon/grill.png'); + game.load.image('spaceship', '../../../resources/image/icon/spaceship.png'); + game.load.image('chocoball', '../../../resources/image/icon/chocoball.png'); } -PlayAppButton.TYPING_APP_ID = 200; -PlayAppButton.TYPING_APP_NAME = "typing_exam"; -PlayAppButton.TYPING_APP_KOREAN_NAME = "타자검정"; -*/ - - PlayAppButton.WIDTH = 150; PlayAppButton.HEIGHT = 180; @@ -173,7 +167,7 @@ PlayAppButton.ICON_COLOR_OVER_HEX = MainColor.WHITE_HEX; PlayAppButton.ICON_COLOR_DOWN_HEX = MainColor.WHITE_HEX; PlayAppButton.ICON_COLOR_DISABLED_HEX = MainColor.LIGHT_GRAY_HEX; -PlayAppButton.TEXT_COLOR_OUT_HEX = MainColor.LINEN_STRING; -PlayAppButton.TEXT_COLOR_OVER_HEX = MainColor.DARK_CHOCO_STRING; -PlayAppButton.TEXT_COLOR_DOWN_HEX = MainColor.LIGHTER_CHOCO_STRING; -PlayAppButton.TEXT_COLOR_DISABLED_HEX = MainColor.DARK_GRAY_STRING; // MainColor.THISTLE_STRING; \ No newline at end of file +PlayAppButton.TEXT_COLOR_OUT_HEX = MainColor.LINEN_STRING; +PlayAppButton.TEXT_COLOR_OVER_HEX = MainColor.DARK_CHOCO_STRING; +PlayAppButton.TEXT_COLOR_DOWN_HEX = MainColor.LIGHTER_CHOCO_STRING; +PlayAppButton.TEXT_COLOR_DISABLED_HEX = MainColor.DARK_GRAY_STRING; // MainColor.THISTLE_STRING; \ No newline at end of file diff --git a/src/game/main_menu/main_menu.js b/src/game/main_menu/main_menu.js index f4d23a6..77b2d3b 100644 --- a/src/game/main_menu/main_menu.js +++ b/src/game/main_menu/main_menu.js @@ -8,19 +8,11 @@ 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.image('mouse', '../../../resources/image/icon/mouse.png'); - Animal.loadResources(); + + AppGroupTab.loadResources(); TypingAppButton.loadResources(); - - game.load.image('alien', '../../../resources/image/icon/green_alien.png'); - game.load.image('card', '../../../resources/image/icon/card.png'); - game.load.image('grill', '../../../resources/image/icon/grill.png'); - game.load.image('spaceship', '../../../resources/image/icon/spaceship.png'); - game.load.image('chocoball', '../../../resources/image/icon/chocoball.png'); - - game.load.image('alienship', '../../../resources/image/icon/alienship.png'); + PlayAppButton.loadResources(); game.load.script('webfont', '//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js'); } @@ -105,10 +97,8 @@ MainMenu.prototype.fontLoaded = function() { ); } - this.activeSavedAppGroupTab(); this.activeSavedLanguageTab(); - // this.loadAppData(); } @@ -142,9 +132,6 @@ MainMenu.prototype.loadAllowEditEnterCode = function(screenTopUI) { } MainMenu.prototype.loadAppData = function() { - // this.activeSavedAppGroupTab(); - // this.activeSavedLanguageTab(); - this.dbService.requestMainMenuAppData( this.selectedAppGroup, this.selectedLanguage, @@ -538,27 +525,37 @@ MainMenu.prototype.onClickMousePlayGroupTab = function() { MainMenu.prototype.makeAppGroupTab = function() { this.appGroupTabLayout = new TabLayout(100, 0, 844, 70); - this.typingPracticeGroupTab = new AppGroupTab( (function() { this.onClickTypingPracticeGroupTab(); }).bind(this) ); + this.typingPracticeGroupTab = new AppGroupTab( + (function() { this.onClickTypingPracticeGroupTab(); }).bind(this) + ); this.typingPracticeGroupTab.reserveIcon("keyboard"); this.typingPracticeGroupTab.reserveSubText("손가락 연습"); this.appGroupTabLayout.add(this.typingPracticeGroupTab); - this.typingTestGroupTab = new AppGroupTab( (function() { this.onClickTypingTestGroupTab(); }).bind(this) ); + this.typingTestGroupTab = new AppGroupTab( + (function() { this.onClickTypingTestGroupTab(); }).bind(this) + ); this.typingTestGroupTab.reserveIcon("keyboard"); this.typingTestGroupTab.reserveSubText("시험"); this.appGroupTabLayout.add(this.typingTestGroupTab); - this.typingExamGroupTab = new AppGroupTab( (function() { this.onClickTypingExamGroupTab(); }).bind(this) ); + this.typingExamGroupTab = new AppGroupTab( + (function() { this.onClickTypingExamGroupTab(); }).bind(this) + ); this.typingExamGroupTab.reserveIcon("keyboard"); this.typingExamGroupTab.reserveSubText("검정"); this.appGroupTabLayout.add(this.typingExamGroupTab); - this.typingPlayGroupTab = new AppGroupTab( (function() { this.onClickTypingPlayGroupTab(); }).bind(this) ); + this.typingPlayGroupTab = new AppGroupTab( + (function() { this.onClickTypingPlayGroupTab(); }).bind(this) + ); this.typingPlayGroupTab.reserveIcon("keyboard"); this.typingPlayGroupTab.reserveSubText("놀이"); this.appGroupTabLayout.add(this.typingPlayGroupTab); - this.mousePlayGroupTab = new AppGroupTab( (function() { this.onClickMousePlayGroupTab(); }).bind(this) ); + this.mousePlayGroupTab = new AppGroupTab( + (function() { this.onClickMousePlayGroupTab(); }).bind(this) + ); this.mousePlayGroupTab.reserveIcon("mouse"); this.mousePlayGroupTab.reserveSubText("놀이"); this.appGroupTabLayout.add(this.mousePlayGroupTab);