Browse Source

[unity] Ported 4.2-beta physics. Updated skeleton assets.

Harald Csaszar 1 năm trước cách đây
mục cha
commit
f8352dce0a
96 tập tin đã thay đổi với 1228 bổ sung1042 xóa
  1. 1 1
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs
  2. 1 1
      spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs
  3. 1 1
      spine-unity/Assets/Spine Examples/Scripts/SpineGauge.cs
  4. 70 82
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.atlas.txt
  5. 2 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.json
  6. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.png
  7. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon2.png
  8. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon3.png
  9. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon4.png
  10. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon5.png
  11. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon6.png
  12. 0 108
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon6.png.meta
  13. 8 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_Atlas.asset
  14. 0 39
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon6.mat
  15. 0 8
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon6.mat.meta
  16. 4 4
      spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.atlas.txt
  17. 2 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.json
  18. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.png
  19. 5 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Atlas.asset
  20. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png
  21. 5 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Atlas.asset
  22. 2 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FootSoldier.json
  23. 4 4
      spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.atlas.txt
  24. 2 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.json
  25. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.png
  26. 5 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Atlas.asset
  27. 54 49
      spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.atlas.txt
  28. 2 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.json
  29. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.png
  30. 5 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Atlas.asset
  31. 29 30
      spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.atlas.txt
  32. 3 3
      spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.json
  33. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.png
  34. 5 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Atlas.asset
  35. 4 7
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.atlas.txt
  36. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png
  37. 5 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Atlas.asset
  38. 2 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/raggedy spineboy.json
  39. 43 50
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.atlas.txt
  40. 2 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.json
  41. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.png
  42. 5 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Atlas.asset
  43. 44 46
      spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.atlas.txt
  44. 2 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.json
  45. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png
  46. 5 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Atlas.asset
  47. 5 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Atlas.asset
  48. 8 8
      spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman.json
  49. 177 181
      spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.atlas.txt
  50. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.png
  51. 5 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Atlas.asset
  52. 278 74
      spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pro.json
  53. 43 50
      spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.atlas.txt
  54. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.png
  55. 5 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Atlas.asset
  56. 32 8
      spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pro.json
  57. 2 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.json
  58. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png
  59. 5 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Atlas.asset
  60. 13 4
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat
  61. 2 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy-unity.json
  62. 29 35
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.atlas.txt
  63. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png
  64. 5 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Atlas.asset
  65. 2 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.json
  66. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png
  67. 5 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Atlas.asset
  68. 1 1
      spine-unity/Assets/Spine Examples/package.json
  69. 1 1
      spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs
  70. 1 1
      spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityBoneInspector.cs
  71. 2 2
      spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs
  72. 5 5
      spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs
  73. 24 0
      spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonDebugWindow.cs
  74. 2 2
      spine-unity/Assets/Spine/Runtime/spine-unity/Asset Types/SkeletonDataCompatibility.cs
  75. 2 2
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/RootMotion/SkeletonRootMotionBase.cs
  76. 5 4
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonAnimation.cs
  77. 9 4
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs
  78. 20 19
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs
  79. 5 1
      spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs
  80. 1 1
      spine-unity/Assets/Spine/Runtime/spine-unity/Mesh Generation/MeshRendererBuffers.cs
  81. 1 1
      spine-unity/Assets/Spine/package.json
  82. 1 1
      spine-unity/Assets/Spine/version.txt
  83. 32 8
      spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor-pro.json
  84. 43 50
      spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor.atlas.txt
  85. BIN
      spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor.png
  86. 8 8
      spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/StretchymanLWRP/stretchyman.json
  87. 1 1
      spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs
  88. 1 1
      spine-unity/Modules/com.esotericsoftware.spine.timeline/package-no-spine-unity-dependency.json
  89. 1 1
      spine-unity/Modules/com.esotericsoftware.spine.timeline/package.json
  90. 32 8
      spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/2D/Spine Skeletons/RaptorURP/raptor-pro.json
  91. 8 8
      spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/2D/Spine Skeletons/StretchymanURP/stretchyman.json
  92. 32 8
      spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor-pro.json
  93. 43 50
      spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor.atlas.txt
  94. BIN
      spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor.png
  95. 8 8
      spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/StretchymanURP/stretchyman.json
  96. 1 1
      spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json

+ 1 - 1
spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll.cs

@@ -269,7 +269,7 @@ namespace Spine.Unity.Examples {
 				t.position -= offset;
 
 			UpdateSpineSkeleton(null);
-			skeleton.UpdateWorldTransform();
+			skeleton.UpdateWorldTransform(Skeleton.Physics.Update);
 		}
 
 		/// <summary>Removes the ragdoll instance and effect from the animated skeleton.</summary>

+ 1 - 1
spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs

