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

Fixing ui bugs, added cutscenes

Browse Source
This commit is contained in:
Vladislav Khorev committed 2026-06-27 22:05:19 +03:00
1 parent 9aeb0b1194
commit 5516d02e2c
18 files changed
+2100 -222
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

resources/w/cutscenes/cutscene3/img.png
LFS
BIN
View File
Binary file not shown.
resources/w/cutscenes/cutscene_exit_darklands/img2.png
LFS
BIN
View File
Binary file not shown.
resources/w/ui/hud_uni_ext.json
+25 -25
View File
@@ -95,9 +95,9 @@
"type": "StaticImage",
"name": "toast001",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 80,
"width": 504,
"height": 132,
"y": 0,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_received001.png"
},
@@ -105,9 +105,9 @@
"type": "StaticImage",
"name": "toast002",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 200,
"width": 504,
"height": 132,
"y": 104,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_removed001.png"
},
@@ -115,19 +115,19 @@
"type": "StaticImage",
"name": "toast003",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 320,
"width": 504,
"height": 132,
"y": 208,
"visible" : false,
"texture": "resources/w/ui/img/toast/objective_completed001.png"
"texture": "resources/w/ui/img/toast/quest_completed001.png"
},
{
{
"type": "TextView",
"name": "toast001text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 170,
"x": 8,
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 62,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -144,13 +144,13 @@
1.0
]
},
{
{
"type": "TextView",
"name": "toast002text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 290,
"x": 8,
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 166,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -167,13 +167,13 @@
1.0
]
},
{
{
"type": "TextView",
"name": "toast003text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 410,
"x": 8,
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 270,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
resources/w/ui/hud_uni_ext_dark.json
+16 -16
View File
@@ -139,9 +139,9 @@
"type": "StaticImage",
"name": "toast001",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 80,
"width": 504,
"height": 132,
"y": 0,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_received001.png"
},
@@ -149,9 +149,9 @@
"type": "StaticImage",
"name": "toast002",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 200,
"width": 504,
"height": 132,
"y": 104,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_removed001.png"
},
@@ -159,19 +159,19 @@
"type": "StaticImage",
"name": "toast003",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 320,
"width": 504,
"height": 132,
"y": 208,
"visible" : false,
"texture": "resources/w/ui/img/toast/objective_completed001.png"
"texture": "resources/w/ui/img/toast/quest_completed001.png"
},
{
"type": "TextView",
"name": "toast001text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 170,
"x": 8,
"y": 62,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -193,8 +193,8 @@
"name": "toast002text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 290,
"x": 8,
"y": 166,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -216,8 +216,8 @@
"name": "toast003text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 410,
"x": 8,
"y": 270,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
resources/w/ui/hud_uni_int_dark_full.json
+16 -16
View File
@@ -139,9 +139,9 @@
"type": "StaticImage",
"name": "toast001",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 80,
"width": 504,
"height": 132,
"y": 0,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_received001.png"
},
@@ -149,9 +149,9 @@
"type": "StaticImage",
"name": "toast002",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 200,
"width": 504,
"height": 132,
"y": 104,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_removed001.png"
},
@@ -159,19 +159,19 @@
"type": "StaticImage",
"name": "toast003",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 320,
"width": 504,
"height": 132,
"y": 208,
"visible" : false,
"texture": "resources/w/ui/img/toast/objective_completed001.png"
"texture": "resources/w/ui/img/toast/quest_completed001.png"
},
{
"type": "TextView",
"name": "toast001text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 170,
"x": 8,
"y": 62,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -193,8 +193,8 @@
"name": "toast002text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 290,
"x": 8,
"y": 166,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -216,8 +216,8 @@
"name": "toast003text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 410,
"x": 8,
"y": 270,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
resources/w/ui/hud_uni_int_full.json
+16 -16
View File
@@ -112,9 +112,9 @@
"type": "StaticImage",
"name": "toast001",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 80,
"width": 504,
"height": 132,
"y": 0,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_received001.png"
},
@@ -122,9 +122,9 @@
"type": "StaticImage",
"name": "toast002",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 200,
"width": 504,
"height": 132,
"y": 104,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_removed001.png"
},
@@ -132,19 +132,19 @@
"type": "StaticImage",
"name": "toast003",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 320,
"width": 504,
"height": 132,
"y": 208,
"visible" : false,
"texture": "resources/w/ui/img/toast/objective_completed001.png"
"texture": "resources/w/ui/img/toast/quest_completed001.png"
},
{
"type": "TextView",
"name": "toast001text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 170,
"x": 8,
"y": 62,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -166,8 +166,8 @@
"name": "toast002text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 290,
"x": 8,
"y": 166,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -189,8 +189,8 @@
"name": "toast003text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 410,
"x": 8,
"y": 270,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
resources/w/ui/hud_uni_int_step10.json
+16 -16
View File
@@ -95,9 +95,9 @@
"type": "StaticImage",
"name": "toast001",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 80,
"width": 504,
"height": 132,
"y": 0,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_received001.png"
},
@@ -105,9 +105,9 @@
"type": "StaticImage",
"name": "toast002",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 200,
"width": 504,
"height": 132,
"y": 104,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_removed001.png"
},
@@ -115,19 +115,19 @@
"type": "StaticImage",
"name": "toast003",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 320,
"width": 504,
"height": 132,
"y": 208,
"visible" : false,
"texture": "resources/w/ui/img/toast/objective_completed001.png"
"texture": "resources/w/ui/img/toast/quest_completed001.png"
},
{
"type": "TextView",
"name": "toast001text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 170,
"x": 8,
"y": 62,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -149,8 +149,8 @@
"name": "toast002text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 290,
"x": 8,
"y": 166,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -172,8 +172,8 @@
"name": "toast003text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 410,
"x": 8,
"y": 270,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
resources/w/ui/hud_uni_int_step11.json
+16 -16
View File
@@ -142,9 +142,9 @@
"type": "StaticImage",
"name": "toast001",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 80,
"width": 504,
"height": 132,
"y": 0,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_received001.png"
},
@@ -152,9 +152,9 @@
"type": "StaticImage",
"name": "toast002",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 200,
"width": 504,
"height": 132,
"y": 104,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_removed001.png"
},
@@ -162,19 +162,19 @@
"type": "StaticImage",
"name": "toast003",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 320,
"width": 504,
"height": 132,
"y": 208,
"visible" : false,
"texture": "resources/w/ui/img/toast/objective_completed001.png"
"texture": "resources/w/ui/img/toast/quest_completed001.png"
},
{
"type": "TextView",
"name": "toast001text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 170,
"x": 8,
"y": 62,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -196,8 +196,8 @@
"name": "toast002text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 290,
"x": 8,
"y": 166,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -219,8 +219,8 @@
"name": "toast003text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 410,
"x": 8,
"y": 270,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
resources/w/ui/hud_uni_int_step12.json
+16 -16
View File
@@ -165,9 +165,9 @@
"type": "StaticImage",
"name": "toast001",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 80,
"width": 504,
"height": 132,
"y": 0,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_received001.png"
},
@@ -175,9 +175,9 @@
"type": "StaticImage",
"name": "toast002",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 200,
"width": 504,
"height": 132,
"y": 104,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_removed001.png"
},
@@ -185,19 +185,19 @@
"type": "StaticImage",
"name": "toast003",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 320,
"width": 504,
"height": 132,
"y": 208,
"visible" : false,
"texture": "resources/w/ui/img/toast/objective_completed001.png"
"texture": "resources/w/ui/img/toast/quest_completed001.png"
},
{
"type": "TextView",
"name": "toast001text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 170,
"x": 8,
"y": 62,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -219,8 +219,8 @@
"name": "toast002text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 290,
"x": 8,
"y": 166,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -242,8 +242,8 @@
"name": "toast003text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 410,
"x": 8,
"y": 270,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
resources/w/ui/hud_uni_int_step13.json
+16 -16
View File
@@ -158,9 +158,9 @@
"type": "StaticImage",
"name": "toast001",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 80,
"width": 504,
"height": 132,
"y": 0,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_received001.png"
},
@@ -168,9 +168,9 @@
"type": "StaticImage",
"name": "toast002",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 200,
"width": 504,
"height": 132,
"y": 104,
"visible" : false,
"texture": "resources/w/ui/img/toast/item_removed001.png"
},
@@ -178,19 +178,19 @@
"type": "StaticImage",
"name": "toast003",
"horizontal_gravity": "center",
"width": 672,
"height": 176,
"y": 320,
"width": 504,
"height": 132,
"y": 208,
"visible" : false,
"texture": "resources/w/ui/img/toast/objective_completed001.png"
"texture": "resources/w/ui/img/toast/quest_completed001.png"
},
{
"type": "TextView",
"name": "toast001text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 170,
"x": 8,
"y": 62,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -212,8 +212,8 @@
"name": "toast002text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 290,
"x": 8,
"y": 166,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
@@ -235,8 +235,8 @@
"name": "toast003text",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"y": 410,
"x": 8,
"y": 270,
"x": 54,
"width": 400,
"height": 100,
"visible" : false,
resources/w/ui/portrait_screen_inventory_item.json
+1 -1
View File
@@ -53,7 +53,7 @@
"width": 600,
"height": 137,
"text": "Серебряный нож.",
"fontSize": 60,
"fontSize": 48,
"fontPath": "resources/fonts/DroidSans.ttf",
"textCentered": false,
"topAligned": true,
resources/w/ui/portrait_screen_journal_item.json
+75 -53
View File
@@ -12,7 +12,7 @@
"name": "background",
"width": 640,
"height": 1200,
"y": 68,
"y": 68,
"horizontal_gravity": "center",
"vertical_gravity": "top",
"texture": "resources/w/ui/img/journal/PortraitQuestJournalItemBkg001.png"
@@ -55,30 +55,38 @@
]
},
{
"type": "LinearLayout",
"orientation": "horizontal",
"spacing": 10,
"type": "StaticImage",
"name": "objective1checkbox",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"x": 36,
"width": 60,
"height": 60,
"x": -255,
"y": 380,
"texture": "resources/w/ui/img/journal/quest_objective_completed.png"
},
{
"type": "LinearLayout",
"orientation": "horizontal",
"spacing": 0,
"horizontal_gravity": "center",
"vertical_gravity": "top",
"vertical_align": "bottom",
"name": "objective1nameLayout",
"paddingY": 0,
"width": 540.0,
"height": 60.0,
"x": 56,
"y": 370,
"width": 640,
"height": 80,
"children": [
{
"type": "StaticImage",
"name": "objective1checkbox",
"width": 60,
"height": 60,
"texture": "resources/w/ui/img/journal/quest_objective_completed.png"
},
{
"type": "TextView",
"name": "objective1name",
"paddingY": 20,
"width": 740.0,
"height": 80.0,
"textPaddingY": 20.0,
"horizontal_gravity": "center",
"vertical_gravity": "top",
"paddingY": -20,
"width": 540.0,
"height": 60.0,
"text": "Цель 1 Цель 1 Цель 1 Цель 1",
"fontSize": 32,
"fontPath": "resources/fonts/DroidSans.ttf",
@@ -95,31 +103,38 @@
]
},
{
"type": "LinearLayout",
"orientation": "horizontal",
"spacing": 10,
"type": "StaticImage",
"name": "objective2checkbox",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"x": 36,
"width": 60,
"height": 60,
"x": -255,
"y": 460,
"texture": "resources/w/ui/img/journal/quest_objective_blank.png"
},
{
"type": "LinearLayout",
"orientation": "horizontal",
"name": "objective2nameLayout",
"spacing": 0,
"horizontal_gravity": "center",
"vertical_gravity": "top",
"vertical_align": "bottom",
"width": 540.0,
"height": 80.0,
"x": 56,
"y": 450,
"width": 640,
"height": 80,
"children": [
{
"type": "StaticImage",
"name": "objective2checkbox",
"width": 60,
"height": 60,
"texture": "resources/w/ui/img/journal/quest_objective_blank.png"
},
{
"type": "TextView",
"name": "objective2name",
"paddingY": 20,
"width": 740.0,
"height": 80.0,
"horizontal_gravity": "center",
"vertical_gravity": "top",
"paddingY": 0,
"width": 540.0,
"height": 60.0,
"text": "Цель 2",
"textPaddingY": 20.0,
"fontSize": 32,
"fontPath": "resources/fonts/DroidSans.ttf",
"textCentered": false,
@@ -135,31 +150,38 @@
]
},
{
"type": "LinearLayout",
"orientation": "horizontal",
"spacing": 10,
"type": "StaticImage",
"name": "objective3checkbox",
"horizontal_gravity": "center",
"vertical_gravity": "top",
"x": 36,
"width": 60,
"height": 60,
"x": -255,
"y": 540,
"texture": "resources/w/ui/img/journal/quest_objective_blank.png"
},
{
"type": "LinearLayout",
"orientation": "horizontal",
"spacing": 0,
"horizontal_gravity": "center",
"vertical_gravity": "top",
"vertical_align": "bottom",
"name": "objective3nameLayout",
"paddingY": 0,
"width": 540.0,
"height": 60.0,
"x": 56,
"y": 530,
"width": 640,
"height": 80,
"children": [
{
"type": "StaticImage",
"name": "objective3checkbox",
"width": 60,
"height": 60,
"texture": "resources/w/ui/img/journal/quest_objective_blank.png"
},
{
"type": "TextView",
"name": "objective3name",
"paddingY": 20,
"width": 740.0,
"height": 80.0,
"horizontal_gravity": "center",
"vertical_gravity": "top",
"width": 540.0,
"height": 60.0,
"text": "Цель 3",
"textPaddingY": 20.0,
"fontSize": 32,
"fontPath": "resources/fonts/DroidSans.ttf",
"textCentered": false,
@@ -184,7 +206,7 @@
"horizontal_gravity": "center",
"vertical_gravity": "top",
"text": "А все бегут бегут бегут бегут бегут бегут бегут бегут бегут бегут бегут а мы идем.",
"fontSize": 32,
"fontSize": 24,
"fontPath": "resources/fonts/DroidSans.ttf",
"textCentered": false,
"topAligned": false,