diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index c48c6a1..eadefa3 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -171,7 +171,7 @@ GameObject: - 222: {fileID: 42588293} - 114: {fileID: 42588292} m_Layer: 5 - m_Name: Checkmark + m_Name: checkmark m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -438,7 +438,7 @@ GameObject: - 222: {fileID: 63450837} - 114: {fileID: 63450836} m_Layer: 5 - m_Name: Label + m_Name: label m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -459,8 +459,8 @@ RectTransform: m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 14, y: -0.5} - m_SizeDelta: {x: -38, y: -3} + m_AnchoredPosition: {x: 21, y: 0} + m_SizeDelta: {x: -42, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &63450836 MonoBehaviour: @@ -488,7 +488,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -1076,6 +1076,42 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 197321765} +--- !u!1 &202190018 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 202190019} + m_Layer: 5 + m_Name: screens + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &202190019 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 202190018} + 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 263018772} + - {fileID: 1935189154} + - {fileID: 951727302} + m_Father: {fileID: 1414104007} + m_RootOrder: 3 + 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.5, y: 0.5} --- !u!1 &212041959 GameObject: m_ObjectHideFlags: 0 @@ -1172,7 +1208,7 @@ RectTransform: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 228512393} - 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: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1180,8 +1216,8 @@ RectTransform: - {fileID: 389535983} - {fileID: 191800646} - {fileID: 2010584310} - m_Father: {fileID: 1414104007} - m_RootOrder: 9 + m_Father: {fileID: 576472178} + m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -1268,7 +1304,7 @@ RectTransform: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 263018771} - 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: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1277,8 +1313,8 @@ RectTransform: - {fileID: 1173561061} - {fileID: 1632068377} - {fileID: 1874017187} - m_Father: {fileID: 1414104007} - m_RootOrder: 5 + m_Father: {fileID: 202190019} + m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -1413,7 +1449,7 @@ GameObject: - 114: {fileID: 265917592} - 114: {fileID: 265917591} m_Layer: 5 - m_Name: settings + m_Name: panel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1425,7 +1461,7 @@ RectTransform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 265917589} - 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: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1433,8 +1469,8 @@ RectTransform: - {fileID: 1763219242} - {fileID: 21916901} - {fileID: 822147789} - m_Father: {fileID: 1414104007} - m_RootOrder: 15 + m_Father: {fileID: 1932070330} + m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0.8, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -1569,8 +1605,8 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -1, y: -0.5} - m_SizeDelta: {x: 2, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &327739039 MonoBehaviour: @@ -1584,7 +1620,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.084} + m_Color: {r: 0, g: 0, b: 0, a: 0.039215688} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2258,7 +2294,7 @@ GameObject: - 222: {fileID: 405954793} - 114: {fileID: 405954792} m_Layer: 5 - m_Name: Background + m_Name: background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2278,11 +2314,11 @@ RectTransform: - {fileID: 42588291} m_Father: {fileID: 868574982} m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 10, y: -10} + 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} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &405954792 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2558,7 +2594,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 1826236683} - m_MethodName: setVisible + m_MethodName: fade m_Mode: 6 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -3187,7 +3223,7 @@ RectTransform: m_Father: {fileID: 1356520163} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -3338,7 +3374,7 @@ GameObject: - 114: {fileID: 569556880} - 114: {fileID: 569556879} m_Layer: 5 - m_Name: scrollbar + m_Name: bar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3446,6 +3482,41 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 569556877} +--- !u!1 &576472177 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 576472178} + m_Layer: 5 + m_Name: screens-full + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &576472178 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 576472177} + 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 228512394} + - {fileID: 2044204295} + m_Father: {fileID: 1414104007} + m_RootOrder: 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.5, y: 0.5} --- !u!1 &578311380 stripped GameObject: m_PrefabParentObject: {fileID: 125100, guid: da45329542b035e4da18f1132cc3d700, type: 2} @@ -3891,7 +3962,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -0.000015258789} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 34} m_Pivot: {x: 0.5, y: 1} --- !u!114 &663262206 MonoBehaviour: @@ -4173,7 +4244,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1.1} m_AnchorMax: {x: 0.97, y: 1.6} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -267.16714, y: 0} + m_SizeDelta: {x: -275.43857, y: 0} m_Pivot: {x: 1, y: 0} --- !u!114 &813876603 MonoBehaviour: @@ -4637,7 +4708,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1414104007} - m_RootOrder: 11 + m_RootOrder: 6 --- !u!114 &842733391 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4708,14 +4779,14 @@ RectTransform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 848083142} - 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: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1164416486} - m_Father: {fileID: 1414104007} - m_RootOrder: 12 + m_Father: {fileID: 1620867682} + m_RootOrder: 4 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -4776,18 +4847,18 @@ RectTransform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 861767964} - 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: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 813876602} - m_Father: {fileID: 1414104007} - m_RootOrder: 4 + m_Father: {fileID: 1620867682} + m_RootOrder: 3 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 92.28571} + m_SizeDelta: {x: 0, y: 95.14286} m_Pivot: {x: 1, y: 0} --- !u!114 &861767966 MonoBehaviour: @@ -4811,6 +4882,7 @@ GameObject: m_Component: - 224: {fileID: 868574982} - 114: {fileID: 868574983} + - 222: {fileID: 868574985} m_Layer: 5 m_Name: toggle m_TagString: Untagged @@ -4833,10 +4905,10 @@ RectTransform: - {fileID: 63450835} m_Father: {fileID: 1093252621} m_RootOrder: 0 - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {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: 160, y: 20} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &868574983 MonoBehaviour: @@ -4882,7 +4954,13 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_IsOn: 1 + m_IsOn: 0 +--- !u!222 &868574985 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 868574981} --- !u!1 &870029353 GameObject: m_ObjectHideFlags: 0 @@ -4913,8 +4991,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 457437674} m_RootOrder: 0 - m_AnchorMin: {x: 0.2, y: 0.2} - m_AnchorMax: {x: 0.8, y: 0.8} + m_AnchorMin: {x: 0.25, y: 0.25} + m_AnchorMax: {x: 0.75, y: 0.75} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -5153,80 +5231,6 @@ Prefab: - {fileID: 9500000, guid: 714c639770278b249bb7d0850bac50fc, type: 3} m_ParentPrefab: {fileID: 100100000, guid: 714c639770278b249bb7d0850bac50fc, type: 3} m_IsPrefabParent: 0 ---- !u!1 &878634659 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 878634660} - - 222: {fileID: 878634662} - - 114: {fileID: 878634661} - m_Layer: 5 - m_Name: text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &878634660 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 878634659} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: [] - m_Father: {fileID: 1093252621} - m_RootOrder: 1 - m_AnchorMin: {x: 0.03, y: 0.04} - m_AnchorMax: {x: 0.97, y: 0.96} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &878634661 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 878634659} - 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: 0.028, g: 0.626, b: 0.966, 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_FontData: - m_Font: {fileID: 12800000, guid: 1d71629ab414fbe4a9015401607e12a6, type: 3} - m_FontSize: 20 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "Para\xEDba" ---- !u!222 &878634662 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 878634659} --- !u!1 &907693709 GameObject: m_ObjectHideFlags: 0 @@ -5594,7 +5598,7 @@ RectTransform: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 951727301} - 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: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5603,8 +5607,8 @@ RectTransform: - {fileID: 363895484} - {fileID: 1265796708} - {fileID: 1976368185} - m_Father: {fileID: 1414104007} - m_RootOrder: 7 + m_Father: {fileID: 202190019} + m_RootOrder: 2 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -5667,7 +5671,7 @@ GameObject: - 222: {fileID: 954173495} - 114: {fileID: 954173494} m_Layer: 5 - m_Name: bar_bottom + m_Name: bar-bottom m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5687,7 +5691,7 @@ RectTransform: m_Children: - {fileID: 263667178} m_Father: {fileID: 1414104007} - m_RootOrder: 8 + m_RootOrder: 4 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -6114,7 +6118,7 @@ RectTransform: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1024302431} - 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: 1, y: 1, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6122,8 +6126,8 @@ RectTransform: - {fileID: 490251390} - {fileID: 2023188709} - {fileID: 1152273570} - m_Father: {fileID: 1414104007} - m_RootOrder: 3 + m_Father: {fileID: 1620867682} + m_RootOrder: 2 m_AnchorMin: {x: 0.18, y: 0.44} m_AnchorMax: {x: 0.82, y: 0.56} m_AnchoredPosition: {x: 0, y: 0} @@ -6173,7 +6177,6 @@ GameObject: m_Component: - 224: {fileID: 1031720609} - 222: {fileID: 1031720612} - - 114: {fileID: 1031720611} - 114: {fileID: 1031720610} m_Layer: 5 m_Name: regions @@ -6181,7 +6184,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1031720609 RectTransform: m_ObjectHideFlags: 0 @@ -6194,11 +6197,11 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 327739038} - - {fileID: 1895603214} - m_Father: {fileID: 1414104007} - m_RootOrder: 16 - m_AnchorMin: {x: 0.12, y: 0.12} - m_AnchorMax: {x: 0.88, y: 0.88} + - {fileID: 1153850832} + m_Father: {fileID: 1932070330} + m_RootOrder: 2 + m_AnchorMin: {x: 0.17, y: 0.12} + m_AnchorMax: {x: 0.83, y: 0.88} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -6208,44 +6211,17 @@ MonoBehaviour: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1031720608} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6b2f870a45d43494caa0650e4932ec5c, type: 3} + m_Script: {fileID: 11500000, guid: 78a5b982b15318c4eb21845febd5f2df, type: 3} m_Name: m_EditorClassIdentifier: visible: 0 - slideOnX: 1 - toLeft: 1 - slideOnY: 0 - toTop: 0 - speed: 40 + visibleAlpha: 1 + hiddenAlpha: 0 + showingSpeed: 0.1 + hiddingSpeed: 0.1 disableWhenHidden: 1 ---- !u!114 &1031720611 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1031720608} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, 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_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 --- !u!222 &1031720612 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6634,13 +6610,12 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 868574982} - - {fileID: 878634660} m_Father: {fileID: 663262205} m_RootOrder: 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 102.88999, y: -17} + m_SizeDelta: {x: 205.77998, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1093252622 MonoBehaviour: @@ -6654,7 +6629,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: button: {fileID: 1093252624} - title: {fileID: 878634661} + title: {fileID: 0} --- !u!114 &1093252623 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6668,7 +6643,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_IgnoreLayout: 0 m_MinWidth: -1 - m_MinHeight: 36 + m_MinHeight: 34 m_PreferredWidth: -1 m_PreferredHeight: -1 m_FlexibleWidth: -1 @@ -6741,10 +6716,9 @@ GameObject: - 224: {fileID: 1112380079} - 114: {fileID: 1112380083} - 222: {fileID: 1112380082} - - 114: {fileID: 1112380081} - 114: {fileID: 1112380080} m_Layer: 5 - m_Name: sv_items + m_Name: scroll-items m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -6768,8 +6742,8 @@ RectTransform: m_RootOrder: 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_AnchoredPosition: {x: 0, y: -10} + m_SizeDelta: {x: -10, y: -20} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1112380080 MonoBehaviour: @@ -6784,51 +6758,23 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 ---- !u!114 &1112380081 +--- !u!222 &1112380082 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22222300, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1112380078} +--- !u!114 &1112380083 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11451276, guid: 5ccb0ba277304a14b9bb8d4e34161675, + m_PrefabParentObject: {fileID: 11466044, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1112380078} 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: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &1112380082 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22222300, guid: 5ccb0ba277304a14b9bb8d4e34161675, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1112380078} ---- !u!114 &1112380083 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11466044, guid: 5ccb0ba277304a14b9bb8d4e34161675, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1112380078} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1367256648, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1367256648, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: m_Content: {fileID: 663262205} @@ -6995,8 +6941,10 @@ GameObject: serializedVersion: 4 m_Component: - 224: {fileID: 1153850832} + - 222: {fileID: 1153850834} + - 114: {fileID: 1153850833} m_Layer: 5 - m_Name: container_items + m_Name: selector m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7015,13 +6963,45 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1112380079} - m_Father: {fileID: 1895603214} - m_RootOrder: 0 + m_Father: {fileID: 1031720609} + m_RootOrder: 1 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_AnchoredPosition: {x: 0, y: 0.5} + m_SizeDelta: {x: -4, y: -3} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1153850833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1153850831} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, 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_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1153850834 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1153850831} --- !u!1 &1157915784 GameObject: m_ObjectHideFlags: 0 @@ -7682,7 +7662,29 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1221056138} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 265917591} + m_MethodName: setVisible + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1031720610} + m_MethodName: fade + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!114 &1221056138 @@ -7861,13 +7863,13 @@ RectTransform: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1265043069} - 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: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1952387009} - m_Father: {fileID: 1414104007} + m_Father: {fileID: 1620867682} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8847,6 +8849,7 @@ GameObject: - 223: {fileID: 1414104010} - 114: {fileID: 1414104009} - 114: {fileID: 1414104008} + - 114: {fileID: 1414104011} m_Layer: 5 m_Name: canvas m_TagString: Untagged @@ -8866,23 +8869,14 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 1265043070} - - {fileID: 1533000892} + - {fileID: 1613520792} + - {fileID: 1620867682} - {fileID: 2119336824} - - {fileID: 1024302432} - - {fileID: 861767965} - - {fileID: 263018772} - - {fileID: 1935189154} - - {fileID: 951727302} + - {fileID: 202190019} - {fileID: 954173493} - - {fileID: 228512394} - - {fileID: 2044204295} + - {fileID: 576472178} - {fileID: 842733390} - - {fileID: 848083143} - - {fileID: 1613520792} - - {fileID: 1826236680} - - {fileID: 265917590} - - {fileID: 1031720609} + - {fileID: 1932070330} m_Father: {fileID: 0} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} @@ -8949,6 +8943,21 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!114 &1414104011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1414104006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f82554c3806c65a4581001e16ff994db, type: 3} + m_Name: + m_EditorClassIdentifier: + gameObjects: + - {fileID: 1826236679} + - {fileID: 265917589} + - {fileID: 1031720608} --- !u!1 &1416567424 GameObject: m_ObjectHideFlags: 0 @@ -10023,13 +10032,13 @@ RectTransform: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1533000889} - 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: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1697118936} - m_Father: {fileID: 1414104007} + m_Father: {fileID: 1620867682} m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -10326,7 +10335,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1414104007} - m_RootOrder: 13 + m_RootOrder: 0 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 16, y: -16} @@ -10383,7 +10392,7 @@ MonoBehaviour: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 1826236683} - m_MethodName: setVisible + m_MethodName: fade m_Mode: 6 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -10454,6 +10463,44 @@ MonoBehaviour: ctrlBochecha_L: {fileID: 0} ctrlBochecha_R: {fileID: 0} BnMandibula: {fileID: 0} +--- !u!1 &1620867681 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1620867682} + m_Layer: 5 + m_Name: layers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1620867682 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1620867681} + 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1265043070} + - {fileID: 1533000892} + - {fileID: 1024302432} + - {fileID: 861767965} + - {fileID: 848083143} + m_Father: {fileID: 1414104007} + m_RootOrder: 1 + 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.5, y: 0.5} --- !u!1 &1623694772 GameObject: m_ObjectHideFlags: 0 @@ -11287,20 +11334,20 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1826236680 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1826236679} - 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: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] - m_Father: {fileID: 1414104007} - m_RootOrder: 14 + m_Father: {fileID: 1932070330} + m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -11350,9 +11397,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: visible: 0 - visibleAlpha: 0.18 + visibleAlpha: 1 hiddenAlpha: 0 - speed: 0.05 + showingSpeed: 0.05 + hiddingSpeed: 0.16 disableWhenHidden: 1 --- !u!114 &1826236684 MonoBehaviour: @@ -11405,7 +11453,18 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 1826236683} - m_MethodName: setVisible + m_MethodName: fade + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1031720610} + m_MethodName: fade m_Mode: 6 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -11561,7 +11620,40 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1839813418} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 2131993094} + m_MethodName: switchScreen + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 263018771} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 265917591} + m_MethodName: setVisible + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1826236683} + m_MethodName: set + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!114 &1839813418 @@ -11702,74 +11794,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1878890614} ---- !u!1 &1895603213 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1895603214} - - 222: {fileID: 1895603216} - - 114: {fileID: 1895603215} - m_Layer: 5 - m_Name: content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1895603214 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1895603213} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 1153850832} - m_Father: {fileID: 1031720609} - m_RootOrder: 1 - 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.5, y: 0.5} ---- !u!114 &1895603215 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1895603213} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -98529514, 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_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &1895603216 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1895603213} --- !u!1 &1920630438 GameObject: m_ObjectHideFlags: 0 @@ -12094,6 +12118,42 @@ Prefab: - {fileID: 11435512, guid: da45329542b035e4da18f1132cc3d700, type: 2} m_ParentPrefab: {fileID: 100100000, guid: da45329542b035e4da18f1132cc3d700, type: 2} m_IsPrefabParent: 0 +--- !u!1 &1932070329 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1932070330} + m_Layer: 5 + m_Name: settings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1932070330 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1932070329} + 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1826236680} + - {fileID: 265917590} + - {fileID: 1031720609} + m_Father: {fileID: 1414104007} + m_RootOrder: 7 + 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.5, y: 0.5} --- !u!1 &1935189153 GameObject: m_ObjectHideFlags: 0 @@ -12119,7 +12179,7 @@ RectTransform: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1935189153} - 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: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -12130,8 +12190,8 @@ RectTransform: - {fileID: 1999953885} - {fileID: 2002966284} - {fileID: 1175405161} - m_Father: {fileID: 1414104007} - m_RootOrder: 6 + m_Father: {fileID: 202190019} + m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -12887,7 +12947,7 @@ RectTransform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2044204294} - 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: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -12895,8 +12955,8 @@ RectTransform: - {fileID: 1412335970} - {fileID: 815279418} - {fileID: 1221700622} - m_Father: {fileID: 1414104007} - m_RootOrder: 10 + m_Father: {fileID: 576472178} + m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -13781,7 +13841,7 @@ GameObject: - 222: {fileID: 2119336826} - 114: {fileID: 2119336825} m_Layer: 5 - m_Name: bar_top + m_Name: bar-top m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scripts/Player Manager/Utils.cs b/Assets/Scripts/Player Manager/Utils.cs new file mode 100644 index 0000000..751da8b --- /dev/null +++ b/Assets/Scripts/Player Manager/Utils.cs @@ -0,0 +1,14 @@ +using UnityEngine; + +namespace Utils { + + public static class Definitions { + + public static Color SetAlpha(this Color color, float alpha) + { + return new Color(color.r, color.g, color.b, alpha); + } + + } + +} diff --git a/Assets/Scripts/Player Manager/Utils.cs.meta b/Assets/Scripts/Player Manager/Utils.cs.meta new file mode 100644 index 0000000..25c5fd5 --- /dev/null +++ b/Assets/Scripts/Player Manager/Utils.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: f266f4b1009c51f4fb7b314f642d068a +timeCreated: 1474777810 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/ActiveOnStart.cs b/Assets/Scripts/UI/ActiveOnStart.cs new file mode 100644 index 0000000..0691866 --- /dev/null +++ b/Assets/Scripts/UI/ActiveOnStart.cs @@ -0,0 +1,14 @@ +using UnityEngine; +using System.Collections; + +public class ActiveOnStart : MonoBehaviour { + + public GameObject[] gameObjects; + + void Start () + { + foreach (GameObject obj in gameObjects) + obj.SetActive(true); + } + +} diff --git a/Assets/Scripts/UI/ActiveOnStart.cs.meta b/Assets/Scripts/UI/ActiveOnStart.cs.meta new file mode 100644 index 0000000..b4e2ee6 --- /dev/null +++ b/Assets/Scripts/UI/ActiveOnStart.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: f82554c3806c65a4581001e16ff994db +timeCreated: 1474815735 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Fadder.cs b/Assets/Scripts/UI/Fadder.cs index e1e0aac..6de2158 100644 --- a/Assets/Scripts/UI/Fadder.cs +++ b/Assets/Scripts/UI/Fadder.cs @@ -6,43 +6,74 @@ public class Fadder : MonoBehaviour { public bool visible = true; public float visibleAlpha = 1f; public float hiddenAlpha = 0f; - public float speed = 0.01f; + public float showingSpeed = 0.01f; + public float hiddingSpeed = 0.01f; public bool disableWhenHidden = true; - private RawImage image; - private Color color; + private CanvasRenderer mainRenderer; + private CanvasRenderer[] renderers; + private bool visibilityChange = false; - public void setVisible(bool visible) + public void fade(bool visible) + { + if (this.visible != visible) + { + this.gameObject.transform.localScale = new Vector3(1, 1, 1); + this.visible = visible; + + visibilityChange = true; + } + } + + public void set(bool visible) { - this.gameObject.SetActive(true); this.visible = visible; + + float alpha = visible ? visibleAlpha : hiddenAlpha; + + foreach (CanvasRenderer renderer in renderers) + renderer.SetAlpha(alpha); + + updateScale(); + } + + private void updateScale() + { + if (disableWhenHidden && this.mainRenderer.GetAlpha() == hiddenAlpha) + this.gameObject.transform.localScale = new Vector3(0, 0, 0); } void Start () { - image = this.gameObject.GetComponent(); + mainRenderer = this.gameObject.GetComponent(); + renderers = this.gameObject.GetComponentsInChildren(); - color = image.color; - color.a = visible ? visibleAlpha : hiddenAlpha; - - image.color = color; - this.gameObject.SetActive(!disableWhenHidden || color.a != hiddenAlpha); - } + hiddingSpeed = -hiddingSpeed; + + set(visible); + } void Update () { - float alpha = visible ? visibleAlpha : hiddenAlpha; - - if (color.a != alpha) + if (visibilityChange) { - if (Mathf.Abs(color.a - alpha) < speed) - color.a = alpha; - else - color.a += color.a < alpha ? speed : -speed; - } + float objective = visible ? visibleAlpha : hiddenAlpha; + visibilityChange = false; + + foreach (CanvasRenderer renderer in renderers) + { + float alpha = renderer.GetAlpha(); - image.color = color; - this.gameObject.SetActive(!disableWhenHidden || color.a != hiddenAlpha); + if (alpha != objective) + { + float speed = visible ? showingSpeed : hiddingSpeed; + renderer.SetAlpha(Mathf.Abs(alpha - objective) < Mathf.Abs(speed) ? objective : alpha + speed); + visibilityChange = true; + } + } + + if (visibilityChange) updateScale(); + } } } -- libgit2 0.21.2