Commit 5f2a3d79 authored by 李维's avatar 李维

dev commit

parent 341bba3b
This diff is collapsed.
......@@ -504,88 +504,88 @@ export default class GameLogic {
let birdAudioWrong = this.g_cartoon.getCartoonElement("birdAudioWrong");
let birdAudioPlaying = this.g_cartoon.getCartoonElement("birdAudioPlaying");
const birdDragonBones_1 = {
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/3fa1882c54e339da6dd269c97f04bb2a.png",
"name": "bird1_tex.png"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/59b30e639be3a22584acec712dd78574.json",
"name": "bird1_tex.json"
},
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/decfe2180607b27160bd34d07448898c.json",
"name": "bird1_ske.json"
}
}
const birdDragonBones_2 = {
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/09ff5666c731f45808e1c0f3d0bfc124.png",
"name": "bird2_tex.png"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/49231d10601dfadffedb9ee25dac164b.json",
"name": "bird2_tex.json"
},
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/c39541350a2828337d5cecb59deac5e8.json",
"name": "bird2_ske.json"
}
}
const audioBird = {
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/24a4f73fd0ba329427cc3a9c07430ede.png",
"name": "playbird_tex.png"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/7b855d3ca30aa8833b9c460424ca2e5c.json",
"name": "playbird_tex.json"
},
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/a611415a85a614a3f3a2c9620633bc2a.json",
"name": "playbird_ske.json"
}
}
// const birdDragonBones_1 = {
// "texPngData": {
// "url": "http://staging-teach.cdn.ireadabc.com/3fa1882c54e339da6dd269c97f04bb2a.png",
// "name": "bird1_tex.png"
// },
// "texJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/59b30e639be3a22584acec712dd78574.json",
// "name": "bird1_tex.json"
// },
// "skeJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/decfe2180607b27160bd34d07448898c.json",
// "name": "bird1_ske.json"
// }
// }
// const birdDragonBones_2 = {
// "texPngData": {
// "url": "http://staging-teach.cdn.ireadabc.com/09ff5666c731f45808e1c0f3d0bfc124.png",
// "name": "bird2_tex.png"
// },
// "texJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/49231d10601dfadffedb9ee25dac164b.json",
// "name": "bird2_tex.json"
// },
// "skeJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/c39541350a2828337d5cecb59deac5e8.json",
// "name": "bird2_ske.json"
// }
// }
// const audioBird = {
// "texPngData": {
// "url": "http://staging-teach.cdn.ireadabc.com/24a4f73fd0ba329427cc3a9c07430ede.png",
// "name": "playbird_tex.png"
// },
// "texJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/7b855d3ca30aa8833b9c460424ca2e5c.json",
// "name": "playbird_tex.json"
// },
// "skeJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/a611415a85a614a3f3a2c9620633bc2a.json",
// "name": "playbird_ske.json"
// }
// }
// Normal
birdAniFly_1.node.opacity = 0;
birdAniFly_2.node.opacity = 0;
birdAniFly_1.dragonBones.setDragonBones(birdDragonBones_1, "Armature鸟1", ()=>{
birdAniFly_1.dragonBones.showDragonBones(-1, "normal")
})
birdAniFly_2.dragonBones.setDragonBones(birdDragonBones_2,"Armature鸟2", ()=>{
birdAniFly_2.dragonBones.showDragonBones(-1, "normal")
})
// birdAniFly_1.dragonBones.setDragonBones(birdDragonBones_1, "Armature鸟1", ()=>{
// birdAniFly_1.dragonBones.showDragonBones(-1, "normal")
// })
// birdAniFly_2.dragonBones.setDragonBones(birdDragonBones_2,"Armature鸟2", ()=>{
// birdAniFly_2.dragonBones.showDragonBones(-1, "normal")
// })
// Wrong
birdAniWrong_1.node.opacity = 0;
birdAniWrong_2.node.opacity = 0;
birdAniWrong_1.dragonBones.setDragonBones(birdDragonBones_1, "Armature鸟1", ()=>{
birdAniWrong_1.dragonBones.showDragonBones(-1, "wrong")
})
birdAniWrong_2.dragonBones.setDragonBones(birdDragonBones_2,"Armature鸟2", ()=>{
birdAniWrong_2.dragonBones.showDragonBones(-1, "wrong")
})
// birdAniWrong_1.dragonBones.setDragonBones(birdDragonBones_1, "Armature鸟1", ()=>{
// birdAniWrong_1.dragonBones.showDragonBones(-1, "wrong")
// })
// birdAniWrong_2.dragonBones.setDragonBones(birdDragonBones_2,"Armature鸟2", ()=>{
// birdAniWrong_2.dragonBones.showDragonBones(-1, "wrong")
// })
// Bird audio
// birdAudioNormal.node.opacity = 0;
birdAudioNormal.dragonBones.setDragonBones(audioBird, "Armature播放", ()=>{
birdAudioNormal.dragonBones.showDragonBones(-1, "normal")
})
// birdAudioNormal.dragonBones.setDragonBones(audioBird, "Armature播放", ()=>{
// birdAudioNormal.dragonBones.showDragonBones(-1, "normal")
// })
birdAudioWrong.node.opacity = 0;
birdAudioWrong.dragonBones.setDragonBones(audioBird, "Armature播放", ()=>{
birdAudioWrong.dragonBones.showDragonBones(-1, "wrong")
})
// birdAudioWrong.dragonBones.setDragonBones(audioBird, "Armature播放", ()=>{
// birdAudioWrong.dragonBones.showDragonBones(-1, "wrong")
// })
birdAudioPlaying.node.opacity = 0;
birdAudioPlaying.dragonBones.setDragonBones(audioBird, "Armature播放", ()=>{
birdAudioPlaying.dragonBones.showDragonBones(-1, "playing")
})
// birdAudioPlaying.dragonBones.setDragonBones(audioBird, "Armature播放", ()=>{
// birdAudioPlaying.dragonBones.showDragonBones(-1, "playing")
// })
birdAudio.switchAni = (type) => {
switch(type) {
......
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