diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.atlas.txt index 805630d88..a358d0c86 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.atlas.txt +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.atlas.txt @@ -3,86 +3,69 @@ dragon.png filter: Linear, Linear pma: true front-toe-a - bounds: 797, 381, 29, 50 -front-toe-b - bounds: 942, 118, 56, 57 + bounds: 993, 73, 29, 50 head - bounds: 647, 81, 296, 260 + bounds: 736, 125, 296, 260 rotate: 90 -left-front-leg - bounds: 942, 250, 84, 57 - rotate: 90 -left-front-thigh - bounds: 852, 7, 84, 72 left-wing01 - bounds: 736, 433, 264, 589 -right-rear-toe - bounds: 647, 2, 109, 77 + bounds: 736, 423, 264, 589 +right-rear-leg + bounds: 891, 7, 116, 100 + rotate: 90 right-wing01 - bounds: 2, 379, 365, 643 + bounds: 2, 369, 365, 643 right-wing02 - bounds: 369, 379, 365, 643 + bounds: 369, 369, 365, 643 right-wing03 - bounds: 2, 12, 365, 643 + bounds: 2, 2, 365, 643 rotate: 90 -tail03 - bounds: 758, 6, 73, 92 - rotate: 90 -tail04 - bounds: 942, 177, 56, 71 -tail05 - bounds: 736, 379, 52, 59 - rotate: 90 -tail06 - bounds: 942, 336, 95, 68 - rotate: 90 -thiagobrayner - bounds: 909, 81, 350, 31 +tail01 + bounds: 736, 3, 120, 153 rotate: 90 dragon2.png size: 1024, 1024 filter: Linear, Linear pma: true -back - bounds: 795, 32, 190, 185 chin - bounds: 647, 157, 214, 146 - rotate: 90 + bounds: 736, 285, 214, 146 left-rear-leg - bounds: 795, 219, 206, 177 + bounds: 736, 106, 206, 177 +left-rear-thigh + bounds: 736, 13, 91, 149 rotate: 90 left-wing02 - bounds: 736, 427, 264, 589 + bounds: 736, 433, 264, 589 +right-rear-toe + bounds: 887, 2, 109, 77 right-wing04 - bounds: 2, 373, 365, 643 + bounds: 2, 379, 365, 643 right-wing05 - bounds: 369, 373, 365, 643 + bounds: 369, 379, 365, 643 right-wing06 - bounds: 2, 6, 365, 643 + bounds: 2, 12, 365, 643 + rotate: 90 +thiagobrayner + bounds: 952, 81, 350, 31 rotate: 90 -tail01 - bounds: 647, 2, 120, 153 dragon3.png size: 1024, 1024 filter: Linear, Linear pma: true +back + bounds: 736, 236, 190, 185 chest - bounds: 740, 299, 136, 122 -left-rear-thigh - bounds: 647, 218, 91, 149 + bounds: 736, 112, 136, 122 left-wing03 bounds: 736, 423, 264, 589 right-front-leg - bounds: 850, 196, 101, 89 + bounds: 846, 9, 101, 89 rotate: 90 right-front-thigh - bounds: 740, 189, 108, 108 -right-rear-leg - bounds: 878, 321, 116, 100 + bounds: 736, 2, 108, 108 right-rear-thigh - bounds: 647, 67, 91, 149 + bounds: 928, 272, 91, 149 right-wing07 bounds: 2, 369, 365, 643 right-wing08 @@ -91,21 +74,37 @@ right-wing09 bounds: 2, 2, 365, 643 rotate: 90 tail02 - bounds: 740, 67, 95, 120 + bounds: 874, 114, 95, 120 +tail06 + bounds: 937, 17, 95, 68 + rotate: 90 dragon4.png size: 1024, 1024 filter: Linear, Linear pma: true -left-wing04 - bounds: 2, 268, 264, 589 -left-wing05 - bounds: 268, 268, 264, 589 -left-wing06 - bounds: 534, 268, 264, 589 -left-wing07 - bounds: 2, 2, 264, 589 +front-toe-b + bounds: 2, 2, 56, 57 +left-front-leg + bounds: 800, 812, 84, 57 rotate: 90 +left-front-thigh + bounds: 2, 61, 84, 72 +left-wing04 + bounds: 2, 401, 264, 589 +left-wing05 + bounds: 268, 401, 264, 589 +left-wing06 + bounds: 534, 401, 264, 589 +left-wing07 + bounds: 2, 135, 264, 589 + rotate: 90 +tail03 + bounds: 800, 898, 73, 92 +tail04 + bounds: 875, 919, 56, 71 +tail05 + bounds: 88, 74, 52, 59 dragon5.png size: 1024, 1024 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.json index e5ed6c7c1..827463472 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "fE1TdXi9fk4", - "spine": "4.2.22", + "spine": "4.3.12-beta", "x": -366.31, "y": -327.81, "width": 660.39, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.png index ec9e89390..ce79f9a95 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon2.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon2.png index 6c025cb8e..a549067e8 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon2.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon2.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon3.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon3.png index 42d87958e..efd062db6 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon3.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon3.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon4.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon4.png index 11283aad5..acc37747d 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon4.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon4.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.json index 7fa736b4b..370773c12 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "bCPH+nfNatw", - "spine": "4.2.22", + "spine": "4.3.12-beta", "x": -434, "y": -133, "width": 868, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FootSoldier.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FootSoldier.json index 4c1640f8d..ad78a7e97 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FootSoldier.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FootSoldier.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "sqPqrqoSm2E", - "spine": "4.2.22", + "spine": "4.3.12-beta", "x": -79.83, "y": -0.99, "width": 147.64, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.json index 3ebfb0424..a8adef1fe 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "TKIzjMjpnSk", - "spine": "4.2.22", + "spine": "4.3.12-beta", "x": -125, "y": -30, "width": 250, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.atlas.txt index 2335b650e..00221cc02 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.atlas.txt +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.atlas.txt @@ -14,7 +14,7 @@ goblin/left-arm goblin/left-foot bounds: 929, 95, 65, 31 goblin/left-hand - bounds: 452, 2, 36, 41 + bounds: 546, 2, 36, 41 goblin/left-lower-leg bounds: 713, 93, 33, 70 rotate: 90 @@ -24,22 +24,21 @@ goblin/left-upper-leg bounds: 638, 93, 33, 73 rotate: 90 goblin/neck - bounds: 490, 2, 36, 41 + bounds: 729, 14, 36, 41 goblin/pelvis bounds: 482, 45, 62, 43 goblin/right-arm - bounds: 690, 2, 23, 50 - rotate: 90 + bounds: 996, 76, 23, 50 goblin/right-foot bounds: 771, 58, 63, 33 goblin/right-hand - bounds: 940, 56, 36, 37 + bounds: 819, 20, 36, 37 + rotate: 90 goblin/right-lower-leg bounds: 482, 90, 36, 76 rotate: 90 goblin/right-shoulder - bounds: 602, 3, 39, 45 - rotate: 90 + bounds: 647, 10, 39, 45 goblin/right-upper-leg bounds: 641, 57, 34, 63 rotate: 90 @@ -55,23 +54,23 @@ goblingirl/eyes-closed goblingirl/head bounds: 2, 21, 103, 81 goblingirl/left-arm - bounds: 978, 56, 37, 35 - rotate: 90 + bounds: 897, 19, 37, 35 goblingirl/left-foot bounds: 107, 3, 65, 31 goblingirl/left-hand - bounds: 565, 2, 35, 40 + bounds: 610, 2, 35, 40 goblingirl/left-lower-leg bounds: 785, 93, 33, 70 rotate: 90 goblingirl/left-shoulder - bounds: 690, 27, 28, 46 + bounds: 771, 28, 28, 46 rotate: 90 goblingirl/left-upper-leg bounds: 857, 93, 33, 70 rotate: 90 goblingirl/neck - bounds: 528, 2, 35, 41 + bounds: 940, 58, 35, 41 + rotate: 90 goblingirl/pelvis bounds: 546, 45, 62, 43 goblingirl/right-arm @@ -79,13 +78,13 @@ goblingirl/right-arm goblingirl/right-foot bounds: 836, 58, 63, 33 goblingirl/right-hand - bounds: 771, 20, 36, 37 + bounds: 858, 20, 36, 37 rotate: 90 goblingirl/right-lower-leg bounds: 560, 90, 36, 76 rotate: 90 goblingirl/right-shoulder - bounds: 649, 10, 39, 45 + bounds: 688, 10, 39, 45 goblingirl/right-upper-leg bounds: 706, 57, 34, 63 rotate: 90 @@ -94,7 +93,7 @@ goblingirl/torso goblingirl/undie-straps bounds: 212, 13, 55, 19 goblingirl/undies - bounds: 810, 27, 36, 29 + bounds: 983, 45, 36, 29 shield bounds: 380, 26, 70, 72 spear diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.json index b54a18d0e..91ec2fce1 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "r8iwnU9Tvmc", - "spine": "4.2.22", + "spine": "4.3.12-beta", "x": -134.12, "y": -3.28, "width": 266.94, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.png index 4b9f623d7..e11c62834 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.json index b0138d168..7f2428146 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "1GKrwevyJb4", - "spine": "4.2.22", + "spine": "4.3.12-beta", "x": -85.7, "y": -0.02, "width": 321.77, @@ -148,7 +148,7 @@ "order": 3, "skin": true, "bones": [ "chain1", "chain2", "chain3", "chain4", "chain5", "chain6", "chain7", "chain8" ], - "target": "weapon-morningstar-path", + "slot": "weapon-morningstar-path", "rotateMode": "chain" } ], diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/raggedy spineboy.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/raggedy spineboy.json index 16fc47452..b5d21698b 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/raggedy spineboy.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/raggedy spineboy.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "y7rWjT0Whbg", - "spine": "4.2.22", + "spine": "4.3.12-beta", "x": -78.45, "y": -9.66, "width": 157.48, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.json index 80c2ab738..84fea1ac7 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "4YKjYFOYC7w", - "spine": "4.2.22", + "spine": "4.3.12-beta", "x": -402.84, "y": -35.99, "width": 611.87, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.atlas.txt index fa52cd646..320179302 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.atlas.txt +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.atlas.txt @@ -12,9 +12,9 @@ arrow body bounds: 2, 171, 274, 339 bootR - bounds: 783, 426, 91, 84 + bounds: 675, 330, 91, 84 browL - bounds: 126, 12, 40, 22 + bounds: 79, 12, 40, 22 browR bounds: 2, 2, 32, 25 rotate: 90 @@ -23,73 +23,77 @@ eyelids closed eyelids open bounds: 502, 421, 176, 89 hairL - bounds: 548, 239, 54, 60 + bounds: 846, 333, 54, 60 hairL2 - bounds: 385, 49, 71, 76 + bounds: 768, 322, 71, 76 + rotate: 90 hairM - bounds: 876, 433, 96, 77 + bounds: 890, 433, 96, 77 hairM blob - bounds: 29, 4, 30, 45 + bounds: 609, 302, 30, 45 rotate: 90 hairM blobS - bounds: 448, 146, 16, 20 + bounds: 548, 195, 16, 20 + rotate: 90 hairR - bounds: 974, 427, 41, 83 + bounds: 783, 395, 41, 83 + rotate: 90 hairR2 bounds: 680, 416, 94, 101 rotate: 90 hairSide - bounds: 76, 10, 48, 24 + bounds: 29, 10, 48, 24 head bounds: 278, 285, 222, 225 indexL - bounds: 640, 260, 24, 36 + bounds: 692, 304, 24, 36 + rotate: 90 indexR - bounds: 207, 6, 34, 28 + bounds: 923, 403, 34, 28 inmouth - bounds: 548, 191, 46, 55 - rotate: 90 + bounds: 633, 245, 46, 55 irisL - bounds: 609, 298, 34, 47 - rotate: 90 + bounds: 988, 463, 34, 47 irisL flatspec - bounds: 278, 41, 19, 10 + bounds: 768, 395, 19, 10 + rotate: 90 irisL spec - bounds: 448, 168, 18, 21 + bounds: 902, 372, 18, 21 irisR - bounds: 604, 249, 34, 47 + bounds: 988, 414, 34, 47 irisR flatspec - bounds: 502, 288, 22, 11 + bounds: 448, 167, 22, 11 + rotate: 90 irisR spec - bounds: 448, 127, 16, 17 + bounds: 121, 17, 16, 17 middleL - bounds: 243, 8, 26, 36 - rotate: 90 + bounds: 868, 395, 26, 36 middleR - bounds: 766, 342, 34, 26 - rotate: 90 + bounds: 656, 302, 34, 26 mouth - bounds: 675, 331, 89, 83 + bounds: 463, 194, 89, 83 + rotate: 90 nose - bounds: 658, 322, 11, 10 + bounds: 502, 289, 11, 10 pinkyL - bounds: 605, 191, 24, 27 + bounds: 959, 407, 24, 27 rotate: 90 pony1 - bounds: 278, 53, 72, 105 + bounds: 783, 438, 72, 105 rotate: 90 pony2 - bounds: 463, 197, 86, 83 + bounds: 548, 213, 86, 83 rotate: 90 ringL - bounds: 605, 217, 26, 30 + bounds: 730, 302, 26, 30 + rotate: 90 rotate bounds: 502, 301, 105, 118 strap bounds: 278, 127, 62, 168 rotate: 90 thumbL - bounds: 168, 6, 37, 28 + bounds: 633, 215, 37, 28 thumbR - bounds: 766, 378, 36, 25 + bounds: 896, 395, 36, 25 rotate: 90 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.json index 2237f8516..73bf35f82 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "bpqXaGsNIZs", - "spine": "4.2.22", + "hash": "AJJUxcmEnS8", + "spine": "4.3.12-beta", "x": -214.04, "y": -80.91, "width": 519.95, @@ -152,12 +152,83 @@ "name": "rotateHandleTarget", "order": 1, "bones": [ "rotateHandle" ], - "target": "handleCenterTargetR" + "source": "handleCenterTargetR", + "properties": { + "rotate": { + "offset": 124.72, + "to": { + "rotate": { "offset": 124.72, "max": 224.72, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "offset": -360, + "to": { + "shearY": { "offset": -360, "max": -260, "scale": 1 } + } + } + } }, { "name": "translateHandleTarget", "bones": [ "arrowOrigin" ], - "target": "handL", + "source": "handL", + "properties": { + "rotate": { + "offset": -2.47, + "to": { + "rotate": { "offset": -2.47, "max": 97.53, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0 } ], diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png index c697bb1a4..873f8ec42 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman.json index 5b8975896..3e3fbb780 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "CNp43FaCQIg", - "spine": "4.2.22", + "hash": "ZqKiK7oBADQ", + "spine": "4.3.12-beta", "x": -100.47, "y": -9.21, "width": 260.65, @@ -418,13 +418,44 @@ "name": "back-foot-position", "order": 8, "bones": [ "back-foot1" ], - "target": "back-leg8", - "rotation": 108.8, + "source": "back-leg8", "x": 41.2, "y": -0.03, - "scaleX": 5.0E-4, - "scaleY": -3.0E-4, - "shearY": 0.1, + "properties": { + "rotate": { + "offset": -103.59, + "to": { + "rotate": { "offset": 5.21, "max": 105.21, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 0.8948, + "to": { + "scaleX": { "offset": 0.8953, "max": 1.8953, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 0.9997, "max": 1.9997, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "offset": 0.1, "max": 100.1, "scale": 1 } + } + } + }, "mixRotate": 0, "mixScaleX": 0 }, @@ -432,13 +463,44 @@ "name": "front-foot-position", "order": 9, "bones": [ "front-foot1" ], - "target": "front-leg8", - "rotation": 101.55, + "source": "front-leg8", "x": 38.92, "y": -0.02, - "scaleX": 4.0E-4, - "scaleY": -3.0E-4, - "shearY": 0.1, + "properties": { + "rotate": { + "offset": -112.09, + "to": { + "rotate": { "offset": -10.54, "max": 89.46, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1.0075, + "to": { + "scaleX": { "offset": 1.0079, "max": 2.0079, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 0.9997, "max": 1.9997, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "offset": 0.1, "max": 100.1, "scale": 1 } + } + } + }, "mixRotate": 0, "mixScaleX": 0 } @@ -448,7 +510,7 @@ "name": "back-arm-path", "order": 7, "bones": [ "back-arm1", "back-arm2", "back-arm3", "back-arm4" ], - "target": "back-arm-path", + "slot": "back-arm-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.25 @@ -457,7 +519,7 @@ "name": "back-leg-path", "order": 4, "bones": [ "back-leg1", "back-leg2", "back-leg3", "back-leg4", "back-leg5", "back-leg6", "back-leg7", "back-leg8" ], - "target": "back-leg-path", + "slot": "back-leg-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.125 @@ -466,7 +528,7 @@ "name": "front-arm-path", "order": 6, "bones": [ "front-arm1", "front-arm2", "front-arm3", "front-arm4" ], - "target": "front-arm-path", + "slot": "front-arm-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.25 @@ -475,7 +537,7 @@ "name": "front-leg-path", "order": 5, "bones": [ "front-leg1", "front-leg2", "front-leg3", "front-leg4", "front-leg5", "front-leg6", "front-leg7", "front-leg8" ], - "target": "front-leg-path", + "slot": "front-leg-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.125 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma.atlas.txt index 614022925..c26517674 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma.atlas.txt +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma.atlas.txt @@ -4,171 +4,159 @@ celestial-circus-pma.png pma: true scale: 0.4 arm-back-down - bounds: 324, 401, 38, 82 - rotate: 90 + bounds: 966, 559, 38, 82 arm-back-up - bounds: 290, 44, 83, 116 + bounds: 772, 2, 83, 116 rotate: 90 arm-front-down - bounds: 706, 2, 36, 78 - rotate: 90 + bounds: 937, 450, 36, 78 arm-front-up - bounds: 860, 138, 77, 116 + bounds: 890, 8, 77, 116 + rotate: 90 bench - bounds: 725, 256, 189, 48 + bounds: 966, 735, 189, 48 + rotate: 90 body-bottom - bounds: 879, 868, 154, 124 + bounds: 816, 222, 154, 124 rotate: 90 body-top - bounds: 725, 128, 126, 133 - rotate: 90 + bounds: 816, 87, 126, 133 chest - bounds: 408, 26, 104, 93 + bounds: 334, 2, 104, 93 cloud-back - bounds: 752, 378, 202, 165 + bounds: 704, 378, 202, 165 cloud-front bounds: 2, 2, 325, 196 rotate: 90 collar - bounds: 786, 13, 47, 26 + bounds: 879, 851, 47, 26 ear - bounds: 1002, 643, 20, 28 + bounds: 232, 329, 20, 28 + rotate: 90 eye-back-shadow - bounds: 428, 395, 14, 10 + bounds: 937, 533, 14, 10 eye-front-shadow - bounds: 704, 529, 24, 14 + bounds: 262, 335, 24, 14 eye-reflex-back - bounds: 860, 128, 8, 7 + bounds: 966, 537, 8, 7 rotate: 90 eye-reflex-front - bounds: 726, 386, 10, 7 -eye-white-back - bounds: 835, 23, 13, 16 -eye-white-front - bounds: 1005, 1000, 22, 17 + bounds: 966, 547, 10, 7 rotate: 90 +eye-white-back + bounds: 1009, 683, 13, 16 +eye-white-front + bounds: 200, 2, 22, 17 eyelashes-down-back - bounds: 232, 329, 11, 6 + bounds: 1016, 889, 11, 6 rotate: 90 eyelashes-down-front - bounds: 913, 851, 15, 6 - rotate: 90 + bounds: 928, 851, 15, 6 eyelashes-top-back - bounds: 408, 395, 18, 10 + bounds: 990, 301, 18, 10 eyelashes-top-front - bounds: 702, 179, 30, 16 + bounds: 1006, 611, 30, 16 rotate: 90 face - bounds: 514, 26, 93, 102 + bounds: 668, 2, 93, 102 rotate: 90 feathers-back - bounds: 954, 625, 46, 46 + bounds: 942, 300, 46, 46 feathers-front - bounds: 706, 40, 72, 86 + bounds: 879, 936, 72, 86 fringe-middle-back - bounds: 200, 6, 33, 52 - rotate: 90 + bounds: 944, 193, 33, 52 fringe-middle-front - bounds: 878, 76, 60, 50 - rotate: 90 + bounds: 952, 395, 60, 50 fringe-side-back - bounds: 780, 41, 27, 94 - rotate: 90 + bounds: 908, 449, 27, 94 fringe-side-front - bounds: 939, 161, 26, 93 + bounds: 440, 2, 26, 93 glove-bottom-back - bounds: 954, 572, 51, 41 + bounds: 942, 247, 51, 41 rotate: 90 glove-bottom-front - bounds: 916, 256, 47, 48 + bounds: 975, 447, 47, 48 hair-back-1 - bounds: 444, 395, 132, 306 - rotate: 90 + bounds: 200, 21, 132, 306 hair-back-2 - bounds: 438, 211, 80, 285 - rotate: 90 + bounds: 482, 64, 80, 285 hair-back-3 - bounds: 719, 306, 70, 268 - rotate: 90 + bounds: 744, 108, 70, 268 hair-back-4 - bounds: 438, 121, 88, 262 + bounds: 232, 351, 88, 262 rotate: 90 hair-back-5 - bounds: 438, 293, 88, 279 - rotate: 90 + bounds: 654, 97, 88, 279 hair-back-6 - bounds: 200, 41, 88, 286 + bounds: 564, 90, 88, 286 hair-hat-shadow - bounds: 232, 398, 90, 41 + bounds: 966, 643, 90, 41 + rotate: 90 hand-back - bounds: 954, 673, 60, 47 + bounds: 975, 497, 60, 47 rotate: 90 hand-front - bounds: 967, 172, 53, 60 + bounds: 468, 2, 53, 60 hat-back - bounds: 954, 802, 64, 45 - rotate: 90 + bounds: 952, 348, 64, 45 hat-front - bounds: 780, 70, 96, 56 + bounds: 966, 926, 96, 56 + rotate: 90 head-back - bounds: 618, 17, 102, 86 - rotate: 90 + bounds: 564, 2, 102, 86 jabot - bounds: 967, 234, 70, 55 - rotate: 90 + bounds: 879, 879, 70, 55 leg-back bounds: 232, 441, 210, 333 leg-front bounds: 444, 529, 258, 320 logo-brooch - bounds: 954, 545, 16, 25 + bounds: 1006, 584, 16, 25 mouth - bounds: 408, 121, 22, 6 -neck - bounds: 232, 342, 39, 56 + bounds: 1016, 902, 22, 6 rotate: 90 +neck + bounds: 523, 6, 39, 56 nose - bounds: 742, 529, 6, 7 + bounds: 945, 851, 6, 7 rotate: 90 nose-highlight - bounds: 719, 300, 4, 4 + bounds: 890, 2, 4, 4 nose-shadow - bounds: 869, 128, 7, 8 + bounds: 1014, 438, 7, 8 + rotate: 90 pupil-back - bounds: 730, 529, 10, 14 + bounds: 224, 5, 10, 14 pupil-front - bounds: 254, 21, 12, 18 + bounds: 468, 77, 12, 18 rope-back - bounds: 232, 383, 10, 492 - rotate: 90 + bounds: 954, 530, 10, 492 rope-front - bounds: 232, 383, 10, 492 - rotate: 90 + bounds: 954, 530, 10, 492 rope-front-bottom - bounds: 954, 735, 42, 65 + bounds: 908, 382, 42, 65 skirt bounds: 2, 776, 440, 246 sock-bow - bounds: 408, 407, 33, 32 -spine-logo-body - bounds: 879, 853, 13, 32 + bounds: 990, 313, 33, 32 rotate: 90 +spine-logo-body + bounds: 1009, 701, 13, 32 star-big - bounds: 939, 141, 18, 24 + bounds: 928, 859, 18, 24 rotate: 90 star-medium - bounds: 742, 537, 6, 8 - rotate: 90 + bounds: 1016, 879, 6, 8 star-small - bounds: 719, 378, 3, 4 - rotate: 90 + bounds: 262, 329, 3, 4 underskirt bounds: 2, 329, 445, 228 rotate: 90 underskirt-back bounds: 444, 851, 433, 171 wing-back - bounds: 290, 129, 146, 252 + bounds: 334, 97, 146, 252 wing-front bounds: 704, 545, 304, 248 rotate: 90 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma.png index 2b2b9ca1e..f4c3b1e51 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pro.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pro.json index 1a7eebab0..97f203d18 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pro.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "FsTlpSGjt5g", - "spine": "4.2.22", + "hash": "xjCHDkKvLDs", + "spine": "4.3.12-beta", "x": -755, "y": -556.02, "width": 1332, @@ -300,9 +300,44 @@ "name": "girl/face-control", "order": 9, "bones": [ "face-holder" ], - "target": "face-control", + "source": "face-control", "x": 33.48, "y": 16.63, + "properties": { + "rotate": { + "offset": 90, + "to": { + "rotate": { "offset": 90, "max": 190, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0.8, "mixScaleX": 0, @@ -312,9 +347,44 @@ "name": "girl/head-control", "order": 8, "bones": [ "face-inverse" ], - "target": "face-control", + "source": "face-control", "x": 109.57, "y": 251.66, + "properties": { + "rotate": { + "offset": 90, + "to": { + "rotate": { "offset": 90, "max": 190, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": -0.5, "mixScaleX": 0, @@ -324,9 +394,44 @@ "name": "girl/shoulders-perspective", "order": 6, "bones": [ "arm-back-up-holder" ], - "target": "arm-front-up-holder", + "source": "arm-front-up-holder", "x": 25.8, "y": -257.4, + "properties": { + "rotate": { + "offset": 90, + "to": { + "rotate": { "offset": 90, "max": 190, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": -1, "mixScaleX": 0, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.atlas.txt index 9e401d294..36cc7220c 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.atlas.txt +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.atlas.txt @@ -66,13 +66,13 @@ pot-mouth-smile pot-mouth-smile-big bounds: 878, 352, 20, 9 rain-blue - bounds: 926, 360, 12, 18 + bounds: 900, 349, 12, 18 rotate: 90 rain-color bounds: 264, 4, 9, 17 rotate: 90 rain-green - bounds: 900, 349, 12, 18 + bounds: 741, 336, 12, 18 rotate: 90 rain-white bounds: 727, 337, 12, 22 @@ -83,4 +83,4 @@ stem bounds: 907, 392, 8, 105 rotate: 90 stem-end - bounds: 300, 62, 13, 13 + bounds: 761, 335, 13, 13 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.png index 6557c449f..110eca694 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.skel.bytes b/spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.skel.bytes index d25759cea..79990eab3 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.skel.bytes and b/spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.skel.bytes differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.atlas.txt index b4cc35fa9..4cb708eb1 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.atlas.txt +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.atlas.txt @@ -22,12 +22,13 @@ boy/body bounds: 845, 413, 97, 132 rotate: 90 boy/boot-ribbon-front - bounds: 234, 304, 9, 11 + bounds: 309, 40, 9, 11 + rotate: 90 boy/collar bounds: 471, 243, 73, 29 rotate: 90 boy/ear - bounds: 991, 352, 19, 23 + bounds: 901, 163, 19, 23 rotate: 90 boy/eye-back-low-eyelid bounds: 66, 72, 17, 6 @@ -35,16 +36,15 @@ boy/eye-back-pupil bounds: 694, 279, 8, 9 rotate: 90 boy/eye-back-up-eyelid - bounds: 460, 101, 23, 5 + bounds: 309, 96, 23, 5 rotate: 90 boy/eye-back-up-eyelid-back bounds: 979, 414, 19, 10 rotate: 90 boy/eye-front-low-eyelid - bounds: 1015, 203, 22, 7 - rotate: 90 + bounds: 316, 95, 22, 7 boy/eye-front-pupil - bounds: 309, 50, 9, 9 + bounds: 234, 306, 9, 9 boy/eye-front-up-eyelid bounds: 991, 373, 31, 6 boy/eye-front-up-eyelid-back @@ -53,16 +53,16 @@ boy/eye-front-up-eyelid-back boy/eye-iris-back bounds: 810, 260, 17, 17 boy/eye-iris-front - bounds: 902, 230, 18, 18 + bounds: 316, 104, 18, 18 boy/eye-white-back - bounds: 599, 179, 20, 12 + bounds: 601, 179, 20, 12 boy/eye-white-front bounds: 544, 183, 27, 13 boy/eyebrow-back - bounds: 1002, 225, 20, 11 + bounds: 309, 51, 20, 11 rotate: 90 boy/eyebrow-front - bounds: 975, 234, 25, 11 + bounds: 997, 213, 25, 11 boy/hair-back bounds: 629, 289, 122, 81 rotate: 90 @@ -73,34 +73,41 @@ boy/hair-side bounds: 979, 435, 25, 43 rotate: 90 boy/hand-backfingers - bounds: 858, 183, 19, 21 + bounds: 926, 163, 19, 21 + rotate: 90 boy/hand-front-fingers - bounds: 879, 183, 19, 21 + bounds: 953, 183, 19, 21 + rotate: 90 boy/hat bounds: 218, 121, 93, 56 boy/leg-front bounds: 85, 104, 31, 158 boy/mouth-close - bounds: 467, 100, 21, 5 + bounds: 309, 73, 21, 5 + rotate: 90 girl-blue-cape/mouth-close - bounds: 467, 100, 21, 5 + bounds: 309, 73, 21, 5 + rotate: 90 girl-spring-dress/mouth-close - bounds: 467, 100, 21, 5 + bounds: 309, 73, 21, 5 + rotate: 90 girl/mouth-close - bounds: 467, 100, 21, 5 + bounds: 309, 73, 21, 5 + rotate: 90 boy/mouth-smile bounds: 1015, 258, 29, 7 rotate: 90 boy/nose - bounds: 323, 79, 17, 10 + bounds: 335, 76, 17, 10 + rotate: 90 boy/pompom bounds: 979, 462, 48, 43 rotate: 90 boy/zip - bounds: 922, 231, 14, 23 + bounds: 949, 167, 14, 23 rotate: 90 girl-blue-cape/back-eyebrow - bounds: 527, 106, 18, 12 + bounds: 322, 56, 18, 12 rotate: 90 girl-blue-cape/body-dress bounds: 2, 264, 109, 246 @@ -111,8 +118,7 @@ girl-blue-cape/cape-back girl-blue-cape/cape-back-up bounds: 504, 305, 123, 106 girl-blue-cape/cape-ribbon - bounds: 396, 118, 50, 18 - rotate: 90 + bounds: 901, 184, 50, 18 girl-blue-cape/cape-shoulder-back bounds: 420, 243, 49, 59 girl-blue-cape/cape-shoulder-front @@ -120,11 +126,14 @@ girl-blue-cape/cape-shoulder-front girl-blue-cape/cape-up-front bounds: 118, 145, 98, 117 girl-blue-cape/ear - bounds: 837, 181, 19, 23 + bounds: 991, 352, 19, 23 + rotate: 90 girl-spring-dress/ear - bounds: 837, 181, 19, 23 + bounds: 991, 352, 19, 23 + rotate: 90 girl/ear - bounds: 837, 181, 19, 23 + bounds: 991, 352, 19, 23 + rotate: 90 girl-blue-cape/eye-back-low-eyelid bounds: 810, 252, 17, 6 girl-spring-dress/eye-back-low-eyelid @@ -132,28 +141,25 @@ girl-spring-dress/eye-back-low-eyelid girl/eye-back-low-eyelid bounds: 810, 252, 17, 6 girl-blue-cape/eye-back-pupil - bounds: 309, 40, 8, 9 - rotate: 90 + bounds: 536, 169, 8, 9 girl-spring-dress/eye-back-pupil - bounds: 309, 40, 8, 9 - rotate: 90 + bounds: 536, 169, 8, 9 girl/eye-back-pupil - bounds: 309, 40, 8, 9 - rotate: 90 + bounds: 536, 169, 8, 9 girl-blue-cape/eye-back-up-eyelid - bounds: 573, 179, 24, 12 + bounds: 974, 167, 24, 12 girl-spring-dress/eye-back-up-eyelid - bounds: 573, 179, 24, 12 + bounds: 974, 167, 24, 12 girl/eye-back-up-eyelid - bounds: 573, 179, 24, 12 + bounds: 974, 167, 24, 12 girl-blue-cape/eye-back-up-eyelid-back - bounds: 380, 105, 17, 11 + bounds: 336, 57, 17, 11 rotate: 90 girl-spring-dress/eye-back-up-eyelid-back - bounds: 380, 105, 17, 11 + bounds: 336, 57, 17, 11 rotate: 90 girl/eye-back-up-eyelid-back - bounds: 380, 105, 17, 11 + bounds: 336, 57, 17, 11 rotate: 90 girl-blue-cape/eye-front-low-eyelid bounds: 1016, 353, 18, 6 @@ -165,11 +171,11 @@ girl/eye-front-low-eyelid bounds: 1016, 353, 18, 6 rotate: 90 girl-blue-cape/eye-front-pupil - bounds: 363, 94, 9, 9 + bounds: 983, 156, 9, 9 girl-spring-dress/eye-front-pupil - bounds: 363, 94, 9, 9 + bounds: 983, 156, 9, 9 girl/eye-front-pupil - bounds: 363, 94, 9, 9 + bounds: 983, 156, 9, 9 girl-blue-cape/eye-front-up-eyelid bounds: 679, 413, 30, 14 rotate: 90 @@ -180,27 +186,27 @@ girl/eye-front-up-eyelid bounds: 679, 413, 30, 14 rotate: 90 girl-blue-cape/eye-front-up-eyelid-back - bounds: 947, 234, 26, 11 + bounds: 573, 180, 26, 11 girl-spring-dress/eye-front-up-eyelid-back - bounds: 947, 234, 26, 11 + bounds: 573, 180, 26, 11 girl/eye-front-up-eyelid-back - bounds: 947, 234, 26, 11 + bounds: 573, 180, 26, 11 girl-blue-cape/eye-iris-back - bounds: 323, 105, 17, 17 + bounds: 316, 76, 17, 17 girl-blue-cape/eye-iris-front - bounds: 467, 107, 18, 18 + bounds: 336, 104, 18, 18 girl-blue-cape/eye-white-back - bounds: 621, 175, 20, 16 + bounds: 623, 175, 20, 16 girl-spring-dress/eye-white-back - bounds: 621, 175, 20, 16 + bounds: 623, 175, 20, 16 girl-blue-cape/eye-white-front - bounds: 643, 175, 20, 16 + bounds: 645, 175, 20, 16 girl-spring-dress/eye-white-front - bounds: 643, 175, 20, 16 + bounds: 645, 175, 20, 16 girl/eye-white-front - bounds: 643, 175, 20, 16 + bounds: 645, 175, 20, 16 girl-blue-cape/front-eyebrow - bounds: 309, 101, 18, 12 + bounds: 322, 36, 18, 12 rotate: 90 girl-blue-cape/hair-back bounds: 712, 317, 117, 98 @@ -210,34 +216,32 @@ girl-blue-cape/hair-bangs girl-blue-cape/hair-head-side-back bounds: 544, 198, 30, 52 girl-blue-cape/hair-head-side-front - bounds: 466, 127, 41, 42 + bounds: 866, 206, 41, 42 girl-blue-cape/hair-side bounds: 175, 2, 36, 71 rotate: 90 girl-blue-cape/hand-front-fingers - bounds: 902, 207, 19, 21 + bounds: 976, 181, 19, 21 girl-spring-dress/hand-front-fingers - bounds: 902, 207, 19, 21 + bounds: 976, 181, 19, 21 girl-blue-cape/leg-front bounds: 519, 413, 30, 158 rotate: 90 girl-blue-cape/mouth-smile - bounds: 1015, 227, 29, 7 - rotate: 90 + bounds: 505, 171, 29, 7 girl-spring-dress/mouth-smile - bounds: 1015, 227, 29, 7 - rotate: 90 + bounds: 505, 171, 29, 7 girl/mouth-smile - bounds: 1015, 227, 29, 7 - rotate: 90 + bounds: 505, 171, 29, 7 girl-blue-cape/nose - bounds: 342, 82, 11, 7 + bounds: 546, 174, 11, 7 girl-spring-dress/nose - bounds: 342, 82, 11, 7 + bounds: 546, 174, 11, 7 girl/nose - bounds: 342, 82, 11, 7 + bounds: 546, 174, 11, 7 girl-blue-cape/sleeve-back - bounds: 416, 95, 42, 29 + bounds: 870, 162, 42, 29 + rotate: 90 girl-blue-cape/sleeve-front bounds: 249, 303, 52, 119 rotate: 90 @@ -245,7 +249,7 @@ girl-spring-dress/arm-front bounds: 829, 292, 17, 111 rotate: 90 girl-spring-dress/back-eyebrow - bounds: 309, 81, 18, 12 + bounds: 321, 16, 18, 12 rotate: 90 girl-spring-dress/body-up bounds: 66, 2, 64, 66 @@ -254,19 +258,20 @@ girl-spring-dress/cloak-down girl-spring-dress/cloak-up bounds: 628, 229, 64, 58 girl-spring-dress/eye-iris-back - bounds: 342, 105, 17, 17 + bounds: 336, 38, 17, 17 girl-spring-dress/eye-iris-front - bounds: 487, 107, 18, 18 + bounds: 356, 104, 18, 18 girl-spring-dress/front-eyebrow - bounds: 323, 91, 18, 12 + bounds: 321, 2, 18, 12 girl-spring-dress/hair-back bounds: 370, 417, 147, 93 girl-spring-dress/hair-bangs bounds: 829, 250, 91, 40 girl-spring-dress/hair-head-side-back - bounds: 509, 126, 30, 52 + bounds: 991, 381, 30, 52 girl-spring-dress/hair-head-side-front - bounds: 816, 206, 41, 42 + bounds: 909, 204, 41, 42 + rotate: 90 girl-spring-dress/hair-side bounds: 248, 2, 36, 71 rotate: 90 @@ -286,7 +291,7 @@ girl/arm-front bounds: 712, 279, 36, 115 rotate: 90 girl/back-eyebrow - bounds: 309, 61, 18, 12 + bounds: 335, 16, 18, 12 rotate: 90 girl/bag-base bounds: 694, 219, 62, 58 @@ -299,15 +304,15 @@ girl/body bounds: 370, 318, 97, 132 rotate: 90 girl/boot-ribbon-front - bounds: 323, 64, 13, 13 + bounds: 968, 152, 13, 13 girl/eye-iris-back - bounds: 361, 105, 17, 17 + bounds: 949, 148, 17, 17 girl/eye-iris-front - bounds: 507, 106, 18, 18 + bounds: 376, 104, 18, 18 girl/eye-white-back - bounds: 665, 175, 20, 16 + bounds: 667, 175, 20, 16 girl/front-eyebrow - bounds: 343, 91, 18, 12 + bounds: 341, 2, 18, 12 girl/hair-back bounds: 696, 417, 147, 93 girl/hair-bangs @@ -316,9 +321,11 @@ girl/hair-flap-down-front bounds: 415, 171, 70, 65 rotate: 90 girl/hair-head-side-back - bounds: 991, 381, 30, 52 + bounds: 816, 173, 30, 52 + rotate: 90 girl/hair-head-side-front - bounds: 859, 206, 41, 42 + bounds: 953, 204, 41, 42 + rotate: 90 girl/hair-patch bounds: 132, 2, 66, 41 rotate: 90 @@ -343,17 +350,18 @@ girl/hair-strand-front-3 bounds: 313, 124, 44, 81 rotate: 90 girl/hand-front-fingers - bounds: 923, 208, 19, 21 + bounds: 997, 190, 19, 21 girl/hat bounds: 218, 179, 93, 82 girl/leg-front bounds: 831, 349, 30, 158 rotate: 90 girl/pompom - bounds: 416, 126, 48, 43 + bounds: 816, 205, 48, 43 girl/scarf bounds: 113, 264, 119, 51 girl/scarf-back bounds: 502, 252, 72, 51 girl/zip - bounds: 816, 179, 19, 25 + bounds: 997, 226, 19, 25 + rotate: 90 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.png index b286cbfae..adf1599d7 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pro.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pro.json index 1b98ebbed..6f892c16c 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pro.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "tNX0Pe3Kdo0", - "spine": "4.2.22", + "hash": "gedvil/DzIQ", + "spine": "4.3.12-beta", "x": -240.58, "y": -3.38, "width": 410.36, @@ -1039,7 +1039,41 @@ "name": "eye-back-pupil", "order": 12, "bones": [ "eye-back-iris" ], - "target": "eye-back-pupil", + "source": "eye-back-pupil", + "properties": { + "rotate": { + "to": { + "rotate": { "max": 100, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0.4, "mixScaleX": 0, @@ -1049,7 +1083,41 @@ "name": "eye-front-pupil", "order": 11, "bones": [ "eye-front-iris" ], - "target": "eye-front-pupil", + "source": "eye-front-pupil", + "properties": { + "rotate": { + "to": { + "rotate": { "max": 100, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0.4, "mixScaleX": 0, @@ -1059,7 +1127,41 @@ "name": "eye-transform", "order": 7, "bones": [ "features-control" ], - "target": "head-control", + "source": "head-control", + "properties": { + "rotate": { + "to": { + "rotate": { "max": 100, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0.2, "mixScaleX": 0, @@ -1069,10 +1171,43 @@ "name": "hair-side-back", "order": 9, "bones": [ "hair-side-back" ], - "target": "head-back-control", - "rotation": -62.21, + "source": "head-back-control", "x": 132.47, "y": 46.72, + "properties": { + "rotate": { + "to": { + "rotate": { "offset": -62.2, "max": 37.8, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0.05, "mixScaleX": 0, @@ -1082,10 +1217,43 @@ "name": "hair-side-front-control", "order": 8, "bones": [ "hair-side-front" ], - "target": "head-control", - "rotation": -80.89, + "source": "head-control", "x": -102.78, "y": 27.17, + "properties": { + "rotate": { + "to": { + "rotate": { "offset": -80.88, "max": 19.12, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0.15, "mixScaleX": 0, @@ -1096,11 +1264,43 @@ "order": 10, "skin": true, "bones": [ "hat-control" ], - "target": "head-control", - "rotation": 95.63, + "source": "head-control", "x": -78.91, "y": 123.01, - "shearY": -36, + "properties": { + "rotate": { + "to": { + "rotate": { "offset": 95.64, "max": 195.64, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "offset": -36, "max": 64, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0.6, "mixScaleX": 0, @@ -1110,8 +1310,42 @@ "name": "head-control", "order": 6, "bones": [ "head-back-control" ], - "target": "head-control", + "source": "head-control", "x": -88.92, + "properties": { + "rotate": { + "to": { + "rotate": { "max": 100, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": -1, "mixScaleX": 0, @@ -1122,9 +1356,44 @@ "order": 18, "skin": true, "bones": [ "dress-control-foot-back" ], - "target": "leg-down-back", + "source": "leg-down-back", "x": 132.85, "y": 58.02, + "properties": { + "rotate": { + "offset": -92.95, + "to": { + "rotate": { "offset": -92.95, "max": 7.05, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixScaleX": 0, "mixShearY": 0 }, @@ -1133,9 +1402,44 @@ "order": 19, "skin": true, "bones": [ "dress-control-leg-down-back" ], - "target": "leg-down-back", + "source": "leg-down-back", "x": 17.25, "y": 41.79, + "properties": { + "rotate": { + "offset": -92.95, + "to": { + "rotate": { "offset": -92.95, "max": 7.05, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixScaleX": 0, "mixShearY": 0 }, @@ -1144,9 +1448,44 @@ "order": 17, "skin": true, "bones": [ "dress-control-foot-front" ], - "target": "leg-down", + "source": "leg-down", "x": 147.87, "y": -60.85, + "properties": { + "rotate": { + "offset": -98.06, + "to": { + "rotate": { "offset": -98.06, "max": 1.94, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixScaleX": 0, "mixShearY": 0 }, @@ -1155,9 +1494,44 @@ "order": 16, "skin": true, "bones": [ "dress-control-leg-down-front" ], - "target": "leg-down", + "source": "leg-down", "x": 23.51, "y": -48.52, + "properties": { + "rotate": { + "offset": -98.06, + "to": { + "rotate": { "offset": -98.06, "max": 1.94, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixScaleX": 0, "mixShearY": 0 }, @@ -1166,9 +1540,44 @@ "order": 15, "skin": true, "bones": [ "dress-control-leg-up-front" ], - "target": "leg-up", + "source": "leg-up", "x": 130.03, "y": -50.13, + "properties": { + "rotate": { + "offset": -91.9, + "to": { + "rotate": { "offset": -91.9, "max": 8.1, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixScaleX": 0, "mixShearY": 0 }, @@ -1177,9 +1586,44 @@ "order": 14, "skin": true, "bones": [ "dress-control-leg-up-back" ], - "target": "leg-up-back", + "source": "leg-up-back", "x": 129.36, "y": 40.42, + "properties": { + "rotate": { + "offset": -89.47, + "to": { + "rotate": { "offset": -89.47, "max": 10.53, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixScaleX": 0, "mixShearY": 0 }, @@ -1187,10 +1631,44 @@ "name": "shoulder-back", "order": 22, "bones": [ "shoulder-back-transform" ], - "target": "arm-back-up", - "rotation": 180, + "source": "arm-back-up", "x": -14.41, "y": -46.12, + "properties": { + "rotate": { + "offset": -90, + "to": { + "rotate": { "offset": 90, "max": 190, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0.18, "mixX": 0, "mixScaleX": 0, @@ -1200,10 +1678,44 @@ "name": "shoulder-front", "order": 21, "bones": [ "shouder-front-transform" ], - "target": "arm-front-up", - "rotation": 90, + "source": "arm-front-up", "x": -24.78, "y": 29.54, + "properties": { + "rotate": { + "offset": -90, + "to": { + "rotate": { "max": 100, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0.186, "mixX": 0, "mixScaleX": 0, @@ -1214,11 +1726,42 @@ "order": 20, "skin": true, "bones": [ "skirt-control-back" ], - "target": "skirt-rotation-back", - "rotation": 114.82, + "source": "skirt-rotation-back", "x": 148.43, "y": -0.72, - "shearY": -36, + "properties": { + "rotate": { + "to": { + "rotate": { "offset": 114.82, "max": 214.82, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "to": { + "scaleX": { "scale": 1 } + } + }, + "scaleY": { + "to": { + "scaleY": { "scale": 1 } + } + }, + "shearY": { + "offset": -90, + "to": { + "shearY": { "offset": -126, "max": -26, "scale": 1 } + } + } + }, "mixX": 0.7, "mixScaleX": 0, "mixShearY": 0 @@ -1228,11 +1771,42 @@ "order": 13, "skin": true, "bones": [ "skirt-control-front" ], - "target": "skirt-rotation-front", - "rotation": 242.6, + "source": "skirt-rotation-front", "x": 141.99, "y": 2.23, - "shearY": -36, + "properties": { + "rotate": { + "to": { + "rotate": { "offset": 242.6, "max": 342.6, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "to": { + "scaleX": { "scale": 1 } + } + }, + "scaleY": { + "to": { + "scaleY": { "scale": 1 } + } + }, + "shearY": { + "offset": -90, + "to": { + "shearY": { "offset": -126, "max": -26, "scale": 1 } + } + } + }, "mixX": 0.7, "mixScaleX": 0, "mixShearY": 0 @@ -1243,7 +1817,7 @@ "name": "arm-back", "order": 4, "bones": [ "arm-back-up-2", "arm-back-up-3", "arm-back-up-4", "arm-back-up-5", "arm-back-up-6", "arm-back-up-7" ], - "target": "arm-back-path", + "slot": "arm-back-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.1667 @@ -1252,7 +1826,7 @@ "name": "arm-front", "order": 2, "bones": [ "arm-front-up-2", "arm-front-up-6", "arm-front-up-5", "arm-front-up-4", "arm-front-up-3", "arm-front-up-7" ], - "target": "arm-front-path", + "slot": "arm-front-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.1667 @@ -1261,7 +1835,7 @@ "name": "leg-back", "order": 5, "bones": [ "leg-back-8", "leg-back-7", "leg-back-6", "leg-back-5", "leg-back-4", "leg-back-3", "leg-back-2", "leg-back-1" ], - "target": "leg-back-path", + "slot": "leg-back-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.125 @@ -1270,7 +1844,7 @@ "name": "leg-front", "order": 3, "bones": [ "leg-front-1", "leg-front-2", "leg-front-3", "leg-front-4", "leg-front-5", "leg-front-6", "leg-front-7", "leg-front-8" ], - "target": "leg-front-path", + "slot": "leg-front-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.125 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pro.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pro.json index 17fc3ae8a..24a4bf6ce 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pro.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pro.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "PlcXzl8RAT8", - "spine": "4.2.22", + "spine": "4.3.12-beta", "x": -809.16, "y": -73.54, "width": 1287.65, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/sack/sack-pro.skel.bytes b/spine-unity/Assets/Spine Examples/Spine Skeletons/sack/sack-pro.skel.bytes index 831a77301..1de73f448 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/sack/sack-pro.skel.bytes and b/spine-unity/Assets/Spine Examples/Spine Skeletons/sack/sack-pro.skel.bytes differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma.atlas.txt index fda6cd335..d128f9382 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma.atlas.txt +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma.atlas.txt @@ -152,7 +152,7 @@ leg-down-r pupil-l bounds: 51, 2, 32, 32 pupil-r - bounds: 85, 2, 32, 32 + bounds: 939, 859, 32, 32 red-present-decoration bounds: 426, 99, 41, 40 scarf-pompom-l diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_2.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_2.png index a0bfc0869..c0c906544 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_2.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_2.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro.skel.bytes b/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro.skel.bytes index a7a825479..4530d4bfe 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro.skel.bytes and b/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro.skel.bytes differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.json index 64b4b086c..caaeda113 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "a+YTUe6ARJY", - "spine": "4.2.22", + "hash": "CAE47sqQF0s", + "spine": "4.3.12-beta", "x": -190.61, "y": -7.99, "width": 419.76, @@ -368,8 +368,42 @@ "name": "aim-front-arm-transform", "order": 10, "bones": [ "front-upper-arm" ], - "target": "aim-constraint-target", - "rotation": -180, + "source": "aim-constraint-target", + "properties": { + "rotate": { + "offset": 15.95, + "to": { + "rotate": { "offset": -164.05, "max": -64.05, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, @@ -379,8 +413,42 @@ "name": "aim-head-transform", "order": 9, "bones": [ "head" ], - "target": "aim-constraint-target", - "rotation": 84.3, + "source": "aim-constraint-target", + "properties": { + "rotate": { + "offset": 15.95, + "to": { + "rotate": { "offset": 100.25, "max": 200.25, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, @@ -390,9 +458,44 @@ "name": "aim-rear-arm-transform", "order": 11, "bones": [ "rear-upper-arm" ], - "target": "aim-constraint-target", + "source": "aim-constraint-target", "x": 57.7, "y": 56.4, + "properties": { + "rotate": { + "offset": 15.95, + "to": { + "rotate": { "offset": 15.95, "max": 115.95, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, @@ -402,9 +505,42 @@ "name": "aim-torso-transform", "order": 8, "bones": [ "torso" ], - "target": "aim-constraint-target", - "rotation": 69.5, - "shearY": -36, + "source": "aim-constraint-target", + "properties": { + "rotate": { + "offset": 15.95, + "to": { + "rotate": { "offset": 85.45, "max": 185.45, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "offset": -36, "max": 64, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, @@ -414,9 +550,44 @@ "name": "front-foot-board", "order": 1, "bones": [ "front-foot-ik" ], - "target": "hoverboard-controller", + "source": "hoverboard-controller", "x": -69.8, "y": 20.7, + "properties": { + "rotate": { + "offset": 0.07, + "to": { + "rotate": { "offset": 0.07, "max": 100.07, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, @@ -426,9 +597,44 @@ "name": "rear-foot-board", "order": 2, "bones": [ "rear-foot-ik" ], - "target": "hoverboard-controller", + "source": "hoverboard-controller", "x": 86.6, "y": 21.3, + "properties": { + "rotate": { + "offset": 0.07, + "to": { + "rotate": { "offset": 0.07, "max": 100.07, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, @@ -438,7 +644,42 @@ "name": "toes-board", "order": 13, "bones": [ "front-foot-tip", "back-foot-tip" ], - "target": "hoverboard-controller", + "source": "hoverboard-controller", + "properties": { + "rotate": { + "offset": 0.07, + "to": { + "rotate": { "offset": 0.07, "max": 100.07, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy-unity.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy-unity.json index 09f37913c..c12349880 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy-unity.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy-unity.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "XrCABmFcV0A", - "spine": "4.2.22", + "hash": "6J9sKh3pJyY", + "spine": "4.3.12-beta", "x": -221.22, "y": -8.55, "width": 371.09, @@ -204,8 +204,41 @@ "name": "gun2 rotation", "order": 4, "bones": [ "gun2" ], - "target": "gun rotation", - "rotation": 72.7, + "source": "gun rotation", + "properties": { + "rotate": { + "to": { + "rotate": { "offset": 72.7, "max": 172.7, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, @@ -215,8 +248,41 @@ "name": "gun3 rotation", "order": 5, "bones": [ "gun3" ], - "target": "gun rotation", - "rotation": -116.2, + "source": "gun rotation", + "properties": { + "rotate": { + "to": { + "rotate": { "offset": -116.2, "max": -16.2, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, @@ -226,8 +292,41 @@ "name": "gun4 rotation", "order": 6, "bones": [ "gun4" ], - "target": "gun rotation", - "rotation": 166.9, + "source": "gun rotation", + "properties": { + "rotate": { + "to": { + "rotate": { "offset": 166.9, "max": 266.9, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, @@ -237,7 +336,42 @@ "name": "gun flying", "order": 3, "bones": [ "gun" ], - "target": "free gun bone", + "source": "free gun bone", + "properties": { + "rotate": { + "offset": -37.23, + "to": { + "rotate": { "offset": -37.23, "max": 62.77, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixRotate": 0, "mixX": 0, "mixScaleX": 0, @@ -249,7 +383,7 @@ "name": "spinning guns", "order": 2, "bones": [ "gun4", "gun3", "gun2" ], - "target": "gunspath", + "slot": "gunspath", "spacingMode": "percent", "spacing": 0.335, "mixRotate": 0, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.json b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.json index f8f021b2e..1e256c2a7 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.json +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "tfwPbA2MCzE", - "spine": "4.2.22", + "hash": "2y7ACMyctGU", + "spine": "4.3.12-beta", "x": -252.71, "y": -232.55, "width": 456.71, @@ -27,7 +27,41 @@ { "name": "rotation", "bones": [ "additive", "multiply", "normal", "screen" ], - "target": "_rotation", + "source": "_rotation", + "properties": { + "rotate": { + "to": { + "rotate": { "max": 100, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1, + "to": { + "scaleX": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 1, "max": 2, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "max": 100, "scale": 1 } + } + } + }, "mixX": 0, "mixScaleX": 0, "mixShearY": 0 diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataCompatibility.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataCompatibility.cs index e212a093e..3c0ff96bb 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataCompatibility.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataCompatibility.cs @@ -41,8 +41,8 @@ namespace Spine.Unity { public static class SkeletonDataCompatibility { #if UNITY_EDITOR - static readonly int[][] compatibleBinaryVersions = { new[] { 4, 2, 0 } }; - static readonly int[][] compatibleJsonVersions = { new[] { 4, 2, 0 } }; + static readonly int[][] compatibleBinaryVersions = { new[] { 4, 3, 0 } }; + static readonly int[][] compatibleJsonVersions = { new[] { 4, 3, 0 } }; static bool wasVersionDialogShown = false; static readonly Regex jsonVersionRegex = new Regex(@"""spine""\s*:\s*""([^""]+)""", RegexOptions.CultureInvariant); diff --git a/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor-pro.json b/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor-pro.json index 17fc3ae8a..24a4bf6ce 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor-pro.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor-pro.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "PlcXzl8RAT8", - "spine": "4.2.22", + "spine": "4.3.12-beta", "x": -809.16, "y": -73.54, "width": 1287.65, diff --git a/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/StretchymanLWRP/stretchyman.json b/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/StretchymanLWRP/stretchyman.json index 5b8975896..3e3fbb780 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/StretchymanLWRP/stretchyman.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/StretchymanLWRP/stretchyman.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "CNp43FaCQIg", - "spine": "4.2.22", + "hash": "ZqKiK7oBADQ", + "spine": "4.3.12-beta", "x": -100.47, "y": -9.21, "width": 260.65, @@ -418,13 +418,44 @@ "name": "back-foot-position", "order": 8, "bones": [ "back-foot1" ], - "target": "back-leg8", - "rotation": 108.8, + "source": "back-leg8", "x": 41.2, "y": -0.03, - "scaleX": 5.0E-4, - "scaleY": -3.0E-4, - "shearY": 0.1, + "properties": { + "rotate": { + "offset": -103.59, + "to": { + "rotate": { "offset": 5.21, "max": 105.21, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 0.8948, + "to": { + "scaleX": { "offset": 0.8953, "max": 1.8953, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 0.9997, "max": 1.9997, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "offset": 0.1, "max": 100.1, "scale": 1 } + } + } + }, "mixRotate": 0, "mixScaleX": 0 }, @@ -432,13 +463,44 @@ "name": "front-foot-position", "order": 9, "bones": [ "front-foot1" ], - "target": "front-leg8", - "rotation": 101.55, + "source": "front-leg8", "x": 38.92, "y": -0.02, - "scaleX": 4.0E-4, - "scaleY": -3.0E-4, - "shearY": 0.1, + "properties": { + "rotate": { + "offset": -112.09, + "to": { + "rotate": { "offset": -10.54, "max": 89.46, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1.0075, + "to": { + "scaleX": { "offset": 1.0079, "max": 2.0079, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 0.9997, "max": 1.9997, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "offset": 0.1, "max": 100.1, "scale": 1 } + } + } + }, "mixRotate": 0, "mixScaleX": 0 } @@ -448,7 +510,7 @@ "name": "back-arm-path", "order": 7, "bones": [ "back-arm1", "back-arm2", "back-arm3", "back-arm4" ], - "target": "back-arm-path", + "slot": "back-arm-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.25 @@ -457,7 +519,7 @@ "name": "back-leg-path", "order": 4, "bones": [ "back-leg1", "back-leg2", "back-leg3", "back-leg4", "back-leg5", "back-leg6", "back-leg7", "back-leg8" ], - "target": "back-leg-path", + "slot": "back-leg-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.125 @@ -466,7 +528,7 @@ "name": "front-arm-path", "order": 6, "bones": [ "front-arm1", "front-arm2", "front-arm3", "front-arm4" ], - "target": "front-arm-path", + "slot": "front-arm-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.25 @@ -475,7 +537,7 @@ "name": "front-leg-path", "order": 5, "bones": [ "front-leg1", "front-leg2", "front-leg3", "front-leg4", "front-leg5", "front-leg6", "front-leg7", "front-leg8" ], - "target": "front-leg-path", + "slot": "front-leg-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.125 diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/2D/Spine Skeletons/RaptorURP/raptor-pro.json b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/2D/Spine Skeletons/RaptorURP/raptor-pro.json index 17fc3ae8a..24a4bf6ce 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/2D/Spine Skeletons/RaptorURP/raptor-pro.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/2D/Spine Skeletons/RaptorURP/raptor-pro.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "PlcXzl8RAT8", - "spine": "4.2.22", + "spine": "4.3.12-beta", "x": -809.16, "y": -73.54, "width": 1287.65, diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/2D/Spine Skeletons/StretchymanURP/stretchyman.json b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/2D/Spine Skeletons/StretchymanURP/stretchyman.json index 5b8975896..3e3fbb780 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/2D/Spine Skeletons/StretchymanURP/stretchyman.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/2D/Spine Skeletons/StretchymanURP/stretchyman.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "CNp43FaCQIg", - "spine": "4.2.22", + "hash": "ZqKiK7oBADQ", + "spine": "4.3.12-beta", "x": -100.47, "y": -9.21, "width": 260.65, @@ -418,13 +418,44 @@ "name": "back-foot-position", "order": 8, "bones": [ "back-foot1" ], - "target": "back-leg8", - "rotation": 108.8, + "source": "back-leg8", "x": 41.2, "y": -0.03, - "scaleX": 5.0E-4, - "scaleY": -3.0E-4, - "shearY": 0.1, + "properties": { + "rotate": { + "offset": -103.59, + "to": { + "rotate": { "offset": 5.21, "max": 105.21, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 0.8948, + "to": { + "scaleX": { "offset": 0.8953, "max": 1.8953, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 0.9997, "max": 1.9997, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "offset": 0.1, "max": 100.1, "scale": 1 } + } + } + }, "mixRotate": 0, "mixScaleX": 0 }, @@ -432,13 +463,44 @@ "name": "front-foot-position", "order": 9, "bones": [ "front-foot1" ], - "target": "front-leg8", - "rotation": 101.55, + "source": "front-leg8", "x": 38.92, "y": -0.02, - "scaleX": 4.0E-4, - "scaleY": -3.0E-4, - "shearY": 0.1, + "properties": { + "rotate": { + "offset": -112.09, + "to": { + "rotate": { "offset": -10.54, "max": 89.46, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1.0075, + "to": { + "scaleX": { "offset": 1.0079, "max": 2.0079, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 0.9997, "max": 1.9997, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "offset": 0.1, "max": 100.1, "scale": 1 } + } + } + }, "mixRotate": 0, "mixScaleX": 0 } @@ -448,7 +510,7 @@ "name": "back-arm-path", "order": 7, "bones": [ "back-arm1", "back-arm2", "back-arm3", "back-arm4" ], - "target": "back-arm-path", + "slot": "back-arm-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.25 @@ -457,7 +519,7 @@ "name": "back-leg-path", "order": 4, "bones": [ "back-leg1", "back-leg2", "back-leg3", "back-leg4", "back-leg5", "back-leg6", "back-leg7", "back-leg8" ], - "target": "back-leg-path", + "slot": "back-leg-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.125 @@ -466,7 +528,7 @@ "name": "front-arm-path", "order": 6, "bones": [ "front-arm1", "front-arm2", "front-arm3", "front-arm4" ], - "target": "front-arm-path", + "slot": "front-arm-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.25 @@ -475,7 +537,7 @@ "name": "front-leg-path", "order": 5, "bones": [ "front-leg1", "front-leg2", "front-leg3", "front-leg4", "front-leg5", "front-leg6", "front-leg7", "front-leg8" ], - "target": "front-leg-path", + "slot": "front-leg-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.125 diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor-pro.json b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor-pro.json index 17fc3ae8a..24a4bf6ce 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor-pro.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor-pro.json @@ -1,7 +1,7 @@ { "skeleton": { "hash": "PlcXzl8RAT8", - "spine": "4.2.22", + "spine": "4.3.12-beta", "x": -809.16, "y": -73.54, "width": 1287.65, diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/StretchymanURP/stretchyman.json b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/StretchymanURP/stretchyman.json index 5b8975896..3e3fbb780 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/StretchymanURP/stretchyman.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/StretchymanURP/stretchyman.json @@ -1,7 +1,7 @@ { "skeleton": { - "hash": "CNp43FaCQIg", - "spine": "4.2.22", + "hash": "ZqKiK7oBADQ", + "spine": "4.3.12-beta", "x": -100.47, "y": -9.21, "width": 260.65, @@ -418,13 +418,44 @@ "name": "back-foot-position", "order": 8, "bones": [ "back-foot1" ], - "target": "back-leg8", - "rotation": 108.8, + "source": "back-leg8", "x": 41.2, "y": -0.03, - "scaleX": 5.0E-4, - "scaleY": -3.0E-4, - "shearY": 0.1, + "properties": { + "rotate": { + "offset": -103.59, + "to": { + "rotate": { "offset": 5.21, "max": 105.21, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 0.8948, + "to": { + "scaleX": { "offset": 0.8953, "max": 1.8953, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 0.9997, "max": 1.9997, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "offset": 0.1, "max": 100.1, "scale": 1 } + } + } + }, "mixRotate": 0, "mixScaleX": 0 }, @@ -432,13 +463,44 @@ "name": "front-foot-position", "order": 9, "bones": [ "front-foot1" ], - "target": "front-leg8", - "rotation": 101.55, + "source": "front-leg8", "x": 38.92, "y": -0.02, - "scaleX": 4.0E-4, - "scaleY": -3.0E-4, - "shearY": 0.1, + "properties": { + "rotate": { + "offset": -112.09, + "to": { + "rotate": { "offset": -10.54, "max": 89.46, "scale": 1 } + } + }, + "x": { + "to": { + "x": { "max": 100, "scale": 1 } + } + }, + "y": { + "to": { + "y": { "max": 100, "scale": 1 } + } + }, + "scaleX": { + "offset": 1.0075, + "to": { + "scaleX": { "offset": 1.0079, "max": 2.0079, "scale": 1 } + } + }, + "scaleY": { + "offset": 1, + "to": { + "scaleY": { "offset": 0.9997, "max": 1.9997, "scale": 1 } + } + }, + "shearY": { + "to": { + "shearY": { "offset": 0.1, "max": 100.1, "scale": 1 } + } + } + }, "mixRotate": 0, "mixScaleX": 0 } @@ -448,7 +510,7 @@ "name": "back-arm-path", "order": 7, "bones": [ "back-arm1", "back-arm2", "back-arm3", "back-arm4" ], - "target": "back-arm-path", + "slot": "back-arm-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.25 @@ -457,7 +519,7 @@ "name": "back-leg-path", "order": 4, "bones": [ "back-leg1", "back-leg2", "back-leg3", "back-leg4", "back-leg5", "back-leg6", "back-leg7", "back-leg8" ], - "target": "back-leg-path", + "slot": "back-leg-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.125 @@ -466,7 +528,7 @@ "name": "front-arm-path", "order": 6, "bones": [ "front-arm1", "front-arm2", "front-arm3", "front-arm4" ], - "target": "front-arm-path", + "slot": "front-arm-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.25 @@ -475,7 +537,7 @@ "name": "front-leg-path", "order": 5, "bones": [ "front-leg1", "front-leg2", "front-leg3", "front-leg4", "front-leg5", "front-leg6", "front-leg7", "front-leg8" ], - "target": "front-leg-path", + "slot": "front-leg-path", "spacingMode": "percent", "rotateMode": "chainScale", "spacing": 0.125