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

Fix: AnimalRecordList, Animal.TYPE_FINGER_POSITION / TYPE_PRACTICE / (TYPE_EXAM)

Browse Source
This commit is contained in:
Jisang Park
2019-08-07 22:28:02 +09:00
parent b205787545
commit 8aee96fb51
6 changed files with 112 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/main_menu/main_menu.js
+26 -24
View File
@@ -66,7 +66,7 @@ MainMenu.prototype.create = function() {
this.selectedAppGroup = MainMenu.APP_GROUP_FINGER_POSITION;
this.selectedLanguage = MainMenu.LANGUAGE_KOREAN;
// this.animalRecordList.printScore(AnimalList.TYPE_PRACTICE);
// this.animalRecordList.printScore(Animal.TYPE_FINGER_POSITION);
}
MainMenu.prototype.fontLoaded = function() {
@@ -173,8 +173,8 @@ MainMenu.prototype.updateAppButtons = function(appGroup, appData) {
this.makeTypingPracticeAppButtons();
break;
case MainMenu.APP_GROUP_TYPING_TEST:
this.makeTypingTestAppButtons();
case MainMenu.APP_GROUP_TYPING_EXAM:
this.makeTypingExamAppButtons();
break;
case MainMenu.APP_GROUP_TYPING_PLAY:
@@ -188,6 +188,7 @@ MainMenu.prototype.updateAppButtons = function(appGroup, appData) {
}
}
/*
MainMenu.prototype.loadSucceeded = function(replyJSON) {
// console.log(replyJSON);
@@ -211,6 +212,7 @@ MainMenu.prototype.hasApp = function(appID, appList) {
return false;
}
*/
MainMenu.prototype.makeButtons = function() {
this.backButton = new BackButton(
@@ -230,6 +232,7 @@ MainMenu.prototype.makeAppGroupTab = 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();
}).bind(this)
);
@@ -242,6 +245,7 @@ MainMenu.prototype.makeAppGroupTab = function() {
console.log("typing practice");
this.selectedAppGroup = MainMenu.APP_GROUP_TYPING_PRACTICE;
this.animalRecordList.show();
this.animalRecordList.printScore(Animal.TYPE_PRACTICE);
this.languageTabLayout.show();
}).bind(this)
);
@@ -249,27 +253,24 @@ MainMenu.prototype.makeAppGroupTab = function() {
typingPracticeGroupTab.reserveSubText("연습");
this.appGroupTabLayout.add(typingPracticeGroupTab);
var typingTestGroupTab = new AppGroupTab(
var typingExamGroupTab = new AppGroupTab(
(function() {
console.log("typing test");
this.selectedAppGroup = MainMenu.APP_GROUP_TYPING_TEST;
console.log("typing exam");
this.selectedAppGroup = MainMenu.APP_GROUP_TYPING_EXAM;
this.animalRecordList.show();
this.animalRecordList.printScore(Animal.TYPE_EXAM);
this.languageTabLayout.show();
}).bind(this)
);
typingTestGroupTab.reserveIcon("keyboard");
typingTestGroupTab.reserveSubText("시험");
this.appGroupTabLayout.add(typingTestGroupTab);
typingExamGroupTab.reserveIcon("keyboard");
typingExamGroupTab.reserveSubText("시험");
this.appGroupTabLayout.add(typingExamGroupTab);
// var typingPlayGroupTab = new AppGroupTab( (function() { console.log("typing test"); }).bind(this) );
var typingPlayGroupTab = new AppGroupTab(
(function() { console.log("typing play"); }).bind(this)
);
var typingPlayGroupTab = new AppGroupTab(
(function() {
console.log("typing play");
this.selectedAppGroup = MainMenu.APP_GROUP_TYPING_PLAY;
this.animalRecordList.show();
this.animalRecordList.hide();
this.languageTabLayout.show();
}).bind(this)
);
@@ -277,14 +278,12 @@ MainMenu.prototype.makeAppGroupTab = function() {
typingPlayGroupTab.reserveSubText("놀이");
this.appGroupTabLayout.add(typingPlayGroupTab);
// var mousePlayGroupTab = new AppGroupTab( (function() { console.log("mouse play"); }).bind(this) );
var mousePlayGroupTab = new AppGroupTab(
(function() { console.log("mouse play"); this.animalRecordList.hide(); this.languageTabLayout.hide(); }).bind(this)
);
var typingFingerGroupTab = new AppGroupTab(
(function() {
console.log("typing finger position");
this.selectedAppGroup = MainMenu.APP_GROUP_FINGER_POSITION;
console.log("mouse play");
this.selectedAppGroup = MainMenu.APP_GROUP_MOUSE_PLAY;
this.animalRecordList.hide();
this.languageTabLayout.hide();
}).bind(this)
);
mousePlayGroupTab.reserveIcon("mouse");
@@ -296,19 +295,20 @@ MainMenu.prototype.makeAppGroupTab = function() {
// typingFingerGroupTab.setInputEnabled(false);
// typingPracticeGroupTab.setInputEnabled(false);
// typingTestGroupTab.setInputEnabled(false);
// typingExamGroupTab.setInputEnabled(false);
// typingPlayGroupTab.setInputEnabled(false);
// mousePlayGroupTab.setInputEnabled(false);
}
MainMenu.prototype.makeAnimalRecordList = function() {
this.animalRecordList = new AnimalRecordList(AnimalRecordList.TYPE_MENU);
this.animalRecordList.printScore(AnimalList.TYPE_TEST);
this.animalRecordList.printScore(Animal.TYPE_FINGER_POSITION);
}
MainMenu.prototype.makeLanguageTab = function() {
var languageTabHeight = 48;
this.languageTabLayout = new TabLayout(0, GAME_SCREEN_SIZE.y - languageTabHeight, GAME_SCREEN_SIZE.x, languageTabHeight);
// this.languageTabLayout = new TabLayout(0, GAME_SCREEN_SIZE.y - languageTabHeight, GAME_SCREEN_SIZE.x, languageTabHeight);
this.languageTabLayout = new TabLayout(0, 70, GAME_SCREEN_SIZE.x, languageTabHeight);
var koreanTab = new LanguageTab(
(function() {
@@ -332,6 +332,7 @@ MainMenu.prototype.makeLanguageTab = function() {
}
/*
MainMenu.prototype.makeMouseAppButtons = function(appList, activeAppList) {
// console.log(appList);
@@ -461,6 +462,7 @@ MainMenu.prototype.getButtonPosY = function(index, buttonCount, startPosY) {
var startY = startPosY - ( (gap / 2) * (rowCount - 1) );
return startY + gap * rowIndex;
}
*/
MainMenu.prototype.loadFailed = function(replyJSON) {
// console.log('login failed, jsonData : ' + JSON.stringify(replyJSON));
@@ -471,7 +473,7 @@ MainMenu.MAIN_MENU_HEIGHT = 70;
MainMenu.APP_GROUP_FINGER_POSITION = 0;
MainMenu.APP_GROUP_TYPING_PRACTICE = 1;
MainMenu.APP_GROUP_TYPING_TEST = 2;
MainMenu.APP_GROUP_TYPING_EXAM = 2;
MainMenu.APP_GROUP_TYPING_PLAY = 3;
MainMenu.APP_GROUP_MOUSE_PLAY = 4;