From 7caafb712d0d7cb99feda5cbf86d30a38921648c 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: Mon, 16 Sep 2019 00:32:10 +0900 Subject: [PATCH] Fix: test player, test maestro account --- .../lib/flat_button/typing_exam_button.js | 2 ++ src/game/main_menu/main_menu.js | 8 +++++++ src/web/main/free_player_app_menu.html | 2 +- src/web/module/home_section.html | 21 ++++++++----------- src/web/module/maestro_section_main.html | 4 ++-- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/game/lib/flat_button/typing_exam_button.js b/src/game/lib/flat_button/typing_exam_button.js index 896b9bd..b6f1025 100644 --- a/src/game/lib/flat_button/typing_exam_button.js +++ b/src/game/lib/flat_button/typing_exam_button.js @@ -156,9 +156,11 @@ TypingExamButton.prototype.setInputEnabled = function(isEnabled) { if(isEnabled === true) { this.mouseOut(); + this.writingNameText.style.fill = MainColor.LINEN_STRING; this.animal.sprite.alpha = 1; } else { this.buttonDisabled(); + this.writingNameText.style.fill = MainColor.GRAY_STRING; this.animal.sprite.alpha = 0.3; } } diff --git a/src/game/main_menu/main_menu.js b/src/game/main_menu/main_menu.js index aa978f6..90f6cb8 100644 --- a/src/game/main_menu/main_menu.js +++ b/src/game/main_menu/main_menu.js @@ -383,6 +383,14 @@ MainMenu.prototype.updateTypingExamAppButtons = function(appData) { if(i < count) { button.setActive(true); button.updateAppData(appDataList[i]); + console.log(appDataList[i]); + if(isExperiencePlayerAccount() === true) { + var splitedFilename = appDataList[i].filename.split("_"); + var language = splitedFilename[0]; + if(language === "english") { + button.setInputEnabled(false); + } + } } else { button.setActive(true); button.showEmptyDisabled(); diff --git a/src/web/main/free_player_app_menu.html b/src/web/main/free_player_app_menu.html index 2c0bc2b..961e567 100644 --- a/src/web/main/free_player_app_menu.html +++ b/src/web/main/free_player_app_menu.html @@ -64,7 +64,7 @@ sessionStorage.setItem("playerAccountType", playerAccountType); sessionStorage.setItem("playerName", playerName); - location.href = "./../client/menu_app.html"; + location.href = "./../client/main_menu.html"; }, function(errorMessage, errorCode) { diff --git a/src/web/module/home_section.html b/src/web/module/home_section.html index a19c4d1..dfe2e9f 100644 --- a/src/web/module/home_section.html +++ b/src/web/module/home_section.html @@ -1,15 +1,12 @@