Commit 933a92fb authored by 李维's avatar 李维

Bug fix

parent 87d3e7a1
......@@ -463,12 +463,16 @@ export default class GameLogic {
let p2 = null
if(this.g_formData.dataArray[this.m_currentQuestion].rightType == "image") {
this.g_cartoon.getCartoonElement("rightImageContainer").node.active = true
this.g_cartoon.getCartoonElement("rightDragonContainer").node.active = false
p2 = new Promise((resolve, reject) => {
this.g_cartoon.getCartoonElement("rightImageContainer").setImage(this.g_formData.dataArray[this.m_currentQuestion].image_url, ()=>{
resolve()
})
})
} else {
this.g_cartoon.getCartoonElement("rightImageContainer").node.active = false
this.g_cartoon.getCartoonElement("rightDragonContainer").node.active = true
p2 = new Promise((resolve, reject) => {
this.g_cartoon.getCartoonElement("rightDragonContainer").setDragonBones(rightDragon, ()=>{
resolve()
......
......@@ -104,7 +104,7 @@ cc.Class({
// const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbx_Pronunciation","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_Sbx_Pronunciation","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_Sbx_Pronunciation","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/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"}]}}'
// const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbox_FT_08","bgMusic":"","titleText":"","questionAudio_url":"","birdDragonBones_1":{},"birdDragonBones_2":{},"birdDragonBones_audio":{},"dataArray":[{"video_url":"http://staging-teach.cdn.ireadabc.com/f8476aa86cfb6ea4d1fbb69578f606d7.mp4","textDragonBones":{"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/b095932007653f7aa4514570af991342.png","name":"word_tex.png"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/4e2458f5632fbfdf6c5a1c66f8c77fe3.json","name":"word_tex.json"},"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/c83f14aeee5b533cb582887f5122bcef.json","name":"word_ske.json"}},"rightDragonBones":{"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/ccc42a2a6830dd5bddc67e727ebf717b.png","name":"dragon_tex.png"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/830c92d3d3c73353cf43f03a0051123f.json","name":"dragon_tex.json"},"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/e1f26dedb60960b07f90bd42e5478ba6.json","name":"dragon_ske.json"}},"audio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","text_audio_url":"http://staging-teach.cdn.ireadabc.com/99ddd7e2eaa495fa24c6d8ceec76a128.mp3","right_audio_url":"http://staging-teach.cdn.ireadabc.com/315ca3d2ed808bb1cc0b6d26ac229d4c.mp3","rightType":"image","image_url":"http://staging-teach.cdn.ireadabc.com/06bb65fb7a3a03d095587b5cc2efc65f.png"}],"theme":"A"},"border_image_url":"http://staging-teach.cdn.ireadabc.com/e9ce15bcb9165a8416799df5597f01e6.jpg","video_image_url":"http://staging-teach.cdn.ireadabc.com/308cc7a44debd884b12508a7fcad83ab.jpg","text_image_url":"http://staging-teach.cdn.ireadabc.com/389033602b7468ceb2a34845b0063ea1.jpg"}'
// const dataJson = '{"contentObj":{"version":"1.0","key":"DataKey_Sbx_Pronunciation","theme":"A","border_image_url":"http://staging-teach.cdn.ireadabc.com/c3e8520418444ad2ee7689510f98de9b.png","video_image_url":"http://staging-teach.cdn.ireadabc.com/06bb65fb7a3a03d095587b5cc2efc65f.png","text_image_url":"http://staging-teach.cdn.ireadabc.com/08a2a49e8e1e8e1dc53fb57ad8a4cb44.png","dataArray":[{"video_url":"http://staging-teach.cdn.ireadabc.com/f25bb33cdb266345667a1bec58818175.mp4","textDragonBones":{"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/b095932007653f7aa4514570af991342.png","name":"word_tex.png"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/830c92d3d3c73353cf43f03a0051123f.json","name":"dragon_tex.json"},"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/e1f26dedb60960b07f90bd42e5478ba6.json","name":"dragon_ske.json"}},"rightDragonBones":{"skeJsonData":{"url":"","name":""},"texJsonData":{"url":"","name":""},"texPngData":{"url":"","name":""}},"rightType":"image","image_url":"http://staging-teach.cdn.ireadabc.com/3aa79777f6bb704604a502c0ab05fcf0.png"},{"video_url":"http://staging-teach.cdn.ireadabc.com/82438e44e9e106cfa43d1fd62a24d61b.mp4","textDragonBones":{"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/b095932007653f7aa4514570af991342.png","name":"word_tex.png"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/4e2458f5632fbfdf6c5a1c66f8c77fe3.json","name":"word_tex.json"},"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/c83f14aeee5b533cb582887f5122bcef.json","name":"word_ske.json"}},"rightDragonBones":{"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/ccc42a2a6830dd5bddc67e727ebf717b.png","name":"dragon_tex.png"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/830c92d3d3c73353cf43f03a0051123f.json","name":"dragon_tex.json"},"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/e1f26dedb60960b07f90bd42e5478ba6.json","name":"dragon_ske.json"}},"rightType":"dragonBones"}]},"border_image_url":"http://staging-teach.cdn.ireadabc.com/56009acbe3fa82935a9026ba38ee1155.jpg","video_image_url":"http://staging-teach.cdn.ireadabc.com/3e00d8db68a4d285deac9b42a2fdb02a.jpg","text_image_url":"http://staging-teach.cdn.ireadabc.com/556a588389ff7cd2aa6ca13d492cc7ce.png"}'
const dataJson = '{ "contentObj": { "version": "1.0", "key": "DataKey_Sbx_Pronunciation", "bgMusic": "", "titleText": "", "questionAudio_url": "", "birdDragonBones_1": {}, "birdDragonBones_2": {}, "birdDragonBones_audio": {}, "dataArray": [], "theme": "A" }, "border_image_url": "", "video_image_url": "", "text_image_url": "" }'
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