From 0ca3c8e50702cbd37b8acec14d0b938054e22e1d Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Mon, 17 Jul 2023 16:43:11 +0200 Subject: [PATCH] [unity] Fixed a Timeline SpineAnimationStateClip related bug introduced in commit d4cc1631. Closes #2316. --- .../SpineAnimationState/SpineAnimationStateMixerBehaviour.cs | 2 +- .../Modules/com.esotericsoftware.spine.timeline/package.json | 2 +- 2 files changed, 2 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 21875d45b2..68aacb9d6f 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 @@ -165,7 +165,7 @@ ScriptPlayable[] startingClips for (int i = 0; i < inputCount; i++) { float lastInputWeight = lastInputWeights[i]; float inputWeight = playable.GetInputWeight(i); - bool clipStarted = (lastInputWeight == 0 && inputWeight > 0) || info.seekOccurred || info.timeLooped; + bool clipStarted = (inputWeight > 0) && (lastInputWeight == 0 || info.seekOccurred || info.timeLooped); if (inputWeight > 0) anyClipPlaying = true; lastInputWeights[i] = inputWeight; diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json b/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json index f417f18b61..cb08721372 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.10", + "version": "4.1.11", "unity": "2018.3", "author": { "name": "Esoteric Software",