salmon-engine-projects/shadow-over-bishkek001
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working on portrait mode

Browse Source
This commit is contained in:
Vladislav Khorev 2026-06-26 21:25:53 +03:00
parent 8c42179576
commit b41e312511
19 changed files with 102 additions and 636 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/w/ui/hud_step0.json
View File

@ -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"
}
]

4
resources/w/ui/hud_step1.json
View File

@ -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"
}
]

4
resources/w/ui/hud_step2.json
View File

@ -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"
}
]

4
resources/w/ui/hud_step3.json
View File

@ -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"
}
]

4
resources/w/ui/hud_step4.json
View File

@ -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"
}
]

138
resources/w/ui/hud_step5a.json
View File

@ -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"
}
]
}

121
resources/w/ui/hud_step5ab.json
View File

@ -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",

119
resources/w/ui/hud_step5b.json
View File

@ -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",

12
resources/w/ui/hud_uni_ext.json
View File

@ -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"
},
{

12
resources/w/ui/hud_uni_ext_dark.json
View File

@ -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"
},
{

12
resources/w/ui/hud_uni_int_dark_full.json
View File

@ -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"
},
{

16
resources/w/ui/hud_uni_int_full.json
View File

@ -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"
},
{

214
resources/w/ui/hud_uni_int_old.json
View File

@ -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
]
}
]
}
]
}
}

12
resources/w/ui/hud_uni_int_step10.json
View File

@ -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"
},
{

16
resources/w/ui/hud_uni_int_step11.json
View File

@ -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"
},
{

12
resources/w/ui/hud_uni_int_step12.json
View File

@ -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"
},
{

20
resources/w/ui/hud_uni_int_step13.json
View File

@ -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",

2
src/MenuManager.cpp
View File

@ -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);

12
src/dialogue/DialogueOverlay.cpp
View File

@ -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();