UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 14:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'EsotericSoftware:4.2' into 4.2

Browse Source
This commit is contained in:
KK 2026-01-21 10:23:26 +08:00 committed by GitHub
commit 1eb1c4c90e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 61 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-godot/build/build-templates-v4.sh
View File

@ -122,7 +122,7 @@ elif [ "$platform" = "ios" ]; then
cp libgodot.ios.template_release.simulator.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64_x86_64-simulator/libgodot.a cp libgodot.ios.template_release.simulator.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64_x86_64-simulator/libgodot.a
cp libgodot.ios.template_debug.arm64.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64/libgodot.a cp libgodot.ios.template_debug.arm64.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64/libgodot.a
cp libgodot.ios.template_debug.simulator.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a cp libgodot.ios.template_debug.simulator.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a
cp -r ~/VulkanSDK/1.3.275.0/MoltenVK/MoltenVK.xcframework ios_xcode/ cp -r /Users/runner/VulkanSDK/1.3.275.0/macOS/lib/MoltenVK.xcframework ios_xcode/
rm -rf ios_xcode/MoltenVK.xcframework/{macos,tvos}* rm -rf ios_xcode/MoltenVK.xcframework/{macos,tvos}*
rm -rf ios.zip rm -rf ios.zip
pushd ios_xcode pushd ios_xcode

2
spine-godot/build/install-macos-vulkan-sdk.sh
View File

@ -5,6 +5,6 @@ IFS=$'\n\t'
curl -L "https://sdk.lunarg.com/sdk/download/1.3.275.0/mac/vulkansdk-macos-1.3.275.0.dmg" -o /tmp/vulkan-sdk.dmg curl -L "https://sdk.lunarg.com/sdk/download/1.3.275.0/mac/vulkansdk-macos-1.3.275.0.dmg" -o /tmp/vulkan-sdk.dmg
hdiutil attach /tmp/vulkan-sdk.dmg -mountpoint /Volumes/vulkan-sdk hdiutil attach /tmp/vulkan-sdk.dmg -mountpoint /Volumes/vulkan-sdk
/Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan \ /Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan \
--accept-licenses --default-answer --confirm-command install --accept-licenses --default-answer --confirm-command install com.lunarg.vulkan.ios
# hdiutil detach /Volumes/vulkan-sdk # hdiutil detach /Volumes/vulkan-sdk
rm -f /tmp/vulkan-sdk.dmg rm -f /tmp/vulkan-sdk.dmg

