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

Fix: typing app menu

Browse Source
This commit is contained in:
Jisang Park
2018-06-07 08:57:10 +09:00
parent 26b47536dc
commit 670d48cbc7
8 changed files with 110 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/lib/db_connect_manager.js
+1 -1
View File
@@ -119,7 +119,7 @@ class DBConnectManager {
requestTypingPracticeAppList(maestroID, onSucceededListener, onFailedListener) {
let xhr = new XMLHttpRequest();
xhr.open("POST", this.phpPath + "server/app/active_typing_practice_app_list.php", true);
xhr.open("POST", this.phpPath + "server/app/menu_active_typing_practice_app_list.php", true);
xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
xhr.onreadystatechange = function() {
if(xhr.readyState == 4 && xhr.status == 200) {
src/game/lib/game_app_button.js
+1
View File
@@ -77,6 +77,7 @@ GameAppButton.BUTTON_WIDTH = 150;
GameAppButton.BUTTON_HEIGHT = 150;
GameAppButton.BUTTON_GAP = 20;
GameAppButton.MARGIN_VERTICAL = 100;
GameAppButton.BUTTON_UPPER_POS_Y = 200;
GameAppButton.BUTTON_LOWER_POS_Y = 540;
src/game/lib/typing_practice_button.js
+11 -5
View File
@@ -1,12 +1,12 @@
class TypingPracticeButton extends AppButton {
constructor(x, y, type, iconName, buttonText, clickEvent) {
let setting = new RoundRectButtonSetting(200, 100);
let setting = new RoundRectButtonSetting(TypingPracticeButton.BUTTON_WIDTH, TypingPracticeButton.BUTTON_HEIGHT);
setting.fontStyle.boundsAlignH = "center"; // left, center. right
setting.fontStyle.boundsAlignV = "middle"; // top, middle, bottom
setting.strokeWidthPx = 5;
if(type === TypingPracticeButton.TYPE_KOREAN) {
if(type === LANGUAGE_KOREAN) {
setting.setStrokeColor(
0xaa6666,
0x884444,
@@ -25,7 +25,7 @@ class TypingPracticeButton extends AppButton {
"#844",
"#333"
);
} else { // TYPE_ENGLISH
} else { // LANGUAGE_ENGLISH
setting.setStrokeColor(
0x444488,
0x6666aa,
@@ -72,5 +72,11 @@ class TypingPracticeButton extends AppButton {
}
TypingPracticeButton.TYPE_KOREAN = "한글";
TypingPracticeButton.TYPE_ENGLISH = "영문";
TypingPracticeButton.BUTTON_WIDTH = 200;
TypingPracticeButton.BUTTON_HEIGHT = 100;
TypingPracticeButton.BUTTON_GAP = 20;
TypingPracticeButton.MARGIN_VERTICAL = 100;
TypingPracticeButton.BUTTON_UPPER_POS_Y = 200;
TypingPracticeButton.BUTTON_LOWER_POS_Y = 540;
src/game/menu/menu_app.js
+2 -4
View File
@@ -120,7 +120,7 @@ class MenuApp {
getButtonPosX(index, buttonCount) {
let gap = GameAppButton.BUTTON_WIDTH + GameAppButton.BUTTON_GAP;
let maxColumnNum = Math.floor( (game.world.width - MenuApp.MARGIN_VERTICAL) / gap );
let maxColumnNum = Math.floor( (game.world.width - GameAppButton.MARGIN_VERTICAL) / gap );
// console.log("maxColumnNum : " + maxColumnNum);
let rowCount = Math.ceil(buttonCount / maxColumnNum);
// console.log("rowCount : " + rowCount);
@@ -143,7 +143,7 @@ class MenuApp {
getButtonPosY(index, buttonCount, startPosY) {
let gap = GameAppButton.BUTTON_HEIGHT + GameAppButton.BUTTON_GAP;
let maxColumnNum = Math.floor( (game.world.width - MenuApp.MARGIN_VERTICAL) / gap );
let maxColumnNum = Math.floor( (game.world.width - GameAppButton.MARGIN_VERTICAL) / gap );
// console.log("maxColumnNum : " + maxColumnNum);
let rowCount = Math.ceil(buttonCount / maxColumnNum);
// console.log("rowCount : " + rowCount);
@@ -160,5 +160,3 @@ class MenuApp {
}
}
MenuApp.MARGIN_VERTICAL = 100;
src/game/menu/menu_typing_practice.js
+60 -60
View File
@@ -23,8 +23,7 @@ class MenuTypingPractice {
let screenBottom = new ScreenBottom();
screenBottom.makeBottomLine();
// screenBottom.printBottomLeftText("게임 진행 정보");
let playingAppName = appInfoManager.getAppNameKorean(sessionStorageManager.playingAppName);
screenBottom.printBottomCenterText(playingAppName);
screenBottom.printBottomCenterText("타자 연습");
screenBottom.printBottomRightText(sessionStorageManager.playerName);
@@ -43,25 +42,27 @@ class MenuTypingPractice {
}
loginSucceeded(replyJSON) {
console.log(replyJSON);
// console.log(replyJSON);
let buttonWidthGap = MenuTypingPractice.BUTTON_WIDTH + MenuTypingPractice.BUTTON_GAP;
let buttonWidthGap = TypingPracticeButton.BUTTON_WIDTH + MenuTypingPractice.BUTTON_GAP;
let koreanTypingPracticeAppCount = self.getAppCount(replyJSON, MenuTypingPractice.TYPE_KOREAN);
let englishTypingPracticeAppCount = self.getAppCount(replyJSON, MenuTypingPractice.TYPE_ENGLISH);
let koreanTypingPracticeAppCount = Object.keys(replyJSON.Korean).length;
let englishTypingPracticeAppCount = Object.keys(replyJSON.English).length;
// let startX = game.world.width / 2 - (buttonWidthGap * koreanTypingPracticeAppCount / 2) - (buttonWidthGap / 2);
// let koreanTypingPracticeAppIndex = 0;
for(let i = 0; i < koreanTypingPracticeAppCount; i++) {
let activeApp = replyJSON.Korean[i];
let posX = self.getButtonPosX(i, koreanTypingPracticeAppCount);
let posY = self.getButtonPosY(i, koreanTypingPracticeAppCount,
TypingPracticeButton.BUTTON_UPPER_POS_Y
);
let startX = game.world.width / 2 - (buttonWidthGap * koreanTypingPracticeAppCount / 2) - (buttonWidthGap / 2);
let koreanTypingPracticeAppIndex = 0;
for(let i = 0; i < replyJSON.length; i++) {
let activeApp = replyJSON[i];
if(self.isKoreanApp(activeApp)) {
koreanTypingPracticeAppIndex++;
console.log(activeApp);
new TypingPracticeButton(
startX + buttonWidthGap * koreanTypingPracticeAppIndex, 300,
TypingPracticeButton.TYPE_KOREAN,
posX, posY, LANGUAGE_KOREAN,
TypingPracticeButton.NONE_ICON,
appInfoManager.getAppNameKorean(activeApp.AppName),
activeApp.KoreanName,
() => {
sessionStorageManager.playingAppID = activeApp.AppID;
sessionStorageManager.playingAppName = activeApp.AppName;
@@ -69,20 +70,20 @@ class MenuTypingPractice {
}
);
}
}
startX = game.world.width / 2 - (buttonWidthGap * koreanTypingPracticeAppCount / 2) - (buttonWidthGap / 2);
let englishTypingPracticeAppIndex = 0;
for(let i = 0; i < replyJSON.length; i++) {
let activeApp = replyJSON[i];
if(!self.isKoreanApp(activeApp)) {
englishTypingPracticeAppIndex++;
console.log(activeApp);
// startX = game.world.width / 2 - (buttonWidthGap * englishTypingPracticeAppCount / 2) - (buttonWidthGap / 2);
for(let i = 0; i < englishTypingPracticeAppCount; i++) {
let activeApp = replyJSON.English[i];
let posX = self.getButtonPosX(i, englishTypingPracticeAppCount);
let posY = self.getButtonPosY(i, englishTypingPracticeAppCount,
TypingPracticeButton.BUTTON_LOWER_POS_Y
);
new TypingPracticeButton(
startX + buttonWidthGap * englishTypingPracticeAppIndex, 500,
TypingPracticeButton.TYPE_ENGLISH,
posX, posY, LANGUAGE_ENGLISH,
TypingPracticeButton.NONE_ICON,
appInfoManager.getAppNameKorean(activeApp.AppName),
activeApp.KoreanName,
() => {
sessionStorageManager.playingAppID = activeApp.AppID;
sessionStorageManager.playingAppName = activeApp.AppName;
@@ -92,47 +93,46 @@ class MenuTypingPractice {
}
}
/*
if(englishTypingPracticeAppCount > 0) {
new TypingPracticeButton(game.world.width / 2, 500, TypingPracticeButton.TYPE_KOREAN,
TypingPracticeButton.NONE_ICON, "검지 글쇠",
() => {
sessionStorageManager.playingAppID = activeApp.AppID;
sessionStorageManager.playingAppName = activeApp.AppName;
location.href = '../../web/client/start.html';
}
);
}
*/
getButtonPosX(index, buttonCount) {
let gap = TypingPracticeButton.BUTTON_WIDTH + TypingPracticeButton.BUTTON_GAP;
let maxColumnNum = Math.floor( (game.world.width - TypingPracticeButton.MARGIN_VERTICAL) / gap );
// console.log("maxColumnNum : " + maxColumnNum);
let rowCount = Math.ceil(buttonCount / maxColumnNum);
// console.log("rowCount : " + rowCount);
let columnIndex = index % maxColumnNum;
// console.log("columnIndex : " + columnIndex);
let rowIndex = Math.floor(index / maxColumnNum);
// console.log("rowIndex : " + rowIndex);
let columnCountForThisRow = 0;
if(rowIndex < rowCount - 1)
columnCountForThisRow = maxColumnNum;
else
columnCountForThisRow = buttonCount - (maxColumnNum * rowIndex);
// console.log("columnCountForThisRow : " + columnCountForThisRow);
let startX = game.world.width / 2 - ( (gap / 2) * (columnCountForThisRow - 1) );
return startX + gap * columnIndex;
}
isKoreanApp(app) {
if(app.AppType === MenuTypingPractice.TYPE_KOREAN)
return true;
getButtonPosY(index, buttonCount, startPosY) {
let gap = TypingPracticeButton.BUTTON_HEIGHT + TypingPracticeButton.BUTTON_GAP;
let maxColumnNum = Math.floor( (game.world.width - TypingPracticeButton.MARGIN_VERTICAL) / gap );
// console.log("maxColumnNum : " + maxColumnNum);
let rowCount = Math.ceil(buttonCount / maxColumnNum);
// console.log("rowCount : " + rowCount);
return false;
let rowIndex = Math.floor(index / maxColumnNum);
// console.log("rowIndex : " + rowIndex);
let startY = startPosY - ( (gap / 2) * (rowCount - 1) );
return startY + gap * rowIndex;
}
getAppCount(replyJSON, type) {
let appCount = 0;
for(let i = 0; i < replyJSON.length; i++) {
let activeApp = replyJSON[i];
if(activeApp.AppType === type)
appCount++;
}
return appCount;
}
loginFailed(replyJSON) {
console.log('login failed, jsonData : ' + JSON.stringify(replyJSON));
}
}
MenuTypingPractice.TYPE_KOREAN = 10;
MenuTypingPractice.TYPE_ENGLISH = 20;
MenuTypingPractice.BUTTON_WIDTH = 200;
MenuTypingPractice.BUTTON_GAP = 20;
src/web/server/app/active_typing_practice_app_list.php → src/web/server/app/menu_active_typing_practice_app_list.php
+9 -7
View File
@@ -8,7 +8,8 @@ $maestro_id = $_POST["maestro_id"];
include "./../setup/connect_db.php";
$replyJSON = get_active_typing_practice_app_list($maestro_id);
$replyJSON["Korean"] = get_active_typing_practice_app_list($maestro_id, 10);
$replyJSON["English"] = get_active_typing_practice_app_list($maestro_id, 20);
$db_conn->close();
if($replyJSON.length === 0) {
@@ -22,23 +23,24 @@ $db_conn->close();
function get_active_typing_practice_app_list($maestro_id) {
function get_active_typing_practice_app_list($maestro_id, $type) {
global $db_conn;
$query = "
SELECT A.AppID, A.AppName, A.AppType
SELECT A.AppID, A.AppName, A.KoreanName
FROM moty_app AS A
INNER JOIN moty_active_app AS AA ON A.AppType < 50 AND A.AppID = AA.AppID AND AA.MaestroID=?";
INNER JOIN moty_active_app AS AA ON A.AppType < 50 AND A.AppID = AA.AppID AND AA.MaestroID = ? AND A.AppType = ?
ORDER BY A.AppID ASC";
$stmt = $db_conn->prepare($query);
$stmt->bind_param('i', $maestro_id);
$stmt->bind_param('ii', $maestro_id, $type);
$stmt->execute();
$stmt->bind_result($app_id, $app_name, $app_type);
$stmt->bind_result($app_id, $app_name, $korean_name);
$return_array = array();
while($stmt->fetch()) {
$row_array['AppID'] = $app_id;
$row_array['AppName'] = $app_name;
$row_array['AppType'] = $app_type;
$row_array['KoreanName'] = $korean_name;
array_push($return_array, $row_array);
}
$stmt->close();
test/test_db_connect_manager.js
+4 -4
View File
@@ -38,12 +38,12 @@ QUnit.test( "Player history", function( assert ) {
// console.log(historyRecordManager);
assert.equal(historyRecordManager.getAppNameAt(0), "korean_word");
assert.equal(historyRecordManager.getDateAt(0), "2018-05-14");
assert.equal(historyRecordManager.getBestRecordAt(0), 101.78);
assert.equal(historyRecordManager.getDateAt(0), "2018-05-16");
assert.equal(historyRecordManager.getBestRecordAt(0), 108.248);
assert.equal(historyRecordManager.getAppNameAt(4), "korean_word");
assert.equal(historyRecordManager.getDateAt(4), "2018-04-18");
assert.equal(historyRecordManager.getBestRecordAt(4), 51.6102);
assert.equal(historyRecordManager.getDateAt(4), "2018-04-23");
assert.equal(historyRecordManager.getBestRecordAt(4), 74.2234);
done();
}