Fixing clicking on phone
This commit is contained in:
parent
bdad5fa107
commit
763ba9eeac
@ -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",
|
||||
|
||||
@ -22,14 +22,20 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "StaticImage",
|
||||
"type": "Button",
|
||||
"name": "phoneMain",
|
||||
"horizontal_gravity": "center",
|
||||
"vertical_gravity": "center",
|
||||
"y": -60,
|
||||
"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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -22,14 +22,20 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
|
||||
@ -22,14 +22,20 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
|
||||
@ -22,14 +22,20 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
|
||||
@ -22,14 +22,20 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "StaticImage",
|
||||
"type": "Button",
|
||||
"name": "phoneMain",
|
||||
"horizontal_gravity": "center",
|
||||
"vertical_gravity": "center",
|
||||
"y": -60,
|
||||
"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",
|
||||
|
||||
@ -22,14 +22,20 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"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",
|
||||
|
||||
@ -22,14 +22,20 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "StaticImage",
|
||||
"type": "Button",
|
||||
"name": "phoneMain",
|
||||
"horizontal_gravity": "center",
|
||||
"vertical_gravity": "center",
|
||||
"y": -60,
|
||||
"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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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/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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -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/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",
|
||||
|
||||
@ -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/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",
|
||||
|
||||
@ -29,6 +29,8 @@
|
||||
"y": -60,
|
||||
"width": 617.4,
|
||||
"height": 991.2,
|
||||
"clickZoneWidth": 500,
|
||||
"clickZoneHeight": 800,
|
||||
"texture": "resources/w/ui/img/phoneVideo/PhoneVideo003.png"
|
||||
},
|
||||
{
|
||||
|
||||
@ -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();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user