[csharp] Removed bad fix for #1024

based on 1514b4acbb (diff-2e690293d0fea3104ddda07be1d1e5c9)
This commit is contained in:
John 2017-11-22 18:07:20 +08:00 committed by GitHub
parent 5948e5a62f
commit ed8f238524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -69,7 +69,7 @@ namespace Spine {
trackEntryPool
);
}
/// <summary>
/// Increments the track entry times, setting queued animations as current if needed</summary>
/// <param name="delta">delta time</param>
@ -259,17 +259,12 @@ namespace Spine {
break;
case Dip:
pose = MixPose.Setup;
alpha = mix == 1 ? 0 : alphaDip;
alpha = alphaDip;
break;
default:
pose = MixPose.Setup;
if (mix == 1) {
alpha = 0;
} else {
alpha = alphaDip;
var dipMix = timelineDipMix[i];
alpha *= Math.Max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
}
TrackEntry dipMix = timelineDipMix[i];
alpha = alphaDip * Math.Max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
break;
}
from.totalAlpha += alpha;