From 75d71fb778afacabafa29d08157607218fcfbb46 Mon Sep 17 00:00:00 2001 From: RominaMarchetti <51088292+RominaMarchetti@users.noreply.github.com> Date: Mon, 30 Oct 2023 11:02:24 -0300 Subject: [PATCH 01/15] fix: POI info button (#5871) --- .../DCL/Controllers/HUD/NavMap/Prefabs/NavmapFilters.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/NavMap/Prefabs/NavmapFilters.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/NavMap/Prefabs/NavmapFilters.prefab index 76a6ace00b..30553a3125 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/NavMap/Prefabs/NavmapFilters.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/NavMap/Prefabs/NavmapFilters.prefab @@ -313,7 +313,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5877066469086181843 RectTransform: m_ObjectHideFlags: 0 From bc1f5a00b7f031a96af309a80cc8d23d4ffa483b Mon Sep 17 00:00:00 2001 From: Patricio Guerra Date: Mon, 30 Oct 2023 11:52:31 -0300 Subject: [PATCH 02/15] fix: scene emotes not working (#5872) Fixed scene emotes not working --- .../Assets/DCLServices/EmotesService/EmotesService.cs | 2 +- .../MainScripts/DCL/Models/AvatarAssets/SceneEmoteHelper.cs | 2 +- .../Debugging/DebugParameters/DebugConfigComponent.cs | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/unity-renderer/Assets/DCLServices/EmotesService/EmotesService.cs b/unity-renderer/Assets/DCLServices/EmotesService/EmotesService.cs index cd81120e26..28731598fc 100644 --- a/unity-renderer/Assets/DCLServices/EmotesService/EmotesService.cs +++ b/unity-renderer/Assets/DCLServices/EmotesService/EmotesService.cs @@ -136,7 +136,7 @@ private UniTask FetchEmote(EmoteBodyId emoteBodyId, CancellationTo if (!emoteId.StartsWith("urn")) return emotesCatalogService.RequestEmoteFromBuilderAsync(emoteId, ct); - WearableItem emoteItem = SceneEmoteHelper.TryGetDataFromEmoteId(emoteId, out string emoteHash, out bool loop) ? new EmoteItem(emoteId, emoteBodyId.BodyShapeId, emoteHash, catalyst.contentUrl, loop) : null; + WearableItem emoteItem = SceneEmoteHelper.TryGetDataFromEmoteId(emoteId, out string emoteHash, out bool loop) ? new EmoteItem(emoteBodyId.BodyShapeId, emoteId, emoteHash, catalyst.contentUrl, loop) : null; return new UniTask(emoteItem); } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/SceneEmoteHelper.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/SceneEmoteHelper.cs index 1eaa5b8e3e..de745f307b 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/SceneEmoteHelper.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/SceneEmoteHelper.cs @@ -46,6 +46,6 @@ public static bool TryGetDataFromEmoteId(string emoteId, out string emoteHash, o } public static bool IsSceneEmote(string emoteId) => - emoteId.StartsWith(SCENE_EMOTE_PREFIX); + emoteId.Contains(SCENE_EMOTE_PREFIX, StringComparison.OrdinalIgnoreCase); } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/WorldRuntime/Debugging/DebugParameters/DebugConfigComponent.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/WorldRuntime/Debugging/DebugParameters/DebugConfigComponent.cs index 6dd0b2299f..d4be63c5d0 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/WorldRuntime/Debugging/DebugParameters/DebugConfigComponent.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/WorldRuntime/Debugging/DebugParameters/DebugConfigComponent.cs @@ -39,6 +39,7 @@ public enum BaseUrl ZONE, ORG, LOCAL_HOST, + SDK_TEST_SCENES, CUSTOM, } @@ -188,6 +189,7 @@ private void OpenWebBrowser() return; } } + else if (baseUrlMode.Equals(BaseUrl.SDK_TEST_SCENES)) { baseUrl = "http://sdk-test-scenes.decentraland.zone/?"; } else { baseUrl = "http://play.decentraland.zone/?"; From a1af2ec7b6d1c1a4a112a4181c04b12cf2357f81 Mon Sep 17 00:00:00 2001 From: RominaMarchetti <51088292+RominaMarchetti@users.noreply.github.com> Date: Mon, 30 Oct 2023 15:49:27 -0300 Subject: [PATCH 03/15] style: fix avatar mask on "photo taken by" (#5874) --- .../Prefabs/InfoSidePanel.prefab | 74 ++++++++++--------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/unity-renderer/Assets/DCLFeatures/CameraReel/ScreenshotViewer/Prefabs/InfoSidePanel.prefab b/unity-renderer/Assets/DCLFeatures/CameraReel/ScreenshotViewer/Prefabs/InfoSidePanel.prefab index 877cab1a7f..dbff4aa121 100644 --- a/unity-renderer/Assets/DCLFeatures/CameraReel/ScreenshotViewer/Prefabs/InfoSidePanel.prefab +++ b/unity-renderer/Assets/DCLFeatures/CameraReel/ScreenshotViewer/Prefabs/InfoSidePanel.prefab @@ -36,7 +36,6 @@ RectTransform: - {fileID: 8903632593526411871} - {fileID: 8327835561176109783} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -133,7 +132,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8004029881843311455} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -269,7 +267,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4108771228429417372} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -345,7 +342,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8327835561176109783} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -483,7 +479,6 @@ RectTransform: - {fileID: 5078628746777948773} - {fileID: 2185562770188861522} m_Father: {fileID: 5228534757935820605} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -530,11 +525,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6651684803134284858} - 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_AnchoredPosition: {x: 28, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &6673915266572683257 @@ -680,7 +674,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6718579527528359591} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -758,7 +751,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 43607444463904916} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -898,7 +890,6 @@ RectTransform: - {fileID: 4300166027533833039} - {fileID: 5812527819279053230} m_Father: {fileID: 6718579527528359591} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -950,7 +941,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -1004,7 +997,6 @@ RectTransform: - {fileID: 7309848424164065513} - {fileID: 2878437399800650433} m_Father: {fileID: 8004029881843311455} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1044,7 +1036,6 @@ RectTransform: m_Children: - {fileID: 8168646111919926491} m_Father: {fileID: 295417195109176294} - 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} @@ -1079,8 +1070,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 63cedfaa776dc4d69a9f4848cd966364, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: e36f3569fbdef4c609c33f7a1cebace5, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1134,7 +1125,6 @@ RectTransform: m_Children: - {fileID: 8685893528945806555} m_Father: {fileID: 4108771228429417372} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1213,7 +1203,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6651684803134284858} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1311,7 +1300,6 @@ RectTransform: m_Children: - {fileID: 1828966752758323896} m_Father: {fileID: 5228534757935820605} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1399,7 +1387,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 8387667570911444318} m_HandleRect: {fileID: 3577049640919480687} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -1436,7 +1424,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 43607444463904916} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1572,7 +1559,6 @@ RectTransform: - {fileID: 5183033023747828721} - {fileID: 492640903368304420} m_Father: {fileID: 43607444463904916} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1612,7 +1598,6 @@ RectTransform: - {fileID: 2572893631207750675} - {fileID: 6651684803134284858} m_Father: {fileID: 6718579527528359591} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1650,7 +1635,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 295417195109176294} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1725,7 +1709,6 @@ RectTransform: m_Children: - {fileID: 3577049640919480687} m_Father: {fileID: 42922667192140630} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1763,7 +1746,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1828966752758323896} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1839,7 +1821,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 43607444463904916} - 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} @@ -1975,7 +1956,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8004029881843311455} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2113,11 +2093,10 @@ RectTransform: m_Children: - {fileID: 5228534757935820605} m_Father: {fileID: 8327835561176109783} - 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: -24.9235} + m_AnchoredPosition: {x: 0, y: -24.923523} m_SizeDelta: {x: 0, y: -49.847} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1531780950115587345 @@ -2205,7 +2184,6 @@ RectTransform: - {fileID: 4108771228429417372} - {fileID: 42922667192140630} m_Father: {fileID: 5812527819279053230} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2267,6 +2245,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2185562770188861522} m_Modifications: - target: {fileID: 88618477953342369, guid: 265a497ea4c730246958e732ee9b8f7d, @@ -2392,27 +2371,27 @@ PrefabInstance: - target: {fileID: 5236748412449174260, guid: 265a497ea4c730246958e732ee9b8f7d, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5236748412449174260, guid: 265a497ea4c730246958e732ee9b8f7d, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5236748412449174260, guid: 265a497ea4c730246958e732ee9b8f7d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 347.2459 objectReference: {fileID: 0} - target: {fileID: 5236748412449174260, guid: 265a497ea4c730246958e732ee9b8f7d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 347.2459 objectReference: {fileID: 0} - target: {fileID: 5236748412449174260, guid: 265a497ea4c730246958e732ee9b8f7d, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -23 objectReference: {fileID: 0} - target: {fileID: 6576503548707075487, guid: 265a497ea4c730246958e732ee9b8f7d, type: 3} @@ -2452,7 +2431,7 @@ PrefabInstance: - target: {fileID: 6576503548707075487, guid: 265a497ea4c730246958e732ee9b8f7d, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 423 objectReference: {fileID: 0} - target: {fileID: 6576503548707075487, guid: 265a497ea4c730246958e732ee9b8f7d, type: 3} @@ -2497,7 +2476,7 @@ PrefabInstance: - target: {fileID: 6576503548707075487, guid: 265a497ea4c730246958e732ee9b8f7d, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 211.5 objectReference: {fileID: 0} - target: {fileID: 6576503548707075487, guid: 265a497ea4c730246958e732ee9b8f7d, type: 3} @@ -2550,6 +2529,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 265a497ea4c730246958e732ee9b8f7d, type: 3} --- !u!114 &1910084322250798679 stripped MonoBehaviour: @@ -2574,6 +2556,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5183033023747828721} m_Modifications: - target: {fileID: 6302203761313059702, guid: 4849d2ed3b5a18948bf3cd46256869a4, @@ -2687,6 +2670,9 @@ PrefabInstance: value: Texture objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4849d2ed3b5a18948bf3cd46256869a4, type: 3} --- !u!114 &7109975732615303842 stripped MonoBehaviour: @@ -2711,6 +2697,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6718579527528359591} m_Modifications: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, @@ -3133,6 +3120,9 @@ PrefabInstance: - {fileID: 1442316120381234285, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} - {fileID: 7263379833390393243, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} - {fileID: 8412491424384214035, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} --- !u!114 &2719334482313503704 stripped MonoBehaviour: @@ -3157,6 +3147,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8004029881843311455} m_Modifications: - target: {fileID: 1666294373695335966, guid: a9655de17706cf24888b3691e237c46d, @@ -3417,6 +3408,17 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 7220245117478121805, guid: a9655de17706cf24888b3691e237c46d, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3256114392390223212, guid: a9655de17706cf24888b3691e237c46d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6238928004456479188} + - targetCorrespondingSourceObject: {fileID: 3256114392390223212, guid: a9655de17706cf24888b3691e237c46d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8088936266880851099} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a9655de17706cf24888b3691e237c46d, type: 3} --- !u!114 &1902134871595957501 stripped MonoBehaviour: From d470bef519a0e8a28736cd3c40cacebc95fcb6cc Mon Sep 17 00:00:00 2001 From: RominaMarchetti <51088292+RominaMarchetti@users.noreply.github.com> Date: Mon, 30 Oct 2023 16:25:41 -0300 Subject: [PATCH 04/15] style: fix realm selector container (#5875) --- .../Realms/RealmSelector_Modal.prefab | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ExploreV2/Resources/MainMenu/Realms/RealmSelector_Modal.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ExploreV2/Resources/MainMenu/Realms/RealmSelector_Modal.prefab index b67cf7edc0..16021efad6 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ExploreV2/Resources/MainMenu/Realms/RealmSelector_Modal.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ExploreV2/Resources/MainMenu/Realms/RealmSelector_Modal.prefab @@ -70,7 +70,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6067442b4b5ee49e68ff2720d1aedddd, type: 3} + m_Sprite: {fileID: 21300000, guid: 54cbe9bf5928342d490167f954f07710, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -534,7 +534,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.9019608} + m_Color: {r: 0, g: 0, b: 0, a: 0.8627451} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -875,7 +875,7 @@ RectTransform: 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_SizeDelta: {x: 801, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &5356990328712885393 MonoBehaviour: @@ -1020,7 +1020,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8ba9b271a894b4f8695979cdfe864b48, type: 3} + m_Sprite: {fileID: 21300000, guid: 5c569e851fe024c7e8e4b57c07575226, type: 3} m_Type: 1 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1157,8 +1157,8 @@ RectTransform: 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_AnchoredPosition: {x: 400.5, y: 0} + m_SizeDelta: {x: 801, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5103069144962680523 CanvasRenderer: @@ -1308,7 +1308,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.7979099, b: 0.2235294, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1927,7 +1927,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 5403075742153451268} m_HandleRect: {fileID: 1238740497843610272} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -2814,32 +2814,32 @@ PrefabInstance: - target: {fileID: 5170059318450306070, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5170059318450306070, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5170059318450306070, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 16 objectReference: {fileID: 0} - target: {fileID: 5170059318450306070, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 27 objectReference: {fileID: 0} - target: {fileID: 5170059318450306070, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 13 objectReference: {fileID: 0} - target: {fileID: 5170059318450306070, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -13.5 objectReference: {fileID: 0} - target: {fileID: 5466927874646222343, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} @@ -2865,32 +2865,32 @@ PrefabInstance: - target: {fileID: 8616488889774720505, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8616488889774720505, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8616488889774720505, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 61.62 objectReference: {fileID: 0} - target: {fileID: 8616488889774720505, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 27 objectReference: {fileID: 0} - target: {fileID: 8616488889774720505, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 56.809998 objectReference: {fileID: 0} - target: {fileID: 8616488889774720505, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -13.5 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -3309,7 +3309,7 @@ PrefabInstance: - target: {fileID: 2026062374757361563, guid: a0b08d9ca8421644db83c1bd3f2e2e48, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 801 objectReference: {fileID: 0} - target: {fileID: 2026062374757361563, guid: a0b08d9ca8421644db83c1bd3f2e2e48, type: 3} @@ -3354,7 +3354,7 @@ PrefabInstance: - target: {fileID: 2026062374757361563, guid: a0b08d9ca8421644db83c1bd3f2e2e48, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 400.5 objectReference: {fileID: 0} - target: {fileID: 2026062374757361563, guid: a0b08d9ca8421644db83c1bd3f2e2e48, type: 3} @@ -3733,32 +3733,32 @@ PrefabInstance: - target: {fileID: 5170059318450306070, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5170059318450306070, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5170059318450306070, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 5170059318450306070, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 27 objectReference: {fileID: 0} - target: {fileID: 5170059318450306070, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 12.5 objectReference: {fileID: 0} - target: {fileID: 5170059318450306070, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -13.5 objectReference: {fileID: 0} - target: {fileID: 5466927874646222343, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} @@ -3784,32 +3784,32 @@ PrefabInstance: - target: {fileID: 8616488889774720505, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8616488889774720505, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8616488889774720505, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 68.27 objectReference: {fileID: 0} - target: {fileID: 8616488889774720505, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 27 objectReference: {fileID: 0} - target: {fileID: 8616488889774720505, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 59.135 objectReference: {fileID: 0} - target: {fileID: 8616488889774720505, guid: ab19e19dd7d19cc4c9bb1876293bcd22, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -13.5 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] From 5e08016ee62609704ee67831f6b66e2e2f02aa53 Mon Sep 17 00:00:00 2001 From: Aga Date: Tue, 31 Oct 2023 11:25:04 +0000 Subject: [PATCH 05/15] chore: update auto_assign_config.yml (#5879) Update auto_assign_config.yml Signed-off-by: Aga --- .github/auto_assign_config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/auto_assign_config.yml b/.github/auto_assign_config.yml index 6a3a63f497..915330c25d 100644 --- a/.github/auto_assign_config.yml +++ b/.github/auto_assign_config.yml @@ -9,14 +9,13 @@ reviewGroups: - sandrade-dcl - lorux0 - davidejensen - - dalkia - popuz - Kinerius - mikhail-dcl - pravusjif qa: - - kwssbocian - - kwsskulinski + - Ludmilafantaniella + - LucasLioyQA - anicalbano filterLabels: From b9aefb9c26982ad41c4b2c57c06ef4393a56c306 Mon Sep 17 00:00:00 2001 From: RominaMarchetti <51088292+RominaMarchetti@users.noreply.github.com> Date: Tue, 31 Oct 2023 10:12:50 -0300 Subject: [PATCH 06/15] style: fix textures for avatar modifier/teleport prompt and colapse chat members bar (#5878) --- .../_AvatarModifierAreaFeedbackHUD.prefab | 2 +- .../Prefabs/ChannelMembersHUD.prefab | 70 ++- .../Prefabs/NearbyMembersHUD.prefab | 2 +- .../TeleportPromptHUD/Animations/Idle.anim | 146 +++-- .../Resources/TeleportPromptHUD.prefab | 565 +++++++++++++----- 5 files changed, 551 insertions(+), 234 deletions(-) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarModifierAreaHUD/Resources/_AvatarModifierAreaFeedbackHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarModifierAreaHUD/Resources/_AvatarModifierAreaFeedbackHUD.prefab index fb701482a4..3ab1e8d4ed 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarModifierAreaHUD/Resources/_AvatarModifierAreaFeedbackHUD.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarModifierAreaHUD/Resources/_AvatarModifierAreaFeedbackHUD.prefab @@ -68,7 +68,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 30d1d8e90eaef49418c0797533d97acf, type: 3} + m_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChannelMembersHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChannelMembersHUD.prefab index 48ca0ee238..fbfe7dedd3 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChannelMembersHUD.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/ChannelMembersHUD.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5239503401355176004} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -168,7 +167,6 @@ RectTransform: m_Children: - {fileID: 1451780076122516969} m_Father: {fileID: 6385060616518280574} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -247,7 +245,6 @@ RectTransform: m_Children: - {fileID: 1968423421655585717} m_Father: {fileID: 4547125968938856368} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -392,7 +389,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 207844789075968199} - 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} @@ -528,7 +524,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3044897357420295492} - 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} @@ -665,7 +660,6 @@ RectTransform: - {fileID: 2459096548153257659} - {fileID: 2575983426737279768} m_Father: {fileID: 4382546108109034416} - 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} @@ -729,7 +723,6 @@ RectTransform: - {fileID: 5613567272720105287} - {fileID: 4990062118737493138} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -818,7 +811,6 @@ RectTransform: - {fileID: 2828657937425296497} - {fileID: 68614839704429010} m_Father: {fileID: 3866157782987366350} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -936,7 +928,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3866157782987366350} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1012,7 +1003,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6296847833854330826} - 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} @@ -1148,7 +1138,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 207844789075968199} - 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} @@ -1283,7 +1272,6 @@ RectTransform: m_Children: - {fileID: 7437318031689893040} m_Father: {fileID: 68614839704429010} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1324,7 +1312,6 @@ RectTransform: - {fileID: 4382546108109034416} - {fileID: 6296847833854330826} m_Father: {fileID: 2828657937425296497} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1403,7 +1390,6 @@ RectTransform: m_Children: - {fileID: 6896061596910773713} m_Father: {fileID: 3866157782987366350} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1479,7 +1465,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1968423421655585717} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1557,11 +1542,10 @@ RectTransform: m_Children: - {fileID: 207844789075968199} m_Father: {fileID: 6385060616518280574} - 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: 140, y: -10} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 140, y: 0} m_SizeDelta: {x: 280, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &3064829855575657985 @@ -1657,7 +1641,6 @@ RectTransform: - {fileID: 1486616107479674160} - {fileID: 8524380590184803825} m_Father: {fileID: 6385060616518280574} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1698,7 +1681,6 @@ RectTransform: - {fileID: 6385060616518280574} - {fileID: 3044897357420295492} m_Father: {fileID: 4547125968938856368} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1761,6 +1743,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6296847833854330826} m_Modifications: - target: {fileID: 5510830612936421616, guid: 252c1fea75fc0614587349a368eb8684, @@ -1899,6 +1882,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 252c1fea75fc0614587349a368eb8684, type: 3} --- !u!1 &5050351621148873383 stripped GameObject: @@ -1917,6 +1903,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3313323158016119388} m_Modifications: - target: {fileID: 836569618237506586, guid: db08434be6dadc943b7e258f41869504, @@ -2207,6 +2194,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: db08434be6dadc943b7e258f41869504, type: 3} --- !u!224 &6896061596910773713 stripped RectTransform: @@ -2231,6 +2221,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3866157782987366350} m_Modifications: - target: {fileID: 33180226908608850, guid: 15120eceeeb9c45ee9d520a23f50872d, @@ -3079,6 +3070,9 @@ PrefabInstance: value: -26 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15120eceeeb9c45ee9d520a23f50872d, type: 3} --- !u!224 &4990062118737493138 stripped RectTransform: @@ -3103,6 +3097,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3866157782987366350} m_Modifications: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, @@ -3143,12 +3138,12 @@ PrefabInstance: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_SizeDelta.x - value: 36 + value: 17 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_SizeDelta.y - value: 17 + value: 36 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -3168,7 +3163,7 @@ PrefabInstance: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 1 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -3183,7 +3178,7 @@ PrefabInstance: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_LocalRotation.z - value: 0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -3208,7 +3203,7 @@ PrefabInstance: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 90 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1442316120381234285, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -3235,7 +3230,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 01894c9b0e4cc4d15a7f0fe26505e2c9, + objectReference: {fileID: 21300000, guid: eaad235cc6bf34bdf899e5095b412398, type: 3} - target: {fileID: 3725923502685340037, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -3260,7 +3255,7 @@ PrefabInstance: - target: {fileID: 3725923502685340037, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_PixelsPerUnitMultiplier - value: 2.7 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4469143239268576428, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -3270,7 +3265,7 @@ PrefabInstance: - target: {fileID: 4469143239268576428, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_fontSize - value: 15 + value: 14 objectReference: {fileID: 0} - target: {fileID: 5170059318450306070, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -3310,7 +3305,7 @@ PrefabInstance: - target: {fileID: 5170059318450306070, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5170059318450306070, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -3325,7 +3320,7 @@ PrefabInstance: - target: {fileID: 5170059318450306070, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_LocalRotation.z - value: 0.7071068 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5170059318450306070, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -3340,7 +3335,7 @@ PrefabInstance: - target: {fileID: 5170059318450306070, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 90 + value: 180 objectReference: {fileID: 0} - target: {fileID: 5466927874646222343, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -3424,6 +3419,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} --- !u!224 &5613567272720105287 stripped RectTransform: @@ -3436,6 +3434,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2828657937425296497} m_Modifications: - target: {fileID: 5510830612936421616, guid: 252c1fea75fc0614587349a368eb8684, @@ -3574,6 +3573,13 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2005211661982528219} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 252c1fea75fc0614587349a368eb8684, type: 3} --- !u!1 &1881234650997279250 stripped GameObject: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/NearbyMembersHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/NearbyMembersHUD.prefab index f3e26dfa6a..bdf9f5687a 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/NearbyMembersHUD.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SocialBarPrefabs/SocialBarV1/Prefabs/NearbyMembersHUD.prefab @@ -1450,7 +1450,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 590e1b5ec5d7e45379b7d1f4f3f4e1af, + objectReference: {fileID: 21300000, guid: eaad235cc6bf34bdf899e5095b412398, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TeleportPromptHUD/Animations/Idle.anim b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TeleportPromptHUD/Animations/Idle.anim index f36134a5f8..072324946e 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TeleportPromptHUD/Animations/Idle.anim +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TeleportPromptHUD/Animations/Idle.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Idle - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -45,7 +46,9 @@ AnimationClip: path: Content/Popup/Header/LoadingBrightMask classID: 225 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -73,7 +76,9 @@ AnimationClip: path: Content/Popup/Container_Coordinates/InfoLoading classID: 225 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -101,7 +106,9 @@ AnimationClip: path: Content/Popup/Container_Coordinates/Container_Scene classID: 225 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -129,7 +136,9 @@ AnimationClip: path: Content/Popup/Container_Coordinates/Container_Scene classID: 1 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -157,7 +166,9 @@ AnimationClip: path: Content/Popup/Button_Cancel classID: 1 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -185,7 +196,9 @@ AnimationClip: path: Content/Popup/Button_Cancel classID: 225 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -213,7 +226,9 @@ AnimationClip: path: Content/Popup/Button_Continue classID: 225 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -241,7 +256,9 @@ AnimationClip: path: Content/Popup/Button_Continue classID: 1 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -266,10 +283,12 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.r - path: Content/Popup/Container_Coordinates/Container_Scene/Text_Creator + path: Content/Popup/Container_Coordinates/Container_Scene/Container_Creator/Text_Creator classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - - curve: + flags: 0 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -294,10 +313,12 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.g - path: Content/Popup/Container_Coordinates/Container_Scene/Text_Creator + path: Content/Popup/Container_Coordinates/Container_Scene/Container_Creator/Text_Creator classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - - curve: + flags: 0 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -322,10 +343,12 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.b - path: Content/Popup/Container_Coordinates/Container_Scene/Text_Creator + path: Content/Popup/Container_Coordinates/Container_Scene/Container_Creator/Text_Creator classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - - curve: + flags: 0 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -350,9 +373,10 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.a - path: Content/Popup/Container_Coordinates/Container_Scene/Text_Creator + path: Content/Popup/Container_Coordinates/Container_Scene/Container_Creator/Text_Creator classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + flags: 0 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -368,6 +392,8 @@ AnimationClip: typeID: 225 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 3262373928 attribute: 1574349066 @@ -375,6 +401,8 @@ AnimationClip: typeID: 225 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1302592065 attribute: 1574349066 @@ -382,6 +410,8 @@ AnimationClip: typeID: 225 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1302592065 attribute: 2086281974 @@ -389,6 +419,8 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 3066988797 attribute: 2086281974 @@ -396,6 +428,8 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 3066988797 attribute: 1574349066 @@ -403,6 +437,8 @@ AnimationClip: typeID: 225 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2811589550 attribute: 1574349066 @@ -410,6 +446,8 @@ AnimationClip: typeID: 225 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2811589550 attribute: 2086281974 @@ -417,34 +455,44 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 - path: 1660823319 + path: 178842397 attribute: 2110649717 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} typeID: 114 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 - path: 1660823319 + path: 178842397 attribute: 269488542 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} typeID: 114 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 - path: 1660823319 + path: 178842397 attribute: 1618666769 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} typeID: 114 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 - path: 1660823319 + path: 178842397 attribute: 4185109675 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} typeID: 114 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -467,7 +515,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -495,7 +544,9 @@ AnimationClip: path: Content/Popup/Header/LoadingBrightMask classID: 225 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -523,7 +574,9 @@ AnimationClip: path: Content/Popup/Container_Coordinates/InfoLoading classID: 225 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -551,7 +604,9 @@ AnimationClip: path: Content/Popup/Container_Coordinates/Container_Scene classID: 225 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -579,7 +634,9 @@ AnimationClip: path: Content/Popup/Container_Coordinates/Container_Scene classID: 1 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -607,7 +664,9 @@ AnimationClip: path: Content/Popup/Button_Cancel classID: 1 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -635,7 +694,9 @@ AnimationClip: path: Content/Popup/Button_Cancel classID: 225 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -663,7 +724,9 @@ AnimationClip: path: Content/Popup/Button_Continue classID: 225 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -691,7 +754,9 @@ AnimationClip: path: Content/Popup/Button_Continue classID: 1 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -716,10 +781,12 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.r - path: Content/Popup/Container_Coordinates/Container_Scene/Text_Creator + path: Content/Popup/Container_Coordinates/Container_Scene/Container_Creator/Text_Creator classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - - curve: + flags: 0 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -744,10 +811,12 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.g - path: Content/Popup/Container_Coordinates/Container_Scene/Text_Creator + path: Content/Popup/Container_Coordinates/Container_Scene/Container_Creator/Text_Creator classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - - curve: + flags: 0 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -772,10 +841,12 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.b - path: Content/Popup/Container_Coordinates/Container_Scene/Text_Creator + path: Content/Popup/Container_Coordinates/Container_Scene/Container_Creator/Text_Creator classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - - curve: + flags: 0 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -800,9 +871,10 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_fontColor.a - path: Content/Popup/Container_Coordinates/Container_Scene/Text_Creator + path: Content/Popup/Container_Coordinates/Container_Scene/Container_Creator/Text_Creator classID: 114 script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TeleportPromptHUD/Resources/TeleportPromptHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TeleportPromptHUD/Resources/TeleportPromptHUD.prefab index 5d643d505d..7ad3b03912 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TeleportPromptHUD/Resources/TeleportPromptHUD.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TeleportPromptHUD/Resources/TeleportPromptHUD.prefab @@ -35,12 +35,11 @@ RectTransform: m_Children: - {fileID: 2391374172649869519} m_Father: {fileID: 739492711435516089} - m_RootOrder: 4 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: -101, y: -213} - m_SizeDelta: {x: 186, y: 46} + m_AnchoredPosition: {x: -97, y: -213} + m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7032285744522065620 CanvasRenderer: @@ -63,7 +62,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.1254902, g: 0.1254902, b: 0.1764706, a: 1} + m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 0 @@ -184,7 +183,6 @@ RectTransform: - {fileID: 7853987414554381042} - {fileID: 5840738243200001848} m_Father: {fileID: 956218146493471001} - 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} @@ -230,12 +228,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7892421877335740936} - 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.5, y: -0.8999529} - m_SizeDelta: {x: 28.5804, y: 16} + 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!222 &1844376085239453237 CanvasRenderer: @@ -267,9 +264,8 @@ MonoBehaviour: m_Calls: [] m_text: Live m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 6b705423dc77d4fceb4122f6d7e571d6, type: 2} - m_sharedMaterial: {fileID: -1532326820724739884, guid: 6b705423dc77d4fceb4122f6d7e571d6, - type: 2} + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -293,14 +289,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12 - m_fontSizeBase: 12 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 m_fontSizeMax: 17 m_fontStyle: 16 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -367,7 +363,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7689921164329490298} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -411,8 +406,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294769916 + m_fontColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -429,8 +424,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15.66 - m_fontSizeBase: 15.66 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -503,12 +498,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4923690153599861533} - 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: -108.81, y: -1.264513} - m_SizeDelta: {x: 161.997, y: 26} + m_AnchoredPosition: {x: -106.85149, y: -1.264513} + m_SizeDelta: {x: 149.6913, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2694739790686123459 CanvasRenderer: @@ -538,7 +532,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 379157433051e4d4283a64dae91d86f2, type: 3} + m_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -547,7 +541,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 2.4 --- !u!1 &832139579139912443 GameObject: m_ObjectHideFlags: 0 @@ -558,6 +552,8 @@ GameObject: m_Component: - component: {fileID: 4144811504476302523} - component: {fileID: 3284238525564996184} + - component: {fileID: 4153014868079679231} + - component: {fileID: 3401874635211256471} m_Layer: 5 m_Name: Container_Scene m_TagString: Untagged @@ -579,16 +575,15 @@ RectTransform: m_Children: - {fileID: 5473492688898665014} - {fileID: 2192676819683722101} - - {fileID: 925199901403164925} - - {fileID: 5359253606877620343} + - {fileID: 5822220395698202263} + - {fileID: 2345805614421020873} m_Father: {fileID: 4633052412617948251} - 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: 0.6, y: -104} - m_SizeDelta: {x: 386, y: 137.4} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 174.27939, y: -23.075005} + m_SizeDelta: {x: 356, y: 87.85} + m_Pivot: {x: 1, y: 1} --- !u!225 &3284238525564996184 CanvasGroup: m_ObjectHideFlags: 0 @@ -601,6 +596,46 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!114 &4153014868079679231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 832139579139912443} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 14 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &3401874635211256471 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 832139579139912443} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &843925162800624028 GameObject: m_ObjectHideFlags: 0 @@ -626,18 +661,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 843925162800624028} - 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4144811504476302523} - m_RootOrder: 2 + m_Father: {fileID: 2345805614421020873} 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: -188.8, y: 19.4} - m_SizeDelta: {x: 15, y: 18} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 7.600006, y: -34.60002} + m_SizeDelta: {x: 22, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &332597871529549308 CanvasRenderer: @@ -660,14 +694,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.44313726, g: 0.41960785, b: 0.4862745, 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_Sprite: {fileID: 21300000, guid: 2656696aa53c7404f8c5fb49468ee219, type: 3} + m_Sprite: {fileID: 21300000, guid: 0492c753b33b04474ac2b7e7d18a2c70, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -708,11 +742,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3113663853504699793} - 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: 34.650013, y: -0.8} + m_AnchoredPosition: {x: 36, y: -0.8} m_SizeDelta: {x: 22, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5937625758399348428 @@ -784,12 +817,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 956218146493471001} - 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: -67.099976, y: -13} - m_SizeDelta: {x: 249.36, y: 20.9823} + m_AnchoredPosition: {x: -35.85086, y: -15} + m_SizeDelta: {x: 311.8583, y: 29.999} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5038304793843093447 CanvasRenderer: @@ -822,8 +854,7 @@ MonoBehaviour: m_text: Event name m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} - m_sharedMaterial: {fileID: 1196159134475820439, guid: a02669827dd9144f39b4b164e753a21a, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -847,8 +878,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 + m_fontSize: 18 + m_fontSizeBase: 18 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 10 @@ -921,7 +952,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3123940933529925964} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1058,7 +1088,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3123940933529925964} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1194,7 +1223,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1351706842662438855} - 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} @@ -1270,12 +1298,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4144811504476302523} - 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: 0, y: 12} - m_SizeDelta: {x: 386, y: 58} + m_AnchoredPosition: {x: 0, y: -0} + m_SizeDelta: {x: 350, y: 45.85} m_Pivot: {x: 0, y: 1} --- !u!222 &5596032882116128723 CanvasRenderer: @@ -1305,11 +1332,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Scene Name + m_text: Scene NameScene NameScene Name m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 6b705423dc77d4fceb4122f6d7e571d6, type: 2} - m_sharedMaterial: {fileID: -1532326820724739884, guid: 6b705423dc77d4fceb4122f6d7e571d6, - type: 2} + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1351,7 +1377,7 @@ MonoBehaviour: m_charWidthMaxAdj: 0 m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 - m_overflowMode: 1 + m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 @@ -1407,7 +1433,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8946095954856375470} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1512,6 +1537,141 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3175754360268563552 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6978427459412156721} + - component: {fileID: 2982293637877467819} + - component: {fileID: 7472666846945363273} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6978427459412156721 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3175754360268563552} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2345805614421020873} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -0.000061035156, y: -0.40000153} + m_SizeDelta: {x: 386, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!222 &2982293637877467819 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3175754360268563552} + m_CullTransparentMesh: 0 +--- !u!114 &7472666846945363273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3175754360268563552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: LOCATION + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4286344049 + m_fontColor: {r: 0.44313726, g: 0.41960785, b: 0.4862745, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 15 + m_fontSizeBase: 15 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 15 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: -10 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 1 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3441465799549265325 GameObject: m_ObjectHideFlags: 0 @@ -1543,7 +1703,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6044816913885112151} - 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} @@ -1621,12 +1780,11 @@ RectTransform: m_Children: - {fileID: 695635982608469531} m_Father: {fileID: 1280812252893711885} - 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: 0.37803102, y: -1.2645226} - m_SizeDelta: {x: 380.373, y: 36} + m_AnchoredPosition: {x: -4.6626, y: -1.2645226} + m_SizeDelta: {x: 355.517, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3313788345775264506 CanvasRenderer: @@ -1656,7 +1814,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d9ea79320a5c7124bbb6e8ffbd1b935c, type: 3} + m_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1665,7 +1823,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.7 --- !u!114 &5988041840532871401 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1715,7 +1873,6 @@ RectTransform: - {fileID: 5023114622238309060} - {fileID: 6044816913885112151} m_Father: {fileID: 739492711435516089} - 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} @@ -1803,13 +1960,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4144811504476302523} - m_RootOrder: 3 + m_Father: {fileID: 2345805614421020873} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 184.29996, y: -49.700012} - m_SizeDelta: {x: 338.45056, y: 30} + m_AnchoredPosition: {x: 124, y: -34.60002} + m_SizeDelta: {x: 200, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2477305115557586594 CanvasRenderer: @@ -1842,8 +1998,7 @@ MonoBehaviour: m_text: X-Y m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} - m_sharedMaterial: {fileID: 1196159134475820439, guid: a02669827dd9144f39b4b164e753a21a, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1867,12 +2022,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 16 + m_fontSize: 15 m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 12 - m_fontSizeMax: 16 + m_fontSizeMax: 15 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -1941,7 +2096,6 @@ RectTransform: - {fileID: 4422755086417855261} - {fileID: 275869552580710359} m_Father: {fileID: 739492711435516089} - 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} @@ -1981,12 +2135,11 @@ RectTransform: - {fileID: 4923690153599861533} - {fileID: 472037619187426452} m_Father: {fileID: 4633052412617948251} - 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: 0.000045776, y: -53.999996} - m_SizeDelta: {x: 424, y: 108} + m_AnchoredPosition: {x: -0.00060009956, y: -60} + m_SizeDelta: {x: 430.22, y: 108} m_Pivot: {x: 0.5, y: 0.5} --- !u!225 &4291617163160009123 CanvasGroup: @@ -2031,7 +2184,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8367719189172994006} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2134,7 +2286,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 1 + m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4461092734453978260 @@ -2168,12 +2320,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3113663853504699793} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -16, y: 0} - m_SizeDelta: {x: -29.3, y: 0} + m_AnchoredPosition: {x: -10.2393, y: 0} + m_SizeDelta: {x: -17.7786, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7419681687485786448 CanvasRenderer: @@ -2212,8 +2363,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4294769916 + m_fontColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2230,8 +2381,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15.66 - m_fontSizeBase: 15.66 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2308,7 +2459,6 @@ RectTransform: - {fileID: 2399017487291187114} - {fileID: 739492711435516089} m_Father: {fileID: 4068145632197052207} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2332,7 +2482,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 3 m_TargetDisplay: 0 @@ -2388,6 +2540,81 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &4690486339726320405 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5822220395698202263} + - component: {fileID: 5146112331367679765} + - component: {fileID: 6368173834894073177} + m_Layer: 5 + m_Name: Div + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5822220395698202263 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4690486339726320405} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4144811504476302523} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -73.85} + m_SizeDelta: {x: 100, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5146112331367679765 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4690486339726320405} + m_CullTransparentMesh: 1 +--- !u!114 &6368173834894073177 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4690486339726320405} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_Sprite: {fileID: 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4755119034144204487 GameObject: m_ObjectHideFlags: 0 @@ -2419,12 +2646,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1280812252893711885} - 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.37799668, y: -1.264513} - m_SizeDelta: {x: 380.37, y: 36} + m_AnchoredPosition: {x: -4.6627, y: -1.264513} + m_SizeDelta: {x: 355.517, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &489094772520478746 CanvasRenderer: @@ -2454,7 +2680,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d9ea79320a5c7124bbb6e8ffbd1b935c, type: 3} + m_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2463,7 +2689,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.7 --- !u!1 &4840031060944663586 GameObject: m_ObjectHideFlags: 0 @@ -2502,7 +2728,6 @@ RectTransform: - {fileID: 7689921164329490298} - {fileID: 3113663853504699793} m_Father: {fileID: 1528383878579514654} - 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} @@ -2537,7 +2762,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cda51e8a359aa4105bbb5f2b2e27dd10, type: 3} + m_Sprite: {fileID: 21300000, guid: 54cbe9bf5928342d490167f954f07710, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2590,12 +2815,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 472037619187426452} - 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: -65.662, y: -1.264513} - m_SizeDelta: {x: 248.295, y: 26} + m_AnchoredPosition: {x: -66.471535, y: -1.264513} + m_SizeDelta: {x: 232.0216, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1207265015344781744 CanvasRenderer: @@ -2625,7 +2849,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 379157433051e4d4283a64dae91d86f2, type: 3} + m_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2634,7 +2858,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 2.4 --- !u!1 &4970391106856856755 GameObject: m_ObjectHideFlags: 0 @@ -2666,12 +2890,11 @@ RectTransform: - {fileID: 5097478796157968980} - {fileID: 2189217411224346283} m_Father: {fileID: 1025099586584243763} - 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: -13.1, y: -29.2} - m_SizeDelta: {x: 393.972, y: 48.325} + m_AnchoredPosition: {x: 1.2796, y: -29.2} + m_SizeDelta: {x: 361.2409, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5116050222581406702 GameObject: @@ -2704,7 +2927,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2229113075485743295} - 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} @@ -2749,6 +2971,44 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5659948530481409305 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2345805614421020873} + m_Layer: 5 + m_Name: Location + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2345805614421020873 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5659948530481409305} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6978427459412156721} + - {fileID: 925199901403164925} + - {fileID: 5359253606877620343} + m_Father: {fileID: 4144811504476302523} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 193, y: -87.85} + m_SizeDelta: {x: 386, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5679412090479882597 GameObject: m_ObjectHideFlags: 0 @@ -2780,7 +3040,6 @@ RectTransform: - {fileID: 657959700488782509} - {fileID: 383839441425313838} m_Father: {fileID: 739492711435516089} - 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} @@ -2822,7 +3081,6 @@ RectTransform: - {fileID: 20030556357735071} - {fileID: 5941273681637762769} m_Father: {fileID: 4018673116236469548} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2923,12 +3181,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2192676819683722101} - 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: 193, y: -121.16199} - m_SizeDelta: {x: 386, y: 49.124} + m_AnchoredPosition: {x: 233.14, y: 0} + m_SizeDelta: {x: 305.72, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1716662806619727429 CanvasRenderer: @@ -3003,7 +3260,7 @@ MonoBehaviour: m_charWidthMaxAdj: 0 m_TextWrappingMode: 0 m_wordWrappingRatios: 0.4 - m_overflowMode: 0 + m_overflowMode: 1 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 @@ -3059,7 +3316,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4018673116236469548} - 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} @@ -3137,12 +3393,11 @@ RectTransform: m_Children: - {fileID: 7898598007044785838} m_Father: {fileID: 472037619187426452} - 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: -65.662, y: -1.2645226} - m_SizeDelta: {x: 248.3, y: 26} + m_AnchoredPosition: {x: -66.471535, y: -1.2645226} + m_SizeDelta: {x: 232.0216, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &334295021394783244 CanvasRenderer: @@ -3172,7 +3427,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 379157433051e4d4283a64dae91d86f2, type: 3} + m_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3181,7 +3436,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 2.4 --- !u!114 &6070395171498093624 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3229,7 +3484,6 @@ RectTransform: m_Children: - {fileID: 1528383878579514654} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3308,7 +3562,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 11 m_TargetDisplay: 0 @@ -3366,12 +3622,11 @@ RectTransform: - {fileID: 2935237887359635440} - {fileID: 4599733940411165834} m_Father: {fileID: 4144811504476302523} - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 193, y: -59.85} + m_SizeDelta: {x: 386, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6656334125399969241 GameObject: @@ -3404,7 +3659,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8367719189172994006} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3541,7 +3795,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4018673116236469548} - 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} @@ -3617,7 +3870,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8946095954856375470} - 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} @@ -3693,12 +3945,11 @@ RectTransform: - {fileID: 4423923052416368815} - {fileID: 2229113075485743295} m_Father: {fileID: 1025099586584243763} - 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: -13.3, y: -66.4} - m_SizeDelta: {x: 393.972, y: 48.325} + m_AnchoredPosition: {x: 1.0944, y: -56.7} + m_SizeDelta: {x: 361.2409, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7314736999172836456 GameObject: @@ -3732,7 +3983,6 @@ RectTransform: - {fileID: 4144811504476302523} - {fileID: 1025099586584243763} m_Father: {fileID: 739492711435516089} - 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} @@ -3772,12 +4022,11 @@ RectTransform: m_Children: - {fileID: 1082453002206254277} m_Father: {fileID: 4923690153599861533} - 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: -108.81, y: -1.2645226} - m_SizeDelta: {x: 162, y: 26} + m_AnchoredPosition: {x: -106.85149, y: -1.2645226} + m_SizeDelta: {x: 149.6913, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2010832472183284867 CanvasRenderer: @@ -3807,7 +4056,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 379157433051e4d4283a64dae91d86f2, type: 3} + m_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3816,7 +4065,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 2.4 --- !u!114 &61978764841609215 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3861,12 +4110,11 @@ RectTransform: - {fileID: 8146081838298166000} - {fileID: 1351706842662438855} m_Father: {fileID: 1025099586584243763} - 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: -13.7, y: 20.3} - m_SizeDelta: {x: 393.972, y: 48.325} + m_AnchoredPosition: {x: 0.7239, y: 20.3} + m_SizeDelta: {x: 361.2409, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8026375987735435041 GameObject: @@ -3899,7 +4147,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2189217411224346283} - 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} @@ -3975,7 +4222,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6044816913885112151} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4051,7 +4297,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4018673116236469548} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4125,7 +4370,6 @@ RectTransform: m_Children: - {fileID: 5857691850385592122} m_Father: {fileID: 956218146493471001} - 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} @@ -4160,8 +4404,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d01cf34e9364896468606aa1bd5246d0, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4169,7 +4413,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 4 --- !u!1 &8651362769890228248 GameObject: m_ObjectHideFlags: 0 @@ -4201,7 +4445,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 956218146493471001} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4282,12 +4525,11 @@ RectTransform: - {fileID: 4446375049104672710} - {fileID: 5659490557570295574} m_Father: {fileID: 739492711435516089} - m_RootOrder: 5 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: 101, y: -213.00003} - m_SizeDelta: {x: 186, y: 46} + m_AnchoredPosition: {x: 92, y: -213.00003} + m_SizeDelta: {x: 170, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5897831162716546141 CanvasRenderer: @@ -4432,7 +4674,6 @@ RectTransform: - {fileID: 8946095954856375470} - {fileID: 1782795320825263734} m_Father: {fileID: 4633052412617948251} - 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} @@ -4470,12 +4711,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2192676819683722101} - 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: 193, y: -87.7} - m_SizeDelta: {x: 386, y: 30.099998} + m_AnchoredPosition: {x: 40.139786, y: 0} + m_SizeDelta: {x: 80, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3922905428684146279 CanvasRenderer: @@ -4505,17 +4745,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: CREATED BY + m_text: created by m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -4532,12 +4772,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 + m_fontSize: 15 m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 10 - m_fontSizeMax: 14 + m_fontSizeMax: 15 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -4607,7 +4847,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1528383878579514654} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} From 8245caba4b13287b0d0c39e35bb4894f31be10b6 Mon Sep 17 00:00:00 2001 From: Patricio Guerra Date: Tue, 31 Oct 2023 11:16:52 -0300 Subject: [PATCH 07/15] fix: various emotes bugs (#5877) * fix: emotes not playing or stopping when constrained by camera * Fixed some emotes not working and fixed Override User ID * Fixed looping emotes not playing again when re-triggering them, this should not affect looping emotes RPC * Fixed emote request being paginated, now it will fetch all emotes recursively * Fixed Emotes section scroll not appearing after loading a large number of emotes * Fix debug logic for tests * Small refactor --- .../EmotesCatalog/EmotesRequestWeb.cs | 54 +++++++++++++++---- .../EmotesService/EmoteAnimationLoader.cs | 16 ++---- .../LambdasWearablesCatalogService.cs | 7 --- .../AvatarSystem/AvatarEmotesController.cs | 18 +++++-- .../DCL/AvatarSystem/Definitions/IAnimator.cs | 2 +- .../Definitions/IAvatarEmotesController.cs | 2 +- .../Components/Avatar/AvatarAnimatorLegacy.cs | 10 ++-- .../EmotesCustomizationSectionV2.prefab | 17 +++++- .../EmotesCustomizationComponentController.cs | 2 + .../EmotesCustomizationComponentView.cs | 7 +++ .../IEmotesCustomizationComponentView.cs | 4 +- .../BackpackEmotesSectionController.cs | 32 +++++++---- .../MainScripts/DCL/DataStore/DebugConfig.cs | 19 ++++--- .../DCL/Models/AvatarAssets/EmoteClipData.cs | 2 + .../DCL/UserProfile/UserProfile.asmdef | 3 +- .../DCL/UserProfile/UserProfile.cs | 2 +- .../DebugParameters/DebugConfigComponent.cs | 4 -- 17 files changed, 131 insertions(+), 70 deletions(-) diff --git a/unity-renderer/Assets/DCLServices/EmotesCatalog/EmotesRequestWeb.cs b/unity-renderer/Assets/DCLServices/EmotesCatalog/EmotesRequestWeb.cs index 13cbe470ac..5e45af0998 100644 --- a/unity-renderer/Assets/DCLServices/EmotesCatalog/EmotesRequestWeb.cs +++ b/unity-renderer/Assets/DCLServices/EmotesCatalog/EmotesRequestWeb.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; +using System.Threading.Tasks; namespace DCLServices.EmotesCatalog { @@ -24,6 +25,9 @@ public class EmoteRequestDto } public EmoteRequestDto[] elements; + public int totalAmount; + public int pageSize; + public int pageNum; } public event Action> OnEmotesReceived; @@ -61,21 +65,18 @@ public void RequestOwnedEmotes(string userId) private async UniTask RequestOwnedEmotesAsync(string userId) { var url = $"{catalyst.lambdasUrl}/users/{userId}/emotes"; - var result = await lambdasService.GetFromSpecificUrl(url, url, cancellationToken: cts.Token); - if (!result.success) throw new Exception($"Fetching owned wearables failed! {url}\nAddress: {userId}"); + List requestedEmotes = new List(); - if (result.response.elements.Length <= 0) - { - OnOwnedEmotesReceived?.Invoke(new List(), userId); + if (!await FullListEmoteFetch(userId, url, requestedEmotes)) return; - } var tempList = PoolUtils.RentList(); var emoteUrns = tempList.GetList(); Dictionary urnToAmountMap = new Dictionary(); - foreach (OwnedEmotesRequestDto.EmoteRequestDto emoteRequestDto in result.response.elements) + + foreach (OwnedEmotesRequestDto.EmoteRequestDto emoteRequestDto in requestedEmotes) { emoteUrns.Add(emoteRequestDto.urn); urnToAmountMap[emoteRequestDto.urn] = emoteRequestDto.amount; @@ -88,6 +89,40 @@ private async UniTask RequestOwnedEmotesAsync(string userId) OnOwnedEmotesReceived?.Invoke(emotes, userId); } + // This recursiveness is horrible, we should add proper pagination + private async UniTask FullListEmoteFetch(string userId, string url, List requestedEmotes) + { + int requestedCount = 0; + int totalEmotes = 99999; + int pageNum = 1; + + while (requestedCount < totalEmotes) + { + var queryParams = new List<(string name, string value)> + { + ("pageNum", pageNum.ToString()) + }.ToArray(); + + var result = await lambdasService.GetFromSpecificUrl(url, url, + cancellationToken: cts.Token, urlEncodedParams: queryParams); + + if (!result.success) throw new Exception($"Fetching owned wearables failed! {url}\nAddress: {userId}"); + + if (result.response.elements.Length <= 0 && requestedCount <= 0) + { + OnOwnedEmotesReceived?.Invoke(new List(), userId); + return false; + } + + requestedCount += result.response.elements.Length; + totalEmotes = result.response.totalAmount; + pageNum++; + requestedEmotes.AddRange(result.response.elements); + } + + return true; + } + public void RequestEmote(string emoteId) { RequestWearableBatchAsync(emoteId).Forget(); @@ -135,10 +170,7 @@ private async UniTask> FetchEmotes(List ids, var contentUrl = $"{catalyst.contentUrl}contents/"; var wearableItem = dto.ToWearableItem(contentUrl); - if (urnToAmountMap != null && urnToAmountMap.TryGetValue(dto.id, out int amount)) - { - wearableItem.amount = amount; - } + if (urnToAmountMap != null && urnToAmountMap.TryGetValue(dto.id, out int amount)) { wearableItem.amount = amount; } wearableItem.baseUrl = contentUrl; wearableItem.baseUrlBundles = assetBundlesUrl; diff --git a/unity-renderer/Assets/DCLServices/EmotesService/EmoteAnimationLoader.cs b/unity-renderer/Assets/DCLServices/EmotesService/EmoteAnimationLoader.cs index 3b90efcbed..2b103d8452 100644 --- a/unity-renderer/Assets/DCLServices/EmotesService/EmoteAnimationLoader.cs +++ b/unity-renderer/Assets/DCLServices/EmotesService/EmoteAnimationLoader.cs @@ -95,6 +95,8 @@ private void SetupEmote(GameObject emoteInstance, string emoteId) return; } + mainClip = animation.clip; + if (animation.GetClipCount() > 1) { this.container = emoteInstance; @@ -104,6 +106,7 @@ private void SetupEmote(GameObject emoteInstance, string emoteId) { AnimationClip clip = state.clip; + // Replace the main clip with the one that's correctly named if (clip.name.Contains("_avatar", StringComparison.OrdinalIgnoreCase) || clip.name == emoteId) mainClip = clip; @@ -111,20 +114,7 @@ private void SetupEmote(GameObject emoteInstance, string emoteId) // our workaround is to play every animation while we load the audio clip and then disable the animator animation.Play(clip.name); } - - // in the case that the animation names are badly named, we just get the first animation that does not contain prop in its name - if (mainClip == null) - { - foreach (AnimationState animationState in animation) - { - if (animationState.clip.name.Contains("prop", StringComparison.OrdinalIgnoreCase)) continue; - mainClip = animationState.clip; - break; - } - } } - else - mainClip = animation.clip; if (mainClip == null) { diff --git a/unity-renderer/Assets/DCLServices/WearablesCatalogService/LambdasWearablesCatalogService.cs b/unity-renderer/Assets/DCLServices/WearablesCatalogService/LambdasWearablesCatalogService.cs index 3370fae95d..3009fee9ce 100644 --- a/unity-renderer/Assets/DCLServices/WearablesCatalogService/LambdasWearablesCatalogService.cs +++ b/unity-renderer/Assets/DCLServices/WearablesCatalogService/LambdasWearablesCatalogService.cs @@ -173,13 +173,6 @@ public void Dispose() public async UniTask<(IReadOnlyList wearables, int totalAmount)> RequestOwnedWearablesAsync(string userId, int pageNumber, int pageSize, bool cleanCachedPages, CancellationToken ct) { -#if UNITY_EDITOR - string debugUserId = dataStore.debugConfig.overrideUserID; - - if (!string.IsNullOrEmpty(debugUserId)) - userId = debugUserId; -#endif - var createNewPointer = false; if (!ownerWearablesPagePointers.TryGetValue((userId, pageSize), out var pagePointer)) { createNewPointer = true; } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/AvatarSystem/AvatarEmotesController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/AvatarSystem/AvatarEmotesController.cs index 6bfc1ea478..8d07eaae91 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/AvatarSystem/AvatarEmotesController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/AvatarSystem/AvatarEmotesController.cs @@ -15,6 +15,7 @@ namespace AvatarSystem public class AvatarEmotesController : IAvatarEmotesController { private const float BASE_VOLUME = 0.2f; + private const string INSIDE_CAMERA = "INSIDE_CAMERA"; public event Action OnEmoteEquipped; public event Action OnEmoteUnequipped; @@ -38,7 +39,9 @@ public bool TryGetEquippedEmote(string bodyShape, string emoteId, out IEmoteRefe public void AddVisibilityConstraint(string key) { visibilityConstraints.Add(key); - StopEmote(); + + if (!CanPlayEmote()) + StopEmote(); } public void RemoveVisibilityConstraint(string key) @@ -83,16 +86,23 @@ private async UniTask AsyncEmoteLoad(string bodyShapeId, string emoteId) catch (Exception e) { Debug.LogException(e); } } - public void PlayEmote(string emoteId, long timestamps, bool spatial, bool occlude, bool ignoreTimestamp) + public void PlayEmote(string emoteId, long timestamps, bool spatial, bool occlude, bool forcePlay) { if (string.IsNullOrEmpty(emoteId)) return; - if (visibilityConstraints.Count > 0) return; + if (!CanPlayEmote()) return; var emoteKey = new EmoteBodyId(bodyShapeId, emoteId); if (!equippedEmotes.ContainsKey(emoteKey)) return; float volume = GetEmoteVolume(); - animator.PlayEmote(emoteId, timestamps, spatial, volume, occlude, ignoreTimestamp); + animator.PlayEmote(emoteId, timestamps, spatial, volume, occlude, forcePlay); + } + + private bool CanPlayEmote() + { + if (visibilityConstraints.Count == 0) return true; + if (visibilityConstraints.Count > 1) return false; + return visibilityConstraints.Contains(INSIDE_CAMERA); } // TODO: We have to decouple this volume logic into an IAudioMixer.GetVolume(float, Channel) since we are doing the same calculations everywhere diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/AvatarSystem/Definitions/IAnimator.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/AvatarSystem/Definitions/IAnimator.cs index df5fc04f47..8ce70f8ac1 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/AvatarSystem/Definitions/IAnimator.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/AvatarSystem/Definitions/IAnimator.cs @@ -7,7 +7,7 @@ public interface IAnimator { bool Prepare(string bodyshapeId, GameObject container); void PlayEmote(string emoteId, long timestamps, bool spatial, float volume, bool occlude, - bool ignoreTimestamp); + bool forcePlay); void StopEmote(); void EquipEmote(string emoteId, EmoteClipData emoteClipData); void UnequipEmote(string emoteId); diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/AvatarSystem/Definitions/IAvatarEmotesController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/AvatarSystem/Definitions/IAvatarEmotesController.cs index 43c057ad1f..b0c4e1a6fe 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/AvatarSystem/Definitions/IAvatarEmotesController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/AvatarSystem/Definitions/IAvatarEmotesController.cs @@ -11,7 +11,7 @@ public interface IAvatarEmotesController : IDisposable void LoadEmotes(string bodyShapeId, IEnumerable emotes); - void PlayEmote(string emoteId, long timestamps, bool spatial = true, bool occlude = true, bool ignoreTimestamp = false); + void PlayEmote(string emoteId, long timestamps, bool spatial = true, bool occlude = true, bool forcePlay = false); void StopEmote(); diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/AvatarAnimatorLegacy.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/AvatarAnimatorLegacy.cs index 807b047977..61f5441ae2 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/AvatarAnimatorLegacy.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Avatar/AvatarAnimatorLegacy.cs @@ -458,7 +458,7 @@ public void Reset() public void SetIdleFrame() { animation.Play(currentLocomotions.idle.name); } public void PlayEmote(string emoteId, long timestamps, bool spatial, float volume, bool occlude, - bool ignoreTimestamp) + bool forcePlay) { if (animation == null) return; @@ -470,9 +470,13 @@ public void PlayEmote(string emoteId, long timestamps, bool spatial, float volum return; bool loop = emoteClipDataMap.TryGetValue(emoteId, out var clipData) && clipData.Loop; - bool mustTriggerAnimation = !string.IsNullOrEmpty(emoteId) && (blackboard.expressionTriggerTimestamp != timestamps || ignoreTimestamp); + bool mustTriggerAnimation = !string.IsNullOrEmpty(emoteId) && (blackboard.expressionTriggerTimestamp != timestamps || forcePlay); - if (loop && blackboard.expressionTriggerId == emoteId) + bool isTheSameLoopingEmote = loop && blackboard.expressionTriggerId == emoteId; + + // Triggering an emote manually updates the timestamp, the looping emote by itself sends a timestamp of -1 + // so if we are already using an emote that looped and we receive the play emote command with that timestamp, we ignore + if (isTheSameLoopingEmote && timestamps < 0) return; blackboard.expressionTriggerId = emoteId; diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmotesCustomizationSectionV2.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmotesCustomizationSectionV2.prefab index 1ff3abe20e..0cc68887bf 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmotesCustomizationSectionV2.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmotesCustomizationSectionV2.prefab @@ -909,6 +909,7 @@ MonoBehaviour: emoteSlotSelector: {fileID: 5504772256985452013} emotesGrid: {fileID: 737305017821576015} emoteInfoPanel: {fileID: 7906939378484150054} + columnsOrganizerComponentView: {fileID: 6831564234207524114} --- !u!1 &2672119976802274059 GameObject: m_ObjectHideFlags: 0 @@ -2245,6 +2246,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6831564234207524114 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5588409793679400621, guid: cfed952f63812a44d86ff7609367aceb, + type: 3} + m_PrefabInstance: {fileID: 1387269628721425343} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 709709442490280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: db117b813acf0fd4490217bd16761fe7, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &7777758932990698070 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8696649798073764329, guid: cfed952f63812a44d86ff7609367aceb, @@ -2332,7 +2345,7 @@ PrefabInstance: - target: {fileID: 2026062374757361563, guid: a0b08d9ca8421644db83c1bd3f2e2e48, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 845.5 objectReference: {fileID: 0} - target: {fileID: 2026062374757361563, guid: a0b08d9ca8421644db83c1bd3f2e2e48, type: 3} @@ -2377,7 +2390,7 @@ PrefabInstance: - target: {fileID: 2026062374757361563, guid: a0b08d9ca8421644db83c1bd3f2e2e48, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 2026062374757361563, guid: a0b08d9ca8421644db83c1bd3f2e2e48, type: 3} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/EmotesCustomizationComponentController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/EmotesCustomizationComponentController.cs index 32ff95acf4..dba5b5b586 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/EmotesCustomizationComponentController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/EmotesCustomizationComponentController.cs @@ -99,6 +99,8 @@ public void SetEmotes(WearableItem[] ownedEmotes) AddEmote(emote); UpdateEmoteSlots(); + + view.Refresh(); } public void SetEquippedBodyShape(string bodyShapeId) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/EmotesCustomizationComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/EmotesCustomizationComponentView.cs index e0213f9870..9aa75ccb22 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/EmotesCustomizationComponentView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/EmotesCustomizationComponentView.cs @@ -18,6 +18,7 @@ public class EmotesCustomizationComponentView : BaseComponentView, IEmotesCustom [SerializeField] internal EmoteSlotSelectorComponentView emoteSlotSelector; [SerializeField] internal GridContainerComponentView emotesGrid; [SerializeField] internal NFTItemInfo emoteInfoPanel; + [SerializeField] internal ColumnsOrganizerComponentView columnsOrganizerComponentView; public event Action onEmoteEquipped; public event Action onEmoteUnequipped; @@ -51,6 +52,7 @@ public override void RefreshControl() { emoteSlotSelector.RefreshControl(); emotesGrid.RefreshControl(); + columnsOrganizerComponentView.RefreshControl(); } public override void Dispose() @@ -170,6 +172,11 @@ public void OpenEmoteInfoPanel(EmoteCardComponentModel emoteModel, Color backgro public EmoteSlotCardComponentView GetSlot(int slotNumber) { return currentSlots.FirstOrDefault(x => x.model.slotNumber == slotNumber); } + public void Refresh() + { + RefreshControl(); + } + internal void ClickOnEmote(string emoteId, string emoteName, int slotNumber, bool isAssignedInSelectedSlot) { if (!isAssignedInSelectedSlot) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/IEmotesCustomizationComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/IEmotesCustomizationComponentView.cs index cc90df1bec..e455b4fa4a 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/IEmotesCustomizationComponentView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/IEmotesCustomizationComponentView.cs @@ -118,5 +118,7 @@ public interface IEmotesCustomizationComponentView /// Slot number to get. /// EmoteSlotCardComponentView GetSlot(int slotNumber); + + void Refresh(); } -} \ No newline at end of file +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEmotesSectionController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEmotesSectionController.cs index 21fade4351..5e0cb00367 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEmotesSectionController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEmotesSectionController.cs @@ -102,36 +102,46 @@ async UniTaskVoid LoadEmotesAsync(CancellationToken ct = default) { EmbeddedEmotesSO embeddedEmotesSo = await emotesCatalogService.GetEmbeddedEmotes(); List allEmotes = new (); - allEmotes.AddRange(embeddedEmotesSo.GetAllEmotes()); allEmotes.AddRange(await emotesCatalogService.RequestOwnedEmotesAsync(userProfileBridge.GetOwn().userId, ct) ?? Array.Empty()); Dictionary consolidatedEmotes = new Dictionary(); + + foreach (EmbeddedEmote emote in embeddedEmotesSo.GetAllEmotes()) + consolidatedEmotes[emote.id] = emote; + foreach (var emote in allEmotes) { - if (consolidatedEmotes.ContainsKey(emote.id)) - { - consolidatedEmotes[emote.id].amount += emote.amount + 1; - } + if (consolidatedEmotes.TryGetValue(emote.id, out WearableItem consolidatedEmote)) + consolidatedEmote.amount += emote.amount + 1; else { emote.amount++; consolidatedEmotes[emote.id] = emote; } } + allEmotes = consolidatedEmotes.Values.ToList(); + UpdateEmotes(); try { - await UniTask.WhenAll(FetchCustomEmoteCollections(allEmotes, ct), - FetchCustomEmoteItems(allEmotes, ct)); + await FetchCustomEmoteItems(allEmotes, ct); + await FetchCustomEmoteCollections(allEmotes, ct); + UpdateEmotes(); + } + catch (Exception e) when (e is not OperationCanceledException) + { + Debug.LogException(e); } - catch (Exception e) when (e is not OperationCanceledException) { Debug.LogException(e); } - dataStore.emotesCustomization.UnequipMissingEmotes(allEmotes); - emotesCustomizationComponentController.SetEmotes(allEmotes.ToArray()); + void UpdateEmotes() + { + dataStore.emotesCustomization.UnequipMissingEmotes(allEmotes); + emotesCustomizationComponentController.SetEmotes(allEmotes.ToArray()); + } } catch (OperationCanceledException) { } - catch (Exception e) { Debug.LogError($"Error loading emotes: {e.Message}"); } + catch (Exception e) { Debug.LogException(e); } } loadEmotesCts = loadEmotesCts.SafeRestart(); diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DebugConfig.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DebugConfig.cs index 9a5bb09a74..29149d4f4f 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DebugConfig.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DebugConfig.cs @@ -22,31 +22,31 @@ public class DebugConfig /// [System.NonSerialized] public BaseVariable isDebugMode = new BaseVariable(); - + [System.NonSerialized] public BaseVariable isFPSPanelVisible = new BaseVariable(); - + [System.NonSerialized] public BaseDictionary showSceneBoundingBoxes = new BaseDictionary(); - + [System.NonSerialized] public BaseVariable isPreviewMenuActive = new BaseVariable(); - + [System.NonSerialized] public BaseDictionary showSceneSpawnPoints = new BaseDictionary(); [System.NonSerialized] public BaseVariable showSceneABDetectionLayer = new BaseVariable(); - + [System.NonSerialized] public BaseVariable showGlobalABDetectionLayer = new BaseVariable(); - + [System.NonSerialized] public BaseVariable jsHeapSizeLimit = new BaseVariable(); - + [System.NonSerialized] public BaseVariable jsTotalHeapSize = new BaseVariable(); - + [System.NonSerialized] public BaseVariable jsUsedHeapSize = new BaseVariable(); @@ -66,6 +66,5 @@ public class DebugConfig /// public bool msgStepByStep = false; public bool logWs; - public string overrideUserID; } -} \ No newline at end of file +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/EmoteClipData.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/EmoteClipData.cs index ceb3ccfdf0..a6cfc9010a 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/EmoteClipData.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/EmoteClipData.cs @@ -55,6 +55,8 @@ public void Play(int gameObjectLayer, bool spatial, float volume, bool occlude) { foreach (Renderer renderer in renderers) { + if (renderer.name.Contains("_reference", StringComparison.OrdinalIgnoreCase)) continue; + renderer.enabled = true; renderer.gameObject.layer = gameObjectLayer; renderer.allowOcclusionWhenDynamic = occlude; diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfile.asmdef b/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfile.asmdef index ceda44eec9..ca7fa9b2df 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfile.asmdef +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfile.asmdef @@ -23,7 +23,8 @@ "GUID:5db7e9d450464b96bfddf316690db751", "GUID:3b80b0b562b1cbc489513f09fc1b8f69", "GUID:c8ea72e806cd2ab47b539b37895b86b7", - "GUID:2995626b54c60644988f134a69a77450" + "GUID:2995626b54c60644988f134a69a77450", + "GUID:1cd9f56ea305aae458297148eecef98c" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfile.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfile.cs index a330de9350..034351b526 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfile.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfile.cs @@ -142,7 +142,7 @@ public void SetAvatarExpression(string id, EmoteSource source, bool rpcOnly = fa emotes?.TriggerExpression(new TriggerExpressionRequest() { Id = id, - Timestamp = timestamp + Timestamp = rpcOnly ? -1 : timestamp }); if (!rpcOnly) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/WorldRuntime/Debugging/DebugParameters/DebugConfigComponent.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/WorldRuntime/Debugging/DebugParameters/DebugConfigComponent.cs index d4be63c5d0..dc4d5b109f 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/WorldRuntime/Debugging/DebugParameters/DebugConfigComponent.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/WorldRuntime/Debugging/DebugParameters/DebugConfigComponent.cs @@ -69,9 +69,6 @@ public enum Network public Vector2 startInCoords = new Vector2(-99, 109); - [Tooltip("Set this value to load the catalog from another wallet for debug purposes")] - public string overrideUserID = ""; - [Header("Kernel Misc Settings")] public bool forceLocalComms = true; public bool enableTutorial = false; @@ -96,7 +93,6 @@ private void Awake() DataStore.i.debugConfig.soloSceneCoords = debugConfig.soloSceneCoords; DataStore.i.debugConfig.ignoreGlobalScenes = debugConfig.ignoreGlobalScenes; DataStore.i.debugConfig.msgStepByStep = debugConfig.msgStepByStep; - DataStore.i.debugConfig.overrideUserID = overrideUserID; DataStore.i.performance.multithreading.Set(multithreaded); if (disableGLTFDownloadThrottle) DataStore.i.performance.maxDownloads.Set(999); Texture.allowThreadedTextureCreation = multithreaded; From 519f361dc133bbdfc09cc16858efe3dec19c3ede Mon Sep 17 00:00:00 2001 From: Pravus Date: Tue, 31 Oct 2023 20:08:21 +0100 Subject: [PATCH 08/15] chore: disable allowed media hostnames check (#5844) * Added configuration const to toggle checking allowed media hostnames and disabled it * Disabled related tests --- .../AudioStream/Tests/ECSAudioStreamShould.cs | 3 +++ .../Material/Tests/MaterialHandlerShould.cs | 3 +++ .../VideoPlayer/Tests/VideoPlayerHandlerShould.cs | 3 +++ .../Assets/DCLPlugins/ECS7/Utils/Scene/Media.cs | 9 ++++++--- .../MainScripts/DCL/Configuration/Configuration.cs | 3 ++- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/AudioStream/Tests/ECSAudioStreamShould.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/AudioStream/Tests/ECSAudioStreamShould.cs index bdd30b72bb..d5f904925d 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/AudioStream/Tests/ECSAudioStreamShould.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/AudioStream/Tests/ECSAudioStreamShould.cs @@ -192,6 +192,7 @@ public void StopAudioIfItsOutsideScene() } [Test] + [Explicit] public void NotAllowExternalAudioStreamWithoutPermissionsSet() { PBAudioStream model = new PBAudioStream() @@ -209,6 +210,7 @@ public void NotAllowExternalAudioStreamWithoutPermissionsSet() } [Test] + [Explicit] public void AllowExternalAudioStreamWithPermissionsSet() { PBAudioStream model = new PBAudioStream() @@ -228,6 +230,7 @@ public void AllowExternalAudioStreamWithPermissionsSet() } [Test] + [Explicit] public void NotAllowExternalAudioStreamWithWrongHostName() { PBAudioStream model = new PBAudioStream() diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/Material/Tests/MaterialHandlerShould.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/Material/Tests/MaterialHandlerShould.cs index 517bad90bb..089b5683fc 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/Material/Tests/MaterialHandlerShould.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/Material/Tests/MaterialHandlerShould.cs @@ -387,6 +387,7 @@ public IEnumerator ForgetWontRaiseExceptionWhenCalledAfterComponentIsRemoved() } [Test] + [Explicit] public void NotAllowBase64Textures() { TextureUnion texture = new TextureUnion() @@ -403,6 +404,7 @@ public void NotAllowBase64Textures() } [Test] + [Explicit] public void NotAllowExternalTextureWithoutPermissionsSet() { TextureUnion texture = new TextureUnion() @@ -421,6 +423,7 @@ public void NotAllowExternalTextureWithoutPermissionsSet() } [Test] + [Explicit] public void AllowExternalTextureWithPermissionsSet() { TextureUnion texture = new TextureUnion() diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/VideoPlayer/Tests/VideoPlayerHandlerShould.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/VideoPlayer/Tests/VideoPlayerHandlerShould.cs index 13c3b444ba..2b20f22d8d 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/VideoPlayer/Tests/VideoPlayerHandlerShould.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/VideoPlayer/Tests/VideoPlayerHandlerShould.cs @@ -156,6 +156,7 @@ public void CreateInternalComponentCorrectly() } [Test] + [Explicit] public void NotAllowExternalVideoWithoutPermissionsSet() { PBVideoPlayer model = new PBVideoPlayer() @@ -176,6 +177,7 @@ public void NotAllowExternalVideoWithoutPermissionsSet() } [Test] + [Explicit] public void AllowExternalVideoWithRightPermissionsSet() { PBVideoPlayer model = new PBVideoPlayer() @@ -195,6 +197,7 @@ public void AllowExternalVideoWithRightPermissionsSet() } [Test] + [Explicit] public void NotAllowExternalVideoWithWrongHostName() { PBVideoPlayer model = new PBVideoPlayer() diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/Utils/Scene/Media.cs b/unity-renderer/Assets/DCLPlugins/ECS7/Utils/Scene/Media.cs index 2f8745610a..f08de8499b 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/Utils/Scene/Media.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/Utils/Scene/Media.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using UnityEngine; +using DCL.Configuration; /* * Scene utils file for media related stuff @@ -53,15 +54,17 @@ public static bool TryGetMediaUrl(string inputUrl, ContentProvider sceneContentP return true; } - if (sceneRequiredPermissions == null || sceneAllowedMediaHostnames == null) + if (ExternalDataFetchingSettings.CHECK_ALLOWED_MEDIA_HOSTNAMES + && (sceneRequiredPermissions == null || sceneAllowedMediaHostnames == null)) { url = string.Empty; Debug.LogError("External media asset url error: 'allowedMediaHostnames' missing in scene.json file."); return false; } - if (HasRequiredPermission(sceneRequiredPermissions, ScenePermissionNames.ALLOW_MEDIA_HOSTNAMES) - && IsUrlDomainAllowed(sceneAllowedMediaHostnames, inputUrl)) + if (!ExternalDataFetchingSettings.CHECK_ALLOWED_MEDIA_HOSTNAMES + || (HasRequiredPermission(sceneRequiredPermissions, ScenePermissionNames.ALLOW_MEDIA_HOSTNAMES) + && IsUrlDomainAllowed(sceneAllowedMediaHostnames, inputUrl))) { url = inputUrl; return true; diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Configuration/Configuration.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Configuration/Configuration.cs index ab223cd9f1..e84f6670db 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Configuration/Configuration.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Configuration/Configuration.cs @@ -208,13 +208,14 @@ public static class UISettings public static float RESERVED_CANVAS_TOP_PERCENTAGE = 10f; } - public static class NFTDataFetchingSettings + public static class ExternalDataFetchingSettings { public static UnityEngine.Vector2 NORMALIZED_DIMENSIONS = new UnityEngine.Vector2(512f, 512f); // The image dimensions that correspond to Vector3.One scale public static string DAR_API_URL = "https://schema.decentraland.org/dar"; + public const bool CHECK_ALLOWED_MEDIA_HOSTNAMES = false; } public static class PhysicsLayers From 0983caa6888c2bac730d195be14562296d13c0c3 Mon Sep 17 00:00:00 2001 From: Pravus Date: Wed, 1 Nov 2023 14:00:55 +0100 Subject: [PATCH 09/15] fix: preview mode crash on start (#5883) --- .../EmotesCustomization/EmotesCustomizationComponentView.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/EmotesCustomizationComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/EmotesCustomizationComponentView.cs index 9aa75ccb22..3c5f3b6955 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/EmotesCustomizationComponentView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/EmotesCustomization/EmotesCustomizationComponentView.cs @@ -52,7 +52,7 @@ public override void RefreshControl() { emoteSlotSelector.RefreshControl(); emotesGrid.RefreshControl(); - columnsOrganizerComponentView.RefreshControl(); + columnsOrganizerComponentView?.RefreshControl(); } public override void Dispose() From a0c314c2ee0048d79615730aadcb8e79cb148ea3 Mon Sep 17 00:00:00 2001 From: Pravus Date: Wed, 1 Nov 2023 16:02:07 +0100 Subject: [PATCH 10/15] fix: sdk7 ui text position (#5884) * Reverted initial position type for ui text * Added position type update based on root element (only affects ui text for now) --- .../UIAbstractElements/UIElementHandlerBase.cs | 7 +++++++ .../DCLPlugins/ECS7/ECSComponents/Utils/UiElementUtils.cs | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/UIElementHandlerBase.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/UIElementHandlerBase.cs index a77ee9c0d7..6b3e8804d7 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/UIElementHandlerBase.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/UIElementHandlerBase.cs @@ -24,7 +24,14 @@ protected UIElementHandlerBase( protected internal InternalUiContainer AddElementToRoot(IParcelScene scene, IDCLEntity entity, VisualElement uiElement) { var internalContainer = AddComponentToEntity(scene, entity); + uiElement.pickingMode = PickingMode.Ignore; + if (internalContainer.rootElement.style.width.keyword == StyleKeyword.Auto + || internalContainer.rootElement.style.height.keyword == StyleKeyword.Auto) + { + uiElement.style.position = new StyleEnum(Position.Relative); + } + internalContainer.rootElement.Add(uiElement); return internalContainer; } diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/Utils/UiElementUtils.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/Utils/UiElementUtils.cs index 7cdc633ef5..d7a1a77bd5 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/Utils/UiElementUtils.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/Utils/UiElementUtils.cs @@ -10,7 +10,7 @@ public static void SetElementDefaultStyle(IStyle elementStyle) elementStyle.bottom = 0; elementStyle.width = new StyleLength(StyleKeyword.Auto); elementStyle.height = new StyleLength(StyleKeyword.Auto); - elementStyle.position = new StyleEnum(Position.Relative); + elementStyle.position = new StyleEnum(Position.Absolute); elementStyle.justifyContent = new StyleEnum(Justify.Center); elementStyle.alignItems = new StyleEnum(Align.Center); } From be1aa6c4aba43d0f4794a2ac0eaf1fa7e2f76b20 Mon Sep 17 00:00:00 2001 From: Nicolas Echezarreta Date: Wed, 1 Nov 2023 13:35:24 -0300 Subject: [PATCH 11/15] add: two more default scene permissions --- browser-interface/packages/shared/apis/host/Permissions.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/browser-interface/packages/shared/apis/host/Permissions.ts b/browser-interface/packages/shared/apis/host/Permissions.ts index 7789c79011..371f0cb7c0 100644 --- a/browser-interface/packages/shared/apis/host/Permissions.ts +++ b/browser-interface/packages/shared/apis/host/Permissions.ts @@ -12,7 +12,9 @@ import type { PortContext } from './context' export const defaultParcelPermissions: PermissionItem[] = [ PermissionItem.PI_USE_WEB3_API, PermissionItem.PI_USE_FETCH, - PermissionItem.PI_USE_WEBSOCKET + PermissionItem.PI_USE_WEBSOCKET, + PermissionItem.PI_ALLOW_TO_MOVE_PLAYER_INSIDE_SCENE, + PermissionItem.PI_ALLOW_TO_TRIGGER_AVATAR_EMOTE ] export const defaultPortableExperiencePermissions: PermissionItem[] = [] From c20f25a573aaecad1eb49b77722ac396dc70d9fd Mon Sep 17 00:00:00 2001 From: Gon Pombo Date: Wed, 1 Nov 2023 17:26:11 -0300 Subject: [PATCH 12/15] fix hot reload for smart wearables (#5891) --- browser-interface/packages/unity-interface/dcl.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser-interface/packages/unity-interface/dcl.ts b/browser-interface/packages/unity-interface/dcl.ts index 7fe06472a7..84a7045d50 100644 --- a/browser-interface/packages/unity-interface/dcl.ts +++ b/browser-interface/packages/unity-interface/dcl.ts @@ -15,7 +15,7 @@ import { traceDecoratorUnityGame } from './trace' import defaultLogger from 'lib/logger' import { ContentMapping, EntityType, Scene, sdk } from '@dcl/schemas' import { ensureMetaConfigurationInitialized } from 'shared/meta' -import { reloadScenePortableExperience } from 'shared/portableExperiences/actions' +import { denyPortableExperiences, reloadScenePortableExperience } from 'shared/portableExperiences/actions' import { wearableToSceneEntity } from 'shared/wearablesPortableExperience/sagas' import { fetchScenesByLocation } from 'shared/scene-loader/sagas' import { sleep } from 'lib/javascript/sleep' @@ -149,7 +149,7 @@ export async function loadPreviewScene(message: sdk.Messages) { } if (message.type === sdk.SCENE_UPDATE && sdk.SceneUpdate.validate(message)) { - if (message.payload.sceneType === sdk.ProjectType.PORTABLE_EXPERIENCE) { + if ([sdk.ProjectType.PORTABLE_EXPERIENCE, 'smart-wearable'].includes(message.payload.sceneType)) { try { const { sceneId } = message.payload const url = `${rootURLPreviewMode()}/preview-wearables/${sceneId}` @@ -159,7 +159,7 @@ export async function loadPreviewScene(message: sdk.Messages) { const wearable = collection.data[0] const entity = await wearableToSceneEntity(wearable, wearable.baseUrl) - + store.dispatch(denyPortableExperiences([])) store.dispatch(reloadScenePortableExperience(entity)) } } catch (err) { From e29d9d3cecadcab68b174d215747204faf51cc9e Mon Sep 17 00:00:00 2001 From: Pravus Date: Thu, 2 Nov 2023 11:16:51 +0100 Subject: [PATCH 13/15] feat: sdk7 ui input submit (#5864) * Added new NavigationSubmitEvent to UiInput's TextField VisualElement to output a UiInpuResult component with the new isSubmit bool in true. Allowed keys for submitting are only Return/Enter and keypad's Return/Enter. * Added textfield clearing on submit * Fixed and re-enabled some Ui component tests including UiInput --- scripts/package-lock.json | 14 +- scripts/package.json | 2 +- .../UIAbstractElements/AssemblyInfo.cs | 2 +- ...CSComponents.AbstractElements.Tests.asmdef | 36 -- ...CSComponents.AbstractElements.Tests.asmref | 3 + ...onents.AbstractElements.Tests.asmref.meta} | 0 .../Tests/UIComponentsShouldBase.cs | 4 + .../Tests/UIElementRegisterBaseShould.cs | 10 +- .../UIBackground/AssemblyInfo.cs | 2 +- ...CL.ECSComponents.UIBackground.Tests.asmdef | 37 -- ...CL.ECSComponents.UIBackground.Tests.asmref | 3 + ...Components.UIBackground.Tests.asmref.meta} | 0 .../UIComponentsUtils/AssemblyInfo.cs | 2 +- ...SComponents.UIComponentsUtils.Tests.asmdef | 39 -- ...SComponents.UIComponentsUtils.Tests.asmref | 3 + ...nents.UIComponentsUtils.Tests.asmref.meta} | 0 .../UIComponentsUtils/UIPointerEventsUtils.cs | 9 +- .../ECSComponents/UIDropdown/AssemblyInfo.cs | 2 +- .../DCL.ECSComponents.UIDropdown.Tests.asmdef | 37 -- .../DCL.ECSComponents.UIDropdown.Tests.asmref | 3 + ...CSComponents.UIDropdown.Tests.asmref.meta} | 0 .../ECSComponents/UIInput/AssemblyInfo.cs | 2 +- .../DCL.ECSComponents.UIInput.Tests.asmdef | 38 -- .../DCL.ECSComponents.UIInput.Tests.asmref | 3 + ...L.ECSComponents.UIInput.Tests.asmref.meta} | 0 .../UIInput/Tests/UIInputHandlerShould.cs | 41 +- .../ECSComponents/UIInput/UIInputHandler.cs | 45 ++- .../ECS7.Systems.UIInputSender.Tests.asmdef | 45 --- .../ECS7.Systems.UIInputSender.Tests.asmref | 3 + ...7.Systems.UIInputSender.Tests.asmref.meta} | 0 .../ECS7/Tests/ECS7Plugin.Tests.asmdef | 11 +- .../ECS7/UIElements/Image/AssemblyInfo.cs | 2 +- .../DCL/DecentralandProtocol/Analytics.gen.cs | 374 +----------------- .../kernel_services/AnalyticsService.gen.cs | 3 - .../ClientAnalyticsService.gen.cs | 7 - .../DecentralandProtocol/UiInputResult.gen.cs | 64 ++- 36 files changed, 204 insertions(+), 642 deletions(-) delete mode 100644 unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/DCL.ECSComponents.AbstractElements.Tests.asmdef create mode 100644 unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/DCL.ECSComponents.AbstractElements.Tests.asmref rename unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/{DCL.ECSComponents.AbstractElements.Tests.asmdef.meta => DCL.ECSComponents.AbstractElements.Tests.asmref.meta} (100%) delete mode 100644 unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/Tests/DCL.ECSComponents.UIBackground.Tests.asmdef create mode 100644 unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/Tests/DCL.ECSComponents.UIBackground.Tests.asmref rename unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/Tests/{DCL.ECSComponents.UIBackground.Tests.asmdef.meta => DCL.ECSComponents.UIBackground.Tests.asmref.meta} (100%) delete mode 100644 unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/Tests/DCL.ECSComponents.UIComponentsUtils.Tests.asmdef create mode 100644 unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/Tests/DCL.ECSComponents.UIComponentsUtils.Tests.asmref rename unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/Tests/{DCL.ECSComponents.UIComponentsUtils.Tests.asmdef.meta => DCL.ECSComponents.UIComponentsUtils.Tests.asmref.meta} (100%) delete mode 100644 unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/Tests/DCL.ECSComponents.UIDropdown.Tests.asmdef create mode 100644 unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/Tests/DCL.ECSComponents.UIDropdown.Tests.asmref rename unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/Tests/{DCL.ECSComponents.UIDropdown.Tests.asmdef.meta => DCL.ECSComponents.UIDropdown.Tests.asmref.meta} (100%) delete mode 100644 unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/DCL.ECSComponents.UIInput.Tests.asmdef create mode 100644 unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/DCL.ECSComponents.UIInput.Tests.asmref rename unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/{DCL.ECSComponents.UIInput.Tests.asmdef.meta => DCL.ECSComponents.UIInput.Tests.asmref.meta} (100%) delete mode 100644 unity-renderer/Assets/DCLPlugins/ECS7/Systems/UIInputSenderSystem/Tests/ECS7.Systems.UIInputSender.Tests.asmdef create mode 100644 unity-renderer/Assets/DCLPlugins/ECS7/Systems/UIInputSenderSystem/Tests/ECS7.Systems.UIInputSender.Tests.asmref rename unity-renderer/Assets/DCLPlugins/ECS7/Systems/UIInputSenderSystem/Tests/{ECS7.Systems.UIInputSender.Tests.asmdef.meta => ECS7.Systems.UIInputSender.Tests.asmref.meta} (100%) diff --git a/scripts/package-lock.json b/scripts/package-lock.json index 9ee3765a50..7bae886467 100644 --- a/scripts/package-lock.json +++ b/scripts/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "Apache-2.0", "dependencies": { - "@dcl/protocol": "^1.0.0-6590614146.commit-db4a595", + "@dcl/protocol": "^1.0.0-6725457366.commit-d6b2b77", "@protobuf-ts/protoc": "^2.8.2", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.0.1", @@ -36,9 +36,9 @@ } }, "node_modules/@dcl/protocol": { - "version": "1.0.0-6590614146.commit-db4a595", - "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-6590614146.commit-db4a595.tgz", - "integrity": "sha512-BaLAj9GPiAz/S4oNSgD28oEfdsDviDZgDOL8kPoZ+6NQ6H4FjnHTVr1AS7Sy7Evw1K77l3OfPPMjwN1IvaIygw==", + "version": "1.0.0-6725457366.commit-d6b2b77", + "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-6725457366.commit-d6b2b77.tgz", + "integrity": "sha512-hZQxkoBTsNamu6kpbRtT7QAg4yIa7qF/ZAsfDM3OR0KtbKxYtxsat5dQ2KnjUm6JEMefphonoL9PIR0wOJYrFA==", "dependencies": { "@dcl/ts-proto": "1.154.0" } @@ -569,9 +569,9 @@ } }, "@dcl/protocol": { - "version": "1.0.0-6590614146.commit-db4a595", - "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-6590614146.commit-db4a595.tgz", - "integrity": "sha512-BaLAj9GPiAz/S4oNSgD28oEfdsDviDZgDOL8kPoZ+6NQ6H4FjnHTVr1AS7Sy7Evw1K77l3OfPPMjwN1IvaIygw==", + "version": "1.0.0-6725457366.commit-d6b2b77", + "resolved": "https://registry.npmjs.org/@dcl/protocol/-/protocol-1.0.0-6725457366.commit-d6b2b77.tgz", + "integrity": "sha512-hZQxkoBTsNamu6kpbRtT7QAg4yIa7qF/ZAsfDM3OR0KtbKxYtxsat5dQ2KnjUm6JEMefphonoL9PIR0wOJYrFA==", "requires": { "@dcl/ts-proto": "1.154.0" } diff --git a/scripts/package.json b/scripts/package.json index d0158af217..13bdf86025 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -16,7 +16,7 @@ "typescript": "^4.2.3" }, "dependencies": { - "@dcl/protocol": "^1.0.0-6590614146.commit-db4a595", + "@dcl/protocol": "^1.0.0-6725457366.commit-d6b2b77", "@protobuf-ts/protoc": "^2.8.2", "@types/fs-extra": "^11.0.1", "@types/glob": "^8.0.1", diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/AssemblyInfo.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/AssemblyInfo.cs index dd705837e6..166b1af15a 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/AssemblyInfo.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/AssemblyInfo.cs @@ -1,2 +1,2 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("DCL.ECSComponents.AbstractElements.Tests")] +[assembly: InternalsVisibleTo("ECS7Plugin.Tests")] diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/DCL.ECSComponents.AbstractElements.Tests.asmdef b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/DCL.ECSComponents.AbstractElements.Tests.asmdef deleted file mode 100644 index c9f177dc27..0000000000 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/DCL.ECSComponents.AbstractElements.Tests.asmdef +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "DCL.ECSComponents.AbstractElements.Tests", - "rootNamespace": "", - "references": [ - "GUID:27619889b8ba8c24980f49ee34dbb44a", - "GUID:0acc523941302664db1f4e527237feb3", - "GUID:f3eba44237ea4969b29674e332426425", - "GUID:9cccce9925d3495d8a5e4fa5b25f54a5", - "GUID:9b110c16a6b8f4d54ae0f56af2163334", - "GUID:97d8897529779cb49bebd400c7f402a6", - "GUID:1dd0780aa6be12b428c8005d0bee46b8", - "GUID:37d2c04574c1d480d8c817e2a7c578e7", - "GUID:1fa4d2c8ae751fb46a83e1fdc59823dc", - "GUID:f8a3a0af3ed28474c885e04c605a7962", - "GUID:4bd423f6dceb67540b5c246ca8cf789b", - "GUID:7eb48a6a47db4795bdee44a726fa8338", - "GUID:3c7b57a14671040bd8c549056adc04f5" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll", - "NSubstitute.dll", - "Google.Protobuf.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/DCL.ECSComponents.AbstractElements.Tests.asmref b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/DCL.ECSComponents.AbstractElements.Tests.asmref new file mode 100644 index 0000000000..97e7f8980d --- /dev/null +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/DCL.ECSComponents.AbstractElements.Tests.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:f8afb582bba443878c19a3bf4e7d83c0" +} \ No newline at end of file diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/DCL.ECSComponents.AbstractElements.Tests.asmdef.meta b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/DCL.ECSComponents.AbstractElements.Tests.asmref.meta similarity index 100% rename from unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/DCL.ECSComponents.AbstractElements.Tests.asmdef.meta rename to unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/DCL.ECSComponents.AbstractElements.Tests.asmref.meta diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/UIComponentsShouldBase.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/UIComponentsShouldBase.cs index dcca64c0aa..d08693e464 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/UIComponentsShouldBase.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/UIComponentsShouldBase.cs @@ -61,6 +61,9 @@ public void SetUp() if (!uiDoc.rootVisualElement.Contains(internalCompData.Value.model.rootElement)) uiDoc.rootVisualElement.Add(internalCompData.Value.model.rootElement); }); + + var serviceLocator = ServiceLocatorTestFactory.CreateMocked(); + Environment.Setup(serviceLocator); } protected static UIDocument InstantiateUiDocument() => @@ -70,6 +73,7 @@ protected static UIDocument InstantiateUiDocument() => public void TearDown() { sceneTestHelper.Dispose(); + Environment.Dispose(); } } } diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/UIElementRegisterBaseShould.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/UIElementRegisterBaseShould.cs index 0f46ae066e..67274f13f6 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/UIElementRegisterBaseShould.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIAbstractElements/Tests/UIElementRegisterBaseShould.cs @@ -29,12 +29,20 @@ public void RegisterSetUp() (COMPONENT_ID, RESULT_COMPONENT_ID, factory, writer, internalUiContainer, handlerBuilder); } + [TearDown] + public void RegisterTearDown() + { + factory.ClearReceivedCalls(); + writer.ClearReceivedCalls(); + register.ClearReceivedCalls(); + } + [Test] public void AddDeserializer() { factory.Received(1) .AddOrReplaceComponent(COMPONENT_ID, - Arg.Any>(), default); + (o) => { return new PBUiBackground(); }, default); Assert.IsTrue(factory.componentBuilders.TryGetValue(COMPONENT_ID, out var componentBuilder)); Assert.AreEqual(typeof(ECSComponent), componentBuilder().GetType()); diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/AssemblyInfo.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/AssemblyInfo.cs index d90e944b33..439cda3eb9 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/AssemblyInfo.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/AssemblyInfo.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("DCL.ECSComponents.UIBackground.Tests")] +[assembly: InternalsVisibleTo("ECS7Plugin.Tests")] diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/Tests/DCL.ECSComponents.UIBackground.Tests.asmdef b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/Tests/DCL.ECSComponents.UIBackground.Tests.asmdef deleted file mode 100644 index 2ea6115ecc..0000000000 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/Tests/DCL.ECSComponents.UIBackground.Tests.asmdef +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "DCL.ECSComponents.UIBackground.Tests", - "references": [ - "GUID:f3eba44237ea4969b29674e332426425", - "GUID:9cccce9925d3495d8a5e4fa5b25f54a5", - "GUID:97d8897529779cb49bebd400c7f402a6", - "GUID:9b110c16a6b8f4d54ae0f56af2163334", - "GUID:37d2c04574c1d480d8c817e2a7c578e7", - "GUID:1dd0780aa6be12b428c8005d0bee46b8", - "GUID:e30cc2f9ee2c45df93dbb8f7f826792f", - "GUID:4bd423f6dceb67540b5c246ca8cf789b", - "GUID:a881b57670b1d2747a6d7f9e32b63230", - "GUID:d8d40e815f1e74d4f821388b7c13bf78", - "GUID:a3ceb534947fac14da25035bc5c24788", - "GUID:1fa4d2c8ae751fb46a83e1fdc59823dc", - "GUID:59c9e1ae4a4a61c43b19957ad3bfbaf7", - "GUID:091c556278214ab49cfdc87549e3135c", - "GUID:3c7b57a14671040bd8c549056adc04f5" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll", - "NSubstitute.dll", - "System.Threading.Tasks.Extensions.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/Tests/DCL.ECSComponents.UIBackground.Tests.asmref b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/Tests/DCL.ECSComponents.UIBackground.Tests.asmref new file mode 100644 index 0000000000..97e7f8980d --- /dev/null +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/Tests/DCL.ECSComponents.UIBackground.Tests.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:f8afb582bba443878c19a3bf4e7d83c0" +} \ No newline at end of file diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/Tests/DCL.ECSComponents.UIBackground.Tests.asmdef.meta b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/Tests/DCL.ECSComponents.UIBackground.Tests.asmref.meta similarity index 100% rename from unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/Tests/DCL.ECSComponents.UIBackground.Tests.asmdef.meta rename to unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIBackground/Tests/DCL.ECSComponents.UIBackground.Tests.asmref.meta diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/AssemblyInfo.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/AssemblyInfo.cs index 74982b5ee3..439cda3eb9 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/AssemblyInfo.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/AssemblyInfo.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("DCL.ECSComponents.UIComponentsUtils.Tests")] +[assembly: InternalsVisibleTo("ECS7Plugin.Tests")] diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/Tests/DCL.ECSComponents.UIComponentsUtils.Tests.asmdef b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/Tests/DCL.ECSComponents.UIComponentsUtils.Tests.asmdef deleted file mode 100644 index d2b4a86811..0000000000 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/Tests/DCL.ECSComponents.UIComponentsUtils.Tests.asmdef +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "DCL.ECSComponents.UIComponentsUtils.Tests", - "rootNamespace": "", - "references": [ - "GUID:f3eba44237ea4969b29674e332426425", - "GUID:97d8897529779cb49bebd400c7f402a6", - "GUID:9b110c16a6b8f4d54ae0f56af2163334", - "GUID:37d2c04574c1d480d8c817e2a7c578e7", - "GUID:1dd0780aa6be12b428c8005d0bee46b8", - "GUID:a3f19928bfc54c8ca5660ce7ba0c4d75", - "GUID:4bd423f6dceb67540b5c246ca8cf789b", - "GUID:a881b57670b1d2747a6d7f9e32b63230", - "GUID:a3ceb534947fac14da25035bc5c24788", - "GUID:d8d40e815f1e74d4f821388b7c13bf78", - "GUID:4cbefd453333a0b4dbf7e4045dacb0bd", - "GUID:1fa4d2c8ae751fb46a83e1fdc59823dc", - "GUID:c29054c91fb4463193b37a04e2e85515", - "GUID:3c7b57a14671040bd8c549056adc04f5", - "GUID:acb0f5633d7c47aba96ee6b61c872d94", - "GUID:9cccce9925d3495d8a5e4fa5b25f54a5" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll", - "NSubstitute.dll", - "Google.Protobuf.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/Tests/DCL.ECSComponents.UIComponentsUtils.Tests.asmref b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/Tests/DCL.ECSComponents.UIComponentsUtils.Tests.asmref new file mode 100644 index 0000000000..97e7f8980d --- /dev/null +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/Tests/DCL.ECSComponents.UIComponentsUtils.Tests.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:f8afb582bba443878c19a3bf4e7d83c0" +} \ No newline at end of file diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/Tests/DCL.ECSComponents.UIComponentsUtils.Tests.asmdef.meta b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/Tests/DCL.ECSComponents.UIComponentsUtils.Tests.asmref.meta similarity index 100% rename from unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/Tests/DCL.ECSComponents.UIComponentsUtils.Tests.asmdef.meta rename to unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/Tests/DCL.ECSComponents.UIComponentsUtils.Tests.asmref.meta diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/UIPointerEventsUtils.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/UIPointerEventsUtils.cs index 35bbf69ea6..dc0a74f1e8 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/UIPointerEventsUtils.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIComponentsUtils/UIPointerEventsUtils.cs @@ -2,7 +2,6 @@ using DCL.ECS7.ComponentWrapper; using DCL.ECS7.InternalComponents; using DCL.Models; -using Google.Protobuf; using System; using System.Collections.Generic; using UnityEngine.UIElements; @@ -23,8 +22,12 @@ public static EventCallback RegisterFeedback( EventCallback callback = evt => { var model = inputResults.GetFor(scene, entity)?.model ?? new InternalUIInputResults(new Queue()); - model.Results.Enqueue(new InternalUIInputResults.Result(createResult(evt), resultComponentId)); - inputResults.PutFor(scene, entity, model); + var result = createResult(evt); + if (result != null) + { + model.Results.Enqueue(new InternalUIInputResults.Result(result, resultComponentId)); + inputResults.PutFor(scene, entity, model); + } }; uiElement.RegisterCallback(callback); diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/AssemblyInfo.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/AssemblyInfo.cs index 95ebbaea37..439cda3eb9 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/AssemblyInfo.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/AssemblyInfo.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("DCL.ECSComponents.UIDropdown.Tests")] +[assembly: InternalsVisibleTo("ECS7Plugin.Tests")] diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/Tests/DCL.ECSComponents.UIDropdown.Tests.asmdef b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/Tests/DCL.ECSComponents.UIDropdown.Tests.asmdef deleted file mode 100644 index 21d879a9a1..0000000000 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/Tests/DCL.ECSComponents.UIDropdown.Tests.asmdef +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "DCL.ECSComponents.UIDropdown.Tests", - "rootNamespace": "", - "references": [ - "GUID:f3eba44237ea4969b29674e332426425", - "GUID:97d8897529779cb49bebd400c7f402a6", - "GUID:9b110c16a6b8f4d54ae0f56af2163334", - "GUID:37d2c04574c1d480d8c817e2a7c578e7", - "GUID:1dd0780aa6be12b428c8005d0bee46b8", - "GUID:4bd423f6dceb67540b5c246ca8cf789b", - "GUID:a881b57670b1d2747a6d7f9e32b63230", - "GUID:a3ceb534947fac14da25035bc5c24788", - "GUID:d8d40e815f1e74d4f821388b7c13bf78", - "GUID:1fa4d2c8ae751fb46a83e1fdc59823dc", - "GUID:02760f41040d3ef4c8652916aad15b45", - "GUID:3c7b57a14671040bd8c549056adc04f5", - "GUID:acb0f5633d7c47aba96ee6b61c872d94", - "GUID:9cccce9925d3495d8a5e4fa5b25f54a5" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll", - "NSubstitute.dll", - "Google.Protobuf.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/Tests/DCL.ECSComponents.UIDropdown.Tests.asmref b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/Tests/DCL.ECSComponents.UIDropdown.Tests.asmref new file mode 100644 index 0000000000..8f11f09ff9 --- /dev/null +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/Tests/DCL.ECSComponents.UIDropdown.Tests.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:f8afb582bba443878c19a3bf4e7d83c0" +} \ No newline at end of file diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/Tests/DCL.ECSComponents.UIDropdown.Tests.asmdef.meta b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/Tests/DCL.ECSComponents.UIDropdown.Tests.asmref.meta similarity index 100% rename from unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/Tests/DCL.ECSComponents.UIDropdown.Tests.asmdef.meta rename to unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIDropdown/Tests/DCL.ECSComponents.UIDropdown.Tests.asmref.meta diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/AssemblyInfo.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/AssemblyInfo.cs index 792dee2a82..439cda3eb9 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/AssemblyInfo.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/AssemblyInfo.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("DCL.ECSComponents.UIInput.Tests")] +[assembly: InternalsVisibleTo("ECS7Plugin.Tests")] diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/DCL.ECSComponents.UIInput.Tests.asmdef b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/DCL.ECSComponents.UIInput.Tests.asmdef deleted file mode 100644 index 86756addb6..0000000000 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/DCL.ECSComponents.UIInput.Tests.asmdef +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "DCL.ECSComponents.UIInput.Tests", - "rootNamespace": "", - "references": [ - "GUID:f3eba44237ea4969b29674e332426425", - "GUID:9cccce9925d3495d8a5e4fa5b25f54a5", - "GUID:97d8897529779cb49bebd400c7f402a6", - "GUID:9b110c16a6b8f4d54ae0f56af2163334", - "GUID:37d2c04574c1d480d8c817e2a7c578e7", - "GUID:1dd0780aa6be12b428c8005d0bee46b8", - "GUID:a3f19928bfc54c8ca5660ce7ba0c4d75", - "GUID:4bd423f6dceb67540b5c246ca8cf789b", - "GUID:a881b57670b1d2747a6d7f9e32b63230", - "GUID:a3ceb534947fac14da25035bc5c24788", - "GUID:d8d40e815f1e74d4f821388b7c13bf78", - "GUID:4cbefd453333a0b4dbf7e4045dacb0bd", - "GUID:1fa4d2c8ae751fb46a83e1fdc59823dc", - "GUID:3c7b57a14671040bd8c549056adc04f5", - "GUID:acb0f5633d7c47aba96ee6b61c872d94" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll", - "NSubstitute.dll", - "Google.Protobuf.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/DCL.ECSComponents.UIInput.Tests.asmref b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/DCL.ECSComponents.UIInput.Tests.asmref new file mode 100644 index 0000000000..97e7f8980d --- /dev/null +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/DCL.ECSComponents.UIInput.Tests.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:f8afb582bba443878c19a3bf4e7d83c0" +} \ No newline at end of file diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/DCL.ECSComponents.UIInput.Tests.asmdef.meta b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/DCL.ECSComponents.UIInput.Tests.asmref.meta similarity index 100% rename from unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/DCL.ECSComponents.UIInput.Tests.asmdef.meta rename to unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/DCL.ECSComponents.UIInput.Tests.asmref.meta diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/UIInputHandlerShould.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/UIInputHandlerShould.cs index 9bc795c040..100c831ae2 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/UIInputHandlerShould.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/Tests/UIInputHandlerShould.cs @@ -1,6 +1,6 @@ -using DCL.ECS7.ComponentWrapper; +using DCL.ECS7; +using DCL.ECS7.ComponentWrapper; using DCL.ECS7.ComponentWrapper.Generic; -using DCL.ECS7.InternalComponents; using DCL.ECSComponents.UIAbstractElements.Tests; using Decentraland.Common; using NUnit.Framework; @@ -9,7 +9,6 @@ namespace DCL.ECSComponents.UIInput.Tests { - [Category("Flaky")] public class UIInputHandlerShould : UIComponentsShouldBase { private const int COMPONENT_ID = 1001; @@ -22,7 +21,6 @@ public class UIInputHandlerShould : UIComponentsShouldBase public void CreateHandler() { pool = new WrappedComponentPool>(0, () => new ProtobufWrappedComponent(new PBUiInputResult())); - handler = new UIInputHandler( internalUiContainer, RESULT_COMPONENT_ID, @@ -33,7 +31,13 @@ public void CreateHandler() ); } - [Test][Category("ToFix")] + [TearDown] + public void TearDown() + { + handler.OnComponentRemoved(scene, entity); + } + + [Test] [TestCase(false)] [TestCase(true)] public void ConformToSchema(bool useTextValue) @@ -51,18 +55,18 @@ public void ConformToSchema(bool useTextValue) Assert.AreEqual("PLACEHOLDER", handler.uiElement.text); } - [Test][Category("ToFix")] - public void EmitResult() + [Test] + public void EmitOnChangeInputResult() { const string TEST_VALUE = "TEST_TEXT"; + UpdateComponentModel(); + + Assert.IsFalse(ContainsInputResult(TEST_VALUE)); + handler.uiElement.value = TEST_VALUE; - var result = pool.Get(); - result.WrappedComponent.Model.Value = TEST_VALUE; - Assert.Contains( - new InternalUIInputResults.Result(result, RESULT_COMPONENT_ID), - uiInputResults.Results); + Assert.IsTrue(ContainsInputResult(TEST_VALUE)); } [Test] @@ -92,6 +96,19 @@ private void UpdateComponentModel(bool useTextValueProperty = false) handler.OnComponentModelUpdated(scene, entity, model); } + + private bool ContainsInputResult(string targetTextValue, bool targetSubmitValue = false) + { + foreach (var inputResult in uiInputResults.Results) + { + if (inputResult.Message.WrappedComponentBase is IWrappedComponent comp + && inputResult.ComponentId == RESULT_COMPONENT_ID + && comp.Model.Value == targetTextValue + && comp.Model.IsSubmit == targetSubmitValue) return true; + } + + return false; + } } } diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/UIInputHandler.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/UIInputHandler.cs index c4a89866ee..2e63d46db4 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/UIInputHandler.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIInput/UIInputHandler.cs @@ -7,6 +7,7 @@ using DCL.ECSRuntime; using DCL.Models; using DCL.UIElements; +using UnityEngine; using UnityEngine.UIElements; namespace DCL.ECSComponents.UIInput @@ -23,8 +24,9 @@ public class UIInputHandler : UIElementHandlerBase, IECSComponentHandler> componentPool; private EventCallback> onValueChanged; + private EventCallback onSubmit; - internal TextField uiElement { get; private set; } + public TextField uiElement { get; private set; } internal TextFieldPlaceholder placeholder { get; private set; } @@ -56,24 +58,59 @@ public void OnComponentCreated(IParcelScene scene, IDCLEntity entity) onValueChanged = UIPointerEventsUtils .RegisterFeedback> (inputResults, - CreateInputResult, + CreateOnChangeInputResult, + scene, + entity, + uiElement, + resultComponentId); + + // We don't use because that one is called a lot more and is + // triggered twice for some reason (probably a unity bug) + onSubmit = UIPointerEventsUtils + .RegisterFeedback + (inputResults, + CreateOnSubmitInputResult, scene, entity, uiElement, resultComponentId); } - private IPooledWrappedComponent CreateInputResult(ChangeEvent onValueChange) + private IPooledWrappedComponent CreateOnChangeInputResult(ChangeEvent evt) { + evt.StopPropagation(); + var componentPooled = componentPool.Get(); var componentModel = componentPooled.WrappedComponent.Model; - componentModel.Value = onValueChange.newValue; + componentModel.Value = uiElement.value; + componentModel.IsSubmit = false; + return componentPooled; + } + + private IPooledWrappedComponent CreateOnSubmitInputResult(NavigationSubmitEvent evt) + { + evt.StopPropagation(); + + // Space-bar is also detected as a navigation "submit" event + if (evt.shiftKey || evt.altKey || evt.ctrlKey || evt.commandKey + || (!Input.GetKeyDown(KeyCode.Return) && !Input.GetKeyDown(KeyCode.KeypadEnter))) + return null; + + var componentPooled = componentPool.Get(); + var componentModel = componentPooled.WrappedComponent.Model; + componentModel.Value = uiElement.value; + componentModel.IsSubmit = true; + + // Clear text field without triggering its onChange event + uiElement.SetValueWithoutNotify(string.Empty); + return componentPooled; } public void OnComponentRemoved(IParcelScene scene, IDCLEntity entity) { uiElement.UnregisterFeedback(onValueChanged); + uiElement.UnregisterFeedback(onSubmit); RemoveElementFromRoot(scene, entity, uiElement); uiElement = null; fontUpdater.Dispose(); diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/Systems/UIInputSenderSystem/Tests/ECS7.Systems.UIInputSender.Tests.asmdef b/unity-renderer/Assets/DCLPlugins/ECS7/Systems/UIInputSenderSystem/Tests/ECS7.Systems.UIInputSender.Tests.asmdef deleted file mode 100644 index ead540cacb..0000000000 --- a/unity-renderer/Assets/DCLPlugins/ECS7/Systems/UIInputSenderSystem/Tests/ECS7.Systems.UIInputSender.Tests.asmdef +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "ECS7.Systems.UIInputSender.Tests", - "rootNamespace": "", - "references": [ - "GUID:f3eba44237ea4969b29674e332426425", - "GUID:1dd0780aa6be12b428c8005d0bee46b8", - "GUID:a881b57670b1d2747a6d7f9e32b63230", - "GUID:3b80b0b562b1cbc489513f09fc1b8f69", - "GUID:9cccce9925d3495d8a5e4fa5b25f54a5", - "GUID:37d2c04574c1d480d8c817e2a7c578e7", - "GUID:f8a3a0af3ed28474c885e04c605a7962", - "GUID:3f9bd7dfada994a3ca114055e53e2c1f", - "GUID:8796c22c84974ce385f8d79b1ae08e1b", - "GUID:5c497d137ccf6054880aae69dbaea398", - "GUID:77b2ad1d87ef4cfb82003d8a3fa9cb3b", - "GUID:4bd423f6dceb67540b5c246ca8cf789b", - "GUID:97d8897529779cb49bebd400c7f402a6", - "GUID:f334064a9ed3462091d1b06f9e981366", - "GUID:ac62e852826a4b36aeb22931dad73edb", - "GUID:9b110c16a6b8f4d54ae0f56af2163334", - "GUID:d8d40e815f1e74d4f821388b7c13bf78", - "GUID:1e10040ab6604cbe8ad0921047d49e65", - "GUID:3c7b57a14671040bd8c549056adc04f5", - "GUID:acb0f5633d7c47aba96ee6b61c872d94", - "GUID:dfe945c84f5740b79615bed3c57f6118", - "GUID:7eb48a6a47db4795bdee44a726fa8338" - ], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": true, - "precompiledReferences": [ - "nunit.framework.dll", - "NSubstitute.dll", - "Google.Protobuf.dll" - ], - "autoReferenced": false, - "defineConstraints": [ - "UNITY_INCLUDE_TESTS" - ], - "versionDefines": [], - "noEngineReferences": false -} \ No newline at end of file diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/Systems/UIInputSenderSystem/Tests/ECS7.Systems.UIInputSender.Tests.asmref b/unity-renderer/Assets/DCLPlugins/ECS7/Systems/UIInputSenderSystem/Tests/ECS7.Systems.UIInputSender.Tests.asmref new file mode 100644 index 0000000000..97e7f8980d --- /dev/null +++ b/unity-renderer/Assets/DCLPlugins/ECS7/Systems/UIInputSenderSystem/Tests/ECS7.Systems.UIInputSender.Tests.asmref @@ -0,0 +1,3 @@ +{ + "reference": "GUID:f8afb582bba443878c19a3bf4e7d83c0" +} \ No newline at end of file diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/Systems/UIInputSenderSystem/Tests/ECS7.Systems.UIInputSender.Tests.asmdef.meta b/unity-renderer/Assets/DCLPlugins/ECS7/Systems/UIInputSenderSystem/Tests/ECS7.Systems.UIInputSender.Tests.asmref.meta similarity index 100% rename from unity-renderer/Assets/DCLPlugins/ECS7/Systems/UIInputSenderSystem/Tests/ECS7.Systems.UIInputSender.Tests.asmdef.meta rename to unity-renderer/Assets/DCLPlugins/ECS7/Systems/UIInputSenderSystem/Tests/ECS7.Systems.UIInputSender.Tests.asmref.meta diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/Tests/ECS7Plugin.Tests.asmdef b/unity-renderer/Assets/DCLPlugins/ECS7/Tests/ECS7Plugin.Tests.asmdef index 7cc8f3b459..f3680695e9 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/Tests/ECS7Plugin.Tests.asmdef +++ b/unity-renderer/Assets/DCLPlugins/ECS7/Tests/ECS7Plugin.Tests.asmdef @@ -77,7 +77,16 @@ "GUID:933da198fac7c00489424e7b953fe8b1", "GUID:691ba36162f94224faace1706408a72c", "GUID:e55bb9116cf54f04a57453fc981dc81d", - "GUID:cd4c1c51b9a395144a2550a24a6c496c" + "GUID:cd4c1c51b9a395144a2550a24a6c496c", + "GUID:d8d40e815f1e74d4f821388b7c13bf78", + "GUID:4cbefd453333a0b4dbf7e4045dacb0bd", + "GUID:1fa4d2c8ae751fb46a83e1fdc59823dc", + "GUID:02760f41040d3ef4c8652916aad15b45", + "GUID:c29054c91fb4463193b37a04e2e85515", + "GUID:e30cc2f9ee2c45df93dbb8f7f826792f", + "GUID:091c556278214ab49cfdc87549e3135c", + "GUID:f334064a9ed3462091d1b06f9e981366", + "GUID:59c9e1ae4a4a61c43b19957ad3bfbaf7" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/UIElements/Image/AssemblyInfo.cs b/unity-renderer/Assets/DCLPlugins/ECS7/UIElements/Image/AssemblyInfo.cs index 6665bc5a59..f81204788d 100644 --- a/unity-renderer/Assets/DCLPlugins/ECS7/UIElements/Image/AssemblyInfo.cs +++ b/unity-renderer/Assets/DCLPlugins/ECS7/UIElements/Image/AssemblyInfo.cs @@ -1,5 +1,5 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("DCL.ECS7.UIElements.Image.Tests")] -[assembly: InternalsVisibleTo("DCL.ECSComponents.UIBackground.Tests")] +[assembly: InternalsVisibleTo("ECS7Plugin.Tests")] diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/Analytics.gen.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/Analytics.gen.cs index 7e37326dd2..7939b03a71 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/Analytics.gen.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/Analytics.gen.cs @@ -52,23 +52,18 @@ static AnalyticsReflection() { "cnR5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCSJ4ChVBbmFseXRpY3NF", "dmVudFJlcXVlc3QSEgoKZXZlbnRfbmFtZRgBIAEoCRJLCgpwcm9wZXJ0aWVz", "GAIgAygLMjcuZGVjZW50cmFsYW5kLnJlbmRlcmVyLmtlcm5lbF9zZXJ2aWNl", - "cy5BbmFseXRpY1Byb3BlcnR5IhgKFkFuYWx5dGljc0V2ZW50UmVzcG9uc2Ui", - "KQoWRGVsaWdodGVkU3VydmV5UmVxdWVzdBIPCgdlbmFibGVkGAEgASgIIhkK", - "F0RlbGlnaHRlZFN1cnZleVJlc3BvbnNlMvwEChZBbmFseXRpY3NLZXJuZWxT", - "ZXJ2aWNlEpgBChFQZXJmb3JtYW5jZVJlcG9ydBI/LmRlY2VudHJhbGFuZC5y", - "ZW5kZXJlci5rZXJuZWxfc2VydmljZXMuUGVyZm9ybWFuY2VSZXBvcnRSZXF1", - "ZXN0GkAuZGVjZW50cmFsYW5kLnJlbmRlcmVyLmtlcm5lbF9zZXJ2aWNlcy5Q", - "ZXJmb3JtYW5jZVJlcG9ydFJlc3BvbnNlIgASlQEKEFN5c3RlbUluZm9SZXBv", - "cnQSPi5kZWNlbnRyYWxhbmQucmVuZGVyZXIua2VybmVsX3NlcnZpY2VzLlN5", - "c3RlbUluZm9SZXBvcnRSZXF1ZXN0Gj8uZGVjZW50cmFsYW5kLnJlbmRlcmVy", - "Lmtlcm5lbF9zZXJ2aWNlcy5TeXN0ZW1JbmZvUmVwb3J0UmVzcG9uc2UiABKP", - "AQoOQW5hbHl0aWNzRXZlbnQSPC5kZWNlbnRyYWxhbmQucmVuZGVyZXIua2Vy", - "bmVsX3NlcnZpY2VzLkFuYWx5dGljc0V2ZW50UmVxdWVzdBo9LmRlY2VudHJh", - "bGFuZC5yZW5kZXJlci5rZXJuZWxfc2VydmljZXMuQW5hbHl0aWNzRXZlbnRS", - "ZXNwb25zZSIAEpwBChlTZXREZWxpZ2h0ZWRTdXJ2ZXlFbmFibGVkEj0uZGVj", - "ZW50cmFsYW5kLnJlbmRlcmVyLmtlcm5lbF9zZXJ2aWNlcy5EZWxpZ2h0ZWRT", - "dXJ2ZXlSZXF1ZXN0Gj4uZGVjZW50cmFsYW5kLnJlbmRlcmVyLmtlcm5lbF9z", - "ZXJ2aWNlcy5EZWxpZ2h0ZWRTdXJ2ZXlSZXNwb25zZSIAYgZwcm90bzM=")); + "cy5BbmFseXRpY1Byb3BlcnR5IhgKFkFuYWx5dGljc0V2ZW50UmVzcG9uc2Uy", + "3QMKFkFuYWx5dGljc0tlcm5lbFNlcnZpY2USmAEKEVBlcmZvcm1hbmNlUmVw", + "b3J0Ej8uZGVjZW50cmFsYW5kLnJlbmRlcmVyLmtlcm5lbF9zZXJ2aWNlcy5Q", + "ZXJmb3JtYW5jZVJlcG9ydFJlcXVlc3QaQC5kZWNlbnRyYWxhbmQucmVuZGVy", + "ZXIua2VybmVsX3NlcnZpY2VzLlBlcmZvcm1hbmNlUmVwb3J0UmVzcG9uc2Ui", + "ABKVAQoQU3lzdGVtSW5mb1JlcG9ydBI+LmRlY2VudHJhbGFuZC5yZW5kZXJl", + "ci5rZXJuZWxfc2VydmljZXMuU3lzdGVtSW5mb1JlcG9ydFJlcXVlc3QaPy5k", + "ZWNlbnRyYWxhbmQucmVuZGVyZXIua2VybmVsX3NlcnZpY2VzLlN5c3RlbUlu", + "Zm9SZXBvcnRSZXNwb25zZSIAEo8BCg5BbmFseXRpY3NFdmVudBI8LmRlY2Vu", + "dHJhbGFuZC5yZW5kZXJlci5rZXJuZWxfc2VydmljZXMuQW5hbHl0aWNzRXZl", + "bnRSZXF1ZXN0Gj0uZGVjZW50cmFsYW5kLnJlbmRlcmVyLmtlcm5lbF9zZXJ2", + "aWNlcy5BbmFseXRpY3NFdmVudFJlc3BvbnNlIgBiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { @@ -78,9 +73,7 @@ static AnalyticsReflection() { new pbr::GeneratedClrTypeInfo(typeof(global::Decentraland.Renderer.KernelServices.SystemInfoReportResponse), global::Decentraland.Renderer.KernelServices.SystemInfoReportResponse.Parser, null, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Decentraland.Renderer.KernelServices.AnalyticProperty), global::Decentraland.Renderer.KernelServices.AnalyticProperty.Parser, new[]{ "Key", "Value" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Decentraland.Renderer.KernelServices.AnalyticsEventRequest), global::Decentraland.Renderer.KernelServices.AnalyticsEventRequest.Parser, new[]{ "EventName", "Properties" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Decentraland.Renderer.KernelServices.AnalyticsEventResponse), global::Decentraland.Renderer.KernelServices.AnalyticsEventResponse.Parser, null, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Decentraland.Renderer.KernelServices.DelightedSurveyRequest), global::Decentraland.Renderer.KernelServices.DelightedSurveyRequest.Parser, new[]{ "Enabled" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::Decentraland.Renderer.KernelServices.DelightedSurveyResponse), global::Decentraland.Renderer.KernelServices.DelightedSurveyResponse.Parser, null, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Decentraland.Renderer.KernelServices.AnalyticsEventResponse), global::Decentraland.Renderer.KernelServices.AnalyticsEventResponse.Parser, null, null, null, null, null) })); } #endregion @@ -2436,347 +2429,6 @@ public void MergeFrom(pb::CodedInputStream input) { } - public sealed partial class DelightedSurveyRequest : pb::IMessage - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - , pb::IBufferMessage - #endif - { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new DelightedSurveyRequest()); - private pb::UnknownFieldSet _unknownFields; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pbr::MessageDescriptor Descriptor { - get { return global::Decentraland.Renderer.KernelServices.AnalyticsReflection.Descriptor.MessageTypes[7]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public DelightedSurveyRequest() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public DelightedSurveyRequest(DelightedSurveyRequest other) : this() { - enabled_ = other.enabled_; - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public DelightedSurveyRequest Clone() { - return new DelightedSurveyRequest(this); - } - - /// Field number for the "enabled" field. - public const int EnabledFieldNumber = 1; - private bool enabled_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool Enabled { - get { return enabled_; } - set { - enabled_ = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override bool Equals(object other) { - return Equals(other as DelightedSurveyRequest); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool Equals(DelightedSurveyRequest other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - if (Enabled != other.Enabled) return false; - return Equals(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override int GetHashCode() { - int hash = 1; - if (Enabled != false) hash ^= Enabled.GetHashCode(); - if (_unknownFields != null) { - hash ^= _unknownFields.GetHashCode(); - } - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void WriteTo(pb::CodedOutputStream output) { - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - output.WriteRawMessage(this); - #else - if (Enabled != false) { - output.WriteRawTag(8); - output.WriteBool(Enabled); - } - if (_unknownFields != null) { - _unknownFields.WriteTo(output); - } - #endif - } - - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - if (Enabled != false) { - output.WriteRawTag(8); - output.WriteBool(Enabled); - } - if (_unknownFields != null) { - _unknownFields.WriteTo(ref output); - } - } - #endif - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public int CalculateSize() { - int size = 0; - if (Enabled != false) { - size += 1 + 1; - } - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(DelightedSurveyRequest other) { - if (other == null) { - return; - } - if (other.Enabled != false) { - Enabled = other.Enabled; - } - _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(pb::CodedInputStream input) { - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - input.ReadRawMessage(this); - #else - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); - break; - case 8: { - Enabled = input.ReadBool(); - break; - } - } - } - #endif - } - - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); - break; - case 8: { - Enabled = input.ReadBool(); - break; - } - } - } - } - #endif - - } - - public sealed partial class DelightedSurveyResponse : pb::IMessage - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - , pb::IBufferMessage - #endif - { - private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new DelightedSurveyResponse()); - private pb::UnknownFieldSet _unknownFields; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pb::MessageParser Parser { get { return _parser; } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public static pbr::MessageDescriptor Descriptor { - get { return global::Decentraland.Renderer.KernelServices.AnalyticsReflection.Descriptor.MessageTypes[8]; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - pbr::MessageDescriptor pb::IMessage.Descriptor { - get { return Descriptor; } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public DelightedSurveyResponse() { - OnConstruction(); - } - - partial void OnConstruction(); - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public DelightedSurveyResponse(DelightedSurveyResponse other) : this() { - _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public DelightedSurveyResponse Clone() { - return new DelightedSurveyResponse(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override bool Equals(object other) { - return Equals(other as DelightedSurveyResponse); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public bool Equals(DelightedSurveyResponse other) { - if (ReferenceEquals(other, null)) { - return false; - } - if (ReferenceEquals(other, this)) { - return true; - } - return Equals(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override int GetHashCode() { - int hash = 1; - if (_unknownFields != null) { - hash ^= _unknownFields.GetHashCode(); - } - return hash; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public override string ToString() { - return pb::JsonFormatter.ToDiagnosticString(this); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void WriteTo(pb::CodedOutputStream output) { - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - output.WriteRawMessage(this); - #else - if (_unknownFields != null) { - _unknownFields.WriteTo(output); - } - #endif - } - - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { - if (_unknownFields != null) { - _unknownFields.WriteTo(ref output); - } - } - #endif - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public int CalculateSize() { - int size = 0; - if (_unknownFields != null) { - size += _unknownFields.CalculateSize(); - } - return size; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(DelightedSurveyResponse other) { - if (other == null) { - return; - } - _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - public void MergeFrom(pb::CodedInputStream input) { - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - input.ReadRawMessage(this); - #else - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); - break; - } - } - #endif - } - - #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] - void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) { - uint tag; - while ((tag = input.ReadTag()) != 0) { - switch(tag) { - default: - _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input); - break; - } - } - } - #endif - - } - #endregion } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/Decentraland/renderer/kernel_services/AnalyticsService.gen.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/Decentraland/renderer/kernel_services/AnalyticsService.gen.cs index b96d7af9d5..a7f305b874 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/Decentraland/renderer/kernel_services/AnalyticsService.gen.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/Decentraland/renderer/kernel_services/AnalyticsService.gen.cs @@ -18,8 +18,6 @@ public interface IAnalyticsKernelService UniTask AnalyticsEvent(AnalyticsEventRequest request, Context context, CancellationToken ct); - UniTask SetDelightedSurveyEnabled(DelightedSurveyRequest request, Context context, CancellationToken ct); - } public static class AnalyticsKernelServiceCodeGen @@ -33,7 +31,6 @@ public static void RegisterService(RpcServerPort port, IAnalyt result.definition.Add("PerformanceReport", async (payload, context, ct) => { var res = await service.PerformanceReport(PerformanceReportRequest.Parser.ParseFrom(payload), context, ct); return res?.ToByteString(); }); result.definition.Add("SystemInfoReport", async (payload, context, ct) => { var res = await service.SystemInfoReport(SystemInfoReportRequest.Parser.ParseFrom(payload), context, ct); return res?.ToByteString(); }); result.definition.Add("AnalyticsEvent", async (payload, context, ct) => { var res = await service.AnalyticsEvent(AnalyticsEventRequest.Parser.ParseFrom(payload), context, ct); return res?.ToByteString(); }); - result.definition.Add("SetDelightedSurveyEnabled", async (payload, context, ct) => { var res = await service.SetDelightedSurveyEnabled(DelightedSurveyRequest.Parser.ParseFrom(payload), context, ct); return res?.ToByteString(); }); port.RegisterModule(ServiceName, (port) => UniTask.FromResult(result)); } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/Decentraland/renderer/kernel_services/ClientAnalyticsService.gen.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/Decentraland/renderer/kernel_services/ClientAnalyticsService.gen.cs index d8574828c0..ba03b1d33e 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/Decentraland/renderer/kernel_services/ClientAnalyticsService.gen.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/Decentraland/renderer/kernel_services/ClientAnalyticsService.gen.cs @@ -14,8 +14,6 @@ public interface IClientAnalyticsKernelService UniTask SystemInfoReport(SystemInfoReportRequest request); UniTask AnalyticsEvent(AnalyticsEventRequest request); - - UniTask SetDelightedSurveyEnabled(DelightedSurveyRequest request); } public class ClientAnalyticsKernelService : IClientAnalyticsKernelService @@ -43,10 +41,5 @@ public UniTask AnalyticsEvent(AnalyticsEventRequest requ return module.CallUnaryProcedure("AnalyticsEvent", request); } - public UniTask SetDelightedSurveyEnabled(DelightedSurveyRequest request) - { - return module.CallUnaryProcedure("SetDelightedSurveyEnabled", request); - } - } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiInputResult.gen.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiInputResult.gen.cs index f71c549904..b44e890d00 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiInputResult.gen.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiInputResult.gen.cs @@ -25,13 +25,14 @@ static UiInputResultReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "CjFkZWNlbnRyYWxhbmQvc2RrL2NvbXBvbmVudHMvdWlfaW5wdXRfcmVzdWx0", - "LnByb3RvEhtkZWNlbnRyYWxhbmQuc2RrLmNvbXBvbmVudHMiIAoPUEJVaUlu", - "cHV0UmVzdWx0Eg0KBXZhbHVlGAEgASgJQhSqAhFEQ0wuRUNTQ29tcG9uZW50", - "c2IGcHJvdG8z")); + "LnByb3RvEhtkZWNlbnRyYWxhbmQuc2RrLmNvbXBvbmVudHMiRgoPUEJVaUlu", + "cHV0UmVzdWx0Eg0KBXZhbHVlGAEgASgJEhYKCWlzX3N1Ym1pdBgCIAEoCEgA", + "iAEBQgwKCl9pc19zdWJtaXRCFKoCEURDTC5FQ1NDb21wb25lbnRzYgZwcm90", + "bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::DCL.ECSComponents.PBUiInputResult), global::DCL.ECSComponents.PBUiInputResult.Parser, new[]{ "Value" }, null, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::DCL.ECSComponents.PBUiInputResult), global::DCL.ECSComponents.PBUiInputResult.Parser, new[]{ "Value", "IsSubmit" }, new[]{ "IsSubmit" }, null, null, null) })); } #endregion @@ -45,6 +46,7 @@ public sealed partial class PBUiInputResult : pb::IMessage { private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new PBUiInputResult()); private pb::UnknownFieldSet _unknownFields; + private int _hasBits0; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public static pb::MessageParser Parser { get { return _parser; } } @@ -72,7 +74,9 @@ public PBUiInputResult() { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public PBUiInputResult(PBUiInputResult other) : this() { + _hasBits0 = other._hasBits0; value_ = other.value_; + isSubmit_ = other.isSubmit_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -94,6 +98,34 @@ public string Value { } } + /// Field number for the "is_submit" field. + public const int IsSubmitFieldNumber = 2; + private bool isSubmit_; + /// + /// default: false + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool IsSubmit { + get { if ((_hasBits0 & 1) != 0) { return isSubmit_; } else { return false; } } + set { + _hasBits0 |= 1; + isSubmit_ = value; + } + } + /// Gets whether the "is_submit" field is set + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public bool HasIsSubmit { + get { return (_hasBits0 & 1) != 0; } + } + /// Clears the value of the "is_submit" field + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] + public void ClearIsSubmit() { + _hasBits0 &= ~1; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] public override bool Equals(object other) { @@ -110,6 +142,7 @@ public bool Equals(PBUiInputResult other) { return true; } if (Value != other.Value) return false; + if (IsSubmit != other.IsSubmit) return false; return Equals(_unknownFields, other._unknownFields); } @@ -118,6 +151,7 @@ public bool Equals(PBUiInputResult other) { public override int GetHashCode() { int hash = 1; if (Value.Length != 0) hash ^= Value.GetHashCode(); + if (HasIsSubmit) hash ^= IsSubmit.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -140,6 +174,10 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(10); output.WriteString(Value); } + if (HasIsSubmit) { + output.WriteRawTag(16); + output.WriteBool(IsSubmit); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -154,6 +192,10 @@ public void WriteTo(pb::CodedOutputStream output) { output.WriteRawTag(10); output.WriteString(Value); } + if (HasIsSubmit) { + output.WriteRawTag(16); + output.WriteBool(IsSubmit); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -167,6 +209,9 @@ public int CalculateSize() { if (Value.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(Value); } + if (HasIsSubmit) { + size += 1 + 1; + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -182,6 +227,9 @@ public void MergeFrom(PBUiInputResult other) { if (other.Value.Length != 0) { Value = other.Value; } + if (other.HasIsSubmit) { + IsSubmit = other.IsSubmit; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -201,6 +249,10 @@ public void MergeFrom(pb::CodedInputStream input) { Value = input.ReadString(); break; } + case 16: { + IsSubmit = input.ReadBool(); + break; + } } } #endif @@ -220,6 +272,10 @@ public void MergeFrom(pb::CodedInputStream input) { Value = input.ReadString(); break; } + case 16: { + IsSubmit = input.ReadBool(); + break; + } } } } From 103124b0be03664eeb80f359f48668d9ada7003d Mon Sep 17 00:00:00 2001 From: Nicolas Lorusso <56365551+lorux0@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:25:56 -0300 Subject: [PATCH 14/15] fix: base wearables loading from incorrect catalyst (#5890) --- .../DCL/UserProfile/UserProfileController.cs | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfileController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfileController.cs index 3b6baa223e..4a5ecd1245 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfileController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/UserProfile/UserProfileController.cs @@ -1,11 +1,9 @@ using Cysharp.Threading.Tasks; using DCL.Interface; using DCL.UserProfiles; -using DCLServices.WearablesCatalogService; using System; using JetBrains.Annotations; using System.Collections.Generic; -using System.Linq; using System.Threading; using UnityEngine; @@ -22,7 +20,6 @@ public class UserProfileController : MonoBehaviour private readonly Dictionary> pendingUserProfileTasks = new (StringComparer.OrdinalIgnoreCase); private readonly Dictionary> saveProfileTask = new (); private readonly List linkList = new (); - private bool baseWearablesAlreadyRequested; public static UserProfileDictionary userProfilesCatalog { @@ -50,25 +47,9 @@ public void Awake() [PublicAPI] public void LoadProfile(string payload) { - async UniTaskVoid RequestBaseWearablesAsync(CancellationToken ct) - { - try - { - await DCL.Environment.i.serviceLocator.Get().RequestBaseWearablesAsync(ct); - } - catch (Exception e) - { - OnBaseWereablesFail?.Invoke(); - Debug.LogError(e.Message); - } - } - - if (!baseWearablesAlreadyRequested) - { - baseWearablesAlreadyRequested = true; - RequestBaseWearablesAsync(CancellationToken.None).Forget(); - } - + // We used to request base wearables here but it raises race condition issues + // The current realm is not set yet thus ends up requesting wearables to an incorrect catalyst's content url + // Resolving inconsistent wearables information if (payload == null) return; From b7aa0c53a53a07bbb4593373f2582a71c71ef5ef Mon Sep 17 00:00:00 2001 From: Santi Andrade Date: Fri, 3 Nov 2023 17:46:21 +0100 Subject: [PATCH 15/15] feat: simplify terms of service and email subscription (#5810) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Implement SignUp mode for the Backpack * Implement SignUp mode for the Backpack (II) * Modify next steps (SignupHUD) to become only one * Minor fixes * Implement links to “Terms of Service” and “Privacy Policy” * Encapsulate FF string into constants * Create new section “Email notifications” in Account Settings * Create new section “Email notifications” in Account Settings (II) * Update SignupHUDV2.prefab * Minor updates * Set the name input focused by default * Visual fixes for the Backpack's sign up header * fix: The name is not being set correctly after the sign up process * Play wave emote when we click on NEXT in the Backpack * Fix transition between ToS and the loading screen * Update categories backpack icons * Update NftTypeIcons.asset * Update NFTTypesIcons.asset * Update mouse icons * Revert "Update mouse icons" This reverts commit fd4187b5e94a75a770703f543cc251fb11ffe936. * Update mouse textures * Update mouse hints color and copies * Fix colors for base wearables in the passport * Update warning texture. Fix icon position in warning noti. * Update button component color animation * Polish SignupHUD2 UI * Update textures (add, rename, relocate) * Update toast VRM icon * Add icons to my account section buttons * Update MyAccountSectionHUD.prefab * Send email to Beehiiv * Update SubscriptionsAPIClient.cs * Relocate and rename radial gradient assets * Create new background * Manage email status in my account * Update SubscriptionsAPIClient.cs * Manage email in MyAccount section * Update SignupHUDV2.prefab * Update email assets * Create confirmation pop-up for updating email * Update SignupHUDV2.prefab * Store Beehiiv TokenID into a secret environment variable * Add temporal debug logs * Revert "Add temporal debug logs" This reverts commit 532c3286d215a7a139fea2d661689e452eb832d0. * Revert "Store Beehiiv TokenID into a secret environment variable" This reverts commit 42868c9e3165ea10b11bbe3e2a2731576c2deeb4. * Update UpdateEmailConfirmationHUD.prefab * Use subscribe endpoint from builder-server * Update unsubscribe modal copy * Update disclaimer icon and fix input left margin * Polish backpack nav bar * Update orange container color * Use delete and get endpoints from builder-server * Make avatar loading bigger * Point subscriptions url to.org * Implement new metric click_onboarding_jump_in * Update metric passport_edit_profile * Create empty state for the sign in flow during the avatar customization step * When editing the email field in account settings the carret blinking and the outline grey container are missing * Avatar customization: turn off the image texture of the WearablesSection game object * The icon of the jump into dcl button doesn't look disable * Add spinner animation in the email input after processing an update * Remove click_onboarding_jump_in metric * Add animations for the transitions in the sign up flow * Make the avatar be saved after the last step in the signup flow * Update BackpackEditorHUDController.cs * Update BackpackEditorHUDController.cs * Don't clean form between transitions * Add missing character limit error detail * Fix color toggle highlight missing texture * Fix corner radius size of the color picker sliders * Remove from "Final details" the mouse hints on the bottom left corner * Update SignupHUDControllerShould.cs --------- Signed-off-by: Santi Andrade Co-authored-by: Romina Marchetti --- .../AssetGroups/HUDs.asset | 10 + .../AssetGroups/MyAccount.asset | 13 + .../SignupHUDPlugin/SignupHUDPlugin.asmdef | 7 +- .../SignupHUDPlugin/SignupHUDPlugin.cs | 53 +- .../DCLServices/SubscriptionsAPIService.meta | 3 + .../CreateSubscriptionPayload.cs | 11 + .../CreateSubscriptionPayload.cs.meta | 3 + .../SubscriptionAPIResponse.cs | 33 + .../SubscriptionAPIResponse.cs.meta | 3 + .../SubscriptionsAPIClient.cs | 81 + .../SubscriptionsAPIClient.cs.meta | 3 + .../SubscriptionsAPIService.asmdef | 20 + .../SubscriptionsAPIService.asmdef.meta | 3 + .../SubscriptionsAPIService.cs | 34 + .../SubscriptionsAPIService.cs.meta | 3 + .../INewUserExperienceAnalytics.cs | 4 +- .../NewUserExperienceAnalytics.cs | 18 +- .../SocialAnalytics/ISocialAnalytics.cs | 8 +- .../SocialAnalytics/SocialAnalytics.cs | 3 +- .../SocialAnalytics/SocialAnalyticsTypes.cs | 1 + .../Prefabs/ColorPickerPanel.prefab | 115 +- .../Resources/ColorToggle.prefab | 10 +- .../AvatarSlot/NftTypeIcons.asset | 36 +- .../BackpackEditorHUDController.cs | 103 +- .../BackpackEditorHUDV2.asmdef | 3 +- .../BackpackEditorHUDV2ComponentView.cs | 68 + .../IBackpackEditorHUDView.cs | 10 +- .../Prefabs/WearablesSection.prefab | 348 +- .../Resources/BackpackEditorHUDV2.prefab | 2145 +++++++++- .../BackpackEditorHUDControllerShould.cs | 42 +- .../Tests/WearableGridComponentViewShould.cs | 7 +- .../WearableGridComponentView.cs | 5 +- .../WearableGridController.cs | 3 +- .../EmailNotificationsComponentView.cs | 121 + .../EmailNotificationsComponentView.cs.meta | 3 + .../EmailNotificationsController.cs | 257 ++ .../EmailNotificationsController.cs.meta | 3 + .../IEmailNotificationsComponentView.cs | 23 + .../IEmailNotificationsComponentView.cs.meta | 3 + .../IMyAccountSectionHUDComponentView.cs | 10 +- ...UpdateEmailConfirmationHUDComponentView.cs | 13 + ...eEmailConfirmationHUDComponentView.cs.meta | 3 + .../HUD/MyAccountHUD/MyAccountHUD.asmdef | 4 +- .../HUD/MyAccountHUD/MyAccountPlugin.cs | 18 +- .../MyAccountSectionHUDComponentView.cs | 73 + .../MyAccountSectionHUDController.cs | 7 +- .../MyAccountHUD/MyProfileComponentView.cs | 18 +- .../HUD/MyAccountHUD/MyProfileController.cs | 2 +- .../Prefabs/EmailNotifications.prefab | 2619 ++++++++++++ .../Prefabs/EmailNotifications.prefab.meta | 7 + .../Prefabs/MyAccountSectionHUD.prefab | 3475 +++++++++++++--- .../Prefabs/UpdateEmailConfirmationHUD.prefab | 1265 ++++++ .../UpdateEmailConfirmationHUD.prefab.meta | 7 + .../Tests/MyProfileControllerShould.cs | 2 +- ...UpdateEmailConfirmationHUDComponentView.cs | 59 + ...eEmailConfirmationHUDComponentView.cs.meta | 3 + .../Prefabs/WarningNotification.prefab | 6 +- .../Passport/NFTIcons/NFTIconComponentView.cs | 2 +- .../NFTIcons/NFTTypeIconsAndColors.cs | 11 + .../HUD/Passport/NFTIcons/NFTTypesIcons.asset | 34 +- .../HUD/ProfileHUD/ProfileHUDController.cs | 2 +- .../HUD/SignupHUD/SignupHUD.asmdef | 11 +- .../HUD/SignupHUD/SignupHUDController.cs | 72 +- .../HUD/SignupHUD/SignupHUDV2.prefab | 3696 +++++++++++++++++ .../HUD/SignupHUD/SignupHUDV2.prefab.meta | 7 + .../HUD/SignupHUD/SignupHUDV2View.cs | 168 + .../HUD/SignupHUD/SignupHUDV2View.cs.meta | 3 + .../HUD/SignupHUD/SignupHUDView.cs | 2 + .../Tests/SignupHUDControllerShould.cs | 26 +- .../HUD/SignupHUD/Tests/SignupHUDTests.asmdef | 5 +- .../DCL/DataStore/DataStore_MyAccount.cs | 1 + .../ServiceLocatorFactory.asmdef | 3 +- .../ServiceLocatorFactory.cs | 2 + .../BackpackTextures/EmptyCategoryImg.png | 3 + .../EmptyCategoryImg.png.meta | 127 + .../BackpackTextures/EyewareIcon.png | 4 +- .../{MustacheIcon.png => FacialHairIcon.png} | 0 ...eIcon.png.meta => FacialHairIcon.png.meta} | 11 +- .../BackpackV2/BackpackTextures/HatIcon.png | 4 +- .../BackpackTextures/HelmetIcon.png | 4 +- .../BackpackV2/BackpackTextures/MaskIcon.png | 4 +- .../BackpackV2/BackpackTextures/MouthIcon.png | 4 +- .../BackpackV2/BackpackTextures/SkinsIcon.png | 4 +- .../BackpackV2/BackpackTextures/TiaraIcon.png | 4 +- .../BackpackTextures/TopheadIcon.png | 4 +- .../Assets/Textures/UI/Common/CheckIcn.png | 4 +- .../Textures/UI/Common/CheckIcn.png.meta | 29 +- .../UI/Common/CheckmarkContainerIcn.png | 3 + .../CheckmarkContainerIcn.png.meta} | 29 +- .../Textures/UI/Common/LeftClickIcn.png | 4 +- ...ialGradient.png => RadialGradientHard.png} | 0 ...t.png.meta => RadialGradientHard.png.meta} | 0 .../Textures/UI/Common/RadialGradientSoft.png | 3 + .../RadialGradientSoft.png.meta} | 0 .../Textures/UI/Common/RightClickIcn.png | 4 +- .../Assets/Textures/UI/Common/ScrollIcn.png | 3 + .../{WheelIcn.png.meta => ScrollIcn.png.meta} | 0 .../Assets/Textures/UI/Common/WarningIcn.png | 4 +- .../Assets/Textures/UI/Common/WheelIcn.png | 3 - .../Assets/Textures/UI/MyAccount/CheckIcn.png | 3 - .../Textures/UI/MyAccount/EmailDeleteIcn.png | 3 + .../UI/MyAccount/EmailDeleteIcn.png.meta | 127 + .../Textures/UI/MyAccount/EmailWarningIcn.png | 3 + .../UI/MyAccount/EmailWarningIcn.png.meta | 127 + .../Assets/Textures/UI/MyAccount/Envelope.png | 3 + .../Textures/UI/MyAccount/Envelope.png.meta | 127 + .../Passport/PassportIcons/RadialGradient.png | 3 - .../UIComponents/Prefabs/Button_Common.prefab | 6 +- .../UIComponents/Prefabs/ColorPicker.prefab | 40 +- .../Prefabs/Helpers/ColorToggle.prefab | 6 +- 110 files changed, 15038 insertions(+), 924 deletions(-) create mode 100644 unity-renderer/Assets/DCLServices/SubscriptionsAPIService.meta create mode 100644 unity-renderer/Assets/DCLServices/SubscriptionsAPIService/CreateSubscriptionPayload.cs create mode 100644 unity-renderer/Assets/DCLServices/SubscriptionsAPIService/CreateSubscriptionPayload.cs.meta create mode 100644 unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionAPIResponse.cs create mode 100644 unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionAPIResponse.cs.meta create mode 100644 unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIClient.cs create mode 100644 unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIClient.cs.meta create mode 100644 unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.asmdef create mode 100644 unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.asmdef.meta create mode 100644 unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.cs create mode 100644 unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.cs.meta create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsComponentView.cs create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsComponentView.cs.meta create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsController.cs create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsController.cs.meta create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IEmailNotificationsComponentView.cs create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IEmailNotificationsComponentView.cs.meta create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IUpdateEmailConfirmationHUDComponentView.cs create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IUpdateEmailConfirmationHUDComponentView.cs.meta create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/EmailNotifications.prefab create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/EmailNotifications.prefab.meta create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/UpdateEmailConfirmationHUD.prefab create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/UpdateEmailConfirmationHUD.prefab.meta create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/UpdateEmailConfirmationHUDComponentView.cs create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/UpdateEmailConfirmationHUDComponentView.cs.meta create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2.prefab create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2.prefab.meta create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2View.cs create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2View.cs.meta create mode 100644 unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/EmptyCategoryImg.png create mode 100644 unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/EmptyCategoryImg.png.meta rename unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/{MustacheIcon.png => FacialHairIcon.png} (100%) rename unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/{MustacheIcon.png.meta => FacialHairIcon.png.meta} (93%) mode change 100644 => 100755 unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/HatIcon.png mode change 100644 => 100755 unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/HelmetIcon.png mode change 100644 => 100755 unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/MouthIcon.png mode change 100644 => 100755 unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/TiaraIcon.png mode change 100644 => 100755 unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/TopheadIcon.png create mode 100644 unity-renderer/Assets/Textures/UI/Common/CheckmarkContainerIcn.png rename unity-renderer/Assets/Textures/UI/{MyAccount/CheckIcn.png.meta => Common/CheckmarkContainerIcn.png.meta} (88%) rename unity-renderer/Assets/Textures/UI/Common/{RadialGradient.png => RadialGradientHard.png} (100%) rename unity-renderer/Assets/Textures/UI/Common/{RadialGradient.png.meta => RadialGradientHard.png.meta} (100%) create mode 100644 unity-renderer/Assets/Textures/UI/Common/RadialGradientSoft.png rename unity-renderer/Assets/Textures/UI/{Passport/PassportIcons/RadialGradient.png.meta => Common/RadialGradientSoft.png.meta} (100%) create mode 100755 unity-renderer/Assets/Textures/UI/Common/ScrollIcn.png rename unity-renderer/Assets/Textures/UI/Common/{WheelIcn.png.meta => ScrollIcn.png.meta} (100%) delete mode 100755 unity-renderer/Assets/Textures/UI/Common/WheelIcn.png delete mode 100644 unity-renderer/Assets/Textures/UI/MyAccount/CheckIcn.png create mode 100644 unity-renderer/Assets/Textures/UI/MyAccount/EmailDeleteIcn.png create mode 100644 unity-renderer/Assets/Textures/UI/MyAccount/EmailDeleteIcn.png.meta create mode 100644 unity-renderer/Assets/Textures/UI/MyAccount/EmailWarningIcn.png create mode 100644 unity-renderer/Assets/Textures/UI/MyAccount/EmailWarningIcn.png.meta create mode 100644 unity-renderer/Assets/Textures/UI/MyAccount/Envelope.png create mode 100644 unity-renderer/Assets/Textures/UI/MyAccount/Envelope.png.meta delete mode 100644 unity-renderer/Assets/Textures/UI/Passport/PassportIcons/RadialGradient.png diff --git a/unity-renderer/Assets/AddressableAssetsData/AssetGroups/HUDs.asset b/unity-renderer/Assets/AddressableAssetsData/AssetGroups/HUDs.asset index a5814b8e34..0ad38f6c4f 100644 --- a/unity-renderer/Assets/AddressableAssetsData/AssetGroups/HUDs.asset +++ b/unity-renderer/Assets/AddressableAssetsData/AssetGroups/HUDs.asset @@ -21,22 +21,32 @@ MonoBehaviour: m_Address: SignupHUD m_ReadOnly: 0 m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 8eeaa25ae02fb784e9b14ed71aae12f5 m_Address: HelpAndSupportHUD m_ReadOnly: 0 m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 987f12680f06c40d0a902d4004a36e3c m_Address: NotificationHUD m_ReadOnly: 0 m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 9945fbc075d76034b8836c6068943390 m_Address: WalletSectionHUD m_ReadOnly: 0 m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: d73178a7da1894086b95f324c67f7d69 m_Address: ExperiencesConfirmationPopup m_ReadOnly: 0 m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 66b5961c332b383448f2a142ed0a3dea + m_Address: SignupHUDV2 + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 436e0d4fdc1cdfa4aaef13be2e8bcef8, type: 2} m_SchemaSet: diff --git a/unity-renderer/Assets/AddressableAssetsData/AssetGroups/MyAccount.asset b/unity-renderer/Assets/AddressableAssetsData/AssetGroups/MyAccount.asset index 050d3738a7..faa739e592 100644 --- a/unity-renderer/Assets/AddressableAssetsData/AssetGroups/MyAccount.asset +++ b/unity-renderer/Assets/AddressableAssetsData/AssetGroups/MyAccount.asset @@ -21,34 +21,47 @@ MonoBehaviour: m_Address: MyAccountSectionHUD m_ReadOnly: 0 m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 99407e78aaf4f4651bbc1994d3727d5a m_Address: ProfileCountries m_ReadOnly: 0 m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: b9abce1a9234047fab509631245558ea m_Address: ProfileEmploymentStatus m_ReadOnly: 0 m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 853a257eba7a74f4db47236ae49f29b4 m_Address: ProfileGenders m_ReadOnly: 0 m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 6282385abcabb43899e02dc2c3640283 m_Address: ProfileLanguages m_ReadOnly: 0 m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: a3bcd7e62b195469a9b3e1dcc1ee39b8 m_Address: ProfilePronouns m_ReadOnly: 0 m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 2352ca3d532b4418ea29122f66f04d51 m_Address: ProfileRelationshipStatus m_ReadOnly: 0 m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 158b9f8b14ee641fab8eccc25b314376 m_Address: ProfileSexualOrientations m_ReadOnly: 0 m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 2bc8f09d15597c54eafedcf481d7c2fa + m_Address: UpdateEmailConfirmationHUD + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 436e0d4fdc1cdfa4aaef13be2e8bcef8, type: 2} m_SchemaSet: diff --git a/unity-renderer/Assets/DCLPlugins/SignupHUDPlugin/SignupHUDPlugin.asmdef b/unity-renderer/Assets/DCLPlugins/SignupHUDPlugin/SignupHUDPlugin.asmdef index 9ec28c2295..69296e26ba 100644 --- a/unity-renderer/Assets/DCLPlugins/SignupHUDPlugin/SignupHUDPlugin.asmdef +++ b/unity-renderer/Assets/DCLPlugins/SignupHUDPlugin/SignupHUDPlugin.asmdef @@ -10,7 +10,12 @@ "GUID:0663fad624d836944b40ae27c3414652", "GUID:28f74c468a54948bfa9f625c5d428f56", "GUID:f51ebe6a0ceec4240a699833d6309b23", - "GUID:3b80b0b562b1cbc489513f09fc1b8f69" + "GUID:3b80b0b562b1cbc489513f09fc1b8f69", + "GUID:1e6b57fe78f7b724e9567f29f6a40c2c", + "GUID:2995626b54c60644988f134a69a77450", + "GUID:4d7712e4b2446440a8af21fd3ce8690e", + "GUID:c31f144fbfb54890960a05fca4149e56", + "GUID:1de3566cccb280f4a982c59ad0d08c96" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/unity-renderer/Assets/DCLPlugins/SignupHUDPlugin/SignupHUDPlugin.cs b/unity-renderer/Assets/DCLPlugins/SignupHUDPlugin/SignupHUDPlugin.cs index 95e6bff895..b20425692f 100644 --- a/unity-renderer/Assets/DCLPlugins/SignupHUDPlugin/SignupHUDPlugin.cs +++ b/unity-renderer/Assets/DCLPlugins/SignupHUDPlugin/SignupHUDPlugin.cs @@ -1,13 +1,19 @@ using Cysharp.Threading.Tasks; using DCL; +using DCL.Browser; using DCL.Providers; +using DCLServices.SubscriptionsAPIService; using SignupHUD; namespace DCLPlugins.SignupHUDPlugin { public class SignupHUDPlugin : IPlugin { + private const string NEW_TOS_AND_EMAIL_SUBSCRIPTION_FF = "new_terms_of_service_and_email_subscription"; private const string SIGNUP_HUD = "SignupHUD"; + private const string SIGNUP_HUD_V2 = "SignupHUDV2"; + + private BaseVariable featureFlags => DataStore.i.featureFlags.flags; private SignupHUDController controller; @@ -18,18 +24,49 @@ public SignupHUDPlugin() private async UniTaskVoid Initialize() { - var assetsProvider = DCL.Environment.i.platform.serviceLocator.Get(); - var analytics = DCL.Environment.i.platform.serviceProviders.analytics; - var loadingScreenDataStore = DataStore.i.Get(); - var hudsDataStore = DataStore.i.HUDs; - - var view = await assetsProvider.Instantiate(SIGNUP_HUD, $"_{SIGNUP_HUD}"); - controller = new SignupHUDController(analytics, view, loadingScreenDataStore, hudsDataStore); - controller.Initialize(); + if (!featureFlags.Get().IsInitialized) + featureFlags.OnChange += OnFeatureFlagsChanged; + else + OnFeatureFlagsChanged(featureFlags.Get()); + } + + private void OnFeatureFlagsChanged(FeatureFlag current, FeatureFlag _ = null) + { + async UniTaskVoid InitializeController() + { + var assetsProvider = DCL.Environment.i.platform.serviceLocator.Get(); + var analytics = DCL.Environment.i.platform.serviceProviders.analytics; + var loadingScreenDataStore = DataStore.i.Get(); + var hudsDataStore = DataStore.i.HUDs; + var featureFlagDataStore = DataStore.i.Get(); + var browserBridge = new WebInterfaceBrowserBridge(); + var subscriptionsAPIService = Environment.i.serviceLocator.Get(); + var userProfileWebInterfaceBridge = new UserProfileWebInterfaceBridge(); + + bool isNewTermsOfServiceAndEmailSubscriptionEnabled = current.IsFeatureEnabled(NEW_TOS_AND_EMAIL_SUBSCRIPTION_FF); + var view = await assetsProvider.Instantiate( + isNewTermsOfServiceAndEmailSubscriptionEnabled ? SIGNUP_HUD_V2 : SIGNUP_HUD, + $"_{(isNewTermsOfServiceAndEmailSubscriptionEnabled ? SIGNUP_HUD_V2 : SIGNUP_HUD)}"); + + controller = new SignupHUDController( + analytics, + view, + loadingScreenDataStore, + hudsDataStore, + featureFlagDataStore, + browserBridge, + subscriptionsAPIService); + + controller.Initialize(); + } + + featureFlags.OnChange -= OnFeatureFlagsChanged; + InitializeController().Forget(); } public void Dispose() { + featureFlags.OnChange -= OnFeatureFlagsChanged; controller?.Dispose(); } } diff --git a/unity-renderer/Assets/DCLServices/SubscriptionsAPIService.meta b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService.meta new file mode 100644 index 0000000000..033f390139 --- /dev/null +++ b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 51bc50521a2f4630a2acae0659d25702 +timeCreated: 1697804931 \ No newline at end of file diff --git a/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/CreateSubscriptionPayload.cs b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/CreateSubscriptionPayload.cs new file mode 100644 index 0000000000..e97102bb5e --- /dev/null +++ b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/CreateSubscriptionPayload.cs @@ -0,0 +1,11 @@ +using System; + +namespace DCLServices.SubscriptionsAPIService +{ + [Serializable] + public class CreateSubscriptionPayload + { + public string email; + public string source; + } +} diff --git a/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/CreateSubscriptionPayload.cs.meta b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/CreateSubscriptionPayload.cs.meta new file mode 100644 index 0000000000..1f0aaa7956 --- /dev/null +++ b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/CreateSubscriptionPayload.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f7f3ff0dbe4c403885a834efcd361234 +timeCreated: 1697805618 \ No newline at end of file diff --git a/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionAPIResponse.cs b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionAPIResponse.cs new file mode 100644 index 0000000000..f7130f2c94 --- /dev/null +++ b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionAPIResponse.cs @@ -0,0 +1,33 @@ +using System; + +namespace DCLServices.SubscriptionsAPIService +{ + [Serializable] + public class SubscriptionAPIResponse + { + public bool ok; + public SubscriptionData data; + } + + [Serializable] + public class SubscriptionData + { + public Subscription data; + } + + [Serializable] + public class Subscription + { + public string id; + public string email; + public string status; + public string created; + public string subscription_tier; + public string utm_source; + public string utm_medium; + public string utm_channel; + public string utm_campaign; + public string referring_site; + public string referral_code; + } +} diff --git a/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionAPIResponse.cs.meta b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionAPIResponse.cs.meta new file mode 100644 index 0000000000..f03466c7a8 --- /dev/null +++ b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionAPIResponse.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9ecf24bb02124f129f52ece7f7b92669 +timeCreated: 1697806071 \ No newline at end of file diff --git a/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIClient.cs b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIClient.cs new file mode 100644 index 0000000000..32b7a48ea4 --- /dev/null +++ b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIClient.cs @@ -0,0 +1,81 @@ +using Cysharp.Threading.Tasks; +using DCL; +using DCL.Helpers; +using System; +using System.Collections.Generic; +using System.Threading; +using UnityEngine; +using UnityEngine.Networking; + +namespace DCLServices.SubscriptionsAPIService +{ + public interface ISubscriptionsAPIClient + { + UniTask CreateSubscription(string email, CancellationToken ct); + UniTask DeleteSubscription(string subscriptionId, CancellationToken ct); + UniTask GetSubscription(string subscriptionId, CancellationToken ct); + } + + public class SubscriptionsAPIClient : ISubscriptionsAPIClient + { + private const string UTM_SOURCE = "explorer"; + private const string BASE_SUBSCRIPTION_URL = "https://builder-api.decentraland.org/v1/newsletter"; + + private readonly IWebRequestController webRequestController; + + public SubscriptionsAPIClient(IWebRequestController webRequestController) + { + this.webRequestController = webRequestController; + } + + public async UniTask CreateSubscription(string email, CancellationToken ct) + { + string postData = JsonUtility.ToJson(new CreateSubscriptionPayload + { + email = email, + source = UTM_SOURCE, + }); + + UnityWebRequest postResult = await webRequestController.PostAsync( + url: BASE_SUBSCRIPTION_URL, + postData: postData, + cancellationToken: ct, + headers: new Dictionary { { "Content-Type", "application/json" } }); + + if (postResult.result != UnityWebRequest.Result.Success) + throw new Exception($"Error creating subscription:\n{postResult.error}"); + + var postResponse = Utils.SafeFromJson(postResult.downloadHandler.text); + if (postResponse?.data?.data == null) + throw new Exception($"Error creating subscription:\n{postResult.downloadHandler.text}"); + + return postResponse.data.data; + } + + public async UniTask DeleteSubscription(string subscriptionId, CancellationToken ct) + { + UnityWebRequest deleteResult = await webRequestController.DeleteAsync( + url: $"{BASE_SUBSCRIPTION_URL}/{subscriptionId}", + cancellationToken: ct); + + if (deleteResult.result != UnityWebRequest.Result.Success) + throw new Exception($"Error deleting subscription:\n{deleteResult.error}"); + } + + public async UniTask GetSubscription(string subscriptionId, CancellationToken ct) + { + UnityWebRequest getResult = await webRequestController.GetAsync( + url: $"{BASE_SUBSCRIPTION_URL}/{subscriptionId}", + cancellationToken: ct); + + if (getResult.result != UnityWebRequest.Result.Success) + throw new Exception($"Error getting subscription:\n{getResult.error}"); + + var getResponse = Utils.SafeFromJson(getResult.downloadHandler.text); + if (getResponse?.data?.data == null) + throw new Exception($"Error parsing get subscription response:\n{getResult.downloadHandler.text}"); + + return getResponse.data.data; + } + } +} diff --git a/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIClient.cs.meta b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIClient.cs.meta new file mode 100644 index 0000000000..f0e2804a3a --- /dev/null +++ b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIClient.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1cdb48bb0a354a37b25296a4e306ac93 +timeCreated: 1697805067 \ No newline at end of file diff --git a/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.asmdef b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.asmdef new file mode 100644 index 0000000000..7345890d7d --- /dev/null +++ b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.asmdef @@ -0,0 +1,20 @@ +{ + "name": "SubscriptionsAPIService", + "rootNamespace": "", + "references": [ + "GUID:ee6523961ef177343ad763fcd55c7c46", + "GUID:b1087c5731ff68448a0a9c625bb7e52d", + "GUID:f51ebe6a0ceec4240a699833d6309b23", + "GUID:3b80b0b562b1cbc489513f09fc1b8f69", + "GUID:68069f49d86442cd9618861b4d74b1aa" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.asmdef.meta b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.asmdef.meta new file mode 100644 index 0000000000..273a0cf74d --- /dev/null +++ b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.asmdef.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c31f144fbfb54890960a05fca4149e56 +timeCreated: 1697804953 \ No newline at end of file diff --git a/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.cs b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.cs new file mode 100644 index 0000000000..a6bc8af9e3 --- /dev/null +++ b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.cs @@ -0,0 +1,34 @@ +using Cysharp.Threading.Tasks; +using DCL; +using System.Threading; + +namespace DCLServices.SubscriptionsAPIService +{ + public interface ISubscriptionsAPIService : IService + { + UniTask CreateSubscription(string email, CancellationToken ct); + UniTask DeleteSubscription(string subscriptionId, CancellationToken ct); + UniTask GetSubscription(string subscriptionId, CancellationToken ct); + } + + public class SubscriptionsAPIService : ISubscriptionsAPIService + { + private readonly ISubscriptionsAPIClient client; + + public SubscriptionsAPIService(ISubscriptionsAPIClient client) => + this.client = client; + + public void Initialize() { } + + public void Dispose() { } + + public async UniTask CreateSubscription(string email, CancellationToken ct) => + await client.CreateSubscription(email, ct); + + public async UniTask DeleteSubscription(string subscriptionId, CancellationToken ct) => + await client.DeleteSubscription(subscriptionId, ct); + + public async UniTask GetSubscription(string subscriptionId, CancellationToken ct) => + await client.GetSubscription(subscriptionId, ct); + } +} diff --git a/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.cs.meta b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.cs.meta new file mode 100644 index 0000000000..df0d6948fd --- /dev/null +++ b/unity-renderer/Assets/DCLServices/SubscriptionsAPIService/SubscriptionsAPIService.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b83513c432454781bad46965955ab1f7 +timeCreated: 1697808320 \ No newline at end of file diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/NewUserExperienceAnalytics/INewUserExperienceAnalytics.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/NewUserExperienceAnalytics/INewUserExperienceAnalytics.cs index b73dab7baa..52ddcaa969 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/NewUserExperienceAnalytics/INewUserExperienceAnalytics.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/NewUserExperienceAnalytics/INewUserExperienceAnalytics.cs @@ -1,5 +1,5 @@ public interface INewUserExperienceAnalytics { void AvatarEditSuccessNux(); - void SendTermsOfServiceAcceptedNux(); -} \ No newline at end of file + void SendTermsOfServiceAcceptedNux(string nameChosen, string email); +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/NewUserExperienceAnalytics/NewUserExperienceAnalytics.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/NewUserExperienceAnalytics/NewUserExperienceAnalytics.cs index 4c7e906549..2a817caae2 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/NewUserExperienceAnalytics/NewUserExperienceAnalytics.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/NewUserExperienceAnalytics/NewUserExperienceAnalytics.cs @@ -6,7 +6,7 @@ public class NewUserExperienceAnalytics : INewUserExperienceAnalytics private const string TERMS_OF_SERVICE_SUCCESS_NUX = "terms_of_service_success_nux"; private readonly IAnalytics analytics; - + public NewUserExperienceAnalytics(IAnalytics analytics) { this.analytics = analytics; @@ -17,16 +17,22 @@ public void AvatarEditSuccessNux() SendAnalytic(AVATAR_EDIT_SUCCESS_NUX); } - public void SendTermsOfServiceAcceptedNux() + public void SendTermsOfServiceAcceptedNux(string nameChosen, string email) { - SendAnalytic(TERMS_OF_SERVICE_SUCCESS_NUX); + Dictionary data = new Dictionary + { + { "name", nameChosen }, + { "email", email }, + }; + + SendAnalytic(TERMS_OF_SERVICE_SUCCESS_NUX, data); } - + private static void SendAnalytic(string eventName, Dictionary data = null) { data ??= new Dictionary(); - + IAnalytics analytics = DCL.Environment.i?.platform?.serviceProviders?.analytics; analytics?.SendAnalytic(eventName, data); } -} \ No newline at end of file +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/SocialAnalytics/ISocialAnalytics.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/SocialAnalytics/ISocialAnalytics.cs index c36432def8..c9e8376be6 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/SocialAnalytics/ISocialAnalytics.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/SocialAnalytics/ISocialAnalytics.cs @@ -3,6 +3,12 @@ namespace SocialFeaturesAnalytics { + public enum ProfileField + { + Description, + Email + } + public interface ISocialAnalytics { void SendPlayerMuted(string toUserId); @@ -19,7 +25,7 @@ public interface ISocialAnalytics void SendCopyWallet(PlayerActionSource source); void SendCopyUsername(PlayerActionSource source); void SendJumpInToPlayer(PlayerActionSource source, string recipientId); - void SendProfileEdit(int descriptionLength, bool hasLinks, PlayerActionSource source); + void SendProfileEdit(int descriptionLength, bool hasLinks, PlayerActionSource source, ProfileField fieldChanged); void SendVoiceChatPreferencesChanged(VoiceChatAllow preference); void SendFriendRequestSent(string fromUserId, string toUserId, double messageLength, PlayerActionSource source, string friendRequestId); void SendFriendRequestApproved(string fromUserId, string toUserId, string source, bool hasBodyMessage, string friendRequestId); diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/SocialAnalytics/SocialAnalytics.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/SocialAnalytics/SocialAnalytics.cs index 17d6eda4a9..e920d4cd60 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/SocialAnalytics/SocialAnalytics.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/SocialAnalytics/SocialAnalytics.cs @@ -184,13 +184,14 @@ public void SendJumpInToPlayer(PlayerActionSource source, string recipientId) analytics.SendAnalytic(PASSPORT_JUMP_IN, data); } - public void SendProfileEdit(int descriptionLength, bool hasLinks, PlayerActionSource source) + public void SendProfileEdit(int descriptionLength, bool hasLinks, PlayerActionSource source, ProfileField fieldChanged) { var data = new Dictionary { { "source", source.ToString() }, { "descriptionLength", descriptionLength.ToString() }, { "hasLinks", hasLinks.ToString() }, + { "field", fieldChanged.ToString() }, }; analytics.SendAnalytic(PASSPORT_EDIT_PROFILE, data); diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/SocialAnalytics/SocialAnalyticsTypes.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/SocialAnalytics/SocialAnalyticsTypes.cs index 96dc3dc86f..527dfb6b24 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/SocialAnalytics/SocialAnalyticsTypes.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Analytics/SocialAnalytics/SocialAnalyticsTypes.cs @@ -14,6 +14,7 @@ public enum PlayerActionSource Conversation, ProfileEditHUD, MyProfile, + EmailNotifications, } public enum AvatarOpenSource diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Prefabs/ColorPickerPanel.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Prefabs/ColorPickerPanel.prefab index 0ef6e5e3aa..be6d1be161 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Prefabs/ColorPickerPanel.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Prefabs/ColorPickerPanel.prefab @@ -28,9 +28,9 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 273429225438685837} - 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} @@ -164,9 +164,9 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8814137314757355627} - 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} @@ -239,9 +239,9 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.98, y: 0.98, z: 0.98} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4173308295013561872} - 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} @@ -314,9 +314,9 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8814137314757355627} - 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} @@ -389,9 +389,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.09, y: 1.06, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8814137314757355627} - 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} @@ -464,9 +464,9 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4173308295013561872} - 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} @@ -538,6 +538,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7515551167997239848} - {fileID: 380297248356426412} @@ -547,7 +548,6 @@ RectTransform: - {fileID: 194278301267950590} - {fileID: 273429225438685837} m_Father: {fileID: 3368490752059801647} - 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} @@ -590,9 +590,9 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4173308295013561872} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -724,11 +724,11 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 3368490752059801647} - {fileID: 4173308295013561872} m_Father: {fileID: 0} - 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} @@ -765,13 +765,13 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1302308593659387293} - {fileID: 4063367109676853226} - {fileID: 189911215760734194} - {fileID: 6662992897659841052} m_Father: {fileID: 413655955901338976} - 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} @@ -905,10 +905,10 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8814137314757355627} m_Father: {fileID: 413655955901338976} - 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} @@ -935,6 +935,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a23c4e6847f864c29968a45e1874abf0, type: 3} m_Name: m_EditorClassIdentifier: + showHideAnimator: {fileID: 0} sliderHue: {fileID: 2045644356204057586} sliderSaturation: {fileID: 6803678543382834983} sliderValue: {fileID: 1901463322018553244} @@ -943,9 +944,12 @@ MonoBehaviour: containerImage: {fileID: 7456165995023033672} colorSelectorObject: {fileID: 273429225438685838} colorPreviewImage: {fileID: 6109952967050899614} + arrowUpMark: {fileID: 0} + arrowDownMark: {fileID: 0} model: colorList: [] incrementAmount: 0.1 + showOnlyPresetColors: 0 --- !u!114 &7456165995023033672 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1004,9 +1008,9 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4173308295013561872} - 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} @@ -1056,6 +1060,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8814137314757355627} m_Modifications: - target: {fileID: 723695754730657919, guid: 724f72ebe8e5b4b85a667c623faa06cc, @@ -1324,6 +1329,11 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 007d970352cbc4cadadc4cb99da58e7d, type: 3} + - target: {fileID: 6090225926260730994, guid: 724f72ebe8e5b4b85a667c623faa06cc, + type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6090225926260730995, guid: 724f72ebe8e5b4b85a667c623faa06cc, type: 3} propertyPath: m_SizeDelta.x @@ -1335,7 +1345,16 @@ PrefabInstance: value: 0.5169983 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 724f72ebe8e5b4b85a667c623faa06cc, type: 3} +--- !u!224 &5096641370173081925 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6090225925176353667, guid: 724f72ebe8e5b4b85a667c623faa06cc, + type: 3} + m_PrefabInstance: {fileID: 1314554543995415238} + m_PrefabAsset: {fileID: 0} --- !u!114 &6803678543382834983 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5500506972710962657, guid: 724f72ebe8e5b4b85a667c623faa06cc, @@ -1348,17 +1367,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ca1e045d229a745dfa06e45c366ad1d1, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &5096641370173081925 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6090225925176353667, guid: 724f72ebe8e5b4b85a667c623faa06cc, - type: 3} - m_PrefabInstance: {fileID: 1314554543995415238} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1899810584447926721 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8814137314757355627} m_Modifications: - target: {fileID: 1843680647071165260, guid: abd8de46c57324b1d81a836e41d0f0d3, @@ -1473,13 +1487,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 1843680647352129411, guid: abd8de46c57324b1d81a836e41d0f0d3, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1843680647071165260, guid: abd8de46c57324b1d81a836e41d0f0d3, + type: 3} + insertIndex: -1 + addedObject: {fileID: 9176331454416874961} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1843680647352129413, guid: abd8de46c57324b1d81a836e41d0f0d3, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8866001754633850795} m_SourcePrefab: {fileID: 100100000, guid: abd8de46c57324b1d81a836e41d0f0d3, type: 3} ---- !u!1 &273429226859025988 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1843680647352129413, guid: abd8de46c57324b1d81a836e41d0f0d3, - type: 3} - m_PrefabInstance: {fileID: 1899810584447926721} - m_PrefabAsset: {fileID: 0} --- !u!224 &273429225438685837 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1843680647071165260, guid: abd8de46c57324b1d81a836e41d0f0d3, @@ -1492,6 +1511,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1899810584447926721} m_PrefabAsset: {fileID: 0} +--- !u!1 &273429226859025988 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1843680647352129413, guid: abd8de46c57324b1d81a836e41d0f0d3, + type: 3} + m_PrefabInstance: {fileID: 1899810584447926721} + m_PrefabAsset: {fileID: 0} --- !u!114 &8866001754633850795 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1521,6 +1546,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8814137314757355627} m_Modifications: - target: {fileID: 723695754730657919, guid: 724f72ebe8e5b4b85a667c623faa06cc, @@ -1774,6 +1800,11 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: cf1014f15559747c1918c2345d4e259a, type: 3} + - target: {fileID: 6090225926260730994, guid: 724f72ebe8e5b4b85a667c623faa06cc, + type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6090225926260730995, guid: 724f72ebe8e5b4b85a667c623faa06cc, type: 3} propertyPath: m_SizeDelta.x @@ -1785,17 +1816,26 @@ PrefabInstance: value: 0.5169983 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 724f72ebe8e5b4b85a667c623faa06cc, type: 3} ---- !u!114 &3785214446314640835 stripped +--- !u!224 &338609384431990160 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6090225925176353667, guid: 724f72ebe8e5b4b85a667c623faa06cc, + type: 3} + m_PrefabInstance: {fileID: 5779859152770455059} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2045644356204057586 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7255834724452434896, guid: 724f72ebe8e5b4b85a667c623faa06cc, + m_CorrespondingSourceObject: {fileID: 5500506972710962657, guid: 724f72ebe8e5b4b85a667c623faa06cc, type: 3} m_PrefabInstance: {fileID: 5779859152770455059} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Script: {fileID: 11500000, guid: ca1e045d229a745dfa06e45c366ad1d1, type: 3} m_Name: m_EditorClassIdentifier: --- !u!114 &2653248329855334066 stripped @@ -1810,29 +1850,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &2045644356204057586 stripped +--- !u!114 &3785214446314640835 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5500506972710962657, guid: 724f72ebe8e5b4b85a667c623faa06cc, + m_CorrespondingSourceObject: {fileID: 7255834724452434896, guid: 724f72ebe8e5b4b85a667c623faa06cc, type: 3} m_PrefabInstance: {fileID: 5779859152770455059} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca1e045d229a745dfa06e45c366ad1d1, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &338609384431990160 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6090225925176353667, guid: 724f72ebe8e5b4b85a667c623faa06cc, - type: 3} - m_PrefabInstance: {fileID: 5779859152770455059} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6212402478800345213 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8814137314757355627} m_Modifications: - target: {fileID: 500210390985956454, guid: 724f72ebe8e5b4b85a667c623faa06cc, @@ -2106,6 +2141,11 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 8ee9aed5af74d4e399555cda5681978e, type: 3} + - target: {fileID: 6090225926260730994, guid: 724f72ebe8e5b4b85a667c623faa06cc, + type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6090225926260730995, guid: 724f72ebe8e5b4b85a667c623faa06cc, type: 3} propertyPath: m_SizeDelta.x @@ -2122,6 +2162,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 724f72ebe8e5b4b85a667c623faa06cc, type: 3} --- !u!224 &194278301267950590 stripped RectTransform: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/ColorToggle.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/ColorToggle.prefab index 1a2fdb2a09..28801ab39c 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/ColorToggle.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/ColorToggle.prefab @@ -28,9 +28,9 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6296784106553009268} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -103,9 +103,9 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6296784106553009268} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -140,7 +140,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: aa5bccfe420b24d5c89f0e8b12b4f537, type: 3} + m_Sprite: {fileID: 21300000, guid: 4848194f7bc4d4e509d067d3160eadac, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -178,9 +178,9 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.98, y: 0.98, z: 0.98} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6296784106553009268} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -255,12 +255,12 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 8302942726011909858} - {fileID: 6296784105343664821} - {fileID: 6296784104552688694} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/AvatarSlot/NftTypeIcons.asset b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/AvatarSlot/NftTypeIcons.asset index 1a158d8234..e33201da4b 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/AvatarSlot/NftTypeIcons.asset +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/AvatarSlot/NftTypeIcons.asset @@ -14,43 +14,43 @@ MonoBehaviour: m_EditorClassIdentifier: nftIcons: - key: eyes - value: {fileID: 21300000, guid: b90a97a10e3a7452988bced1ec1aaf84, type: 3} + value: {fileID: 21300000, guid: 03b05b1004b784dc690bbff5ea268de7, type: 3} - key: mouth - value: {fileID: 21300000, guid: 866efedbbcc38498f9e6136d65695c9c, type: 3} + value: {fileID: 21300000, guid: 075c9dd99649649f9869afece52cd35b, type: 3} - key: eyebrows - value: {fileID: 21300000, guid: 84c790cbe3a484378906dc785b6c5995, type: 3} + value: {fileID: 21300000, guid: 15c01427d7e8f4c72a16e8e1368c82a6, type: 3} - key: hair - value: {fileID: 21300000, guid: 946f30660ef2f4261b313ca749c4127c, type: 3} + value: {fileID: 21300000, guid: 9b13173961ced41b287b3ec0d724c585, type: 3} - key: upper_body - value: {fileID: 21300000, guid: ddce90606ec7d4e5d820390fe246a91b, type: 3} + value: {fileID: 21300000, guid: 48d5dd980b244494b9f9d9fc540e0b01, type: 3} - key: lower_body - value: {fileID: 21300000, guid: d4ee93e9eb8464972b0fd5598a452f50, type: 3} + value: {fileID: 21300000, guid: bf9cd8edf950343a9ba38284a615c606, type: 3} - key: feet - value: {fileID: 21300000, guid: c1bf499699a424df88aa013bd2f32b68, type: 3} + value: {fileID: 21300000, guid: 2bd9c7cbf6f504ad89e22e7f1f497fd2, type: 3} - key: head - value: {fileID: 21300000, guid: 30c54e14722864c70a0e8c28edc2f7e6, type: 3} + value: {fileID: 0} - key: facial_hair - value: {fileID: 21300000, guid: 06cdeba19874e4ee38010ed40544559d, type: 3} + value: {fileID: 21300000, guid: 81132a1626c0d43aabeeec2414a68945, type: 3} - key: tiara - value: {fileID: 21300000, guid: 4454cae867deb4aea91f4d26c5bc88b1, type: 3} + value: {fileID: 21300000, guid: 6a3c7a80a921c458c93852cc9cfa33c1, type: 3} - key: hat - value: {fileID: 21300000, guid: 2de957f05cca04e4aac38646afee2263, type: 3} + value: {fileID: 21300000, guid: ec6e82c586d96441e9a01726eae9c6f8, type: 3} - key: helmet - value: {fileID: 21300000, guid: 15c0a1185bb524f0c9d7b118e081501f, type: 3} + value: {fileID: 21300000, guid: 6bc5be995cfc14e0182a54c5a4fef290, type: 3} - key: skin - value: {fileID: 21300000, guid: 0bfef183260d34c50b8d971b1400499e, type: 3} + value: {fileID: 21300000, guid: bda43422408ca42209dd311b23a1d06f, type: 3} - key: mask - value: {fileID: 21300000, guid: 90e673ad913664a27b245b61ccdf31bf, type: 3} + value: {fileID: 21300000, guid: f88ebb8cd1cd5487ca7c3f4d3e65e76a, type: 3} - key: eyewear - value: {fileID: 21300000, guid: 18cc300911ff74c3c922eb3a9b346f3c, type: 3} + value: {fileID: 21300000, guid: 1f8423c7e44934bc88742ef8c05aa4ee, type: 3} - key: top_head - value: {fileID: 21300000, guid: 17e4c961a88d74262a222ea008152618, type: 3} + value: {fileID: 21300000, guid: 6084de83d5bc748b9a444a61a7c0b96a, type: 3} - key: earring - value: {fileID: 21300000, guid: 4a803782af3694d97b17f31e269c04d1, type: 3} + value: {fileID: 21300000, guid: 98a2ad67412f444ee883c03d3a07dd1e, type: 3} - key: emote value: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3} - key: body_shape - value: {fileID: 21300000, guid: 7df132fb4eb304d619c7dd33841261a1, type: 3} + value: {fileID: 21300000, guid: 98bae2808161c4d678b3f5d109a5ee80, type: 3} - key: hands_wear value: {fileID: 21300000, guid: 16866e729ce1061429170517e80ef313, type: 3} - key: hands diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDController.cs index 4405f48a63..2c068f79a1 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDController.cs @@ -15,6 +15,8 @@ namespace DCL.Backpack { public class BackpackEditorHUDController { + private const string NEW_TOS_AND_EMAIL_SUBSCRIPTION_FF = "new_terms_of_service_and_email_subscription"; + private readonly IBackpackEditorHUDView view; private readonly DataStore dataStore; private readonly IWearablesCatalogService wearablesCatalogService; @@ -56,7 +58,11 @@ public class BackpackEditorHUDController private CancellationTokenSource loadProfileCancellationToken = new (); private CancellationTokenSource setVisibilityCancellationToken = new (); private CancellationTokenSource outfitLoadCancellationToken = new (); + private CancellationTokenSource saveCancellationToken = new (); private string categoryPendingToPlayEmote; + private bool isTakingSnapshot; + + private bool isNewTermsOfServiceAndEmailSubscriptionEnabled => dataStore.featureFlags.flags.Get().IsFeatureEnabled(NEW_TOS_AND_EMAIL_SUBSCRIPTION_FF); private BaseCollection previewEquippedWearables => dataStore.backpackV2.previewEquippedWearables; @@ -100,6 +106,7 @@ public BackpackEditorHUDController( dataStore.HUDs.avatarEditorVisible.OnChange += OnBackpackVisibleChanged; dataStore.HUDs.isAvatarEditorInitialized.Set(true); dataStore.exploreV2.configureBackpackInFullscreenMenu.OnChange += ConfigureBackpackInFullscreenMenuChanged; + dataStore.common.isSignUpFlow.OnChange += OnSignUpFlowChanged; ConfigureBackpackInFullscreenMenuChanged(dataStore.exploreV2.configureBackpackInFullscreenMenu.Get(), null); @@ -124,6 +131,7 @@ public BackpackEditorHUDController( view.OnAvatarUpdated += OnAvatarUpdated; view.OnOutfitsOpened += OnOutfitsOpened; view.OnVRMExport += OnVrmExport; + view.OnSignUpBackClicked += OnSignUpBack; outfitsController.OnOutfitEquipped += OnOutfitEquipped; view.SetOutfitsEnabled(dataStore.featureFlags.flags.Get().IsFeatureEnabled("outfits")); @@ -185,6 +193,7 @@ public void Dispose() ownUserProfile.OnUpdate -= LoadUserProfileFromProfileUpdate; dataStore.HUDs.avatarEditorVisible.OnChange -= OnBackpackVisibleChanged; dataStore.exploreV2.configureBackpackInFullscreenMenu.OnChange -= ConfigureBackpackInFullscreenMenuChanged; + dataStore.common.isSignUpFlow.OnChange -= OnSignUpFlowChanged; backpackEmotesSectionController.OnNewEmoteAdded -= OnNewEmoteAdded; backpackEmotesSectionController.OnEmotePreviewed -= OnEmotePreviewed; @@ -205,6 +214,12 @@ public void Dispose() view.OnColorChanged -= OnWearableColorChanged; view.OnContinueSignup -= SaveAvatarAndContinueSignupProcess; + view.OnColorPickerToggle -= OnColorPickerToggled; + view.OnAvatarUpdated -= OnAvatarUpdated; + view.OnOutfitsOpened -= OnOutfitsOpened; + view.OnVRMExport -= OnVrmExport; + view.OnSignUpBackClicked -= OnSignUpBack; + outfitsController.OnOutfitEquipped -= OnOutfitEquipped; view.Dispose(); } @@ -240,10 +255,15 @@ async UniTaskVoid SetVisibilityAsync(bool visible, bool saveAvatar, Cancellation wearableGridController.LoadCollections(); LoadUserProfile(ownUserProfile); view.Show(); + view.SetSignUpModeActive(dataStore.common.isSignUpFlow.Get() && isNewTermsOfServiceAndEmailSubscriptionEnabled); if (dataStore.common.isSignUpFlow.Get()) { - view.ShowContinueSignup(); + if (isNewTermsOfServiceAndEmailSubscriptionEnabled) + view.HideContinueSignup(); + else + view.ShowContinueSignup(); + avatarSlotsHUDController.SelectSlot(WearableLiterals.Categories.BODY_SHAPE); } else @@ -252,19 +272,7 @@ async UniTaskVoid SetVisibilityAsync(bool visible, bool saveAvatar, Cancellation else { if (saveAvatar) - { - try - { - await TakeSnapshotsAndSaveAvatarAsync(cancellationToken); - CloseView(); - } - catch (OperationCanceledException) { } - catch (Exception e) - { - Debug.LogException(e); - CloseView(); - } - } + await SaveAsync(cancellationToken); else CloseView(); @@ -278,6 +286,9 @@ async UniTaskVoid SetVisibilityAsync(bool visible, bool saveAvatar, Cancellation private void CloseView() { + if (isTakingSnapshot) + return; + view.Hide(); view.ResetPreviewPanel(); wearableGridController.ResetFilters(); @@ -287,6 +298,16 @@ private void CloseView() private void ConfigureBackpackInFullscreenMenuChanged(Transform currentParentTransform, Transform previousParentTransform) => view.SetAsFullScreenMenuMode(currentParentTransform); + private void OnSignUpFlowChanged(bool current, bool previous) + { + if (current) + return; + + view.SetSignUpStage(SignUpStage.CustomizeAvatar); + saveCancellationToken = saveCancellationToken.SafeRestart(); + SaveAsync(saveCancellationToken.Token).Forget(); + } + private void LoadUserProfileFromProfileUpdate(UserProfile userProfile) { bool isEditorVisible = rendererState.Get() && view.isVisible; @@ -412,24 +433,54 @@ private void EquipBodyShape(WearableItem bodyShape, bool setAsDirty = true) avatarIsDirty = true; } - private void SaveAvatarAndContinueSignupProcess() => - SetVisibility(false, saveAvatar: true); + private void SaveAvatarAndContinueSignupProcess() + { + if (!isNewTermsOfServiceAndEmailSubscriptionEnabled) + { + SetVisibility(false, saveAvatar: true); + return; + } + + dataStore.HUDs.signupVisible.Set(true); + view.SetSignUpStage(SignUpStage.SetNameAndEmail); + view.SetAvatarPreviewFocus(PreviewCameraFocus.FaceEditing); + view.PlayPreviewEmote("wave"); + backpackAnalyticsService.SendAvatarEditSuccessNuxAnalytic(); + } + + private async UniTask SaveAsync(CancellationToken cancellationToken) + { + try + { + await TakeSnapshotsAndSaveAvatarAsync(cancellationToken); + CloseView(); + } + catch (OperationCanceledException) { } + catch (Exception e) + { + Debug.LogException(e); + CloseView(); + } + } private UniTask TakeSnapshotsAndSaveAvatarAsync(CancellationToken cancellationToken) { UniTaskCompletionSource task = new (); + isTakingSnapshot = true; TakeSnapshots( onSuccess: (face256Snapshot, bodySnapshot) => { cancellationToken.ThrowIfCancellationRequested(); SaveAvatar(face256Snapshot, bodySnapshot); + isTakingSnapshot = false; task.TrySetResult(); }, onFailed: () => { cancellationToken.ThrowIfCancellationRequested(); SaveAvatar(new Texture2D(256, 256), new Texture2D(256, 256)); + isTakingSnapshot = false; task.TrySetException(new Exception("Error taking avatar screenshots.")); }); @@ -471,7 +522,9 @@ private void SaveAvatar(Texture2D face256Snapshot, Texture2D bodySnapshot) if (dataStore.common.isSignUpFlow.Get()) { dataStore.HUDs.signupVisible.Set(true); - backpackAnalyticsService.SendAvatarEditSuccessNuxAnalytic(); + + if (!isNewTermsOfServiceAndEmailSubscriptionEnabled) + backpackAnalyticsService.SendAvatarEditSuccessNuxAnalytic(); } avatarIsDirty = false; @@ -776,6 +829,22 @@ private void OnVrmExport() VrmExport(vrmExportCts.Token).Forget(); } + private void OnSignUpBack(SignUpStage stage) + { + switch (stage) + { + default: + case SignUpStage.CustomizeAvatar: + userProfileBridge.LogOut(); + break; + case SignUpStage.SetNameAndEmail: + dataStore.HUDs.signupVisible.Set(false); + view.SetSignUpStage(SignUpStage.CustomizeAvatar); + view.SetAvatarPreviewFocus(PreviewCameraFocus.DefaultEditing); + break; + } + } + internal async UniTask VrmExport(CancellationToken ct) { const int SUCCESS_TOAST_ACTIVE_TIME = 2000; diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDV2.asmdef b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDV2.asmdef index 9071b9576c..d1c22ccda2 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDV2.asmdef +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDV2.asmdef @@ -71,7 +71,8 @@ "GUID:5ec801bb410ed4adf91f82aa97aaf380", "GUID:4ad87ae8afda2df4d897ad1a3527cd1d", "GUID:d6fe1b5729e3405d98cf8ff2035d9542", - "GUID:0c0c18c12967b3944b844b79c47c2320" + "GUID:0c0c18c12967b3944b844b79c47c2320", + "GUID:f92ef779fd645be45832a91c16125784" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDV2ComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDV2ComponentView.cs index a1b55d8477..741a9bd1b4 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDV2ComponentView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDV2ComponentView.cs @@ -1,6 +1,7 @@ using AvatarSystem; using Cysharp.Threading.Tasks; using DCL.Tasks; +using DG.Tweening; using MainScripts.DCL.Controllers.HUD.CharacterPreview; using System; using System.Collections.Generic; @@ -15,12 +16,16 @@ namespace DCL.Backpack { public class BackpackEditorHUDV2ComponentView : BaseComponentView, IBackpackEditorHUDView, IPointerDownHandler { + private const string SIGN_UP_HEADER_TITLE_FOR_FISRT_STEP = "Customize Your Avatar"; + private const string SIGN_UP_HEADER_TITLE_FOR_SECOND_STEP = "Final Details"; + public event Action OnColorChanged; public event Action OnColorPickerToggle; public event Action OnContinueSignup; public event Action OnAvatarUpdated; public event Action OnOutfitsOpened; public event Action OnVRMExport; + public event Action OnSignUpBackClicked; private const int AVATAR_SECTION_INDEX = 0; private const int EMOTES_SECTION_INDEX = 1; @@ -28,6 +33,8 @@ public class BackpackEditorHUDV2ComponentView : BaseComponentView originalVisibleRenderers => backpackPreviewPanel?.originalVisibleRenderers; public IAvatarEmotesController EmotesController => backpackPreviewPanel?.EmotesController; @@ -61,6 +85,9 @@ public class BackpackEditorHUDV2ComponentView : BaseComponentView OnContinueSignup?.Invoke()); + nextButton.onClick.AddListener(() => OnContinueSignup?.Invoke()); + backButton.onClick.AddListener(() => OnSignUpBackClicked?.Invoke(currentStage)); } public void Initialize( @@ -266,6 +297,26 @@ public void SetVRMSuccessToastActive(bool active) vrmExportedToast.gameObject.SetActive(active); } + public void SetSignUpModeActive(bool isActive) + { + signUpHeader.SetActive(isActive); + backgroundForSignUp.SetActive(isActive); + background.SetActive(!isActive); + wearablesSectionBackground.enabled = !isActive; + + foreach (GameObject go in objectsToDeactivateInSignUpMode) + go.SetActive(!isActive); + } + + public void SetSignUpStage(SignUpStage stage) + { + currentStage = stage; + nextButton.gameObject.SetActive(stage == SignUpStage.CustomizeAvatar); + signUpHeaderTitle.text = stage == SignUpStage.CustomizeAvatar ? SIGN_UP_HEADER_TITLE_FOR_FISRT_STEP : SIGN_UP_HEADER_TITLE_FOR_SECOND_STEP; + hints.SetActive(stage == SignUpStage.CustomizeAvatar); + PlayTransitionAnimation(stage); + } + public void OnPointerDown(PointerEventData eventData) { if (eventData.pointerPressRaycast.gameObject != colorPickerComponentView.gameObject) @@ -337,5 +388,22 @@ private void OnColorPickerColorChanged(Color newColor) => private void ColorPickerToggle() => OnColorPickerToggle?.Invoke(); + + private void PlayTransitionAnimation(SignUpStage stage) + { + Vector2 wearablesBackgroundForSignUpEndPosition = originalAnchorPositionOfWearablesBackgroundForSignUp; + if (stage == SignUpStage.SetNameAndEmail) + wearablesBackgroundForSignUpEndPosition.x += transitionDistance; + wearablesBackgroundForSignUp.DOAnchorPos(wearablesBackgroundForSignUpEndPosition, transitionDuration).SetEase(transitionEase); + wearablesBackgroundForSignUpCanvasGroup.DOFade(stage == SignUpStage.CustomizeAvatar ? 1f : 0f, transitionDuration).SetEase(transitionEase); + wearablesBackgroundForSignUpCanvasGroup.blocksRaycasts = stage == SignUpStage.CustomizeAvatar; + + Vector2 wearablesSectionEndPosition = originalAnchorPositionOfWearablesSection; + if (stage == SignUpStage.SetNameAndEmail) + wearablesSectionEndPosition.x += transitionDistance; + (wearablesSection.transform as RectTransform).DOAnchorPos(wearablesSectionEndPosition, transitionDuration).SetEase(transitionEase); + wearablesSectionCanvasGroup.DOFade(stage == SignUpStage.CustomizeAvatar ? 1f : 0f, transitionDuration).SetEase(transitionEase); + wearablesSectionCanvasGroup.blocksRaycasts = stage == SignUpStage.CustomizeAvatar; + } } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/IBackpackEditorHUDView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/IBackpackEditorHUDView.cs index 939ce14521..f6c0ce448e 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/IBackpackEditorHUDView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/IBackpackEditorHUDView.cs @@ -5,6 +5,12 @@ namespace DCL.Backpack { + public enum SignUpStage + { + CustomizeAvatar, + SetNameAndEmail, + } + public interface IBackpackEditorHUDView { event Action OnColorChanged; @@ -13,6 +19,7 @@ public interface IBackpackEditorHUDView event Action OnAvatarUpdated; event Action OnOutfitsOpened; event Action OnVRMExport; + event Action OnSignUpBackClicked; delegate void OnSnapshotsReady(Texture2D face256, Texture2D body); IReadOnlyList originalVisibleRenderers { get; } @@ -39,6 +46,7 @@ public interface IBackpackEditorHUDView void SetVRMButtonActive(bool enabled); void SetVRMButtonEnabled(bool enabled); void SetVRMSuccessToastActive(bool active); - + void SetSignUpModeActive(bool isActive); + void SetSignUpStage(SignUpStage stage); } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Prefabs/WearablesSection.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Prefabs/WearablesSection.prefab index 0b6afeee65..24807c68f1 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Prefabs/WearablesSection.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Prefabs/WearablesSection.prefab @@ -33,7 +33,6 @@ RectTransform: - {fileID: 7259701034706346812} - {fileID: 6183872829584003177} m_Father: {fileID: 8122654311339567853} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.943} m_AnchorMax: {x: 0, y: 0.943} @@ -112,7 +111,6 @@ RectTransform: - {fileID: 8178807879177054821} - {fileID: 8199015531534222460} m_Father: {fileID: 1889405134162418298} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.02914226, y: 0} m_AnchorMax: {x: 0.26069662, y: 1} @@ -170,7 +168,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1889405134162418298} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -247,7 +244,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4759224320048783547} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -337,7 +333,6 @@ RectTransform: - {fileID: 1889405134162418298} - {fileID: 4759224320048783547} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.321, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -363,6 +358,7 @@ MonoBehaviour: wearablePageSelector: {fileID: 1869699820219046859} infoCardComponentView: {fileID: 1404156234988725630} emptyStateContainer: {fileID: 5709399435702167902} + emptyStateContainerForSignUp: {fileID: 7256302617379840629} goToMarketplaceButton: {fileID: 123394143504748400} loadingSpinner: {fileID: 1395095762456914057} --- !u!222 &1497040140008365510 @@ -434,7 +430,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5142187023423996251} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -520,7 +515,6 @@ RectTransform: - {fileID: 2619369885523437138} - {fileID: 4844923940034614351} m_Father: {fileID: 4759224320048783547} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -760,7 +754,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4759224320048783547} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -879,6 +872,141 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &3890803294086095839 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 978191160757147920} + - component: {fileID: 5881915177808442944} + - component: {fileID: 5808010976892580844} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &978191160757147920 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3890803294086095839} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8241262116138736045} + 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: 40} + m_SizeDelta: {x: 751.10876, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5881915177808442944 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3890803294086095839} + m_CullTransparentMesh: 1 +--- !u!114 &5808010976892580844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3890803294086095839} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: There are no items in this category + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4010626735298748388 GameObject: m_ObjectHideFlags: 0 @@ -911,10 +1039,10 @@ RectTransform: - {fileID: 5711676711565938686} - {fileID: 2523909998165301215} - {fileID: 5777814123107904011} + - {fileID: 8241262116138736045} - {fileID: 5046471651262680866} - {fileID: 7302680584577872279} m_Father: {fileID: 1889405134162418298} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.303, y: 0} m_AnchorMax: {x: 0.98453563, y: 1} @@ -951,7 +1079,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5142187023423996251} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1017,7 +1144,6 @@ RectTransform: - {fileID: 5142187023423996251} - {fileID: 8122654311339567853} m_Father: {fileID: 4310305108509663685} - 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} @@ -1059,7 +1185,6 @@ RectTransform: - {fileID: 7666540203010386272} - {fileID: 4793115084116977530} m_Father: {fileID: 4759224320048783547} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1123,7 +1248,6 @@ RectTransform: - {fileID: 750171139774865965} - {fileID: 7597442121838466010} m_Father: {fileID: 8122654311339567853} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1162,7 +1286,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 750171139774865965} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1283,7 +1406,6 @@ RectTransform: m_Children: - {fileID: 6989399456266503809} m_Father: {fileID: 5777814123107904011} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -1391,6 +1513,43 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7256302617379840629 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8241262116138736045} + m_Layer: 5 + m_Name: GridEmptyStateForSignUp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8241262116138736045 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7256302617379840629} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5118205306680124903} + - {fileID: 978191160757147920} + m_Father: {fileID: 8122654311339567853} + 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.5, y: 0.5} --- !u!1 &7747725482117158820 GameObject: m_ObjectHideFlags: 0 @@ -1422,7 +1581,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5777814123107904011} - 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} @@ -1499,7 +1657,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4474691227378578484} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1595,7 +1752,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4474691227378578484} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1735,7 +1891,6 @@ RectTransform: - {fileID: 7413306556926942845} - {fileID: 3405755437925897666} m_Father: {fileID: 4759224320048783547} - 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} @@ -1805,7 +1960,6 @@ RectTransform: - {fileID: 2273205608813961853} - {fileID: 389451657606281639} m_Father: {fileID: 4310305108509663685} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.303, y: 0} m_AnchorMax: {x: 0.98453563, y: 1} @@ -1905,7 +2059,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8122654311339567853} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.32500002} m_AnchorMax: {x: 1, y: 0.9191925} @@ -1936,11 +2089,87 @@ MonoBehaviour: m_Spacing: {x: 36, y: 38} m_Constraint: 0 m_ConstraintCount: 5 +--- !u!1 &9014161498785448899 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5118205306680124903} + - component: {fileID: 5796278656759338860} + - component: {fileID: 579247745332667706} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5118205306680124903 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9014161498785448899} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8241262116138736045} + 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: 120} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5796278656759338860 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9014161498785448899} + m_CullTransparentMesh: 1 +--- !u!114 &579247745332667706 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9014161498785448899} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_Sprite: {fileID: 21300000, guid: 73e87750f1ef74c6fbf35cd8ae4e6c9a, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1001 &979154213018909 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2273205608813961853} m_Modifications: - target: {fileID: 2293051074121960227, guid: f024f244cf880481684afce6a2533399, @@ -2054,6 +2283,9 @@ PrefabInstance: value: EmptyOutfitSlot (1) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f024f244cf880481684afce6a2533399, type: 3} --- !u!224 &2292885559419475518 stripped RectTransform: @@ -2066,6 +2298,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5046471651262680866} m_Modifications: - target: {fileID: 3924119466273712775, guid: 0e3f32811571a4fdd85865afcaaf5d1c, @@ -2189,6 +2422,9 @@ PrefabInstance: value: WearablesBreadcrumb objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0e3f32811571a4fdd85865afcaaf5d1c, type: 3} --- !u!114 &3396448617856098410 stripped MonoBehaviour: @@ -2213,6 +2449,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2273205608813961853} m_Modifications: - target: {fileID: 2293051074121960227, guid: f024f244cf880481684afce6a2533399, @@ -2326,6 +2563,9 @@ PrefabInstance: value: EmptyOutfitSlot objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f024f244cf880481684afce6a2533399, type: 3} --- !u!224 &1537742236299128978 stripped RectTransform: @@ -2338,6 +2578,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5046471651262680866} m_Modifications: - target: {fileID: 110588233006084425, guid: 276399237381835458e985e88e92c7d2, @@ -3092,6 +3333,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 276399237381835458e985e88e92c7d2, type: 3} --- !u!224 &6183872829584003177 stripped RectTransform: @@ -3104,6 +3348,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 886871072213724172} m_Modifications: - target: {fileID: 2293051074121960227, guid: bdc3991b3b86441ee99de5abec60e41b, @@ -3217,6 +3462,9 @@ PrefabInstance: value: OutfitItem objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bdc3991b3b86441ee99de5abec60e41b, type: 3} --- !u!114 &3125894133225298174 stripped MonoBehaviour: @@ -3241,6 +3489,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8122654311339567853} m_Modifications: - target: {fileID: 2136973473263099510, guid: f5f14a07355bcff46ac345f4d95ec24a, @@ -3308,6 +3557,11 @@ PrefabInstance: propertyPath: m_Name value: PageSelector objectReference: {fileID: 0} + - target: {fileID: 4213288149590170572, guid: f5f14a07355bcff46ac345f4d95ec24a, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5955730194940385775, guid: f5f14a07355bcff46ac345f4d95ec24a, type: 3} propertyPath: m_Pivot.x @@ -3404,6 +3658,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f5f14a07355bcff46ac345f4d95ec24a, type: 3} --- !u!114 &1869699820219046859 stripped MonoBehaviour: @@ -3428,6 +3685,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2273205608813961853} m_Modifications: - target: {fileID: 2293051074121960227, guid: f024f244cf880481684afce6a2533399, @@ -3541,6 +3799,9 @@ PrefabInstance: value: EmptyOutfitSlot (4) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f024f244cf880481684afce6a2533399, type: 3} --- !u!224 &3405755437925897666 stripped RectTransform: @@ -3553,6 +3814,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8122654311339567853} m_Modifications: - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, @@ -3671,6 +3933,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2336035712942851721, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1753022967748094443} m_SourcePrefab: {fileID: 100100000, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} --- !u!1 &1395095762456914057 stripped GameObject: @@ -3709,6 +3978,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8122654311339567853} m_Modifications: - target: {fileID: 366606970992223459, guid: fe4279b779a1a4d9ca4af042d04c96a2, @@ -3821,6 +4091,11 @@ PrefabInstance: propertyPath: m_Name value: BackpackInfoCard objectReference: {fileID: 0} + - target: {fileID: 1287566341132425315, guid: fe4279b779a1a4d9ca4af042d04c96a2, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2394973838855383652, guid: fe4279b779a1a4d9ca4af042d04c96a2, type: 3} propertyPath: m_AnchorMax.x @@ -4362,6 +4637,9 @@ PrefabInstance: value: 0.70002747 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fe4279b779a1a4d9ca4af042d04c96a2, type: 3} --- !u!114 &1404156234988725630 stripped MonoBehaviour: @@ -4386,6 +4664,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 886871072213724172} m_Modifications: - target: {fileID: 2293051074121960227, guid: bdc3991b3b86441ee99de5abec60e41b, @@ -4499,6 +4778,9 @@ PrefabInstance: value: OutfitItem (2) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bdc3991b3b86441ee99de5abec60e41b, type: 3} --- !u!114 &5703631538347214337 stripped MonoBehaviour: @@ -4523,6 +4805,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2273205608813961853} m_Modifications: - target: {fileID: 2293051074121960227, guid: f024f244cf880481684afce6a2533399, @@ -4636,6 +4919,9 @@ PrefabInstance: value: EmptyOutfitSlot (2) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f024f244cf880481684afce6a2533399, type: 3} --- !u!224 &4821405088718808682 stripped RectTransform: @@ -4648,6 +4934,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 886871072213724172} m_Modifications: - target: {fileID: 2293051074121960227, guid: bdc3991b3b86441ee99de5abec60e41b, @@ -4761,6 +5048,9 @@ PrefabInstance: value: OutfitItem (4) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bdc3991b3b86441ee99de5abec60e41b, type: 3} --- !u!224 &4793115084116977530 stripped RectTransform: @@ -4785,6 +5075,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1889405134162418298} m_Modifications: - target: {fileID: 115377728778037777, guid: 8b341cda69edde1499bca7d73267ea5f, @@ -5198,6 +5489,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8b341cda69edde1499bca7d73267ea5f, type: 3} --- !u!224 &2652373419529443112 stripped RectTransform: @@ -5210,6 +5504,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 886871072213724172} m_Modifications: - target: {fileID: 2293051074121960227, guid: bdc3991b3b86441ee99de5abec60e41b, @@ -5323,6 +5618,9 @@ PrefabInstance: value: OutfitItem (3) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bdc3991b3b86441ee99de5abec60e41b, type: 3} --- !u!224 &7666540203010386272 stripped RectTransform: @@ -5347,6 +5645,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2273205608813961853} m_Modifications: - target: {fileID: 2293051074121960227, guid: f024f244cf880481684afce6a2533399, @@ -5460,6 +5759,9 @@ PrefabInstance: value: EmptyOutfitSlot (3) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f024f244cf880481684afce6a2533399, type: 3} --- !u!224 &7413306556926942845 stripped RectTransform: @@ -5472,6 +5774,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 886871072213724172} m_Modifications: - target: {fileID: 2293051074121960227, guid: bdc3991b3b86441ee99de5abec60e41b, @@ -5585,6 +5888,9 @@ PrefabInstance: value: OutfitItem (1) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bdc3991b3b86441ee99de5abec60e41b, type: 3} --- !u!224 &7396145756231670243 stripped RectTransform: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Resources/BackpackEditorHUDV2.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Resources/BackpackEditorHUDV2.prefab index a77dc45d09..24e53cb600 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Resources/BackpackEditorHUDV2.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Resources/BackpackEditorHUDV2.prefab @@ -1,5 +1,140 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &257514962992389024 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7429190631637473170} + - component: {fileID: 282816453981556887} + - component: {fileID: 3299006008772291472} + m_Layer: 5 + m_Name: SignUpTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7429190631637473170 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257514962992389024} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5910900519288670340} + 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: 140, y: 0} + m_SizeDelta: {x: 640, y: 50} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &282816453981556887 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257514962992389024} + m_CullTransparentMesh: 1 +--- !u!114 &3299006008772291472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257514962992389024} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_text: Customize Your Avatar + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 34 + m_fontSizeBase: 34 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &457794506221437082 GameObject: m_ObjectHideFlags: 0 @@ -12,7 +147,7 @@ GameObject: - component: {fileID: 7202021117050705016} - component: {fileID: 4099327779905196055} m_Layer: 5 - m_Name: WheelIcn + m_Name: RightIcn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -35,7 +170,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 7.000292, y: -10.999756} - m_SizeDelta: {x: 14, y: 16} + m_SizeDelta: {x: 16, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7202021117050705016 CanvasRenderer: @@ -58,14 +193,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.44313726, g: 0.41960785, b: 0.4862745, a: 1} + m_Color: {r: 0.2627451, g: 0.2509804, b: 0.2901961, 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_Sprite: {fileID: 21300000, guid: 96f72d4a8759b47cea1df19e01632e26, type: 3} + m_Sprite: {fileID: 21300000, guid: 0c1f94bccfacc415f8b7916a4f3ae512, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -210,6 +345,94 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &516418156273752100 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4342889036681528669} + - component: {fileID: 7517409048018998757} + - component: {fileID: 6268815766397813910} + - component: {fileID: 180354113003941719} + m_Layer: 5 + m_Name: WearablesContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4342889036681528669 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 516418156273752100} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1238863926746129352} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 693.49, y: 0} + m_SizeDelta: {x: 2069.3, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7517409048018998757 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 516418156273752100} + m_CullTransparentMesh: 1 +--- !u!114 &6268815766397813910 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 516418156273752100} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.45490196, b: 0.22352941, a: 0.15686275} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!225 &180354113003941719 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 516418156273752100} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &673456029672021538 GameObject: m_ObjectHideFlags: 0 @@ -379,10 +602,10 @@ RectTransform: - {fileID: 4165967543594959923} m_Father: {fileID: 3150290541654462627} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, 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: 1080} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8989491702630186046 CanvasRenderer: @@ -435,7 +658,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 ---- !u!1 &1348614289619733184 +--- !u!1 &922729490444802687 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -443,66 +666,66 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9090333417083232009} - - component: {fileID: 3200864384385582261} - - component: {fileID: 1851985410868766019} + - component: {fileID: 3298006400841531246} + - component: {fileID: 7539138756122097416} + - component: {fileID: 2611133028955632769} m_Layer: 5 - m_Name: UnselectedIcon + m_Name: RadialTop m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &9090333417083232009 + m_IsActive: 1 +--- !u!224 &3298006400841531246 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1348614289619733184} + m_GameObject: {fileID: 922729490444802687} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5369915736583580992} + m_Father: {fileID: 1238863926746129352} 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: 21.5, y: 0} - m_SizeDelta: {x: 25, y: 25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3200864384385582261 + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 298, y: 516} + m_SizeDelta: {x: -641.7952, y: 817.9287} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &7539138756122097416 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1348614289619733184} + m_GameObject: {fileID: 922729490444802687} m_CullTransparentMesh: 1 ---- !u!114 &1851985410868766019 +--- !u!114 &2611133028955632769 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1348614289619733184} + m_GameObject: {fileID: 922729490444802687} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_Color: {r: 1, g: 0.9607843, b: 0.7490196, 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_Sprite: {fileID: 21300000, guid: 7df132fb4eb304d619c7dd33841261a1, type: 3} + m_Sprite: {fileID: 21300000, guid: 9fb5589c5caac46e5882f2be6709b03d, type: 3} m_Type: 0 - m_PreserveAspect: 1 + m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -510,7 +733,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1801116622221139394 +--- !u!1 &1348614289619733184 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -518,43 +741,382 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3796049446928469386} - - component: {fileID: 9168637634446966193} - - component: {fileID: 2099548947802068887} + - component: {fileID: 9090333417083232009} + - component: {fileID: 3200864384385582261} + - component: {fileID: 1851985410868766019} m_Layer: 5 - m_Name: Header + m_Name: UnselectedIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3796049446928469386 + m_IsActive: 0 +--- !u!224 &9090333417083232009 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1801116622221139394} + m_GameObject: {fileID: 1348614289619733184} 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5732738632668567410} - - {fileID: 8870671573072448641} - - {fileID: 7362392692425171482} - m_Father: {fileID: 3150290541654462627} + m_Children: [] + m_Father: {fileID: 5369915736583580992} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0.321, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 70} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &9168637634446966193 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 21.5, y: 0} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3200864384385582261 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1348614289619733184} + m_CullTransparentMesh: 1 +--- !u!114 &1851985410868766019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1348614289619733184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, 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_Sprite: {fileID: 21300000, guid: 7df132fb4eb304d619c7dd33841261a1, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1446318515357121610 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8256146862193256572} + - component: {fileID: 49691185296746926} + - component: {fileID: 5127058321856927537} + m_Layer: 5 + m_Name: Floor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8256146862193256572 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1446318515357121610} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1238863926746129352} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 93.74872} + m_SizeDelta: {x: 0, y: 286.2453} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &49691185296746926 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1446318515357121610} + m_CullTransparentMesh: 1 +--- !u!114 &5127058321856927537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1446318515357121610} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.8156863, b: 0.6, 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_Sprite: {fileID: 21300000, guid: fb6df28e83ce34e9aa23cdc3683244a7, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1579045848300072855 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6466622163805889236} + - component: {fileID: 8092120835342852879} + - component: {fileID: 4019168675148883827} + - component: {fileID: 77436869593246426} + - component: {fileID: 3494180093217185995} + - component: {fileID: 4366847275719105606} + - component: {fileID: 3400217371173087097} + - component: {fileID: 8851328573667013568} + m_Layer: 5 + m_Name: NextButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6466622163805889236 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579045848300072855} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6921547316914522286} + - {fileID: 3508913861399150950} + m_Father: {fileID: 5910900519288670340} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -30, y: 0} + m_SizeDelta: {x: 120, y: 46} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &8092120835342852879 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579045848300072855} + m_CullTransparentMesh: 1 +--- !u!114 &4019168675148883827 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579045848300072855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.1764706, b: 0.33333334, 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_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!114 &77436869593246426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579045848300072855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4019168675148883827} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!225 &3494180093217185995 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579045848300072855} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &4366847275719105606 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579045848300072855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bfd0d144b6d3dd438b84fa14a062c4f, type: 3} + m_Name: + m_EditorClassIdentifier: + playHover: 1 + playClick: 1 + playRelease: 1 + extraClickEvent: {fileID: 0} +--- !u!114 &3400217371173087097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579045848300072855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 274bf6bf95184804cb2606eda1bf2a6a, type: 3} + m_Name: + m_EditorClassIdentifier: + showHideAnimator: {fileID: 0} + button: {fileID: 77436869593246426} + text: {fileID: 2106614225301025675} + icon: {fileID: 8485430861690130054} + model: + text: NEXT + icon: {fileID: 21300000, guid: 877d19aa5b7d74c25862a30311503ed4, type: 3} +--- !u!114 &8851328573667013568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579045848300072855} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 63f05fbeb9b20044d9c1dc9abd16c772, type: 3} + m_Name: + m_EditorClassIdentifier: + textToChange: {fileID: 2106614225301025675} + iconToChange: {fileID: 8485430861690130054} + onFocusColor: {r: 1, g: 1, b: 1, a: 1} + onLoseFocusColor: {r: 0.027450982, g: 0.7803922, b: 0.7176471, a: 1} +--- !u!1 &1801116622221139394 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3796049446928469386} + - component: {fileID: 9168637634446966193} + - component: {fileID: 2099548947802068887} + m_Layer: 5 + m_Name: Header + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3796049446928469386 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801116622221139394} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5732738632668567410} + - {fileID: 8870671573072448641} + - {fileID: 7362392692425171482} + m_Father: {fileID: 3150290541654462627} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0.321, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 70} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &9168637634446966193 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1801116622221139394} m_CullTransparentMesh: 1 @@ -588,6 +1150,195 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2070551518993042687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2069590308181577131} + - component: {fileID: 8186487160592845386} + - component: {fileID: 307603210563824139} + - component: {fileID: 1230887024710601160} + - component: {fileID: 1765035978473072296} + - component: {fileID: 5071097894896792743} + - component: {fileID: 813070099672572821} + - component: {fileID: 7177588579789046480} + m_Layer: 5 + m_Name: BackButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2069590308181577131 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070551518993042687} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 334768666670876389} + - {fileID: 8113110150136540914} + m_Father: {fileID: 5910900519288670340} + 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: 30, y: 0} + m_SizeDelta: {x: 90, y: 46} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &8186487160592845386 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070551518993042687} + m_CullTransparentMesh: 1 +--- !u!114 &307603210563824139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070551518993042687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!114 &1230887024710601160 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070551518993042687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.8962264, g: 0.8962264, b: 0.8962264, a: 1} + m_SelectedColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, 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_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 307603210563824139} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!225 &1765035978473072296 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070551518993042687} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &5071097894896792743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070551518993042687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bfd0d144b6d3dd438b84fa14a062c4f, type: 3} + m_Name: + m_EditorClassIdentifier: + playHover: 1 + playClick: 1 + playRelease: 1 + extraClickEvent: {fileID: 0} +--- !u!114 &813070099672572821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070551518993042687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 274bf6bf95184804cb2606eda1bf2a6a, type: 3} + m_Name: + m_EditorClassIdentifier: + showHideAnimator: {fileID: 0} + button: {fileID: 1230887024710601160} + text: {fileID: 898603626774995711} + icon: {fileID: 803950736251462913} + model: + text: BACK + icon: {fileID: 21300000, guid: 877d19aa5b7d74c25862a30311503ed4, type: 3} +--- !u!114 &7177588579789046480 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2070551518993042687} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 63f05fbeb9b20044d9c1dc9abd16c772, type: 3} + m_Name: + m_EditorClassIdentifier: + textToChange: {fileID: 898603626774995711} + iconToChange: {fileID: 803950736251462913} + onFocusColor: {r: 1, g: 1, b: 1, a: 1} + onLoseFocusColor: {r: 0.027450982, g: 0.7803922, b: 0.7176471, a: 1} --- !u!1 &2104245742628137850 GameObject: m_ObjectHideFlags: 0 @@ -622,8 +1373,8 @@ RectTransform: 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: 130.00029, y: -32.999725} - m_SizeDelta: {x: 226, y: 20} + m_AnchoredPosition: {x: 194.0149, y: -32.999725} + m_SizeDelta: {x: 354, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4019974648158641564 CanvasRenderer: @@ -653,7 +1404,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Items to view info. x2 to equip/unequip + m_text: Click items x1 to view their info. x2 to equip/unequip m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} @@ -662,8 +1413,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4286344049 - m_fontColor: {r: 0.44313726, g: 0.41960785, b: 0.4862745, a: 1} + rgba: 4283056195 + m_fontColor: {r: 0.2627451, g: 0.2509804, b: 0.2901961, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -680,8 +1431,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12 - m_fontSizeBase: 12 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -835,7 +1586,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 7.000292, y: 33.000275} - m_SizeDelta: {x: 14, y: 16} + m_SizeDelta: {x: 16, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7244113486412151992 CanvasRenderer: @@ -858,7 +1609,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.44313726, g: 0.41960785, b: 0.4862745, a: 1} + m_Color: {r: 0.2627451, g: 0.2509804, b: 0.2901961, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -950,6 +1701,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 2 +--- !u!1 &2732148336737316940 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8113110150136540914} + - component: {fileID: 4308093537474744218} + - component: {fileID: 898603626774995711} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8113110150136540914 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2732148336737316940} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2069590308181577131} + 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: 7.2902, y: 0} + m_SizeDelta: {x: 54.6504, y: 46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4308093537474744218 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2732148336737316940} + m_CullTransparentMesh: 1 +--- !u!114 &898603626774995711 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2732148336737316940} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_text: BACK + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 15 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 0 + m_fontSizeMax: 16 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 1 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2873328789701693609 GameObject: m_ObjectHideFlags: 0 @@ -1255,12 +2141,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6553298992627456305} + - {fileID: 1238863926746129352} - {fileID: 8123435181804342355} - {fileID: 3796049446928469386} - {fileID: 6978439095690722522} - - {fileID: 2808822538381467795} - - {fileID: 8509127120294317601} + - {fileID: 7452293473094958854} - {fileID: 5524500279841468122} + - {fileID: 5910900519288670340} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1343,6 +2230,8 @@ MonoBehaviour: showHideAnimator: {fileID: 0} sectionSelector: {fileID: 4937913390550088837} wearablesSection: {fileID: 8694961808569182621} + wearablesSectionCanvasGroup: {fileID: 488015403376276380} + wearablesSectionBackground: {fileID: 3183983164897129620} emotesSection: {fileID: 8105447645029322740} backpackPreviewPanel: {fileID: 1525771720304835258} wearableGridComponentView: {fileID: 1749780642349599266} @@ -1360,6 +2249,23 @@ MonoBehaviour: outfitButtonIcon: {fileID: 3485334918105635855} vrmExportButton: {fileID: 2441708800504307716} vrmExportedToast: {fileID: 1332459953862512925} + background: {fileID: 877741989302552789} + hints: {fileID: 4019917794035596556} + signUpHeader: {fileID: 6032775923198393604} + signUpHeaderTitle: {fileID: 3299006008772291472} + backgroundForSignUp: {fileID: 4055525242982503514} + backButton: {fileID: 1230887024710601160} + nextButton: {fileID: 77436869593246426} + objectsToDeactivateInSignUpMode: + - {fileID: 1801116622221139394} + - {fileID: 8302108287862786213} + - {fileID: 9051742950965977207} + - {fileID: 4501634856494230904} + wearablesBackgroundForSignUp: {fileID: 4342889036681528669} + wearablesBackgroundForSignUpCanvasGroup: {fileID: 180354113003941719} + transitionEase: 19 + transitionDuration: 0.5 + transitionDistance: 1800 --- !u!114 &8774932851833110932 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1639,73 +2545,283 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4833671119558046783} - - component: {fileID: 6231985440395662688} - - component: {fileID: 3634465567243128528} + - component: {fileID: 4833671119558046783} + - component: {fileID: 6231985440395662688} + - component: {fileID: 3634465567243128528} + m_Layer: 5 + m_Name: ScrollIcn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4833671119558046783 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3269679662471255222} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6978439095690722522} + 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: 7.000292, y: 11.000275} + m_SizeDelta: {x: 16, y: 16} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6231985440395662688 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3269679662471255222} + m_CullTransparentMesh: 1 +--- !u!114 &3634465567243128528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3269679662471255222} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.2627451, g: 0.2509804, b: 0.2901961, 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_Sprite: {fileID: 21300000, guid: 96f72d4a8759b47cea1df19e01632e26, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3313208992325237374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5385834669478912827} + - component: {fileID: 5752800175130206665} + - component: {fileID: 3338989812363151489} + m_Layer: 5 + m_Name: RadialRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5385834669478912827 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3313208992325237374} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1238863926746129352} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 377.4356, y: 12.802124} + m_SizeDelta: {x: 88.6041, y: 713.4089} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5752800175130206665 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3313208992325237374} + m_CullTransparentMesh: 1 +--- !u!114 &3338989812363151489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3313208992325237374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.8742672, b: 0.6431373, 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_Sprite: {fileID: 21300000, guid: 9fb5589c5caac46e5882f2be6709b03d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3435605625687558718 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6921547316914522286} + - component: {fileID: 2492919368130015138} + - component: {fileID: 2106614225301025675} m_Layer: 5 - m_Name: RightIcn + m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4833671119558046783 +--- !u!224 &6921547316914522286 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3269679662471255222} + m_GameObject: {fileID: 3435605625687558718} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6978439095690722522} + m_Father: {fileID: 6466622163805889236} 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: 7.000292, y: 11.000275} - m_SizeDelta: {x: 14, y: 16} + 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: 108, y: 46} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6231985440395662688 +--- !u!222 &2492919368130015138 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3269679662471255222} + m_GameObject: {fileID: 3435605625687558718} m_CullTransparentMesh: 1 ---- !u!114 &3634465567243128528 +--- !u!114 &2106614225301025675 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3269679662471255222} + m_GameObject: {fileID: 3435605625687558718} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.44313726, g: 0.41960785, b: 0.4862745, a: 1} - m_RaycastTarget: 1 + 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_Sprite: {fileID: 21300000, guid: 0c1f94bccfacc415f8b7916a4f3ae512, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_text: NEXT + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 15 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 0 + m_fontSizeMax: 16 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 1 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3512838727088661949 GameObject: m_ObjectHideFlags: 0 @@ -1740,8 +2856,8 @@ RectTransform: 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: 20, y: 0} - m_SizeDelta: {x: 16, y: 16} + m_AnchoredPosition: {x: 18, y: 0} + m_SizeDelta: {x: 18, y: 14} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6229098342105957262 CanvasRenderer: @@ -1771,7 +2887,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 04162ca1b011c47e7a21c573dc2c8a14, type: 3} + m_Sprite: {fileID: 21300000, guid: fe227f939d22a5941aa33dece9abecab, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2086,11 +3202,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6774232023209469465} - m_Father: {fileID: 3150290541654462627} + m_Father: {fileID: 7452293473094958854} 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: 52.880005, y: -56} + m_AnchoredPosition: {x: 52.880005, y: -28} m_SizeDelta: {x: 46, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9147690448515644523 @@ -2199,41 +3315,269 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6978439095690722522} + - component: {fileID: 6978439095690722522} + m_Layer: 5 + m_Name: Hints + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6978439095690722522 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4019917794035596556} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8142942395115637025} + - {fileID: 7208055736649029552} + - {fileID: 4833671119558046783} + - {fileID: 990663290263357610} + - {fileID: 4946856279897323622} + - {fileID: 5214646346852136781} + - {fileID: 6898135960386834224} + - {fileID: 9222180925196709489} + m_Father: {fileID: 3150290541654462627} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 150, y: 74} + m_SizeDelta: {x: 243, y: 86} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4055525242982503514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1238863926746129352} + - component: {fileID: 1043373284709577512} + - component: {fileID: 7508786313309376115} + - component: {fileID: 4309889245878882125} + m_Layer: 5 + m_Name: BackgroundForSignUp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1238863926746129352 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4055525242982503514} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5385834669478912827} + - {fileID: 3298006400841531246} + - {fileID: 3456940062615268944} + - {fileID: 8256146862193256572} + - {fileID: 4852378705022286991} + - {fileID: 4342889036681528669} + m_Father: {fileID: 3150290541654462627} + 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.5, y: 0.5} +--- !u!222 &1043373284709577512 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4055525242982503514} + m_CullTransparentMesh: 1 +--- !u!114 &7508786313309376115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4055525242982503514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.64599484, b: 0.47843134, 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_Sprite: {fileID: 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 + m_PixelsPerUnitMultiplier: 2 +--- !u!114 &4309889245878882125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4055525242982503514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!1 &4501634856494230904 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7452293473094958854} + m_Layer: 5 + m_Name: LeftButtons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7452293473094958854 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4501634856494230904} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2808822538381467795} + - {fileID: 8509127120294317601} + m_Father: {fileID: 3150290541654462627} + 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: 0, y: -28} + m_SizeDelta: {x: 110, y: 110} + m_Pivot: {x: 0, y: 0.5} +--- !u!1 &4581576638940804506 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 334768666670876389} + - component: {fileID: 3883938496906383871} + - component: {fileID: 803950736251462913} + - component: {fileID: 7089230401055959783} m_Layer: 5 - m_Name: Hints + m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6978439095690722522 +--- !u!224 &334768666670876389 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4019917794035596556} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 4581576638940804506} + 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8142942395115637025} - - {fileID: 7208055736649029552} - - {fileID: 4833671119558046783} - - {fileID: 990663290263357610} - - {fileID: 4946856279897323622} - - {fileID: 5214646346852136781} - - {fileID: 6898135960386834224} - - {fileID: 9222180925196709489} - m_Father: {fileID: 3150290541654462627} + m_Children: [] + m_Father: {fileID: 2069590308181577131} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 150, y: 74} - m_SizeDelta: {x: 243, y: 86} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 16, y: -23} + m_SizeDelta: {x: 14, y: 14} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3883938496906383871 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4581576638940804506} + m_CullTransparentMesh: 1 +--- !u!114 &803950736251462913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4581576638940804506} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.1764706, b: 0.33333334, 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_Sprite: {fileID: 21300000, guid: 643485b56259a47ff8f14e9b10fd47bb, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7089230401055959783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4581576638940804506} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 5 + m_MinHeight: 5 + m_PreferredWidth: 14 + m_PreferredHeight: 10 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &4687927231565998221 GameObject: m_ObjectHideFlags: 0 @@ -2403,8 +3747,8 @@ RectTransform: 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: 130.00029, y: 33.000275} - m_SizeDelta: {x: 226, y: 20} + m_AnchoredPosition: {x: 194.0149, y: 33.000275} + m_SizeDelta: {x: 354, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &76697598986303759 CanvasRenderer: @@ -2434,7 +3778,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: And drag avatar to rotate + m_text: Left-click and drag avatar to rotate m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} @@ -2443,8 +3787,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4286344049 - m_fontColor: {r: 0.44313726, g: 0.41960785, b: 0.4862745, a: 1} + rgba: 4283056195 + m_fontColor: {r: 0.2627451, g: 0.2509804, b: 0.2901961, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2461,8 +3805,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12 - m_fontSizeBase: 12 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2539,7 +3883,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 7.000292, y: -32.999725} - m_SizeDelta: {x: 14, y: 16} + m_SizeDelta: {x: 16, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8889210062964757835 CanvasRenderer: @@ -2562,7 +3906,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.44313726, g: 0.41960785, b: 0.4862745, a: 1} + m_Color: {r: 0.2627451, g: 0.2509804, b: 0.2901961, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3247,6 +4591,81 @@ MonoBehaviour: m_FadeDuration: 0 unselectedTextColor: {r: 0, g: 0, b: 0, a: 1} unselectedImageColor: {r: 0, g: 0, b: 0, a: 1} +--- !u!1 &5667253241381250499 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3456940062615268944} + - component: {fileID: 2747246199804550950} + - component: {fileID: 1935211302795386888} + m_Layer: 5 + m_Name: RadialLeft + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3456940062615268944 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5667253241381250499} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1238863926746129352} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -682.5179, y: 37.21759} + m_SizeDelta: {x: -1365.3942, y: -274.9248} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2747246199804550950 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5667253241381250499} + m_CullTransparentMesh: 1 +--- !u!114 &1935211302795386888 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5667253241381250499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.9607843, b: 0.7490196, a: 0.27450982} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 9fb5589c5caac46e5882f2be6709b03d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5748387431688135276 GameObject: m_ObjectHideFlags: 0 @@ -3708,6 +5127,85 @@ MonoBehaviour: iconToChange: {fileID: 8215258920564745813} onFocusColor: {r: 1, g: 1, b: 1, a: 1} onLoseFocusColor: {r: 0.027450982, g: 0.7803922, b: 0.7176471, a: 1} +--- !u!1 &6032775923198393604 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5910900519288670340} + - component: {fileID: 7835316893245267837} + - component: {fileID: 1408973870174605080} + m_Layer: 5 + m_Name: SignUpHeader + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5910900519288670340 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6032775923198393604} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2069590308181577131} + - {fileID: 7429190631637473170} + - {fileID: 6466622163805889236} + - {fileID: 2942948614829787355} + m_Father: {fileID: 3150290541654462627} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 70} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &7835316893245267837 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6032775923198393604} + m_CullTransparentMesh: 1 +--- !u!114 &1408973870174605080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6032775923198393604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411766, 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_Sprite: {fileID: 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6331759221656227466 GameObject: m_ObjectHideFlags: 0 @@ -3754,15 +5252,90 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6331759221656227466} + m_GameObject: {fileID: 6331759221656227466} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 2 + m_AspectRatio: 1.778 +--- !u!1 &6468513329892971067 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3477912684092409739} + - component: {fileID: 3470226798384022359} + - component: {fileID: 528535030943428529} + m_Layer: 5 + m_Name: UnselectedIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3477912684092409739 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6468513329892971067} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6328930397804721303} + 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: 21.5, y: 0} + m_SizeDelta: {x: 25, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3470226798384022359 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6468513329892971067} + m_CullTransparentMesh: 1 +--- !u!114 &528535030943428529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6468513329892971067} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86710e43de46f6f4bac7c8e50813a599, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_AspectMode: 2 - m_AspectRatio: 1.778 ---- !u!1 &6468513329892971067 + m_Material: {fileID: 0} + m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, 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_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6599944213440104296 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3770,66 +5343,66 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3477912684092409739} - - component: {fileID: 3470226798384022359} - - component: {fileID: 528535030943428529} + - component: {fileID: 2942948614829787355} + - component: {fileID: 6767648118265978249} + - component: {fileID: 8462531375284028310} m_Layer: 5 - m_Name: UnselectedIcon + m_Name: Gradient m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3477912684092409739 +--- !u!224 &2942948614829787355 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6468513329892971067} + m_GameObject: {fileID: 6599944213440104296} 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6328930397804721303} + m_Father: {fileID: 5910900519288670340} 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: 21.5, y: 0} - m_SizeDelta: {x: 25, y: 25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3470226798384022359 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 3} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &6767648118265978249 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6468513329892971067} + m_GameObject: {fileID: 6599944213440104296} m_CullTransparentMesh: 1 ---- !u!114 &528535030943428529 +--- !u!114 &8462531375284028310 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6468513329892971067} + m_GameObject: {fileID: 6599944213440104296} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_Material: {fileID: 2100000, guid: 46b27b872d36eed4189dc8d5948e9c00, 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_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 - m_PreserveAspect: 1 + m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -4471,6 +6044,177 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &7359625395133578900 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3508913861399150950} + - component: {fileID: 1393813384000243907} + - component: {fileID: 8485430861690130054} + - component: {fileID: 1790278748753856961} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3508913861399150950 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7359625395133578900} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6466622163805889236} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 94.52, y: -23} + m_SizeDelta: {x: 14, y: 46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1393813384000243907 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7359625395133578900} + m_CullTransparentMesh: 1 +--- !u!114 &8485430861690130054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7359625395133578900} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_Sprite: {fileID: 21300000, guid: 877d19aa5b7d74c25862a30311503ed4, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1790278748753856961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7359625395133578900} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 5 + m_MinHeight: 5 + m_PreferredWidth: 14 + m_PreferredHeight: 10 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &7419256743363626811 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4852378705022286991} + - component: {fileID: 8165893930868093389} + - component: {fileID: 1558327372318158274} + m_Layer: 5 + m_Name: RadialTopLeft + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4852378705022286991 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7419256743363626811} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1238863926746129352} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -658, y: 676} + m_SizeDelta: {x: 1000, y: 1000} + m_Pivot: {x: 0, y: 1} +--- !u!222 &8165893930868093389 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7419256743363626811} + m_CullTransparentMesh: 1 +--- !u!114 &1558327372318158274 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7419256743363626811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7764706, g: 0.2509804, b: 0.8039216, 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_Sprite: {fileID: 21300000, guid: 9fb5589c5caac46e5882f2be6709b03d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7434593196046200920 GameObject: m_ObjectHideFlags: 0 @@ -4504,11 +6248,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1292220468979140246} - m_Father: {fileID: 3150290541654462627} + m_Father: {fileID: 7452293473094958854} 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: 52.880005, y: 0} + m_AnchoredPosition: {x: 52.880005, y: 28} m_SizeDelta: {x: 46, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &369936347188194217 @@ -4853,8 +6597,8 @@ RectTransform: 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: 130.00024, y: 11.000275} - m_SizeDelta: {x: 226, y: 20} + m_AnchoredPosition: {x: 194.01482, y: 11.000275} + m_SizeDelta: {x: 354, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1906847569895504502 CanvasRenderer: @@ -4884,9 +6628,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'And drag avatar to pan - -' + m_text: Scroll to zoom in/out m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} @@ -4895,8 +6637,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4286344049 - m_fontColor: {r: 0.44313726, g: 0.41960785, b: 0.4862745, a: 1} + rgba: 4283056195 + m_fontColor: {r: 0.2627451, g: 0.2509804, b: 0.2901961, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -4913,8 +6655,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12 - m_fontSizeBase: 12 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -5137,8 +6879,8 @@ RectTransform: 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: 130.00029, y: -10.999756} - m_SizeDelta: {x: 226, y: 20} + m_AnchoredPosition: {x: 194.0149, y: -10.999756} + m_SizeDelta: {x: 354, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1843754919022980753 CanvasRenderer: @@ -5168,7 +6910,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Zoom in/out avatar + m_text: Right-click and drag avatar to pan m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} @@ -5177,8 +6919,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4286344049 - m_fontColor: {r: 0.44313726, g: 0.41960785, b: 0.4862745, a: 1} + rgba: 4283056195 + m_fontColor: {r: 0.2627451, g: 0.2509804, b: 0.2901961, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -5195,8 +6937,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12 - m_fontSizeBase: 12 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -6308,6 +8050,16 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5619480088259716515, guid: 210aa713bbb1ba742ae68e327564eb24, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 5619480088259716515, guid: 210aa713bbb1ba742ae68e327564eb24, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} - target: {fileID: 5737810733465724014, guid: 210aa713bbb1ba742ae68e327564eb24, type: 3} propertyPath: m_AnchoredPosition.y @@ -6832,9 +8584,14 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3302785465968920600, guid: 7987c409c7fea4189954a35a350cfd2a, type: 3} - propertyPath: m_Value + propertyPath: m_Size value: 1 objectReference: {fileID: 0} + - target: {fileID: 3302785465968920600, guid: 7987c409c7fea4189954a35a350cfd2a, + type: 3} + propertyPath: m_Value + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3405755437925897666, guid: 7987c409c7fea4189954a35a350cfd2a, type: 3} propertyPath: m_AnchorMax.y @@ -7180,6 +8937,11 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4847834742907417991, guid: 7987c409c7fea4189954a35a350cfd2a, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 6.0000305 + objectReference: {fileID: 0} - target: {fileID: 5004805495591359541, guid: 7987c409c7fea4189954a35a350cfd2a, type: 3} propertyPath: m_AnchoredPosition.y @@ -7633,6 +9395,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7639681550671311545, guid: 7987c409c7fea4189954a35a350cfd2a, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7666540203010386272, guid: 7987c409c7fea4189954a35a350cfd2a, type: 3} propertyPath: m_AnchorMax.y @@ -7748,7 +9515,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 905428465606010205, guid: 7987c409c7fea4189954a35a350cfd2a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 488015403376276380} m_SourcePrefab: {fileID: 100100000, guid: 7987c409c7fea4189954a35a350cfd2a, type: 3} --- !u!1 &211765849088223244 stripped GameObject: @@ -7780,13 +9551,25 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 036f9ab7337445c7825161e4d11fbfbe, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &3183983164897129620 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6347199185060100180, guid: 7987c409c7fea4189954a35a350cfd2a, + type: 3} + m_PrefabInstance: {fileID: 8375023868890549440} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8694961808569182621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &3816535422934981372 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4669389939373217340, guid: 7987c409c7fea4189954a35a350cfd2a, type: 3} m_PrefabInstance: {fileID: 8375023868890549440} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 8302108287862786213} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4c7033a292424c3c9cc450747544a132, type: 3} @@ -7828,12 +9611,36 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a23c4e6847f864c29968a45e1874abf0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &8302108287862786213 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 508075897983648869, guid: 7987c409c7fea4189954a35a350cfd2a, + type: 3} + m_PrefabInstance: {fileID: 8375023868890549440} + m_PrefabAsset: {fileID: 0} --- !u!1 &8694961808569182621 stripped GameObject: m_CorrespondingSourceObject: {fileID: 905428465606010205, guid: 7987c409c7fea4189954a35a350cfd2a, type: 3} m_PrefabInstance: {fileID: 8375023868890549440} m_PrefabAsset: {fileID: 0} +--- !u!225 &488015403376276380 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8694961808569182621} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!1 &9051742950965977207 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 694767754441043127, guid: 7987c409c7fea4189954a35a350cfd2a, + type: 3} + m_PrefabInstance: {fileID: 8375023868890549440} + m_PrefabAsset: {fileID: 0} --- !u!114 &8524006652554261386 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Tests/BackpackEditorHUDControllerShould.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Tests/BackpackEditorHUDControllerShould.cs index 6b7ba00d28..b7c6d9bf07 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Tests/BackpackEditorHUDControllerShould.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Tests/BackpackEditorHUDControllerShould.cs @@ -20,6 +20,8 @@ namespace DCL.Backpack { public class BackpackEditorHUDControllerShould { + private const string NEW_TOS_AND_EMAIL_SUBSCRIPTION_FF = "new_terms_of_service_and_email_subscription"; + private UserProfile userProfile; private IBackpackEditorHUDView view; private DataStore dataStore; @@ -131,10 +133,16 @@ public void InitializeCorrectly() } [Test] - public void ShowBackpackCorrectly() + [TestCase(true, true)] + [TestCase(false, true)] + [TestCase(true, false)] + [TestCase(false, false)] + public void ShowBackpackCorrectly(bool isSignUpFlow, bool isNewTermsOfServiceAndEmailSubscriptionEnabled) { // Arrange + dataStore.common.isSignUpFlow.Set(isSignUpFlow, false); dataStore.skyboxConfig.avatarMatProfile.Set(AvatarMaterialProfile.InWorld, false); + dataStore.featureFlags.flags.Set(new FeatureFlag { flags = { [NEW_TOS_AND_EMAIL_SUBSCRIPTION_FF] = isNewTermsOfServiceAndEmailSubscriptionEnabled } }); // Act dataStore.HUDs.avatarEditorVisible.Set(true, true); @@ -144,6 +152,7 @@ public void ShowBackpackCorrectly() backpackEmotesSectionController.Received(1).RestoreEmoteSlots(); backpackEmotesSectionController.Received(1).LoadEmotes(); view.Received(1).Show(); + view.Received(1).SetSignUpModeActive(isSignUpFlow && isNewTermsOfServiceAndEmailSubscriptionEnabled); } [Test] @@ -329,13 +338,19 @@ public void SaveAvatarAndCloseViewWhenContinueSignup() } [Test] - public void ShowSignup() + [TestCase(true)] + [TestCase(false)] + public void ShowSignup(bool isNewTermsOfServiceAndEmailSubscriptionEnabled) { dataStore.common.isSignUpFlow.Set(true); + dataStore.featureFlags.flags.Set(new FeatureFlag { flags = { [NEW_TOS_AND_EMAIL_SUBSCRIPTION_FF] = isNewTermsOfServiceAndEmailSubscriptionEnabled } }); dataStore.HUDs.avatarEditorVisible.Set(true, true); - view.Received(1).ShowContinueSignup(); + if (isNewTermsOfServiceAndEmailSubscriptionEnabled) + view.Received(1).HideContinueSignup(); + else + view.Received(1).ShowContinueSignup(); } [Test] @@ -429,6 +444,27 @@ public void FallbackIncompatibleWearablesWhenChangingBodyShape() Assert.IsFalse(userProfile.avatar.wearables.Contains("urn:decentraland:off-chain:base-avatars:f_jeans")); } + [Test] + [TestCase(SignUpStage.CustomizeAvatar)] + [TestCase(SignUpStage.SetNameAndEmail)] + public void SignUpBackCorrectly(SignUpStage currentStage) + { + // Act + view.OnSignUpBackClicked += Raise.Event>(currentStage); + + switch (currentStage) + { + // Assert + default: + case SignUpStage.CustomizeAvatar: + userProfileBridge.Received(1).LogOut(); + break; + case SignUpStage.SetNameAndEmail: + Assert.IsFalse(dataStore.HUDs.signupVisible.Get()); + break; + } + } + private static UserProfileModel GetTestUserProfileModel() => new () { diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Tests/WearableGridComponentViewShould.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Tests/WearableGridComponentViewShould.cs index 03f8ac731b..ad5b228064 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Tests/WearableGridComponentViewShould.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Tests/WearableGridComponentViewShould.cs @@ -244,12 +244,15 @@ public void SetBreadcrumb() } [Test] - public void EnableEmptyStateWhenNoWearables() + [TestCase(true)] + [TestCase(false)] + public void EnableEmptyStateWhenNoWearables(bool isSignIn) { + DataStore.i.common.isSignUpFlow.Set(isSignIn); view.ClearWearables(); view.ShowWearables(Array.Empty()); - Assert.IsTrue(view.emptyStateContainer.activeSelf); + Assert.IsTrue(isSignIn ? view.emptyStateContainerForSignUp : view.emptyStateContainer.activeSelf); Assert.IsFalse(view.wearablesGridContainer.gameObject.activeSelf); } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/WearableGridComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/WearableGridComponentView.cs index 2e8f235998..260de31775 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/WearableGridComponentView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/WearableGridComponentView.cs @@ -14,6 +14,7 @@ public class WearableGridComponentView : MonoBehaviour, IWearableGridView [SerializeField] internal PageSelectorComponentView wearablePageSelector; [SerializeField] internal InfoCardComponentView infoCardComponentView; [SerializeField] internal GameObject emptyStateContainer; + [SerializeField] internal GameObject emptyStateContainerForSignUp; [SerializeField] internal Button goToMarketplaceButton; [SerializeField] internal GameObject loadingSpinner; @@ -185,7 +186,9 @@ private void UpdateEmptyState() bool isEmpty = wearablesById.Count == 0; wearablesGridContainer.gameObject.SetActive(!isEmpty && !loadingSpinner.activeSelf); - emptyStateContainer.SetActive(isEmpty && !loadingSpinner.activeSelf); + + emptyStateContainer.SetActive(isEmpty && !loadingSpinner.activeSelf && !DataStore.i.common.isSignUpFlow.Get()); + emptyStateContainerForSignUp.SetActive(isEmpty && !loadingSpinner.activeSelf && DataStore.i.common.isSignUpFlow.Get()); } } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/WearableGridController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/WearableGridController.cs index 475267555b..43662e4838 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/WearableGridController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/WearableGridController.cs @@ -21,6 +21,7 @@ public class WearableGridController private const string CATEGORY_FILTER_REF = "category="; private const string URL_MARKET_PLACE = "https://market.decentraland.org/browse?section=wearables"; private const string URL_GET_A_WALLET = "https://docs.decentraland.org/get-a-wallet"; + private const string EMPTY_WEARABLE_DESCRIPTION = "This item doesn’t have a description."; private readonly IWearableGridView view; private readonly IUserProfileBridge userProfileBridge; @@ -403,7 +404,7 @@ private void HandleWearableSelected(WearableGridItemModel wearableGridItem) { rarity = wearable.rarity, category = wearable.data.category, - description = wearable.description, + description = string.IsNullOrEmpty(wearable.description) ? EMPTY_WEARABLE_DESCRIPTION : wearable.description, imageUri = wearable.ComposeThumbnailUrl(), // TODO: solve hidden by field diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsComponentView.cs new file mode 100644 index 0000000000..0d370ccb5e --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsComponentView.cs @@ -0,0 +1,121 @@ +using System; +using TMPro; +using UnityEngine; +using UnityEngine.EventSystems; + +namespace DCL.MyAccount +{ + public class EmailNotificationsComponentView : BaseComponentView, IEmailNotificationsComponentView, IPointerClickHandler + { + [SerializeField] internal GameObject mainContainer; + [SerializeField] internal GameObject loadingContainer; + [SerializeField] internal TMP_InputField emailInputField; + [SerializeField] internal GameObject emailEditionLogoContainer; + [SerializeField] internal GameObject emailEditionLogo; + [SerializeField] internal GameObject emailEditionLoadingSpinner; + [SerializeField] internal GameObject emailInputFieldInvalid; + [SerializeField] internal GameObject emailInputFieldEditing; + [SerializeField] internal GameObject emailInputInvalidLabel; + [SerializeField] internal GameObject pendingStatusWarning; + [SerializeField] internal TMP_Text pendingStatusWarningText; + [SerializeField] internal Sprite deleteEmailSprite; + [SerializeField] internal Sprite updateEmailSprite; + + public event Action OnEmailEdited; + public event Action OnEmailSubmitted; + public event Action OnReSendConfirmationEmailClicked; + + public Sprite deleteEmailLogo => deleteEmailSprite; + public Sprite updateEmailLogo => updateEmailSprite; + + public override void Awake() + { + base.Awake(); + + emailInputField.onValueChanged.AddListener(OnEmailTextChanged); + emailInputField.onSelect.AddListener(_ => + { + emailEditionLogo.SetActive(false); + emailInputFieldEditing.SetActive(true); + }); + emailInputField.onDeselect.AddListener(OnEmailTextSubmitted); + emailInputField.onSubmit.AddListener(OnEmailTextSubmitted); + } + + public override void RefreshControl() { } + + public void SetLoadingActive(bool isActive) + { + loadingContainer.SetActive(isActive); + mainContainer.SetActive(!isActive); + } + + public void SetEmail(string email) => + emailInputField.text = email; + + public void SetStatusAsPending(bool isPending) => + pendingStatusWarning.SetActive(isPending); + + public void SetEmailFormValid(bool isValid) + { + emailInputFieldInvalid.SetActive(!isValid); + emailInputInvalidLabel.SetActive(!isValid); + } + + public void ResetForm() + { + emailEditionLogo.SetActive(true); + emailInputFieldEditing.SetActive(false); + emailInputFieldInvalid.SetActive(false); + emailInputInvalidLabel.SetActive(false); + SetStatusAsPending(false); + } + + public void SetEmailInputInteractable(bool isInteractable) => + emailInputField.interactable = isInteractable; + + public void SetEmailUpdateLoadingActive(bool isActive) + { + emailEditionLogoContainer.SetActive(!isActive); + emailEditionLoadingSpinner.SetActive(isActive); + } + + public override void Show(bool instant = false) => + gameObject.SetActive(true); + + public override void Hide(bool instant = false) => + gameObject.SetActive(false); + + public void OnPointerClick(PointerEventData eventData) + { + int linkIndex = TMP_TextUtilities.FindIntersectingLink(pendingStatusWarningText, Input.mousePosition, null); + if (linkIndex == -1) + return; + + TMP_LinkInfo linkInfo = pendingStatusWarningText.textInfo.linkInfo[linkIndex]; + if (linkInfo.GetLinkID() == "reSendConfirmationEmail") + OnReSendConfirmationEmailClicked?.Invoke(); + } + + public override void Dispose() + { + emailInputField.onValueChanged.RemoveAllListeners(); + emailInputField.onDeselect.RemoveAllListeners(); + emailInputField.onSubmit.RemoveAllListeners(); + + base.Dispose(); + } + + private void OnEmailTextChanged(string newName) + { + OnEmailEdited?.Invoke(newName); + } + + private void OnEmailTextSubmitted(string newName) + { + emailEditionLogo.SetActive(true); + emailInputFieldEditing.SetActive(false); + OnEmailSubmitted?.Invoke(newName); + } + } +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsComponentView.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsComponentView.cs.meta new file mode 100644 index 0000000000..87546a1e69 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsComponentView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 659a6aee3e5b47788b88ac6edbd4559d +timeCreated: 1697645403 \ No newline at end of file diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsController.cs new file mode 100644 index 0000000000..302313e1e9 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsController.cs @@ -0,0 +1,257 @@ +using Cysharp.Threading.Tasks; +using DCL.Helpers; +using DCL.Tasks; +using DCLServices.SubscriptionsAPIService; +using SocialFeaturesAnalytics; +using System; +using System.Net.Mail; +using System.Threading; +using UnityEngine; + +namespace DCL.MyAccount +{ + public class EmailNotificationsController + { + private enum ConfirmationModalStatus + { + None, + Accepted, + Rejected, + } + + private const string CURRENT_SUBSCRIPTION_ID_LOCAL_STORAGE_KEY = "currentSubscriptionId"; + + private readonly IEmailNotificationsComponentView view; + private readonly IUpdateEmailConfirmationHUDComponentView updateEmailConfirmationHUDComponentView; + private readonly MyAccountSectionHUDController myAccountSectionHUDController; + private readonly DataStore dataStore; + private readonly ISubscriptionsAPIService subscriptionsAPIService; + private readonly ISocialAnalytics socialAnalytics; + + private CancellationTokenSource loadEmailCancellationToken; + private CancellationTokenSource updateEmailCancellationToken; + + private string savedEmail; + private bool savedIsPending; + private ConfirmationModalStatus confirmationModalStatus = ConfirmationModalStatus.None; + + public EmailNotificationsController( + IEmailNotificationsComponentView view, + IUpdateEmailConfirmationHUDComponentView updateEmailConfirmationHUDComponentView, + MyAccountSectionHUDController myAccountSectionHUDController, + DataStore dataStore, + ISubscriptionsAPIService subscriptionsAPIService, + ISocialAnalytics socialAnalytics) + { + this.view = view; + this.updateEmailConfirmationHUDComponentView = updateEmailConfirmationHUDComponentView; + this.myAccountSectionHUDController = myAccountSectionHUDController; + this.dataStore = dataStore; + this.subscriptionsAPIService = subscriptionsAPIService; + this.socialAnalytics = socialAnalytics; + + dataStore.myAccount.isMyAccountSectionVisible.OnChange += OnMyAccountSectionOpen; + dataStore.myAccount.openSection.OnChange += OnMyAccountSectionTabChanged; + view.OnEmailEdited += OnEmailEdited; + view.OnEmailSubmitted += OnEmailSubmitted; + view.OnReSendConfirmationEmailClicked += OnReSendConfirmationEmailClicked; + updateEmailConfirmationHUDComponentView.OnConfirmationModalAccepted += isAccepted => confirmationModalStatus = isAccepted ? ConfirmationModalStatus.Accepted : ConfirmationModalStatus.Rejected; + } + + public void Dispose() + { + loadEmailCancellationToken.SafeCancelAndDispose(); + updateEmailCancellationToken.SafeCancelAndDispose(); + dataStore.myAccount.isMyAccountSectionVisible.OnChange -= OnMyAccountSectionOpen; + dataStore.myAccount.openSection.OnChange -= OnMyAccountSectionTabChanged; + view.OnEmailEdited -= OnEmailEdited; + view.OnEmailSubmitted -= OnEmailSubmitted; + view.OnReSendConfirmationEmailClicked -= OnReSendConfirmationEmailClicked; + } + + private void OnMyAccountSectionOpen(bool isVisible, bool _) + { + if (!isVisible || dataStore.myAccount.openSection.Get() != MyAccountSection.EmailNotifications.ToString()) + return; + + RefreshForm(); + } + + private void OnMyAccountSectionTabChanged(string currentOpenSection, string _) + { + if (currentOpenSection != MyAccountSection.EmailNotifications.ToString()) + return; + + RefreshForm(); + } + + private void RefreshForm() + { + view.ResetForm(); + loadEmailCancellationToken = loadEmailCancellationToken.SafeRestart(); + LoadEmailAsync(loadEmailCancellationToken.Token).Forget(); + updateEmailConfirmationHUDComponentView.HideConfirmationModal(); + } + + private void OnEmailEdited(string newEmail) + { + view.SetEmailFormValid(IsValidEmail(newEmail)); + view.SetStatusAsPending(newEmail == savedEmail && savedIsPending); + } + + private void OnEmailSubmitted(string newEmail) + { + if (!IsValidEmail(newEmail)) + { + SetSavedEmail(); + return; + } + + if (newEmail == savedEmail) + return; + + updateEmailCancellationToken = updateEmailCancellationToken.SafeRestart(); + UpdateEmailAsync(newEmail, true, updateEmailCancellationToken.Token).Forget(); + } + + private void SetSavedEmail() + { + view.SetEmail(savedEmail); + view.SetStatusAsPending(savedIsPending); + view.SetEmailFormValid(true); + view.SetEmailInputInteractable(true); + view.SetEmailUpdateLoadingActive(false); + } + + private void OnReSendConfirmationEmailClicked() + { + updateEmailCancellationToken = updateEmailCancellationToken.SafeRestart(); + UpdateEmailAsync(savedEmail, false, updateEmailCancellationToken.Token).Forget(); + } + + private static bool IsValidEmail(string email) + { + if (email.Length == 0) + return true; + + try + { + MailAddress mailAddress = new MailAddress(email); + return mailAddress.Address == email; + } + catch + { + return false; + } + } + + private async UniTaskVoid LoadEmailAsync(CancellationToken cancellationToken) + { + view.SetLoadingActive(true); + savedEmail = string.Empty; + savedIsPending = false; + + if (!string.IsNullOrEmpty(PlayerPrefsBridge.GetString(CURRENT_SUBSCRIPTION_ID_LOCAL_STORAGE_KEY))) + { + string subscriptionToGet = PlayerPrefsBridge.GetString(CURRENT_SUBSCRIPTION_ID_LOCAL_STORAGE_KEY); + + try + { + var existingSubscription = await subscriptionsAPIService.GetSubscription(subscriptionToGet, cancellationToken); + + if (existingSubscription != null) + { + if (existingSubscription.status == "inactive") + PlayerPrefsBridge.SetString(CURRENT_SUBSCRIPTION_ID_LOCAL_STORAGE_KEY, string.Empty); + else + { + savedEmail = existingSubscription.email; + savedIsPending = existingSubscription.status is "pending" or "validating"; + } + } + } + catch (Exception ex) + { + if (ex.Message.Contains("404")) + PlayerPrefsBridge.SetString(CURRENT_SUBSCRIPTION_ID_LOCAL_STORAGE_KEY, string.Empty); + else + Debug.LogError($"An error occurred while getting the email subscription '{subscriptionToGet}': {ex.Message}"); + } + } + + SetSavedEmail(); + view.SetLoadingActive(false); + } + + private async UniTaskVoid UpdateEmailAsync(string newEmail, bool needConfirmation, CancellationToken cancellationToken) + { + var wasSuccessfullyUpdated = false; + view.SetEmailInputInteractable(false); + view.SetEmailUpdateLoadingActive(true); + + if (needConfirmation && !string.IsNullOrEmpty(savedEmail)) + { + confirmationModalStatus = ConfirmationModalStatus.None; + updateEmailConfirmationHUDComponentView.ShowConfirmationModal( + string.IsNullOrEmpty(newEmail) ? view.deleteEmailLogo : view.updateEmailLogo, + string.IsNullOrEmpty(newEmail) ? "Are you sure you want to unsubscribe from Decentraland's newsletter?" : "Are you sure you want to update your Email Address?"); + + await UniTask.WaitUntil(() => confirmationModalStatus != ConfirmationModalStatus.None, cancellationToken: cancellationToken); + } + + if (confirmationModalStatus == ConfirmationModalStatus.Rejected) + { + SetSavedEmail(); + return; + } + + if (!string.IsNullOrEmpty(PlayerPrefsBridge.GetString(CURRENT_SUBSCRIPTION_ID_LOCAL_STORAGE_KEY))) + { + string subscriptionToDelete = PlayerPrefsBridge.GetString(CURRENT_SUBSCRIPTION_ID_LOCAL_STORAGE_KEY); + + try + { + await subscriptionsAPIService.DeleteSubscription(subscriptionToDelete, cancellationToken); + PlayerPrefsBridge.SetString(CURRENT_SUBSCRIPTION_ID_LOCAL_STORAGE_KEY, string.Empty); + PlayerPrefsBridge.Save(); + savedEmail = string.Empty; + savedIsPending = false; + wasSuccessfullyUpdated = true; + } + catch (Exception ex) + { + wasSuccessfullyUpdated = false; + Debug.LogError($"An error occurred while deleting the email subscription '{subscriptionToDelete}': {ex.Message}"); + } + } + + if (!string.IsNullOrEmpty(newEmail)) + { + try + { + var newSubscription = await subscriptionsAPIService.CreateSubscription(newEmail, cancellationToken); + PlayerPrefsBridge.SetString(CURRENT_SUBSCRIPTION_ID_LOCAL_STORAGE_KEY, newSubscription.id); + PlayerPrefsBridge.Save(); + savedEmail = newEmail; + savedIsPending = newSubscription.status is "pending" or "validating"; + wasSuccessfullyUpdated = true; + } + catch (Exception ex) + { + wasSuccessfullyUpdated = false; + Debug.LogError($"An error occurred while creating the subscription for {newEmail}: {ex.Message}"); + } + } + + view.SetEmailInputInteractable(true); + view.SetStatusAsPending(savedIsPending); + view.SetEmailUpdateLoadingActive(false); + + if (wasSuccessfullyUpdated) + { + myAccountSectionHUDController.ShowAccountSettingsUpdatedToast(); + socialAnalytics.SendProfileEdit(0, false, PlayerActionSource.EmailNotifications, ProfileField.Email); + } + } + } +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsController.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsController.cs.meta new file mode 100644 index 0000000000..569bb892a2 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/EmailNotificationsController.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 393861a56ca4470e9e4d4d8c52702f26 +timeCreated: 1697645608 \ No newline at end of file diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IEmailNotificationsComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IEmailNotificationsComponentView.cs new file mode 100644 index 0000000000..88af09f8ad --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IEmailNotificationsComponentView.cs @@ -0,0 +1,23 @@ +using System; +using UnityEngine; + +namespace DCL.MyAccount +{ + public interface IEmailNotificationsComponentView + { + event Action OnEmailEdited; + public event Action OnEmailSubmitted; + public event Action OnReSendConfirmationEmailClicked; + + Sprite deleteEmailLogo { get; } + Sprite updateEmailLogo { get; } + + void SetLoadingActive(bool isActive); + void SetEmail(string email); + void SetStatusAsPending(bool isPending); + void SetEmailFormValid(bool isValid); + void ResetForm(); + void SetEmailInputInteractable(bool isInteractable); + void SetEmailUpdateLoadingActive(bool isActive); + } +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IEmailNotificationsComponentView.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IEmailNotificationsComponentView.cs.meta new file mode 100644 index 0000000000..b9e2ec5da4 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IEmailNotificationsComponentView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 6aa3efd9793a441b8e294909a82a9641 +timeCreated: 1697645311 \ No newline at end of file diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IMyAccountSectionHUDComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IMyAccountSectionHUDComponentView.cs index 5dbf7a463c..945c78bc3b 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IMyAccountSectionHUDComponentView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IMyAccountSectionHUDComponentView.cs @@ -1,10 +1,18 @@ -using UnityEngine; +using System; +using UnityEngine; namespace DCL.MyAccount { + public enum MyAccountSection + { + MyProfile, + EmailNotifications, + } + public interface IMyAccountSectionHUDComponentView { void SetAsFullScreenMenuMode(Transform parentTransform); void ShowAccountSettingsUpdatedToast(); + void SetSectionsMenuActive(bool isActive); } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IUpdateEmailConfirmationHUDComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IUpdateEmailConfirmationHUDComponentView.cs new file mode 100644 index 0000000000..f726536748 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IUpdateEmailConfirmationHUDComponentView.cs @@ -0,0 +1,13 @@ +using System; +using UnityEngine; + +namespace DCL.MyAccount +{ + public interface IUpdateEmailConfirmationHUDComponentView + { + event Action OnConfirmationModalAccepted; + + void ShowConfirmationModal(Sprite actionLogo, string text); + void HideConfirmationModal(); + } +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IUpdateEmailConfirmationHUDComponentView.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IUpdateEmailConfirmationHUDComponentView.cs.meta new file mode 100644 index 0000000000..3aee7a6cb6 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/IUpdateEmailConfirmationHUDComponentView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8594c23753ca41bfae414f6e76d55a2f +timeCreated: 1698165261 \ No newline at end of file diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountHUD.asmdef b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountHUD.asmdef index f89ca55591..621a83d2d8 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountHUD.asmdef +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountHUD.asmdef @@ -23,7 +23,9 @@ "GUID:0663fad624d836944b40ae27c3414652", "GUID:dffbb581f2650ea4990781f603ac258a", "GUID:b1087c5731ff68448a0a9c625bb7e52d", - "GUID:55b66aa56b81d2d4cafb4a5f02bc90ca" + "GUID:55b66aa56b81d2d4cafb4a5f02bc90ca", + "GUID:2995626b54c60644988f134a69a77450", + "GUID:c31f144fbfb54890960a05fca4149e56" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountPlugin.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountPlugin.cs index df7ed6f34f..b7ee3f2909 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountPlugin.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountPlugin.cs @@ -2,6 +2,7 @@ using DCL.Providers; using DCL.Tasks; using DCLServices.Lambdas.NamesService; +using DCLServices.SubscriptionsAPIService; using SocialFeaturesAnalytics; using System.Threading; @@ -13,6 +14,7 @@ public class MyAccountPlugin : IPlugin private MyAccountSectionHUDController myAccountSectionHUDController; private MyProfileController myProfileController; + private EmailNotificationsController emailNotificationsController; public MyAccountPlugin() { @@ -24,6 +26,9 @@ private async void Initialize(CancellationToken ct) var myAccountSectionView = await Environment.i.serviceLocator.Get() .Instantiate("MyAccountSectionHUD", "MyAccountSectionHUD", cancellationToken: ct); + var updateEmailConfirmationHUD = await Environment.i.serviceLocator.Get() + .Instantiate("UpdateEmailConfirmationHUD", "UpdateEmailConfirmationHUD", cancellationToken: ct); + ProfileAdditionalInfoValueListScriptableObject countryListProvider = await Environment.i.serviceLocator.Get() .GetAddressable("ProfileCountries", ct); @@ -49,6 +54,8 @@ private async void Initialize(CancellationToken ct) var userProfileWebInterfaceBridge = new UserProfileWebInterfaceBridge(); + var socialAnalytics = new SocialAnalytics(Environment.i.platform.serviceProviders.analytics, userProfileWebInterfaceBridge); + myAccountSectionHUDController = new MyAccountSectionHUDController( myAccountSectionView, dataStore); @@ -62,7 +69,7 @@ private async void Initialize(CancellationToken ct) myAccountSectionHUDController, KernelConfig.i, new MyAccountAnalyticsService(Environment.i.platform.serviceProviders.analytics), - new SocialAnalytics(Environment.i.platform.serviceProviders.analytics, userProfileWebInterfaceBridge), + socialAnalytics, countryListProvider, genderListProvider, sexualOrientationProvider, @@ -70,12 +77,21 @@ private async void Initialize(CancellationToken ct) relationshipStatusProvider, languageListProvider, pronounListProvider); + + emailNotificationsController = new EmailNotificationsController( + myAccountSectionView.CurrentEmailNotificationsView, + updateEmailConfirmationHUD, + myAccountSectionHUDController, + dataStore, + Environment.i.serviceLocator.Get(), + socialAnalytics); } public void Dispose() { cts.SafeCancelAndDispose(); myProfileController.Dispose(); + emailNotificationsController.Dispose(); myAccountSectionHUDController.Dispose(); } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountSectionHUDComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountSectionHUDComponentView.cs index 3b0856c7b2..70f7af389e 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountSectionHUDComponentView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountSectionHUDComponentView.cs @@ -3,6 +3,8 @@ using System; using System.Threading; using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; namespace DCL.MyAccount { @@ -10,10 +12,25 @@ public class MyAccountSectionHUDComponentView : BaseComponentView, IMyAccountSec { private const float COPY_TOAST_VISIBLE_TIME = 3; + [SerializeField] internal GameObject sectionsMenu; [SerializeField] internal MyProfileComponentView myProfileComponentView; + [SerializeField] internal EmailNotificationsComponentView emailNotificationsComponentView; [SerializeField] internal ShowHideAnimator accountSettingsUpdatedToast; + [Header("Sections Menu Configuration")] + [SerializeField] internal Button myProfileButton; + [SerializeField] internal GameObject myProfileButtonDeselected; + [SerializeField] internal Image myProfileButtonDeselectedImage; + [SerializeField] internal GameObject myProfileButtonSelected; + [SerializeField] internal Image myProfileButtonSelectedImage; + [SerializeField] internal Button emailNotificationsButton; + [SerializeField] internal GameObject emailNotificationsButtonDeselected; + [SerializeField] internal Image emailNotificationsButtonDeselectedImage; + [SerializeField] internal GameObject emailNotificationsButtonSelected; + [SerializeField] internal Image emailNotificationsButtonSelectedImage; + public IMyProfileComponentView CurrentMyProfileView => myProfileComponentView; + public IEmailNotificationsComponentView CurrentEmailNotificationsView => emailNotificationsComponentView; private Transform thisTransform; private CancellationTokenSource showAccountSettingsCancellationToken = new (); @@ -23,6 +40,11 @@ public override void Awake() base.Awake(); thisTransform = transform; + + myProfileButton.onClick.AddListener(() => OpenSection(MyAccountSection.MyProfile)); + emailNotificationsButton.onClick.AddListener(() => OpenSection(MyAccountSection.EmailNotifications)); + + OpenSection(MyAccountSection.MyProfile); } public override void Dispose() @@ -30,6 +52,8 @@ public override void Dispose() base.Dispose(); showAccountSettingsCancellationToken.SafeCancelAndDispose(); + myProfileButton.onClick.RemoveAllListeners(); + emailNotificationsButton.onClick.RemoveAllListeners(); } public override void RefreshControl() { } @@ -69,5 +93,54 @@ async UniTaskVoid ShowAccountSettingsUpdatedToastAsync(CancellationToken cancell showAccountSettingsCancellationToken = showAccountSettingsCancellationToken.SafeRestart(); ShowAccountSettingsUpdatedToastAsync(showAccountSettingsCancellationToken.Token).Forget(); } + + public void SetSectionsMenuActive(bool isActive) => + sectionsMenu.SetActive(isActive); + + private void OpenSection(MyAccountSection section) + { + DeselectButtons(); + + switch (section) + { + default: + case MyAccountSection.MyProfile: + SetMyProfileButtonStatus(true); + SetEmailNotificationsButtonStatus(false); + myProfileComponentView.Show(); + emailNotificationsComponentView.Hide(); + break; + case MyAccountSection.EmailNotifications: + SetMyProfileButtonStatus(false); + SetEmailNotificationsButtonStatus(true); + myProfileComponentView.Hide(); + emailNotificationsComponentView.Show(); + break; + } + + DataStore.i.myAccount.openSection.Set(section.ToString()); + } + + private void SetMyProfileButtonStatus(bool isSelected) + { + myProfileButton.targetGraphic = isSelected ? myProfileButtonSelectedImage : myProfileButtonDeselectedImage; + myProfileButtonDeselected.SetActive(!isSelected); + myProfileButtonSelected.SetActive(isSelected); + } + + private void SetEmailNotificationsButtonStatus(bool isSelected) + { + emailNotificationsButton.targetGraphic = isSelected ? emailNotificationsButtonSelectedImage : emailNotificationsButtonDeselectedImage; + emailNotificationsButtonDeselected.SetActive(!isSelected); + emailNotificationsButtonSelected.SetActive(isSelected); + } + + private static void DeselectButtons() + { + if (EventSystem.current == null) + return; + + EventSystem.current.SetSelectedGameObject(null); + } } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountSectionHUDController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountSectionHUDController.cs index 8781ca4a40..637b896dad 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountSectionHUDController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyAccountSectionHUDController.cs @@ -4,6 +4,8 @@ namespace DCL.MyAccount { public class MyAccountSectionHUDController { + private const string NEW_TOS_AND_EMAIL_SUBSCRIPTION_FF = "new_terms_of_service_and_email_subscription"; + private readonly IMyAccountSectionHUDComponentView view; private readonly DataStore dataStore; @@ -28,7 +30,10 @@ public void Dispose() public void ShowAccountSettingsUpdatedToast() => view.ShowAccountSettingsUpdatedToast(); - private void ConfigureMyAccountSectionInFullscreenMenuChanged(Transform currentParentTransform, Transform _) => + private void ConfigureMyAccountSectionInFullscreenMenuChanged(Transform currentParentTransform, Transform _) + { view.SetAsFullScreenMenuMode(currentParentTransform); + view.SetSectionsMenuActive(dataStore.featureFlags.flags.Get().IsFeatureEnabled(NEW_TOS_AND_EMAIL_SUBSCRIPTION_FF)); + } } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyProfileComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyProfileComponentView.cs index c508d449e2..300f718a9b 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyProfileComponentView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyProfileComponentView.cs @@ -6,7 +6,6 @@ using UIComponents.Scripts.Components; using UnityEngine; using UnityEngine.EventSystems; -using UnityEngine.Networking; using UnityEngine.UI; namespace DCL.MyAccount @@ -20,6 +19,7 @@ public class MyProfileComponentView : BaseComponentView, IMyProf [SerializeField] internal GameObject mainContainer; [SerializeField] internal GameObject loadingContainer; [SerializeField] internal RectTransform contentTransform; + [SerializeField] internal GameObject scrollBar; [Header("Header")] [SerializeField] internal RectTransform headerContainerTransform; @@ -162,6 +162,22 @@ public override void Awake() additionalInfoList.OnAdditionalFieldRemoved += () => Utils.ForceRebuildLayoutImmediate(additionalInfoContainerTransform); } + public override void Show(bool instant = false) + { + gameObject.SetActive(true); + + if (scrollBar != null) + scrollBar.SetActive(true); + } + + public override void Hide(bool instant = false) + { + gameObject.SetActive(false); + + if (scrollBar != null) + scrollBar.SetActive(false); + } + public void OnPointerClick(PointerEventData eventData) { if (eventData.pointerCurrentRaycast.gameObject.name != ABOUT_READ_ONLY_CONTAINER_NAME) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyProfileController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyProfileController.cs index c56fa2d607..4e4a55579f 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyProfileController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/MyProfileController.cs @@ -252,7 +252,7 @@ async UniTaskVoid SaveDescriptionAsync(string newDesc, CancellationToken cancell myAccountSectionHUDController.ShowAccountSettingsUpdatedToast(); myAccountAnalyticsService.SendProfileInfoEditAnalytic(newDesc.Length); - socialAnalytics.SendProfileEdit(newDesc.Length, false, PlayerActionSource.MyProfile); + socialAnalytics.SendProfileEdit(newDesc.Length, false, PlayerActionSource.MyProfile, ProfileField.Description); } saveDescriptionCancellationToken = saveDescriptionCancellationToken.SafeRestart(); diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/EmailNotifications.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/EmailNotifications.prefab new file mode 100644 index 0000000000..235cdc76e8 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/EmailNotifications.prefab @@ -0,0 +1,2619 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &265639554380430496 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 628271296046100574} + - component: {fileID: 4708843174647929116} + - component: {fileID: 9192671243260528230} + m_Layer: 5 + m_Name: InfoIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &628271296046100574 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 265639554380430496} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3166637306679997320} + 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: 31, y: 0} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4708843174647929116 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 265639554380430496} + m_CullTransparentMesh: 1 +--- !u!114 &9192671243260528230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 265639554380430496} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, 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_Sprite: {fileID: 21300000, guid: 774f1dafe0ff34d158a77a6aafef1a49, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &716215124352047014 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3948086035216379263} + - component: {fileID: 2465450626800158119} + - component: {fileID: 6615085707077701300} + - component: {fileID: 9123865113910861310} + m_Layer: 5 + m_Name: EmailNotifications + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3948086035216379263 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 716215124352047014} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8303104940016665670} + - {fileID: 7698760764725819171} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 962, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2465450626800158119 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 716215124352047014} + m_CullTransparentMesh: 1 +--- !u!114 &6615085707077701300 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 716215124352047014} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.19607843} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &9123865113910861310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 716215124352047014} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 659a6aee3e5b47788b88ac6edbd4559d, type: 3} + m_Name: + m_EditorClassIdentifier: + showHideAnimator: {fileID: 0} + mainContainer: {fileID: 5525947702249342312} + loadingContainer: {fileID: 9045699770010660240} + emailInputField: {fileID: 5758871049081747414} + emailEditionLogoContainer: {fileID: 3468768456779422421} + emailEditionLogo: {fileID: 7073749113389248373} + emailEditionLoadingSpinner: {fileID: 1013656273813292054} + emailInputFieldInvalid: {fileID: 2355204908624164975} + emailInputFieldEditing: {fileID: 7474965137257774655} + emailInputInvalidLabel: {fileID: 4223244232111858960} + pendingStatusWarning: {fileID: 5446535916202093448} + pendingStatusWarningText: {fileID: 6755730615616916033} + deleteEmailSprite: {fileID: 21300000, guid: d6a96908978f04454a0eb99ff0e659a0, type: 3} + updateEmailSprite: {fileID: 21300000, guid: 0725572a788b244b484b3e28ea72e08b, type: 3} +--- !u!1 &835793214861672301 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 846938546520320142} + - component: {fileID: 3069648613901233807} + - component: {fileID: 2082583413365923870} + m_Layer: 5 + m_Name: Icn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &846938546520320142 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 835793214861672301} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4112516359022823064} + 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: 0, y: 0} + m_SizeDelta: {x: 16, y: 16} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &3069648613901233807 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 835793214861672301} + m_CullTransparentMesh: 1 +--- !u!114 &2082583413365923870 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 835793214861672301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, 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_Sprite: {fileID: 21300000, guid: 6139681b2373cc64399f3419a20be1cc, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &929108178591445040 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 95679141384985374} + - component: {fileID: 4085830146337367048} + m_Layer: 5 + m_Name: EmailWarnings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &95679141384985374 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 929108178591445040} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4112516359022823064} + - {fileID: 3166637306679997320} + m_Father: {fileID: 6301706684044671907} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 131, y: -146} + m_SizeDelta: {x: 700, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!114 &4085830146337367048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 929108178591445040} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 6 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 1 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &2355204908624164975 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6647745249005483916} + - component: {fileID: 8522253229745037647} + - component: {fileID: 916995891837234091} + m_Layer: 5 + m_Name: Email_Invalid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6647745249005483916 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2355204908624164975} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 146307879165241409} + 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.0000076293945} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8522253229745037647 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2355204908624164975} + m_CullTransparentMesh: 1 +--- !u!114 &916995891837234091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2355204908624164975} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_Sprite: {fileID: 21300000, guid: cea1ac0c0c969478ea2054b9a06f7c86, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!1 &2879574444433093881 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6829333354624725828} + - component: {fileID: 7799911529405084368} + - component: {fileID: 7548704488891547796} + - component: {fileID: 2312292449505734340} + m_Layer: 5 + m_Name: MyProfileDesc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6829333354624725828 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2879574444433093881} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7368521058794980880} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 246.22, y: -121.5} + m_SizeDelta: {x: 495, y: 38} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7799911529405084368 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2879574444433093881} + m_CullTransparentMesh: 1 +--- !u!114 &7548704488891547796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2879574444433093881} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_text: Subscribe to Decentraland's newsletter to receive the latest news about + events, updates, contests, and more. + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4286344049 + m_fontColor: {r: 0.44313726, g: 0.41960785, b: 0.4862745, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &2312292449505734340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2879574444433093881} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &3168665297633325289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6301706684044671907} + m_Layer: 5 + m_Name: Email + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6301706684044671907 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3168665297633325289} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1690003641000436044} + - {fileID: 9217275221748445178} + - {fileID: 146307879165241409} + - {fileID: 95679141384985374} + m_Father: {fileID: 8303104940016665670} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -190} + m_SizeDelta: {x: 957, y: 180} + m_Pivot: {x: 0, y: 1} +--- !u!1 &3468768456779422421 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 368145716860567993} + m_Layer: 5 + m_Name: EmailEditionLogoContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &368145716860567993 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3468768456779422421} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5263046088220145637} + m_Father: {fileID: 146307879165241409} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -20, y: 0} + m_SizeDelta: {x: 14, y: 14} + m_Pivot: {x: 1, y: 0.5} +--- !u!1 &4223244232111858960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4112516359022823064} + - component: {fileID: 983306664689584818} + m_Layer: 5 + m_Name: EmailValidation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4112516359022823064 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4223244232111858960} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 846938546520320142} + - {fileID: 1668819534299275117} + m_Father: {fileID: 95679141384985374} + 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: 20} + m_Pivot: {x: 0, y: 1} +--- !u!222 &983306664689584818 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4223244232111858960} + m_CullTransparentMesh: 1 +--- !u!1 &4431390506517947338 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9217275221748445178} + - component: {fileID: 993341144394366117} + - component: {fileID: 9188915158300024180} + m_Layer: 5 + m_Name: EmailDesc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9217275221748445178 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4431390506517947338} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6301706684044671907} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 128, y: -59} + m_SizeDelta: {x: 495, y: 19} + m_Pivot: {x: 0, y: 1} +--- !u!222 &993341144394366117 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4431390506517947338} + m_CullTransparentMesh: 1 +--- !u!114 &9188915158300024180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4431390506517947338} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_text: Your email won't be visible in your profile + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4286344049 + m_fontColor: {r: 0.44313726, g: 0.41960785, b: 0.4862745, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5203940117019491814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1690003641000436044} + - component: {fileID: 6669637243508816737} + - component: {fileID: 4149289741067077585} + m_Layer: 5 + m_Name: EmailTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1690003641000436044 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5203940117019491814} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6301706684044671907} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 128, y: -19} + m_SizeDelta: {x: 200, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!222 &6669637243508816737 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5203940117019491814} + m_CullTransparentMesh: 1 +--- !u!114 &4149289741067077585 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5203940117019491814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_text: Email Address + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5386204301521147600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6516476081154437901} + - component: {fileID: 3869298778398517610} + - component: {fileID: 7311234473262200987} + - component: {fileID: 9192587131692254767} + m_Layer: 5 + m_Name: MyProfileTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6516476081154437901 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5386204301521147600} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7368521058794980880} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 246.22, y: -80.5} + m_SizeDelta: {x: 300, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!222 &3869298778398517610 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5386204301521147600} + m_CullTransparentMesh: 1 +--- !u!114 &7311234473262200987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5386204301521147600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_text: Email notifications + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &9192587131692254767 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5386204301521147600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &5446535916202093448 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3166637306679997320} + - component: {fileID: 3568244130854974258} + - component: {fileID: 688380524433263034} + m_Layer: 5 + m_Name: PendingStatusWarning + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3166637306679997320 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5446535916202093448} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 628271296046100574} + - {fileID: 7835818500042268079} + m_Father: {fileID: 95679141384985374} + 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: 54} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3568244130854974258 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5446535916202093448} + m_CullTransparentMesh: 1 +--- !u!114 &688380524433263034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5446535916202093448} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9803922, g: 0.93725497, b: 0.8352942, 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_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!1 &5525947702249342312 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8303104940016665670} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8303104940016665670 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5525947702249342312} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7368521058794980880} + - {fileID: 6301706684044671907} + m_Father: {fileID: 3948086035216379263} + 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, y: 1} +--- !u!1 &6672327441437010353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 146307879165241409} + - component: {fileID: 3966871810290983829} + - component: {fileID: 6705239403062615670} + - component: {fileID: 5758871049081747414} + m_Layer: 5 + m_Name: EmailInput + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &146307879165241409 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6672327441437010353} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6647745249005483916} + - {fileID: 7377392606521589868} + - {fileID: 9166501380020102670} + - {fileID: 368145716860567993} + - {fileID: 4488929890043329344} + m_Father: {fileID: 6301706684044671907} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 131, y: -93.5} + m_SizeDelta: {x: 700, y: 46} + m_Pivot: {x: 0, y: 1} +--- !u!222 &3966871810290983829 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6672327441437010353} + m_CullTransparentMesh: 1 +--- !u!114 &6705239403062615670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6672327441437010353} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!114 &5758871049081747414 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6672327441437010353} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: -1 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 21300000, guid: 8512d2a614988894b967cb17ea417d0b, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: 8512d2a614988894b967cb17ea417d0b, type: 3} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6705239403062615670} + m_TextViewport: {fileID: 9166501380020102670} + m_TextComponent: {fileID: 3607086606550803896} + m_Placeholder: {fileID: 8350613164540938484} + m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbarEventHandler: {fileID: 0} + m_LayoutGroup: {fileID: 0} + m_ScrollSensitivity: 1 + m_ContentType: 0 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 0 + m_HideMobileInput: 0 + m_HideSoftKeyboard: 0 + m_CharacterValidation: 0 + m_RegexValue: + m_GlobalPointSize: 14 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnSelect: + m_PersistentCalls: + m_Calls: [] + m_OnDeselect: + m_PersistentCalls: + m_Calls: [] + m_OnTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnEndTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_OnTouchScreenKeyboardStatusChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_RichText: 1 + m_GlobalFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_OnFocusSelectAll: 1 + m_ResetOnDeActivation: 1 + m_KeepTextSelectionVisible: 0 + m_RestoreOriginalTextOnEscape: 1 + m_isRichTextEditingAllowed: 0 + m_LineLimit: 0 + isAlert: 0 + m_InputValidator: {fileID: 0} + m_ShouldActivateOnSelect: 1 +--- !u!1 &6730330040413547447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3257818658331314270} + - component: {fileID: 5371282687733451536} + - component: {fileID: 8350613164540938484} + - component: {fileID: 2176859839294819552} + m_Layer: 5 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3257818658331314270 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6730330040413547447} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9166501380020102670} + 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: -3.9999995, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5371282687733451536 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6730330040413547447} + m_CullTransparentMesh: 1 +--- !u!114 &8350613164540938484 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6730330040413547447} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: Enter email + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4289239968 + m_fontColor: {r: 0.627451, g: 0.60784316, b: 0.65882355, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &2176859839294819552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6730330040413547447} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &7073749113389248373 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5263046088220145637} + - component: {fileID: 8522330640887613546} + - component: {fileID: 1575995074880582570} + m_Layer: 5 + m_Name: EmailEditionLogo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5263046088220145637 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7073749113389248373} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 368145716860567993} + 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.5, y: 0.5} +--- !u!222 &8522330640887613546 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7073749113389248373} + m_CullTransparentMesh: 1 +--- !u!114 &1575995074880582570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7073749113389248373} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, 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_Sprite: {fileID: 21300000, guid: 11d98207a7e6dcf4b84f29030463ff3c, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7251130955644000741 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7368521058794980880} + m_Layer: 5 + m_Name: Header + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7368521058794980880 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7251130955644000741} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8266787439063214708} + - {fileID: 6516476081154437901} + - {fileID: 6829333354624725828} + m_Father: {fileID: 8303104940016665670} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 957, y: 170} + m_Pivot: {x: 0, y: 1} +--- !u!1 &7379245627967354838 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9166501380020102670} + - component: {fileID: 8733450907236174883} + m_Layer: 5 + m_Name: Text Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9166501380020102670 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7379245627967354838} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3257818658331314270} + - {fileID: 1185899536102849530} + m_Father: {fileID: 146307879165241409} + 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: -28, y: -12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8733450907236174883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7379245627967354838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: -8, y: -5, z: -8, w: -5} + m_Softness: {x: 0, y: 0} +--- !u!1 &7474965137257774655 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7377392606521589868} + - component: {fileID: 1486503158965470802} + - component: {fileID: 2535630426210531610} + m_Layer: 5 + m_Name: Email_Editing + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7377392606521589868 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7474965137257774655} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 146307879165241409} + 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.0000076293945} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1486503158965470802 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7474965137257774655} + m_CullTransparentMesh: 1 +--- !u!114 &2535630426210531610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7474965137257774655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_Sprite: {fileID: 21300000, guid: 780ed9eff07384ade9aaa318dbbe63b7, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!1 &8017016977805746435 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1185899536102849530} + - component: {fileID: 3664366080237250024} + - component: {fileID: 3607086606550803896} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1185899536102849530 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8017016977805746435} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9166501380020102670} + 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: -3.9999995, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3664366080237250024 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8017016977805746435} + m_CullTransparentMesh: 1 +--- !u!114 &3607086606550803896 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8017016977805746435} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: "\u200B" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 3 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8771959238957704289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8266787439063214708} + - component: {fileID: 3323904250488879136} + - component: {fileID: 9034869070971165112} + - component: {fileID: 7899129989849963414} + m_Layer: 5 + m_Name: MyProfileLogo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8266787439063214708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8771959238957704289} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7368521058794980880} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 131, y: -70} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0, y: 1} +--- !u!222 &3323904250488879136 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8771959238957704289} + m_CullTransparentMesh: 1 +--- !u!114 &9034869070971165112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8771959238957704289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_Sprite: {fileID: 21300000, guid: 9df5e4cf75c44484589486f76072825a, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7899129989849963414 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8771959238957704289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &9045699770010660240 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7698760764725819171} + m_Layer: 5 + m_Name: LoadingContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7698760764725819171 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9045699770010660240} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6447723139690819933} + m_Father: {fileID: 3948086035216379263} + 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: -100} + m_SizeDelta: {x: 0, y: -200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &9123561140422492622 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1668819534299275117} + - component: {fileID: 5015033799551827303} + - component: {fileID: 3427319429904463156} + m_Layer: 5 + m_Name: EmailValidation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1668819534299275117 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9123561140422492622} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4112516359022823064} + 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: 20, y: 0} + m_SizeDelta: {x: 881.86, y: 20} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &5015033799551827303 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9123561140422492622} + m_CullTransparentMesh: 1 +--- !u!114 &3427319429904463156 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9123561140422492622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: Enter a valid email + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190335 + m_fontColor: {r: 1, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 12 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &9219005951421069962 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7835818500042268079} + - component: {fileID: 1662089006788897575} + - component: {fileID: 6755730615616916033} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7835818500042268079 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9219005951421069962} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3166637306679997320} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 56, y: -10} + m_SizeDelta: {x: -66, y: -20} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1662089006788897575 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9219005951421069962} + m_CullTransparentMesh: 1 +--- !u!114 &6755730615616916033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9219005951421069962} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: Check your email and confirm your account by clicking the verification + link. If you missed it check your spam folder or click here + to resend the verification email. + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &5281443506908629122 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7698760764725819171} + m_Modifications: + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -300 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -336.96002 + objectReference: {fileID: 0} + - target: {fileID: 2336035712942851721, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_Name + value: NamesLoadingSpinner + objectReference: {fileID: 0} + - target: {fileID: 2336035712942851721, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d565b61885fb1ef41b1582a285e748e9, type: 3} +--- !u!224 &6447723139690819933 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1166888513132788191, guid: d565b61885fb1ef41b1582a285e748e9, + type: 3} + m_PrefabInstance: {fileID: 5281443506908629122} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7121429600079070615 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 146307879165241409} + m_Modifications: + - target: {fileID: 5510830612936421616, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5510830612936421616, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5510830612936421616, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5510830612936421616, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_SizeDelta.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_SizeDelta.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -17 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -336.96002 + objectReference: {fileID: 0} + - target: {fileID: 7837773527243981185, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_Name + value: EmailEditionSpinner + objectReference: {fileID: 0} + - target: {fileID: 7837773527243981185, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 252c1fea75fc0614587349a368eb8684, type: 3} +--- !u!1 &1013656273813292054 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7837773527243981185, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + m_PrefabInstance: {fileID: 7121429600079070615} + m_PrefabAsset: {fileID: 0} +--- !u!224 &4488929890043329344 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6674202217144139479, guid: 252c1fea75fc0614587349a368eb8684, + type: 3} + m_PrefabInstance: {fileID: 7121429600079070615} + m_PrefabAsset: {fileID: 0} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/EmailNotifications.prefab.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/EmailNotifications.prefab.meta new file mode 100644 index 0000000000..0b37a439a1 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/EmailNotifications.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 10785685f82bbec4f997b67b38841089 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/MyAccountSectionHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/MyAccountSectionHUD.prefab index e600f29752..20ca18860b 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/MyAccountSectionHUD.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/MyAccountSectionHUD.prefab @@ -1,133 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1972120969985573475 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8784170467649388825} - - component: {fileID: 1874267298051612884} - - component: {fileID: 2774204969094322599} - - component: {fileID: 1950547650792199863} - m_Layer: 5 - m_Name: Scrollbar Vertical - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8784170467649388825 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972120969985573475} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3880736322189904317} - m_Father: {fileID: 8024335577128154959} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -4, y: -6} - m_SizeDelta: {x: 12, y: -16} - m_Pivot: {x: 1, y: 1} ---- !u!222 &1874267298051612884 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972120969985573475} - m_CullTransparentMesh: 1 ---- !u!114 &2774204969094322599 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972120969985573475} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - 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_Sprite: {fileID: 21300000, guid: 7b9d8b2a13149489fac02d8d802c41b6, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2 ---- !u!114 &1950547650792199863 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1972120969985573475} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 6753950606951242898} - m_HandleRect: {fileID: 8047280749183032157} - m_Direction: 2 - m_Value: 1 - m_Size: 0.656687 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &2478272298537920004 +--- !u!1 &917689707994316 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -135,68 +8,64 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3343833300668648931} - - component: {fileID: 3180781092624752395} - - component: {fileID: 985365364143794640} + - component: {fileID: 7720430151369412661} + - component: {fileID: 8582340779622666788} + - component: {fileID: 1079753815423475917} m_Layer: 5 - m_Name: Background + m_Name: Icn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3343833300668648931 +--- !u!224 &7720430151369412661 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2478272298537920004} + m_GameObject: {fileID: 917689707994316} 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7274778504134302950} - - {fileID: 127432183537313684} - - {fileID: 7604475712446157887} - m_Father: {fileID: 5162748506838320623} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 2369809693483100583} 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_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 28, y: 0} + m_SizeDelta: {x: 26, y: 25} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3180781092624752395 +--- !u!222 &8582340779622666788 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2478272298537920004} + m_GameObject: {fileID: 917689707994316} m_CullTransparentMesh: 1 ---- !u!114 &985365364143794640 +--- !u!114 &1079753815423475917 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2478272298537920004} + m_GameObject: {fileID: 917689707994316} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8352941, g: 0.84705883, b: 0.8666667, a: 1} + m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, 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_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 1b667b2b8fb323c45a5e7050166fbcb2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -206,7 +75,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &2804035393169044711 +--- !u!1 &619406739866435280 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -214,51 +83,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3075299736904206643} - - component: {fileID: 5043425346342522229} - - component: {fileID: 6691880629765964227} + - component: {fileID: 2927744087910633362} + - component: {fileID: 4423796150369422443} + - component: {fileID: 3926538438791647722} m_Layer: 5 - m_Name: HeaderText + m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3075299736904206643 +--- !u!224 &2927744087910633362 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2804035393169044711} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 619406739866435280} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 9188305680439761446} - m_RootOrder: 0 + m_Father: {fileID: 2369809693483100583} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: 0} - m_SizeDelta: {x: 400, y: 0} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &5043425346342522229 + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 24, y: 0} + m_SizeDelta: {x: -48, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4423796150369422443 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2804035393169044711} + m_GameObject: {fileID: 619406739866435280} m_CullTransparentMesh: 1 ---- !u!114 &6691880629765964227 +--- !u!114 &3926538438791647722 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2804035393169044711} + m_GameObject: {fileID: 619406739866435280} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -266,13 +134,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Account Settings + m_text: My profile m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} @@ -281,8 +149,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -299,8 +167,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 16 + m_fontSizeBase: 16 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -342,7 +210,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4707481494047159087 +--- !u!1 &1708094415091034523 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -350,67 +218,66 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1051552430065570828} - - component: {fileID: 4854223900804110116} - - component: {fileID: 8353780627163663613} + - component: {fileID: 5629046692074579084} + - component: {fileID: 5532363963178374916} + - component: {fileID: 4929510066636077644} m_Layer: 5 - m_Name: LabelContainer + m_Name: Selected m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1051552430065570828 + m_IsActive: 0 +--- !u!224 &5629046692074579084 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4707481494047159087} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1708094415091034523} + 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_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2959526057998495295} - - {fileID: 5874045422075732181} - m_Father: {fileID: 5113492613887539422} - m_RootOrder: 0 + - {fileID: 3375225634029604995} + - {fileID: 7133763741649941029} + m_Father: {fileID: 3750537167248046599} 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.5, y: 0.5} ---- !u!222 &4854223900804110116 +--- !u!222 &5532363963178374916 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4707481494047159087} - m_CullTransparentMesh: 0 ---- !u!114 &8353780627163663613 + m_GameObject: {fileID: 1708094415091034523} + m_CullTransparentMesh: 1 +--- !u!114 &4929510066636077644 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4707481494047159087} + m_GameObject: {fileID: 1708094415091034523} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} - m_RaycastTarget: 0 + m_Color: {r: 1, g: 0.45490196, b: 0.22352941, a: 1} + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14d01e642387749e482a6f14133c57b8, type: 3} + m_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -420,7 +287,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 2 ---- !u!1 &4889201764278733172 +--- !u!1 &1972120969985573475 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -428,109 +295,125 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5113492613887539422} - - component: {fileID: 1221651337774158248} - - component: {fileID: 4313705119105649438} - - component: {fileID: 6610558860221813516} - - component: {fileID: 542359358118033507} + - component: {fileID: 8784170467649388825} + - component: {fileID: 1874267298051612884} + - component: {fileID: 2774204969094322599} + - component: {fileID: 1950547650792199863} m_Layer: 5 - m_Name: AccountSettingsUpdatedToast + m_Name: Scrollbar Vertical m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &5113492613887539422 + m_IsActive: 1 +--- !u!224 &8784170467649388825 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4889201764278733172} + m_GameObject: {fileID: 1972120969985573475} 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_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1051552430065570828} - m_Father: {fileID: 5162748506838320623} - m_RootOrder: 2 + - {fileID: 3880736322189904317} + m_Father: {fileID: 8024335577128154959} 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: 0, y: -13} - m_SizeDelta: {x: 244, y: 49.5} - m_Pivot: {x: 0.5, y: 1} ---- !u!225 &1221651337774158248 -CanvasGroup: + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -4, y: -6} + m_SizeDelta: {x: 12, y: -16} + m_Pivot: {x: 1, y: 1} +--- !u!222 &1874267298051612884 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4889201764278733172} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 0 - m_BlocksRaycasts: 0 - m_IgnoreParentGroups: 0 ---- !u!95 &4313705119105649438 -Animator: - serializedVersion: 5 + m_GameObject: {fileID: 1972120969985573475} + m_CullTransparentMesh: 1 +--- !u!114 &2774204969094322599 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4889201764278733172} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &6610558860221813516 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4889201764278733172} - m_Enabled: 1 + m_GameObject: {fileID: 1972120969985573475} + m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d8b939b5bedb9494b806609faeda7d8d, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - hideOnEnable: 0 - animSpeedFactor: 2 - disableAfterFadeOut: 1 - canvasGroup: {fileID: 1221651337774158248} ---- !u!114 &542359358118033507 + m_Material: {fileID: 0} + 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_Sprite: {fileID: 21300000, guid: 7b9d8b2a13149489fac02d8d802c41b6, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!114 &1950547650792199863 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4889201764278733172} + m_GameObject: {fileID: 1972120969985573475} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreLayout: 1 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: -1 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!1 &5162748506838320611 + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6753950606951242898} + m_HandleRect: {fileID: 8047280749183032157} + m_Direction: 2 + m_Value: 1.0000002 + m_Size: 0.656687 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &2028320410227073271 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -538,141 +421,2043 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5162748506838320623} - - component: {fileID: 5162748506838320608} - - component: {fileID: 1574854731119695064} - - component: {fileID: 5162748506838320610} - - component: {fileID: 4241928624954537728} - - component: {fileID: 1194008953749785141} - - component: {fileID: 3116743888907601847} + - component: {fileID: 3151271295511166727} + - component: {fileID: 2561658741426245203} + - component: {fileID: 7040414711813206806} + - component: {fileID: 3782714199164332175} + - component: {fileID: 426303733068455060} m_Layer: 5 - m_Name: MyAccountSectionHUD + m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5162748506838320623 +--- !u!224 &3151271295511166727 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5162748506838320611} + m_GameObject: {fileID: 2028320410227073271} 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_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3343833300668648931} - - {fileID: 9188305680439761446} - - {fileID: 5113492613887539422} - - {fileID: 8024335577128154959} - m_Father: {fileID: 0} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 449552777671460718} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!223 &5162748506838320608 -Canvas: + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2561658741426245203 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5162748506838320611} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 1 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 10 - m_TargetDisplay: 0 ---- !u!114 &1574854731119695064 + m_GameObject: {fileID: 2028320410227073271} + m_CullTransparentMesh: 1 +--- !u!114 &7040414711813206806 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5162748506838320611} + m_GameObject: {fileID: 2028320410227073271} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 1 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &5162748506838320610 + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.8627451} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3782714199164332175 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5162748506838320611} + m_GameObject: {fileID: 2028320410227073271} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!225 &4241928624954537728 -CanvasGroup: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7040414711813206806} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &426303733068455060 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5162748506838320611} + m_GameObject: {fileID: 2028320410227073271} m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!222 &1194008953749785141 -CanvasRenderer: + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bfd0d144b6d3dd438b84fa14a062c4f, type: 3} + m_Name: + m_EditorClassIdentifier: + playHover: 1 + playClick: 1 + playRelease: 1 + extraClickEvent: {fileID: 11400000, guid: 71d95c991cfe14a43b69f63de00cc73e, type: 2} +--- !u!1 &2478272298537920004 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5162748506838320611} - m_CullTransparentMesh: 0 ---- !u!114 &3116743888907601847 -MonoBehaviour: + serializedVersion: 6 + m_Component: + - component: {fileID: 3343833300668648931} + - component: {fileID: 3180781092624752395} + - component: {fileID: 985365364143794640} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3343833300668648931 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5162748506838320611} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 572dcddba55040628952260f7a14d9aa, type: 3} - m_Name: - m_EditorClassIdentifier: - showHideAnimator: {fileID: 0} - myProfileComponentView: {fileID: 4575446210914794904} - accountSettingsUpdatedToast: {fileID: 6610558860221813516} ---- !u!1 &5472062092190438407 + m_GameObject: {fileID: 2478272298537920004} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7274778504134302950} + - {fileID: 127432183537313684} + - {fileID: 7604475712446157887} + m_Father: {fileID: 5162748506838320623} + 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.5, y: 0.5} +--- !u!222 &3180781092624752395 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2478272298537920004} + m_CullTransparentMesh: 1 +--- !u!114 &985365364143794640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2478272298537920004} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8352941, g: 0.84705883, b: 0.8666667, 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_Sprite: {fileID: 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 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2562870807502328264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5991122243707592773} + - component: {fileID: 6875134278164900218} + m_Layer: 5 + m_Name: SectionsMenu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5991122243707592773 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2562870807502328264} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3750537167248046599} + - {fileID: 2247699559297615373} + m_Father: {fileID: 9210792432472360934} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -50, y: 0} + m_SizeDelta: {x: 210, y: -64} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &6875134278164900218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2562870807502328264} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 2 + m_Spacing: 14 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 1 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &2718019705717952361 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2369809693483100583} + - component: {fileID: 2471752682647126303} + - component: {fileID: 3971691480320509006} + m_Layer: 5 + m_Name: Deselected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2369809693483100583 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2718019705717952361} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7720430151369412661} + - {fileID: 2927744087910633362} + m_Father: {fileID: 3750537167248046599} + 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.5, y: 0.5} +--- !u!222 &2471752682647126303 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2718019705717952361} + m_CullTransparentMesh: 1 +--- !u!114 &3971691480320509006 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2718019705717952361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.9882353, b: 0.9882353, 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_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!1 &2738526855334058177 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 353301606005885634} + - component: {fileID: 8916493509460802556} + - component: {fileID: 5533094968504556431} + m_Layer: 5 + m_Name: Icn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &353301606005885634 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2738526855334058177} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4343338878116032075} + 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: 28, y: 0} + m_SizeDelta: {x: 26, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8916493509460802556 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2738526855334058177} + m_CullTransparentMesh: 1 +--- !u!114 &5533094968504556431 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2738526855334058177} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.9882353, b: 0.9882353, 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_Sprite: {fileID: 21300000, guid: b28c3b247e8b8b646af42e66b9741cb5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2801926067816802232 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 449552777671460718} + - component: {fileID: 2392968465015830234} + m_Layer: 5 + m_Name: ConfirmationModal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &449552777671460718 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2801926067816802232} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3151271295511166727} + - {fileID: 8981163224422539298} + m_Father: {fileID: 5162748506838320623} + 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, y: 0} +--- !u!225 &2392968465015830234 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2801926067816802232} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!1 &2804035393169044711 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3075299736904206643} + - component: {fileID: 5043425346342522229} + - component: {fileID: 6691880629765964227} + m_Layer: 5 + m_Name: HeaderText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3075299736904206643 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2804035393169044711} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9188305680439761446} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30, y: 0} + m_SizeDelta: {x: 400, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &5043425346342522229 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2804035393169044711} + m_CullTransparentMesh: 1 +--- !u!114 &6691880629765964227 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2804035393169044711} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_text: Account Settings + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3513420263379420365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7078138303469546560} + - component: {fileID: 3488039788155174616} + - component: {fileID: 4732370260649817268} + m_Layer: 5 + m_Name: Icn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7078138303469546560 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3513420263379420365} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3283626860157897344} + 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: 28, y: 0} + m_SizeDelta: {x: 26, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3488039788155174616 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3513420263379420365} + m_CullTransparentMesh: 1 +--- !u!114 &4732370260649817268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3513420263379420365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, 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_Sprite: {fileID: 21300000, guid: b28c3b247e8b8b646af42e66b9741cb5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3588598697516932475 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3750537167248046599} + - component: {fileID: 7616359460810944539} + - component: {fileID: 5765207209131397594} + - component: {fileID: 757769175592608795} + m_Layer: 5 + m_Name: MyProfileButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3750537167248046599 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3588598697516932475} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2369809693483100583} + - {fileID: 5629046692074579084} + m_Father: {fileID: 5991122243707592773} + 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: 46} + m_Pivot: {x: 0, y: 0} +--- !u!222 &7616359460810944539 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3588598697516932475} + m_CullTransparentMesh: 1 +--- !u!114 &5765207209131397594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3588598697516932475} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3971691480320509006} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &757769175592608795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3588598697516932475} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bfd0d144b6d3dd438b84fa14a062c4f, type: 3} + m_Name: + m_EditorClassIdentifier: + playHover: 1 + playClick: 1 + playRelease: 1 + extraClickEvent: {fileID: 0} +--- !u!1 &4009500309378424423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1042293640683670072} + - component: {fileID: 3419604521940922718} + - component: {fileID: 6597983626941363942} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1042293640683670072 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4009500309378424423} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8981163224422539298} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -133} + m_SizeDelta: {x: -110, y: 66} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3419604521940922718 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4009500309378424423} + m_CullTransparentMesh: 1 +--- !u!114 &6597983626941363942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4009500309378424423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: Text... + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6b705423dc77d4fceb4122f6d7e571d6, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 9d9df32282a3c40299019c36b2157d37, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4701751308139970832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9210792432472360934} + m_Layer: 5 + m_Name: SectionsContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9210792432472360934 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4701751308139970832} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2071218490073935391} + - {fileID: 8747905691023710764} + - {fileID: 5991122243707592773} + m_Father: {fileID: 8024335577128154959} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 962, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4707481494047159087 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1051552430065570828} + - component: {fileID: 4854223900804110116} + - component: {fileID: 8353780627163663613} + m_Layer: 5 + m_Name: LabelContainer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1051552430065570828 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4707481494047159087} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2959526057998495295} + - {fileID: 5874045422075732181} + m_Father: {fileID: 5113492613887539422} + 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.5, y: 0.5} +--- !u!222 &4854223900804110116 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4707481494047159087} + m_CullTransparentMesh: 0 +--- !u!114 &8353780627163663613 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4707481494047159087} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 14d01e642387749e482a6f14133c57b8, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!1 &4889201764278733172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5113492613887539422} + - component: {fileID: 1221651337774158248} + - component: {fileID: 4313705119105649438} + - component: {fileID: 6610558860221813516} + - component: {fileID: 542359358118033507} + m_Layer: 5 + m_Name: AccountSettingsUpdatedToast + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5113492613887539422 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4889201764278733172} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1051552430065570828} + m_Father: {fileID: 5162748506838320623} + 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: 0, y: -13} + m_SizeDelta: {x: 244, y: 49.5} + m_Pivot: {x: 0.5, y: 1} +--- !u!225 &1221651337774158248 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4889201764278733172} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 0 + m_BlocksRaycasts: 0 + m_IgnoreParentGroups: 0 +--- !u!95 &4313705119105649438 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4889201764278733172} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &6610558860221813516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4889201764278733172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8b939b5bedb9494b806609faeda7d8d, type: 3} + m_Name: + m_EditorClassIdentifier: + hideOnEnable: 0 + animSpeedFactor: 2 + disableAfterFadeOut: 1 + canvasGroup: {fileID: 1221651337774158248} +--- !u!114 &542359358118033507 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4889201764278733172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &4925462578089050462 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4141693405581629633} + - component: {fileID: 7105887349911253849} + - component: {fileID: 177449805137559159} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4141693405581629633 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4925462578089050462} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3283626860157897344} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 24, y: 0} + m_SizeDelta: {x: -48, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7105887349911253849 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4925462578089050462} + m_CullTransparentMesh: 1 +--- !u!114 &177449805137559159 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4925462578089050462} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: Email notifications + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5162748506838320611 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5162748506838320623} + - component: {fileID: 5162748506838320608} + - component: {fileID: 1574854731119695064} + - component: {fileID: 5162748506838320610} + - component: {fileID: 4241928624954537728} + - component: {fileID: 1194008953749785141} + - component: {fileID: 3116743888907601847} + m_Layer: 5 + m_Name: MyAccountSectionHUD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5162748506838320623 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162748506838320611} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3343833300668648931} + - {fileID: 9188305680439761446} + - {fileID: 5113492613887539422} + - {fileID: 8024335577128154959} + - {fileID: 449552777671460718} + m_Father: {fileID: 0} + 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!223 &5162748506838320608 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162748506838320611} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 1 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 10 + m_TargetDisplay: 0 +--- !u!114 &1574854731119695064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162748506838320611} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &5162748506838320610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162748506838320611} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!225 &4241928624954537728 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162748506838320611} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!222 &1194008953749785141 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162748506838320611} + m_CullTransparentMesh: 0 +--- !u!114 &3116743888907601847 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5162748506838320611} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 572dcddba55040628952260f7a14d9aa, type: 3} + m_Name: + m_EditorClassIdentifier: + showHideAnimator: {fileID: 0} + sectionsMenu: {fileID: 2562870807502328264} + myProfileComponentView: {fileID: 4575446210914794904} + emailNotificationsComponentView: {fileID: 3545138090583190189} + accountSettingsUpdatedToast: {fileID: 6610558860221813516} + myProfileButton: {fileID: 5765207209131397594} + myProfileButtonDeselected: {fileID: 2718019705717952361} + myProfileButtonDeselectedImage: {fileID: 3971691480320509006} + myProfileButtonSelected: {fileID: 1708094415091034523} + myProfileButtonSelectedImage: {fileID: 4929510066636077644} + emailNotificationsButton: {fileID: 1148961022647624431} + emailNotificationsButtonDeselected: {fileID: 7033645233673418964} + emailNotificationsButtonDeselectedImage: {fileID: 5491465393681721634} + emailNotificationsButtonSelected: {fileID: 6002833764150711434} + emailNotificationsButtonSelectedImage: {fileID: 6372531175273281447} + confirmationModal: {fileID: 2801926067816802232} + confirmationModalLogo: {fileID: 1137234026456544787} + confirmationModalText: {fileID: 6597983626941363942} + confirmationModalNoButton: {fileID: 6283054375367079162} + confirmationModalYesButton: {fileID: 8419000464500689258} +--- !u!1 &5472062092190438407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 127432183537313684} + - component: {fileID: 2185500955640553003} + - component: {fileID: 1228596473853923657} + m_Layer: 5 + m_Name: BottomLinearGradient + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &127432183537313684 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5472062092190438407} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3343833300668648931} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 402.57666} + m_SizeDelta: {x: 0, y: 805.1532} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2185500955640553003 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5472062092190438407} + m_CullTransparentMesh: 1 +--- !u!114 &1228596473853923657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5472062092190438407} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.61960787, g: 0.6509804, b: 0.69803923, a: 0.40784314} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3576a9dcb9ec94ac1b908b89c3571e75, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5547952197810995297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8981163224422539298} + - component: {fileID: 8288910241177994682} + - component: {fileID: 4918704868710983774} + - component: {fileID: 3838404932492766516} + m_Layer: 5 + m_Name: Modal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8981163224422539298 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5547952197810995297} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5428982970760606828} + - {fileID: 1042293640683670072} + - {fileID: 1232808902220131389} + - {fileID: 3673945336505389485} + m_Father: {fileID: 449552777671460718} + 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: 430, y: 334} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8288910241177994682 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5547952197810995297} + m_CullTransparentMesh: 1 +--- !u!114 &4918704868710983774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5547952197810995297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.94117653, g: 0.9333334, b: 0.95686275, 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_Sprite: {fileID: 21300000, guid: 54cbe9bf5928342d490167f954f07710, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!114 &3838404932492766516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5547952197810995297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!1 &5588545459531427262 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7133763741649941029} + - component: {fileID: 2103123482054432364} + - component: {fileID: 6918501868292565236} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7133763741649941029 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5588545459531427262} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5629046692074579084} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 24, y: 0} + m_SizeDelta: {x: -48, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2103123482054432364 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5588545459531427262} + m_CullTransparentMesh: 1 +--- !u!114 &6918501868292565236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5588545459531427262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: My profile + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294769916 + m_fontColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5777005913818398110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8192285222306137311} + - component: {fileID: 9134187872026861618} + - component: {fileID: 598995351242783088} + m_Layer: 5 + m_Name: TitleGradient + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8192285222306137311 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5777005913818398110} + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7274778504134302950} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 93.65295, y: -0.0001} + m_SizeDelta: {x: 1082.1909, y: 381.2144} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9134187872026861618 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5777005913818398110} + m_CullTransparentMesh: 1 +--- !u!114 &598995351242783088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5777005913818398110} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8352941, g: 0.84705883, b: 0.8666667, 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_Sprite: {fileID: 21300000, guid: 3576a9dcb9ec94ac1b908b89c3571e75, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5811330195062425537 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8024335577128154959} + - component: {fileID: 3652735178674915126} + - component: {fileID: 4791733469885460102} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8024335577128154959 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5811330195062425537} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9210792432472360934} + - {fileID: 8784170467649388825} + m_Father: {fileID: 5162748506838320623} + 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: -68} + m_SizeDelta: {x: 0, y: -68} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3652735178674915126 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5811330195062425537} + m_CullTransparentMesh: 1 +--- !u!114 &4791733469885460102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5811330195062425537} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.19607843} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5989414146991530812 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4160569613766266488} + - component: {fileID: 398898081079021822} + - component: {fileID: 3144227817797214408} + m_Layer: 5 + m_Name: WalletSuperTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4160569613766266488 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5989414146991530812} + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7274778504134302950} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -201, y: 73.749985} + m_SizeDelta: {x: 1370.198, y: 403.0002} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &398898081079021822 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5989414146991530812} + m_CullTransparentMesh: 1 +--- !u!114 &3144227817797214408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5989414146991530812} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_text: Account + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6b705423dc77d4fceb4122f6d7e571d6, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 9d9df32282a3c40299019c36b2157d37, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 855638015 + m_fontColor: {r: 1, g: 1, b: 1, a: 0.19607843} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 320 + m_fontSizeBase: 320 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6002833764150711434 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -680,66 +2465,67 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 127432183537313684} - - component: {fileID: 2185500955640553003} - - component: {fileID: 1228596473853923657} + - component: {fileID: 4343338878116032075} + - component: {fileID: 4079186750998427105} + - component: {fileID: 6372531175273281447} m_Layer: 5 - m_Name: BottomLinearGradient + m_Name: Selected m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &127432183537313684 + m_IsActive: 0 +--- !u!224 &4343338878116032075 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5472062092190438407} + m_GameObject: {fileID: 6002833764150711434} 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3343833300668648931} - m_RootOrder: 1 + m_Children: + - {fileID: 353301606005885634} + - {fileID: 9054933368299285745} + m_Father: {fileID: 2247699559297615373} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 402.57666} - m_SizeDelta: {x: 0, y: 805.1532} + 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!222 &2185500955640553003 +--- !u!222 &4079186750998427105 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5472062092190438407} + m_GameObject: {fileID: 6002833764150711434} m_CullTransparentMesh: 1 ---- !u!114 &1228596473853923657 +--- !u!114 &6372531175273281447 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5472062092190438407} + m_GameObject: {fileID: 6002833764150711434} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.61960787, g: 0.6509804, b: 0.69803923, a: 0.40784314} + m_Color: {r: 1, g: 0.45490196, b: 0.22352941, 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_Sprite: {fileID: 21300000, guid: 3576a9dcb9ec94ac1b908b89c3571e75, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -747,8 +2533,8 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5777005913818398110 + m_PixelsPerUnitMultiplier: 2 +--- !u!1 &6589602318062871053 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -756,67 +2542,102 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8192285222306137311} - - component: {fileID: 9134187872026861618} - - component: {fileID: 598995351242783088} + - component: {fileID: 3880736322189904317} m_Layer: 5 - m_Name: TitleGradient + m_Name: Sliding Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8192285222306137311 +--- !u!224 &3880736322189904317 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5777005913818398110} - m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_GameObject: {fileID: 6589602318062871053} + 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7274778504134302950} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 93.65295, y: -0.0001} - m_SizeDelta: {x: 1082.1909, y: 381.2144} + m_Children: + - {fileID: 8047280749183032157} + m_Father: {fileID: 8784170467649388825} + 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.5, y: 0.5} ---- !u!222 &9134187872026861618 +--- !u!1 &6612989571230044036 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5428982970760606828} + - component: {fileID: 2057817044397691400} + - component: {fileID: 1137234026456544787} + m_Layer: 5 + m_Name: Logo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5428982970760606828 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6612989571230044036} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8981163224422539298} + 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: 0, y: -47} + m_SizeDelta: {x: 300, y: 54} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2057817044397691400 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5777005913818398110} + m_GameObject: {fileID: 6612989571230044036} m_CullTransparentMesh: 1 ---- !u!114 &598995351242783088 +--- !u!114 &1137234026456544787 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5777005913818398110} + m_GameObject: {fileID: 6612989571230044036} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8352941, g: 0.84705883, b: 0.8666667, a: 1} + 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_Sprite: {fileID: 21300000, guid: 3576a9dcb9ec94ac1b908b89c3571e75, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -824,7 +2645,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5811330195062425537 +--- !u!1 &7033645233673418964 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -832,68 +2653,67 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8024335577128154959} - - component: {fileID: 3652735178674915126} - - component: {fileID: 4791733469885460102} + - component: {fileID: 3283626860157897344} + - component: {fileID: 6558703757684530813} + - component: {fileID: 5491465393681721634} m_Layer: 5 - m_Name: Content + m_Name: Deselected m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8024335577128154959 +--- !u!224 &3283626860157897344 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5811330195062425537} + m_GameObject: {fileID: 7033645233673418964} 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_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2071218490073935391} - - {fileID: 8784170467649388825} - m_Father: {fileID: 5162748506838320623} - m_RootOrder: 3 + - {fileID: 7078138303469546560} + - {fileID: 4141693405581629633} + m_Father: {fileID: 2247699559297615373} 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: -68} - m_SizeDelta: {x: 0, y: -68} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &3652735178674915126 + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6558703757684530813 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5811330195062425537} + m_GameObject: {fileID: 7033645233673418964} m_CullTransparentMesh: 1 ---- !u!114 &4791733469885460102 +--- !u!114 &5491465393681721634 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5811330195062425537} - m_Enabled: 0 + m_GameObject: {fileID: 7033645233673418964} + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.19607843} + m_Color: {r: 0.9882353, g: 0.9882353, b: 0.9882353, 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_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -901,8 +2721,8 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5989414146991530812 + m_PixelsPerUnitMultiplier: 2 +--- !u!1 &7490637495086527679 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -910,51 +2730,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4160569613766266488} - - component: {fileID: 398898081079021822} - - component: {fileID: 3144227817797214408} + - component: {fileID: 9054933368299285745} + - component: {fileID: 2721532459064095761} + - component: {fileID: 1874063066462932283} m_Layer: 5 - m_Name: WalletSuperTitle + m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4160569613766266488 +--- !u!224 &9054933368299285745 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5989414146991530812} - m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_GameObject: {fileID: 7490637495086527679} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7274778504134302950} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -201, y: 73.749985} - m_SizeDelta: {x: 1370.198, y: 403.0002} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &398898081079021822 + m_Father: {fileID: 4343338878116032075} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 24, y: 0} + m_SizeDelta: {x: -48, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2721532459064095761 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5989414146991530812} + m_GameObject: {fileID: 7490637495086527679} m_CullTransparentMesh: 1 ---- !u!114 &3144227817797214408 +--- !u!114 &1874063066462932283 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5989414146991530812} + m_GameObject: {fileID: 7490637495086527679} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -962,23 +2781,23 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Account + m_text: Email notifications m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 6b705423dc77d4fceb4122f6d7e571d6, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 9d9df32282a3c40299019c36b2157d37, type: 2} + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 855638015 - m_fontColor: {r: 1, g: 1, b: 1, a: 0.19607843} + rgba: 4294769916 + m_fontColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -995,8 +2814,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 320 - m_fontSizeBase: 320 + m_fontSize: 16 + m_fontSizeBase: 16 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1035,46 +2854,9 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &6589602318062871053 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3880736322189904317} - m_Layer: 5 - m_Name: Sliding Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3880736322189904317 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6589602318062871053} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8047280749183032157} - m_Father: {fileID: 8784170467649388825} - m_RootOrder: 0 - 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.5, y: 0.5} + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7845292203091259355 GameObject: m_ObjectHideFlags: 0 @@ -1107,7 +2889,6 @@ RectTransform: m_Children: - {fileID: 3075299736904206643} m_Father: {fileID: 5162748506838320623} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1183,7 +2964,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3343833300668648931} - 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} @@ -1259,7 +3039,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1051552430065570828} - 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} @@ -1335,7 +3114,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3880736322189904317} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1411,7 +3189,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1051552430065570828} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1534,32 +3311,376 @@ GameObject: m_IsActive: 1 --- !u!224 &7274778504134302950 RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8706760633975401916} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4160569613766266488} + - {fileID: 8192285222306137311} + m_Father: {fileID: 3343833300668648931} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 242.84302, y: -540} + m_SizeDelta: {x: 485.6861, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8743528959627333007 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3375225634029604995} + - component: {fileID: 1927135732727216272} + - component: {fileID: 1784574666598066727} + m_Layer: 5 + m_Name: Icn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3375225634029604995 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8743528959627333007} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5629046692074579084} + 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: 28, y: 0} + m_SizeDelta: {x: 26, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1927135732727216272 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8743528959627333007} + m_CullTransparentMesh: 1 +--- !u!114 &1784574666598066727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8743528959627333007} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.9882353, b: 0.9882353, 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_Sprite: {fileID: 21300000, guid: 1b667b2b8fb323c45a5e7050166fbcb2, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &9143858018359704493 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2247699559297615373} + - component: {fileID: 8329599424593465798} + - component: {fileID: 1148961022647624431} + - component: {fileID: 561514398737389721} + m_Layer: 5 + m_Name: EmailNotificationsButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2247699559297615373 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9143858018359704493} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3283626860157897344} + - {fileID: 4343338878116032075} + m_Father: {fileID: 5991122243707592773} + 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: 46} + m_Pivot: {x: 0, y: 0} +--- !u!222 &8329599424593465798 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9143858018359704493} + m_CullTransparentMesh: 1 +--- !u!114 &1148961022647624431 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9143858018359704493} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.8584906, g: 0.8584906, b: 0.8584906, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5491465393681721634} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &561514398737389721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9143858018359704493} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bfd0d144b6d3dd438b84fa14a062c4f, type: 3} + m_Name: + m_EditorClassIdentifier: + playHover: 1 + playClick: 1 + playRelease: 1 + extraClickEvent: {fileID: 0} +--- !u!1001 &1286305281802319120 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8981163224422539298} + m_Modifications: + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_SizeDelta.y + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 55 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 47 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1442316120381234285, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: model.text + value: NO + objectReference: {fileID: 0} + - target: {fileID: 3725923502685340037, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Color.b + value: 0.09411765 + objectReference: {fileID: 0} + - target: {fileID: 3725923502685340037, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Color.g + value: 0.08235294 + objectReference: {fileID: 0} + - target: {fileID: 3725923502685340037, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Color.r + value: 0.08627451 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_text + value: NO + objectReference: {fileID: 0} + - target: {fileID: 5466927874646222343, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Name + value: NoButton + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df2ca57878cc0834088cff37f213e619, type: 3} +--- !u!224 &1232808902220131389 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + m_PrefabInstance: {fileID: 1286305281802319120} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8706760633975401916} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4160569613766266488} - - {fileID: 8192285222306137311} - m_Father: {fileID: 3343833300668648931} - 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: 242.84302, y: -540} - m_SizeDelta: {x: 485.6861, y: 1080} - m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6283054375367079162 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + m_PrefabInstance: {fileID: 1286305281802319120} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3059097994089677664 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 8024335577128154959} + serializedVersion: 3 + m_TransformParent: {fileID: 9210792432472360934} m_Modifications: - target: {fileID: 79715913179127650, guid: 4fa96e450963f8b45b7835edf038262d, type: 3} @@ -1656,6 +3777,21 @@ PrefabInstance: propertyPath: m_Name value: MyProfile objectReference: {fileID: 0} + - target: {fileID: 716215124352047014, guid: 4fa96e450963f8b45b7835edf038262d, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1125826047934859879, guid: 4fa96e450963f8b45b7835edf038262d, + type: 3} + propertyPath: m_SizeDelta.y + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1516404091816312568, guid: 4fa96e450963f8b45b7835edf038262d, + type: 3} + propertyPath: scrollBar + value: + objectReference: {fileID: 6589602318062871053} - target: {fileID: 2541878013537955074, guid: 4fa96e450963f8b45b7835edf038262d, type: 3} propertyPath: m_AnchorMax.y @@ -1794,17 +3930,17 @@ PrefabInstance: - target: {fileID: 3948086035216379263, guid: 4fa96e450963f8b45b7835edf038262d, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3948086035216379263, guid: 4fa96e450963f8b45b7835edf038262d, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3948086035216379263, guid: 4fa96e450963f8b45b7835edf038262d, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3948086035216379263, guid: 4fa96e450963f8b45b7835edf038262d, type: 3} @@ -2011,6 +4147,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7311234473262200987, guid: 4fa96e450963f8b45b7835edf038262d, + type: 3} + propertyPath: m_text + value: My Profile + objectReference: {fileID: 0} + - target: {fileID: 7311234473262200987, guid: 4fa96e450963f8b45b7835edf038262d, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, + type: 2} + - target: {fileID: 7311234473262200987, guid: 4fa96e450963f8b45b7835edf038262d, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + - target: {fileID: 7311234473262200987, guid: 4fa96e450963f8b45b7835edf038262d, + type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7368521058794980880, guid: 4fa96e450963f8b45b7835edf038262d, type: 3} propertyPath: m_AnchorMax.y @@ -2076,6 +4233,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7990445871455885891, guid: 4fa96e450963f8b45b7835edf038262d, + type: 3} + propertyPath: m_text + value: Additional Info + objectReference: {fileID: 0} - target: {fileID: 8233974169046724784, guid: 4fa96e450963f8b45b7835edf038262d, type: 3} propertyPath: m_AnchorMax.y @@ -2106,7 +4268,15 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8303104940016665670, guid: 4fa96e450963f8b45b7835edf038262d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.00018310547 + objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4fa96e450963f8b45b7835edf038262d, type: 3} --- !u!224 &2071218490073935391 stripped RectTransform: @@ -2126,3 +4296,290 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0209e555424353648956e035cd543a47, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &3620462189717440640 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8981163224422539298} + m_Modifications: + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_SizeDelta.y + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -55 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 47 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1442316120381234285, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: model.text + value: YES + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_text + value: YES + objectReference: {fileID: 0} + - target: {fileID: 5466927874646222343, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Name + value: YesButton + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df2ca57878cc0834088cff37f213e619, type: 3} +--- !u!224 &3673945336505389485 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + m_PrefabInstance: {fileID: 3620462189717440640} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8419000464500689258 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + m_PrefabInstance: {fileID: 3620462189717440640} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &5741146918857652051 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9210792432472360934} + m_Modifications: + - target: {fileID: 716215124352047014, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_Name + value: EmailNotifications + objectReference: {fileID: 0} + - target: {fileID: 716215124352047014, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_SizeDelta.x + value: 962 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 10785685f82bbec4f997b67b38841089, type: 3} +--- !u!114 &3545138090583190189 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 9123865113910861310, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + m_PrefabInstance: {fileID: 5741146918857652051} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 659a6aee3e5b47788b88ac6edbd4559d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &8747905691023710764 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3948086035216379263, guid: 10785685f82bbec4f997b67b38841089, + type: 3} + m_PrefabInstance: {fileID: 5741146918857652051} + m_PrefabAsset: {fileID: 0} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/UpdateEmailConfirmationHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/UpdateEmailConfirmationHUD.prefab new file mode 100644 index 0000000000..91b04d3580 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/UpdateEmailConfirmationHUD.prefab @@ -0,0 +1,1265 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &227908684584197476 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1446232773736322684} + - component: {fileID: 6628798625264839196} + - component: {fileID: 1656224131817444487} + m_Layer: 5 + m_Name: Floor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1446232773736322684 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227908684584197476} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6008964468014646208} + 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: 0, y: -50} + m_SizeDelta: {x: 300, y: 84} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &6628798625264839196 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227908684584197476} + m_CullTransparentMesh: 1 +--- !u!114 &1656224131817444487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227908684584197476} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_Sprite: {fileID: 21300000, guid: 46524689a799e4be9941af9ef6f45a89, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &267834067832879686 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4831397367791034242} + - component: {fileID: 6679999947234156117} + - component: {fileID: 8483770875783050387} + m_Layer: 5 + m_Name: ActionLogo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4831397367791034242 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 267834067832879686} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3812766589936957106} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -25, y: -20} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0, y: 0} +--- !u!222 &6679999947234156117 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 267834067832879686} + m_CullTransparentMesh: 1 +--- !u!114 &8483770875783050387 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 267834067832879686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_Sprite: {fileID: 21300000, guid: d6a96908978f04454a0eb99ff0e659a0, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &752552916217800548 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6008964468014646208} + m_Layer: 5 + m_Name: Illustration + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6008964468014646208 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 752552916217800548} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1446232773736322684} + - {fileID: 146480626580712373} + - {fileID: 3812766589936957106} + m_Father: {fileID: 3364135582139750038} + 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: 0, y: -48.320244} + m_SizeDelta: {x: 300, y: 130.1102} + m_Pivot: {x: 0.5, y: 1} +--- !u!1 &1275377754030658737 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 929856955434212113} + - component: {fileID: 8774623106957783532} + - component: {fileID: 6948940265473854165} + - component: {fileID: 7791826050260128955} + - component: {fileID: 1860585905494195208} + - component: {fileID: 1031171311106437030} + - component: {fileID: 7677882640776232502} + m_Layer: 5 + m_Name: UpdateEmailConfirmationHUD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &929856955434212113 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275377754030658737} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8832753444777503195} + - {fileID: 3364135582139750038} + m_Father: {fileID: 0} + 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!223 &8774623106957783532 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275377754030658737} + 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_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 4 + m_TargetDisplay: 0 +--- !u!114 &6948940265473854165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275377754030658737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &7791826050260128955 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275377754030658737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1860585905494195208 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275377754030658737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8b939b5bedb9494b806609faeda7d8d, type: 3} + m_Name: + m_EditorClassIdentifier: + hideOnEnable: 1 + animSpeedFactor: 1 + disableAfterFadeOut: 0 + canvasGroup: {fileID: 0} +--- !u!225 &1031171311106437030 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275377754030658737} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &7677882640776232502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275377754030658737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 921877989b50412eac62f38af27b162d, type: 3} + m_Name: + m_EditorClassIdentifier: + showHideAnimator: {fileID: 0} + actionLogoImage: {fileID: 8483770875783050387} + confirmationText: {fileID: 7932521898882228721} + backgroundButton: {fileID: 2535454852855324367} + noButton: {fileID: 267341017498904739} + yesButton: {fileID: 6528367819886741278} +--- !u!1 &3301100875474382389 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3364135582139750038} + - component: {fileID: 4486710255442783951} + - component: {fileID: 8736983984092789948} + - component: {fileID: 4448230778165754301} + m_Layer: 5 + m_Name: Modal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3364135582139750038 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3301100875474382389} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6008964468014646208} + - {fileID: 5634805770393609999} + - {fileID: 5017006399886667876} + - {fileID: 2068100497134460889} + m_Father: {fileID: 929856955434212113} + 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: 430, y: 334} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4486710255442783951 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3301100875474382389} + m_CullTransparentMesh: 1 +--- !u!114 &8736983984092789948 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3301100875474382389} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.94117653, g: 0.9333334, b: 0.95686275, 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_Sprite: {fileID: 21300000, guid: 54cbe9bf5928342d490167f954f07710, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!114 &4448230778165754301 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3301100875474382389} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!1 &4249256714535742795 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 146480626580712373} + - component: {fileID: 7562667631080191108} + - component: {fileID: 689816505977697969} + m_Layer: 5 + m_Name: Shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &146480626580712373 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4249256714535742795} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6008964468014646208} + 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: 0, y: -58.538002} + m_SizeDelta: {x: 50, y: 14} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &7562667631080191108 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4249256714535742795} + m_CullTransparentMesh: 1 +--- !u!114 &689816505977697969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4249256714535742795} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.078431375} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: cf43c05d20914491481a6f7736f2eec6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5348897884666829550 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3812766589936957106} + - component: {fileID: 3337389684028315122} + - component: {fileID: 4055385307338399791} + m_Layer: 5 + m_Name: Logo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3812766589936957106 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5348897884666829550} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4831397367791034242} + m_Father: {fileID: 6008964468014646208} + 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: 0, y: -4.311804} + m_SizeDelta: {x: 66, y: 46} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3337389684028315122 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5348897884666829550} + m_CullTransparentMesh: 1 +--- !u!114 &4055385307338399791 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5348897884666829550} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_Sprite: {fileID: 21300000, guid: 653364ce081e149ae983947e645cc879, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6388088502254152880 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8832753444777503195} + - component: {fileID: 2932078964142180290} + - component: {fileID: 3182911080044089452} + - component: {fileID: 2535454852855324367} + - component: {fileID: 4095243827863346857} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8832753444777503195 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6388088502254152880} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 929856955434212113} + 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.5, y: 0.5} +--- !u!222 &2932078964142180290 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6388088502254152880} + m_CullTransparentMesh: 1 +--- !u!114 &3182911080044089452 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6388088502254152880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.8627451} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2535454852855324367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6388088502254152880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3182911080044089452} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4095243827863346857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6388088502254152880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4bfd0d144b6d3dd438b84fa14a062c4f, type: 3} + m_Name: + m_EditorClassIdentifier: + playHover: 1 + playClick: 1 + playRelease: 1 + extraClickEvent: {fileID: 0} +--- !u!1 &8617427737621724123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5634805770393609999} + - component: {fileID: 3422113623918524578} + - component: {fileID: 7932521898882228721} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5634805770393609999 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8617427737621724123} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3364135582139750038} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -133} + m_SizeDelta: {x: -110, y: 66} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3422113623918524578 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8617427737621724123} + m_CullTransparentMesh: 1 +--- !u!114 &7932521898882228721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8617427737621724123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: Are you sure you want to unsubscribe from Decentraland's newsletter? + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &2049507873658898164 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3364135582139750038} + m_Modifications: + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_SizeDelta.y + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -55 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 47 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1442316120381234285, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: model.text + value: YES + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_text + value: YES + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_fontColor.b + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_fontColor.g + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_fontColor.r + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4294769916 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Colors.m_PressedColor.b + value: 0.8773585 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Colors.m_PressedColor.g + value: 0.8773585 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Colors.m_PressedColor.r + value: 0.8773585 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Colors.m_SelectedColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Colors.m_SelectedColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Colors.m_SelectedColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5466927874646222343, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Name + value: YesButton + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df2ca57878cc0834088cff37f213e619, type: 3} +--- !u!224 &2068100497134460889 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + m_PrefabInstance: {fileID: 2049507873658898164} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6528367819886741278 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + m_PrefabInstance: {fileID: 2049507873658898164} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &4998417525849401673 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3364135582139750038} + m_Modifications: + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_SizeDelta.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_SizeDelta.y + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 55 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 47 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1442316120381234285, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: model.text + value: NO + objectReference: {fileID: 0} + - target: {fileID: 3725923502685340037, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Color.b + value: 0.09411765 + objectReference: {fileID: 0} + - target: {fileID: 3725923502685340037, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Color.g + value: 0.08235294 + objectReference: {fileID: 0} + - target: {fileID: 3725923502685340037, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Color.r + value: 0.08627451 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_text + value: NO + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_fontColor.b + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_fontColor.g + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_fontColor.r + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4294769916 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Colors.m_PressedColor.b + value: 0.8773585 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Colors.m_PressedColor.g + value: 0.8773585 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Colors.m_PressedColor.r + value: 0.8773585 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Colors.m_SelectedColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Colors.m_SelectedColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Colors.m_SelectedColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5466927874646222343, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + propertyPath: m_Name + value: NoButton + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df2ca57878cc0834088cff37f213e619, type: 3} +--- !u!114 &267341017498904739 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5109399184885072362, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + m_PrefabInstance: {fileID: 4998417525849401673} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &5017006399886667876 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 54622623229548845, guid: df2ca57878cc0834088cff37f213e619, + type: 3} + m_PrefabInstance: {fileID: 4998417525849401673} + m_PrefabAsset: {fileID: 0} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/UpdateEmailConfirmationHUD.prefab.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/UpdateEmailConfirmationHUD.prefab.meta new file mode 100644 index 0000000000..c2c212580f --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/UpdateEmailConfirmationHUD.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2bc8f09d15597c54eafedcf481d7c2fa +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Tests/MyProfileControllerShould.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Tests/MyProfileControllerShould.cs index e6b7cd54fe..ba6a00a174 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Tests/MyProfileControllerShould.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Tests/MyProfileControllerShould.cs @@ -335,7 +335,7 @@ public void SaveAboutDescription() userProfileBridge.SaveDescription(ANOTHER_DESCRIPTION, Arg.Any()); myAccountAnalyticsService.Received(1).SendProfileInfoEditAnalytic(ANOTHER_DESCRIPTION.Length); - socialAnalytics.Received(1).SendProfileEdit(ANOTHER_DESCRIPTION.Length, false, PlayerActionSource.MyProfile); + socialAnalytics.Received(1).SendProfileEdit(ANOTHER_DESCRIPTION.Length, false, PlayerActionSource.MyProfile, ProfileField.Description); } [TestCase("l1", "http://whatever.com", "l0")] diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/UpdateEmailConfirmationHUDComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/UpdateEmailConfirmationHUDComponentView.cs new file mode 100644 index 0000000000..b75f0bd991 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/UpdateEmailConfirmationHUDComponentView.cs @@ -0,0 +1,59 @@ +using System; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace DCL.MyAccount +{ + public class UpdateEmailConfirmationHUDComponentView : BaseComponentView, IUpdateEmailConfirmationHUDComponentView + { + [SerializeField] internal Image actionLogoImage; + [SerializeField] internal TMP_Text confirmationText; + [SerializeField] internal Button backgroundButton; + [SerializeField] internal Button noButton; + [SerializeField] internal Button yesButton; + + public event Action OnConfirmationModalAccepted; + + public override void Awake() + { + base.Awake(); + + backgroundButton.onClick.AddListener(RejectConfirmation); + + noButton.onClick.AddListener(RejectConfirmation); + yesButton.onClick.AddListener(AcceptConfirmation); + } + + public override void Dispose() + { + noButton.onClick.RemoveAllListeners(); + yesButton.onClick.RemoveAllListeners(); + base.Dispose(); + } + + public override void RefreshControl() { } + + public void ShowConfirmationModal(Sprite actionLogo, string text) + { + actionLogoImage.sprite = actionLogo; + confirmationText.text = text; + Show(); + } + + public void HideConfirmationModal() => + Hide(); + + private void AcceptConfirmation() + { + HideConfirmationModal(); + OnConfirmationModalAccepted?.Invoke(true); + } + + private void RejectConfirmation() + { + HideConfirmationModal(); + OnConfirmationModalAccepted?.Invoke(false); + } + } +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/UpdateEmailConfirmationHUDComponentView.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/UpdateEmailConfirmationHUDComponentView.cs.meta new file mode 100644 index 0000000000..587ab96d23 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/UpdateEmailConfirmationHUDComponentView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 921877989b50412eac62f38af27b162d +timeCreated: 1698164655 \ No newline at end of file diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/NotificationHUD/Prefabs/WarningNotification.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/NotificationHUD/Prefabs/WarningNotification.prefab index 27bce5a329..9997175c4a 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/NotificationHUD/Prefabs/WarningNotification.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/NotificationHUD/Prefabs/WarningNotification.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 471081646976459722, guid: 0282a050c09634ed299130b8e9c2c035, @@ -183,7 +184,7 @@ PrefabInstance: - target: {fileID: 3460499450308197912, guid: 0282a050c09634ed299130b8e9c2c035, type: 3} propertyPath: m_AnchoredPosition.y - value: -1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4507316053449197995, guid: 0282a050c09634ed299130b8e9c2c035, type: 3} @@ -347,4 +348,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0282a050c09634ed299130b8e9c2c035, type: 3} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTIconComponentView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTIconComponentView.cs index 5478e40a67..1816f6e401 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTIconComponentView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTIconComponentView.cs @@ -122,7 +122,7 @@ public void SetRarity(string rarity) backgroundImage.sprite = model.type == nameType ? nameBackground : normalBackground; backgroundImageGradient.enabled = model.type != nameType; - backgroundImage.color = model.type == nameType ? Color.white : new Color(rarityColor.r, rarityColor.g, rarityColor.b, 1f); + backgroundImage.color = model.type == nameType ? Color.white : new Color(rarityColor.r, rarityColor.g, rarityColor.b, nftTypesIcons.DoesRarityExist(rarity) ? 1f : 0.5f); rarityBackgroundImage.color = rarityColor; } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTTypeIconsAndColors.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTTypeIconsAndColors.cs index dacfb151e5..8e13edbb49 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTTypeIconsAndColors.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTTypeIconsAndColors.cs @@ -29,4 +29,15 @@ public Color GetColor(string rarity) return defaultColor; } + + public bool DoesRarityExist(string rarity) + { + foreach (var color in nftColors) + { + if (color.key == rarity) + return true; + } + + return false; + } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTTypesIcons.asset b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTTypesIcons.asset index f7c8bfd6ad..0688a9ef85 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTTypesIcons.asset +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTTypesIcons.asset @@ -14,39 +14,39 @@ MonoBehaviour: m_EditorClassIdentifier: nftIcons: - key: eyes - value: {fileID: 21300000, guid: b90a97a10e3a7452988bced1ec1aaf84, type: 3} + value: {fileID: 21300000, guid: 03b05b1004b784dc690bbff5ea268de7, type: 3} - key: mouth - value: {fileID: 21300000, guid: 866efedbbcc38498f9e6136d65695c9c, type: 3} + value: {fileID: 21300000, guid: 075c9dd99649649f9869afece52cd35b, type: 3} - key: eyebrows - value: {fileID: 21300000, guid: 84c790cbe3a484378906dc785b6c5995, type: 3} + value: {fileID: 21300000, guid: 15c01427d7e8f4c72a16e8e1368c82a6, type: 3} - key: hair - value: {fileID: 21300000, guid: 946f30660ef2f4261b313ca749c4127c, type: 3} + value: {fileID: 21300000, guid: 9b13173961ced41b287b3ec0d724c585, type: 3} - key: upper_body - value: {fileID: 21300000, guid: ddce90606ec7d4e5d820390fe246a91b, type: 3} + value: {fileID: 21300000, guid: 48d5dd980b244494b9f9d9fc540e0b01, type: 3} - key: lower_body - value: {fileID: 21300000, guid: d4ee93e9eb8464972b0fd5598a452f50, type: 3} + value: {fileID: 21300000, guid: bf9cd8edf950343a9ba38284a615c606, type: 3} - key: feet - value: {fileID: 21300000, guid: c1bf499699a424df88aa013bd2f32b68, type: 3} + value: {fileID: 21300000, guid: 2bd9c7cbf6f504ad89e22e7f1f497fd2, type: 3} - key: head - value: {fileID: 21300000, guid: 30c54e14722864c70a0e8c28edc2f7e6, type: 3} + value: {fileID: 0} - key: facial_hair - value: {fileID: 21300000, guid: 06cdeba19874e4ee38010ed40544559d, type: 3} + value: {fileID: 21300000, guid: 81132a1626c0d43aabeeec2414a68945, type: 3} - key: tiara - value: {fileID: 21300000, guid: 4454cae867deb4aea91f4d26c5bc88b1, type: 3} + value: {fileID: 21300000, guid: 6a3c7a80a921c458c93852cc9cfa33c1, type: 3} - key: hat - value: {fileID: 21300000, guid: 2de957f05cca04e4aac38646afee2263, type: 3} + value: {fileID: 21300000, guid: ec6e82c586d96441e9a01726eae9c6f8, type: 3} - key: helmet - value: {fileID: 21300000, guid: 15c0a1185bb524f0c9d7b118e081501f, type: 3} + value: {fileID: 21300000, guid: 6bc5be995cfc14e0182a54c5a4fef290, type: 3} - key: skin - value: {fileID: 21300000, guid: 0bfef183260d34c50b8d971b1400499e, type: 3} + value: {fileID: 21300000, guid: bda43422408ca42209dd311b23a1d06f, type: 3} - key: mask - value: {fileID: 21300000, guid: 90e673ad913664a27b245b61ccdf31bf, type: 3} + value: {fileID: 21300000, guid: f88ebb8cd1cd5487ca7c3f4d3e65e76a, type: 3} - key: eyewear - value: {fileID: 21300000, guid: 18cc300911ff74c3c922eb3a9b346f3c, type: 3} + value: {fileID: 21300000, guid: 1f8423c7e44934bc88742ef8c05aa4ee, type: 3} - key: top_head - value: {fileID: 21300000, guid: 17e4c961a88d74262a222ea008152618, type: 3} + value: {fileID: 21300000, guid: 6084de83d5bc748b9a444a61a7c0b96a, type: 3} - key: earring - value: {fileID: 21300000, guid: 4a803782af3694d97b17f31e269c04d1, type: 3} + value: {fileID: 21300000, guid: 98a2ad67412f444ee883c03d3a07dd1e, type: 3} - key: emote value: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3} - key: name diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/ProfileHUD/ProfileHUDController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/ProfileHUD/ProfileHUDController.cs index 7e43f50aad..3ded732b87 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/ProfileHUD/ProfileHUDController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/ProfileHUD/ProfileHUDController.cs @@ -205,7 +205,7 @@ private void UpdateProfileDescription(string description) saveDescriptionCancellationToken = saveDescriptionCancellationToken.SafeRestart(); userProfileBridge.SaveDescription(description, saveDescriptionCancellationToken.Token).Forget(); - socialAnalytics.SendProfileEdit(description.Length, ContainsLinks(description), PlayerActionSource.ProfileEditHUD); + socialAnalytics.SendProfileEdit(description.Length, ContainsLinks(description), PlayerActionSource.ProfileEditHUD, ProfileField.Description); } private void SetAsFullScreenMenuMode(bool currentIsFullScreenMenuMode, bool previousIsFullScreenMenuMode) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUD.asmdef b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUD.asmdef index ec24f9e954..b1a7a4d858 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUD.asmdef +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUD.asmdef @@ -13,7 +13,16 @@ "GUID:1e6b57fe78f7b724e9567f29f6a40c2c", "GUID:8705acb5462cf2c49aef7efa961ad469", "GUID:0663fad624d836944b40ae27c3414652", - "GUID:4720e174f2805c74bb7aa94cc8bb5bf8" + "GUID:4720e174f2805c74bb7aa94cc8bb5bf8", + "GUID:81f3218b29e049144b175dad2ebbac1b", + "GUID:4d7712e4b2446440a8af21fd3ce8690e", + "GUID:c31f144fbfb54890960a05fca4149e56", + "GUID:3b80b0b562b1cbc489513f09fc1b8f69", + "GUID:f51ebe6a0ceec4240a699833d6309b23", + "GUID:4d3366a36e77f41cfb7436340334e236", + "GUID:2995626b54c60644988f134a69a77450", + "GUID:b1087c5731ff68448a0a9c625bb7e52d", + "GUID:f92ef779fd645be45832a91c16125784" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDController.cs index 9da952dadb..748ad7cb3b 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDController.cs @@ -1,27 +1,55 @@ +using Cysharp.Threading.Tasks; using DCL; +using DCL.Browser; +using DCL.Helpers; using DCL.Interface; +using DCL.Tasks; +using DCLServices.SubscriptionsAPIService; +using System; +using System.Threading; using UnityEngine; namespace SignupHUD { public class SignupHUDController : IHUD { + private const string TOS_URL = "https://decentraland.org/terms/"; + private const string PRIVACY_POLICY_URL = "https://decentraland.org/privacy/"; + private const string NEW_TOS_AND_EMAIL_SUBSCRIPTION_FF = "new_terms_of_service_and_email_subscription"; + private const string CURRENT_SUBSCRIPTION_ID_LOCAL_STORAGE_KEY = "currentSubscriptionId"; + private readonly NewUserExperienceAnalytics newUserExperienceAnalytics; private readonly DataStore_LoadingScreen loadingScreenDataStore; private readonly DataStore_HUDs dataStoreHUDs; + private readonly DataStore_FeatureFlag dataStoreFeatureFlag; + private readonly IBrowserBridge browserBridge; + private readonly ISubscriptionsAPIService subscriptionsAPIService; internal readonly ISignupHUDView view; internal string name; internal string email; private BaseVariable signupVisible => DataStore.i.HUDs.signupVisible; + private BaseVariable backpackVisible => DataStore.i.HUDs.avatarEditorVisible; + private bool isNewTermsOfServiceAndEmailSubscriptionEnabled => dataStoreFeatureFlag.flags.Get().IsFeatureEnabled(NEW_TOS_AND_EMAIL_SUBSCRIPTION_FF); + + private CancellationTokenSource createSubscriptionCts; - public SignupHUDController(IAnalytics analytics, ISignupHUDView view, DataStore_LoadingScreen loadingScreenDataStore, - DataStore_HUDs dataStoreHUDs) + public SignupHUDController( + IAnalytics analytics, + ISignupHUDView view, + DataStore_LoadingScreen loadingScreenDataStore, + DataStore_HUDs dataStoreHUDs, + DataStore_FeatureFlag dataStoreFeatureFlag, + IBrowserBridge browserBridge, + ISubscriptionsAPIService subscriptionsAPIService) { newUserExperienceAnalytics = new NewUserExperienceAnalytics(analytics); this.view = view; this.loadingScreenDataStore = loadingScreenDataStore; this.dataStoreHUDs = dataStoreHUDs; + this.dataStoreFeatureFlag = dataStoreFeatureFlag; + this.browserBridge = browserBridge; + this.subscriptionsAPIService = subscriptionsAPIService; loadingScreenDataStore.decoupledLoadingHUD.visible.OnChange += OnLoadingScreenAppear; } @@ -36,14 +64,19 @@ public void Initialize() view.OnEditAvatar += OnEditAvatar; view.OnTermsOfServiceAgreed += OnTermsOfServiceAgreed; view.OnTermsOfServiceBack += OnTermsOfServiceBack; + view.OnLinkClicked += OnLinkClicked; CommonScriptableObjects.isLoadingHUDOpen.OnChange += OnLoadingScreenAppear; signupVisible.Set(signupVisible.Get(), true); } + private void OnLoadingScreenAppear(bool current, bool previous) { - if(signupVisible.Get() && current) + if (signupVisible.Get() && current) + { signupVisible.Set(false); + backpackVisible.Set(false); + } } private void OnSignupVisibleChanged(bool current, bool previous) @@ -75,11 +108,41 @@ internal void OnTermsOfServiceAgreed() { WebInterface.SendPassport(name, email); DataStore.i.common.isSignUpFlow.Set(false); - newUserExperienceAnalytics?.SendTermsOfServiceAcceptedNux(); + newUserExperienceAnalytics?.SendTermsOfServiceAcceptedNux(name, email); + + if (!isNewTermsOfServiceAndEmailSubscriptionEnabled) + return; + + createSubscriptionCts = createSubscriptionCts.SafeRestart(); + CreateSubscriptionAsync(email, createSubscriptionCts.Token).Forget(); + } + + private async UniTaskVoid CreateSubscriptionAsync(string emailAddress, CancellationToken cancellationToken) + { + try + { + var newSubscription = await subscriptionsAPIService.CreateSubscription(emailAddress, cancellationToken); + PlayerPrefsBridge.SetString(CURRENT_SUBSCRIPTION_ID_LOCAL_STORAGE_KEY, newSubscription.id); + PlayerPrefsBridge.Save(); + } + catch (Exception ex) { Debug.LogError($"An error occurred while creating the subscription for {emailAddress}: {ex.Message}"); } } internal void OnTermsOfServiceBack() { StartSignupProcess(); } + private void OnLinkClicked(string linkId) + { + switch (linkId) + { + case "tosUrl": + browserBridge.OpenUrl(TOS_URL); + break; + case "privacyPolicyUrl": + browserBridge.OpenUrl(PRIVACY_POLICY_URL); + break; + } + } + public void SetVisibility(bool visible) { view?.SetVisibility(visible); @@ -98,6 +161,7 @@ public void Dispose() view.OnTermsOfServiceBack -= OnTermsOfServiceBack; CommonScriptableObjects.isFullscreenHUDOpen.OnChange -= OnLoadingScreenAppear; loadingScreenDataStore.decoupledLoadingHUD.visible.OnChange -= OnLoadingScreenAppear; + createSubscriptionCts.SafeCancelAndDispose(); view.Dispose(); } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2.prefab new file mode 100644 index 0000000000..3d9ba63dd8 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2.prefab @@ -0,0 +1,3696 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &56380586464882455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5023305050921431380} + - component: {fileID: 323365074896079453} + - component: {fileID: 8275781349962032660} + m_Layer: 5 + m_Name: Icn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5023305050921431380 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 56380586464882455} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9174057842995388847} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -10} + m_SizeDelta: {x: 16, y: 16} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &323365074896079453 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 56380586464882455} + m_CullTransparentMesh: 1 +--- !u!114 &8275781349962032660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 56380586464882455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, 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_Sprite: {fileID: 21300000, guid: 6139681b2373cc64399f3419a20be1cc, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &579543157188496642 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1601470506711559518} + - component: {fileID: 72238369309359061} + - component: {fileID: 6859779996693374826} + - component: {fileID: 8114059859674282854} + m_Layer: 5 + m_Name: EmailInput + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1601470506711559518 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 579543157188496642} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8628685526670664247} + - {fileID: 3830026964349886450} + m_Father: {fileID: 5400598103665836480} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -86} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0, y: 1} +--- !u!222 &72238369309359061 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 579543157188496642} + m_CullTransparentMesh: 1 +--- !u!114 &6859779996693374826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 579543157188496642} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!114 &8114059859674282854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 579543157188496642} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: -1 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 21300000, guid: 8512d2a614988894b967cb17ea417d0b, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: 8512d2a614988894b967cb17ea417d0b, type: 3} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6859779996693374826} + m_TextViewport: {fileID: 3830026964349886450} + m_TextComponent: {fileID: 6178850959663220603} + m_Placeholder: {fileID: 3598218725558136768} + m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbarEventHandler: {fileID: 0} + m_LayoutGroup: {fileID: 0} + m_ScrollSensitivity: 1 + m_ContentType: 0 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 0 + m_HideMobileInput: 0 + m_HideSoftKeyboard: 0 + m_CharacterValidation: 0 + m_RegexValue: + m_GlobalPointSize: 14 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnSelect: + m_PersistentCalls: + m_Calls: [] + m_OnDeselect: + m_PersistentCalls: + m_Calls: [] + m_OnTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnEndTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_OnTouchScreenKeyboardStatusChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_RichText: 1 + m_GlobalFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_OnFocusSelectAll: 1 + m_ResetOnDeActivation: 1 + m_KeepTextSelectionVisible: 0 + m_RestoreOriginalTextOnEscape: 1 + m_isRichTextEditingAllowed: 0 + m_LineLimit: 0 + isAlert: 0 + m_InputValidator: {fileID: 0} + m_ShouldActivateOnSelect: 1 +--- !u!1 &728680869327105183 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 149386893471877362} + - component: {fileID: 3601352428064510698} + - component: {fileID: 1917803039412694563} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &149386893471877362 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 728680869327105183} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4464977467887081046} + - {fileID: 8228153389778618123} + - {fileID: 5400598103665836480} + - {fileID: 1658359650511513679} + - {fileID: 7948650356736746200} + m_Father: {fileID: 543217254752006596} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -228, y: -230} + m_SizeDelta: {x: 884, y: 620} + m_Pivot: {x: 1, y: 1} +--- !u!222 &3601352428064510698 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 728680869327105183} + m_CullTransparentMesh: 1 +--- !u!225 &1917803039412694563 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 728680869327105183} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!1 &800595759923128664 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8008040260335603851} + - component: {fileID: 5903478603024220622} + - component: {fileID: 976729390085968838} + m_Layer: 5 + m_Name: NameTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8008040260335603851 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 800595759923128664} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8228153389778618123} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5903478603024220622 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 800595759923128664} + m_CullTransparentMesh: 1 +--- !u!114 &976729390085968838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 800595759923128664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: Your Avatar's Name * + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &973980130259951830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 74003253528235216} + - component: {fileID: 667596702152064519} + - component: {fileID: 7638894866137935732} + - component: {fileID: 7772388066512655486} + m_Layer: 5 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &74003253528235216 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 973980130259951830} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2105139276870056259} + 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: -3.9999995, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &667596702152064519 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 973980130259951830} + m_CullTransparentMesh: 1 +--- !u!114 &7638894866137935732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 973980130259951830} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: Name + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4289239968 + m_fontColor: {r: 0.627451, g: 0.60784316, b: 0.65882355, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &7772388066512655486 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 973980130259951830} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &999182896938449207 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2420648779505270717} + - component: {fileID: 551397501946057753} + - component: {fileID: 6267044900892803159} + m_Layer: 5 + m_Name: EmailSubtitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2420648779505270717 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999182896938449207} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5400598103665836480} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -36} + m_SizeDelta: {x: 0, y: 40} + m_Pivot: {x: 0, y: 1} +--- !u!222 &551397501946057753 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999182896938449207} + m_CullTransparentMesh: 1 +--- !u!114 &6267044900892803159 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 999182896938449207} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: Subscribe to Decentraland's newsletter to receive the latest news about + events, updates, contests, and more. + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4283056195 + m_fontColor: {r: 0.2627451, g: 0.2509804, b: 0.2901961, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 12 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1113251675141333107 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3830026964349886450} + - component: {fileID: 4998698879645153541} + m_Layer: 5 + m_Name: Text Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3830026964349886450 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1113251675141333107} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 484082367446393819} + - {fileID: 7997443954654344026} + m_Father: {fileID: 1601470506711559518} + 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: -32, y: -12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4998698879645153541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1113251675141333107} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: -8, y: -5, z: -8, w: -5} + m_Softness: {x: 0, y: 0} +--- !u!1 &1168387516007744603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8228153389778618123} + m_Layer: 5 + m_Name: NameControls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8228153389778618123 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1168387516007744603} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8008040260335603851} + - {fileID: 9026670465428973497} + - {fileID: 4383128830677467794} + m_Father: {fileID: 149386893471877362} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140, y: -80} + m_SizeDelta: {x: 600, y: 109.3202} + m_Pivot: {x: 0, y: 1} +--- !u!1 &1243698204700119226 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4308582022782370670} + - component: {fileID: 2041112877706627753} + - component: {fileID: 8376774377052529340} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4308582022782370670 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1243698204700119226} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9174057842995388847} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 10.000061, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2041112877706627753 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1243698204700119226} + m_CullTransparentMesh: 1 +--- !u!114 &8376774377052529340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1243698204700119226} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: Character limit reached + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190335 + m_fontColor: {r: 1, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 11.5 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: -4 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1596950031444397359 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 484082367446393819} + - component: {fileID: 7769616731484627616} + - component: {fileID: 3598218725558136768} + - component: {fileID: 1433855075188323558} + m_Layer: 5 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &484082367446393819 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1596950031444397359} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3830026964349886450} + 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: -3.9999995, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7769616731484627616 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1596950031444397359} + m_CullTransparentMesh: 1 +--- !u!114 &3598218725558136768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1596950031444397359} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: Enter email + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: -6676260188536263158, guid: 6708c7eadd49b49f4ac3469e5104e7c9, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4289239968 + m_fontColor: {r: 0.627451, g: 0.60784316, b: 0.65882355, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &1433855075188323558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1596950031444397359} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &1636523586481371152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5400598103665836480} + m_Layer: 5 + m_Name: EmailControls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5400598103665836480 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1636523586481371152} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6146927243140338005} + - {fileID: 2420648779505270717} + - {fileID: 1601470506711559518} + - {fileID: 1403013455555087896} + m_Father: {fileID: 149386893471877362} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140, y: -240} + m_SizeDelta: {x: 600, y: 157.9179} + m_Pivot: {x: 0, y: 1} +--- !u!1 &1644441510465595183 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4383128830677467794} + - component: {fileID: 6543272237422364423} + m_Layer: 5 + m_Name: NameValidations + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4383128830677467794 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644441510465595183} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4798166336211856368} + - {fileID: 9174057842995388847} + - {fileID: 2203504993340464821} + m_Father: {fileID: 8228153389778618123} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -91.600006} + m_SizeDelta: {x: 0, y: 14} + m_Pivot: {x: 0, y: 1} +--- !u!114 &6543272237422364423 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644441510465595183} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 4 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &1989955353252842562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5274804786132339018} + - component: {fileID: 8536537878791187112} + - component: {fileID: 3647892465151761758} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5274804786132339018 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1989955353252842562} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2203504993340464821} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 10.000061, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8536537878791187112 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1989955353252842562} + m_CullTransparentMesh: 1 +--- !u!114 &3647892465151761758 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1989955353252842562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: Letters and numbers only + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190335 + m_fontColor: {r: 1, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 11.5 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: -4 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2037530446849261634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8161194278267853563} + - component: {fileID: 7020750451067291497} + - component: {fileID: 1634840539233718816} + m_Layer: 5 + m_Name: Icn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8161194278267853563 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2037530446849261634} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1403013455555087896} + 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: -20, y: 0} + m_SizeDelta: {x: 16, y: 16} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &7020750451067291497 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2037530446849261634} + m_CullTransparentMesh: 1 +--- !u!114 &1634840539233718816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2037530446849261634} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, 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_Sprite: {fileID: 21300000, guid: 6139681b2373cc64399f3419a20be1cc, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3271135131929340478 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3766457505922202186} + - component: {fileID: 6934254127588433472} + - component: {fileID: 6071035153632304230} + m_Layer: 5 + m_Name: Shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3766457505922202186 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3271135131929340478} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4464977467887081046} + 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: -284} + m_SizeDelta: {x: -20, y: -538.2067} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6934254127588433472 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3271135131929340478} + m_CullTransparentMesh: 1 +--- !u!114 &6071035153632304230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3271135131929340478} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_Sprite: {fileID: 21300000, guid: 009e5e907d373454a87134a1d7009adf, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!1 &3306009242426055792 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6146927243140338005} + - component: {fileID: 2604446808454449018} + - component: {fileID: 7031502373779953913} + m_Layer: 5 + m_Name: EmailTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6146927243140338005 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3306009242426055792} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5400598103665836480} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2604446808454449018 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3306009242426055792} + m_CullTransparentMesh: 1 +--- !u!114 &7031502373779953913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3306009242426055792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: Email (optional) + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3322974679011777238 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3622660432932864253} + - component: {fileID: 1482373126320767279} + - component: {fileID: 2457477260840803930} + m_Layer: 5 + m_Name: NameFullOrInvalid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3622660432932864253 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3322974679011777238} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9026670465428973497} + 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.5, y: 0.5} +--- !u!222 &1482373126320767279 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3322974679011777238} + m_CullTransparentMesh: 1 +--- !u!114 &2457477260840803930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3322974679011777238} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_Sprite: {fileID: 21300000, guid: cea1ac0c0c969478ea2054b9a06f7c86, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!1 &4206508371707046353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2105139276870056259} + - component: {fileID: 7996623120283732723} + m_Layer: 5 + m_Name: Text Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2105139276870056259 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4206508371707046353} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 74003253528235216} + - {fileID: 7219791559677225463} + m_Father: {fileID: 9026670465428973497} + 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: -32, y: -12} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7996623120283732723 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4206508371707046353} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: -8, y: -5, z: -8, w: -5} + m_Softness: {x: 0, y: 0} +--- !u!1 &4392456078187668514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7219791559677225463} + - component: {fileID: 8615464387059793234} + - component: {fileID: 8624477179752018012} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7219791559677225463 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4392456078187668514} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2105139276870056259} + 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: -3.9999995, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8615464387059793234 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4392456078187668514} + m_CullTransparentMesh: 1 +--- !u!114 &8624477179752018012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4392456078187668514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: "\u200B" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 3 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4491748286744018315 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9026670465428973497} + - component: {fileID: 1551997721391603307} + - component: {fileID: 4554737333371424649} + - component: {fileID: 6588702801670224650} + m_Layer: 5 + m_Name: NameInput + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9026670465428973497 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4491748286744018315} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3622660432932864253} + - {fileID: 2105139276870056259} + m_Father: {fileID: 8228153389778618123} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -36} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1551997721391603307 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4491748286744018315} + m_CullTransparentMesh: 1 +--- !u!114 &4554737333371424649 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4491748286744018315} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_Sprite: {fileID: 21300000, guid: f02af068e11cb4902a1a4faad10b890a, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!114 &6588702801670224650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4491748286744018315} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: -1 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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: 21300000, guid: 8512d2a614988894b967cb17ea417d0b, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: 8512d2a614988894b967cb17ea417d0b, type: 3} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4554737333371424649} + m_TextViewport: {fileID: 2105139276870056259} + m_TextComponent: {fileID: 8624477179752018012} + m_Placeholder: {fileID: 7638894866137935732} + m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbarEventHandler: {fileID: 0} + m_LayoutGroup: {fileID: 0} + m_ScrollSensitivity: 1 + m_ContentType: 9 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 0 + m_HideMobileInput: 0 + m_HideSoftKeyboard: 0 + m_CharacterValidation: 0 + m_RegexValue: + m_GlobalPointSize: 14 + m_CharacterLimit: 15 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnSelect: + m_PersistentCalls: + m_Calls: [] + m_OnDeselect: + m_PersistentCalls: + m_Calls: [] + m_OnTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnEndTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_OnTouchScreenKeyboardStatusChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_RichText: 1 + m_GlobalFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_OnFocusSelectAll: 1 + m_ResetOnDeActivation: 1 + m_KeepTextSelectionVisible: 0 + m_RestoreOriginalTextOnEscape: 1 + m_isRichTextEditingAllowed: 0 + m_LineLimit: 0 + isAlert: 0 + m_InputValidator: {fileID: 0} + m_ShouldActivateOnSelect: 1 +--- !u!1 &4998507799658168344 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7997443954654344026} + - component: {fileID: 4255824866177960083} + - component: {fileID: 6178850959663220603} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7997443954654344026 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4998507799658168344} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3830026964349886450} + 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: -3.9999995, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4255824866177960083 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4998507799658168344} + m_CullTransparentMesh: 1 +--- !u!114 &6178850959663220603 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4998507799658168344} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: "\u200B" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279768342 + m_fontColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 3 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5279094815299916421 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 543217254752006596} + - component: {fileID: 4625076044834171474} + - component: {fileID: 4605662655224957664} + - component: {fileID: 5473325884796640050} + - component: {fileID: 8172636323072227638} + - component: {fileID: 6503069449347711114} + m_Layer: 5 + m_Name: SignupHUDV2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &543217254752006596 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5279094815299916421} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 149386893471877362} + m_Father: {fileID: 0} + 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!223 &4625076044834171474 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5279094815299916421} + 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_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 11 + m_TargetDisplay: 0 +--- !u!114 &4605662655224957664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5279094815299916421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &5473325884796640050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5279094815299916421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!222 &8172636323072227638 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5279094815299916421} + m_CullTransparentMesh: 1 +--- !u!114 &6503069449347711114 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5279094815299916421} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 29fa84e0c27b415b95fe76531cc00c08, type: 3} + m_Name: + m_EditorClassIdentifier: + showHideAnimator: {fileID: 0} + nameInputField: {fileID: 6588702801670224650} + nameInputFieldFullOrInvalid: {fileID: 3322974679011777238} + nameInputInvalidLabel: {fileID: 6608955173455334696} + nameCurrentCharacters: {fileID: 2575337229975399100} + nameCurrentCharactersReachedLimit: {fileID: 7749970068255988151} + emailInputFieldInvalid: {fileID: 5639800636375264322} + emailInputField: {fileID: 8114059859674282854} + emailInputInvalidLabel: {fileID: 7132642172324504402} + colorForCharLimit: {r: 1, g: 0.07058824, b: 0.38431373, a: 1} + agreeTosAndPrivacyPolicyToggle: {fileID: 2654011316450251598} + tosAndPrivacyPolicyText: {fileID: 7762126982973327232} + termsOfServiceAgreeButton: {fileID: 2910859052875627039} + termsOfServiceAgreeButtonIcon: {fileID: 493961233402157412} + signUpRectTransform: {fileID: 149386893471877362} + signUpCanvasGroup: {fileID: 1917803039412694563} + transitionEase: 19 + transitionDuration: 0.5 + transitionDistance: 200 +--- !u!1 &5639800636375264322 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8628685526670664247} + - component: {fileID: 7325696311872139376} + - component: {fileID: 1101260478657035926} + m_Layer: 5 + m_Name: EmailInvalidInvalid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8628685526670664247 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5639800636375264322} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1601470506711559518} + 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.0000076293945} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7325696311872139376 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5639800636375264322} + m_CullTransparentMesh: 1 +--- !u!114 &1101260478657035926 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5639800636375264322} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + 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_Sprite: {fileID: 21300000, guid: cea1ac0c0c969478ea2054b9a06f7c86, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!1 &6608955173455334696 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2203504993340464821} + m_Layer: 5 + m_Name: NameValidation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2203504993340464821 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6608955173455334696} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7382384350876626523} + - {fileID: 5274804786132339018} + m_Father: {fileID: 4383128830677467794} + 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: 200, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!1 &7132642172324504402 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1403013455555087896} + - component: {fileID: 7667775641453380285} + - component: {fileID: 2962602052973418859} + m_Layer: 5 + m_Name: EmailValidation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1403013455555087896 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7132642172324504402} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8161194278267853563} + m_Father: {fileID: 5400598103665836480} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 20, y: -140} + m_SizeDelta: {x: -20, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7667775641453380285 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7132642172324504402} + m_CullTransparentMesh: 1 +--- !u!114 &2962602052973418859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7132642172324504402} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: Enter a valid email + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190335 + m_fontColor: {r: 1, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 12 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7253202391442980134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4798166336211856368} + - component: {fileID: 5459561305525163911} + - component: {fileID: 2575337229975399100} + - component: {fileID: 4104771996697299132} + m_Layer: 5 + m_Name: NameCharactersCounter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4798166336211856368 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7253202391442980134} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4383128830677467794} + 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: 20} + m_Pivot: {x: 0, y: 1} +--- !u!222 &5459561305525163911 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7253202391442980134} + m_CullTransparentMesh: 1 +--- !u!114 &2575337229975399100 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7253202391442980134} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_text: 0/15 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4286344049 + m_fontColor: {r: 0.44313726, g: 0.41960785, b: 0.4862745, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &4104771996697299132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7253202391442980134} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!1 &7299105321189405979 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7382384350876626523} + - component: {fileID: 2673021860926247469} + - component: {fileID: 2029304486351747525} + m_Layer: 5 + m_Name: Icn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7382384350876626523 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7299105321189405979} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2203504993340464821} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -10} + m_SizeDelta: {x: 16, y: 16} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &2673021860926247469 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7299105321189405979} + m_CullTransparentMesh: 1 +--- !u!114 &2029304486351747525 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7299105321189405979} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, 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_Sprite: {fileID: 21300000, guid: 6139681b2373cc64399f3419a20be1cc, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7749970068255988151 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9174057842995388847} + m_Layer: 5 + m_Name: NameCharactersCounterValidation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9174057842995388847 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7749970068255988151} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5023305050921431380} + - {fileID: 4308582022782370670} + m_Father: {fileID: 4383128830677467794} + 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: 185, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!1 &7822585355293234451 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5011323871061442431} + - component: {fileID: 7109739252069997285} + - component: {fileID: 6826508234947615549} + m_Layer: 5 + m_Name: Solid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5011323871061442431 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7822585355293234451} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4464977467887081046} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.000061035156, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7109739252069997285 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7822585355293234451} + m_CullTransparentMesh: 1 +--- !u!114 &6826508234947615549 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7822585355293234451} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9254902, g: 0.92156863, b: 0.92941177, 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_Sprite: {fileID: 21300000, guid: 54cbe9bf5928342d490167f954f07710, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!1 &8714952310370649288 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4464977467887081046} + m_Layer: 5 + m_Name: Container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4464977467887081046 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8714952310370649288} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3766457505922202186} + - {fileID: 5011323871061442431} + m_Father: {fileID: 149386893471877362} + 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.5, y: 0.5} +--- !u!1001 &4759853346849447854 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 149386893471877362} + m_Modifications: + - target: {fileID: 525420787284409780, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_Name + value: AgreeToS&PrivacyPolicyToggle + objectReference: {fileID: 0} + - target: {fileID: 2195480638150896117, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_SizeDelta.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2195480638150896117, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_SizeDelta.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2195480638150896117, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 3005862737368832046, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_text + value: I agree with Decentraland Terms of + Service and Privacy + Policy + objectReference: {fileID: 0} + - target: {fileID: 3005862737368832046, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_fontSize + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 3005862737368832046, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, + type: 2} + - target: {fileID: 3005862737368832046, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_fontColor.b + value: 0.2901961 + objectReference: {fileID: 0} + - target: {fileID: 3005862737368832046, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_fontColor.g + value: 0.2509804 + objectReference: {fileID: 0} + - target: {fileID: 3005862737368832046, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_fontColor.r + value: 0.2627451 + objectReference: {fileID: 0} + - target: {fileID: 3005862737368832046, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_fontSizeBase + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 3005862737368832046, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} + - target: {fileID: 3005862737368832046, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4283056195 + objectReference: {fileID: 0} + - target: {fileID: 3005862737368832046, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5365640620524202394, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_SizeDelta.x + value: -26 + objectReference: {fileID: 0} + - target: {fileID: 5365640620524202394, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 6051995778057700073, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_SizeDelta.x + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 6051995778057700073, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_SizeDelta.y + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 6051995778057700073, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6051995778057700073, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_SizeDelta.x + value: 600 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_SizeDelta.y + value: 28 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -420 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7411399265605913824, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: model.isOn + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7411399265605913824, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: model.text + value: I agree with Decentraland Terms of Service + and Privacy Policy + objectReference: {fileID: 0} + - target: {fileID: 7775090286350803124, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 04162ca1b011c47e7a21c573dc2c8a14, + type: 3} + - target: {fileID: 8448182982039922279, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_IsOn + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8448182982039922279, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_Colors.m_PressedColor.b + value: 0.8679245 + objectReference: {fileID: 0} + - target: {fileID: 8448182982039922279, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_Colors.m_PressedColor.g + value: 0.8679245 + objectReference: {fileID: 0} + - target: {fileID: 8448182982039922279, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_Colors.m_PressedColor.r + value: 0.8679245 + objectReference: {fileID: 0} + - target: {fileID: 8448182982039922279, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_Colors.m_SelectedColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8448182982039922279, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_Colors.m_SelectedColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8448182982039922279, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_Colors.m_SelectedColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8448182982039922279, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 0.9528302 + objectReference: {fileID: 0} + - target: {fileID: 8448182982039922279, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 0.9528302 + objectReference: {fileID: 0} + - target: {fileID: 8448182982039922279, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 0.9528302 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 364e5896a70df11418dc18e8fa2049c7, type: 3} +--- !u!224 &1658359650511513679 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6128774804984969185, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + m_PrefabInstance: {fileID: 4759853346849447854} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2654011316450251598 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7411399265605913824, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + m_PrefabInstance: {fileID: 4759853346849447854} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 49868df02d62a428c8aa5b2dd1a1ce20, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7762126982973327232 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3005862737368832046, guid: 364e5896a70df11418dc18e8fa2049c7, + type: 3} + m_PrefabInstance: {fileID: 4759853346849447854} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &7966104259838049269 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 149386893471877362} + m_Modifications: + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_SizeDelta.x + value: 326 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_SizeDelta.y + value: 56 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 140 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -488 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 295322807238159221, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1442316120381234285, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: model.text + value: JUMP IN DECENTRALAND + objectReference: {fileID: 0} + - target: {fileID: 1727543226122190079, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3725923502685340037, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_text + value: JUMP INto DECENTRALAND + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_fontSize + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: a02669827dd9144f39b4b164e753a21a, + type: 2} + - target: {fileID: 4469143239268576428, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_fontStyle + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_fontColor.b + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_fontColor.g + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_fontColor.r + value: 0.9882353 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_fontSizeBase + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 74b83fa9a54124695b9bdd8bea96fa17, type: 2} + - target: {fileID: 4469143239268576428, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_enableAutoSizing + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_fontColor32.rgba + value: 4294769916 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_HorizontalAlignment + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4469143239268576428, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Interactable + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 6717235604763556464} + - target: {fileID: 5109399184885072362, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Colors.m_PressedColor.b + value: 0.8679245 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Colors.m_PressedColor.g + value: 0.8679245 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Colors.m_PressedColor.r + value: 0.8679245 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Colors.m_DisabledColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Colors.m_DisabledColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Colors.m_DisabledColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.b + value: 0.9245283 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.g + value: 0.9245283 + objectReference: {fileID: 0} + - target: {fileID: 5109399184885072362, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Colors.m_HighlightedColor.r + value: 0.9245283 + objectReference: {fileID: 0} + - target: {fileID: 5170059318450306070, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5170059318450306070, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5170059318450306070, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5170059318450306070, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5170059318450306070, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5170059318450306070, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_SizeDelta.x + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 5170059318450306070, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_SizeDelta.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 5170059318450306070, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 5170059318450306070, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5466927874646222343, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Name + value: JumpInDecentralandButton + objectReference: {fileID: 0} + - target: {fileID: 8360437818873036568, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8616488889774720505, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8616488889774720505, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8616488889774720505, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8616488889774720505, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8616488889774720505, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_SizeDelta.x + value: -35.2065 + objectReference: {fileID: 0} + - target: {fileID: 8616488889774720505, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8616488889774720505, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.000051498 + objectReference: {fileID: 0} + - target: {fileID: 8616488889774720505, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} +--- !u!114 &493961233402157412 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7518669975530283665, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + m_PrefabInstance: {fileID: 7966104259838049269} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2910859052875627039 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5109399184885072362, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + m_PrefabInstance: {fileID: 7966104259838049269} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &6717235604763556464 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3725923502685340037, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + m_PrefabInstance: {fileID: 7966104259838049269} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &7948650356736746200 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, + type: 3} + m_PrefabInstance: {fileID: 7966104259838049269} + m_PrefabAsset: {fileID: 0} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2.prefab.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2.prefab.meta new file mode 100644 index 0000000000..665e63443d --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 66b5961c332b383448f2a142ed0a3dea +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2View.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2View.cs new file mode 100644 index 0000000000..0be0144352 --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2View.cs @@ -0,0 +1,168 @@ +using DG.Tweening; +using System; +using System.Net.Mail; +using System.Text.RegularExpressions; +using TMPro; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; + +namespace SignupHUD +{ + public class SignupHUDV2View : BaseComponentView, ISignupHUDView, IPointerClickHandler + { + private const int MIN_NAME_LENGTH = 1; + private const int MAX_NAME_LENGTH = 15; + + public event ISignupHUDView.NameScreenDone OnNameScreenNext; + public event Action OnEditAvatar; + public event Action OnTermsOfServiceAgreed; + public event Action OnTermsOfServiceBack; + public event Action OnLinkClicked; + + [SerializeField] internal TMP_InputField nameInputField; + [SerializeField] internal GameObject nameInputFieldFullOrInvalid; + [SerializeField] internal GameObject nameInputInvalidLabel; + [SerializeField] internal TextMeshProUGUI nameCurrentCharacters; + [SerializeField] internal GameObject nameCurrentCharactersReachedLimit; + [SerializeField] internal GameObject emailInputFieldInvalid; + [SerializeField] internal TMP_InputField emailInputField; + [SerializeField] internal GameObject emailInputInvalidLabel; + [SerializeField] internal Color colorForCharLimit; + [SerializeField] internal ToggleComponentView agreeTosAndPrivacyPolicyToggle; + [SerializeField] internal TMP_Text tosAndPrivacyPolicyText; + [SerializeField] internal Button termsOfServiceAgreeButton; + [SerializeField] internal Image termsOfServiceAgreeButtonIcon; + + [Header("SignUp Mode Transitions")] + [SerializeField] internal RectTransform signUpRectTransform; + [SerializeField] internal CanvasGroup signUpCanvasGroup; + [SerializeField] internal Ease transitionEase = Ease.InOutExpo; + [SerializeField] internal float transitionDuration = 0.5f; + [SerializeField] internal float transitionDistance = 200f; + + private Vector2 originalAnchorPositionOfSignUp; + + public override void Awake() + { + originalAnchorPositionOfSignUp = signUpRectTransform.anchoredPosition; + + InitNameAndEmailScreen(); + InitTermsOfServicesScreen(); + } + + public override void RefreshControl() { } + + public void SetVisibility(bool visible) + { + PlayTransitionAnimation(visible); + + if (!visible) + return; + + nameInputField.Select(); + } + + public void ShowNameScreen() { } + + public void ShowTermsOfServiceScreen() { } + + private void InitNameAndEmailScreen() + { + SetTermsOfServiceAgreeButtonInteractable(false); + nameCurrentCharacters.text = $"{0}/{MAX_NAME_LENGTH}"; + nameInputField.characterLimit = MAX_NAME_LENGTH; + nameInputInvalidLabel.SetActive(false); + nameInputFieldFullOrInvalid.SetActive(false); + emailInputFieldInvalid.SetActive(false); + emailInputInvalidLabel.SetActive(false); + nameCurrentCharactersReachedLimit.SetActive(false); + + nameInputField.onValueChanged.AddListener((text) => + { + UpdateNameAndEmailNextButton(); + nameCurrentCharacters.text = $"{text.Length} / {MAX_NAME_LENGTH}"; + nameCurrentCharacters.color = text.Length < MAX_NAME_LENGTH ? Color.black : colorForCharLimit; + nameCurrentCharactersReachedLimit.SetActive(text.Length >= MAX_NAME_LENGTH); + nameInputInvalidLabel.SetActive(!IsValidName(text)); + nameInputFieldFullOrInvalid.SetActive(text.Length >= MAX_NAME_LENGTH || !IsValidName(text)); + }); + + emailInputField.onValueChanged.AddListener((text) => + { + emailInputFieldInvalid.SetActive(!IsValidEmail(text)); + emailInputInvalidLabel.SetActive(!IsValidEmail(text)); + UpdateNameAndEmailNextButton(); + }); + + agreeTosAndPrivacyPolicyToggle.OnSelectedChanged += (_, _, _) => + UpdateNameAndEmailNextButton(); + } + + private void InitTermsOfServicesScreen() + { + SetTermsOfServiceAgreeButtonInteractable(false); + termsOfServiceAgreeButton.onClick.AddListener(() => + { + OnNameScreenNext?.Invoke(nameInputField.text, emailInputField.text); + OnTermsOfServiceAgreed?.Invoke(); + }); + } + + private void UpdateNameAndEmailNextButton() + { + string nameText = nameInputField.text; + string emailText = emailInputField.text; + + SetTermsOfServiceAgreeButtonInteractable( + nameText.Length >= MIN_NAME_LENGTH && + IsValidName(nameText) && IsValidEmail(emailText) && + agreeTosAndPrivacyPolicyToggle.isOn); + } + + private bool IsValidEmail(string email) + { + if (email.Length == 0) + return true; + + try + { + MailAddress mailAddress = new MailAddress(email); + return mailAddress.Address == email; + } + catch + { + return false; + } + } + + private static bool IsValidName(string nameText) => + Regex.IsMatch(nameText, "^[a-zA-Z0-9]*$"); + + public void OnPointerClick(PointerEventData eventData) + { + int linkIndex = TMP_TextUtilities.FindIntersectingLink(tosAndPrivacyPolicyText, Input.mousePosition, null); + if (linkIndex == -1) + return; + + TMP_LinkInfo linkInfo = tosAndPrivacyPolicyText.textInfo.linkInfo[linkIndex]; + OnLinkClicked?.Invoke(linkInfo.GetLinkID()); + } + + private void SetTermsOfServiceAgreeButtonInteractable(bool isInteractable) + { + termsOfServiceAgreeButton.interactable = isInteractable; + termsOfServiceAgreeButtonIcon.color = new Color(termsOfServiceAgreeButtonIcon.color.r, termsOfServiceAgreeButtonIcon.color.g, termsOfServiceAgreeButtonIcon.color.b, isInteractable ? 1f : 0.1f); + } + + private void PlayTransitionAnimation(bool visible) + { + Vector2 signUpEndPosition = originalAnchorPositionOfSignUp; + if (!visible) + signUpEndPosition.x -= transitionDistance; + signUpRectTransform.DOAnchorPos(signUpEndPosition, transitionDuration).SetEase(transitionEase); + signUpCanvasGroup.DOFade(visible ? 1f : 0f, transitionDuration).SetEase(transitionEase); + signUpCanvasGroup.blocksRaycasts = visible; + } + } +} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2View.cs.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2View.cs.meta new file mode 100644 index 0000000000..c6f098257f --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDV2View.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 29fa84e0c27b415b95fe76531cc00c08 +timeCreated: 1697543010 \ No newline at end of file diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDView.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDView.cs index fd3e5b6109..9ba1b26d75 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDView.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/SignupHUDView.cs @@ -16,6 +16,7 @@ public interface ISignupHUDView : IDisposable event Action OnEditAvatar; event Action OnTermsOfServiceAgreed; event Action OnTermsOfServiceBack; + event Action OnLinkClicked; void SetVisibility(bool visible); void ShowNameScreen(); @@ -31,6 +32,7 @@ public class SignupHUDView : MonoBehaviour, ISignupHUDView public event Action OnEditAvatar; public event Action OnTermsOfServiceAgreed; public event Action OnTermsOfServiceBack; + public event Action OnLinkClicked; [Header("Name and Email Screen")] [SerializeField] internal RectTransform nameAndEmailPanel; diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/Tests/SignupHUDControllerShould.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/Tests/SignupHUDControllerShould.cs index a6fcc3b927..63f6103aa2 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/Tests/SignupHUDControllerShould.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/Tests/SignupHUDControllerShould.cs @@ -1,4 +1,6 @@ using DCL; +using DCL.Browser; +using DCLServices.SubscriptionsAPIService; using NSubstitute; using NUnit.Framework; using SignupHUD; @@ -10,19 +12,28 @@ public class SignupHUDControllerShould { private SignupHUDController hudController; private ISignupHUDView hudView; + private IBrowserBridge browserBridge; + private ISubscriptionsAPIService subscriptionsAPIService; private DataStore_HUDs dataStoreHUDs; + private DataStore_FeatureFlag dataStoreFeatureFlag; private BaseVariable signupVisible => DataStore.i.HUDs.signupVisible; [SetUp] public void SetUp() { hudView = Substitute.For(); + browserBridge = Substitute.For(); + subscriptionsAPIService = Substitute.For(); dataStoreHUDs = new DataStore_HUDs(); + dataStoreFeatureFlag = new DataStore_FeatureFlag(); hudController = new SignupHUDController(Substitute.For(), hudView, new DataStore_LoadingScreen(), - dataStoreHUDs); + dataStoreHUDs, + dataStoreFeatureFlag, + browserBridge, + subscriptionsAPIService); hudController.Initialize(); } @@ -109,6 +120,19 @@ public void ReactsToTermsOfServiceBack() hudView.Received().ShowNameScreen(); } + [Test] + [TestCase("tosUrl")] + [TestCase("privacyPolicyUrl")] + public void ReactsToLinkClicked(string linkId) + { + hudController.name = "this_will_be_null"; + hudController.email = "this_will_be_null"; + + hudView.OnLinkClicked += Raise.Event>(linkId); + + browserBridge.Received(1).OpenUrl(Arg.Any()); + } + [TearDown] public void TearDown() { DataStore.Clear(); } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/Tests/SignupHUDTests.asmdef b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/Tests/SignupHUDTests.asmdef index 65b25d88dd..93c4b22cd6 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/Tests/SignupHUDTests.asmdef +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/SignupHUD/Tests/SignupHUDTests.asmdef @@ -14,7 +14,10 @@ "GUID:a3ceb534947fac14da25035bc5c24788", "GUID:3b80b0b562b1cbc489513f09fc1b8f69", "GUID:f51ebe6a0ceec4240a699833d6309b23", - "GUID:0663fad624d836944b40ae27c3414652" + "GUID:0663fad624d836944b40ae27c3414652", + "GUID:4d7712e4b2446440a8af21fd3ce8690e", + "GUID:c31f144fbfb54890960a05fca4149e56", + "GUID:1de3566cccb280f4a982c59ad0d08c96" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DataStore_MyAccount.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DataStore_MyAccount.cs index e435392b05..eb9a30a788 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DataStore_MyAccount.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DataStore_MyAccount.cs @@ -5,5 +5,6 @@ public class DataStore_MyAccount public readonly BaseVariable isMyAccountSectionVisible = new (false); public readonly BaseVariable isInitialized = new (false); public readonly BaseVariable myAccountSectionOpenFromProfileHUD = new (false); + public readonly BaseVariable openSection = new (null); } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Environment/Factories/ServiceLocatorFactory/ServiceLocatorFactory.asmdef b/unity-renderer/Assets/Scripts/MainScripts/DCL/Environment/Factories/ServiceLocatorFactory/ServiceLocatorFactory.asmdef index 3666f3cab9..d73814629a 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Environment/Factories/ServiceLocatorFactory/ServiceLocatorFactory.asmdef +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Environment/Factories/ServiceLocatorFactory/ServiceLocatorFactory.asmdef @@ -90,7 +90,8 @@ "GUID:687884b2e72b39a439951d6db2e2c7ee", "GUID:0c0c18c12967b3944b844b79c47c2320", "GUID:d6fe1b5729e3405d98cf8ff2035d9542", - "GUID:a4bf61c057a098f4ca05b539a6d8c0fe" + "GUID:a4bf61c057a098f4ca05b539a6d8c0fe", + "GUID:c31f144fbfb54890960a05fca4149e56" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Environment/Factories/ServiceLocatorFactory/ServiceLocatorFactory.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Environment/Factories/ServiceLocatorFactory/ServiceLocatorFactory.cs index b7d76b5fa1..7a839e48c3 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Environment/Factories/ServiceLocatorFactory/ServiceLocatorFactory.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Environment/Factories/ServiceLocatorFactory/ServiceLocatorFactory.cs @@ -28,6 +28,7 @@ using DCLServices.PlacesAPIService; using DCLServices.PortableExperiences.Analytics; using DCLServices.ScreencaptureCamera.Service; +using DCLServices.SubscriptionsAPIService; using DCLServices.WearablesCatalogService; using DCLServices.WorldsAPIService; using MainScripts.DCL.Controllers.AssetManager; @@ -213,6 +214,7 @@ public static ServiceLocator CreateDefault() result.Register(() => new PlacesAPIService(new PlacesAPIClient(webRequestController))); result.Register(() => new WorldsAPIService(new WorldsAPIClient(webRequestController))); result.Register(() => new CameraReelNetworkStorageService(new CameraReelWebRequestClient(webRequestController, environmentProviderService))); + result.Register(() => new SubscriptionsAPIService(new SubscriptionsAPIClient(webRequestController))); var screencaptureCameraExternalDependencies = new ScreencaptureCameraExternalDependencies(CommonScriptableObjects.allUIHidden, CommonScriptableObjects.cameraModeInputLocked, DataStore.i.camera.leftMouseButtonCursorLock, CommonScriptableObjects.cameraBlocked, diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/EmptyCategoryImg.png b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/EmptyCategoryImg.png new file mode 100644 index 0000000000..0bc7923d35 --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/EmptyCategoryImg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1d85bc90cf5bf274c214e5064966b34d052077fb3fc497492480058c9b2111b +size 1734 diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/EmptyCategoryImg.png.meta b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/EmptyCategoryImg.png.meta new file mode 100644 index 0000000000..5b621e332a --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/EmptyCategoryImg.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 73e87750f1ef74c6fbf35cd8ae4e6c9a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/EyewareIcon.png b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/EyewareIcon.png index cd3f9c754a..ab0280e5ff 100755 --- a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/EyewareIcon.png +++ b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/EyewareIcon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0b393d117b3e63b8089028ab08b373bce9a47b3d7b563061fd7562d255a08b4 -size 500 +oid sha256:49e861f5ec16d4852b9ea34ddc94f485bc0a5019f8049e21014ddd6efedbcf06 +size 530 diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/MustacheIcon.png b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/FacialHairIcon.png similarity index 100% rename from unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/MustacheIcon.png rename to unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/FacialHairIcon.png diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/MustacheIcon.png.meta b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/FacialHairIcon.png.meta similarity index 93% rename from unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/MustacheIcon.png.meta rename to unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/FacialHairIcon.png.meta index 71192e779c..360c624bed 100644 --- a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/MustacheIcon.png.meta +++ b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/FacialHairIcon.png.meta @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -63,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 1 + swizzle: 50462976 cookieLightType: 1 platformSettings: - serializedVersion: 3 @@ -75,6 +77,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -87,6 +90,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -99,6 +103,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -111,6 +116,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -127,9 +133,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/HatIcon.png b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/HatIcon.png old mode 100644 new mode 100755 index 94c4387057..151de054be --- a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/HatIcon.png +++ b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/HatIcon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe024ccdb952a834403391c6cb7ce671904513f32a7b0d2d7fa3e00d2c0e89fb -size 953 +oid sha256:96208233314ce5481e68268ff2c0d1ad48b0f55381a0912d80194c6225893d1c +size 524 diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/HelmetIcon.png b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/HelmetIcon.png old mode 100644 new mode 100755 index 7db30fc934..1d41ca4421 --- a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/HelmetIcon.png +++ b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/HelmetIcon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f2723f61e29fe4ef82bbe0e0b2233167404cbbcd0627c9199a2c16a33d17ccc1 -size 1278 +oid sha256:acd85102bd1908bf7b3715595b2c41917c6437a1ba380bfb5e8a61bb7d4e77b2 +size 784 diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/MaskIcon.png b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/MaskIcon.png index e3f48aaa17..362e0b786a 100755 --- a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/MaskIcon.png +++ b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/MaskIcon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c886fc7e98f1bf560cdf95839be183e28f62ffd1ae5b131e0e7d6a8fdd5a3be -size 554 +oid sha256:038e72eefcfc21b9a2e01049a50bb24003ad3005929c336b77ae48dd7b285121 +size 544 diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/MouthIcon.png b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/MouthIcon.png old mode 100644 new mode 100755 index a346212060..6d2d71088d --- a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/MouthIcon.png +++ b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/MouthIcon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0018a1da586c4b52bd67b96645ca4481c661626b4220b3cc1ff8081198866c1 -size 453 +oid sha256:bc5260c7b4d66edd12391670b69045655b884e7b1296bd51d82e4571db640318 +size 470 diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/SkinsIcon.png b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/SkinsIcon.png index 950ceddb4b..da5b80f45a 100755 --- a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/SkinsIcon.png +++ b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/SkinsIcon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9958a6b74be5a0cc6147421c1b56a7a5f611244dd0b956841fe6ac5a299d1b7 -size 656 +oid sha256:e8d3e6ab2335816b581d831d44e788eb6ad5007808e81218538100fec5cbb308 +size 661 diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/TiaraIcon.png b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/TiaraIcon.png old mode 100644 new mode 100755 index a73a94353c..80a65a8df9 --- a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/TiaraIcon.png +++ b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/TiaraIcon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76a1721d75e82eab99b5ef1e3219c2a811f195711c75aa1da981c9b5a7efb720 -size 695 +oid sha256:85164a57d8f820c622ed1717515255ab9d30b9eefd4260c33a8c9cf9d88bc01d +size 501 diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/TopheadIcon.png b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/TopheadIcon.png old mode 100644 new mode 100755 index d3925ba3b6..fa2f4af9dd --- a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/TopheadIcon.png +++ b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/TopheadIcon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc2e024827636e8b8ea63c9f5b53788497e053cc28bb883429f1ad1cbee4a203 -size 891 +oid sha256:0da8c676bf2373a25d7b6dc893e267bd29d4b68e0d4ab973e6c4400223746ca3 +size 2996 diff --git a/unity-renderer/Assets/Textures/UI/Common/CheckIcn.png b/unity-renderer/Assets/Textures/UI/Common/CheckIcn.png index 874b4f25cc..c06604425b 100644 --- a/unity-renderer/Assets/Textures/UI/Common/CheckIcn.png +++ b/unity-renderer/Assets/Textures/UI/Common/CheckIcn.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4781ac64ea89b546628932ea9b5d85cd5321a311f90dc99c34051d603c6904d -size 1880 +oid sha256:618b4a0175256c5408e901fde33f562fff201e4f04aff079a64330f537483cbc +size 292 diff --git a/unity-renderer/Assets/Textures/UI/Common/CheckIcn.png.meta b/unity-renderer/Assets/Textures/UI/Common/CheckIcn.png.meta index 55c917a93d..7f9717b1ef 100644 --- a/unity-renderer/Assets/Textures/UI/Common/CheckIcn.png.meta +++ b/unity-renderer/Assets/Textures/UI/Common/CheckIcn.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 04162ca1b011c47e7a21c573dc2c8a14 +guid: fe227f939d22a5941aa33dece9abecab TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,12 +20,11 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMipmapLimit: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -45,12 +44,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 0 + spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -64,8 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -77,12 +75,11 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 64 + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -90,12 +87,11 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 64 + buildTarget: Server + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -103,12 +99,11 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 64 + buildTarget: WebGL + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -116,7 +111,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -133,8 +127,9 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - mipmapLimitGroupName: + spritePackingTag: pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/unity-renderer/Assets/Textures/UI/Common/CheckmarkContainerIcn.png b/unity-renderer/Assets/Textures/UI/Common/CheckmarkContainerIcn.png new file mode 100644 index 0000000000..874b4f25cc --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/Common/CheckmarkContainerIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4781ac64ea89b546628932ea9b5d85cd5321a311f90dc99c34051d603c6904d +size 1880 diff --git a/unity-renderer/Assets/Textures/UI/MyAccount/CheckIcn.png.meta b/unity-renderer/Assets/Textures/UI/Common/CheckmarkContainerIcn.png.meta similarity index 88% rename from unity-renderer/Assets/Textures/UI/MyAccount/CheckIcn.png.meta rename to unity-renderer/Assets/Textures/UI/Common/CheckmarkContainerIcn.png.meta index 7f9717b1ef..55c917a93d 100644 --- a/unity-renderer/Assets/Textures/UI/MyAccount/CheckIcn.png.meta +++ b/unity-renderer/Assets/Textures/UI/Common/CheckmarkContainerIcn.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fe227f939d22a5941aa33dece9abecab +guid: 04162ca1b011c47e7a21c573dc2c8a14 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -20,11 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -44,12 +45,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -63,7 +64,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 0 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -75,11 +77,12 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -87,11 +90,12 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 + buildTarget: WebGL + maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -99,11 +103,12 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 + buildTarget: Server + maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -111,6 +116,7 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -127,9 +133,8 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - spritePackingTag: + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/unity-renderer/Assets/Textures/UI/Common/LeftClickIcn.png b/unity-renderer/Assets/Textures/UI/Common/LeftClickIcn.png index ac59bd4e26..1c4c9523c3 100755 --- a/unity-renderer/Assets/Textures/UI/Common/LeftClickIcn.png +++ b/unity-renderer/Assets/Textures/UI/Common/LeftClickIcn.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35f2ea56ed1fbf86da475d8604a932647bc2bf71ca7ded7078e4b6d71c7bcc9c -size 356 +oid sha256:a2c8f1c304be2341443f7a10872f32a33a461d810e69356d670a91a1720e7221 +size 546 diff --git a/unity-renderer/Assets/Textures/UI/Common/RadialGradient.png b/unity-renderer/Assets/Textures/UI/Common/RadialGradientHard.png similarity index 100% rename from unity-renderer/Assets/Textures/UI/Common/RadialGradient.png rename to unity-renderer/Assets/Textures/UI/Common/RadialGradientHard.png diff --git a/unity-renderer/Assets/Textures/UI/Common/RadialGradient.png.meta b/unity-renderer/Assets/Textures/UI/Common/RadialGradientHard.png.meta similarity index 100% rename from unity-renderer/Assets/Textures/UI/Common/RadialGradient.png.meta rename to unity-renderer/Assets/Textures/UI/Common/RadialGradientHard.png.meta diff --git a/unity-renderer/Assets/Textures/UI/Common/RadialGradientSoft.png b/unity-renderer/Assets/Textures/UI/Common/RadialGradientSoft.png new file mode 100644 index 0000000000..b1d2afeef6 --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/Common/RadialGradientSoft.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ade524de0a87203ca9f6b1114434b50286db26d533247b1db02ace43936e94a +size 29799 diff --git a/unity-renderer/Assets/Textures/UI/Passport/PassportIcons/RadialGradient.png.meta b/unity-renderer/Assets/Textures/UI/Common/RadialGradientSoft.png.meta similarity index 100% rename from unity-renderer/Assets/Textures/UI/Passport/PassportIcons/RadialGradient.png.meta rename to unity-renderer/Assets/Textures/UI/Common/RadialGradientSoft.png.meta diff --git a/unity-renderer/Assets/Textures/UI/Common/RightClickIcn.png b/unity-renderer/Assets/Textures/UI/Common/RightClickIcn.png index f9f4b111d3..499b2e1abd 100755 --- a/unity-renderer/Assets/Textures/UI/Common/RightClickIcn.png +++ b/unity-renderer/Assets/Textures/UI/Common/RightClickIcn.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de3416b5493971b7a830f67083a5547c8c5f5c29220f84b55569c96d12b3a91f -size 369 +oid sha256:dfd695a5fb0c28cf1f6d14f5c31aa2add3cdb20ba3891b7d7c64ed0bb836d9fd +size 553 diff --git a/unity-renderer/Assets/Textures/UI/Common/ScrollIcn.png b/unity-renderer/Assets/Textures/UI/Common/ScrollIcn.png new file mode 100755 index 0000000000..41de71a002 --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/Common/ScrollIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42cac90efe80329d8b4da7b5cc0e8470da4a08b88d60998d58e429316054848a +size 603 diff --git a/unity-renderer/Assets/Textures/UI/Common/WheelIcn.png.meta b/unity-renderer/Assets/Textures/UI/Common/ScrollIcn.png.meta similarity index 100% rename from unity-renderer/Assets/Textures/UI/Common/WheelIcn.png.meta rename to unity-renderer/Assets/Textures/UI/Common/ScrollIcn.png.meta diff --git a/unity-renderer/Assets/Textures/UI/Common/WarningIcn.png b/unity-renderer/Assets/Textures/UI/Common/WarningIcn.png index 4ae8aa177f..87074616f4 100644 --- a/unity-renderer/Assets/Textures/UI/Common/WarningIcn.png +++ b/unity-renderer/Assets/Textures/UI/Common/WarningIcn.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b23693d56e30ac0178fd0783274d65e870bc932bfde242363bcad3da8963605 -size 466 +oid sha256:536b7d4a8bcca4680acc0e3aba78e689eacd93fb31706acb2f57acf5025b3d87 +size 2080 diff --git a/unity-renderer/Assets/Textures/UI/Common/WheelIcn.png b/unity-renderer/Assets/Textures/UI/Common/WheelIcn.png deleted file mode 100755 index d255ee96aa..0000000000 --- a/unity-renderer/Assets/Textures/UI/Common/WheelIcn.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f35594ac3f8391767617a7c811594ae8ce6a9d292866e04e67539467fb82598e -size 395 diff --git a/unity-renderer/Assets/Textures/UI/MyAccount/CheckIcn.png b/unity-renderer/Assets/Textures/UI/MyAccount/CheckIcn.png deleted file mode 100644 index c06604425b..0000000000 --- a/unity-renderer/Assets/Textures/UI/MyAccount/CheckIcn.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:618b4a0175256c5408e901fde33f562fff201e4f04aff079a64330f537483cbc -size 292 diff --git a/unity-renderer/Assets/Textures/UI/MyAccount/EmailDeleteIcn.png b/unity-renderer/Assets/Textures/UI/MyAccount/EmailDeleteIcn.png new file mode 100644 index 0000000000..f3968bf7bb --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/MyAccount/EmailDeleteIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98de8541039c8f02bab1ff8116f4931ece7b9cc1ca3f8e7c0ad6ddf1e56fc3cd +size 1620 diff --git a/unity-renderer/Assets/Textures/UI/MyAccount/EmailDeleteIcn.png.meta b/unity-renderer/Assets/Textures/UI/MyAccount/EmailDeleteIcn.png.meta new file mode 100644 index 0000000000..878ae21766 --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/MyAccount/EmailDeleteIcn.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: d6a96908978f04454a0eb99ff0e659a0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer/Assets/Textures/UI/MyAccount/EmailWarningIcn.png b/unity-renderer/Assets/Textures/UI/MyAccount/EmailWarningIcn.png new file mode 100644 index 0000000000..0832a90f21 --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/MyAccount/EmailWarningIcn.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15e919eb08122d9051a65e8847980c10eb123aaa0ba2388e67d870442eeca61c +size 1525 diff --git a/unity-renderer/Assets/Textures/UI/MyAccount/EmailWarningIcn.png.meta b/unity-renderer/Assets/Textures/UI/MyAccount/EmailWarningIcn.png.meta new file mode 100644 index 0000000000..dda2f84c46 --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/MyAccount/EmailWarningIcn.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 0725572a788b244b484b3e28ea72e08b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer/Assets/Textures/UI/MyAccount/Envelope.png b/unity-renderer/Assets/Textures/UI/MyAccount/Envelope.png new file mode 100644 index 0000000000..71c362c03e --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/MyAccount/Envelope.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc8a94e7cde9cfc18c2f70ce51c8e376d1deb0289dda9fb2297db0e4538cd7b7 +size 2224 diff --git a/unity-renderer/Assets/Textures/UI/MyAccount/Envelope.png.meta b/unity-renderer/Assets/Textures/UI/MyAccount/Envelope.png.meta new file mode 100644 index 0000000000..c9e222f7df --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/MyAccount/Envelope.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 653364ce081e149ae983947e645cc879 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer/Assets/Textures/UI/Passport/PassportIcons/RadialGradient.png b/unity-renderer/Assets/Textures/UI/Passport/PassportIcons/RadialGradient.png deleted file mode 100644 index eea99a645e..0000000000 --- a/unity-renderer/Assets/Textures/UI/Passport/PassportIcons/RadialGradient.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed9dffe2f7e5835d0fed80ade139c4d2cf38babdcc1cd48019043742f2c0ff5b -size 13229 diff --git a/unity-renderer/Assets/UIComponents/Prefabs/Button_Common.prefab b/unity-renderer/Assets/UIComponents/Prefabs/Button_Common.prefab index ea23675aeb..7fa328f6dc 100644 --- a/unity-renderer/Assets/UIComponents/Prefabs/Button_Common.prefab +++ b/unity-renderer/Assets/UIComponents/Prefabs/Button_Common.prefab @@ -338,9 +338,9 @@ MonoBehaviour: 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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_HighlightedColor: {r: 0.9245283, g: 0.9245283, b: 0.9245283, a: 1} + m_PressedColor: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} + m_SelectedColor: {r: 1, g: 1, b: 1, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 diff --git a/unity-renderer/Assets/UIComponents/Prefabs/ColorPicker.prefab b/unity-renderer/Assets/UIComponents/Prefabs/ColorPicker.prefab index 583169a2a6..d223c99e32 100644 --- a/unity-renderer/Assets/UIComponents/Prefabs/ColorPicker.prefab +++ b/unity-renderer/Assets/UIComponents/Prefabs/ColorPicker.prefab @@ -32,7 +32,6 @@ RectTransform: - {fileID: 7075269179022686125} - {fileID: 8459376800888603026} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -97,7 +96,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7075269179022686125} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -233,7 +231,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7075269179022686125} - 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} @@ -310,7 +307,6 @@ RectTransform: m_Children: - {fileID: 2416441976408992214} m_Father: {fileID: 6802528885745030365} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -392,7 +388,6 @@ RectTransform: - {fileID: 5328906965105081934} - {fileID: 553171590681258913} m_Father: {fileID: 6802528885745030365} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -532,7 +527,6 @@ RectTransform: - {fileID: 2116725146145900792} - {fileID: 6442611513117620803} m_Father: {fileID: 2416441976408992214} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -612,7 +606,6 @@ RectTransform: - {fileID: 2630690191027809388} - {fileID: 6346025365088475134} m_Father: {fileID: 110588233006084425} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -678,7 +671,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6346025363564948272} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -753,7 +745,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6346025363564948272} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -892,7 +883,6 @@ RectTransform: - {fileID: 3717281599095350165} - {fileID: 110588233006084425} m_Father: {fileID: 8459376800888603026} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -978,7 +968,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7075269179022686125} - 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} @@ -1055,7 +1044,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2416441976408992214} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1151,7 +1139,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7075269179022686125} - 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} @@ -1201,6 +1188,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 110588233006084425} m_Modifications: - target: {fileID: 723695754730657919, guid: 724f72ebe8e5b4b85a667c623faa06cc, @@ -1485,6 +1473,11 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: cf1014f15559747c1918c2345d4e259a, type: 3} + - target: {fileID: 6090225926260730994, guid: 724f72ebe8e5b4b85a667c623faa06cc, + type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6090225926260730995, guid: 724f72ebe8e5b4b85a667c623faa06cc, type: 3} propertyPath: m_SizeDelta.x @@ -1501,6 +1494,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 724f72ebe8e5b4b85a667c623faa06cc, type: 3} --- !u!114 &5168268324802433615 stripped MonoBehaviour: @@ -1549,6 +1545,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 110588233006084425} m_Modifications: - target: {fileID: 500210390985956454, guid: 724f72ebe8e5b4b85a667c623faa06cc, @@ -1853,6 +1850,11 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 8ee9aed5af74d4e399555cda5681978e, type: 3} + - target: {fileID: 6090225926260730994, guid: 724f72ebe8e5b4b85a667c623faa06cc, + type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6090225926260730995, guid: 724f72ebe8e5b4b85a667c623faa06cc, type: 3} propertyPath: m_SizeDelta.x @@ -1869,6 +1871,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 724f72ebe8e5b4b85a667c623faa06cc, type: 3} --- !u!114 &4736006482339453985 stripped MonoBehaviour: @@ -1893,6 +1898,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 110588233006084425} m_Modifications: - target: {fileID: 723695754730657919, guid: 724f72ebe8e5b4b85a667c623faa06cc, @@ -2192,6 +2198,11 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 007d970352cbc4cadadc4cb99da58e7d, type: 3} + - target: {fileID: 6090225926260730994, guid: 724f72ebe8e5b4b85a667c623faa06cc, + type: 3} + propertyPath: m_PixelsPerUnitMultiplier + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6090225926260730995, guid: 724f72ebe8e5b4b85a667c623faa06cc, type: 3} propertyPath: m_SizeDelta.x @@ -2203,6 +2214,9 @@ PrefabInstance: value: 0.5169983 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 724f72ebe8e5b4b85a667c623faa06cc, type: 3} --- !u!114 &410236081902202522 stripped MonoBehaviour: diff --git a/unity-renderer/Assets/UIComponents/Prefabs/Helpers/ColorToggle.prefab b/unity-renderer/Assets/UIComponents/Prefabs/Helpers/ColorToggle.prefab index d6f79c6f03..24aefa7bfb 100644 --- a/unity-renderer/Assets/UIComponents/Prefabs/Helpers/ColorToggle.prefab +++ b/unity-renderer/Assets/UIComponents/Prefabs/Helpers/ColorToggle.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7509590604523045340} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -112,7 +111,6 @@ RectTransform: - {fileID: 7509590605728196381} - {fileID: 7509590606523369886} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -239,7 +237,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7509590604523045340} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -315,7 +312,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7509590604523045340} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -350,7 +346,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: aa5bccfe420b24d5c89f0e8b12b4f537, type: 3} + m_Sprite: {fileID: 21300000, guid: 4848194f7bc4d4e509d067d3160eadac, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1