Merge branch 'master' into journal_ui

Fix quest retry
Fix journal UI scaling
2023-07-09 12:08:58 +02:00 · 2023-07-09 12:05:51 +02:00 · 2023-07-08 22:38:35 +02:00
8 changed files with 250 additions and 1479 deletions
--- a/Assets/Images/Adventurers/Adena.png
+++ b/Assets/Images/Adventurers/Adena.png
--- a/Assets/Images/Adventurers/Amadeus.png
+++ b/Assets/Images/Adventurers/Amadeus.png
--- a/Assets/Images/Adventurers/Derk.png
+++ b/Assets/Images/Adventurers/Derk.png
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
--- a/Assets/Scripts/Journal.cs
+++ b/Assets/Scripts/Journal.cs
@@ -95,7 +95,9 @@ public class Journal : MonoBehaviour
        bool success = QuestManager.Instance.RunQuestWithAdventurer(m_availableAdventurers[m_selectedAdventurer], activeQuest);
        Debug.Log("THE QUESTR ESULT WAS: " + success);
        adventurerPage.gameObject.SetActive(false);
-        if(success)
+
+        questPage.Find("QuestResult").gameObject.SetActive(true);
+        if (success)
        {
            questPage.Find("QuestResult/NextQuest").gameObject.SetActive(true);
            questPage.Find("QuestResult/RetryQuest").gameObject.SetActive(false);
@@ -106,7 +108,7 @@ public class Journal : MonoBehaviour
        }

        questPage.Find("QuestResult/QuestResultText").gameObject.GetComponent<TMP_Text>().text = success ? activeQuest.successStr : activeQuest.failedStr;
-        questPage.Find("QuestResult").gameObject.SetActive(true);
+        
    }

    public void StartNextQuest()
--- a/Files/Adventure
+++ b/Files/Adventure
--- a/Files/Rufus.png
+++ b/Files/Rufus.png
--- a/Files/Sketches.kra
+++ b/Files/Sketches.kra
Author	SHA1	Message	Date
Minz	4cc6d4fc39	Merge branch 'master' into journal_ui	2023-07-09 12:08:58 +02:00
Minz	a00e4a6e98	Fix quest retry	2023-07-09 12:05:51 +02:00
Minzkraut	6bbadefa3e	Fix journal UI scaling	2023-07-08 22:38:35 +02:00