60
spine-ts/package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "@esotericsoftware/spine-ts", "name": "@esotericsoftware/spine-ts",
"version": "4.2.96", "version": "4.2.98",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@esotericsoftware/spine-ts", "name": "@esotericsoftware/spine-ts",
"version": "4.2.96", "version": "4.2.98",
"license": "LicenseRef-LICENSE", "license": "LicenseRef-LICENSE",
"workspaces": [ "workspaces": [
"spine-core", "spine-core",
@ -33,9 +33,9 @@
} }
}, },
"node_modules/@babel/runtime": { "node_modules/@babel/runtime": {
"version": "7.28.4", "version": "7.28.6",
"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz",
"integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==", "integrity": "sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
@ -2219,18 +2219,18 @@
}, },
"spine-canvas": { "spine-canvas": {
"name": "@esotericsoftware/spine-canvas", "name": "@esotericsoftware/spine-canvas",
"version": "4.2.96", "version": "4.2.98",
"license": "LicenseRef-LICENSE", "license": "LicenseRef-LICENSE",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-core": "4.2.96" "@esotericsoftware/spine-core": "4.2.98"
} }
}, },
"spine-canvaskit": { "spine-canvaskit": {
"name": "@esotericsoftware/spine-canvaskit", "name": "@esotericsoftware/spine-canvaskit",
"version": "4.2.96", "version": "4.2.98",
"license": "LicenseRef-LICENSE", "license": "LicenseRef-LICENSE",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-core": "4.2.96", "@esotericsoftware/spine-core": "4.2.98",
"canvaskit-wasm": "0.39.1" "canvaskit-wasm": "0.39.1"
}, },
"devDependencies": { "devDependencies": {
@ -2240,17 +2240,17 @@
}, },
"spine-core": { "spine-core": {
"name": "@esotericsoftware/spine-core", "name": "@esotericsoftware/spine-core",
"version": "4.2.96", "version": "4.2.98",
"license": "LicenseRef-LICENSE" "license": "LicenseRef-LICENSE"
}, },
"spine-phaser-v3": { "spine-phaser-v3": {
"name": "@esotericsoftware/spine-phaser-v3", "name": "@esotericsoftware/spine-phaser-v3",
"version": "4.2.96", "version": "4.2.98",
"license": "LicenseRef-LICENSE", "license": "LicenseRef-LICENSE",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-canvas": "4.2.96", "@esotericsoftware/spine-canvas": "4.2.98",
"@esotericsoftware/spine-core": "4.2.96", "@esotericsoftware/spine-core": "4.2.98",
"@esotericsoftware/spine-webgl": "4.2.96" "@esotericsoftware/spine-webgl": "4.2.98"
}, },
"devDependencies": { "devDependencies": {
"phaser": "^3.60.0" "phaser": "^3.60.0"
@ -2274,12 +2274,12 @@
}, },
"spine-phaser-v4": { "spine-phaser-v4": {
"name": "@esotericsoftware/spine-phaser-v4", "name": "@esotericsoftware/spine-phaser-v4",
"version": "4.2.96", "version": "4.2.98",
"license": "LicenseRef-LICENSE", "license": "LicenseRef-LICENSE",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-canvas": "4.2.96", "@esotericsoftware/spine-canvas": "4.2.98",
"@esotericsoftware/spine-core": "4.2.96", "@esotericsoftware/spine-core": "4.2.98",
"@esotericsoftware/spine-webgl": "4.2.96" "@esotericsoftware/spine-webgl": "4.2.98"
}, },
"devDependencies": { "devDependencies": {
"phaser": "^4.0.0-rc.1" "phaser": "^4.0.0-rc.1"
@ -2290,10 +2290,10 @@
}, },
"spine-pixi-v7": { "spine-pixi-v7": {
"name": "@esotericsoftware/spine-pixi-v7", "name": "@esotericsoftware/spine-pixi-v7",
"version": "4.2.96", "version": "4.2.98",
"license": "LicenseRef-LICENSE", "license": "LicenseRef-LICENSE",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-core": "4.2.96" "@esotericsoftware/spine-core": "4.2.98"
}, },
"peerDependencies": { "peerDependencies": {
"@pixi/assets": "^7.2.4", "@pixi/assets": "^7.2.4",
@ -2307,10 +2307,10 @@
}, },
"spine-pixi-v8": { "spine-pixi-v8": {
"name": "@esotericsoftware/spine-pixi-v8", "name": "@esotericsoftware/spine-pixi-v8",
"version": "4.2.96", "version": "4.2.98",
"license": "LicenseRef-LICENSE", "license": "LicenseRef-LICENSE",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-core": "4.2.96" "@esotericsoftware/spine-core": "4.2.98"
}, },
"peerDependencies": { "peerDependencies": {
"pixi.js": "^8.12.0" "pixi.js": "^8.12.0"
@ -2318,18 +2318,18 @@
}, },
"spine-player": { "spine-player": {
"name": "@esotericsoftware/spine-player", "name": "@esotericsoftware/spine-player",
"version": "4.2.96", "version": "4.2.98",
"license": "LicenseRef-LICENSE", "license": "LicenseRef-LICENSE",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-webgl": "4.2.96" "@esotericsoftware/spine-webgl": "4.2.98"
} }
}, },
"spine-threejs": { "spine-threejs": {
"name": "@esotericsoftware/spine-threejs", "name": "@esotericsoftware/spine-threejs",
"version": "4.2.96", "version": "4.2.98",
"license": "LicenseRef-LICENSE", "license": "LicenseRef-LICENSE",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-core": "4.2.96" "@esotericsoftware/spine-core": "4.2.98"
}, },
"devDependencies": { "devDependencies": {
"@types/three": "0.162.0" "@types/three": "0.162.0"
@ -2340,18 +2340,18 @@
}, },
"spine-webcomponents": { "spine-webcomponents": {
"name": "@esotericsoftware/spine-webcomponents", "name": "@esotericsoftware/spine-webcomponents",
"version": "4.2.96", "version": "4.2.98",
"license": "LicenseRef-LICENSE", "license": "LicenseRef-LICENSE",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-webgl": "4.2.96" "@esotericsoftware/spine-webgl": "4.2.98"
} }
}, },
"spine-webgl": { "spine-webgl": {
"name": "@esotericsoftware/spine-webgl", "name": "@esotericsoftware/spine-webgl",
"version": "4.2.96", "version": "4.2.98",
"license": "LicenseRef-LICENSE", "license": "LicenseRef-LICENSE",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-core": "4.2.96" "@esotericsoftware/spine-core": "4.2.98"
} }
} }
} }

