diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Getting Started/6 SkeletonGraphic.unity b/spine-unity/Assets/Spine/Samples~/Spine Examples/Getting Started/6 SkeletonGraphic.unity index afc13f06c..edcff1eb4 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Getting Started/6 SkeletonGraphic.unity +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Getting Started/6 SkeletonGraphic.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 @@ -156,7 +158,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: 0 m_OnCullStateChanged: @@ -165,6 +167,10 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null skeletonDataAsset: {fileID: 11400000, guid: 3c48535ae5679204c950a22a7caaa5a4, type: 2} + additiveMaterial: {fileID: 0} + multiplyMaterial: {fileID: 0} + screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} initialSkinName: default initialFlipX: 0 initialFlipY: 0 @@ -172,16 +178,37 @@ MonoBehaviour: startingLoop: 1 timeScale: 1 freeze: 0 - unscaledTime: 0 + layoutScaleMode: 0 + referenceSize: {x: 491, y: 708} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 491, y: 708} + editReferenceRect: 0 + updateWhenInvisible: 3 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + 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 &57002146 CanvasRenderer: m_ObjectHideFlags: 0 @@ -221,7 +248,7 @@ RectTransform: 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: -12.049179, y: 499.93677} + m_AnchoredPosition: {x: -12.049194, y: 499.93677} m_SizeDelta: {x: 100, y: 54.64} m_Pivot: {x: -0.15, y: -2.04} --- !u!114 &140863501 @@ -280,8 +307,11 @@ MonoBehaviour: followBoneRotation: 1 followSkeletonFlip: 1 followLocalScale: 0 + followParentWorldScale: 0 followXYPosition: 1 followZPosition: 1 + followAttachmentZSpacing: 0 + maintainedAxisOrientation: 1 --- !u!1 &189134934 GameObject: m_ObjectHideFlags: 0 @@ -592,7 +622,7 @@ RectTransform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 759111374} - m_LocalRotation: {x: 0, y: 0, z: 0.012304246, w: 0.9999243} + m_LocalRotation: {x: 0, y: 0, z: 0.012304263, w: 0.9999243} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -601,7 +631,7 @@ RectTransform: 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: 164.98044, y: 39.06775} + m_AnchoredPosition: {x: 164.98044, y: 39.06778} m_SizeDelta: {x: 35.7, y: 54.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &759111376 @@ -660,8 +690,11 @@ MonoBehaviour: followBoneRotation: 1 followSkeletonFlip: 1 followLocalScale: 0 + followParentWorldScale: 0 followXYPosition: 1 followZPosition: 1 + followAttachmentZSpacing: 0 + maintainedAxisOrientation: 1 --- !u!1 &774800193 GameObject: m_ObjectHideFlags: 0 @@ -822,7 +855,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1918252543} m_Direction: 0 m_Value: 0 - m_Size: 1 + m_Size: 0.9999999 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1120,7 +1153,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: 0 m_OnCullStateChanged: @@ -1129,6 +1162,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 @@ -1136,16 +1173,37 @@ MonoBehaviour: startingLoop: 1 timeScale: 1 freeze: 0 - unscaledTime: 0 + layoutScaleMode: 0 + referenceSize: {x: 535.3857, y: 654.491} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 535.3857, y: 654.491} + editReferenceRect: 0 + updateWhenInvisible: 3 + allowMultipleCanvasRenderers: 0 + canvasRenderers: [] + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + 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 &1384013135 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1228,7 +1286,7 @@ MonoBehaviour: m_HandleRect: {fileID: 2091633435} m_Direction: 2 m_Value: 1 - m_Size: 0.27235755 + m_Size: 0.27162817 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon.png index 4ec41b60d..9eac11127 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon2.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon2.png index 294cd28e9..7a8ac8423 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon2.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon2.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon3.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon3.png index 8fd0dc8c8..b439f413d 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon3.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon3.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon4.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon4.png index 69dd204fd..ce57b7107 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon4.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon4.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon5.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon5.png index 054db4003..f73a4fe40 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon5.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Dragon/dragon5.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes.png index 69d3eaefa..fff5bb611 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Eyes/eyes.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png index 4170722cd..7b37ec6da 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/FootSoldier/FS_White.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge.png index 68d0d2649..a2f803530 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Gauge/Gauge.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins.png index 2fb81d19c..4f4b716e4 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Goblins/goblins.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro.png index 9bc23f29a..5a82b0d9f 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Hero/hero-pro.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png index 708e2baf8..93a4ecd5a 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raggedy Spineboy/Raggedy Spineboy.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor.png index 27d5d7b81..1e48854ec 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Raptor/raptor.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png index bb6235617..fbac078a6 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Spineunitygirl/Doi.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.png index fdad599ae..1b969bb8b 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/Stretchyman/stretchyman-diffuse.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.png index 5ef26b368..d8cdcf1c5 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/celestial-circus/celestial-circus.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.png index 0b5db2489..0421ce033 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/cloud-pot/cloud-pot.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.png index 8ce7a8384..7ba082cc0 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/mix-and-match/mix-and-match.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.png index d17322d80..0419bea06 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/raptor-pro-and-mask/raptor.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.png index f4e7983d2..0d82687dc 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/sack/sack.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.png index e3ec62e59..fdd332355 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_2.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_2.png index aa15830bb..4917c23a5 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_2.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_2.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_3.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_3.png index 5f27debd3..20b2c7c84 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_3.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/snowglobe/snowglobe_3.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png index 417259a33..587ac02cc 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-pro/spineboy-pro.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png index 3448b4f28..215b9cf17 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/spineboy-unity/spineboy.png differ diff --git a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png index aa45d5cc0..70194960f 100644 Binary files a/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png and b/spine-unity/Assets/Spine/Samples~/Spine Examples/Spine Skeletons/whirlyblendmodes/whirlyblendmodes.png differ