Эх сурвалжийг харах

[ts][csharp] Fix for #1352, the last subsequent attachment timeline always mixes out to the setup pose.

badlogic 6 жил өмнө
parent
commit
6341fbbd9d

+ 4 - 1
spine-csharp/src/AnimationState.cs

@@ -299,7 +299,10 @@ namespace Spine {
 					float alpha;
 					float alpha;
 					switch (timelineMode[i] & AnimationState.NotLast - 1) {
 					switch (timelineMode[i] & AnimationState.NotLast - 1) {
 						case AnimationState.Subsequent:
 						case AnimationState.Subsequent:
-							if (!attachments && timeline is AttachmentTimeline) continue;
+							if (!attachments && timeline is AttachmentTimeline) {
+								if ((timelineMode[i] & AnimationState.NotLast) == AnimationState.NotLast) continue;
+								blend = MixBlend.setup;
+							}
 							if (!drawOrder && timeline is DrawOrderTimeline) continue;
 							if (!drawOrder && timeline is DrawOrderTimeline) continue;
 							timelineBlend = blend;
 							timelineBlend = blend;
 							alpha = alphaMix;
 							alpha = alphaMix;

+ 5 - 2
spine-ts/build/spine-all.js

@@ -1475,8 +1475,11 @@ var spine;
 					var alpha = 0;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
 						case AnimationState.SUBSEQUENT:
-							if (!attachments && timeline instanceof spine.AttachmentTimeline)
-								continue;
+							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
+								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
+									continue;
+								blend = spine.MixBlend.setup;
+							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 								continue;
 							timelineBlend = blend;
 							timelineBlend = blend;

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-all.js.map


+ 5 - 2
spine-ts/build/spine-canvas.js

@@ -1475,8 +1475,11 @@ var spine;
 					var alpha = 0;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
 						case AnimationState.SUBSEQUENT:
-							if (!attachments && timeline instanceof spine.AttachmentTimeline)
-								continue;
+							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
+								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
+									continue;
+								blend = spine.MixBlend.setup;
+							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 								continue;
 							timelineBlend = blend;
 							timelineBlend = blend;

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-canvas.js.map


+ 5 - 2
spine-ts/build/spine-core.js

@@ -1475,8 +1475,11 @@ var spine;
 					var alpha = 0;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
 						case AnimationState.SUBSEQUENT:
-							if (!attachments && timeline instanceof spine.AttachmentTimeline)
-								continue;
+							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
+								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
+									continue;
+								blend = spine.MixBlend.setup;
+							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 								continue;
 							timelineBlend = blend;
 							timelineBlend = blend;

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-core.js.map


+ 5 - 2
spine-ts/build/spine-player.js

@@ -1475,8 +1475,11 @@ var spine;
 					var alpha = 0;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
 						case AnimationState.SUBSEQUENT:
-							if (!attachments && timeline instanceof spine.AttachmentTimeline)
-								continue;
+							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
+								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
+									continue;
+								blend = spine.MixBlend.setup;
+							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 								continue;
 							timelineBlend = blend;
 							timelineBlend = blend;

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-player.js.map


+ 5 - 2
spine-ts/build/spine-threejs.js

@@ -1475,8 +1475,11 @@ var spine;
 					var alpha = 0;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
 						case AnimationState.SUBSEQUENT:
-							if (!attachments && timeline instanceof spine.AttachmentTimeline)
-								continue;
+							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
+								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
+									continue;
+								blend = spine.MixBlend.setup;
+							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 								continue;
 							timelineBlend = blend;
 							timelineBlend = blend;

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-threejs.js.map


+ 5 - 2
spine-ts/build/spine-webgl.js

@@ -1475,8 +1475,11 @@ var spine;
 					var alpha = 0;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
 						case AnimationState.SUBSEQUENT:
-							if (!attachments && timeline instanceof spine.AttachmentTimeline)
-								continue;
+							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
+								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
+									continue;
+								blend = spine.MixBlend.setup;
+							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 								continue;
 							timelineBlend = blend;
 							timelineBlend = blend;

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
spine-ts/build/spine-webgl.js.map


+ 4 - 1
spine-ts/core/src/AnimationState.ts

@@ -230,7 +230,10 @@ module spine {
 					let alpha = 0;
 					let alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 					case AnimationState.SUBSEQUENT:
 					case AnimationState.SUBSEQUENT:
-						if (!attachments && timeline instanceof AttachmentTimeline) continue;
+						if (!attachments && timeline instanceof AttachmentTimeline) {
+							if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST) continue;
+							blend = MixBlend.setup;
+						}
 						if (!drawOrder && timeline instanceof DrawOrderTimeline) continue;
 						if (!drawOrder && timeline instanceof DrawOrderTimeline) continue;
 						timelineBlend = blend;
 						timelineBlend = blend;
 						alpha = alphaMix;
 						alpha = alphaMix;

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно