From 56b86c20ca0bb2f453c160f5d6be88ddd8fc7242 Mon Sep 17 00:00:00 2001 From: Conrad Kreyling Date: Wed, 12 Apr 2017 16:20:39 -0400 Subject: [PATCH] Make additional methods in SayDialog virtual Makes the following methods virtual in SayDialog: - Awake - OnDestroy - GetWriter - GetCanvasGroup - GetWriterAudio - Start - OnEnable --- Assets/Fungus/Scripts/Components/SayDialog.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/Fungus/Scripts/Components/SayDialog.cs b/Assets/Fungus/Scripts/Components/SayDialog.cs index a3b15475..a940cfb2 100644 --- a/Assets/Fungus/Scripts/Components/SayDialog.cs +++ b/Assets/Fungus/Scripts/Components/SayDialog.cs @@ -61,7 +61,7 @@ namespace Fungus // Cache active Say Dialogs to avoid expensive scene search protected static List activeSayDialogs = new List(); - protected void Awake() + protected virtual void Awake() { if (!activeSayDialogs.Contains(this)) { @@ -69,12 +69,12 @@ namespace Fungus } } - protected void OnDestroy() + protected virtual void OnDestroy() { activeSayDialogs.Remove(this); } - protected Writer GetWriter() + protected virtual Writer GetWriter() { if (writer != null) { @@ -90,7 +90,7 @@ namespace Fungus return writer; } - protected CanvasGroup GetCanvasGroup() + protected virtual CanvasGroup GetCanvasGroup() { if (canvasGroup != null) { @@ -106,7 +106,7 @@ namespace Fungus return canvasGroup; } - protected WriterAudio GetWriterAudio() + protected virtual WriterAudio GetWriterAudio() { if (writerAudio != null) { @@ -122,7 +122,7 @@ namespace Fungus return writerAudio; } - protected void Start() + protected virtual void Start() { // Dialog always starts invisible, will be faded in when writing starts GetCanvasGroup().alpha = 0f; @@ -149,7 +149,7 @@ namespace Fungus } } - protected void OnEnable() + protected virtual void OnEnable() { // We need to update the cached list every time the Say Dialog is enabled // due to an initialization order issue after loading scenes.