Browse Source

[unity] Updated remaining assets for major 4.0-beta runtime changes. See #1796.

Harald Csaszar 5 years ago
parent
commit
b58c129e85
42 changed files with 1016 additions and 370 deletions
  1. 12 67
      spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Ragdoll.unity
  2. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.json
  3. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.png
  4. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon2.png
  5. 8 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat
  6. 8 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat
  7. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.json
  8. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.png
  9. 8 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat
  10. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png
  11. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FootSoldier.json
  12. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.json
  13. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.png
  14. 8 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat
  15. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.json
  16. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.png
  17. 7 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Material.mat
  18. 62 15
      spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.json
  19. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.png
  20. 7 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Material.mat
  21. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png
  22. 8 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat
  23. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/raggedy spineboy.json
  24. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.json
  25. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.png
  26. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.json
  27. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png
  28. 9 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat
  29. 8 8
      spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.atlas.txt
  30. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.png
  31. 7 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat
  32. 735 154
      spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman.json
  33. 55 55
      spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.atlas.txt
  34. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.png
  35. 8 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material.mat
  36. 48 52
      spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pro.json
  37. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.json
  38. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png
  39. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy-unity.json
  40. BIN
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png
  41. 7 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material.mat
  42. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.json

+ 12 - 67
spine-unity/Assets/Spine Examples/Other Examples/SkeletonUtility Ragdoll.unity

@@ -199,6 +199,7 @@ MonoBehaviour:
   massFalloffFactor: 0.504
   massFalloffFactor: 0.504
   colliderLayer: 0
   colliderLayer: 0
   mix: 1
   mix: 1
+  oldRagdollBehaviour: 1
 --- !u!114 &92814986
 --- !u!114 &92814986
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -214,6 +215,8 @@ MonoBehaviour:
   initialSkinName: 
   initialSkinName: 
   initialFlipX: 0
   initialFlipX: 0
   initialFlipY: 0
   initialFlipY: 0
+  updateMode: 3
+  updateWhenInvisible: 3
   separatorSlotNames: []
   separatorSlotNames: []
   zSpacing: 0
   zSpacing: 0
   useClipping: 1
   useClipping: 1
@@ -283,7 +286,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Children: []
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &136357263
 --- !u!1 &136357263
 GameObject:
 GameObject:
@@ -925,6 +928,7 @@ MonoBehaviour:
   massFalloffFactor: 0.504
   massFalloffFactor: 0.504
   colliderLayer: 0
   colliderLayer: 0
   mix: 1
   mix: 1
+  oldRagdollBehaviour: 1
 --- !u!114 &1063411342
 --- !u!114 &1063411342
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -940,6 +944,8 @@ MonoBehaviour:
   initialSkinName: 
   initialSkinName: 
   initialFlipX: 0
   initialFlipX: 0
   initialFlipY: 0
   initialFlipY: 0
+  updateMode: 3
+  updateWhenInvisible: 3
   separatorSlotNames: []
   separatorSlotNames: []
   zSpacing: 0
   zSpacing: 0
   useClipping: 1
   useClipping: 1
@@ -1009,7 +1015,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Children: []
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1241879114
 --- !u!1 &1241879114
 GameObject:
 GameObject:
@@ -1495,6 +1501,7 @@ MonoBehaviour:
   massFalloffFactor: 0.504
   massFalloffFactor: 0.504
   colliderLayer: 0
   colliderLayer: 0
   mix: 1
   mix: 1
+  oldRagdollBehaviour: 1
 --- !u!114 &1686250045
 --- !u!114 &1686250045
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1510,6 +1517,8 @@ MonoBehaviour:
   initialSkinName: 
   initialSkinName: 
   initialFlipX: 1
   initialFlipX: 1
   initialFlipY: 0
   initialFlipY: 0
+  updateMode: 3
+  updateWhenInvisible: 3
   separatorSlotNames: []
   separatorSlotNames: []
   zSpacing: 0
   zSpacing: 0
   useClipping: 1
   useClipping: 1
