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

Refactor Journal Script

Browse Source 
Refactored variable names and protection modifiers
This commit is contained in:
Minz
2023-07-16 23:09:17 +02:00
parent 1f57632e84
commit 64e56af504
2 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Scenes/Main.unity
View File

@@ -1285,12 +1285,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c0493f659bb4e67428b686920758641b, type: 3} m_Script: {fileID: 11500000, guid: c0493f659bb4e67428b686920758641b, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
journal: {fileID: 22208185} m_journal: {fileID: 22208185}
m_pageSound: {fileID: 8300000, guid: 9f4b6c8a11388384cbce1b85d03f053a, type: 3} m_pageSound: {fileID: 8300000, guid: 9f4b6c8a11388384cbce1b85d03f053a, type: 3}
m_openSound: {fileID: 8300000, guid: fd39bd6850cc59d4caec9846abe40cb7, type: 3} m_openSound: {fileID: 8300000, guid: fd39bd6850cc59d4caec9846abe40cb7, type: 3}
m_closeSound: {fileID: 8300000, guid: 451bd7638e5a31249b6fbcbfa1ed524a, type: 3} m_closeSound: {fileID: 8300000, guid: 451bd7638e5a31249b6fbcbfa1ed524a, type: 3}
adventurerPage: {fileID: 219076562} m_adventurerPage: {fileID: 219076562}
questPage: {fileID: 137465973} m_questPage: {fileID: 137465973}
--- !u!65 &243041994 --- !u!65 &243041994
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

56
Assets/Scripts/Journal.cs
View File

@@ -8,13 +8,13 @@ using UnityEngine.UI;
[RequireComponent(typeof(AudioSource))] [RequireComponent(typeof(AudioSource))]
public class Journal : MonoBehaviour public class Journal : MonoBehaviour
{ {
public GameObject journal; [SerializeField] private GameObject m_journal;
public AudioClip m_pageSound, m_openSound, m_closeSound; [SerializeField] private AudioClip m_pageSound, m_openSound, m_closeSound;
[SerializeField]
private Transform m_adventurerPage, m_questPage;
private List<CharacterData> m_availableAdventurers = new List<CharacterData>(); private List<CharacterData> m_availableAdventurers = new List<CharacterData>();
public Transform adventurerPage;
public Transform questPage;
private int m_selectedAdventurer = 0; private int m_selectedAdventurer = 0;
@@ -42,7 +42,6 @@ public class Journal : MonoBehaviour
foreach (var character in CharacterManager.Instance.CharacterDatas) foreach (var character in CharacterManager.Instance.CharacterDatas)
{ {
if (CharacterManager.Instance.CharacterInterviewed(character.name)) { if (CharacterManager.Instance.CharacterInterviewed(character.name)) {
Debug.Log("Available Adventurer:" + character.name);
m_availableAdventurers.Add(character); m_availableAdventurers.Add(character);
} }
} }
@@ -51,42 +50,41 @@ public class Journal : MonoBehaviour
if (m_availableAdventurers.Count > 0) if (m_availableAdventurers.Count > 0)
{ {
SetJournalAdventurerPage(m_selectedAdventurer); SetJournalAdventurerPage(m_selectedAdventurer);
adventurerPage.gameObject.SetActive(true); m_adventurerPage.gameObject.SetActive(true);
} }
journal.SetActive(true); m_journal.SetActive(true);
GetComponent<AudioSource>().PlayOneShot(m_openSound,1); GetComponent<AudioSource>().PlayOneShot(m_openSound,1);
//PlayerController.Instance.cameraMovement = false;
} }
public void CloseJournal() public void CloseJournal()
{ {
GetComponent<AudioSource>().PlayOneShot(m_closeSound,1); GetComponent<AudioSource>().PlayOneShot(m_closeSound,1);
journal.SetActive(false); m_journal.SetActive(false);
adventurerPage.gameObject.SetActive(false); m_adventurerPage.gameObject.SetActive(false);
PlayerController.Instance.cameraMovement = true; PlayerController.Instance.cameraMovement = true;
GameManager.Instance.uiManager.BlockInput(false); GameManager.Instance.uiManager.BlockInput(false);
} }
public void SetJournalAdventurerPage(int id) private void SetJournalAdventurerPage(int id)
{ {
CharacterData chara = m_availableAdventurers[id]; CharacterData chara = m_availableAdventurers[id];
adventurerPage.Find("AdventurerName").gameObject.GetComponent<TMP_Text>().text = chara.name; m_adventurerPage.Find("AdventurerName").gameObject.GetComponent<TMP_Text>().text = chara.name;
adventurerPage.Find("AdventurerAvatar").gameObject.GetComponent<Image>().sprite = chara.m_avatar; m_adventurerPage.Find("AdventurerAvatar").gameObject.GetComponent<Image>().sprite = chara.m_avatar;
string cv = ""; string cv = "";
foreach (var line in chara.m_dialogueOptions) foreach (var line in chara.m_dialogueOptions)
{ {
cv += $"- {line.bulletizedText}\n"; cv += $"- {line.bulletizedText}\n";
} }
adventurerPage.Find("AdventurerCV").gameObject.GetComponent<TMP_Text>().text = cv; m_adventurerPage.Find("AdventurerCV").gameObject.GetComponent<TMP_Text>().text = cv;
} }
public void SetJournalQuestPage() private void SetJournalQuestPage()
{ {
Quest quest = QuestManager.Instance.GetActiveQuest(); Quest quest = QuestManager.Instance.GetActiveQuest();
questPage.Find("QuestName").gameObject.GetComponent<TMP_Text>().text = quest.name; m_questPage.Find("QuestName").gameObject.GetComponent<TMP_Text>().text = quest.name;
questPage.Find("QuestDescription").gameObject.GetComponent<TMP_Text>().text = quest.description; m_questPage.Find("QuestDescription").gameObject.GetComponent<TMP_Text>().text = quest.description;
} }
public void NextAdventurer() public void NextAdventurer()
@@ -113,37 +111,35 @@ public class Journal : MonoBehaviour
{ {
Quest activeQuest = QuestManager.Instance.GetActiveQuest(); Quest activeQuest = QuestManager.Instance.GetActiveQuest();
bool success = QuestManager.Instance.RunQuestWithAdventurer(m_availableAdventurers[m_selectedAdventurer], activeQuest); bool success = QuestManager.Instance.RunQuestWithAdventurer(m_availableAdventurers[m_selectedAdventurer], activeQuest);
Debug.Log("THE QUESTR ESULT WAS: " + success); m_adventurerPage.gameObject.SetActive(false);
adventurerPage.gameObject.SetActive(false);
questPage.Find("QuestResult").gameObject.SetActive(true); m_questPage.Find("QuestResult").gameObject.SetActive(true);
if (success) if (success)
{ {
questPage.Find("QuestResult/NextQuest").gameObject.SetActive(true); m_questPage.Find("QuestResult/NextQuest").gameObject.SetActive(true);
questPage.Find("QuestResult/RetryQuest").gameObject.SetActive(false); m_questPage.Find("QuestResult/RetryQuest").gameObject.SetActive(false);
} else } else
{ {
questPage.Find("QuestResult/NextQuest").gameObject.SetActive(false); m_questPage.Find("QuestResult/NextQuest").gameObject.SetActive(false);
questPage.Find("QuestResult/RetryQuest").gameObject.SetActive(true); m_questPage.Find("QuestResult/RetryQuest").gameObject.SetActive(true);
} }
questPage.Find("QuestResult/QuestResultText").gameObject.GetComponent<TMP_Text>().text = success ? activeQuest.successStr : activeQuest.failedStr; m_questPage.Find("QuestResult/QuestResultText").gameObject.GetComponent<TMP_Text>().text = success ? activeQuest.successStr : activeQuest.failedStr;
} }
public void StartNextQuest() public void StartNextQuest()
{ {
Debug.Log("Starting next day"); Debug.Log("Starting next day");
questPage.Find("QuestResult").gameObject.SetActive(false); m_questPage.Find("QuestResult").gameObject.SetActive(false);
QuestManager.Instance.NextQuest(); QuestManager.Instance.NextQuest();
CloseJournal(); CloseJournal();
Debug.Log("Started next quest");
} }
public void RetryQuest() public void RetryQuest()
{ {
Debug.Log("Retrying quest"); Debug.Log("Retrying quest");
questPage.Find("QuestResult").gameObject.SetActive(false); m_questPage.Find("QuestResult").gameObject.SetActive(false);
QuestManager.Instance.RetryQuest(); QuestManager.Instance.RetryQuest();
CloseJournal(); CloseJournal();
} }