KittenBox/gmtk-2023
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7 from JanGross/character_panel_tweaks

Browse Source 
Character panel tweaks
This commit is contained in:
Amaan Shawkath
2023-07-08 21:37:01 +01:00
committed by GitHub
parent e2e4f55caa bbcb6861c8
commit 77aaf1e0a7
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Scripts/DialogueSystem/DialogueController.cs
View File

@@ -29,10 +29,9 @@ public class DialogueController : MonoBehaviour
Debug.Log($"DialogueController: Character {characterName} finished interviewing"); Debug.Log($"DialogueController: Character {characterName} finished interviewing");
CharacterManager.Instance.SetInterviewed(characterName); CharacterManager.Instance.SetInterviewed(characterName);
PlayerController.Instance.cameraMovement = true; PlayerController.Instance.cameraMovement = true;
// TODO: stop the dialogue and return to gameplay...
// TODO: we could probably show a "Quit" button highlighted. m_dialoguePanel.gameObject.SetActive(false);
} }
public void Debug_NextCharacter() public void Debug_NextCharacter()

13
Assets/Scripts/DialogueSystem/UI/DialoguePanel.cs
View File

@@ -57,8 +57,17 @@ public class DialoguePanel : MonoBehaviour
m_characterText.text = "Select an option..."; m_characterText.text = "Select an option...";
SetupCharacterSheet(); SetupCharacterSheet();
m_characterSheet.SetName(characterData.name);
m_characterSheet.gameObject.SetActive(true); if (CharacterManager.Instance.CharacterInterviewed(characterData.name))
{
m_characterSheet.SetName(characterData.name);
m_characterSheet.gameObject.SetActive(true);
// Hide the dialogue panel.
gameObject.SetActive(false);
return;
}
m_questionIndexAsked.Clear(); m_questionIndexAsked.Clear();
m_questionHolder.gameObject.SetActive(true); m_questionHolder.gameObject.SetActive(true);