From 742b69263228b7adad727fccadcda81f3336d9bf 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, 22 Aug 2019 19:22:48 +0900 Subject: [PATCH] Fix: app group tab name --- src/game/lib/global/global_variables.js | 3 +++ src/game/lib/util/number_util.js | 2 +- src/game/main_menu/main_menu.js | 18 ++++++++++++++---- src/game/typing/examination/game.js | 6 +++--- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/game/lib/global/global_variables.js b/src/game/lib/global/global_variables.js index 458f0d3..bf9e03c 100644 --- a/src/game/lib/global/global_variables.js +++ b/src/game/lib/global/global_variables.js @@ -83,6 +83,9 @@ function isTypingGameApp() { if(sessionStorageManager.getPlayingAppName() == null) return false; + if(sessionStorageManager.getPlayingAppID === 200) + return true; + if(sessionStorageManager.getPlayingAppID < 50 || sessionStorageManager.getPlayingAppID > 100) return false; diff --git a/src/game/lib/util/number_util.js b/src/game/lib/util/number_util.js index 6499e54..5b1aae9 100644 --- a/src/game/lib/util/number_util.js +++ b/src/game/lib/util/number_util.js @@ -17,7 +17,7 @@ NumberUtil.getRecordText = function(value) { var number = Math.floor(value); var numberWithCommas = NumberUtil.numberWithCommas(number); - if(isTypingGame()) + if(isTypingGameApp()) return numberWithCommas + " 타"; else return numberWithCommas + " 점"; diff --git a/src/game/main_menu/main_menu.js b/src/game/main_menu/main_menu.js index 3932d84..c6469c3 100644 --- a/src/game/main_menu/main_menu.js +++ b/src/game/main_menu/main_menu.js @@ -522,28 +522,37 @@ MainMenu.prototype.makeAppGroupTab = function() { (function() { this.onClickTypingTestGroupTab(); }).bind(this) ); this.typingTestGroupTab.reserveIcon("keyboard"); - this.typingTestGroupTab.reserveSubText("시험"); + this.typingTestGroupTab.reserveSubText("단어 / 문장 연습"); this.appGroupTabLayout.add(this.typingTestGroupTab); this.typingExamGroupTab = new AppGroupTab( (function() { this.onClickTypingExamGroupTab(); }).bind(this) ); this.typingExamGroupTab.reserveIcon("keyboard"); - this.typingExamGroupTab.reserveSubText("검정"); + this.typingExamGroupTab.reserveSubText("긴글 연습"); this.appGroupTabLayout.add(this.typingExamGroupTab); + /* + this.typingCompetitionGroupTab = new AppGroupTab( + (function() { this.onClickTypingExamGroupTab(); }).bind(this) + ); + this.typingCompetitionGroupTab.reserveIcon("keyboard"); + this.typingCompetitionGroupTab.reserveSubText("타자 대회"); + this.appGroupTabLayout.add(this.typingCompetitionGroupTab); + */ + this.typingPlayGroupTab = new AppGroupTab( (function() { this.onClickTypingPlayGroupTab(); }).bind(this) ); this.typingPlayGroupTab.reserveIcon("keyboard"); - this.typingPlayGroupTab.reserveSubText("놀이"); + this.typingPlayGroupTab.reserveSubText("타자 놀이"); this.appGroupTabLayout.add(this.typingPlayGroupTab); this.mousePlayGroupTab = new AppGroupTab( (function() { this.onClickMousePlayGroupTab(); }).bind(this) ); this.mousePlayGroupTab.reserveIcon("mouse"); - this.mousePlayGroupTab.reserveSubText("놀이"); + this.mousePlayGroupTab.reserveSubText("마우스 놀이"); this.appGroupTabLayout.add(this.mousePlayGroupTab); this.appGroupTabLayout.createTabs(); @@ -551,6 +560,7 @@ MainMenu.prototype.makeAppGroupTab = function() { // this.typingPracticeGroupTab.setInputEnabled(false); // this.typingTestGroupTab.setInputEnabled(false); // this.typingExamGroupTab.setInputEnabled(false); + // this.typingCompetitionGroupTab.setInputEnabled(false); // this.typingPlayGroupTab.setInputEnabled(false); // this.mousePlayGroupTab.setInputEnabled(false); } diff --git a/src/game/typing/examination/game.js b/src/game/typing/examination/game.js index d7b0725..39fbc31 100644 --- a/src/game/typing/examination/game.js +++ b/src/game/typing/examination/game.js @@ -439,7 +439,7 @@ TypingExamination.prototype.showTypingExaminationContents = function() { this.textTypingRecordsDone[i].text = ""; } else { this.textTypingContentsDone[i].text = this.typingExaminationContents[doneIndex]; - this.textTypingRecordsDone[i].text = Math.floor(this.typingRecordForLines[doneIndex]); + this.textTypingRecordsDone[i].text = NumberUtil.getRecordText(Math.floor(this.typingRecordForLines[doneIndex])); } } @@ -600,8 +600,8 @@ TypingExamination.prototype.playNextContent = function() { TypingExamination.prototype.showPlayingWordNumber = function() { var currentLine = this.typingIndex + 1; - // this.textTypingLine.text = currentLine + " / " + this.typingContentLength; - this.textTypingLine.text = "9,999/9,999"; + this.textTypingLine.text = currentLine + " / " + this.typingContentLength + " 줄"; + // this.textTypingLine.text = "9,999/9,999 줄"; } TypingExamination.prototype.setTimeTypingStart = function() {