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

Fix: make game app button and typing app button smaller

Browse Source
This commit is contained in:
Jisang Park
2018-09-01 15:11:59 +09:00
parent 5ff260f05f
commit 29539e9ce7
8 changed files with 100 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/menu/menu_app.js
+3 -2
View File
@@ -82,7 +82,8 @@ class MenuApp {
let app = appList[i];
let gameAppButton = new GameAppButton(
posX, posY, GameAppButton.TYPE_MOUSE_APP,
"icon_fullscreen", app.KoreanName,
RoundRectButton.NONE_ICON, // "icon_fullscreen",
app.KoreanName,
() => {
sessionStorageManager.playingAppID = app.AppID;
sessionStorageManager.playingAppName = app.AppName;
@@ -145,7 +146,7 @@ class MenuApp {
let gameAppButton = new GameAppButton(
posX, posY, GameAppButton.TYPE_TYPING_APP,
"icon_fullscreen",
RoundRectButton.NONE_ICON, // "icon_fullscreen",
// (isKoreanTypingApp ? "(한글)" : "(영문)") + "\n" + app.KoreanName,
app.KoreanName,
() => {
src/game/menu/menu_typing_practice.js
+12 -12
View File
@@ -72,7 +72,7 @@ class MenuTypingPractice {
downloadListSucceeded(replyJSON) {
// console.log(replyJSON);
let buttonWidthGap = TypingPracticeButton.BUTTON_WIDTH + MenuTypingPractice.BUTTON_GAP;
let buttonWidthGap = TypingAppButton.BUTTON_WIDTH + MenuTypingPractice.BUTTON_GAP;
let koreanTypingPracticeAppCount = Object.keys(replyJSON.KoreanAppList).length;
let englishTypingPracticeAppCount = Object.keys(replyJSON.EnglishAppList).length;
@@ -82,12 +82,12 @@ class MenuTypingPractice {
let posX = self.getButtonPosX(i, koreanTypingPracticeAppCount);
let posY = self.getButtonPosY(i, koreanTypingPracticeAppCount,
TypingPracticeButton.BUTTON_UPPER_POS_Y
TypingAppButton.BUTTON_UPPER_POS_Y
);
let typingPracticeButton = new TypingPracticeButton(
let typingPracticeButton = new TypingAppButton(
posX, posY,
TypingPracticeButton.NONE_ICON,
TypingAppButton.NONE_ICON,
activeApp.KoreanName,
() => {
sessionStorageManager.playingAppID = activeApp.AppID;
@@ -106,12 +106,12 @@ class MenuTypingPractice {
let posX = self.getButtonPosX(i, englishTypingPracticeAppCount);
let posY = self.getButtonPosY(i, englishTypingPracticeAppCount,
TypingPracticeButton.BUTTON_LOWER_POS_Y
TypingAppButton.BUTTON_LOWER_POS_Y
);
let typingPracticeButton = new TypingPracticeButton(
let typingPracticeButton = new TypingAppButton(
posX, posY,
TypingPracticeButton.NONE_ICON,
TypingAppButton.NONE_ICON,
activeApp.KoreanName,
() => {
sessionStorageManager.playingAppID = activeApp.AppID;
@@ -127,8 +127,8 @@ class MenuTypingPractice {
}
getButtonPosX(index, buttonCount) {
let gap = TypingPracticeButton.BUTTON_WIDTH + TypingPracticeButton.BUTTON_GAP;
let maxColumnNum = Math.floor( (game.world.width - TypingPracticeButton.MARGIN_VERTICAL) / gap );
let gap = TypingAppButton.BUTTON_WIDTH + TypingAppButton.BUTTON_GAP;
let maxColumnNum = Math.floor( (game.world.width - TypingAppButton.MARGIN_VERTICAL) / gap );
// console.log("maxColumnNum : " + maxColumnNum);
let rowCount = Math.ceil(buttonCount / maxColumnNum);
// console.log("rowCount : " + rowCount);
@@ -150,10 +150,10 @@ class MenuTypingPractice {
}
getButtonPosY(index, buttonCount, startPosY) {
let rowGap = TypingPracticeButton.BUTTON_HEIGHT + TypingPracticeButton.BUTTON_GAP;
let rowGap = TypingAppButton.BUTTON_HEIGHT + TypingAppButton.BUTTON_GAP;
let columnGap = TypingPracticeButton.BUTTON_WIDTH + TypingPracticeButton.BUTTON_GAP;
let maxColumnNum = Math.floor( (game.world.width - TypingPracticeButton.MARGIN_VERTICAL) / columnGap );
let columnGap = TypingAppButton.BUTTON_WIDTH + TypingAppButton.BUTTON_GAP;
let maxColumnNum = Math.floor( (game.world.width - TypingAppButton.MARGIN_VERTICAL) / columnGap );
// console.log("maxColumnNum : " + maxColumnNum);
// console.log("buttonCount : " + buttonCount);
let rowCount = Math.ceil(buttonCount / maxColumnNum);
src/game/menu/menu_typing_test.js
+12 -12
View File
@@ -71,7 +71,7 @@ class MenuTypingTest {
downloadListSucceeded(replyJSON) {
// console.log(replyJSON);
let buttonWidthGap = TypingPracticeButton.BUTTON_WIDTH + MenuTypingTest.BUTTON_GAP;
let buttonWidthGap = TypingAppButton.BUTTON_WIDTH + MenuTypingTest.BUTTON_GAP;
let koreanTypingPracticeAppCount = Object.keys(replyJSON.KoreanAppList).length;
let englishTypingPracticeAppCount = Object.keys(replyJSON.EnglishAppList).length;
@@ -81,12 +81,12 @@ class MenuTypingTest {
let posX = self.getButtonPosX(i, koreanTypingPracticeAppCount);
let posY = self.getButtonPosY(i, koreanTypingPracticeAppCount,
TypingPracticeButton.BUTTON_UPPER_POS_Y
TypingAppButton.BUTTON_UPPER_POS_Y
);
let typingTestButton = new TypingPracticeButton(
let typingTestButton = new TypingAppButton(
posX, posY,
TypingPracticeButton.NONE_ICON,
TypingAppButton.NONE_ICON,
activeApp.KoreanName,
() => {
sessionStorageManager.playingAppID = activeApp.AppID;
@@ -105,12 +105,12 @@ class MenuTypingTest {
let posX = self.getButtonPosX(i, englishTypingPracticeAppCount);
let posY = self.getButtonPosY(i, englishTypingPracticeAppCount,
TypingPracticeButton.BUTTON_LOWER_POS_Y
TypingAppButton.BUTTON_LOWER_POS_Y
);
let typingTestButton = new TypingPracticeButton(
let typingTestButton = new TypingAppButton(
posX, posY,
TypingPracticeButton.NONE_ICON,
TypingAppButton.NONE_ICON,
activeApp.KoreanName,
() => {
sessionStorageManager.playingAppID = activeApp.AppID;
@@ -126,8 +126,8 @@ class MenuTypingTest {
}
getButtonPosX(index, buttonCount) {
let gap = TypingPracticeButton.BUTTON_WIDTH + TypingPracticeButton.BUTTON_GAP;
let maxColumnNum = Math.floor( (game.world.width - TypingPracticeButton.MARGIN_VERTICAL) / gap );
let gap = TypingAppButton.BUTTON_WIDTH + TypingAppButton.BUTTON_GAP;
let maxColumnNum = Math.floor( (game.world.width - TypingAppButton.MARGIN_VERTICAL) / gap );
// console.log("maxColumnNum : " + maxColumnNum);
let rowCount = Math.ceil(buttonCount / maxColumnNum);
// console.log("rowCount : " + rowCount);
@@ -149,10 +149,10 @@ class MenuTypingTest {
}
getButtonPosY(index, buttonCount, startPosY) {
let rowGap = TypingPracticeButton.BUTTON_HEIGHT + TypingPracticeButton.BUTTON_GAP;
let rowGap = TypingAppButton.BUTTON_HEIGHT + TypingAppButton.BUTTON_GAP;
let columnGap = TypingPracticeButton.BUTTON_WIDTH + TypingPracticeButton.BUTTON_GAP;
let maxColumnNum = Math.floor( (game.world.width - TypingPracticeButton.MARGIN_VERTICAL) / columnGap );
let columnGap = TypingAppButton.BUTTON_WIDTH + TypingAppButton.BUTTON_GAP;
let maxColumnNum = Math.floor( (game.world.width - TypingAppButton.MARGIN_VERTICAL) / columnGap );
// console.log("maxColumnNum : " + maxColumnNum);
// console.log("buttonCount : " + buttonCount);
let rowCount = Math.ceil(buttonCount / maxColumnNum);