mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-26 22:49:01 +08:00
[ts] Port fix to AnimationState, see #1092
This commit is contained in:
parent
75403b9e66
commit
7f481cd633
@ -1654,11 +1654,11 @@ var spine;
|
|||||||
if (last.loop)
|
if (last.loop)
|
||||||
delay += duration * (1 + ((last.trackTime / duration) | 0));
|
delay += duration * (1 + ((last.trackTime / duration) | 0));
|
||||||
else
|
else
|
||||||
delay += duration;
|
delay += Math.max(duration, last.trackTime);
|
||||||
delay -= this.data.getMix(last.animation, animation);
|
delay -= this.data.getMix(last.animation, animation);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
delay = 0;
|
delay = last.trackTime;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
entry.delay = delay;
|
entry.delay = delay;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -1654,11 +1654,11 @@ var spine;
|
|||||||
if (last.loop)
|
if (last.loop)
|
||||||
delay += duration * (1 + ((last.trackTime / duration) | 0));
|
delay += duration * (1 + ((last.trackTime / duration) | 0));
|
||||||
else
|
else
|
||||||
delay += duration;
|
delay += Math.max(duration, last.trackTime);
|
||||||
delay -= this.data.getMix(last.animation, animation);
|
delay -= this.data.getMix(last.animation, animation);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
delay = 0;
|
delay = last.trackTime;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
entry.delay = delay;
|
entry.delay = delay;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -1654,11 +1654,11 @@ var spine;
|
|||||||
if (last.loop)
|
if (last.loop)
|
||||||
delay += duration * (1 + ((last.trackTime / duration) | 0));
|
delay += duration * (1 + ((last.trackTime / duration) | 0));
|
||||||
else
|
else
|
||||||
delay += duration;
|
delay += Math.max(duration, last.trackTime);
|
||||||
delay -= this.data.getMix(last.animation, animation);
|
delay -= this.data.getMix(last.animation, animation);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
delay = 0;
|
delay = last.trackTime;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
entry.delay = delay;
|
entry.delay = delay;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -1654,11 +1654,11 @@ var spine;
|
|||||||
if (last.loop)
|
if (last.loop)
|
||||||
delay += duration * (1 + ((last.trackTime / duration) | 0));
|
delay += duration * (1 + ((last.trackTime / duration) | 0));
|
||||||
else
|
else
|
||||||
delay += duration;
|
delay += Math.max(duration, last.trackTime);
|
||||||
delay -= this.data.getMix(last.animation, animation);
|
delay -= this.data.getMix(last.animation, animation);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
delay = 0;
|
delay = last.trackTime;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
entry.delay = delay;
|
entry.delay = delay;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -1654,11 +1654,11 @@ var spine;
|
|||||||
if (last.loop)
|
if (last.loop)
|
||||||
delay += duration * (1 + ((last.trackTime / duration) | 0));
|
delay += duration * (1 + ((last.trackTime / duration) | 0));
|
||||||
else
|
else
|
||||||
delay += duration;
|
delay += Math.max(duration, last.trackTime);
|
||||||
delay -= this.data.getMix(last.animation, animation);
|
delay -= this.data.getMix(last.animation, animation);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
delay = 0;
|
delay = last.trackTime;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
entry.delay = delay;
|
entry.delay = delay;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -1654,11 +1654,11 @@ var spine;
|
|||||||
if (last.loop)
|
if (last.loop)
|
||||||
delay += duration * (1 + ((last.trackTime / duration) | 0));
|
delay += duration * (1 + ((last.trackTime / duration) | 0));
|
||||||
else
|
else
|
||||||
delay += duration;
|
delay += Math.max(duration, last.trackTime);
|
||||||
delay -= this.data.getMix(last.animation, animation);
|
delay -= this.data.getMix(last.animation, animation);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
delay = 0;
|
delay = last.trackTime;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
entry.delay = delay;
|
entry.delay = delay;
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -463,10 +463,10 @@ module spine {
|
|||||||
if (last.loop)
|
if (last.loop)
|
||||||
delay += duration * (1 + ((last.trackTime / duration) | 0));
|
delay += duration * (1 + ((last.trackTime / duration) | 0));
|
||||||
else
|
else
|
||||||
delay += duration;
|
delay += Math.max(duration, last.trackTime);
|
||||||
delay -= this.data.getMix(last.animation, animation);
|
delay -= this.data.getMix(last.animation, animation);
|
||||||
} else
|
} else
|
||||||
delay = 0;
|
delay = last.trackTime;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user