Commit 731980ed authored by Seaborn Lee's avatar Seaborn Lee

clean code

parent c3534108
...@@ -7,55 +7,27 @@ ...@@ -7,55 +7,27 @@
import { getSprNode } from "../script/util"; import { getSprNode } from "../script/util";
cc.Class({ cc.Class({
extends: cc.Component, extends: cc.Component,
properties: { properties: {
bgHeight: {
context: { set: function (bgHeight) {
set: function(ctx) { this._bgHeight = bgHeight;
this._ctx = ctx;
}, },
}, },
count: { count: {
set: function(count) { set: function (count) {
this._count = count; this._count = count;
this.setStarCount(); this.setStarCount();
}, },
}
// foo: {
// // ATTRIBUTES:
// default: null, // The default value will be used only when the component attaching
// // to a node for the first time
// type: cc.SpriteFrame, // optional, default is typeof default
// serializable: true, // optional, default is true
// },
// bar: {
// get () {
// return this._bar;
// },
// set (value) {
// this._bar = value;
// }
// },
}, },
// LIFE-CYCLE CALLBACKS:
// onLoad () {},
start () {
}, },
setStarCount() { start() {},
console.log('set Star Count');
setStarCount() {
let disH = 80; let disH = 80;
// let disScale = 1; // let disScale = 1;
// if (this._count > 5) { // if (this._count > 5) {
...@@ -63,17 +35,13 @@ cc.Class({ ...@@ -63,17 +35,13 @@ cc.Class({
// disScale = 5 / gArr.length; // disScale = 5 / gArr.length;
// } // }
for (let i=0; i<this._count; i++) { for (let i = 0; i < this._count; i++) {
const starBg = this.getSprNode("img/star_bg") const starBg = this.getSprNode("img/star_bg");
starBg.y= -i * disH; starBg.y = -i * disH;
this.node.addChild(starBg); this.node.addChild(starBg);
} }
}, },
setContext(ctx) {
},
getSprNode(resName) { getSprNode(resName) {
const sf = cc.find(resName, this.node).getComponent(cc.Sprite).spriteFrame; const sf = cc.find(resName, this.node).getComponent(cc.Sprite).spriteFrame;
const node = new cc.Node(); const node = new cc.Node();
...@@ -81,8 +49,6 @@ cc.Class({ ...@@ -81,8 +49,6 @@ cc.Class({
return node; return node;
}, },
bigStarArr: null, bigStarArr: null,
initStar() { initStar() {
const gArr = this.data.groupArr; const gArr = this.data.groupArr;
...@@ -103,18 +69,18 @@ cc.Class({ ...@@ -103,18 +69,18 @@ cc.Class({
disScale = 5 / gArr.length; disScale = 5 / gArr.length;
} }
for (let i = 0; i < gArr.length; i++) { for (let i = 0; i < gArr.length; i++) {
const starBg = getSprNode('star_bg'); const starBg = getSprNode("star_bg");
this.canvas.addChild(starBg, 10); this.canvas.addChild(starBg, 10);
starBg.x = baseX; starBg.x = baseX;
starBg.y = baseY - i * disH; starBg.y = baseY - i * disH;
starBg.scale = disScale; starBg.scale = disScale;
const starTop = getSprNode('star'); const starTop = getSprNode("star");
starBg.addChild(starTop); starBg.addChild(starTop);
starTop.active = false; starTop.active = false;
starBg.star = starTop; starBg.star = starTop;
const starBig = getSprNode('icon_bigstar'); const starBig = getSprNode("icon_bigstar");
starTop.addChild(starBig); starTop.addChild(starBig);
starBig.angle = -90; starBig.angle = -90;
starBg.starBig = starBig; starBg.starBig = starBig;
...@@ -127,13 +93,12 @@ cc.Class({ ...@@ -127,13 +93,12 @@ cc.Class({
cleanStar() { cleanStar() {
if (this.bigStarArr && this.bigStarArr.length > 0) { if (this.bigStarArr && this.bigStarArr.length > 0) {
for (let i=0; i<this.bigStarArr.length; i++) { for (let i = 0; i < this.bigStarArr.length; i++) {
this.bigStarArr[i].removeFromParent(); this.bigStarArr[i].removeFromParent();
} }
} }
}, },
showBigStar() { showBigStar() {
if (!this.bigStarArr || this.bigStarArr.length <= 0) { if (!this.bigStarArr || this.bigStarArr.length <= 0) {
// this.checkGameEnd(); // this.checkGameEnd();
...@@ -148,34 +113,52 @@ cc.Class({ ...@@ -148,34 +113,52 @@ cc.Class({
star.scaleX = 0.7 / bigStarBg.scale; star.scaleX = 0.7 / bigStarBg.scale;
star.scaleY = 1 / bigStarBg.scale; star.scaleY = 1 / bigStarBg.scale;
star.angle = 90; star.angle = 90;
const canvas = cc.find('Canvas'); const canvas = cc.find("Canvas");
const startPos = exchangeNodePos(star.parent, canvas, cc.v2(0, -canvas.height / 2)); const startPos = exchangeNodePos(
const middlePos = exchangeNodePos(star.parent, canvas, cc.v2(0, -canvas.height / 4)); star.parent,
canvas,
cc.v2(0, -canvas.height / 2)
);
const middlePos = exchangeNodePos(
star.parent,
canvas,
cc.v2(0, -canvas.height / 4)
);
star.x = startPos.x; star.x = startPos.x;
star.y = startPos.y - starBig.height; star.y = startPos.y - starBig.height;
console.log('middlePos = ' + JSON.stringify(middlePos)); console.log("middlePos = " + JSON.stringify(middlePos));
const time = 1; const time = 1;
cc.tween(star) cc.tween(star)
.to(0.3, { y: middlePos.y + 80 }, { easing: 'quadOut' }) .to(0.3, { y: middlePos.y + 80 }, { easing: "quadOut" })
.to(0.1, { y: middlePos.y + 40, scaleX: 1.2 / bigStarBg.scale, scaleY: 0.8 / bigStarBg.scale }, { easing: 'quadOut' }) .to(
.to(0.1, { y: middlePos.y, scaleX: 1 / bigStarBg.scale, scaleY: 1 / bigStarBg.scale }, { easing: 'quadOut' }) 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) .delay(0.1)
.to(0.8, { angle: -720, scale: 1 }) .to(0.8, { angle: -720, scale: 1 })
.start(); .start();
cc.tween(star) cc.tween(star).delay(0.6).to(0.8, { x: 0 }, { easing: "quadIn" }).start();
.delay(0.6) cc.tween(star).delay(0.6).to(0.8, { y: 0 }, { easing: "quadOut" }).start();
.to(0.8, { x: 0 }, { easing: 'quadIn' })
.start();
cc.tween(star)
.delay(0.6)
.to(0.8, { y: 0 }, { easing: 'quadOut' })
.start();
cc.tween(starBig) cc.tween(starBig)
.delay(0.6) .delay(0.6)
.to(0.8, { scale: 0 }, { easing: 'quadOut' }) .to(0.8, { scale: 0 }, { easing: "quadOut" })
.call(() => { .call(() => {
// this.checkGameEnd(); // this.checkGameEnd();
// playAudio(this.starCountClip); // playAudio(this.starCountClip);
......
...@@ -136,8 +136,90 @@ cc.Class({ ...@@ -136,8 +136,90 @@ cc.Class({
}, },
getDefaultData() { getDefaultData() {
return {
return {"groupArr":[{"questionArr":[{"questionType":"text","answerType":"text","answerArr":[],"letter":"A","audio_url":"http://staging-teach.cdn.ireadabc.com/f51e3fedc88aa69a99f6ef579f7de047.mp3"},{"questionType":"text","answerType":"text","answerArr":[],"letter":"b","audio_url":"http://staging-teach.cdn.ireadabc.com/fbe2f23b9eb191a9330f99800e0d54d5.mp3"},{"questionType":"text","answerType":"text","answerArr":[],"letter":"cc","audio_url":"http://staging-teach.cdn.ireadabc.com/263d9cbaef7fbf251f9e3703130fb763.mp3"},{"questionType":"text","answerType":"text","answerArr":[],"letter":"dd","audio_url":"http://staging-teach.cdn.ireadabc.com/4edd6cd36d36dd5a16348db81044bda7.mp3"}]},{"questionArr":[{"questionType":"text","answerType":"text","answerArr":[],"letter":"bb","audio_url":"http://staging-teach.cdn.ireadabc.com/9fd01e4dc5e9c0c583d81b4bbe984342.mp3"},{"questionType":"text","answerType":"text","answerArr":[],"letter":"c"}]},{"questionArr":[{"questionType":"text","answerType":"text","answerArr":[],"letter":"d"},{"questionType":"text","answerType":"text","answerArr":[],"letter":"ee","audio_url":"http://staging-teach.cdn.ireadabc.com/28a42e3e77e023c8118624bb8351e7b2.mp3"},{"questionType":"text","answerType":"text","answerArr":[],"letter":"F"}]}],"style":"UK","batch":"one"}; groupArr: [
{
questionArr: [
{
questionType: "text",
answerType: "text",
answerArr: [],
letter: "A",
audio_url:
"http://staging-teach.cdn.ireadabc.com/f51e3fedc88aa69a99f6ef579f7de047.mp3",
},
{
questionType: "text",
answerType: "text",
answerArr: [],
letter: "b",
audio_url:
"http://staging-teach.cdn.ireadabc.com/fbe2f23b9eb191a9330f99800e0d54d5.mp3",
},
{
questionType: "text",
answerType: "text",
answerArr: [],
letter: "cc",
audio_url:
"http://staging-teach.cdn.ireadabc.com/263d9cbaef7fbf251f9e3703130fb763.mp3",
},
{
questionType: "text",
answerType: "text",
answerArr: [],
letter: "dd",
audio_url:
"http://staging-teach.cdn.ireadabc.com/4edd6cd36d36dd5a16348db81044bda7.mp3",
},
],
},
{
questionArr: [
{
questionType: "text",
answerType: "text",
answerArr: [],
letter: "bb",
audio_url:
"http://staging-teach.cdn.ireadabc.com/9fd01e4dc5e9c0c583d81b4bbe984342.mp3",
},
{
questionType: "text",
answerType: "text",
answerArr: [],
letter: "c",
},
],
},
{
questionArr: [
{
questionType: "text",
answerType: "text",
answerArr: [],
letter: "d",
},
{
questionType: "text",
answerType: "text",
answerArr: [],
letter: "ee",
audio_url:
"http://staging-teach.cdn.ireadabc.com/28a42e3e77e023c8118624bb8351e7b2.mp3",
},
{
questionType: "text",
answerType: "text",
answerArr: [],
letter: "F",
},
],
},
],
style: "UK",
batch: "one",
};
// console.log("defaultData = " + defaultData); // console.log("defaultData = " + defaultData);
// return defaultData; // return defaultData;
...@@ -188,7 +270,6 @@ cc.Class({ ...@@ -188,7 +270,6 @@ cc.Class({
letterPosList: null, letterPosList: null,
curGroupIndex: null, curGroupIndex: null,
initData() { initData() {
this.curGroupIndex = 0; this.curGroupIndex = 0;
// this._writingIdx = 0; // this._writingIdx = 0;
// this.letterPosList = {}; // this.letterPosList = {};
...@@ -236,9 +317,9 @@ cc.Class({ ...@@ -236,9 +317,9 @@ cc.Class({
initStar() { initStar() {
const starNode = cc.find("Canvas/starNode"); const starNode = cc.find("Canvas/starNode");
console.log("starNode: " ,starNode); const script = starNode.getComponent("star");
const script = starNode.getComponent("star") script.bgHeight = this.canvas.height;
script.count = 6; script.count = 12;
}, },
bigStarArr: null, bigStarArr: null,
...@@ -261,18 +342,18 @@ cc.Class({ ...@@ -261,18 +342,18 @@ cc.Class({
disScale = 5 / gArr.length; disScale = 5 / gArr.length;
} }
for (let i = 0; i < gArr.length; i++) { for (let i = 0; i < gArr.length; i++) {
const starBg = getSprNode('star_bg'); const starBg = getSprNode("star_bg");
this.canvas.addChild(starBg, 10); this.canvas.addChild(starBg, 10);
starBg.x = baseX; starBg.x = baseX;
starBg.y = baseY - i * disH; starBg.y = baseY - i * disH;
starBg.scale = disScale; starBg.scale = disScale;
const starTop = getSprNode('star'); const starTop = getSprNode("star");
starBg.addChild(starTop); starBg.addChild(starTop);
starTop.active = false; starTop.active = false;
starBg.star = starTop; starBg.star = starTop;
const starBig = getSprNode('icon_bigstar'); const starBig = getSprNode("icon_bigstar");
starTop.addChild(starBig); starTop.addChild(starBig);
starBig.angle = -90; starBig.angle = -90;
starBg.starBig = starBig; starBg.starBig = starBig;
...@@ -285,13 +366,12 @@ cc.Class({ ...@@ -285,13 +366,12 @@ cc.Class({
cleanStar() { cleanStar() {
if (this.bigStarArr && this.bigStarArr.length > 0) { if (this.bigStarArr && this.bigStarArr.length > 0) {
for (let i=0; i<this.bigStarArr.length; i++) { for (let i = 0; i < this.bigStarArr.length; i++) {
this.bigStarArr[i].removeFromParent(); this.bigStarArr[i].removeFromParent();
} }
} }
}, },
showBigStar() { showBigStar() {
if (!this.bigStarArr || this.bigStarArr.length <= 0) { if (!this.bigStarArr || this.bigStarArr.length <= 0) {
// this.checkGameEnd(); // this.checkGameEnd();
...@@ -306,34 +386,52 @@ cc.Class({ ...@@ -306,34 +386,52 @@ cc.Class({
star.scaleX = 0.7 / bigStarBg.scale; star.scaleX = 0.7 / bigStarBg.scale;
star.scaleY = 1 / bigStarBg.scale; star.scaleY = 1 / bigStarBg.scale;
star.angle = 90; star.angle = 90;
const canvas = cc.find('Canvas'); const canvas = cc.find("Canvas");
const startPos = exchangeNodePos(star.parent, canvas, cc.v2(0, -canvas.height / 2)); const startPos = exchangeNodePos(
const middlePos = exchangeNodePos(star.parent, canvas, cc.v2(0, -canvas.height / 4)); star.parent,
canvas,
cc.v2(0, -canvas.height / 2)
);
const middlePos = exchangeNodePos(
star.parent,
canvas,
cc.v2(0, -canvas.height / 4)
);
star.x = startPos.x; star.x = startPos.x;
star.y = startPos.y - starBig.height; star.y = startPos.y - starBig.height;
console.log('middlePos = ' + JSON.stringify(middlePos)); console.log("middlePos = " + JSON.stringify(middlePos));
const time = 1; const time = 1;
cc.tween(star) cc.tween(star)
.to(0.3, { y: middlePos.y + 80 }, { easing: 'quadOut' }) .to(0.3, { y: middlePos.y + 80 }, { easing: "quadOut" })
.to(0.1, { y: middlePos.y + 40, scaleX: 1.2 / bigStarBg.scale, scaleY: 0.8 / bigStarBg.scale }, { easing: 'quadOut' }) .to(
.to(0.1, { y: middlePos.y, scaleX: 1 / bigStarBg.scale, scaleY: 1 / bigStarBg.scale }, { easing: 'quadOut' }) 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) .delay(0.1)
.to(0.8, { angle: -720, scale: 1 }) .to(0.8, { angle: -720, scale: 1 })
.start(); .start();
cc.tween(star) cc.tween(star).delay(0.6).to(0.8, { x: 0 }, { easing: "quadIn" }).start();
.delay(0.6) cc.tween(star).delay(0.6).to(0.8, { y: 0 }, { easing: "quadOut" }).start();
.to(0.8, { x: 0 }, { easing: 'quadIn' })
.start();
cc.tween(star)
.delay(0.6)
.to(0.8, { y: 0 }, { easing: 'quadOut' })
.start();
cc.tween(starBig) cc.tween(starBig)
.delay(0.6) .delay(0.6)
.to(0.8, { scale: 0 }, { easing: 'quadOut' }) .to(0.8, { scale: 0 }, { easing: "quadOut" })
.call(() => { .call(() => {
// this.checkGameEnd(); // this.checkGameEnd();
// playAudio(this.starCountClip); // playAudio(this.starCountClip);
......
{ {
"game": { "game": {
"name": "未知游戏", "name": "UNKNOW GAME",
"appid": "UNKNOW" "appid": "UNKNOW"
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment