diff --git a/bounce/assets/scripts/boll.js b/bounce/assets/scripts/boll.js index a5277fa..8e8ffdc 100644 --- a/bounce/assets/scripts/boll.js +++ b/bounce/assets/scripts/boll.js @@ -2,7 +2,7 @@ cc.Class({ extends: cc.Component, properties: { - + }, onBeginContact: function (contact, selfCollider, otherCollider) { @@ -14,9 +14,11 @@ cc.Class({ // 判断label数值是否为1 if (labelValue == 1) { box.node.destroy(); - } else { + } else { label.string = (--labelValue).toString(); } + var colorArr = this.hslToRgb(labelValue * 0.025, 0.5, 0.5); + box.node.setColor(cc.color(colorArr[0], colorArr[1], colorArr[2])); } if (otherCollider.node.name == "lifeBox") { cc.audioEngine.playEffect(selfCollider.node.game.circleAudio, false); @@ -24,4 +26,28 @@ cc.Class({ selfCollider.node.game.addBolls ++; } }, + + hslToRgb: function (h, s, l) { + var r, g, b; + if(s == 0) { + r = g = b = l; // achromatic + } else { + var hue2rgb = function hue2rgb(p, q, t) { + if(t < 0) t += 1; + if(t > 1) t -= 1; + if(t < 1/6) return p + (q - p) * 6 * t; + if(t < 1/2) return q; + if(t < 2/3) return p + (q - p) * (2/3 - t) * 6; + return p; + } + var q = l < 0.5 ? l * (1 + s) : l + s - l * s; + var p = 2 * l - q; + r = hue2rgb(p, q, h + 1/3); + g = hue2rgb(p, q, h); + b = hue2rgb(p, q, h - 1/3); + } + return [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)]; + } + + }); diff --git a/bounce/assets/scripts/bounceGame.js b/bounce/assets/scripts/bounceGame.js index 30b8dee..604d669 100644 --- a/bounce/assets/scripts/bounceGame.js +++ b/bounce/assets/scripts/bounceGame.js @@ -227,7 +227,6 @@ cc.Class({ hslToRgb: function (h, s, l) { var r, g, b; - if(s == 0) { r = g = b = l; // achromatic } else { @@ -239,14 +238,12 @@ cc.Class({ if(t < 2/3) return p + (q - p) * (2/3 - t) * 6; return p; } - var q = l < 0.5 ? l * (1 + s) : l + s - l * s; var p = 2 * l - q; r = hue2rgb(p, q, h + 1/3); g = hue2rgb(p, q, h); b = hue2rgb(p, q, h - 1/3); } - return [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)]; } diff --git a/bounce/settings/project.json b/bounce/settings/project.json index c7826e5..4478186 100644 --- a/bounce/settings/project.json +++ b/bounce/settings/project.json @@ -49,5 +49,6 @@ "width": 960 }, "use-customize-simulator": false, - "use-project-simulator-setting": false + "use-project-simulator-setting": false, + "start-scene": "current" } \ No newline at end of file diff --git a/start_project/library/uuid-to-mtime.json b/start_project/library/uuid-to-mtime.json index d298c93..91437f2 100644 --- a/start_project/library/uuid-to-mtime.json +++ b/start_project/library/uuid-to-mtime.json @@ -291,22 +291,22 @@ }, "99170b0b-d210-46f1-b213-7d9e3f23098a": { "asset": 1523971143000, - "meta": 1525143648186, + "meta": 1525156213123, "relativePath": "image/default_progressbar_bg.png" }, "cfef78f1-c8df-49b7-8ed0-4c953ace2621": { "asset": 1523971143000, - "meta": 1525143648188, + "meta": 1525156213124, "relativePath": "image/default_progressbar.png" }, "567dcd80-8bf4-4535-8a5a-313f1caf078a": { "asset": 1523971143000, - "meta": 1525143648211, + "meta": 1525156213143, "relativePath": "image/default_radio_button_off.png" }, "9d60001f-b5f4-4726-a629-2659e3ded0b8": { "asset": 1523971143000, - "meta": 1525143648212, + "meta": 1525156213145, "relativePath": "image/default_radio_button_on.png" } } \ No newline at end of file diff --git a/start_project/local/logs/project.log b/start_project/local/logs/project.log index 8c71f26..d2e759b 100644 --- a/start_project/local/logs/project.log +++ b/start_project/local/logs/project.log @@ -51,3 +51,5 @@ 2018-04-29T10:42:39.858Z - normal: Run Application 2018-04-29T10:42:40.242Z - success: preview server running at http://localhost:7456 2018-04-29T10:42:45.120Z - normal: 1.9.1 +2018-05-01T03:47:23.690Z - warn: Error: ipc timeout. message: scene:query-node, session: scene@renderer:326658 +2018-05-01T06:30:14.955Z - info: shutdown preview server