diff --git a/resources/w/ui/hud_step3.json b/resources/w/ui/hud_step3.json index 5014d3c..acb3767 100644 --- a/resources/w/ui/hud_step3.json +++ b/resources/w/ui/hud_step3.json @@ -18,8 +18,8 @@ { "type": "StaticImage", "name": "hint4", - "width": 940, - "height": 312, + "width": 705, + "height": 234, "horizontal_gravity": "center", "texture": "resources/w/ui/img/Hint4.png", "pulse": { diff --git a/resources/w/ui/hud_step4.json b/resources/w/ui/hud_step4.json index 4be8a90..1eceb64 100644 --- a/resources/w/ui/hud_step4.json +++ b/resources/w/ui/hud_step4.json @@ -18,8 +18,8 @@ { "type": "StaticImage", "name": "hint5", - "width": 808, - "height": 268, + "width": 606, + "height": 201, "horizontal_gravity": "center", "texture": "resources/w/ui/img/Hint5.png", "pulse": { diff --git a/resources/w/ui/hud_step5a.json b/resources/w/ui/hud_step5a.json index e5a8d6f..5658d9a 100644 --- a/resources/w/ui/hud_step5a.json +++ b/resources/w/ui/hud_step5a.json @@ -58,21 +58,22 @@ }, { "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_align": "top", - "texture": "resources/w/ui/img/Location_dorm.png" + "name": "hint6aarrow", + "horizontal_gravity": "right", + "vertical_gravity" : "bottom", + "width": 118, + "height": 118, + "x": 80, + "y": 60, + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" }, { "type": "StaticImage", "name": "hint6a", "width": 606, "height": 234, - "x" : 270, - "y" : -20, + "x" : 110, + "y" : 80, "horizontal_gravity": "right", "vertical_gravity" : "bottom", "texture": "resources/w/ui/img/Hint6a.png", diff --git a/resources/w/ui/hud_step5ab.json b/resources/w/ui/hud_step5ab.json index 779a71a..d75601d 100644 --- a/resources/w/ui/hud_step5ab.json +++ b/resources/w/ui/hud_step5ab.json @@ -85,47 +85,22 @@ }, { "type": "StaticImage", - "name": "hint6b", + "name": "hint6aarrow", "horizontal_gravity": "right", - "width": 738.75, - "height": 292.5, - "x": 0, - "y": 200, - "texture": "resources/w/ui/img/Hint6b.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint6barrow", - "horizontal_gravity": "right", - "width": 24, + "vertical_gravity" : "bottom", + "width": 118, "height": 118, - "x": 280, - "y": 120, - "texture": "resources/w/ui/img/hint_arrow_up.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } + "x": 80, + "y": 60, + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" }, { "type": "StaticImage", "name": "hint6a", "width": 606, "height": 234, - "x" : 270, - "y" : -20, + "x" : 110, + "y" : 80, "horizontal_gravity": "right", "vertical_gravity" : "bottom", "texture": "resources/w/ui/img/Hint6a.png", @@ -140,14 +115,43 @@ }, { "type": "StaticImage", - "name": "hint6aarrow", - "width": 170, - "height": 48, - "x" : 140, - "y" : 50, - "horizontal_gravity": "right", + "name": "hint6b", + "horizontal_gravity": "right", + "width": 738.75, + "height": 292.5, + "x": 0, + "y": 360, + "texture": "resources/w/ui/img/Hint6b.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "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", + "name": "hint7arrow", + "horizontal_gravity": "right", "vertical_gravity" : "bottom", - "texture": "resources/w/ui/img/hint_arrow_left.png", + "width": 118, + "height": 118, + "x": 80, + "y": 60, + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png", + "visible":false, "pulse": { "minScale": 0.92, "maxScale": 1.08, @@ -162,8 +166,8 @@ "name": "hint7", "width": 606, "height": 201, - "x" : 270, - "y" : -20, + "x" : 110, + "y" : 80, "visible":false, "horizontal_gravity": "right", "vertical_gravity" : "bottom", @@ -176,26 +180,6 @@ "fadeIn": { "durationMs": 1000 } - }, - { - "type": "StaticImage", - "name": "hint7arrow", - "width": 170, - "height": 48, - "x" : 140, - "y" : 50, - "visible":false, - "horizontal_gravity": "right", - "vertical_gravity" : "bottom", - "texture": "resources/w/ui/img/hint_arrow_left.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } } ] } diff --git a/resources/w/ui/hud_step5b.json b/resources/w/ui/hud_step5b.json index b7cd941..b1cebcf 100644 --- a/resources/w/ui/hud_step5b.json +++ b/resources/w/ui/hud_step5b.json @@ -56,15 +56,15 @@ "pressed": "resources/w/ui/img/Journal001_State=Tap.png" } }, - { + { "type": "StaticImage", "name": "location", "width": 380, "height": 64, "y": 30, "horizontal_gravity": "center", - "vertical_align": "top", - "texture": "resources/w/ui/img/Location_uni_ext.png" + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/Location_dorm.png" }, { "type": "StaticImage", @@ -73,7 +73,7 @@ "width": 738.75, "height": 292.5, "x": 0, - "y": 200, + "y": 360, "texture": "resources/w/ui/img/Hint6b.png", "pulse": { "minScale": 0.92, @@ -88,11 +88,11 @@ "type": "StaticImage", "name": "hint6barrow", "horizontal_gravity": "right", - "width": 24, + "width": 118, "height": 118, - "x": 280, - "y": 120, - "texture": "resources/w/ui/img/hint_arrow_up.png" + "x": 80, + "y": 300, + "texture": "resources/w/ui/img/hint_arrow_right_top.png" } ] } diff --git a/resources/w/ui/hud_top_hint01.json b/resources/w/ui/hud_top_hint01.json index 95614d9..3d9739b 100644 --- a/resources/w/ui/hud_top_hint01.json +++ b/resources/w/ui/hud_top_hint01.json @@ -10,9 +10,10 @@ "name": "hint2", "width": 72, "height": 354, - "y": 200, - "x": 500, - "horizontal_gravity": "right", + "y": -100, + "x": 0, + "horizontal_gravity": "center", + "vertical_gravity": "center", "texture": "resources/w/ui/img/hint_arrow_down.png", "pulse": { "minScale": 0.92, @@ -26,11 +27,12 @@ { "type": "StaticImage", "name": "hint1", - "width": 880, - "height": 268, - "x": 100, - "y" : -40, - "horizontal_gravity": "right", + "width": 660, + "height": 201, + "x": 0, + "y" : 160, + "horizontal_gravity": "center", + "vertical_gravity": "center", "texture": "resources/w/ui/img/Hint1.png", "pulse": { "minScale": 0.92, diff --git a/resources/w/ui/img/hint_arrow_down_small.png b/resources/w/ui/img/hint_arrow_down_small.png new file mode 100644 index 0000000..843c799 --- /dev/null +++ b/resources/w/ui/img/hint_arrow_down_small.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae296c1a7eca0e0a2533f46f05aa2c5c7ba9d759a0e5decb0a0a4c0c6544d063 +size 3216 diff --git a/resources/w/ui/img/hint_arrow_right_bottom.png b/resources/w/ui/img/hint_arrow_right_bottom.png new file mode 100644 index 0000000..6121f32 --- /dev/null +++ b/resources/w/ui/img/hint_arrow_right_bottom.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa02d9ae0e7036fe789e0224821587c8e874d2f49842357cc59c6f4247c65820 +size 8409 diff --git a/resources/w/ui/img/hint_arrow_right_top.png b/resources/w/ui/img/hint_arrow_right_top.png new file mode 100644 index 0000000..0a6b3bd --- /dev/null +++ b/resources/w/ui/img/hint_arrow_right_top.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a4068f3a97b2c2b7de226f65dba975a2a748a1e3d4fe0720f75959dd0c7ac97 +size 8384 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 eb64826..6e12a99 100644 --- a/resources/w/ui/portrait_screen_phone_chat_list_hint001.json +++ b/resources/w/ui/portrait_screen_phone_chat_list_hint001.json @@ -7,25 +7,6 @@ "vertical_align": "center", "horizontal_align": "center", "children": [ - { - "type": "StaticImage", - "name": "hint_m002", - "width": 400, - "height": 156, - "x": 420, - "y": 0, - "horizontal_gravity": "center", - "vertical_gravity": "top", - "texture": "resources/w/ui/img/Hint_m001.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, { "type": "Button", "name": "phoneExitButton", @@ -48,7 +29,7 @@ "y": -60, "width": 882, "height": 1416, - "clickZoneWidth": 600, + "clickZoneWidth": 600, "clickZoneHeight": 900, "textures": { "normal": "resources/w/ui/img/phone/PhoneChatList001.png", @@ -260,6 +241,25 @@ ] } ] + }, + { + "type": "StaticImage", + "name": "hint_m002", + "width": 600, + "height": 234, + "x": 0, + "y": 10, + "horizontal_gravity": "center", + "vertical_gravity": "top", + "texture": "resources/w/ui/img/Hint_m001.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + } } ] } diff --git a/resources/w/ui/portrait_screen_phone_hint001.json b/resources/w/ui/portrait_screen_phone_hint001.json index 9a9721e..5c11bff 100644 --- a/resources/w/ui/portrait_screen_phone_hint001.json +++ b/resources/w/ui/portrait_screen_phone_hint001.json @@ -21,7 +21,7 @@ "pressed": "resources/transparent.png" } }, - { + { "type": "Button", "name": "phoneMain", "horizontal_gravity": "center", @@ -29,7 +29,7 @@ "y": -60, "width": 882, "height": 1416, - "clickZoneWidth": 600, + "clickZoneWidth": 600, "clickZoneHeight": 900, "textures": { "normal": "resources/w/ui/img/phone2/Phone002.png", @@ -47,7 +47,7 @@ "height": 172, "texture": "resources/w/ui/img/phone2/ClockDay001.png" }, - { + { "type": "StaticImage", "name": "phoneTimeNight", "horizontal_gravity": "center", @@ -57,7 +57,7 @@ "height": 120.4, "texture": "resources/w/ui/img/phone2/ClockNight001.png" }, - { + { "type": "StaticImage", "name": "phoneTimeDawn", "horizontal_gravity": "center", @@ -127,16 +127,16 @@ "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" } }, - { + { "type": "StaticImage", "name": "hint_m001arrow", - "width": 170, - "height": 48, - "x" : -220, - "y" : 150, + "width": 48, + "height": 170, + "x": -110, + "y": -400, "horizontal_gravity": "center", - "vertical_gravity" : "bottom", - "texture": "resources/w/ui/img/hint_arrow_left.png", + "vertical_gravity": "center", + "texture": "resources/w/ui/img/hint_arrow_up.png", "pulse": { "minScale": 0.92, "maxScale": 1.08, @@ -146,15 +146,15 @@ "durationMs": 1000 } }, - { + { "type": "StaticImage", "name": "hint_m001", - "width": 414, - "height": 156, - "x" : -420, - "y" : 100, + "width": 621, + "height": 234, + "x": 0, + "y": -470, "horizontal_gravity": "center", - "vertical_gravity" : "bottom", + "vertical_gravity": "center", "texture": "resources/w/ui/img/Hint_m002.png", "pulse": { "minScale": 0.92, @@ -167,4 +167,4 @@ } ] } -} +} \ No newline at end of file diff --git a/resources/w/ui/portrait_screen_phone_hint001_002.json b/resources/w/ui/portrait_screen_phone_hint001_002.json index 6308175..27a4237 100644 --- a/resources/w/ui/portrait_screen_phone_hint001_002.json +++ b/resources/w/ui/portrait_screen_phone_hint001_002.json @@ -130,13 +130,13 @@ { "type": "StaticImage", "name": "hint_m001arrow", - "width": 170, - "height": 48, - "x": -220, - "y": 150, + "width": 48, + "height": 170, + "x": -110, + "y": -400, "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/hint_arrow_left.png", + "vertical_gravity": "center", + "texture": "resources/w/ui/img/hint_arrow_up.png", "pulse": { "minScale": 0.92, "maxScale": 1.08, @@ -149,12 +149,12 @@ { "type": "StaticImage", "name": "hint_m001", - "width": 414, - "height": 156, - "x": -420, - "y": 100, + "width": 621, + "height": 234, + "x": 0, + "y": -470, "horizontal_gravity": "center", - "vertical_gravity": "bottom", + "vertical_gravity": "center", "texture": "resources/w/ui/img/Hint_m002.png", "pulse": { "minScale": 0.92, @@ -168,13 +168,13 @@ { "type": "StaticImage", "name": "hint_m003arrow", - "width": 170, - "height": 48, - "x": 220, - "y": 270, + "width": 48, + "height": 170, + "x" : 110, + "y" : 130, "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/hint_arrow_right.png", + "vertical_gravity" : "center", + "texture": "resources/w/ui/img/hint_arrow_down_small.png", "pulse": { "minScale": 0.92, "maxScale": 1.08, @@ -184,15 +184,15 @@ "durationMs": 1000 } }, - { + { "type": "StaticImage", "name": "hint_m003", - "width": 318, - "height": 178, - "x": 420, - "y": 220, + "width": 636, + "height": 356, + "x" : 0, + "y" : 250, "horizontal_gravity": "center", - "vertical_gravity": "bottom", + "vertical_gravity" : "center", "texture": "resources/w/ui/img/Hint_m003.png", "pulse": { "minScale": 0.92, diff --git a/resources/w/ui/portrait_screen_phone_hint002.json b/resources/w/ui/portrait_screen_phone_hint002.json index 639ff88..f8ff3b5 100644 --- a/resources/w/ui/portrait_screen_phone_hint002.json +++ b/resources/w/ui/portrait_screen_phone_hint002.json @@ -130,13 +130,13 @@ { "type": "StaticImage", "name": "hint_m003arrow", - "width": 170, - "height": 48, - "x" : 220, - "y" : 270, + "width": 48, + "height": 170, + "x" : 110, + "y" : 130, "horizontal_gravity": "center", - "vertical_gravity" : "bottom", - "texture": "resources/w/ui/img/hint_arrow_right.png", + "vertical_gravity" : "center", + "texture": "resources/w/ui/img/hint_arrow_down_small.png", "pulse": { "minScale": 0.92, "maxScale": 1.08, @@ -149,12 +149,12 @@ { "type": "StaticImage", "name": "hint_m003", - "width": 318, - "height": 178, - "x" : 420, - "y" : 220, + "width": 636, + "height": 356, + "x" : 0, + "y" : 250, "horizontal_gravity": "center", - "vertical_gravity" : "bottom", + "vertical_gravity" : "center", "texture": "resources/w/ui/img/Hint_m003.png", "pulse": { "minScale": 0.92, diff --git a/src/Game.cpp b/src/Game.cpp index 03b8b3e..6b4dfff 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -941,6 +941,7 @@ namespace ZL Environment::computeProjectionDimensions(); const bool isPortrait = Environment::width < Environment::height; menuManager.uiManager.updateAllLayouts(); + menuManager.topUiManager.updateAllLayouts(); if (wasPortrait != isPortrait) { menuManager.onOrientationChanged(); } diff --git a/src/MenuManager.cpp b/src/MenuManager.cpp index c011efb..ce56791 100644 --- a/src/MenuManager.cpp +++ b/src/MenuManager.cpp @@ -606,6 +606,8 @@ namespace ZL { uiManager.pushMenuFromSavedRoot(phoneMainRoot); } + + uiManager.setButtonCallback("phoneExitButton", [this](const std::string&) { closePhoneEntirely(); });