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

Fix: return to main_menu.html not to menu

Browse Source
This commit is contained in:
Jisang Park
2019-08-20 10:11:00 +09:00
parent 6dd9a8aa5b
commit 6c648b65b4
11 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/mouse/card_matching/game.js
+1 -1
View File
@@ -154,7 +154,7 @@ var Game = {
back: function() { back: function() {
sessionStorageManager.resetPlayingAppData(); sessionStorageManager.resetPlayingAppData();
location.href = '../../web/client/menu_app.html'; location.href = '../../web/client/main_menu.html';
}, },
/* /*
src/game/mouse/dodge/game.js
+1 -1
View File
@@ -81,7 +81,7 @@ var Game = {
back: function() { back: function() {
sessionStorageManager.resetPlayingAppData(); sessionStorageManager.resetPlayingAppData();
location.href = '../../web/client/menu_app.html'; location.href = '../../web/client/main_menu.html';
}, },
countDown: function() { countDown: function() {
src/game/mouse/grilled_meat/game.js
+1 -1
View File
@@ -118,7 +118,7 @@ var Game = {
back: function() { back: function() {
sessionStorageManager.resetPlayingAppData(); sessionStorageManager.resetPlayingAppData();
location.href = '../../web/client/menu_app.html'; location.href = '../../web/client/main_menu.html';
}, },
/* /*
src/game/mouse/one_to_fifty/game.js
+1 -1
View File
@@ -108,7 +108,7 @@ var Game = {
back: function() { back: function() {
sessionStorageManager.resetPlayingAppData(); sessionStorageManager.resetPlayingAppData();
location.href = '../../web/client/menu_app.html'; location.href = '../../web/client/main_menu.html';
}, },
src/game/mouse/space_invaders/game.js
+1 -1
View File
@@ -95,7 +95,7 @@ var Game = {
back: function() { back: function() {
sessionStorageManager.resetPlayingAppData(); sessionStorageManager.resetPlayingAppData();
location.href = '../../web/client/menu_app.html'; location.href = '../../web/client/main_menu.html';
}, },
initListeners: function() { initListeners: function() {
src/game/typing/examination/game.js
+3 -2
View File
@@ -142,7 +142,7 @@ TypingExamination.prototype.fontLoaded = function() {
// current text line number / total line number // current text line number / total line number
// textStyleBasic.font = "38px Arial"; // textStyleBasic.font = "38px Arial";
textStyleBasic.font = "38px Nanum Gothic Coding"; textStyleBasic.font = "26px Nanum Gothic Coding";
textStyleBasic.backgroundColor = null; textStyleBasic.backgroundColor = null;
this.textTypingLine = game.add.text( this.textTypingLine = game.add.text(
RECORD_POSITION_X, TYPING_CONTENT_Y, RECORD_POSITION_X, TYPING_CONTENT_Y,
@@ -600,7 +600,8 @@ TypingExamination.prototype.playNextContent = function() {
TypingExamination.prototype.showPlayingWordNumber = function() { TypingExamination.prototype.showPlayingWordNumber = function() {
var currentLine = this.typingIndex + 1; var currentLine = this.typingIndex + 1;
this.textTypingLine.text = currentLine + " / " + this.typingContentLength; // this.textTypingLine.text = currentLine + " / " + this.typingContentLength;
this.textTypingLine.text = "9,999/9,999";
} }
TypingExamination.prototype.setTimeTypingStart = function() { TypingExamination.prototype.setTimeTypingStart = function() {
src/game/typing/practice/game.js
+1 -1
View File
@@ -121,7 +121,7 @@ var TypingPractice = {
back: function() { back: function() {
sessionStorageManager.resetPlayingAppData(); sessionStorageManager.resetPlayingAppData();
location.href = '../../web/client/menu_typing_practice.html'; location.href = '../../web/client/main_menu.html';
}, },
startGame: function() { startGame: function() {
src/game/typing/test/game.js
+1 -1
View File
@@ -183,7 +183,7 @@ var TypingTest = {
back: function() { back: function() {
sessionStorageManager.resetPlayingAppData(); sessionStorageManager.resetPlayingAppData();
location.href = '../../web/client/menu_typing_test.html'; location.href = '../../web/client/main_menu.html';
}, },
startGame: function() { startGame: function() {
src/game/typing/whac_a_mole/game.js
+1 -1
View File
@@ -147,7 +147,7 @@ var WhacAMole = {
back: function() { back: function() {
sessionStorageManager.resetPlayingAppData(); sessionStorageManager.resetPlayingAppData();
location.href = '../../web/client/menu_app.html'; location.href = '../../web/client/main_menu.html';
}, },
startGame: function() { startGame: function() {
src/game/typing/word_flyingsaucer/game.js
+1 -1
View File
@@ -100,7 +100,7 @@ var WordFlyingSaucer = {
back: function() { back: function() {
sessionStorageManager.resetPlayingAppData(); sessionStorageManager.resetPlayingAppData();
location.href = '../../web/client/menu_app.html'; location.href = '../../web/client/main_menu.html';
}, },
test/tdd.js
+6 -6
View File
@@ -146,7 +146,7 @@ QUnit.test( "AppList", function( assert ) {
(function(jsonData) { (function(jsonData) {
assert.equal(jsonData.appGroup, appGroup, "#3 appGroup : typing play, Korean"); assert.equal(jsonData.appGroup, appGroup, "#3 appGroup : typing play, Korean");
assert.equal(jsonData.appData.appList.length, 2, "appList"); assert.equal(jsonData.appData.appList.length, 2, "appList");
assert.equal(jsonData.appData.activeAppList.length, 1, "activeAppList"); assert.equal(jsonData.appData.activeAppList.length, 2, "activeAppList");
assert.equal(jsonData.appData.highestRecordList.length, 2, "highestRecordList"); assert.equal(jsonData.appData.highestRecordList.length, 2, "highestRecordList");
asyncTypingPlayKorean(); asyncTypingPlayKorean();
}).bind(this), }).bind(this),
@@ -790,11 +790,11 @@ QUnit.test( "TypingTextManager - makeExaminationContents", function( assert ) {
let contents = typingTextMan.getContents(); let contents = typingTextMan.getContents();
assert.equal(contents[0], "냉면 / 김남천", "addTextArray - line 1"); assert.equal(contents[0], "냉면 / 김남천", "addTextArray - line 1");
assert.equal(contents[1], "'냉면'이라는 말에 '평양'이 붙어서 ", "addTextArray - line 2"); assert.equal(contents[1], "'냉면'이라는 말에 '평양'이 붙어서 '평양냉면'이라야 ", "addTextArray - line 2");
assert.equal(contents[2], "'평양냉면'이라야 비로소 어울리는 격에 맞는 말이 ", "addTextArray - line 3"); assert.equal(contents[2], "비로소 어울리는 격에 맞는 말이 되듯이 냉면은 평양에 ", "addTextArray - line 3");
assert.equal(contents[3], "되듯이 냉면은 평양에 있어 대표적인 음식이다. ", "addTextArray - line 4"); assert.equal(contents[3], "있어 대표적인 음식이다. 언제부터 이 냉면이 평양에 ", "addTextArray - line 4");
assert.equal(contents[10], "사아자차카타파하가나다라마바사아자차카타파하가나", "addTextArray - line 5"); assert.equal(contents[8], "가나다라마바사아자차카타파하가나다라마바사아자차카타파하", "addTextArray - line 5");
assert.equal(contents[11], "다라마바사아자차카타파하", "addTextArray - line 6"); assert.equal(contents[9], "가나다라마바사아자차카타파하가나다라마바사아자차카타파하", "addTextArray - line 6");
}); });
QUnit.test( "TypingTextManager - add", function( assert ) { QUnit.test( "TypingTextManager - add", function( assert ) {