tschesky/AppleHillsProduction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working Dialogue

Browse Source
This commit is contained in:
Michal Pikulski
2025-09-28 11:56:13 +02:00
parent 665cfa89c6
commit 02031335e3
5 changed files with 158 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Editor/Dialogue/DialogueGraphImporter.cs
View File

@@ -48,6 +48,9 @@ namespace Editor.Dialogue
// Process node based on its type
if (iNode is DialogueNode dialogueNode)
{
// Process base dialogue node properties (for all node types)
ProcessDialogueNodeBase(dialogueNode, runtimeNode);
if (iNode is WaitOnPuzzleStep puzzleNode)
{
ProcessPuzzleNode(puzzleNode, runtimeNode);
@@ -60,9 +63,6 @@ namespace Editor.Dialogue
{
ProcessSlotNode(slotNode, runtimeNode);
}
// Process base dialogue node properties (for all node types)
ProcessDialogueNodeBase(dialogueNode, runtimeNode);
}
else if (iNode is EndNode)
{

100
Assets/Scripts/Dialogue/DialogueComponent.cs
View File

@@ -46,7 +46,7 @@ namespace Dialogue
}
// Auto-start the dialogue
StartDialogue();
// StartDialogue();
var interactable = GetComponent<Interactable>();
if (interactable != null)
@@ -54,15 +54,26 @@ namespace Dialogue
interactable.characterArrived.AddListener(OnCharacterArrived);
}
if (HasAnyLines())
// Update bubble visibility based on whether we have lines
if (speechBubble != null)
{
speechBubble.SetText(". . .");
speechBubble.UpdatePromptVisibility(HasAnyLines());
}
}
private void OnCharacterArrived()
{
speechBubble.SetText(GetCurrentDialogueLine());
if (speechBubble == null || ! HasAnyLines()) return;
AdvanceDialogueState();
// Get the current dialogue line
string line = GetCurrentDialogueLine();
// Display the line with the new method that handles timed updates
speechBubble.DisplayDialogueLine(line, HasAnyLines());
// Advance dialogue state for next interaction
}
private void OnDestroy()
@@ -100,6 +111,12 @@ namespace Dialogue
// Process the node
ProcessCurrentNode();
// Update bubble visibility based on whether we have lines
if (speechBubble != null)
{
speechBubble.UpdatePromptVisibility(HasAnyLines());
}
}
/// <summary>
@@ -124,9 +141,6 @@ namespace Dialogue
currentLine = currentNode.dialogueLines[currentLineIndex];
}
// Advance dialogue state for next interaction
AdvanceDialogueState();
// Return the current line
return currentLine;
}
@@ -139,10 +153,6 @@ namespace Dialogue
if (!IsActive || IsCompleted || currentNode == null)
return;
// If we're on a conditional node, we can't advance past it until condition is met
if (IsWaitingForCondition())
return;
// If we have more lines in the current node, advance to the next line
if (currentLineIndex < currentNode.dialogueLines.Count - 1)
{
@@ -157,8 +167,19 @@ namespace Dialogue
return;
}
// Otherwise, move to the next node
MoveToNextNode();
// If we're at a node that doesn't have a next node, we're done
if (string.IsNullOrEmpty(currentNode.nextNodeID))
{
IsActive = false;
IsCompleted = true;
return;
}
// Move to the next node only if no conditions to wait for
if (!IsWaitingForCondition())
{
MoveToNextNode();
}
}
private void MoveToNextNode()
@@ -246,7 +267,16 @@ namespace Dialogue
{
// Move to next node automatically when condition is met
MoveToNextNode();
OnDialogueChanged?.Invoke(GetCurrentDialogueLine());
// Notify any listeners about the dialogue change
string line = GetCurrentDialogueLine();
OnDialogueChanged?.Invoke(line);
// Update bubble visibility after state change
if (speechBubble != null)
{
speechBubble.UpdatePromptVisibility(HasAnyLines());
}
}
}
@@ -262,7 +292,22 @@ namespace Dialogue
{
// Move to next node automatically when condition is met
MoveToNextNode();
OnDialogueChanged?.Invoke(GetCurrentDialogueLine());
// Notify any listeners about the dialogue change
string line = GetCurrentDialogueLine();
OnDialogueChanged?.Invoke(line);
// Update bubble visibility after state change
if (speechBubble != null)
{
speechBubble.UpdatePromptVisibility(HasAnyLines());
}
}
// Always check if any dialogue was unblocked by this pickup
if (speechBubble != null)
{
speechBubble.UpdatePromptVisibility(HasAnyLines());
}
}
@@ -278,7 +323,22 @@ namespace Dialogue
{
// Move to next node automatically when condition is met
MoveToNextNode();
OnDialogueChanged?.Invoke(GetCurrentDialogueLine());
// Notify any listeners about the dialogue change
string line = GetCurrentDialogueLine();
OnDialogueChanged?.Invoke(line);
// Update bubble visibility after state change
if (speechBubble != null)
{
speechBubble.UpdatePromptVisibility(HasAnyLines());
}
}
// Always check if any dialogue was unblocked by this slotting
if (speechBubble != null)
{
speechBubble.UpdatePromptVisibility(HasAnyLines());
}
}
@@ -373,10 +433,10 @@ namespace Dialogue
}
// Special case for conditional nodes waiting on conditions
if (IsWaitingForCondition())
{
return currentNode.dialogueLines.Count > 0;
}
// if (IsWaitingForCondition())
// {
// return currentNode.dialogueLines.Count > 0;
// }
return false;
}

