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

[unity] Fixed compile error on Unity 2017 of last commit bf8f1f6.

Browse Source
This commit is contained in:
Harald Csaszar 2024-09-23 20:50:28 +02:00
parent bf8f1f69bf
commit 6ac6a1d8ac
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs
View File

@ -455,13 +455,13 @@ namespace Spine.Unity {
float[] customWeights = layerClipInfos[layer].clipResolvedWeights; float[] customWeights = layerClipInfos[layer].clipResolvedWeights;
for (int c = 0; c < clipInfoCount; c++) { for (int c = 0; c < clipInfoCount; c++) {
ApplyAnimation(skeleton, clipInfo[c], stateInfo, layer, layerWeight, layerBlendMode, ApplyAnimation(skeleton, clipInfo[c], stateInfo, layer, layerWeight, layerBlendMode,
useCustomClipWeight: true, customWeights[c]); true, customWeights[c]);
} }
if (hasNext) { if (hasNext) {
customWeights = layerClipInfos[layer].nextClipResolvedWeights; customWeights = layerClipInfos[layer].nextClipResolvedWeights;
for (int c = 0; c < nextClipInfoCount; c++) { for (int c = 0; c < nextClipInfoCount; c++) {
ApplyAnimation(skeleton, nextClipInfo[c], nextStateInfo, layer, layerWeight, layerBlendMode, ApplyAnimation(skeleton, nextClipInfo[c], nextStateInfo, layer, layerWeight, layerBlendMode,
useCustomClipWeight: true, customWeights[c]); true, customWeights[c]);
} }
} }
if (isInterruptionActive) { if (isInterruptionActive) {
@ -470,7 +470,7 @@ namespace Spine.Unity {
ApplyInterruptionAnimation(skeleton, interpolateWeightTo1, ApplyInterruptionAnimation(skeleton, interpolateWeightTo1,
interruptingClipInfo[c], interruptingStateInfo, interruptingClipInfo[c], interruptingStateInfo,
layer, layerWeight, layerBlendMode, interruptingClipTimeAddition, layer, layerWeight, layerBlendMode, interruptingClipTimeAddition,
useCustomClipWeight: true, customWeights[c]); true, customWeights[c]);
} }
} }
} else { // case MixNext || Hard } else { // case MixNext || Hard
@ -478,7 +478,7 @@ namespace Spine.Unity {
int c = 0; int c = 0;
for (; c < clipInfoCount; c++) { for (; c < clipInfoCount; c++) {
if (!ApplyAnimation(skeleton, clipInfo[c], stateInfo, layer, layerWeight, layerBlendMode, if (!ApplyAnimation(skeleton, clipInfo[c], stateInfo, layer, layerWeight, layerBlendMode,
useCustomClipWeight: true, 1.0f)) true, 1.0f))
continue; continue;
++c; break; ++c; break;
} }
@ -493,7 +493,7 @@ namespace Spine.Unity {
if (mode == MixMode.Hard) { if (mode == MixMode.Hard) {
for (; c < nextClipInfoCount; c++) { for (; c < nextClipInfoCount; c++) {
if (!ApplyAnimation(skeleton, nextClipInfo[c], nextStateInfo, layer, layerWeight, layerBlendMode, if (!ApplyAnimation(skeleton, nextClipInfo[c], nextStateInfo, layer, layerWeight, layerBlendMode,
useCustomClipWeight: true, 1.0f)) true, 1.0f))
continue; continue;
++c; break; ++c; break;
} }
@ -512,7 +512,7 @@ namespace Spine.Unity {
for (; c < interruptingClipInfoCount; c++) { for (; c < interruptingClipInfoCount; c++) {
if (ApplyInterruptionAnimation(skeleton, interpolateWeightTo1, if (ApplyInterruptionAnimation(skeleton, interpolateWeightTo1,
interruptingClipInfo[c], interruptingStateInfo, interruptingClipInfo[c], interruptingStateInfo,
layer, layerWeight, layerBlendMode, interruptingClipTimeAddition, useCustomClipWeight: true, 1.0f)) { layer, layerWeight, layerBlendMode, interruptingClipTimeAddition, true, 1.0f)) {
++c; break; ++c; break;
} }