From 75e92b5f74f8d81b7350e7edd35022e3235af5d9 Mon Sep 17 00:00:00 2001 From: fanxuehan <fanxuehan@qq.com> Date: Tue, 16 Mar 2021 14:01:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B6=85=E8=BF=875=E4=B8=AA=E9=A2=98?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=8F=B3=E4=BE=A7=E6=98=9F=E6=98=9F?= =?UTF-8?q?=E7=BC=A9=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 14340 -> 14340 bytes play/assets/et_13/script/et_13.js | 17 ++++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.DS_Store b/.DS_Store index 342a654970739e5a106e62e97c262433f45c3599..c19f7e2d30d6d6e7e93366029be4910a2bde1d8e 100644 GIT binary patch delta 16 XcmZoEXerpxDLVO_M&agPqFhP<LGlM5 delta 16 XcmZoEXerpxDLOe$A#d|{QC=kgJ|YIB diff --git a/play/assets/et_13/script/et_13.js b/play/assets/et_13/script/et_13.js index ea017de..765cebb 100644 --- a/play/assets/et_13/script/et_13.js +++ b/play/assets/et_13/script/et_13.js @@ -99,7 +99,7 @@ cc.Class({ }, getDefaultData() { - const dataJson = '{"groupArr":[{"ques":"","optionArr":[{"type":"text","isRight":"1","text":"pad"},{"type":"text","isRight":"0","text":"bdpq"},{"type":"text","isRight":"0","text":"ooo"}]},{"ques":"","optionArr":[{"type":"text","isRight":"1","text":"pad"},{"type":"text","isRight":"0","text":"ggff"},{"type":"text","isRight":"0","text":"OOO"}]}]}'; + const dataJson = '{"groupArr":[{"ques":"","optionArr":[{"type":"text","isRight":"1","text":"pad"},{"type":"text","isRight":"0","text":"bdpq"},{"type":"text","isRight":"0","text":"ooo"}]},{"ques":"","optionArr":[{"type":"text","isRight":"1","text":"pad"},{"type":"text","isRight":"0","text":"ggff"},{"type":"text","isRight":"0","text":"OOO"}]},{"ques":"","optionArr":[{"type":"text","isRight":"1","text":"pad"},{"type":"text","isRight":"0","text":"ggff"},{"type":"text","isRight":"0","text":"OOO"}]},{"ques":"","optionArr":[{"type":"text","isRight":"1","text":"pad"},{"type":"text","isRight":"0","text":"ggff"},{"type":"text","isRight":"0","text":"OOO"}]},{"ques":"","optionArr":[{"type":"text","isRight":"1","text":"pad"},{"type":"text","isRight":"0","text":"ggff"},{"type":"text","isRight":"0","text":"OOO"}]},{"ques":"","optionArr":[{"type":"text","isRight":"1","text":"pad"},{"type":"text","isRight":"0","text":"ggff"},{"type":"text","isRight":"0","text":"OOO"}]},{"ques":"","optionArr":[{"type":"text","isRight":"1","text":"pad"},{"type":"text","isRight":"0","text":"ggff"},{"type":"text","isRight":"0","text":"OOO"}]},{"ques":"","optionArr":[{"type":"text","isRight":"1","text":"pad"},{"type":"text","isRight":"0","text":"ggff"},{"type":"text","isRight":"0","text":"OOO"}]},{"ques":"","optionArr":[{"type":"text","isRight":"1","text":"pad"},{"type":"text","isRight":"0","text":"ggff"},{"type":"text","isRight":"0","text":"OOO"}]},{"ques":"","optionArr":[{"type":"text","isRight":"1","text":"pad"},{"type":"text","isRight":"0","text":"ggff"},{"type":"text","isRight":"0","text":"OOO"}]}]}'; const data1 = JSON.parse(dataJson); return data1; }, @@ -258,11 +258,17 @@ cc.Class({ let baseX = this.canvas.width / 2 - 80 * this._mapScaleMin; let baseY = this.canvas.height / 2 - 80 * this._mapScaleMin; let disH = 80 * this._mapScaleMin; + let disScale = 1; + if (gArr.length > 5) { + disH = (400 / gArr.length) * this._mapScaleMin; + disScale = 5 / gArr.length; + } for (let i = 0; i < gArr.length; i++) { const starBg = getSprNode('star_bg'); this.canvas.addChild(starBg, 2); starBg.x = baseX; starBg.y = baseY - i * disH; + starBg.scale = disScale; const starTop = getSprNode('star'); starBg.addChild(starTop); @@ -626,7 +632,8 @@ cc.Class({ const starBig = bigStarBg.starBig; const star = bigStarBg.star; star.active = true; - star.scaleX = 0.7; + star.scaleX = 0.7 / bigStarBg.scale; + star.scaleY = 1 / bigStarBg.scale; star.angle = 90; const canvas = cc.find('Canvas'); const startPos = exchangeNodePos(star.parent, canvas, cc.v2(0, -canvas.height / 2)); @@ -638,10 +645,10 @@ cc.Class({ const time = 1; cc.tween(star) .to(0.3, { y: middlePos.y + 80 }, { easing: 'quadOut' }) - .to(0.1, { y: middlePos.y + 40, scaleX: 1.2, scaleY: 0.8 }, { easing: 'quadOut' }) - .to(0.1, { y: middlePos.y, scaleX: 1, scaleY: 1 }, { easing: 'quadOut' }) + .to(0.1, { y: middlePos.y + 40, scaleX: 1.2 / bigStarBg.scale, scaleY: 0.8 / bigStarBg.scale }, { easing: 'quadOut' }) + .to(0.1, { y: middlePos.y, scaleX: 1 / bigStarBg.scale, scaleY: 1 / bigStarBg.scale }, { easing: 'quadOut' }) .delay(0.1) - .to(0.8, { angle: -720 }) + .to(0.8, { angle: -720, scale: 1 }) .start(); cc.tween(star) -- 2.21.0