mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-08 16:24:53 +08:00
Merge branch '4.0' into 4.1-beta
# Conflicts: # examples/raptor/export/raptor-pma.png # examples/raptor/export/raptor-pro.json # examples/raptor/export/raptor-pro.skel # examples/raptor/export/raptor.png # spine-ue4/Content/GettingStarted/Assets/Raptor/Textures/raptor.uasset # spine-ue4/Content/GettingStarted/Assets/Raptor/raptor.json # spine-ue4/Content/GettingStarted/Assets/Raptor/raptor.png # spine-ue4/Content/GettingStarted/Assets/Raptor/raptor.uasset # spine-ue4/Content/GettingStarted/Assets/Spineboy/Textures/spineboy.uasset # spine-ue4/Content/GettingStarted/Assets/Spineboy/spineboy.json # spine-ue4/Content/GettingStarted/Assets/Spineboy/spineboy.png # spine-ue4/Content/GettingStarted/Assets/Spineboy/spineboy.uasset
This commit is contained in:
badlogic
commit
147342973e
Binary file not shown.
|
Before Width: | Height: | Size: 407 KiB After Width: | Height: | Size: 468 KiB |
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 411 KiB After Width: | Height: | Size: 470 KiB |
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
|
Before Width: | Height: | Size: 411 KiB After Width: | Height: | Size: 470 KiB |
Binary file not shown.
Binary file not shown.
@ -1,7 +1,7 @@
|
||||
{
|
||||
"skeleton": {
|
||||
"hash": "ttp88nCyPm0",
|
||||
"spine": "4.1.04-beta",
|
||||
"hash": "IQgkYFQG8ng",
|
||||
"spine": "4.0.61",
|
||||
"x": -188.63,
|
||||
"y": -7.94,
|
||||
"width": 418.45,
|
||||
@ -2427,19 +2427,19 @@
|
||||
"side-glow1": {
|
||||
"attachment": [
|
||||
{ "name": "hoverglow-small" },
|
||||
{ "time": 0.9667 }
|
||||
{ "time": 0.9667, "name": null }
|
||||
]
|
||||
},
|
||||
"side-glow2": {
|
||||
"attachment": [
|
||||
{ "time": 0.0667, "name": "hoverglow-small" },
|
||||
{ "time": 1 }
|
||||
{ "time": 1, "name": null }
|
||||
]
|
||||
},
|
||||
"side-glow3": {
|
||||
"attachment": [
|
||||
{ "name": "hoverglow-small" },
|
||||
{ "time": 0.9667 }
|
||||
{ "time": 0.9667, "name": null }
|
||||
]
|
||||
}
|
||||
},
|
||||
@ -3479,68 +3479,60 @@
|
||||
{ "mixX": 0, "mixScaleX": 0, "mixShearY": 0 }
|
||||
]
|
||||
},
|
||||
"attachments": {
|
||||
"deform": {
|
||||
"default": {
|
||||
"front-foot": {
|
||||
"front-foot": {
|
||||
"deform": [
|
||||
{
|
||||
"offset": 26,
|
||||
"vertices": [ -0.02832, -5.37024, -0.02832, -5.37024, 3.8188, -3.7757, -0.02832, -5.37024, -3.82159, 3.77847 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
"front-foot": [
|
||||
{
|
||||
"offset": 26,
|
||||
"vertices": [ -0.02832, -5.37024, -0.02832, -5.37024, 3.8188, -3.7757, -0.02832, -5.37024, -3.82159, 3.77847 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
"front-shin": {
|
||||
"front-shin": {
|
||||
"deform": [
|
||||
{
|
||||
"offset": 14,
|
||||
"vertices": [ 0.5298, -1.12677, -0.85507, -4.20587, -11.35158, -10.19225, -10.79865, -8.43765, -6.06447, -6.89757, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.54892, -3.06021, 1.48463, -2.29663, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4.80437, -7.01817 ]
|
||||
},
|
||||
{
|
||||
"time": 0.3667,
|
||||
"offset": 14,
|
||||
"vertices": [ 0.5298, -1.12677, -11.66571, -9.07211, -25.65866, -17.53735, -25.53217, -16.50978, -11.78232, -11.26097, 0, 0, 0.60487, -1.63589, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.60487, -1.63589, 0, 0, -2.64522, -7.35739, 1.48463, -2.29663, 0, 0, 0, 0, 0, 0, 0.60487, -1.63589, 0.60487, -1.63589, 0.60487, -1.63589, 0.60487, -1.63589, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.60487, -1.63589, 0, 0, -10.06873, -12.0999 ]
|
||||
},
|
||||
{
|
||||
"time": 0.5333,
|
||||
"offset": 14,
|
||||
"vertices": [ 0.5298, -1.12677, -0.85507, -4.20587, -7.00775, -8.24771, -6.45482, -6.49312, -6.06447, -6.89757, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.54892, -3.06021, 1.48463, -2.29663, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4.80437, -7.01817 ]
|
||||
},
|
||||
{
|
||||
"time": 1,
|
||||
"offset": 14,
|
||||
"vertices": [ 0.5298, -1.12677, -0.85507, -4.20587, -11.35158, -10.19225, -10.79865, -8.43765, -6.06447, -6.89757, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.54892, -3.06021, 1.48463, -2.29663, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4.80437, -7.01817 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
"front-shin": [
|
||||
{
|
||||
"offset": 14,
|
||||
"vertices": [ 0.5298, -1.12677, -0.85507, -4.20587, -11.35158, -10.19225, -10.79865, -8.43765, -6.06447, -6.89757, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.54892, -3.06021, 1.48463, -2.29663, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4.80437, -7.01817 ]
|
||||
},
|
||||
{
|
||||
"time": 0.3667,
|
||||
"offset": 14,
|
||||
"vertices": [ 0.5298, -1.12677, -11.66571, -9.07211, -25.65866, -17.53735, -25.53217, -16.50978, -11.78232, -11.26097, 0, 0, 0.60487, -1.63589, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.60487, -1.63589, 0, 0, -2.64522, -7.35739, 1.48463, -2.29663, 0, 0, 0, 0, 0, 0, 0.60487, -1.63589, 0.60487, -1.63589, 0.60487, -1.63589, 0.60487, -1.63589, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.60487, -1.63589, 0, 0, -10.06873, -12.0999 ]
|
||||
},
|
||||
{
|
||||
"time": 0.5333,
|
||||
"offset": 14,
|
||||
"vertices": [ 0.5298, -1.12677, -0.85507, -4.20587, -7.00775, -8.24771, -6.45482, -6.49312, -6.06447, -6.89757, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.54892, -3.06021, 1.48463, -2.29663, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4.80437, -7.01817 ]
|
||||
},
|
||||
{
|
||||
"time": 1,
|
||||
"offset": 14,
|
||||
"vertices": [ 0.5298, -1.12677, -0.85507, -4.20587, -11.35158, -10.19225, -10.79865, -8.43765, -6.06447, -6.89757, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.54892, -3.06021, 1.48463, -2.29663, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -4.80437, -7.01817 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
"hoverboard-board": {
|
||||
"hoverboard-board": {
|
||||
"deform": [
|
||||
{
|
||||
"curve": [ 0.067, 0, 0.2, 1 ]
|
||||
},
|
||||
{
|
||||
"time": 0.2667,
|
||||
"offset": 1,
|
||||
"vertices": [ 2.45856, 0, 0, 0, 0, 0, 0, 0, 0, 3.55673, -3.0E-4, 3.55673, -3.0E-4, 0, 0, 0, 0, 0, 0, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, 0, 0, 0, 0, 0, 0, 0, 0, -4.90558, 0.11214, -9.40706, 6.2E-4, -6.34871, 4.3E-4, -6.34925, -6.57018, -6.34925, -6.57018, -6.34871, 4.3E-4, -2.3308, 1.7E-4, -2.33133, -6.57045, -2.33133, -6.57045, -2.3308, 1.7E-4, 0, 0, 1.2E-4, 2.45856, 1.2E-4, 2.45856, 1.2E-4, 2.45856, 1.2E-4, 2.45856, 3.3297, 4.44005, 3.3297, 4.44005, 3.3297, 4.44005, 1.2E-4, 2.45856, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2.46227, 1.7E-4, -2.46227, 1.7E-4, -2.52316, 1.1313, -2.52316, 1.1313, -2.52316, 1.1313, 1.2E-4, 2.45856, 1.2E-4, 2.45856, -9.40694, 2.45918, 1.88063, 0.44197, -2.9E-4, -3.54808, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2.52316, 1.1313, -2.52316, 1.1313, -2.52316, 1.1313, -2.46227, 1.7E-4, -2.46227, 1.7E-4, -2.46227, 1.7E-4, 0, 0, 0, 0, 1.2E-4, 2.45856 ],
|
||||
"curve": [ 0.45, 0, 0.817, 1 ]
|
||||
},
|
||||
{ "time": 1 }
|
||||
]
|
||||
}
|
||||
"hoverboard-board": [
|
||||
{
|
||||
"curve": [ 0.067, 0, 0.2, 1 ]
|
||||
},
|
||||
{
|
||||
"time": 0.2667,
|
||||
"offset": 1,
|
||||
"vertices": [ 2.45856, 0, 0, 0, 0, 0, 0, 0, 0, 3.55673, -3.0E-4, 3.55673, -3.0E-4, 0, 0, 0, 0, 0, 0, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, -7.6E-4, -9.84158, 0, 0, 0, 0, 0, 0, 0, 0, -4.90558, 0.11214, -9.40706, 6.2E-4, -6.34871, 4.3E-4, -6.34925, -6.57018, -6.34925, -6.57018, -6.34871, 4.3E-4, -2.3308, 1.7E-4, -2.33133, -6.57045, -2.33133, -6.57045, -2.3308, 1.7E-4, 0, 0, 1.2E-4, 2.45856, 1.2E-4, 2.45856, 1.2E-4, 2.45856, 1.2E-4, 2.45856, 3.3297, 4.44005, 3.3297, 4.44005, 3.3297, 4.44005, 1.2E-4, 2.45856, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2.46227, 1.7E-4, -2.46227, 1.7E-4, -2.52316, 1.1313, -2.52316, 1.1313, -2.52316, 1.1313, 1.2E-4, 2.45856, 1.2E-4, 2.45856, -9.40694, 2.45918, 1.88063, 0.44197, -2.9E-4, -3.54808, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -2.52316, 1.1313, -2.52316, 1.1313, -2.52316, 1.1313, -2.46227, 1.7E-4, -2.46227, 1.7E-4, -2.46227, 1.7E-4, 0, 0, 0, 0, 1.2E-4, 2.45856 ],
|
||||
"curve": [ 0.45, 0, 0.817, 1 ]
|
||||
},
|
||||
{ "time": 1 }
|
||||
]
|
||||
},
|
||||
"rear-foot": {
|
||||
"rear-foot": {
|
||||
"deform": [
|
||||
{
|
||||
"offset": 28,
|
||||
"vertices": [ -1.93078, 1.34782, -0.31417, 2.33363, 3.05122, 0.33946, 2.31472, -2.01678, 2.17583, -2.05795, -0.04277, -2.99459, 1.15429, 0.26328, 0.97501, -0.67169 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
"rear-foot": [
|
||||
{
|
||||
"offset": 28,
|
||||
"vertices": [ -1.93078, 1.34782, -0.31417, 2.33363, 3.05122, 0.33946, 2.31472, -2.01678, 2.17583, -2.05795, -0.04277, -2.99459, 1.15429, 0.26328, 0.97501, -0.67169 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -5211,7 +5203,7 @@
|
||||
"portal-bg": {
|
||||
"attachment": [
|
||||
{ "name": "portal-bg" },
|
||||
{ "time": 3 }
|
||||
{ "time": 3, "name": null }
|
||||
]
|
||||
},
|
||||
"portal-flare1": {
|
||||
@ -5222,7 +5214,7 @@
|
||||
{ "time": 1.2, "name": "portal-flare1" },
|
||||
{ "time": 1.2333, "name": "portal-flare2" },
|
||||
{ "time": 1.2667, "name": "portal-flare1" },
|
||||
{ "time": 1.3333 }
|
||||
{ "time": 1.3333, "name": null }
|
||||
]
|
||||
},
|
||||
"portal-flare2": {
|
||||
@ -5232,14 +5224,14 @@
|
||||
{ "time": 1.1667, "name": "portal-flare1" },
|
||||
{ "time": 1.2, "name": "portal-flare2" },
|
||||
{ "time": 1.2333, "name": "portal-flare3" },
|
||||
{ "time": 1.2667 }
|
||||
{ "time": 1.2667, "name": null }
|
||||
]
|
||||
},
|
||||
"portal-flare3": {
|
||||
"attachment": [
|
||||
{ "time": 1.2, "name": "portal-flare3" },
|
||||
{ "time": 1.2333, "name": "portal-flare2" },
|
||||
{ "time": 1.2667 }
|
||||
{ "time": 1.2667, "name": null }
|
||||
]
|
||||
},
|
||||
"portal-flare4": {
|
||||
@ -5247,33 +5239,33 @@
|
||||
{ "time": 1.2, "name": "portal-flare2" },
|
||||
{ "time": 1.2333, "name": "portal-flare1" },
|
||||
{ "time": 1.2667, "name": "portal-flare2" },
|
||||
{ "time": 1.3333 }
|
||||
{ "time": 1.3333, "name": null }
|
||||
]
|
||||
},
|
||||
"portal-flare5": {
|
||||
"attachment": [
|
||||
{ "time": 1.2333, "name": "portal-flare3" },
|
||||
{ "time": 1.2667, "name": "portal-flare1" },
|
||||
{ "time": 1.3333 }
|
||||
{ "time": 1.3333, "name": null }
|
||||
]
|
||||
},
|
||||
"portal-flare6": {
|
||||
"attachment": [
|
||||
{ "time": 1.2667, "name": "portal-flare3" },
|
||||
{ "time": 1.3333 }
|
||||
{ "time": 1.3333, "name": null }
|
||||
]
|
||||
},
|
||||
"portal-flare7": {
|
||||
"attachment": [
|
||||
{ "time": 1.1333, "name": "portal-flare2" },
|
||||
{ "time": 1.1667 }
|
||||
{ "time": 1.1667, "name": null }
|
||||
]
|
||||
},
|
||||
"portal-flare8": {
|
||||
"attachment": [
|
||||
{ "time": 1.2, "name": "portal-flare3" },
|
||||
{ "time": 1.2333, "name": "portal-flare2" },
|
||||
{ "time": 1.2667 }
|
||||
{ "time": 1.2667, "name": null }
|
||||
]
|
||||
},
|
||||
"portal-flare9": {
|
||||
@ -5281,7 +5273,7 @@
|
||||
{ "time": 1.2, "name": "portal-flare2" },
|
||||
{ "time": 1.2333, "name": "portal-flare3" },
|
||||
{ "time": 1.2667, "name": "portal-flare1" },
|
||||
{ "time": 1.3 }
|
||||
{ "time": 1.3, "name": null }
|
||||
]
|
||||
},
|
||||
"portal-flare10": {
|
||||
@ -5289,25 +5281,25 @@
|
||||
{ "time": 1.2, "name": "portal-flare2" },
|
||||
{ "time": 1.2333, "name": "portal-flare1" },
|
||||
{ "time": 1.2667, "name": "portal-flare3" },
|
||||
{ "time": 1.3 }
|
||||
{ "time": 1.3, "name": null }
|
||||
]
|
||||
},
|
||||
"portal-shade": {
|
||||
"attachment": [
|
||||
{ "name": "portal-shade" },
|
||||
{ "time": 3 }
|
||||
{ "time": 3, "name": null }
|
||||
]
|
||||
},
|
||||
"portal-streaks1": {
|
||||
"attachment": [
|
||||
{ "name": "portal-streaks1" },
|
||||
{ "time": 3 }
|
||||
{ "time": 3, "name": null }
|
||||
]
|
||||
},
|
||||
"portal-streaks2": {
|
||||
"attachment": [
|
||||
{ "name": "portal-streaks2" },
|
||||
{ "time": 3 }
|
||||
{ "time": 3, "name": null }
|
||||
]
|
||||
}
|
||||
},
|
||||
@ -7704,7 +7696,7 @@
|
||||
{ "time": 0.1, "name": "muzzle03" },
|
||||
{ "time": 0.1333, "name": "muzzle04" },
|
||||
{ "time": 0.1667, "name": "muzzle05" },
|
||||
{ "time": 0.2 }
|
||||
{ "time": 0.2, "name": null }
|
||||
]
|
||||
},
|
||||
"muzzle-glow": {
|
||||
@ -7733,7 +7725,7 @@
|
||||
],
|
||||
"attachment": [
|
||||
{ "time": 0.0333, "name": "muzzle-ring" },
|
||||
{ "time": 0.2333 }
|
||||
{ "time": 0.2333, "name": null }
|
||||
]
|
||||
},
|
||||
"muzzle-ring2": {
|
||||
@ -7747,7 +7739,7 @@
|
||||
],
|
||||
"attachment": [
|
||||
{ "time": 0.0333, "name": "muzzle-ring" },
|
||||
{ "time": 0.2 }
|
||||
{ "time": 0.2, "name": null }
|
||||
]
|
||||
},
|
||||
"muzzle-ring3": {
|
||||
@ -7761,7 +7753,7 @@
|
||||
],
|
||||
"attachment": [
|
||||
{ "time": 0.0333, "name": "muzzle-ring" },
|
||||
{ "time": 0.2 }
|
||||
{ "time": 0.2, "name": null }
|
||||
]
|
||||
},
|
||||
"muzzle-ring4": {
|
||||
@ -7775,7 +7767,7 @@
|
||||
],
|
||||
"attachment": [
|
||||
{ "time": 0.0333, "name": "muzzle-ring" },
|
||||
{ "time": 0.2 }
|
||||
{ "time": 0.2, "name": null }
|
||||
]
|
||||
}
|
||||
},
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 238 KiB After Width: | Height: | Size: 277 KiB |
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user