Commit f7576875 authored by Tt's avatar Tt

加猫咪

parent 07900478
...@@ -104,11 +104,12 @@ cc.Class({ ...@@ -104,11 +104,12 @@ cc.Class({
getDefaultData() { getDefaultData() {
let data = DefaultData; let data = DefaultData;
// return data; // return data;
return { return {
"startAudio": "http://staging-teach.cdn.ireadabc.com/1227771664f9dd7b1fe210a7736b76a0.mp3", "startAudio": "http://staging-teach.cdn.ireadabc.com/1227771664f9dd7b1fe210a7736b76a0.mp3",
"endAudio": "http://staging-teach.cdn.ireadabc.com/1227771664f9dd7b1fe210a7736b76a0.mp3", "endAudio": "http://staging-teach.cdn.ireadabc.com/1227771664f9dd7b1fe210a7736b76a0.mp3",
"waitAudio": "http://staging-teach.cdn.ireadabc.com/1227771664f9dd7b1fe210a7736b76a0.mp3", "waitAudio": "http://staging-teach.cdn.ireadabc.com/1227771664f9dd7b1fe210a7736b76a0.mp3",
"haveCover": false, "coverType": "Image", "coverImage": "", "coverAudio": "", "coverText": "", "coverDragonBone": { "skeJsonData": { "url": "" }, "texJsonData": { "url": "" }, "texPngData": { "url": "" } }, "titleAudio": "", "titleText": "", "titleTextColor": "A", "pageList": [{ "pageType": "Image", "pageAudio": "http://staging-teach.cdn.ireadabc.com/cc5b1a8730bc275ecac85185d5ce2c5b.mp3", "pageText": "", "pageImage": "", "textColor": "A", "pageDragonBone": { "skeJsonData": { "url": "http://staging-teach.cdn.ireadabc.com/679fed26daa464819d553de6331b3552.json", "name": "alien-pro.json" }, "texJsonData": { "url": "http://staging-teach.cdn.ireadabc.com/65d8214c6b5c5d0496e17adb0408276a.atlas", "name": "alien-pro.atlas" }, "texPngData": { "url": "http://staging-teach.cdn.ireadabc.com/a319b372899239325b90bb4ec07b4970.png", "name": "alien-pro.png" }, "animType": "spine" } }, { "pageType": "Image", "pageAudio": "http://staging-teach.cdn.ireadabc.com/fd877ad376fdffdb0dfc62122065a78f.mp3", "pageText": "", "pageImage": "", "textColor": "A", "pageDragonBone": { "skeJsonData": { "url": "http://staging-teach.cdn.ireadabc.com/d1f859d3fba84bd03565e543c986fb28.json", "name": "6_4_ske.json" }, "texJsonData": { "url": "http://staging-teach.cdn.ireadabc.com/70f96e1cc7f013e27ed1952c503fb750.json", "name": "6_4_tex.json" }, "texPngData": { "url": "http://staging-teach.cdn.ireadabc.com/b06f9b90018a6eb0175a01e355b9ced6.png", "name": "6_4_tex.png" }, "animType": "dragonBone" } }, { "pageType": "Image", "pageAudio": "http://staging-teach.cdn.ireadabc.com/dff6748c93f6bf3de8cb7105fa9ba5de.mp3", "pageText": "", "pageImage": "", "textColor": "A", "pageDragonBone": { "skeJsonData": { "url": "http://staging-teach.cdn.ireadabc.com/a278a56fe77dfade7366829e9c65c815.json", "name": "6_3_ske.json" }, "texJsonData": { "url": "http://staging-teach.cdn.ireadabc.com/96680527a570cec4d7c9818c91ec434a.json", "name": "6_3_tex.json" }, "texPngData": { "url": "http://staging-teach.cdn.ireadabc.com/5c441810b0a5bc73248c50d8c32b4899.png", "name": "6_3_tex.png" }, "animType": "dragonBone" } }] } "haveCover": false, "coverType": "Image", "coverImage": "", "coverAudio": "", "coverText": "", "coverDragonBone": { "skeJsonData": { "url": "" }, "texJsonData": { "url": "" }, "texPngData": { "url": "" } }, "titleAudio": "", "titleText": "", "titleTextColor": "A", "pageList": [{ "pageType": "Image", "pageAudio": "http://staging-teach.cdn.ireadabc.com/cc5b1a8730bc275ecac85185d5ce2c5b.mp3", "pageText": "", "pageImage": "", "textColor": "A", "pageDragonBone": { "skeJsonData": { "url": "http://staging-teach.cdn.ireadabc.com/679fed26daa464819d553de6331b3552.json", "name": "alien-pro.json" }, "texJsonData": { "url": "http://staging-teach.cdn.ireadabc.com/65d8214c6b5c5d0496e17adb0408276a.atlas", "name": "alien-pro.atlas" }, "texPngData": { "url": "http://staging-teach.cdn.ireadabc.com/a319b372899239325b90bb4ec07b4970.png", "name": "alien-pro.png" }, "animType": "spine" } }, { "pageType": "Image", "pageAudio": "http://staging-teach.cdn.ireadabc.com/fd877ad376fdffdb0dfc62122065a78f.mp3", "pageText": "", "pageImage": "", "textColor": "A", "pageDragonBone": { "skeJsonData": { "url": "http://staging-teach.cdn.ireadabc.com/d1f859d3fba84bd03565e543c986fb28.json", "name": "6_4_ske.json" }, "texJsonData": { "url": "http://staging-teach.cdn.ireadabc.com/70f96e1cc7f013e27ed1952c503fb750.json", "name": "6_4_tex.json" }, "texPngData": { "url": "http://staging-teach.cdn.ireadabc.com/b06f9b90018a6eb0175a01e355b9ced6.png", "name": "6_4_tex.png" }, "animType": "dragonBone" } }, { "pageType": "Image", "pageAudio": "http://staging-teach.cdn.ireadabc.com/dff6748c93f6bf3de8cb7105fa9ba5de.mp3", "pageText": "", "pageImage": "", "textColor": "A", "pageDragonBone": { "skeJsonData": { "url": "http://staging-teach.cdn.ireadabc.com/a278a56fe77dfade7366829e9c65c815.json", "name": "6_3_ske.json" }, "texJsonData": { "url": "http://staging-teach.cdn.ireadabc.com/96680527a570cec4d7c9818c91ec434a.json", "name": "6_3_tex.json" }, "texPngData": { "url": "http://staging-teach.cdn.ireadabc.com/5c441810b0a5bc73248c50d8c32b4899.png", "name": "6_3_tex.png" }, "animType": "dragonBone" } }]
}
}, },
preloadItem() { preloadItem() {
...@@ -177,7 +178,13 @@ cc.Class({ ...@@ -177,7 +178,13 @@ cc.Class({
let itemPage = page.getComponent('ItemPage'); let itemPage = page.getComponent('ItemPage');
itemPage.playAudio(); itemPage.playAudio();
itemPage.playSpine().then(() => { itemPage.playSpine().then(() => {
resolve(''); let nextPage = this.pageList[GameData.pageIndex + 1];
if (!nextPage) {
this.gameOver();
resolve('');
} else {
resolve('');
}
}) })
}); });
}, },
...@@ -209,7 +216,6 @@ cc.Class({ ...@@ -209,7 +216,6 @@ cc.Class({
gameOver() { gameOver() {
this.catSpeakEnd(() => { this.catSpeakEnd(() => {
onHomeworkFinish(); onHomeworkFinish();
alert("游戏结束,调试弹窗")
}) })
}, },
initData() { initData() {
...@@ -238,7 +244,9 @@ cc.Class({ ...@@ -238,7 +244,9 @@ cc.Class({
this.initArrowBtn(); this.initArrowBtn();
this.initPages().then(() => { this.initPages().then(() => {
this.updateBtnStatus(); this.updateBtnStatus();
this.autoPlay(); this.catSpeakStart(() => {
this.autoPlay();
})
}); });
}, },
initArrowBtn() { initArrowBtn() {
...@@ -256,10 +264,8 @@ cc.Class({ ...@@ -256,10 +264,8 @@ cc.Class({
}, 220); }, 220);
}, },
autoPlay() { autoPlay() {
this.catSpeakStart(() => { this.inited = true;
this.inited = true; this.isTruning = false
this.isTruning = false
})
if (1) return; if (1) return;
//自动开始播放动画,及触发动画效果 //自动开始播放动画,及触发动画效果
this.inited = false; this.inited = false;
...@@ -370,7 +376,7 @@ cc.Class({ ...@@ -370,7 +376,7 @@ cc.Class({
this.onTouchRight(); this.onTouchRight();
}, },
onTouchPanelLeft() { onTouchPanelLeft() {
if (!this.inited) return;
if (this.isTruning) { if (this.isTruning) {
return false; return false;
} }
...@@ -384,7 +390,7 @@ cc.Class({ ...@@ -384,7 +390,7 @@ cc.Class({
return true; return true;
}, },
onTouchPanelRight() { onTouchPanelRight() {
if (!this.inited) return;
if (this.isTruning) { if (this.isTruning) {
return false; return false;
} }
...@@ -429,10 +435,12 @@ cc.Class({ ...@@ -429,10 +435,12 @@ cc.Class({
catSpeakEnd(cb) { catSpeakEnd(cb) {
const cat = cc.find('Canvas/mao'); const cat = cc.find('Canvas/mao');
playDragonBoneAnimation(cat, 'finish', -1); playDragonBoneAnimation(cat, 'finish', 0);
this.playAudioByUrl(this.data.endAudio, () => { this.playAudioByUrl(this.data.endAudio, () => {
playDragonBoneAnimation(cat, 'normal', -1); setTimeout(() => {
cb(); playDragonBoneAnimation(cat, 'normal', -1);
cb();
}, 500);
}); });
}, },
...@@ -443,7 +451,7 @@ cc.Class({ ...@@ -443,7 +451,7 @@ cc.Class({
}, },
catSpeakWait(cb) { catSpeakWait(cb) {
const cat = cc.find('Canvas/mao'); const cat = cc.find('Canvas/mao');
playDragonBoneAnimation(cat, 'right', -1); playDragonBoneAnimation(cat, 'begin', -1);
this.playAudioByUrl(this.data.waitAudio, () => { this.playAudioByUrl(this.data.waitAudio, () => {
playDragonBoneAnimation(cat, 'normal', -1); playDragonBoneAnimation(cat, 'normal', -1);
cb(); cb();
......
This diff is collapsed.
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
"children": [ "children": [
{ {
"width": 299, "width": 299,
"height": 621.5, "height": 624,
"type": "dock-v", "type": "dock-v",
"children": [ "children": [
{ {
"width": 299, "width": 299,
"height": 286, "height": 286.921875,
"type": "panel", "type": "panel",
"active": 0, "active": 0,
"children": [ "children": [
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
}, },
{ {
"width": 299, "width": 299,
"height": 332.5, "height": 334.078125,
"type": "panel", "type": "panel",
"active": 0, "active": 0,
"children": [ "children": [
...@@ -40,12 +40,12 @@ ...@@ -40,12 +40,12 @@
}, },
{ {
"width": 655, "width": 655,
"height": 621.5, "height": 624,
"type": "dock-v", "type": "dock-v",
"children": [ "children": [
{ {
"width": 655, "width": 655,
"height": 325.671875, "height": 327.578125,
"type": "panel", "type": "panel",
"active": 0, "active": 0,
"children": [ "children": [
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
}, },
{ {
"width": 655, "width": 655,
"height": 292.8125, "height": 293.421875,
"type": "panel", "type": "panel",
"active": 0, "active": 0,
"children": [ "children": [
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
}, },
{ {
"width": 304, "width": 304,
"height": 621.5, "height": 624,
"type": "panel", "type": "panel",
"active": 0, "active": 0,
"children": [ "children": [
...@@ -79,9 +79,9 @@ ...@@ -79,9 +79,9 @@
}, },
"panels": [ "panels": [
"hierarchy", "hierarchy",
"node-library",
"assets", "assets",
"scene", "scene",
"node-library",
"console", "console",
"timeline", "timeline",
"game-window", "game-window",
......
{"version":"1.0.8","stats":{"F:/tt/op13/temp/quick-scripts/src/__qc_index__.js":"2022-08-20T01:48:03.447Z","F:/tt/op13/temp/quick-scripts/src/assets/OP13/script/capture_to_web.js":"2022-08-20T01:48:03.400Z","F:/tt/op13/temp/quick-scripts/src/assets/OP13/script/bezier_render.js":"2022-08-20T01:48:03.411Z","F:/tt/op13/temp/quick-scripts/src/assets/OP13/script/NodeFitScreen.js":"2022-08-20T01:48:03.408Z","F:/tt/op13/temp/quick-scripts/src/assets/OP13/script/page_effect_assembler_base.js":"2022-08-20T01:48:03.398Z","F:/tt/op13/temp/quick-scripts/src/assets/OP13/script/utils.js":"2022-08-20T01:48:03.407Z","F:/tt/op13/temp/quick-scripts/src/assets/OP13/scene/OP13.js":"2022-08-20T01:48:03.410Z","F:/tt/op13/temp/quick-scripts/src/assets/OP13/script/util.js":"2022-08-20T01:48:03.406Z","F:/tt/op13/temp/quick-scripts/src/assets/OP13/script/bezier_assembler.js":"2022-08-20T01:48:03.403Z","F:/tt/op13/temp/quick-scripts/src/assets/OP13/script/EventMgr.js":"2022-08-20T01:48:03.409Z","F:/tt/op13/temp/quick-scripts/src/assets/OP13/script/DefaultData.js":"2022-08-20T01:48:03.401Z","F:/tt/op13/temp/quick-scripts/src/assets/OP13/script/verlet_assembler.js":"2022-08-20T01:48:03.404Z","F:/tt/op13/temp/quick-scripts/src/assets/OP13/script/verlet_render.js":"2022-08-20T01:48:03.399Z","F:/tt/op13/temp/quick-scripts/src/assets/OP13/script/runtime.js":"2022-08-20T01:48:03.397Z","F:/tt/op13/temp/quick-scripts/src/assets/OP13/script/BaseUI.js":"2022-08-20T01:48:03.402Z","F:/tt/op13/temp/quick-scripts/src/assets/OP13/script/ItemPage.js":"2022-08-20T01:48:03.405Z"}} {"version":"1.0.8","stats":{"D:/work/huiwan/OP13/temp/quick-scripts/src/__qc_index__.js":"2022-08-20T03:59:24.688Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/ItemPage.js":"2022-08-20T03:59:24.633Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/DefaultData.js":"2022-08-20T03:59:24.626Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/capture_to_web.js":"2022-08-20T03:59:24.624Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/NodeFitScreen.js":"2022-08-20T03:59:24.638Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/scene/OP13.js":"2022-08-20T03:59:24.642Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/bezier_assembler.js":"2022-08-20T03:59:24.630Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/bezier_render.js":"2022-08-20T03:59:24.645Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/page_effect_assembler_base.js":"2022-08-20T03:59:24.620Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/util.js":"2022-08-20T03:59:24.635Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/utils.js":"2022-08-20T03:59:24.636Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/verlet_assembler.js":"2022-08-20T03:59:24.631Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/verlet_render.js":"2022-08-20T03:59:24.622Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/runtime.js":"2022-08-20T03:59:24.618Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/BaseUI.js":"2022-08-20T03:59:24.628Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/EventMgr.js":"2022-08-20T03:59:24.640Z"}}
This diff is collapsed.
(function () { (function () {
var scripts = [{"deps":{"./assets/OP13/script/EventMgr":9,"./assets/OP13/script/ItemPage":15,"./assets/OP13/script/bezier_assembler":8,"./assets/OP13/script/NodeFitScreen":3,"./assets/OP13/script/page_effect_assembler_base":4,"./assets/OP13/script/capture_to_web":1,"./assets/OP13/script/utils":5,"./assets/OP13/script/runtime":13,"./assets/OP13/script/util":7,"./assets/OP13/script/bezier_render":2,"./assets/OP13/script/verlet_render":12,"./assets/OP13/script/DefaultData":10,"./assets/OP13/script/verlet_assembler":11,"./assets/OP13/scene/OP13":6,"./assets/OP13/script/BaseUI":14},"path":"preview-scripts/__qc_index__.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/capture_to_web.js"},{"deps":{"./bezier_assembler":8},"path":"preview-scripts/assets/OP13/script/bezier_render.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/NodeFitScreen.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/page_effect_assembler_base.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/utils.js"},{"deps":{"capture_to_web":1,"BaseUI":14,"../script/utils":5,"../script/DefaultData":10},"path":"preview-scripts/assets/OP13/scene/OP13.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/util.js"},{"deps":{"./page_effect_assembler_base":4},"path":"preview-scripts/assets/OP13/script/bezier_assembler.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/EventMgr.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/DefaultData.js"},{"deps":{"./page_effect_assembler_base":4},"path":"preview-scripts/assets/OP13/script/verlet_assembler.js"},{"deps":{"./verlet_assembler":11},"path":"preview-scripts/assets/OP13/script/verlet_render.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/runtime.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/BaseUI.js"},{"deps":{"BaseUI":14,"./utils":5},"path":"preview-scripts/assets/OP13/script/ItemPage.js"}]; var scripts = [{"deps":{"./assets/OP13/script/EventMgr":15,"./assets/OP13/script/NodeFitScreen":4,"./assets/OP13/script/bezier_render":7,"./assets/OP13/script/runtime":13,"./assets/OP13/script/bezier_assembler":6,"./assets/OP13/script/capture_to_web":3,"./assets/OP13/script/page_effect_assembler_base":8,"./assets/OP13/script/util":9,"./assets/OP13/script/utils":10,"./assets/OP13/script/verlet_assembler":11,"./assets/OP13/script/verlet_render":12,"./assets/OP13/script/DefaultData":2,"./assets/OP13/scene/OP13":5,"./assets/OP13/script/BaseUI":14,"./assets/OP13/script/ItemPage":1},"path":"preview-scripts/__qc_index__.js"},{"deps":{"./utils":10,"BaseUI":14},"path":"preview-scripts/assets/OP13/script/ItemPage.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/DefaultData.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/capture_to_web.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/NodeFitScreen.js"},{"deps":{"capture_to_web":3,"BaseUI":14,"../script/utils":10,"../script/DefaultData":2},"path":"preview-scripts/assets/OP13/scene/OP13.js"},{"deps":{"./page_effect_assembler_base":8},"path":"preview-scripts/assets/OP13/script/bezier_assembler.js"},{"deps":{"./bezier_assembler":6},"path":"preview-scripts/assets/OP13/script/bezier_render.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/page_effect_assembler_base.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/util.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/utils.js"},{"deps":{"./page_effect_assembler_base":8},"path":"preview-scripts/assets/OP13/script/verlet_assembler.js"},{"deps":{"./verlet_assembler":11},"path":"preview-scripts/assets/OP13/script/verlet_render.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/runtime.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/BaseUI.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/EventMgr.js"}];
var entries = ["preview-scripts/__qc_index__.js"]; var entries = ["preview-scripts/__qc_index__.js"];
var bundleScript = 'preview-scripts/__qc_bundle__.js'; var bundleScript = 'preview-scripts/__qc_bundle__.js';
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -313,7 +313,15 @@ cc.Class({ ...@@ -313,7 +313,15 @@ cc.Class({
var itemPage = page.getComponent('ItemPage'); var itemPage = page.getComponent('ItemPage');
itemPage.playAudio(); itemPage.playAudio();
itemPage.playSpine().then(function () { itemPage.playSpine().then(function () {
resolve(''); var nextPage = _this4.pageList[GameData.pageIndex + 1];
if (!nextPage) {
_this4.gameOver();
resolve('');
} else {
resolve('');
}
}); });
}); });
}, },
...@@ -352,7 +360,6 @@ cc.Class({ ...@@ -352,7 +360,6 @@ cc.Class({
gameOver: function gameOver() { gameOver: function gameOver() {
this.catSpeakEnd(function () { this.catSpeakEnd(function () {
(0, _utils.onHomeworkFinish)(); (0, _utils.onHomeworkFinish)();
alert("游戏结束,调试弹窗");
}); });
}, },
initData: function initData() { initData: function initData() {
...@@ -381,7 +388,9 @@ cc.Class({ ...@@ -381,7 +388,9 @@ cc.Class({
this.initPages().then(function () { this.initPages().then(function () {
_this6.updateBtnStatus(); _this6.updateBtnStatus();
_this6.autoPlay(); _this6.catSpeakStart(function () {
_this6.autoPlay();
});
}); });
}, },
initArrowBtn: function initArrowBtn() { initArrowBtn: function initArrowBtn() {
...@@ -401,10 +410,8 @@ cc.Class({ ...@@ -401,10 +410,8 @@ cc.Class({
autoPlay: function autoPlay() { autoPlay: function autoPlay() {
var _this8 = this; var _this8 = this;
this.catSpeakStart(function () { this.inited = true;
_this8.inited = true; this.isTruning = false;
_this8.isTruning = false;
});
if (1) return; //自动开始播放动画,及触发动画效果 if (1) return; //自动开始播放动画,及触发动画效果
this.inited = false; this.inited = false;
...@@ -528,6 +535,8 @@ cc.Class({ ...@@ -528,6 +535,8 @@ cc.Class({
onTouchPanelLeft: function onTouchPanelLeft() { onTouchPanelLeft: function onTouchPanelLeft() {
var _this10 = this; var _this10 = this;
if (!this.inited) return;
if (this.isTruning) { if (this.isTruning) {
return false; return false;
} }
...@@ -547,6 +556,8 @@ cc.Class({ ...@@ -547,6 +556,8 @@ cc.Class({
onTouchPanelRight: function onTouchPanelRight() { onTouchPanelRight: function onTouchPanelRight() {
var _this11 = this; var _this11 = this;
if (!this.inited) return;
if (this.isTruning) { if (this.isTruning) {
return false; return false;
} }
...@@ -589,10 +600,12 @@ cc.Class({ ...@@ -589,10 +600,12 @@ cc.Class({
}, },
catSpeakEnd: function catSpeakEnd(cb) { catSpeakEnd: function catSpeakEnd(cb) {
var cat = cc.find('Canvas/mao'); var cat = cc.find('Canvas/mao');
playDragonBoneAnimation(cat, 'finish', -1); playDragonBoneAnimation(cat, 'finish', 0);
this.playAudioByUrl(this.data.endAudio, function () { this.playAudioByUrl(this.data.endAudio, function () {
playDragonBoneAnimation(cat, 'normal', -1); setTimeout(function () {
cb(); playDragonBoneAnimation(cat, 'normal', -1);
cb();
}, 500);
}); });
}, },
onTouchCat: function onTouchCat() { onTouchCat: function onTouchCat() {
...@@ -602,7 +615,7 @@ cc.Class({ ...@@ -602,7 +615,7 @@ cc.Class({
}, },
catSpeakWait: function catSpeakWait(cb) { catSpeakWait: function catSpeakWait(cb) {
var cat = cc.find('Canvas/mao'); var cat = cc.find('Canvas/mao');
playDragonBoneAnimation(cat, 'right', -1); playDragonBoneAnimation(cat, 'begin', -1);
this.playAudioByUrl(this.data.waitAudio, function () { this.playAudioByUrl(this.data.waitAudio, function () {
playDragonBoneAnimation(cat, 'normal', -1); playDragonBoneAnimation(cat, 'normal', -1);
cb(); cb();
......
This source diff could not be displayed because it is too large. You can view the blob instead.
{"pid":49612} {"pid":10412}
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