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

Fixing clicking on phone

Browse Source
This commit is contained in:
Vladislav Khorev committed 2026-06-27 13:50:39 +03:00
1 parent bdad5fa107
commit 763ba9eeac
27 files changed
+179 -48
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

resources/w/ui/portrait_screen_phone.json
+26 -4
View File
@@ -22,14 +22,36 @@
}
},
{
"type": "StaticImage",
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 882,
"height": 1416,
"texture": "resources/w/ui/img/phone2/Phone002.png"
"clickZoneWidth": 600,
"clickZoneHeight": 900,
"textures": {
"normal": "resources/w/ui/img/phone2/Phone002.png",
"hover": "resources/w/ui/img/phone2/Phone002.png",
"pressed": "resources/w/ui/img/phone2/Phone002.png"
}
},
{
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 882,
"height": 1416,
"clickZoneWidth": 600,
"clickZoneHeight": 900,
"textures": {
"normal": "resources/w/ui/img/phone2/Phone002.png",
"hover": "resources/w/ui/img/phone2/Phone002.png",
"pressed": "resources/w/ui/img/phone2/Phone002.png"
}
},
{
"type": "StaticImage",
@@ -41,7 +63,7 @@
"height": 172,
"texture": "resources/w/ui/img/phone2/ClockDay001.png"
},
{
{
"type": "StaticImage",
"name": "phoneTimeNight",
"horizontal_gravity": "center",
@@ -51,7 +73,7 @@
"height": 120.4,
"texture": "resources/w/ui/img/phone2/ClockNight001.png"
},
{
{
"type": "StaticImage",
"name": "phoneTimeDawn",
"horizontal_gravity": "center",
resources/w/ui/portrait_screen_phone_bank.json
+10 -4
View File
@@ -21,15 +21,21 @@
"pressed": "resources/transparent.png"
}
},
{
"type": "StaticImage",
{
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 882,
"width": 882,
"height": 1416,
"texture": "resources/w/ui/img/phoneBank/PhoneBank002.png"
"clickZoneWidth": 600,
"clickZoneHeight": 900,
"textures": {
"normal": "resources/w/ui/img/phoneBank/PhoneBank002.png",
"hover": "resources/w/ui/img/phoneBank/PhoneBank002.png",
"pressed": "resources/w/ui/img/phoneBank/PhoneBank002.png"
}
},
{
"type": "Button",
resources/w/ui/portrait_screen_phone_chat1.json
+2
View File
@@ -29,6 +29,8 @@
"y": -60,
"width": 882,
"height": 1416,
"clickZoneWidth": 600,
"clickZoneHeight": 900,
"textures": {
"normal": "resources/w/ui/img/phone/PhoneChat001.png",
"hover": "resources/w/ui/img/phone/PhoneChat001.png",
resources/w/ui/portrait_screen_phone_chat2.json
+2
View File
@@ -29,6 +29,8 @@
"y": -60,
"width": 882,
"height": 1416,
"clickZoneWidth": 600,
"clickZoneHeight": 900,
"textures": {
"normal": "resources/w/ui/img/phone/PhoneChat001.png",
"hover": "resources/w/ui/img/phone/PhoneChat001.png",
resources/w/ui/portrait_screen_phone_chat3.json
+2
View File
@@ -29,6 +29,8 @@
"y": -60,
"width": 882,
"height": 1416,
"clickZoneWidth": 600,
"clickZoneHeight": 900,
"textures": {
"normal": "resources/w/ui/img/phone/PhoneChat001.png",
"hover": "resources/w/ui/img/phone/PhoneChat001.png",
resources/w/ui/portrait_screen_phone_chat_list.json
+2
View File
@@ -29,6 +29,8 @@
"y": -60,
"width": 882,
"height": 1416,
"clickZoneWidth": 600,
"clickZoneHeight": 900,
"textures": {
"normal": "resources/w/ui/img/phone/PhoneChatList001.png",
"hover": "resources/w/ui/img/phone/PhoneChatList001.png",
resources/w/ui/portrait_screen_phone_chat_list_hint001.json
+2
View File
@@ -48,6 +48,8 @@
"y": -60,
"width": 882,
"height": 1416,
"clickZoneWidth": 600,
"clickZoneHeight": 900,
"textures": {
"normal": "resources/w/ui/img/phone/PhoneChatList001.png",
"hover": "resources/w/ui/img/phone/PhoneChatList001.png",
resources/w/ui/portrait_screen_phone_hint001.json
+9 -3
View File
@@ -21,15 +21,21 @@
"pressed": "resources/transparent.png"
}
},
{
"type": "StaticImage",
{
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 882,
"height": 1416,
"texture": "resources/w/ui/img/phone2/Phone002.png"
"clickZoneWidth": 600,
"clickZoneHeight": 900,
"textures": {
"normal": "resources/w/ui/img/phone2/Phone002.png",
"hover": "resources/w/ui/img/phone2/Phone002.png",
"pressed": "resources/w/ui/img/phone2/Phone002.png"
}
},
{
"type": "StaticImage",
resources/w/ui/portrait_screen_phone_hint001_002.json
+9 -3
View File
@@ -21,15 +21,21 @@
"pressed": "resources/transparent.png"
}
},
{
"type": "StaticImage",
{
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 882,
"height": 1416,
"texture": "resources/w/ui/img/phone2/Phone002.png"
"clickZoneWidth": 600,
"clickZoneHeight": 900,
"textures": {
"normal": "resources/w/ui/img/phone2/Phone002.png",
"hover": "resources/w/ui/img/phone2/Phone002.png",
"pressed": "resources/w/ui/img/phone2/Phone002.png"
}
},
{
"type": "StaticImage",
resources/w/ui/portrait_screen_phone_hint002.json
+9 -3
View File
@@ -21,15 +21,21 @@
"pressed": "resources/transparent.png"
}
},
{
"type": "StaticImage",
{
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 882,
"height": 1416,
"texture": "resources/w/ui/img/phone2/Phone002.png"
"clickZoneWidth": 600,
"clickZoneHeight": 900,
"textures": {
"normal": "resources/w/ui/img/phone2/Phone002.png",
"hover": "resources/w/ui/img/phone2/Phone002.png",
"pressed": "resources/w/ui/img/phone2/Phone002.png"
}
},
{
"type": "StaticImage",
resources/w/ui/portrait_screen_phone_map_dorm.json
+10 -4
View File
@@ -21,15 +21,21 @@
"pressed": "resources/transparent.png"
}
},
{
"type": "StaticImage",
{
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 882,
"width": 882,
"height": 1416,
"texture": "resources/w/ui/img/phoneMap/PhoneMapDorm001.png"
"clickZoneWidth": 600,
"clickZoneHeight": 900,
"textures": {
"normal": "resources/w/ui/img/phoneMap/PhoneMapDorm001.png",
"hover": "resources/w/ui/img/phoneMap/PhoneMapDorm001.png",
"pressed": "resources/w/ui/img/phoneMap/PhoneMapDorm001.png"
}
},
{
"type": "Button",
resources/w/ui/portrait_screen_phone_map_uni.json
+9 -3
View File
@@ -21,15 +21,21 @@
"pressed": "resources/transparent.png"
}
},
{
"type": "StaticImage",
{
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 882,
"height": 1416,
"texture": "resources/w/ui/img/phoneMap/PhoneMapUni001.png"
"clickZoneWidth": 600,
"clickZoneHeight": 900,
"textures": {
"normal": "resources/w/ui/img/phoneMap/PhoneMapUni001.png",
"hover": "resources/w/ui/img/phoneMap/PhoneMapUni001.png",
"pressed": "resources/w/ui/img/phoneMap/PhoneMapUni001.png"
}
},
{
"type": "Button",
resources/w/ui/portrait_screen_phone_video.json
+10 -4
View File
@@ -21,15 +21,21 @@
"pressed": "resources/transparent.png"
}
},
{
"type": "StaticImage",
{
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 882,
"width": 882,
"height": 1416,
"texture": "resources/w/ui/img/phoneVideo/PhoneVideo003.png"
"clickZoneWidth": 600,
"clickZoneHeight": 900,
"textures": {
"normal": "resources/w/ui/img/phoneVideo/PhoneVideo003.png",
"hover": "resources/w/ui/img/phoneVideo/PhoneVideo003.png",
"pressed": "resources/w/ui/img/phoneVideo/PhoneVideo003.png"
}
},
{
"type": "Button",
resources/w/ui/screen_phone.json
+9 -3
View File
@@ -21,15 +21,21 @@
"pressed": "resources/transparent.png"
}
},
{
"type": "StaticImage",
{
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 617.4,
"height": 991.2,
"texture": "resources/w/ui/img/phone2/Phone002.png"
"clickZoneWidth": 500,
"clickZoneHeight": 800,
"textures": {
"normal": "resources/w/ui/img/phone2/Phone002.png",
"hover": "resources/w/ui/img/phone2/Phone002.png",
"pressed": "resources/w/ui/img/phone2/Phone002.png"
}
},
{
"type": "StaticImage",
resources/w/ui/screen_phone_bank.json
+9 -3
View File
@@ -21,15 +21,21 @@
"pressed": "resources/transparent.png"
}
},
{
"type": "StaticImage",
{
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 617.4,
"height": 991.2,
"texture": "resources/w/ui/img/phoneBank/PhoneBank002.png"
"clickZoneWidth": 500,
"clickZoneHeight": 800,
"textures": {
"normal": "resources/w/ui/img/phoneBank/PhoneBank002.png",
"hover": "resources/w/ui/img/phoneBank/PhoneBank002.png",
"pressed": "resources/w/ui/img/phoneBank/PhoneBank002.png"
}
},
{
"type": "Button",
resources/w/ui/screen_phone_chat1.json
+2
View File
@@ -29,6 +29,8 @@
"y": -60,
"width": 617.4,
"height": 991.2,
"clickZoneWidth": 500,
"clickZoneHeight": 800,
"textures": {
"normal": "resources/w/ui/img/phone/PhoneChat001.png",
"hover": "resources/w/ui/img/phone/PhoneChat001.png",
resources/w/ui/screen_phone_chat2.json
+2
View File
@@ -29,6 +29,8 @@
"y": -60,
"width": 617.4,
"height": 991.2,
"clickZoneWidth": 500,
"clickZoneHeight": 800,
"textures": {
"normal": "resources/w/ui/img/phone/PhoneChat001.png",
"hover": "resources/w/ui/img/phone/PhoneChat001.png",
resources/w/ui/screen_phone_chat3.json
+2
View File
@@ -29,6 +29,8 @@
"y": -60,
"width": 617.4,
"height": 991.2,
"clickZoneWidth": 500,
"clickZoneHeight": 800,
"textures": {
"normal": "resources/w/ui/img/phone/PhoneChat001.png",
"hover": "resources/w/ui/img/phone/PhoneChat001.png",
resources/w/ui/screen_phone_chat_list.json
+2
View File
@@ -29,6 +29,8 @@
"y": -60,
"width": 617.4,
"height": 991.2,
"clickZoneWidth": 500,
"clickZoneHeight": 800,
"textures": {
"normal": "resources/w/ui/img/phone/PhoneChatList001.png",
"hover": "resources/w/ui/img/phone/PhoneChatList001.png",
resources/w/ui/screen_phone_chat_list_hint001.json
+2
View File
@@ -48,6 +48,8 @@
"y": -60,
"width": 617.4,
"height": 991.2,
"clickZoneWidth": 500,
"clickZoneHeight": 800,
"textures": {
"normal": "resources/w/ui/img/phone/PhoneChatList001.png",
"hover": "resources/w/ui/img/phone/PhoneChatList001.png",
resources/w/ui/screen_phone_hint001.json
+8 -2
View File
@@ -22,14 +22,20 @@
}
},
{
"type": "StaticImage",
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 617.4,
"height": 991.2,
"texture": "resources/w/ui/img/phone2/Phone002.png"
"clickZoneWidth": 500,
"clickZoneHeight": 800,
"textures": {
"normal": "resources/w/ui/img/phone2/Phone002.png",
"hover": "resources/w/ui/img/phone2/Phone002.png",
"pressed": "resources/w/ui/img/phone2/Phone002.png"
}
},
{
"type": "StaticImage",
resources/w/ui/screen_phone_hint001_002.json
+8 -2
View File
@@ -22,14 +22,20 @@
}
},
{
"type": "StaticImage",
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 617.4,
"height": 991.2,
"texture": "resources/w/ui/img/phone2/Phone002.png"
"clickZoneWidth": 500,
"clickZoneHeight": 800,
"textures": {
"normal": "resources/w/ui/img/phone2/Phone002.png",
"hover": "resources/w/ui/img/phone2/Phone002.png",
"pressed": "resources/w/ui/img/phone2/Phone002.png"
}
},
{
"type": "StaticImage",
resources/w/ui/screen_phone_hint002.json
+9 -3
View File
@@ -21,15 +21,21 @@
"pressed": "resources/transparent.png"
}
},
{
"type": "StaticImage",
{
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 617.4,
"height": 991.2,
"texture": "resources/w/ui/img/phone2/Phone002.png"
"clickZoneWidth": 500,
"clickZoneHeight": 800,
"textures": {
"normal": "resources/w/ui/img/phone2/Phone002.png",
"hover": "resources/w/ui/img/phone2/Phone002.png",
"pressed": "resources/w/ui/img/phone2/Phone002.png"
}
},
{
"type": "StaticImage",
resources/w/ui/screen_phone_map_dorm.json
+9 -3
View File
@@ -21,15 +21,21 @@
"pressed": "resources/transparent.png"
}
},
{
"type": "StaticImage",
{
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 617.4,
"height": 991.2,
"texture": "resources/w/ui/img/phoneMap/PhoneMapDorm001.png"
"clickZoneWidth": 500,
"clickZoneHeight": 800,
"textures": {
"normal": "resources/w/ui/img/phoneMap/PhoneMapDorm001.png",
"hover": "resources/w/ui/img/phoneMap/PhoneMapDorm001.png",
"pressed": "resources/w/ui/img/phoneMap/PhoneMapDorm001.png"
}
},
{
"type": "Button",
resources/w/ui/screen_phone_map_uni.json
+9 -3
View File
@@ -21,15 +21,21 @@
"pressed": "resources/transparent.png"
}
},
{
"type": "StaticImage",
{
"type": "Button",
"name": "phoneMain",
"horizontal_gravity": "center",
"vertical_gravity": "center",
"y": -60,
"width": 617.4,
"height": 991.2,
"texture": "resources/w/ui/img/phoneMap/PhoneMapUni001.png"
"clickZoneWidth": 500,
"clickZoneHeight": 800,
"textures": {
"normal": "resources/w/ui/img/phoneMap/PhoneMapUni001.png",
"hover": "resources/w/ui/img/phoneMap/PhoneMapUni001.png",
"pressed": "resources/w/ui/img/phoneMap/PhoneMapUni001.png"
}
},
{
"type": "Button",
resources/w/ui/screen_phone_video.json
+2
View File
@@ -29,6 +29,8 @@
"y": -60,
"width": 617.4,
"height": 991.2,
"clickZoneWidth": 500,
"clickZoneHeight": 800,
"texture": "resources/w/ui/img/phoneVideo/PhoneVideo003.png"
},
{
src/MenuManager.cpp
+4 -1
View File
@@ -7,7 +7,6 @@
#include <algorithm>
#include <string>
namespace ZL {
static int questStatusPriority(Quest::QuestStatus status) {
@@ -610,6 +609,7 @@ namespace ZL {
uiManager.setButtonCallback("phoneExitButton", [this](const std::string&) {
closePhoneEntirely();
});
uiManager.setButtonCallback("phoneMain", [this](const std::string&) {});
uiManager.setButtonCallback("phoneMessenger", [this](const std::string&) {
openPhoneMessenger();
});
@@ -710,6 +710,7 @@ namespace ZL {
uiManager.setButtonCallback("phoneExitButton", [this](const std::string&) {
closePhoneEntirely();
});
uiManager.setButtonCallback("phoneMain", [this](const std::string&) {});
uiManager.setButtonCallback("buttonBack", [this](const std::string&) {
uiManager.popMenu();
uiManager.updateAllLayouts();
@@ -723,6 +724,7 @@ namespace ZL {
uiManager.setButtonCallback("phoneExitButton", [this](const std::string&) {
closePhoneEntirely();
});
uiManager.setButtonCallback("phoneMain", [this](const std::string&) {});
uiManager.setButtonCallback("buttonBack", [this](const std::string&) {
uiManager.popMenu();
uiManager.updateAllLayouts();
@@ -768,6 +770,7 @@ namespace ZL {
uiManager.setButtonCallback("phoneExitButton", [this](const std::string&) {
closePhoneEntirely();
});
uiManager.setButtonCallback("phoneMain", [this](const std::string&) {});
uiManager.setButtonCallback("buttonBack", [this](const std::string&) {
uiManager.popMenu();
uiManager.updateAllLayouts();