@@ -281,7 +281,7 @@ namespace Spine.Unity.Examples {
 				t.position -= offset;
 
 			UpdateSpineSkeleton(null);
-			skeleton.UpdateWorldTransform();
+			skeleton.UpdateWorldTransform(Skeleton.Physics.Update);
 		}
 
 		/// <summary>Removes the ragdoll instance and effect from the animated skeleton.</summary>

+ 1 - 1
spine-unity/Assets/Spine Examples/Scripts/SpineGauge.cs

@@ -56,7 +56,7 @@ namespace Spine.Unity.Examples {
 			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);
 		}
 	}
 

+ 70 - 82
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

+ 2 - 2
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,

BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.png


BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon2.png


BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon3.png


BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon4.png


BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon5.png


BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon6.png


+ 0 - 108
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon6.png.meta

@@ -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: 

+ 8 - 2
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}

+ 0 - 39
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon6.mat

@@ -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: []

+ 0 - 8
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon6.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: df19a30178772d14895780e0cbd7c25c
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 4 - 4
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

+ 2 - 2
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,

BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.png


+ 5 - 2
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}

BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png


+ 5 - 2
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}

+ 2 - 2
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,

+ 4 - 4
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

+ 2 - 2
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,

BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.png


+ 5 - 2
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}

+ 54 - 49
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

+ 2 - 2
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,

BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.png


+ 5 - 2
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}

+ 29 - 30
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

+ 3 - 3
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" ]
 	},
 	{

BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.png


+ 5 - 2
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}

+ 4 - 7
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

BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png


+ 5 - 2
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}

+ 2 - 2
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,

+ 43 - 50
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

+ 2 - 2
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,

BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.png


+ 5 - 2
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}

+ 44 - 46
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

+ 2 - 2
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,

BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png


+ 5 - 2
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}

+ 5 - 2
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}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 8 - 8
spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman.json


+ 177 - 181
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

BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma.png


+ 5 - 2
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}

+ 278 - 74
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 }

+ 43 - 50
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

BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.png


+ 5 - 2
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}

+ 32 - 8
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" },

+ 2 - 2
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,

BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png


+ 5 - 2
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}

+ 13 - 4
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: []

+ 2 - 2
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,

+ 29 - 35
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

BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png


+ 5 - 2
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}

+ 2 - 2
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,

BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png


+ 5 - 2
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}

+ 1 - 1
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",

+ 1 - 1
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs

@@ -532,7 +532,7 @@ namespace Spine.Unity.Editor {
 			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;
 		}

+ 1 - 1
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityBoneInspector.cs

