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

Compare commits

base: KittenBox:journal_ui
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
..
compare: KittenBox:gfx
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
journal_ui ... gfx

Author SHA1 Message Date
Minzkraut
1e373edbf1 Updated character graphics 2023-07-09 12:28:10 +02:00
Minzkraut
e9bb26f4d9 Merge branch 'master' into gfx 2023-07-09 12:01:29 +02:00
Minzkraut
96007ac7da Merge branch 'master' into gfx 2023-07-09 12:00:24 +02:00
8 changed files with 1478 additions and 249 deletions
Expand all files Collapse all files

BIN
Assets/Images/Adventurers/Adena.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
Assets/Images/Adventurers/Amadeus.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
Assets/Images/Adventurers/Derk.png (Stored with Git LFS)
View File

Binary file not shown.

1699
Assets/Scenes/Main.unity
View File

File diff suppressed because it is too large Load Diff

4
Assets/Scripts/Journal.cs
View File

@@ -95,8 +95,6 @@ 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);
questPage.Find("QuestResult").gameObject.SetActive(true);
if(success) if(success)
{ {
questPage.Find("QuestResult/NextQuest").gameObject.SetActive(true); questPage.Find("QuestResult/NextQuest").gameObject.SetActive(true);
@@ -108,7 +106,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()

BIN
Krita Files/Adventure Cat.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Krita Files/Rufus.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Krita Files/Sketches.kra (Stored with Git LFS)
View File

Binary file not shown.