diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs index d872ab37ed..b823ee6e27 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs @@ -269,7 +269,7 @@ public void SetSkeletonPosition (Vector3 worldPosition) { t.position -= offset; UpdateSpineSkeleton(null); - skeleton.UpdateWorldTransform(); + skeleton.UpdateWorldTransform(Skeleton.Physics.Update); } /// Removes the ragdoll instance and effect from the animated skeleton. diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs index 9cecb3f48f..0a17e01a78 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs @@ -281,7 +281,7 @@ public void SetSkeletonPosition (Vector3 worldPosition) { t.position -= offset; UpdateSpineSkeleton(null); - skeleton.UpdateWorldTransform(); + skeleton.UpdateWorldTransform(Skeleton.Physics.Update); } /// Removes the ragdoll instance and effect from the animated skeleton. diff --git a/spine-unity/Assets/Spine Examples/Scripts/SpineGauge.cs b/spine-unity/Assets/Spine Examples/Scripts/SpineGauge.cs index 194743bba9..06baf1ce21 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/SpineGauge.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/SpineGauge.cs @@ -56,7 +56,7 @@ public void SetGaugePercent (float percent) { Skeleton skeleton = skeletonRenderer.skeleton; if (skeleton == null) return; fillAnimation.Animation.Apply(skeleton, 0, percent, false, null, 1f, MixBlend.Setup, MixDirection.In); - skeleton.UpdateWorldTransform(); + skeleton.UpdateWorldTransform(Skeleton.Physics.Update); } } 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 d90845f5fc..805630d88e 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 @@ -2,128 +2,116 @@ dragon.png size: 1024, 1024 filter: Linear, Linear pma: true -back - bounds: 564, 534, 190, 185 -chest - bounds: 2, 645, 136, 122 -chin - bounds: 140, 619, 214, 146 front-toe-a - bounds: 2, 862, 29, 50 - rotate: 90 + bounds: 797, 381, 29, 50 front-toe-b - bounds: 467, 835, 56, 57 - rotate: 90 + bounds: 942, 118, 56, 57 head - bounds: 756, 398, 296, 260 + bounds: 647, 81, 296, 260 rotate: 90 left-front-leg - bounds: 599, 834, 84, 57 -left-front-thigh - bounds: 782, 819, 84, 72 -left-rear-leg - bounds: 356, 558, 206, 177 -left-rear-thigh - bounds: 216, 767, 91, 149 + bounds: 942, 250, 84, 57 rotate: 90 +left-front-thigh + bounds: 852, 7, 84, 72 left-wing01 - bounds: 2, 268, 264, 589 - rotate: 90 -left-wing02 - bounds: 2, 2, 264, 589 - rotate: 90 -right-front-leg - bounds: 113, 769, 101, 89 -right-front-thigh - bounds: 758, 709, 108, 108 -right-rear-leg - bounds: 640, 721, 116, 100 -right-rear-thigh - bounds: 367, 742, 91, 149 - rotate: 90 + bounds: 736, 433, 264, 589 right-rear-toe - bounds: 2, 781, 109, 77 -tail01 - bounds: 868, 696, 120, 153 - rotate: 90 -tail02 - bounds: 518, 737, 95, 120 + bounds: 647, 2, 109, 77 +right-wing01 + bounds: 2, 379, 365, 643 +right-wing02 + bounds: 369, 379, 365, 643 +right-wing03 + bounds: 2, 12, 365, 643 rotate: 90 tail03 - bounds: 868, 818, 73, 92 + bounds: 758, 6, 73, 92 rotate: 90 tail04 - bounds: 526, 835, 56, 71 - rotate: 90 + bounds: 942, 177, 56, 71 tail05 - bounds: 406, 839, 52, 59 + bounds: 736, 379, 52, 59 rotate: 90 tail06 - bounds: 685, 823, 95, 68 + bounds: 942, 336, 95, 68 + rotate: 90 thiagobrayner - bounds: 54, 860, 350, 31 + bounds: 909, 81, 350, 31 + rotate: 90 dragon2.png size: 1024, 1024 filter: Linear, Linear pma: true -left-wing03 - bounds: 2, 534, 264, 589 +back + bounds: 795, 32, 190, 185 +chin + bounds: 647, 157, 214, 146 rotate: 90 -left-wing04 - bounds: 2, 268, 264, 589 +left-rear-leg + bounds: 795, 219, 206, 177 rotate: 90 -left-wing05 - bounds: 593, 209, 264, 589 -left-wing06 - bounds: 2, 2, 264, 589 +left-wing02 + bounds: 736, 427, 264, 589 +right-wing04 + bounds: 2, 373, 365, 643 +right-wing05 + bounds: 369, 373, 365, 643 +right-wing06 + bounds: 2, 6, 365, 643 rotate: 90 +tail01 + bounds: 647, 2, 120, 153 dragon3.png size: 1024, 1024 filter: Linear, Linear pma: true -left-wing07 - bounds: 2, 694, 264, 589 - rotate: 90 -left-wing08 - bounds: 2, 428, 264, 589 - rotate: 90 -left-wing09 - bounds: 593, 369, 264, 589 -right-wing01 - bounds: 2, 2, 365, 643 +chest + bounds: 740, 299, 136, 122 +left-rear-thigh + bounds: 647, 218, 91, 149 +left-wing03 + bounds: 736, 423, 264, 589 +right-front-leg + bounds: 850, 196, 101, 89 rotate: 90 - -dragon4.png - size: 1024, 1024 - filter: Linear, Linear - pma: true -right-wing02 +right-front-thigh + bounds: 740, 189, 108, 108 +right-rear-leg + bounds: 878, 321, 116, 100 +right-rear-thigh + bounds: 647, 67, 91, 149 +right-wing07 bounds: 2, 369, 365, 643 -right-wing03 +right-wing08 bounds: 369, 369, 365, 643 -right-wing04 +right-wing09 bounds: 2, 2, 365, 643 rotate: 90 +tail02 + bounds: 740, 67, 95, 120 -dragon5.png +dragon4.png size: 1024, 1024 filter: Linear, Linear pma: true -right-wing05 - bounds: 2, 369, 365, 643 -right-wing06 - bounds: 369, 369, 365, 643 -right-wing07 - bounds: 2, 2, 365, 643 +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 rotate: 90 -dragon6.png +dragon5.png size: 1024, 1024 filter: Linear, Linear pma: true -right-wing08 - bounds: 2, 2, 365, 643 -right-wing09 - bounds: 369, 2, 365, 643 +left-wing08 + bounds: 2, 2, 264, 589 +left-wing09 + bounds: 268, 2, 264, 589 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 7c16610d73..119737bf42 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": "aPoA1GjXkVI", - "spine": "4.1.23-beta", + "hash": "XM8KoDHOBqA", + "spine": "4.2.05-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 bc49bf9784..ec9e893905 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 084bc5e931..6c025cb8e7 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 17276d4e63..42d87958e3 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 f0b9d721b4..11283aad56 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/Dragon/dragon5.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon5.png index f98942cba3..4aba3a6d33 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon5.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon5.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon6.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon6.png deleted file mode 100644 index ebbfe9285a..0000000000 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon6.png and /dev/null differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon6.png.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon6.png.meta deleted file mode 100644 index e2591f8fc4..0000000000 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon6.png.meta +++ /dev/null @@ -1,108 +0,0 @@ -fileFormatVersion: 2 -guid: a87fe78b999f42f459397732f7c75303 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_Atlas.asset index de8ead202c..fac6ecbd80 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_Atlas.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_Atlas.asset @@ -3,15 +3,21 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} m_Name: dragon_Atlas m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: 40ca8efa87a2fae4a9de6fa585dc6b4b, type: 3} materials: - {fileID: 2100000, guid: 3277fd5561d95724e83c6ca4a1dd28a4, type: 2} - {fileID: 2100000, guid: d58543c96f991934ca874395eb40222c, type: 2} + - {fileID: 2100000, guid: 46ebf60e37c48414f90b2f53f8ce4ea0, type: 2} + - {fileID: 2100000, guid: 1cb51a81cfe737549beec4fdb1f16360, type: 2} + - {fileID: 2100000, guid: bd1fb273f898c1e4482466fbdfdbd01e, type: 2} diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon6.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon6.mat deleted file mode 100644 index b3bd56da23..0000000000 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon6.mat +++ /dev/null @@ -1,39 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: dragon_dragon6 - m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: a87fe78b999f42f459397732f7c75303, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _Cutoff: 0.1 - - _OutlineMipLevel: 0 - - _OutlineReferenceTexWidth: 1024 - - _OutlineSmoothness: 1 - - _OutlineWidth: 3 - - _StencilComp: 8 - - _StencilRef: 1 - - _StraightAlphaInput: 0 - - _ThresholdEnd: 0.25 - - _Use8Neighbourhood: 1 - m_Colors: - - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon6.mat.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon6.mat.meta deleted file mode 100644 index b6a32bc214..0000000000 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon6.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: df19a30178772d14895780e0cbd7c25c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.atlas.txt index 6d82750d94..d5004c0c69 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.atlas.txt +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.atlas.txt @@ -3,10 +3,10 @@ eyes.png filter: Linear, Linear pma: true EyeLines - bounds: 2, 2, 868, 322 + bounds: 2, 152, 868, 322 EyeWhite - bounds: 2, 326, 700, 148 + bounds: 2, 2, 700, 148 L_Eye - bounds: 704, 326, 148, 148 + bounds: 872, 326, 148, 148 R_Eye - bounds: 704, 326, 148, 148 + bounds: 872, 326, 148, 148 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 56a3086b9b..c5beabdc6a 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": "3Ru4PsHnfWE", - "spine": "4.1.23-beta", + "hash": "MqOKmU/lus4", + "spine": "4.2.05-beta", "x": -434, "y": -133, "width": 868, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.png index b8aa51f358..02459133ee 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Atlas.asset index ca81907baa..d08232bcce 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Atlas.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Atlas.asset @@ -3,14 +3,17 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} m_Name: eyes_Atlas m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: d2899150110e7384badaef80d9f784ee, type: 3} materials: - {fileID: 2100000, guid: 4f9d106a1e4d45b468b980311947a225, type: 2} diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png index dec75bc50e..9ef97aa05a 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Atlas.asset index 90776f83d9..f8dcc498c2 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Atlas.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Atlas.asset @@ -3,14 +3,17 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} m_Name: FS_White_Atlas m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: 5ca7c05342912804eb0a2fd5bbe85b58, type: 3} materials: - {fileID: 2100000, guid: 5a3598dafa118754db95756064347da7, type: 2} 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 7dd4077a4f..ef54fde40f 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": "RGdJecpcnMU", - "spine": "4.1.23-beta", + "hash": "6GSD+PnD2mk", + "spine": "4.2.05-beta", "x": -79.83, "y": -0.99, "width": 147.64, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.atlas.txt index 0178a65694..2bfd8f01e8 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.atlas.txt +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.atlas.txt @@ -1,10 +1,10 @@ Gauge.png - size: 512, 128 + size: 1024, 64 filter: Linear, Linear pma: true Background - bounds: 254, 36, 224, 32 + bounds: 254, 30, 224, 32 Bar - bounds: 254, 2, 224, 32 + bounds: 480, 30, 224, 32 Border - bounds: 2, 8, 250, 60 + bounds: 2, 2, 250, 60 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 c3f838910b..10f12e468e 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": "Sz0QhWD6Eyg", - "spine": "4.1.23-beta", + "hash": "sz5bbdk7yj4", + "spine": "4.2.05-beta", "x": -125, "y": -30, "width": 250, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.png index 083750f93e..3ed43f6c8f 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Atlas.asset index 9c786b0f6a..753a0008d3 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Atlas.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Atlas.asset @@ -3,14 +3,17 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} m_Name: Gauge_Atlas m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: 6afa4952627478a44995c3cdf2e96a24, type: 3} materials: - {fileID: 2100000, guid: 9ab9bdbda020b3e46b5a3b0558ef591d, type: 2} 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 144797b51a..2335b650eb 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 @@ -3,95 +3,100 @@ goblins.png filter: Linear, Linear pma: true dagger - bounds: 2, 18, 26, 108 + bounds: 372, 100, 26, 108 + rotate: 90 goblin/eyes-closed - bounds: 2, 4, 34, 12 + bounds: 2, 7, 34, 12 goblin/head - bounds: 113, 23, 103, 66 - rotate: 90 + bounds: 107, 36, 103, 66 goblin/left-arm - bounds: 937, 89, 37, 35 - rotate: 90 + bounds: 901, 56, 37, 35 goblin/left-foot - bounds: 609, 61, 65, 31 - rotate: 90 + bounds: 929, 95, 65, 31 goblin/left-hand - bounds: 840, 21, 36, 41 + bounds: 452, 2, 36, 41 goblin/left-lower-leg - bounds: 504, 56, 33, 70 + bounds: 713, 93, 33, 70 + rotate: 90 goblin/left-shoulder - bounds: 745, 17, 29, 44 + bounds: 610, 44, 29, 44 goblin/left-upper-leg - bounds: 397, 53, 33, 73 + bounds: 638, 93, 33, 73 + rotate: 90 goblin/neck - bounds: 862, 85, 36, 41 + bounds: 490, 2, 36, 41 goblin/pelvis - bounds: 776, 18, 62, 43 + bounds: 482, 45, 62, 43 goblin/right-arm - bounds: 181, 5, 23, 50 + bounds: 690, 2, 23, 50 rotate: 90 goblin/right-foot - bounds: 747, 63, 63, 33 - rotate: 90 + bounds: 771, 58, 63, 33 goblin/right-hand - bounds: 878, 3, 36, 37 + bounds: 940, 56, 36, 37 goblin/right-lower-leg - bounds: 321, 50, 36, 76 + bounds: 482, 90, 36, 76 + rotate: 90 goblin/right-shoulder - bounds: 663, 14, 39, 45 + bounds: 602, 3, 39, 45 + rotate: 90 goblin/right-upper-leg - bounds: 675, 63, 34, 63 + bounds: 641, 57, 34, 63 + rotate: 90 goblin/torso - bounds: 181, 30, 68, 96 + bounds: 212, 34, 68, 96 + rotate: 90 goblin/undie-straps - bounds: 38, 2, 55, 19 + bounds: 380, 5, 55, 19 goblin/undies - bounds: 974, 97, 36, 29 + bounds: 174, 5, 36, 29 goblingirl/eyes-closed - bounds: 397, 30, 37, 21 + bounds: 269, 11, 37, 21 goblingirl/head - bounds: 30, 23, 103, 81 - rotate: 90 + bounds: 2, 21, 103, 81 goblingirl/left-arm - bounds: 916, 8, 37, 35 + bounds: 978, 56, 37, 35 rotate: 90 goblingirl/left-foot - bounds: 642, 61, 65, 31 - rotate: 90 + bounds: 107, 3, 65, 31 goblingirl/left-hand - bounds: 900, 86, 35, 40 + bounds: 565, 2, 35, 40 goblingirl/left-lower-leg - bounds: 539, 56, 33, 70 + bounds: 785, 93, 33, 70 + rotate: 90 goblingirl/left-shoulder - bounds: 633, 13, 28, 46 + bounds: 690, 27, 28, 46 + rotate: 90 goblingirl/left-upper-leg - bounds: 574, 56, 33, 70 + bounds: 857, 93, 33, 70 + rotate: 90 goblingirl/neck - bounds: 878, 42, 35, 41 + bounds: 528, 2, 35, 41 goblingirl/pelvis - bounds: 817, 64, 62, 43 - rotate: 90 + bounds: 546, 45, 62, 43 goblingirl/right-arm - bounds: 603, 4, 28, 50 + bounds: 452, 48, 28, 50 goblingirl/right-foot - bounds: 782, 63, 63, 33 - rotate: 90 + bounds: 836, 58, 63, 33 goblingirl/right-hand - bounds: 915, 47, 36, 37 + bounds: 771, 20, 36, 37 + rotate: 90 goblingirl/right-lower-leg - bounds: 359, 50, 36, 76 + bounds: 560, 90, 36, 76 + rotate: 90 goblingirl/right-shoulder - bounds: 704, 16, 39, 45 + bounds: 649, 10, 39, 45 goblingirl/right-upper-leg - bounds: 711, 63, 34, 63 + bounds: 706, 57, 34, 63 + rotate: 90 goblingirl/torso - bounds: 251, 30, 68, 96 + bounds: 310, 2, 68, 96 goblingirl/undie-straps - bounds: 95, 2, 55, 19 + bounds: 212, 13, 55, 19 goblingirl/undies - bounds: 974, 66, 36, 29 + bounds: 810, 27, 36, 29 shield - bounds: 432, 54, 70, 72 + bounds: 380, 26, 70, 72 spear - bounds: 233, 6, 22, 368 + bounds: 2, 104, 22, 368 rotate: 90 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 6caf03bb07..669d2433f1 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": "CdaHvXeCMjE", - "spine": "4.1.23-beta", + "hash": "L5SRKBSWP5U", + "spine": "4.2.05-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 f0a5b6ce39..4b9f623d7f 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/Goblins/goblins_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Atlas.asset index 6f377a39e9..72a32e4960 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Atlas.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Atlas.asset @@ -3,14 +3,17 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} m_Name: goblins_Atlas m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: 179f09b47e5402545a1aa69bf5cb2cba, type: 3} materials: - {fileID: 2100000, guid: 54091ef934c41eb4192f72bfd8e3bcc9, type: 2} diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.atlas.txt index 6a4f23ce59..d2ffe75673 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.atlas.txt +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.atlas.txt @@ -3,59 +3,58 @@ hero-pro.png filter: Linear, Linear pma: true body - bounds: 452, 157, 97, 95 - rotate: 90 + bounds: 324, 88, 97, 95 cape - bounds: 247, 95, 146, 159 + bounds: 176, 95, 146, 159 chain-ball - bounds: 241, 11, 64, 68 + bounds: 423, 115, 64, 68 chain-flat - bounds: 241, 4, 16, 5 + bounds: 2, 2, 16, 5 chain-round - bounds: 307, 10, 17, 14 - rotate: 90 + bounds: 423, 99, 17, 14 eyes - bounds: 68, 5, 82, 31 + bounds: 678, 223, 82, 31 fingers - bounds: 2, 3, 31, 33 + bounds: 948, 221, 31, 33 foot1 - bounds: 483, 2, 50, 42 + bounds: 762, 212, 50, 42 foot2 - bounds: 185, 41, 53, 38 + bounds: 140, 26, 53, 38 + rotate: 90 forearm1 - bounds: 73, 38, 41, 49 + bounds: 814, 213, 41, 49 rotate: 90 forearm2 - bounds: 35, 4, 31, 32 + bounds: 981, 222, 31, 32 hand1 - bounds: 191, 2, 37, 48 + bounds: 865, 217, 37, 48 rotate: 90 hand2 - bounds: 152, 7, 31, 37 - rotate: 90 + bounds: 915, 217, 31, 37 handle - bounds: 323, 13, 134, 14 + bounds: 542, 240, 134, 14 head - bounds: 73, 81, 172, 173 + bounds: 2, 81, 172, 173 mantles - bounds: 395, 118, 136, 55 - rotate: 90 + bounds: 2, 24, 136, 55 mouth - bounds: 395, 103, 61, 13 + bounds: 2, 9, 61, 13 shin1 - bounds: 428, 44, 53, 57 -shin2 - bounds: 458, 104, 51, 54 + bounds: 542, 126, 53, 57 rotate: 90 +shin2 + bounds: 489, 129, 51, 54 sword - bounds: 2, 38, 216, 69 - rotate: 90 + bounds: 324, 185, 216, 69 thigh1 - bounds: 366, 30, 60, 63 + bounds: 608, 178, 60, 63 + rotate: 90 thigh2 - bounds: 307, 29, 57, 64 + bounds: 542, 181, 57, 64 + rotate: 90 upper-arm1 - bounds: 483, 46, 50, 56 + bounds: 601, 126, 50, 56 + rotate: 90 upper-arm2 - bounds: 124, 40, 39, 59 + bounds: 673, 182, 39, 59 rotate: 90 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 b33c61fdbc..83d6fcb40d 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": "iMg/Nef4GhU", - "spine": "4.1.23-beta", + "hash": "BqLF1o63bbo", + "spine": "4.2.05-beta", "x": -85.7, "y": -0.02, "width": 321.77, @@ -309,7 +309,7 @@ }, { "name": "weapon/morningstar", - "bones": [ "chain4", "weapon-morningstar-physics2", "weapon-morningstar-physics1", "weapon-morningstar-physics3", "chain8", "chain1", "chain6", "weapon-morningstar", "chain5", "chain7", "weapon-morningstar-physics4", "chain2", "chain3" ], + "bones": [ "chain8", "chain1", "weapon-morningstar-physics2", "chain4", "weapon-morningstar-physics3", "chain5", "weapon-morningstar-physics4", "chain2", "chain3", "weapon-morningstar", "weapon-morningstar-physics1", "chain6", "chain7" ], "path": [ "weapon-morningstar" ] }, { diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.png index c506a0a45d..6f5319f413 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Atlas.asset index fb0687f7ae..b390d9bd28 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Atlas.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Atlas.asset @@ -3,14 +3,17 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} m_Name: hero-pro_Atlas m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: d7e3bd7e6f971cb428513ebf424e0846, type: 3} materials: - {fileID: 2100000, guid: 9aa2023c2c91b254f9cb0a4fba19af00, type: 2} diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.atlas.txt index 792c6867e1..e544488158 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.atlas.txt +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.atlas.txt @@ -3,14 +3,11 @@ Raggedy Spineboy.png filter: Linear, Linear pma: true arm - bounds: 2, 140, 71, 75 - rotate: 90 + bounds: 140, 178, 71, 75 head - bounds: 2, 2, 136, 187 - rotate: 90 + bounds: 2, 66, 136, 187 leg - bounds: 2, 213, 36, 99 - rotate: 90 + bounds: 140, 77, 36, 99 torso - bounds: 103, 187, 62, 95 + bounds: 2, 2, 62, 95 rotate: 90 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png index 337fbc5a23..de5b3f872b 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Atlas.asset index a5a9288523..604be59896 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Atlas.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Atlas.asset @@ -3,14 +3,17 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} m_Name: Raggedy Spineboy_Atlas m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: bdfc7a081d52b68499e44aa82689a73d, type: 3} materials: - {fileID: 2100000, guid: 4ad4f7167d4983147ad870f93ebc9416, type: 2} 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 ece22dd22d..e300ef077e 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": "ukmbgK+14T0", - "spine": "4.1.23-beta", + "hash": "y7rWjT0Whbg", + "spine": "4.2.05-beta", "x": -78.45, "y": -9.66, "width": 157.48, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.atlas.txt index 0d9fb8ba36..8a7f85da80 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.atlas.txt +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.atlas.txt @@ -3,91 +3,84 @@ raptor.png filter: Linear, Linear pma: true back_arm - bounds: 827, 536, 46, 29 - rotate: 90 + bounds: 410, 545, 46, 29 back_bracer - bounds: 710, 490, 39, 28 - rotate: 90 + bounds: 540, 548, 39, 28 back_hand - bounds: 741, 520, 36, 34 + bounds: 504, 538, 36, 34 + rotate: 90 back_knee - bounds: 560, 668, 49, 67 + bounds: 299, 478, 49, 67 back_thigh - bounds: 779, 530, 39, 24 + bounds: 140, 247, 39, 24 + rotate: 90 eyes_open - bounds: 953, 499, 47, 45 -front_arm - bounds: 831, 633, 48, 30 + bounds: 2, 2, 47, 45 rotate: 90 +front_arm + bounds: 360, 544, 48, 30 front_bracer - bounds: 710, 531, 41, 29 - rotate: 90 + bounds: 538, 578, 41, 29 front_hand - bounds: 831, 729, 41, 38 - rotate: 90 + bounds: 538, 609, 41, 38 front_open_hand - bounds: 543, 499, 43, 44 - rotate: 90 + bounds: 894, 782, 43, 44 front_thigh - bounds: 831, 772, 57, 29 - rotate: 90 + bounds: 942, 849, 57, 29 gun - bounds: 382, 553, 107, 103 + bounds: 785, 774, 107, 103 gun_nohand - bounds: 603, 470, 105, 102 + bounds: 614, 703, 105, 102 head - bounds: 873, 731, 136, 149 - rotate: 90 + bounds: 2, 137, 136, 149 lower_leg - bounds: 858, 447, 73, 98 + bounds: 780, 699, 73, 98 + rotate: 90 mouth_smile - bounds: 827, 584, 47, 30 + bounds: 49, 2, 47, 30 rotate: 90 neck - bounds: 933, 524, 18, 21 -raptor_arm_back - bounds: 933, 415, 82, 86 + bounds: 1001, 860, 18, 21 rotate: 90 +raptor_arm_back + bounds: 940, 936, 82, 86 raptor_body bounds: 2, 737, 610, 285 raptor_front_arm - bounds: 744, 556, 81, 102 -raptor_front_leg - bounds: 614, 831, 191, 257 + bounds: 195, 464, 81, 102 rotate: 90 +raptor_front_leg + bounds: 2, 478, 191, 257 raptor_hindleg_back - bounds: 614, 660, 169, 215 - rotate: 90 + bounds: 614, 807, 169, 215 raptor_horn - bounds: 871, 547, 182, 80 - rotate: 90 + bounds: 360, 655, 182, 80 raptor_horn_back - bounds: 382, 658, 176, 77 + bounds: 360, 576, 176, 77 raptor_jaw - bounds: 873, 869, 153, 143 - rotate: 90 + bounds: 785, 879, 153, 143 raptor_saddle_noshadow - bounds: 2, 572, 163, 188 - rotate: 90 + bounds: 2, 288, 163, 188 raptor_saddle_strap_front - bounds: 953, 546, 57, 95 + bounds: 721, 710, 57, 95 raptor_saddle_strap_rear - bounds: 547, 544, 54, 74 -raptor_saddle_w_shadow - bounds: 192, 572, 163, 188 + bounds: 940, 880, 54, 74 rotate: 90 +raptor_saddle_w_shadow + bounds: 195, 547, 163, 188 raptor_tongue - bounds: 953, 643, 86, 64 + bounds: 544, 649, 86, 64 rotate: 90 stirrup_back - bounds: 831, 683, 44, 35 - rotate: 90 + bounds: 458, 539, 44, 35 stirrup_front - bounds: 491, 518, 45, 50 + bounds: 81, 4, 45, 50 rotate: 90 stirrup_strap - bounds: 560, 620, 49, 46 + bounds: 894, 828, 49, 46 + rotate: 90 torso - bounds: 491, 565, 54, 91 + bounds: 610, 647, 54, 91 + rotate: 90 visor - bounds: 611, 574, 131, 84 + bounds: 2, 51, 131, 84 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 39a4977cbf..ea3fd2c55e 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": "8C0Q8jcbsuI", - "spine": "4.1.23-beta", + "hash": "nEth/W2iqq8", + "spine": "4.2.05-beta", "x": -402.84, "y": -35.99, "width": 611.87, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.png index 0b070ffab1..f4aec155f1 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Atlas.asset index 49b6a02f96..883fd58d25 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Atlas.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Atlas.asset @@ -3,14 +3,17 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} m_Name: raptor_Atlas m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: ddbc971619ecba3499f4bcd61c741053, type: 3} materials: - {fileID: 2100000, guid: 4e2feebfcaa26a54ab19f1ff3e0eae35, type: 2} 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 be97844cd7..fa52cd6461 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 @@ -3,95 +3,93 @@ Doi.png filter: Linear, Linear pma: true armL - bounds: 2, 5, 163, 133 - rotate: 90 + bounds: 2, 36, 163, 133 armR - bounds: 425, 82, 133, 109 -arrow - bounds: 414, 12, 64, 85 + bounds: 167, 36, 133, 109 rotate: 90 +arrow + bounds: 609, 334, 64, 85 body - bounds: 2, 170, 274, 339 + bounds: 2, 171, 274, 339 bootR - bounds: 456, 198, 91, 84 + bounds: 783, 426, 91, 84 browL - bounds: 610, 94, 40, 22 - rotate: 90 + bounds: 126, 12, 40, 22 browR - bounds: 629, 60, 32, 25 + bounds: 2, 2, 32, 25 rotate: 90 eyelids closed - bounds: 137, 76, 183, 92 + bounds: 278, 191, 183, 92 eyelids open - bounds: 278, 193, 176, 89 + bounds: 502, 421, 176, 89 hairL - bounds: 652, 449, 54, 60 + bounds: 548, 239, 54, 60 hairL2 - bounds: 587, 313, 71, 76 + bounds: 385, 49, 71, 76 hairM - bounds: 501, 3, 96, 77 + bounds: 876, 433, 96, 77 hairM blob - bounds: 609, 394, 30, 45 + bounds: 29, 4, 30, 45 rotate: 90 hairM blobS - bounds: 298, 171, 16, 20 + bounds: 448, 146, 16, 20 hairR - bounds: 609, 426, 41, 83 + bounds: 974, 427, 41, 83 hairR2 - bounds: 322, 78, 94, 101 + bounds: 680, 416, 94, 101 rotate: 90 hairSide - bounds: 560, 88, 48, 24 + bounds: 76, 10, 48, 24 head - bounds: 278, 284, 222, 225 + bounds: 278, 285, 222, 225 indexL - bounds: 624, 174, 24, 36 + bounds: 640, 260, 24, 36 indexR - bounds: 599, 13, 34, 28 - rotate: 90 + bounds: 207, 6, 34, 28 inmouth - bounds: 656, 392, 46, 55 + bounds: 548, 191, 46, 55 + rotate: 90 irisL - bounds: 560, 163, 34, 47 + bounds: 609, 298, 34, 47 + rotate: 90 irisL flatspec - bounds: 358, 181, 19, 10 + bounds: 278, 41, 19, 10 irisL spec - bounds: 278, 170, 18, 21 + bounds: 448, 168, 18, 21 irisR - bounds: 560, 114, 34, 47 + bounds: 604, 249, 34, 47 irisR flatspec - bounds: 334, 180, 22, 11 + bounds: 502, 288, 22, 11 irisR spec - bounds: 316, 174, 16, 17 + bounds: 448, 127, 16, 17 middleL - bounds: 596, 174, 26, 36 + bounds: 243, 8, 26, 36 + rotate: 90 middleR - bounds: 623, 138, 34, 26 + bounds: 766, 342, 34, 26 rotate: 90 mouth - bounds: 502, 300, 89, 83 - rotate: 90 + bounds: 675, 331, 89, 83 nose - bounds: 379, 180, 11, 10 - rotate: 90 + bounds: 658, 322, 11, 10 pinkyL - bounds: 629, 31, 24, 27 + bounds: 605, 191, 24, 27 + rotate: 90 pony1 - bounds: 307, 2, 72, 105 + bounds: 278, 53, 72, 105 rotate: 90 pony2 - bounds: 549, 212, 86, 83 + bounds: 463, 197, 86, 83 rotate: 90 ringL - bounds: 634, 106, 26, 30 + bounds: 605, 217, 26, 30 rotate - bounds: 502, 391, 105, 118 + bounds: 502, 301, 105, 118 strap - bounds: 137, 12, 62, 168 + bounds: 278, 127, 62, 168 rotate: 90 thumbL - bounds: 599, 49, 37, 28 - rotate: 90 + bounds: 168, 6, 37, 28 thumbR - bounds: 596, 136, 36, 25 + bounds: 766, 378, 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 bbf62c09c9..dc94f30ae6 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": "8oWe7nDoZEk", - "spine": "4.1.23-beta", + "hash": "pZ6HMBCwhMs", + "spine": "4.2.05-beta", "x": -214.04, "y": -80.91, "width": 519.95, 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 523a161fb0..c697bb1a4c 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/Spineunitygirl/Doi_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Atlas.asset index 8546d47cc4..5d695282c0 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Atlas.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Atlas.asset @@ -3,14 +3,17 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} m_Name: Doi_Atlas m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: a99a92edb8383b244b4fcf3babe8ebae, type: 3} materials: - {fileID: 2100000, guid: 2745674eb28031e499ac70ef825b153e, type: 2} diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Atlas.asset index bcf2de1bad..835776a526 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Atlas.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Atlas.asset @@ -3,14 +3,17 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} m_Name: stretchyman-diffuse-pma_Atlas m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: 492ecfd45cd2de542bc20043b10ee4aa, type: 3} materials: - {fileID: 2100000, guid: 824cfb62bcbe3db49a3ce6db7e3757d1, type: 2} 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 006f2d5a84..2fe9bacd2c 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": "QqiPXGOfONE", - "spine": "4.1.23-beta", + "hash": "ZCd/c3RDCPk", + "spine": "4.2.05-beta", "x": -100.47, "y": -9.21, "width": 260.65, @@ -11,7 +11,7 @@ }, "bones": [ { "name": "root" }, - { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff" }, + { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff", "icon": "ik" }, { "name": "hip", "parent": "root", "x": 28.61, "y": 289.9, "color": "ffbd00ff" }, { "name": "spine1", @@ -117,7 +117,7 @@ "transform": "noScale", "color": "ff0000ff" }, - { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff" }, + { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg-ik1", "parent": "hip", @@ -202,7 +202,7 @@ }, { "name": "belly", "parent": "spine1", "x": 35.94, "y": -37.69, "color": "ffbd00ff" }, { "name": "butt", "parent": "hip", "x": -32.67, "y": -1.88, "color": "ffbd00ff" }, - { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff" }, + { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-arm-ik1", "parent": "spine4", @@ -263,7 +263,7 @@ }, { "name": "front-foot2", "parent": "front-foot1", "length": 29.12, "rotation": 9.61, "x": 26.3, "color": "50ff00ff" }, { "name": "front-foot3", "parent": "front-foot2", "length": 23.49, "rotation": 8.91, "x": 29.12, "color": "50ff00ff" }, - { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff" }, + { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg-ik1", "parent": "hip", @@ -489,7 +489,7 @@ "back-arm": { "type": "mesh", "uvs": [ 0.74522, 0.00989, 0.64111, 0.05762, 0.56303, 0.1559, 0.42509, 0.25886, 0.28974, 0.359, 0.22988, 0.49565, 0.21166, 0.60797, 0.21166, 0.69782, 0.16481, 0.78674, 0.14139, 0.84757, 0.02427, 0.88501, 0.0529, 0.91871, 0.37824, 0.98797, 0.60468, 0.98235, 0.6307, 0.9056, 0.73481, 0.87752, 0.63591, 0.81762, 0.55262, 0.74181, 0.38084, 0.69876, 0.37824, 0.60797, 0.39906, 0.50876, 0.51358, 0.38521, 0.66194, 0.28881, 0.85454, 0.18398, 0.97687, 0.07541, 0.9144, 0.00989 ], - "triangles": [ 11, 9, 12, 9, 8, 12, 12, 8, 18, 13, 12, 14, 12, 18, 17, 18, 8, 7, 14, 12, 17, 11, 10, 9, 14, 16, 15, 14, 17, 16, 7, 19, 18, 7, 6, 19, 6, 5, 19, 19, 5, 20, 5, 4, 20, 20, 4, 21, 4, 3, 21, 21, 3, 22, 3, 2, 22, 22, 2, 23, 2, 1, 23, 23, 1, 24, 1, 0, 24, 0, 25, 24 ], + "triangles": [ 14, 17, 16, 14, 16, 15, 11, 10, 9, 14, 12, 17, 18, 8, 7, 12, 18, 17, 13, 12, 14, 12, 8, 18, 9, 8, 12, 11, 9, 12, 6, 5, 19, 7, 6, 19, 7, 19, 18, 20, 4, 21, 5, 4, 20, 19, 5, 20, 3, 2, 22, 21, 3, 22, 4, 3, 21, 0, 25, 24, 1, 0, 24, 23, 1, 24, 2, 1, 23, 22, 2, 23 ], "vertices": [ 1, 9, -7.68, -11.48, 1, 1, 9, 4.09, -13.63, 1, 1, 9, 23.49, -9.36, 1, 1, 10, 13.44, -9.23, 1, 2, 10, 35.2, -9.62, 0.50649, 11, -0.58, -9.66, 0.49351, 1, 11, 26.04, -6.39, 1, 1, 12, 14.15, -6.11, 1, 2, 12, 31.54, -5.57, 0.66493, 13, -3.33, -5.03, 0.33507, 1, 13, 13.08, -11.25, 1, 1, 13, 24.41, -14.89, 1, 1, 13, 30.15, -24.52, 1, 1, 13, 36.93, -23.54, 1, 1, 13, 54.08, -2.33, 1, 1, 13, 55.73, 14.15, 1, 1, 13, 41.39, 18.48, 1, 1, 13, 37.29, 26.87, 1, 1, 13, 24.66, 21.67, 1, 1, 13, 9.18, 18.1, 1, 2, 12, 31.33, 6.78, 0.47881, 13, -1.11, 7.12, 0.52119, 1, 12, 13.77, 6.04, 1, 2, 11, 24.98, 6.17, 0.89218, 12, -5.48, 6.96, 0.10782, 2, 10, 32.6, 7.29, 0.59842, 11, -0.32, 7.45, 0.40158, 1, 10, 11.08, 8.85, 1, 1, 9, 17.89, 11.88, 1, 1, 9, -4.82, 9.46, 1, 1, 9, -13.69, -0.69, 1 ], "hull": 26, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 46, 48, 48, 50, 0, 50, 2, 48, 4, 46, 6, 44, 8, 42, 10, 40, 12, 38, 14, 36 ], @@ -509,7 +509,7 @@ "back-leg": { "type": "mesh", "uvs": [ 0.502, 0.01179, 0.36076, 0.06379, 0.4057, 0.15046, 0.44743, 0.23916, 0.47953, 0.32991, 0.51163, 0.42269, 0.52127, 0.50629, 0.48274, 0.58888, 0.41212, 0.66025, 0.3126, 0.74182, 0.2163, 0.81625, 0.1232, 0.89272, 0.00763, 0.97429, 0.29655, 0.98958, 0.47407, 0.99222, 0.64004, 0.99468, 0.80989, 0.9896, 0.91291, 0.98652, 1, 0.95797, 0.8333, 0.94681, 0.71067, 0.9386, 0.57123, 0.92031, 0.41533, 0.89986, 0.3447, 0.89272, 0.36885, 0.87178, 0.42817, 0.82033, 0.502, 0.74794, 0.58226, 0.66943, 0.6593, 0.59092, 0.72993, 0.50528, 0.76524, 0.42167, 0.78129, 0.32481, 0.78771, 0.23406, 0.78771, 0.13924, 0.72351, 0.03728, 0.60152, 0.00567, 0.82117, 0.96898, 0.67873, 0.96396, 0.52111, 0.9574, 0.35936, 0.94214, 0.19388, 0.92922, 0.25375, 0.88159, 0.32792, 0.8184 ], - "triangles": [ 17, 36, 19, 17, 16, 36, 16, 37, 36, 17, 19, 18, 36, 20, 19, 15, 37, 16, 14, 38, 15, 15, 38, 37, 37, 20, 36, 38, 21, 37, 37, 21, 20, 38, 22, 21, 13, 39, 14, 14, 39, 38, 12, 40, 13, 13, 40, 39, 39, 22, 38, 40, 23, 39, 39, 23, 22, 12, 11, 40, 40, 41, 23, 40, 11, 41, 23, 41, 24, 11, 10, 41, 41, 42, 24, 41, 10, 42, 24, 42, 25, 26, 25, 9, 10, 9, 42, 25, 42, 9, 9, 8, 26, 26, 8, 27, 8, 7, 27, 27, 7, 28, 7, 6, 28, 28, 6, 29, 6, 5, 29, 29, 5, 30, 30, 5, 31, 31, 5, 4, 31, 4, 32, 32, 4, 3, 32, 3, 33, 3, 2, 33, 2, 34, 33, 2, 1, 34, 34, 0, 35, 34, 1, 0 ], + "triangles": [ 36, 20, 19, 17, 19, 18, 16, 37, 36, 17, 16, 36, 17, 36, 19, 38, 22, 21, 37, 21, 20, 38, 21, 37, 37, 20, 36, 15, 38, 37, 14, 38, 15, 15, 37, 16, 39, 23, 22, 40, 23, 39, 39, 22, 38, 13, 40, 39, 12, 40, 13, 14, 39, 38, 13, 39, 14, 9, 8, 26, 25, 42, 9, 10, 9, 42, 26, 25, 9, 24, 42, 25, 41, 10, 42, 41, 42, 24, 11, 10, 41, 23, 41, 24, 40, 11, 41, 40, 41, 23, 12, 11, 40, 26, 8, 27, 6, 5, 29, 28, 6, 29, 7, 6, 28, 27, 7, 28, 8, 7, 27, 29, 5, 30, 31, 5, 4, 30, 5, 31, 32, 4, 3, 31, 4, 32, 34, 1, 0, 34, 0, 35, 2, 1, 34, 2, 34, 33, 3, 2, 33, 32, 3, 33 ], "vertices": [ 1, 20, -19.79, -5.67, 1, 2, 20, -5.62, -22.28, 0.83363, 21, -41.07, -23.3, 0.16637, 2, 20, 22.31, -21.98, 0.65187, 21, -13.17, -21.89, 0.34813, 3, 20, 50.83, -22.11, 0.3172, 21, 15.33, -20.87, 0.43086, 22, -19.67, -21.09, 0.25193, 4, 20, 79.85, -23.29, 0.10792, 21, 44.37, -20.89, 0.35417, 22, 9.3, -19.2, 0.3192, 23, -25.22, -20.06, 0.21872, 4, 21, 74.06, -20.98, 0.16486, 22, 38.93, -17.34, 0.32776, 23, 4.09, -15.38, 0.29831, 24, -30.1, -17.16, 0.20907, 3, 22, 65.54, -17.61, 0.17523, 23, 30.6, -13.11, 0.39173, 24, -4.12, -11.42, 0.43304, 3, 23, 57.03, -15.71, 0.19718, 24, 22.43, -10.53, 0.52971, 25, -12.97, -9.81, 0.27311, 3, 24, 46.05, -13.47, 0.40991, 25, 10.84, -10.17, 0.34747, 26, -24.93, -10.51, 0.24261, 3, 24, 73.39, -18.69, 0.19432, 25, 38.58, -12.41, 0.37177, 26, 2.9, -10.99, 0.43391, 3, 25, 64.06, -14.98, 0.16664, 26, 28.49, -11.94, 0.56756, 27, -7.53, -11.48, 0.2658, 3, 26, 54.58, -12.37, 0.52114, 27, 18.56, -10.93, 0.36168, 14, -3.08, 24.95, 0.11718, 4, 26, 82.97, -14.36, 0.35144, 27, 47.01, -11.86, 0.29521, 14, -13.07, -1.67, 0.25118, 15, -46.3, 1.83, 0.10216, 1, 14, 16.37, -4.67, 1, 2, 14, 34.32, -4.37, 0.53487, 15, 0.74, -4.44, 0.46513, 3, 14, 51.1, -4.08, 0.14611, 15, 17.5, -5.42, 0.54314, 16, -15.51, -2.75, 0.31075, 2, 15, 34.67, -4.01, 0.40714, 16, 1.65, -4.36, 0.59286, 2, 15, 45.09, -3.16, 0.25726, 16, 12.05, -5.34, 0.74274, 2, 15, 53.99, 5.81, 0.25311, 16, 22.38, 1.94, 0.74689, 2, 15, 37.19, 9.56, 0.4029, 16, 6.5, 8.57, 0.5971, 3, 14, 57.07, 14.17, 0.13352, 15, 24.84, 12.33, 0.54644, 16, -5.18, 13.44, 0.32004, 4, 26, 47.09, 33.11, 0.13131, 14, 42.64, 19.08, 0.26349, 15, 10.82, 18.31, 0.49746, 16, -17.94, 21.78, 0.10773, 4, 26, 46.46, 16.09, 0.21159, 27, 9.37, 17.21, 0.1068, 14, 26.51, 24.57, 0.44951, 15, -4.85, 25.01, 0.23211, 3, 26, 46.8, 8.62, 0.40111, 27, 10, 9.75, 0.24543, 14, 19.24, 26.38, 0.35346, 3, 26, 39.71, 8.61, 0.5825, 27, 2.91, 9.47, 0.30792, 14, 21.25, 33.18, 0.10958, 3, 25, 59.17, 5.89, 0.21955, 26, 22.27, 8.58, 0.57946, 27, -14.51, 8.8, 0.20099, 3, 24, 71.84, 0.47, 0.21583, 25, 34.96, 6.47, 0.32263, 26, -1.92, 7.63, 0.46154, 3, 24, 45.81, 3.96, 0.40554, 25, 8.71, 7.12, 0.38602, 26, -28.17, 6.61, 0.20845, 3, 23, 56.79, 2.13, 0.25409, 24, 19.83, 7.12, 0.53006, 25, -17.46, 7.46, 0.21585, 3, 22, 66.18, 3.45, 0.22414, 23, 29.23, 7.92, 0.34135, 24, -8.25, 9.24, 0.43451, 4, 21, 76.6, 4.51, 0.19364, 22, 39.78, 8.26, 0.28887, 23, 2.49, 10.19, 0.33579, 24, -35.06, 7.97, 0.1817, 4, 20, 82.88, 7.08, 0.11658, 21, 46.18, 9.58, 0.35727, 22, 9.09, 11.32, 0.35745, 23, -28.36, 10.3, 0.16869, 3, 20, 54.46, 12.11, 0.35357, 21, 17.57, 13.46, 0.44494, 22, -19.71, 13.32, 0.20149, 2, 20, 24.65, 16.69, 0.65438, 21, -12.4, 16.85, 0.34562, 2, 20, -8.38, 15.21, 0.85331, 21, -45.34, 14.05, 0.14669, 1, 20, -20.19, 4.56, 1, 2, 15, 35.89, 2.53, 0.4051, 16, 3.99, 1.87, 0.5949, 3, 14, 54.38, 5.92, 0.13921, 15, 21.52, 4.3, 0.54495, 16, -9.85, 6.12, 0.31584, 2, 14, 37.79, 7.63, 0.44939, 15, 5.1, 7.27, 0.55061, 3, 26, 65.39, 20.7, 0.11858, 14, 20.6, 11.35, 0.75134, 15, -11.76, 12.27, 0.13008, 3, 26, 65.41, 1.81, 0.3968, 27, 24.3, 0.23, 0.28258, 14, 2.07, 14.98, 0.32063, 3, 26, 48.01, 0.08, 0.55395, 27, 6.94, -0.33, 0.33293, 14, 3.38, 30.47, 0.11312, 3, 25, 65.95, -2.97, 0.19447, 26, 24.96, -1.58, 0.57382, 27, -15.99, -0.43, 0.23171 ], "hull": 36, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 34, 36, 44, 46, 50, 52, 52, 54, 54, 56, 56, 58, 58, 60, 60, 62, 62, 64, 64, 66, 66, 68, 68, 70, 0, 70, 4, 66, 2, 68, 40, 42, 42, 44, 26, 28, 28, 30, 46, 48, 48, 50, 36, 38, 38, 40, 30, 32, 32, 34, 18, 52, 16, 54, 14, 56, 12, 58, 10, 60, 8, 62, 6, 64, 32, 72, 72, 38, 30, 74, 74, 40, 72, 74, 28, 76, 76, 42, 74, 76, 26, 78, 78, 44, 76, 78, 24, 80, 80, 46, 78, 80, 22, 82, 82, 48, 80, 82, 20, 84, 84, 50, 82, 84 ], @@ -529,7 +529,7 @@ "body": { "type": "mesh", "uvs": [ 0.35966, 0.01351, 0.26864, 0.04108, 0.26204, 0.0954, 0.34119, 0.14478, 0.39792, 0.19457, 0.40451, 0.24272, 0.38077, 0.27893, 0.3597, 0.3004, 0.34119, 0.31926, 0.34989, 0.34326, 0.35834, 0.36658, 0.36552, 0.40164, 0.37234, 0.43499, 0.38397, 0.4944, 0.3956, 0.55971, 0.39884, 0.59858, 0.40142, 0.62955, 0.40216, 0.65662, 0.3461, 0.71564, 0.27077, 0.78176, 0.2201, 0.82128, 0.17618, 0.85553, 0.13115, 0.88833, 0.08238, 0.92385, 0.00342, 0.9796, 0.18836, 0.99127, 0.32172, 0.99284, 0.46266, 0.99451, 0.61643, 0.98608, 0.71618, 0.97182, 0.61851, 0.95821, 0.48967, 0.95043, 0.39458, 0.94083, 0.27772, 0.92904, 0.23408, 0.9232, 0.26692, 0.89774, 0.30681, 0.86681, 0.34203, 0.83415, 0.38369, 0.7955, 0.45642, 0.72874, 0.52708, 0.66845, 0.56032, 0.63345, 0.57541, 0.60109, 0.59357, 0.56214, 0.61643, 0.49732, 0.63513, 0.43963, 0.64345, 0.40462, 0.77081, 0.39011, 0.84585, 0.37025, 0.90983, 0.35331, 0.9674, 0.31915, 0.97302, 0.28585, 0.96448, 0.23351, 0.8952, 0.1681, 0.79346, 0.12643, 0.75179, 0.10879, 0.71799, 0.09448, 0.66817, 0.07237, 0.61343, 0.04807, 0.47868, 0.01411, 0.49846, 0.38826, 0.66315, 0.34728, 0.67333, 0.30664, 0.8188, 0.29655, 0.80971, 0.24505, 0.72829, 0.17902, 0.68147, 0.13902, 0.59191, 0.09711, 0.3904, 0.09012, 0.53695, 0.14981, 0.57563, 0.19616, 0.64483, 0.25077, 0.79855, 0.33476, 0.61751, 0.97167, 0.4773, 0.97061, 0.23795, 0.95673, 0.15272, 0.92355, 0.14158, 0.94886, 0.23861, 0.86092, 0.51732, 0.30354, 0.50696, 0.34527, 0.50634, 0.43735, 0.50334, 0.4959, 0.51086, 0.32558, 0.50355, 0.41057, 0.19543, 0.89241, 0.36492, 0.9641 ], - "triangles": [ 1, 0, 59, 58, 1, 59, 68, 1, 58, 2, 1, 68, 67, 68, 58, 67, 58, 57, 67, 57, 56, 66, 67, 56, 66, 56, 55, 3, 2, 68, 69, 68, 67, 3, 68, 69, 69, 67, 66, 66, 55, 54, 65, 66, 54, 65, 54, 53, 4, 3, 69, 70, 69, 66, 4, 69, 70, 70, 66, 65, 5, 4, 70, 71, 70, 65, 5, 70, 71, 6, 71, 62, 79, 6, 62, 7, 6, 79, 71, 6, 5, 83, 7, 79, 8, 7, 83, 83, 79, 62, 9, 8, 83, 80, 9, 83, 61, 83, 62, 61, 62, 72, 80, 83, 61, 46, 80, 61, 46, 61, 47, 62, 71, 64, 64, 65, 53, 64, 53, 52, 71, 65, 64, 63, 64, 52, 63, 52, 51, 62, 64, 63, 50, 63, 51, 72, 62, 63, 72, 63, 50, 49, 72, 50, 48, 72, 49, 47, 61, 72, 47, 72, 48, 74, 32, 31, 86, 32, 74, 73, 31, 30, 74, 31, 73, 73, 30, 29, 28, 74, 73, 28, 73, 29, 27, 86, 74, 27, 74, 28, 26, 86, 27, 75, 33, 86, 24, 23, 77, 25, 77, 75, 24, 77, 25, 26, 75, 86, 25, 75, 26, 22, 21, 85, 85, 78, 35, 34, 85, 35, 76, 22, 85, 76, 85, 34, 23, 22, 76, 77, 23, 76, 77, 76, 34, 77, 34, 33, 75, 77, 33, 86, 33, 32, 36, 78, 20, 21, 20, 78, 37, 36, 20, 85, 21, 78, 35, 78, 36, 38, 18, 39, 19, 18, 38, 37, 19, 38, 20, 19, 37, 40, 17, 16, 41, 40, 16, 39, 17, 40, 18, 17, 39, 42, 15, 14, 43, 42, 14, 41, 16, 15, 42, 41, 15, 14, 13, 82, 43, 82, 44, 14, 82, 43, 12, 11, 84, 45, 81, 84, 12, 84, 81, 46, 45, 84, 13, 12, 81, 82, 13, 81, 44, 81, 45, 82, 81, 44, 10, 9, 80, 60, 10, 80, 11, 10, 60, 60, 80, 46, 84, 60, 46, 11, 60, 84 ], + "triangles": [ 2, 1, 68, 68, 1, 58, 58, 1, 59, 1, 0, 59, 69, 67, 66, 3, 68, 69, 69, 68, 67, 3, 2, 68, 66, 56, 55, 66, 67, 56, 67, 57, 56, 67, 58, 57, 67, 68, 58, 5, 70, 71, 71, 70, 65, 5, 4, 70, 70, 66, 65, 4, 69, 70, 70, 69, 66, 4, 3, 69, 65, 54, 53, 65, 66, 54, 66, 55, 54, 46, 61, 47, 46, 80, 61, 80, 83, 61, 61, 62, 72, 61, 83, 62, 80, 9, 83, 9, 8, 83, 83, 79, 62, 8, 7, 83, 83, 7, 79, 71, 6, 5, 7, 6, 79, 79, 6, 62, 6, 71, 62, 47, 72, 48, 47, 61, 72, 48, 72, 49, 49, 72, 50, 72, 63, 50, 72, 62, 63, 50, 63, 51, 62, 64, 63, 63, 52, 51, 63, 64, 52, 71, 65, 64, 64, 53, 52, 64, 65, 53, 62, 71, 64, 26, 86, 27, 27, 74, 28, 27, 86, 74, 28, 73, 29, 28, 74, 73, 73, 30, 29, 74, 31, 73, 73, 31, 30, 86, 32, 74, 74, 32, 31, 25, 75, 26, 26, 75, 86, 24, 77, 25, 25, 77, 75, 24, 23, 77, 75, 33, 86, 86, 33, 32, 75, 77, 33, 77, 34, 33, 77, 76, 34, 77, 23, 76, 23, 22, 76, 76, 85, 34, 76, 22, 85, 34, 85, 35, 85, 78, 35, 22, 21, 85, 35, 78, 36, 85, 21, 78, 37, 36, 20, 21, 20, 78, 36, 78, 20, 20, 19, 37, 37, 19, 38, 19, 18, 38, 38, 18, 39, 18, 17, 39, 39, 17, 40, 41, 40, 16, 40, 17, 16, 42, 41, 15, 41, 16, 15, 43, 42, 14, 42, 15, 14, 14, 82, 43, 43, 82, 44, 14, 13, 82, 82, 81, 44, 44, 81, 45, 82, 13, 81, 13, 12, 81, 46, 45, 84, 12, 84, 81, 45, 81, 84, 12, 11, 84, 11, 60, 84, 84, 60, 46, 60, 80, 46, 11, 10, 60, 60, 10, 80, 10, 9, 80 ], "vertices": [ 1, 6, 30.85, 2.45, 1, 2, 5, 60.42, 12.42, 0.24859, 6, 22.32, 18.18, 0.75141, 2, 5, 39.47, 25.25, 0.44332, 6, -1.06, 25.72, 0.55668, 3, 4, 48.03, 29.46, 0.37431, 5, 14.55, 26.45, 0.47619, 6, -25.57, 21.02, 0.1495, 3, 3, 50.36, 32.58, 0.11243, 4, 24.29, 26.8, 0.64611, 5, -8.99, 30.5, 0.24146, 3, 44, -45.22, -8.81, 0.10611, 3, 28.69, 30.4, 0.49533, 4, 2.89, 30.85, 0.39856, 3, 44, -28.91, -12.45, 0.25802, 3, 12.15, 32.8, 0.60894, 4, -12.29, 37.84, 0.13304, 3, 44, -18.5, -14.05, 0.28714, 3, 2.34, 35.98, 0.51935, 29, -7.6, 18.95, 0.19351, 4, 44, -10.79, -18.35, 0.28478, 28, -42.03, 75.56, 0.10295, 3, -6.36, 37.32, 0.37494, 29, -10.2, 10.26, 0.23733, 3, 44, 0.92, -16.96, 0.34087, 3, -17.28, 35.45, 0.32141, 29, -8.2, -0.67, 0.33772, 4, 44, 10.64, -16.32, 0.32691, 45, -24.05, -14.9, 0.16082, 3, -27.58, 33.67, 0.14432, 29, -6.37, -11.05, 0.36794, 4, 44, 28.5, -15.63, 0.24237, 45, -9.55, -15.11, 0.27028, 46, -45.51, -19.12, 0.12132, 29, -3.65, -27.88, 0.36603, 4, 44, 41.59, -14.89, 0.21761, 45, 6.93, -15.35, 0.33285, 46, -26.85, -17.49, 0.20377, 29, -1.3, -43.28, 0.24577, 3, 45, 33.83, -15.81, 0.47179, 46, 0, -15.85, 0.42627, 47, -31.79, -17.82, 0.10194, 3, 45, 63.39, -16.48, 0.2126, 46, 29.52, -14.22, 0.42737, 47, -2.43, -14.39, 0.36002, 3, 46, 49.79, -15.51, 0.30179, 47, 14.85, -13.08, 0.47127, 48, -21.15, -15.64, 0.22695, 3, 46, 61.1, -13.41, 0.15443, 47, 29.03, -11.65, 0.50848, 48, -3.27, -12.45, 0.33708, 2, 47, 41.24, -10.8, 0.28079, 48, 8.41, -8.79, 0.71921, 2, 48, 36.24, -8.59, 0.56513, 49, -3.02, -8.84, 0.43487, 3, 48, 67.93, -10.06, 0.16322, 49, 28.69, -7.82, 0.53712, 50, -8.12, -7.7, 0.29966, 3, 49, 47.76, -8.47, 0.40201, 50, 10.97, -7.9, 0.45131, 51, -26.34, -6.21, 0.14668, 3, 49, 64.62, -8.06, 0.25017, 50, 27.8, -8.4, 0.46039, 51, -12.77, -8.82, 0.28944, 4, 49, 79.13, -10.24, 0.11858, 50, 42.33, -8.03, 0.26981, 51, 4.53, -8.38, 0.48104, 38, -1.56, 35.6, 0.13057, 2, 51, 20.84, -9.2, 0.728, 38, -5.38, 19.56, 0.272, 1, 38, -11.5, -7.3, 1, 4, 51, 43.23, 16.27, 0.2746, 38, 15.1, -7.51, 0.48158, 39, -12.29, -5.54, 0.12942, 40, -41.77, 0.94, 0.11439, 4, 51, 37, 33.94, 0.18804, 38, 33.71, -4.58, 0.34252, 39, 6.54, -5.76, 0.18297, 40, -23.2, -2.19, 0.28647, 3, 38, 53.35, -1.59, 0.21646, 39, 26.41, -6.09, 0.26516, 40, -3.62, -5.59, 0.51838, 2, 39, 47.99, -1.76, 0.15753, 40, 18.37, -4.66, 0.84247, 1, 40, 33.16, -0.12, 1, 2, 39, 47.98, 10.84, 0.17387, 40, 20.32, 7.79, 0.82613, 4, 51, 9.83, 48.43, 0.17572, 38, 53.29, 18.7, 0.17038, 39, 29.73, 13.92, 0.136, 40, 2.77, 13.66, 0.5179, 4, 51, 11.45, 34.58, 0.26313, 38, 39.26, 20.56, 0.23037, 39, 16.21, 18.1, 0.15679, 40, -9.94, 19.88, 0.3497, 4, 51, 12.41, 17.13, 0.37057, 38, 22.11, 22.5, 0.30409, 39, -0.38, 22.88, 0.18235, 40, -25.59, 27.17, 0.14299, 3, 51, 12.34, 10.44, 0.4464, 38, 15.56, 23.92, 0.2976, 39, -6.59, 25.37, 0.256, 4, 50, 38.15, 11.09, 0.28506, 51, 1.65, 10.97, 0.37544, 38, 17.99, 34.75, 0.18251, 39, -2.39, 35.65, 0.15699, 3, 49, 62.62, 10.94, 0.26064, 50, 26.05, 10.62, 0.49792, 51, -15.15, 10.14, 0.24144, 3, 49, 47.27, 9.67, 0.40348, 50, 9.53, 10.2, 0.4787, 51, -26.59, 11.94, 0.11781, 3, 48, 69.23, 6.98, 0.16044, 49, 28.64, 9.27, 0.53936, 50, -7.95, 9.39, 0.3002, 2, 48, 37.36, 8.01, 0.57649, 49, -3.21, 7.8, 0.42351, 2, 47, 45.49, 7.11, 0.2935, 48, 8.38, 9.61, 0.7065, 3, 46, 62.85, 9, 0.15446, 47, 29.41, 10.82, 0.49324, 48, -8.13, 9.49, 0.3523, 3, 46, 52.15, 9.28, 0.30575, 47, 12.84, 11.74, 0.46742, 48, -26.12, 8.77, 0.22683, 3, 45, 66.66, 11.26, 0.21798, 46, 30.62, 13.69, 0.42844, 47, -3.05, 13.54, 0.35358, 3, 45, 37.7, 16.76, 0.48246, 46, 1.32, 16.92, 0.41752, 47, -32.5, 14.97, 0.10002, 4, 44, 44.35, 22.12, 0.2346, 45, 11.91, 21.43, 0.43853, 46, -24.76, 19.57, 0.2068, 3, -58.29, -7.2, 0.12007, 4, 44, 28.55, 23.57, 0.31081, 45, -3.77, 23.84, 0.19158, 28, -76.76, 29.23, 0.21531, 3, -42.43, -7.46, 0.28231, 3, 44, 22.31, 41.64, 0.18196, 28, -69.84, 12.47, 0.43955, 3, -34.84, -25, 0.37848, 3, 44, 19.78, 51.42, 0.1392, 28, -59.84, 2.53, 0.47896, 3, -23.9, -35.17, 0.38184, 3, 44, 6.03, 61.54, 0.10543, 28, -52.71, -5.88, 0.51007, 3, -17.11, -43.61, 0.38449, 2, 28, -37.16, -13.14, 0.67427, 3, -1.22, -50.83, 0.32573, 1, 28, -22.09, -13.06, 1, 2, 28, 1.45, -10.49, 0.89019, 3, 37.4, -48.18, 0.10981, 3, 28, 30.41, 0.97, 0.4302, 3, 66.35, -36.73, 0.16237, 4, 19.98, -44.2, 0.40743, 2, 4, 41.58, -34.52, 0.68165, 5, -9.45, -33.21, 0.31835, 2, 4, 50.69, -30.62, 0.51066, 5, 0.38, -31.99, 0.48934, 3, 4, 58.07, -27.45, 0.26484, 5, 8.35, -31.01, 0.61475, 6, -18.05, -36.28, 0.12041, 3, 4, 69.4, -22.88, 0.17396, 5, 20.51, -29.78, 0.5644, 6, -6.53, -32.23, 0.26164, 2, 5, 33.86, -28.42, 0.29085, 6, 6.13, -27.77, 0.70915, 2, 5, 56.55, -19.38, 0.17381, 6, 26.05, -13.63, 0.82619, 4, 44, 20.79, 3.26, 0.43236, 45, -12.74, 4.03, 0.19687, 3, -36.22, 13.38, 0.21782, 29, 13.98, -19.25, 0.15294, 4, 44, 2.69, 26.81, 0.26409, 28, -50.86, 29.21, 0.2337, 3, -16.39, -8.73, 0.34628, 29, 35.79, -0.49, 0.15592, 3, 44, -15.65, 28.57, 0.15678, 28, -33.54, 28.78, 0.2916, 3, 2.03, -9.11, 0.55162, 1, 28, -28.18, 8.37, 1, 1, 28, -5.01, 11, 1, 3, 28, 24.12, 24.18, 0.12052, 3, 60.07, -13.52, 0.21384, 4, 20.53, -20.16, 0.66564, 2, 4, 39.64, -17.85, 0.59513, 5, -6.68, -16.66, 0.40487, 3, 4, 60.96, -9.87, 0.26252, 5, 16.02, -14.92, 0.55541, 6, -14.39, -18.85, 0.18206, 2, 5, 32.69, 8.3, 0.58729, 6, -3.66, 7.65, 0.41271, 2, 4, 39.53, 3.1, 0.47136, 5, -0.95, 3.5, 0.52864, 1, 4, 17.89, 2.56, 1, 2, 3, 27.01, -3.64, 0.67245, 4, -8.37, -1.32, 0.32755, 3, 44, -2.63, 46, 0.10033, 28, -45.42, 10.27, 0.52612, 3, -9.64, -27.47, 0.37356, 2, 39, 47.98, 4.75, 0.16598, 40, 19.38, 1.78, 0.83402, 4, 51, 19.56, 50.48, 0.12624, 38, 53.31, 9.51, 0.16908, 39, 28.22, 4.86, 0.24846, 40, -0.13, 4.94, 0.45621, 4, 51, 26.31, 16.82, 0.32786, 38, 18.97, 9.25, 0.38308, 39, -5.69, 10.34, 0.1588, 40, -32.78, 15.61, 0.13026, 2, 51, 16.97, -0.03, 0.66865, 38, 4.23, 21.71, 0.33135, 3, 51, 28.1, 2.86, 0.4826, 38, 4.92, 10.15, 0.31302, 39, -19.39, 13.57, 0.20437, 3, 49, 63.22, -0.58, 0.21069, 50, 25.96, 0.79, 0.49387, 51, -11.02, 1.48, 0.29545, 3, 44, -14.84, 8.09, 0.24448, 28, -33.35, 51.23, 0.16325, 3, 2.6, 13.54, 0.59227, 4, 44, 3.38, 4.96, 0.28616, 28, -51.81, 51.13, 0.16477, 3, -15.87, 13.44, 0.31892, 29, 13.85, -0.53, 0.23015, 4, 44, 46.09, 3.59, 0.2409, 45, 9.06, 3.1, 0.41152, 46, -28.46, 0.64, 0.21862, 29, 17.5, -43.07, 0.12896, 3, 45, 37.23, 1.25, 0.47745, 46, -0.08, 1.26, 0.42163, 47, -36.26, -5.26, 0.10093, 4, 44, -5.23, 6.3, 0.25594, 28, -43.11, 51.32, 0.15579, 3, -7.17, 13.63, 0.42092, 29, 14.17, 8.17, 0.16735, 4, 44, 33.04, 3.37, 0.36685, 45, -3.97, 3.61, 0.31093, 3, -45.33, 9.83, 0.17307, 29, 15.76, -30.15, 0.14915, 4, 49, 77.51, -1.16, 0.11479, 50, 40.24, 0.95, 0.26889, 51, 3.05, 0.72, 0.44973, 38, 7.66, 35.33, 0.16659, 4, 51, 22.73, 34.68, 0.22091, 38, 37.18, 9.39, 0.26956, 39, 12.3, 7.43, 0.20636, 40, -15.46, 9.95, 0.30317 ], "hull": 60, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 24, 26, 26, 28, 32, 34, 34, 36, 36, 38, 46, 48, 48, 50, 54, 56, 56, 58, 58, 60, 60, 62, 66, 68, 76, 78, 78, 80, 80, 82, 86, 88, 88, 90, 90, 92, 92, 94, 98, 100, 100, 102, 102, 104, 104, 106, 106, 108, 116, 118, 0, 118, 92, 120, 120, 20, 28, 86, 82, 32, 34, 80, 78, 36, 76, 38, 12, 124, 102, 126, 126, 124, 126, 128, 128, 130, 130, 132, 132, 134, 112, 134, 134, 136, 136, 4, 2, 116, 6, 138, 138, 132, 8, 140, 140, 130, 10, 142, 142, 128, 128, 104, 130, 106, 132, 108, 122, 92, 100, 144, 144, 122, 126, 144, 144, 94, 112, 114, 114, 116, 108, 110, 110, 112, 16, 18, 18, 20, 20, 22, 22, 24, 12, 14, 14, 16, 122, 124, 94, 96, 96, 98, 56, 146, 146, 60, 54, 148, 148, 62, 146, 148, 50, 150, 150, 66, 46, 152, 152, 68, 154, 152, 154, 48, 42, 156, 156, 72, 14, 158, 158, 124, 18, 160, 160, 122, 160, 120, 24, 162, 162, 90, 26, 164, 164, 88, 162, 164, 16, 166, 160, 166, 166, 158, 166, 124, 162, 168, 168, 120, 168, 22, 168, 92, 38, 40, 40, 42, 72, 74, 74, 76, 40, 74, 42, 44, 44, 46, 152, 170, 170, 156, 44, 170, 68, 70, 70, 72, 170, 70, 62, 64, 64, 66, 148, 172, 172, 150, 64, 172, 50, 52, 52, 54, 172, 52, 154, 66, 150, 154, 28, 30, 30, 32, 82, 84, 84, 86, 30, 84 ], @@ -541,7 +541,7 @@ "front-arm": { "type": "mesh", "uvs": [ 0.71401, 0.00566, 0.67108, 0.08129, 0.60222, 0.15434, 0.53633, 0.21683, 0.44558, 0.28705, 0.34898, 0.35134, 0.29097, 0.38941, 0.25238, 0.41472, 0.22423, 0.44271, 0.19483, 0.47193, 0.15998, 0.50658, 0.09138, 0.59568, 0.05498, 0.70866, 0.02988, 0.81366, 0.01049, 0.94262, 0.10495, 0.98985, 0.25391, 0.97421, 0.31482, 0.88907, 0.28834, 0.82869, 0.13607, 0.74572, 0.14335, 0.71488, 0.18317, 0.62253, 0.25217, 0.54221, 0.29538, 0.50981, 0.33787, 0.47795, 0.38452, 0.45013, 0.43581, 0.41953, 0.54711, 0.3655, 0.68845, 0.29832, 0.74855, 0.35527, 0.85874, 0.38229, 0.99674, 0.37645, 0.95354, 0.33244, 0.91356, 0.29172, 0.87464, 0.25208, 0.83759, 0.21434, 0.78083, 0.12598, 0.78194, 0.0683, 0.6322, 0.23719, 0.66925, 0.15784, 0.75533, 0.20967, 0.7161, 0.11137 ], - "triangles": [ 30, 32, 31, 30, 29, 33, 30, 33, 32, 29, 28, 33, 28, 34, 33, 34, 40, 35, 34, 28, 40, 28, 38, 40, 38, 39, 40, 40, 36, 35, 39, 41, 40, 40, 41, 36, 39, 1, 41, 36, 41, 37, 37, 41, 0, 41, 1, 0, 39, 2, 1, 15, 18, 16, 15, 14, 13, 15, 13, 19, 16, 18, 17, 18, 15, 19, 13, 12, 19, 19, 12, 20, 12, 11, 20, 20, 11, 21, 11, 10, 21, 21, 10, 22, 10, 9, 22, 22, 9, 23, 9, 8, 23, 8, 7, 23, 23, 7, 24, 7, 6, 24, 24, 6, 25, 6, 5, 25, 25, 5, 26, 26, 5, 4, 26, 4, 27, 4, 3, 27, 27, 38, 28, 27, 3, 38, 3, 2, 38, 38, 2, 39 ], + "triangles": [ 30, 29, 33, 30, 32, 31, 40, 41, 36, 39, 41, 40, 40, 36, 35, 38, 39, 40, 28, 38, 40, 34, 28, 40, 34, 40, 35, 28, 34, 33, 29, 28, 33, 30, 33, 32, 41, 1, 0, 37, 41, 0, 36, 41, 37, 39, 1, 41, 39, 2, 1, 19, 12, 20, 13, 12, 19, 18, 15, 19, 16, 18, 17, 15, 13, 19, 15, 14, 13, 15, 18, 16, 21, 10, 22, 11, 10, 21, 20, 11, 21, 12, 11, 20, 9, 8, 23, 22, 9, 23, 10, 9, 22, 26, 5, 4, 25, 5, 26, 6, 5, 25, 24, 6, 25, 7, 6, 24, 23, 7, 24, 8, 7, 23, 38, 2, 39, 3, 2, 38, 27, 3, 38, 27, 38, 28, 4, 3, 27, 26, 4, 27 ], "vertices": [ 1, 53, 21.67, 6.08, 1, 2, 52, 18.13, 3.37, 0.16553, 53, 3.92, 4.24, 0.83447, 3, 33, -6.12, -15.24, 0.20965, 52, -0.05, 8.86, 0.53629, 6, 43.44, 6.81, 0.25406, 1, 33, 10.36, -12.02, 1, 2, 33, 30.62, -10.09, 0.88822, 34, -7.63, -10.15, 0.11178, 2, 33, 50.57, -9.69, 0.30996, 34, 12.31, -9.61, 0.69004, 2, 34, 24.21, -9.37, 0.86563, 35, -13.43, -6.2, 0.13437, 2, 34, 32.12, -9.22, 0.73143, 35, -5.73, -8.02, 0.26857, 2, 34, 39.35, -7.59, 0.54007, 35, 1.68, -8.25, 0.45993, 2, 34, 46.9, -5.88, 0.29037, 35, 9.42, -8.48, 0.70963, 2, 35, 18.59, -8.76, 0.66539, 36, -15.76, -5.13, 0.33461, 1, 36, 6.03, -8.58, 1, 2, 36, 31.42, -5.98, 0.39257, 37, 0.49, -6.36, 0.60743, 1, 37, 23.8, -9.31, 1, 1, 37, 52.37, -11.28, 1, 1, 37, 62.39, 2.72, 1, 1, 37, 58.29, 24.21, 1, 1, 37, 39.22, 32.48, 1, 1, 37, 26, 28.25, 1, 1, 37, 8.33, 5.63, 1, 2, 36, 28.81, 6.64, 0.48313, 37, 1.49, 6.49, 0.51687, 1, 36, 7.61, 5.9, 1, 3, 34, 51.67, 11.07, 0.10767, 35, 18.26, 6.75, 0.559, 36, -12.35, 10.01, 0.33333, 2, 34, 42.19, 10.25, 0.31464, 35, 8.88, 8.32, 0.68536, 2, 34, 32.87, 9.45, 0.59184, 35, -0.35, 9.86, 0.40816, 2, 34, 23.73, 9.7, 0.83036, 35, -9.14, 12.39, 0.16964, 2, 33, 52.08, 9.88, 0.29921, 34, 13.68, 9.98, 0.70079, 2, 33, 32.19, 12.6, 0.84687, 34, -6.24, 12.55, 0.15313, 1, 6, 9.42, 3.39, 1, 2, 6, -5.05, -1.59, 0.472, 5, 29.16, -0.35, 0.528, 1, 5, 16.13, -11.36, 1, 1, 5, 7.46, -29.44, 1, 2, 6, -8.23, -31.57, 0.5193, 5, 19, -28.74, 0.4807, 1, 6, 2, -28.43, 1, 1, 6, 11.96, -25.37, 1, 1, 6, 21.44, -22.45, 1, 3, 52, 12.7, -14.55, 0.25482, 53, 2.14, -14.4, 0.32231, 6, 42.47, -19.82, 0.42287, 1, 53, 13.64, -8.89, 1, 1, 33, 3.55, 0.91, 1, 2, 52, 1.72, -0.73, 0.5001, 6, 40.07, -2.34, 0.4999, 1, 6, 25.66, -11.25, 1, 3, 52, 13.4, -4.65, 0.33234, 53, 0.86, -4.56, 0.48165, 6, 48.12, -11.66, 0.18601 ], "hull": 38, "edges": [ 0, 2, 8, 10, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 52, 54, 54, 56, 56, 58, 58, 60, 60, 62, 70, 72, 72, 74, 0, 74, 56, 76, 6, 8, 76, 6, 4, 6, 4, 78, 78, 80, 80, 70, 2, 82, 82, 72, 82, 78, 78, 76, 2, 4, 56, 80, 56, 66, 62, 64, 64, 66, 66, 68, 68, 70, 44, 46, 46, 48, 18, 20, 46, 18, 10, 12, 12, 14, 48, 50, 50, 52, 12, 50, 14, 16, 16, 18 ], @@ -572,6 +572,17 @@ } ], "animations": { + "idle": { + "bones": { + "hip": { + "translate": [ + {}, + { "time": 1, "y": -4.42 }, + { "time": 2 } + ] + } + } + }, "sneak": { "bones": { "hip": { 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 c2eb27f20f..b4cc35fa93 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 @@ -4,360 +4,356 @@ mix-and-match-pma.png pma: true scale: 0.5 base-head - bounds: 587, 2, 95, 73 + bounds: 118, 70, 95, 73 boy/arm-front - bounds: 558, 271, 36, 115 + bounds: 831, 311, 36, 115 + rotate: 90 boy/backpack - bounds: 235, 109, 119, 153 + bounds: 249, 357, 119, 153 boy/backpack-pocket - bounds: 328, 73, 34, 62 + bounds: 628, 193, 34, 62 rotate: 90 boy/backpack-strap-front - bounds: 665, 79, 38, 88 -boy/backpack-up - bounds: 395, 364, 21, 70 + bounds: 330, 263, 38, 88 rotate: 90 +boy/backpack-up + bounds: 482, 171, 21, 70 boy/body - bounds: 251, 264, 97, 132 + bounds: 845, 413, 97, 132 rotate: 90 boy/boot-ribbon-front - bounds: 648, 131, 9, 11 + bounds: 234, 304, 9, 11 boy/collar - bounds: 744, 4, 73, 29 + bounds: 471, 243, 73, 29 rotate: 90 boy/ear - bounds: 383, 109, 19, 23 + bounds: 991, 352, 19, 23 rotate: 90 boy/eye-back-low-eyelid - bounds: 739, 284, 17, 6 - rotate: 90 + bounds: 66, 72, 17, 6 boy/eye-back-pupil - bounds: 832, 443, 8, 9 + bounds: 694, 279, 8, 9 rotate: 90 boy/eye-back-up-eyelid - bounds: 558, 264, 23, 5 + bounds: 460, 101, 23, 5 + rotate: 90 boy/eye-back-up-eyelid-back - bounds: 802, 491, 19, 10 + bounds: 979, 414, 19, 10 rotate: 90 boy/eye-front-low-eyelid - bounds: 386, 363, 22, 7 + bounds: 1015, 203, 22, 7 rotate: 90 boy/eye-front-pupil - bounds: 816, 389, 9, 9 + bounds: 309, 50, 9, 9 boy/eye-front-up-eyelid - bounds: 160, 71, 31, 6 - rotate: 90 + bounds: 991, 373, 31, 6 boy/eye-front-up-eyelid-back - bounds: 801, 434, 26, 9 + bounds: 107, 76, 26, 9 rotate: 90 boy/eye-iris-back - bounds: 618, 264, 17, 17 + bounds: 810, 260, 17, 17 boy/eye-iris-front - bounds: 727, 264, 18, 18 + bounds: 902, 230, 18, 18 boy/eye-white-back - bounds: 580, 131, 20, 12 + bounds: 599, 179, 20, 12 boy/eye-white-front - bounds: 510, 130, 27, 13 + bounds: 544, 183, 27, 13 boy/eyebrow-back - bounds: 751, 88, 20, 11 + bounds: 1002, 225, 20, 11 rotate: 90 boy/eyebrow-front - bounds: 483, 130, 25, 11 + bounds: 975, 234, 25, 11 boy/hair-back - bounds: 494, 388, 122, 81 + bounds: 629, 289, 122, 81 rotate: 90 boy/hair-bangs - bounds: 667, 284, 70, 37 + bounds: 505, 180, 70, 37 + rotate: 90 boy/hair-side - bounds: 789, 374, 25, 43 + bounds: 979, 435, 25, 43 + rotate: 90 boy/hand-backfingers - bounds: 467, 364, 19, 21 + bounds: 858, 183, 19, 21 boy/hand-front-fingers - bounds: 488, 364, 19, 21 + bounds: 879, 183, 19, 21 boy/hat - bounds: 615, 417, 93, 56 - rotate: 90 + bounds: 218, 121, 93, 56 boy/leg-front - bounds: 138, 104, 31, 158 + bounds: 85, 104, 31, 158 boy/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-blue-cape/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl-spring-dress/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 girl/mouth-close - bounds: 551, 365, 21, 5 - rotate: 90 + bounds: 467, 100, 21, 5 boy/mouth-smile - bounds: 705, 79, 29, 7 -boy/nose - bounds: 836, 473, 17, 10 + bounds: 1015, 258, 29, 7 rotate: 90 +boy/nose + bounds: 323, 79, 17, 10 boy/pompom - bounds: 747, 273, 48, 43 + bounds: 979, 462, 48, 43 rotate: 90 boy/zip - bounds: 648, 144, 14, 23 + bounds: 922, 231, 14, 23 + rotate: 90 girl-blue-cape/back-eyebrow - bounds: 602, 131, 18, 12 + bounds: 527, 106, 18, 12 + rotate: 90 girl-blue-cape/body-dress bounds: 2, 264, 109, 246 girl-blue-cape/body-ribbon - bounds: 615, 283, 50, 38 + bounds: 576, 193, 50, 38 girl-blue-cape/cape-back - bounds: 2, 69, 134, 193 + bounds: 113, 317, 134, 193 girl-blue-cape/cape-back-up - bounds: 386, 387, 123, 106 - rotate: 90 + bounds: 504, 305, 123, 106 girl-blue-cape/cape-ribbon - bounds: 675, 264, 50, 18 + bounds: 396, 118, 50, 18 + rotate: 90 girl-blue-cape/cape-shoulder-back - bounds: 751, 110, 49, 59 + bounds: 420, 243, 49, 59 girl-blue-cape/cape-shoulder-front - bounds: 113, 264, 62, 76 - rotate: 90 + bounds: 2, 2, 62, 76 girl-blue-cape/cape-up-front - bounds: 399, 264, 98, 117 - rotate: 90 + bounds: 118, 145, 98, 117 girl-blue-cape/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-spring-dress/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl/ear - bounds: 775, 2, 19, 23 + bounds: 837, 181, 19, 23 girl-blue-cape/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-spring-dress/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl/eye-back-low-eyelid - bounds: 802, 463, 17, 6 + bounds: 810, 252, 17, 6 girl-blue-cape/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-spring-dress/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl/eye-back-pupil - bounds: 816, 367, 8, 9 + bounds: 309, 40, 8, 9 + rotate: 90 girl-blue-cape/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-spring-dress/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl/eye-back-up-eyelid - bounds: 554, 131, 24, 12 + bounds: 573, 179, 24, 12 girl-blue-cape/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-spring-dress/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl/eye-back-up-eyelid-back - bounds: 832, 453, 17, 11 + bounds: 380, 105, 17, 11 rotate: 90 girl-blue-cape/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-spring-dress/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl/eye-front-low-eyelid - bounds: 739, 303, 18, 6 + bounds: 1016, 353, 18, 6 rotate: 90 girl-blue-cape/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-spring-dress/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl/eye-front-pupil - bounds: 816, 378, 9, 9 + bounds: 363, 94, 9, 9 girl-blue-cape/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-spring-dress/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl/eye-front-up-eyelid - bounds: 392, 77, 30, 14 + bounds: 679, 413, 30, 14 rotate: 90 girl-blue-cape/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-spring-dress/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl/eye-front-up-eyelid-back - bounds: 455, 130, 26, 11 + bounds: 947, 234, 26, 11 girl-blue-cape/eye-iris-back - bounds: 637, 264, 17, 17 + bounds: 323, 105, 17, 17 girl-blue-cape/eye-iris-front - bounds: 802, 471, 18, 18 + bounds: 467, 107, 18, 18 girl-blue-cape/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-spring-dress/eye-white-back - bounds: 596, 264, 20, 16 + bounds: 621, 175, 20, 16 girl-blue-cape/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-spring-dress/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl/eye-white-front - bounds: 796, 5, 20, 16 - rotate: 90 + bounds: 643, 175, 20, 16 girl-blue-cape/front-eyebrow - bounds: 608, 149, 18, 12 + bounds: 309, 101, 18, 12 rotate: 90 girl-blue-cape/hair-back - bounds: 508, 145, 117, 98 - rotate: 90 + bounds: 712, 317, 117, 98 girl-blue-cape/hair-bangs - bounds: 673, 419, 91, 40 + bounds: 313, 170, 91, 40 rotate: 90 girl-blue-cape/hair-head-side-back - bounds: 196, 331, 30, 52 - rotate: 90 + bounds: 544, 198, 30, 52 girl-blue-cape/hair-head-side-front - bounds: 738, 323, 41, 42 + bounds: 466, 127, 41, 42 girl-blue-cape/hair-side - bounds: 473, 3, 36, 71 + bounds: 175, 2, 36, 71 + rotate: 90 girl-blue-cape/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-spring-dress/hand-front-fingers - bounds: 509, 365, 19, 21 + bounds: 902, 207, 19, 21 girl-blue-cape/leg-front - bounds: 168, 72, 30, 158 + bounds: 519, 413, 30, 158 rotate: 90 girl-blue-cape/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-spring-dress/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl/mouth-smile - bounds: 736, 79, 29, 7 + bounds: 1015, 227, 29, 7 + rotate: 90 girl-blue-cape/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-spring-dress/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl/nose - bounds: 747, 264, 11, 7 + bounds: 342, 82, 11, 7 girl-blue-cape/sleeve-back - bounds: 767, 79, 42, 29 + bounds: 416, 95, 42, 29 girl-blue-cape/sleeve-front - bounds: 408, 76, 52, 119 + bounds: 249, 303, 52, 119 rotate: 90 girl-spring-dress/arm-front - bounds: 596, 282, 17, 111 + bounds: 829, 292, 17, 111 + rotate: 90 girl-spring-dress/back-eyebrow - bounds: 801, 420, 18, 12 + bounds: 309, 81, 18, 12 + rotate: 90 girl-spring-dress/body-up - bounds: 179, 4, 64, 66 + bounds: 66, 2, 64, 66 girl-spring-dress/cloak-down - bounds: 775, 27, 50, 50 + bounds: 758, 227, 50, 50 girl-spring-dress/cloak-up - bounds: 360, 7, 64, 58 - rotate: 90 + bounds: 628, 229, 64, 58 girl-spring-dress/eye-iris-back - bounds: 656, 264, 17, 17 + bounds: 342, 105, 17, 17 girl-spring-dress/eye-iris-front - bounds: 814, 492, 18, 18 + bounds: 487, 107, 18, 18 girl-spring-dress/front-eyebrow - bounds: 822, 472, 18, 12 - rotate: 90 + bounds: 323, 91, 18, 12 girl-spring-dress/hair-back - bounds: 196, 363, 147, 93 - rotate: 90 + bounds: 370, 417, 147, 93 girl-spring-dress/hair-bangs - bounds: 696, 326, 91, 40 - rotate: 90 + bounds: 829, 250, 91, 40 girl-spring-dress/hair-head-side-back - bounds: 529, 76, 30, 52 + bounds: 509, 126, 30, 52 girl-spring-dress/hair-head-side-front - bounds: 781, 323, 41, 42 + bounds: 816, 206, 41, 42 girl-spring-dress/hair-side - bounds: 511, 3, 36, 71 + bounds: 248, 2, 36, 71 + rotate: 90 girl-spring-dress/leg-front - bounds: 171, 104, 30, 158 + bounds: 831, 381, 30, 158 + rotate: 90 girl-spring-dress/neck - bounds: 138, 70, 20, 32 + bounds: 85, 70, 20, 32 girl-spring-dress/shoulder-ribbon - bounds: 622, 131, 36, 24 - rotate: 90 + bounds: 175, 44, 36, 24 girl-spring-dress/skirt - bounds: 113, 328, 182, 81 + bounds: 2, 80, 182, 81 rotate: 90 girl-spring-dress/underskirt - bounds: 2, 2, 175, 65 + bounds: 519, 445, 175, 65 girl/arm-front - bounds: 577, 395, 36, 115 + bounds: 712, 279, 36, 115 + rotate: 90 girl/back-eyebrow - bounds: 834, 492, 18, 12 + bounds: 309, 61, 18, 12 rotate: 90 girl/bag-base - bounds: 191, 264, 62, 58 - rotate: 90 + bounds: 694, 219, 62, 58 girl/bag-strap-front - bounds: 385, 265, 12, 96 + bounds: 370, 304, 12, 96 + rotate: 90 girl/bag-top - bounds: 738, 367, 49, 50 + bounds: 765, 175, 49, 50 girl/body - bounds: 356, 130, 97, 132 + bounds: 370, 318, 97, 132 + rotate: 90 girl/boot-ribbon-front - bounds: 539, 130, 13, 13 + bounds: 323, 64, 13, 13 girl/eye-iris-back - bounds: 821, 424, 17, 17 + bounds: 361, 105, 17, 17 girl/eye-iris-front - bounds: 812, 443, 18, 18 + bounds: 507, 106, 18, 18 girl/eye-white-back - bounds: 814, 5, 20, 16 - rotate: 90 + bounds: 665, 175, 20, 16 girl/front-eyebrow - bounds: 816, 400, 18, 12 - rotate: 90 + bounds: 343, 91, 18, 12 girl/hair-back - bounds: 291, 363, 147, 93 - rotate: 90 + bounds: 696, 417, 147, 93 girl/hair-bangs - bounds: 715, 419, 91, 40 - rotate: 90 + bounds: 922, 247, 91, 40 girl/hair-flap-down-front - bounds: 288, 5, 70, 65 + bounds: 415, 171, 70, 65 + rotate: 90 girl/hair-head-side-back - bounds: 561, 77, 30, 52 + bounds: 991, 381, 30, 52 girl/hair-head-side-front - bounds: 757, 419, 41, 42 - rotate: 90 + bounds: 859, 206, 41, 42 girl/hair-patch - bounds: 245, 4, 66, 41 + bounds: 132, 2, 66, 41 rotate: 90 girl/hair-side - bounds: 549, 3, 36, 71 + bounds: 692, 181, 36, 71 + rotate: 90 girl/hair-strand-back-1 - bounds: 684, 3, 58, 74 + bounds: 948, 289, 58, 74 + rotate: 90 girl/hair-strand-back-2 - bounds: 692, 171, 91, 58 + bounds: 355, 170, 91, 58 rotate: 90 girl/hair-strand-back-3 - bounds: 615, 323, 92, 79 - rotate: 90 + bounds: 215, 40, 92, 79 girl/hair-strand-front-1 - bounds: 518, 269, 38, 94 + bounds: 234, 263, 38, 94 + rotate: 90 girl/hair-strand-front-2 - bounds: 593, 79, 70, 50 + bounds: 576, 233, 70, 50 + rotate: 90 girl/hair-strand-front-3 - bounds: 705, 88, 44, 81 + bounds: 313, 124, 44, 81 + rotate: 90 girl/hand-front-fingers - bounds: 530, 365, 19, 21 + bounds: 923, 208, 19, 21 girl/hat - bounds: 608, 169, 93, 82 - rotate: 90 + bounds: 218, 179, 93, 82 girl/leg-front - bounds: 203, 104, 30, 158 -girl/pompom - bounds: 757, 462, 48, 43 + bounds: 831, 349, 30, 158 rotate: 90 +girl/pompom + bounds: 416, 126, 48, 43 girl/scarf - bounds: 455, 143, 119, 51 - rotate: 90 + bounds: 113, 264, 119, 51 girl/scarf-back - bounds: 420, 2, 72, 51 - rotate: 90 + bounds: 502, 252, 72, 51 girl/zip - bounds: 356, 109, 19, 25 - rotate: 90 + bounds: 816, 179, 19, 25 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 1c7c748eb7..b286cbfaee 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-pma_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Atlas.asset index 81efc7f4dc..745119ea0d 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Atlas.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Atlas.asset @@ -3,14 +3,17 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} m_Name: mix-and-match-pma_Atlas m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: 9b5072c1342a08b429b2bbfa38e83bab, type: 3} materials: - {fileID: 2100000, guid: f68af5332bca5ef49a0bb6a25be1a8e5, type: 2} 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 9f27b879ac..db848798b4 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": "5bSWDwjOkqw", - "spine": "4.1.23-beta", + "hash": "W2+S6fZzp+8", + "spine": "4.2.05-beta", "x": -240.58, "y": -3.38, "width": 410.36, @@ -11,8 +11,8 @@ }, "bones": [ { "name": "root" }, - { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff" }, - { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff" }, + { "name": "skeleton-control", "parent": "root", "x": -0.43, "y": 257.36, "color": "ff1111ff", "icon": "arrowsB" }, + { "name": "hips", "parent": "skeleton-control", "x": 3.06, "y": 29.29, "color": "ffce12ff", "icon": "diamond" }, { "name": "body-down", "parent": "hips", @@ -99,7 +99,8 @@ "x": -51.95, "y": -259.13, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up", "parent": "leg-control-front", "length": 144.38, "rotation": -99.42, "y": 0.45, "color": "d130ffff" }, { "name": "leg-down", "parent": "leg-up", "length": 144.38, "rotation": 8.86, "x": 144.38, "color": "d130ffff" }, @@ -111,14 +112,38 @@ { "name": "leg-front-6", "parent": "leg-front-5", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-7", "parent": "leg-front-6", "length": 35.95, "x": 35.95, "color": "65127cff" }, { "name": "leg-front-8", "parent": "leg-front-7", "length": 35.95, "x": 35.95, "color": "65127cff" }, - { "name": "head-control", "parent": "head", "rotation": -87.57, "x": 71.99, "y": -39.68, "color": "ffce12ff" }, - { "name": "head-back-control", "parent": "head", "rotation": -87.57, "x": 68.52, "y": 49.17, "color": "ffce12ff" }, - { "name": "features-control", "parent": "head", "rotation": -87.57, "x": 88.9, "y": -37.83, "color": "ff5826ff" }, - { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff" }, - { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff" }, - { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff" }, + { + "name": "head-control", + "parent": "head", + "rotation": -87.57, + "x": 71.99, + "y": -39.68, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "head-back-control", + "parent": "head", + "rotation": -87.57, + "x": 68.52, + "y": 49.17, + "color": "ffce12ff", + "icon": "arrowsB" + }, + { + "name": "features-control", + "parent": "head", + "rotation": -87.57, + "x": 88.9, + "y": -37.83, + "color": "ff5826ff", + "icon": "arrowUpDown" + }, + { "name": "eye-front", "parent": "features-control", "x": -52.2, "y": -35.32, "color": "ff2e2eff", "icon": "eye" }, + { "name": "eye-front-iris", "parent": "eye-front", "x": -2.45, "y": 18.5, "color": "ff2e2eff", "icon": "star" }, + { "name": "eye-front-up-eyelid-holder", "parent": "eye-front", "x": -23.12, "y": 25.84, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-up-eyelid", "parent": "eye-front-up-eyelid-holder", "length": 24.39, "rotation": 12.94, "color": "ff2e2eff" }, - { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff" }, + { "name": "eye-front-low-eyelid-holder", "parent": "eye-front", "x": -14.14, "y": 5.98, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "eye-front-low-eyelid", "parent": "eye-front-low-eyelid-holder", "length": 17.4, "rotation": -9.9, "color": "ff2e2eff" }, { "name": "eye-front-eyebrow", @@ -129,12 +154,12 @@ "y": 46.78, "color": "ff2e2eff" }, - { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff" }, - { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff" }, + { "name": "eye-back", "parent": "features-control", "x": 35.89, "y": -33.38, "color": "f64379ff", "icon": "eye" }, + { "name": "eye-back-up-eyelid-holder", "parent": "eye-back", "x": 13.06, "y": 27.2, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-up-eyelid", "parent": "eye-back-up-eyelid-holder", "length": 20.8, "rotation": 168.69, "color": "f64379ff" }, - { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff" }, + { "name": "eye-back-low-eyelid-holder", "parent": "eye-back", "x": 12.51, "y": 5.71, "color": "f64379ff", "icon": "arrowUpDown" }, { "name": "eye-back-low-eyelid", "parent": "eye-back-low-eyelid-holder", "length": 16.37, "rotation": -164.58, "color": "f64379ff" }, - { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff" }, + { "name": "eye-back-iris", "parent": "eye-back", "x": -4.9, "y": 17.41, "color": "f64379ff", "icon": "star" }, { "name": "eye-back-eyebrow", "parent": "eye-back", @@ -180,7 +205,15 @@ "y": -7.09, "color": "ffce12ff" }, - { "name": "hat-base", "parent": "head", "x": 136.74, "y": 38.65, "skin": true, "color": "b131ffff" }, + { + "name": "hat-base", + "parent": "head", + "x": 136.74, + "y": 38.65, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "hat", "parent": "hat-base", @@ -191,8 +224,24 @@ "skin": true, "color": "b131ffff" }, - { "name": "hat-control", "parent": "hat", "x": 65.29, "y": -6.95, "skin": true, "color": "b131ffff" }, - { "name": "pompom-control", "parent": "hat", "x": 150.97, "y": 0.35, "skin": true, "color": "b131ffff" }, + { + "name": "hat-control", + "parent": "hat", + "x": 65.29, + "y": -6.95, + "skin": true, + "color": "b131ffff", + "icon": "arrows" + }, + { + "name": "pompom-control", + "parent": "hat", + "x": 150.97, + "y": 0.35, + "skin": true, + "color": "b131ffff", + "icon": "arrowLeftRight" + }, { "name": "end-arm-control", "parent": "arm-front-down", "length": 26.6, "x": 74.55, "y": 0.24, "color": "ff3636ff" }, { "name": "backpack", @@ -204,7 +253,15 @@ "skin": true, "color": "b57dd9ff" }, - { "name": "backpack-control", "parent": "backpack", "x": 53.83, "y": -119.3, "skin": true, "color": "b57dd9ff" }, + { + "name": "backpack-control", + "parent": "backpack", + "x": 53.83, + "y": -119.3, + "skin": true, + "color": "b57dd9ff", + "icon": "arrows" + }, { "name": "bag", "parent": "body-up", @@ -215,7 +272,15 @@ "skin": true, "color": "e8afe7ff" }, - { "name": "bag-control", "parent": "bag", "x": 84.37, "y": 53.1, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-control", + "parent": "bag", + "x": 84.37, + "y": 53.1, + "skin": true, + "color": "e8afe7ff", + "icon": "arrows" + }, { "name": "bag-flap", "parent": "bag", @@ -236,7 +301,15 @@ "skin": true, "color": "69ff53ff" }, - { "name": "bag-strap-back", "parent": "arm-front-control", "x": -0.31, "y": 10.97, "skin": true, "color": "e8afe7ff" }, + { + "name": "bag-strap-back", + "parent": "arm-front-control", + "x": -0.31, + "y": 10.97, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" + }, { "name": "bag-back-down", "parent": "bag-control", @@ -244,9 +317,18 @@ "x": -31.08, "y": -10.86, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" + }, + { + "name": "bag-strap-front", + "parent": "arm-front-control", + "x": 2.82, + "y": -11.88, + "skin": true, + "color": "e8afe7ff", + "icon": "diamondB" }, - { "name": "bag-strap-front", "parent": "arm-front-control", "x": 2.82, "y": -11.88, "skin": true, "color": "e8afe7ff" }, { "name": "bag-back-front", "parent": "bag", @@ -254,7 +336,8 @@ "x": -18.37, "y": 34.05, "skin": true, - "color": "e8afe7ff" + "color": "e8afe7ff", + "icon": "diamondB" }, { "name": "zip-girl", @@ -276,7 +359,15 @@ "skin": true, "color": "ff4cf5ff" }, - { "name": "hair-holder-front", "parent": "body-up", "x": 100.57, "y": 80.62, "skin": true, "color": "06b8d8ff" }, + { + "name": "hair-holder-front", + "parent": "body-up", + "x": 100.57, + "y": 80.62, + "skin": true, + "color": "06b8d8ff", + "icon": "spiral" + }, { "name": "hair-strand-front-1", "parent": "hair-holder-front", @@ -297,7 +388,15 @@ "skin": true, "color": "06b7d875" }, - { "name": "hair-holder-back", "parent": "body-up", "x": 105.21, "y": -48.86, "skin": true, "color": "2a96c6ff" }, + { + "name": "hair-holder-back", + "parent": "body-up", + "x": 105.21, + "y": -48.86, + "skin": true, + "color": "2a96c6ff", + "icon": "spiral" + }, { "name": "hair-strand-back-1", "parent": "hair-holder-back", @@ -350,7 +449,7 @@ }, { "name": "eye-front-pupil", "parent": "eye-front", "x": -3.44, "y": 17.51, "color": "ff2e2eff" }, { "name": "eye-back-pupil", "parent": "eye-back", "x": -5.89, "y": 16.42, "color": "f64379ff" }, - { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff" }, + { "name": "eyelid-skin", "parent": "eye-front", "x": 1.06, "y": 41.21, "color": "ff2e2eff", "icon": "arrowUpDown" }, { "name": "arm-back-control", "parent": "body-up", "rotation": -94.33, "x": 73.75, "y": -67.88, "color": "321c9aff" }, { "name": "arm-back-up", @@ -418,7 +517,8 @@ "x": 38.54, "y": -259.75, "transform": "noRotationOrReflection", - "color": "d130ffff" + "color": "d130ffff", + "icon": "ik" }, { "name": "leg-up-back", "parent": "leg-control-back", "length": 144.38, "rotation": -92.95, "y": 0.45, "color": "8f0c5bff" }, { "name": "leg-down-back", "parent": "leg-up-back", "length": 144.38, "rotation": 3.48, "x": 144.38, "color": "8f0c5bff" }, @@ -519,9 +619,18 @@ "x": 4.35, "y": -26.24, "skin": true, - "color": "8dff00ff" + "color": "8dff00ff", + "icon": "triangle" + }, + { + "name": "skirt-control-up", + "parent": "skirt-control", + "x": -15.87, + "y": -0.12, + "skin": true, + "color": "09d627ff", + "icon": "triangle" }, - { "name": "skirt-control-up", "parent": "skirt-control", "x": -15.87, "y": -0.12, "skin": true, "color": "09d627ff" }, { "name": "skirt-rotation-back", "parent": "body-up", @@ -542,7 +651,7 @@ "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff" }, + { "name": "skirt-control-middle", "parent": "skirt-control-up", "x": -19.76, "skin": true, "color": "09d627ff", "icon": "triangle" }, { "name": "skirt-control-back", "parent": "skirt-rotation-back", @@ -550,7 +659,8 @@ "x": 148.43, "y": -0.72, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" }, { "name": "skirt-control-front", @@ -559,11 +669,36 @@ "x": 141.99, "y": 2.23, "skin": true, - "color": "09d627ff" + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-front-down", + "parent": "skirt-control-front", + "x": -45.51, + "y": -13.62, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "skirt-control-back-down", + "parent": "skirt-control-back", + "x": -47.46, + "y": 29.56, + "skin": true, + "color": "09d627ff", + "icon": "triangle" + }, + { + "name": "cape-red-front-inside", + "parent": "body-up", + "x": 32.8, + "y": -12.11, + "skin": true, + "color": "ff539eff", + "icon": "arrowUpDown" }, - { "name": "skirt-control-front-down", "parent": "skirt-control-front", "x": -45.51, "y": -13.62, "skin": true, "color": "09d627ff" }, - { "name": "skirt-control-back-down", "parent": "skirt-control-back", "x": -47.46, "y": 29.56, "skin": true, "color": "09d627ff" }, - { "name": "cape-red-front-inside", "parent": "body-up", "x": 32.8, "y": -12.11, "skin": true, "color": "ff539eff" }, { "name": "cape-front-rotator", "parent": "arm-front-up", @@ -581,7 +716,8 @@ "x": 47.43, "y": -0.24, "skin": true, - "color": "ff539eff" + "color": "ff539eff", + "icon": "arrowUpDown" }, { "name": "shouder-front-transform", "parent": "body-up", "rotation": -94.33, "x": 93.23, "y": 0.49, "color": "ffce12ff" }, { "name": "shoulder-front", "parent": "shouder-front-transform", "x": -43.57, "y": -0.76, "color": "ffce12ff" }, @@ -602,9 +738,18 @@ "x": 45.94, "y": 0.9, "skin": true, - "color": "93006dff" + "color": "93006dff", + "icon": "arrowLeftRight" + }, + { + "name": "cape-red-back-inside", + "parent": "body-up", + "x": 37.71, + "y": -42.92, + "skin": true, + "color": "93006dff", + "icon": "arrowUpDown" }, - { "name": "cape-red-back-inside", "parent": "body-up", "x": 37.71, "y": -42.92, "skin": true, "color": "93006dff" }, { "name": "shoulder-back-transform", "parent": "body-up", "rotation": -4.33, "x": 84.44, "y": -34.31, "color": "ffce12ff" }, { "name": "shoulder-back", "parent": "shoulder-back-transform", "x": 1.09, "y": -39.44, "color": "ffce12ff" }, { @@ -614,7 +759,8 @@ "x": 86.24, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-back", @@ -623,7 +769,8 @@ "x": 86.81, "y": -134.93, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-up-front", @@ -632,7 +779,8 @@ "x": -81.34, "y": -100.16, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-leg-down-front", @@ -641,7 +789,8 @@ "x": -83.05, "y": -132.65, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-front", @@ -650,7 +799,8 @@ "x": -112.69, "y": -254.06, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" }, { "name": "dress-control-foot-back", @@ -659,9 +809,18 @@ "x": 97.07, "y": -251.21, "skin": true, - "color": "ff7a45ff" + "color": "ff7a45ff", + "icon": "arrowUpDown" + }, + { + "name": "dress-control-middle", + "parent": "skeleton-control", + "x": -5.53, + "y": -254.06, + "skin": true, + "color": "ff7a45ff", + "icon": "arrowUpDown" }, - { "name": "dress-control-middle", "parent": "skeleton-control", "x": -5.53, "y": -254.06, "skin": true, "color": "ff7a45ff" }, { "name": "sleeve-control-front", "parent": "arm-front-up-7", @@ -670,7 +829,8 @@ "x": 37.64, "y": -41.32, "skin": true, - "color": "5e0202ff" + "color": "5e0202ff", + "icon": "handLeft" }, { "name": "sleeve-control-back", @@ -680,7 +840,8 @@ "x": 25.63, "y": 55.1, "skin": true, - "color": "02045eff" + "color": "02045eff", + "icon": "handLeft" }, { "name": "cape-blue-up", @@ -701,11 +862,51 @@ "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-middle", "parent": "cape-blue-down", "x": 168.33, "y": -1.52, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-front", "parent": "cape-blue-down-middle", "x": -19.01, "y": -133.73, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-down-back", "parent": "cape-blue-down-middle", "x": -10.01, "y": 121.12, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-front", "parent": "cape-blue-down", "x": 41.13, "y": -101.46, "skin": true, "color": "1130ff78" }, - { "name": "cape-blue-middle-back", "parent": "cape-blue-down", "x": 33.12, "y": 96.5, "skin": true, "color": "1130ff78" }, + { + "name": "cape-blue-down-middle", + "parent": "cape-blue-down", + "x": 168.33, + "y": -1.52, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-front", + "parent": "cape-blue-down-middle", + "x": -19.01, + "y": -133.73, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-down-back", + "parent": "cape-blue-down-middle", + "x": -10.01, + "y": 121.12, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-front", + "parent": "cape-blue-down", + "x": 41.13, + "y": -101.46, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, + { + "name": "cape-blue-middle-back", + "parent": "cape-blue-down", + "x": 33.12, + "y": 96.5, + "skin": true, + "color": "1130ff78", + "icon": "romanII" + }, { "name": "cape-blue-up-front", "parent": "cape-front-rotator", @@ -713,7 +914,8 @@ "x": 98.31, "y": 4.67, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-up-back", @@ -722,7 +924,8 @@ "x": 69.6, "y": -16.89, "skin": true, - "color": "1130ff78" + "color": "1130ff78", + "icon": "romanII" }, { "name": "cape-blue-control", @@ -731,9 +934,10 @@ "x": 179.82, "y": -1.71, "skin": true, - "color": "ff11b6ff" + "color": "ff11b6ff", + "icon": "arrows" }, - { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff" } + { "name": "mouth", "parent": "features-control", "x": -0.72, "y": -41.96, "color": "258effff", "icon": "mouth" } ], "slots": [ { "name": "sleeve-inner-back", "bone": "arm-back-down", "attachment": "sleeve-inner-back" }, @@ -1262,7 +1466,7 @@ }, { "name": "accessories/bag", - "bones": [ "bag-back-front", "bag-flap", "bag-strap-front", "bag-back-down", "bag-strap-back", "bag", "bag-control" ], + "bones": [ "bag-back-down", "bag-strap-back", "bag-flap", "bag", "bag-back-front", "bag-strap-front", "bag-control" ], "attachments": { "bag-base": { "bag-base": { @@ -1323,7 +1527,7 @@ }, { "name": "accessories/cape-blue", - "bones": [ "cape-blue-up", "cape-front-rotator", "cape-blue-control", "cape-blue-down-middle", "cape-blue-middle-back", "cape-blue-middle-front", "cape-blue-up-front", "cape-back-rotator", "cape-blue-down-back", "cape-blue-down-front", "cape-blue-down", "cape-blue-up-back" ], + "bones": [ "cape-back-rotator", "cape-blue-down", "cape-blue-middle-front", "cape-blue-up", "cape-blue-down-middle", "cape-blue-up-back", "cape-blue-down-front", "cape-blue-down-back", "cape-blue-control", "cape-blue-middle-back", "cape-blue-up-front", "cape-front-rotator" ], "attachments": { "cape-back": { "cape-back": { @@ -1411,7 +1615,7 @@ }, { "name": "accessories/cape-red", - "bones": [ "cape-red-front-inside", "cape-red-front-outside", "cape-front-rotator", "cape-red-back-outside", "cape-back-rotator", "cape-red-back-inside" ], + "bones": [ "cape-red-front-outside", "cape-back-rotator", "cape-red-front-inside", "cape-red-back-outside", "cape-red-back-inside", "cape-front-rotator" ], "attachments": { "cape-red-down": { "cape-red-down": { @@ -1449,7 +1653,7 @@ }, { "name": "accessories/hat-pointy-blue-yellow", - "bones": [ "pompom-control", "hat", "hat-control", "hat-base" ], + "bones": [ "hat", "pompom-control", "hat-base", "hat-control" ], "transform": [ "hat-control" ], "attachments": { "hat": { @@ -1475,7 +1679,7 @@ }, { "name": "accessories/hat-red-yellow", - "bones": [ "pompom-control", "hat", "hat-control", "hat-base" ], + "bones": [ "hat", "pompom-control", "hat-base", "hat-control" ], "transform": [ "hat-control" ], "attachments": { "hat": { @@ -1526,8 +1730,8 @@ }, { "name": "clothes/dress-blue", - "bones": [ "dress-control-leg-down-back", "dress-control-leg-up-back", "sleeve-control-front", "dress-control-leg-down-front", "sleeve-control-back", "dress-control-middle", "dress-control-foot-back", "dress-control-foot-front", "dress-control-leg-up-front" ], - "transform": [ "leg-down-front", "leg-up", "leg-down-back", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "dress-control-leg-down-front", "dress-control-leg-up-front", "dress-control-foot-back", "dress-control-foot-front", "dress-control-leg-down-back", "dress-control-middle", "dress-control-leg-up-back", "sleeve-control-back", "sleeve-control-front" ], + "transform": [ "leg-up", "leg-down-front", "leg-up-back", "leg-down-back", "leg-down-back-up", "leg-down-down" ], "attachments": { "arm-back": { "arm-back": { @@ -1615,7 +1819,7 @@ }, { "name": "clothes/dress-green", - "bones": [ "skirt-control-front-down", "skirt-control-up", "skirt-control-back-down", "skirt-control", "skirt-control-front", "skirt-control-back", "skirt-control-middle" ], + "bones": [ "skirt-control", "skirt-control-middle", "skirt-control-front", "skirt-control-front-down", "skirt-control-back-down", "skirt-control-back", "skirt-control-up" ], "attachments": { "body-up": { "body-up": { "name": "girl-spring-dress/body-up", "x": 59.16, "y": -14.67, "rotation": -94.33, "width": 128, "height": 131 } @@ -2110,7 +2314,7 @@ }, { "name": "full-skins/boy", - "bones": [ "hat-base", "pompom-control", "hat", "zip-boy", "hat-control", "backpack", "backpack-control" ], + "bones": [ "zip-boy", "backpack-control", "backpack", "hat", "pompom-control", "hat-base", "hat-control" ], "transform": [ "hat-control" ], "attachments": { "arm-back": { @@ -2535,8 +2739,8 @@ }, { "name": "full-skins/girl", - "bones": [ "bag-back-front", "bag-flap", "hair-strand-back-1", "hair-strand-back-3", "hat", "pompom-control", "zip-girl", "bag-strap-front", "hair-holder-front", "scarf-back", "bag-back-down", "hat-control", "bag-strap-back", "hair-strand-front-2", "hair-strand-front-3", "hair-holder-back", "bag", "hair-strand-front-4", "bag-control", "hair-strand-front-1", "hair-strand-back-2", "hat-base" ], - "transform": [ "hat-control", "leg-down-back-up", "leg-up-back" ], + "bones": [ "bag-back-down", "hair-strand-front-3", "hair-strand-front-2", "scarf-back", "hat", "hair-strand-back-2", "zip-girl", "bag-strap-back", "hair-strand-front-1", "bag-flap", "hair-strand-back-3", "pompom-control", "bag", "hair-holder-back", "bag-back-front", "bag-strap-front", "hair-holder-front", "hair-strand-back-1", "hat-base", "hat-control", "hair-strand-front-4", "bag-control" ], + "transform": [ "leg-up-back", "leg-down-back-up", "hat-control" ], "attachments": { "arm-back": { "arm-back": { "name": "girl/arm-front", "type": "linkedmesh", "skin": "full-skins/boy", "parent": "arm-back", "width": 71, "height": 229 } @@ -3033,8 +3237,8 @@ }, { "name": "full-skins/girl-blue-cape", - "bones": [ "cape-blue-up", "dress-control-leg-up-front", "dress-control-leg-down-back", "sleeve-control-front", "dress-control-leg-up-back", "cape-front-rotator", "cape-blue-control", "cape-blue-down-middle", "cape-blue-middle-back", "cape-blue-middle-front", "dress-control-leg-down-front", "dress-control-middle", "sleeve-control-back", "cape-blue-up-front", "cape-back-rotator", "cape-blue-down-back", "cape-blue-down-front", "dress-control-foot-back", "cape-blue-down", "dress-control-foot-front", "cape-blue-up-back" ], - "transform": [ "leg-down-front", "leg-up", "leg-down-back", "leg-down-back-up", "leg-down-down", "leg-up-back" ], + "bones": [ "cape-back-rotator", "cape-blue-down", "dress-control-leg-down-front", "dress-control-leg-up-front", "dress-control-middle", "cape-blue-middle-front", "dress-control-foot-back", "cape-blue-up", "dress-control-foot-front", "dress-control-leg-down-back", "sleeve-control-back", "cape-blue-down-middle", "cape-blue-up-back", "cape-blue-down-front", "dress-control-leg-up-back", "sleeve-control-front", "cape-blue-down-back", "cape-blue-control", "cape-blue-middle-back", "cape-blue-up-front", "cape-front-rotator" ], + "transform": [ "leg-up", "leg-down-front", "leg-up-back", "leg-down-back", "leg-down-back-up", "leg-down-down" ], "attachments": { "arm-back": { "arm-back": { @@ -3527,8 +3731,8 @@ }, { "name": "full-skins/girl-spring-dress", - "bones": [ "cape-red-front-inside", "skirt-control-front-down", "cape-red-front-outside", "cape-front-rotator", "skirt-control-back-down", "skirt-control-up", "skirt-rotation-back", "skirt-control", "cape-red-back-outside", "cape-back-rotator", "skirt-rotation-front", "skirt-control-middle", "skirt-control-front", "skirt-control-back", "cape-red-back-inside" ], - "transform": [ "skirt-rotation-back", "skirt-rotation-front" ], + "bones": [ "cape-red-front-outside", "skirt-control", "skirt-control-middle", "cape-back-rotator", "cape-red-front-inside", "skirt-control-front", "skirt-control-front-down", "skirt-control-back-down", "skirt-rotation-front", "cape-red-back-outside", "skirt-rotation-back", "skirt-control-back", "skirt-control-up", "cape-red-back-inside", "cape-front-rotator" ], + "transform": [ "skirt-rotation-front", "skirt-rotation-back" ], "attachments": { "arm-back": { "arm-back": { @@ -4256,7 +4460,7 @@ }, { "name": "hair/long-blue-with-scarf", - "bones": [ "hair-strand-back-1", "hair-strand-back-3", "hair-holder-front", "scarf-back", "hair-strand-front-2", "hair-holder-back", "hair-strand-front-3", "hair-strand-front-1", "hair-strand-front-4", "hair-strand-back-2" ], + "bones": [ "hair-strand-front-3", "hair-strand-front-2", "scarf-back", "hair-strand-back-2", "hair-strand-front-1", "hair-strand-back-3", "hair-holder-back", "hair-holder-front", "hair-strand-back-1", "hair-strand-front-4" ], "attachments": { "ear": { "ear": { "name": "girl/ear", "x": 56.58, "y": 85.63, "rotation": -87.57, "width": 38, "height": 45 } diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.atlas.txt index 5b4981c802..456015eafc 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.atlas.txt +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.atlas.txt @@ -4,98 +4,91 @@ raptor-pma.png pma: true scale: 0.5 back-arm - bounds: 829, 88, 46, 25 - rotate: 90 + bounds: 895, 295, 46, 25 back-bracer - bounds: 195, 238, 39, 28 + bounds: 992, 216, 39, 28 rotate: 90 back-hand - bounds: 724, 140, 36, 34 - rotate: 90 + bounds: 594, 58, 36, 34 back-knee - bounds: 760, 131, 49, 67 + bounds: 729, 86, 49, 67 rotate: 90 back-thigh - bounds: 225, 238, 39, 24 - rotate: 90 + bounds: 379, 2, 39, 24 eyes-open - bounds: 975, 204, 47, 45 + bounds: 902, 194, 47, 45 + rotate: 90 front-arm - bounds: 969, 112, 48, 26 + bounds: 945, 306, 48, 26 front-bracer - bounds: 724, 97, 41, 29 - rotate: 90 + bounds: 949, 197, 41, 29 front-hand - bounds: 251, 239, 41, 38 + bounds: 949, 266, 41, 38 front-open-hand - bounds: 856, 76, 43, 44 - rotate: 90 + bounds: 875, 148, 43, 44 front-thigh - bounds: 729, 178, 57, 29 + bounds: 793, 171, 57, 29 rotate: 90 gun - bounds: 894, 251, 107, 103 + bounds: 379, 28, 107, 103 + rotate: 90 gun-nohand - bounds: 764, 241, 105, 102 + bounds: 487, 87, 105, 102 head - bounds: 756, 345, 136, 149 + bounds: 807, 361, 136, 149 lower-leg - bounds: 475, 237, 73, 98 - rotate: 90 + bounds: 827, 195, 73, 98 mouth-grind - bounds: 975, 172, 47, 30 + bounds: 920, 145, 47, 30 + rotate: 90 mouth-smile - bounds: 975, 140, 47, 30 + bounds: 992, 257, 47, 30 + rotate: 90 neck - bounds: 366, 282, 18, 21 + bounds: 359, 114, 18, 21 raptor-back-arm - bounds: 636, 97, 82, 86 - rotate: 90 + bounds: 653, 142, 82, 86 raptor-body - bounds: 2, 2, 632, 233 + bounds: 2, 277, 632, 233 raptor-front-arm - bounds: 871, 168, 81, 102 + bounds: 484, 4, 81, 102 rotate: 90 raptor-front-leg - bounds: 2, 237, 191, 257 + bounds: 2, 18, 191, 257 raptor-hindleg-back - bounds: 195, 279, 169, 215 + bounds: 636, 295, 169, 215 raptor-horn - bounds: 431, 312, 182, 80 - rotate: 90 + bounds: 195, 22, 182, 80 raptor-horn-back - bounds: 513, 318, 176, 77 + bounds: 945, 334, 176, 77 rotate: 90 raptor-jaw - bounds: 894, 356, 126, 138 + bounds: 359, 137, 126, 138 raptor-jaw-tooth - bounds: 294, 240, 37, 48 + bounds: 895, 322, 37, 48 rotate: 90 raptor-mouth-inside - bounds: 344, 241, 36, 41 + bounds: 949, 228, 36, 41 rotate: 90 raptor-saddle-strap-back - bounds: 575, 242, 54, 74 -raptor-saddle-strap-front - bounds: 764, 182, 57, 95 + bounds: 653, 86, 54, 74 rotate: 90 +raptor-saddle-strap-front + bounds: 594, 94, 57, 95 raptor-saddle-w-shadow - bounds: 592, 323, 162, 171 + bounds: 195, 104, 162, 171 raptor-tail-shadow - bounds: 366, 305, 189, 63 - rotate: 90 + bounds: 636, 230, 189, 63 raptor-tongue - bounds: 387, 239, 86, 64 + bounds: 807, 295, 86, 64 stirrup-back - bounds: 829, 136, 44, 35 + bounds: 952, 151, 44, 35 rotate: 90 stirrup-front - bounds: 866, 121, 45, 50 - rotate: 90 + bounds: 902, 243, 45, 50 stirrup-strap - bounds: 918, 120, 49, 46 + bounds: 824, 147, 49, 46 torso - bounds: 636, 181, 54, 91 - rotate: 90 + bounds: 737, 137, 54, 91 visor - bounds: 631, 237, 131, 84 + bounds: 487, 191, 131, 84 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.png index 6d03497724..0448b24a69 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Atlas.asset index 3e0c402e26..c938e729c0 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Atlas.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Atlas.asset @@ -3,14 +3,17 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} m_Name: raptor-pma_Atlas m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: 237a4ac5be7ab634ea6b20fcab00aa97, type: 3} materials: - {fileID: 2100000, guid: 3d645292a7b9c7547bf7b14caa569410, type: 2} 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 bd04cccd47..7ac3fb12d4 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": "AAVlM3uJh3s", - "spine": "4.1.23-beta", + "hash": "PPErx2B6aMg", + "spine": "4.2.05-beta", "x": -809.16, "y": -73.54, "width": 1287.65, @@ -129,8 +129,8 @@ "y": -0.01, "color": "e07800ff" }, - { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff" }, - { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff" }, + { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff", "icon": "ik" }, + { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg1", "parent": "hip", @@ -309,8 +309,16 @@ "y": 0.2, "color": "15ff00ff" }, - { "name": "front-foot-target", "parent": "root", "rotation": -6.96, "x": -45.8, "y": -28.67, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff" }, + { + "name": "front-foot-target", + "parent": "root", + "rotation": -6.96, + "x": -45.8, + "y": -28.67, + "color": "ff3f00ff", + "icon": "ik" + }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg1", "parent": "hip", @@ -512,8 +520,24 @@ "y": -0.21, "color": "fff200ff" }, - { "name": "head-control", "parent": "head", "rotation": -95.04, "x": 42.32, "y": -220.33, "color": "219517ff" }, - { "name": "leg-control", "parent": "front-leg1", "rotation": 53.14, "x": 172.97, "y": 4.16, "color": "1d8020ff" } + { + "name": "head-control", + "parent": "head", + "rotation": -95.04, + "x": 42.32, + "y": -220.33, + "color": "219517ff", + "icon": "arrows" + }, + { + "name": "leg-control", + "parent": "front-leg1", + "rotation": 53.14, + "x": 172.97, + "y": 4.16, + "color": "1d8020ff", + "icon": "arrows" + } ], "slots": [ { "name": "back-hand", "bone": "back-hand2", "attachment": "back-hand" }, 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 1ea41c3f73..a84f56072d 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": "MBDs/ftbFOk", - "spine": "4.1.23-beta", + "hash": "ZcxTLmki+zw", + "spine": "4.2.05-beta", "x": -190.61, "y": -7.99, "width": 419.76, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png index 307419941c..a709dd363e 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Atlas.asset index f094e27c2c..672760e41c 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Atlas.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Atlas.asset @@ -3,14 +3,17 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} m_Name: spineboy-pro_Atlas m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: 9b2378ddc54f1c94fb80411958000a8c, type: 3} materials: - {fileID: 2100000, guid: f89bbf05902e77242a3ad20f3c927353, type: 2} diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat index c2b19ea1d9..e9a0166929 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat @@ -2,19 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: spineboy-pro_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_ShaderKeywords: + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -22,9 +28,11 @@ Material: m_Texture: {fileID: 2800000, guid: 4ea2c33e839afb34c98f66e892b3b2d2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Cutoff: 0.1 - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 - _OutlineSmoothness: 1 - _OutlineWidth: 3 @@ -35,3 +43,4 @@ Material: - _Use8Neighbourhood: 1 m_Colors: - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + m_BuildTextureStacks: [] 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 1c93b8e4c8..4fbe74163e 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": "fJ3tj/bl3Iw", - "spine": "4.1.23-beta", + "hash": "KTQ/KXo4uYI", + "spine": "4.2.05-beta", "x": -221.22, "y": -8.55, "width": 371.09, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.atlas.txt b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.atlas.txt index b1ebac5bd6..b5eb277915 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.atlas.txt +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.atlas.txt @@ -3,69 +3,63 @@ spineboy.png filter: Linear, Linear pma: true eye_indifferent - bounds: 2, 460, 93, 89 + bounds: 550, 694, 93, 89 eye_surprised - bounds: 462, 492, 93, 89 + bounds: 834, 856, 93, 89 front_bracer - bounds: 907, 472, 58, 80 - rotate: 90 + bounds: 678, 774, 58, 80 front_fist_closed - bounds: 652, 499, 75, 82 -front_fist_open - bounds: 729, 470, 86, 87 + bounds: 466, 593, 75, 82 rotate: 90 +front_fist_open + bounds: 550, 605, 86, 87 front_foot - bounds: 2, 551, 126, 69 + bounds: 550, 785, 126, 69 front_foot_bend1 - bounds: 952, 689, 128, 70 + bounds: 375, 492, 128, 70 rotate: 90 front_foot_bend2 - bounds: 911, 594, 108, 93 -front_shin - bounds: 766, 735, 82, 184 + bounds: 275, 330, 108, 93 rotate: 90 +front_shin + bounds: 466, 670, 82, 184 front_thigh - bounds: 249, 572, 48, 112 - rotate: 90 + bounds: 214, 208, 48, 112 front_upper_arm - bounds: 363, 566, 54, 97 - rotate: 90 + bounds: 214, 109, 54, 97 goggles - bounds: 466, 583, 261, 166 + bounds: 466, 856, 261, 166 gun - bounds: 766, 819, 210, 203 + bounds: 2, 117, 210, 203 head - bounds: 466, 751, 271, 298 - rotate: 90 + bounds: 2, 322, 271, 298 mouth_grind - bounds: 355, 505, 93, 59 + bounds: 929, 896, 93, 59 mouth_oooo - bounds: 557, 522, 93, 59 + bounds: 929, 835, 93, 59 mouth_smile - bounds: 557, 461, 93, 59 + bounds: 447, 532, 93, 59 muzzle bounds: 2, 622, 462, 400 neck - bounds: 978, 986, 36, 41 - rotate: 90 + bounds: 796, 819, 36, 41 rear_bracer - bounds: 652, 441, 56, 72 - rotate: 90 + bounds: 738, 788, 56, 72 rear_foot - bounds: 909, 532, 113, 60 + bounds: 2, 2, 113, 60 + rotate: 90 rear_foot_bend1 - bounds: 130, 554, 117, 66 + bounds: 64, 49, 117, 66 rear_foot_bend2 - bounds: 130, 469, 103, 83 + bounds: 729, 862, 103, 83 rear_shin - bounds: 729, 558, 75, 178 + bounds: 729, 947, 75, 178 rotate: 90 rear_thigh - bounds: 249, 505, 65, 104 + bounds: 909, 957, 65, 104 rotate: 90 rear_upper_arm - bounds: 818, 509, 47, 87 + bounds: 447, 483, 47, 87 rotate: 90 torso - bounds: 729, 635, 98, 180 - rotate: 90 + bounds: 275, 440, 98, 180 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png index 68b1e7fe60..ae295f6368 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Atlas.asset index 6938779a2c..38068e0bc8 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Atlas.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Atlas.asset @@ -3,14 +3,17 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} m_Name: spineboy_Atlas m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: 5c0a5c36970a46e4d8378760ab4a4cfc, type: 3} materials: - {fileID: 2100000, guid: 1455e88fdb81ccc45bdeaedd657bad4d, type: 2} 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 d28fab0de7..efb59d2fe9 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": "d53R1Ina68Q", - "spine": "4.1.23-beta", + "hash": "8oaRkSKcddw", + "spine": "4.2.05-beta", "x": -252.71, "y": -232.55, "width": 456.71, diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png index aa45d5cc0f..cf85243fc0 100644 Binary files a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png and b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png differ diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Atlas.asset index a24c4b3a7b..25ec648721 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Atlas.asset +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Atlas.asset @@ -3,14 +3,17 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} m_Name: whirlyblendmodes_Atlas m_EditorClassIdentifier: + textureLoadingMode: 0 + onDemandTextureLoader: {fileID: 0} atlasFile: {fileID: 4900000, guid: 188756a89517d7649a67fb53606220f5, type: 3} materials: - {fileID: 2100000, guid: e162c08da1abc294cb851248f51dfc40, type: 2} diff --git a/spine-unity/Assets/Spine Examples/package.json b/spine-unity/Assets/Spine Examples/package.json index 79a1178571..6d64e9ad5f 100644 --- a/spine-unity/Assets/Spine Examples/package.json +++ b/spine-unity/Assets/Spine Examples/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.spine-unity-examples", "displayName": "spine-unity Runtime Examples", "description": "This plugin provides example scenes and scripts for the spine-unity runtime.", - "version": "4.2.22", + "version": "4.2.23", "unity": "2018.3", "author": { "name": "Esoteric Software", diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs index 53ca35d23c..808c32cc0b 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs @@ -532,7 +532,7 @@ public static SkeletonGraphic InstantiateSkeletonGraphic (SkeletonDataAsset skel graphic.Initialize(false); if (skin != null) graphic.Skeleton.SetSkin(skin); graphic.initialSkinName = skin.Name; - graphic.Skeleton.UpdateWorldTransform(); + graphic.Skeleton.UpdateWorldTransform(Skeleton.Physics.Update); graphic.UpdateMesh(); return graphic; } diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityBoneInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityBoneInspector.cs index 82ac1625d2..0aafcef6b3 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityBoneInspector.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityBoneInspector.cs @@ -213,7 +213,7 @@ public override void OnInspectorGUI () { GUILayout.Space(30); string buttonLabel = box.IsWeighted() ? box.Name + " (!)" : box.Name; if (GUILayout.Button(buttonLabel, GUILayout.Width(200))) { - utilityBone.bone.Skeleton.UpdateWorldTransform(); + utilityBone.bone.Skeleton.UpdateWorldTransform(Skeleton.Physics.Update); Transform bbTransform = utilityBone.transform.Find("[BoundingBox]" + box.Name); // Use FindChild in older versions of Unity. if (bbTransform != null) { PolygonCollider2D originalCollider = bbTransform.GetComponent(); diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs index ee4a68d2d9..682d67e262 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs @@ -1357,7 +1357,7 @@ public static SkeletonAnimation InstantiateSkeletonAnimation (SkeletonDataAsset newSkeletonAnimation.loop = SpineEditorUtilities.Preferences.defaultInstantiateLoop; newSkeletonAnimation.state.Update(0); newSkeletonAnimation.state.Apply(newSkeletonAnimation.skeleton); - newSkeletonAnimation.skeleton.UpdateWorldTransform(); + newSkeletonAnimation.skeleton.UpdateWorldTransform(Skeleton.Physics.Update); return newSkeletonAnimation; } @@ -1440,7 +1440,7 @@ public static SkeletonMecanim InstantiateSkeletonMecanim (SkeletonDataAsset skel throw e; } - newSkeletonMecanim.skeleton.UpdateWorldTransform(); + newSkeletonMecanim.skeleton.UpdateWorldTransform(Skeleton.Physics.Update); newSkeletonMecanim.LateUpdate(); return newSkeletonMecanim; diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs index 316cda832a..be36773dab 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs @@ -614,7 +614,7 @@ internal static Mesh ExtractWeightedMeshAttachment (string name, MeshAttachment throw new System.ArgumentException("Mesh is not weighted.", "attachment"); Skeleton skeleton = new Skeleton(skeletonData); - skeleton.UpdateWorldTransform(); + skeleton.UpdateWorldTransform(Skeleton.Physics.Update); float[] floatVerts = new float[attachment.WorldVerticesLength]; attachment.ComputeWorldVertices(skeleton.Slots.Items[slotIndex], floatVerts); @@ -835,7 +835,7 @@ static void BakeBoneConstraints (Bone bone, Spine.Animation animation, Animation bool inheritRotation = bone.Data.TransformMode.InheritsRotation(); animation.Apply(skeleton, 0, 0, false, null, 1f, MixBlend.Setup, MixDirection.In); - skeleton.UpdateWorldTransform(); + skeleton.UpdateWorldTransform(Skeleton.Physics.Update); float duration = animation.Duration; AnimationCurve curve = new AnimationCurve(); @@ -863,7 +863,7 @@ static void BakeBoneConstraints (Bone bone, Spine.Animation animation, Animation currentTime = duration; animation.Apply(skeleton, 0, currentTime, true, null, 1f, MixBlend.Setup, MixDirection.In); - skeleton.UpdateWorldTransform(); + skeleton.UpdateWorldTransform(Skeleton.Physics.Update); int pIndex = listIndex; @@ -1449,7 +1449,7 @@ static void ParseRotateTimeline (Skeleton skeleton, RotateTimeline timeline, Ani float time = frames[f]; timeline.Apply(skeleton, lastTime, currentTime, null, 1, MixBlend.Setup, MixDirection.In); - skeleton.UpdateWorldTransform(); + skeleton.UpdateWorldTransform(Skeleton.Physics.Update); rotation = frames[f + 1] + boneData.Rotation; angle += Mathf.DeltaAngle(angle, rotation); @@ -1463,7 +1463,7 @@ static void ParseRotateTimeline (Skeleton skeleton, RotateTimeline timeline, Ani currentTime = time; timeline.Apply(skeleton, lastTime, currentTime, null, 1, MixBlend.Setup, MixDirection.In); - skeleton.UpdateWorldTransform(); + skeleton.UpdateWorldTransform(Skeleton.Physics.Update); pk = keys[listIndex]; rotation = bone.Rotation; diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonDebugWindow.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonDebugWindow.cs index 309db484bb..6fd34acc78 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonDebugWindow.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonDebugWindow.cs @@ -436,6 +436,30 @@ void OnGUI () { EditorGUILayout.LabelField(SpineInspectorUtility.TempContent(string.Format("Path Constraints ({0})", skeleton.PathConstraints.Count), Icons.constraintPath), EditorStyles.boldLabel); + EditorGUILayout.LabelField(SpineInspectorUtility.TempContent(string.Format("Physics Constraints ({0})", skeleton.PhysicsConstraints.Count), Icons.constraintIK), EditorStyles.boldLabel); + using (new SpineInspectorUtility.IndentScope()) { + if (skeleton.PhysicsConstraints.Count > 0) { + foreach (PhysicsConstraint c in skeleton.PhysicsConstraints) { + EditorGUILayout.LabelField(SpineInspectorUtility.TempContent(c.Data.Name, Icons.constraintIK)); + + EditorGUI.BeginChangeCheck(); + c.Mix = EditorGUILayout.Slider("Mix", c.Mix, MixMin, MixMax); + c.Inertia = EditorGUILayout.Slider("Inertia", c.Inertia, MixMin, MixMax); + c.Strength = EditorGUILayout.Slider("Strength", c.Strength, MixMin, MixMax); + c.Damping = EditorGUILayout.Slider("Damping", c.Damping, MixMin, MixMax); + c.MassInverse = 1.0f / EditorGUILayout.Slider("Mass", 1.0f / c.MassInverse, MixMin, MixMax); + c.Wind = EditorGUILayout.Slider("Wind", c.Wind, MixMin, MixMax); + c.Gravity = EditorGUILayout.Slider("Gravity", c.Gravity, MixMin, MixMax); + if (EditorGUI.EndChangeCheck()) requireRepaint = true; + + EditorGUILayout.Space(); + } + + } else { + EditorGUILayout.LabelField(NoneText); + } + } + EditorGUI.BeginChangeCheck(); showPaths = EditorGUILayout.Toggle("Show Paths", showPaths); requireRepaint |= EditorGUI.EndChangeCheck(); 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 1898dae4a4..421eecd311 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, 1, 0 } }; - static readonly int[][] compatibleJsonVersions = { new[] { 4, 1, 0 } }; + static readonly int[][] compatibleBinaryVersions = { new[] { 4, 2, 0 } }; + static readonly int[][] compatibleJsonVersions = { new[] { 4, 2, 0 } }; static bool wasVersionDialogShown = false; static readonly Regex jsonVersionRegex = new Regex(@"""spine""\s*:\s*""([^""]+)""", RegexOptions.CultureInvariant); diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/RootMotion/SkeletonRootMotionBase.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/RootMotion/SkeletonRootMotionBase.cs index f9a00ecfc5..f7825ec31a 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/RootMotion/SkeletonRootMotionBase.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/RootMotion/SkeletonRootMotionBase.cs @@ -213,7 +213,7 @@ protected virtual void PhysicsUpdate (bool skeletonAnimationUsesFixedUpdate) { Vector2 parentBoneScale; GetScaleAffectingRootMotion(out parentBoneScale); ClearEffectiveBoneOffsets(parentBoneScale); - skeletonComponent.Skeleton.UpdateWorldTransform(); + skeletonComponent.Skeleton.UpdateWorldTransform(Skeleton.Physics.Update); } ClearRigidbodyTempMovement(); @@ -605,7 +605,7 @@ void ApplyTransformConstraints () { // apply the constraint and sets Bone.ax, Bone.ay and Bone.arotation values. /// Update is based on Bone.x, Bone.y and Bone.rotation, so skeleton.UpdateWorldTransform() /// can be called afterwards without having a different starting point. - constraint.Update(); + constraint.Update(Skeleton.Physics.Update); } } diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonAnimation.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonAnimation.cs index 087dabd760..b3d4d0aa4d 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonAnimation.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonAnimation.cs @@ -236,7 +236,7 @@ public void Update (float deltaTime) { state.ApplyEventTimelinesOnly(skeleton, issueEvents: false); return; } - ApplyAnimation(); + ApplyAnimation(deltaTime); } protected void UpdateAnimationStatus (float deltaTime) { @@ -244,7 +244,7 @@ protected void UpdateAnimationStatus (float deltaTime) { state.Update(deltaTime); } - protected void ApplyAnimation () { + protected void ApplyAnimation (float deltaTime) { if (_BeforeApply != null) _BeforeApply(this); @@ -253,6 +253,7 @@ protected void ApplyAnimation () { else state.ApplyEventTimelinesOnly(skeleton, issueEvents: true); + skeleton.Update(deltaTime); AfterAnimationApplied(); } @@ -260,11 +261,11 @@ public void AfterAnimationApplied () { if (_UpdateLocal != null) _UpdateLocal(this); - skeleton.UpdateWorldTransform(); + UpdateWorldTransform(); if (_UpdateWorld != null) { _UpdateWorld(this); - skeleton.UpdateWorldTransform(); + UpdateWorldTransform(); } if (_UpdateComplete != null) { diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs index 90d7529de0..7fca455825 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs @@ -357,7 +357,7 @@ public virtual void Update (float deltaTime) { state.ApplyEventTimelinesOnly(skeleton, issueEvents: false); return; } - ApplyAnimation(); + ApplyAnimation(deltaTime); } protected void SyncSubmeshGraphicsWithCanvasRenderers () { @@ -383,7 +383,7 @@ protected void UpdateAnimationStatus (float deltaTime) { state.Update(deltaTime); } - protected void ApplyAnimation () { + protected void ApplyAnimation (float deltaTime) { if (BeforeApply != null) BeforeApply(this); @@ -392,6 +392,7 @@ protected void ApplyAnimation () { else state.ApplyEventTimelinesOnly(skeleton, issueEvents: true); + skeleton.Update(deltaTime); AfterAnimationApplied(); } @@ -399,17 +400,21 @@ public void AfterAnimationApplied () { if (UpdateLocal != null) UpdateLocal(this); - skeleton.UpdateWorldTransform(); + UpdateWorldTransform(); if (UpdateWorld != null) { UpdateWorld(this); - skeleton.UpdateWorldTransform(); + UpdateWorldTransform(); } if (UpdateComplete != null) UpdateComplete(this); } + protected void UpdateWorldTransform () { + skeleton.UpdateWorldTransform(Skeleton.Physics.Update); + } + public void LateUpdate () { if (!this.IsValid) return; // instantiation can happen from Update() after this component, leading to a missing Update() call. diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs index fa17e9d98d..529c4d9185 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs @@ -101,32 +101,32 @@ public override void Initialize (bool overwrite, bool quiet = false) { public virtual void Update () { if (!valid || updateTiming != UpdateTiming.InUpdate) return; - UpdateAnimation(); + UpdateAnimation(Time.deltaTime); } public virtual void FixedUpdate () { if (!valid || updateTiming != UpdateTiming.InFixedUpdate) return; - UpdateAnimation(); + UpdateAnimation(Time.deltaTime); } /// Manual animation update. Required when updateTiming is set to ManualUpdate. /// Ignored parameter. public virtual void Update (float deltaTime) { if (!valid) return; - UpdateAnimation(); + UpdateAnimation(deltaTime); } - protected void UpdateAnimation () { + protected void UpdateAnimation (float deltaTime) { wasUpdatedAfterInit = true; // animation status is kept by Mecanim Animator component if (updateMode <= UpdateMode.OnlyAnimationStatus) return; - ApplyAnimation(); + ApplyAnimation(deltaTime); } - protected void ApplyAnimation () { + protected void ApplyAnimation (float deltaTime) { if (_BeforeApply != null) _BeforeApply(this); @@ -148,27 +148,28 @@ protected void ApplyAnimation () { #else translator.Apply(skeleton); #endif + skeleton.Update(deltaTime); + AfterAnimationApplied(); + } - // UpdateWorldTransform and Bone Callbacks - { - if (_UpdateLocal != null) - _UpdateLocal(this); - - skeleton.UpdateWorldTransform(); + public void AfterAnimationApplied () { + if (_UpdateLocal != null) + _UpdateLocal(this); - if (_UpdateWorld != null) { - _UpdateWorld(this); - skeleton.UpdateWorldTransform(); - } + UpdateWorldTransform(); - if (_UpdateComplete != null) - _UpdateComplete(this); + if (_UpdateWorld != null) { + _UpdateWorld(this); + UpdateWorldTransform(); } + + if (_UpdateComplete != null) + _UpdateComplete(this); } public override void LateUpdate () { if (updateTiming == UpdateTiming.InLateUpdate && valid && translator != null && translator.Animator != null) - UpdateAnimation(); + UpdateAnimation(Time.deltaTime); // instantiation can happen from Update() after this component, leading to a missing Update() call. if (!wasUpdatedAfterInit) Update(); base.LateUpdate(); diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs index ebdcb7e583..b2c2123cc0 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs @@ -423,7 +423,7 @@ public virtual void Initialize (bool overwrite, bool quiet = false) { // Generate mesh once, required to update mesh bounds for visibility UpdateMode updateModeSaved = updateMode; updateMode = UpdateMode.FullUpdate; - skeleton.UpdateWorldTransform(); + UpdateWorldTransform(); LateUpdate(); updateMode = updateModeSaved; @@ -439,6 +439,10 @@ public virtual void Initialize (bool overwrite, bool quiet = false) { #endif } + protected virtual void UpdateWorldTransform () { + skeleton.UpdateWorldTransform(Skeleton.Physics.Update); + } + /// /// Generates a new UnityEngine.Mesh from the internal Skeleton. public virtual void LateUpdate () { diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Mesh Generation/MeshRendererBuffers.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Mesh Generation/MeshRendererBuffers.cs index e17e582d52..2b037a7c13 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Mesh Generation/MeshRendererBuffers.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Mesh Generation/MeshRendererBuffers.cs @@ -107,7 +107,7 @@ public void Dispose () { doubleBufferedMesh = null; } - ///This is a Mesh that also stores the instructions SkeletonRenderer generated for it. + /// This is a Mesh that also stores the instructions SkeletonRenderer generated for it. public class SmartMesh : IDisposable { public Mesh mesh = SpineMesh.NewSkeletonMesh(); public SkeletonRendererInstruction instructionUsed = new SkeletonRendererInstruction(); diff --git a/spine-unity/Assets/Spine/package.json b/spine-unity/Assets/Spine/package.json index 98d74ac68d..a0aae04ee5 100644 --- a/spine-unity/Assets/Spine/package.json +++ b/spine-unity/Assets/Spine/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.spine-unity", "displayName": "spine-unity Runtime", "description": "This plugin provides the spine-unity runtime core.", - "version": "4.2.31", + "version": "4.2.32", "unity": "2018.3", "author": { "name": "Esoteric Software", diff --git a/spine-unity/Assets/Spine/version.txt b/spine-unity/Assets/Spine/version.txt index e75dccddda..869bb59971 100644 --- a/spine-unity/Assets/Spine/version.txt +++ b/spine-unity/Assets/Spine/version.txt @@ -1 +1 @@ -This Spine-Unity runtime works with data exported from Spine Editor version: 4.1.xx \ No newline at end of file +This Spine-Unity runtime works with data exported from Spine Editor version: 4.2.xx \ No newline at end of file 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 bd04cccd47..7ac3fb12d4 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": "AAVlM3uJh3s", - "spine": "4.1.23-beta", + "hash": "PPErx2B6aMg", + "spine": "4.2.05-beta", "x": -809.16, "y": -73.54, "width": 1287.65, @@ -129,8 +129,8 @@ "y": -0.01, "color": "e07800ff" }, - { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff" }, - { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff" }, + { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff", "icon": "ik" }, + { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg1", "parent": "hip", @@ -309,8 +309,16 @@ "y": 0.2, "color": "15ff00ff" }, - { "name": "front-foot-target", "parent": "root", "rotation": -6.96, "x": -45.8, "y": -28.67, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff" }, + { + "name": "front-foot-target", + "parent": "root", + "rotation": -6.96, + "x": -45.8, + "y": -28.67, + "color": "ff3f00ff", + "icon": "ik" + }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg1", "parent": "hip", @@ -512,8 +520,24 @@ "y": -0.21, "color": "fff200ff" }, - { "name": "head-control", "parent": "head", "rotation": -95.04, "x": 42.32, "y": -220.33, "color": "219517ff" }, - { "name": "leg-control", "parent": "front-leg1", "rotation": 53.14, "x": 172.97, "y": 4.16, "color": "1d8020ff" } + { + "name": "head-control", + "parent": "head", + "rotation": -95.04, + "x": 42.32, + "y": -220.33, + "color": "219517ff", + "icon": "arrows" + }, + { + "name": "leg-control", + "parent": "front-leg1", + "rotation": 53.14, + "x": 172.97, + "y": 4.16, + "color": "1d8020ff", + "icon": "arrows" + } ], "slots": [ { "name": "back-hand", "bone": "back-hand2", "attachment": "back-hand" }, diff --git a/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor.atlas.txt b/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor.atlas.txt index 89cf60341e..a0723d67a7 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor.atlas.txt +++ b/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor.atlas.txt @@ -3,98 +3,91 @@ raptor.png filter: Linear, Linear scale: 0.5 back-arm - bounds: 829, 88, 46, 25 - rotate: 90 + bounds: 895, 295, 46, 25 back-bracer - bounds: 195, 238, 39, 28 + bounds: 992, 216, 39, 28 rotate: 90 back-hand - bounds: 724, 140, 36, 34 - rotate: 90 + bounds: 594, 58, 36, 34 back-knee - bounds: 760, 131, 49, 67 + bounds: 729, 86, 49, 67 rotate: 90 back-thigh - bounds: 225, 238, 39, 24 - rotate: 90 + bounds: 379, 2, 39, 24 eyes-open - bounds: 975, 204, 47, 45 + bounds: 902, 194, 47, 45 + rotate: 90 front-arm - bounds: 969, 112, 48, 26 + bounds: 945, 306, 48, 26 front-bracer - bounds: 724, 97, 41, 29 - rotate: 90 + bounds: 949, 197, 41, 29 front-hand - bounds: 251, 239, 41, 38 + bounds: 949, 266, 41, 38 front-open-hand - bounds: 856, 76, 43, 44 - rotate: 90 + bounds: 875, 148, 43, 44 front-thigh - bounds: 729, 178, 57, 29 + bounds: 793, 171, 57, 29 rotate: 90 gun - bounds: 894, 251, 107, 103 + bounds: 379, 28, 107, 103 + rotate: 90 gun-nohand - bounds: 764, 241, 105, 102 + bounds: 487, 87, 105, 102 head - bounds: 756, 345, 136, 149 + bounds: 807, 361, 136, 149 lower-leg - bounds: 475, 237, 73, 98 - rotate: 90 + bounds: 827, 195, 73, 98 mouth-grind - bounds: 975, 172, 47, 30 + bounds: 920, 145, 47, 30 + rotate: 90 mouth-smile - bounds: 975, 140, 47, 30 + bounds: 992, 257, 47, 30 + rotate: 90 neck - bounds: 366, 282, 18, 21 + bounds: 359, 114, 18, 21 raptor-back-arm - bounds: 636, 97, 82, 86 - rotate: 90 + bounds: 653, 142, 82, 86 raptor-body - bounds: 2, 2, 632, 233 + bounds: 2, 277, 632, 233 raptor-front-arm - bounds: 871, 168, 81, 102 + bounds: 484, 4, 81, 102 rotate: 90 raptor-front-leg - bounds: 2, 237, 191, 257 + bounds: 2, 18, 191, 257 raptor-hindleg-back - bounds: 195, 279, 169, 215 + bounds: 636, 295, 169, 215 raptor-horn - bounds: 431, 312, 182, 80 - rotate: 90 + bounds: 195, 22, 182, 80 raptor-horn-back - bounds: 513, 318, 176, 77 + bounds: 945, 334, 176, 77 rotate: 90 raptor-jaw - bounds: 894, 356, 126, 138 + bounds: 359, 137, 126, 138 raptor-jaw-tooth - bounds: 294, 240, 37, 48 + bounds: 895, 322, 37, 48 rotate: 90 raptor-mouth-inside - bounds: 344, 241, 36, 41 + bounds: 949, 228, 36, 41 rotate: 90 raptor-saddle-strap-back - bounds: 575, 242, 54, 74 -raptor-saddle-strap-front - bounds: 764, 182, 57, 95 + bounds: 653, 86, 54, 74 rotate: 90 +raptor-saddle-strap-front + bounds: 594, 94, 57, 95 raptor-saddle-w-shadow - bounds: 592, 323, 162, 171 + bounds: 195, 104, 162, 171 raptor-tail-shadow - bounds: 366, 305, 189, 63 - rotate: 90 + bounds: 636, 230, 189, 63 raptor-tongue - bounds: 387, 239, 86, 64 + bounds: 807, 295, 86, 64 stirrup-back - bounds: 829, 136, 44, 35 + bounds: 952, 151, 44, 35 rotate: 90 stirrup-front - bounds: 866, 121, 45, 50 - rotate: 90 + bounds: 902, 243, 45, 50 stirrup-strap - bounds: 918, 120, 49, 46 + bounds: 824, 147, 49, 46 torso - bounds: 636, 181, 54, 91 - rotate: 90 + bounds: 737, 137, 54, 91 visor - bounds: 631, 237, 131, 84 + bounds: 487, 191, 131, 84 diff --git a/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor.png b/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor.png index 474f6316bc..af3658a386 100644 Binary files a/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor.png and b/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor.png differ 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 006f2d5a84..2fe9bacd2c 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": "QqiPXGOfONE", - "spine": "4.1.23-beta", + "hash": "ZCd/c3RDCPk", + "spine": "4.2.05-beta", "x": -100.47, "y": -9.21, "width": 260.65, @@ -11,7 +11,7 @@ }, "bones": [ { "name": "root" }, - { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff" }, + { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff", "icon": "ik" }, { "name": "hip", "parent": "root", "x": 28.61, "y": 289.9, "color": "ffbd00ff" }, { "name": "spine1", @@ -117,7 +117,7 @@ "transform": "noScale", "color": "ff0000ff" }, - { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff" }, + { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg-ik1", "parent": "hip", @@ -202,7 +202,7 @@ }, { "name": "belly", "parent": "spine1", "x": 35.94, "y": -37.69, "color": "ffbd00ff" }, { "name": "butt", "parent": "hip", "x": -32.67, "y": -1.88, "color": "ffbd00ff" }, - { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff" }, + { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-arm-ik1", "parent": "spine4", @@ -263,7 +263,7 @@ }, { "name": "front-foot2", "parent": "front-foot1", "length": 29.12, "rotation": 9.61, "x": 26.3, "color": "50ff00ff" }, { "name": "front-foot3", "parent": "front-foot2", "length": 23.49, "rotation": 8.91, "x": 29.12, "color": "50ff00ff" }, - { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff" }, + { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg-ik1", "parent": "hip", @@ -489,7 +489,7 @@ "back-arm": { "type": "mesh", "uvs": [ 0.74522, 0.00989, 0.64111, 0.05762, 0.56303, 0.1559, 0.42509, 0.25886, 0.28974, 0.359, 0.22988, 0.49565, 0.21166, 0.60797, 0.21166, 0.69782, 0.16481, 0.78674, 0.14139, 0.84757, 0.02427, 0.88501, 0.0529, 0.91871, 0.37824, 0.98797, 0.60468, 0.98235, 0.6307, 0.9056, 0.73481, 0.87752, 0.63591, 0.81762, 0.55262, 0.74181, 0.38084, 0.69876, 0.37824, 0.60797, 0.39906, 0.50876, 0.51358, 0.38521, 0.66194, 0.28881, 0.85454, 0.18398, 0.97687, 0.07541, 0.9144, 0.00989 ], - "triangles": [ 11, 9, 12, 9, 8, 12, 12, 8, 18, 13, 12, 14, 12, 18, 17, 18, 8, 7, 14, 12, 17, 11, 10, 9, 14, 16, 15, 14, 17, 16, 7, 19, 18, 7, 6, 19, 6, 5, 19, 19, 5, 20, 5, 4, 20, 20, 4, 21, 4, 3, 21, 21, 3, 22, 3, 2, 22, 22, 2, 23, 2, 1, 23, 23, 1, 24, 1, 0, 24, 0, 25, 24 ], + "triangles": [ 14, 17, 16, 14, 16, 15, 11, 10, 9, 14, 12, 17, 18, 8, 7, 12, 18, 17, 13, 12, 14, 12, 8, 18, 9, 8, 12, 11, 9, 12, 6, 5, 19, 7, 6, 19, 7, 19, 18, 20, 4, 21, 5, 4, 20, 19, 5, 20, 3, 2, 22, 21, 3, 22, 4, 3, 21, 0, 25, 24, 1, 0, 24, 23, 1, 24, 2, 1, 23, 22, 2, 23 ], "vertices": [ 1, 9, -7.68, -11.48, 1, 1, 9, 4.09, -13.63, 1, 1, 9, 23.49, -9.36, 1, 1, 10, 13.44, -9.23, 1, 2, 10, 35.2, -9.62, 0.50649, 11, -0.58, -9.66, 0.49351, 1, 11, 26.04, -6.39, 1, 1, 12, 14.15, -6.11, 1, 2, 12, 31.54, -5.57, 0.66493, 13, -3.33, -5.03, 0.33507, 1, 13, 13.08, -11.25, 1, 1, 13, 24.41, -14.89, 1, 1, 13, 30.15, -24.52, 1, 1, 13, 36.93, -23.54, 1, 1, 13, 54.08, -2.33, 1, 1, 13, 55.73, 14.15, 1, 1, 13, 41.39, 18.48, 1, 1, 13, 37.29, 26.87, 1, 1, 13, 24.66, 21.67, 1, 1, 13, 9.18, 18.1, 1, 2, 12, 31.33, 6.78, 0.47881, 13, -1.11, 7.12, 0.52119, 1, 12, 13.77, 6.04, 1, 2, 11, 24.98, 6.17, 0.89218, 12, -5.48, 6.96, 0.10782, 2, 10, 32.6, 7.29, 0.59842, 11, -0.32, 7.45, 0.40158, 1, 10, 11.08, 8.85, 1, 1, 9, 17.89, 11.88, 1, 1, 9, -4.82, 9.46, 1, 1, 9, -13.69, -0.69, 1 ], "hull": 26, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 46, 48, 48, 50, 0, 50, 2, 48, 4, 46, 6, 44, 8, 42, 10, 40, 12, 38, 14, 36 ], @@ -509,7 +509,7 @@ "back-leg": { "type": "mesh", "uvs": [ 0.502, 0.01179, 0.36076, 0.06379, 0.4057, 0.15046, 0.44743, 0.23916, 0.47953, 0.32991, 0.51163, 0.42269, 0.52127, 0.50629, 0.48274, 0.58888, 0.41212, 0.66025, 0.3126, 0.74182, 0.2163, 0.81625, 0.1232, 0.89272, 0.00763, 0.97429, 0.29655, 0.98958, 0.47407, 0.99222, 0.64004, 0.99468, 0.80989, 0.9896, 0.91291, 0.98652, 1, 0.95797, 0.8333, 0.94681, 0.71067, 0.9386, 0.57123, 0.92031, 0.41533, 0.89986, 0.3447, 0.89272, 0.36885, 0.87178, 0.42817, 0.82033, 0.502, 0.74794, 0.58226, 0.66943, 0.6593, 0.59092, 0.72993, 0.50528, 0.76524, 0.42167, 0.78129, 0.32481, 0.78771, 0.23406, 0.78771, 0.13924, 0.72351, 0.03728, 0.60152, 0.00567, 0.82117, 0.96898, 0.67873, 0.96396, 0.52111, 0.9574, 0.35936, 0.94214, 0.19388, 0.92922, 0.25375, 0.88159, 0.32792, 0.8184 ], - "triangles": [ 17, 36, 19, 17, 16, 36, 16, 37, 36, 17, 19, 18, 36, 20, 19, 15, 37, 16, 14, 38, 15, 15, 38, 37, 37, 20, 36, 38, 21, 37, 37, 21, 20, 38, 22, 21, 13, 39, 14, 14, 39, 38, 12, 40, 13, 13, 40, 39, 39, 22, 38, 40, 23, 39, 39, 23, 22, 12, 11, 40, 40, 41, 23, 40, 11, 41, 23, 41, 24, 11, 10, 41, 41, 42, 24, 41, 10, 42, 24, 42, 25, 26, 25, 9, 10, 9, 42, 25, 42, 9, 9, 8, 26, 26, 8, 27, 8, 7, 27, 27, 7, 28, 7, 6, 28, 28, 6, 29, 6, 5, 29, 29, 5, 30, 30, 5, 31, 31, 5, 4, 31, 4, 32, 32, 4, 3, 32, 3, 33, 3, 2, 33, 2, 34, 33, 2, 1, 34, 34, 0, 35, 34, 1, 0 ], + "triangles": [ 36, 20, 19, 17, 19, 18, 16, 37, 36, 17, 16, 36, 17, 36, 19, 38, 22, 21, 37, 21, 20, 38, 21, 37, 37, 20, 36, 15, 38, 37, 14, 38, 15, 15, 37, 16, 39, 23, 22, 40, 23, 39, 39, 22, 38, 13, 40, 39, 12, 40, 13, 14, 39, 38, 13, 39, 14, 9, 8, 26, 25, 42, 9, 10, 9, 42, 26, 25, 9, 24, 42, 25, 41, 10, 42, 41, 42, 24, 11, 10, 41, 23, 41, 24, 40, 11, 41, 40, 41, 23, 12, 11, 40, 26, 8, 27, 6, 5, 29, 28, 6, 29, 7, 6, 28, 27, 7, 28, 8, 7, 27, 29, 5, 30, 31, 5, 4, 30, 5, 31, 32, 4, 3, 31, 4, 32, 34, 1, 0, 34, 0, 35, 2, 1, 34, 2, 34, 33, 3, 2, 33, 32, 3, 33 ], "vertices": [ 1, 20, -19.79, -5.67, 1, 2, 20, -5.62, -22.28, 0.83363, 21, -41.07, -23.3, 0.16637, 2, 20, 22.31, -21.98, 0.65187, 21, -13.17, -21.89, 0.34813, 3, 20, 50.83, -22.11, 0.3172, 21, 15.33, -20.87, 0.43086, 22, -19.67, -21.09, 0.25193, 4, 20, 79.85, -23.29, 0.10792, 21, 44.37, -20.89, 0.35417, 22, 9.3, -19.2, 0.3192, 23, -25.22, -20.06, 0.21872, 4, 21, 74.06, -20.98, 0.16486, 22, 38.93, -17.34, 0.32776, 23, 4.09, -15.38, 0.29831, 24, -30.1, -17.16, 0.20907, 3, 22, 65.54, -17.61, 0.17523, 23, 30.6, -13.11, 0.39173, 24, -4.12, -11.42, 0.43304, 3, 23, 57.03, -15.71, 0.19718, 24, 22.43, -10.53, 0.52971, 25, -12.97, -9.81, 0.27311, 3, 24, 46.05, -13.47, 0.40991, 25, 10.84, -10.17, 0.34747, 26, -24.93, -10.51, 0.24261, 3, 24, 73.39, -18.69, 0.19432, 25, 38.58, -12.41, 0.37177, 26, 2.9, -10.99, 0.43391, 3, 25, 64.06, -14.98, 0.16664, 26, 28.49, -11.94, 0.56756, 27, -7.53, -11.48, 0.2658, 3, 26, 54.58, -12.37, 0.52114, 27, 18.56, -10.93, 0.36168, 14, -3.08, 24.95, 0.11718, 4, 26, 82.97, -14.36, 0.35144, 27, 47.01, -11.86, 0.29521, 14, -13.07, -1.67, 0.25118, 15, -46.3, 1.83, 0.10216, 1, 14, 16.37, -4.67, 1, 2, 14, 34.32, -4.37, 0.53487, 15, 0.74, -4.44, 0.46513, 3, 14, 51.1, -4.08, 0.14611, 15, 17.5, -5.42, 0.54314, 16, -15.51, -2.75, 0.31075, 2, 15, 34.67, -4.01, 0.40714, 16, 1.65, -4.36, 0.59286, 2, 15, 45.09, -3.16, 0.25726, 16, 12.05, -5.34, 0.74274, 2, 15, 53.99, 5.81, 0.25311, 16, 22.38, 1.94, 0.74689, 2, 15, 37.19, 9.56, 0.4029, 16, 6.5, 8.57, 0.5971, 3, 14, 57.07, 14.17, 0.13352, 15, 24.84, 12.33, 0.54644, 16, -5.18, 13.44, 0.32004, 4, 26, 47.09, 33.11, 0.13131, 14, 42.64, 19.08, 0.26349, 15, 10.82, 18.31, 0.49746, 16, -17.94, 21.78, 0.10773, 4, 26, 46.46, 16.09, 0.21159, 27, 9.37, 17.21, 0.1068, 14, 26.51, 24.57, 0.44951, 15, -4.85, 25.01, 0.23211, 3, 26, 46.8, 8.62, 0.40111, 27, 10, 9.75, 0.24543, 14, 19.24, 26.38, 0.35346, 3, 26, 39.71, 8.61, 0.5825, 27, 2.91, 9.47, 0.30792, 14, 21.25, 33.18, 0.10958, 3, 25, 59.17, 5.89, 0.21955, 26, 22.27, 8.58, 0.57946, 27, -14.51, 8.8, 0.20099, 3, 24, 71.84, 0.47, 0.21583, 25, 34.96, 6.47, 0.32263, 26, -1.92, 7.63, 0.46154, 3, 24, 45.81, 3.96, 0.40554, 25, 8.71, 7.12, 0.38602, 26, -28.17, 6.61, 0.20845, 3, 23, 56.79, 2.13, 0.25409, 24, 19.83, 7.12, 0.53006, 25, -17.46, 7.46, 0.21585, 3, 22, 66.18, 3.45, 0.22414, 23, 29.23, 7.92, 0.34135, 24, -8.25, 9.24, 0.43451, 4, 21, 76.6, 4.51, 0.19364, 22, 39.78, 8.26, 0.28887, 23, 2.49, 10.19, 0.33579, 24, -35.06, 7.97, 0.1817, 4, 20, 82.88, 7.08, 0.11658, 21, 46.18, 9.58, 0.35727, 22, 9.09, 11.32, 0.35745, 23, -28.36, 10.3, 0.16869, 3, 20, 54.46, 12.11, 0.35357, 21, 17.57, 13.46, 0.44494, 22, -19.71, 13.32, 0.20149, 2, 20, 24.65, 16.69, 0.65438, 21, -12.4, 16.85, 0.34562, 2, 20, -8.38, 15.21, 0.85331, 21, -45.34, 14.05, 0.14669, 1, 20, -20.19, 4.56, 1, 2, 15, 35.89, 2.53, 0.4051, 16, 3.99, 1.87, 0.5949, 3, 14, 54.38, 5.92, 0.13921, 15, 21.52, 4.3, 0.54495, 16, -9.85, 6.12, 0.31584, 2, 14, 37.79, 7.63, 0.44939, 15, 5.1, 7.27, 0.55061, 3, 26, 65.39, 20.7, 0.11858, 14, 20.6, 11.35, 0.75134, 15, -11.76, 12.27, 0.13008, 3, 26, 65.41, 1.81, 0.3968, 27, 24.3, 0.23, 0.28258, 14, 2.07, 14.98, 0.32063, 3, 26, 48.01, 0.08, 0.55395, 27, 6.94, -0.33, 0.33293, 14, 3.38, 30.47, 0.11312, 3, 25, 65.95, -2.97, 0.19447, 26, 24.96, -1.58, 0.57382, 27, -15.99, -0.43, 0.23171 ], "hull": 36, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 34, 36, 44, 46, 50, 52, 52, 54, 54, 56, 56, 58, 58, 60, 60, 62, 62, 64, 64, 66, 66, 68, 68, 70, 0, 70, 4, 66, 2, 68, 40, 42, 42, 44, 26, 28, 28, 30, 46, 48, 48, 50, 36, 38, 38, 40, 30, 32, 32, 34, 18, 52, 16, 54, 14, 56, 12, 58, 10, 60, 8, 62, 6, 64, 32, 72, 72, 38, 30, 74, 74, 40, 72, 74, 28, 76, 76, 42, 74, 76, 26, 78, 78, 44, 76, 78, 24, 80, 80, 46, 78, 80, 22, 82, 82, 48, 80, 82, 20, 84, 84, 50, 82, 84 ], @@ -529,7 +529,7 @@ "body": { "type": "mesh", "uvs": [ 0.35966, 0.01351, 0.26864, 0.04108, 0.26204, 0.0954, 0.34119, 0.14478, 0.39792, 0.19457, 0.40451, 0.24272, 0.38077, 0.27893, 0.3597, 0.3004, 0.34119, 0.31926, 0.34989, 0.34326, 0.35834, 0.36658, 0.36552, 0.40164, 0.37234, 0.43499, 0.38397, 0.4944, 0.3956, 0.55971, 0.39884, 0.59858, 0.40142, 0.62955, 0.40216, 0.65662, 0.3461, 0.71564, 0.27077, 0.78176, 0.2201, 0.82128, 0.17618, 0.85553, 0.13115, 0.88833, 0.08238, 0.92385, 0.00342, 0.9796, 0.18836, 0.99127, 0.32172, 0.99284, 0.46266, 0.99451, 0.61643, 0.98608, 0.71618, 0.97182, 0.61851, 0.95821, 0.48967, 0.95043, 0.39458, 0.94083, 0.27772, 0.92904, 0.23408, 0.9232, 0.26692, 0.89774, 0.30681, 0.86681, 0.34203, 0.83415, 0.38369, 0.7955, 0.45642, 0.72874, 0.52708, 0.66845, 0.56032, 0.63345, 0.57541, 0.60109, 0.59357, 0.56214, 0.61643, 0.49732, 0.63513, 0.43963, 0.64345, 0.40462, 0.77081, 0.39011, 0.84585, 0.37025, 0.90983, 0.35331, 0.9674, 0.31915, 0.97302, 0.28585, 0.96448, 0.23351, 0.8952, 0.1681, 0.79346, 0.12643, 0.75179, 0.10879, 0.71799, 0.09448, 0.66817, 0.07237, 0.61343, 0.04807, 0.47868, 0.01411, 0.49846, 0.38826, 0.66315, 0.34728, 0.67333, 0.30664, 0.8188, 0.29655, 0.80971, 0.24505, 0.72829, 0.17902, 0.68147, 0.13902, 0.59191, 0.09711, 0.3904, 0.09012, 0.53695, 0.14981, 0.57563, 0.19616, 0.64483, 0.25077, 0.79855, 0.33476, 0.61751, 0.97167, 0.4773, 0.97061, 0.23795, 0.95673, 0.15272, 0.92355, 0.14158, 0.94886, 0.23861, 0.86092, 0.51732, 0.30354, 0.50696, 0.34527, 0.50634, 0.43735, 0.50334, 0.4959, 0.51086, 0.32558, 0.50355, 0.41057, 0.19543, 0.89241, 0.36492, 0.9641 ], - "triangles": [ 1, 0, 59, 58, 1, 59, 68, 1, 58, 2, 1, 68, 67, 68, 58, 67, 58, 57, 67, 57, 56, 66, 67, 56, 66, 56, 55, 3, 2, 68, 69, 68, 67, 3, 68, 69, 69, 67, 66, 66, 55, 54, 65, 66, 54, 65, 54, 53, 4, 3, 69, 70, 69, 66, 4, 69, 70, 70, 66, 65, 5, 4, 70, 71, 70, 65, 5, 70, 71, 6, 71, 62, 79, 6, 62, 7, 6, 79, 71, 6, 5, 83, 7, 79, 8, 7, 83, 83, 79, 62, 9, 8, 83, 80, 9, 83, 61, 83, 62, 61, 62, 72, 80, 83, 61, 46, 80, 61, 46, 61, 47, 62, 71, 64, 64, 65, 53, 64, 53, 52, 71, 65, 64, 63, 64, 52, 63, 52, 51, 62, 64, 63, 50, 63, 51, 72, 62, 63, 72, 63, 50, 49, 72, 50, 48, 72, 49, 47, 61, 72, 47, 72, 48, 74, 32, 31, 86, 32, 74, 73, 31, 30, 74, 31, 73, 73, 30, 29, 28, 74, 73, 28, 73, 29, 27, 86, 74, 27, 74, 28, 26, 86, 27, 75, 33, 86, 24, 23, 77, 25, 77, 75, 24, 77, 25, 26, 75, 86, 25, 75, 26, 22, 21, 85, 85, 78, 35, 34, 85, 35, 76, 22, 85, 76, 85, 34, 23, 22, 76, 77, 23, 76, 77, 76, 34, 77, 34, 33, 75, 77, 33, 86, 33, 32, 36, 78, 20, 21, 20, 78, 37, 36, 20, 85, 21, 78, 35, 78, 36, 38, 18, 39, 19, 18, 38, 37, 19, 38, 20, 19, 37, 40, 17, 16, 41, 40, 16, 39, 17, 40, 18, 17, 39, 42, 15, 14, 43, 42, 14, 41, 16, 15, 42, 41, 15, 14, 13, 82, 43, 82, 44, 14, 82, 43, 12, 11, 84, 45, 81, 84, 12, 84, 81, 46, 45, 84, 13, 12, 81, 82, 13, 81, 44, 81, 45, 82, 81, 44, 10, 9, 80, 60, 10, 80, 11, 10, 60, 60, 80, 46, 84, 60, 46, 11, 60, 84 ], + "triangles": [ 2, 1, 68, 68, 1, 58, 58, 1, 59, 1, 0, 59, 69, 67, 66, 3, 68, 69, 69, 68, 67, 3, 2, 68, 66, 56, 55, 66, 67, 56, 67, 57, 56, 67, 58, 57, 67, 68, 58, 5, 70, 71, 71, 70, 65, 5, 4, 70, 70, 66, 65, 4, 69, 70, 70, 69, 66, 4, 3, 69, 65, 54, 53, 65, 66, 54, 66, 55, 54, 46, 61, 47, 46, 80, 61, 80, 83, 61, 61, 62, 72, 61, 83, 62, 80, 9, 83, 9, 8, 83, 83, 79, 62, 8, 7, 83, 83, 7, 79, 71, 6, 5, 7, 6, 79, 79, 6, 62, 6, 71, 62, 47, 72, 48, 47, 61, 72, 48, 72, 49, 49, 72, 50, 72, 63, 50, 72, 62, 63, 50, 63, 51, 62, 64, 63, 63, 52, 51, 63, 64, 52, 71, 65, 64, 64, 53, 52, 64, 65, 53, 62, 71, 64, 26, 86, 27, 27, 74, 28, 27, 86, 74, 28, 73, 29, 28, 74, 73, 73, 30, 29, 74, 31, 73, 73, 31, 30, 86, 32, 74, 74, 32, 31, 25, 75, 26, 26, 75, 86, 24, 77, 25, 25, 77, 75, 24, 23, 77, 75, 33, 86, 86, 33, 32, 75, 77, 33, 77, 34, 33, 77, 76, 34, 77, 23, 76, 23, 22, 76, 76, 85, 34, 76, 22, 85, 34, 85, 35, 85, 78, 35, 22, 21, 85, 35, 78, 36, 85, 21, 78, 37, 36, 20, 21, 20, 78, 36, 78, 20, 20, 19, 37, 37, 19, 38, 19, 18, 38, 38, 18, 39, 18, 17, 39, 39, 17, 40, 41, 40, 16, 40, 17, 16, 42, 41, 15, 41, 16, 15, 43, 42, 14, 42, 15, 14, 14, 82, 43, 43, 82, 44, 14, 13, 82, 82, 81, 44, 44, 81, 45, 82, 13, 81, 13, 12, 81, 46, 45, 84, 12, 84, 81, 45, 81, 84, 12, 11, 84, 11, 60, 84, 84, 60, 46, 60, 80, 46, 11, 10, 60, 60, 10, 80, 10, 9, 80 ], "vertices": [ 1, 6, 30.85, 2.45, 1, 2, 5, 60.42, 12.42, 0.24859, 6, 22.32, 18.18, 0.75141, 2, 5, 39.47, 25.25, 0.44332, 6, -1.06, 25.72, 0.55668, 3, 4, 48.03, 29.46, 0.37431, 5, 14.55, 26.45, 0.47619, 6, -25.57, 21.02, 0.1495, 3, 3, 50.36, 32.58, 0.11243, 4, 24.29, 26.8, 0.64611, 5, -8.99, 30.5, 0.24146, 3, 44, -45.22, -8.81, 0.10611, 3, 28.69, 30.4, 0.49533, 4, 2.89, 30.85, 0.39856, 3, 44, -28.91, -12.45, 0.25802, 3, 12.15, 32.8, 0.60894, 4, -12.29, 37.84, 0.13304, 3, 44, -18.5, -14.05, 0.28714, 3, 2.34, 35.98, 0.51935, 29, -7.6, 18.95, 0.19351, 4, 44, -10.79, -18.35, 0.28478, 28, -42.03, 75.56, 0.10295, 3, -6.36, 37.32, 0.37494, 29, -10.2, 10.26, 0.23733, 3, 44, 0.92, -16.96, 0.34087, 3, -17.28, 35.45, 0.32141, 29, -8.2, -0.67, 0.33772, 4, 44, 10.64, -16.32, 0.32691, 45, -24.05, -14.9, 0.16082, 3, -27.58, 33.67, 0.14432, 29, -6.37, -11.05, 0.36794, 4, 44, 28.5, -15.63, 0.24237, 45, -9.55, -15.11, 0.27028, 46, -45.51, -19.12, 0.12132, 29, -3.65, -27.88, 0.36603, 4, 44, 41.59, -14.89, 0.21761, 45, 6.93, -15.35, 0.33285, 46, -26.85, -17.49, 0.20377, 29, -1.3, -43.28, 0.24577, 3, 45, 33.83, -15.81, 0.47179, 46, 0, -15.85, 0.42627, 47, -31.79, -17.82, 0.10194, 3, 45, 63.39, -16.48, 0.2126, 46, 29.52, -14.22, 0.42737, 47, -2.43, -14.39, 0.36002, 3, 46, 49.79, -15.51, 0.30179, 47, 14.85, -13.08, 0.47127, 48, -21.15, -15.64, 0.22695, 3, 46, 61.1, -13.41, 0.15443, 47, 29.03, -11.65, 0.50848, 48, -3.27, -12.45, 0.33708, 2, 47, 41.24, -10.8, 0.28079, 48, 8.41, -8.79, 0.71921, 2, 48, 36.24, -8.59, 0.56513, 49, -3.02, -8.84, 0.43487, 3, 48, 67.93, -10.06, 0.16322, 49, 28.69, -7.82, 0.53712, 50, -8.12, -7.7, 0.29966, 3, 49, 47.76, -8.47, 0.40201, 50, 10.97, -7.9, 0.45131, 51, -26.34, -6.21, 0.14668, 3, 49, 64.62, -8.06, 0.25017, 50, 27.8, -8.4, 0.46039, 51, -12.77, -8.82, 0.28944, 4, 49, 79.13, -10.24, 0.11858, 50, 42.33, -8.03, 0.26981, 51, 4.53, -8.38, 0.48104, 38, -1.56, 35.6, 0.13057, 2, 51, 20.84, -9.2, 0.728, 38, -5.38, 19.56, 0.272, 1, 38, -11.5, -7.3, 1, 4, 51, 43.23, 16.27, 0.2746, 38, 15.1, -7.51, 0.48158, 39, -12.29, -5.54, 0.12942, 40, -41.77, 0.94, 0.11439, 4, 51, 37, 33.94, 0.18804, 38, 33.71, -4.58, 0.34252, 39, 6.54, -5.76, 0.18297, 40, -23.2, -2.19, 0.28647, 3, 38, 53.35, -1.59, 0.21646, 39, 26.41, -6.09, 0.26516, 40, -3.62, -5.59, 0.51838, 2, 39, 47.99, -1.76, 0.15753, 40, 18.37, -4.66, 0.84247, 1, 40, 33.16, -0.12, 1, 2, 39, 47.98, 10.84, 0.17387, 40, 20.32, 7.79, 0.82613, 4, 51, 9.83, 48.43, 0.17572, 38, 53.29, 18.7, 0.17038, 39, 29.73, 13.92, 0.136, 40, 2.77, 13.66, 0.5179, 4, 51, 11.45, 34.58, 0.26313, 38, 39.26, 20.56, 0.23037, 39, 16.21, 18.1, 0.15679, 40, -9.94, 19.88, 0.3497, 4, 51, 12.41, 17.13, 0.37057, 38, 22.11, 22.5, 0.30409, 39, -0.38, 22.88, 0.18235, 40, -25.59, 27.17, 0.14299, 3, 51, 12.34, 10.44, 0.4464, 38, 15.56, 23.92, 0.2976, 39, -6.59, 25.37, 0.256, 4, 50, 38.15, 11.09, 0.28506, 51, 1.65, 10.97, 0.37544, 38, 17.99, 34.75, 0.18251, 39, -2.39, 35.65, 0.15699, 3, 49, 62.62, 10.94, 0.26064, 50, 26.05, 10.62, 0.49792, 51, -15.15, 10.14, 0.24144, 3, 49, 47.27, 9.67, 0.40348, 50, 9.53, 10.2, 0.4787, 51, -26.59, 11.94, 0.11781, 3, 48, 69.23, 6.98, 0.16044, 49, 28.64, 9.27, 0.53936, 50, -7.95, 9.39, 0.3002, 2, 48, 37.36, 8.01, 0.57649, 49, -3.21, 7.8, 0.42351, 2, 47, 45.49, 7.11, 0.2935, 48, 8.38, 9.61, 0.7065, 3, 46, 62.85, 9, 0.15446, 47, 29.41, 10.82, 0.49324, 48, -8.13, 9.49, 0.3523, 3, 46, 52.15, 9.28, 0.30575, 47, 12.84, 11.74, 0.46742, 48, -26.12, 8.77, 0.22683, 3, 45, 66.66, 11.26, 0.21798, 46, 30.62, 13.69, 0.42844, 47, -3.05, 13.54, 0.35358, 3, 45, 37.7, 16.76, 0.48246, 46, 1.32, 16.92, 0.41752, 47, -32.5, 14.97, 0.10002, 4, 44, 44.35, 22.12, 0.2346, 45, 11.91, 21.43, 0.43853, 46, -24.76, 19.57, 0.2068, 3, -58.29, -7.2, 0.12007, 4, 44, 28.55, 23.57, 0.31081, 45, -3.77, 23.84, 0.19158, 28, -76.76, 29.23, 0.21531, 3, -42.43, -7.46, 0.28231, 3, 44, 22.31, 41.64, 0.18196, 28, -69.84, 12.47, 0.43955, 3, -34.84, -25, 0.37848, 3, 44, 19.78, 51.42, 0.1392, 28, -59.84, 2.53, 0.47896, 3, -23.9, -35.17, 0.38184, 3, 44, 6.03, 61.54, 0.10543, 28, -52.71, -5.88, 0.51007, 3, -17.11, -43.61, 0.38449, 2, 28, -37.16, -13.14, 0.67427, 3, -1.22, -50.83, 0.32573, 1, 28, -22.09, -13.06, 1, 2, 28, 1.45, -10.49, 0.89019, 3, 37.4, -48.18, 0.10981, 3, 28, 30.41, 0.97, 0.4302, 3, 66.35, -36.73, 0.16237, 4, 19.98, -44.2, 0.40743, 2, 4, 41.58, -34.52, 0.68165, 5, -9.45, -33.21, 0.31835, 2, 4, 50.69, -30.62, 0.51066, 5, 0.38, -31.99, 0.48934, 3, 4, 58.07, -27.45, 0.26484, 5, 8.35, -31.01, 0.61475, 6, -18.05, -36.28, 0.12041, 3, 4, 69.4, -22.88, 0.17396, 5, 20.51, -29.78, 0.5644, 6, -6.53, -32.23, 0.26164, 2, 5, 33.86, -28.42, 0.29085, 6, 6.13, -27.77, 0.70915, 2, 5, 56.55, -19.38, 0.17381, 6, 26.05, -13.63, 0.82619, 4, 44, 20.79, 3.26, 0.43236, 45, -12.74, 4.03, 0.19687, 3, -36.22, 13.38, 0.21782, 29, 13.98, -19.25, 0.15294, 4, 44, 2.69, 26.81, 0.26409, 28, -50.86, 29.21, 0.2337, 3, -16.39, -8.73, 0.34628, 29, 35.79, -0.49, 0.15592, 3, 44, -15.65, 28.57, 0.15678, 28, -33.54, 28.78, 0.2916, 3, 2.03, -9.11, 0.55162, 1, 28, -28.18, 8.37, 1, 1, 28, -5.01, 11, 1, 3, 28, 24.12, 24.18, 0.12052, 3, 60.07, -13.52, 0.21384, 4, 20.53, -20.16, 0.66564, 2, 4, 39.64, -17.85, 0.59513, 5, -6.68, -16.66, 0.40487, 3, 4, 60.96, -9.87, 0.26252, 5, 16.02, -14.92, 0.55541, 6, -14.39, -18.85, 0.18206, 2, 5, 32.69, 8.3, 0.58729, 6, -3.66, 7.65, 0.41271, 2, 4, 39.53, 3.1, 0.47136, 5, -0.95, 3.5, 0.52864, 1, 4, 17.89, 2.56, 1, 2, 3, 27.01, -3.64, 0.67245, 4, -8.37, -1.32, 0.32755, 3, 44, -2.63, 46, 0.10033, 28, -45.42, 10.27, 0.52612, 3, -9.64, -27.47, 0.37356, 2, 39, 47.98, 4.75, 0.16598, 40, 19.38, 1.78, 0.83402, 4, 51, 19.56, 50.48, 0.12624, 38, 53.31, 9.51, 0.16908, 39, 28.22, 4.86, 0.24846, 40, -0.13, 4.94, 0.45621, 4, 51, 26.31, 16.82, 0.32786, 38, 18.97, 9.25, 0.38308, 39, -5.69, 10.34, 0.1588, 40, -32.78, 15.61, 0.13026, 2, 51, 16.97, -0.03, 0.66865, 38, 4.23, 21.71, 0.33135, 3, 51, 28.1, 2.86, 0.4826, 38, 4.92, 10.15, 0.31302, 39, -19.39, 13.57, 0.20437, 3, 49, 63.22, -0.58, 0.21069, 50, 25.96, 0.79, 0.49387, 51, -11.02, 1.48, 0.29545, 3, 44, -14.84, 8.09, 0.24448, 28, -33.35, 51.23, 0.16325, 3, 2.6, 13.54, 0.59227, 4, 44, 3.38, 4.96, 0.28616, 28, -51.81, 51.13, 0.16477, 3, -15.87, 13.44, 0.31892, 29, 13.85, -0.53, 0.23015, 4, 44, 46.09, 3.59, 0.2409, 45, 9.06, 3.1, 0.41152, 46, -28.46, 0.64, 0.21862, 29, 17.5, -43.07, 0.12896, 3, 45, 37.23, 1.25, 0.47745, 46, -0.08, 1.26, 0.42163, 47, -36.26, -5.26, 0.10093, 4, 44, -5.23, 6.3, 0.25594, 28, -43.11, 51.32, 0.15579, 3, -7.17, 13.63, 0.42092, 29, 14.17, 8.17, 0.16735, 4, 44, 33.04, 3.37, 0.36685, 45, -3.97, 3.61, 0.31093, 3, -45.33, 9.83, 0.17307, 29, 15.76, -30.15, 0.14915, 4, 49, 77.51, -1.16, 0.11479, 50, 40.24, 0.95, 0.26889, 51, 3.05, 0.72, 0.44973, 38, 7.66, 35.33, 0.16659, 4, 51, 22.73, 34.68, 0.22091, 38, 37.18, 9.39, 0.26956, 39, 12.3, 7.43, 0.20636, 40, -15.46, 9.95, 0.30317 ], "hull": 60, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 24, 26, 26, 28, 32, 34, 34, 36, 36, 38, 46, 48, 48, 50, 54, 56, 56, 58, 58, 60, 60, 62, 66, 68, 76, 78, 78, 80, 80, 82, 86, 88, 88, 90, 90, 92, 92, 94, 98, 100, 100, 102, 102, 104, 104, 106, 106, 108, 116, 118, 0, 118, 92, 120, 120, 20, 28, 86, 82, 32, 34, 80, 78, 36, 76, 38, 12, 124, 102, 126, 126, 124, 126, 128, 128, 130, 130, 132, 132, 134, 112, 134, 134, 136, 136, 4, 2, 116, 6, 138, 138, 132, 8, 140, 140, 130, 10, 142, 142, 128, 128, 104, 130, 106, 132, 108, 122, 92, 100, 144, 144, 122, 126, 144, 144, 94, 112, 114, 114, 116, 108, 110, 110, 112, 16, 18, 18, 20, 20, 22, 22, 24, 12, 14, 14, 16, 122, 124, 94, 96, 96, 98, 56, 146, 146, 60, 54, 148, 148, 62, 146, 148, 50, 150, 150, 66, 46, 152, 152, 68, 154, 152, 154, 48, 42, 156, 156, 72, 14, 158, 158, 124, 18, 160, 160, 122, 160, 120, 24, 162, 162, 90, 26, 164, 164, 88, 162, 164, 16, 166, 160, 166, 166, 158, 166, 124, 162, 168, 168, 120, 168, 22, 168, 92, 38, 40, 40, 42, 72, 74, 74, 76, 40, 74, 42, 44, 44, 46, 152, 170, 170, 156, 44, 170, 68, 70, 70, 72, 170, 70, 62, 64, 64, 66, 148, 172, 172, 150, 64, 172, 50, 52, 52, 54, 172, 52, 154, 66, 150, 154, 28, 30, 30, 32, 82, 84, 84, 86, 30, 84 ], @@ -541,7 +541,7 @@ "front-arm": { "type": "mesh", "uvs": [ 0.71401, 0.00566, 0.67108, 0.08129, 0.60222, 0.15434, 0.53633, 0.21683, 0.44558, 0.28705, 0.34898, 0.35134, 0.29097, 0.38941, 0.25238, 0.41472, 0.22423, 0.44271, 0.19483, 0.47193, 0.15998, 0.50658, 0.09138, 0.59568, 0.05498, 0.70866, 0.02988, 0.81366, 0.01049, 0.94262, 0.10495, 0.98985, 0.25391, 0.97421, 0.31482, 0.88907, 0.28834, 0.82869, 0.13607, 0.74572, 0.14335, 0.71488, 0.18317, 0.62253, 0.25217, 0.54221, 0.29538, 0.50981, 0.33787, 0.47795, 0.38452, 0.45013, 0.43581, 0.41953, 0.54711, 0.3655, 0.68845, 0.29832, 0.74855, 0.35527, 0.85874, 0.38229, 0.99674, 0.37645, 0.95354, 0.33244, 0.91356, 0.29172, 0.87464, 0.25208, 0.83759, 0.21434, 0.78083, 0.12598, 0.78194, 0.0683, 0.6322, 0.23719, 0.66925, 0.15784, 0.75533, 0.20967, 0.7161, 0.11137 ], - "triangles": [ 30, 32, 31, 30, 29, 33, 30, 33, 32, 29, 28, 33, 28, 34, 33, 34, 40, 35, 34, 28, 40, 28, 38, 40, 38, 39, 40, 40, 36, 35, 39, 41, 40, 40, 41, 36, 39, 1, 41, 36, 41, 37, 37, 41, 0, 41, 1, 0, 39, 2, 1, 15, 18, 16, 15, 14, 13, 15, 13, 19, 16, 18, 17, 18, 15, 19, 13, 12, 19, 19, 12, 20, 12, 11, 20, 20, 11, 21, 11, 10, 21, 21, 10, 22, 10, 9, 22, 22, 9, 23, 9, 8, 23, 8, 7, 23, 23, 7, 24, 7, 6, 24, 24, 6, 25, 6, 5, 25, 25, 5, 26, 26, 5, 4, 26, 4, 27, 4, 3, 27, 27, 38, 28, 27, 3, 38, 3, 2, 38, 38, 2, 39 ], + "triangles": [ 30, 29, 33, 30, 32, 31, 40, 41, 36, 39, 41, 40, 40, 36, 35, 38, 39, 40, 28, 38, 40, 34, 28, 40, 34, 40, 35, 28, 34, 33, 29, 28, 33, 30, 33, 32, 41, 1, 0, 37, 41, 0, 36, 41, 37, 39, 1, 41, 39, 2, 1, 19, 12, 20, 13, 12, 19, 18, 15, 19, 16, 18, 17, 15, 13, 19, 15, 14, 13, 15, 18, 16, 21, 10, 22, 11, 10, 21, 20, 11, 21, 12, 11, 20, 9, 8, 23, 22, 9, 23, 10, 9, 22, 26, 5, 4, 25, 5, 26, 6, 5, 25, 24, 6, 25, 7, 6, 24, 23, 7, 24, 8, 7, 23, 38, 2, 39, 3, 2, 38, 27, 3, 38, 27, 38, 28, 4, 3, 27, 26, 4, 27 ], "vertices": [ 1, 53, 21.67, 6.08, 1, 2, 52, 18.13, 3.37, 0.16553, 53, 3.92, 4.24, 0.83447, 3, 33, -6.12, -15.24, 0.20965, 52, -0.05, 8.86, 0.53629, 6, 43.44, 6.81, 0.25406, 1, 33, 10.36, -12.02, 1, 2, 33, 30.62, -10.09, 0.88822, 34, -7.63, -10.15, 0.11178, 2, 33, 50.57, -9.69, 0.30996, 34, 12.31, -9.61, 0.69004, 2, 34, 24.21, -9.37, 0.86563, 35, -13.43, -6.2, 0.13437, 2, 34, 32.12, -9.22, 0.73143, 35, -5.73, -8.02, 0.26857, 2, 34, 39.35, -7.59, 0.54007, 35, 1.68, -8.25, 0.45993, 2, 34, 46.9, -5.88, 0.29037, 35, 9.42, -8.48, 0.70963, 2, 35, 18.59, -8.76, 0.66539, 36, -15.76, -5.13, 0.33461, 1, 36, 6.03, -8.58, 1, 2, 36, 31.42, -5.98, 0.39257, 37, 0.49, -6.36, 0.60743, 1, 37, 23.8, -9.31, 1, 1, 37, 52.37, -11.28, 1, 1, 37, 62.39, 2.72, 1, 1, 37, 58.29, 24.21, 1, 1, 37, 39.22, 32.48, 1, 1, 37, 26, 28.25, 1, 1, 37, 8.33, 5.63, 1, 2, 36, 28.81, 6.64, 0.48313, 37, 1.49, 6.49, 0.51687, 1, 36, 7.61, 5.9, 1, 3, 34, 51.67, 11.07, 0.10767, 35, 18.26, 6.75, 0.559, 36, -12.35, 10.01, 0.33333, 2, 34, 42.19, 10.25, 0.31464, 35, 8.88, 8.32, 0.68536, 2, 34, 32.87, 9.45, 0.59184, 35, -0.35, 9.86, 0.40816, 2, 34, 23.73, 9.7, 0.83036, 35, -9.14, 12.39, 0.16964, 2, 33, 52.08, 9.88, 0.29921, 34, 13.68, 9.98, 0.70079, 2, 33, 32.19, 12.6, 0.84687, 34, -6.24, 12.55, 0.15313, 1, 6, 9.42, 3.39, 1, 2, 6, -5.05, -1.59, 0.472, 5, 29.16, -0.35, 0.528, 1, 5, 16.13, -11.36, 1, 1, 5, 7.46, -29.44, 1, 2, 6, -8.23, -31.57, 0.5193, 5, 19, -28.74, 0.4807, 1, 6, 2, -28.43, 1, 1, 6, 11.96, -25.37, 1, 1, 6, 21.44, -22.45, 1, 3, 52, 12.7, -14.55, 0.25482, 53, 2.14, -14.4, 0.32231, 6, 42.47, -19.82, 0.42287, 1, 53, 13.64, -8.89, 1, 1, 33, 3.55, 0.91, 1, 2, 52, 1.72, -0.73, 0.5001, 6, 40.07, -2.34, 0.4999, 1, 6, 25.66, -11.25, 1, 3, 52, 13.4, -4.65, 0.33234, 53, 0.86, -4.56, 0.48165, 6, 48.12, -11.66, 0.18601 ], "hull": 38, "edges": [ 0, 2, 8, 10, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 52, 54, 54, 56, 56, 58, 58, 60, 60, 62, 70, 72, 72, 74, 0, 74, 56, 76, 6, 8, 76, 6, 4, 6, 4, 78, 78, 80, 80, 70, 2, 82, 82, 72, 82, 78, 78, 76, 2, 4, 56, 80, 56, 66, 62, 64, 64, 66, 66, 68, 68, 70, 44, 46, 46, 48, 18, 20, 46, 18, 10, 12, 12, 14, 48, 50, 50, 52, 12, 50, 14, 16, 16, 18 ], @@ -572,6 +572,17 @@ } ], "animations": { + "idle": { + "bones": { + "hip": { + "translate": [ + {}, + { "time": 1, "y": -4.42 }, + { "time": 2 } + ] + } + } + }, "sneak": { "bones": { "hip": { diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs index 5533314152..09dcc3a8cc 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs +++ b/spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs @@ -362,7 +362,7 @@ public void PreviewEditModePose (Playable playable, } } - skeleton.UpdateWorldTransform(); + skeleton.UpdateWorldTransform(Skeleton.Physics.Update); if (skeletonAnimation) { skeletonAnimation.AfterAnimationApplied(); skeletonAnimation.LateUpdate(); diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/package-no-spine-unity-dependency.json b/spine-unity/Modules/com.esotericsoftware.spine.timeline/package-no-spine-unity-dependency.json index 0ddccf7353..09254af030 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.timeline/package-no-spine-unity-dependency.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.timeline/package-no-spine-unity-dependency.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.timeline", "displayName": "Spine Timeline Extensions", "description": "This plugin provides integration of spine-unity for the Unity Timeline.\n\nPrerequisites:\nIt requires a working installation of the spine-unity runtime (via the spine-unity unitypackage), version 4.1.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)", - "version": "4.1.7", + "version": "4.2.14", "unity": "2018.3", "author": { "name": "Esoteric Software", diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json b/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json index 8085941247..eaa50d8a61 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.timeline", "displayName": "Spine Timeline Extensions", "description": "This plugin provides integration of spine-unity for the Unity Timeline.\n\nPrerequisites:\nIt requires a working installation of the spine-unity and spine-csharp runtimes as UPM packages (not as spine-unity unitypackage), version 4.2.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)", - "version": "4.2.13", + "version": "4.2.14", "unity": "2018.3", "author": { "name": "Esoteric Software", 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 bd04cccd47..7ac3fb12d4 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": "AAVlM3uJh3s", - "spine": "4.1.23-beta", + "hash": "PPErx2B6aMg", + "spine": "4.2.05-beta", "x": -809.16, "y": -73.54, "width": 1287.65, @@ -129,8 +129,8 @@ "y": -0.01, "color": "e07800ff" }, - { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff" }, - { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff" }, + { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff", "icon": "ik" }, + { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg1", "parent": "hip", @@ -309,8 +309,16 @@ "y": 0.2, "color": "15ff00ff" }, - { "name": "front-foot-target", "parent": "root", "rotation": -6.96, "x": -45.8, "y": -28.67, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff" }, + { + "name": "front-foot-target", + "parent": "root", + "rotation": -6.96, + "x": -45.8, + "y": -28.67, + "color": "ff3f00ff", + "icon": "ik" + }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg1", "parent": "hip", @@ -512,8 +520,24 @@ "y": -0.21, "color": "fff200ff" }, - { "name": "head-control", "parent": "head", "rotation": -95.04, "x": 42.32, "y": -220.33, "color": "219517ff" }, - { "name": "leg-control", "parent": "front-leg1", "rotation": 53.14, "x": 172.97, "y": 4.16, "color": "1d8020ff" } + { + "name": "head-control", + "parent": "head", + "rotation": -95.04, + "x": 42.32, + "y": -220.33, + "color": "219517ff", + "icon": "arrows" + }, + { + "name": "leg-control", + "parent": "front-leg1", + "rotation": 53.14, + "x": 172.97, + "y": 4.16, + "color": "1d8020ff", + "icon": "arrows" + } ], "slots": [ { "name": "back-hand", "bone": "back-hand2", "attachment": "back-hand" }, 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 006f2d5a84..2fe9bacd2c 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": "QqiPXGOfONE", - "spine": "4.1.23-beta", + "hash": "ZCd/c3RDCPk", + "spine": "4.2.05-beta", "x": -100.47, "y": -9.21, "width": 260.65, @@ -11,7 +11,7 @@ }, "bones": [ { "name": "root" }, - { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff" }, + { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff", "icon": "ik" }, { "name": "hip", "parent": "root", "x": 28.61, "y": 289.9, "color": "ffbd00ff" }, { "name": "spine1", @@ -117,7 +117,7 @@ "transform": "noScale", "color": "ff0000ff" }, - { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff" }, + { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg-ik1", "parent": "hip", @@ -202,7 +202,7 @@ }, { "name": "belly", "parent": "spine1", "x": 35.94, "y": -37.69, "color": "ffbd00ff" }, { "name": "butt", "parent": "hip", "x": -32.67, "y": -1.88, "color": "ffbd00ff" }, - { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff" }, + { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-arm-ik1", "parent": "spine4", @@ -263,7 +263,7 @@ }, { "name": "front-foot2", "parent": "front-foot1", "length": 29.12, "rotation": 9.61, "x": 26.3, "color": "50ff00ff" }, { "name": "front-foot3", "parent": "front-foot2", "length": 23.49, "rotation": 8.91, "x": 29.12, "color": "50ff00ff" }, - { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff" }, + { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg-ik1", "parent": "hip", @@ -489,7 +489,7 @@ "back-arm": { "type": "mesh", "uvs": [ 0.74522, 0.00989, 0.64111, 0.05762, 0.56303, 0.1559, 0.42509, 0.25886, 0.28974, 0.359, 0.22988, 0.49565, 0.21166, 0.60797, 0.21166, 0.69782, 0.16481, 0.78674, 0.14139, 0.84757, 0.02427, 0.88501, 0.0529, 0.91871, 0.37824, 0.98797, 0.60468, 0.98235, 0.6307, 0.9056, 0.73481, 0.87752, 0.63591, 0.81762, 0.55262, 0.74181, 0.38084, 0.69876, 0.37824, 0.60797, 0.39906, 0.50876, 0.51358, 0.38521, 0.66194, 0.28881, 0.85454, 0.18398, 0.97687, 0.07541, 0.9144, 0.00989 ], - "triangles": [ 11, 9, 12, 9, 8, 12, 12, 8, 18, 13, 12, 14, 12, 18, 17, 18, 8, 7, 14, 12, 17, 11, 10, 9, 14, 16, 15, 14, 17, 16, 7, 19, 18, 7, 6, 19, 6, 5, 19, 19, 5, 20, 5, 4, 20, 20, 4, 21, 4, 3, 21, 21, 3, 22, 3, 2, 22, 22, 2, 23, 2, 1, 23, 23, 1, 24, 1, 0, 24, 0, 25, 24 ], + "triangles": [ 14, 17, 16, 14, 16, 15, 11, 10, 9, 14, 12, 17, 18, 8, 7, 12, 18, 17, 13, 12, 14, 12, 8, 18, 9, 8, 12, 11, 9, 12, 6, 5, 19, 7, 6, 19, 7, 19, 18, 20, 4, 21, 5, 4, 20, 19, 5, 20, 3, 2, 22, 21, 3, 22, 4, 3, 21, 0, 25, 24, 1, 0, 24, 23, 1, 24, 2, 1, 23, 22, 2, 23 ], "vertices": [ 1, 9, -7.68, -11.48, 1, 1, 9, 4.09, -13.63, 1, 1, 9, 23.49, -9.36, 1, 1, 10, 13.44, -9.23, 1, 2, 10, 35.2, -9.62, 0.50649, 11, -0.58, -9.66, 0.49351, 1, 11, 26.04, -6.39, 1, 1, 12, 14.15, -6.11, 1, 2, 12, 31.54, -5.57, 0.66493, 13, -3.33, -5.03, 0.33507, 1, 13, 13.08, -11.25, 1, 1, 13, 24.41, -14.89, 1, 1, 13, 30.15, -24.52, 1, 1, 13, 36.93, -23.54, 1, 1, 13, 54.08, -2.33, 1, 1, 13, 55.73, 14.15, 1, 1, 13, 41.39, 18.48, 1, 1, 13, 37.29, 26.87, 1, 1, 13, 24.66, 21.67, 1, 1, 13, 9.18, 18.1, 1, 2, 12, 31.33, 6.78, 0.47881, 13, -1.11, 7.12, 0.52119, 1, 12, 13.77, 6.04, 1, 2, 11, 24.98, 6.17, 0.89218, 12, -5.48, 6.96, 0.10782, 2, 10, 32.6, 7.29, 0.59842, 11, -0.32, 7.45, 0.40158, 1, 10, 11.08, 8.85, 1, 1, 9, 17.89, 11.88, 1, 1, 9, -4.82, 9.46, 1, 1, 9, -13.69, -0.69, 1 ], "hull": 26, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 46, 48, 48, 50, 0, 50, 2, 48, 4, 46, 6, 44, 8, 42, 10, 40, 12, 38, 14, 36 ], @@ -509,7 +509,7 @@ "back-leg": { "type": "mesh", "uvs": [ 0.502, 0.01179, 0.36076, 0.06379, 0.4057, 0.15046, 0.44743, 0.23916, 0.47953, 0.32991, 0.51163, 0.42269, 0.52127, 0.50629, 0.48274, 0.58888, 0.41212, 0.66025, 0.3126, 0.74182, 0.2163, 0.81625, 0.1232, 0.89272, 0.00763, 0.97429, 0.29655, 0.98958, 0.47407, 0.99222, 0.64004, 0.99468, 0.80989, 0.9896, 0.91291, 0.98652, 1, 0.95797, 0.8333, 0.94681, 0.71067, 0.9386, 0.57123, 0.92031, 0.41533, 0.89986, 0.3447, 0.89272, 0.36885, 0.87178, 0.42817, 0.82033, 0.502, 0.74794, 0.58226, 0.66943, 0.6593, 0.59092, 0.72993, 0.50528, 0.76524, 0.42167, 0.78129, 0.32481, 0.78771, 0.23406, 0.78771, 0.13924, 0.72351, 0.03728, 0.60152, 0.00567, 0.82117, 0.96898, 0.67873, 0.96396, 0.52111, 0.9574, 0.35936, 0.94214, 0.19388, 0.92922, 0.25375, 0.88159, 0.32792, 0.8184 ], - "triangles": [ 17, 36, 19, 17, 16, 36, 16, 37, 36, 17, 19, 18, 36, 20, 19, 15, 37, 16, 14, 38, 15, 15, 38, 37, 37, 20, 36, 38, 21, 37, 37, 21, 20, 38, 22, 21, 13, 39, 14, 14, 39, 38, 12, 40, 13, 13, 40, 39, 39, 22, 38, 40, 23, 39, 39, 23, 22, 12, 11, 40, 40, 41, 23, 40, 11, 41, 23, 41, 24, 11, 10, 41, 41, 42, 24, 41, 10, 42, 24, 42, 25, 26, 25, 9, 10, 9, 42, 25, 42, 9, 9, 8, 26, 26, 8, 27, 8, 7, 27, 27, 7, 28, 7, 6, 28, 28, 6, 29, 6, 5, 29, 29, 5, 30, 30, 5, 31, 31, 5, 4, 31, 4, 32, 32, 4, 3, 32, 3, 33, 3, 2, 33, 2, 34, 33, 2, 1, 34, 34, 0, 35, 34, 1, 0 ], + "triangles": [ 36, 20, 19, 17, 19, 18, 16, 37, 36, 17, 16, 36, 17, 36, 19, 38, 22, 21, 37, 21, 20, 38, 21, 37, 37, 20, 36, 15, 38, 37, 14, 38, 15, 15, 37, 16, 39, 23, 22, 40, 23, 39, 39, 22, 38, 13, 40, 39, 12, 40, 13, 14, 39, 38, 13, 39, 14, 9, 8, 26, 25, 42, 9, 10, 9, 42, 26, 25, 9, 24, 42, 25, 41, 10, 42, 41, 42, 24, 11, 10, 41, 23, 41, 24, 40, 11, 41, 40, 41, 23, 12, 11, 40, 26, 8, 27, 6, 5, 29, 28, 6, 29, 7, 6, 28, 27, 7, 28, 8, 7, 27, 29, 5, 30, 31, 5, 4, 30, 5, 31, 32, 4, 3, 31, 4, 32, 34, 1, 0, 34, 0, 35, 2, 1, 34, 2, 34, 33, 3, 2, 33, 32, 3, 33 ], "vertices": [ 1, 20, -19.79, -5.67, 1, 2, 20, -5.62, -22.28, 0.83363, 21, -41.07, -23.3, 0.16637, 2, 20, 22.31, -21.98, 0.65187, 21, -13.17, -21.89, 0.34813, 3, 20, 50.83, -22.11, 0.3172, 21, 15.33, -20.87, 0.43086, 22, -19.67, -21.09, 0.25193, 4, 20, 79.85, -23.29, 0.10792, 21, 44.37, -20.89, 0.35417, 22, 9.3, -19.2, 0.3192, 23, -25.22, -20.06, 0.21872, 4, 21, 74.06, -20.98, 0.16486, 22, 38.93, -17.34, 0.32776, 23, 4.09, -15.38, 0.29831, 24, -30.1, -17.16, 0.20907, 3, 22, 65.54, -17.61, 0.17523, 23, 30.6, -13.11, 0.39173, 24, -4.12, -11.42, 0.43304, 3, 23, 57.03, -15.71, 0.19718, 24, 22.43, -10.53, 0.52971, 25, -12.97, -9.81, 0.27311, 3, 24, 46.05, -13.47, 0.40991, 25, 10.84, -10.17, 0.34747, 26, -24.93, -10.51, 0.24261, 3, 24, 73.39, -18.69, 0.19432, 25, 38.58, -12.41, 0.37177, 26, 2.9, -10.99, 0.43391, 3, 25, 64.06, -14.98, 0.16664, 26, 28.49, -11.94, 0.56756, 27, -7.53, -11.48, 0.2658, 3, 26, 54.58, -12.37, 0.52114, 27, 18.56, -10.93, 0.36168, 14, -3.08, 24.95, 0.11718, 4, 26, 82.97, -14.36, 0.35144, 27, 47.01, -11.86, 0.29521, 14, -13.07, -1.67, 0.25118, 15, -46.3, 1.83, 0.10216, 1, 14, 16.37, -4.67, 1, 2, 14, 34.32, -4.37, 0.53487, 15, 0.74, -4.44, 0.46513, 3, 14, 51.1, -4.08, 0.14611, 15, 17.5, -5.42, 0.54314, 16, -15.51, -2.75, 0.31075, 2, 15, 34.67, -4.01, 0.40714, 16, 1.65, -4.36, 0.59286, 2, 15, 45.09, -3.16, 0.25726, 16, 12.05, -5.34, 0.74274, 2, 15, 53.99, 5.81, 0.25311, 16, 22.38, 1.94, 0.74689, 2, 15, 37.19, 9.56, 0.4029, 16, 6.5, 8.57, 0.5971, 3, 14, 57.07, 14.17, 0.13352, 15, 24.84, 12.33, 0.54644, 16, -5.18, 13.44, 0.32004, 4, 26, 47.09, 33.11, 0.13131, 14, 42.64, 19.08, 0.26349, 15, 10.82, 18.31, 0.49746, 16, -17.94, 21.78, 0.10773, 4, 26, 46.46, 16.09, 0.21159, 27, 9.37, 17.21, 0.1068, 14, 26.51, 24.57, 0.44951, 15, -4.85, 25.01, 0.23211, 3, 26, 46.8, 8.62, 0.40111, 27, 10, 9.75, 0.24543, 14, 19.24, 26.38, 0.35346, 3, 26, 39.71, 8.61, 0.5825, 27, 2.91, 9.47, 0.30792, 14, 21.25, 33.18, 0.10958, 3, 25, 59.17, 5.89, 0.21955, 26, 22.27, 8.58, 0.57946, 27, -14.51, 8.8, 0.20099, 3, 24, 71.84, 0.47, 0.21583, 25, 34.96, 6.47, 0.32263, 26, -1.92, 7.63, 0.46154, 3, 24, 45.81, 3.96, 0.40554, 25, 8.71, 7.12, 0.38602, 26, -28.17, 6.61, 0.20845, 3, 23, 56.79, 2.13, 0.25409, 24, 19.83, 7.12, 0.53006, 25, -17.46, 7.46, 0.21585, 3, 22, 66.18, 3.45, 0.22414, 23, 29.23, 7.92, 0.34135, 24, -8.25, 9.24, 0.43451, 4, 21, 76.6, 4.51, 0.19364, 22, 39.78, 8.26, 0.28887, 23, 2.49, 10.19, 0.33579, 24, -35.06, 7.97, 0.1817, 4, 20, 82.88, 7.08, 0.11658, 21, 46.18, 9.58, 0.35727, 22, 9.09, 11.32, 0.35745, 23, -28.36, 10.3, 0.16869, 3, 20, 54.46, 12.11, 0.35357, 21, 17.57, 13.46, 0.44494, 22, -19.71, 13.32, 0.20149, 2, 20, 24.65, 16.69, 0.65438, 21, -12.4, 16.85, 0.34562, 2, 20, -8.38, 15.21, 0.85331, 21, -45.34, 14.05, 0.14669, 1, 20, -20.19, 4.56, 1, 2, 15, 35.89, 2.53, 0.4051, 16, 3.99, 1.87, 0.5949, 3, 14, 54.38, 5.92, 0.13921, 15, 21.52, 4.3, 0.54495, 16, -9.85, 6.12, 0.31584, 2, 14, 37.79, 7.63, 0.44939, 15, 5.1, 7.27, 0.55061, 3, 26, 65.39, 20.7, 0.11858, 14, 20.6, 11.35, 0.75134, 15, -11.76, 12.27, 0.13008, 3, 26, 65.41, 1.81, 0.3968, 27, 24.3, 0.23, 0.28258, 14, 2.07, 14.98, 0.32063, 3, 26, 48.01, 0.08, 0.55395, 27, 6.94, -0.33, 0.33293, 14, 3.38, 30.47, 0.11312, 3, 25, 65.95, -2.97, 0.19447, 26, 24.96, -1.58, 0.57382, 27, -15.99, -0.43, 0.23171 ], "hull": 36, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 34, 36, 44, 46, 50, 52, 52, 54, 54, 56, 56, 58, 58, 60, 60, 62, 62, 64, 64, 66, 66, 68, 68, 70, 0, 70, 4, 66, 2, 68, 40, 42, 42, 44, 26, 28, 28, 30, 46, 48, 48, 50, 36, 38, 38, 40, 30, 32, 32, 34, 18, 52, 16, 54, 14, 56, 12, 58, 10, 60, 8, 62, 6, 64, 32, 72, 72, 38, 30, 74, 74, 40, 72, 74, 28, 76, 76, 42, 74, 76, 26, 78, 78, 44, 76, 78, 24, 80, 80, 46, 78, 80, 22, 82, 82, 48, 80, 82, 20, 84, 84, 50, 82, 84 ], @@ -529,7 +529,7 @@ "body": { "type": "mesh", "uvs": [ 0.35966, 0.01351, 0.26864, 0.04108, 0.26204, 0.0954, 0.34119, 0.14478, 0.39792, 0.19457, 0.40451, 0.24272, 0.38077, 0.27893, 0.3597, 0.3004, 0.34119, 0.31926, 0.34989, 0.34326, 0.35834, 0.36658, 0.36552, 0.40164, 0.37234, 0.43499, 0.38397, 0.4944, 0.3956, 0.55971, 0.39884, 0.59858, 0.40142, 0.62955, 0.40216, 0.65662, 0.3461, 0.71564, 0.27077, 0.78176, 0.2201, 0.82128, 0.17618, 0.85553, 0.13115, 0.88833, 0.08238, 0.92385, 0.00342, 0.9796, 0.18836, 0.99127, 0.32172, 0.99284, 0.46266, 0.99451, 0.61643, 0.98608, 0.71618, 0.97182, 0.61851, 0.95821, 0.48967, 0.95043, 0.39458, 0.94083, 0.27772, 0.92904, 0.23408, 0.9232, 0.26692, 0.89774, 0.30681, 0.86681, 0.34203, 0.83415, 0.38369, 0.7955, 0.45642, 0.72874, 0.52708, 0.66845, 0.56032, 0.63345, 0.57541, 0.60109, 0.59357, 0.56214, 0.61643, 0.49732, 0.63513, 0.43963, 0.64345, 0.40462, 0.77081, 0.39011, 0.84585, 0.37025, 0.90983, 0.35331, 0.9674, 0.31915, 0.97302, 0.28585, 0.96448, 0.23351, 0.8952, 0.1681, 0.79346, 0.12643, 0.75179, 0.10879, 0.71799, 0.09448, 0.66817, 0.07237, 0.61343, 0.04807, 0.47868, 0.01411, 0.49846, 0.38826, 0.66315, 0.34728, 0.67333, 0.30664, 0.8188, 0.29655, 0.80971, 0.24505, 0.72829, 0.17902, 0.68147, 0.13902, 0.59191, 0.09711, 0.3904, 0.09012, 0.53695, 0.14981, 0.57563, 0.19616, 0.64483, 0.25077, 0.79855, 0.33476, 0.61751, 0.97167, 0.4773, 0.97061, 0.23795, 0.95673, 0.15272, 0.92355, 0.14158, 0.94886, 0.23861, 0.86092, 0.51732, 0.30354, 0.50696, 0.34527, 0.50634, 0.43735, 0.50334, 0.4959, 0.51086, 0.32558, 0.50355, 0.41057, 0.19543, 0.89241, 0.36492, 0.9641 ], - "triangles": [ 1, 0, 59, 58, 1, 59, 68, 1, 58, 2, 1, 68, 67, 68, 58, 67, 58, 57, 67, 57, 56, 66, 67, 56, 66, 56, 55, 3, 2, 68, 69, 68, 67, 3, 68, 69, 69, 67, 66, 66, 55, 54, 65, 66, 54, 65, 54, 53, 4, 3, 69, 70, 69, 66, 4, 69, 70, 70, 66, 65, 5, 4, 70, 71, 70, 65, 5, 70, 71, 6, 71, 62, 79, 6, 62, 7, 6, 79, 71, 6, 5, 83, 7, 79, 8, 7, 83, 83, 79, 62, 9, 8, 83, 80, 9, 83, 61, 83, 62, 61, 62, 72, 80, 83, 61, 46, 80, 61, 46, 61, 47, 62, 71, 64, 64, 65, 53, 64, 53, 52, 71, 65, 64, 63, 64, 52, 63, 52, 51, 62, 64, 63, 50, 63, 51, 72, 62, 63, 72, 63, 50, 49, 72, 50, 48, 72, 49, 47, 61, 72, 47, 72, 48, 74, 32, 31, 86, 32, 74, 73, 31, 30, 74, 31, 73, 73, 30, 29, 28, 74, 73, 28, 73, 29, 27, 86, 74, 27, 74, 28, 26, 86, 27, 75, 33, 86, 24, 23, 77, 25, 77, 75, 24, 77, 25, 26, 75, 86, 25, 75, 26, 22, 21, 85, 85, 78, 35, 34, 85, 35, 76, 22, 85, 76, 85, 34, 23, 22, 76, 77, 23, 76, 77, 76, 34, 77, 34, 33, 75, 77, 33, 86, 33, 32, 36, 78, 20, 21, 20, 78, 37, 36, 20, 85, 21, 78, 35, 78, 36, 38, 18, 39, 19, 18, 38, 37, 19, 38, 20, 19, 37, 40, 17, 16, 41, 40, 16, 39, 17, 40, 18, 17, 39, 42, 15, 14, 43, 42, 14, 41, 16, 15, 42, 41, 15, 14, 13, 82, 43, 82, 44, 14, 82, 43, 12, 11, 84, 45, 81, 84, 12, 84, 81, 46, 45, 84, 13, 12, 81, 82, 13, 81, 44, 81, 45, 82, 81, 44, 10, 9, 80, 60, 10, 80, 11, 10, 60, 60, 80, 46, 84, 60, 46, 11, 60, 84 ], + "triangles": [ 2, 1, 68, 68, 1, 58, 58, 1, 59, 1, 0, 59, 69, 67, 66, 3, 68, 69, 69, 68, 67, 3, 2, 68, 66, 56, 55, 66, 67, 56, 67, 57, 56, 67, 58, 57, 67, 68, 58, 5, 70, 71, 71, 70, 65, 5, 4, 70, 70, 66, 65, 4, 69, 70, 70, 69, 66, 4, 3, 69, 65, 54, 53, 65, 66, 54, 66, 55, 54, 46, 61, 47, 46, 80, 61, 80, 83, 61, 61, 62, 72, 61, 83, 62, 80, 9, 83, 9, 8, 83, 83, 79, 62, 8, 7, 83, 83, 7, 79, 71, 6, 5, 7, 6, 79, 79, 6, 62, 6, 71, 62, 47, 72, 48, 47, 61, 72, 48, 72, 49, 49, 72, 50, 72, 63, 50, 72, 62, 63, 50, 63, 51, 62, 64, 63, 63, 52, 51, 63, 64, 52, 71, 65, 64, 64, 53, 52, 64, 65, 53, 62, 71, 64, 26, 86, 27, 27, 74, 28, 27, 86, 74, 28, 73, 29, 28, 74, 73, 73, 30, 29, 74, 31, 73, 73, 31, 30, 86, 32, 74, 74, 32, 31, 25, 75, 26, 26, 75, 86, 24, 77, 25, 25, 77, 75, 24, 23, 77, 75, 33, 86, 86, 33, 32, 75, 77, 33, 77, 34, 33, 77, 76, 34, 77, 23, 76, 23, 22, 76, 76, 85, 34, 76, 22, 85, 34, 85, 35, 85, 78, 35, 22, 21, 85, 35, 78, 36, 85, 21, 78, 37, 36, 20, 21, 20, 78, 36, 78, 20, 20, 19, 37, 37, 19, 38, 19, 18, 38, 38, 18, 39, 18, 17, 39, 39, 17, 40, 41, 40, 16, 40, 17, 16, 42, 41, 15, 41, 16, 15, 43, 42, 14, 42, 15, 14, 14, 82, 43, 43, 82, 44, 14, 13, 82, 82, 81, 44, 44, 81, 45, 82, 13, 81, 13, 12, 81, 46, 45, 84, 12, 84, 81, 45, 81, 84, 12, 11, 84, 11, 60, 84, 84, 60, 46, 60, 80, 46, 11, 10, 60, 60, 10, 80, 10, 9, 80 ], "vertices": [ 1, 6, 30.85, 2.45, 1, 2, 5, 60.42, 12.42, 0.24859, 6, 22.32, 18.18, 0.75141, 2, 5, 39.47, 25.25, 0.44332, 6, -1.06, 25.72, 0.55668, 3, 4, 48.03, 29.46, 0.37431, 5, 14.55, 26.45, 0.47619, 6, -25.57, 21.02, 0.1495, 3, 3, 50.36, 32.58, 0.11243, 4, 24.29, 26.8, 0.64611, 5, -8.99, 30.5, 0.24146, 3, 44, -45.22, -8.81, 0.10611, 3, 28.69, 30.4, 0.49533, 4, 2.89, 30.85, 0.39856, 3, 44, -28.91, -12.45, 0.25802, 3, 12.15, 32.8, 0.60894, 4, -12.29, 37.84, 0.13304, 3, 44, -18.5, -14.05, 0.28714, 3, 2.34, 35.98, 0.51935, 29, -7.6, 18.95, 0.19351, 4, 44, -10.79, -18.35, 0.28478, 28, -42.03, 75.56, 0.10295, 3, -6.36, 37.32, 0.37494, 29, -10.2, 10.26, 0.23733, 3, 44, 0.92, -16.96, 0.34087, 3, -17.28, 35.45, 0.32141, 29, -8.2, -0.67, 0.33772, 4, 44, 10.64, -16.32, 0.32691, 45, -24.05, -14.9, 0.16082, 3, -27.58, 33.67, 0.14432, 29, -6.37, -11.05, 0.36794, 4, 44, 28.5, -15.63, 0.24237, 45, -9.55, -15.11, 0.27028, 46, -45.51, -19.12, 0.12132, 29, -3.65, -27.88, 0.36603, 4, 44, 41.59, -14.89, 0.21761, 45, 6.93, -15.35, 0.33285, 46, -26.85, -17.49, 0.20377, 29, -1.3, -43.28, 0.24577, 3, 45, 33.83, -15.81, 0.47179, 46, 0, -15.85, 0.42627, 47, -31.79, -17.82, 0.10194, 3, 45, 63.39, -16.48, 0.2126, 46, 29.52, -14.22, 0.42737, 47, -2.43, -14.39, 0.36002, 3, 46, 49.79, -15.51, 0.30179, 47, 14.85, -13.08, 0.47127, 48, -21.15, -15.64, 0.22695, 3, 46, 61.1, -13.41, 0.15443, 47, 29.03, -11.65, 0.50848, 48, -3.27, -12.45, 0.33708, 2, 47, 41.24, -10.8, 0.28079, 48, 8.41, -8.79, 0.71921, 2, 48, 36.24, -8.59, 0.56513, 49, -3.02, -8.84, 0.43487, 3, 48, 67.93, -10.06, 0.16322, 49, 28.69, -7.82, 0.53712, 50, -8.12, -7.7, 0.29966, 3, 49, 47.76, -8.47, 0.40201, 50, 10.97, -7.9, 0.45131, 51, -26.34, -6.21, 0.14668, 3, 49, 64.62, -8.06, 0.25017, 50, 27.8, -8.4, 0.46039, 51, -12.77, -8.82, 0.28944, 4, 49, 79.13, -10.24, 0.11858, 50, 42.33, -8.03, 0.26981, 51, 4.53, -8.38, 0.48104, 38, -1.56, 35.6, 0.13057, 2, 51, 20.84, -9.2, 0.728, 38, -5.38, 19.56, 0.272, 1, 38, -11.5, -7.3, 1, 4, 51, 43.23, 16.27, 0.2746, 38, 15.1, -7.51, 0.48158, 39, -12.29, -5.54, 0.12942, 40, -41.77, 0.94, 0.11439, 4, 51, 37, 33.94, 0.18804, 38, 33.71, -4.58, 0.34252, 39, 6.54, -5.76, 0.18297, 40, -23.2, -2.19, 0.28647, 3, 38, 53.35, -1.59, 0.21646, 39, 26.41, -6.09, 0.26516, 40, -3.62, -5.59, 0.51838, 2, 39, 47.99, -1.76, 0.15753, 40, 18.37, -4.66, 0.84247, 1, 40, 33.16, -0.12, 1, 2, 39, 47.98, 10.84, 0.17387, 40, 20.32, 7.79, 0.82613, 4, 51, 9.83, 48.43, 0.17572, 38, 53.29, 18.7, 0.17038, 39, 29.73, 13.92, 0.136, 40, 2.77, 13.66, 0.5179, 4, 51, 11.45, 34.58, 0.26313, 38, 39.26, 20.56, 0.23037, 39, 16.21, 18.1, 0.15679, 40, -9.94, 19.88, 0.3497, 4, 51, 12.41, 17.13, 0.37057, 38, 22.11, 22.5, 0.30409, 39, -0.38, 22.88, 0.18235, 40, -25.59, 27.17, 0.14299, 3, 51, 12.34, 10.44, 0.4464, 38, 15.56, 23.92, 0.2976, 39, -6.59, 25.37, 0.256, 4, 50, 38.15, 11.09, 0.28506, 51, 1.65, 10.97, 0.37544, 38, 17.99, 34.75, 0.18251, 39, -2.39, 35.65, 0.15699, 3, 49, 62.62, 10.94, 0.26064, 50, 26.05, 10.62, 0.49792, 51, -15.15, 10.14, 0.24144, 3, 49, 47.27, 9.67, 0.40348, 50, 9.53, 10.2, 0.4787, 51, -26.59, 11.94, 0.11781, 3, 48, 69.23, 6.98, 0.16044, 49, 28.64, 9.27, 0.53936, 50, -7.95, 9.39, 0.3002, 2, 48, 37.36, 8.01, 0.57649, 49, -3.21, 7.8, 0.42351, 2, 47, 45.49, 7.11, 0.2935, 48, 8.38, 9.61, 0.7065, 3, 46, 62.85, 9, 0.15446, 47, 29.41, 10.82, 0.49324, 48, -8.13, 9.49, 0.3523, 3, 46, 52.15, 9.28, 0.30575, 47, 12.84, 11.74, 0.46742, 48, -26.12, 8.77, 0.22683, 3, 45, 66.66, 11.26, 0.21798, 46, 30.62, 13.69, 0.42844, 47, -3.05, 13.54, 0.35358, 3, 45, 37.7, 16.76, 0.48246, 46, 1.32, 16.92, 0.41752, 47, -32.5, 14.97, 0.10002, 4, 44, 44.35, 22.12, 0.2346, 45, 11.91, 21.43, 0.43853, 46, -24.76, 19.57, 0.2068, 3, -58.29, -7.2, 0.12007, 4, 44, 28.55, 23.57, 0.31081, 45, -3.77, 23.84, 0.19158, 28, -76.76, 29.23, 0.21531, 3, -42.43, -7.46, 0.28231, 3, 44, 22.31, 41.64, 0.18196, 28, -69.84, 12.47, 0.43955, 3, -34.84, -25, 0.37848, 3, 44, 19.78, 51.42, 0.1392, 28, -59.84, 2.53, 0.47896, 3, -23.9, -35.17, 0.38184, 3, 44, 6.03, 61.54, 0.10543, 28, -52.71, -5.88, 0.51007, 3, -17.11, -43.61, 0.38449, 2, 28, -37.16, -13.14, 0.67427, 3, -1.22, -50.83, 0.32573, 1, 28, -22.09, -13.06, 1, 2, 28, 1.45, -10.49, 0.89019, 3, 37.4, -48.18, 0.10981, 3, 28, 30.41, 0.97, 0.4302, 3, 66.35, -36.73, 0.16237, 4, 19.98, -44.2, 0.40743, 2, 4, 41.58, -34.52, 0.68165, 5, -9.45, -33.21, 0.31835, 2, 4, 50.69, -30.62, 0.51066, 5, 0.38, -31.99, 0.48934, 3, 4, 58.07, -27.45, 0.26484, 5, 8.35, -31.01, 0.61475, 6, -18.05, -36.28, 0.12041, 3, 4, 69.4, -22.88, 0.17396, 5, 20.51, -29.78, 0.5644, 6, -6.53, -32.23, 0.26164, 2, 5, 33.86, -28.42, 0.29085, 6, 6.13, -27.77, 0.70915, 2, 5, 56.55, -19.38, 0.17381, 6, 26.05, -13.63, 0.82619, 4, 44, 20.79, 3.26, 0.43236, 45, -12.74, 4.03, 0.19687, 3, -36.22, 13.38, 0.21782, 29, 13.98, -19.25, 0.15294, 4, 44, 2.69, 26.81, 0.26409, 28, -50.86, 29.21, 0.2337, 3, -16.39, -8.73, 0.34628, 29, 35.79, -0.49, 0.15592, 3, 44, -15.65, 28.57, 0.15678, 28, -33.54, 28.78, 0.2916, 3, 2.03, -9.11, 0.55162, 1, 28, -28.18, 8.37, 1, 1, 28, -5.01, 11, 1, 3, 28, 24.12, 24.18, 0.12052, 3, 60.07, -13.52, 0.21384, 4, 20.53, -20.16, 0.66564, 2, 4, 39.64, -17.85, 0.59513, 5, -6.68, -16.66, 0.40487, 3, 4, 60.96, -9.87, 0.26252, 5, 16.02, -14.92, 0.55541, 6, -14.39, -18.85, 0.18206, 2, 5, 32.69, 8.3, 0.58729, 6, -3.66, 7.65, 0.41271, 2, 4, 39.53, 3.1, 0.47136, 5, -0.95, 3.5, 0.52864, 1, 4, 17.89, 2.56, 1, 2, 3, 27.01, -3.64, 0.67245, 4, -8.37, -1.32, 0.32755, 3, 44, -2.63, 46, 0.10033, 28, -45.42, 10.27, 0.52612, 3, -9.64, -27.47, 0.37356, 2, 39, 47.98, 4.75, 0.16598, 40, 19.38, 1.78, 0.83402, 4, 51, 19.56, 50.48, 0.12624, 38, 53.31, 9.51, 0.16908, 39, 28.22, 4.86, 0.24846, 40, -0.13, 4.94, 0.45621, 4, 51, 26.31, 16.82, 0.32786, 38, 18.97, 9.25, 0.38308, 39, -5.69, 10.34, 0.1588, 40, -32.78, 15.61, 0.13026, 2, 51, 16.97, -0.03, 0.66865, 38, 4.23, 21.71, 0.33135, 3, 51, 28.1, 2.86, 0.4826, 38, 4.92, 10.15, 0.31302, 39, -19.39, 13.57, 0.20437, 3, 49, 63.22, -0.58, 0.21069, 50, 25.96, 0.79, 0.49387, 51, -11.02, 1.48, 0.29545, 3, 44, -14.84, 8.09, 0.24448, 28, -33.35, 51.23, 0.16325, 3, 2.6, 13.54, 0.59227, 4, 44, 3.38, 4.96, 0.28616, 28, -51.81, 51.13, 0.16477, 3, -15.87, 13.44, 0.31892, 29, 13.85, -0.53, 0.23015, 4, 44, 46.09, 3.59, 0.2409, 45, 9.06, 3.1, 0.41152, 46, -28.46, 0.64, 0.21862, 29, 17.5, -43.07, 0.12896, 3, 45, 37.23, 1.25, 0.47745, 46, -0.08, 1.26, 0.42163, 47, -36.26, -5.26, 0.10093, 4, 44, -5.23, 6.3, 0.25594, 28, -43.11, 51.32, 0.15579, 3, -7.17, 13.63, 0.42092, 29, 14.17, 8.17, 0.16735, 4, 44, 33.04, 3.37, 0.36685, 45, -3.97, 3.61, 0.31093, 3, -45.33, 9.83, 0.17307, 29, 15.76, -30.15, 0.14915, 4, 49, 77.51, -1.16, 0.11479, 50, 40.24, 0.95, 0.26889, 51, 3.05, 0.72, 0.44973, 38, 7.66, 35.33, 0.16659, 4, 51, 22.73, 34.68, 0.22091, 38, 37.18, 9.39, 0.26956, 39, 12.3, 7.43, 0.20636, 40, -15.46, 9.95, 0.30317 ], "hull": 60, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 24, 26, 26, 28, 32, 34, 34, 36, 36, 38, 46, 48, 48, 50, 54, 56, 56, 58, 58, 60, 60, 62, 66, 68, 76, 78, 78, 80, 80, 82, 86, 88, 88, 90, 90, 92, 92, 94, 98, 100, 100, 102, 102, 104, 104, 106, 106, 108, 116, 118, 0, 118, 92, 120, 120, 20, 28, 86, 82, 32, 34, 80, 78, 36, 76, 38, 12, 124, 102, 126, 126, 124, 126, 128, 128, 130, 130, 132, 132, 134, 112, 134, 134, 136, 136, 4, 2, 116, 6, 138, 138, 132, 8, 140, 140, 130, 10, 142, 142, 128, 128, 104, 130, 106, 132, 108, 122, 92, 100, 144, 144, 122, 126, 144, 144, 94, 112, 114, 114, 116, 108, 110, 110, 112, 16, 18, 18, 20, 20, 22, 22, 24, 12, 14, 14, 16, 122, 124, 94, 96, 96, 98, 56, 146, 146, 60, 54, 148, 148, 62, 146, 148, 50, 150, 150, 66, 46, 152, 152, 68, 154, 152, 154, 48, 42, 156, 156, 72, 14, 158, 158, 124, 18, 160, 160, 122, 160, 120, 24, 162, 162, 90, 26, 164, 164, 88, 162, 164, 16, 166, 160, 166, 166, 158, 166, 124, 162, 168, 168, 120, 168, 22, 168, 92, 38, 40, 40, 42, 72, 74, 74, 76, 40, 74, 42, 44, 44, 46, 152, 170, 170, 156, 44, 170, 68, 70, 70, 72, 170, 70, 62, 64, 64, 66, 148, 172, 172, 150, 64, 172, 50, 52, 52, 54, 172, 52, 154, 66, 150, 154, 28, 30, 30, 32, 82, 84, 84, 86, 30, 84 ], @@ -541,7 +541,7 @@ "front-arm": { "type": "mesh", "uvs": [ 0.71401, 0.00566, 0.67108, 0.08129, 0.60222, 0.15434, 0.53633, 0.21683, 0.44558, 0.28705, 0.34898, 0.35134, 0.29097, 0.38941, 0.25238, 0.41472, 0.22423, 0.44271, 0.19483, 0.47193, 0.15998, 0.50658, 0.09138, 0.59568, 0.05498, 0.70866, 0.02988, 0.81366, 0.01049, 0.94262, 0.10495, 0.98985, 0.25391, 0.97421, 0.31482, 0.88907, 0.28834, 0.82869, 0.13607, 0.74572, 0.14335, 0.71488, 0.18317, 0.62253, 0.25217, 0.54221, 0.29538, 0.50981, 0.33787, 0.47795, 0.38452, 0.45013, 0.43581, 0.41953, 0.54711, 0.3655, 0.68845, 0.29832, 0.74855, 0.35527, 0.85874, 0.38229, 0.99674, 0.37645, 0.95354, 0.33244, 0.91356, 0.29172, 0.87464, 0.25208, 0.83759, 0.21434, 0.78083, 0.12598, 0.78194, 0.0683, 0.6322, 0.23719, 0.66925, 0.15784, 0.75533, 0.20967, 0.7161, 0.11137 ], - "triangles": [ 30, 32, 31, 30, 29, 33, 30, 33, 32, 29, 28, 33, 28, 34, 33, 34, 40, 35, 34, 28, 40, 28, 38, 40, 38, 39, 40, 40, 36, 35, 39, 41, 40, 40, 41, 36, 39, 1, 41, 36, 41, 37, 37, 41, 0, 41, 1, 0, 39, 2, 1, 15, 18, 16, 15, 14, 13, 15, 13, 19, 16, 18, 17, 18, 15, 19, 13, 12, 19, 19, 12, 20, 12, 11, 20, 20, 11, 21, 11, 10, 21, 21, 10, 22, 10, 9, 22, 22, 9, 23, 9, 8, 23, 8, 7, 23, 23, 7, 24, 7, 6, 24, 24, 6, 25, 6, 5, 25, 25, 5, 26, 26, 5, 4, 26, 4, 27, 4, 3, 27, 27, 38, 28, 27, 3, 38, 3, 2, 38, 38, 2, 39 ], + "triangles": [ 30, 29, 33, 30, 32, 31, 40, 41, 36, 39, 41, 40, 40, 36, 35, 38, 39, 40, 28, 38, 40, 34, 28, 40, 34, 40, 35, 28, 34, 33, 29, 28, 33, 30, 33, 32, 41, 1, 0, 37, 41, 0, 36, 41, 37, 39, 1, 41, 39, 2, 1, 19, 12, 20, 13, 12, 19, 18, 15, 19, 16, 18, 17, 15, 13, 19, 15, 14, 13, 15, 18, 16, 21, 10, 22, 11, 10, 21, 20, 11, 21, 12, 11, 20, 9, 8, 23, 22, 9, 23, 10, 9, 22, 26, 5, 4, 25, 5, 26, 6, 5, 25, 24, 6, 25, 7, 6, 24, 23, 7, 24, 8, 7, 23, 38, 2, 39, 3, 2, 38, 27, 3, 38, 27, 38, 28, 4, 3, 27, 26, 4, 27 ], "vertices": [ 1, 53, 21.67, 6.08, 1, 2, 52, 18.13, 3.37, 0.16553, 53, 3.92, 4.24, 0.83447, 3, 33, -6.12, -15.24, 0.20965, 52, -0.05, 8.86, 0.53629, 6, 43.44, 6.81, 0.25406, 1, 33, 10.36, -12.02, 1, 2, 33, 30.62, -10.09, 0.88822, 34, -7.63, -10.15, 0.11178, 2, 33, 50.57, -9.69, 0.30996, 34, 12.31, -9.61, 0.69004, 2, 34, 24.21, -9.37, 0.86563, 35, -13.43, -6.2, 0.13437, 2, 34, 32.12, -9.22, 0.73143, 35, -5.73, -8.02, 0.26857, 2, 34, 39.35, -7.59, 0.54007, 35, 1.68, -8.25, 0.45993, 2, 34, 46.9, -5.88, 0.29037, 35, 9.42, -8.48, 0.70963, 2, 35, 18.59, -8.76, 0.66539, 36, -15.76, -5.13, 0.33461, 1, 36, 6.03, -8.58, 1, 2, 36, 31.42, -5.98, 0.39257, 37, 0.49, -6.36, 0.60743, 1, 37, 23.8, -9.31, 1, 1, 37, 52.37, -11.28, 1, 1, 37, 62.39, 2.72, 1, 1, 37, 58.29, 24.21, 1, 1, 37, 39.22, 32.48, 1, 1, 37, 26, 28.25, 1, 1, 37, 8.33, 5.63, 1, 2, 36, 28.81, 6.64, 0.48313, 37, 1.49, 6.49, 0.51687, 1, 36, 7.61, 5.9, 1, 3, 34, 51.67, 11.07, 0.10767, 35, 18.26, 6.75, 0.559, 36, -12.35, 10.01, 0.33333, 2, 34, 42.19, 10.25, 0.31464, 35, 8.88, 8.32, 0.68536, 2, 34, 32.87, 9.45, 0.59184, 35, -0.35, 9.86, 0.40816, 2, 34, 23.73, 9.7, 0.83036, 35, -9.14, 12.39, 0.16964, 2, 33, 52.08, 9.88, 0.29921, 34, 13.68, 9.98, 0.70079, 2, 33, 32.19, 12.6, 0.84687, 34, -6.24, 12.55, 0.15313, 1, 6, 9.42, 3.39, 1, 2, 6, -5.05, -1.59, 0.472, 5, 29.16, -0.35, 0.528, 1, 5, 16.13, -11.36, 1, 1, 5, 7.46, -29.44, 1, 2, 6, -8.23, -31.57, 0.5193, 5, 19, -28.74, 0.4807, 1, 6, 2, -28.43, 1, 1, 6, 11.96, -25.37, 1, 1, 6, 21.44, -22.45, 1, 3, 52, 12.7, -14.55, 0.25482, 53, 2.14, -14.4, 0.32231, 6, 42.47, -19.82, 0.42287, 1, 53, 13.64, -8.89, 1, 1, 33, 3.55, 0.91, 1, 2, 52, 1.72, -0.73, 0.5001, 6, 40.07, -2.34, 0.4999, 1, 6, 25.66, -11.25, 1, 3, 52, 13.4, -4.65, 0.33234, 53, 0.86, -4.56, 0.48165, 6, 48.12, -11.66, 0.18601 ], "hull": 38, "edges": [ 0, 2, 8, 10, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 52, 54, 54, 56, 56, 58, 58, 60, 60, 62, 70, 72, 72, 74, 0, 74, 56, 76, 6, 8, 76, 6, 4, 6, 4, 78, 78, 80, 80, 70, 2, 82, 82, 72, 82, 78, 78, 76, 2, 4, 56, 80, 56, 66, 62, 64, 64, 66, 66, 68, 68, 70, 44, 46, 46, 48, 18, 20, 46, 18, 10, 12, 12, 14, 48, 50, 50, 52, 12, 50, 14, 16, 16, 18 ], @@ -572,6 +572,17 @@ } ], "animations": { + "idle": { + "bones": { + "hip": { + "translate": [ + {}, + { "time": 1, "y": -4.42 }, + { "time": 2 } + ] + } + } + }, "sneak": { "bones": { "hip": { 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 bd04cccd47..7ac3fb12d4 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": "AAVlM3uJh3s", - "spine": "4.1.23-beta", + "hash": "PPErx2B6aMg", + "spine": "4.2.05-beta", "x": -809.16, "y": -73.54, "width": 1287.65, @@ -129,8 +129,8 @@ "y": -0.01, "color": "e07800ff" }, - { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff" }, - { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff" }, + { "name": "back-foot-target", "parent": "root", "x": 33.44, "y": 30.82, "color": "ff3f00ff", "icon": "ik" }, + { "name": "back-leg-target", "parent": "back-foot-target", "x": -127.51, "y": 75.99, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg1", "parent": "hip", @@ -309,8 +309,16 @@ "y": 0.2, "color": "15ff00ff" }, - { "name": "front-foot-target", "parent": "root", "rotation": -6.96, "x": -45.8, "y": -28.67, "color": "ff3f00ff" }, - { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff" }, + { + "name": "front-foot-target", + "parent": "root", + "rotation": -6.96, + "x": -45.8, + "y": -28.67, + "color": "ff3f00ff", + "icon": "ik" + }, + { "name": "front-leg-target", "parent": "front-foot-target", "x": -106.06, "y": 115.58, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg1", "parent": "hip", @@ -512,8 +520,24 @@ "y": -0.21, "color": "fff200ff" }, - { "name": "head-control", "parent": "head", "rotation": -95.04, "x": 42.32, "y": -220.33, "color": "219517ff" }, - { "name": "leg-control", "parent": "front-leg1", "rotation": 53.14, "x": 172.97, "y": 4.16, "color": "1d8020ff" } + { + "name": "head-control", + "parent": "head", + "rotation": -95.04, + "x": 42.32, + "y": -220.33, + "color": "219517ff", + "icon": "arrows" + }, + { + "name": "leg-control", + "parent": "front-leg1", + "rotation": 53.14, + "x": 172.97, + "y": 4.16, + "color": "1d8020ff", + "icon": "arrows" + } ], "slots": [ { "name": "back-hand", "bone": "back-hand2", "attachment": "back-hand" }, diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor.atlas.txt b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor.atlas.txt index 89cf60341e..a0723d67a7 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor.atlas.txt +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor.atlas.txt @@ -3,98 +3,91 @@ raptor.png filter: Linear, Linear scale: 0.5 back-arm - bounds: 829, 88, 46, 25 - rotate: 90 + bounds: 895, 295, 46, 25 back-bracer - bounds: 195, 238, 39, 28 + bounds: 992, 216, 39, 28 rotate: 90 back-hand - bounds: 724, 140, 36, 34 - rotate: 90 + bounds: 594, 58, 36, 34 back-knee - bounds: 760, 131, 49, 67 + bounds: 729, 86, 49, 67 rotate: 90 back-thigh - bounds: 225, 238, 39, 24 - rotate: 90 + bounds: 379, 2, 39, 24 eyes-open - bounds: 975, 204, 47, 45 + bounds: 902, 194, 47, 45 + rotate: 90 front-arm - bounds: 969, 112, 48, 26 + bounds: 945, 306, 48, 26 front-bracer - bounds: 724, 97, 41, 29 - rotate: 90 + bounds: 949, 197, 41, 29 front-hand - bounds: 251, 239, 41, 38 + bounds: 949, 266, 41, 38 front-open-hand - bounds: 856, 76, 43, 44 - rotate: 90 + bounds: 875, 148, 43, 44 front-thigh - bounds: 729, 178, 57, 29 + bounds: 793, 171, 57, 29 rotate: 90 gun - bounds: 894, 251, 107, 103 + bounds: 379, 28, 107, 103 + rotate: 90 gun-nohand - bounds: 764, 241, 105, 102 + bounds: 487, 87, 105, 102 head - bounds: 756, 345, 136, 149 + bounds: 807, 361, 136, 149 lower-leg - bounds: 475, 237, 73, 98 - rotate: 90 + bounds: 827, 195, 73, 98 mouth-grind - bounds: 975, 172, 47, 30 + bounds: 920, 145, 47, 30 + rotate: 90 mouth-smile - bounds: 975, 140, 47, 30 + bounds: 992, 257, 47, 30 + rotate: 90 neck - bounds: 366, 282, 18, 21 + bounds: 359, 114, 18, 21 raptor-back-arm - bounds: 636, 97, 82, 86 - rotate: 90 + bounds: 653, 142, 82, 86 raptor-body - bounds: 2, 2, 632, 233 + bounds: 2, 277, 632, 233 raptor-front-arm - bounds: 871, 168, 81, 102 + bounds: 484, 4, 81, 102 rotate: 90 raptor-front-leg - bounds: 2, 237, 191, 257 + bounds: 2, 18, 191, 257 raptor-hindleg-back - bounds: 195, 279, 169, 215 + bounds: 636, 295, 169, 215 raptor-horn - bounds: 431, 312, 182, 80 - rotate: 90 + bounds: 195, 22, 182, 80 raptor-horn-back - bounds: 513, 318, 176, 77 + bounds: 945, 334, 176, 77 rotate: 90 raptor-jaw - bounds: 894, 356, 126, 138 + bounds: 359, 137, 126, 138 raptor-jaw-tooth - bounds: 294, 240, 37, 48 + bounds: 895, 322, 37, 48 rotate: 90 raptor-mouth-inside - bounds: 344, 241, 36, 41 + bounds: 949, 228, 36, 41 rotate: 90 raptor-saddle-strap-back - bounds: 575, 242, 54, 74 -raptor-saddle-strap-front - bounds: 764, 182, 57, 95 + bounds: 653, 86, 54, 74 rotate: 90 +raptor-saddle-strap-front + bounds: 594, 94, 57, 95 raptor-saddle-w-shadow - bounds: 592, 323, 162, 171 + bounds: 195, 104, 162, 171 raptor-tail-shadow - bounds: 366, 305, 189, 63 - rotate: 90 + bounds: 636, 230, 189, 63 raptor-tongue - bounds: 387, 239, 86, 64 + bounds: 807, 295, 86, 64 stirrup-back - bounds: 829, 136, 44, 35 + bounds: 952, 151, 44, 35 rotate: 90 stirrup-front - bounds: 866, 121, 45, 50 - rotate: 90 + bounds: 902, 243, 45, 50 stirrup-strap - bounds: 918, 120, 49, 46 + bounds: 824, 147, 49, 46 torso - bounds: 636, 181, 54, 91 - rotate: 90 + bounds: 737, 137, 54, 91 visor - bounds: 631, 237, 131, 84 + bounds: 487, 191, 131, 84 diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor.png b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor.png index 474f6316bc..af3658a386 100644 Binary files a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor.png and b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor.png differ 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 006f2d5a84..2fe9bacd2c 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": "QqiPXGOfONE", - "spine": "4.1.23-beta", + "hash": "ZCd/c3RDCPk", + "spine": "4.2.05-beta", "x": -100.47, "y": -9.21, "width": 260.65, @@ -11,7 +11,7 @@ }, "bones": [ { "name": "root" }, - { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff" }, + { "name": "back-arm-ik-target", "parent": "root", "x": 103.52, "y": 345.27, "color": "ff3f00ff", "icon": "ik" }, { "name": "hip", "parent": "root", "x": 28.61, "y": 289.9, "color": "ffbd00ff" }, { "name": "spine1", @@ -117,7 +117,7 @@ "transform": "noScale", "color": "ff0000ff" }, - { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff" }, + { "name": "back-leg-ik-target", "parent": "root", "x": 46.15, "y": 8.68, "color": "ff3f00ff", "icon": "ik" }, { "name": "back-leg-ik1", "parent": "hip", @@ -202,7 +202,7 @@ }, { "name": "belly", "parent": "spine1", "x": 35.94, "y": -37.69, "color": "ffbd00ff" }, { "name": "butt", "parent": "hip", "x": -32.67, "y": -1.88, "color": "ffbd00ff" }, - { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff" }, + { "name": "front-arm-ik-target", "parent": "root", "x": -92.44, "y": 331.78, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-arm-ik1", "parent": "spine4", @@ -263,7 +263,7 @@ }, { "name": "front-foot2", "parent": "front-foot1", "length": 29.12, "rotation": 9.61, "x": 26.3, "color": "50ff00ff" }, { "name": "front-foot3", "parent": "front-foot2", "length": 23.49, "rotation": 8.91, "x": 29.12, "color": "50ff00ff" }, - { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff" }, + { "name": "front-leg-ik-target", "parent": "root", "x": -37.74, "y": 5.03, "color": "ff3f00ff", "icon": "ik" }, { "name": "front-leg-ik1", "parent": "hip", @@ -489,7 +489,7 @@ "back-arm": { "type": "mesh", "uvs": [ 0.74522, 0.00989, 0.64111, 0.05762, 0.56303, 0.1559, 0.42509, 0.25886, 0.28974, 0.359, 0.22988, 0.49565, 0.21166, 0.60797, 0.21166, 0.69782, 0.16481, 0.78674, 0.14139, 0.84757, 0.02427, 0.88501, 0.0529, 0.91871, 0.37824, 0.98797, 0.60468, 0.98235, 0.6307, 0.9056, 0.73481, 0.87752, 0.63591, 0.81762, 0.55262, 0.74181, 0.38084, 0.69876, 0.37824, 0.60797, 0.39906, 0.50876, 0.51358, 0.38521, 0.66194, 0.28881, 0.85454, 0.18398, 0.97687, 0.07541, 0.9144, 0.00989 ], - "triangles": [ 11, 9, 12, 9, 8, 12, 12, 8, 18, 13, 12, 14, 12, 18, 17, 18, 8, 7, 14, 12, 17, 11, 10, 9, 14, 16, 15, 14, 17, 16, 7, 19, 18, 7, 6, 19, 6, 5, 19, 19, 5, 20, 5, 4, 20, 20, 4, 21, 4, 3, 21, 21, 3, 22, 3, 2, 22, 22, 2, 23, 2, 1, 23, 23, 1, 24, 1, 0, 24, 0, 25, 24 ], + "triangles": [ 14, 17, 16, 14, 16, 15, 11, 10, 9, 14, 12, 17, 18, 8, 7, 12, 18, 17, 13, 12, 14, 12, 8, 18, 9, 8, 12, 11, 9, 12, 6, 5, 19, 7, 6, 19, 7, 19, 18, 20, 4, 21, 5, 4, 20, 19, 5, 20, 3, 2, 22, 21, 3, 22, 4, 3, 21, 0, 25, 24, 1, 0, 24, 23, 1, 24, 2, 1, 23, 22, 2, 23 ], "vertices": [ 1, 9, -7.68, -11.48, 1, 1, 9, 4.09, -13.63, 1, 1, 9, 23.49, -9.36, 1, 1, 10, 13.44, -9.23, 1, 2, 10, 35.2, -9.62, 0.50649, 11, -0.58, -9.66, 0.49351, 1, 11, 26.04, -6.39, 1, 1, 12, 14.15, -6.11, 1, 2, 12, 31.54, -5.57, 0.66493, 13, -3.33, -5.03, 0.33507, 1, 13, 13.08, -11.25, 1, 1, 13, 24.41, -14.89, 1, 1, 13, 30.15, -24.52, 1, 1, 13, 36.93, -23.54, 1, 1, 13, 54.08, -2.33, 1, 1, 13, 55.73, 14.15, 1, 1, 13, 41.39, 18.48, 1, 1, 13, 37.29, 26.87, 1, 1, 13, 24.66, 21.67, 1, 1, 13, 9.18, 18.1, 1, 2, 12, 31.33, 6.78, 0.47881, 13, -1.11, 7.12, 0.52119, 1, 12, 13.77, 6.04, 1, 2, 11, 24.98, 6.17, 0.89218, 12, -5.48, 6.96, 0.10782, 2, 10, 32.6, 7.29, 0.59842, 11, -0.32, 7.45, 0.40158, 1, 10, 11.08, 8.85, 1, 1, 9, 17.89, 11.88, 1, 1, 9, -4.82, 9.46, 1, 1, 9, -13.69, -0.69, 1 ], "hull": 26, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 46, 48, 48, 50, 0, 50, 2, 48, 4, 46, 6, 44, 8, 42, 10, 40, 12, 38, 14, 36 ], @@ -509,7 +509,7 @@ "back-leg": { "type": "mesh", "uvs": [ 0.502, 0.01179, 0.36076, 0.06379, 0.4057, 0.15046, 0.44743, 0.23916, 0.47953, 0.32991, 0.51163, 0.42269, 0.52127, 0.50629, 0.48274, 0.58888, 0.41212, 0.66025, 0.3126, 0.74182, 0.2163, 0.81625, 0.1232, 0.89272, 0.00763, 0.97429, 0.29655, 0.98958, 0.47407, 0.99222, 0.64004, 0.99468, 0.80989, 0.9896, 0.91291, 0.98652, 1, 0.95797, 0.8333, 0.94681, 0.71067, 0.9386, 0.57123, 0.92031, 0.41533, 0.89986, 0.3447, 0.89272, 0.36885, 0.87178, 0.42817, 0.82033, 0.502, 0.74794, 0.58226, 0.66943, 0.6593, 0.59092, 0.72993, 0.50528, 0.76524, 0.42167, 0.78129, 0.32481, 0.78771, 0.23406, 0.78771, 0.13924, 0.72351, 0.03728, 0.60152, 0.00567, 0.82117, 0.96898, 0.67873, 0.96396, 0.52111, 0.9574, 0.35936, 0.94214, 0.19388, 0.92922, 0.25375, 0.88159, 0.32792, 0.8184 ], - "triangles": [ 17, 36, 19, 17, 16, 36, 16, 37, 36, 17, 19, 18, 36, 20, 19, 15, 37, 16, 14, 38, 15, 15, 38, 37, 37, 20, 36, 38, 21, 37, 37, 21, 20, 38, 22, 21, 13, 39, 14, 14, 39, 38, 12, 40, 13, 13, 40, 39, 39, 22, 38, 40, 23, 39, 39, 23, 22, 12, 11, 40, 40, 41, 23, 40, 11, 41, 23, 41, 24, 11, 10, 41, 41, 42, 24, 41, 10, 42, 24, 42, 25, 26, 25, 9, 10, 9, 42, 25, 42, 9, 9, 8, 26, 26, 8, 27, 8, 7, 27, 27, 7, 28, 7, 6, 28, 28, 6, 29, 6, 5, 29, 29, 5, 30, 30, 5, 31, 31, 5, 4, 31, 4, 32, 32, 4, 3, 32, 3, 33, 3, 2, 33, 2, 34, 33, 2, 1, 34, 34, 0, 35, 34, 1, 0 ], + "triangles": [ 36, 20, 19, 17, 19, 18, 16, 37, 36, 17, 16, 36, 17, 36, 19, 38, 22, 21, 37, 21, 20, 38, 21, 37, 37, 20, 36, 15, 38, 37, 14, 38, 15, 15, 37, 16, 39, 23, 22, 40, 23, 39, 39, 22, 38, 13, 40, 39, 12, 40, 13, 14, 39, 38, 13, 39, 14, 9, 8, 26, 25, 42, 9, 10, 9, 42, 26, 25, 9, 24, 42, 25, 41, 10, 42, 41, 42, 24, 11, 10, 41, 23, 41, 24, 40, 11, 41, 40, 41, 23, 12, 11, 40, 26, 8, 27, 6, 5, 29, 28, 6, 29, 7, 6, 28, 27, 7, 28, 8, 7, 27, 29, 5, 30, 31, 5, 4, 30, 5, 31, 32, 4, 3, 31, 4, 32, 34, 1, 0, 34, 0, 35, 2, 1, 34, 2, 34, 33, 3, 2, 33, 32, 3, 33 ], "vertices": [ 1, 20, -19.79, -5.67, 1, 2, 20, -5.62, -22.28, 0.83363, 21, -41.07, -23.3, 0.16637, 2, 20, 22.31, -21.98, 0.65187, 21, -13.17, -21.89, 0.34813, 3, 20, 50.83, -22.11, 0.3172, 21, 15.33, -20.87, 0.43086, 22, -19.67, -21.09, 0.25193, 4, 20, 79.85, -23.29, 0.10792, 21, 44.37, -20.89, 0.35417, 22, 9.3, -19.2, 0.3192, 23, -25.22, -20.06, 0.21872, 4, 21, 74.06, -20.98, 0.16486, 22, 38.93, -17.34, 0.32776, 23, 4.09, -15.38, 0.29831, 24, -30.1, -17.16, 0.20907, 3, 22, 65.54, -17.61, 0.17523, 23, 30.6, -13.11, 0.39173, 24, -4.12, -11.42, 0.43304, 3, 23, 57.03, -15.71, 0.19718, 24, 22.43, -10.53, 0.52971, 25, -12.97, -9.81, 0.27311, 3, 24, 46.05, -13.47, 0.40991, 25, 10.84, -10.17, 0.34747, 26, -24.93, -10.51, 0.24261, 3, 24, 73.39, -18.69, 0.19432, 25, 38.58, -12.41, 0.37177, 26, 2.9, -10.99, 0.43391, 3, 25, 64.06, -14.98, 0.16664, 26, 28.49, -11.94, 0.56756, 27, -7.53, -11.48, 0.2658, 3, 26, 54.58, -12.37, 0.52114, 27, 18.56, -10.93, 0.36168, 14, -3.08, 24.95, 0.11718, 4, 26, 82.97, -14.36, 0.35144, 27, 47.01, -11.86, 0.29521, 14, -13.07, -1.67, 0.25118, 15, -46.3, 1.83, 0.10216, 1, 14, 16.37, -4.67, 1, 2, 14, 34.32, -4.37, 0.53487, 15, 0.74, -4.44, 0.46513, 3, 14, 51.1, -4.08, 0.14611, 15, 17.5, -5.42, 0.54314, 16, -15.51, -2.75, 0.31075, 2, 15, 34.67, -4.01, 0.40714, 16, 1.65, -4.36, 0.59286, 2, 15, 45.09, -3.16, 0.25726, 16, 12.05, -5.34, 0.74274, 2, 15, 53.99, 5.81, 0.25311, 16, 22.38, 1.94, 0.74689, 2, 15, 37.19, 9.56, 0.4029, 16, 6.5, 8.57, 0.5971, 3, 14, 57.07, 14.17, 0.13352, 15, 24.84, 12.33, 0.54644, 16, -5.18, 13.44, 0.32004, 4, 26, 47.09, 33.11, 0.13131, 14, 42.64, 19.08, 0.26349, 15, 10.82, 18.31, 0.49746, 16, -17.94, 21.78, 0.10773, 4, 26, 46.46, 16.09, 0.21159, 27, 9.37, 17.21, 0.1068, 14, 26.51, 24.57, 0.44951, 15, -4.85, 25.01, 0.23211, 3, 26, 46.8, 8.62, 0.40111, 27, 10, 9.75, 0.24543, 14, 19.24, 26.38, 0.35346, 3, 26, 39.71, 8.61, 0.5825, 27, 2.91, 9.47, 0.30792, 14, 21.25, 33.18, 0.10958, 3, 25, 59.17, 5.89, 0.21955, 26, 22.27, 8.58, 0.57946, 27, -14.51, 8.8, 0.20099, 3, 24, 71.84, 0.47, 0.21583, 25, 34.96, 6.47, 0.32263, 26, -1.92, 7.63, 0.46154, 3, 24, 45.81, 3.96, 0.40554, 25, 8.71, 7.12, 0.38602, 26, -28.17, 6.61, 0.20845, 3, 23, 56.79, 2.13, 0.25409, 24, 19.83, 7.12, 0.53006, 25, -17.46, 7.46, 0.21585, 3, 22, 66.18, 3.45, 0.22414, 23, 29.23, 7.92, 0.34135, 24, -8.25, 9.24, 0.43451, 4, 21, 76.6, 4.51, 0.19364, 22, 39.78, 8.26, 0.28887, 23, 2.49, 10.19, 0.33579, 24, -35.06, 7.97, 0.1817, 4, 20, 82.88, 7.08, 0.11658, 21, 46.18, 9.58, 0.35727, 22, 9.09, 11.32, 0.35745, 23, -28.36, 10.3, 0.16869, 3, 20, 54.46, 12.11, 0.35357, 21, 17.57, 13.46, 0.44494, 22, -19.71, 13.32, 0.20149, 2, 20, 24.65, 16.69, 0.65438, 21, -12.4, 16.85, 0.34562, 2, 20, -8.38, 15.21, 0.85331, 21, -45.34, 14.05, 0.14669, 1, 20, -20.19, 4.56, 1, 2, 15, 35.89, 2.53, 0.4051, 16, 3.99, 1.87, 0.5949, 3, 14, 54.38, 5.92, 0.13921, 15, 21.52, 4.3, 0.54495, 16, -9.85, 6.12, 0.31584, 2, 14, 37.79, 7.63, 0.44939, 15, 5.1, 7.27, 0.55061, 3, 26, 65.39, 20.7, 0.11858, 14, 20.6, 11.35, 0.75134, 15, -11.76, 12.27, 0.13008, 3, 26, 65.41, 1.81, 0.3968, 27, 24.3, 0.23, 0.28258, 14, 2.07, 14.98, 0.32063, 3, 26, 48.01, 0.08, 0.55395, 27, 6.94, -0.33, 0.33293, 14, 3.38, 30.47, 0.11312, 3, 25, 65.95, -2.97, 0.19447, 26, 24.96, -1.58, 0.57382, 27, -15.99, -0.43, 0.23171 ], "hull": 36, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 34, 36, 44, 46, 50, 52, 52, 54, 54, 56, 56, 58, 58, 60, 60, 62, 62, 64, 64, 66, 66, 68, 68, 70, 0, 70, 4, 66, 2, 68, 40, 42, 42, 44, 26, 28, 28, 30, 46, 48, 48, 50, 36, 38, 38, 40, 30, 32, 32, 34, 18, 52, 16, 54, 14, 56, 12, 58, 10, 60, 8, 62, 6, 64, 32, 72, 72, 38, 30, 74, 74, 40, 72, 74, 28, 76, 76, 42, 74, 76, 26, 78, 78, 44, 76, 78, 24, 80, 80, 46, 78, 80, 22, 82, 82, 48, 80, 82, 20, 84, 84, 50, 82, 84 ], @@ -529,7 +529,7 @@ "body": { "type": "mesh", "uvs": [ 0.35966, 0.01351, 0.26864, 0.04108, 0.26204, 0.0954, 0.34119, 0.14478, 0.39792, 0.19457, 0.40451, 0.24272, 0.38077, 0.27893, 0.3597, 0.3004, 0.34119, 0.31926, 0.34989, 0.34326, 0.35834, 0.36658, 0.36552, 0.40164, 0.37234, 0.43499, 0.38397, 0.4944, 0.3956, 0.55971, 0.39884, 0.59858, 0.40142, 0.62955, 0.40216, 0.65662, 0.3461, 0.71564, 0.27077, 0.78176, 0.2201, 0.82128, 0.17618, 0.85553, 0.13115, 0.88833, 0.08238, 0.92385, 0.00342, 0.9796, 0.18836, 0.99127, 0.32172, 0.99284, 0.46266, 0.99451, 0.61643, 0.98608, 0.71618, 0.97182, 0.61851, 0.95821, 0.48967, 0.95043, 0.39458, 0.94083, 0.27772, 0.92904, 0.23408, 0.9232, 0.26692, 0.89774, 0.30681, 0.86681, 0.34203, 0.83415, 0.38369, 0.7955, 0.45642, 0.72874, 0.52708, 0.66845, 0.56032, 0.63345, 0.57541, 0.60109, 0.59357, 0.56214, 0.61643, 0.49732, 0.63513, 0.43963, 0.64345, 0.40462, 0.77081, 0.39011, 0.84585, 0.37025, 0.90983, 0.35331, 0.9674, 0.31915, 0.97302, 0.28585, 0.96448, 0.23351, 0.8952, 0.1681, 0.79346, 0.12643, 0.75179, 0.10879, 0.71799, 0.09448, 0.66817, 0.07237, 0.61343, 0.04807, 0.47868, 0.01411, 0.49846, 0.38826, 0.66315, 0.34728, 0.67333, 0.30664, 0.8188, 0.29655, 0.80971, 0.24505, 0.72829, 0.17902, 0.68147, 0.13902, 0.59191, 0.09711, 0.3904, 0.09012, 0.53695, 0.14981, 0.57563, 0.19616, 0.64483, 0.25077, 0.79855, 0.33476, 0.61751, 0.97167, 0.4773, 0.97061, 0.23795, 0.95673, 0.15272, 0.92355, 0.14158, 0.94886, 0.23861, 0.86092, 0.51732, 0.30354, 0.50696, 0.34527, 0.50634, 0.43735, 0.50334, 0.4959, 0.51086, 0.32558, 0.50355, 0.41057, 0.19543, 0.89241, 0.36492, 0.9641 ], - "triangles": [ 1, 0, 59, 58, 1, 59, 68, 1, 58, 2, 1, 68, 67, 68, 58, 67, 58, 57, 67, 57, 56, 66, 67, 56, 66, 56, 55, 3, 2, 68, 69, 68, 67, 3, 68, 69, 69, 67, 66, 66, 55, 54, 65, 66, 54, 65, 54, 53, 4, 3, 69, 70, 69, 66, 4, 69, 70, 70, 66, 65, 5, 4, 70, 71, 70, 65, 5, 70, 71, 6, 71, 62, 79, 6, 62, 7, 6, 79, 71, 6, 5, 83, 7, 79, 8, 7, 83, 83, 79, 62, 9, 8, 83, 80, 9, 83, 61, 83, 62, 61, 62, 72, 80, 83, 61, 46, 80, 61, 46, 61, 47, 62, 71, 64, 64, 65, 53, 64, 53, 52, 71, 65, 64, 63, 64, 52, 63, 52, 51, 62, 64, 63, 50, 63, 51, 72, 62, 63, 72, 63, 50, 49, 72, 50, 48, 72, 49, 47, 61, 72, 47, 72, 48, 74, 32, 31, 86, 32, 74, 73, 31, 30, 74, 31, 73, 73, 30, 29, 28, 74, 73, 28, 73, 29, 27, 86, 74, 27, 74, 28, 26, 86, 27, 75, 33, 86, 24, 23, 77, 25, 77, 75, 24, 77, 25, 26, 75, 86, 25, 75, 26, 22, 21, 85, 85, 78, 35, 34, 85, 35, 76, 22, 85, 76, 85, 34, 23, 22, 76, 77, 23, 76, 77, 76, 34, 77, 34, 33, 75, 77, 33, 86, 33, 32, 36, 78, 20, 21, 20, 78, 37, 36, 20, 85, 21, 78, 35, 78, 36, 38, 18, 39, 19, 18, 38, 37, 19, 38, 20, 19, 37, 40, 17, 16, 41, 40, 16, 39, 17, 40, 18, 17, 39, 42, 15, 14, 43, 42, 14, 41, 16, 15, 42, 41, 15, 14, 13, 82, 43, 82, 44, 14, 82, 43, 12, 11, 84, 45, 81, 84, 12, 84, 81, 46, 45, 84, 13, 12, 81, 82, 13, 81, 44, 81, 45, 82, 81, 44, 10, 9, 80, 60, 10, 80, 11, 10, 60, 60, 80, 46, 84, 60, 46, 11, 60, 84 ], + "triangles": [ 2, 1, 68, 68, 1, 58, 58, 1, 59, 1, 0, 59, 69, 67, 66, 3, 68, 69, 69, 68, 67, 3, 2, 68, 66, 56, 55, 66, 67, 56, 67, 57, 56, 67, 58, 57, 67, 68, 58, 5, 70, 71, 71, 70, 65, 5, 4, 70, 70, 66, 65, 4, 69, 70, 70, 69, 66, 4, 3, 69, 65, 54, 53, 65, 66, 54, 66, 55, 54, 46, 61, 47, 46, 80, 61, 80, 83, 61, 61, 62, 72, 61, 83, 62, 80, 9, 83, 9, 8, 83, 83, 79, 62, 8, 7, 83, 83, 7, 79, 71, 6, 5, 7, 6, 79, 79, 6, 62, 6, 71, 62, 47, 72, 48, 47, 61, 72, 48, 72, 49, 49, 72, 50, 72, 63, 50, 72, 62, 63, 50, 63, 51, 62, 64, 63, 63, 52, 51, 63, 64, 52, 71, 65, 64, 64, 53, 52, 64, 65, 53, 62, 71, 64, 26, 86, 27, 27, 74, 28, 27, 86, 74, 28, 73, 29, 28, 74, 73, 73, 30, 29, 74, 31, 73, 73, 31, 30, 86, 32, 74, 74, 32, 31, 25, 75, 26, 26, 75, 86, 24, 77, 25, 25, 77, 75, 24, 23, 77, 75, 33, 86, 86, 33, 32, 75, 77, 33, 77, 34, 33, 77, 76, 34, 77, 23, 76, 23, 22, 76, 76, 85, 34, 76, 22, 85, 34, 85, 35, 85, 78, 35, 22, 21, 85, 35, 78, 36, 85, 21, 78, 37, 36, 20, 21, 20, 78, 36, 78, 20, 20, 19, 37, 37, 19, 38, 19, 18, 38, 38, 18, 39, 18, 17, 39, 39, 17, 40, 41, 40, 16, 40, 17, 16, 42, 41, 15, 41, 16, 15, 43, 42, 14, 42, 15, 14, 14, 82, 43, 43, 82, 44, 14, 13, 82, 82, 81, 44, 44, 81, 45, 82, 13, 81, 13, 12, 81, 46, 45, 84, 12, 84, 81, 45, 81, 84, 12, 11, 84, 11, 60, 84, 84, 60, 46, 60, 80, 46, 11, 10, 60, 60, 10, 80, 10, 9, 80 ], "vertices": [ 1, 6, 30.85, 2.45, 1, 2, 5, 60.42, 12.42, 0.24859, 6, 22.32, 18.18, 0.75141, 2, 5, 39.47, 25.25, 0.44332, 6, -1.06, 25.72, 0.55668, 3, 4, 48.03, 29.46, 0.37431, 5, 14.55, 26.45, 0.47619, 6, -25.57, 21.02, 0.1495, 3, 3, 50.36, 32.58, 0.11243, 4, 24.29, 26.8, 0.64611, 5, -8.99, 30.5, 0.24146, 3, 44, -45.22, -8.81, 0.10611, 3, 28.69, 30.4, 0.49533, 4, 2.89, 30.85, 0.39856, 3, 44, -28.91, -12.45, 0.25802, 3, 12.15, 32.8, 0.60894, 4, -12.29, 37.84, 0.13304, 3, 44, -18.5, -14.05, 0.28714, 3, 2.34, 35.98, 0.51935, 29, -7.6, 18.95, 0.19351, 4, 44, -10.79, -18.35, 0.28478, 28, -42.03, 75.56, 0.10295, 3, -6.36, 37.32, 0.37494, 29, -10.2, 10.26, 0.23733, 3, 44, 0.92, -16.96, 0.34087, 3, -17.28, 35.45, 0.32141, 29, -8.2, -0.67, 0.33772, 4, 44, 10.64, -16.32, 0.32691, 45, -24.05, -14.9, 0.16082, 3, -27.58, 33.67, 0.14432, 29, -6.37, -11.05, 0.36794, 4, 44, 28.5, -15.63, 0.24237, 45, -9.55, -15.11, 0.27028, 46, -45.51, -19.12, 0.12132, 29, -3.65, -27.88, 0.36603, 4, 44, 41.59, -14.89, 0.21761, 45, 6.93, -15.35, 0.33285, 46, -26.85, -17.49, 0.20377, 29, -1.3, -43.28, 0.24577, 3, 45, 33.83, -15.81, 0.47179, 46, 0, -15.85, 0.42627, 47, -31.79, -17.82, 0.10194, 3, 45, 63.39, -16.48, 0.2126, 46, 29.52, -14.22, 0.42737, 47, -2.43, -14.39, 0.36002, 3, 46, 49.79, -15.51, 0.30179, 47, 14.85, -13.08, 0.47127, 48, -21.15, -15.64, 0.22695, 3, 46, 61.1, -13.41, 0.15443, 47, 29.03, -11.65, 0.50848, 48, -3.27, -12.45, 0.33708, 2, 47, 41.24, -10.8, 0.28079, 48, 8.41, -8.79, 0.71921, 2, 48, 36.24, -8.59, 0.56513, 49, -3.02, -8.84, 0.43487, 3, 48, 67.93, -10.06, 0.16322, 49, 28.69, -7.82, 0.53712, 50, -8.12, -7.7, 0.29966, 3, 49, 47.76, -8.47, 0.40201, 50, 10.97, -7.9, 0.45131, 51, -26.34, -6.21, 0.14668, 3, 49, 64.62, -8.06, 0.25017, 50, 27.8, -8.4, 0.46039, 51, -12.77, -8.82, 0.28944, 4, 49, 79.13, -10.24, 0.11858, 50, 42.33, -8.03, 0.26981, 51, 4.53, -8.38, 0.48104, 38, -1.56, 35.6, 0.13057, 2, 51, 20.84, -9.2, 0.728, 38, -5.38, 19.56, 0.272, 1, 38, -11.5, -7.3, 1, 4, 51, 43.23, 16.27, 0.2746, 38, 15.1, -7.51, 0.48158, 39, -12.29, -5.54, 0.12942, 40, -41.77, 0.94, 0.11439, 4, 51, 37, 33.94, 0.18804, 38, 33.71, -4.58, 0.34252, 39, 6.54, -5.76, 0.18297, 40, -23.2, -2.19, 0.28647, 3, 38, 53.35, -1.59, 0.21646, 39, 26.41, -6.09, 0.26516, 40, -3.62, -5.59, 0.51838, 2, 39, 47.99, -1.76, 0.15753, 40, 18.37, -4.66, 0.84247, 1, 40, 33.16, -0.12, 1, 2, 39, 47.98, 10.84, 0.17387, 40, 20.32, 7.79, 0.82613, 4, 51, 9.83, 48.43, 0.17572, 38, 53.29, 18.7, 0.17038, 39, 29.73, 13.92, 0.136, 40, 2.77, 13.66, 0.5179, 4, 51, 11.45, 34.58, 0.26313, 38, 39.26, 20.56, 0.23037, 39, 16.21, 18.1, 0.15679, 40, -9.94, 19.88, 0.3497, 4, 51, 12.41, 17.13, 0.37057, 38, 22.11, 22.5, 0.30409, 39, -0.38, 22.88, 0.18235, 40, -25.59, 27.17, 0.14299, 3, 51, 12.34, 10.44, 0.4464, 38, 15.56, 23.92, 0.2976, 39, -6.59, 25.37, 0.256, 4, 50, 38.15, 11.09, 0.28506, 51, 1.65, 10.97, 0.37544, 38, 17.99, 34.75, 0.18251, 39, -2.39, 35.65, 0.15699, 3, 49, 62.62, 10.94, 0.26064, 50, 26.05, 10.62, 0.49792, 51, -15.15, 10.14, 0.24144, 3, 49, 47.27, 9.67, 0.40348, 50, 9.53, 10.2, 0.4787, 51, -26.59, 11.94, 0.11781, 3, 48, 69.23, 6.98, 0.16044, 49, 28.64, 9.27, 0.53936, 50, -7.95, 9.39, 0.3002, 2, 48, 37.36, 8.01, 0.57649, 49, -3.21, 7.8, 0.42351, 2, 47, 45.49, 7.11, 0.2935, 48, 8.38, 9.61, 0.7065, 3, 46, 62.85, 9, 0.15446, 47, 29.41, 10.82, 0.49324, 48, -8.13, 9.49, 0.3523, 3, 46, 52.15, 9.28, 0.30575, 47, 12.84, 11.74, 0.46742, 48, -26.12, 8.77, 0.22683, 3, 45, 66.66, 11.26, 0.21798, 46, 30.62, 13.69, 0.42844, 47, -3.05, 13.54, 0.35358, 3, 45, 37.7, 16.76, 0.48246, 46, 1.32, 16.92, 0.41752, 47, -32.5, 14.97, 0.10002, 4, 44, 44.35, 22.12, 0.2346, 45, 11.91, 21.43, 0.43853, 46, -24.76, 19.57, 0.2068, 3, -58.29, -7.2, 0.12007, 4, 44, 28.55, 23.57, 0.31081, 45, -3.77, 23.84, 0.19158, 28, -76.76, 29.23, 0.21531, 3, -42.43, -7.46, 0.28231, 3, 44, 22.31, 41.64, 0.18196, 28, -69.84, 12.47, 0.43955, 3, -34.84, -25, 0.37848, 3, 44, 19.78, 51.42, 0.1392, 28, -59.84, 2.53, 0.47896, 3, -23.9, -35.17, 0.38184, 3, 44, 6.03, 61.54, 0.10543, 28, -52.71, -5.88, 0.51007, 3, -17.11, -43.61, 0.38449, 2, 28, -37.16, -13.14, 0.67427, 3, -1.22, -50.83, 0.32573, 1, 28, -22.09, -13.06, 1, 2, 28, 1.45, -10.49, 0.89019, 3, 37.4, -48.18, 0.10981, 3, 28, 30.41, 0.97, 0.4302, 3, 66.35, -36.73, 0.16237, 4, 19.98, -44.2, 0.40743, 2, 4, 41.58, -34.52, 0.68165, 5, -9.45, -33.21, 0.31835, 2, 4, 50.69, -30.62, 0.51066, 5, 0.38, -31.99, 0.48934, 3, 4, 58.07, -27.45, 0.26484, 5, 8.35, -31.01, 0.61475, 6, -18.05, -36.28, 0.12041, 3, 4, 69.4, -22.88, 0.17396, 5, 20.51, -29.78, 0.5644, 6, -6.53, -32.23, 0.26164, 2, 5, 33.86, -28.42, 0.29085, 6, 6.13, -27.77, 0.70915, 2, 5, 56.55, -19.38, 0.17381, 6, 26.05, -13.63, 0.82619, 4, 44, 20.79, 3.26, 0.43236, 45, -12.74, 4.03, 0.19687, 3, -36.22, 13.38, 0.21782, 29, 13.98, -19.25, 0.15294, 4, 44, 2.69, 26.81, 0.26409, 28, -50.86, 29.21, 0.2337, 3, -16.39, -8.73, 0.34628, 29, 35.79, -0.49, 0.15592, 3, 44, -15.65, 28.57, 0.15678, 28, -33.54, 28.78, 0.2916, 3, 2.03, -9.11, 0.55162, 1, 28, -28.18, 8.37, 1, 1, 28, -5.01, 11, 1, 3, 28, 24.12, 24.18, 0.12052, 3, 60.07, -13.52, 0.21384, 4, 20.53, -20.16, 0.66564, 2, 4, 39.64, -17.85, 0.59513, 5, -6.68, -16.66, 0.40487, 3, 4, 60.96, -9.87, 0.26252, 5, 16.02, -14.92, 0.55541, 6, -14.39, -18.85, 0.18206, 2, 5, 32.69, 8.3, 0.58729, 6, -3.66, 7.65, 0.41271, 2, 4, 39.53, 3.1, 0.47136, 5, -0.95, 3.5, 0.52864, 1, 4, 17.89, 2.56, 1, 2, 3, 27.01, -3.64, 0.67245, 4, -8.37, -1.32, 0.32755, 3, 44, -2.63, 46, 0.10033, 28, -45.42, 10.27, 0.52612, 3, -9.64, -27.47, 0.37356, 2, 39, 47.98, 4.75, 0.16598, 40, 19.38, 1.78, 0.83402, 4, 51, 19.56, 50.48, 0.12624, 38, 53.31, 9.51, 0.16908, 39, 28.22, 4.86, 0.24846, 40, -0.13, 4.94, 0.45621, 4, 51, 26.31, 16.82, 0.32786, 38, 18.97, 9.25, 0.38308, 39, -5.69, 10.34, 0.1588, 40, -32.78, 15.61, 0.13026, 2, 51, 16.97, -0.03, 0.66865, 38, 4.23, 21.71, 0.33135, 3, 51, 28.1, 2.86, 0.4826, 38, 4.92, 10.15, 0.31302, 39, -19.39, 13.57, 0.20437, 3, 49, 63.22, -0.58, 0.21069, 50, 25.96, 0.79, 0.49387, 51, -11.02, 1.48, 0.29545, 3, 44, -14.84, 8.09, 0.24448, 28, -33.35, 51.23, 0.16325, 3, 2.6, 13.54, 0.59227, 4, 44, 3.38, 4.96, 0.28616, 28, -51.81, 51.13, 0.16477, 3, -15.87, 13.44, 0.31892, 29, 13.85, -0.53, 0.23015, 4, 44, 46.09, 3.59, 0.2409, 45, 9.06, 3.1, 0.41152, 46, -28.46, 0.64, 0.21862, 29, 17.5, -43.07, 0.12896, 3, 45, 37.23, 1.25, 0.47745, 46, -0.08, 1.26, 0.42163, 47, -36.26, -5.26, 0.10093, 4, 44, -5.23, 6.3, 0.25594, 28, -43.11, 51.32, 0.15579, 3, -7.17, 13.63, 0.42092, 29, 14.17, 8.17, 0.16735, 4, 44, 33.04, 3.37, 0.36685, 45, -3.97, 3.61, 0.31093, 3, -45.33, 9.83, 0.17307, 29, 15.76, -30.15, 0.14915, 4, 49, 77.51, -1.16, 0.11479, 50, 40.24, 0.95, 0.26889, 51, 3.05, 0.72, 0.44973, 38, 7.66, 35.33, 0.16659, 4, 51, 22.73, 34.68, 0.22091, 38, 37.18, 9.39, 0.26956, 39, 12.3, 7.43, 0.20636, 40, -15.46, 9.95, 0.30317 ], "hull": 60, "edges": [ 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 24, 26, 26, 28, 32, 34, 34, 36, 36, 38, 46, 48, 48, 50, 54, 56, 56, 58, 58, 60, 60, 62, 66, 68, 76, 78, 78, 80, 80, 82, 86, 88, 88, 90, 90, 92, 92, 94, 98, 100, 100, 102, 102, 104, 104, 106, 106, 108, 116, 118, 0, 118, 92, 120, 120, 20, 28, 86, 82, 32, 34, 80, 78, 36, 76, 38, 12, 124, 102, 126, 126, 124, 126, 128, 128, 130, 130, 132, 132, 134, 112, 134, 134, 136, 136, 4, 2, 116, 6, 138, 138, 132, 8, 140, 140, 130, 10, 142, 142, 128, 128, 104, 130, 106, 132, 108, 122, 92, 100, 144, 144, 122, 126, 144, 144, 94, 112, 114, 114, 116, 108, 110, 110, 112, 16, 18, 18, 20, 20, 22, 22, 24, 12, 14, 14, 16, 122, 124, 94, 96, 96, 98, 56, 146, 146, 60, 54, 148, 148, 62, 146, 148, 50, 150, 150, 66, 46, 152, 152, 68, 154, 152, 154, 48, 42, 156, 156, 72, 14, 158, 158, 124, 18, 160, 160, 122, 160, 120, 24, 162, 162, 90, 26, 164, 164, 88, 162, 164, 16, 166, 160, 166, 166, 158, 166, 124, 162, 168, 168, 120, 168, 22, 168, 92, 38, 40, 40, 42, 72, 74, 74, 76, 40, 74, 42, 44, 44, 46, 152, 170, 170, 156, 44, 170, 68, 70, 70, 72, 170, 70, 62, 64, 64, 66, 148, 172, 172, 150, 64, 172, 50, 52, 52, 54, 172, 52, 154, 66, 150, 154, 28, 30, 30, 32, 82, 84, 84, 86, 30, 84 ], @@ -541,7 +541,7 @@ "front-arm": { "type": "mesh", "uvs": [ 0.71401, 0.00566, 0.67108, 0.08129, 0.60222, 0.15434, 0.53633, 0.21683, 0.44558, 0.28705, 0.34898, 0.35134, 0.29097, 0.38941, 0.25238, 0.41472, 0.22423, 0.44271, 0.19483, 0.47193, 0.15998, 0.50658, 0.09138, 0.59568, 0.05498, 0.70866, 0.02988, 0.81366, 0.01049, 0.94262, 0.10495, 0.98985, 0.25391, 0.97421, 0.31482, 0.88907, 0.28834, 0.82869, 0.13607, 0.74572, 0.14335, 0.71488, 0.18317, 0.62253, 0.25217, 0.54221, 0.29538, 0.50981, 0.33787, 0.47795, 0.38452, 0.45013, 0.43581, 0.41953, 0.54711, 0.3655, 0.68845, 0.29832, 0.74855, 0.35527, 0.85874, 0.38229, 0.99674, 0.37645, 0.95354, 0.33244, 0.91356, 0.29172, 0.87464, 0.25208, 0.83759, 0.21434, 0.78083, 0.12598, 0.78194, 0.0683, 0.6322, 0.23719, 0.66925, 0.15784, 0.75533, 0.20967, 0.7161, 0.11137 ], - "triangles": [ 30, 32, 31, 30, 29, 33, 30, 33, 32, 29, 28, 33, 28, 34, 33, 34, 40, 35, 34, 28, 40, 28, 38, 40, 38, 39, 40, 40, 36, 35, 39, 41, 40, 40, 41, 36, 39, 1, 41, 36, 41, 37, 37, 41, 0, 41, 1, 0, 39, 2, 1, 15, 18, 16, 15, 14, 13, 15, 13, 19, 16, 18, 17, 18, 15, 19, 13, 12, 19, 19, 12, 20, 12, 11, 20, 20, 11, 21, 11, 10, 21, 21, 10, 22, 10, 9, 22, 22, 9, 23, 9, 8, 23, 8, 7, 23, 23, 7, 24, 7, 6, 24, 24, 6, 25, 6, 5, 25, 25, 5, 26, 26, 5, 4, 26, 4, 27, 4, 3, 27, 27, 38, 28, 27, 3, 38, 3, 2, 38, 38, 2, 39 ], + "triangles": [ 30, 29, 33, 30, 32, 31, 40, 41, 36, 39, 41, 40, 40, 36, 35, 38, 39, 40, 28, 38, 40, 34, 28, 40, 34, 40, 35, 28, 34, 33, 29, 28, 33, 30, 33, 32, 41, 1, 0, 37, 41, 0, 36, 41, 37, 39, 1, 41, 39, 2, 1, 19, 12, 20, 13, 12, 19, 18, 15, 19, 16, 18, 17, 15, 13, 19, 15, 14, 13, 15, 18, 16, 21, 10, 22, 11, 10, 21, 20, 11, 21, 12, 11, 20, 9, 8, 23, 22, 9, 23, 10, 9, 22, 26, 5, 4, 25, 5, 26, 6, 5, 25, 24, 6, 25, 7, 6, 24, 23, 7, 24, 8, 7, 23, 38, 2, 39, 3, 2, 38, 27, 3, 38, 27, 38, 28, 4, 3, 27, 26, 4, 27 ], "vertices": [ 1, 53, 21.67, 6.08, 1, 2, 52, 18.13, 3.37, 0.16553, 53, 3.92, 4.24, 0.83447, 3, 33, -6.12, -15.24, 0.20965, 52, -0.05, 8.86, 0.53629, 6, 43.44, 6.81, 0.25406, 1, 33, 10.36, -12.02, 1, 2, 33, 30.62, -10.09, 0.88822, 34, -7.63, -10.15, 0.11178, 2, 33, 50.57, -9.69, 0.30996, 34, 12.31, -9.61, 0.69004, 2, 34, 24.21, -9.37, 0.86563, 35, -13.43, -6.2, 0.13437, 2, 34, 32.12, -9.22, 0.73143, 35, -5.73, -8.02, 0.26857, 2, 34, 39.35, -7.59, 0.54007, 35, 1.68, -8.25, 0.45993, 2, 34, 46.9, -5.88, 0.29037, 35, 9.42, -8.48, 0.70963, 2, 35, 18.59, -8.76, 0.66539, 36, -15.76, -5.13, 0.33461, 1, 36, 6.03, -8.58, 1, 2, 36, 31.42, -5.98, 0.39257, 37, 0.49, -6.36, 0.60743, 1, 37, 23.8, -9.31, 1, 1, 37, 52.37, -11.28, 1, 1, 37, 62.39, 2.72, 1, 1, 37, 58.29, 24.21, 1, 1, 37, 39.22, 32.48, 1, 1, 37, 26, 28.25, 1, 1, 37, 8.33, 5.63, 1, 2, 36, 28.81, 6.64, 0.48313, 37, 1.49, 6.49, 0.51687, 1, 36, 7.61, 5.9, 1, 3, 34, 51.67, 11.07, 0.10767, 35, 18.26, 6.75, 0.559, 36, -12.35, 10.01, 0.33333, 2, 34, 42.19, 10.25, 0.31464, 35, 8.88, 8.32, 0.68536, 2, 34, 32.87, 9.45, 0.59184, 35, -0.35, 9.86, 0.40816, 2, 34, 23.73, 9.7, 0.83036, 35, -9.14, 12.39, 0.16964, 2, 33, 52.08, 9.88, 0.29921, 34, 13.68, 9.98, 0.70079, 2, 33, 32.19, 12.6, 0.84687, 34, -6.24, 12.55, 0.15313, 1, 6, 9.42, 3.39, 1, 2, 6, -5.05, -1.59, 0.472, 5, 29.16, -0.35, 0.528, 1, 5, 16.13, -11.36, 1, 1, 5, 7.46, -29.44, 1, 2, 6, -8.23, -31.57, 0.5193, 5, 19, -28.74, 0.4807, 1, 6, 2, -28.43, 1, 1, 6, 11.96, -25.37, 1, 1, 6, 21.44, -22.45, 1, 3, 52, 12.7, -14.55, 0.25482, 53, 2.14, -14.4, 0.32231, 6, 42.47, -19.82, 0.42287, 1, 53, 13.64, -8.89, 1, 1, 33, 3.55, 0.91, 1, 2, 52, 1.72, -0.73, 0.5001, 6, 40.07, -2.34, 0.4999, 1, 6, 25.66, -11.25, 1, 3, 52, 13.4, -4.65, 0.33234, 53, 0.86, -4.56, 0.48165, 6, 48.12, -11.66, 0.18601 ], "hull": 38, "edges": [ 0, 2, 8, 10, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 52, 54, 54, 56, 56, 58, 58, 60, 60, 62, 70, 72, 72, 74, 0, 74, 56, 76, 6, 8, 76, 6, 4, 6, 4, 78, 78, 80, 80, 70, 2, 82, 82, 72, 82, 78, 78, 76, 2, 4, 56, 80, 56, 66, 62, 64, 64, 66, 66, 68, 68, 70, 44, 46, 46, 48, 18, 20, 46, 18, 10, 12, 12, 14, 48, 50, 50, 52, 12, 50, 14, 16, 16, 18 ], @@ -572,6 +572,17 @@ } ], "animations": { + "idle": { + "bones": { + "hip": { + "translate": [ + {}, + { "time": 1, "y": -4.42 }, + { "time": 2 } + ] + } + } + }, "sneak": { "bones": { "hip": { diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json index c089eaaea5..375338680c 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.urp-shaders", "displayName": "Spine Universal RP Shaders", "description": "This plugin provides universal render pipeline (URP) shaders for the spine-unity runtime.\n\nPrerequisites:\nIt requires a working installation of the spine-unity runtime, version 4.2.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)", - "version": "4.2.27", + "version": "4.2.28", "unity": "2019.3", "author": { "name": "Esoteric Software",