From 0f1af578ca6257f24d7aafce89529e95c3431e15 Mon Sep 17 00:00:00 2001 From: mob-sakai Date: Fri, 18 Feb 2022 04:01:19 +0900 Subject: [PATCH] demo: update demo --- Samples~/Demo/Unmask_Demo.cs | 9 + Samples~/Demo/Unmask_Demo.unity | 375 ++++++++++++++++++++++++++++++-- 2 files changed, 363 insertions(+), 21 deletions(-) diff --git a/Samples~/Demo/Unmask_Demo.cs b/Samples~/Demo/Unmask_Demo.cs index 4d13652..cc5c9ae 100644 --- a/Samples~/Demo/Unmask_Demo.cs +++ b/Samples~/Demo/Unmask_Demo.cs @@ -6,6 +6,7 @@ namespace Coffee.UIExtensions.Demos public class Unmask_Demo : MonoBehaviour { [SerializeField] Unmask unmask = null; + [SerializeField] Unmask[] smoothingUnmasks = new Unmask[0]; [SerializeField] Graphic transition = null; [SerializeField] Image transitionImage = null; [SerializeField] Sprite unity_chan = null; @@ -28,5 +29,13 @@ namespace Coffee.UIExtensions.Demos var size = transitionImage.rectTransform.rect.size; transitionImage.rectTransform.sizeDelta = new Vector2(150, size.y / size.x * 150); } + + public void EnableSmoothing(bool flag) + { + foreach (var unmask in smoothingUnmasks) + { + unmask.edgeSmoothing = flag ? 1 : 0; + } + } } } \ No newline at end of file diff --git a/Samples~/Demo/Unmask_Demo.unity b/Samples~/Demo/Unmask_Demo.unity index 0a90586..903adb2 100644 --- a/Samples~/Demo/Unmask_Demo.unity +++ b/Samples~/Demo/Unmask_Demo.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1} + m_IndirectSpecularColor: {r: 0.44657838, g: 0.49641234, b: 0.57481676, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -526,8 +526,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab46b16b64e214e0d91583c53ac12da4, type: 3} m_Name: m_EditorClassIdentifier: - target: {fileID: 2026878701} unmask: {fileID: 1934621013} + smoothingUnmasks: + - {fileID: 474546652} + - {fileID: 323196830} + - {fileID: 1934621013} + - {fileID: 427535254} transition: {fileID: 1826727338} transitionImage: {fileID: 653262226} unity_chan: {fileID: 21300000, guid: 0cd154e72107340939b1731297ff8632, type: 3} @@ -611,6 +615,101 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 158225045} m_CullTransparentMesh: 0 +--- !u!1 &183422925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 183422926} + - component: {fileID: 183422927} + m_Layer: 5 + m_Name: Toggle - Edge Smoothing + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &183422926 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183422925} + 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: + - {fileID: 797299950} + - {fileID: 758245432} + m_Father: {fileID: 1526965849} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 92.421875, y: -99} + m_SizeDelta: {x: 184.84375, y: 22} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &183422927 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183422925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2109663825, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 797299951} + toggleTransition: 1 + graphic: {fileID: 1335416432} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 133894763} + m_MethodName: EnableSmoothing + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IsOn: 1 --- !u!1 &209121757 GameObject: m_ObjectHideFlags: 0 @@ -739,6 +838,7 @@ MonoBehaviour: m_FitOnLateUpdate: 0 m_OnlyForChildren: 0 m_ShowUnmaskGraphic: 0 + m_EdgeSmoothing: 1 --- !u!114 &323196831 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1084,6 +1184,7 @@ MonoBehaviour: m_FitOnLateUpdate: 0 m_OnlyForChildren: 0 m_ShowUnmaskGraphic: 0 + m_EdgeSmoothing: 1 --- !u!114 &427535255 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1165,8 +1266,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 99.331215, y: -33} - m_SizeDelta: {x: 198.66243, y: 22} + m_AnchoredPosition: {x: 97.378136, y: -33} + m_SizeDelta: {x: 194.75627, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &432299462 MonoBehaviour: @@ -1424,6 +1525,7 @@ MonoBehaviour: m_FitOnLateUpdate: 0 m_OnlyForChildren: 0 m_ShowUnmaskGraphic: 1 + m_EdgeSmoothing: 1 --- !u!114 &474546653 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1797,6 +1899,7 @@ MonoBehaviour: m_FitOnLateUpdate: 0 m_OnlyForChildren: 0 m_ShowUnmaskGraphic: 0 + m_EdgeSmoothing: 0 --- !u!114 &653262226 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1913,6 +2016,160 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 749509811} m_CullTransparentMesh: 0 +--- !u!1 &758245431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 758245432} + - component: {fileID: 758245434} + - component: {fileID: 758245433} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &758245432 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 758245431} + 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: 183422926} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 11.5, y: 0.0000076293945} + m_SizeDelta: {x: -23, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &758245433 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 758245431} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Edge smoothing +--- !u!222 &758245434 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 758245431} + m_CullTransparentMesh: 0 +--- !u!1 &797299949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 797299950} + - component: {fileID: 797299952} + - component: {fileID: 797299951} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &797299950 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 797299949} + 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: + - {fileID: 1335416431} + m_Father: {fileID: 183422926} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &797299951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 797299949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &797299952 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 797299949} + m_CullTransparentMesh: 0 --- !u!1 &798697676 GameObject: m_ObjectHideFlags: 0 @@ -3049,8 +3306,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90.46879, y: -11} - m_SizeDelta: {x: 180.93758, y: 22} + m_AnchoredPosition: {x: 92.421875, y: -11} + m_SizeDelta: {x: 184.84375, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1158411646 MonoBehaviour: @@ -3129,8 +3386,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90.46879, y: -77} - m_SizeDelta: {x: 180.93758, y: 22} + m_AnchoredPosition: {x: 92.421875, y: -77} + m_SizeDelta: {x: 184.84375, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1253616863 MonoBehaviour: @@ -3318,6 +3575,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1275261700} m_CullTransparentMesh: 0 +--- !u!1 &1335416430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1335416431} + - component: {fileID: 1335416433} + - component: {fileID: 1335416432} + m_Layer: 5 + m_Name: Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1335416431 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1335416430} + 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: 797299950} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1335416432 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1335416430} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &1335416433 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1335416430} + m_CullTransparentMesh: 0 --- !u!1 &1341563783 GameObject: m_ObjectHideFlags: 0 @@ -3555,8 +3886,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 99.331215, y: -11} - m_SizeDelta: {x: 198.66243, y: 22} + m_AnchoredPosition: {x: 97.378136, y: -11} + m_SizeDelta: {x: 194.75627, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1415840031 MonoBehaviour: @@ -3706,13 +4037,14 @@ RectTransform: - {fileID: 1742342034} - {fileID: 1787531622} - {fileID: 1253616862} + - {fileID: 183422926} m_Father: {fileID: 798697677} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 289.13123, y: -50} - m_SizeDelta: {x: 180.93758, y: 100} + m_AnchoredPosition: {x: 287.17816, y: -55} + m_SizeDelta: {x: 184.84375, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1526965850 MonoBehaviour: @@ -4079,8 +4411,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90.46879, y: -33} - m_SizeDelta: {x: 180.93758, y: 22} + m_AnchoredPosition: {x: 92.421875, y: -33} + m_SizeDelta: {x: 184.84375, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1742342035 MonoBehaviour: @@ -4249,8 +4581,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 90.46879, y: -55} - m_SizeDelta: {x: 180.93758, y: 22} + m_AnchoredPosition: {x: 92.421875, y: -55} + m_SizeDelta: {x: 184.84375, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1787531623 MonoBehaviour: @@ -4414,8 +4746,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 99.331215, y: -50} - m_SizeDelta: {x: 198.66243, y: 100} + m_AnchoredPosition: {x: 97.378136, y: -50} + m_SizeDelta: {x: 194.75627, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1815324079 MonoBehaviour: @@ -4743,6 +5075,7 @@ MonoBehaviour: m_FitOnLateUpdate: 1 m_OnlyForChildren: 0 m_ShowUnmaskGraphic: 0 + m_EdgeSmoothing: 1 --- !u!114 &1934621014 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4796,7 +5129,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: -150.6, y: -142.8312} + m_AnchoredPosition: {x: -150.60013, y: -125.75426} m_SizeDelta: {x: 83.7, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1971058987 @@ -5167,8 +5500,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 99.331215, y: -55} - m_SizeDelta: {x: 198.66243, y: 22} + m_AnchoredPosition: {x: 97.378136, y: -55} + m_SizeDelta: {x: 194.75627, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2122063194 MonoBehaviour: