From 8cff3ec26809a2ec9783200756ba6f2316f2124d Mon Sep 17 00:00:00 2001 From: pbosio Date: Fri, 21 Aug 2020 12:07:04 -0300 Subject: [PATCH] chore: re-enabled email request popup (#1188) --- kernel/packages/config/index.ts | 1 + kernel/packages/shared/profiles/sagas.ts | 11 +- kernel/packages/shared/types.ts | 3 +- .../unity-interface/UnityInterface.ts | 9 +- .../HUD/EmailPromptHUD/EmailPromptHUD.asmdef | 11 +- .../EmailPromptHUDController.cs | 114 +- .../EmailPromptHUDController.cs.meta | 2 +- .../HUD/EmailPromptHUD/EmailPromptHUDView.cs | 73 + .../EmailPromptHUD/EmailPromptHUDView.cs.meta | 11 + .../{Textures.meta => Resources.meta} | 2 +- .../{ => Resources}/EmailPromptHUD.prefab | 1443 +++++++++-------- .../EmailPromptHUD.prefab.meta | 0 .../EmailPromptHUD/Textures/CloseButton.png | 3 - .../HUD/EmailPromptHUD/Textures/Ellipse.png | 3 - .../Textures/EmailHUDAtlas.spriteatlas | 48 - .../Textures/EmailHUDAtlas.spriteatlas.meta | 8 - .../EmailPromptHUD/Textures/EmailImage.png | 3 - .../EmailPromptHUD/Textures/MainButton.png | 3 - .../Textures/PopUpBackground.png | 3 - .../Textures/PopUpBackground.png.meta | 112 -- .../DCL/Controllers/HUD/HUD.asmdef | 7 +- .../DCL/Controllers/HUD/HUDController.cs | 12 +- unity-client/Assets/Textures/UI/Button40.png | 3 + .../UI/Button40.png.meta} | 30 +- .../Assets/Textures/UI/EmailHeader.png | 3 + .../UI/EmailHeader.png.meta} | 28 +- .../Assets/Textures/UI/EmailInput.png | 3 + .../UI/EmailInput.png.meta} | 30 +- .../Assets/Textures/UI/Radius11Shadow.png | 3 + .../UI/Radius11Shadow.png.meta} | 30 +- .../Assets/Tutorial/Scripts/Tutorial.asmdef | 6 +- .../Tutorial/Scripts/TutorialController.cs | 27 +- 32 files changed, 1104 insertions(+), 941 deletions(-) create mode 100644 unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDView.cs create mode 100644 unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDView.cs.meta rename unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/{Textures.meta => Resources.meta} (77%) rename unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/{ => Resources}/EmailPromptHUD.prefab (78%) rename unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/{ => Resources}/EmailPromptHUD.prefab.meta (100%) delete mode 100644 unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/CloseButton.png delete mode 100644 unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/Ellipse.png delete mode 100644 unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailHUDAtlas.spriteatlas delete mode 100644 unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailHUDAtlas.spriteatlas.meta delete mode 100644 unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailImage.png delete mode 100644 unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/MainButton.png delete mode 100644 unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/PopUpBackground.png delete mode 100644 unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/PopUpBackground.png.meta create mode 100644 unity-client/Assets/Textures/UI/Button40.png rename unity-client/Assets/{Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/Ellipse.png.meta => Textures/UI/Button40.png.meta} (79%) create mode 100644 unity-client/Assets/Textures/UI/EmailHeader.png rename unity-client/Assets/{Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/CloseButton.png.meta => Textures/UI/EmailHeader.png.meta} (81%) create mode 100644 unity-client/Assets/Textures/UI/EmailInput.png rename unity-client/Assets/{Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailImage.png.meta => Textures/UI/EmailInput.png.meta} (79%) create mode 100644 unity-client/Assets/Textures/UI/Radius11Shadow.png rename unity-client/Assets/{Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/MainButton.png.meta => Textures/UI/Radius11Shadow.png.meta} (79%) diff --git a/kernel/packages/config/index.ts b/kernel/packages/config/index.ts index aea837edc7..ee80669617 100644 --- a/kernel/packages/config/index.ts +++ b/kernel/packages/config/index.ts @@ -127,6 +127,7 @@ export const INIT_PRE_LOAD = location.search.indexOf('INIT_PRE_LOAD') !== -1 export const AWS = location.search.indexOf('AWS') !== -1 export const NO_MOTD = location.search.indexOf('NO_MOTD') !== -1 +export const RESET_TUTORIAL = location.search.indexOf('RESET_TUTORIAL') !== -1 export const DISABLE_AUTH = location.search.indexOf('DISABLE_AUTH') !== -1 || DEBUG export const ENGINE_DEBUG_PANEL = location.search.indexOf('ENGINE_DEBUG_PANEL') !== -1 diff --git a/kernel/packages/shared/profiles/sagas.ts b/kernel/packages/shared/profiles/sagas.ts index f3dc613f01..9264d02ce2 100644 --- a/kernel/packages/shared/profiles/sagas.ts +++ b/kernel/packages/shared/profiles/sagas.ts @@ -9,7 +9,8 @@ import { getWearablesSafeURL, PIN_CATALYST, PREVIEW, - ethereumConfigurations + ethereumConfigurations, + RESET_TUTORIAL } from 'config' import { NotificationType } from 'shared/types' @@ -188,6 +189,11 @@ function* initialProfileLoad() { profileDirty = true } + if (RESET_TUTORIAL) { + profile = { ...profile, tutorialStep: 0 } + profileDirty = true + } + if (profileDirty) { scheduleProfileUpdate(profile) } @@ -489,6 +495,9 @@ export function* submitProfileToRenderer(action: ProfileSuccessAction): any { if (ALL_WEARABLES) { profile.inventory = (yield select(getExclusiveCatalog)).map((_: Wearable) => _.id) } + + globalThis.unityInterface.ConfigureEmailPrompt(profile.tutorialStep) + yield call(sendLoadProfile, profile) } else { yield call(ensureRenderer) diff --git a/kernel/packages/shared/types.ts b/kernel/packages/shared/types.ts index 33b1f4e8f5..8cb633a13b 100644 --- a/kernel/packages/shared/types.ts +++ b/kernel/packages/shared/types.ts @@ -397,7 +397,8 @@ export enum HUDElementID { OPEN_EXTERNAL_URL_PROMPT = 14, NFT_INFO_DIALOG = 16, TELEPORT_DIALOG = 17, - CONTROLS_HUD = 18 + CONTROLS_HUD = 18, + EMAIL_PROMPT = 19 } export type HUDConfiguration = { diff --git a/kernel/packages/unity-interface/UnityInterface.ts b/kernel/packages/unity-interface/UnityInterface.ts index 7fea2feeb1..4484da0d8e 100644 --- a/kernel/packages/unity-interface/UnityInterface.ts +++ b/kernel/packages/unity-interface/UnityInterface.ts @@ -71,7 +71,6 @@ export class UnityInterface { } if (!this.gameInstance.Module) { - defaultLogger.log( `Can't change base resolution height to ${height}! Are you running explorer in unity editor or native?` ) @@ -300,6 +299,14 @@ export class UnityInterface { } } + public ConfigureEmailPrompt(tutorialStep: number) { + const emailCompletedFlag = 128 + this.ConfigureHUDElement(HUDElementID.EMAIL_PROMPT, { + active: (tutorialStep & emailCompletedFlag) === 0, + visible: false + }) + } + // ********************************************************************************* // ************** Builder messages ************** // ********************************************************************************* diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUD.asmdef b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUD.asmdef index e6a2bdf3b8..3fe8bfcf14 100644 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUD.asmdef +++ b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUD.asmdef @@ -2,10 +2,14 @@ "name": "EmailPromptHUD", "references": [ "GUID:6055be8ebefd69e48b49212b09b47b2f", - "GUID:1de3566cccb280f4a982c59ad0d08c96", + "GUID:555c1f3c6d18648df910b7a1de75b424", + "GUID:b1087c5731ff68448a0a9c625bb7e52d", + "GUID:4720e174f2805c74bb7aa94cc8bb5bf8", + "GUID:760a1d365aad58044916992b072cf2a6", + "GUID:3f4c1b4f55716479ea104c4254afe172", + "GUID:8e14059e964ca49aeb55d0e7b2b14c3c", "GUID:4973650d2444c4561a15d50f24d91cd9" ], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, @@ -13,5 +17,6 @@ "precompiledReferences": [], "autoReferenced": true, "defineConstraints": [], - "versionDefines": [] + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDController.cs b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDController.cs index d7ede9dca6..bc581377be 100644 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDController.cs +++ b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDController.cs @@ -1,34 +1,110 @@ using UnityEngine; -using UnityEngine.UI; -using TMPro; using DCL.Interface; +using DCL.Helpers; +using System.Collections; +using DCL.Tutorial; -public class EmailPromptHUDController : MonoBehaviour +public class EmailPromptHUDController : IHUD { - public TMP_InputField inputField; - public GameObject cryptoUserMessage; - public GameObject nonCryptoUserMessage; - public Button sendButton; + const float POPUP_DELAY = 60; - void Awake() + EmailPromptHUDView view; + + bool isPopupRoutineRunning = false; + Coroutine showPopupDelayedRoutine; + + public EmailPromptHUDController() + { + view = UnityEngine.Object.Instantiate(Resources.Load("EmailPromptHUD")).GetComponent(); + view.name = "_EmailPromptHUD"; + + view.OnDismiss += OnDismiss; + view.OnSendEmail += OnSendEmail; + + view.gameObject.SetActive(false); + } + + public void SetVisibility(bool visible) + { + if (visible) + { + Utils.UnlockCursor(); + view.gameObject.SetActive(true); + view.showHideAnimator.Show(); + } + else + { + view.showHideAnimator.Hide(); + } + } + + public void Dispose() + { + if (view != null) + { + GameObject.Destroy(view.gameObject); + } + if (showPopupDelayedRoutine != null) + { + StopPopupRoutine(); + } + } + + public void SetEnable(bool enable) + { + if (enable && !isPopupRoutineRunning) + { + StartPopupRoutine(); + } + else if (!enable && isPopupRoutineRunning) + { + StopPopupRoutine(); + } + } + + void StartPopupRoutine() + { + showPopupDelayedRoutine = CoroutineStarter.Start(ShowPopupDelayed(POPUP_DELAY)); + } + + void StopPopupRoutine() { - bool hasWallet = UserProfile.GetOwnUserProfile().hasConnectedWeb3; + if (showPopupDelayedRoutine != null) + { + CoroutineStarter.Stop(showPopupDelayedRoutine); + showPopupDelayedRoutine = null; + } + isPopupRoutineRunning = false; + } - cryptoUserMessage.SetActive(hasWallet); - nonCryptoUserMessage.SetActive(!hasWallet); + IEnumerator ShowPopupDelayed(float seconds) + { + isPopupRoutineRunning = true; + yield return new WaitUntil(() => CommonScriptableObjects.rendererState.Get()); + yield return WaitForSecondsCache.Get(seconds); + yield return new WaitUntil(() => CommonScriptableObjects.rendererState.Get()); + SetVisibility(true); + isPopupRoutineRunning = false; + } - sendButton.interactable = false; - sendButton.onClick.AddListener(SaveEmail); + void OnSendEmail(string email) + { + WebInterface.SendUserEmail(email); + SetEmailFlag(); + SetVisibility(false); + } - inputField.onValueChanged.AddListener(value => + void OnDismiss(bool dontAskAgain) + { + if (dontAskAgain) { - sendButton.interactable = !string.IsNullOrEmpty(value); - }); + SetEmailFlag(); + } + SetVisibility(false); } - public void SaveEmail() + void SetEmailFlag() { - gameObject.SetActive(false); - WebInterface.SendUserEmail(inputField.text); + TutorialController.i.SetStepCompleted(TutorialController.TutorialStep.EmailRequested); } } diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDController.cs.meta b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDController.cs.meta index 9dd1d7693d..e5f7766791 100644 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDController.cs.meta +++ b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDController.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5b7824e70b4de4d03a257f0cc6dc1b10 +guid: e853628802f2b4cd1b523d13752465fe MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDView.cs b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDView.cs new file mode 100644 index 0000000000..13e5dcef3e --- /dev/null +++ b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDView.cs @@ -0,0 +1,73 @@ +using UnityEngine; +using UnityEngine.UI; +using TMPro; +using System; +using System.Text.RegularExpressions; + +internal class EmailPromptHUDView : MonoBehaviour +{ + public event Action OnSendEmail; + public event Action OnDismiss; + + public TMP_InputField inputField; + public Button_OnPointerDown closeButton; + public Button_OnPointerDown sendButton; + public Toggle dontAskAgain; + public ShowHideAnimator showHideAnimator; + public GameObject invalidEmailIndicator; + + // NOTE: regex based in https://github.com/Microsoft/referencesource/blob/master/System.ComponentModel.DataAnnotations/DataAnnotations/EmailAddressAttribute.cs + const string emailPattern = @"^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$"; + const RegexOptions options = RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture; + Regex emailRegex = new Regex(emailPattern, options); + + void Awake() + { + sendButton.interactable = false; + invalidEmailIndicator.SetActive(false); + + sendButton.onClick.AddListener(() => OnSendEmail?.Invoke(inputField.text)); + closeButton.onClick.AddListener(() => OnDismiss?.Invoke(dontAskAgain.isOn)); + + inputField.onValueChanged.AddListener(value => + { + bool isValidValue = IsValidEmail(value); + sendButton.interactable = isValidValue; + + if (!string.IsNullOrEmpty(value)) + { + invalidEmailIndicator.SetActive(!isValidValue); + } + else + { + invalidEmailIndicator.SetActive(false); + } + }); + + inputField.onSubmit.AddListener(value => + { + if (sendButton.interactable) + { + sendButton.onClick.Invoke(); + } + }); + + showHideAnimator.OnWillFinishStart += OnWillFinishStart; + } + + void OnWillFinishStart(ShowHideAnimator animator) + { + inputField.Select(); + inputField.ActivateInputField(); + } + + void OnDestroy() + { + showHideAnimator.OnWillFinishStart -= OnWillFinishStart; + } + + bool IsValidEmail(string email) + { + return emailRegex.IsMatch(email); + } +} diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDView.cs.meta b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDView.cs.meta new file mode 100644 index 0000000000..9dd1d7693d --- /dev/null +++ b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUDView.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5b7824e70b4de4d03a257f0cc6dc1b10 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures.meta b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Resources.meta similarity index 77% rename from unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures.meta rename to unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Resources.meta index 6d31dfc300..566da540c0 100644 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures.meta +++ b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Resources.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 14187c891859f41879dd424216b9ef15 +guid: 36043e041af60428180652c0db6d861d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUD.prefab b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Resources/EmailPromptHUD.prefab similarity index 78% rename from unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUD.prefab rename to unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Resources/EmailPromptHUD.prefab index 154880fa47..48d35c86ff 100644 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUD.prefab +++ b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Resources/EmailPromptHUD.prefab @@ -1,163 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &396472808658941870 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4860231333878472485} - - component: {fileID: 5143882471656323167} - - component: {fileID: 1897050071619665189} - m_Layer: 5 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4860231333878472485 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 396472808658941870} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4246739490076433} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 34} - m_SizeDelta: {x: 364, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5143882471656323167 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 396472808658941870} - m_CullTransparentMesh: 0 ---- !u!114 &1897050071619665189 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 396472808658941870} - 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_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Get exclusive crypto items! - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 26b03903800224f718b64e9afbc91b61, type: 2} - m_sharedMaterial: {fileID: -6892909264025736228, guid: 26b03903800224f718b64e9afbc91b61, - 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_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 - m_fontSize: 18 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 12 - m_fontSizeMax: 18 - m_fontStyle: 0 - m_textAlignment: 514 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 - m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 1897050071619665189} - characterCount: 27 - spriteCount: 0 - spaceCount: 3 - wordCount: 4 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} - m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1181454726022817450 GameObject: m_ObjectHideFlags: 0 @@ -212,17 +54,16 @@ MonoBehaviour: m_GameObject: {fileID: 1181454726022817450} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -232,6 +73,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1377090148267012245 GameObject: m_ObjectHideFlags: 0 @@ -262,15 +104,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 3946178047409169073} - {fileID: 985915641317356586} m_Father: {fileID: 6442390413612448339} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: -41} - m_SizeDelta: {x: -140, y: 30} + m_AnchoredPosition: {x: 1.9888464, y: -44.21} + m_SizeDelta: {x: -187.97769, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8340736190598547498 CanvasRenderer: @@ -289,18 +130,17 @@ MonoBehaviour: m_GameObject: {fileID: 1377090148267012245} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 017eca2d81e3343959735e87d3b06c02, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -309,6 +149,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!114 &4985210244339914906 MonoBehaviour: m_ObjectHideFlags: 0 @@ -327,7 +168,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + 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} @@ -348,7 +189,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 8114045857259492415} + m_TargetGraphic: {fileID: 6409210296797752633} m_TextViewport: {fileID: 985915641317356586} m_TextComponent: {fileID: 5678093457427341989} m_Placeholder: {fileID: 6205512245659029053} @@ -369,44 +210,28 @@ MonoBehaviour: m_OnEndEdit: m_PersistentCalls: m_Calls: [] - m_TypeName: TMPro.TMP_InputField+SubmitEvent, Unity.TextMeshPro, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null m_OnSubmit: m_PersistentCalls: m_Calls: [] - m_TypeName: TMPro.TMP_InputField+SubmitEvent, Unity.TextMeshPro, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null m_OnSelect: m_PersistentCalls: m_Calls: [] - m_TypeName: TMPro.TMP_InputField+SelectionEvent, Unity.TextMeshPro, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null m_OnDeselect: m_PersistentCalls: m_Calls: [] - m_TypeName: TMPro.TMP_InputField+SelectionEvent, Unity.TextMeshPro, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null m_OnTextSelection: m_PersistentCalls: m_Calls: [] - m_TypeName: TMPro.TMP_InputField+TextSelectionEvent, Unity.TextMeshPro, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null m_OnEndTextSelection: m_PersistentCalls: m_Calls: [] - m_TypeName: TMPro.TMP_InputField+TextSelectionEvent, Unity.TextMeshPro, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: TMPro.TMP_InputField+OnChangeEvent, Unity.TextMeshPro, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null m_OnTouchScreenKeyboardStatusChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: TMPro.TMP_InputField+TouchScreenKeyboardEvent, Unity.TextMeshPro, - Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_CaretColor: {r: 1, g: 0.28627452, b: 0.45490196, a: 1} + m_CaretColor: {r: 0, g: 0, b: 0, a: 1} m_CustomCaretColor: 1 m_SelectionColor: {r: 1, g: 1, b: 1, a: 1} m_Text: @@ -481,12 +306,11 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: NEXT + m_text: KEeP ME UPDATED! m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 26b03903800224f718b64e9afbc91b61, type: 2} m_sharedMaterial: {fileID: -6892909264025736228, guid: 26b03903800224f718b64e9afbc91b61, @@ -515,10 +339,10 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 12 - m_fontSizeBase: 24 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 10 m_fontSizeMax: 12 m_fontStyle: 16 @@ -556,10 +380,10 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 8890796236042353780} - characterCount: 4 + characterCount: 16 spriteCount: 0 - spaceCount: 0 - wordCount: 1 + spaceCount: 2 + wordCount: 3 linkCount: 0 lineCount: 1 pageCount: 1 @@ -613,8 +437,8 @@ RectTransform: 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: 10.9} + m_AnchoredPosition: {x: 0, y: -0.9599991} + m_SizeDelta: {x: -17.934967, y: -1.8334885} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6898826709567973184 CanvasRenderer: @@ -639,12 +463,11 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Email address + m_text: Email m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c0f2e4affe3f2438d9042ca1db45764f, type: 2} m_sharedMaterial: {fileID: 8921694724713903678, guid: c0f2e4affe3f2438d9042ca1db45764f, @@ -654,8 +477,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4286410355 - m_fontColor: {r: 0.4509804, g: 0.43137255, b: 0.49019608, a: 1} + rgba: 4286743170 + m_fontColor: {r: 0.50980395, g: 0.50980395, b: 0.50980395, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -673,14 +496,14 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 13 + m_fontSize: 16 m_fontSizeBase: 12 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 10 - m_fontSizeMax: 13 + m_fontSizeMax: 16 m_fontStyle: 0 - m_textAlignment: 514 + m_textAlignment: 513 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -714,10 +537,10 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 6205512245659029053} - characterCount: 13 + characterCount: 5 spriteCount: 0 - spaceCount: 1 - wordCount: 2 + spaceCount: 0 + wordCount: 1 linkCount: 0 lineCount: 1 pageCount: 1 @@ -737,7 +560,7 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &2393662430775454879 +--- !u!1 &2343241845368640042 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -745,72 +568,71 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1298665989806638360} - - component: {fileID: 5952947554182739418} - - component: {fileID: 1288190879772205926} + - component: {fileID: 5299796762384343832} + - component: {fileID: 7880697781087196515} + - component: {fileID: 7170216300753772855} m_Layer: 5 - m_Name: EmailImage + m_Name: TMP SubMeshUI [SF-UI-Text-HeavyShadow + LiberationSans SDF Atlas] m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1298665989806638360 +--- !u!224 &5299796762384343832 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2393662430775454879} + m_GameObject: {fileID: 2343241845368640042} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6442390413612448339} + m_Father: {fileID: 7223738435154292015} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 182.1} - m_SizeDelta: {x: 124, y: 90} + 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 &5952947554182739418 +--- !u!222 &7880697781087196515 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2393662430775454879} + m_GameObject: {fileID: 2343241845368640042} m_CullTransparentMesh: 0 ---- !u!114 &1288190879772205926 +--- !u!114 &7170216300753772855 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2393662430775454879} + m_GameObject: {fileID: 2343241845368640042} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 7d598c1eca58d4507b16d139b59641a4, 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_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_spriteAsset: {fileID: 0} + m_material: {fileID: 0} + m_sharedMaterial: {fileID: 0} + m_isDefaultMaterial: 0 + m_padding: 8.5625 + m_canvasRenderer: {fileID: 7880697781087196515} + m_TextComponent: {fileID: 6448606785358696417} + m_materialReferenceIndex: 1 --- !u!1 &2449586574400869084 GameObject: m_ObjectHideFlags: 0 @@ -824,6 +646,9 @@ GameObject: - component: {fileID: 8986793680226859692} - component: {fileID: 8747265365724859278} - component: {fileID: 2871122417710248123} + - component: {fileID: 744397392441356162} + - component: {fileID: 2010703097762440681} + - component: {fileID: 47617055478392490} m_Layer: 5 m_Name: EmailPromptHUD m_TagString: Untagged @@ -871,7 +696,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 - m_SortingOrder: 2 + m_SortingOrder: 5 m_TargetDisplay: 0 --- !u!114 &8986793680226859692 MonoBehaviour: @@ -882,7 +707,7 @@ MonoBehaviour: m_GameObject: {fileID: 2449586574400869084} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 1 @@ -904,7 +729,7 @@ MonoBehaviour: m_GameObject: {fileID: 2449586574400869084} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -925,9 +750,58 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: inputField: {fileID: 4985210244339914906} - cryptoUserMessage: {fileID: 6118217295391630347} - nonCryptoUserMessage: {fileID: 6366243840366973910} - sendButton: {fileID: 4809985602784591396} + closeButton: {fileID: 9102416857377050958} + sendButton: {fileID: 6462468963638411156} + dontAskAgain: {fileID: 1888323851016925300} + showHideAnimator: {fileID: 2010703097762440681} + invalidEmailIndicator: {fileID: 5283840960803929079} +--- !u!95 &744397392441356162 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2449586574400869084} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 22100000, guid: d5f6cd638da0f1b4388c7a3679abe0b0, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &2010703097762440681 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2449586574400869084} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d8b939b5bedb9494b806609faeda7d8d, type: 3} + m_Name: + m_EditorClassIdentifier: + hideOnEnable: 1 + animSpeedFactor: 1 + disableAfterFadeOut: 1 + visibleParam: visible +--- !u!225 &47617055478392490 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2449586574400869084} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &4073756698442913839 GameObject: m_ObjectHideFlags: 0 @@ -959,12 +833,12 @@ RectTransform: - {fileID: 6302762263229028484} - {fileID: 5053958270576811162} m_Father: {fileID: 919648430529020659} - m_RootOrder: 1 + 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: 6} - m_SizeDelta: {x: -20, y: -13} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 1.24, y: 0.79093} + m_SizeDelta: {x: 284.22406, y: 38.4181} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2625214423214053785 MonoBehaviour: @@ -975,7 +849,7 @@ MonoBehaviour: m_GameObject: {fileID: 4073756698442913839} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &4304512116758457548 @@ -1007,13 +881,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3801363074982679359} - m_RootOrder: 1 + m_Father: {fileID: 6442390413612448339} + 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: 0, y: -26.6} - m_SizeDelta: {x: 332, y: 64} + m_AnchoredPosition: {x: 1.4609, y: 27.65} + m_SizeDelta: {x: 385.1477, y: 55.299995} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7897435843545543613 CanvasRenderer: @@ -1038,12 +912,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Enter your email to hear about future events and competitions! + m_text: Enter your email below to receive spam-free updates about events, special + offers and amazing new features! m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c0f2e4affe3f2438d9042ca1db45764f, type: 2} m_sharedMaterial: {fileID: 8921694724713903678, guid: c0f2e4affe3f2438d9042ca1db45764f, @@ -1072,10 +946,10 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 13 - m_fontSizeBase: 36 + m_fontSize: 16 + m_fontSizeBase: 16 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 10 m_fontSizeMax: 13 m_fontStyle: 0 @@ -1089,7 +963,7 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 + m_firstOverflowCharacterIndex: 93 m_linkedTextComponent: {fileID: 0} m_isLinkedTextComponent: 0 m_isTextTruncated: 0 @@ -1113,12 +987,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 4453940201574627198} - characterCount: 62 + characterCount: 106 spriteCount: 0 - spaceCount: 9 - wordCount: 10 + spaceCount: 15 + wordCount: 16 linkCount: 0 - lineCount: 2 + lineCount: 3 pageCount: 1 materialCount: 1 m_isUsingLegacyAnimationComponent: 0 @@ -1136,7 +1010,7 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &5460272255377446827 +--- !u!1 &4393736689572977568 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1144,78 +1018,479 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6442390413612448339} - - component: {fileID: 6214505918051157399} - - component: {fileID: 161608979280352884} + - component: {fileID: 5346030859113566619} + - component: {fileID: 1888323851016925300} m_Layer: 5 - m_Name: ContentBackground + m_Name: ToggleDontAskAgain m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6442390413612448339 +--- !u!224 &5346030859113566619 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5460272255377446827} + m_GameObject: {fileID: 4393736689572977568} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1298665989806638360} - - {fileID: 2588338880410381109} - - {fileID: 3801363074982679359} - - {fileID: 4246739490076433} - - {fileID: 919648430529020659} - - {fileID: 4162363002249325025} - m_Father: {fileID: 1753101510307271087} - m_RootOrder: 1 + - {fileID: 6715797827757102088} + - {fileID: 153415660321296752} + m_Father: {fileID: 6442390413612448339} + m_RootOrder: 7 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: -8.1} - m_SizeDelta: {x: 410, y: 336} + m_AnchoredPosition: {x: 0.66989, y: -183.59} + m_SizeDelta: {x: 191.1488, y: 14.77597} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6214505918051157399 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5460272255377446827} - m_CullTransparentMesh: 0 ---- !u!114 &161608979280352884 +--- !u!114 &1888323851016925300 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5460272255377446827} + m_GameObject: {fileID: 4393736689572977568} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_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: 1291433629092246314} + toggleTransition: 1 + graphic: {fileID: 5946013480051255142} + m_Group: {fileID: 0} + onValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: ded605edc90204e32b89385728ee87ca, type: 3} - m_Type: 1 - m_PreserveAspect: 0 + m_IsOn: 0 +--- !u!1 &4613048781008310872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 153415660321296752} + - component: {fileID: 1636996505639229818} + - component: {fileID: 1968131584497517172} + 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 &153415660321296752 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4613048781008310872} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5346030859113566619} + 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: 30.8, y: -0.16754007} + m_SizeDelta: {x: -53.824432, y: 0.33509636} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1636996505639229818 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4613048781008310872} + m_CullTransparentMesh: 0 +--- !u!114 &1968131584497517172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4613048781008310872} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Don't ask again + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c0f2e4affe3f2438d9042ca1db45764f, type: 2} + m_sharedMaterial: {fileID: 8921694724713903678, guid: c0f2e4affe3f2438d9042ca1db45764f, + 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_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_textAlignment: 513 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: 0 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 1968131584497517172} + characterCount: 15 + spriteCount: 0 + spaceCount: 2 + wordCount: 3 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5283840960803929079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 546682950794650579} + - component: {fileID: 1742631877846330692} + - component: {fileID: 8341940977957686415} + m_Layer: 5 + m_Name: ValidEmailFeedback + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &546682950794650579 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5283840960803929079} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6442390413612448339} + 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: 5.26, y: -81} + m_SizeDelta: {x: 271.32303, y: 20.951775} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1742631877846330692 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5283840960803929079} + m_CullTransparentMesh: 0 +--- !u!114 &8341940977957686415 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5283840960803929079} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Enter a valid Email + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c0f2e4affe3f2438d9042ca1db45764f, type: 2} + m_sharedMaterial: {fileID: 8921694724713903678, guid: c0f2e4affe3f2438d9042ca1db45764f, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4284105962 + m_fontColor: {r: 0.9176471, g: 0.26666668, b: 0.3529412, 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_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 10 + m_fontSizeMax: 16 + m_fontStyle: 0 + m_textAlignment: 516 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 8341940977957686415} + characterCount: 19 + spriteCount: 0 + spaceCount: 3 + wordCount: 4 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5460272255377446827 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6442390413612448339} + - component: {fileID: 6214505918051157399} + - component: {fileID: 161608979280352884} + m_Layer: 5 + m_Name: ContentBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6442390413612448339 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5460272255377446827} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3208115865899690616} + - {fileID: 2588338880410381109} + - {fileID: 7223738435154292015} + - {fileID: 5659676129924774791} + - {fileID: 919648430529020659} + - {fileID: 546682950794650579} + - {fileID: 4162363002249325025} + - {fileID: 5346030859113566619} + m_Father: {fileID: 1753101510307271087} + 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: -5.91, y: -0.95} + m_SizeDelta: {x: 475.37946, y: 468.00842} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6214505918051157399 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5460272255377446827} + m_CullTransparentMesh: 0 +--- !u!114 &161608979280352884 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5460272255377446827} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d35ae73176cdc4afaa2ef323399f3232, 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 &5710560246528345763 GameObject: m_ObjectHideFlags: 0 @@ -1244,14 +1519,15 @@ 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_Children: [] - m_Father: {fileID: 3801363074982679359} - m_RootOrder: 0 + m_Children: + - {fileID: 5299796762384343832} + m_Father: {fileID: 6442390413612448339} + 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, y: 34} - m_SizeDelta: {x: 364, y: 40} + m_AnchoredPosition: {x: 0, y: 129.5} + m_SizeDelta: {x: 443.91174, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4744624551682749282 CanvasRenderer: @@ -1276,23 +1552,21 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: We would like to stay in touch + m_text: "Let\u2019s stay in touch!" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 26b03903800224f718b64e9afbc91b61, type: 2} - m_sharedMaterial: {fileID: -6892909264025736228, guid: 26b03903800224f718b64e9afbc91b61, - type: 2} + m_fontAsset: {fileID: 11400000, guid: 131598e906f4d4a048cfa339caa74472, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 8f0c7039aba8d420aad6241bf1b80584, 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: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1310,10 +1584,10 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 18 - m_fontSizeBase: 36 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 12 m_fontSizeMax: 18 m_fontStyle: 0 @@ -1351,21 +1625,21 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_textInfo: textComponent: {fileID: 6448606785358696417} - characterCount: 30 + characterCount: 20 spriteCount: 0 - spaceCount: 6 - wordCount: 7 + spaceCount: 3 + wordCount: 4 linkCount: 0 lineCount: 1 pageCount: 1 - materialCount: 1 + materialCount: 2 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 m_subTextObjects: - {fileID: 0} - - {fileID: 0} + - {fileID: 7170216300753772855} - {fileID: 0} - {fileID: 0} - {fileID: 0} @@ -1374,7 +1648,7 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &6118217295391630347 +--- !u!1 &5740940524436131457 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1382,36 +1656,73 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3801363074982679359} + - component: {fileID: 753347708419756024} + - component: {fileID: 5213525775360518301} + - component: {fileID: 5946013480051255142} m_Layer: 5 - m_Name: MessageCryptoUser + m_Name: Checkmark m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3801363074982679359 +--- !u!224 &753347708419756024 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6118217295391630347} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 5740940524436131457} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7223738435154292015} - - {fileID: 5659676129924774791} - m_Father: {fileID: 6442390413612448339} - m_RootOrder: 2 + m_Children: [] + m_Father: {fileID: 6715797827757102088} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -108} - m_SizeDelta: {x: 0, y: 110} + m_AnchoredPosition: {x: 0.0000076293945, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &6366243840366973910 +--- !u!222 &5213525775360518301 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5740940524436131457} + m_CullTransparentMesh: 0 +--- !u!114 &5946013480051255142 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5740940524436131457} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3c2f4bed18ef84d5baeb2774df7d08df, 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 &6563728159969202661 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1419,36 +1730,73 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4246739490076433} + - component: {fileID: 4329422895069493364} + - component: {fileID: 3180898696498843802} + - component: {fileID: 8235055206592729585} m_Layer: 5 - m_Name: MessageNonCryptoUser + m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &4246739490076433 + m_IsActive: 1 +--- !u!224 &4329422895069493364 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6366243840366973910} + m_GameObject: {fileID: 6563728159969202661} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4860231333878472485} - - {fileID: 6625870063989813817} - m_Father: {fileID: 6442390413612448339} - m_RootOrder: 3 + m_Children: [] + m_Father: {fileID: 2588338880410381109} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -108} - m_SizeDelta: {x: 0, y: 110} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &6563728159969202661 +--- !u!222 &3180898696498843802 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6563728159969202661} + m_CullTransparentMesh: 0 +--- !u!114 &8235055206592729585 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6563728159969202661} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 851b72df6e5bd4b91a42eb20ae6323f0, 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 &7343825988936853180 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1456,64 +1804,64 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4329422895069493364} - - component: {fileID: 3180898696498843802} - - component: {fileID: 8235055206592729585} + - component: {fileID: 6715797827757102088} + - component: {fileID: 6017001071475182418} + - component: {fileID: 1291433629092246314} m_Layer: 5 - m_Name: Image + m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4329422895069493364 +--- !u!224 &6715797827757102088 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6563728159969202661} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 7343825988936853180} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2588338880410381109} + m_Children: + - {fileID: 753347708419756024} + m_Father: {fileID: 5346030859113566619} 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: -12, y: -12} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 45.759926, y: -7.5555} + m_SizeDelta: {x: 15.3448715, y: 15.111103} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3180898696498843802 +--- !u!222 &6017001071475182418 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6563728159969202661} + m_GameObject: {fileID: 7343825988936853180} m_CullTransparentMesh: 0 ---- !u!114 &8235055206592729585 +--- !u!114 &1291433629092246314 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6563728159969202661} + m_GameObject: {fileID: 7343825988936853180} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 56a66c6f10b324d7fbea4a1e8a29a1dc, type: 3} + m_Sprite: {fileID: 21300000, guid: f3e766ab5571e436ebb74c06db87db7b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1522,7 +1870,8 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &6704275134416053509 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7391312497284722859 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1530,64 +1879,63 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3946178047409169073} - - component: {fileID: 5707375612173393231} - - component: {fileID: 8114045857259492415} + - component: {fileID: 3208115865899690616} + - component: {fileID: 463481082644885272} + - component: {fileID: 5408643452205011619} m_Layer: 5 - m_Name: Line + m_Name: HeaderImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3946178047409169073 +--- !u!224 &3208115865899690616 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6704275134416053509} + m_GameObject: {fileID: 7391312497284722859} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 919648430529020659} + m_Father: {fileID: 6442390413612448339} m_RootOrder: 0 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: 1} - m_SizeDelta: {x: 0, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 191} + m_SizeDelta: {x: 463.8661, y: 187.45273} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5707375612173393231 +--- !u!222 &463481082644885272 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6704275134416053509} + m_GameObject: {fileID: 7391312497284722859} m_CullTransparentMesh: 0 ---- !u!114 &8114045857259492415 +--- !u!114 &5408643452205011619 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6704275134416053509} + m_GameObject: {fileID: 7391312497284722859} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.28627452, b: 0.45490196, a: 1} - m_RaycastTarget: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: dcdf9cf86d2644e82b7712af42584c7c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1596,6 +1944,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7542188138682940116 GameObject: m_ObjectHideFlags: 0 @@ -1630,8 +1979,8 @@ RectTransform: 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_AnchoredPosition: {x: 0, y: -0.9599991} + m_SizeDelta: {x: -17.934967, y: -1.8334885} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1340839984253492353 CanvasRenderer: @@ -1656,15 +2005,14 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_text: "\u200B" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: c0f2e4affe3f2438d9042ca1db45764f, type: 2} - m_sharedMaterial: {fileID: 8921694724713903678, guid: c0f2e4affe3f2438d9042ca1db45764f, + m_fontAsset: {fileID: 11400000, guid: 26b03903800224f718b64e9afbc91b61, type: 2} + m_sharedMaterial: {fileID: -6892909264025736228, guid: 26b03903800224f718b64e9afbc91b61, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -1690,14 +2038,14 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 13 + m_fontSize: 16 m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 10 - m_fontSizeMax: 13 + m_fontSizeMax: 16 m_fontStyle: 0 - m_textAlignment: 514 + m_textAlignment: 513 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -1765,8 +2113,8 @@ GameObject: - component: {fileID: 2588338880410381109} - component: {fileID: 8906477860965228058} - component: {fileID: 8115539219159882249} - - component: {fileID: 6099297758426500158} - component: {fileID: 2267484801611824732} + - component: {fileID: 9102416857377050958} m_Layer: 5 m_Name: CloseButton m_TagString: Untagged @@ -1791,8 +2139,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -28, y: -22} - m_SizeDelta: {x: 24, y: 24} + m_AnchoredPosition: {x: -31.8, y: -24.542} + m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8906477860965228058 CanvasRenderer: @@ -1811,27 +2159,42 @@ MonoBehaviour: m_GameObject: {fileID: 7562340894579282662} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1} + m_Color: {r: 0.21176472, g: 0.21176472, b: 0.21176472, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8b5857541ef5a4a25a00670c951f9584, type: 3} + m_Sprite: {fileID: 21300000, guid: e36f3569fbdef4c609c33f7a1cebace5, type: 3} m_Type: 0 - m_PreserveAspect: 1 + m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &6099297758426500158 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2267484801611824732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7562340894579282662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d30b4ce08e6854094b8461fdea1282aa, type: 3} + m_Name: + m_EditorClassIdentifier: + targetRectTransform: {fileID: 2588338880410381109} + hoverScale: 1.02 + normalScale: 1 +--- !u!114 &9102416857377050958 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1840,7 +2203,7 @@ MonoBehaviour: m_GameObject: {fileID: 7562340894579282662} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 028f6aecab96a43f096fdbbc8a753ead, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -1852,8 +2215,8 @@ 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_HighlightedColor: {r: 0.8396226, g: 0.8396226, b: 0.8396226, a: 1} + m_PressedColor: {r: 0.6792453, g: 0.6792453, b: 0.6792453, 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 @@ -1872,196 +2235,8 @@ MonoBehaviour: m_Interactable: 1 m_TargetGraphic: {fileID: 8115539219159882249} m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2449586574400869084} - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &2267484801611824732 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7562340894579282662} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d30b4ce08e6854094b8461fdea1282aa, type: 3} - m_Name: - m_EditorClassIdentifier: - targetRectTransform: {fileID: 2588338880410381109} - hoverScale: 1.05 - normalScale: 1 ---- !u!1 &7699496830526077590 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6625870063989813817} - - component: {fileID: 9132569559078827755} - - component: {fileID: 7082884423117489041} - m_Layer: 5 - m_Name: Description - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6625870063989813817 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7699496830526077590} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4246739490076433} - 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, y: -26.6} - m_SizeDelta: {x: 332, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &9132569559078827755 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7699496830526077590} - m_CullTransparentMesh: 0 ---- !u!114 &7082884423117489041 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7699496830526077590} - 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_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_text: Enter your email to receive a quick guide on installing a crypto wallet - on your browser and receiving free crypto assets in Decentraland. We will also - let you know about future events and competitions! - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: c0f2e4affe3f2438d9042ca1db45764f, type: 2} - m_sharedMaterial: {fileID: 8921694724713903678, guid: c0f2e4affe3f2438d9042ca1db45764f, - 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_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 - m_fontSize: 13 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 10 - m_fontSizeMax: 13 - m_fontStyle: 0 - m_textAlignment: 514 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 - m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 7082884423117489041} - characterCount: 201 - spriteCount: 0 - spaceCount: 33 - wordCount: 34 - linkCount: 0 - lineCount: 4 - pageCount: 1 - materialCount: 1 - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} - m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8411291397949959184 GameObject: m_ObjectHideFlags: 0 @@ -2073,8 +2248,8 @@ GameObject: - component: {fileID: 4162363002249325025} - component: {fileID: 5517491898951262088} - component: {fileID: 1443982011315502396} - - component: {fileID: 4809985602784591396} - component: {fileID: 4280037014402588622} + - component: {fileID: 6462468963638411156} m_Layer: 5 m_Name: NextButton m_TagString: Untagged @@ -2095,12 +2270,12 @@ RectTransform: m_Children: - {fileID: 6771805345302960720} m_Father: {fileID: 6442390413612448339} - m_RootOrder: 5 + m_RootOrder: 6 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: -112} - m_SizeDelta: {x: 196, y: 40} + m_AnchoredPosition: {x: 0.67, y: -128.15} + m_SizeDelta: {x: 191.14886, y: 45.8907} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5517491898951262088 CanvasRenderer: @@ -2119,18 +2294,17 @@ MonoBehaviour: m_GameObject: {fileID: 8411291397949959184} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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_Color: {r: 1, g: 0.1764706, b: 0.33333334, a: 1} m_RaycastTarget: 1 + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 3663fab4245524d468599c96df19457e, type: 3} + m_Sprite: {fileID: 21300000, guid: 7c67c1a311ba3489892ab89b094714e5, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2139,7 +2313,23 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &4809985602784591396 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4280037014402588622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8411291397949959184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d30b4ce08e6854094b8461fdea1282aa, type: 3} + m_Name: + m_EditorClassIdentifier: + targetRectTransform: {fileID: 4162363002249325025} + hoverScale: 1.01 + normalScale: 1 +--- !u!114 &6462468963638411156 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2148,7 +2338,7 @@ MonoBehaviour: m_GameObject: {fileID: 8411291397949959184} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 028f6aecab96a43f096fdbbc8a753ead, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -2160,8 +2350,8 @@ 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_HighlightedColor: {r: 0.9339623, g: 0.9339623, b: 0.9339623, 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 @@ -2182,20 +2372,3 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &4280037014402588622 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8411291397949959184} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d30b4ce08e6854094b8461fdea1282aa, type: 3} - m_Name: - m_EditorClassIdentifier: - targetRectTransform: {fileID: 4162363002249325025} - hoverScale: 1.02 - normalScale: 1 diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUD.prefab.meta b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Resources/EmailPromptHUD.prefab.meta similarity index 100% rename from unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/EmailPromptHUD.prefab.meta rename to unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Resources/EmailPromptHUD.prefab.meta diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/CloseButton.png b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/CloseButton.png deleted file mode 100644 index bcbc0f49aa..0000000000 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/CloseButton.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e194131abc5c961fc06a53196ecc9c7986c78465dc387aa0fb7b19a65f362df0 -size 428 diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/Ellipse.png b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/Ellipse.png deleted file mode 100644 index a85c3ca223..0000000000 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/Ellipse.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cfd56116b3ea6cffbab3b952e1204d8f8575b6d0a852fbd946aceb91ec43d94d -size 5731 diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailHUDAtlas.spriteatlas b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailHUDAtlas.spriteatlas deleted file mode 100644 index 11845dc430..0000000000 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailHUDAtlas.spriteatlas +++ /dev/null @@ -1,48 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!687078895 &4343727234628468602 -SpriteAtlas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: EmailHUDAtlas - m_EditorData: - serializedVersion: 2 - textureSettings: - serializedVersion: 2 - anisoLevel: 1 - compressionQuality: 50 - maxTextureSize: 2048 - textureCompression: 0 - filterMode: 1 - generateMipMaps: 0 - readable: 0 - crunchedCompression: 0 - sRGB: 1 - platformSettings: [] - packingSettings: - serializedVersion: 2 - padding: 4 - blockOffset: 1 - allowAlphaSplitting: 0 - enableRotation: 1 - enableTightPacking: 1 - variantMultiplier: 1 - packables: - - {fileID: 102900000, guid: 14187c891859f41879dd424216b9ef15, type: 3} - totalSpriteSurfaceArea: 75717 - bindAsDefault: 1 - m_MasterAtlas: {fileID: 0} - m_PackedSprites: - - {fileID: 21300000, guid: 3663fab4245524d468599c96df19457e, type: 3} - - {fileID: 21300000, guid: ded605edc90204e32b89385728ee87ca, type: 3} - - {fileID: 21300000, guid: 7d598c1eca58d4507b16d139b59641a4, type: 3} - - {fileID: 21300000, guid: 56a66c6f10b324d7fbea4a1e8a29a1dc, type: 3} - m_PackedSpriteNamesToIndex: - - MainButton - - PopUpBackground - - EmailImage - - CloseButton - m_Tag: EmailHUDAtlas - m_IsVariant: 0 diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailHUDAtlas.spriteatlas.meta b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailHUDAtlas.spriteatlas.meta deleted file mode 100644 index 7faaa235fb..0000000000 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailHUDAtlas.spriteatlas.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f3d045fa513544a7bad876a756156fc6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 4343727234628468602 - userData: - assetBundleName: - assetBundleVariant: diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailImage.png b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailImage.png deleted file mode 100644 index 2656fa685c..0000000000 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailImage.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:550fac36ef790ea11503ee9c1b8c61e8fad6404a32c34916fe919205321e6ddc -size 16442 diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/MainButton.png b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/MainButton.png deleted file mode 100644 index 1b599492c6..0000000000 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/MainButton.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f92c62b39d24c844b8ee86e595197db7d6c5bea59e850469dde8c988edbc8fef -size 4875 diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/PopUpBackground.png b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/PopUpBackground.png deleted file mode 100644 index 86ca1a959a..0000000000 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/PopUpBackground.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:54eece8df0ac7ee587b92d986d68f4dfda8c304698a454c11c9fab5731d90af8 -size 8090 diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/PopUpBackground.png.meta b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/PopUpBackground.png.meta deleted file mode 100644 index 152c8aa04d..0000000000 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/PopUpBackground.png.meta +++ /dev/null @@ -1,112 +0,0 @@ -fileFormatVersion: 2 -guid: ded605edc90204e32b89385728ee87ca -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - 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 - isReadable: 1 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: -1 - 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: 18, y: 165, z: 18, w: 165} - spriteGenerateFallbackPhysicsShape: 0 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 512 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 512 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 512 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 1f3bd8fceb4244fb3a7a42703c5df1f5 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUD.asmdef b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUD.asmdef index b77c767f61..f6b4f50e4b 100644 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUD.asmdef +++ b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUD.asmdef @@ -35,9 +35,9 @@ "GUID:d9a4800ebd3d742459c4760c04abca30", "GUID:a00bf0f127ed8470580555a29e48253d", "GUID:c4447d6e4315b45618cad98697304322", - "GUID:bf2ea772b384e4182a4a8e34d1ee0be4" + "GUID:bf2ea772b384e4182a4a8e34d1ee0be4", + "GUID:daec83ba2e04b42eabe45f268f743d9f" ], - "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": false, @@ -45,5 +45,6 @@ "precompiledReferences": [], "autoReferenced": true, "defineConstraints": [], - "versionDefines": [] + "versionDefines": [], + "noEngineReferences": false } \ No newline at end of file diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUDController.cs b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUDController.cs index 7a361701e0..d988f79f3e 100644 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUDController.cs +++ b/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUDController.cs @@ -62,6 +62,8 @@ private void Awake() public ControlsHUDController controlsHud => GetHUDElement(HUDElementID.CONTROLS_HUD) as ControlsHUDController; + public EmailPromptHUDController emailPromptHud => GetHUDElement(HUDElementID.EMAIL_PROMPT) as EmailPromptHUDController; + public Dictionary hudElements { get; private set; } = new Dictionary(); private UserProfile ownUserProfile => UserProfile.GetOwnUserProfile(); @@ -121,7 +123,8 @@ public enum HUDElementID NFT_INFO_DIALOG = 16, TELEPORT_DIALOG = 17, CONTROLS_HUD = 18, - COUNT = 19 + EMAIL_PROMPT = 19, + COUNT = 20 } [System.Serializable] @@ -289,6 +292,13 @@ public void ConfigureHUDElement(HUDElementID hudElementId, HUDConfiguration conf case HUDElementID.CONTROLS_HUD: CreateHudElement(configuration, hudElementId); break; + case HUDElementID.EMAIL_PROMPT: + if (emailPromptHud == null) + { + CreateHudElement(configuration, hudElementId); + } + emailPromptHud?.SetEnable(configuration.active); + break; } var hudElement = GetHUDElement(hudElementId); diff --git a/unity-client/Assets/Textures/UI/Button40.png b/unity-client/Assets/Textures/UI/Button40.png new file mode 100644 index 0000000000..b565f38088 --- /dev/null +++ b/unity-client/Assets/Textures/UI/Button40.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:feabd38d1c46f86ef322933829509fceca5600e665789a440065401b825b7d13 +size 420 diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/Ellipse.png.meta b/unity-client/Assets/Textures/UI/Button40.png.meta similarity index 79% rename from unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/Ellipse.png.meta rename to unity-client/Assets/Textures/UI/Button40.png.meta index 2d45507378..f0407957ae 100644 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/Ellipse.png.meta +++ b/unity-client/Assets/Textures/UI/Button40.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 8b5857541ef5a4a25a00670c951f9584 +guid: 7c67c1a311ba3489892ab89b094714e5 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 14, y: 0, z: 14, w: 0} spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 @@ -57,10 +57,11 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 128 + maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -69,20 +70,10 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 128 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 128 + maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -91,13 +82,14 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: ac915bdbc03bd4d68b45d6cdbb2e6732 + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/unity-client/Assets/Textures/UI/EmailHeader.png b/unity-client/Assets/Textures/UI/EmailHeader.png new file mode 100644 index 0000000000..bc548fb8b5 --- /dev/null +++ b/unity-client/Assets/Textures/UI/EmailHeader.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:549041c4e876b70785f6929088ed47582a380536a3396e6a95e818b092aaf05d +size 409586 diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/CloseButton.png.meta b/unity-client/Assets/Textures/UI/EmailHeader.png.meta similarity index 81% rename from unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/CloseButton.png.meta rename to unity-client/Assets/Textures/UI/EmailHeader.png.meta index 06fca01f6e..ed5ce68f2a 100644 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/CloseButton.png.meta +++ b/unity-client/Assets/Textures/UI/EmailHeader.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 56a66c6f10b324d7fbea4a1e8a29a1dc +guid: dcdf9cf86d2644e82b7712af42584c7c TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -57,10 +57,11 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 32 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -69,20 +70,10 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 32 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -91,13 +82,14 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 52204640323ff40139d5b2afc8d56dd1 + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/unity-client/Assets/Textures/UI/EmailInput.png b/unity-client/Assets/Textures/UI/EmailInput.png new file mode 100644 index 0000000000..4fd6861e7b --- /dev/null +++ b/unity-client/Assets/Textures/UI/EmailInput.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e53a85e44ecd415180a4b8f78a6a571329b82d9df592a172786222e262e072e8 +size 608 diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailImage.png.meta b/unity-client/Assets/Textures/UI/EmailInput.png.meta similarity index 79% rename from unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailImage.png.meta rename to unity-client/Assets/Textures/UI/EmailInput.png.meta index 36192fea40..2ee5ef2ca6 100644 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/EmailImage.png.meta +++ b/unity-client/Assets/Textures/UI/EmailInput.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 7d598c1eca58d4507b16d139b59641a4 +guid: 017eca2d81e3343959735e87d3b06c02 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 19, y: 19, z: 19, w: 19} spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 @@ -57,10 +57,11 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 512 + maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -69,20 +70,10 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 512 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 512 + maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -91,13 +82,14 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 4cc260302cd0a47f0beb77db4697fe97 + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/unity-client/Assets/Textures/UI/Radius11Shadow.png b/unity-client/Assets/Textures/UI/Radius11Shadow.png new file mode 100644 index 0000000000..8d9aa3718c --- /dev/null +++ b/unity-client/Assets/Textures/UI/Radius11Shadow.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c6133f5b2013e2e8646fcf9f5e161273e71a571cb44b85524a3c01b2844ebdb +size 1250 diff --git a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/MainButton.png.meta b/unity-client/Assets/Textures/UI/Radius11Shadow.png.meta similarity index 79% rename from unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/MainButton.png.meta rename to unity-client/Assets/Textures/UI/Radius11Shadow.png.meta index a87b58ccf8..9df4247144 100644 --- a/unity-client/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmailPromptHUD/Textures/MainButton.png.meta +++ b/unity-client/Assets/Textures/UI/Radius11Shadow.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 3663fab4245524d468599c96df19457e +guid: d35ae73176cdc4afaa2ef323399f3232 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 95, y: 14, z: 95, w: 14} + spriteBorder: {x: 19, y: 22, z: 19, w: 14} spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 @@ -57,10 +57,11 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 256 + maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -69,20 +70,10 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 256 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: WebGL - maxTextureSize: 256 + maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -91,13 +82,14 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 27ca51fd963c044ca8e3482209ca17dc + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/unity-client/Assets/Tutorial/Scripts/Tutorial.asmdef b/unity-client/Assets/Tutorial/Scripts/Tutorial.asmdef index 85135e1311..09b5a12441 100644 --- a/unity-client/Assets/Tutorial/Scripts/Tutorial.asmdef +++ b/unity-client/Assets/Tutorial/Scripts/Tutorial.asmdef @@ -1,12 +1,8 @@ { "name": "Onboarding", "references": [ - "GUID:3bdb7fe910cce8d4888137cded3ba4a2", - "GUID:e555144732b726c4cba5b0f6337fea75", "GUID:1de3566cccb280f4a982c59ad0d08c96", - "GUID:4720e174f2805c74bb7aa94cc8bb5bf8", - "GUID:9a1d7e67f710d724584ebbbd5614bcf1", - "GUID:77b5a911c82ebbd419d08251ca150702" + "GUID:4973650d2444c4561a15d50f24d91cd9" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/unity-client/Assets/Tutorial/Scripts/TutorialController.cs b/unity-client/Assets/Tutorial/Scripts/TutorialController.cs index 549e0b154f..fd46159806 100644 --- a/unity-client/Assets/Tutorial/Scripts/TutorialController.cs +++ b/unity-client/Assets/Tutorial/Scripts/TutorialController.cs @@ -1,6 +1,5 @@ -using DCL.Controllers; -using System.Collections; -using System.Collections.Generic; +using DCL.Interface; +using System; using UnityEngine; namespace DCL.Tutorial @@ -8,24 +7,33 @@ namespace DCL.Tutorial public class TutorialController : MonoBehaviour { public static TutorialController i { private set; get; } - public bool isTutorialEnabled { private set; get; } = false; + [Flags] + public enum TutorialStep + { + None = 0, + OldTutorialValue = 99, // NOTE: old tutorial set tutorialStep to 99 when finished + EmailRequested = 128 + } + public void SetTutorialEnabled() { - CommonScriptableObjects.rendererState.OnChange += OnRenderingStateChanged; isTutorialEnabled = true; } + public void SetStepCompleted(TutorialStep step) + { + WebInterface.SaveUserTutorialStep(GetTutorialStepFromProfile() | (int)step); + } + private void Awake() { i = this; } - private void OnDestroy() { - CommonScriptableObjects.rendererState.OnChange -= OnRenderingStateChanged; i = null; } @@ -33,10 +41,5 @@ private int GetTutorialStepFromProfile() { return UserProfile.GetOwnUserProfile().tutorialStep; } - - private void OnRenderingStateChanged(bool renderingEnabled, bool prevState) - { - if (!isTutorialEnabled || !renderingEnabled) return; - } } }