@@ -213,7 +213,7 @@ namespace Spine.Unity.Editor {
 								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<PolygonCollider2D>();

+ 2 - 2
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs

@@ -1357,7 +1357,7 @@ namespace Spine.Unity.Editor {
 			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 @@ namespace Spine.Unity.Editor {
 				throw e;
 			}
 
-			newSkeletonMecanim.skeleton.UpdateWorldTransform();
+			newSkeletonMecanim.skeleton.UpdateWorldTransform(Skeleton.Physics.Update);
 			newSkeletonMecanim.LateUpdate();
 
 			return newSkeletonMecanim;

+ 5 - 5
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonBaker.cs

@@ -614,7 +614,7 @@ namespace Spine.Unity.Editor {
 				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 @@ namespace Spine.Unity.Editor {
 			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 @@ namespace Spine.Unity.Editor {
 					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 @@ namespace Spine.Unity.Editor {
 					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 @@ namespace Spine.Unity.Editor {
 							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;

+ 24 - 0
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Windows/SkeletonDebugWindow.cs

@@ -436,6 +436,30 @@ namespace Spine.Unity.Editor {
 
 							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();

+ 2 - 2
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);

+ 2 - 2
spine-unity/Assets/Spine/Runtime/spine-unity/Components/RootMotion/SkeletonRootMotionBase.cs

@@ -213,7 +213,7 @@ namespace Spine.Unity {
 				Vector2 parentBoneScale;
 				GetScaleAffectingRootMotion(out parentBoneScale);
 				ClearEffectiveBoneOffsets(parentBoneScale);
-				skeletonComponent.Skeleton.UpdateWorldTransform();
+				skeletonComponent.Skeleton.UpdateWorldTransform(Skeleton.Physics.Update);
 			}
 			ClearRigidbodyTempMovement();
 
@@ -605,7 +605,7 @@ namespace Spine.Unity {
 				// 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);
 			}
 		}
 

+ 5 - 4
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonAnimation.cs

@@ -236,7 +236,7 @@ namespace Spine.Unity {
 				state.ApplyEventTimelinesOnly(skeleton, issueEvents: false);
 				return;
 			}
-			ApplyAnimation();
+			ApplyAnimation(deltaTime);
 		}
 
 		protected void UpdateAnimationStatus (float deltaTime) {
@@ -244,7 +244,7 @@ namespace Spine.Unity {
 			state.Update(deltaTime);
 		}
 
-		protected void ApplyAnimation () {
+		protected void ApplyAnimation (float deltaTime) {
 			if (_BeforeApply != null)
 				_BeforeApply(this);
 
@@ -253,6 +253,7 @@ namespace Spine.Unity {
 			else
 				state.ApplyEventTimelinesOnly(skeleton, issueEvents: true);
 
+			skeleton.Update(deltaTime);
 			AfterAnimationApplied();
 		}
 
@@ -260,11 +261,11 @@ namespace Spine.Unity {
 			if (_UpdateLocal != null)
 				_UpdateLocal(this);
 
-			skeleton.UpdateWorldTransform();
+			UpdateWorldTransform();
 
 			if (_UpdateWorld != null) {
 				_UpdateWorld(this);
-				skeleton.UpdateWorldTransform();
+				UpdateWorldTransform();
 			}
 
 			if (_UpdateComplete != null) {

+ 9 - 4
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs

@@ -357,7 +357,7 @@ namespace Spine.Unity {
 				state.ApplyEventTimelinesOnly(skeleton, issueEvents: false);
 				return;
 			}
-			ApplyAnimation();
+			ApplyAnimation(deltaTime);
 		}
 
 		protected void SyncSubmeshGraphicsWithCanvasRenderers () {
@@ -383,7 +383,7 @@ namespace Spine.Unity {
 			state.Update(deltaTime);
 		}
 
-		protected void ApplyAnimation () {
+		protected void ApplyAnimation (float deltaTime) {
 			if (BeforeApply != null)
 				BeforeApply(this);
 
@@ -392,6 +392,7 @@ namespace Spine.Unity {
 			else
 				state.ApplyEventTimelinesOnly(skeleton, issueEvents: true);
 
+			skeleton.Update(deltaTime);
 			AfterAnimationApplied();
 		}
 
@@ -399,17 +400,21 @@ namespace Spine.Unity {
 			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.

+ 20 - 19
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs

@@ -101,32 +101,32 @@ namespace Spine.Unity {
 
 		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);
 		}
 
 		/// <summary>Manual animation update. Required when <c>updateTiming</c> is set to <c>ManualUpdate</c>.</summary>
 		/// <param name="deltaTime">Ignored parameter.</param>
 		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 @@ namespace Spine.Unity {
 #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();

+ 5 - 1
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs

@@ -423,7 +423,7 @@ namespace Spine.Unity {
 			// 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 @@ namespace Spine.Unity {
 #endif
 		}
 
+		protected virtual void UpdateWorldTransform () {
+			skeleton.UpdateWorldTransform(Skeleton.Physics.Update);
+		}
+
 		/// <summary>
 		/// Generates a new UnityEngine.Mesh from the internal Skeleton.</summary>
 		public virtual void LateUpdate () {

+ 1 - 1
spine-unity/Assets/Spine/Runtime/spine-unity/Mesh Generation/MeshRendererBuffers.cs

@@ -107,7 +107,7 @@ namespace Spine.Unity {
 			doubleBufferedMesh = null;
 		}
 
-		///<summary>This is a Mesh that also stores the instructions SkeletonRenderer generated for it.</summary>
+		/// <summary>This is a Mesh that also stores the instructions SkeletonRenderer generated for it.</summary>
 		public class SmartMesh : IDisposable {
 			public Mesh mesh = SpineMesh.NewSkeletonMesh();
 			public SkeletonRendererInstruction instructionUsed = new SkeletonRendererInstruction();

+ 1 - 1
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",

+ 1 - 1
spine-unity/Assets/Spine/version.txt

@@ -1 +1 @@
-This Spine-Unity runtime works with data exported from Spine Editor version: 4.1.xx
+This Spine-Unity runtime works with data exported from Spine Editor version: 4.2.xx

+ 32 - 8
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" },

+ 43 - 50
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

BIN
spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/RaptorLWRP/raptor.png


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 8 - 8
spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/Spine Skeletons/StretchymanLWRP/stretchyman.json


+ 1 - 1
spine-unity/Modules/com.esotericsoftware.spine.timeline/Runtime/SpineAnimationState/SpineAnimationStateMixerBehaviour.cs

@@ -362,7 +362,7 @@ namespace Spine.Unity.Playables {
 					}
 				}
 
-				skeleton.UpdateWorldTransform();
+				skeleton.UpdateWorldTransform(Skeleton.Physics.Update);
 				if (skeletonAnimation) {
 					skeletonAnimation.AfterAnimationApplied();
 					skeletonAnimation.LateUpdate();

+ 1 - 1
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",

+ 1 - 1
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",

+ 32 - 8
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" },

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 8 - 8
spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/2D/Spine Skeletons/StretchymanURP/stretchyman.json


+ 32 - 8
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" },

+ 43 - 50
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

BIN
spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/RaptorURP/raptor.png


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 8 - 8
spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Samples~/Examples/3D/Spine Skeletons/StretchymanURP/stretchyman.json


+ 1 - 1
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",

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác