From a02e75e06a8aaf2728ffb369bd621e06cac1cb68 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: Fri, 10 May 2019 20:45:25 +0900 Subject: [PATCH] Fix: chocoball size smaller --- src/game/mouse/one_to_fifty/chocoball.js | 14 +++++++------- src/game/mouse/one_to_fifty/game.js | 13 ++++++++----- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/game/mouse/one_to_fifty/chocoball.js b/src/game/mouse/one_to_fifty/chocoball.js index 1f76d64..08a1337 100644 --- a/src/game/mouse/one_to_fifty/chocoball.js +++ b/src/game/mouse/one_to_fifty/chocoball.js @@ -118,9 +118,9 @@ Chocoball.FONT_STYLE = { font: "50px Arial", boundsAlignH: "center", // left, center. right boundsAlignV: "middle", // top, middle, bottom - fill: "#fff", + fill: "rgba(255, 255, 255, 0.9)", // "#fff", fontWeight: "bold", - stroke: "rgba(0, 0, 0, 0.5)", // "#333", // "#000", + stroke: "rgba(0, 0, 0, 0.3)", // "#333", // "#000", strokeThickness: 12, align: "center" }; @@ -131,11 +131,11 @@ Chocoball.DEFAULT_STROKE_WIDTH_PX = 5; // in pixel Chocoball.RADIUS = 90; Chocoball.COLOR_BLACK = 0x553333; -Chocoball.COLOR_1_TO_10 = 0x3355ff; -Chocoball.COLOR_11_TO_20 = 0xff5533; -Chocoball.COLOR_21_TO_30 = 0x33ff55; -Chocoball.COLOR_31_TO_40 = 0xffff33; -Chocoball.COLOR_41_TO_50 = 0x33ffff; +Chocoball.COLOR_1_TO_10 = 0x0090ff; // blue +Chocoball.COLOR_11_TO_20 = 0xff2000; // red +Chocoball.COLOR_21_TO_30 = 0x00ff30; // green +Chocoball.COLOR_31_TO_40 = 0xffff33; // yellow +Chocoball.COLOR_41_TO_50 = 0x33ffff; // Chocoball.MODE_EASY = 0; Chocoball.MODE_DIFFICULT = 1; \ No newline at end of file diff --git a/src/game/mouse/one_to_fifty/game.js b/src/game/mouse/one_to_fifty/game.js index 79c5381..8b2f9c8 100644 --- a/src/game/mouse/one_to_fifty/game.js +++ b/src/game/mouse/one_to_fifty/game.js @@ -52,6 +52,8 @@ var Game = { this.nextNumber = 1; this.difficulty = Chocoball.MODE_DIFFICULT; + // this.difficulty = Chocoball.MODE_EASY; + // if previous record is over 60 sec, play easy mode var prevRecord = sessionStorageManager.getRecord() // console.log(prevRecord); @@ -138,17 +140,18 @@ var Game = { onClickChocoball: function(chocoball) { // console.log(chocoball.index); // console.log(chocoball.number); + if(chocoball.number != this.nextNumber) { + console.log("wrong"); + this.god.animateAngry(); + return; + } + if(chocoball.number == 50) { // console.log("game clear"); chocoball.setVisible(false); this.gameClear(); return; } - if(chocoball.number != this.nextNumber) { - console.log("wrong"); - this.god.animateAngry(); - return; - } // clicked correct number if(chocoball.number == 1)