From 2faa90a9e3efd9fe0aaa939b39532212ec60b71b 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: Sat, 10 Aug 2019 17:52:28 +0900 Subject: [PATCH] Fix: finger position -> practice, practice -> test --- src/game/lib/animal.js | 4 +- src/game/lib/animal_record_list.js | 2 +- src/game/main_menu/main_menu.js | 66 +++++++++++++++--------------- src/web/php/db/menu_collection.php | 27 ++++++------ src/web/php/menu/menu_list.php | 11 +++-- 5 files changed, 59 insertions(+), 51 deletions(-) diff --git a/src/game/lib/animal.js b/src/game/lib/animal.js index 7f0aec2..a9092e3 100644 --- a/src/game/lib/animal.js +++ b/src/game/lib/animal.js @@ -92,8 +92,8 @@ Animal.loadResources = function() { Animal.TYPE_ANIMATION = 0; Animal.TYPE_ICON = 1; -Animal.TYPE_FINGER_POSITION = 0; -Animal.TYPE_PRACITICE = 1; +Animal.TYPE_PRACTICE = 0; +Animal.TYPE_TEST = 1; Animal.TYPE_EXAM = 1; Animal.ANIMATION_TYPE_CHANGE = 0; diff --git a/src/game/lib/animal_record_list.js b/src/game/lib/animal_record_list.js index 5e8d56f..f562188 100644 --- a/src/game/lib/animal_record_list.js +++ b/src/game/lib/animal_record_list.js @@ -82,7 +82,7 @@ AnimalRecordList.prototype.printScore = function(recordType) { var recordText = this.texts[i]; var typingCountWithUnit = ""; - if(recordType == Animal.TYPE_FINGER_POSITION) + if(recordType == Animal.TYPE_PRACTICE) typingCountWithUnit = RecordUtil.getRecordValueWithUnit(animalData.fingerPositionTypingCount, 1); else typingCountWithUnit = RecordUtil.getRecordValueWithUnit(animalData.practiceTypingCount, 1); diff --git a/src/game/main_menu/main_menu.js b/src/game/main_menu/main_menu.js index af07234..65d2d71 100644 --- a/src/game/main_menu/main_menu.js +++ b/src/game/main_menu/main_menu.js @@ -64,9 +64,9 @@ MainMenu.prototype.create = function() { this.appGroupTabLayout = null; this.languageTabLayout = null; - this.selectedAppGroup = MainMenu.APP_GROUP_FINGER_POSITION; + this.selectedAppGroup = MainMenu.APP_GROUP_TYPING_PRACTICE; this.selectedLanguage = MainMenu.LANGUAGE_KOREAN; - // this.animalRecordList.printScore(Animal.TYPE_FINGER_POSITION); + // this.animalRecordList.printScore(Animal.TYPE_PRACTICE); } MainMenu.prototype.fontLoaded = function() { @@ -171,14 +171,14 @@ MainMenu.prototype.updateAppButtons = function(appGroup, appData) { this.removeAllButtons(); switch(parseInt(appGroup)) { - case MainMenu.APP_GROUP_FINGER_POSITION: - this.makeFingerPositionAppButtons(appData); - break; - case MainMenu.APP_GROUP_TYPING_PRACTICE: this.makeTypingPracticeAppButtons(appData); break; + case MainMenu.APP_GROUP_TYPING_TEST: + this.makeTypingTestAppButtons(appData); + break; + case MainMenu.APP_GROUP_TYPING_EXAM: this.makeTypingExamAppButtons(appData); break; @@ -196,13 +196,13 @@ MainMenu.prototype.updateAppButtons = function(appGroup, appData) { } } -MainMenu.prototype.makeFingerPositionAppButtons = function(appData) { - console.log("makeFingerPositionAppButtons"); +MainMenu.prototype.makeTypingPracticeAppButtons = function(appData) { + console.log("makeTypingPracticeAppButtons"); console.log(appData); } -MainMenu.prototype.makeTypingPracticeAppButtons = function(appData) { - console.log("makeTypingPracticeAppButtons"); +MainMenu.prototype.makeTypingTestAppButtons = function(appData) { + console.log("makeTypingTestAppButtons"); console.log(appData); } @@ -261,23 +261,9 @@ MainMenu.prototype.makeButtons = function() { MainMenu.prototype.makeAppGroupTab = function() { this.appGroupTabLayout = new TabLayout(100, 0, 844, 70); - var typingFingerGroupTab = new AppGroupTab( - (function() { - console.log("typing finger position"); - this.selectedAppGroup = MainMenu.APP_GROUP_FINGER_POSITION; - this.animalRecordList.show(); - this.animalRecordList.printScore(Animal.TYPE_FINGER_POSITION); - this.languageTabLayout.show(); - this.loadAppData(); - }).bind(this) - ); - typingFingerGroupTab.reserveIcon("keyboard"); - typingFingerGroupTab.reserveSubText("손가락 위치"); - this.appGroupTabLayout.add(typingFingerGroupTab); - var typingPracticeGroupTab = new AppGroupTab( (function() { - console.log("typing practice"); + console.log("typing finger position"); this.selectedAppGroup = MainMenu.APP_GROUP_TYPING_PRACTICE; this.animalRecordList.show(); this.animalRecordList.printScore(Animal.TYPE_PRACTICE); @@ -286,9 +272,23 @@ MainMenu.prototype.makeAppGroupTab = function() { }).bind(this) ); typingPracticeGroupTab.reserveIcon("keyboard"); - typingPracticeGroupTab.reserveSubText("연습"); + typingPracticeGroupTab.reserveSubText("손가락 연습"); this.appGroupTabLayout.add(typingPracticeGroupTab); + var typingTestGroupTab = new AppGroupTab( + (function() { + console.log("typing practice"); + this.selectedAppGroup = MainMenu.APP_GROUP_TYPING_TEST; + this.animalRecordList.show(); + this.animalRecordList.printScore(Animal.TYPE_TEST); + this.languageTabLayout.show(); + this.loadAppData(); + }).bind(this) + ); + typingTestGroupTab.reserveIcon("keyboard"); + typingTestGroupTab.reserveSubText("시험"); + this.appGroupTabLayout.add(typingTestGroupTab); + var typingExamGroupTab = new AppGroupTab( (function() { console.log("typing exam"); @@ -300,7 +300,7 @@ MainMenu.prototype.makeAppGroupTab = function() { }).bind(this) ); typingExamGroupTab.reserveIcon("keyboard"); - typingExamGroupTab.reserveSubText("시험"); + typingExamGroupTab.reserveSubText("검정"); this.appGroupTabLayout.add(typingExamGroupTab); var typingPlayGroupTab = new AppGroupTab( @@ -332,8 +332,8 @@ MainMenu.prototype.makeAppGroupTab = function() { this.appGroupTabLayout.createTabs(); - // typingFingerGroupTab.setInputEnabled(false); // typingPracticeGroupTab.setInputEnabled(false); + // typingTestGroupTab.setInputEnabled(false); // typingExamGroupTab.setInputEnabled(false); // typingPlayGroupTab.setInputEnabled(false); // mousePlayGroupTab.setInputEnabled(false); @@ -341,7 +341,7 @@ MainMenu.prototype.makeAppGroupTab = function() { MainMenu.prototype.makeAnimalRecordList = function() { this.animalRecordList = new AnimalRecordList(AnimalRecordList.TYPE_MENU); - this.animalRecordList.printScore(Animal.TYPE_FINGER_POSITION); + this.animalRecordList.printScore(Animal.TYPE_PRACTICE); } MainMenu.prototype.makeLanguageTab = function() { @@ -416,7 +416,7 @@ MainMenu.prototype.makeTypingButtons = function(typingPracticeAppCount, typingTe // typing tab buttons var typingPracticeTabButton = new TypingTabButton( TypingTabButton.PRACTICE_BUTTON_POS_X, TypingTabButton.BUTTON_POS_Y, - "", "타자 연습", + "", "타자 시험", (function() { location.href = '../../web/client/menu_typing_practice.html'; }) @@ -426,7 +426,7 @@ MainMenu.prototype.makeTypingButtons = function(typingPracticeAppCount, typingTe var typingTestTabButton = new TypingTabButton( TypingTabButton.TEST_BUTTON_POS_X, TypingTabButton.BUTTON_POS_Y, - "", "타자 시험", + "", "타자 검정", (function() { location.href = '../../web/client/menu_typing_test.html'; }) @@ -512,8 +512,8 @@ MainMenu.prototype.loadFailed = function(replyJSON) { MainMenu.MAIN_MENU_HEIGHT = 70; -MainMenu.APP_GROUP_FINGER_POSITION = 0; -MainMenu.APP_GROUP_TYPING_PRACTICE = 1; +MainMenu.APP_GROUP_TYPING_PRACTICE = 0; +MainMenu.APP_GROUP_TYPING_TEST = 1; MainMenu.APP_GROUP_TYPING_EXAM = 2; MainMenu.APP_GROUP_TYPING_PLAY = 3; MainMenu.APP_GROUP_MOUSE_PLAY = 4; diff --git a/src/web/php/db/menu_collection.php b/src/web/php/db/menu_collection.php index d768b41..c81a199 100644 --- a/src/web/php/db/menu_collection.php +++ b/src/web/php/db/menu_collection.php @@ -6,14 +6,14 @@ class MenuCollection extends DBMethodContainer { switch(intval($appGroupCode)) { case 0: - return "finger position"; - - case 1: return "typing practice"; - case 2: + case 1: return "typing test"; + case 2: + return "typing exam"; + case 3: return "typing play"; @@ -36,13 +36,13 @@ class MenuCollection extends DBMethodContainer public function getTypingAppType($appGroupCode, $language) { switch(intval($appGroupCode)) { - case 0: // typing finger position" + case 0: // typing practice" if(intval($language) === 0) // Korean return 1; else // English return 2; - case 1: // typing practice + case 1: // typing test if(intval($language) === 0) // Korean return 11; else // English @@ -53,6 +53,9 @@ class MenuCollection extends DBMethodContainer return 51; else // English return 52; + + default: + return -1; } } @@ -62,8 +65,8 @@ class MenuCollection extends DBMethodContainer public function getAppList($maestroID, $playerID, $appGroup, $language) { switch($appGroup) { - case 0: // typing finger position - case 1: // typing practice + case 0: // typing practice + case 1: // typing test case 3: // typing play return $this->getTypingAppList($maestroID, $playerID, $appGroup, $language); @@ -134,8 +137,8 @@ class MenuCollection extends DBMethodContainer public function getActiveAppList($maestroID, $playerID, $appGroup, $language) { switch($appGroup) { - case 0: // typing finger position - case 1: // typing practice + case 0: // typing practice + case 1: // typing test case 3: // typing play return $this->getTypingActiveAppList($maestroID, $playerID, $appGroup, $language); @@ -181,8 +184,8 @@ class MenuCollection extends DBMethodContainer public function getHighestRecordList($maestroID, $playerID, $appList) { switch($appGroup) { - case 0: // typing finger position - case 1: // typing practice + case 0: // typing practice + case 1: // typing test return $this->getTypingHighestRecordList($maestroID, $playerID, $appList); case 2: diff --git a/src/web/php/menu/menu_list.php b/src/web/php/menu/menu_list.php index c0d3fbd..790b234 100644 --- a/src/web/php/menu/menu_list.php +++ b/src/web/php/menu/menu_list.php @@ -34,9 +34,14 @@ $jsonBuilder->setData("appGroupName", $menuCollection->getAppGroupName($appGroup $jsonBuilder->setData("languageName", $menuCollection->getLanguageName($language)); $jsonBuilder->setData("appGroup", $appGroup); -$jsonBuilder->setData("appList", $appList); -$jsonBuilder->setData("activeAppList", $activeAppList); -$jsonBuilder->setData("highestRecordList", $highestRecordList); + +$appData["appList"] = $appList; +$appData["activeAppList"] = $activeAppList; +$appData["highestRecordList"] = $highestRecordList; +// $jsonBuilder->setData("appList", $appList); +// $jsonBuilder->setData("activeAppList", $activeAppList); +// $jsonBuilder->setData("highestRecordList", $highestRecordList); +$jsonBuilder->setData("appData", $appData); $jsonBuilder->sendResultSuccess();