Browse Source

Renamed Fade Out to Fade When Done

More descriptive and doesn’t alias the old Fade Out property (meaning
has changed).
master
chrisgregan 10 years ago
parent
commit
cc43ca7777
  1. 6
      Assets/Fungus/Narrative/Editor/SayEditor.cs
  2. 4
      Assets/Fungus/Narrative/Scripts/Commands/Say.cs

6
Assets/Fungus/Narrative/Editor/SayEditor.cs

@ -78,7 +78,7 @@ namespace Fungus
protected SerializedProperty showAlwaysProp;
protected SerializedProperty showCountProp;
protected SerializedProperty extendPreviousProp;
protected SerializedProperty fadeOutProp;
protected SerializedProperty fadeWhenDoneProp;
protected SerializedProperty waitForClickProp;
protected SerializedProperty setSayDialogProp;
@ -95,7 +95,7 @@ namespace Fungus
showAlwaysProp = serializedObject.FindProperty("showAlways");
showCountProp = serializedObject.FindProperty("showCount");
extendPreviousProp = serializedObject.FindProperty("extendPrevious");
fadeOutProp = serializedObject.FindProperty("fadeOut");
fadeWhenDoneProp = serializedObject.FindProperty("fadeWhenDone");
waitForClickProp = serializedObject.FindProperty("waitForClick");
setSayDialogProp = serializedObject.FindProperty("setSayDialog");
@ -188,7 +188,7 @@ namespace Fungus
rightButton.fontSize = 10;
rightButton.font = EditorStyles.toolbarButton.font;
EditorGUILayout.PropertyField(fadeOutProp);
EditorGUILayout.PropertyField(fadeWhenDoneProp);
EditorGUILayout.PropertyField(waitForClickProp);
EditorGUILayout.PropertyField(setSayDialogProp);

4
Assets/Fungus/Narrative/Scripts/Commands/Say.cs

@ -37,7 +37,7 @@ namespace Fungus
public bool extendPrevious = false;
[Tooltip("Fade out the dialog box when writing has finished and not waiting for input.")]
public bool fadeOut = true;
public bool fadeWhenDone = true;
[Tooltip("Wait for player to click before continuing.")]
public bool waitForClick = true;
@ -90,7 +90,7 @@ namespace Fungus
string subbedText = flowchart.SubstituteVariables(displayText);
sayDialog.Say(subbedText, !extendPrevious, waitForClick, fadeOut, voiceOverClip, delegate {
sayDialog.Say(subbedText, !extendPrevious, waitForClick, fadeWhenDone, voiceOverClip, delegate {
Continue();
});
}

Loading…
Cancel
Save