From 6b34ee2401ccfd198272b2e1db1bb28ae36c1f89 Mon Sep 17 00:00:00 2001 From: PHILIP WHITE Date: Mon, 5 Feb 2024 17:19:01 +0000 Subject: [PATCH] Update Dialogue to be Able to Click to Progress --- EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset | 4 ++-- EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset | 2 +- EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset | 2 +- EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset | 4 ++-- .../DialogueSystem/AC_PlayerDialogueInterpreter.cpp | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset b/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset index 085864ef..f2032bc7 100644 --- a/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset +++ b/EndlessVendetta/Content/Dialogue/BP_DialogueUI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35908c5dcdb5143afd98a83341d8cb46d90ab1430b3d365f1b4707d85c793c70 -size 224018 +oid sha256:18f25031baa2166bb6085631ad0d09eacb61140da74137347709274b8caac5ca +size 233135 diff --git a/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset b/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset index 4fc01cf4..bf26a840 100644 --- a/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset +++ b/EndlessVendetta/Content/MainMenu/Music/Manu_maybe_3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb8f4c9f8b54f6f6bf65b0d41ff7f1ea5c8a9c25e494a0ceae061faa431279f9 +oid sha256:d6b53e65d1478291402898cdcc39158cedac1091873500d8429a0050ba4b6e40 size 6023064 diff --git a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset index 41087f44..48b24b2a 100644 --- a/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset +++ b/EndlessVendetta/Content/MainMenu/Music/Menu_maybe_3_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1d6ac457cec4cc6d963b0522d8adbd8ce6e90f7e1d290c482c548cb596017c4 +oid sha256:a9a4773b9ec5db370898639bd618f51024a541b99b41ab8ea5b33b43ac341947 size 15907164 diff --git a/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset b/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset index 2cc1da9e..364b534b 100644 --- a/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset +++ b/EndlessVendetta/Content/PauseMenu/PauseMenuBackground.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f5ba48d09af24b7bd6d2265d08899b4e0237ac470f4b9d9326ed388289b5ce6 -size 47717 +oid sha256:e859baaadbcc2e64ec682e5450d17cca1b1d3040358c6ccce4366300054a29bf +size 47812 diff --git a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp index ee03cad5..40096b70 100644 --- a/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/DialogueSystem/AC_PlayerDialogueInterpreter.cpp @@ -69,6 +69,7 @@ void UAC_PlayerDialogueInterpreter::StartDialogue(UDialogueTree* DialogueTree) void UAC_PlayerDialogueInterpreter::NextDialogue() { if (!IsValid(CurrentTextNode)) return; + if (IsValid(CurrentChoiceNode)) return; if (CurrentTextNode->ChildrenNodes.Num() == 0) { EndDialogue();