Commit 7021d7af authored by 李维's avatar 李维

dev commit

parent 67230368
{
"ver": "2.0.1",
"uuid": "0228048b-0aa2-4e5d-90bd-2e6296ae4419",
"downloadMode": 0,
"duration": 1.236583,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "c1346441-63d2-4096-b5a1-0cecc042ab61",
"downloadMode": 0,
"duration": 1.854694,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "234809b3-87b1-4db0-a1bb-b4327e90de89",
"downloadMode": 0,
"duration": 1.044898,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "03402378-9ad2-4144-8d41-cf3bd78190a9",
"downloadMode": 0,
"duration": 0.84,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "29f5220e-ff20-4b01-baf2-ebc27321ce7b",
"downloadMode": 0,
"duration": 1.688,
"subMetas": {}
}
\ No newline at end of file
This diff is collapsed.
...@@ -140,38 +140,37 @@ export default class Cartoon { ...@@ -140,38 +140,37 @@ export default class Cartoon {
// Audio // Audio
playAudio(audio_url, cb = null) { playAudio(audio_url, cb = null) {
// return new Promise((res, rej) => { return new Promise((resolve, reject)=>{
if (audio_url) {
// })
if (audio_url) {
var urlreg=/^(?=^.{3,255}$)(http(s)?:\/\/)?(www\.)?[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+(:\d+)*(\/\w+\.\w+)*([\?&]\w+=\w*)*$/ var urlreg=/^(?=^.{3,255}$)(http(s)?:\/\/)?(www\.)?[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+(:\d+)*(\/\w+\.\w+)*([\?&]\w+=\w*)*$/
if(urlreg.test(audio_url)) { if(urlreg.test(audio_url)) {
cc.assetManager.loadRemote(audio_url, (err, audioClip) => { cc.assetManager.loadRemote(audio_url, (err, audioClip) => {
if(cb) { if(cb) {
this.audioCallback[audio_url] = cb this.audioCallback[audio_url] = cb
} }
const audio = cc.audioEngine.play(audioClip, false, 1); const audioId = cc.audioEngine.play(audioClip, false, 1);
if (cb) { if (cb) {
cc.audioEngine.setFinishCallback(audio, () => { cc.audioEngine.setFinishCallback(audioId, () => {
delete this.audioCallback[audio_url] delete this.audioCallback[audio_url]
cb(); cb();
}); });
} }
// res(audio) resolve(audioId)
}); });
} else { } else {
const audioNode = cc.find('Canvas/res/audio').getChildByName(audio_url).getComponent(cc.AudioSource); const audioNode = cc.find('Canvas/res/audio').getChildByName(audio_url).getComponent(cc.AudioSource);
const audio = cc.audioEngine.play(audioNode.clip, false, 1) let audioId = cc.audioEngine.play(audioNode.clip, false, 1)
if (cb) { if (cb) {
this.audioCallback[audio_url] = cb this.audioCallback[audio_url] = cb
cc.audioEngine.setFinishCallback(audio, () => { cc.audioEngine.setFinishCallback(audioId, () => {
delete this.audioCallback[audio_url] delete this.audioCallback[audio_url]
cb(); cb();
}); });
} }
// res(audio) resolve(audioId)
} }
} }
})
} }
stopAllAudio(exceptUrls = []) { stopAllAudio(exceptUrls = []) {
...@@ -292,9 +291,9 @@ class DragonBones { ...@@ -292,9 +291,9 @@ class DragonBones {
const ske = dragonBonesConfig.skeJsonData.url const ske = dragonBonesConfig.skeJsonData.url
const atlas = dragonBonesConfig.texJsonData.url const atlas = dragonBonesConfig.texJsonData.url
cc.loader.load(image, (error, texture) => { cc.assetManager.loadRemote(image, (error, texture) => {
cc.loader.load({url: atlas, type: 'txt'}, (error, atlasJson) => { cc.assetManager.loadRemote(atlas, (error, atlasJson) => {
cc.loader.load({url: ske, type: 'txt'}, (error, dragonBonesJson) => { cc.assetManager.loadRemote(url, (error, dragonBonesJson) => {
const atlas = new dragonBones.DragonBonesAtlasAsset(); const atlas = new dragonBones.DragonBonesAtlasAsset();
atlas.atlasJson = atlasJson; atlas.atlasJson = atlasJson;
atlas.texture = texture; atlas.texture = texture;
......
This diff is collapsed.
...@@ -82,13 +82,19 @@ cc.Class({ ...@@ -82,13 +82,19 @@ cc.Class({
}) })
}, },
onDestory() {
cc.audioEngine.stopAll()
},
getData(cb) { getData(cb) {
cb(this.getDefaultData()); cb(this.getDefaultData());
}, },
getDefaultData() { getDefaultData() {
// const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"","titleText":"TEstd","questionAudio_url":"","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/2e28eae8f0e0f01193da6f3677379ed3.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/fad2dac4f8b59a185dc30d42617c2ca8.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/6c3fca11052464102407f173e4a83db9.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ec82c796af801486548ae98623f614d2.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png"}]}}' // const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"","titleText":"TEstd","questionAudio_url":"","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/2e28eae8f0e0f01193da6f3677379ed3.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/fad2dac4f8b59a185dc30d42617c2ca8.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/6c3fca11052464102407f173e4a83db9.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ec82c796af801486548ae98623f614d2.png"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png"}]}}'
const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"http://staging-teach.cdn.ireadabc.com/ad58bae62ea02cf215ce7dee22df306f.mp3","titleText":"TEstd","questionAudio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png","audio_url":"http://staging-teach.cdn.ireadabc.com/ae7c0930a45d0ffc9f13182298e2be71.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png","audio_url":"http://staging-teach.cdn.ireadabc.com/c14938125a52096dc0be9fbbf6638cb2.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png","audio_url":"http://staging-teach.cdn.ireadabc.com/135c628899396df62c14567f46d61f3f.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/2e28eae8f0e0f01193da6f3677379ed3.png","audio_url":"http://staging-teach.cdn.ireadabc.com/cb0ac1d1bcdfdaf768f0a06d3fff37a3.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/fad2dac4f8b59a185dc30d42617c2ca8.png","audio_url":"http://staging-teach.cdn.ireadabc.com/9df3f14bc88bcffc49b6717c40428ed8.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/6c3fca11052464102407f173e4a83db9.png","audio_url":"http://staging-teach.cdn.ireadabc.com/d5a5ac2f45431a8a15492cb9f78e0396.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ec82c796af801486548ae98623f614d2.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"}]}}' // const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"http://staging-teach.cdn.ireadabc.com/ad58bae62ea02cf215ce7dee22df306f.mp3","titleText":"TEstd","questionAudio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/06cc843598a912921f6ca3acfde6220b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/571974922f6678111348a5643dba7e20.png","audio_url":"http://staging-teach.cdn.ireadabc.com/ae7c0930a45d0ffc9f13182298e2be71.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/78579114773af12a7aec6723e3b9d475.png","audio_url":"http://staging-teach.cdn.ireadabc.com/c14938125a52096dc0be9fbbf6638cb2.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/c99e82e1c3f087c6dc0469e30c624f70.png","audio_url":"http://staging-teach.cdn.ireadabc.com/135c628899396df62c14567f46d61f3f.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/5b45c89ac9e899d76522767219b1346b.png","audio_url":"http://staging-teach.cdn.ireadabc.com/3b5540cc95a006dff8c41dba7537075a.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/2e28eae8f0e0f01193da6f3677379ed3.png","audio_url":"http://staging-teach.cdn.ireadabc.com/cb0ac1d1bcdfdaf768f0a06d3fff37a3.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/fad2dac4f8b59a185dc30d42617c2ca8.png","audio_url":"http://staging-teach.cdn.ireadabc.com/9df3f14bc88bcffc49b6717c40428ed8.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/6c3fca11052464102407f173e4a83db9.png","audio_url":"http://staging-teach.cdn.ireadabc.com/d5a5ac2f45431a8a15492cb9f78e0396.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ec82c796af801486548ae98623f614d2.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"},{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"}]}}'
// const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","titleText":"TEstd","questionAudio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","dataArray":[{"text":"","image_url":"http://staging-teach.cdn.ireadabc.com/ac4b9422df1556f80ac5c3058cd3d670.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fb08783926362bf64232e2ec6966011d.mp3"}]}}'
const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"","titleText":"","questionAudio_url":"","dataArray":[]}}'
const data = JSON.parse(dataJson); const data = JSON.parse(dataJson);
return data; return data;
}, },
...@@ -191,7 +197,7 @@ cc.Class({ ...@@ -191,7 +197,7 @@ cc.Class({
getSpriteFrimeByUrl(url, cb) { getSpriteFrimeByUrl(url, cb) {
cc.loader.load({ url }, (err, img) => { cc.assetManager.loadRemote(url, (err, img) => {
const spriteFrame = new cc.SpriteFrame(img) const spriteFrame = new cc.SpriteFrame(img)
if (cb) { if (cb) {
cb(spriteFrame); cb(spriteFrame);
......
export default { export default {
default: true, "default": true,
dataArray: [ "version":"1.0",
"key":"DataKey_Sbox_FT_08",
"bgMusic":"",
"titleText":"It's My Day",
"questionAudio_url":"",
"dataArray":[
{ {
question: { "image_url":"card_demo",
question_text: "What Am I Doing?", "audio_url":""
body_text: "I am walking.",
question_audio_url: "whatamidoing",
body_audio_url: "imwalking"
},
selectCards: [
{ image_url: "eat", audio_url: "imeatting", stage_image_url: "", isAnswer: false },
{ image_url: "fly", audio_url: "iamflying", stage_image_url: "", isAnswer: false },
{ image_url: "drive", audio_url: "imdrivingmycar", stage_image_url: "", isAnswer: false },
{ image_url: "dance", audio_url: "imdancing", stage_image_url: "", isAnswer: false },
{ image_url: "jump", audio_url: "iamjumping", stage_image_url: "", isAnswer: false },
{ image_url: "roll", audio_url: "iamrolling", stage_image_url: "", isAnswer: false },
{ image_url: "sleep", audio_url: "imsleeping", stage_image_url: "", isAnswer: false },
{ image_url: "walk", audio_url: "imwalking", stage_image_url: "", isAnswer: true }
]
}, },
{ {
question: { "image_url":"card_demo",
question_text: "What Am I Doing?", "audio_url":""
body_text: "I am dancing.",
question_audio_url: "",
body_audio_url: "imdancing"
},
selectCards: [
{ image_url: "dance", audio_url: "imdancing", stage_image_url: "", isAnswer: true },
{ image_url: "jump", audio_url: "iamjumping", stage_image_url: "", isAnswer: false },
{ image_url: "sleep", audio_url: "imsleeping", stage_image_url: "", isAnswer: false },
{ image_url: "drive", audio_url: "imdrivingmycar", stage_image_url: "", isAnswer: false },
{ image_url: "walk", audio_url: "imwalking", stage_image_url: "", isAnswer: false }
]
}, },
{ {
question: { "image_url":"card_demo",
question_text: "What Am I Doing?", "audio_url":""
body_text: "I am sleeping.",
question_audio_url: "",
body_audio_url: "imsleeping"
},
selectCards: [
{ image_url: "dance", audio_url: "imdancing", stage_image_url: "", isAnswer: false },
{ image_url: "eat", audio_url: "imeatting", stage_image_url: "", isAnswer: false },
{ image_url: "fly", audio_url: "iamflying", stage_image_url: "", isAnswer: false },
{ image_url: "sleep", audio_url: "imsleeping", stage_image_url: "", isAnswer: true },
{ image_url: "drive", audio_url: "imdrivingmycar", stage_image_url: "", isAnswer: false },
{ image_url: "walk", audio_url: "imwalking", stage_image_url: "", isAnswer: false }
]
}, },
{ {
question: { "image_url":"card_demo",
question_text: "What Am I Doing?", "audio_url":""
body_text: "I am eatting.", },
question_audio_url: "", {
body_audio_url: "imeatting" "image_url":"card_demo",
}, "audio_url":""
selectCards: [ },
{ image_url: "drive", audio_url: "imdrivingmycar", stage_image_url: "", isAnswer: false }, {
{ image_url: "fly", audio_url: "imsleeping", stage_image_url: "", isAnswer: false }, "image_url":"card_demo",
{ image_url: "dance", audio_url: "imdancing", stage_image_url: "", isAnswer: false }, "audio_url":""
{ image_url: "eat", audio_url: "imeatting", stage_image_url: "", isAnswer: true }, },
{ image_url: "roll", audio_url: "iamrolling", stage_image_url: "", isAnswer: false }, {
{ image_url: "jump", audio_url: "iamjumping", stage_image_url: "", isAnswer: false }, "image_url":"card_demo",
{ image_url: "sleep", audio_url: "imsleeping", stage_image_url: "", isAnswer: false }, "audio_url":""
] },
} {
"image_url":"card_demo",
"audio_url":""
},
{
"image_url":"card_demo",
"audio_url":""
},
{
"image_url":"card_demo",
"audio_url":""
},
] ]
} }
\ 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