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

Fixing lots of UI bugs

Browse Source
This commit is contained in:
Vladislav Khorev committed 2026-07-10 21:30:59 +03:00
1 parent 8e745ce0cd
commit 79413e7319
33 files changed
+1740 -1342
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

resources/w/ui_en/portrait_screen_inventory.json
+24 -24
View File
@@ -68,9 +68,9 @@
"x": 0,
"y": 250,
"textures": {
"normal": "resources/w/ui/img/inv/ItemJournal001.png",
"hover": "resources/w/ui/img/inv/ItemJournal001.png",
"pressed": "resources/w/ui/img/inv/ItemJournal001.png"
"normal": "resources/w/ui/img/inv/ItemJournal002.png",
"hover": "resources/w/ui/img/inv/ItemJournal002.png",
"pressed": "resources/w/ui/img/inv/ItemJournal002.png"
}
},
{
@@ -83,9 +83,9 @@
"x": 200,
"y": 250,
"textures": {
"normal": "resources/w/ui/img/inv/ItemKnife001.png",
"hover": "resources/w/ui/img/inv/ItemKnife001.png",
"pressed": "resources/w/ui/img/inv/ItemKnife001.png"
"normal": "resources/w/ui/img/inv/ItemKnife002.png",
"hover": "resources/w/ui/img/inv/ItemKnife002.png",
"pressed": "resources/w/ui/img/inv/ItemKnife002.png"
}
},
{
@@ -98,9 +98,9 @@
"x": -200,
"y": 450,
"textures": {
"normal": "resources/w/ui/img/inv/ItemNote001.png",
"hover": "resources/w/ui/img/inv/ItemNote001.png",
"pressed": "resources/w/ui/img/inv/ItemNote001.png"
"normal": "resources/w/ui/img/inv/ItemNote002.png",
"hover": "resources/w/ui/img/inv/ItemNote002.png",
"pressed": "resources/w/ui/img/inv/ItemNote002.png"
}
},
{
@@ -113,9 +113,9 @@
"x": 0,
"y": 450,
"textures": {
"normal": "resources/w/ui/img/inv/ItemCoursework001.png",
"hover": "resources/w/ui/img/inv/ItemCoursework001.png",
"pressed": "resources/w/ui/img/inv/ItemCoursework001.png"
"normal": "resources/w/ui/img/inv/ItemCoursework002.png",
"hover": "resources/w/ui/img/inv/ItemCoursework002.png",
"pressed": "resources/w/ui/img/inv/ItemCoursework002.png"
}
},
{
@@ -128,9 +128,9 @@
"x": 200,
"y": 450,
"textures": {
"normal": "resources/w/ui/img/inv/ItemReportCard001.png",
"hover": "resources/w/ui/img/inv/ItemReportCard001.png",
"pressed": "resources/w/ui/img/inv/ItemReportCard001.png"
"normal": "resources/w/ui/img/inv/ItemReportCard002.png",
"hover": "resources/w/ui/img/inv/ItemReportCard002.png",
"pressed": "resources/w/ui/img/inv/ItemReportCard002.png"
}
},
{
@@ -143,9 +143,9 @@
"x": -200,
"y": 650,
"textures": {
"normal": "resources/w/ui/img/inv/ItemBook001.png",
"hover": "resources/w/ui/img/inv/ItemBook001.png",
"pressed": "resources/w/ui/img/inv/ItemBook001.png"
"normal": "resources/w/ui/img/inv/ItemBook002.png",
"hover": "resources/w/ui/img/inv/ItemBook002.png",
"pressed": "resources/w/ui/img/inv/ItemBook002.png"
}
},
{
@@ -158,9 +158,9 @@
"x": 0,
"y": 650,
"textures": {
"normal": "resources/w/ui/img/inv/ItemBook001.png",
"hover": "resources/w/ui/img/inv/ItemBook001.png",
"pressed": "resources/w/ui/img/inv/ItemBook001.png"
"normal": "resources/w/ui/img/inv/ItemBook002.png",
"hover": "resources/w/ui/img/inv/ItemBook002.png",
"pressed": "resources/w/ui/img/inv/ItemBook002.png"
}
},
{
@@ -173,9 +173,9 @@
"x": -200,
"y": 650,
"textures": {
"normal": "resources/w/ui/img/inv/ItemBook001.png",
"hover": "resources/w/ui/img/inv/ItemBook001.png",
"pressed": "resources/w/ui/img/inv/ItemBook001.png"
"normal": "resources/w/ui/img/inv/ItemBook002.png",
"hover": "resources/w/ui/img/inv/ItemBook002.png",
"pressed": "resources/w/ui/img/inv/ItemBook002.png"
}
}
]
resources/w/ui_en/portrait_screen_inventory_item.json
+1 -1
View File
@@ -41,7 +41,7 @@
"y": 190,
"horizontal_gravity": "center",
"vertical_gravity": "top",
"texture": "resources/w/ui/img/inv/ItemSelReportCard001.png"
"texture": "resources/w/ui/img/inv/ItemSelReportCard002.png"
},
{
"type": "TextView",
resources/w/ui_en/screen_inventory.json
+25 -25
View File
@@ -67,9 +67,9 @@
"x": -480,
"y": 90,
"textures": {
"normal": "resources/w/ui/img/inv/ItemJournal001.png",
"hover": "resources/w/ui/img/inv/ItemJournal001.png",
"pressed": "resources/w/ui/img/inv/ItemJournal001.png"
"normal": "resources/w/ui/img/inv/ItemJournal002.png",
"hover": "resources/w/ui/img/inv/ItemJournal002.png",
"pressed": "resources/w/ui/img/inv/ItemJournal002.png"
}
},
{
@@ -82,9 +82,9 @@
"x": -380,
"y": 90,
"textures": {
"normal": "resources/w/ui/img/inv/ItemKnife001.png",
"hover": "resources/w/ui/img/inv/ItemKnife001.png",
"pressed": "resources/w/ui/img/inv/ItemKnife001.png"
"normal": "resources/w/ui/img/inv/ItemKnife002.png",
"hover": "resources/w/ui/img/inv/ItemKnife002.png",
"pressed": "resources/w/ui/img/inv/ItemKnife002.png"
}
},
{
@@ -97,9 +97,9 @@
"x": -580,
"y": -10,
"textures": {
"normal": "resources/w/ui/img/inv/ItemNote001.png",
"hover": "resources/w/ui/img/inv/ItemNote001.png",
"pressed": "resources/w/ui/img/inv/ItemNote001.png"
"normal": "resources/w/ui/img/inv/ItemNote002.png",
"hover": "resources/w/ui/img/inv/ItemNote002.png",
"pressed": "resources/w/ui/img/inv/ItemNote002.png"
}
},
{
@@ -112,9 +112,9 @@
"x": -480,
"y": -10,
"textures": {
"normal": "resources/w/ui/img/inv/ItemCoursework001.png",
"hover": "resources/w/ui/img/inv/ItemCoursework001.png",
"pressed": "resources/w/ui/img/inv/ItemCoursework001.png"
"normal": "resources/w/ui/img/inv/ItemCoursework002.png",
"hover": "resources/w/ui/img/inv/ItemCoursework002.png",
"pressed": "resources/w/ui/img/inv/ItemCoursework002.png"
}
},
{
@@ -127,9 +127,9 @@
"x": -380,
"y": -10,
"textures": {
"normal": "resources/w/ui/img/inv/ItemReportCard001.png",
"hover": "resources/w/ui/img/inv/ItemReportCard001.png",
"pressed": "resources/w/ui/img/inv/ItemReportCard001.png"
"normal": "resources/w/ui/img/inv/ItemReportCard002.png",
"hover": "resources/w/ui/img/inv/ItemReportCard002.png",
"pressed": "resources/w/ui/img/inv/ItemReportCard002.png"
}
},
{
@@ -142,9 +142,9 @@
"x": -580,
"y": -110,
"textures": {
"normal": "resources/w/ui/img/inv/ItemBook001.png",
"hover": "resources/w/ui/img/inv/ItemBook001.png",
"pressed": "resources/w/ui/img/inv/ItemBook001.png"
"normal": "resources/w/ui/img/inv/ItemBook002.png",
"hover": "resources/w/ui/img/inv/ItemBook002.png",
"pressed": "resources/w/ui/img/inv/ItemBook002.png"
}
},
{
@@ -157,9 +157,9 @@
"x": -480,
"y": -110,
"textures": {
"normal": "resources/w/ui/img/inv/ItemBook001.png",
"hover": "resources/w/ui/img/inv/ItemBook001.png",
"pressed": "resources/w/ui/img/inv/ItemBook001.png"
"normal": "resources/w/ui/img/inv/ItemBook002.png",
"hover": "resources/w/ui/img/inv/ItemBook002.png",
"pressed": "resources/w/ui/img/inv/ItemBook002.png"
}
},
{
@@ -172,9 +172,9 @@
"x": -380,
"y": -110,
"textures": {
"normal": "resources/w/ui/img/inv/ItemBook001.png",
"hover": "resources/w/ui/img/inv/ItemBook001.png",
"pressed": "resources/w/ui/img/inv/ItemBook001.png"
"normal": "resources/w/ui/img/inv/ItemBook002.png",
"hover": "resources/w/ui/img/inv/ItemBook002.png",
"pressed": "resources/w/ui/img/inv/ItemBook002.png"
}
},
{
@@ -186,7 +186,7 @@
"y": 90,
"horizontal_gravity": "center",
"vertical_gravity": "center",
"texture": "resources/w/ui/img/inv/ItemSelReportCard001.png"
"texture": "resources/w/ui/img/inv/ItemSelReportCard002.png"
},
{
"type": "TextView",
resources/w/ui_en/screen_journal.json
+1 -1
View File
@@ -394,7 +394,7 @@
"spacing": 10,
"horizontal_gravity": "center",
"vertical_gravity": "top",
"x": 70,
"x": 67,
"y": 400,
"width": 800,
"height": 40,
resources/w/ui_en/screen_language.json
+5 -3
View File
@@ -7,9 +7,11 @@
{
"type": "StaticImage",
"name": "languageBkg",
"width": "match_parent",
"height": "match_parent",
"texture": "resources/w/ui/img/main/bkg.png"
"width": 2992,
"height": 1632,
"horizontal_gravity": "center",
"vertical_gravity": "center",
"texture": "resources/w/ui/img/main/MenuBkg001_v001.png"
},
{
"type": "LinearLayout",
resources/w/ui_en/screen_load.json
+64 -58
View File
@@ -7,65 +7,71 @@
{
"type": "StaticImage",
"name": "loadBkg",
"width": "match_parent",
"height": "match_parent",
"texture": "resources/w/ui/img/main/bkg.png"
"width": 2992,
"height": 1632,
"horizontal_gravity": "center",
"vertical_gravity": "center",
"texture": "resources/w/ui/img/main/MenuBkg001_v001.png"
},
{
"type": "LinearLayout",
"orientation": "vertical",
"horizontal_align": "center",
"vertical_align": "center",
"spacing": 24,
"width": "match_parent",
"height": "match_parent",
"children": [
{
"type": "TextView",
"name": "loadTitle",
"width": 300,
"height": 70,
"text": "Select a saved game:",
"fontSize": 48,
"textCentered": true
},
{
"type": "TextButton",
"name": "loadSlot1Button",
"width": 600,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
},
{
"type": "TextButton",
"name": "loadSlot2Button",
"width": 600,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
},
{
"type": "TextButton",
"name": "loadSlot3Button",
"width": 600,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
},
{
"type": "TextButton",
"name": "loadSlot4Button",
"width": 600,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
}
]
{
"type": "TextView",
"name": "loadTitle",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": 200,
"width": 300,
"height": 70,
"text": "Select a saved game:",
"fontSize": 48,
"textCentered": true
},
{
"type": "TextButton",
"name": "loadSlot1Button",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": 130,
"width": 400,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
},
{
"type": "TextButton",
"name": "loadSlot2Button",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": 60,
"width": 400,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
},
{
"type": "TextButton",
"name": "loadSlot3Button",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -10,
"width": 400,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
},
{
"type": "TextButton",
"name": "loadSlot4Button",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -80,
"width": 400,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
},
{
"type": "TextButton",
resources/w/ui_en/screen_main_menu.json
+14 -11
View File
@@ -7,8 +7,10 @@
{
"type": "StaticImage",
"name": "mainMenuBkg",
"width": 2186,
"height": 1536,
"width": 2992,
"height": 1632,
"horizontal_gravity": "center",
"vertical_gravity": "center",
"texture": "resources/w/ui/img/main/MenuBkg001_v001.png"
},
{
@@ -24,9 +26,10 @@
"type": "StaticImage",
"name": "mainMenuUnderLetterBkg",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"width": 450,
"height": "match_parent",
"texture": "resources/w/ui/img/main/under_letters001.png"
"height": 900,
"texture": "resources/w/ui/img/main/under_letters002.png"
},
{
"type": "StaticImage",
@@ -44,7 +47,7 @@
"horizontal_align": "center",
"vertical_align": "center",
"spacing": 24,
"y": 120,
"y": 150,
"width": "match_parent",
"height": "match_parent",
"children": [
@@ -52,7 +55,7 @@
"type": "TextButton",
"name": "menuStartButton",
"width": 300,
"height": 60,
"height": 50,
"text": "Start Game",
"fontSize": 48,
"textCentered": true
@@ -61,7 +64,7 @@
"type": "TextButton",
"name": "menuLoadButton",
"width": 300,
"height": 60,
"height": 50,
"text": "Load Game",
"fontSize": 48,
"textCentered": true
@@ -70,7 +73,7 @@
"type": "TextButton",
"name": "menuSettingsButton",
"width": 300,
"height": 60,
"height": 50,
"text": "Settings",
"fontSize": 48,
"textCentered": true
@@ -79,7 +82,7 @@
"type": "TextButton",
"name": "menuLanguageButton",
"width": 300,
"height": 60,
"height": 50,
"text": "Язык / Language",
"fontSize": 48,
"textCentered": true
@@ -88,7 +91,7 @@
"type": "TextButton",
"name": "menuAboutButton",
"width": 300,
"height": 70,
"height": 50,
"text": "About Us",
"fontSize": 48,
"textCentered": true
@@ -97,7 +100,7 @@
"type": "TextButton",
"name": "menuExitButton",
"width": 300,
"height": 60,
"height": 50,
"text": "Exit",
"fontSize": 48,
"textCentered": true
resources/w/ui_en/screen_save.json
+65 -58
View File
@@ -7,65 +7,71 @@
{
"type": "StaticImage",
"name": "saveBkg",
"width": "match_parent",
"height": "match_parent",
"texture": "resources/w/ui/img/main/bkg.png"
"width": 2992,
"height": 1632,
"horizontal_gravity": "center",
"vertical_gravity": "center",
"texture": "resources/w/ui/img/main/MenuBkg001_v001.png"
},
{
"type": "LinearLayout",
"orientation": "vertical",
"horizontal_align": "center",
"vertical_align": "center",
"spacing": 24,
"width": "match_parent",
"height": "match_parent",
"children": [
{
"type": "TextView",
"name": "saveTitle",
"width": 300,
"height": 70,
"text": "Select a save slot:",
"fontSize": 48,
"textCentered": true
},
{
"type": "TextButton",
"name": "saveSlot1Button",
"width": 600,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
},
{
"type": "TextButton",
"name": "saveSlot2Button",
"width": 600,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
},
{
"type": "TextButton",
"name": "saveSlot3Button",
"width": 600,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
},
{
"type": "TextButton",
"name": "saveSlot4Button",
"width": 600,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
}
]
{
"type": "TextView",
"name": "saveTitle",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": 200,
"width": 300,
"height": 70,
"text": "Select a save slot:",
"fontSize": 48,
"textCentered": true
},
{
"type": "TextButton",
"name": "saveSlot1Button",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": 130,
"width": 400,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
},
{
"type": "TextButton",
"name": "saveSlot2Button",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": 60,
"width": 400,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
},
{
"type": "TextButton",
"name": "saveSlot3Button",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -10,
"width": 400,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
},
{
"type": "TextButton",
"name": "saveSlot4Button",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -80,
"width": 400,
"height": 70,
"text": "(empty)",
"fontSize": 24,
"textCentered": true
},
{
"type": "TextButton",
@@ -82,3 +88,4 @@
]
}
}
resources/w/ui_en/screen_settings.json
+17 -15
View File
@@ -7,9 +7,11 @@
{
"type": "StaticImage",
"name": "settingsBkg",
"width": "match_parent",
"height": "match_parent",
"texture": "resources/w/ui/img/main/bkg.png"
"width": 2992,
"height": 1632,
"horizontal_gravity": "center",
"vertical_gravity": "center",
"texture": "resources/w/ui/img/main/MenuBkg001_v001.png"
},
{
"type": "LinearLayout",
@@ -36,7 +38,7 @@
"name": "musicVolumeText",
"width": 500,
"height": 40,
"text": "Music volume: 100",
"text": "",
"fontSize": 32,
"textCentered": false,
"topAligned": true,
@@ -52,8 +54,8 @@
"value": 0.78125,
"interactive": true,
"textures": {
"track": "resources/w/red.png",
"knob": "resources/w/blue.png"
"track": "resources/loadingProgressBarFrame.png",
"knob": "resources/loadingProgressBar.png"
}
},
{
@@ -61,7 +63,7 @@
"name": "soundVolumeText",
"width": 500,
"height": 40,
"text": "Sound volume: 80",
"text": "",
"fontSize": 32,
"textCentered": false,
"topAligned": true,
@@ -77,8 +79,8 @@
"value": 0.625,
"interactive": true,
"textures": {
"track": "resources/w/red.png",
"knob": "resources/w/blue.png"
"track": "resources/loadingProgressBarFrame.png",
"knob": "resources/loadingProgressBar.png"
}
},
{
@@ -86,30 +88,30 @@
"name": "musicToggleButton",
"width": 500,
"height": 40,
"text": "Music: ON",
"text": "",
"fontSize": 32,
"textCentered": true,
"color": [0.2, 0.9, 0.2, 1.0]
"color": [1.0, 1.0, 1.0, 1.0]
},
{
"type": "TextButton",
"name": "soundToggleButton",
"width": 500,
"height": 40,
"text": "Sound: ON",
"text": "",
"fontSize": 32,
"textCentered": true,
"color": [0.2, 0.9, 0.2, 1.0]
"color": [1.0, 1.0, 1.0, 1.0]
},
{
"type": "TextButton",
"name": "fullScreenToggleButton",
"width": 500,
"height": 60,
"text": "Full screen: OFF",
"text": "",
"fontSize": 32,
"textCentered": true,
"color": [0.2, 0.9, 0.2, 1.0]
"color": [1.0, 1.0, 1.0, 1.0]
}
]
},