From f8310d775ad518b255e6e27509330f7c0d4ce09e 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, 9 Sep 2019 11:27:53 +0900 Subject: [PATCH] Fix: typing app button - record text color --- src/game/lib/flat_button/typing_app_button.js | 7 ++++--- src/game/lib/flat_button/typing_exam_button.js | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/game/lib/flat_button/typing_app_button.js b/src/game/lib/flat_button/typing_app_button.js index 8d81aeb..98be602 100644 --- a/src/game/lib/flat_button/typing_app_button.js +++ b/src/game/lib/flat_button/typing_app_button.js @@ -85,13 +85,14 @@ TypingAppButton.prototype.setTypingRecordText = function(record) { var noDataAlpha = 0.3; if(typeof(record) === "undefined") { this.animal.sprite.alpha = noDataAlpha; - this.typingRecordText.style.fill = MainColor.CHOCO_STRING; + this.typingRecordText.style.fill = MainColor.GRAY_STRING; this.typingRecordText.text = "기록 없음"; } else if(record === 0) { this.animal.sprite.alpha = noDataAlpha; - this.typingRecordText.style.fill = MainColor.CHOCO_STRING; + this.typingRecordText.style.fill = MainColor.GRAY_STRING; this.typingRecordText.text = "기록 없음"; } else { + this.typingRecordText.style.fill = MainColor.WHITE_SMOKE_STRING; var recordWithUnit = RecordUtil.getRecordValueWithUnit(record, typingAppID); this.typingRecordText.text = recordWithUnit; } @@ -264,7 +265,7 @@ TypingAppButton.HEIGHT = 80; TypingAppButton.KEYBOARD_WIDTH = 100; -TypingAppButton.ANIMAL_OFFSET_Y = -6; +TypingAppButton.ANIMAL_OFFSET_Y = -7; TypingAppButton.STROKE_COLOR_OUT_HEX = MainColor.LIGHT_CHOCO_HEX; TypingAppButton.STROKE_COLOR_OVER_HEX = MainColor.LIGHT_CHOCO_HEX; diff --git a/src/game/lib/flat_button/typing_exam_button.js b/src/game/lib/flat_button/typing_exam_button.js index 7d406c6..328a55f 100644 --- a/src/game/lib/flat_button/typing_exam_button.js +++ b/src/game/lib/flat_button/typing_exam_button.js @@ -82,7 +82,7 @@ TypingExamButton.prototype.makeTypingRecordText = function(x, y) { typingRecordText.anchor.set(0.5, 0.5); typingRecordText.font = this.setting.font; typingRecordText.fontSize = 13; - typingRecordText.style.fill = MainColor.LIGHTER_CHOCO_STRING; + typingRecordText.style.fill = MainColor.WHITE_STRING; // MainColor.LIGHTER_CHOCO_STRING; typingRecordText.lineSpacing = ButtonSetting.DEFAULT_TEXT_LINE_SPACING_PX; return typingRecordText; @@ -102,13 +102,14 @@ TypingExamButton.prototype.setTypingRecordText = function(record) { var noDataAlpha = 0.3; if(typeof(record) === "undefined") { this.animal.sprite.alpha = noDataAlpha; - this.typingRecordText.style.fill = MainColor.CHOCO_STRING; + this.typingRecordText.style.fill = MainColor.GRAY_STRING; this.typingRecordText.text = "기록 없음"; } else if(record === 0) { this.animal.sprite.alpha = noDataAlpha; - this.typingRecordText.style.fill = MainColor.CHOCO_STRING; + this.typingRecordText.style.fill = MainColor.GRAY_STRING; this.typingRecordText.text = "기록 없음"; } else { + this.typingRecordText.style.fill = MainColor.WHITE_SMOKE_STRING; var recordWithUnit = RecordUtil.getRecordValueWithUnit(record, typingExamAppID); this.typingRecordText.text = recordWithUnit; } @@ -222,7 +223,7 @@ TypingExamButton.loadResources = function() { TypingExamButton.WIDTH = 400; TypingExamButton.HEIGHT = 80; -TypingExamButton.ANIMAL_OFFSET_Y = -6; +TypingExamButton.ANIMAL_OFFSET_Y = -7; TypingExamButton.STROKE_COLOR_OUT_HEX = MainColor.LIGHT_CHOCO_HEX; TypingExamButton.STROKE_COLOR_OVER_HEX = MainColor.LIGHT_CHOCO_HEX;