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

Fix: refactoring appButton

Browse Source
This commit is contained in:
Jisang Park
2018-06-02 22:12:19 +09:00
parent 73bdb38c56
commit e3bcd3bb12
13 changed files with 216 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/menu/menu_app.js
+2 -2
View File
@@ -55,7 +55,7 @@ class MenuApp {
let activeApp = replyJSON[i];
if(self.isMouseApp(activeApp)) {
mouseAppIndex++;
new AppButton(startX + 150 * mouseAppIndex, 300, AppButton.TYPE_MOUSE,
new GameAppButton(startX + 150 * mouseAppIndex, 300, AppButton.TYPE_MOUSE,
activeApp.AppName, AppButton.NONE_BUTTON_TEXT,
() => {
sessionStorageManager.playingAppID = activeApp.AppID;
@@ -67,7 +67,7 @@ class MenuApp {
}
if(typingPracticeAppCount > 0) {
new AppButton(game.world.width / 2, 500, AppButton.TYPE_TYPING,
new GameAppButton(game.world.width / 2, 500, AppButton.TYPE_TYPING,
"icon_fullscreen", "타자 연습\n(임시)",
() => {
location.href = '../../web/client/menu_typing_practice.html';
src/game/menu/menu_typing_practice.js
+13 -11
View File
@@ -45,17 +45,17 @@ class MenuTypingPractice {
loginSucceeded(replyJSON) {
// console.log(replyJSON);
let mouseAppCount = self.getAppCount(replyJSON, AppButton.TYPE_MOUSE);
let typingAppCount = self.getAppCount(replyJSON, AppButton.TYPE_TYPING);
let koreanTypingPracticeAppCount = 1; // self.getAppCount(replyJSON, AppButton.TYPE_MOUSE);
let englishTypingPracticeAppCount = 1; // self.getAppCount(replyJSON, AppButton.TYPE_TYPING);
let startX = game.world.width / 2 - (150 * mouseAppCount / 2) - (150 / 2);
let mouseAppIndex = 0;
let startX = game.world.width / 2 - (150 * koreanTypingPracticeAppCount / 2) - (150 / 2);
let koreanTypingPracticeAppIndex = 0;
for(let i = 0; i < replyJSON.length; i++) {
let activeApp = replyJSON[i];
if(self.isMouseApp(activeApp)) {
mouseAppIndex++;
new AppButton(startX + 150 * mouseAppIndex, 300, AppButton.TYPE_MOUSE,
AppButton.NONE_ICON, "양손 기본",
koreanTypingPracticeAppIndex++;
new TypingPracticeButton(startX + 150 * koreanTypingPracticeAppIndex, 300, TypingPracticeButton.TYPE_ENGLISH,
TypingPracticeButton.NONE_ICON, "양손 기본",
() => {
sessionStorageManager.playingAppID = activeApp.AppID;
sessionStorageManager.playingAppName = activeApp.AppName;
@@ -65,11 +65,13 @@ class MenuTypingPractice {
}
}
if(typingAppCount > 0) {
new AppButton(game.world.width / 2, 500, AppButton.TYPE_TYPING,
AppButton.NONE_ICON, "검지 글쇠",
if(englishTypingPracticeAppCount > 0) {
new TypingPracticeButton(game.world.width / 2, 500, TypingPracticeButton.TYPE_KOREAN,
TypingPracticeButton.NONE_ICON, "검지 글쇠",
() => {
location.href = '../../web/client/menu_typing_app.html';
sessionStorageManager.playingAppID = activeApp.AppID;
sessionStorageManager.playingAppName = activeApp.AppName;
location.href = '../../web/client/start.html';
}
);
}