From 8cfb822ddfc263f41aff2b4b1752cd5c5924cd56 Mon Sep 17 00:00:00 2001 From: Steve Halliwell Date: Sat, 19 Sep 2020 15:54:44 +1000 Subject: [PATCH] Update Changelog Change portrait move to front to operate on holder rather than image Bump Unity bugfix version --- Assets/Fungus/Docs/CHANGELOG.txt | 4 ++++ Assets/Fungus/Scripts/Components/PortraitController.cs | 2 +- ProjectSettings/ProjectVersion.txt | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Assets/Fungus/Docs/CHANGELOG.txt b/Assets/Fungus/Docs/CHANGELOG.txt index 9a9c58db..0a0871a0 100644 --- a/Assets/Fungus/Docs/CHANGELOG.txt +++ b/Assets/Fungus/Docs/CHANGELOG.txt @@ -4,6 +4,10 @@ Changelog {#changelog} Unreleased ====== +## Fixed + + - LoadVariable leaves variable unchanged if key not found, previously was setting to default. Thanks to CG-Tespy. + - Portrait MoveToFront now correctly moves holder rather than underlying image itself. Thanks to iwanPlays. v3.13.5 ====== diff --git a/Assets/Fungus/Scripts/Components/PortraitController.cs b/Assets/Fungus/Scripts/Components/PortraitController.cs index f3e2b4b3..df1d9f9b 100644 --- a/Assets/Fungus/Scripts/Components/PortraitController.cs +++ b/Assets/Fungus/Scripts/Components/PortraitController.cs @@ -390,7 +390,7 @@ namespace Fungus /// public virtual void MoveToFront(PortraitOptions options) { - options.character.State.portraitImage.transform.parent.SetSiblingIndex(options.character.State.portraitImage.transform.parent.parent.childCount); + options.character.State.holder.SetSiblingIndex(options.character.State.holder.parent.childCount); options.character.State.display = DisplayType.MoveToFront; FinishCommand(options); } diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index be58fed7..a12731e7 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.9f1 -m_EditorVersionWithRevision: 2019.4.9f1 (50fe8a171dd9) +m_EditorVersion: 2019.4.10f1 +m_EditorVersionWithRevision: 2019.4.10f1 (5311b3af6f69)