Commit b9cf8203 authored by limingzhe's avatar limingzhe

fix: 资源写活

parent d649e8db
No preview for this file type
...@@ -209,6 +209,9 @@ cc.Class({ ...@@ -209,6 +209,9 @@ cc.Class({
dataPool: null, dataPool: null,
initData() { initData() {
// 所有全局变量 默认都是null // 所有全局变量 默认都是null
console.log(' canTouch = fasle 0');
this.canTouch = false; this.canTouch = false;
this.step = 1; this.step = 1;
this.dataPool = []; this.dataPool = [];
...@@ -472,6 +475,7 @@ cc.Class({ ...@@ -472,6 +475,7 @@ cc.Class({
this.canvas.addChild(itemBgBig); this.canvas.addChild(itemBgBig);
this.itemBgBig = itemBgBig; this.itemBgBig = itemBgBig;
const letterW = 50 * this._mapScaleMin; const letterW = 50 * this._mapScaleMin;
itemBgBig.x = -itemBgBig.width / 2 * itemBgBig.scaleX + letterW; itemBgBig.x = -itemBgBig.width / 2 * itemBgBig.scaleX + letterW;
...@@ -489,6 +493,7 @@ cc.Class({ ...@@ -489,6 +493,7 @@ cc.Class({
// itemLetterBig.y = itemBgBig.y; // itemLetterBig.y = itemBgBig.y;
// }) // })
let animColor; let animColor;
let animBlack; let animBlack;
...@@ -507,6 +512,7 @@ cc.Class({ ...@@ -507,6 +512,7 @@ cc.Class({
animColor = animNode; animColor = animNode;
animColor.x = 100; animColor.x = 100;
animColor.name = 'daxie_yanse'
this.letterAnimBig = animColor; this.letterAnimBig = animColor;
itemBgBig.addChild(animColor); itemBgBig.addChild(animColor);
checkShowOneLineAnim(); checkShowOneLineAnim();
...@@ -529,9 +535,9 @@ cc.Class({ ...@@ -529,9 +535,9 @@ cc.Class({
itemLetterBig.y = itemBgBig.y; itemLetterBig.y = itemBgBig.y;
itemLetterBig.scale = 0.614; // itemLetterBig.scale = 0.614;
itemLetterBig.y += itemBgBig.height / 6; // itemLetterBig.y += itemBgBig.height / 6;
}) })
...@@ -568,6 +574,9 @@ cc.Class({ ...@@ -568,6 +574,9 @@ cc.Class({
spr.node.x = animNode.x; spr.node.x = animNode.x;
spr.node.y = animNode.y; spr.node.y = animNode.y;
spr.node.scale = animNode.scale; spr.node.scale = animNode.scale;
console.log(' spr.node.width: ', spr.node.width)
console.log(' spr.node.height: ', spr.node.height)
}) })
} }
}, },
...@@ -575,11 +584,24 @@ cc.Class({ ...@@ -575,11 +584,24 @@ cc.Class({
addColorLetterListener(letter) { addColorLetterListener(letter) {
console.log(' in addColorLetterListener 1', letter.name || '')
const nodeW = 258;
const nodeH = 138;
letter.width = nodeW;
letter.height = nodeH;
letter.on('touchstart', ()=> { letter.on('touchstart', ()=> {
console.log( ' in addColorLetterListener 2')
if (!this.canTouch) { if (!this.canTouch) {
return; return;
} }
console.log(' canTouch = fasle 1');
this.canTouch = false; this.canTouch = false;
this.showLetterAnim(1, letter, () => { this.showLetterAnim(1, letter, () => {
...@@ -612,16 +634,16 @@ cc.Class({ ...@@ -612,16 +634,16 @@ cc.Class({
// anim.scale = animBg.height / anim.height; // anim.scale = animBg.height / anim.height;
if (anim.height) { if (anim.height) {
anim.scale = 0.614; // anim.scale = 0.614;
if(animBg != this.itemBgSmall) { // if(animBg != this.itemBgSmall) {
anim.y += animBg.height / 6; // anim.y += animBg.height / 6;
} // }
} else { } else {
anim.scale = 0.614; // anim.scale = 0.614;
if(animBg != this.itemBgSmall) { // if(animBg != this.itemBgSmall) {
anim.y += animBg.height / 6; // anim.y += animBg.height / 6;
} // }
} }
// console.log(' anim.scale ~ ', anim.scale); // console.log(' anim.scale ~ ', anim.scale);
...@@ -659,7 +681,7 @@ cc.Class({ ...@@ -659,7 +681,7 @@ cc.Class({
anim.animationNames = animBlack.animationNames; anim.animationNames = animBlack.animationNames;
anim.x = baseX + i * disW; anim.x = baseX + i * disW;
anim.scale = 0.614; // anim.scale = 0.614;
// console.log(' anim.scale ~ ', anim.scale); // console.log(' anim.scale ~ ', anim.scale);
...@@ -739,7 +761,7 @@ cc.Class({ ...@@ -739,7 +761,7 @@ cc.Class({
itemLetterSmall.x = itemBgSmall.x - letterW; itemLetterSmall.x = itemBgSmall.x - letterW;
itemLetterSmall.y = itemBgSmall.y; itemLetterSmall.y = itemBgSmall.y;
itemLetterSmall.scale = 0.614; // itemLetterSmall.scale = 0.614;
// itemLetterSmall.y += itemBgSmall.height / 6; // itemLetterSmall.y += itemBgSmall.height / 6;
}) })
...@@ -807,16 +829,24 @@ cc.Class({ ...@@ -807,16 +829,24 @@ cc.Class({
if (!this.canTouch) { if (!this.canTouch) {
return; return;
} }
console.log(' canTouch = fasle 2');
this.canTouch = false; this.canTouch = false;
const letterAnim = letter.getComponent(cc.Animation); // const letterAnim = letter.getComponent(cc.Animation);
letterAnim.play('anim_A_0'); // letterAnim.play('anim_A_0');
// const cb = () => {
// // this.canTouch = true;
// this.checkShowDataPool();
// letterAnim.off('finished', cb)
// }
// letterAnim.on('finished', cb);
const cb = () => {
// this.canTouch = true; this.showLetterAnim(1, letter, () => {
this.checkShowDataPool(); this.checkShowDataPool();
letterAnim.off('finished', cb) });
}
letterAnim.on('finished', cb);
}) })
...@@ -843,17 +873,23 @@ cc.Class({ ...@@ -843,17 +873,23 @@ cc.Class({
if (!this.canTouch) { if (!this.canTouch) {
return; return;
} }
console.log(' canTouch = fasle 3');
this.canTouch = false; this.canTouch = false;
const letterAnim = letter.getComponent(cc.Animation); // const letterAnim = letter.getComponent(cc.Animation);
letterAnim.play('anim_a_0'); // letterAnim.play('anim_a_0');
const cb = () => { // const cb = () => {
// this.canTouch = true; // // this.canTouch = true;
this.checkShowDataPool(); // this.checkShowDataPool();
letterAnim.off('finished', cb) // letterAnim.off('finished', cb)
} // }
letterAnim.on('finished', cb); // letterAnim.on('finished', cb);
this.showLetterAnim(1, letter, () => {
this.checkShowDataPool();
});
}) })
...@@ -877,7 +913,7 @@ cc.Class({ ...@@ -877,7 +913,7 @@ cc.Class({
const layer = new cc.Node(); const layer = new cc.Node();
layer.x = -this.canvas.width / 2 + 10; layer.x = -this.canvas.width / 2 + 10;
layer.y = this.canvas.height / 2 - 10; layer.y = this.canvas.height / 2 - 10;
// layer.active = false; layer.active = false;
const sample = getSprNode('sample'); const sample = getSprNode('sample');
sample.anchorX = 0; sample.anchorX = 0;
...@@ -999,6 +1035,8 @@ cc.Class({ ...@@ -999,6 +1035,8 @@ cc.Class({
beginShowAudio() { beginShowAudio() {
console.log(' canTouch = fasle 4');
this.canTouch = false; this.canTouch = false;
const playEnd = () => { const playEnd = () => {
...@@ -1062,6 +1100,8 @@ cc.Class({ ...@@ -1062,6 +1100,8 @@ cc.Class({
const playEnd = () => { const playEnd = () => {
this.playAni('normal', 0); this.playAni('normal', 0);
console.log( 'this.canTouch = true 1 ');
this.canTouch = true; this.canTouch = true;
this.startTesting(); this.startTesting();
...@@ -1243,17 +1283,24 @@ cc.Class({ ...@@ -1243,17 +1283,24 @@ cc.Class({
item.isShow = true; item.isShow = true;
item.active = true; item.active = true;
const anim = item.getComponent(cc.Animation); // const anim = item.getComponent(cc.Animation);
console.log(' showItemAniNew item: ', item); // console.log(' showItemAniNew item: ', item);
anim.play(item.name); // anim.play(item.name);
anim.on('finished', () => {
console.log('in finished'); // anim.on('finished', () => {
if (cb) { // console.log('in finished');
cb(); // if (cb) {
} // cb();
// }
// });
this.showLetterAnim(1, item, () => {
cb && cb();
}); });
}, },
showItemAni(item, cb) { showItemAni(item, cb) {
...@@ -1560,6 +1607,8 @@ cc.Class({ ...@@ -1560,6 +1607,8 @@ cc.Class({
this._playText = true; this._playText = true;
console.log(' canTouch = fasle 5');
this.canTouch = false; this.canTouch = false;
const twinkle = (node) => { const twinkle = (node) => {
...@@ -1769,6 +1818,9 @@ cc.Class({ ...@@ -1769,6 +1818,9 @@ cc.Class({
const oldStep = this.step; const oldStep = this.step;
this.checkShowStepAudio(); this.checkShowStepAudio();
if (oldStep != this.step) { if (oldStep != this.step) {
console.log(' canTouch = fasle 6');
this.canTouch = false; this.canTouch = false;
this.showStepAudio(); this.showStepAudio();
} else { } else {
...@@ -1847,6 +1899,7 @@ cc.Class({ ...@@ -1847,6 +1899,7 @@ cc.Class({
checkShowDataPool() { checkShowDataPool() {
if (this.dataPool.length == 0) { if (this.dataPool.length == 0) {
console.log(' this.canTouch = true 6')
this.canTouch = true; this.canTouch = true;
return; return;
} }
...@@ -1980,16 +2033,21 @@ cc.Class({ ...@@ -1980,16 +2033,21 @@ cc.Class({
showSmallLetterAnim() { showSmallLetterAnim() {
console.log(' in showSmallLetterAnim') console.log(' in showSmallLetterAnim')
const anim = this.letterAnimSmall.getComponent(cc.Animation); // const anim = this.letterAnimSmall.getComponent(cc.Animation);
anim.play('anim_a_0'); // anim.play('anim_a_0');
const cb = () => { // const cb = () => {
console.log('in finished'); // console.log('in finished');
this.showSmallLetter1Audio(); // this.showSmallLetter1Audio();
anim.off('finished', cb) // anim.off('finished', cb)
} // }
// anim.on('finished', cb);
anim.on('finished', cb);
this.showLetterAnim(1, this.letterAnimSmall, () => {
this.showSmallLetter1Audio();
});
}, },
showSmallLetter1Audio() { showSmallLetter1Audio() {
......
export const defaultData = {"write_big_0_audio_url":"http://staging-teach.cdn.ireadabc.com/443413d501c007c9a05c8f93416b60e1.mp3","write_big_1_audio_url":"http://staging-teach.cdn.ireadabc.com/7cd79c2e777bc1b7c916fdb5e5e326a8.mp3","write_big_2_audio_url":"http://staging-teach.cdn.ireadabc.com/0fd3a090c37a2c11bb8503908a1326f2.mp3","write_small_0_audio_url":"http://staging-teach.cdn.ireadabc.com/0b2bac3cae824af3ace9c183115fcd15.mp3","write_small_1_audio_url":"http://staging-teach.cdn.ireadabc.com/9b28f76d7966d2ade83a746b7ac1664c.mp3","write_small_2_audio_url":"http://staging-teach.cdn.ireadabc.com/908269df525600b866042ab473a0b879.mp3","finish_audio_url":"http://staging-teach.cdn.ireadabc.com/7be3761deb1c904e68a0cd3b47cd28d1.mp3","tip_audio_url":"http://staging-teach.cdn.ireadabc.com/52824b6c66664de8ee7b3bef3af5593f.mp3","letter":"A","animArr":[{"key":"letter_big_0","title":"大写彩色动画","skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/25c3e44a24d2558fdd9d21bd020a12f7.json","name":"A_big_color_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/b9f338ed66c1d683e606f6e17db1208f.json","name":"A_big_color_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/6f00f2443f7b598d82479e85d1507b82.png","name":"A_big_color_tex.png"}},{"key":"letter_big_1","title":"大写黑色动画","skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/b8f88524300ff0c56f8c29307dccd202.json","name":"A_big_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/f7e98e5a8d50ed84e285e2c664747cc2.json","name":"A_big_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/ad5527e45a30b44f8238743055d0ae2b.png","name":"A_big_tex.png"}},{"key":"letter_small_0","title":"小写彩色动画","skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/d59a88955bbfac24b682aea5ffdb159c.json","name":"a_small_color_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/8f865752a7c35f5e2a421851b072ae72.json","name":"a_small_color_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/1092894cb5a02d2c2d96803166fd4e79.png","name":"a_small_color_tex.png"}},{"key":"letter_small_1","title":"小写黑色动画","skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/485d26f6e36426e2431a2c9a5ae33e14.json","name":"a_small_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/10aa01d5bcb4c35ad3a4ff3a41204a2d.json","name":"a_small_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/fca78056f7c139918484443a9bf7cca8.png","name":"a_small_tex.png"}}],"letter_small_pic_url":"http://staging-teach.cdn.ireadabc.com/f7f72381d37bb389c2b277bc79a197c3.png","letter_big_pic_url":"http://staging-teach.cdn.ireadabc.com/3decbe2e9d3537c8db340af67fc69f54.png","dot_big_1_url":"http://staging-teach.cdn.ireadabc.com/88695b362c7fd57c51ec4cfd71ae2e73.png","dot_big_2_url":"http://staging-teach.cdn.ireadabc.com/b46a06ca66b373cdf7e129b026a6248d.png","dot_small_1_url":"http://staging-teach.cdn.ireadabc.com/f4733b392faae330311cf8e95ca3e21f.png","dot_small_2_url":"http://staging-teach.cdn.ireadabc.com/d62ead9ca6ce1ed29f08a5d28e8dd2ea.png"} export const defaultData = {"animArr":[{"key":"letter_big_0","title":"大写彩色动画","skeJsonData":{"url":"https://staging-teach.cdn.ireadabc.com/3854b249ba08fe0d7f7be94308eda238.json","name":"D大彩_ske.json"},"texJsonData":{"url":"https://staging-teach.cdn.ireadabc.com/047c4030ce0956e7fa491bb10efa99d0.json","name":"D大彩_tex.json"},"texPngData":{"url":"https://staging-teach.cdn.ireadabc.com/fdeefde6344de8b50de4c1e97532de46.png","name":"D大彩_tex.png"}},{"key":"letter_big_1","title":"大写黑色动画","skeJsonData":{"url":"https://staging-teach.cdn.ireadabc.com/4a73aa0ed1abe9fe59cbc9396164ab0b.json","name":"D大黑_ske.json"},"texJsonData":{"url":"https://staging-teach.cdn.ireadabc.com/264182a83f00f862662611adde7afc05.json","name":"D大黑_tex.json"},"texPngData":{"url":"https://staging-teach.cdn.ireadabc.com/444b96de33fb48ab6a488b058d81449d.png","name":"D大黑_tex.png"}},{"key":"letter_small_0","title":"小写彩色动画","skeJsonData":{"url":"https://staging-teach.cdn.ireadabc.com/4fbe3832ff08127bb2899c525f3c0918.json","name":"D小彩_ske.json"},"texJsonData":{"url":"https://staging-teach.cdn.ireadabc.com/958bfb6722f4bf5f2b5d975e420cf23c.json","name":"D小彩_tex.json"},"texPngData":{"url":"https://staging-teach.cdn.ireadabc.com/489483bb7b433044f5736ac1f05d4bf2.png","name":"D小彩_tex.png"}},{"key":"letter_small_1","title":"小写黑色动画","skeJsonData":{"url":"https://staging-teach.cdn.ireadabc.com/f88764f49c73d2bdc7ab21d3f3f3c4bc.json","name":"D小黑_ske.json"},"texJsonData":{"url":"https://staging-teach.cdn.ireadabc.com/403916dcfd80ce24069eddce10e0124c.json","name":"D小黑_tex.json"},"texPngData":{"url":"https://staging-teach.cdn.ireadabc.com/840b55ebf6ae75ec7cf011c48f3189ec.png","name":"D小黑_tex.png"}}],"write_big_0_audio_url":"https://staging-teach.cdn.ireadabc.com/d4c2f72fd4238c48c1b19d747d0ce382.mp3","write_big_1_audio_url":"https://staging-teach.cdn.ireadabc.com/4c5a39defde0e90f3a53bf50db6943f4.mp3","write_big_2_audio_url":"https://staging-teach.cdn.ireadabc.com/a5652eadaf165869b2b551530921bb0d.mp3","write_small_0_audio_url":"https://staging-teach.cdn.ireadabc.com/d099918c85ac7afc33f169c9038f46d4.mp3","write_small_1_audio_url":"https://staging-teach.cdn.ireadabc.com/2f1ea180fb4d17dce34e8d7cc6cf9159.mp3","write_small_2_audio_url":"https://staging-teach.cdn.ireadabc.com/15147c1c4ae733303566baf84fae2840.mp3","finish_audio_url":"https://staging-teach.cdn.ireadabc.com/7fb349c67a76d2112a0604e624acaa97.mp3","tip_audio_url":"https://staging-teach.cdn.ireadabc.com/d5cdef3f02abe29b14ca8c16ad4e7543.mp3","letter":"D","dot_small_2_url":"https://staging-teach.cdn.ireadabc.com/8a8cbc71ad861b372418f36aef32a8cd.png","dot_small_1_url":"https://staging-teach.cdn.ireadabc.com/80221b2a4b62f57c33c7e6491f372077.png","dot_big_1_url":"https://staging-teach.cdn.ireadabc.com/e2b74edc1520bc2001d82b4e8aaba5d7.png","dot_big_2_url":"https://staging-teach.cdn.ireadabc.com/e2b74edc1520bc2001d82b4e8aaba5d7.png"}
\ No newline at end of file \ 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