diff --git a/resources/w/ui/hud_step5ab.json b/resources/w/ui/hud_step5ab.json index d75601d..96a0bfd 100644 --- a/resources/w/ui/hud_step5ab.json +++ b/resources/w/ui/hud_step5ab.json @@ -112,15 +112,27 @@ "fadeIn": { "durationMs": 1000 } + }, + { + "type": "StaticImage", + "name": "hint6barrow", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "width": 118, + "height": 118, + "x": 80, + "y": 200, + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" }, { "type": "StaticImage", "name": "hint6b", "horizontal_gravity": "right", + "vertical_gravity": "top", "width": 738.75, "height": 292.5, - "x": 0, - "y": 360, + "x": 80, + "y": 100, "texture": "resources/w/ui/img/Hint6b.png", "pulse": { "minScale": 0.92, @@ -130,16 +142,6 @@ "fadeIn": { "durationMs": 1000 } - }, - { - "type": "StaticImage", - "name": "hint6barrow", - "horizontal_gravity": "right", - "width": 118, - "height": 118, - "x": 80, - "y": 300, - "texture": "resources/w/ui/img/hint_arrow_right_top.png" }, { "type": "StaticImage", diff --git a/resources/w/ui/hud_step5b.json b/resources/w/ui/hud_step5b.json index b1cebcf..403b46a 100644 --- a/resources/w/ui/hud_step5b.json +++ b/resources/w/ui/hud_step5b.json @@ -65,15 +65,27 @@ "horizontal_gravity": "center", "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_dorm.png" + }, + { + "type": "StaticImage", + "name": "hint6barrow", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "width": 118, + "height": 118, + "x": 80, + "y": 200, + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" }, { "type": "StaticImage", "name": "hint6b", "horizontal_gravity": "right", + "vertical_gravity": "top", "width": 738.75, "height": 292.5, - "x": 0, - "y": 360, + "x": 80, + "y": 100, "texture": "resources/w/ui/img/Hint6b.png", "pulse": { "minScale": 0.92, @@ -83,16 +95,6 @@ "fadeIn": { "durationMs": 1000 } - }, - { - "type": "StaticImage", - "name": "hint6barrow", - "horizontal_gravity": "right", - "width": 118, - "height": 118, - "x": 80, - "y": 300, - "texture": "resources/w/ui/img/hint_arrow_right_top.png" } ] } diff --git a/resources/w/ui/hud_uni_int_step11.json b/resources/w/ui/hud_uni_int_step11.json index 534de0c..6e01a02 100644 --- a/resources/w/ui/hud_uni_int_step11.json +++ b/resources/w/ui/hud_uni_int_step11.json @@ -99,16 +99,27 @@ "horizontal_gravity": "center", "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_uni_int.png" + }, + { + "type": "StaticImage", + "name": "hint_darklands001_arrow", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "width": 118, + "height": 118, + "x": 80, + "y": 310, + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" }, { "type": "StaticImage", "name": "hint_darklands001", + "horizontal_gravity": "right", + "vertical_gravity": "top", "width": 470, "height": 156, - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": 167, - "y": 200, + "x": 100, + "y": 250, "texture": "resources/w/ui/img/Hint_darklands001.png", "pulse": { "minScale": 0.92, @@ -118,17 +129,6 @@ "fadeIn": { "durationMs": 600 } - }, - { - "type": "StaticImage", - "name": "hint_darklands001_arrow", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "width": 24, - "height": 118, - "x": 397, - "y": 110, - "texture": "resources/w/ui/img/hint_arrow_up.png" }, { "type": "FrameLayout", diff --git a/resources/w/ui/hud_uni_int_step13.json b/resources/w/ui/hud_uni_int_step13.json index fceec4a..cccc2ba 100644 --- a/resources/w/ui/hud_uni_int_step13.json +++ b/resources/w/ui/hud_uni_int_step13.json @@ -74,7 +74,7 @@ "width": 470, "height": 178, "x": 0, - "y": 20, + "y": 80, "texture": "resources/w/ui/img/Hint_darklands002_attack.png", "pulse": { "minScale": 0.92, diff --git a/resources/w/ui/portrait_screen_phone_chat_list_hint001.json b/resources/w/ui/portrait_screen_phone_chat_list_hint001.json index 6e12a99..ab9e5ef 100644 --- a/resources/w/ui/portrait_screen_phone_chat_list_hint001.json +++ b/resources/w/ui/portrait_screen_phone_chat_list_hint001.json @@ -248,9 +248,9 @@ "width": 600, "height": 234, "x": 0, - "y": 10, + "y": -160, "horizontal_gravity": "center", - "vertical_gravity": "top", + "vertical_gravity": "center", "texture": "resources/w/ui/img/Hint_m001.png", "pulse": { "minScale": 0.92, diff --git a/src/MenuManager.cpp b/src/MenuManager.cpp index ce56791..a41b82e 100644 --- a/src/MenuManager.cpp +++ b/src/MenuManager.cpp @@ -607,7 +607,6 @@ namespace ZL { } - uiManager.setButtonCallback("phoneExitButton", [this](const std::string&) { closePhoneEntirely(); });