|
@@ -1118,9 +1118,12 @@ var spine;
|
|
return true;
|
|
return true;
|
|
var finished = this.updateMixingFrom(from, delta, animationCount + 1);
|
|
var finished = this.updateMixingFrom(from, delta, animationCount + 1);
|
|
if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) {
|
|
if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) {
|
|
- if (animationCount > 6 && from.mixingFrom == null) {
|
|
|
|
- entry.mixingFrom = null;
|
|
|
|
- this.queue.end(from);
|
|
|
|
|
|
+ if (animationCount > 5 && from.mixingFrom == null) {
|
|
|
|
+ entry.interruptAlpha = Math.max(0, entry.interruptAlpha - delta * 0.66);
|
|
|
|
+ if (entry.interruptAlpha <= 0) {
|
|
|
|
+ entry.mixingFrom = null;
|
|
|
|
+ this.queue.end(from);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return finished;
|
|
return finished;
|
|
}
|
|
}
|