From 76d220b3d12f008cf6127a360c201cb22054810c Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Thu, 20 Jul 2023 18:03:31 +0200 Subject: [PATCH] [unity] Fixed Spine Timeline not ending at clip end when last clip on track. Restores behaviour as named and documented. Closes #2318. --- .../SpineAnimationState/SpineAnimationStateMixerBehaviour.cs | 3 ++- .../Modules/com.esotericsoftware.spine.timeline/package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs index 68aacb9d6..d38a16684 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs +++ b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs @@ -68,7 +68,8 @@ namespace Spine.Unity.Playables { } public override void OnGraphStop (Playable playable) { - if (!isPaused && endAtClipEnd) + bool isStoppedNotPaused = playable.GetGraph().IsPlaying(); // end of track was reached or graph stopped. + if (isStoppedNotPaused && endAtClipEnd) HandleClipEnd(); } diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json b/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json index cb0872137..f7e25a8a3 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.timeline", "displayName": "Spine Timeline Extensions", "description": "This plugin provides integration of spine-unity for the Unity Timeline.\n\nPrerequisites:\nIt requires a working installation of the spine-unity and spine-csharp runtimes as UPM packages (not as spine-unity unitypackage), version 4.1.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)", - "version": "4.1.11", + "version": "4.1.12", "unity": "2018.3", "author": { "name": "Esoteric Software",