UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-06 18:56:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1' into 4.2-beta

Browse Source 
# 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
This commit is contained in:
Mario Zechner 2023-06-30 15:28:20 +02:00
commit bf6cc69ddf
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spine-ts/build.sh
View File

@ -21,6 +21,7 @@ then
spine-player/dist/iife/* \ spine-player/dist/iife/* \
spine-threejs/dist/iife/* \ spine-threejs/dist/iife/* \
spine-pixi/dist/iife/* \ spine-pixi/dist/iife/* \
spine-phaser/dist/iife/* \
spine-player/css/spine-player.css spine-player/css/spine-player.css
curl -f -F "file=@spine-ts.zip" "$TS_UPDATE_URL$BRANCH" curl -f -F "file=@spine-ts.zip" "$TS_UPDATE_URL$BRANCH"
else else

2
spine-ts/spine-pixi/src/Spine.ts
View File

@ -340,7 +340,7 @@ export class Spine extends Container {
const skeletonAsset = Assets.get<any | Uint8Array>(skeletonAssetName); const skeletonAsset = Assets.get<any | Uint8Array>(skeletonAssetName);
const atlasAsset = Assets.get<TextureAtlas>(atlasAssetName); const atlasAsset = Assets.get<TextureAtlas>(atlasAssetName);
const attachmentLoader = new AtlasAttachmentLoader(atlasAsset); 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; parser.scale = options?.scale ?? 1;
skeletonData = parser.readSkeletonData(skeletonAsset); skeletonData = parser.readSkeletonData(skeletonAsset);
Spine.skeletonCache[cacheKey] = skeletonData; Spine.skeletonCache[cacheKey] = skeletonData;