Commit 87364bc7 authored by limingzhe's avatar limingzhe

fix: debug

parent 3a1ffb36
This diff is collapsed.
...@@ -408,7 +408,7 @@ cc.Class({ ...@@ -408,7 +408,7 @@ cc.Class({
initView() { initView() {
this.initBgContainer();
this.initTitle(); this.initTitle();
this.initAudioPlayer(); this.initAudioPlayer();
this.initPanel(); this.initPanel();
...@@ -419,6 +419,14 @@ cc.Class({ ...@@ -419,6 +419,14 @@ cc.Class({
}, },
initBgContainer() {
const bgContainer = cc.find('Canvas/bg_container');
const canvas = cc.find("Canvas");
const sx = canvas.width / bgContainer.width;
const sy = canvas.height / bgContainer.height;
bgContainer.scale = Math.min(sx, sy);
},
showBackBtn() { showBackBtn() {
const backBtn = cc.find('Canvas/back_btn'); const backBtn = cc.find('Canvas/back_btn');
backBtn.active = true; backBtn.active = true;
...@@ -438,13 +446,13 @@ cc.Class({ ...@@ -438,13 +446,13 @@ cc.Class({
initTitle() { initTitle() {
const title = cc.find('Canvas/bg/title'); const title = cc.find('Canvas/bg_container/title');
const titleLabel = title.getComponent(cc.Label); const titleLabel = title.getComponent(cc.Label);
titleLabel.string = this.data.title || ''; titleLabel.string = this.data.title || '';
}, },
initAudioPlayer() { initAudioPlayer() {
const audioPlayer = cc.find('Canvas/bg/AudioPlayer'); const audioPlayer = cc.find('Canvas/bg_container/AudioPlayer');
const playBtn = cc.find('play', audioPlayer); const playBtn = cc.find('play', audioPlayer);
const pauseBtn = cc.find('pause', audioPlayer); const pauseBtn = cc.find('pause', audioPlayer);
...@@ -464,7 +472,13 @@ cc.Class({ ...@@ -464,7 +472,13 @@ cc.Class({
cc.assetManager.loadRemote(this.data.audio_url, (err, _audioClip) => { cc.assetManager.loadRemote(this.data.audio_url, (err, _audioClip) => {
audioClip = _audioClip; audioClip = _audioClip;
this.totalTime = audioClip.duration; this.totalTime = audioClip.duration;
setTimeout(() => {
if (this.isDestroy) {
return;
}
totalTimeLabel.string = this.formatTime(audioClip.duration * 1000); totalTimeLabel.string = this.formatTime(audioClip.duration * 1000);
}, 300);
}); });
let audioId; let audioId;
...@@ -509,7 +523,7 @@ cc.Class({ ...@@ -509,7 +523,7 @@ cc.Class({
if (!this.data.pic_url) { if (!this.data.pic_url) {
return; return;
} }
const panel = cc.find("Canvas/panel"); const panel = cc.find("Canvas/bg_container/panel");
this.canvas = cc.find("Canvas"); this.canvas = cc.find("Canvas");
...@@ -544,28 +558,28 @@ cc.Class({ ...@@ -544,28 +558,28 @@ cc.Class({
initColorPanel() { initColorPanel() {
const selectCircle = cc.find("Canvas/color_panel/select"); const selectCircle = cc.find("Canvas/bg_container/color_panel/select");
const colorArr = this.getColorArr(); const colorArr = this.getColorArr();
// [
// '#FF6868',
// '#FFBB55',
// '#FAFF04',
// '#AAF50A',
// '#0DF0FF',
// '#3988FF',
// '#9E00FF',
// ];
console.log('colorArr: ', colorArr); console.log('colorArr: ', colorArr);
const disX = 120; const disX = 120;
const colorPanel = cc.find('Canvas/color_panel'); const colorPanel = cc.find('Canvas/bg_container/color_panel');
const colorBtnBase = cc.find('Canvas/color_panel/color_btn'); const colorBtnBase = cc.find('Canvas/bg_container/color_panel/color_btn');
const colorObj = {};
let len = 0;
for (let i=0; i<colorArr.length; i++) { for (let i=0; i<colorArr.length; i++) {
const color = colorArr[i].code; const color = colorArr[i].code;
if (colorObj[colorArr[i].key]) {
continue;
}
colorObj[colorArr[i].key] = true;
len ++;
const colorBtn = cc.instantiate(colorBtnBase); const colorBtn = cc.instantiate(colorBtnBase);
colorBtn.active = true; colorBtn.active = true;
colorBtn.parent = colorBtnBase.parent; colorBtn.parent = colorBtnBase.parent;
...@@ -587,11 +601,12 @@ cc.Class({ ...@@ -587,11 +601,12 @@ cc.Class({
if (i == 0) { if (i == 0) {
this.curPaintColor = cc.Color.fromHEX(new cc.Color(), color); this.curPaintColor = cc.Color.fromHEX(new cc.Color(), color);
this.curPaintColorCode = color;
selectCircle.x = colorBtn.x; selectCircle.x = colorBtn.x;
} }
} }
colorPanel.x = -(colorArr.length - 1) * disX / 2; colorPanel.x = -(len - 1) * disX / 2;
}, },
...@@ -633,7 +648,7 @@ cc.Class({ ...@@ -633,7 +648,7 @@ cc.Class({
formatTime(milliseconds) { formatTime(milliseconds = 0) {
if (typeof milliseconds !== 'number' || isNaN(milliseconds) || milliseconds < 0) { if (typeof milliseconds !== 'number' || isNaN(milliseconds) || milliseconds < 0) {
console.error('传入的不是一个有效的非负数值'); console.error('传入的不是一个有效的非负数值');
return null; return null;
......
export const defaultData = {"title":"Choose your favorite color and paint it.","audio_url":"http://staging-teach.cdn.ireadabc.com/555083b19cc70078d2ece421b0619520.mp3","picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/90ce5433218c53cb580a57a04ce696f8.png","colorData":{"key":"Blue","value":"蓝色","code":"#3988FF"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/223b1e8fc317bd435397347f6756c79b.png","colorData":{"key":"Yellow","value":"黄色","code":"#FAFF04"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/2c4061df2a7d91590b17580d6a426e7b.png","colorData":{"key":"Pink","value":"粉色","code":"#FFC6EC"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/a89d9738d55bd7373e34141f4c1c3e65.png","colorData":{"key":"Purple","value":"紫色","code":"#9E00FF"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/ee942a82682b6d5929c7f0b7c9b2c071.png","colorData":{"key":"Green","value":"绿色","code":"#AAF50A"}}],"pic_url":"http://staging-teach.cdn.ireadabc.com/f4d9c566c17699ff7af21ec3beaa7d97.png","bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/f4d9c566c17699ff7af21ec3beaa7d97.png","rect":{"x":405.12,"y":0,"width":1066.76,"height":717}},"hotZoneItemArr":[{"id":"1716804401017","index":0,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":612.5,"posY":657.5,"labelArr":[{"key":"number","title":"序号","value":"1"}],"sizeW":56.99999999999999,"sizeH":56.99999999999999,"rect":{"x":178.88,"y":629,"width":57,"height":57}},{"id":"1716804410047","index":1,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":872.5011925785761,"posY":576.4975947226569,"labelArr":[{"key":"number","title":"序号","value":"2"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":438.88,"y":548,"width":57,"height":57}},{"id":"1716804421092","index":2,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":619.5002414422884,"posY":386.49789103819273,"labelArr":[{"key":"number","title":"序号","value":"3"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":185.88,"y":358,"width":57,"height":57}},{"id":"1716804428169","index":3,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":1142.5011669710607,"posY":512.4985860993261,"labelArr":[{"key":"number","title":"序号","value":"4"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":708.88,"y":484,"width":57,"height":57}},{"id":"1716804439994","index":4,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":1228.4992537238356,"posY":270.49812516404813,"labelArr":[{"key":"number","title":"序号","value":"5"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":794.88,"y":242,"width":57,"height":57}}]} export const defaultData = {"title":"Choose your favorite color and paint it.","audio_url":"http://staging-teach.cdn.ireadabc.com/555083b19cc70078d2ece421b0619520.mp3","picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/90ce5433218c53cb580a57a04ce696f8.png","colorData":{"key":"Blue","value":"蓝色","code":"#3988FF"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/223b1e8fc317bd435397347f6756c79b.png","colorData":{"key":"Yellow","value":"黄色","code":"#FAFF04"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/2c4061df2a7d91590b17580d6a426e7b.png","colorData":{"key":"Pink","value":"粉色","code":"#FFC6EC"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/a89d9738d55bd7373e34141f4c1c3e65.png","colorData":{"key":"Purple","value":"紫色","code":"#9E00FF"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/ee942a82682b6d5929c7f0b7c9b2c071.png","colorData":{"key":"Yellow","value":"黄色","code":"#FAFF04"}}],"pic_url":"http://staging-teach.cdn.ireadabc.com/f4d9c566c17699ff7af21ec3beaa7d97.png","bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/f4d9c566c17699ff7af21ec3beaa7d97.png","rect":{"x":405.12,"y":0,"width":1066.76,"height":717}},"hotZoneItemArr":[{"id":"1716804401017","index":0,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":612.5,"posY":657.5,"labelArr":[{"key":"number","title":"序号","value":"1"}],"sizeW":56.99999999999999,"sizeH":56.99999999999999,"rect":{"x":178.88,"y":629,"width":57,"height":57}},{"id":"1716804410047","index":1,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":872.5011925785761,"posY":576.4975947226569,"labelArr":[{"key":"number","title":"序号","value":"2"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":438.88,"y":548,"width":57,"height":57}},{"id":"1716804421092","index":2,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":619.5002414422884,"posY":386.49789103819273,"labelArr":[{"key":"number","title":"序号","value":"3"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":185.88,"y":358,"width":57,"height":57}},{"id":"1716804428169","index":3,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":1142.5011669710607,"posY":512.4985860993261,"labelArr":[{"key":"number","title":"序号","value":"4"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":708.88,"y":484,"width":57,"height":57}},{"id":"1716804439994","index":4,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":1228.4992537238356,"posY":270.49812516404813,"labelArr":[{"key":"number","title":"序号","value":"5"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":794.88,"y":242,"width":57,"height":57}}]}
// {"title":"Choose your favorite color and paint it.","audio_url":"http://staging-teach.cdn.ireadabc.com/555083b19cc70078d2ece421b0619520.mp3","picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/47cbc362bdda20a5a15a5c9012174e8f.png"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/d1f337cde81bbe6570e3c4c6989d64fd.png"}],"pic_url":"http://staging-teach.cdn.ireadabc.com/c30eef64a4d7d75972e7bd9ffa8e71cf.png"} // {"title":"Choose your favorite color and paint it.","audio_url":"http://staging-teach.cdn.ireadabc.com/555083b19cc70078d2ece421b0619520.mp3","picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/47cbc362bdda20a5a15a5c9012174e8f.png"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/d1f337cde81bbe6570e3c4c6989d64fd.png"}],"pic_url":"http://staging-teach.cdn.ireadabc.com/c30eef64a4d7d75972e7bd9ffa8e71cf.png"}
......
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