Эх сурвалжийг харах

[unity] Updated sample skeleton assets to 4.3.37-beta.

Harald Csaszar 2 сар өмнө
parent
commit
2e6f632000
33 өөрчлөгдсөн 133 нэмэгдсэн , 71 устгасан
  1. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat
  2. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat
  3. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon3.mat
  4. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon4.mat
  5. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon5.mat
  6. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat
  7. 5 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Atlas.asset
  8. 16 4
      spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Material.mat
  9. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Material.mat
  10. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat
  11. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Material.mat
  12. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Material.mat
  13. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat
  14. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Material.mat
  15. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat
  16. 24 5
      spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat
  17. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_Material.mat
  18. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma_Material.mat
  19. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Material.mat
  20. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material.mat
  21. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/sack/sack-pma_Material.mat
  22. 0 2
      spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_Atlas.asset
  23. 13 3
      spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma-Multiply.mat
  24. 1 1
      spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma-Multiply.mat.meta
  25. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma.mat
  26. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_2.mat
  27. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_3.mat
  28. 0 46
      spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_5.mat
  29. 0 8
      spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_5.mat.meta
  30. 2 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro_SkeletonData.asset
  31. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat
  32. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material.mat
  33. 3 0
      spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon3.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon4.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon5.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 5 - 2
spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_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: Equipment_Atlas
   m_EditorClassIdentifier: 
+  textureLoadingMode: 0
+  onDemandTextureLoader: {fileID: 0}
   atlasFile: {fileID: 4900000, guid: 4f0639ff8bc42314d8d62ee0f7ba541f, type: 3}
   materials:
   - {fileID: 2100000, guid: e6e388faa521c96449984cfa4b60d74e, type: 2}

+ 16 - 4
spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_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: Equipment_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: 5
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -22,9 +28,12 @@ Material:
         m_Texture: {fileID: 2800000, guid: ddb89f63d0296cf4f8572b0448bb6b30, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
+    - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
     - _OutlineSmoothness: 1
     - _OutlineWidth: 3
@@ -33,5 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Material.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

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

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,8 +42,10 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _Black: {r: 1, g: 0, b: 0, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

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

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _FillPhase: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
@@ -42,7 +43,9 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _FillColor: {r: 1, g: 1, b: 1, a: 1}
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Material.mat

@@ -32,6 +32,7 @@ Material:
     m_Floats:
     - _Cutoff: 0.1
     - _DarkColorAlphaAdditive: 0
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -42,8 +43,10 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _Black: {r: 0, g: 0, b: 0, a: 0}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 24 - 5
spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat

@@ -2,14 +2,23 @@
 %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: stretchyman-diffuse-pma_Material
   m_Shader: {fileID: 4800000, guid: 2ce511398fb980f41b7d316c51534590, type: 3}
-  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _FIXED_NORMALS _FIXED_NORMALS_VIEWSPACE
-    _NORMALMAP
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _EMISSION
+  - _FIXED_NORMALS_VIEWSPACE
+  - _NORMALMAP
+  m_InvalidKeywords:
+  - _FIXED_NORMALS
+  - _USE8NEIGHBOURHOOD_ON
   m_LightmapFlags: 5
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -19,6 +28,7 @@ Material:
     IGNOREPROJECTOR: true
     RenderType: Transparent
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -50,6 +60,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - PixelSnap: 0
     - _BlendAmount: 0
@@ -62,11 +73,14 @@ Material:
     - _DstBlend: 10
     - _EmissionPower: 1
     - _EnableExternalAlpha: 0
+    - _Fill: 0
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _Hue: 0
+    - _LightAffectsAdditive: 0
     - _Metallic: 0
     - _OutlineMipLevel: 0
+    - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
     - _OutlineSmoothness: 1
     - _OutlineWidth: 3
@@ -78,12 +92,17 @@ Material:
     - _StencilComp: 8
     - _StencilRef: 1
     - _ThresholdEnd: 0.25
+    - _TintBlack: 0
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     - _ZWrite: 0
     m_Colors:
+    - _Black: {r: 0, g: 0, b: 0, a: 0}
     - _Color: {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}
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
     - _OverlayColor: {r: 0, g: 0, b: 0, a: 0}
     - _RimColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_Material.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma_Material.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Material.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

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

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/sack/sack-pma_Material.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 0 - 2
spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_Atlas.asset

@@ -19,5 +19,3 @@ MonoBehaviour:
   - {fileID: 2100000, guid: bc273223b04e8cb4dbbc77a27f38cc65, type: 2}
   - {fileID: 2100000, guid: c0f19210b249a30418ba777c6dbdd1f3, type: 2}
   - {fileID: 2100000, guid: decd34b04cd07554a9bcd2e85dde7b03, type: 2}
-  - {fileID: 2100000, guid: 2944e525a4bfee14b8c5067246eb3e39, type: 2}
-  - {fileID: 2100000, guid: 30c7a85032064f0468da374e72de22b0, type: 2}

+ 13 - 3
spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_4.mat → spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma-Multiply.mat

@@ -7,8 +7,8 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: snowglobe-pma_snowglobe-pma_4
-  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
+  m_Name: snowglobe-pma_snowglobe-pma-Multiply
+  m_Shader: {fileID: 4800000, guid: 8bdcdc7ee298e594a9c20c61d25c33b6, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
@@ -24,13 +24,19 @@ Material:
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
+    - <noninit>:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: ee794275af753d9479a2e00dfed719d8, type: 3}
+        m_Texture: {fileID: 2800000, guid: fde4ea38b31cbd34284ee37e5551e9f2, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
+    - <noninit>: 0
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +47,10 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
+    - <noninit>: {r: 0, g: 2.018574, b: 1e-45, a: 0.000007110106}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 1 - 1
spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_4.mat.meta → spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma-Multiply.mat.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2944e525a4bfee14b8c5067246eb3e39
+guid: 8fe6588f222e36643befb8dc4dd42d31
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_2.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_3.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 0 - 46
spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_5.mat

@@ -1,46 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: snowglobe-pma_snowglobe-pma_5
-  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
-  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:
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 2193d62b6eff5284caf4f1599a1f5615, 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
-    - _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/snowglobe/snowglobe-pma_snowglobe-pma_5.mat.meta

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

+ 2 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro_SkeletonData.asset

@@ -24,6 +24,8 @@ MonoBehaviour:
     multiplyMaterials:
     - pageName: snowglobe-pma_4.png
       material: {fileID: 2100000, guid: 457f3020c684d35468371a3d1f701bf5, type: 2}
+    - pageName: snowglobe-pma.png
+      material: {fileID: 2100000, guid: 8fe6588f222e36643befb8dc4dd42d31, type: 2}
     screenMaterials: []
   skeletonDataModifiers: []
   fromAnimation: []

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

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

@@ -34,6 +34,7 @@ Material:
     - _CloakPhase: 0
     - _Cutoff: 0.1
     - _DarkColorAlphaAdditive: 0
+    - _Fill: 0
     - _FillPhase: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
@@ -46,6 +47,7 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     - _node_3476: 0
     m_Colors:
     - _Black: {r: 0, g: 0, b: 0, a: 0}
@@ -53,3 +55,4 @@ Material:
     - _FillColor: {r: 1, g: 1, b: 1, a: 1}
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

+ 3 - 0
spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat

@@ -31,6 +31,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _Fill: 0
     - _OutlineMipLevel: 0
     - _OutlineOpaqueAlpha: 1
     - _OutlineReferenceTexWidth: 1024
@@ -41,6 +42,8 @@ Material:
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
+    - _UseScreenSpaceOutlineWidth: 0
     m_Colors:
     - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1