diff --git a/resources/image/ui/keyboard/key_position.sketch b/resources/image/ui/keyboard/key_position.sketch index 0985469..4142740 100644 Binary files a/resources/image/ui/keyboard/key_position.sketch and b/resources/image/ui/keyboard/key_position.sketch differ diff --git a/src/game/lib/flat_button/app_group_tab.js b/src/game/lib/flat_button/app_group_tab.js index e266745..85a17a2 100644 --- a/src/game/lib/flat_button/app_group_tab.js +++ b/src/game/lib/flat_button/app_group_tab.js @@ -95,7 +95,7 @@ AppGroupTab.ACTIVE_LINE_COLOR_OVER_HEX = MainColor.CHOCO_HEX; AppGroupTab.ACTIVE_LINE_COLOR_DOWN_HEX = MainColor.LIGHTER_CHOCO_HEX; AppGroupTab.ACTIVE_LINE_COLOR_DISABLED_HEX = MainColor.BLACK_HEX; -AppGroupTab.ICON_COLOR_OUT_HEX = MainColor.LIGHT_CHOCO_HEX; +AppGroupTab.ICON_COLOR_OUT_HEX = MainColor.PAPAYA_WHIP_HEX; // MainColor.LIGHT_CHOCO_HEX; AppGroupTab.ICON_COLOR_OVER_HEX = MainColor.CHOCO_HEX; AppGroupTab.ICON_COLOR_DOWN_HEX = MainColor.LIGHT_CHOCO_HEX; AppGroupTab.ICON_COLOR_DISABLED_HEX = MainColor.DARK_CHOCO_HEX; diff --git a/src/game/result/result.js b/src/game/result/result.js index d3c2227..092a92c 100644 --- a/src/game/result/result.js +++ b/src/game/result/result.js @@ -62,6 +62,9 @@ var Result = { back: function() { + location.href = '../../web/client/main_menu.html'; + + /* if(isTypingExamApp()) location.href = '../../web/client/menu_typing_exam.html'; else if(isTypingPracticeApp()) @@ -72,6 +75,7 @@ var Result = { location.href = '../../web/client/menu_app.html'; sessionStorageManager.resetPlayingAppData(); + */ }, printRecord: function() { diff --git a/src/game/start/start.js b/src/game/start/start.js index d14afad..97ff6df 100644 --- a/src/game/start/start.js +++ b/src/game/start/start.js @@ -98,6 +98,11 @@ var Start = { back: function() { + location.href = '../../web/client/main_menu.html'; + + /* + sessionStorageManager.resetPlayingAppData(); + if(isTypingExamApp()) location.href = '../../web/client/menu_typing_exam.html'; else if(isTypingPracticeApp()) @@ -106,8 +111,7 @@ var Start = { location.href = '../../web/client/menu_typing_test.html'; else location.href = '../../web/client/menu_app.html'; - - sessionStorageManager.resetPlayingAppData(); + */ }, loadHowToPlay: function(appID) { diff --git a/src/game/typing/examination/game.js b/src/game/typing/examination/game.js index 5ab1452..a3407dd 100644 --- a/src/game/typing/examination/game.js +++ b/src/game/typing/examination/game.js @@ -269,7 +269,8 @@ var TypingExamination = { back: function() { sessionStorageManager.resetPlayingAppData(); - location.href = '../../web/client/menu_typing_exam.html'; + // location.href = '../../web/client/menu_typing_exam.html'; + location.href = '../../web/client/main_menu.html'; }, startGame: function() { @@ -358,10 +359,10 @@ var TypingExamination = { var directory = writer + writerID + "/"; var filename = writingInfo["filename"]; var url = path + directory + filename; - if(isDebugMode()) { - url = path + "system/sample.txt"; - console.log(url); - } + // if(isDebugMode()) { + // url = path + "system/sample.txt"; + // console.log(url); + // } game.load.onLoadComplete.add(this.completeLoadingWriting, this); game.load.text("writing", url);