Skip to content

Commit 54d7009

Browse files
committed
[unity] Fixed skeleton baker animation event int and float params not supported at the same time. Closes #3022.
1 parent 61e29d5 commit 54d7009

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
@@ -1537,9 +1537,11 @@ static void ParseEventTimeline (ref List<AnimationEvent> animationEvents,
15371537
unityAnimationEvent.stringParameter = spineEvent.String;
15381538
// if string (separate from name) is set in event, fallback to objectReferenceParameter.
15391539
unityAnimationEvent.objectReferenceParameter = SpineEventObjectPlaceholder;
1540-
} else if (spineEvent.Int != 0) {
1540+
}
1541+
if (spineEvent.Int != 0) {
15411542
unityAnimationEvent.intParameter = spineEvent.Int;
1542-
} else if (spineEvent.Float != 0) {
1543+
}
1544+
if (spineEvent.Float != 0) {
15431545
unityAnimationEvent.floatParameter = spineEvent.Float;
15441546
} // else, paramless function/Action.
15451547

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.",
5-
"version": "4.2.112",
5+
"version": "4.2.113",
66
"unity": "2018.3",
77
"author": {
88
"name": "Esoteric Software",

0 commit comments

Comments
 (0)