From 9b246edd2d86ea1cfcabc65296c8774875eaedd6 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Tue, 16 Sep 2025 16:06:03 +0200 Subject: [PATCH] [unity] Material and texture settings: Changed example skeleton atlas assets from using PMA to straight alpha for better compatibility with Linear color space. --- .../Spine Skeletons/Dragon/dragon.png.meta | 4 +- .../Spine Skeletons/Dragon/dragon2.png.meta | 4 +- .../Spine Skeletons/Dragon/dragon3.png.meta | 42 +++-------------- .../Spine Skeletons/Dragon/dragon4.png.meta | 42 +++-------------- .../Spine Skeletons/Dragon/dragon5.png.meta | 42 +++-------------- .../Spine Skeletons/Dragon/dragon_Atlas.asset | 5 +- .../Spine Skeletons/Dragon/dragon_dragon.mat | 19 ++------ .../Spine Skeletons/Dragon/dragon_dragon2.mat | 19 ++------ .../Spine Skeletons/Dragon/dragon_dragon3.mat | 19 ++------ .../Spine Skeletons/Dragon/dragon_dragon4.mat | 19 ++------ .../Spine Skeletons/Dragon/dragon_dragon5.mat | 19 ++------ .../Spine Skeletons/Eyes/eyes.png.meta | 12 ++++- .../Spine Skeletons/Eyes/eyes_Atlas.asset | 5 +- .../Spine Skeletons/Eyes/eyes_Material.mat | 19 ++------ .../FootSoldier/Equipment/Equipment.png.meta | 12 ++++- .../Equipment/Equipment_Atlas.asset | 5 +- .../Equipment/Equipment_Material.mat | 19 ++------ .../FootSoldier/FS_White.png.meta | 12 ++++- .../FootSoldier/FS_White_Atlas.asset | 5 +- .../FootSoldier/FS_White_Material.mat | 19 ++------ .../Spine Skeletons/Gauge/Gauge.png.meta | 12 ++++- .../Spine Skeletons/Gauge/Gauge_Atlas.asset | 5 +- .../Spine Skeletons/Gauge/Gauge_Material.mat | 19 ++------ .../Spine Skeletons/Goblins/goblins.png.meta | 12 ++++- .../Goblins/goblins_Atlas.asset | 5 +- .../Goblins/goblins_Material.mat | 19 ++------ .../Spine Skeletons/Hero/hero-pro.png.meta | 12 ++++- .../Spine Skeletons/Hero/hero-pro_Atlas.asset | 5 +- .../Hero/hero-pro_Material.mat | 19 ++------ .../Hero/hero-pro_MaterialOutline.mat | 12 +++-- .../Hero/hero-pro_MaterialOutlineOnly.mat | 12 +++-- .../Raggedy Spineboy.png.meta | 12 ++++- .../Raggedy Spineboy_Atlas.asset | 5 +- .../Raggedy Spineboy_Material.mat | 19 ++------ .../Spine Skeletons/Raptor/raptor.png.meta | 6 +-- .../Spine Skeletons/Raptor/raptor_Atlas.asset | 5 +- .../Raptor/raptor_Material.mat | 19 ++------ .../Spineunitygirl/Doi.png.meta | 12 ++++- .../Spineunitygirl/Doi_Atlas.asset | 5 +- .../Spineunitygirl/Doi_Material.mat | 19 ++------ .../Stretchyman/stretchyman-diffuse.png.meta | 12 ++++- .../stretchyman-diffuse_Atlas.asset | 5 +- .../stretchyman-diffuse_Material.mat | 8 +++- .../celestial-circus-pro_SkeletonData.asset | 5 +- .../celestial-circus.png.meta | 46 +++---------------- .../celestial-circus_Atlas.asset | 5 +- .../celestial-circus_Material.mat | 19 ++------ ...stial-circus_celestial-circus-Multiply.mat | 20 +++----- .../cloud-pot/cloud-pot.png.meta | 46 +++---------------- .../cloud-pot/cloud-pot_Atlas.asset | 5 +- .../cloud-pot/cloud-pot_Material.mat | 19 ++------ .../mix-and-match/mix-and-match.png.meta | 4 +- .../mix-and-match/mix-and-match_Atlas.asset | 5 +- .../mix-and-match/mix-and-match_Material.mat | 19 ++------ .../raptor-pro-and-mask/raptor.png.meta | 4 +- .../raptor-pro-and-mask/raptor_Atlas.asset | 5 +- .../raptor-pro-and-mask/raptor_Material.mat | 19 ++------ .../raptor_MaterialOutline.mat | 12 +++-- .../raptor_MaterialOutline_OutsideMask.mat | 20 +++----- .../raptor_MaterialTint.mat | 20 +++----- .../raptor_MaterialTint_OutsideMask.mat | 20 +++----- .../raptor_Material_InsideMask.mat | 16 +++++-- .../raptor_Material_OutsideMask.mat | 16 +++++-- .../Spine Skeletons/sack/sack.png.meta | 46 +++---------------- .../Spine Skeletons/sack/sack_Atlas.asset | 5 +- .../Spine Skeletons/sack/sack_Material.mat | 19 ++------ .../snowglobe-pro_SkeletonData.asset | 5 +- .../snowglobe/snowglobe.png.meta | 46 +++---------------- .../snowglobe/snowglobe_2.png.meta | 46 +++---------------- .../snowglobe/snowglobe_3.png.meta | 46 +++---------------- .../snowglobe/snowglobe_4.png.meta | 46 +++---------------- .../snowglobe/snowglobe_5.png.meta | 46 +++---------------- .../snowglobe/snowglobe_Atlas.asset | 5 +- .../snowglobe_snowglobe-Multiply.mat | 19 ++------ .../snowglobe/snowglobe_snowglobe.mat | 19 ++------ .../snowglobe/snowglobe_snowglobe_2.mat | 19 ++------ .../snowglobe/snowglobe_snowglobe_3.mat | 19 ++------ .../snowglobe_snowglobe_4-Multiply.mat | 20 +++----- .../spineboy-pro/spineboy-pro.png.meta | 12 ++++- .../spineboy-pro/spineboy-pro_Atlas.asset | 5 +- .../spineboy-pro/spineboy-pro_Material.mat | 19 ++------ .../spineboy-pro/spineboy_spineboy.mat | 16 +++++-- .../spineboy-unity/spineboy.png.meta | 4 +- .../spineboy-unity/spineboy_Atlas.asset | 5 +- .../spineboy-unity/spineboy_Material Fill.mat | 15 +++++- .../spineboy_Material Grayscale.mat | 17 ++++++- .../spineboy-unity/spineboy_Material.mat | 19 ++------ .../whirlyblendmodes.png.meta | 12 ++++- .../whirlyblendmodes_Atlas.asset | 5 +- .../whirlyblendmodes_Material-Additive.mat | 13 +++--- .../whirlyblendmodes_Material-Multiply.mat | 13 +++--- .../whirlyblendmodes_Material-Screen.mat | 13 +++--- .../whirlyblendmodes_Material.mat | 19 ++------ .../whirlyblendmodes_SkeletonData.asset | 5 +- 94 files changed, 528 insertions(+), 996 deletions(-) diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon.png.meta index 7dd533ed4..90a08e2c4 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon.png.meta @@ -29,7 +29,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -68,7 +68,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon2.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon2.png.meta index 669b2c753..d43d3ae2b 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon2.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon2.png.meta @@ -27,7 +27,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -66,7 +66,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon3.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon3.png.meta index d07c2320f..e08a27d39 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon3.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon3.png.meta @@ -1,13 +1,12 @@ fileFormatVersion: 2 guid: 9a960996718ee9a4a9872c1a38fc3946 TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 + fileIDToRecycleName: {} + serializedVersion: 4 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -21,9 +20,6 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -46,63 +42,39 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform + - buildTarget: DefaultTexturePlatform maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 3 - buildTarget: Standalone + - buildTarget: Standalone maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon4.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon4.png.meta index 75761e906..0063035fa 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon4.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon4.png.meta @@ -1,13 +1,12 @@ fileFormatVersion: 2 guid: 390eb45b86ad95d40855f1cedc5ebe86 TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 + fileIDToRecycleName: {} + serializedVersion: 4 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -21,9 +20,6 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -46,63 +42,39 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform + - buildTarget: DefaultTexturePlatform maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 3 - buildTarget: Standalone + - buildTarget: Standalone maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon5.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon5.png.meta index be7a6557f..4f0a048be 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon5.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon5.png.meta @@ -1,13 +1,12 @@ fileFormatVersion: 2 guid: d3a3452c852fdd84ea122c9533745866 TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 + fileIDToRecycleName: {} + serializedVersion: 4 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -21,9 +20,6 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -46,63 +42,39 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform + - buildTarget: DefaultTexturePlatform maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 3 - buildTarget: Standalone + - buildTarget: Standalone maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_Atlas.asset index fac6ecbd8..ca07c3c2e 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat index 174e62a0d..229bed4c8 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: dragon_dragon m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: 6bc52290ef03f2846ba38d67e2823598, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat index cee4e68e9..9ea307461 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon2.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: dragon_dragon2 m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: 12c126994123f12468cf4c5a2684078a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon3.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon3.mat index 4cf1b0159..77e48c30b 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon3.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon3.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: dragon_dragon3 m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: 9a960996718ee9a4a9872c1a38fc3946, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon4.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon4.mat index 5cca0c467..8a100283e 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon4.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon4.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: dragon_dragon4 m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: 390eb45b86ad95d40855f1cedc5ebe86, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon5.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon5.mat index c44d75ee8..8906474cc 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon5.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon_dragon5.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: dragon_dragon5 m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: d3a3452c852fdd84ea122c9533745866, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes.png.meta index de9b14ba7..0e2ac8020 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -47,7 +47,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -63,6 +63,14 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes_Atlas.asset index d08232bcc..4af80be9a 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat index 34ef5fa5e..ce7fb373b 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: eyes_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: 49441e5a1682e564694545bd9b509785, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment.png.meta index 58a7db054..0024d452d 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment.png.meta @@ -12,7 +12,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -67,6 +67,14 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Atlas.asset index 6c157882c..cf4ca10ed 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Material.mat index 41ff8e941..ef62f8cf2 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/Equipment/Equipment_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Equipment_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ 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 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png.meta index 43704126b..799bc81e3 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -47,7 +47,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -63,6 +63,14 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Atlas.asset index f8dcc498c..ab7e0f04f 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Material.mat index 5535b9721..113715287 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: FS_White_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: 57b57f94df266f94ea0981915a4472e1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge.png.meta index 412ca51e3..e4f42b84d 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -47,7 +47,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -63,6 +63,14 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge_Atlas.asset index 753a0008d..b4316f044 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat index 5c92c0927..3a7afbfa3 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Gauge_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: a11301aad15ed6b4995485a02a81b132, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins.png.meta index d36868930..c8229df47 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -47,7 +47,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -63,6 +63,14 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins_Atlas.asset index 72a32e496..c4a0cd8b3 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins_Material.mat index 6417cbc59..0b846f880 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: goblins_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: 5fb7efec30c79cb46a705e0d04debb04, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 - _UseScreenSpaceOutlineWidth: 0 @@ -47,5 +40,3 @@ Material: - _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/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro.png.meta index 3d36fd646..1bc17ce85 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -47,7 +47,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -63,6 +63,14 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_Atlas.asset index b390d9bd2..a04230344 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_Material.mat index cec2ad2df..359bda02b 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: hero-pro_Material m_Shader: {fileID: 4800000, guid: 45495790b394f894a967dbf44489b57b, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: 25b07e861d1a62f4db687c871e4a3828, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -40,12 +33,10 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_MaterialOutline.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_MaterialOutline.mat index 619287926..70861f6b3 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_MaterialOutline.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_MaterialOutline.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: hero-pro_MaterialOutline m_Shader: {fileID: 4800000, guid: e158cbe58baa093438feb3d691f3daba, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -25,16 +24,19 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _Cutoff: 0.1 + - _Fill: 0 - _FillPhase: 0 - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 - _OutlineSmoothness: 1 - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - _FillColor: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 0, g: 1, b: 0.97280097, a: 1} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_MaterialOutlineOnly.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_MaterialOutlineOnly.mat index 1ad6b6632..b144c86e3 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_MaterialOutlineOnly.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro_MaterialOutlineOnly.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: hero-pro_MaterialOutlineOnly m_Shader: {fileID: 4800000, guid: 177da18c3d2e0aa4cb39990ea011973c, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -25,16 +24,19 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _Cutoff: 0.9 + - _Fill: 0 - _FillPhase: 0 - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 - _OutlineSmoothness: 1 - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _ZWriteOffset: 0.01 m_Colors: - _FillColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png.meta index 36ce0e803..6679f8de1 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -47,7 +47,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -63,6 +63,14 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Atlas.asset index 604be5989..4e0156db8 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat index 078d5b907..dcb2e9e2c 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Raggedy Spineboy_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: b29bbacbc2368c94a9c942d176ac6f59, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor.png.meta index e1642f83f..2a81383b8 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor.png.meta @@ -43,7 +43,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -82,7 +82,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -99,7 +99,7 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 - buildTarget: Standalone - maxTextureSize: 4096 + maxTextureSize: 2048 textureFormat: -1 textureCompression: 0 compressionQuality: 50 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor_Atlas.asset index 883fd58d2..aee563554 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor_Material.mat index 77ba331b2..0a5f8ea01 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: raptor_Material m_Shader: {fileID: 4800000, guid: 522f03282fd79be47b306e2ef4b593fd, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: 4261719a8f729a644b2dab6113d1b0ea, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _DarkColorAlphaAdditive: 0 @@ -40,7 +33,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 - _UseScreenSpaceOutlineWidth: 0 @@ -48,5 +41,3 @@ Material: - _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/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png.meta index 37cc6f853..152135eab 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -47,7 +47,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -63,6 +63,14 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Atlas.asset index 5d695282c..fc54888c1 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat index 54610691a..02fd103f1 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: Doi_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: 33e128e17951b4a42b17608ff79ba5c5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.png.meta index 13290da3e..9465f7da2 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -47,7 +47,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -63,6 +63,14 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Atlas.asset index 56901c5bf..60641b5d2 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Material.mat index 61487960d..4f8948980 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse_Material.mat @@ -8,7 +8,7 @@ Material: m_PrefabInternal: {fileID: 0} m_Name: stretchyman-diffuse_Material m_Shader: {fileID: 4800000, guid: 2ce511398fb980f41b7d316c51534590, type: 3} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _FIXED_NORMALS _FIXED_NORMALS_VIEWSPACE + m_ShaderKeywords: _ALPHAPREMULTIPLY_VERTEX_ONLY _EMISSION _FIXED_NORMALS _FIXED_NORMALS_VIEWSPACE _NORMALMAP m_LightmapFlags: 5 m_EnableInstancingVariants: 0 @@ -62,11 +62,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,9 +81,12 @@ 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} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pro_SkeletonData.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pro_SkeletonData.asset index ab91bae15..c1a411fbd 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pro_SkeletonData.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus-pro_SkeletonData.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.png.meta index 923e7df5b..4df65448b 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.png.meta @@ -1,13 +1,12 @@ fileFormatVersion: 2 guid: d5bf0901654cca44d8d54e4b72929593 TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 + fileIDToRecycleName: {} + serializedVersion: 4 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -20,12 +19,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -48,65 +42,39 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform + - buildTarget: DefaultTexturePlatform maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 3 - buildTarget: Standalone + - buildTarget: Standalone maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} spritePackingTag: - pSDRemoveMatte: 0 userData: assetBundleName: assetBundleVariant: diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Atlas.asset index 461d3951e..8003e84b8 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Material.mat index 12d110b25..650e44bcb 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: celestial-circus_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: d5bf0901654cca44d8d54e4b72929593, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_celestial-circus-Multiply.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_celestial-circus-Multiply.mat index 364e81ce1..7d0c5265f 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_celestial-circus-Multiply.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus_celestial-circus-Multiply.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: celestial-circus_celestial-circus-Multiply m_Shader: {fileID: 4800000, guid: 8bdcdc7ee298e594a9c20c61d25c33b6, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -32,10 +26,10 @@ Material: m_Texture: {fileID: 2800000, guid: d5bf0901654cca44d8d54e4b72929593, 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 @@ -43,11 +37,11 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.png.meta index a31b40ced..a70564692 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.png.meta @@ -1,13 +1,12 @@ fileFormatVersion: 2 guid: dfac7903fff13204b8eb6a7d944eb13a TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 + fileIDToRecycleName: {} + serializedVersion: 4 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -20,12 +19,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -48,65 +42,39 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform + - buildTarget: DefaultTexturePlatform maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 3 - buildTarget: Standalone + - buildTarget: Standalone maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} spritePackingTag: - pSDRemoveMatte: 0 userData: assetBundleName: assetBundleVariant: diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Atlas.asset index 7a047e53f..a31e04065 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Material.mat index e290e8f3f..ced7b4eaf 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: cloud-pot_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: dfac7903fff13204b8eb6a7d944eb13a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.png.meta index 3c10ee799..5d89bc827 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -47,7 +47,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Atlas.asset index 447ade9a7..4d71be72b 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Material.mat index f26013cbe..d8b85a2ed 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: mix-and-match_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: a837e662e711d1a4ba0b4a9aeb141878, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.png.meta index bed3a691f..8d9d38999 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -47,7 +47,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Atlas.asset index d1825d3be..d0a23473e 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material.mat index 5dc962d91..8b3694674 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: raptor_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: c1a5fbc2700be764fa3c6c44b2ed67a0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline.mat index dc6cf2944..e5754b758 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: raptor_MaterialOutline m_Shader: {fileID: 4800000, guid: 28b5cf4804845fe4b868531fd0bb81d5, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -25,14 +24,17 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _Cutoff: 0.1 + - _Fill: 0 - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 - _OutlineSmoothness: 1 - _OutlineWidth: 2.5 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline_OutsideMask.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline_OutsideMask.mat index b6f50f67f..f189e6c81 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline_OutsideMask.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialOutline_OutsideMask.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: raptor_MaterialOutline_OutsideMask m_Shader: {fileID: 4800000, guid: 28b5cf4804845fe4b868531fd0bb81d5, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _USE8NEIGHBOURHOOD_ON - m_InvalidKeywords: [] + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,9 +22,9 @@ Material: m_Texture: {fileID: 2800000, guid: c1a5fbc2700be764fa3c6c44b2ed67a0, 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 @@ -38,9 +32,9 @@ Material: - _OutlineWidth: 2.5 - _StencilComp: 5 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint.mat index 6f9f88e58..18b8f8953 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: raptor_MaterialTint m_Shader: {fileID: 4800000, guid: 522f03282fd79be47b306e2ef4b593fd, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,10 +22,10 @@ Material: m_Texture: {fileID: 2800000, guid: c1a5fbc2700be764fa3c6c44b2ed67a0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _DarkColorAlphaAdditive: 0 + - _Fill: 0 - _OutlineMipLevel: 0 - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 @@ -39,11 +33,11 @@ Material: - _OutlineWidth: 2.5 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - _Black: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 0, b: 0, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint_OutsideMask.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint_OutsideMask.mat index 260bc7eca..7dd2a357b 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint_OutsideMask.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_MaterialTint_OutsideMask.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: raptor_MaterialTint_OutsideMask m_Shader: {fileID: 4800000, guid: 522f03282fd79be47b306e2ef4b593fd, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,10 +22,10 @@ Material: m_Texture: {fileID: 2800000, guid: c1a5fbc2700be764fa3c6c44b2ed67a0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _DarkColorAlphaAdditive: 0 + - _Fill: 0 - _OutlineMipLevel: 0 - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 @@ -39,11 +33,11 @@ Material: - _OutlineWidth: 2.5 - _StencilComp: 5 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - _Black: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 0, b: 0, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_InsideMask.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_InsideMask.mat index e86e083fe..2cf13176c 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_InsideMask.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_InsideMask.mat @@ -8,7 +8,7 @@ Material: m_PrefabInternal: {fileID: 0} m_Name: raptor_Material_InsideMask m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_ShaderKeywords: + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,7 +24,17 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _Cutoff: 0.1 + - _Fill: 0 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 - _StencilComp: 4 - _StencilRef: 1 - - _StraightAlphaInput: 0 - m_Colors: [] + - _StraightAlphaInput: 1 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 + m_Colors: + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_OutsideMask.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_OutsideMask.mat index 5f7757c18..a030896f9 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_OutsideMask.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor_Material_OutsideMask.mat @@ -8,7 +8,7 @@ Material: m_PrefabInternal: {fileID: 0} m_Name: raptor_Material_OutsideMask m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_ShaderKeywords: + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,7 +24,17 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _Cutoff: 0.1 + - _Fill: 0 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 - _StencilComp: 5 - _StencilRef: 1 - - _StraightAlphaInput: 0 - m_Colors: [] + - _StraightAlphaInput: 1 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 + m_Colors: + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.png.meta index 1b1bbb94b..ad89e7bcd 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.png.meta @@ -1,13 +1,12 @@ fileFormatVersion: 2 guid: 5ae3e6da1d1624c459c35e9c30a29251 TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 + fileIDToRecycleName: {} + serializedVersion: 4 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -20,12 +19,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -48,65 +42,39 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform + - buildTarget: DefaultTexturePlatform maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 3 - buildTarget: Standalone + - buildTarget: Standalone maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} spritePackingTag: - pSDRemoveMatte: 0 userData: assetBundleName: assetBundleVariant: diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Atlas.asset index eec206779..9bac8de72 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Material.mat index 7c0f16c1e..9e48c1e27 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: sack_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: 5ae3e6da1d1624c459c35e9c30a29251, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro_SkeletonData.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro_SkeletonData.asset index 8f545213e..4703262aa 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro_SkeletonData.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe-pro_SkeletonData.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.png.meta index 5373e6fc6..28a0474c7 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.png.meta @@ -1,13 +1,12 @@ fileFormatVersion: 2 guid: fde4ea38b31cbd34284ee37e5551e9f2 TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 + fileIDToRecycleName: {} + serializedVersion: 4 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -20,12 +19,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -48,65 +42,39 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform + - buildTarget: DefaultTexturePlatform maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 3 - buildTarget: Standalone + - buildTarget: Standalone maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} spritePackingTag: - pSDRemoveMatte: 0 userData: assetBundleName: assetBundleVariant: diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_2.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_2.png.meta index bc07c7131..1c7a81643 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_2.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_2.png.meta @@ -1,13 +1,12 @@ fileFormatVersion: 2 guid: cc0f9572f8b6d464ba456492b6ca33d5 TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 + fileIDToRecycleName: {} + serializedVersion: 4 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -20,12 +19,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -48,65 +42,39 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform + - buildTarget: DefaultTexturePlatform maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 3 - buildTarget: Standalone + - buildTarget: Standalone maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} spritePackingTag: - pSDRemoveMatte: 0 userData: assetBundleName: assetBundleVariant: diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_3.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_3.png.meta index 2854cf959..9a6793db6 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_3.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_3.png.meta @@ -1,13 +1,12 @@ fileFormatVersion: 2 guid: ebcb43b2e6993674bb76468fbe631604 TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 + fileIDToRecycleName: {} + serializedVersion: 4 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -20,12 +19,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -48,65 +42,39 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform + - buildTarget: DefaultTexturePlatform maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 3 - buildTarget: Standalone + - buildTarget: Standalone maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} spritePackingTag: - pSDRemoveMatte: 0 userData: assetBundleName: assetBundleVariant: diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_4.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_4.png.meta index d80e48e90..535e2a25b 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_4.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_4.png.meta @@ -1,13 +1,12 @@ fileFormatVersion: 2 guid: ee794275af753d9479a2e00dfed719d8 TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 + fileIDToRecycleName: {} + serializedVersion: 4 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -20,12 +19,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -48,65 +42,39 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform + - buildTarget: DefaultTexturePlatform maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 3 - buildTarget: Standalone + - buildTarget: Standalone maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} spritePackingTag: - pSDRemoveMatte: 0 userData: assetBundleName: assetBundleVariant: diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_5.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_5.png.meta index f6b2b429c..5dcf14a0e 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_5.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_5.png.meta @@ -1,13 +1,12 @@ fileFormatVersion: 2 guid: 2193d62b6eff5284caf4f1599a1f5615 TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 + fileIDToRecycleName: {} + serializedVersion: 4 mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -20,12 +19,7 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -48,65 +42,39 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform + - buildTarget: DefaultTexturePlatform maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 - - serializedVersion: 3 - buildTarget: Standalone + - buildTarget: Standalone maxTextureSize: 2048 - resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} spritePackingTag: - pSDRemoveMatte: 0 userData: assetBundleName: assetBundleVariant: diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_Atlas.asset index b798776b5..1f466788a 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe-Multiply.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe-Multiply.mat index bdf764b2e..bfda5fb36 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe-Multiply.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe-Multiply.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: snowglobe_snowglobe-Multiply m_Shader: {fileID: 4800000, guid: 8bdcdc7ee298e594a9c20c61d25c33b6, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -32,7 +26,6 @@ Material: 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 @@ -44,7 +37,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 - _UseScreenSpaceOutlineWidth: 0 @@ -52,5 +45,3 @@ Material: - : {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/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe.mat index c1b439da4..b75183de2 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: snowglobe_snowglobe m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: fde4ea38b31cbd34284ee37e5551e9f2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_2.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_2.mat index 8b9307cab..85f72c5c8 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_2.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_2.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: snowglobe_snowglobe_2 m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: cc0f9572f8b6d464ba456492b6ca33d5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_3.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_3.mat index 854f36b6f..e903aed5c 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_3.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_3.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: snowglobe_snowglobe_3 m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: ebcb43b2e6993674bb76468fbe631604, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_4-Multiply.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_4-Multiply.mat index d57df783a..121d379a2 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_4-Multiply.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_snowglobe_4-Multiply.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: snowglobe_snowglobe_4-Multiply m_Shader: {fileID: 4800000, guid: 8bdcdc7ee298e594a9c20c61d25c33b6, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -32,10 +26,10 @@ Material: m_Texture: {fileID: 2800000, guid: ee794275af753d9479a2e00dfed719d8, 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 @@ -43,11 +37,11 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png.meta index 01e828494..87d5f9146 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -47,7 +47,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -63,6 +63,14 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Atlas.asset index 672760e41..9227e40ca 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat index e19d4692c..40e33c5d2 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: spineboy-pro_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: 4ea2c33e839afb34c98f66e892b3b2d2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy_spineboy.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy_spineboy.mat index 5ccf1e613..7c702e9b2 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy_spineboy.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy_spineboy.mat @@ -8,7 +8,7 @@ Material: m_PrefabInternal: {fileID: 0} m_Name: spineboy_spineboy m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_ShaderKeywords: + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,7 +24,17 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _Cutoff: 0.1 + - _Fill: 0 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 - m_Colors: [] + - _StraightAlphaInput: 1 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 + m_Colors: + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png.meta index 69f5595ae..dceebfe81 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png.meta @@ -35,7 +35,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -74,7 +74,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Atlas.asset index 38068e0bc..b95e526cb 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material Fill.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material Fill.mat index 1bafbedaa..d7a9deda1 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material Fill.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material Fill.mat @@ -8,7 +8,7 @@ Material: m_PrefabInternal: {fileID: 0} m_Name: spineboy_Material Fill m_Shader: {fileID: 4800000, guid: 45495790b394f894a967dbf44489b57b, type: 3} - m_ShaderKeywords: + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -26,10 +26,23 @@ Material: - PixelSnap: 0 - _CloakPhase: 0 - _Cutoff: 0.1 + - _Fill: 0 - _FillPhase: 0 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 - _RefractionStrength: 0.01 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _node_3476: 0 m_Colors: - _Black: {r: 0, g: 0, b: 0, a: 0} - _Color: {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} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material Grayscale.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material Grayscale.mat index 1e12403e9..814ebfdc6 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material Grayscale.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material Grayscale.mat @@ -8,7 +8,7 @@ Material: m_PrefabInternal: {fileID: 0} m_Name: spineboy_Material Grayscale m_Shader: {fileID: 4800000, guid: ea7e7c05f36541b4bb280f98ebda8ba1, type: 3} - m_ShaderKeywords: + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -26,12 +26,25 @@ Material: - PixelSnap: 0 - _CloakPhase: 0 - _Cutoff: 0.1 + - _Fill: 0 - _FillPhase: 0 + - _GrayPhase: 1 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 - _Phase: 1 - _RefractionStrength: 0.01 - - _StraightAlphaInput: 0 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _node_3476: 0 m_Colors: - _Black: {r: 0, g: 0, b: 0, a: 0} - _Color: {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} diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material.mat index 38ed7f37d..6fcbc916f 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: spineboy_Material m_Shader: {fileID: 4800000, guid: 522f03282fd79be47b306e2ef4b593fd, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: 49bb65eefe08e424bbf7a38bc98ec638, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - PixelSnap: 0 - _CloakPhase: 0 @@ -44,7 +37,7 @@ Material: - _RefractionStrength: 0.01 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 - _UseScreenSpaceOutlineWidth: 0 @@ -54,5 +47,3 @@ Material: - _Color: {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} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png.meta b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png.meta index 41d565c5a..6fb4460a9 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png.meta +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png.meta @@ -8,7 +8,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 0 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -47,7 +47,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -63,6 +63,14 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Atlas.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Atlas.asset index 25ec64872..dbea8d10a 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Atlas.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Atlas.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material-Additive.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material-Additive.mat index 832e94ac2..f8a5dd564 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material-Additive.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material-Additive.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: whirlyblendmodes_Material-Additive m_Shader: {fileID: 4800000, guid: 53efa1d97f5d9f74285d4330cda14e36, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -30,17 +29,19 @@ Material: m_Floats: - : 0 - _Cutoff: 0.1 + - _Fill: 0 - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 - _OutlineSmoothness: 1 - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material-Multiply.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material-Multiply.mat index a53143cf9..8a1cafc6d 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material-Multiply.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material-Multiply.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: whirlyblendmodes_Material-Multiply m_Shader: {fileID: 4800000, guid: 8bdcdc7ee298e594a9c20c61d25c33b6, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -30,17 +29,19 @@ Material: m_Floats: - : 0 - _Cutoff: 0.1 + - _Fill: 0 - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 - _OutlineSmoothness: 1 - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material-Screen.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material-Screen.mat index e17a5516a..b27ebe222 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material-Screen.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material-Screen.mat @@ -4,12 +4,11 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: whirlyblendmodes_Material-Screen m_Shader: {fileID: 4800000, guid: 4e8caa36c07aacf4ab270da00784e4d9, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -30,17 +29,19 @@ Material: m_Floats: - : 0 - _Cutoff: 0.1 + - _Fill: 0 - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 - _OutlineReferenceTexWidth: 1024 - _OutlineSmoothness: 1 - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 m_Colors: - : {r: 0, g: 2.018574, b: 1e-45, a: 0.000007121922} - _Color: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat index 856cb3d93..1b1081f14 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_Material.mat @@ -2,25 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_Name: whirlyblendmodes_Material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -28,7 +22,6 @@ Material: m_Texture: {fileID: 2800000, guid: dc1b9f9665c8aa74799404a1d2038e3d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _Cutoff: 0.1 - _Fill: 0 @@ -39,11 +32,9 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _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/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_SkeletonData.asset b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_SkeletonData.asset index a6235e986..2e51369b6 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_SkeletonData.asset +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes_SkeletonData.asset @@ -3,9 +3,8 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0