From e9bcb45b410a2f7bd223dcb20435ed48bf794087 Mon Sep 17 00:00:00 2001 From: cyndrdev Date: Fri, 16 Apr 2021 13:15:54 +0100 Subject: [PATCH] fixed bug #127 --- game/Assets/Prefabs/UI/Canvas.prefab | 12 ++++++++++++ game/Assets/Scripts/Artefacts/PickUpDisplay.cs | 9 +++++++++ 2 files changed, 21 insertions(+) diff --git a/game/Assets/Prefabs/UI/Canvas.prefab b/game/Assets/Prefabs/UI/Canvas.prefab index 2283f72..c3d21d9 100644 --- a/game/Assets/Prefabs/UI/Canvas.prefab +++ b/game/Assets/Prefabs/UI/Canvas.prefab @@ -155,6 +155,7 @@ MonoBehaviour: dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2} artefacts: {fileID: 11400000, guid: f523ac0d77530064b8b41c627b13fae0, type: 2} _preview: {fileID: 0} + _continueButton: {fileID: 3941142919679305063} _uiOpen: {fileID: 11400000, guid: 0fc36e00903fc7047b48bb1844e6f12b, type: 2} _uiClose: {fileID: 11400000, guid: d8c4272694282b64e9cd1d4a42477262, type: 2} --- !u!225 &225077497674743764 @@ -360,6 +361,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 3868137226220198580, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} m_PrefabInstance: {fileID: 225077497674743761} m_PrefabAsset: {fileID: 0} +--- !u!114 &3941142919679305063 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3868137226220198582, guid: c2de9a6eb50967e4cbd6d654a8ecbcf1, type: 3} + m_PrefabInstance: {fileID: 225077497674743761} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3941142919679305061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6808448286065587779 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/game/Assets/Scripts/Artefacts/PickUpDisplay.cs b/game/Assets/Scripts/Artefacts/PickUpDisplay.cs index e12ee21..0c891d6 100644 --- a/game/Assets/Scripts/Artefacts/PickUpDisplay.cs +++ b/game/Assets/Scripts/Artefacts/PickUpDisplay.cs @@ -47,6 +47,9 @@ public class PickUpDisplay : MonoBehaviour [SerializeField] private ArtefactSystem artefacts; [SerializeField] private ArtefactPreview _preview; + [SerializeField] + private Button _continueButton; + [SerializeField] private GameEvent _uiOpen; @@ -60,6 +63,7 @@ public class PickUpDisplay : MonoBehaviour private void Start() { EventHandler.current.onArtefactUI += PopUpOn; + _continueButton.enabled = false; } private IEnumerator AnimateIn() @@ -127,12 +131,17 @@ public class PickUpDisplay : MonoBehaviour yield return null; } + + _continueButton.enabled = true; + _continueButton.Select(); } private IEnumerator AnimateOut() { yield return null; bool isComplete = false; + + _continueButton.enabled = false; foreach ( var fader in _fadeInElements ) {