Browse Source

Merge pull request #607 from PillowFightIo/saydialog-virtual-methods

Make additional methods in SayDialog virtual
master
Chris Gregan 8 years ago committed by GitHub
parent
commit
bdd6f01465
  1. 14
      Assets/Fungus/Scripts/Components/SayDialog.cs

14
Assets/Fungus/Scripts/Components/SayDialog.cs

@ -61,7 +61,7 @@ namespace Fungus
// Cache active Say Dialogs to avoid expensive scene search // Cache active Say Dialogs to avoid expensive scene search
protected static List<SayDialog> activeSayDialogs = new List<SayDialog>(); protected static List<SayDialog> activeSayDialogs = new List<SayDialog>();
protected void Awake() protected virtual void Awake()
{ {
if (!activeSayDialogs.Contains(this)) if (!activeSayDialogs.Contains(this))
{ {
@ -69,12 +69,12 @@ namespace Fungus
} }
} }
protected void OnDestroy() protected virtual void OnDestroy()
{ {
activeSayDialogs.Remove(this); activeSayDialogs.Remove(this);
} }
protected Writer GetWriter() protected virtual Writer GetWriter()
{ {
if (writer != null) if (writer != null)
{ {
@ -90,7 +90,7 @@ namespace Fungus
return writer; return writer;
} }
protected CanvasGroup GetCanvasGroup() protected virtual CanvasGroup GetCanvasGroup()
{ {
if (canvasGroup != null) if (canvasGroup != null)
{ {
@ -106,7 +106,7 @@ namespace Fungus
return canvasGroup; return canvasGroup;
} }
protected WriterAudio GetWriterAudio() protected virtual WriterAudio GetWriterAudio()
{ {
if (writerAudio != null) if (writerAudio != null)
{ {
@ -122,7 +122,7 @@ namespace Fungus
return writerAudio; return writerAudio;
} }
protected void Start() protected virtual void Start()
{ {
// Dialog always starts invisible, will be faded in when writing starts // Dialog always starts invisible, will be faded in when writing starts
GetCanvasGroup().alpha = 0f; 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 // We need to update the cached list every time the Say Dialog is enabled
// due to an initialization order issue after loading scenes. // due to an initialization order issue after loading scenes.

Loading…
Cancel
Save