Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta

spine-csharp/src/AnimationState.cs

@@ -528,13 +528,13 @@ namespace Spine {
 					float duration = last.animationEnd - last.animationStart;
 					if (duration != 0) {
 						if (last.loop) {
-							delay += duration * (1 + (int)(last.trackTime / duration));
+							delay += duration * (1 + (int)(last.trackTime / duration)); // Completion of next loop.
 						} else {
-							delay += duration;
+							delay += Math.Max(duration, last.trackTime); // After duration, else next update.
 						}
 						delay -= data.GetMix(last.animation, animation);
 					} else
-						delay = 0;
+						delay = last.trackTime; // Next update.
 				}
 			}
 

spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java

@@ -544,12 +544,12 @@ public class AnimationState {
 				float duration = last.animationEnd - last.animationStart;
 				if (duration != 0) {
 					if (last.loop)
-						delay += duration * (1 + (int)(last.trackTime / duration));
+						delay += duration * (1 + (int)(last.trackTime / duration)); // Completion of next loop.
 					else
-						delay += duration;
+						delay += Math.max(duration, last.trackTime); // After duration, else next update.
 					delay -= data.getMix(last.animation, animation);
 				} else
-					delay = 0;
+					delay = last.trackTime; // Next update.
 			}
 		}