浏览代码

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
Mario Zechner 2 年之前
父节点
当前提交
bf6cc69ddf
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 0
      spine-ts/build.sh
  2. 1 1
      spine-ts/spine-pixi/src/Spine.ts

+ 1 - 0
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 "[email protected]" "$TS_UPDATE_URL$BRANCH"
 else

+ 1 - 1
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;