@@ -1579,71 +1588,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Children: []
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
-  m_RootOrder: 6
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1938155299
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 1938155303}
-  - component: {fileID: 1938155302}
-  - component: {fileID: 1938155301}
-  - component: {fileID: 1938155300}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1938155300
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1938155299}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2d49b7c1bcd2e07499844da127be038d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &1938155301
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1938155299}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &1938155302
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1938155299}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!4 &1938155303
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1938155299}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1949578535
 --- !u!1 &1949578535
 GameObject:
 GameObject:

+ 1 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon.json

@@ -1,7 +1,7 @@
 {
 {
 "skeleton": {
 "skeleton": {
 	"hash": "W2x0sFWHxCE",
 	"hash": "W2x0sFWHxCE",
-	"spine": "4.0.05-beta",
+	"spine": "4.0.11-beta",
 	"x": -366.31,
 	"x": -366.31,
 	"y": -286.62,
 	"y": -286.62,
 	"width": 660.39,
 	"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


+ 8 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat

@@ -24,7 +24,14 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Floats:
     m_Floats:
     - _Cutoff: 0.1
     - _Cutoff: 0.1
+    - _OutlineMipLevel: 0
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
     - _StencilComp: 8
     - _StencilComp: 8
     - _StencilRef: 1
     - _StencilRef: 1
     - _StraightAlphaInput: 0
     - _StraightAlphaInput: 0
-    m_Colors: []
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
+    m_Colors:
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}

+ 8 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat

@@ -24,7 +24,14 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Floats:
     m_Floats:
     - _Cutoff: 0.1
     - _Cutoff: 0.1
+    - _OutlineMipLevel: 0
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
     - _StencilComp: 8
     - _StencilComp: 8
     - _StencilRef: 1
     - _StencilRef: 1
     - _StraightAlphaInput: 0
     - _StraightAlphaInput: 0
-    m_Colors: []
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
+    m_Colors:
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}

+ 1 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes.json

@@ -1,7 +1,7 @@
 {
 {
 "skeleton": {
 "skeleton": {
 	"hash": "wNwtgzmTRJY",
 	"hash": "wNwtgzmTRJY",
-	"spine": "4.0.05-beta",
+	"spine": "4.0.11-beta",
 	"x": -434,
 	"x": -434,
 	"y": -133,
 	"y": -133,
 	"width": 868,
 	"width": 868,

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


+ 8 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat

@@ -24,7 +24,14 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Floats:
     m_Floats:
     - _Cutoff: 0.1
     - _Cutoff: 0.1
+    - _OutlineMipLevel: 0
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
     - _StencilComp: 8
     - _StencilComp: 8
     - _StencilRef: 1
     - _StencilRef: 1
     - _StraightAlphaInput: 0
     - _StraightAlphaInput: 0
-    m_Colors: []
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
+    m_Colors:
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}

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


+ 1 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FootSoldier.json

@@ -1,7 +1,7 @@
 {
 {
 "skeleton": {
 "skeleton": {
 	"hash": "Buu7RaVrgIg",
 	"hash": "Buu7RaVrgIg",
-	"spine": "4.0.05-beta",
+	"spine": "4.0.11-beta",
 	"x": -79.83,
 	"x": -79.83,
 	"y": -0.99,
 	"y": -0.99,
 	"width": 147.64,
 	"width": 147.64,

+ 1 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge.json

@@ -1,7 +1,7 @@
 {
 {
 "skeleton": {
 "skeleton": {
 	"hash": "WGQ8e/U+7iU",
 	"hash": "WGQ8e/U+7iU",
-	"spine": "4.0.05-beta",
+	"spine": "4.0.11-beta",
 	"x": -125,
 	"x": -125,
 	"y": -30,
 	"y": -30,
 	"width": 250,
 	"width": 250,

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


+ 8 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat

@@ -24,7 +24,14 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Floats:
     m_Floats:
     - _Cutoff: 0.1
     - _Cutoff: 0.1
+    - _OutlineMipLevel: 0
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
     - _StencilComp: 8
     - _StencilComp: 8
     - _StencilRef: 1
     - _StencilRef: 1
     - _StraightAlphaInput: 0
     - _StraightAlphaInput: 0
-    m_Colors: []
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
+    m_Colors:
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}

+ 1 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins.json

@@ -1,7 +1,7 @@
 {
 {
 "skeleton": {
 "skeleton": {
 	"hash": "PtTAK+zF95I",
 	"hash": "PtTAK+zF95I",
-	"spine": "4.0.05-beta",
+	"spine": "4.0.11-beta",
 	"x": -134.12,
 	"x": -134.12,
 	"y": -3.28,
 	"y": -3.28,
 	"width": 266.94,
 	"width": 266.94,

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


+ 7 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Material.mat

@@ -24,9 +24,16 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Floats:
     m_Floats:
     - _Cutoff: 0.1
     - _Cutoff: 0.1
+    - _OutlineMipLevel: 0
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
     - _StencilComp: 8
     - _StencilComp: 8
     - _StencilRef: 1
     - _StencilRef: 1
     - _StraightAlphaInput: 0
     - _StraightAlphaInput: 0
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
     m_Colors:
     m_Colors:
     - _Black: {r: 1, g: 0, b: 0, a: 1}
     - _Black: {r: 1, g: 0, b: 0, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}

File diff suppressed because it is too large
+ 62 - 15
spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro.json


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


+ 7 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Material.mat

@@ -25,8 +25,15 @@ Material:
     m_Floats:
     m_Floats:
     - _Cutoff: 0.1
     - _Cutoff: 0.1
     - _FillPhase: 0
     - _FillPhase: 0
+    - _OutlineMipLevel: 0
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
     - _StencilComp: 8
     - _StencilComp: 8
     - _StencilRef: 1
     - _StencilRef: 1
     - _StraightAlphaInput: 0
     - _StraightAlphaInput: 0
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
     m_Colors:
     m_Colors:
     - _FillColor: {r: 1, g: 1, b: 1, a: 1}
     - _FillColor: {r: 1, g: 1, b: 1, a: 1}
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}

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


+ 8 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat

@@ -24,7 +24,14 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Floats:
     m_Floats:
     - _Cutoff: 0.1
     - _Cutoff: 0.1
+    - _OutlineMipLevel: 0
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
     - _StencilComp: 8
     - _StencilComp: 8
     - _StencilRef: 1
     - _StencilRef: 1
     - _StraightAlphaInput: 0
     - _StraightAlphaInput: 0
-    m_Colors: []
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
+    m_Colors:
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}

+ 1 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/raggedy spineboy.json

@@ -1,7 +1,7 @@
 {
 {
 "skeleton": {
 "skeleton": {
 	"hash": "M5CWyRHHnyE",
 	"hash": "M5CWyRHHnyE",
-	"spine": "4.0.05-beta",
+	"spine": "4.0.11-beta",
 	"x": -78.45,
 	"x": -78.45,
 	"y": -9.66,
 	"y": -9.66,
 	"width": 157.48,
 	"width": 157.48,

+ 1 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor.json

@@ -1,7 +1,7 @@
 {
 {
 "skeleton": {
 "skeleton": {
 	"hash": "aUVkIREPuuE",
 	"hash": "aUVkIREPuuE",
-	"spine": "4.0.05-beta",
+	"spine": "4.0.11-beta",
 	"x": -402.84,
 	"x": -402.84,
 	"y": -35.99,
 	"y": -35.99,
 	"width": 611.87,
 	"width": 611.87,

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


+ 1 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.json

@@ -1,7 +1,7 @@
 {
 {
 "skeleton": {
 "skeleton": {
 	"hash": "UHEtfZlIwiw",
 	"hash": "UHEtfZlIwiw",
-	"spine": "4.0.05-beta",
+	"spine": "4.0.11-beta",
 	"x": -214.04,
 	"x": -214.04,
 	"y": -80.91,
 	"y": -80.91,
 	"width": 519.95,
 	"width": 519.95,

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


+ 9 - 2
spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat

@@ -6,7 +6,7 @@ Material:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  m_Name: doi_Material
+  m_Name: Doi_Material
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
   m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
   m_ShaderKeywords: 
   m_ShaderKeywords: 
   m_LightmapFlags: 4
   m_LightmapFlags: 4
@@ -24,7 +24,14 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Floats:
     m_Floats:
     - _Cutoff: 0.1
     - _Cutoff: 0.1
+    - _OutlineMipLevel: 0
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
     - _StencilComp: 8
     - _StencilComp: 8
     - _StencilRef: 1
     - _StencilRef: 1
     - _StraightAlphaInput: 0
     - _StraightAlphaInput: 0
-    m_Colors: []
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
+    m_Colors:
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}

+ 8 - 8
spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.atlas.txt

@@ -5,36 +5,36 @@ format: RGBA8888
 filter: Linear,Linear
 filter: Linear,Linear
 repeat: none
 repeat: none
 back-arm
 back-arm
-  rotate: false
-  xy: 149, 45
+  rotate: true
+  xy: 679, 173
   size: 72, 202
   size: 72, 202
   orig: 72, 202
   orig: 72, 202
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 back-leg
 back-leg
   rotate: true
   rotate: true
-  xy: 312, 4
+  xy: 2, 2
   size: 100, 318
   size: 100, 318
   orig: 100, 318
   orig: 100, 318
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 body
 body
   rotate: true
   rotate: true
-  xy: 223, 106
+  xy: 2, 104
   size: 141, 452
   size: 141, 452
   orig: 141, 452
   orig: 141, 452
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 front-arm
 front-arm
-  rotate: false
-  xy: 2, 26
+  rotate: true
+  xy: 456, 100
   size: 145, 221
   size: 145, 221
   orig: 145, 221
   orig: 145, 221
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 head
 head
-  rotate: false
-  xy: 223, 2
+  rotate: true
+  xy: 322, 15
   size: 87, 102
   size: 87, 102
   orig: 87, 102
   orig: 87, 102
   offset: 0, 0
   offset: 0, 0

BIN
spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma.png


+ 7 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat

@@ -66,6 +66,10 @@ Material:
     - _Glossiness: 0.5
     - _Glossiness: 0.5
     - _Hue: 0
     - _Hue: 0
     - _Metallic: 0
     - _Metallic: 0
+    - _OutlineMipLevel: 0
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
     - _RenderQueue: 0
     - _RenderQueue: 0
     - _RimPower: 1.79
     - _RimPower: 1.79
     - _Saturation: 1
     - _Saturation: 1
@@ -73,10 +77,13 @@ Material:
     - _SrcBlend: 1
     - _SrcBlend: 1
     - _StencilComp: 8
     - _StencilComp: 8
     - _StencilRef: 1
     - _StencilRef: 1
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
     - _ZWrite: 0
     - _ZWrite: 0
     m_Colors:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
     - _FixedNormal: {r: 0, g: 0, b: 1, a: 1}
     - _FixedNormal: {r: 0, g: 0, b: 1, a: 1}
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
     - _OverlayColor: {r: 0, g: 0, b: 0, a: 0}
     - _OverlayColor: {r: 0, g: 0, b: 0, a: 0}
     - _RimColor: {r: 1, g: 1, b: 1, a: 1}
     - _RimColor: {r: 1, g: 1, b: 1, a: 1}

File diff suppressed because it is too large
+ 735 - 154
spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman.json


+ 55 - 55
spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma.atlas.txt

@@ -5,267 +5,267 @@ format: RGBA8888
 filter: Linear,Linear
 filter: Linear,Linear
 repeat: none
 repeat: none
 back-arm
 back-arm
-  rotate: false
-  xy: 895, 295
+  rotate: true
+  xy: 829, 88
   size: 46, 25
   size: 46, 25
   orig: 46, 25
   orig: 46, 25
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 back-bracer
 back-bracer
   rotate: true
   rotate: true
-  xy: 992, 216
+  xy: 195, 238
   size: 39, 28
   size: 39, 28
   orig: 39, 28
   orig: 39, 28
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 back-hand
 back-hand
-  rotate: false
-  xy: 594, 58
+  rotate: true
+  xy: 724, 140
   size: 36, 34
   size: 36, 34
   orig: 36, 34
   orig: 36, 34
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 back-knee
 back-knee
   rotate: true
   rotate: true
-  xy: 729, 86
+  xy: 760, 131
   size: 49, 67
   size: 49, 67
   orig: 49, 67
   orig: 49, 67
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 back-thigh
 back-thigh
-  rotate: false
-  xy: 379, 2
+  rotate: true
+  xy: 225, 238
   size: 39, 24
   size: 39, 24
   orig: 39, 24
   orig: 39, 24
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 eyes-open
 eyes-open
-  rotate: true
-  xy: 902, 194
+  rotate: false
+  xy: 975, 204
   size: 47, 45
   size: 47, 45
   orig: 47, 45
   orig: 47, 45
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 front-arm
 front-arm
   rotate: false
   rotate: false
-  xy: 945, 306
+  xy: 969, 112
   size: 48, 26
   size: 48, 26
   orig: 48, 26
   orig: 48, 26
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 front-bracer
 front-bracer
-  rotate: false
-  xy: 949, 197
+  rotate: true
+  xy: 724, 97
   size: 41, 29
   size: 41, 29
   orig: 41, 29
   orig: 41, 29
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 front-hand
 front-hand
   rotate: false
   rotate: false
-  xy: 949, 266
+  xy: 251, 239
   size: 41, 38
   size: 41, 38
   orig: 41, 38
   orig: 41, 38
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 front-open-hand
 front-open-hand
-  rotate: false
-  xy: 875, 148
+  rotate: true
+  xy: 856, 76
   size: 43, 44
   size: 43, 44
   orig: 43, 44
   orig: 43, 44
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 front-thigh
 front-thigh
   rotate: true
   rotate: true
-  xy: 793, 171
+  xy: 729, 178
   size: 57, 29
   size: 57, 29
   orig: 57, 29
   orig: 57, 29
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 gun
 gun
-  rotate: true
-  xy: 379, 28
+  rotate: false
+  xy: 894, 251
   size: 107, 103
   size: 107, 103
   orig: 107, 103
   orig: 107, 103
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 gun-nohand
 gun-nohand
   rotate: false
   rotate: false
-  xy: 487, 87
+  xy: 764, 241
   size: 105, 102
   size: 105, 102
   orig: 105, 102
   orig: 105, 102
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 head
 head
   rotate: false
   rotate: false
-  xy: 807, 361
+  xy: 756, 345
   size: 136, 149
   size: 136, 149
   orig: 136, 149
   orig: 136, 149
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 lower-leg
 lower-leg
-  rotate: false
-  xy: 827, 195
+  rotate: true
+  xy: 475, 237
   size: 73, 98
   size: 73, 98
   orig: 73, 98
   orig: 73, 98
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 mouth-grind
 mouth-grind
-  rotate: true
-  xy: 920, 145
+  rotate: false
+  xy: 975, 172
   size: 47, 30
   size: 47, 30
   orig: 47, 30
   orig: 47, 30
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 mouth-smile
 mouth-smile
-  rotate: true
-  xy: 992, 257
+  rotate: false
+  xy: 975, 140
   size: 47, 30
   size: 47, 30
   orig: 47, 30
   orig: 47, 30
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 neck
 neck
   rotate: false
   rotate: false
-  xy: 359, 114
+  xy: 366, 282
   size: 18, 21
   size: 18, 21
   orig: 18, 21
   orig: 18, 21
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 raptor-back-arm
 raptor-back-arm
-  rotate: false
-  xy: 653, 142
+  rotate: true
+  xy: 636, 97
   size: 82, 86
   size: 82, 86
   orig: 82, 86
   orig: 82, 86
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 raptor-body
 raptor-body
   rotate: false
   rotate: false
-  xy: 2, 277
+  xy: 2, 2
   size: 632, 233
   size: 632, 233
   orig: 632, 233
   orig: 632, 233
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 raptor-front-arm
 raptor-front-arm
   rotate: true
   rotate: true
-  xy: 484, 4
+  xy: 871, 168
   size: 81, 102
   size: 81, 102
   orig: 81, 102
   orig: 81, 102
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 raptor-front-leg
 raptor-front-leg
   rotate: false
   rotate: false
-  xy: 2, 18
+  xy: 2, 237
   size: 191, 257
   size: 191, 257
   orig: 191, 257
   orig: 191, 257
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 raptor-hindleg-back
 raptor-hindleg-back
   rotate: false
   rotate: false
-  xy: 636, 295
+  xy: 195, 279
   size: 169, 215
   size: 169, 215
   orig: 169, 215
   orig: 169, 215
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 raptor-horn
 raptor-horn
-  rotate: false
-  xy: 195, 22
+  rotate: true
+  xy: 431, 312
   size: 182, 80
   size: 182, 80
   orig: 182, 80
   orig: 182, 80
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 raptor-horn-back
 raptor-horn-back
   rotate: true
   rotate: true
-  xy: 945, 334
+  xy: 513, 318
   size: 176, 77
   size: 176, 77
   orig: 176, 77
   orig: 176, 77
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 raptor-jaw
 raptor-jaw
   rotate: false
   rotate: false
-  xy: 359, 137
+  xy: 894, 356
   size: 126, 138
   size: 126, 138
   orig: 126, 138
   orig: 126, 138
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 raptor-jaw-tooth
 raptor-jaw-tooth
   rotate: true
   rotate: true
-  xy: 895, 322
+  xy: 294, 240
   size: 37, 48
   size: 37, 48
   orig: 37, 48
   orig: 37, 48
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 raptor-mouth-inside
 raptor-mouth-inside
   rotate: true
   rotate: true
-  xy: 949, 228
+  xy: 344, 241
   size: 36, 41
   size: 36, 41
   orig: 36, 41
   orig: 36, 41
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 raptor-saddle-strap-back
 raptor-saddle-strap-back
-  rotate: true
-  xy: 653, 86
+  rotate: false
+  xy: 575, 242
   size: 54, 74
   size: 54, 74
   orig: 54, 74
   orig: 54, 74
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 raptor-saddle-strap-front
 raptor-saddle-strap-front
-  rotate: false
-  xy: 594, 94
+  rotate: true
+  xy: 764, 182
   size: 57, 95
   size: 57, 95
   orig: 57, 95
   orig: 57, 95
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 raptor-saddle-w-shadow
 raptor-saddle-w-shadow
   rotate: false
   rotate: false
-  xy: 195, 104
+  xy: 592, 323
   size: 162, 171
   size: 162, 171
   orig: 162, 171
   orig: 162, 171
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 raptor-tail-shadow
 raptor-tail-shadow
-  rotate: false
-  xy: 636, 230
+  rotate: true
+  xy: 366, 305
   size: 189, 63
   size: 189, 63
   orig: 189, 63
   orig: 189, 63
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 raptor-tongue
 raptor-tongue
   rotate: false
   rotate: false
-  xy: 807, 295
+  xy: 387, 239
   size: 86, 64
   size: 86, 64
   orig: 86, 64
   orig: 86, 64
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 stirrup-back
 stirrup-back
   rotate: true
   rotate: true
-  xy: 952, 151
+  xy: 829, 136
   size: 44, 35
   size: 44, 35
   orig: 44, 35
   orig: 44, 35
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 stirrup-front
 stirrup-front
-  rotate: false
-  xy: 902, 243
+  rotate: true
+  xy: 866, 121
   size: 45, 50
   size: 45, 50
   orig: 45, 50
   orig: 45, 50
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 stirrup-strap
 stirrup-strap
   rotate: false
   rotate: false
-  xy: 824, 147
+  xy: 918, 120
   size: 49, 46
   size: 49, 46
   orig: 49, 46
   orig: 49, 46
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 torso
 torso
-  rotate: false
-  xy: 737, 137
+  rotate: true
+  xy: 636, 181
   size: 54, 91
   size: 54, 91
   orig: 54, 91
   orig: 54, 91
   offset: 0, 0
   offset: 0, 0
   index: -1
   index: -1
 visor
 visor
   rotate: false
   rotate: false
-  xy: 487, 191
+  xy: 631, 237
   size: 131, 84
   size: 131, 84
   orig: 131, 84
   orig: 131, 84
   offset: 0, 0
   offset: 0, 0

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


+ 8 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material.mat

@@ -24,7 +24,14 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Floats:
     m_Floats:
     - _Cutoff: 0.1
     - _Cutoff: 0.1
+    - _OutlineMipLevel: 0
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
     - _StencilComp: 8
     - _StencilComp: 8
     - _StencilRef: 1
     - _StencilRef: 1
     - _StraightAlphaInput: 0
     - _StraightAlphaInput: 0
-    m_Colors: []
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
+    m_Colors:
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}

File diff suppressed because it is too large
+ 48 - 52
spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pro.json


+ 1 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.json

@@ -1,7 +1,7 @@
 {
 {
 "skeleton": {
 "skeleton": {
 	"hash": "P4z2I8983b8",
 	"hash": "P4z2I8983b8",
-	"spine": "4.0.05-beta",
+	"spine": "4.0.11-beta",
 	"x": -190.61,
 	"x": -190.61,
 	"y": -7.99,
 	"y": -7.99,
 	"width": 419.76,
 	"width": 419.76,

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


+ 1 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy-unity.json

@@ -1,7 +1,7 @@
 {
 {
 "skeleton": {
 "skeleton": {
 	"hash": "eVAT/2cki1I",
 	"hash": "eVAT/2cki1I",
-	"spine": "4.0.05-beta",
+	"spine": "4.0.11-beta",
 	"x": -221.22,
 	"x": -221.22,
 	"y": -8.55,
 	"y": -8.55,
 	"width": 371.09,
 	"width": 371.09,

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


+ 7 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material.mat

@@ -27,12 +27,19 @@ Material:
     - _CloakPhase: 0
     - _CloakPhase: 0
     - _Cutoff: 0.1
     - _Cutoff: 0.1
     - _FillPhase: 0
     - _FillPhase: 0
+    - _OutlineMipLevel: 0
+    - _OutlineReferenceTexWidth: 1024
+    - _OutlineSmoothness: 1
+    - _OutlineWidth: 3
     - _RefractionStrength: 0.01
     - _RefractionStrength: 0.01
     - _StencilComp: 8
     - _StencilComp: 8
     - _StencilRef: 1
     - _StencilRef: 1
     - _StraightAlphaInput: 0
     - _StraightAlphaInput: 0
+    - _ThresholdEnd: 0.25
+    - _Use8Neighbourhood: 1
     - _node_3476: 0
     - _node_3476: 0
     m_Colors:
     m_Colors:
     - _Black: {r: 0, g: 0, b: 0, a: 0}
     - _Black: {r: 0, g: 0, b: 0, a: 0}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _FillColor: {r: 1, g: 1, b: 1, a: 1}
     - _FillColor: {r: 1, g: 1, b: 1, a: 1}
+    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}

+ 1 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.json

@@ -1,7 +1,7 @@
 {
 {
 "skeleton": {
 "skeleton": {
 	"hash": "M7buRYUnWiw",
 	"hash": "M7buRYUnWiw",
-	"spine": "4.0.05-beta",
+	"spine": "4.0.11-beta",
 	"x": -252.71,
 	"x": -252.71,
 	"y": -232.55,
 	"y": -232.55,
 	"width": 456.71,
 	"width": 456.71,

Some files were not shown because too many files changed in this diff