diff --git a/src/game/license_timer/chart.js b/src/game/license_timer/chart.js index 126014c..a9a0b00 100644 --- a/src/game/license_timer/chart.js +++ b/src/game/license_timer/chart.js @@ -147,7 +147,7 @@ ChartRecord.getPosY = function(rowIndex) { } ChartRecord.getDefaultFontStyle = function() { - return { font: "28px Arial", fill: "#fff", align: "center" }; + return { font: "26px Arial", fill: "#ffc", align: "center" }; } ChartRecord.GAP_RECORD_Y = 40; diff --git a/src/game/license_timer/input_score.js b/src/game/license_timer/input_score.js index 6336bdd..b8bf745 100644 --- a/src/game/license_timer/input_score.js +++ b/src/game/license_timer/input_score.js @@ -262,9 +262,9 @@ InputScore.prototype.setVisibleSubjectPanel = function(flag, companyName) { } } -InputScore.prototype.onClickCompanySubjectButton = function(subjectName) { - this.setSubjectFullname(subjectName); - this.selectedSubjectData = this.licenseDataManager.getSubjectDataByName(subjectName); +InputScore.prototype.onClickCompanySubjectButton = function(subjectFullname) { + this.setSubjectFullname(subjectFullname); + this.selectedSubjectData = this.licenseDataManager.getSubjectDataByName(subjectFullname); } @@ -282,8 +282,12 @@ InputScore.prototype.makePanelSprite = function(x, y, width, height, color) { InputScore.prototype.onClickSendToServerButton = function() { console.log("send data to server"); + console.log(this.subjectFullname); console.log(this.scoreText.value); + var subjectData = this.licenseDataManager.getSubjectDataByName(this.subjectFullname); + if(subjectData != null) + console.log(subjectData.getGrade(this.scoreText.value)) console.log(this.passwordText.value); } diff --git a/src/game/license_timer/license_data/company_subject.js b/src/game/license_timer/license_data/company_subject.js index 0c3a851..9aa57a8 100644 --- a/src/game/license_timer/license_data/company_subject.js +++ b/src/game/license_timer/license_data/company_subject.js @@ -1,4 +1,4 @@ -var licenseCompanySubjectList = [ +var licenseDataList = [ { companyName: "ITQ", subjectData: [ diff --git a/src/game/license_timer/license_data_manager.js b/src/game/license_timer/license_data_manager.js index 0499f8f..1da07dc 100644 --- a/src/game/license_timer/license_data_manager.js +++ b/src/game/license_timer/license_data_manager.js @@ -21,13 +21,13 @@ function LicenseDataManager() { this.companies = []; this.subjects = []; - // console.log(licenseCompanySubjectList); + // console.log(licenseDataList); this.maxSubjectCount = 0; - for(var i = 0; i < licenseCompanySubjectList.length; i++) { - this.companies[i] = licenseCompanySubjectList[i].companyName; + for(var i = 0; i < licenseDataList.length; i++) { + this.companies[i] = licenseDataList[i].companyName; var subjectCount = 0; - var companyData = licenseCompanySubjectList[i]; + var companyData = licenseDataList[i]; // console.log(companyData); var subjectData = companyData.subjectData; // console.log(subjectData); diff --git a/src/game/license_timer/timer.js b/src/game/license_timer/timer.js index 86c8b90..21af141 100644 --- a/src/game/license_timer/timer.js +++ b/src/game/license_timer/timer.js @@ -135,13 +135,13 @@ Timer.prototype.makeResetButton = function() { Timer.prototype.makePlayButton = function() { var setting = new RoundRectButtonSetting(0, 0, 0, 0); - setting.x = game.world.width - 100; + setting.x = game.world.width - 115; setting.y = this.timerCenterY; setting.width = 120; setting.height = 120; setting.strokeWidthPx = 5; setting.roundAmount = 90; - setting.fontStyle.fontSize = 80; + setting.fontStyle.fontSize = 60; // blue tone setting.setStrokeColor( @@ -172,13 +172,14 @@ Timer.prototype.makePlayButton = function() { Timer.prototype.makePauseButton = function() { var setting = new RoundRectButtonSetting(0, 0, 0, 0); - setting.x = game.world.width - 100; + setting.x = game.world.width - 115; setting.y = this.timerCenterY; setting.width = 120; setting.height = 120; setting.strokeWidthPx = 5; setting.roundAmount = 90; - setting.fontStyle.fontSize = 50; + setting.fontStyle.fontSize = 40; + setting.fontStyle.fontWeight = "bold"; // gray tone setting.setStrokeColor(