Commit baca7ed6 authored by Lwd's avatar Lwd

aaaa

parent 6a46d245
......@@ -4418,7 +4418,7 @@
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
"y": 1.1
},
"_trs": {
"__type__": "TypedArray",
......@@ -4542,8 +4542,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 128,
"height": 128
"width": 125,
"height": 125
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -5448,7 +5448,7 @@
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
"y": -0.1
},
"_trs": {
"__type__": "TypedArray",
......@@ -5572,8 +5572,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 128,
"height": 128
"width": 125,
"height": 125
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -5585,7 +5585,7 @@
"ctor": "Float64Array",
"array": [
0,
0,
-1,
0,
0,
0,
......
......@@ -58,7 +58,7 @@ cc.Class({
//图片适配
photoScare: function (node) {
let maxSize = Math.min(128 / node.height, 128 / node.width);
let maxSize = Math.min(120 / node.height, 120 / node.width);
if (node.perScale == undefined) {
node.perScale = node.scaleX;
} else {
......
......@@ -153,14 +153,14 @@ var result = cc.Class({
chengeTextColor() {
if (!this.layoutText.children[this.textIndex] || this.textIndex == this.layoutText.childrenCount) {
this.isPlaying = false;
this.unschedule(this.chengeTextColor);
if (g.data_mgr.temPlayAudio.length < 1) {
if (g.data_mgr.pageId == g.data_mgr.data.contentObj.pageArr.length - 1) {
//显示结算撒花
g.eff_well.inst.showEff();
}
}
this.isPlaying = false;
this.unschedule(this.chengeTextColor);
}
this.layoutText.children[this.textIndex] && (this.layoutText.children[this.textIndex].color = new cc.Color().fromHEX(Color_texts[1]));
this.layoutText.children[this.textIndex - 1] && (this.layoutText.children[this.textIndex - 1].color = new cc.Color().fromHEX(Color_texts[3]));
......
......@@ -23,7 +23,7 @@ g.data_mgr = {
//获得默认数据
getDefaultData() {
const dataJson = '{ "contentObj": { "title":"frd iwhfii9w","pageArr": [{ "pageInfo": [{ "a_pic_url": "http://staging-teach.cdn.ireadabc.com/19d51663c49a4faed1fd569de26611a3.png", "b_pic_url": "http://staging-teach.cdn.ireadabc.com/7629f54dc9ae5e3c556b4d898509f888.png", "a_audio_url": "http://staging-teach.cdn.ireadabc.com/495324991838775e49e3ca6593d432c9.mp3", "b_audio_url": "http://staging-teach.cdn.ireadabc.com/17cc0e2a383e4632147dc495a1397915.mp3", "groupLabel": "I am Ala", "groupPic": "http://staging-teach.cdn.ireadabc.com/376ac33efcae601263566d37c61005e3.png", "common_pic_url": "http://staging-teach.cdn.ireadabc.com/28ef69eeb008a030ce1fbb237a5d0637.png" ,"type":"Spine","ske_json":"http://staging-teach.cdn.ireadabc.com/e48564e39f64ef92dee4309b3493652a.json","ske_json_name":"mao_ske.json","tex_json":"http://staging-teach.cdn.ireadabc.com/233b2f102f321086b70c239a1bd4ba1a.json","tex_json_name":"mao_tex.json","tex_png":"http://staging-teach.cdn.ireadabc.com/d5c00d0cf339484801dc235ed33200d0.png","tex_png_name":"mao_tex.png"}, { "a_pic_url": "http://staging-teach.cdn.ireadabc.com/e813b164253de04bbcdd9f1a38cc228d.png", "b_pic_url": "http://staging-teach.cdn.ireadabc.com/2c5f7fedc1cdcb91dda5bb621a2d0235.png", "a_audio_url": "http://staging-teach.cdn.ireadabc.com/20f16608cf7fc6499eb1f942e625658d.mp3", "b_audio_url": "http://staging-teach.cdn.ireadabc.com/205722475ccaca6233b2f28e635405ca.mp3", "groupLabel": "I am Ala", "groupPic": "http://staging-teach.cdn.ireadabc.com/376ac33efcae601263566d37c61005e3.png", "common_pic_url": "http://staging-teach.cdn.ireadabc.com/28ef69eeb008a030ce1fbb237a5d0637.png" ,"type":"Image"}, { "a_pic_url": "http://staging-teach.cdn.ireadabc.com/9d7bdb483c7690728f0658022753c8ed.png", "b_pic_url": "http://staging-teach.cdn.ireadabc.com/9d7bdb483c7690728f0658022753c8ed.png", "a_audio_url": "http://staging-teach.cdn.ireadabc.com/0b6ef24f15c6d8ad7bf27cc913445ebf.mp3", "b_audio_url": "http://staging-teach.cdn.ireadabc.com/b2c170f84b85dddf554b5c837d1d6e30.mp3", "groupLabel": "I am Ala", "groupPic": "http://staging-teach.cdn.ireadabc.com/376ac33efcae601263566d37c61005e3.png", "common_pic_url": "http://staging-teach.cdn.ireadabc.com/28ef69eeb008a030ce1fbb237a5d0637.png" ,"type":"Image"}, { "a_pic_url": "http://staging-teach.cdn.ireadabc.com/7502f454d1edc0d1d52efbe8a9b2020a.png", "b_pic_url": "http://staging-teach.cdn.ireadabc.com/7502f454d1edc0d1d52efbe8a9b2020a.png", "a_audio_url": "http://staging-teach.cdn.ireadabc.com/1e3e361ef1953dec43f250278be63e1d.mp3", "b_audio_url": "http://staging-teach.cdn.ireadabc.com/a589225b18d35b045bc52e283ec7cceb.mp3", "groupLabel": "I am Ala", "groupPic": "http://staging-teach.cdn.ireadabc.com/376ac33efcae601263566d37c61005e3.png", "common_pic_url": "http://staging-teach.cdn.ireadabc.com/28ef69eeb008a030ce1fbb237a5d0637.png" ,"type":"Image"}, { "a_pic_url": "http://staging-teach.cdn.ireadabc.com/86fb8f1694cf0d5d2d81c26fecfae709.png", "b_pic_url": "http://staging-teach.cdn.ireadabc.com/a41083db803c2f15cd67402f4b751b87.png", "a_audio_url": "", "b_audio_url": "", "groupLabel": "I am Ala", "groupPic": "http://staging-teach.cdn.ireadabc.com/376ac33efcae601263566d37c61005e3.png", "common_pic_url": "http://staging-teach.cdn.ireadabc.com/28ef69eeb008a030ce1fbb237a5d0637.png" ,"type":"Image"}, { "a_pic_url": "http://staging-teach.cdn.ireadabc.com/adccd435985b8ce20737e4b6a235d88f.png", "b_pic_url": "http://staging-teach.cdn.ireadabc.com/2c5f7fedc1cdcb91dda5bb621a2d0235.png", "a_audio_url": "http://staging-teach.cdn.ireadabc.com/69cbbc96cd60283120521ad606f8c886.mp3", "b_audio_url": "http://staging-teach.cdn.ireadabc.com/11bcdcf1720dd260b90a0f4b523633f8.mp3", "groupLabel": "I am Ala", "groupPic": "http://staging-teach.cdn.ireadabc.com/376ac33efcae601263566d37c61005e3.png", "common_pic_url": "http://staging-teach.cdn.ireadabc.com/28ef69eeb008a030ce1fbb237a5d0637.png" }] ,"type":"Image"}, { "a_pic_url": "http://staging-teach.cdn.ireadabc.com/7629f54dc9ae5e3c556b4d898509f888.png", "b_pic_url": "http://staging-teach.cdn.ireadabc.com/2c5f7fedc1cdcb91dda5bb621a2d0235.png", "a_audio_url": "", "b_audio_url": "", "groupLabel": "I am Ala", "groupPic": "http://staging-teach.cdn.ireadabc.com/376ac33efcae601263566d37c61005e3.png", "common_pic_url": "http://staging-teach.cdn.ireadabc.com/28ef69eeb008a030ce1fbb237a5d0637.png" ,"type":"Image"}, { "a_pic_url": "http://staging-teach.cdn.ireadabc.com/19d51663c49a4faed1fd569de26611a3.png", "b_pic_url": "http://staging-teach.cdn.ireadabc.com/7629f54dc9ae5e3c556b4d898509f888.png", "a_audio_url": "http://staging-teach.cdn.ireadabc.com/a787397544260023572b154914ff961b.mp3", "b_audio_url": "http://staging-teach.cdn.ireadabc.com/4fb9a05072f2b3c0493a2fcbb55307bf.mp3", "groupLabel": "I am Ala", "groupPic": "http://staging-teach.cdn.ireadabc.com/376ac33efcae601263566d37c61005e3.png", "common_pic_url": "http://staging-teach.cdn.ireadabc.com/28ef69eeb008a030ce1fbb237a5d0637.png" ,"type":"Image"}, { "a_pic_url": "http://staging-teach.cdn.ireadabc.com/e813b164253de04bbcdd9f1a38cc228d.png", "b_pic_url": "http://staging-teach.cdn.ireadabc.com/2c5f7fedc1cdcb91dda5bb621a2d0235.png", "a_audio_url": "http://staging-teach.cdn.ireadabc.com/cc93f9eacb135dbeba69857d37d2a0fd.mp3", "b_audio_url": "http://staging-teach.cdn.ireadabc.com/3806065de519a70e2758f2b5ed46f7c1.mp3", "groupLabel": "I am Ala", "groupPic": "http://staging-teach.cdn.ireadabc.com/376ac33efcae601263566d37c61005e3.png", "common_pic_url": "http://staging-teach.cdn.ireadabc.com/28ef69eeb008a030ce1fbb237a5d0637.png" ,"type":"Image"}, { "a_pic_url": "http://staging-teach.cdn.ireadabc.com/9d7bdb483c7690728f0658022753c8ed.png", "b_pic_url": "http://staging-teach.cdn.ireadabc.com/7629f54dc9ae5e3c556b4d898509f888.png", "a_audio_url": "http://staging-teach.cdn.ireadabc.com/3ed9f5f1278b67380e792d94e7a7564b.mp3", "b_audio_url": "http://staging-teach.cdn.ireadabc.com/87fb5b526def6f946c5991490ce31475.mp3", "groupLabel": "I am Ala", "groupPic": "http://staging-teach.cdn.ireadabc.com/376ac33efcae601263566d37c61005e3.png", "common_pic_url": "http://staging-teach.cdn.ireadabc.com/28ef69eeb008a030ce1fbb237a5d0637.png" ,"type":"Image"}, { "a_pic_url": "http://staging-teach.cdn.ireadabc.com/c9147ba4f6865137f78a9a6331c81151.png", "b_pic_url": "http://staging-teach.cdn.ireadabc.com/502c5d3a110c40a6bfcf1a2cd1dab9ea.png", "a_audio_url": "http://staging-teach.cdn.ireadabc.com/69cbbc96cd60283120521ad606f8c886.mp3", "b_audio_url": "http://staging-teach.cdn.ireadabc.com/87fb5b526def6f946c5991490ce31475.mp3", "groupLabel": "I am Ala", "groupPic": "http://staging-teach.cdn.ireadabc.com/376ac33efcae601263566d37c61005e3.png", "common_pic_url": "http://staging-teach.cdn.ireadabc.com/28ef69eeb008a030ce1fbb237a5d0637.png" ,"type":"Image"}, { "a_pic_url": "http://staging-teach.cdn.ireadabc.com/9159668d6274ead9dc1ab0cd8cd2e442.png", "b_pic_url": "http://staging-teach.cdn.ireadabc.com/adccd435985b8ce20737e4b6a235d88f.png", "a_audio_url": "http://staging-teach.cdn.ireadabc.com/4fb9a05072f2b3c0493a2fcbb55307bf.mp3", "b_audio_url": "http://staging-teach.cdn.ireadabc.com/3d2d9f1ed700be793508ab79d6de76a2.mp3", "groupLabel": "I am Ala", "groupPic": "http://staging-teach.cdn.ireadabc.com/376ac33efcae601263566d37c61005e3.png", "common_pic_url": "http://staging-teach.cdn.ireadabc.com/28ef69eeb008a030ce1fbb237a5d0637.png" }, { "a_pic_url": "http://staging-teach.cdn.ireadabc.com/19d51663c49a4faed1fd569de26611a3.png", "b_pic_url": "http://staging-teach.cdn.ireadabc.com/7629f54dc9ae5e3c556b4d898509f888.png", "a_audio_url": "http://staging-teach.cdn.ireadabc.com/495324991838775e49e3ca6593d432c9.mp3", "b_audio_url": "http://staging-teach.cdn.ireadabc.com/17cc0e2a383e4632147dc495a1397915.mp3", "groupLabel": "I am Ala", "groupPic": "http://staging-teach.cdn.ireadabc.com/376ac33efcae601263566d37c61005e3.png", "common_pic_url": "http://staging-teach.cdn.ireadabc.com/28ef69eeb008a030ce1fbb237a5d0637.png" ,"type":"Spine","ske_json":"http://staging-teach.cdn.ireadabc.com/e48564e39f64ef92dee4309b3493652a.json","ske_json_name":"mao_ske.json","tex_json":"http://staging-teach.cdn.ireadabc.com/233b2f102f321086b70c239a1bd4ba1a.json","tex_json_name":"mao_tex.json","tex_png":"http://staging-teach.cdn.ireadabc.com/d5c00d0cf339484801dc235ed33200d0.png","tex_png_name":"mao_tex.png"}] }] } }'
const dataJson = {}
const data = JSON.parse(dataJson);
return data;
},
......
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