2
spine-ts/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@esotericsoftware/spine-ts", "name": "@esotericsoftware/spine-ts",
"version": "4.2.96", "version": "4.2.98",
"description": "The official Spine Runtimes for the web.", "description": "The official Spine Runtimes for the web.",
"type": "module", "type": "module",
"files": [ "files": [

4
spine-ts/spine-canvas/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@esotericsoftware/spine-canvas", "name": "@esotericsoftware/spine-canvas",
"version": "4.2.96", "version": "4.2.98",
"description": "The official Spine Runtimes for the web.", "description": "The official Spine Runtimes for the web.",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",
@ -31,6 +31,6 @@
}, },
"homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-core": "4.2.96" "@esotericsoftware/spine-core": "4.2.98"
} }
} }

4
spine-ts/spine-canvaskit/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@esotericsoftware/spine-canvaskit", "name": "@esotericsoftware/spine-canvaskit",
"version": "4.2.96", "version": "4.2.98",
"description": "The official Spine Runtimes for CanvasKit for NodeJS", "description": "The official Spine Runtimes for CanvasKit for NodeJS",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",
@ -31,7 +31,7 @@
}, },
"homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-core": "4.2.96", "@esotericsoftware/spine-core": "4.2.98",
"canvaskit-wasm": "0.39.1" "canvaskit-wasm": "0.39.1"
}, },
"devDependencies": { "devDependencies": {

2
spine-ts/spine-core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@esotericsoftware/spine-core", "name": "@esotericsoftware/spine-core",
"version": "4.2.96", "version": "4.2.98",
"description": "The official Spine Runtimes for the web.", "description": "The official Spine Runtimes for the web.",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

8
spine-ts/spine-phaser-v3/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@esotericsoftware/spine-phaser-v3", "name": "@esotericsoftware/spine-phaser-v3",
"version": "4.2.96", "version": "4.2.98",
"description": "The official Spine Runtimes for the Phaser v3.", "description": "The official Spine Runtimes for the Phaser v3.",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",
@ -31,9 +31,9 @@
}, },
"homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-canvas": "4.2.96", "@esotericsoftware/spine-canvas": "4.2.98",
"@esotericsoftware/spine-core": "4.2.96", "@esotericsoftware/spine-core": "4.2.98",
"@esotericsoftware/spine-webgl": "4.2.96" "@esotericsoftware/spine-webgl": "4.2.98"
}, },
"devDependencies": { "devDependencies": {
"phaser": "^3.60.0" "phaser": "^3.60.0"

8
spine-ts/spine-phaser-v4/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@esotericsoftware/spine-phaser-v4", "name": "@esotericsoftware/spine-phaser-v4",
"version": "4.2.96", "version": "4.2.98",
"description": "The official Spine Runtimes for the Phaser v4.", "description": "The official Spine Runtimes for the Phaser v4.",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",
@ -31,9 +31,9 @@
}, },
"homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-canvas": "4.2.96", "@esotericsoftware/spine-canvas": "4.2.98",
"@esotericsoftware/spine-core": "4.2.96", "@esotericsoftware/spine-core": "4.2.98",
"@esotericsoftware/spine-webgl": "4.2.96" "@esotericsoftware/spine-webgl": "4.2.98"
}, },
"devDependencies": { "devDependencies": {
"phaser": "^4.0.0-rc.1" "phaser": "^4.0.0-rc.1"

5
spine-ts/spine-phaser-v4/src/SpineGameObject.ts
View File

@ -364,7 +364,7 @@ export class SpineGameObject extends DepthMixin(
if (newType) { if (newType) {
// Ensure framebuffer is properly set up. // Ensure framebuffer is properly set up.
if (drawingContext.renderer.renderNodes.currentBatchDrawingContext !== drawingContext) { if (drawingContext.renderer.renderNodes.currentBatchDrawingContext !== drawingContext) {
drawingContext.use(); drawingContext.renderer.renderNodes.finishBatch();
drawingContext.beginDraw(); drawingContext.beginDraw();
} }
@ -379,7 +379,8 @@ export class SpineGameObject extends DepthMixin(
let transform = Phaser.GameObjects.GetCalcMatrix( let transform = Phaser.GameObjects.GetCalcMatrix(
src, src,
camera, camera,
parentMatrix parentMatrix,
!drawingContext.useCanvas,
).calc; ).calc;
let a = transform.a, let a = transform.a,
b = transform.b, b = transform.b,

4
spine-ts/spine-pixi-v7/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@esotericsoftware/spine-pixi-v7", "name": "@esotericsoftware/spine-pixi-v7",
"version": "4.2.96", "version": "4.2.98",
"description": "The official Spine Runtimes for the web PixiJS v7.", "description": "The official Spine Runtimes for the web PixiJS v7.",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",
@ -31,7 +31,7 @@
}, },
"homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-core": "4.2.96" "@esotericsoftware/spine-core": "4.2.98"
}, },
"peerDependencies": { "peerDependencies": {
"@pixi/core": "^7.2.4", "@pixi/core": "^7.2.4",

4
spine-ts/spine-pixi-v8/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@esotericsoftware/spine-pixi-v8", "name": "@esotericsoftware/spine-pixi-v8",
"version": "4.2.96", "version": "4.2.98",
"description": "The official Spine Runtimes for PixiJS v8.", "description": "The official Spine Runtimes for PixiJS v8.",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",
@ -31,7 +31,7 @@
}, },
"homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-core": "4.2.96" "@esotericsoftware/spine-core": "4.2.98"
}, },
"peerDependencies": { "peerDependencies": {
"pixi.js": "^8.12.0" "pixi.js": "^8.12.0"

4
spine-ts/spine-player/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@esotericsoftware/spine-player", "name": "@esotericsoftware/spine-player",
"version": "4.2.96", "version": "4.2.98",
"description": "The official Spine Runtimes for the web.", "description": "The official Spine Runtimes for the web.",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",
@ -31,6 +31,6 @@
}, },
"homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-webgl": "4.2.96" "@esotericsoftware/spine-webgl": "4.2.98"
} }
} }

