From 7f822b458a6c181b982eb56bedc67e3b13747eae Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Tue, 16 Sep 2025 19:45:59 +0200 Subject: [PATCH] [unity] Updated SkeletonGraphic materials and blend modes sample scene for SkeletonGraphic after switching from PMA to straight alpha for better compatibility with Linear color space. --- .../Components/SkeletonGraphicInspector.cs | 24 +- ...tonGraphicAdditive-CanvasGroupStraight.mat | 8 +- ...etonGraphicDefault-CanvasGroupStraight.mat | 8 +- ...icDefaultGrayscale-CanvasGroupStraight.mat | 8 +- ...phicDefaultOutline-CanvasGroupStraight.mat | 8 +- ...keletonGraphicFill-CanvasGroupStraight.mat | 8 +- ...tonGraphicMultiply-CanvasGroupStraight.mat | 8 +- ...letonGraphicScreen-CanvasGroupStraight.mat | 8 +- ...onGraphicTintBlack-CanvasGroupStraight.mat | 20 +- ...cTintBlackAdditive-CanvasGroupStraight.mat | 20 +- ...cTintBlackMultiply-CanvasGroupStraight.mat | 20 +- ...icTintBlackOutline-CanvasGroupStraight.mat | 20 +- ...hicTintBlackScreen-CanvasGroupStraight.mat | 20 +- .../SkeletonGraphicAdditive-Straight.mat | 19 +- .../SkeletonGraphicDefault-Straight.mat | 19 +- ...eletonGraphicDefaultGrayscale-Straight.mat | 19 +- ...SkeletonGraphicDefaultOutline-Straight.mat | 19 +- .../SkeletonGraphicFill-Straight.mat | 19 +- .../SkeletonGraphicMultiply-Straight.mat | 19 +- .../SkeletonGraphicScreen-Straight.mat | 19 +- .../SkeletonGraphicTintBlack-Straight.mat | 19 +- ...letonGraphicTintBlackAdditive-Straight.mat | 19 +- ...letonGraphicTintBlackMultiply-Straight.mat | 19 +- ...eletonGraphicTintBlackOutline-Straight.mat | 19 +- ...keletonGraphicTintBlackScreen-Straight.mat | 19 +- .../Other Examples/BlendModes.unity | 789 +++++++----------- 26 files changed, 469 insertions(+), 728 deletions(-) diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs index c5f60984f..e7cbe1250 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs @@ -878,19 +878,35 @@ namespace Spine.Unity.Editor { } public static Material DefaultSkeletonGraphicMaterial { - get { return MaterialWithName("SkeletonGraphicDefault"); } + get { + return MaterialWithName(SpineEditorUtilities.Preferences.UsesPMAWorkflow ? + "SkeletonGraphicDefault" : + "SkeletonGraphicDefault-Straight"); + } } public static Material DefaultSkeletonGraphicAdditiveMaterial { - get { return MaterialWithName("SkeletonGraphicAdditive"); } + get { + return MaterialWithName(SpineEditorUtilities.Preferences.UsesPMAWorkflow ? + "SkeletonGraphicAdditive" : + "SkeletonGraphicAdditive-Straight"); + } } public static Material DefaultSkeletonGraphicMultiplyMaterial { - get { return MaterialWithName("SkeletonGraphicMultiply"); } + get { + return MaterialWithName(SpineEditorUtilities.Preferences.UsesPMAWorkflow ? + "SkeletonGraphicMultiply" : + "SkeletonGraphicMultiply-Straight"); + } } public static Material DefaultSkeletonGraphicScreenMaterial { - get { return MaterialWithName("SkeletonGraphicScreen"); } + get { + return MaterialWithName(SpineEditorUtilities.Preferences.UsesPMAWorkflow ? + "SkeletonGraphicScreen" : + "SkeletonGraphicScreen-Straight"); + } } protected static Material MaterialWithName (string name) { diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicAdditive-CanvasGroupStraight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicAdditive-CanvasGroupStraight.mat index b76866e56..c430e8801 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicAdditive-CanvasGroupStraight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicAdditive-CanvasGroupStraight.mat @@ -4,9 +4,8 @@ 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: SkeletonGraphicAdditive-CanvasGroupStraight m_Shader: {fileID: 4800000, guid: a1e4ab34b07f81e4e94f0d241c416669, type: 3} m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT @@ -68,6 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableExternalAlpha: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -88,6 +88,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -96,4 +97,3 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicDefault-CanvasGroupStraight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicDefault-CanvasGroupStraight.mat index 0f0a641d5..515a7637b 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicDefault-CanvasGroupStraight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicDefault-CanvasGroupStraight.mat @@ -4,9 +4,8 @@ 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: SkeletonGraphicDefault-CanvasGroupStraight m_Shader: {fileID: 4800000, guid: fa95b0fb6983c0f40a152e6f9aa82bfb, type: 3} m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT @@ -68,6 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableExternalAlpha: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -88,6 +88,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -96,4 +97,3 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicDefaultGrayscale-CanvasGroupStraight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicDefaultGrayscale-CanvasGroupStraight.mat index 4e6946e73..903f0e96e 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicDefaultGrayscale-CanvasGroupStraight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicDefaultGrayscale-CanvasGroupStraight.mat @@ -4,9 +4,8 @@ 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: SkeletonGraphicDefaultGrayscale-CanvasGroupStraight m_Shader: {fileID: 4800000, guid: fa95b0fb6983c0f40a152e6f9aa82bfb, type: 3} m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT @@ -68,6 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableExternalAlpha: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -88,6 +88,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -96,4 +97,3 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicDefaultOutline-CanvasGroupStraight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicDefaultOutline-CanvasGroupStraight.mat index a9216c2ae..d1378b89d 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicDefaultOutline-CanvasGroupStraight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicDefaultOutline-CanvasGroupStraight.mat @@ -4,9 +4,8 @@ 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: SkeletonGraphicDefaultOutline-CanvasGroupStraight m_Shader: {fileID: 4800000, guid: 8f5d14d2a7fedb84998c50eb96c8b748, type: 3} m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON @@ -68,6 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableExternalAlpha: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -88,6 +88,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -96,4 +97,3 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicFill-CanvasGroupStraight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicFill-CanvasGroupStraight.mat index 40789afd2..0cf835997 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicFill-CanvasGroupStraight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicFill-CanvasGroupStraight.mat @@ -4,9 +4,8 @@ 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: SkeletonGraphicFill-CanvasGroupStraight m_Shader: {fileID: 4800000, guid: c02377d9afbb50e49ab27049e59fb5f8, type: 3} m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON @@ -68,6 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableExternalAlpha: 0 + - _Fill: 0 - _FillPhase: 1 - _Glossiness: 0.5 - _Metallic: 0 @@ -89,6 +89,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -98,4 +99,3 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicMultiply-CanvasGroupStraight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicMultiply-CanvasGroupStraight.mat index 97c27207b..0a5c704c1 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicMultiply-CanvasGroupStraight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicMultiply-CanvasGroupStraight.mat @@ -4,9 +4,8 @@ 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: SkeletonGraphicMultiply-CanvasGroupStraight m_Shader: {fileID: 4800000, guid: cfbf95ed0fe6c554c8c2ee6c8325937c, type: 3} m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT @@ -68,6 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableExternalAlpha: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -88,6 +88,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -96,4 +97,3 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicScreen-CanvasGroupStraight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicScreen-CanvasGroupStraight.mat index 7321c107e..260e873c7 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicScreen-CanvasGroupStraight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicScreen-CanvasGroupStraight.mat @@ -4,9 +4,8 @@ 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: SkeletonGraphicScreen-CanvasGroupStraight m_Shader: {fileID: 4800000, guid: c61244023592f95479fddd71b5067683, type: 3} m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _STRAIGHT_ALPHA_INPUT @@ -68,6 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableExternalAlpha: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -88,6 +88,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -96,4 +97,3 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlack-CanvasGroupStraight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlack-CanvasGroupStraight.mat index 3b9a93b7b..4468efd79 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlack-CanvasGroupStraight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlack-CanvasGroupStraight.mat @@ -2,27 +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: SkeletonGraphicTintBlack-CanvasGroupStraight m_Shader: {fileID: 4800000, guid: f64c7bc238bb2c246b8ca1912b2b6b9c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _CANVAS_GROUP_COMPATIBLE - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _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: @@ -62,7 +54,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _CanvasGroupCompatible: 1 @@ -71,6 +62,7 @@ Material: - _DarkColorAlphaAdditive: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -91,6 +83,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -98,4 +91,3 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackAdditive-CanvasGroupStraight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackAdditive-CanvasGroupStraight.mat index ba2601e2b..b0d138fcb 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackAdditive-CanvasGroupStraight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackAdditive-CanvasGroupStraight.mat @@ -2,27 +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: SkeletonGraphicTintBlackAdditive-CanvasGroupStraight m_Shader: {fileID: 4800000, guid: 1d081289ec7074140a6b96982be27e02, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _CANVAS_GROUP_COMPATIBLE - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _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: @@ -62,7 +54,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _CanvasGroupCompatible: 1 @@ -71,6 +62,7 @@ Material: - _DarkColorAlphaAdditive: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -91,6 +83,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -98,4 +91,3 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackMultiply-CanvasGroupStraight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackMultiply-CanvasGroupStraight.mat index 9fcae644a..99b31221f 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackMultiply-CanvasGroupStraight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackMultiply-CanvasGroupStraight.mat @@ -2,27 +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: SkeletonGraphicTintBlackMultiply-CanvasGroupStraight m_Shader: {fileID: 4800000, guid: d006d50db496cce459741dc6689e2662, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _CANVAS_GROUP_COMPATIBLE - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _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: @@ -62,7 +54,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _CanvasGroupCompatible: 1 @@ -71,6 +62,7 @@ Material: - _DarkColorAlphaAdditive: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -91,6 +83,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -98,4 +91,3 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackOutline-CanvasGroupStraight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackOutline-CanvasGroupStraight.mat index 19913200e..257790d68 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackOutline-CanvasGroupStraight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackOutline-CanvasGroupStraight.mat @@ -2,27 +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: SkeletonGraphicTintBlackOutline-CanvasGroupStraight m_Shader: {fileID: 4800000, guid: d55d64dd09c46af40a319933a62fa1b2, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _CANVAS_GROUP_COMPATIBLE - - _STRAIGHT_ALPHA_INPUT - - _USE8NEIGHBOURHOOD_ON - m_InvalidKeywords: [] + m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _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: @@ -62,7 +54,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _CanvasGroupCompatible: 1 @@ -70,6 +61,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -90,6 +82,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -97,4 +90,3 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackScreen-CanvasGroupStraight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackScreen-CanvasGroupStraight.mat index ad51a93d3..557cdfb81 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackScreen-CanvasGroupStraight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/CanvasGroup/SkeletonGraphicTintBlackScreen-CanvasGroupStraight.mat @@ -2,27 +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: SkeletonGraphicTintBlackScreen-CanvasGroupStraight m_Shader: {fileID: 4800000, guid: 7cb5b7d45d2ae2847970ba2e30fdc597, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _CANVAS_GROUP_COMPATIBLE - - _STRAIGHT_ALPHA_INPUT - m_InvalidKeywords: - - _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _CANVAS_GROUP_COMPATIBLE _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: @@ -62,7 +54,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _CanvasGroupCompatible: 1 @@ -71,6 +62,7 @@ Material: - _DarkColorAlphaAdditive: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -91,6 +83,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -98,4 +91,3 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicAdditive-Straight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicAdditive-Straight.mat index d7572a989..3ffed920c 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicAdditive-Straight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicAdditive-Straight.mat @@ -2,26 +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: SkeletonGraphicAdditive-Straight m_Shader: {fileID: 4800000, guid: a1e4ab34b07f81e4e94f0d241c416669, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - 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: @@ -65,7 +58,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - PixelSnap: 0 - _BumpScale: 1 @@ -75,6 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableExternalAlpha: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -95,6 +88,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -103,4 +97,3 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicDefault-Straight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicDefault-Straight.mat index 69a00ee5d..ab86e0e30 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicDefault-Straight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicDefault-Straight.mat @@ -2,26 +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: SkeletonGraphicDefault-Straight m_Shader: {fileID: 4800000, guid: fa95b0fb6983c0f40a152e6f9aa82bfb, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - 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: @@ -65,7 +58,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - PixelSnap: 0 - _BumpScale: 1 @@ -75,6 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableExternalAlpha: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -95,6 +88,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -103,4 +97,3 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicDefaultGrayscale-Straight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicDefaultGrayscale-Straight.mat index cfdbd05f2..30fe0a40e 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicDefaultGrayscale-Straight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicDefaultGrayscale-Straight.mat @@ -2,26 +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: SkeletonGraphicDefaultGrayscale-Straight m_Shader: {fileID: 4800000, guid: fa95b0fb6983c0f40a152e6f9aa82bfb, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - 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: @@ -65,7 +58,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - PixelSnap: 0 - _BumpScale: 1 @@ -75,6 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableExternalAlpha: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -95,6 +88,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -103,4 +97,3 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicDefaultOutline-Straight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicDefaultOutline-Straight.mat index 21c3d92b9..2f0a2c136 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicDefaultOutline-Straight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicDefaultOutline-Straight.mat @@ -2,26 +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: SkeletonGraphicDefaultOutline-Straight m_Shader: {fileID: 4800000, guid: 8f5d14d2a7fedb84998c50eb96c8b748, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - - _USE8NEIGHBOURHOOD_ON - m_InvalidKeywords: [] + 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: @@ -65,7 +58,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - PixelSnap: 0 - _BumpScale: 1 @@ -75,6 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableExternalAlpha: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -95,6 +88,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -103,4 +97,3 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicFill-Straight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicFill-Straight.mat index 5425bca4b..54a6b3405 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicFill-Straight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicFill-Straight.mat @@ -2,26 +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: SkeletonGraphicFill-Straight m_Shader: {fileID: 4800000, guid: c02377d9afbb50e49ab27049e59fb5f8, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - 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: @@ -65,7 +58,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - PixelSnap: 0 - _BumpScale: 1 @@ -75,6 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableExternalAlpha: 0 + - _Fill: 0 - _FillPhase: 1 - _Glossiness: 0.5 - _Metallic: 0 @@ -96,6 +89,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -105,4 +99,3 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicMultiply-Straight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicMultiply-Straight.mat index e152a4aca..7b238306d 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicMultiply-Straight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicMultiply-Straight.mat @@ -2,26 +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: SkeletonGraphicMultiply-Straight m_Shader: {fileID: 4800000, guid: cfbf95ed0fe6c554c8c2ee6c8325937c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - 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: @@ -65,7 +58,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - PixelSnap: 0 - _BumpScale: 1 @@ -75,6 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableExternalAlpha: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -95,6 +88,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -103,4 +97,3 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicScreen-Straight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicScreen-Straight.mat index a7f50d23c..c266a6528 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicScreen-Straight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicScreen-Straight.mat @@ -2,26 +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: SkeletonGraphicScreen-Straight m_Shader: {fileID: 4800000, guid: c61244023592f95479fddd71b5067683, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - 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: @@ -65,7 +58,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - PixelSnap: 0 - _BumpScale: 1 @@ -75,6 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableExternalAlpha: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -95,6 +88,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -103,4 +97,3 @@ Material: - _Flip: {r: 1, g: 1, b: 1, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlack-Straight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlack-Straight.mat index 33ea7db03..1cf76d40b 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlack-Straight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlack-Straight.mat @@ -2,26 +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: SkeletonGraphicTintBlack-Straight m_Shader: {fileID: 4800000, guid: f64c7bc238bb2c246b8ca1912b2b6b9c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - 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: @@ -61,7 +54,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _CanvasGroupCompatible: 0 @@ -70,6 +62,7 @@ Material: - _DarkColorAlphaAdditive: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -90,6 +83,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -97,4 +91,3 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackAdditive-Straight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackAdditive-Straight.mat index efd8b95ed..4c8965dfa 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackAdditive-Straight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackAdditive-Straight.mat @@ -2,26 +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: SkeletonGraphicTintBlackAdditive-Straight m_Shader: {fileID: 4800000, guid: 1d081289ec7074140a6b96982be27e02, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - 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: @@ -61,7 +54,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _CanvasGroupCompatible: 0 @@ -70,6 +62,7 @@ Material: - _DarkColorAlphaAdditive: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -90,6 +83,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -97,4 +91,3 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackMultiply-Straight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackMultiply-Straight.mat index 326313b48..7cd19658c 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackMultiply-Straight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackMultiply-Straight.mat @@ -2,26 +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: SkeletonGraphicTintBlackMultiply-Straight m_Shader: {fileID: 4800000, guid: d006d50db496cce459741dc6689e2662, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - 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: @@ -61,7 +54,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _CanvasGroupCompatible: 0 @@ -70,6 +62,7 @@ Material: - _DarkColorAlphaAdditive: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -90,6 +83,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -97,4 +91,3 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackOutline-Straight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackOutline-Straight.mat index d08ef7aca..38c4e517a 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackOutline-Straight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackOutline-Straight.mat @@ -2,26 +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: SkeletonGraphicTintBlackOutline-Straight m_Shader: {fileID: 4800000, guid: d55d64dd09c46af40a319933a62fa1b2, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - - _USE8NEIGHBOURHOOD_ON - m_InvalidKeywords: [] + 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: @@ -61,7 +54,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _CanvasGroupCompatible: 0 @@ -69,6 +61,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -89,6 +82,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -96,4 +90,3 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackScreen-Straight.mat b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackScreen-Straight.mat index 7d06589ef..6d3431644 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackScreen-Straight.mat +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Materials/UI-StraightAlphaTex/SkeletonGraphicTintBlackScreen-Straight.mat @@ -2,26 +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: SkeletonGraphicTintBlackScreen-Straight m_Shader: {fileID: 4800000, guid: 7cb5b7d45d2ae2847970ba2e30fdc597, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _STRAIGHT_ALPHA_INPUT - 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: @@ -61,7 +54,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _BumpScale: 1 - _CanvasGroupCompatible: 0 @@ -70,6 +62,7 @@ Material: - _DarkColorAlphaAdditive: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Fill: 0 - _Glossiness: 0.5 - _Metallic: 0 - _Mode: 0 @@ -90,6 +83,7 @@ Material: - _ThresholdEnd: 0.25 - _UVSec: 0 - _Use8Neighbourhood: 1 + - _UseScreenSpaceOutlineWidth: 0 - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: @@ -97,4 +91,3 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, 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/Other Examples/BlendModes.unity b/spine-unity/Assets/Spine/Samples~/Spine Examples/Other Examples/BlendModes.unity index c04c81dbb..e6db490ee 100644 --- a/spine-unity/Assets/Spine/Samples~/Spine Examples/Other Examples/BlendModes.unity +++ b/spine-unity/Assets/Spine/Samples~/Spine Examples/Other Examples/BlendModes.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 8 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,30 +39,30 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 12 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 - m_AtlasSize: 1024 + m_TextureWidth: 1024 + m_TextureHeight: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -77,16 +77,10 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 500 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 2 - m_PVRDenoiserTypeDirect: 0 - m_PVRDenoiserTypeIndirect: 0 - m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 0 + m_PVRFilteringMode: 2 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -94,11 +88,8 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 468757304} + m_UseShadowmask: 1 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,18 +109,13 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &85355364 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - component: {fileID: 85355365} - component: {fileID: 85355367} @@ -144,11 +130,10 @@ GameObject: --- !u!224 &85355365 RectTransform: 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: 85355364} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_Children: @@ -156,7 +141,7 @@ RectTransform: - {fileID: 1378924201} - {fileID: 174458474} - {fileID: 1979685139} - m_Father: {fileID: 1578129253} + m_Father: {fileID: 643096732} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -167,27 +152,27 @@ RectTransform: --- !u!114 &85355366 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: 85355364} m_Enabled: 1 m_EditorHideFlags: 0 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null skeletonDataAsset: {fileID: 11400000, guid: a515487a7cc6cca479d8c7c700c9145d, type: 2} - additiveMaterial: {fileID: 2100000, guid: 2e8245019faeb8c43b75f9ca3ac8ee34, type: 2} - multiplyMaterial: {fileID: 2100000, guid: e74a1f8978a7da348a721508d0d58834, type: 2} - screenMaterial: {fileID: 2100000, guid: bab24c479f34eec45be6ea8595891569, type: 2} + additiveMaterial: {fileID: 2100000, guid: cad8f402683e18141a860042c37d6242, type: 2} + multiplyMaterial: {fileID: 2100000, guid: 508e91b626e5c3d4690de05ff2dc80f3, type: 2} + screenMaterial: {fileID: 2100000, guid: c1a5bc7027fd9544abc08178fe135ba2, type: 2} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} initialSkinName: default initialFlipX: 0 initialFlipY: 0 @@ -195,8 +180,14 @@ MonoBehaviour: startingLoop: 1 timeScale: 1 freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 456.70792, y: 360.68793} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 456.70792, y: 360.68793} + editReferenceRect: 0 updateWhenInvisible: 3 - unscaledTime: 0 allowMultipleCanvasRenderers: 1 canvasRenderers: - {fileID: 1394788119} @@ -207,31 +198,35 @@ MonoBehaviour: 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 - canvasGroupTintBlack: 0 - calculateTangents: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 addNormals: 0 + calculateTangents: 0 immutableTriangles: 0 + updateTiming: 1 + unscaledTime: 0 --- !u!222 &85355367 CanvasRenderer: 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: 85355364} - m_CullTransparentMesh: 1 --- !u!1 &174458473 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - component: {fileID: 174458474} - component: {fileID: 174458476} @@ -246,9 +241,8 @@ GameObject: --- !u!224 &174458474 RectTransform: 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: 174458473} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -257,17 +251,16 @@ RectTransform: m_Father: {fileID: 85355365} m_RootOrder: 2 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: 24.359985, y: 52.20999} - 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5533382, y: 0.64475113} --- !u!114 &174458475 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: 174458473} m_Enabled: 1 m_EditorHideFlags: 0 @@ -277,26 +270,23 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!222 &174458476 CanvasRenderer: 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: 174458473} - m_CullTransparentMesh: 1 --- !u!1 &200188759 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - component: {fileID: 200188764} - component: {fileID: 200188763} @@ -312,36 +302,27 @@ GameObject: --- !u!81 &200188760 AudioListener: 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: 200188759} m_Enabled: 1 --- !u!124 &200188761 Behaviour: 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: 200188759} m_Enabled: 1 --- !u!20 &200188763 Camera: 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: 200188759} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.41089964, g: 0.5221931, b: 0.58823526, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -363,17 +344,16 @@ Camera: m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 --- !u!4 &200188764 Transform: 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: 200188759} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} @@ -382,79 +362,12 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &206298906 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 206298909} - - component: {fileID: 206298908} - - component: {fileID: 206298907} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &206298907 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 206298906} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &206298908 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 206298906} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &206298909 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 206298906} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &267173954 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - component: {fileID: 267173958} - component: {fileID: 267173957} @@ -471,9 +384,8 @@ GameObject: --- !u!114 &267173955 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: 267173954} m_Enabled: 1 m_EditorHideFlags: 0 @@ -482,6 +394,7 @@ MonoBehaviour: m_EditorClassIdentifier: skeletonDataAsset: {fileID: 11400000, guid: af38a3de26ed9b84abc2fe7c7f3b209d, type: 2} initialSkinName: default + fixPrefabOverrideViaMeshFilter: 2 initialFlipX: 0 initialFlipY: 0 updateWhenInvisible: 3 @@ -494,7 +407,6 @@ MonoBehaviour: clearStateOnDisable: 0 tintBlack: 0 singleSubmesh: 0 - fixDrawOrder: 0 addNormals: 0 calculateTangents: 0 maskInteraction: 0 @@ -503,27 +415,26 @@ MonoBehaviour: materialsInsideMask: [] materialsOutsideMask: [] disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 _animationName: run loop: 1 timeScale: 1 --- !u!23 &267173956 MeshRenderer: 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: 267173954} m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 - m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: f89bbf05902e77242a3ad20f3c927353, type: 2} - {fileID: 2100000, guid: f89bbf05902e77242a3ad20f3c927353, type: 2} @@ -534,11 +445,9 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_StitchLightmapSeams: 1 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -547,21 +456,18 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -4 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &267173957 MeshFilter: 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: 267173954} m_Mesh: {fileID: 0} --- !u!4 &267173958 Transform: 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: 267173954} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.53, y: -4.14, z: 0} @@ -576,9 +482,8 @@ Transform: --- !u!114 &267173959 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: 267173954} m_Enabled: 1 m_EditorHideFlags: 0 @@ -591,74 +496,106 @@ MonoBehaviour: partsRenderers: - {fileID: 1776944552} - {fileID: 1476882952} ---- !u!850595691 &468757304 -LightingSettings: +--- !u!1 &643096728 +GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Settings.lighting + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 643096732} + - component: {fileID: 643096731} + - component: {fileID: 643096730} + - component: {fileID: 643096729} + m_Layer: 5 + m_Name: Canvas Blend Modes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &643096729 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 643096728} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &643096730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 643096728} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &643096731 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 643096728} + m_Enabled: 1 serializedVersion: 3 - m_GIWorkflowMode: 1 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_RealtimeEnvironmentLighting: 1 - m_BounceScale: 1 - m_AlbedoBoost: 1 - m_IndirectOutputScale: 1 - m_UsingShadowmask: 1 - m_BakeBackend: 0 - m_LightmapMaxSize: 1024 - m_BakeResolution: 40 - m_Padding: 2 - m_TextureCompression: 1 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAO: 0 - m_MixedBakeMode: 2 - m_LightmapsBakeMode: 1 - m_FilterMode: 1 - m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_RealtimeResolution: 2 - m_ForceWhiteAlbedo: 0 - m_ForceUpdates: 0 - m_FinalGather: 0 - m_FinalGatherRayCount: 256 - m_FinalGatherFiltering: 1 - m_PVRCulling: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 - m_PVREnvironmentSampleCount: 500 - m_PVREnvironmentReferencePointCount: 2048 - m_LightProbeSampleCountMultiplier: 4 - m_PVRBounces: 2 - m_PVRMinBounces: 2 - m_PVREnvironmentMIS: 0 - m_PVRFilteringMode: 2 - m_PVRDenoiserTypeDirect: 0 - m_PVRDenoiserTypeIndirect: 0 - m_PVRDenoiserTypeAO: 0 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &643096732 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 643096728} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 85355365} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1378924200 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - component: {fileID: 1378924201} - component: {fileID: 1378924203} @@ -673,9 +610,8 @@ GameObject: --- !u!224 &1378924201 RectTransform: 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: 1378924200} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -684,17 +620,16 @@ RectTransform: m_Father: {fileID: 85355365} m_RootOrder: 1 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: 24.359985, y: 52.20999} - 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5533382, y: 0.64475113} --- !u!114 &1378924202 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: 1378924200} m_Enabled: 1 m_EditorHideFlags: 0 @@ -704,26 +639,23 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!222 &1378924203 CanvasRenderer: 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: 1378924200} - m_CullTransparentMesh: 1 --- !u!1 &1394788116 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - component: {fileID: 1394788117} - component: {fileID: 1394788119} @@ -738,9 +670,8 @@ GameObject: --- !u!224 &1394788117 RectTransform: 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: 1394788116} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -749,17 +680,16 @@ RectTransform: m_Father: {fileID: 85355365} 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: 24.359985, y: 52.20999} - 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5533382, y: 0.64475113} --- !u!114 &1394788118 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: 1394788116} m_Enabled: 1 m_EditorHideFlags: 0 @@ -769,26 +699,23 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!222 &1394788119 CanvasRenderer: 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: 1394788116} - m_CullTransparentMesh: 1 --- !u!1 &1476882951 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - component: {fileID: 1476882955} - component: {fileID: 1476882954} @@ -804,9 +731,8 @@ GameObject: --- !u!114 &1476882952 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: 1476882951} m_Enabled: 1 m_EditorHideFlags: 0 @@ -816,21 +742,15 @@ MonoBehaviour: --- !u!23 &1476882953 MeshRenderer: 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: 1476882951} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: f89bbf05902e77242a3ad20f3c927353, type: 2} m_StaticBatchInfo: @@ -840,11 +760,9 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_StitchLightmapSeams: 1 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -853,21 +771,18 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 5 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1476882954 MeshFilter: 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: 1476882951} m_Mesh: {fileID: 0} --- !u!4 &1476882955 Transform: 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: 1476882951} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.63, y: 0, z: 0} @@ -879,10 +794,9 @@ Transform: --- !u!1 &1573089137 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - component: {fileID: 1573089138} - component: {fileID: 1573089139} @@ -896,12 +810,11 @@ GameObject: --- !u!4 &1573089138 Transform: 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: 1573089137} m_LocalRotation: {x: 0, y: 0, z: 0.72986406, w: 0.6835923} - m_LocalPosition: {x: 0.6023901, y: 3.6781247, z: 0} + m_LocalPosition: {x: 0.60239005, y: 3.6781247, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1738947319} @@ -911,9 +824,8 @@ Transform: --- !u!114 &1573089139 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: 1573089137} m_Enabled: 1 m_EditorHideFlags: 0 @@ -924,118 +836,81 @@ MonoBehaviour: boneName: head followXYPosition: 1 followZPosition: 1 + followAttachmentZSpacing: 0 followBoneRotation: 1 followSkeletonFlip: 1 followLocalScale: 0 + followParentWorldScale: 0 maintainedAxisOrientation: 1 initializeOnAwake: 1 ---- !u!1 &1578129249 +--- !u!1 &1648654552 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - - component: {fileID: 1578129253} - - component: {fileID: 1578129252} - - component: {fileID: 1578129251} - - component: {fileID: 1578129250} - m_Layer: 5 - m_Name: Canvas Blend Modes + - component: {fileID: 1648654555} + - component: {fileID: 1648654554} + - component: {fileID: 1648654553} + m_Layer: 0 + m_Name: EventSystem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1578129250 +--- !u!114 &1648654553 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578129249} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1648654552} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1578129251 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1648654554 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578129249} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1648654552} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 1 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1578129252 -Canvas: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!4 &1648654555 +Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578129249} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1578129253 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578129249} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1648654552} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 85355365} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} --- !u!1 &1738947315 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - component: {fileID: 1738947319} - component: {fileID: 1738947318} @@ -1052,9 +927,8 @@ GameObject: --- !u!114 &1738947316 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: 1738947315} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1063,6 +937,7 @@ MonoBehaviour: m_EditorClassIdentifier: skeletonDataAsset: {fileID: 11400000, guid: a515487a7cc6cca479d8c7c700c9145d, type: 2} initialSkinName: default + fixPrefabOverrideViaMeshFilter: 2 initialFlipX: 0 initialFlipY: 0 updateWhenInvisible: 3 @@ -1074,7 +949,6 @@ MonoBehaviour: clearStateOnDisable: 0 tintBlack: 0 singleSubmesh: 0 - fixDrawOrder: 0 addNormals: 0 calculateTangents: 0 maskInteraction: 0 @@ -1083,32 +957,31 @@ MonoBehaviour: materialsInsideMask: [] materialsOutsideMask: [] disableRenderingOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + updateTiming: 1 + unscaledTime: 0 _animationName: animation loop: 1 timeScale: 1 --- !u!23 &1738947317 MeshRenderer: 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: 1738947315} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: e162c08da1abc294cb851248f51dfc40, type: 2} - {fileID: 2100000, guid: aa8b3fb015cd7eb438453da5e475ad54, type: 2} - {fileID: 2100000, guid: 1489a5bef834c9743bab2d5bd43168f1, type: 2} - - {fileID: 2100000, guid: e162c08da1abc294cb851248f51dfc40, type: 2} + - {fileID: 2100000, guid: 867b647cef55dcb43928a83908d96007, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1116,11 +989,9 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_StitchLightmapSeams: 1 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1129,21 +1000,18 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1738947318 MeshFilter: 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: 1738947315} m_Mesh: {fileID: 0} --- !u!4 &1738947319 Transform: 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: 1738947315} m_LocalRotation: {x: -0, y: -0, z: 0.78918, w: -0.61416197} m_LocalPosition: {x: 2.003, y: -0.445, z: 0} @@ -1155,9 +1023,8 @@ Transform: --- !u!210 &1738947320 SortingGroup: 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: 1738947315} m_Enabled: 1 m_SortingLayerID: 0 @@ -1166,10 +1033,9 @@ SortingGroup: --- !u!1 &1776944551 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - component: {fileID: 1776944555} - component: {fileID: 1776944554} @@ -1185,9 +1051,8 @@ GameObject: --- !u!114 &1776944552 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: 1776944551} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1197,21 +1062,15 @@ MonoBehaviour: --- !u!23 &1776944553 MeshRenderer: 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: 1776944551} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 - m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: f89bbf05902e77242a3ad20f3c927353, type: 2} m_StaticBatchInfo: @@ -1221,11 +1080,9 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_StitchLightmapSeams: 1 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1234,21 +1091,18 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -17 - m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1776944554 MeshFilter: 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: 1776944551} m_Mesh: {fileID: 0} --- !u!4 &1776944555 Transform: 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: 1776944551} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.15, y: 0.36, z: 0} @@ -1260,10 +1114,9 @@ Transform: --- !u!1 &1979685138 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 m_Component: - component: {fileID: 1979685139} - component: {fileID: 1979685141} @@ -1278,9 +1131,8 @@ GameObject: --- !u!224 &1979685139 RectTransform: 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: 1979685138} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1289,17 +1141,16 @@ RectTransform: m_Father: {fileID: 85355365} m_RootOrder: 3 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: 24.359985, y: 52.20999} - 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5533382, y: 0.64475113} --- !u!114 &1979685140 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: 1979685138} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1309,16 +1160,14 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!222 &1979685141 CanvasRenderer: 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: 1979685138} - m_CullTransparentMesh: 0