From 638b807f71f393ec2183d362bc84f0f144ffd26f Mon Sep 17 00:00:00 2001
From: stendler <stendler@mi.fu-berlin.de>
Date: Fri, 2 Feb 2018 18:39:04 +0100
Subject: [PATCH] ui: masked transition for scrolling
looks better!
---
.../MemoryBox/Scenes/6_MyMemoriesScreen.unity | 93 ++++++++++++++++---
1 file changed, 81 insertions(+), 12 deletions(-)
diff --git a/Assets/MemoryBox/Scenes/6_MyMemoriesScreen.unity b/Assets/MemoryBox/Scenes/6_MyMemoriesScreen.unity
index ae82986..55281b5 100644
--- a/Assets/MemoryBox/Scenes/6_MyMemoriesScreen.unity
+++ b/Assets/MemoryBox/Scenes/6_MyMemoriesScreen.unity
@@ -576,6 +576,76 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 382115068}
+--- !u!1 &391433708
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 391433709}
+ - component: {fileID: 391433711}
+ - component: {fileID: 391433710}
+ m_Layer: 5
+ m_Name: Mask
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &391433709
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 391433708}
+ 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: 913037914}
+ - {fileID: 1648636759}
+ m_Father: {fileID: 1829635678}
+ 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: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.49999997, y: 1}
+--- !u!114 &391433710
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 391433708}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.535}
+ 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_Sprite: {fileID: 21300000, guid: dc726a8ea451f400495ed3cbac7caca5, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+--- !u!222 &391433711
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 391433708}
--- !u!1 &402958333
GameObject:
m_ObjectHideFlags: 0
@@ -893,7 +963,7 @@ RectTransform:
- {fileID: 1981505550}
- {fileID: 1741676523}
m_Father: {fileID: 1829635678}
- m_RootOrder: 2
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -1056,7 +1126,7 @@ RectTransform:
m_Children:
- {fileID: 7745780}
m_Father: {fileID: 1829635678}
- m_RootOrder: 4
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
@@ -1372,12 +1442,12 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1829635678}
+ m_Father: {fileID: 391433709}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 30, y: -108}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: -330, y: -108}
m_SizeDelta: {x: 75, y: 140}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &913037915
@@ -2126,7 +2196,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1829635678}
+ m_Father: {fileID: 391433709}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
@@ -2248,7 +2318,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 786590248}
m_HandleRect: {fileID: 786590247}
m_Direction: 2
- m_Value: 0.9937448
+ m_Value: 0.99374515
m_Size: 0.7504595
m_NumberOfSteps: 0
m_OnValueChanged:
@@ -2316,9 +2386,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 913037914}
- - {fileID: 1648636759}
- {fileID: 628593513}
+ - {fileID: 391433709}
- {fileID: 1988529820}
- {fileID: 683776704}
m_Father: {fileID: 1561544518}
@@ -2405,7 +2474,7 @@ MonoBehaviour:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1981505549}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@@ -2472,7 +2541,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1829635678}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
--
GitLab