4
spine-ts/spine-threejs/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@esotericsoftware/spine-threejs", "name": "@esotericsoftware/spine-threejs",
"version": "4.2.96", "version": "4.2.98",
"description": "The official Spine Runtimes for the web.", "description": "The official Spine Runtimes for the web.",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",
@ -31,7 +31,7 @@
}, },
"homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-core": "4.2.96" "@esotericsoftware/spine-core": "4.2.98"
}, },
"devDependencies": { "devDependencies": {
"@types/three": "0.162.0" "@types/three": "0.162.0"

4
spine-ts/spine-webcomponents/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@esotericsoftware/spine-webcomponents", "name": "@esotericsoftware/spine-webcomponents",
"version": "4.2.96", "version": "4.2.98",
"description": "The official Spine webcomponents.", "description": "The official Spine webcomponents.",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",
@ -31,6 +31,6 @@
}, },
"homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-webgl": "4.2.96" "@esotericsoftware/spine-webgl": "4.2.98"
} }
} }

4
spine-ts/spine-webgl/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@esotericsoftware/spine-webgl", "name": "@esotericsoftware/spine-webgl",
"version": "4.2.96", "version": "4.2.98",
"description": "The official Spine Runtimes for the web.", "description": "The official Spine Runtimes for the web.",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",
@ -31,6 +31,6 @@
}, },
"homepage": "https://github.com/esotericsoftware/spine-runtimes#readme", "homepage": "https://github.com/esotericsoftware/spine-runtimes#readme",
"dependencies": { "dependencies": {
"@esotericsoftware/spine-core": "4.2.96" "@esotericsoftware/spine-core": "4.2.98"
} }
} }