Commit 81b33a39 authored by Tt's avatar Tt

OP13处理

parent d91af668
This diff is collapsed.
......@@ -165,15 +165,32 @@ cc.Class({
this._turnRight = false;
this._angle = 0;
},
stopLeft() {
let page = this.pageList[GameData.pageIndex];
if (!page) return;
let itemPage = page.getComponent('ItemPage');
itemPage.stopAudio();
itemPage.stopSpine();
},
stopRight() {
let page = this.pageList[GameData.pageIndex + 1];
if (!page) return;
let itemPage = page.getComponent('ItemPage');
itemPage.stopAudio();
itemPage.stopSpine();
},
onTouchLeft() {
return new Promise((resolve, reject) => {
if (this.verletRender) {
return resolve('');
}
if (GameData.isPlaying) {
if (GameData.isPlaying == 1) {
this.stopLeft();
GameData.isPlaying = 0;
return resolve('');
}
GameData.isPlaying = true;
this.stopRight();
GameData.isPlaying = 1;
let page = this.pageList[GameData.pageIndex];
let itemPage = page.getComponent('ItemPage');
itemPage.playAudio();
......@@ -193,16 +210,19 @@ cc.Class({
if (this.verletRender) {
return resolve('');
}
if (GameData.isPlaying) {
if (GameData.isPlaying == 2) {
this.stopRight();
GameData.isPlaying = 0;
return resolve('');
}
this.stopLeft();
let page = this.pageList[GameData.pageIndex + 1];
if (!page) {
this.gameOver();
return resolve('');
}
GameData.isPlaying = true;
GameData.isPlaying = 2;
let itemPage = page.getComponent('ItemPage');
itemPage.playAudio();
itemPage.playSpine().then(() => {
......@@ -250,6 +270,11 @@ cc.Class({
});
},
initArrowBtn() {
const touchAniLeft = cc.find("Canvas/touchAniLeft");
const touchAniRight = cc.find("Canvas/touchAniRight");
touchAniLeft.on(cc.Node.EventType.TOUCH_END, this.onTouchLeftAni, this)
touchAniRight.on(cc.Node.EventType.TOUCH_END, this.onTouchRightAni, this)
const lastBtn = this.lastBtn = cc.find("Canvas/left_arrow");
const nextBtn = this.nextBtn = cc.find("Canvas/right_arrow");
......@@ -380,9 +405,13 @@ cc.Class({
if (this.isTruning) {
return false;
}
if (GameData.isPlaying) {
return false;
if (GameData.isPlaying == 1) {
this.stopLeft();
// return false;
} else if (GameData.isPlaying == 2) {
this.stopRight();
}
GameData.isPlaying = 0;
this.onTurnLast();
this._timeoutIds.push(setTimeout(() => {
this.autoPlay();
......@@ -395,7 +424,9 @@ cc.Class({
return false;
}
if (GameData.isPlaying) {
return false;
this.stopLeft();
this.stopRight();
// return false;
}
this.onTurnNext();
this._timeoutIds.push(setTimeout(() => {
......
......@@ -37,32 +37,39 @@ cc.Class({
resolve('');
})
}
});
},
stopSpine() {
if (this._aniSpine) {
const skeleton = this.skeleton;
skeleton.clearTracks();
}
if (this._aniDragonBone) {
this._aniDragonBone.stop();
}
},
playSpine() {
return new Promise((resolve, reject) => {
if (this.data.pageDragonBone.animType == 'spine') {
const skeleton = this.skeleton;
skeleton.setToSetupPose();
setTimeout(() => {
skeleton.setAnimation(0, this.animationName, false);
this._aniSpine = skeleton.setAnimation(0, this.animationName, false);
skeleton.setCompleteListener(() => {
GameData.isPlaying = false;
this._aniSpine = null;
GameData.isPlaying = 0;
resolve('');
})
}, 1);
} else {
this.dragonBone.playAnimation(this.animationName, 1);
this._aniDragonBone = this.dragonBone.playAnimation(this.animationName, 1);
this.dragonBone.on(dragonBones.EventObject.COMPLETE, (evt) => {
GameData.isPlaying = false;
this._aniDragonBone = null;
GameData.isPlaying = 0;
resolve('');
});
}
});
},
......@@ -77,7 +84,7 @@ cc.Class({
stopAudio() {
cc.audioEngine.stop(this.audioID);
this.unschedule(this.chengeTextColor);
GameData.isPlaying = false;
GameData.isPlaying = 0;
},
loadBg() {
let url = this.data.pageImage;
......@@ -98,21 +105,21 @@ cc.Class({
const tex = this.data.pageDragonBone.texPngData.url;
const atlas = this.data.pageDragonBone.texJsonData.url;
const ske = this.data.pageDragonBone.skeJsonData.url;
loadSpine(this.skeleton, this.data.pageDragonBone.texPngData.name, {tex, atlas, ske}).then(({width, height}) => {
loadSpine(this.skeleton, this.data.pageDragonBone.texPngData.name, { tex, atlas, ske }).then(({ width, height }) => {
this.skeleton.node.width = width;
this.skeleton.node.height = height;
this.skeleton.node.height = height;
resolve('');
this.animationName = this.skeleton.animationNames[0];
console.log('width: ', this.skeleton.node.width);
console.log('height~~~: ', this.skeleton.node.height);
console.log('height~~~: ', this.skeleton.node.height);
console.log('this.skeleton.node: ', this.skeleton.node);
this.setSpineScale(this.skeleton.node, this.skeleton.node);
})
});
},
loadDragonBoneAnim() {
return new Promise((resolve, reject) => {
......
This diff is collapsed.
......@@ -19,7 +19,7 @@
"children": [
{
"width": 299,
"height": 286.921875,
"height": 287,
"type": "panel",
"active": 0,
"children": [
......@@ -29,7 +29,7 @@
},
{
"width": 299,
"height": 334.078125,
"height": 334,
"type": "panel",
"active": 0,
"children": [
......@@ -45,7 +45,7 @@
"children": [
{
"width": 655,
"height": 327.578125,
"height": 328,
"type": "panel",
"active": 0,
"children": [
......@@ -54,7 +54,7 @@
},
{
"width": 655,
"height": 293.421875,
"height": 293,
"type": "panel",
"active": 0,
"children": [
......
......@@ -165,15 +165,32 @@ cc.Class({
this._turnRight = false;
this._angle = 0;
},
stopLeft() {
let page = this.pageList[GameData.pageIndex];
if (!page) return;
let itemPage = page.getComponent('ItemPage');
itemPage.stopAudio();
itemPage.stopSpine();
},
stopRight() {
let page = this.pageList[GameData.pageIndex + 1];
if (!page) return;
let itemPage = page.getComponent('ItemPage');
itemPage.stopAudio();
itemPage.stopSpine();
},
onTouchLeft() {
return new Promise((resolve, reject) => {
if (this.verletRender) {
return resolve('');
}
if (GameData.isPlaying) {
if (GameData.isPlaying == 1) {
this.stopLeft();
GameData.isPlaying = 0;
return resolve('');
}
GameData.isPlaying = true;
this.stopRight();
GameData.isPlaying = 1;
let page = this.pageList[GameData.pageIndex];
let itemPage = page.getComponent('ItemPage');
itemPage.playAudio();
......@@ -193,16 +210,19 @@ cc.Class({
if (this.verletRender) {
return resolve('');
}
if (GameData.isPlaying) {
if (GameData.isPlaying == 2) {
this.stopRight();
GameData.isPlaying = 0;
return resolve('');
}
this.stopLeft();
let page = this.pageList[GameData.pageIndex + 1];
if (!page) {
this.gameOver();
return resolve('');
}
GameData.isPlaying = true;
GameData.isPlaying = 2;
let itemPage = page.getComponent('ItemPage');
itemPage.playAudio();
itemPage.playSpine().then(() => {
......@@ -250,6 +270,11 @@ cc.Class({
});
},
initArrowBtn() {
const touchAniLeft = cc.find("Canvas/touchAniLeft");
const touchAniRight = cc.find("Canvas/touchAniRight");
touchAniLeft.on(cc.Node.EventType.TOUCH_END, this.onTouchLeftAni, this)
touchAniRight.on(cc.Node.EventType.TOUCH_END, this.onTouchRightAni, this)
const lastBtn = this.lastBtn = cc.find("Canvas/left_arrow");
const nextBtn = this.nextBtn = cc.find("Canvas/right_arrow");
......@@ -258,12 +283,10 @@ cc.Class({
nextBtn.on(cc.Node.EventType.TOUCH_END, this.onTouchPanelRight, this)
},
checkShowArrowBtn() {
this._timeoutIds.push(setTimeout(() => {
if(this.nodeDict) {
this.lastBtn.active = !this.nodeDict.btnLast.children[1].active;
this.nextBtn.active = !this.nodeDict.btnNext.children[1].active;
}
}, 220))
setTimeout(() => {
this.lastBtn.active = !this.nodeDict.btnLast.children[1].active;
this.nextBtn.active = !this.nodeDict.btnNext.children[1].active;
}, 220);
},
autoPlay() {
this.inited = true;
......@@ -382,9 +405,13 @@ cc.Class({
if (this.isTruning) {
return false;
}
if (GameData.isPlaying) {
return false;
if (GameData.isPlaying == 1) {
this.stopLeft();
// return false;
} else if (GameData.isPlaying == 2) {
this.stopRight();
}
GameData.isPlaying = 0;
this.onTurnLast();
this._timeoutIds.push(setTimeout(() => {
this.autoPlay();
......@@ -397,7 +424,9 @@ cc.Class({
return false;
}
if (GameData.isPlaying) {
return false;
this.stopLeft();
this.stopRight();
// return false;
}
this.onTurnNext();
this._timeoutIds.push(setTimeout(() => {
......@@ -439,10 +468,10 @@ cc.Class({
const cat = cc.find('Canvas/mao');
playDragonBoneAnimation(cat, 'finish', 0);
this.playAudioByUrl(this.data.endAudio, () => {
this._timeoutIds.push(setTimeout(() => {
setTimeout(() => {
playDragonBoneAnimation(cat, 'normal', -1);
cb();
}, 500))
}, 500);
});
},
......
......@@ -37,32 +37,39 @@ cc.Class({
resolve('');
})
}
});
},
stopSpine() {
if (this._aniSpine) {
const skeleton = this.skeleton;
skeleton.clearTracks();
}
if (this._aniDragonBone) {
this._aniDragonBone.stop();
}
},
playSpine() {
return new Promise((resolve, reject) => {
if (this.data.pageDragonBone.animType == 'spine') {
const skeleton = this.skeleton;
skeleton.setToSetupPose();
setTimeout(() => {
skeleton.setAnimation(0, this.animationName, false);
this._aniSpine = skeleton.setAnimation(0, this.animationName, false);
skeleton.setCompleteListener(() => {
GameData.isPlaying = false;
this._aniSpine = null;
GameData.isPlaying = 0;
resolve('');
})
}, 1);
} else {
this.dragonBone.playAnimation(this.animationName, 1);
this._aniDragonBone = this.dragonBone.playAnimation(this.animationName, 1);
this.dragonBone.on(dragonBones.EventObject.COMPLETE, (evt) => {
GameData.isPlaying = false;
this._aniDragonBone = null;
GameData.isPlaying = 0;
resolve('');
});
}
});
},
......@@ -77,7 +84,7 @@ cc.Class({
stopAudio() {
cc.audioEngine.stop(this.audioID);
this.unschedule(this.chengeTextColor);
GameData.isPlaying = false;
GameData.isPlaying = 0;
},
loadBg() {
let url = this.data.pageImage;
......@@ -98,21 +105,21 @@ cc.Class({
const tex = this.data.pageDragonBone.texPngData.url;
const atlas = this.data.pageDragonBone.texJsonData.url;
const ske = this.data.pageDragonBone.skeJsonData.url;
loadSpine(this.skeleton, this.data.pageDragonBone.texPngData.name, {tex, atlas, ske}).then(({width, height}) => {
loadSpine(this.skeleton, this.data.pageDragonBone.texPngData.name, { tex, atlas, ske }).then(({ width, height }) => {
this.skeleton.node.width = width;
this.skeleton.node.height = height;
this.skeleton.node.height = height;
resolve('');
this.animationName = this.skeleton.animationNames[0];
console.log('width: ', this.skeleton.node.width);
console.log('height~~~: ', this.skeleton.node.height);
console.log('height~~~: ', this.skeleton.node.height);
console.log('this.skeleton.node: ', this.skeleton.node);
this.setSpineScale(this.skeleton.node, this.skeleton.node);
})
});
},
loadDragonBoneAnim() {
return new Promise((resolve, reject) => {
......
{"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"}}
{"version":"1.0.8","stats":{"D:/work/huiwan/OP13/temp/quick-scripts/src/__qc_index__.js":"2022-09-08T09:40:31.787Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/ItemPage.js":"2022-09-08T09:40:31.724Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/EventMgr.js":"2022-09-08T09:40:31.733Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/bezier_render.js":"2022-09-08T09:40:31.738Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/NodeFitScreen.js":"2022-09-08T09:40:31.731Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/page_effect_assembler_base.js":"2022-09-08T09:40:31.707Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/bezier_assembler.js":"2022-09-08T09:40:31.719Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/runtime.js":"2022-09-08T09:40:31.704Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/util.js":"2022-09-08T09:40:31.726Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/verlet_assembler.js":"2022-09-08T09:40:31.722Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/capture_to_web.js":"2022-09-08T09:40:31.713Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/utils.js":"2022-09-08T09:40:31.729Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/scene/OP13.js":"2022-09-08T09:40:31.736Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/verlet_render.js":"2022-09-08T09:40:31.710Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/DefaultData.js":"2022-09-08T09:40:31.715Z","D:/work/huiwan/OP13/temp/quick-scripts/src/assets/OP13/script/BaseUI.js":"2022-09-08T09:40:31.717Z"}}
This diff is collapsed.
(function () {
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 scripts = [{"deps":{"./assets/OP13/script/DefaultData":14,"./assets/OP13/script/ItemPage":1,"./assets/OP13/script/NodeFitScreen":4,"./assets/OP13/script/bezier_assembler":6,"./assets/OP13/script/bezier_render":3,"./assets/OP13/script/capture_to_web":10,"./assets/OP13/script/page_effect_assembler_base":5,"./assets/OP13/script/runtime":7,"./assets/OP13/script/util":8,"./assets/OP13/script/utils":11,"./assets/OP13/script/verlet_assembler":9,"./assets/OP13/script/BaseUI":15,"./assets/OP13/script/verlet_render":13,"./assets/OP13/scene/OP13":12,"./assets/OP13/script/EventMgr":2},"path":"preview-scripts/__qc_index__.js"},{"deps":{"BaseUI":15,"./utils":11},"path":"preview-scripts/assets/OP13/script/ItemPage.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/EventMgr.js"},{"deps":{"./bezier_assembler":6},"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":{"./page_effect_assembler_base":5},"path":"preview-scripts/assets/OP13/script/bezier_assembler.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/runtime.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/util.js"},{"deps":{"./page_effect_assembler_base":5},"path":"preview-scripts/assets/OP13/script/verlet_assembler.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/capture_to_web.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/utils.js"},{"deps":{"capture_to_web":10,"BaseUI":15,"../script/DefaultData":14,"../script/utils":11},"path":"preview-scripts/assets/OP13/scene/OP13.js"},{"deps":{"./verlet_assembler":9},"path":"preview-scripts/assets/OP13/script/verlet_render.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/DefaultData.js"},{"deps":{},"path":"preview-scripts/assets/OP13/script/BaseUI.js"}];
var entries = ["preview-scripts/__qc_index__.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.
......@@ -296,6 +296,20 @@ cc.Class({
this._turnRight = false;
this._angle = 0;
},
stopLeft: function stopLeft() {
var page = this.pageList[GameData.pageIndex];
if (!page) return;
var itemPage = page.getComponent('ItemPage');
itemPage.stopAudio();
itemPage.stopSpine();
},
stopRight: function stopRight() {
var page = this.pageList[GameData.pageIndex + 1];
if (!page) return;
var itemPage = page.getComponent('ItemPage');
itemPage.stopAudio();
itemPage.stopSpine();
},
onTouchLeft: function onTouchLeft() {
var _this4 = this;
......@@ -304,11 +318,16 @@ cc.Class({
return resolve('');
}
if (GameData.isPlaying) {
if (GameData.isPlaying == 1) {
_this4.stopLeft();
GameData.isPlaying = 0;
return resolve('');
}
GameData.isPlaying = true;
_this4.stopRight();
GameData.isPlaying = 1;
var page = _this4.pageList[GameData.pageIndex];
var itemPage = page.getComponent('ItemPage');
itemPage.playAudio();
......@@ -333,10 +352,15 @@ cc.Class({
return resolve('');
}
if (GameData.isPlaying) {
if (GameData.isPlaying == 2) {
_this5.stopRight();
GameData.isPlaying = 0;
return resolve('');
}
_this5.stopLeft();
var page = _this5.pageList[GameData.pageIndex + 1];
if (!page) {
......@@ -345,7 +369,7 @@ cc.Class({
return resolve('');
}
GameData.isPlaying = true;
GameData.isPlaying = 2;
var itemPage = page.getComponent('ItemPage');
itemPage.playAudio();
itemPage.playSpine().then(function () {
......@@ -394,6 +418,10 @@ cc.Class({
});
},
initArrowBtn: function initArrowBtn() {
var touchAniLeft = cc.find("Canvas/touchAniLeft");
var touchAniRight = cc.find("Canvas/touchAniRight");
touchAniLeft.on(cc.Node.EventType.TOUCH_END, this.onTouchLeftAni, this);
touchAniRight.on(cc.Node.EventType.TOUCH_END, this.onTouchRightAni, this);
var lastBtn = this.lastBtn = cc.find("Canvas/left_arrow");
var nextBtn = this.nextBtn = cc.find("Canvas/right_arrow");
lastBtn.on(cc.Node.EventType.TOUCH_END, this.onTouchPanelLeft, this);
......@@ -541,10 +569,13 @@ cc.Class({
return false;
}
if (GameData.isPlaying) {
return false;
if (GameData.isPlaying == 1) {
this.stopLeft(); // return false;
} else if (GameData.isPlaying == 2) {
this.stopRight();
}
GameData.isPlaying = 0;
this.onTurnLast();
this._timeoutIds.push(setTimeout(function () {
......@@ -563,7 +594,8 @@ cc.Class({
}
if (GameData.isPlaying) {
return false;
this.stopLeft();
this.stopRight(); // return false;
}
this.onTurnNext();
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -46,6 +46,16 @@ cc.Class({
}
});
},
stopSpine: function stopSpine() {
if (this._aniSpine) {
var skeleton = this.skeleton;
skeleton.clearTracks();
}
if (this._aniDragonBone) {
this._aniDragonBone.stop();
}
},
playSpine: function playSpine() {
var _this2 = this;
......@@ -54,17 +64,19 @@ cc.Class({
var skeleton = _this2.skeleton;
skeleton.setToSetupPose();
setTimeout(function () {
skeleton.setAnimation(0, _this2.animationName, false);
_this2._aniSpine = skeleton.setAnimation(0, _this2.animationName, false);
skeleton.setCompleteListener(function () {
GameData.isPlaying = false;
_this2._aniSpine = null;
GameData.isPlaying = 0;
resolve('');
});
}, 1);
} else {
_this2.dragonBone.playAnimation(_this2.animationName, 1);
_this2._aniDragonBone = _this2.dragonBone.playAnimation(_this2.animationName, 1);
_this2.dragonBone.on(dragonBones.EventObject.COMPLETE, function (evt) {
GameData.isPlaying = false;
_this2._aniDragonBone = null;
GameData.isPlaying = 0;
resolve('');
});
}
......@@ -83,7 +95,7 @@ cc.Class({
stopAudio: function stopAudio() {
cc.audioEngine.stop(this.audioID);
this.unschedule(this.chengeTextColor);
GameData.isPlaying = false;
GameData.isPlaying = 0;
},
loadBg: function loadBg() {
var _this4 = this;
......
{"pid":10412}
{"pid":12660}
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