From 1531c155055d1ef47163cdf648d36c1db8bf1e63 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Mon, 22 Sep 2025 21:05:59 +0200 Subject: [PATCH] [unity] Fixed one more example scene to use SkeletonGraphic straight alpha texture settings. See #2928. --- .../Other Examples/Outline Shaders.unity | 6 +- .../SkeletonRenderSeparator.unity | 116 +++++++++++++++--- 2 files changed, 100 insertions(+), 22 deletions(-) diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Other Examples/Outline Shaders.unity b/spine-unity/Assets/Spine/Samples~/Spine Examples/Other Examples/Outline Shaders.unity index b896300fd..56ee5d632 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Other Examples/Outline Shaders.unity +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Other Examples/Outline Shaders.unity @@ -180,7 +180,7 @@ MonoBehaviour: timeScale: 1 freeze: 0 layoutScaleMode: 0 - referenceSize: {x: 683.73193, y: 689.5855} + referenceSize: {x: 683.73193, y: 689.73535} pivotOffset: {x: 0, y: 0} referenceScale: 1 layoutScale: 1 @@ -228,9 +228,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: skeletonGraphic: {fileID: 432616241} - materialWithoutOutline: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, + materialWithoutOutline: {fileID: 2100000, guid: 9c6ec24bca5fc42489fe47358fef0d4a, type: 2} - materialWithOutline: {fileID: 2100000, guid: c4ee0f8f4be17434aa3df5774a03b366, type: 2} + materialWithOutline: {fileID: 2100000, guid: eb5fcf8085792c14088ce1aeb552cfba, type: 2} --- !u!114 &432616244 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Other Examples/SkeletonRenderSeparator.unity b/spine-unity/Assets/Spine/Samples~/Spine Examples/Other Examples/SkeletonRenderSeparator.unity index aed9c04a4..30ef846fd 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Other Examples/SkeletonRenderSeparator.unity +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Other Examples/SkeletonRenderSeparator.unity @@ -77,15 +77,17 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVRFiltering: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 m_PVRFilteringMode: 1 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousColorSigma: 1 - m_PVRFilteringAtrousNormalSigma: 1 - m_PVRFilteringAtrousPositionSigma: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -355,8 +357,10 @@ MonoBehaviour: m_EditorClassIdentifier: skeletonDataAsset: {fileID: 11400000, guid: a467507a4ffb1d542a558739b2fede77, type: 2} initialSkinName: base + fixPrefabOverrideViaMeshFilter: 2 initialFlipX: 0 initialFlipY: 0 + updateWhenInvisible: 3 separatorSlotNames: - --B zSpacing: 0 @@ -374,6 +378,11 @@ MonoBehaviour: materialsInsideMask: [] materialsOutsideMask: [] disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 _animationName: run loop: 1 timeScale: 0.1 @@ -656,7 +665,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 565117361} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.3628243, y: 3.7229316, z: 0} + m_LocalPosition: {x: -1.3628246, y: 3.7229319, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 93048079} @@ -729,9 +738,12 @@ MonoBehaviour: boneName: front_fist followXYPosition: 1 followZPosition: 0 + followAttachmentZSpacing: 0 followBoneRotation: 0 followSkeletonFlip: 0 followLocalScale: 0 + followParentWorldScale: 0 + maintainedAxisOrientation: 1 initializeOnAwake: 1 --- !u!198 &565117365 ParticleSystem: @@ -4400,7 +4412,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + m_Material: {fileID: 2100000, guid: 9c6ec24bca5fc42489fe47358fef0d4a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: @@ -4409,6 +4421,10 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null skeletonDataAsset: {fileID: 11400000, guid: a467507a4ffb1d542a558739b2fede77, type: 2} + additiveMaterial: {fileID: 0} + multiplyMaterial: {fileID: 0} + screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} initialSkinName: base initialFlipX: 0 initialFlipY: 0 @@ -4416,7 +4432,14 @@ MonoBehaviour: startingLoop: 1 timeScale: 1 freeze: 0 - unscaledTime: 0 + layoutScaleMode: 0 + referenceSize: {x: 371.0865, y: 731.54474} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 371.0865, y: 731.54474} + editReferenceRect: 0 + updateWhenInvisible: 3 allowMultipleCanvasRenderers: 1 canvasRenderers: - {fileID: 1882323272} @@ -4428,15 +4451,23 @@ MonoBehaviour: - {fileID: 835737018} - {fileID: 415442240} updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 + disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} meshGenerator: settings: useClipping: 1 zSpacing: 0 - pmaVertexColors: 1 tintBlack: 0 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 + updateTiming: 1 + unscaledTime: 0 --- !u!222 &1185404040 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4468,6 +4499,7 @@ GameObject: m_Component: - component: {fileID: 1211557619} - component: {fileID: 1211557620} + - component: {fileID: 1211557621} m_Layer: 0 m_Name: Renderer1 m_TagString: Untagged @@ -4488,17 +4520,36 @@ RectTransform: m_Father: {fileID: 415442240} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -9.614487, y: 48.831177} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.59614486, y: 0.011688247} --- !u!222 &1211557620 CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1211557618} +--- !u!114 &1211557621 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1211557618} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: deeb12332c062954093c24a3fab10b83, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!1 &1406277772 GameObject: m_ObjectHideFlags: 0 @@ -5049,6 +5100,7 @@ GameObject: m_Component: - component: {fileID: 1882323273} - component: {fileID: 1882323272} + - component: {fileID: 1882323274} m_Layer: 0 m_Name: Renderer0 m_TagString: Untagged @@ -5075,11 +5127,30 @@ RectTransform: m_Father: {fileID: 835737018} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -9.614487, y: 48.831177} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.59614486, y: 0.011688247} +--- !u!114 &1882323274 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1882323271} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: deeb12332c062954093c24a3fab10b83, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!1 &1918225114 GameObject: m_ObjectHideFlags: 0 @@ -5130,8 +5201,10 @@ MonoBehaviour: m_EditorClassIdentifier: skeletonDataAsset: {fileID: 11400000, guid: a467507a4ffb1d542a558739b2fede77, type: 2} initialSkinName: base + fixPrefabOverrideViaMeshFilter: 2 initialFlipX: 0 initialFlipY: 0 + updateWhenInvisible: 3 separatorSlotNames: - --A zSpacing: 0 @@ -5149,6 +5222,11 @@ MonoBehaviour: materialsInsideMask: [] materialsOutsideMask: [] disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 _animationName: loop: 0 timeScale: 1