Merge branch '4.1' into 4.2-beta

# Conflicts: # spine-ts/package-lock.json # spine-ts/package.json # spine-ts/spine-canvas/package.json # spine-ts/spine-core/package.json # spine-ts/spine-phaser/package.json # spine-ts/spine-player/package.json # spine-ts/spine-threejs/package.json # spine-ts/spine-webgl/package.json
EsotericSoftware · Jun 30, 2023 · bf6cc69 · bf6cc69
2 parents 3ee68dc + b210ff5
commit bf6cc69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/spine-ts/build.sh b/spine-ts/build.sh
@@ -21,6 +21,7 @@ then
 		spine-player/dist/iife/* \
 		spine-threejs/dist/iife/* \
 		spine-pixi/dist/iife/* \
+		spine-phaser/dist/iife/* \
 		spine-player/css/spine-player.css
 	curl -f -F "file=@spine-ts.zip" "$TS_UPDATE_URL$BRANCH"
 else

diff --git a/spine-ts/spine-pixi/src/Spine.ts b/spine-ts/spine-pixi/src/Spine.ts
@@ -340,7 +340,7 @@ export class Spine extends Container {
 		const skeletonAsset = Assets.get<any | Uint8Array>(skeletonAssetName);
 		const atlasAsset = Assets.get<TextureAtlas>(atlasAssetName);
 		const attachmentLoader = new AtlasAttachmentLoader(atlasAsset);
-		let parser = skeletonAsset instanceof Uint8Array ?  new SkeletonBinary(attachmentLoader) : new SkeletonJson(attachmentLoader);
+		let parser = skeletonAsset instanceof Uint8Array ? new SkeletonBinary(attachmentLoader) : new SkeletonJson(attachmentLoader);
 		parser.scale = options?.scale ?? 1;
 		skeletonData = parser.readSkeletonData(skeletonAsset);
 		Spine.skeletonCache[cacheKey] = skeletonData;