UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-06 18:56:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

[csharp] Port of bugfix commits 8e21d09 and 9b37c31, resetting mixBlend and stepped timelines. See #1903.

Browse Source
This commit is contained in:
Harald Csaszar 2021-06-15 09:09:10 +02:00
parent 9b37c31cae
commit 950760903b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spine-csharp/src/AnimationState.cs
View File

@ -832,6 +832,7 @@ namespace Spine {
entry.interruptAlpha = 1; entry.interruptAlpha = 1;
entry.mixTime = 0; entry.mixTime = 0;
entry.mixDuration = last == null ? 0 : data.GetMix(last.animation, animation); entry.mixDuration = last == null ? 0 : data.GetMix(last.animation, animation);
entry.mixBlend = MixBlend.Replace;
return entry; return entry;
} }

5
spine-csharp/src/SkeletonJson.cs
View File

@ -1107,8 +1107,9 @@ namespace Spine {
static int ReadCurve (object curve, CurveTimeline timeline, int bezier, int frame, int value, float time1, float time2, static int ReadCurve (object curve, CurveTimeline timeline, int bezier, int frame, int value, float time1, float time2,
float value1, float value2, float scale) { float value1, float value2, float scale) {
if (curve is string) { string curveString = curve as string;
if (value != 0) timeline.SetStepped(frame); if (curveString != null) {
if (curveString == "stepped") timeline.SetStepped(frame);
return bezier + 1; return bezier + 1;
} }
var curveValues = (List<object>)curve; var curveValues = (List<object>)curve;