Working on phone ui
This commit is contained in:
1 parent
31130ec248
commit
3f5c4a381b
19 files changed
+608
-28
No files matched your search
+2
-2
@@ -196,6 +196,7 @@ namespace ZL
|
||||
uniInteriorParams.npcsJsonPath = "resources/config2/npcs_uni_interior.json";
|
||||
uniInteriorParams.dialoguesJsonPath = "resources/dialogue/uni_interior_dialogues.json";
|
||||
|
||||
|
||||
/*
|
||||
uniInteriorParams.navigationJsonPaths = {
|
||||
"resources/navigation/uni_interior0_all_locked.txt",
|
||||
@@ -703,9 +704,8 @@ namespace ZL
|
||||
//if (audioPlayer) audioPlayer->stopMusicAsync();
|
||||
break;
|
||||
case SDLK_f:
|
||||
//currentLocation->dialogueSystem.startDialogue("test_choice_dialogue");
|
||||
currentLocation->dialogueSystem.startDialogue("dialog_start001");
|
||||
break;
|
||||
|
||||
case SDLK_e:
|
||||
currentLocation->dialogueSystem.startCutscene("test_cutscene_01"); //.startDialogue("test_cutscene_pan_dialogue");
|
||||
break;
|
||||
|
||||
+9
-1
@@ -81,7 +81,8 @@ namespace ZL {
|
||||
hudStep5aRoot = loadUiFromFile("resources/w/ui/hud_step5a.json", renderer, zipFile);
|
||||
hudStep5bRoot = loadUiFromFile("resources/w/ui/hud_step5b.json", renderer, zipFile);
|
||||
hudStep5abRoot = loadUiFromFile("resources/w/ui/hud_step5ab.json", renderer, zipFile);
|
||||
phoneScreenRoot = loadUiFromFile("resources/w/ui/screen_phone.json", renderer, zipFile);
|
||||
//phoneScreenRoot = loadUiFromFile("resources/w/ui/screen_phone_chat_list.json", renderer, zipFile);
|
||||
phoneScreenRoot = loadUiFromFile("resources/w/ui/screen_phone_chat.json", renderer, zipFile);
|
||||
newInventoryRoot = loadUiFromFile("resources/w/ui/screen_inventory.json", renderer, zipFile);
|
||||
questJournalRoot = loadUiFromFile("resources/w/ui/screen_journal.json", renderer, zipFile);
|
||||
|
||||
@@ -201,6 +202,13 @@ namespace ZL {
|
||||
uiManager.setButtonCallback("phoneExitButton", [this](const std::string&) {
|
||||
closePhoneScreen();
|
||||
});
|
||||
uiManager.setButtonCallback("phoneMain", [this](const std::string&) {
|
||||
//Keep the callback
|
||||
});
|
||||
uiManager.setTextButtonCallback("chat1button", [this](const std::string&) {
|
||||
std::cout << "Hello test " << std::endl;
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
void MenuManager::closePhoneScreen() {
|
||||
|
||||
Reference in new issue
Block a user