70
Assets/Scripts/Dialogue/SpeechBubble.cs
View File

@@ -23,8 +23,11 @@ namespace Dialogue
[SerializeField] private AudioSource typingSoundSource;
[SerializeField] private float typingSoundFrequency = 3; // Play sound every X characters
[SerializeField] private bool useRichText = true; // Whether to respect rich text tags
[SerializeField] private float dialogueDisplayTime = 1.5f; // Time in seconds to display dialogue before showing prompt
[SerializeField] private string dialoguePromptText = ". . ."; // Text to show as a prompt for available dialogue
private Coroutine typewriterCoroutine;
private Coroutine promptUpdateCoroutine;
private string currentFullText = string.Empty;
private bool isVisible = false;
@@ -56,6 +59,13 @@ namespace Dialogue
StopCoroutine(typewriterCoroutine);
typewriterCoroutine = null;
}
// Stop any prompt update coroutine
if (promptUpdateCoroutine != null)
{
StopCoroutine(promptUpdateCoroutine);
promptUpdateCoroutine = null;
}
}
/// <summary>
@@ -106,6 +116,66 @@ namespace Dialogue
Show();
}
/// <summary>
/// Display a dialogue line and handle prompt visibility afterward
/// </summary>
/// <param name="line">The dialogue line to display</param>
/// <param name="hasMoreDialogue">Whether there are more dialogue lines available</param>
public void DisplayDialogueLine(string line, bool hasMoreDialogue)
{
// Cancel any existing prompt update
if (promptUpdateCoroutine != null)
{
StopCoroutine(promptUpdateCoroutine);
promptUpdateCoroutine = null;
}
// Display the dialogue line
if (!string.IsNullOrEmpty(line))
{
SetText(line);
// After a delay, update the prompt visibility
promptUpdateCoroutine = StartCoroutine(UpdatePromptAfterDelay(hasMoreDialogue));
}
else
{
// If no line to display, update prompt visibility immediately
UpdatePromptVisibility(hasMoreDialogue);
}
}
/// <summary>
/// Update the speech bubble to either show a prompt or hide based on dialogue availability
/// </summary>
/// <param name="hasDialogueAvailable">Whether dialogue is available</param>
public void UpdatePromptVisibility(bool hasDialogueAvailable)
{
if (hasDialogueAvailable)
{
Show();
SetText(dialoguePromptText);
}
else
{
Hide();
}
}
/// <summary>
/// Coroutine to update the prompt visibility after a delay
/// </summary>
private IEnumerator UpdatePromptAfterDelay(bool hasMoreDialogue)
{
// Wait for the configured display time
yield return new WaitForSeconds(dialogueDisplayTime);
// Update the prompt visibility
UpdatePromptVisibility(hasMoreDialogue);
promptUpdateCoroutine = null;
}
/// <summary>
/// Change the display mode
/// </summary>

1
Assets/Scripts/Dialogue/SpeechBubbleController.cs Normal file
View File

@@ -0,0 +1 @@


3
Assets/Scripts/Dialogue/SpeechBubbleController.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 877344c7a0014922bc3a2a469e03792d
timeCreated: 1759050622