From fca1b210b85bbb31e04aa00a3d93a23012b7a51a 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: Thu, 15 Aug 2019 18:40:56 +0900 Subject: [PATCH] Fix: hyperlink to TypingExamStage --- .../lib/flat_button/typing_exam_button.js | 41 +++------------- src/game/main_menu/main_menu.js | 48 +++---------------- 2 files changed, 14 insertions(+), 75 deletions(-) diff --git a/src/game/lib/flat_button/typing_exam_button.js b/src/game/lib/flat_button/typing_exam_button.js index fec6519..f7debff 100644 --- a/src/game/lib/flat_button/typing_exam_button.js +++ b/src/game/lib/flat_button/typing_exam_button.js @@ -68,12 +68,8 @@ TypingExamButton.prototype.makeLetterCountText = function() { var letterCountText = game.add.text(20, this.mainText.y, ""); letterCountText.anchor.set(0, 0.5); letterCountText.font = this.setting.font; - letterCountText.fontSize = 14; // this.setting.fontSize; - letterCountText.style.fill = "white"; - - // letterCountText.style.fill = "#0xFFFFFF"; - // letterCountText.addColor("0xffffff", 0); - // mainText.fontWeight = "bolder"; + letterCountText.fontSize = 13; + letterCountText.style.fill = MainColor.LIGHT_CHOCO_STRING; letterCountText.lineSpacing = ButtonSetting.DEFAULT_TEXT_LINE_SPACING_PX; return letterCountText; @@ -127,13 +123,9 @@ TypingExamButton.prototype.setInputEnabled = function(isEnabled) { if(isEnabled === true) { this.mouseOut(); - // this.keyboardSprite.tint = MainColor.WHITE_HEX; - // this.animal.sprite.tint = MainColor.WHITE_HEX; this.animal.sprite.alpha = 1; } else { this.buttonDisabled(); - // this.keyboardSprite.tint = MainColor.DIM_GRAY_HEX; - // this.animal.sprite.tint = MainColor.DIM_GRAY_HEX; this.animal.sprite.alpha = 0.3; } } @@ -177,37 +169,18 @@ TypingExamButton.prototype.updateAppData = function(appData) { } TypingExamButton.prototype.clickEvent = function() { - console.log(this.writingID); - console.log(this.filename); - /* - sessionStorageManager.setPlayingAppID(this.appData.appID); - sessionStorageManager.setPlayingAppName(this.appData.appName); - sessionStorageManager.setPlayingAppKoreanName(this.appData.koreanName); + + sessionStorageManager.setPlayingAppID(200); + sessionStorageManager.setPlayingAppName("typing_exam"); + sessionStorageManager.setPlayingAppKoreanName("타자검정"); + sessionStorageManager.setWritingID(this.writingID); if(isExperiencePlayerAccount()) location.href = '../../web/client/ads.html'; else location.href = '../../web/client/start.html'; - */ } -/* -TypingExamButton.prototype.onClick = function() { - sessionStorageManager.setPlayingAppID(TypingExamButton.TYPING_APP_ID); - sessionStorageManager.setPlayingAppName(TypingExamButton.TYPING_APP_NAME); - sessionStorageManager.setPlayingAppKoreanName(TypingExamButton.TYPING_APP_KOREAN_NAME); - sessionStorageManager.setWritingID(this.writingData.writingID); - // location.href = '../../web/client/typing_exam.html'; - location.href = '../../web/client/start.html'; - // printSessionStorage(); -} - - -TypingExamButton.TYPING_APP_ID = 200; -TypingExamButton.TYPING_APP_NAME = "typing_exam"; -TypingExamButton.TYPING_APP_KOREAN_NAME = "타자검정"; -*/ - TypingExamButton.loadResources = function() { game.load.spritesheet('keyboards', '../../../resources/image/ui/keyboard/keyboards.png', 120, 120); diff --git a/src/game/main_menu/main_menu.js b/src/game/main_menu/main_menu.js index 34c91dc..7b1693e 100644 --- a/src/game/main_menu/main_menu.js +++ b/src/game/main_menu/main_menu.js @@ -25,38 +25,6 @@ MainMenu.prototype.preload = function() { game.load.script('webfont', '//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js'); } -// fontLoaded, create method for Google WebFonts test -/* -MainMenu.prototype.fontLoaded = function() { - console.log("fontLoaded"); - - // this.loadingImage.alpha = 0; - - // this.text.font = 'Nanum Gothic'; - // text2.font = 'Nanum Brush Script'; - // this.text3.font = 'Nanum Brush Script'; -} - -MainMenu.prototype.create = function() { - console.log("create"); - - game.stage.backgroundColor = '#4d4d4d'; - - this.loadingImage = game.add.sprite(GAME_SCREEN_SIZE.x / 2, GAME_SCREEN_SIZE.y / 2, "tile_choco"); - this.text = game.add.text(game.world.centerX, game.world.centerY - 150, "- phaser -\n나눔 고딕 웹 폰트\ngoogle web fonts"); - this.text.anchor.setTo(0.5); - this.text.fontSize = 60; - - this.text2 = game.add.text(game.world.centerX, game.world.centerY, "기본 default 글꼴"); - this.text2.anchor.setTo(0.5); - this.text2.fontSize = 60; - - this.text3 = game.add.text(game.world.centerX, game.world.centerY + 150, "- phaser -\n나눔 브러시 스크립트 웹 폰트\ngoogle web fonts"); - this.text3.anchor.setTo(0.5); - this.text3.fontSize = 60; -} -*/ - MainMenu.prototype.create = function() { this.dbService = new DBService(); this.dbService.setMaestroID(sessionStorageManager.getMaestroID()); @@ -80,8 +48,8 @@ MainMenu.prototype.create = function() { this.playAppButtons = new Array(); this.makePlayAppButtons(); - // this.selectedAppGroup = MainMenu.APP_GROUP_TYPING_PRACTICE; - this.selectedAppGroup = MainMenu.APP_GROUP_TYPING_EXAM; + this.selectedAppGroup = MainMenu.APP_GROUP_TYPING_PRACTICE; + // this.selectedAppGroup = MainMenu.APP_GROUP_TYPING_EXAM; this.selectedLanguage = MainMenu.LANGUAGE_KOREAN; // this.animalRecordList.printScore(Animal.TYPE_PRACTICE); } @@ -398,7 +366,7 @@ MainMenu.prototype.updateTypingPracticeAppButtons = function(appGroup, appData) } MainMenu.prototype.updateTypingTestAppButtons = function(appGroup, appData) { - console.log("updateTypingTestAppButtons"); + // console.log("updateTypingTestAppButtons"); var buttonIndex = 0; var appDataList = this.makeTypingPracticeAppDataList(appGroup, appData); @@ -416,12 +384,10 @@ MainMenu.prototype.updateTypingTestAppButtons = function(appGroup, appData) { } MainMenu.prototype.updateTypingExamAppButtons = function(appData) { - console.log("updateTypingExamAppButtons"); - console.log(appData); + // console.log("updateTypingExamAppButtons"); var buttonIndex = 0; var appDataList = this.makeTypingExamAppDataList(appData); - console.log(appDataList); var count = appDataList.length; for(var i = 0; i < MainMenu.TYPING_APP_COUNT; i++) { var button = this.typingExamButtons[i]; @@ -436,7 +402,7 @@ MainMenu.prototype.updateTypingExamAppButtons = function(appData) { } MainMenu.prototype.updatePlayAppButtons = function(appData) { - console.log("updatePlayAppButtons"); + // console.log("updatePlayAppButtons"); var buttonIndex = 0; var appDataList = this.makePlayAppDataList(appData); @@ -583,7 +549,7 @@ MainMenu.prototype.makeLanguageTab = function() { var koreanTab = new LanguageTab( (function() { - console.log("Language : Korean"); + // console.log("Language : Korean"); this.selectedLanguage = MainMenu.LANGUAGE_KOREAN; this.loadAppData(); }).bind(this) @@ -593,7 +559,7 @@ MainMenu.prototype.makeLanguageTab = function() { var englishTab = new LanguageTab( (function() { - console.log("Language : English"); + // console.log("Language : English"); this.selectedLanguage = MainMenu.LANGUAGE_ENGLISH; this.loadAppData(); }).bind(this)