jisangs/chocomae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: finger position -> practice, practice -> test

Browse Source
This commit is contained in:
Jisang Park
2019-08-10 17:52:28 +09:00
parent 8e7fe46905
commit 2faa90a9e3
5 changed files with 59 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/lib/animal.js
+2 -2
View File
@@ -92,8 +92,8 @@ Animal.loadResources = function() {
Animal.TYPE_ANIMATION = 0; Animal.TYPE_ANIMATION = 0;
Animal.TYPE_ICON = 1; Animal.TYPE_ICON = 1;
Animal.TYPE_FINGER_POSITION = 0; Animal.TYPE_PRACTICE = 0;
Animal.TYPE_PRACITICE = 1; Animal.TYPE_TEST = 1;
Animal.TYPE_EXAM = 1; Animal.TYPE_EXAM = 1;
Animal.ANIMATION_TYPE_CHANGE = 0; Animal.ANIMATION_TYPE_CHANGE = 0;
src/game/lib/animal_record_list.js
+1 -1
View File
@@ -82,7 +82,7 @@ AnimalRecordList.prototype.printScore = function(recordType) {
var recordText = this.texts[i]; var recordText = this.texts[i];
var typingCountWithUnit = ""; var typingCountWithUnit = "";
if(recordType == Animal.TYPE_FINGER_POSITION) if(recordType == Animal.TYPE_PRACTICE)
typingCountWithUnit = RecordUtil.getRecordValueWithUnit(animalData.fingerPositionTypingCount, 1); typingCountWithUnit = RecordUtil.getRecordValueWithUnit(animalData.fingerPositionTypingCount, 1);
else else
typingCountWithUnit = RecordUtil.getRecordValueWithUnit(animalData.practiceTypingCount, 1); typingCountWithUnit = RecordUtil.getRecordValueWithUnit(animalData.practiceTypingCount, 1);
src/game/main_menu/main_menu.js
+33 -33
View File
@@ -64,9 +64,9 @@ MainMenu.prototype.create = function() {
this.appGroupTabLayout = null; this.appGroupTabLayout = null;
this.languageTabLayout = null; this.languageTabLayout = null;
this.selectedAppGroup = MainMenu.APP_GROUP_FINGER_POSITION; this.selectedAppGroup = MainMenu.APP_GROUP_TYPING_PRACTICE;
this.selectedLanguage = MainMenu.LANGUAGE_KOREAN; this.selectedLanguage = MainMenu.LANGUAGE_KOREAN;
// this.animalRecordList.printScore(Animal.TYPE_FINGER_POSITION); // this.animalRecordList.printScore(Animal.TYPE_PRACTICE);
} }
MainMenu.prototype.fontLoaded = function() { MainMenu.prototype.fontLoaded = function() {
@@ -171,14 +171,14 @@ MainMenu.prototype.updateAppButtons = function(appGroup, appData) {
this.removeAllButtons(); this.removeAllButtons();
switch(parseInt(appGroup)) { switch(parseInt(appGroup)) {
case MainMenu.APP_GROUP_FINGER_POSITION:
this.makeFingerPositionAppButtons(appData);
break;
case MainMenu.APP_GROUP_TYPING_PRACTICE: case MainMenu.APP_GROUP_TYPING_PRACTICE:
this.makeTypingPracticeAppButtons(appData); this.makeTypingPracticeAppButtons(appData);
break; break;
case MainMenu.APP_GROUP_TYPING_TEST:
this.makeTypingTestAppButtons(appData);
break;
case MainMenu.APP_GROUP_TYPING_EXAM: case MainMenu.APP_GROUP_TYPING_EXAM:
this.makeTypingExamAppButtons(appData); this.makeTypingExamAppButtons(appData);
break; break;
@@ -196,13 +196,13 @@ MainMenu.prototype.updateAppButtons = function(appGroup, appData) {
} }
} }
MainMenu.prototype.makeFingerPositionAppButtons = function(appData) { MainMenu.prototype.makeTypingPracticeAppButtons = function(appData) {
console.log("makeFingerPositionAppButtons"); console.log("makeTypingPracticeAppButtons");
console.log(appData); console.log(appData);
} }
MainMenu.prototype.makeTypingPracticeAppButtons = function(appData) { MainMenu.prototype.makeTypingTestAppButtons = function(appData) {
console.log("makeTypingPracticeAppButtons"); console.log("makeTypingTestAppButtons");
console.log(appData); console.log(appData);
} }
@@ -261,23 +261,9 @@ MainMenu.prototype.makeButtons = function() {
MainMenu.prototype.makeAppGroupTab = function() { MainMenu.prototype.makeAppGroupTab = function() {
this.appGroupTabLayout = new TabLayout(100, 0, 844, 70); 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( var typingPracticeGroupTab = new AppGroupTab(
(function() { (function() {
console.log("typing practice"); console.log("typing finger position");
this.selectedAppGroup = MainMenu.APP_GROUP_TYPING_PRACTICE; this.selectedAppGroup = MainMenu.APP_GROUP_TYPING_PRACTICE;
this.animalRecordList.show(); this.animalRecordList.show();
this.animalRecordList.printScore(Animal.TYPE_PRACTICE); this.animalRecordList.printScore(Animal.TYPE_PRACTICE);
@@ -286,9 +272,23 @@ MainMenu.prototype.makeAppGroupTab = function() {
}).bind(this) }).bind(this)
); );
typingPracticeGroupTab.reserveIcon("keyboard"); typingPracticeGroupTab.reserveIcon("keyboard");
typingPracticeGroupTab.reserveSubText("연습"); typingPracticeGroupTab.reserveSubText("손가락 연습");
this.appGroupTabLayout.add(typingPracticeGroupTab); 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( var typingExamGroupTab = new AppGroupTab(
(function() { (function() {
console.log("typing exam"); console.log("typing exam");
@@ -300,7 +300,7 @@ MainMenu.prototype.makeAppGroupTab = function() {
}).bind(this) }).bind(this)
); );
typingExamGroupTab.reserveIcon("keyboard"); typingExamGroupTab.reserveIcon("keyboard");
typingExamGroupTab.reserveSubText("시험"); typingExamGroupTab.reserveSubText("검정");
this.appGroupTabLayout.add(typingExamGroupTab); this.appGroupTabLayout.add(typingExamGroupTab);
var typingPlayGroupTab = new AppGroupTab( var typingPlayGroupTab = new AppGroupTab(
@@ -332,8 +332,8 @@ MainMenu.prototype.makeAppGroupTab = function() {
this.appGroupTabLayout.createTabs(); this.appGroupTabLayout.createTabs();
// typingFingerGroupTab.setInputEnabled(false);
// typingPracticeGroupTab.setInputEnabled(false); // typingPracticeGroupTab.setInputEnabled(false);
// typingTestGroupTab.setInputEnabled(false);
// typingExamGroupTab.setInputEnabled(false); // typingExamGroupTab.setInputEnabled(false);
// typingPlayGroupTab.setInputEnabled(false); // typingPlayGroupTab.setInputEnabled(false);
// mousePlayGroupTab.setInputEnabled(false); // mousePlayGroupTab.setInputEnabled(false);
@@ -341,7 +341,7 @@ MainMenu.prototype.makeAppGroupTab = function() {
MainMenu.prototype.makeAnimalRecordList = function() { MainMenu.prototype.makeAnimalRecordList = function() {
this.animalRecordList = new AnimalRecordList(AnimalRecordList.TYPE_MENU); this.animalRecordList = new AnimalRecordList(AnimalRecordList.TYPE_MENU);
this.animalRecordList.printScore(Animal.TYPE_FINGER_POSITION); this.animalRecordList.printScore(Animal.TYPE_PRACTICE);
} }
MainMenu.prototype.makeLanguageTab = function() { MainMenu.prototype.makeLanguageTab = function() {
@@ -416,7 +416,7 @@ MainMenu.prototype.makeTypingButtons = function(typingPracticeAppCount, typingTe
// typing tab buttons // typing tab buttons
var typingPracticeTabButton = new TypingTabButton( var typingPracticeTabButton = new TypingTabButton(
TypingTabButton.PRACTICE_BUTTON_POS_X, TypingTabButton.BUTTON_POS_Y, TypingTabButton.PRACTICE_BUTTON_POS_X, TypingTabButton.BUTTON_POS_Y,
"", "타자 연습", "", "타자 시험",
(function() { (function() {
location.href = '../../web/client/menu_typing_practice.html'; location.href = '../../web/client/menu_typing_practice.html';
}) })
@@ -426,7 +426,7 @@ MainMenu.prototype.makeTypingButtons = function(typingPracticeAppCount, typingTe
var typingTestTabButton = new TypingTabButton( var typingTestTabButton = new TypingTabButton(
TypingTabButton.TEST_BUTTON_POS_X, TypingTabButton.BUTTON_POS_Y, TypingTabButton.TEST_BUTTON_POS_X, TypingTabButton.BUTTON_POS_Y,
"", "타자 시험", "", "타자 검정",
(function() { (function() {
location.href = '../../web/client/menu_typing_test.html'; location.href = '../../web/client/menu_typing_test.html';
}) })
@@ -512,8 +512,8 @@ MainMenu.prototype.loadFailed = function(replyJSON) {
MainMenu.MAIN_MENU_HEIGHT = 70; MainMenu.MAIN_MENU_HEIGHT = 70;
MainMenu.APP_GROUP_FINGER_POSITION = 0; MainMenu.APP_GROUP_TYPING_PRACTICE = 0;
MainMenu.APP_GROUP_TYPING_PRACTICE = 1; MainMenu.APP_GROUP_TYPING_TEST = 1;
MainMenu.APP_GROUP_TYPING_EXAM = 2; MainMenu.APP_GROUP_TYPING_EXAM = 2;
MainMenu.APP_GROUP_TYPING_PLAY = 3; MainMenu.APP_GROUP_TYPING_PLAY = 3;
MainMenu.APP_GROUP_MOUSE_PLAY = 4; MainMenu.APP_GROUP_MOUSE_PLAY = 4;
src/web/php/db/menu_collection.php
+15 -12
View File
@@ -6,14 +6,14 @@ class MenuCollection extends DBMethodContainer
{ {
switch(intval($appGroupCode)) { switch(intval($appGroupCode)) {
case 0: case 0:
return "finger position";
case 1:
return "typing practice"; return "typing practice";
case 2: case 1:
return "typing test"; return "typing test";
case 2:
return "typing exam";
case 3: case 3:
return "typing play"; return "typing play";
@@ -36,13 +36,13 @@ class MenuCollection extends DBMethodContainer
public function getTypingAppType($appGroupCode, $language) public function getTypingAppType($appGroupCode, $language)
{ {
switch(intval($appGroupCode)) { switch(intval($appGroupCode)) {
case 0: // typing finger position" case 0: // typing practice"
if(intval($language) === 0) // Korean if(intval($language) === 0) // Korean
return 1; return 1;
else // English else // English
return 2; return 2;
case 1: // typing practice case 1: // typing test
if(intval($language) === 0) // Korean if(intval($language) === 0) // Korean
return 11; return 11;
else // English else // English
@@ -53,6 +53,9 @@ class MenuCollection extends DBMethodContainer
return 51; return 51;
else // English else // English
return 52; return 52;
default:
return -1;
} }
} }
@@ -62,8 +65,8 @@ class MenuCollection extends DBMethodContainer
public function getAppList($maestroID, $playerID, $appGroup, $language) public function getAppList($maestroID, $playerID, $appGroup, $language)
{ {
switch($appGroup) { switch($appGroup) {
case 0: // typing finger position case 0: // typing practice
case 1: // typing practice case 1: // typing test
case 3: // typing play case 3: // typing play
return $this->getTypingAppList($maestroID, $playerID, $appGroup, $language); return $this->getTypingAppList($maestroID, $playerID, $appGroup, $language);
@@ -134,8 +137,8 @@ class MenuCollection extends DBMethodContainer
public function getActiveAppList($maestroID, $playerID, $appGroup, $language) public function getActiveAppList($maestroID, $playerID, $appGroup, $language)
{ {
switch($appGroup) { switch($appGroup) {
case 0: // typing finger position case 0: // typing practice
case 1: // typing practice case 1: // typing test
case 3: // typing play case 3: // typing play
return $this->getTypingActiveAppList($maestroID, $playerID, $appGroup, $language); return $this->getTypingActiveAppList($maestroID, $playerID, $appGroup, $language);
@@ -181,8 +184,8 @@ class MenuCollection extends DBMethodContainer
public function getHighestRecordList($maestroID, $playerID, $appList) public function getHighestRecordList($maestroID, $playerID, $appList)
{ {
switch($appGroup) { switch($appGroup) {
case 0: // typing finger position case 0: // typing practice
case 1: // typing practice case 1: // typing test
return $this->getTypingHighestRecordList($maestroID, $playerID, $appList); return $this->getTypingHighestRecordList($maestroID, $playerID, $appList);
case 2: case 2:
src/web/php/menu/menu_list.php
+8 -3
View File
@@ -34,9 +34,14 @@ $jsonBuilder->setData("appGroupName", $menuCollection->getAppGroupName($appGroup
$jsonBuilder->setData("languageName", $menuCollection->getLanguageName($language)); $jsonBuilder->setData("languageName", $menuCollection->getLanguageName($language));
$jsonBuilder->setData("appGroup", $appGroup); $jsonBuilder->setData("appGroup", $appGroup);
$jsonBuilder->setData("appList", $appList);
$jsonBuilder->setData("activeAppList", $activeAppList); $appData["appList"] = $appList;
$jsonBuilder->setData("highestRecordList", $highestRecordList); $appData["activeAppList"] = $activeAppList;
$appData["highestRecordList"] = $highestRecordList;
// $jsonBuilder->setData("appList", $appList);
// $jsonBuilder->setData("activeAppList", $activeAppList);
// $jsonBuilder->setData("highestRecordList", $highestRecordList);
$jsonBuilder->setData("appData", $appData);
$jsonBuilder->sendResultSuccess(); $jsonBuilder->sendResultSuccess();