From 6e8da919f15659f9eb1d77cd8b970a452ef1f072 Mon Sep 17 00:00:00 2001 From: Alexey Date: Wed, 7 Oct 2020 17:11:38 +0500 Subject: [PATCH] Fix post-account linking behaviour and incorrect profile button icon --- .../Pages/MainMenu/MainMenuPage.prefab | 58 +++++++++---------- .../Scripts/Profile/AccountLinkingManager.cs | 7 ++- .../Scripts/StorePageHeader/UserInfoDrawer.cs | 11 +++- 3 files changed, 44 insertions(+), 32 deletions(-) diff --git a/Assets/Xsolla/Core/DemoTemplates/Prefabs/Pages/MainMenu/MainMenuPage.prefab b/Assets/Xsolla/Core/DemoTemplates/Prefabs/Pages/MainMenu/MainMenuPage.prefab index 4ed02b7..44e88dc 100644 --- a/Assets/Xsolla/Core/DemoTemplates/Prefabs/Pages/MainMenu/MainMenuPage.prefab +++ b/Assets/Xsolla/Core/DemoTemplates/Prefabs/Pages/MainMenu/MainMenuPage.prefab @@ -417,10 +417,15 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7587026821285697340} m_Modifications: - - target: {fileID: 9222053914038295102, guid: 313119b61942d4d1daf3dc74eff589e6, + - target: {fileID: 8187776351546866063, guid: 313119b61942d4d1daf3dc74eff589e6, type: 3} - propertyPath: m_Name - value: MainMenu + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8187776351546866063, guid: 313119b61942d4d1daf3dc74eff589e6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 9222053914038295103, guid: 313119b61942d4d1daf3dc74eff589e6, type: 3} @@ -527,15 +532,10 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8187776351546866063, guid: 313119b61942d4d1daf3dc74eff589e6, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8187776351546866063, guid: 313119b61942d4d1daf3dc74eff589e6, + - target: {fileID: 9222053914038295102, guid: 313119b61942d4d1daf3dc74eff589e6, type: 3} - propertyPath: m_SizeDelta.y - value: 0 + propertyPath: m_Name + value: MainMenu objectReference: {fileID: 0} - target: {fileID: 1926405838632996097, guid: 313119b61942d4d1daf3dc74eff589e6, type: 3} @@ -1100,30 +1100,30 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 152bec8f0073348f998b57e8d0d2d56c, type: 3} ---- !u!114 &3577866936241823370 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6407966649620933387, guid: 152bec8f0073348f998b57e8d0d2d56c, +--- !u!1 &2907123844323223260 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4688991624373441373, guid: 152bec8f0073348f998b57e8d0d2d56c, type: 3} m_PrefabInstance: {fileID: 7587026821006996865} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2907123844323223260} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 324f3b63bb596476ea74d1b010da30f0, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &3069828688384664753 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4886599519023862064, guid: 152bec8f0073348f998b57e8d0d2d56c, type: 3} m_PrefabInstance: {fileID: 7587026821006996865} m_PrefabAsset: {fileID: 0} ---- !u!1 &2907123844323223260 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4688991624373441373, guid: 152bec8f0073348f998b57e8d0d2d56c, +--- !u!114 &3577866936241823370 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6407966649620933387, guid: 152bec8f0073348f998b57e8d0d2d56c, type: 3} m_PrefabInstance: {fileID: 7587026821006996865} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2907123844323223260} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 324f3b63bb596476ea74d1b010da30f0, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &7587026821359198512 PrefabInstance: m_ObjectHideFlags: 0 @@ -1315,11 +1315,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7587026821285697340} m_Modifications: - - target: {fileID: 3581749019319966985, guid: 7b3e54198160d4b519fe3231112b0478, - type: 3} - propertyPath: m_Name - value: XsollusLargeLogo - objectReference: {fileID: 0} - target: {fileID: 3581749019319966990, guid: 7b3e54198160d4b519fe3231112b0478, type: 3} propertyPath: m_LocalPosition.x @@ -1425,6 +1420,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 3581749019319966985, guid: 7b3e54198160d4b519fe3231112b0478, + type: 3} + propertyPath: m_Name + value: XsollusLargeLogo + objectReference: {fileID: 0} - target: {fileID: 3581749020015185276, guid: 7b3e54198160d4b519fe3231112b0478, type: 3} propertyPath: m_AnchorMin.y @@ -1711,7 +1711,7 @@ PrefabInstance: type: 3} propertyPath: pressedStateSprite value: - objectReference: {fileID: 21300000, guid: 4907ec2f56acb467082a7dd60c66f824, + objectReference: {fileID: 21300000, guid: 368e0ac8493174310bfc8383c4443bac, type: 3} - target: {fileID: 3547370729128751038, guid: 8a7604a292124488388498e3d582c635, type: 3} diff --git a/Assets/Xsolla/Core/DemoTemplates/Scripts/Profile/AccountLinkingManager.cs b/Assets/Xsolla/Core/DemoTemplates/Scripts/Profile/AccountLinkingManager.cs index baae1cd..587ac14 100644 --- a/Assets/Xsolla/Core/DemoTemplates/Scripts/Profile/AccountLinkingManager.cs +++ b/Assets/Xsolla/Core/DemoTemplates/Scripts/Profile/AccountLinkingManager.cs @@ -1,4 +1,5 @@ -using System; +#define LoginDemo +using System; using UnityEngine; using Xsolla.Core; using Xsolla.Core.Popup; @@ -74,6 +75,9 @@ private void OnSuccessConsoleLogin(string newToken) private void ApplyNewToken(string newToken) { DemoController.Instance.GetImplementation().Token = newToken; +#if LoginDemo + FindObjectOfType()?.Refresh(); +#elif StoreDemo DemoController.Instance.SetState(MenuState.Main); UserInventory.Instance.Refresh(onSuccess: GoToInventory, onError: StoreDemoPopup.ShowError); } @@ -81,6 +85,7 @@ private void ApplyNewToken(string newToken) private void GoToInventory() { DemoController.Instance.SetState(MenuState.Inventory); +#endif } private void ShowCodeConfirmation(Action callback) diff --git a/Assets/Xsolla/Core/DemoTemplates/Scripts/StorePageHeader/UserInfoDrawer.cs b/Assets/Xsolla/Core/DemoTemplates/Scripts/StorePageHeader/UserInfoDrawer.cs index 8543958..8983af3 100644 --- a/Assets/Xsolla/Core/DemoTemplates/Scripts/StorePageHeader/UserInfoDrawer.cs +++ b/Assets/Xsolla/Core/DemoTemplates/Scripts/StorePageHeader/UserInfoDrawer.cs @@ -25,6 +25,13 @@ IEnumerator Start() }, _ => busy = false); yield return new WaitWhile(() => busy); - Destroy(this, 0.1F); - } + //Destroy(this, 0.1F); + this.gameObject.SetActive(false); + this.gameObject.SetActive(true); + } + + public void Refresh() + { + StartCoroutine(Start()); + } }