Skip to content

Commit 0b6dda9

Browse files
committed
[unity] Fixed skeleton baker animation event int and float params not supported at the same time. Closes #3022.
1 parent 5011d97 commit 0b6dda9

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,9 +1547,11 @@ static void ParseEventTimeline (ref List<AnimationEvent> animationEvents,
15471547
unityAnimationEvent.stringParameter = spineEvent.String;
15481548
// if string (separate from name) is set in event, fallback to objectReferenceParameter.
15491549
unityAnimationEvent.objectReferenceParameter = SpineEventObjectPlaceholder;
1550-
} else if (spineEvent.Int != 0) {
1550+
}
1551+
if (spineEvent.Int != 0) {
15511552
unityAnimationEvent.intParameter = spineEvent.Int;
1552-
} else if (spineEvent.Float != 0) {
1553+
}
1554+
if (spineEvent.Float != 0) {
15531555
unityAnimationEvent.floatParameter = spineEvent.Float;
15541556
} // else, paramless function/Action.
15551557

spine-unity/Assets/Spine/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "com.esotericsoftware.spine.spine-unity",
33
"displayName": "spine-unity Runtime",
44
"description": "This plugin provides the spine-unity runtime core and examples. Spine Examples can be installed via the Samples tab.",
5-
"version": "4.3.42",
5+
"version": "4.3.43",
66
"unity": "2018.3",
77
"author": {
88
"name": "Esoteric Software",

0 commit comments

Comments
 (0)