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

Compare commits

merge into: KittenBox:gfx
Branches Tags
KittenBox:master KittenBox:refactor KittenBox:character_sheet_fix KittenBox:sfx_and_camera_fixes KittenBox:bugfix_win_state KittenBox:bug_fixes KittenBox:level_design KittenBox:gfx KittenBox:journal_ui_adventuers KittenBox:journal_ui KittenBox:adventurers KittenBox:dialogue_tweaks KittenBox:questing_logic KittenBox:character_panel_tweaks KittenBox:start_scene_and_tweak KittenBox:managers KittenBox:character_sheet_improvements KittenBox:character_sheet_setup KittenBox:main KittenBox:dialogue_system
...
pull from: KittenBox:journal_ui
Branches Tags
KittenBox:refactor KittenBox:master KittenBox:character_sheet_fix KittenBox:sfx_and_camera_fixes KittenBox:bugfix_win_state KittenBox:bug_fixes KittenBox:level_design KittenBox:gfx KittenBox:journal_ui_adventuers KittenBox:journal_ui KittenBox:adventurers KittenBox:dialogue_tweaks KittenBox:questing_logic KittenBox:character_panel_tweaks KittenBox:start_scene_and_tweak KittenBox:managers KittenBox:character_sheet_improvements KittenBox:character_sheet_setup KittenBox:main KittenBox:dialogue_system

3 Commits
gfx ... journal_ui

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
2 changed files with 242 additions and 1465 deletions
Expand all files Collapse all files

1701
Assets/Scenes/Main.unity
View File

File diff suppressed because it is too large Load Diff

6
Assets/Scripts/Journal.cs
View File

@@ -95,7 +95,9 @@ public class Journal : MonoBehaviour
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); Debug.Log("THE QUESTR ESULT WAS: " + success);
adventurerPage.gameObject.SetActive(false); adventurerPage.gameObject.SetActive(false);
if(success)
questPage.Find("QuestResult").gameObject.SetActive(true);
if (success)
{ {
questPage.Find("QuestResult/NextQuest").gameObject.SetActive(true); questPage.Find("QuestResult/NextQuest").gameObject.SetActive(true);
questPage.Find("QuestResult/RetryQuest").gameObject.SetActive(false); 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/QuestResultText").gameObject.GetComponent<TMP_Text>().text = success ? activeQuest.successStr : activeQuest.failedStr;
questPage.Find("QuestResult").gameObject.SetActive(true);
} }
public void StartNextQuest() public void StartNextQuest()