From 88eea81003e924ce0baf0c55154142994c41d7ad Mon Sep 17 00:00:00 2001 From: mob-sakai Date: Fri, 25 Jan 2019 16:49:09 +0900 Subject: [PATCH] Update demo --- Assets/SoftMask_Demo/SoftMask_Demo.unity | 39 +++++++++++++++--------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/Assets/SoftMask_Demo/SoftMask_Demo.unity b/Assets/SoftMask_Demo/SoftMask_Demo.unity index cfe5157..1aa4b55 100644 --- a/Assets/SoftMask_Demo/SoftMask_Demo.unity +++ b/Assets/SoftMask_Demo/SoftMask_Demo.unity @@ -2064,7 +2064,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Mask vs SoftMask + m_Text: TextMeshPro --- !u!222 &234968673 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4065,7 +4065,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1454678126} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -4540,7 +4540,7 @@ RectTransform: - {fileID: 1231113645} - {fileID: 633508442} m_Father: {fileID: 1454678126} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -7547,12 +7547,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1864891675} - m_Father: {fileID: 1454678126} + m_Father: {fileID: 1079849196} 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: 3.5183, y: -3.5} + m_AnchoredPosition: {x: 3.5183, y: 3.4999847} m_SizeDelta: {x: 197.94, y: 197.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &717488798 @@ -8615,7 +8615,7 @@ RectTransform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 840664485} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -8623,7 +8623,7 @@ RectTransform: - {fileID: 1797995909} m_Father: {fileID: 1983144426} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -10479,6 +10479,7 @@ GameObject: - component: {fileID: 1079849199} - component: {fileID: 1079849198} - component: {fileID: 1079849197} + - component: {fileID: 1079849200} m_Layer: 5 m_Name: Background Button m_TagString: Untagged @@ -10497,6 +10498,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 70046605} + - {fileID: 714905548} m_Father: {fileID: 1454678126} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10579,6 +10581,17 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1079849195} +--- !u!114 &1079849200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1079849195} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1084240451 GameObject: m_ObjectHideFlags: 0 @@ -11567,7 +11580,7 @@ RectTransform: m_LocalScale: {x: 0.9999819, y: 0.9999819, z: 0.9999819} m_Children: [] m_Father: {fileID: 1454678126} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -14568,7 +14581,6 @@ RectTransform: m_LocalScale: {x: 1.0000144, y: 1.0000144, z: 1.0000144} m_Children: - {fileID: 1079849196} - - {fileID: 714905548} - {fileID: 416831082} - {fileID: 1170415755} - {fileID: 469601973} @@ -15905,10 +15917,9 @@ MonoBehaviour: m_GameObject: {fileID: 1582707149} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3} + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Inverse: 0 --- !u!1 &1590748265 GameObject: m_ObjectHideFlags: 0 @@ -16007,7 +16018,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: '>> SoftMask v0.4.0 <<' + m_Text: '>> SoftMask v0.5.0 <<' --- !u!222 &1590748270 CanvasRenderer: m_ObjectHideFlags: 0 @@ -16563,7 +16574,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -115, y: 44.000008} + m_AnchoredPosition: {x: -115, y: 44.000015} m_SizeDelta: {x: 230, y: 44} m_Pivot: {x: 0, y: 1} --- !u!114 &1658073997 @@ -17947,7 +17958,7 @@ RectTransform: - {fileID: 90419014} - {fileID: 1154869346} m_Father: {fileID: 1454678126} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}