From 2e6f632000d6f89fc99ae16ef5c7fa50c628db0b Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Fri, 20 Jun 2025 22:16:14 +0200 Subject: [PATCH] [unity] Updated sample skeleton assets to 4.3.37-beta. --- .../Spine Skeletons/Dragon/dragon_dragon.mat | 3 ++ .../Spine Skeletons/Dragon/dragon_dragon2.mat | 3 ++ .../Spine Skeletons/Dragon/dragon_dragon3.mat | 3 ++ .../Spine Skeletons/Dragon/dragon_dragon4.mat | 3 ++ .../Spine Skeletons/Dragon/dragon_dragon5.mat | 3 ++ .../Spine Skeletons/Eyes/eyes_Material.mat | 3 ++ .../Equipment/Equipment_Atlas.asset | 7 ++- .../Equipment/Equipment_Material.mat | 20 ++++++-- .../FootSoldier/FS_White_Material.mat | 3 ++ .../Spine Skeletons/Gauge/Gauge_Material.mat | 3 ++ .../Goblins/goblins_Material.mat | 3 ++ .../Hero/hero-pro_Material.mat | 3 ++ .../Raggedy Spineboy_Material.mat | 3 ++ .../Raptor/raptor_Material.mat | 3 ++ .../Spineunitygirl/Doi_Material.mat | 3 ++ .../stretchyman-diffuse-pma_Material.mat | 29 ++++++++++-- .../celestial-circus-pma_Material.mat | 3 ++ .../cloud-pot/cloud-pot-pma_Material.mat | 3 ++ .../mix-and-match-pma_Material.mat | 3 ++ .../raptor-pma_Material.mat | 3 ++ .../sack/sack-pma_Material.mat | 3 ++ .../snowglobe/snowglobe-pma_Atlas.asset | 2 - ... snowglobe-pma_snowglobe-pma-Multiply.mat} | 16 +++++-- ...globe-pma_snowglobe-pma-Multiply.mat.meta} | 2 +- .../snowglobe/snowglobe-pma_snowglobe-pma.mat | 3 ++ .../snowglobe-pma_snowglobe-pma_2.mat | 3 ++ .../snowglobe-pma_snowglobe-pma_3.mat | 3 ++ .../snowglobe-pma_snowglobe-pma_5.mat | 46 ------------------- .../snowglobe-pma_snowglobe-pma_5.mat.meta | 8 ---- .../snowglobe-pro_SkeletonData.asset | 2 + .../spineboy-pro/spineboy-pro_Material.mat | 3 ++ .../spineboy-unity/spineboy_Material.mat | 3 ++ .../whirlyblendmodes_Material.mat | 3 ++ 33 files changed, 133 insertions(+), 71 deletions(-) rename spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/{snowglobe-pma_snowglobe-pma_4.mat => snowglobe-pma_snowglobe-pma-Multiply.mat} (67%) rename spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/{snowglobe-pma_snowglobe-pma_4.mat.meta => snowglobe-pma_snowglobe-pma-Multiply.mat.meta} (79%) delete mode 100644 spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_5.mat delete mode 100644 spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_5.mat.meta diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat index ed8dca345..174e62a0d 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat index 8e20c4c4f..cee4e68e9 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon3.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon3.mat index 274825667..4cf1b0159 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon3.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon4.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon4.mat index 3f61ccad9..5cca0c467 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon4.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon5.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon5.mat index f643b3455..c44d75ee8 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Dragon/dragon_dragon5.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat index fc45d1f3e..34ef5fa5e 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Atlas.asset index 08a155189..6c157882c 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Atlas.asset +++ b/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} diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Material.mat index ab1321b1d..41ff8e941 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Material.mat index 789a0b321..5535b9721 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat index 0a0d03b10..5c92c0927 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Material.mat index 792e2f9f0..6417cbc59 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Goblins/goblins_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Material.mat index 94dd2f46d..cec2ad2df 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Hero/hero-pro_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat index f831689b0..078d5b907 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Material.mat index 0e6d0e738..77ba331b2 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Raptor/raptor_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat index a3a0f478b..54610691a 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat index 7f1914bed..5accab1cd 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse-pma_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_Material.mat index 44603a4cf..de33a1d7e 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pma_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma_Material.mat index 39900c50a..ae4cf71a8 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot-pma_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Material.mat index 36342830b..912ff54f2 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match-pma_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material.mat index 86fff9313..c05b2a55e 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor-pma_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/sack/sack-pma_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/sack/sack-pma_Material.mat index 54a744532..9391e0a92 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/sack/sack-pma_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_Atlas.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_Atlas.asset index 58a2128f9..cb71bd334 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_Atlas.asset +++ b/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} diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_4.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma-Multiply.mat similarity index 67% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_4.mat rename to spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma-Multiply.mat index a8cac05b4..7cc50e29c 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_4.mat +++ b/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: + - : + 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: + - : 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: + - : {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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_4.mat.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma-Multiply.mat.meta similarity index 79% rename from spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_4.mat.meta rename to spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma-Multiply.mat.meta index d36563ae5..d2b5e2836 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_4.mat.meta +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma.mat index 448679633..d17f1492e 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_2.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_2.mat index f0768fed4..c1e947cc8 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_2.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_3.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_3.mat index 86b2552f8..9a59c3bd7 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_3.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_5.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_5.mat deleted file mode 100644 index ee428eb35..000000000 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_5.mat +++ /dev/null @@ -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: [] diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_5.mat.meta b/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_5.mat.meta deleted file mode 100644 index 8438f2d52..000000000 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pma_snowglobe-pma_5.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 30c7a85032064f0468da374e72de22b0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro_SkeletonData.asset b/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro_SkeletonData.asset index 5868ce417..c406207de 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro_SkeletonData.asset +++ b/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: [] diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat index e9a016692..e19d4692c 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat +++ b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat @@ -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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material.mat index 4f9e914e0..38ed7f37d 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material.mat +++ b/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 diff --git a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat b/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat index 9e6be50e5..856cb3d93 100644 --- a/spine-unity/Assets/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat +++ b/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