fixed animation may not play

This commit is contained in:
2youyouo2
2015-12-22 17:47:56 +08:00
parent 9c4f5ea483
commit b25b73ef6d
2 changed files with 25 additions and 10 deletions
+8 -4
View File
@@ -18,17 +18,21 @@ JS.extend(AnimationAnimator, Animator);
var p = AnimationAnimator.prototype;
p.playState = function (state, startTime) {
var clip = state.clip;
if (!clip) {
if (!state.clip) {
return;
}
var curves = state.curves;
if (!state.curveLoaded) {
initClipData(this.target, state);
}
this.playingAnims.push(state);
state.play();
state.time = startTime || 0;
if (typeof startTime === 'number') {
state.time = startTime;
}
this.play();
};
+17 -6
View File
@@ -151,7 +151,6 @@ var Animation = cc.Class({
},
onDisable: function () {
this.setCurrentTime(0);
this.stop();
},
@@ -179,17 +178,19 @@ var Animation = cc.Class({
this._init();
var state = this.getAnimationState(name || this._defaultClip.name);
if (state) {
if (state.isPlaying) {
var animator = this._animator;
if (animator.isPlaying && state.isPlaying) {
if (state.isPaused) {
this._animator.resumeState(state);
animator.resumeState(state);
}
else {
this._animator.stopState(state);
this._animator.playState(state, startTime);
animator.stopState(state);
animator.playState(state, startTime);
}
}
else {
this._animator.playState(state, startTime);
animator.playState(state, startTime);
}
this.currentClip = state.clip;
@@ -412,6 +413,11 @@ var Animation = cc.Class({
var clip = this._clips[i];
if (clip) {
state = new cc.AnimationState(clip);
if (CC_EDITOR) {
this._animator.reloadClip(state);
}
this._nameToState[state.name] = state;
if (equalClips(this._defaultClip, clip)) {
defaultClipState = state;
@@ -420,6 +426,11 @@ var Animation = cc.Class({
}
if (this._defaultClip && !defaultClipState) {
state = new cc.AnimationState(this._defaultClip);
if (CC_EDITOR) {
this._animator.reloadClip(state);
}
this._nameToState[state.name] = state;
}
},