UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mario Zechner 2023-07-12 14:41:56 +02:00
commit 9ce4b14022
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs
View File

@ -165,7 +165,7 @@ namespace Spine.Unity.Playables {
for (int i = 0; i < inputCount; i++) { for (int i = 0; i < inputCount; i++) {
float lastInputWeight = lastInputWeights[i]; float lastInputWeight = lastInputWeights[i];
float inputWeight = playable.GetInputWeight(i); float inputWeight = playable.GetInputWeight(i);
bool clipStarted = lastInputWeight == 0 && inputWeight > 0; bool clipStarted = (lastInputWeight == 0 && inputWeight > 0) || info.seekOccurred || info.timeLooped;
if (inputWeight > 0) if (inputWeight > 0)
anyClipPlaying = true; anyClipPlaying = true;
lastInputWeights[i] = inputWeight; lastInputWeights[i] = inputWeight;
@ -231,10 +231,9 @@ namespace Spine.Unity.Playables {
timelineStartedTrackEntry = trackEntry; timelineStartedTrackEntry = trackEntry;
} }
//else Debug.LogWarningFormat("Animation named '{0}' not found", clipData.animationName);
} }
}
// Ensure that the first frame ends with an updated mesh. if (numStartingClips > 0) {
if (skeletonAnimation) { if (skeletonAnimation) {
skeletonAnimation.Update(0); skeletonAnimation.Update(0);
skeletonAnimation.LateUpdate(); skeletonAnimation.LateUpdate();

2
spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json
View File

@ -2,7 +2,7 @@
"name": "com.esotericsoftware.spine.timeline", "name": "com.esotericsoftware.spine.timeline",
"displayName": "Spine Timeline Extensions", "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)", "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.9", "version": "4.1.10",
"unity": "2018.3", "unity": "2018.3",
"author": { "author": {
"name": "Esoteric Software", "name": "Esoteric Software",