Browse Source

Add NotifyEnd to correct NarrativeLog

closes #938
Split Narrative Log Examples into WithSave and Simple

# Conflicts:
#	Assets/Fungus/Docs/CHANGELOG.txt
master
Steve Halliwell 3 years ago
parent
commit
55eed36586
  1. 1
      Assets/Fungus/Docs/CHANGELOG.txt
  2. 1
      Assets/Fungus/Scripts/Components/Writer.cs
  3. 2029
      Assets/FungusExamples/Conversation/NarrativeLogSimple.unity
  4. 0
      Assets/FungusExamples/Conversation/NarrativeLogSimple.unity.meta
  5. 0
      Assets/FungusExamples/Conversation/NarrativeLogWithSave.unity
  6. 8
      Assets/FungusExamples/Conversation/NarrativeLogWithSave.unity.meta

1
Assets/Fungus/Docs/CHANGELOG.txt

@ -13,6 +13,7 @@ Unreleased
- Block will LogError when an exception is caught from a Command being Executed. - Block will LogError when an exception is caught from a Command being Executed.
- WriterAudio.GetSecondsRemaining reports 0 if not playing. Thanks to KVinS. - WriterAudio.GetSecondsRemaining reports 0 if not playing. Thanks to KVinS.
- Add special case that skips variation logic for sequences that contains no elements, making no change. - Add special case that skips variation logic for sequences that contains no elements, making no change.
- Add NotifyEnd to Writer WaitForInputAndClear logic. Thanks to wolfrug.
v3.13.6 v3.13.6
====== ======

1
Assets/Fungus/Scripts/Components/Writer.cs

@ -789,6 +789,7 @@ namespace Fungus
if (clear) if (clear)
{ {
NotifyEnd(false);
textAdapter.Text = ""; textAdapter.Text = "";
} }

2029
Assets/FungusExamples/Conversation/NarrativeLogSimple.unity

File diff suppressed because it is too large Load Diff

0
Assets/FungusExamples/Conversation/NarrativeLog.unity.meta → Assets/FungusExamples/Conversation/NarrativeLogSimple.unity.meta

0
Assets/FungusExamples/Conversation/NarrativeLog.unity → Assets/FungusExamples/Conversation/NarrativeLogWithSave.unity

8
Assets/FungusExamples/Conversation/NarrativeLogWithSave.unity.meta

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 149ca09fa2df05f44b9457a7493bf275
timeCreated: 1487954686
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Loading…
Cancel
Save