From 6c648b65b4279121dc9d8e713717b2eebaf8eb80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?= =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?= Date: Tue, 20 Aug 2019 10:11:00 +0900 Subject: [PATCH] Fix: return to main_menu.html not to menu --- src/game/mouse/card_matching/game.js | 2 +- src/game/mouse/dodge/game.js | 2 +- src/game/mouse/grilled_meat/game.js | 2 +- src/game/mouse/one_to_fifty/game.js | 2 +- src/game/mouse/space_invaders/game.js | 2 +- src/game/typing/examination/game.js | 5 +++-- src/game/typing/practice/game.js | 2 +- src/game/typing/test/game.js | 2 +- src/game/typing/whac_a_mole/game.js | 2 +- src/game/typing/word_flyingsaucer/game.js | 2 +- test/tdd.js | 12 ++++++------ 11 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/game/mouse/card_matching/game.js b/src/game/mouse/card_matching/game.js index 2e628c6..2a4ca7c 100644 --- a/src/game/mouse/card_matching/game.js +++ b/src/game/mouse/card_matching/game.js @@ -154,7 +154,7 @@ var Game = { back: function() { sessionStorageManager.resetPlayingAppData(); - location.href = '../../web/client/menu_app.html'; + location.href = '../../web/client/main_menu.html'; }, /* diff --git a/src/game/mouse/dodge/game.js b/src/game/mouse/dodge/game.js index c7b478e..bab1213 100644 --- a/src/game/mouse/dodge/game.js +++ b/src/game/mouse/dodge/game.js @@ -81,7 +81,7 @@ var Game = { back: function() { sessionStorageManager.resetPlayingAppData(); - location.href = '../../web/client/menu_app.html'; + location.href = '../../web/client/main_menu.html'; }, countDown: function() { diff --git a/src/game/mouse/grilled_meat/game.js b/src/game/mouse/grilled_meat/game.js index a7273ac..44fdf92 100644 --- a/src/game/mouse/grilled_meat/game.js +++ b/src/game/mouse/grilled_meat/game.js @@ -118,7 +118,7 @@ var Game = { back: function() { sessionStorageManager.resetPlayingAppData(); - location.href = '../../web/client/menu_app.html'; + location.href = '../../web/client/main_menu.html'; }, /* diff --git a/src/game/mouse/one_to_fifty/game.js b/src/game/mouse/one_to_fifty/game.js index 31a8de2..f61d5da 100644 --- a/src/game/mouse/one_to_fifty/game.js +++ b/src/game/mouse/one_to_fifty/game.js @@ -108,7 +108,7 @@ var Game = { back: function() { sessionStorageManager.resetPlayingAppData(); - location.href = '../../web/client/menu_app.html'; + location.href = '../../web/client/main_menu.html'; }, diff --git a/src/game/mouse/space_invaders/game.js b/src/game/mouse/space_invaders/game.js index d21b2a8..db3eb72 100644 --- a/src/game/mouse/space_invaders/game.js +++ b/src/game/mouse/space_invaders/game.js @@ -95,7 +95,7 @@ var Game = { back: function() { sessionStorageManager.resetPlayingAppData(); - location.href = '../../web/client/menu_app.html'; + location.href = '../../web/client/main_menu.html'; }, initListeners: function() { diff --git a/src/game/typing/examination/game.js b/src/game/typing/examination/game.js index 73a5bd4..d7b0725 100644 --- a/src/game/typing/examination/game.js +++ b/src/game/typing/examination/game.js @@ -142,7 +142,7 @@ TypingExamination.prototype.fontLoaded = function() { // current text line number / total line number // textStyleBasic.font = "38px Arial"; - textStyleBasic.font = "38px Nanum Gothic Coding"; + textStyleBasic.font = "26px Nanum Gothic Coding"; textStyleBasic.backgroundColor = null; this.textTypingLine = game.add.text( RECORD_POSITION_X, TYPING_CONTENT_Y, @@ -600,7 +600,8 @@ TypingExamination.prototype.playNextContent = function() { TypingExamination.prototype.showPlayingWordNumber = function() { 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() { diff --git a/src/game/typing/practice/game.js b/src/game/typing/practice/game.js index 9dfce9c..fe8d1de 100644 --- a/src/game/typing/practice/game.js +++ b/src/game/typing/practice/game.js @@ -121,7 +121,7 @@ var TypingPractice = { back: function() { sessionStorageManager.resetPlayingAppData(); - location.href = '../../web/client/menu_typing_practice.html'; + location.href = '../../web/client/main_menu.html'; }, startGame: function() { diff --git a/src/game/typing/test/game.js b/src/game/typing/test/game.js index 72a1917..ba301ec 100644 --- a/src/game/typing/test/game.js +++ b/src/game/typing/test/game.js @@ -183,7 +183,7 @@ var TypingTest = { back: function() { sessionStorageManager.resetPlayingAppData(); - location.href = '../../web/client/menu_typing_test.html'; + location.href = '../../web/client/main_menu.html'; }, startGame: function() { diff --git a/src/game/typing/whac_a_mole/game.js b/src/game/typing/whac_a_mole/game.js index de89f47..b697052 100644 --- a/src/game/typing/whac_a_mole/game.js +++ b/src/game/typing/whac_a_mole/game.js @@ -147,7 +147,7 @@ var WhacAMole = { back: function() { sessionStorageManager.resetPlayingAppData(); - location.href = '../../web/client/menu_app.html'; + location.href = '../../web/client/main_menu.html'; }, startGame: function() { diff --git a/src/game/typing/word_flyingsaucer/game.js b/src/game/typing/word_flyingsaucer/game.js index 24ca131..8609d69 100644 --- a/src/game/typing/word_flyingsaucer/game.js +++ b/src/game/typing/word_flyingsaucer/game.js @@ -100,7 +100,7 @@ var WordFlyingSaucer = { back: function() { sessionStorageManager.resetPlayingAppData(); - location.href = '../../web/client/menu_app.html'; + location.href = '../../web/client/main_menu.html'; }, diff --git a/test/tdd.js b/test/tdd.js index a851fc7..6d94da0 100644 --- a/test/tdd.js +++ b/test/tdd.js @@ -146,7 +146,7 @@ QUnit.test( "AppList", function( assert ) { (function(jsonData) { assert.equal(jsonData.appGroup, appGroup, "#3 appGroup : typing play, Korean"); 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"); asyncTypingPlayKorean(); }).bind(this), @@ -790,11 +790,11 @@ QUnit.test( "TypingTextManager - makeExaminationContents", function( assert ) { let contents = typingTextMan.getContents(); assert.equal(contents[0], "냉면 / 김남천", "addTextArray - line 1"); - assert.equal(contents[1], "'냉면'이라는 말에 '평양'이 붙어서 ", "addTextArray - line 2"); - assert.equal(contents[2], "'평양냉면'이라야 비로소 어울리는 격에 맞는 말이 ", "addTextArray - line 3"); - assert.equal(contents[3], "되듯이 냉면은 평양에 있어 대표적인 음식이다. ", "addTextArray - line 4"); - assert.equal(contents[10], "사아자차카타파하가나다라마바사아자차카타파하가나", "addTextArray - line 5"); - assert.equal(contents[11], "다라마바사아자차카타파하", "addTextArray - line 6"); + assert.equal(contents[1], "'냉면'이라는 말에 '평양'이 붙어서 '평양냉면'이라야 ", "addTextArray - line 2"); + assert.equal(contents[2], "비로소 어울리는 격에 맞는 말이 되듯이 냉면은 평양에 ", "addTextArray - line 3"); + assert.equal(contents[3], "있어 대표적인 음식이다. 언제부터 이 냉면이 평양에 ", "addTextArray - line 4"); + assert.equal(contents[8], "가나다라마바사아자차카타파하가나다라마바사아자차카타파하", "addTextArray - line 5"); + assert.equal(contents[9], "가나다라마바사아자차카타파하가나다라마바사아자차카타파하", "addTextArray - line 6"); }); QUnit.test( "TypingTextManager - add", function( assert ) {