From b41e31251182db7f4644f4ab48ee03fd6eea5f94 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Fri, 26 Jun 2026 21:25:53 +0300 Subject: [PATCH] Working on portrait mode --- resources/w/ui/hud_step0.json | 4 +- resources/w/ui/hud_step1.json | 4 +- resources/w/ui/hud_step2.json | 4 +- resources/w/ui/hud_step3.json | 4 +- resources/w/ui/hud_step4.json | 4 +- resources/w/ui/hud_step5a.json | 138 +------------- resources/w/ui/hud_step5ab.json | 121 +----------- resources/w/ui/hud_step5b.json | 119 +----------- resources/w/ui/hud_uni_ext.json | 12 +- resources/w/ui/hud_uni_ext_dark.json | 12 +- resources/w/ui/hud_uni_int_dark_full.json | 12 +- resources/w/ui/hud_uni_int_full.json | 16 +- resources/w/ui/hud_uni_int_old.json | 214 ---------------------- resources/w/ui/hud_uni_int_step10.json | 12 +- resources/w/ui/hud_uni_int_step11.json | 16 +- resources/w/ui/hud_uni_int_step12.json | 12 +- resources/w/ui/hud_uni_int_step13.json | 20 +- src/MenuManager.cpp | 2 + src/dialogue/DialogueOverlay.cpp | 12 +- 19 files changed, 102 insertions(+), 636 deletions(-) delete mode 100644 resources/w/ui/hud_uni_int_old.json diff --git a/resources/w/ui/hud_step0.json b/resources/w/ui/hud_step0.json index 9293ac6..dbfa31d 100644 --- a/resources/w/ui/hud_step0.json +++ b/resources/w/ui/hud_step0.json @@ -10,7 +10,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -29,7 +29,7 @@ "height": 64, "y": 30, "horizontal_gravity": "center", - "vertical_align": "top", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_dorm.png" } ] diff --git a/resources/w/ui/hud_step1.json b/resources/w/ui/hud_step1.json index d67eb7d..29c718b 100644 --- a/resources/w/ui/hud_step1.json +++ b/resources/w/ui/hud_step1.json @@ -38,7 +38,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -57,7 +57,7 @@ "height": 64, "y": 30, "horizontal_gravity": "center", - "vertical_align": "top", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_dorm.png" } ] diff --git a/resources/w/ui/hud_step2.json b/resources/w/ui/hud_step2.json index 388194c..43d898e 100644 --- a/resources/w/ui/hud_step2.json +++ b/resources/w/ui/hud_step2.json @@ -38,7 +38,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -57,7 +57,7 @@ "height": 64, "y": 30, "horizontal_gravity": "center", - "vertical_align": "top", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_dorm.png" } ] diff --git a/resources/w/ui/hud_step3.json b/resources/w/ui/hud_step3.json index ab68485..5014d3c 100644 --- a/resources/w/ui/hud_step3.json +++ b/resources/w/ui/hud_step3.json @@ -38,7 +38,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -57,7 +57,7 @@ "height": 64, "y": 30, "horizontal_gravity": "center", - "vertical_align": "top", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_dorm.png" } ] diff --git a/resources/w/ui/hud_step4.json b/resources/w/ui/hud_step4.json index 303cbee..4be8a90 100644 --- a/resources/w/ui/hud_step4.json +++ b/resources/w/ui/hud_step4.json @@ -38,7 +38,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -57,7 +57,7 @@ "height": 64, "y": 30, "horizontal_gravity": "center", - "vertical_align": "top", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_dorm.png" } ] diff --git a/resources/w/ui/hud_step5a.json b/resources/w/ui/hud_step5a.json index 37e147c..e5a8d6f 100644 --- a/resources/w/ui/hud_step5a.json +++ b/resources/w/ui/hud_step5a.json @@ -27,7 +27,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -44,8 +44,8 @@ "name": "inventoryButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 110, - "y": -18, + "x": -18, + "y": 110, "width": 165, "height": 165, "clickZoneWidth": 151, @@ -65,115 +65,6 @@ "horizontal_gravity": "center", "vertical_align": "top", "texture": "resources/w/ui/img/Location_dorm.png" - }, - { - "type": "FrameLayout", - "vertical_align": "top", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 528, - "children": [ - { - "type": "StaticImage", - "name": "toast001", - "horizontal_gravity": "center", - "width": 672, - "height": 176, - "y": 80, - "visible": false, - "texture": "resources/w/ui/img/toast/item_received001.png" - }, - { - "type": "StaticImage", - "name": "toast002", - "horizontal_gravity": "center", - "width": 672, - "height": 176, - "y": 200, - "visible": false, - "texture": "resources/w/ui/img/toast/item_removed001.png" - }, - { - "type": "StaticImage", - "name": "toast003", - "horizontal_gravity": "center", - "width": 672, - "height": 176, - "y": 320, - "visible": false, - "texture": "resources/w/ui/img/toast/objective_completed001.png" - }, - { - "type": "TextView", - "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 170, - "x": 8, - "width": 400, - "height": 100, - "visible": false, - "text": "Серебряный нож.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 290, - "x": 8, - "width": 400, - "height": 100, - "visible": false, - "text": "Серебряный нож 2.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 410, - "x": 8, - "width": 400, - "height": 100, - "visible": false, - "text": "Серебряный нож 3.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - } - ] }, { "type": "StaticImage", @@ -196,22 +87,13 @@ }, { "type": "StaticImage", - "name": "hint6aarrow", - "width": 170, - "height": 48, - "x" : 140, - "y" : 50, - "horizontal_gravity": "right", - "vertical_gravity" : "bottom", - "texture": "resources/w/ui/img/hint_arrow_left.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } + "name": "location", + "width": 380, + "height": 64, + "y": 30, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/Location_dorm.png" } ] } diff --git a/resources/w/ui/hud_step5ab.json b/resources/w/ui/hud_step5ab.json index 3fb8dad..779a71a 100644 --- a/resources/w/ui/hud_step5ab.json +++ b/resources/w/ui/hud_step5ab.json @@ -27,7 +27,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -44,8 +44,8 @@ "name": "inventoryButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 110, - "y": -18, + "x": -18, + "y": 110, "width": 165, "height": 165, "clickZoneWidth": 151, @@ -61,8 +61,8 @@ "name": "journalButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 220, - "y": -18, + "x": -18, + "y": 220, "width": 165, "height": 165, "clickZoneWidth": 89, @@ -80,117 +80,8 @@ "height": 64, "y": 30, "horizontal_gravity": "center", - "vertical_align": "top", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_dorm.png" - }, - { - "type": "FrameLayout", - "vertical_align": "top", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 528, - "children": [ - { - "type": "StaticImage", - "name": "toast001", - "horizontal_gravity": "center", - "width": 672, - "height": 176, - "y": 80, - "visible" : false, - "texture": "resources/w/ui/img/toast/item_received001.png" - }, - { - "type": "StaticImage", - "name": "toast002", - "horizontal_gravity": "center", - "width": 672, - "height": 176, - "y": 200, - "visible" : false, - "texture": "resources/w/ui/img/toast/item_removed001.png" - }, - { - "type": "StaticImage", - "name": "toast003", - "horizontal_gravity": "center", - "width": 672, - "height": 176, - "y": 320, - "visible" : false, - "texture": "resources/w/ui/img/toast/objective_completed001.png" - }, - { - "type": "TextView", - "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 170, - "x": 8, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 290, - "x": 8, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож 2.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 410, - "x": 8, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож 3.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - } - ] }, { "type": "StaticImage", diff --git a/resources/w/ui/hud_step5b.json b/resources/w/ui/hud_step5b.json index 8d8a3a9..b7cd941 100644 --- a/resources/w/ui/hud_step5b.json +++ b/resources/w/ui/hud_step5b.json @@ -10,7 +10,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -27,8 +27,8 @@ "name": "inventoryButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 110, - "y": -18, + "x": -18, + "y": 110, "width": 165, "height": 165, "clickZoneWidth": 151, @@ -44,8 +44,8 @@ "name": "journalButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 220, - "y": -18, + "x": -18, + "y": 220, "width": 165, "height": 165, "clickZoneWidth": 89, @@ -65,115 +65,6 @@ "horizontal_gravity": "center", "vertical_align": "top", "texture": "resources/w/ui/img/Location_uni_ext.png" - }, - { - "type": "FrameLayout", - "vertical_align": "top", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 528, - "children": [ - { - "type": "StaticImage", - "name": "toast001", - "horizontal_gravity": "center", - "width": 672, - "height": 176, - "y": 80, - "visible" : false, - "texture": "resources/w/ui/img/toast/item_received001.png" - }, - { - "type": "StaticImage", - "name": "toast002", - "horizontal_gravity": "center", - "width": 672, - "height": 176, - "y": 200, - "visible" : false, - "texture": "resources/w/ui/img/toast/item_removed001.png" - }, - { - "type": "StaticImage", - "name": "toast003", - "horizontal_gravity": "center", - "width": 672, - "height": 176, - "y": 320, - "visible" : false, - "texture": "resources/w/ui/img/toast/objective_completed001.png" - }, - { - "type": "TextView", - "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 170, - "x": 8, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 290, - "x": 8, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож 2.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 410, - "x": 8, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож 3.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - } - ] }, { "type": "StaticImage", diff --git a/resources/w/ui/hud_uni_ext.json b/resources/w/ui/hud_uni_ext.json index 35278f8..ca8ce33 100644 --- a/resources/w/ui/hud_uni_ext.json +++ b/resources/w/ui/hud_uni_ext.json @@ -27,7 +27,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -44,8 +44,8 @@ "name": "inventoryButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 110, - "y": -18, + "x": -18, + "y": 110, "width": 165, "height": 165, "clickZoneWidth": 151, @@ -61,8 +61,8 @@ "name": "journalButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 220, - "y": -18, + "x": -18, + "y": 220, "width": 165, "height": 165, "clickZoneWidth": 89, @@ -80,7 +80,7 @@ "height": 64, "y": 30, "horizontal_gravity": "center", - "vertical_align": "top", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_uni_ext.png" }, { diff --git a/resources/w/ui/hud_uni_ext_dark.json b/resources/w/ui/hud_uni_ext_dark.json index 779416d..1347faa 100644 --- a/resources/w/ui/hud_uni_ext_dark.json +++ b/resources/w/ui/hud_uni_ext_dark.json @@ -10,7 +10,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -27,8 +27,8 @@ "name": "inventoryButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 110, - "y": -18, + "x": -18, + "y": 110, "width": 165, "height": 165, "clickZoneWidth": 151, @@ -44,8 +44,8 @@ "name": "journalButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 220, - "y": -18, + "x": -18, + "y": 220, "width": 165, "height": 165, "clickZoneWidth": 89, @@ -63,7 +63,7 @@ "height": 64, "y": 30, "horizontal_gravity": "center", - "vertical_align": "top", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_uni_ext.png" }, { diff --git a/resources/w/ui/hud_uni_int_dark_full.json b/resources/w/ui/hud_uni_int_dark_full.json index 13f5b04..6d91b29 100644 --- a/resources/w/ui/hud_uni_int_dark_full.json +++ b/resources/w/ui/hud_uni_int_dark_full.json @@ -10,7 +10,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -27,8 +27,8 @@ "name": "inventoryButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 110, - "y": -18, + "x": -18, + "y": 110, "width": 165, "height": 165, "clickZoneWidth": 151, @@ -44,8 +44,8 @@ "name": "journalButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 220, - "y": -18, + "x": -18, + "y": 220, "width": 165, "height": 165, "clickZoneWidth": 89, @@ -63,7 +63,7 @@ "height": 64, "y": 30, "horizontal_gravity": "center", - "vertical_align": "top", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_uni_int.png" }, { diff --git a/resources/w/ui/hud_uni_int_full.json b/resources/w/ui/hud_uni_int_full.json index 649fa44..d8c7b81 100644 --- a/resources/w/ui/hud_uni_int_full.json +++ b/resources/w/ui/hud_uni_int_full.json @@ -27,7 +27,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -44,8 +44,8 @@ "name": "inventoryButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 110, - "y": -18, + "x": -18, + "y": 110, "width": 165, "height": 165, "clickZoneWidth": 151, @@ -61,8 +61,8 @@ "name": "journalButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 220, - "y": -18, + "x": -18, + "y": 220, "width": 165, "height": 165, "clickZoneWidth": 89, @@ -78,8 +78,8 @@ "name": "darklandsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 330, - "y": -18, + "x": -18, + "y": 330, "width": 165, "height": 165, "clickZoneWidth": 89, @@ -97,7 +97,7 @@ "height": 64, "y": 30, "horizontal_gravity": "center", - "vertical_align": "top", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_uni_int.png" }, { diff --git a/resources/w/ui/hud_uni_int_old.json b/resources/w/ui/hud_uni_int_old.json deleted file mode 100644 index 56f445c..0000000 --- a/resources/w/ui/hud_uni_int_old.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "phoneButton", - "horizontal_gravity": "right", - "vertical_gravity": "bottom", - "x": -46, - "y": -46, - "width": 229, - "height": 229, - "clickZoneWidth": 104, - "clickZoneHeight": 104, - "textures": { - "normal": "resources/w/ui/img/Phone001_State=Default.png", - "hover": "resources/w/ui/img/Phone001_State=Selected.png", - "pressed": "resources/w/ui/img/Phone001_State=Tap.png" - } - }, - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -23, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "inventoryButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": 110, - "y": -18, - "width": 165, - "height": 165, - "clickZoneWidth": 151, - "clickZoneHeight": 151, - "textures": { - "normal": "resources/w/ui/img/Inventory001_State=Default001.png", - "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", - "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "journalButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": 220, - "y": -18, - "width": 165, - "height": 165, - "clickZoneWidth": 89, - "clickZoneHeight": 89, - "textures": { - "normal": "resources/w/ui/img/Journal001_State=Default.png", - "hover": "resources/w/ui/img/Journal001_State=Selected.png", - "pressed": "resources/w/ui/img/Journal001_State=Tap.png" - } - }, - { - "type": "Button", - "name": "darklandsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": 330, - "y": -18, - "width": 165, - "height": 165, - "clickZoneWidth": 89, - "clickZoneHeight": 89, - "textures": { - "normal": "resources/w/ui/img/Darklands002_State=Default002.png", - "hover": "resources/w/ui/img/Darklands002_State=Selected002.png", - "pressed": "resources/w/ui/img/Darklands002_State=Tap002.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_align": "top", - "texture": "resources/w/ui/img/Location_uni_int.png" - }, - { - "type": "FrameLayout", - "vertical_align": "top", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 528, - "children": [ - { - "type": "StaticImage", - "name": "toast001", - "horizontal_gravity": "center", - "width": 672, - "height": 176, - "y": 80, - "visible" : false, - "texture": "resources/w/ui/img/toast/item_received001.png" - }, - { - "type": "StaticImage", - "name": "toast002", - "horizontal_gravity": "center", - "width": 672, - "height": 176, - "y": 200, - "visible" : false, - "texture": "resources/w/ui/img/toast/item_removed001.png" - }, - { - "type": "StaticImage", - "name": "toast003", - "horizontal_gravity": "center", - "width": 672, - "height": 176, - "y": 320, - "visible" : false, - "texture": "resources/w/ui/img/toast/objective_completed001.png" - }, - { - "type": "TextView", - "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 170, - "x": 8, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 290, - "x": 8, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож 2.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 410, - "x": 8, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож 3.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - } - ] - } - ] - } -} diff --git a/resources/w/ui/hud_uni_int_step10.json b/resources/w/ui/hud_uni_int_step10.json index 5bdf673..9faf48c 100644 --- a/resources/w/ui/hud_uni_int_step10.json +++ b/resources/w/ui/hud_uni_int_step10.json @@ -27,7 +27,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -44,8 +44,8 @@ "name": "inventoryButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 110, - "y": -18, + "x": -18, + "y": 110, "width": 165, "height": 165, "clickZoneWidth": 151, @@ -61,8 +61,8 @@ "name": "journalButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 220, - "y": -18, + "x": -18, + "y": 220, "width": 165, "height": 165, "clickZoneWidth": 89, @@ -80,7 +80,7 @@ "height": 64, "y": 30, "horizontal_gravity": "center", - "vertical_align": "top", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_uni_int.png" }, { diff --git a/resources/w/ui/hud_uni_int_step11.json b/resources/w/ui/hud_uni_int_step11.json index 37d8899..534de0c 100644 --- a/resources/w/ui/hud_uni_int_step11.json +++ b/resources/w/ui/hud_uni_int_step11.json @@ -27,7 +27,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -44,8 +44,8 @@ "name": "inventoryButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 110, - "y": -18, + "x": -18, + "y": 110, "width": 165, "height": 165, "clickZoneWidth": 151, @@ -61,8 +61,8 @@ "name": "journalButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 220, - "y": -18, + "x": -18, + "y": 220, "width": 165, "height": 165, "clickZoneWidth": 89, @@ -78,8 +78,8 @@ "name": "darklandsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 330, - "y": -18, + "x": -18, + "y": 330, "width": 165, "height": 165, "clickZoneWidth": 89, @@ -97,7 +97,7 @@ "height": 64, "y": 30, "horizontal_gravity": "center", - "vertical_align": "top", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_uni_int.png" }, { diff --git a/resources/w/ui/hud_uni_int_step12.json b/resources/w/ui/hud_uni_int_step12.json index cf2cdf5..c45a8df 100644 --- a/resources/w/ui/hud_uni_int_step12.json +++ b/resources/w/ui/hud_uni_int_step12.json @@ -10,7 +10,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -27,8 +27,8 @@ "name": "inventoryButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 110, - "y": -18, + "x": -18, + "y": 110, "width": 165, "height": 165, "clickZoneWidth": 151, @@ -44,8 +44,8 @@ "name": "journalButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 220, - "y": -18, + "x": -18, + "y": 220, "width": 165, "height": 165, "clickZoneWidth": 89, @@ -63,7 +63,7 @@ "height": 64, "y": 30, "horizontal_gravity": "center", - "vertical_align": "top", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_uni_int.png" }, { diff --git a/resources/w/ui/hud_uni_int_step13.json b/resources/w/ui/hud_uni_int_step13.json index 0a5970f..fceec4a 100644 --- a/resources/w/ui/hud_uni_int_step13.json +++ b/resources/w/ui/hud_uni_int_step13.json @@ -10,7 +10,7 @@ "name": "settingsButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": -23, + "x": -35, "y": -35, "width": 200, "height": 200, @@ -27,8 +27,8 @@ "name": "inventoryButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 110, - "y": -18, + "x": -18, + "y": 110, "width": 165, "height": 165, "clickZoneWidth": 151, @@ -44,8 +44,8 @@ "name": "journalButton", "horizontal_gravity": "right", "vertical_gravity": "top", - "x": 220, - "y": -18, + "x": -18, + "y": 220, "width": 165, "height": 165, "clickZoneWidth": 89, @@ -55,6 +55,16 @@ "hover": "resources/w/ui/img/Journal001_State=Selected.png", "pressed": "resources/w/ui/img/Journal001_State=Tap.png" } + }, + { + "type": "StaticImage", + "name": "location", + "width": 380, + "height": 64, + "y": 30, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/Location_uni_int.png" }, { "type": "StaticImage", diff --git a/src/MenuManager.cpp b/src/MenuManager.cpp index dc6f719..8838644 100644 --- a/src/MenuManager.cpp +++ b/src/MenuManager.cpp @@ -115,6 +115,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); + //hudStep5abRoot = loadUiFromFile("resources/w/ui/portrait_hud_uni_int_full.json", renderer, zipFile); + //hudStep5abRoot = loadUiFromFile("resources/w/ui/portrait_hud_uni_int_dark_full.json", renderer, zipFile); hudUniExtRoot = loadUiFromFile("resources/w/ui/hud_uni_ext.json", renderer, zipFile); hudUniIntStep10Root = loadUiFromFile("resources/w/ui/hud_uni_int_step10.json", renderer, zipFile); hudUniIntStep11Root = loadUiFromFile("resources/w/ui/hud_uni_int_step11.json", renderer, zipFile); diff --git a/src/dialogue/DialogueOverlay.cpp b/src/dialogue/DialogueOverlay.cpp index 505c8d9..ac239e4 100644 --- a/src/dialogue/DialogueOverlay.cpp +++ b/src/dialogue/DialogueOverlay.cpp @@ -262,10 +262,14 @@ void DialogueOverlay::drawPortrait(Renderer& renderer, const PresentationModel& glBindTexture(GL_TEXTURE_2D, textboxChoiceTexture->getTexID()); renderer.DrawVertexRenderStruct(portraitPanelQuad.mesh); - auto portrait = loadTextureCached(model.portraitPath); - if (portrait) { - glBindTexture(GL_TEXTURE_2D, portrait->getTexID()); - renderer.DrawVertexRenderStruct(portraitAbovePortraitQuad.mesh); + if (model.portraitPath != "resources/dialogue/portrait_phone.png") + { + + auto portrait = loadTextureCached(model.portraitPath); + if (portrait) { + glBindTexture(GL_TEXTURE_2D, portrait->getTexID()); + renderer.DrawVertexRenderStruct(portraitAbovePortraitQuad.mesh); + } } renderer.PopMatrix();