From 9fa120d4adca08fe17dab749a159408e5f9c6b80 Mon Sep 17 00:00:00 2001 From: Vladislav Khorev Date: Fri, 23 Oct 2026 22:03:55 +0600 Subject: [PATCH] Working on tutorial refactoring --- resources/config/start_state.json | 14 +- .../w/ui/{hud_step5ab.json => hud_dorm.json} | 174 +++++- ...p5abandroid.json => hud_dorm_android.json} | 174 +++++- resources/w/ui/hud_step0.json | 37 -- resources/w/ui/hud_step1.json | 65 --- resources/w/ui/hud_step1android.json | 65 --- resources/w/ui/hud_step2.json | 65 --- resources/w/ui/hud_step2android.json | 65 --- resources/w/ui/hud_step3.json | 65 --- resources/w/ui/hud_step3android.json | 65 --- resources/w/ui/hud_step4.json | 65 --- resources/w/ui/hud_step5a.json | 101 ---- resources/w/ui/hud_step5b.json | 101 ---- ...d_uni_int_step11.json => hud_uni_int.json} | 100 ++-- ...1android.json => hud_uni_int_android.json} | 100 ++-- ..._int_step12.json => hud_uni_int_dark.json} | 126 +++-- ...p13.json => hud_uni_int_dark_android.json} | 119 ++-- resources/w/ui/hud_uni_int_dark_full.json | 241 -------- resources/w/ui/hud_uni_int_full.json | 214 ------- resources/w/ui/hud_uni_int_step10.json | 197 ------- resources/w/ui/hud_uni_int_step13android.json | 260 --------- resources/w/ui/portrait_screen_phone.json | 82 ++- .../w/ui/portrait_screen_phone_chat_list.json | 24 +- ...rtrait_screen_phone_chat_list_hint001.json | 266 --------- .../w/ui/portrait_screen_phone_hint001.json | 170 ------ .../ui/portrait_screen_phone_hint001_002.json | 208 ------- .../w/ui/portrait_screen_phone_hint002.json | 170 ------ resources/w/ui/screen_phone.json | 82 ++- resources/w/ui/screen_phone_chat_list.json | 94 ++-- .../w/ui/screen_phone_chat_list_hint001.json | 266 --------- resources/w/ui/screen_phone_hint001.json | 170 ------ resources/w/ui/screen_phone_hint001_002.json | 208 ------- resources/w/ui/screen_phone_hint002.json | 170 ------ resources/w/ui/screen_settings.json | 10 + .../w/ui/screen_settings_nomusic_web.json | 10 + .../ui_en/{hud_step5ab.json => hud_dorm.json} | 174 +++++- ...p5abandroid.json => hud_dorm_android.json} | 174 +++++- resources/w/ui_en/hud_step0.json | 37 -- resources/w/ui_en/hud_step1.json | 65 --- resources/w/ui_en/hud_step1android.json | 65 --- resources/w/ui_en/hud_step2.json | 65 --- resources/w/ui_en/hud_step2android.json | 65 --- resources/w/ui_en/hud_step3.json | 65 --- resources/w/ui_en/hud_step3android.json | 65 --- resources/w/ui_en/hud_step4.json | 65 --- resources/w/ui_en/hud_step5a.json | 101 ---- resources/w/ui_en/hud_step5b.json | 101 ---- ...d_uni_int_step11.json => hud_uni_int.json} | 100 ++-- ...1android.json => hud_uni_int_android.json} | 100 ++-- ..._int_step12.json => hud_uni_int_dark.json} | 126 +++-- ...oid.json => hud_uni_int_dark_android.json} | 119 ++-- resources/w/ui_en/hud_uni_int_dark_full.json | 241 -------- resources/w/ui_en/hud_uni_int_full.json | 214 ------- resources/w/ui_en/hud_uni_int_step10.json | 197 ------- resources/w/ui_en/hud_uni_int_step13.json | 260 --------- resources/w/ui_en/portrait_screen_phone.json | 82 ++- .../portrait_screen_phone_chat_list.json | 24 +- ...rtrait_screen_phone_chat_list_hint001.json | 266 --------- .../ui_en/portrait_screen_phone_hint001.json | 170 ------ .../portrait_screen_phone_hint001_002.json | 208 ------- .../ui_en/portrait_screen_phone_hint002.json | 170 ------ resources/w/ui_en/screen_phone.json | 88 ++- resources/w/ui_en/screen_phone_chat_list.json | 94 ++-- .../ui_en/screen_phone_chat_list_hint001.json | 266 --------- resources/w/ui_en/screen_phone_hint001.json | 170 ------ .../w/ui_en/screen_phone_hint001_002.json | 208 ------- resources/w/ui_en/screen_phone_hint002.json | 170 ------ resources/w/ui_en/screen_settings.json | 10 + .../w/ui_en/screen_settings_nomusic_web.json | 10 + src/Environment.cpp | 5 +- src/Game.cpp | 57 +- src/Game.h | 4 +- src/GameState.cpp | 35 +- src/GameState.h | 44 +- src/Location.cpp | 2 +- src/Location.h | 8 +- src/LocationState.cpp | 2 - src/LocationState.h | 3 - src/MenuManager.cpp | 531 +++++------------- src/MenuManager.h | 52 +- src/UiManager.cpp | 18 +- src/UiManager.h | 1 + 82 files changed, 1877 insertions(+), 7563 deletions(-) rename resources/w/ui/{hud_step5ab.json => hud_dorm.json} (52%) rename resources/w/ui/{hud_step5abandroid.json => hud_dorm_android.json} (52%) delete mode 100644 resources/w/ui/hud_step0.json delete mode 100644 resources/w/ui/hud_step1.json delete mode 100644 resources/w/ui/hud_step1android.json delete mode 100644 resources/w/ui/hud_step2.json delete mode 100644 resources/w/ui/hud_step2android.json delete mode 100644 resources/w/ui/hud_step3.json delete mode 100644 resources/w/ui/hud_step3android.json delete mode 100644 resources/w/ui/hud_step4.json delete mode 100644 resources/w/ui/hud_step5a.json delete mode 100644 resources/w/ui/hud_step5b.json rename resources/w/ui/{hud_uni_int_step11.json => hud_uni_int.json} (89%) rename resources/w/ui/{hud_uni_int_step11android.json => hud_uni_int_android.json} (89%) rename resources/w/ui/{hud_uni_int_step12.json => hud_uni_int_dark.json} (84%) rename resources/w/ui/{hud_uni_int_step13.json => hud_uni_int_dark_android.json} (81%) delete mode 100644 resources/w/ui/hud_uni_int_dark_full.json delete mode 100644 resources/w/ui/hud_uni_int_full.json delete mode 100644 resources/w/ui/hud_uni_int_step10.json delete mode 100644 resources/w/ui/hud_uni_int_step13android.json delete mode 100644 resources/w/ui/portrait_screen_phone_chat_list_hint001.json delete mode 100644 resources/w/ui/portrait_screen_phone_hint001.json delete mode 100644 resources/w/ui/portrait_screen_phone_hint001_002.json delete mode 100644 resources/w/ui/portrait_screen_phone_hint002.json delete mode 100644 resources/w/ui/screen_phone_chat_list_hint001.json delete mode 100644 resources/w/ui/screen_phone_hint001.json delete mode 100644 resources/w/ui/screen_phone_hint001_002.json delete mode 100644 resources/w/ui/screen_phone_hint002.json rename resources/w/ui_en/{hud_step5ab.json => hud_dorm.json} (52%) rename resources/w/ui_en/{hud_step5abandroid.json => hud_dorm_android.json} (52%) delete mode 100644 resources/w/ui_en/hud_step0.json delete mode 100644 resources/w/ui_en/hud_step1.json delete mode 100644 resources/w/ui_en/hud_step1android.json delete mode 100644 resources/w/ui_en/hud_step2.json delete mode 100644 resources/w/ui_en/hud_step2android.json delete mode 100644 resources/w/ui_en/hud_step3.json delete mode 100644 resources/w/ui_en/hud_step3android.json delete mode 100644 resources/w/ui_en/hud_step4.json delete mode 100644 resources/w/ui_en/hud_step5a.json delete mode 100644 resources/w/ui_en/hud_step5b.json rename resources/w/ui_en/{hud_uni_int_step11.json => hud_uni_int.json} (89%) rename resources/w/ui_en/{hud_uni_int_step11android.json => hud_uni_int_android.json} (89%) rename resources/w/ui_en/{hud_uni_int_step12.json => hud_uni_int_dark.json} (84%) rename resources/w/ui_en/{hud_uni_int_step13android.json => hud_uni_int_dark_android.json} (81%) delete mode 100644 resources/w/ui_en/hud_uni_int_dark_full.json delete mode 100644 resources/w/ui_en/hud_uni_int_full.json delete mode 100644 resources/w/ui_en/hud_uni_int_step10.json delete mode 100644 resources/w/ui_en/hud_uni_int_step13.json delete mode 100644 resources/w/ui_en/portrait_screen_phone_chat_list_hint001.json delete mode 100644 resources/w/ui_en/portrait_screen_phone_hint001.json delete mode 100644 resources/w/ui_en/portrait_screen_phone_hint001_002.json delete mode 100644 resources/w/ui_en/portrait_screen_phone_hint002.json delete mode 100644 resources/w/ui_en/screen_phone_chat_list_hint001.json delete mode 100644 resources/w/ui_en/screen_phone_hint001.json delete mode 100644 resources/w/ui_en/screen_phone_hint001_002.json delete mode 100644 resources/w/ui_en/screen_phone_hint002.json diff --git a/resources/config/start_state.json b/resources/config/start_state.json index 66288b5..54c4805 100644 --- a/resources/config/start_state.json +++ b/resources/config/start_state.json @@ -530,8 +530,7 @@ "z": 14.0 } ] - }, - "tutorialInteractiveObjectsLocked": true + } }, "npcStates": [ { @@ -737,8 +736,7 @@ "z": -55.0 } ] - }, - "tutorialInteractiveObjectsLocked": false + } }, "npcStates": [], "playerState": { @@ -1126,8 +1124,7 @@ "taxiCarTriggerPositionY": 0.0, "taxiCarTriggerPositionZ": 0.0, "taxiDefaultWaypoints": [] - }, - "tutorialInteractiveObjectsLocked": false + } }, "npcStates": [ { @@ -1653,11 +1650,8 @@ }, "savedAt": "2026-07-24 23:40", "taxiIsCalled": false, - "tutorialJournalPickedUp": false, "tutorialJournalScreenOpened": false, "tutorialNeedOpenTaxiScreen": false, "tutorialPhoneChatScreenOpened": false, - "tutorialPhonePickedUp": false, - "tutorialStep": 0, - "uniIntTutorialState": 0 + "tutorialStep": 0 } \ No newline at end of file diff --git a/resources/w/ui/hud_step5ab.json b/resources/w/ui/hud_dorm.json similarity index 52% rename from resources/w/ui/hud_step5ab.json rename to resources/w/ui/hud_dorm.json index 773cc4b..eb899f1 100644 --- a/resources/w/ui/hud_step5ab.json +++ b/resources/w/ui/hud_dorm.json @@ -83,26 +83,27 @@ "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_dorm.png" }, - { + { "type": "StaticImage", "name": "hint6aarrow", - "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "horizontal_gravity": "right", + "vertical_gravity": "bottom", "width": 118, "height": 118, "x": 80, "y": 60, - "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png", + "visible": false }, - { + { "type": "StaticImage", "name": "hint6a", "width": 606, "height": 234, - "x" : 110, - "y" : 80, + "x": 110, + "y": 80, "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Hint6a.png", "pulse": { "minScale": 0.92, @@ -111,24 +112,26 @@ }, "fadeIn": { "durationMs": 1000 - } + }, + "visible": false }, - { + { "type": "StaticImage", "name": "hint6barrow", - "horizontal_gravity": "right", - "vertical_gravity": "top", + "horizontal_gravity": "right", + "vertical_gravity": "top", "width": 118, "height": 118, "x": 80, "y": 200, - "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png", + "visible": false }, - { + { "type": "StaticImage", "name": "hint6b", - "horizontal_gravity": "right", - "vertical_gravity": "top", + "horizontal_gravity": "right", + "vertical_gravity": "top", "width": 630.4, "height": 249.6, "x": 80, @@ -141,19 +144,20 @@ }, "fadeIn": { "durationMs": 1000 - } + }, + "visible": false }, - { + { "type": "StaticImage", "name": "hint7arrow", - "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "horizontal_gravity": "right", + "vertical_gravity": "bottom", "width": 118, "height": 118, "x": 80, "y": 60, "texture": "resources/w/ui/img/hint_arrow_right_bottom.png", - "visible":false, + "visible": false, "pulse": { "minScale": 0.92, "maxScale": 1.08, @@ -163,16 +167,16 @@ "durationMs": 1000 } }, - { + { "type": "StaticImage", "name": "hint7", "width": 606, "height": 201, - "x" : 110, - "y" : 80, - "visible":false, + "x": 110, + "y": 80, + "visible": false, "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Hint_m004.png", "pulse": { "minScale": 0.92, @@ -182,7 +186,123 @@ "fadeIn": { "durationMs": 1000 } + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint2", + "width": 660, + "height": 201, + "horizontal_gravity": "center", + "texture": "resources/w/ui/img/Hint2.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint3", + "width": 692, + "height": 312, + "horizontal_gravity": "center", + "texture": "resources/w/ui/img/Hint3.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint4", + "width": 705, + "height": 234, + "horizontal_gravity": "center", + "texture": "resources/w/ui/img/Hint4.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint5", + "width": 606, + "height": 201, + "horizontal_gravity": "center", + "texture": "resources/w/ui/img/Hint5.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui/hud_step5abandroid.json b/resources/w/ui/hud_dorm_android.json similarity index 52% rename from resources/w/ui/hud_step5abandroid.json rename to resources/w/ui/hud_dorm_android.json index 773cc4b..9708c4d 100644 --- a/resources/w/ui/hud_step5abandroid.json +++ b/resources/w/ui/hud_dorm_android.json @@ -83,26 +83,27 @@ "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_dorm.png" }, - { + { "type": "StaticImage", "name": "hint6aarrow", - "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "horizontal_gravity": "right", + "vertical_gravity": "bottom", "width": 118, "height": 118, "x": 80, "y": 60, - "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png", + "visible": false }, - { + { "type": "StaticImage", "name": "hint6a", "width": 606, "height": 234, - "x" : 110, - "y" : 80, + "x": 110, + "y": 80, "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Hint6a.png", "pulse": { "minScale": 0.92, @@ -111,24 +112,26 @@ }, "fadeIn": { "durationMs": 1000 - } + }, + "visible": false }, - { + { "type": "StaticImage", "name": "hint6barrow", - "horizontal_gravity": "right", - "vertical_gravity": "top", + "horizontal_gravity": "right", + "vertical_gravity": "top", "width": 118, "height": 118, "x": 80, "y": 200, - "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png", + "visible": false }, - { + { "type": "StaticImage", "name": "hint6b", - "horizontal_gravity": "right", - "vertical_gravity": "top", + "horizontal_gravity": "right", + "vertical_gravity": "top", "width": 630.4, "height": 249.6, "x": 80, @@ -141,19 +144,20 @@ }, "fadeIn": { "durationMs": 1000 - } + }, + "visible": false }, - { + { "type": "StaticImage", "name": "hint7arrow", - "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "horizontal_gravity": "right", + "vertical_gravity": "bottom", "width": 118, "height": 118, "x": 80, "y": 60, "texture": "resources/w/ui/img/hint_arrow_right_bottom.png", - "visible":false, + "visible": false, "pulse": { "minScale": 0.92, "maxScale": 1.08, @@ -163,16 +167,16 @@ "durationMs": 1000 } }, - { + { "type": "StaticImage", "name": "hint7", "width": 606, "height": 201, - "x" : 110, - "y" : 80, - "visible":false, + "x": 110, + "y": 80, + "visible": false, "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Hint_m004.png", "pulse": { "minScale": 0.92, @@ -182,7 +186,123 @@ "fadeIn": { "durationMs": 1000 } + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint2", + "width": 660, + "height": 201, + "horizontal_gravity": "center", + "texture": "resources/w/ui/img/Hint2android.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint3", + "width": 692, + "height": 312, + "horizontal_gravity": "center", + "texture": "resources/w/ui/img/Hint3.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint4", + "width": 705, + "height": 234, + "horizontal_gravity": "center", + "texture": "resources/w/ui/img/Hint4android.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint5", + "width": 606, + "height": 201, + "horizontal_gravity": "center", + "texture": "resources/w/ui/img/Hint5.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui/hud_step0.json b/resources/w/ui/hud_step0.json deleted file mode 100644 index dbfa31d..0000000 --- a/resources/w/ui/hud_step0.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Location_dorm.png" - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/hud_step1.json b/resources/w/ui/hud_step1.json deleted file mode 100644 index 5d445bf..0000000 --- a/resources/w/ui/hud_step1.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Location_dorm.png" - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint2", - "width": 660, - "height": 201, - "horizontal_gravity": "center", - "texture": "resources/w/ui/img/Hint2.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/hud_step1android.json b/resources/w/ui/hud_step1android.json deleted file mode 100644 index 0e320f8..0000000 --- a/resources/w/ui/hud_step1android.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Location_dorm.png" - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint2", - "width": 660, - "height": 201, - "horizontal_gravity": "center", - "texture": "resources/w/ui/img/Hint2android.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/hud_step2.json b/resources/w/ui/hud_step2.json deleted file mode 100644 index 5ef3812..0000000 --- a/resources/w/ui/hud_step2.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Location_dorm.png" - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint3", - "width": 692, - "height": 312, - "horizontal_gravity": "center", - "texture": "resources/w/ui/img/Hint3.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/hud_step2android.json b/resources/w/ui/hud_step2android.json deleted file mode 100644 index 5ef3812..0000000 --- a/resources/w/ui/hud_step2android.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Location_dorm.png" - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint3", - "width": 692, - "height": 312, - "horizontal_gravity": "center", - "texture": "resources/w/ui/img/Hint3.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/hud_step3.json b/resources/w/ui/hud_step3.json deleted file mode 100644 index acb3767..0000000 --- a/resources/w/ui/hud_step3.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint4", - "width": 705, - "height": 234, - "horizontal_gravity": "center", - "texture": "resources/w/ui/img/Hint4.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - }, - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Location_dorm.png" - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/hud_step3android.json b/resources/w/ui/hud_step3android.json deleted file mode 100644 index c0b1c6f..0000000 --- a/resources/w/ui/hud_step3android.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint4", - "width": 705, - "height": 234, - "horizontal_gravity": "center", - "texture": "resources/w/ui/img/Hint4android.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - }, - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Location_dorm.png" - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/hud_step4.json b/resources/w/ui/hud_step4.json deleted file mode 100644 index 0519aab..0000000 --- a/resources/w/ui/hud_step4.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Location_dorm.png" - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint5", - "width": 606, - "height": 201, - "horizontal_gravity": "center", - "texture": "resources/w/ui/img/Hint5.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/hud_step5a.json b/resources/w/ui/hud_step5a.json deleted file mode 100644 index 5658d9a..0000000 --- a/resources/w/ui/hud_step5a.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "phoneButton", - "horizontal_gravity": "right", - "vertical_gravity": "bottom", - "x": -46, - "y": -46, - "width": 229, - "height": 229, - "clickZoneWidth": 104, - "clickZoneHeight": 104, - "textures": { - "normal": "resources/w/ui/img/Phone001_State=Default.png", - "hover": "resources/w/ui/img/Phone001_State=Selected.png", - "pressed": "resources/w/ui/img/Phone001_State=Tap.png" - } - }, - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "inventoryButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 110, - "width": 165, - "height": 165, - "clickZoneWidth": 151, - "clickZoneHeight": 151, - "textures": { - "normal": "resources/w/ui/img/Inventory001_State=Default001.png", - "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", - "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "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" : 110, - "y" : 80, - "horizontal_gravity": "right", - "vertical_gravity" : "bottom", - "texture": "resources/w/ui/img/Hint6a.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Location_dorm.png" - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/hud_step5b.json b/resources/w/ui/hud_step5b.json deleted file mode 100644 index 6dd0226..0000000 --- a/resources/w/ui/hud_step5b.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "inventoryButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 110, - "width": 165, - "height": 165, - "clickZoneWidth": 151, - "clickZoneHeight": 151, - "textures": { - "normal": "resources/w/ui/img/Inventory001_State=Default001.png", - "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", - "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "journalButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 220, - "width": 165, - "height": 165, - "clickZoneWidth": 89, - "clickZoneHeight": 89, - "textures": { - "normal": "resources/w/ui/img/Journal001_State=Default.png", - "hover": "resources/w/ui/img/Journal001_State=Selected.png", - "pressed": "resources/w/ui/img/Journal001_State=Tap.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "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": 630.4, - "height": 249.6, - "x": 80, - "y": 100, - "texture": "resources/w/ui/img/Hint6b.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/hud_uni_int_step11.json b/resources/w/ui/hud_uni_int.json similarity index 89% rename from resources/w/ui/hud_uni_int_step11.json rename to resources/w/ui/hud_uni_int.json index 1f9e74d..37b16e7 100644 --- a/resources/w/ui/hud_uni_int_step11.json +++ b/resources/w/ui/hud_uni_int.json @@ -99,38 +99,8 @@ "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, - "x": 100, - "y": 250, - "texture": "resources/w/ui/img/Hint_darklands001.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 600 - } - }, - { "type": "FrameLayout", "vertical_align": "top", "horizontal_align": "center", @@ -145,7 +115,7 @@ "width": 504, "height": 132, "y": 0, - "visible" : false, + "visible": false, "texture": "resources/w/ui/img/toast/item_received001.png" }, { @@ -155,7 +125,7 @@ "width": 504, "height": 132, "y": 104, - "visible" : false, + "visible": false, "texture": "resources/w/ui/img/toast/item_removed001.png" }, { @@ -165,19 +135,19 @@ "width": 504, "height": 132, "y": 208, - "visible" : false, + "visible": false, "texture": "resources/w/ui/img/toast/quest_completed001.png" }, - { + { "type": "TextView", "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 62, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "Серебряный нож.", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -191,16 +161,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 166, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "Серебряный нож 2.", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -214,16 +184,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 270, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "Серебряный нож 3.", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -238,7 +208,39 @@ ] } ] + }, + { + "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", + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_darklands001", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "width": 470, + "height": 156, + "x": 100, + "y": 250, + "texture": "resources/w/ui/img/Hint_darklands001.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + }, + "visible": false } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui/hud_uni_int_step11android.json b/resources/w/ui/hud_uni_int_android.json similarity index 89% rename from resources/w/ui/hud_uni_int_step11android.json rename to resources/w/ui/hud_uni_int_android.json index 1f9e74d..37b16e7 100644 --- a/resources/w/ui/hud_uni_int_step11android.json +++ b/resources/w/ui/hud_uni_int_android.json @@ -99,38 +99,8 @@ "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, - "x": 100, - "y": 250, - "texture": "resources/w/ui/img/Hint_darklands001.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 600 - } - }, - { "type": "FrameLayout", "vertical_align": "top", "horizontal_align": "center", @@ -145,7 +115,7 @@ "width": 504, "height": 132, "y": 0, - "visible" : false, + "visible": false, "texture": "resources/w/ui/img/toast/item_received001.png" }, { @@ -155,7 +125,7 @@ "width": 504, "height": 132, "y": 104, - "visible" : false, + "visible": false, "texture": "resources/w/ui/img/toast/item_removed001.png" }, { @@ -165,19 +135,19 @@ "width": 504, "height": 132, "y": 208, - "visible" : false, + "visible": false, "texture": "resources/w/ui/img/toast/quest_completed001.png" }, - { + { "type": "TextView", "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 62, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "Серебряный нож.", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -191,16 +161,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 166, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "Серебряный нож 2.", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -214,16 +184,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 270, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "Серебряный нож 3.", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -238,7 +208,39 @@ ] } ] + }, + { + "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", + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_darklands001", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "width": 470, + "height": 156, + "x": 100, + "y": 250, + "texture": "resources/w/ui/img/Hint_darklands001.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + }, + "visible": false } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui/hud_uni_int_step12.json b/resources/w/ui/hud_uni_int_dark.json similarity index 84% rename from resources/w/ui/hud_uni_int_step12.json rename to resources/w/ui/hud_uni_int_dark.json index ca488d9..6e7615a 100644 --- a/resources/w/ui/hud_uni_int_step12.json +++ b/resources/w/ui/hud_uni_int_dark.json @@ -65,62 +65,36 @@ "horizontal_gravity": "center", "vertical_gravity": "bottom", "texture": "resources/w/ui/img/Location_uni_int.png" - }, - { - "type": "StaticImage", - "name": "hint_darklands003_arrow", - "width": 24, - "height": 118, - "x": 210, - "y": 110, - "texture": "resources/w/ui/img/hint_arrow_up.png" }, { "type": "StaticImage", - "name": "hint_darklands003", - "width": 470, - "height": 202, - "x": 130, - "y": 200, - "texture": "resources/w/ui/img/Hint_darklands003_hp.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 600 - } - }, - { - "type": "StaticImage", "name": "healthBarPanel", "width": 389, "height": 132.2, "y": -5, - "x": -5, + "x": -5, "horizontal_gravity": "left", "vertical_align": "top", "texture": "resources/w/ui/img/HealthBarBase002.png" }, - { + { "type": "StaticImage", "name": "healthBarBorder", "width": 151.2, "height": 22.8, "y": 49.8, - "x": 100.6, + "x": 100.6, "horizontal_gravity": "left", "vertical_align": "top", "texture": "resources/w/ui/img/HealthBarBack001.png" }, - { + { "type": "Slider", "name": "healthBarFill", "width": 151.2, "height": 22.8, "y": 49.8, - "x": 100.6, + "x": 100.6, "horizontal_gravity": "left", "vertical_gravity": "top", "orientation": "horizontal", @@ -131,7 +105,7 @@ "track": "resources/w/ui/img/HealthBarFill001.png" } }, - { + { "type": "TextView", "name": "healthValue", "x": 255.0, @@ -153,7 +127,7 @@ 1.0 ] }, - { + { "type": "FrameLayout", "vertical_align": "top", "horizontal_align": "center", @@ -168,7 +142,7 @@ "width": 504, "height": 132, "y": 0, - "visible" : false, + "visible": false, "texture": "resources/w/ui/img/toast/item_received001.png" }, { @@ -178,7 +152,7 @@ "width": 504, "height": 132, "y": 104, - "visible" : false, + "visible": false, "texture": "resources/w/ui/img/toast/item_removed001.png" }, { @@ -188,19 +162,19 @@ "width": 504, "height": 132, "y": 208, - "visible" : false, + "visible": false, "texture": "resources/w/ui/img/toast/quest_completed001.png" }, - { + { "type": "TextView", "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 62, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "Серебряный нож.", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -214,16 +188,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 166, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "Серебряный нож 2.", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -237,16 +211,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 270, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "Серебряный нож 3.", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -261,7 +235,55 @@ ] } ] + }, + { + "type": "StaticImage", + "name": "hint_darklands003_arrow", + "width": 24, + "height": 118, + "x": 210, + "y": 110, + "texture": "resources/w/ui/img/hint_arrow_up.png", + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_darklands003", + "width": 470, + "height": 202, + "x": 130, + "y": 200, + "texture": "resources/w/ui/img/Hint_darklands003_hp.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_darklands002", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "width": 470, + "height": 178, + "x": 0, + "y": 80, + "texture": "resources/w/ui/img/Hint_darklands002_attack.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + }, + "visible": false } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui/hud_uni_int_step13.json b/resources/w/ui/hud_uni_int_dark_android.json similarity index 81% rename from resources/w/ui/hud_uni_int_step13.json rename to resources/w/ui/hud_uni_int_dark_android.json index 86f5db1..6e7615a 100644 --- a/resources/w/ui/hud_uni_int_step13.json +++ b/resources/w/ui/hud_uni_int_dark_android.json @@ -56,7 +56,7 @@ "pressed": "resources/w/ui/img/Journal001_State=Tap.png" } }, - { + { "type": "StaticImage", "name": "location", "width": 380, @@ -68,52 +68,33 @@ }, { "type": "StaticImage", - "name": "hint_darklands002", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "width": 470, - "height": 178, - "x": 0, - "y": 80, - "texture": "resources/w/ui/img/Hint_darklands002_attack.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 600 - } - }, - { - "type": "StaticImage", "name": "healthBarPanel", "width": 389, "height": 132.2, "y": -5, - "x": -5, + "x": -5, "horizontal_gravity": "left", "vertical_align": "top", "texture": "resources/w/ui/img/HealthBarBase002.png" }, - { + { "type": "StaticImage", "name": "healthBarBorder", "width": 151.2, "height": 22.8, "y": 49.8, - "x": 100.6, + "x": 100.6, "horizontal_gravity": "left", "vertical_align": "top", "texture": "resources/w/ui/img/HealthBarBack001.png" }, - { + { "type": "Slider", "name": "healthBarFill", "width": 151.2, "height": 22.8, "y": 49.8, - "x": 100.6, + "x": 100.6, "horizontal_gravity": "left", "vertical_gravity": "top", "orientation": "horizontal", @@ -124,7 +105,7 @@ "track": "resources/w/ui/img/HealthBarFill001.png" } }, - { + { "type": "TextView", "name": "healthValue", "x": 255.0, @@ -146,7 +127,7 @@ 1.0 ] }, - { + { "type": "FrameLayout", "vertical_align": "top", "horizontal_align": "center", @@ -161,7 +142,7 @@ "width": 504, "height": 132, "y": 0, - "visible" : false, + "visible": false, "texture": "resources/w/ui/img/toast/item_received001.png" }, { @@ -171,7 +152,7 @@ "width": 504, "height": 132, "y": 104, - "visible" : false, + "visible": false, "texture": "resources/w/ui/img/toast/item_removed001.png" }, { @@ -181,19 +162,19 @@ "width": 504, "height": 132, "y": 208, - "visible" : false, + "visible": false, "texture": "resources/w/ui/img/toast/quest_completed001.png" }, - { + { "type": "TextView", "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 62, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "Серебряный нож.", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -207,16 +188,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 166, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "Серебряный нож 2.", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -230,16 +211,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 270, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "Серебряный нож 3.", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -254,6 +235,54 @@ ] } ] + }, + { + "type": "StaticImage", + "name": "hint_darklands003_arrow", + "width": 24, + "height": 118, + "x": 210, + "y": 110, + "texture": "resources/w/ui/img/hint_arrow_up.png", + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_darklands003", + "width": 470, + "height": 202, + "x": 130, + "y": 200, + "texture": "resources/w/ui/img/Hint_darklands003_hp.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_darklands002", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "width": 470, + "height": 178, + "x": 0, + "y": 80, + "texture": "resources/w/ui/img/Hint_darklands002_attack.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + }, + "visible": false } ] } diff --git a/resources/w/ui/hud_uni_int_dark_full.json b/resources/w/ui/hud_uni_int_dark_full.json deleted file mode 100644 index 021ccca..0000000 --- a/resources/w/ui/hud_uni_int_dark_full.json +++ /dev/null @@ -1,241 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "inventoryButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 110, - "width": 165, - "height": 165, - "clickZoneWidth": 151, - "clickZoneHeight": 151, - "textures": { - "normal": "resources/w/ui/img/Inventory001_State=Default001.png", - "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", - "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "journalButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 220, - "width": 165, - "height": 165, - "clickZoneWidth": 89, - "clickZoneHeight": 89, - "textures": { - "normal": "resources/w/ui/img/Journal001_State=Default.png", - "hover": "resources/w/ui/img/Journal001_State=Selected.png", - "pressed": "resources/w/ui/img/Journal001_State=Tap.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Location_uni_int.png" - }, - { - "type": "StaticImage", - "name": "healthBarPanel", - "width": 389, - "height": 132.2, - "y": -5, - "x": -5, - "horizontal_gravity": "left", - "vertical_align": "top", - "texture": "resources/w/ui/img/HealthBarBase002.png" - }, - { - "type": "StaticImage", - "name": "healthBarBorder", - "width": 151.2, - "height": 22.8, - "y": 49.8, - "x": 100.6, - "horizontal_gravity": "left", - "vertical_align": "top", - "texture": "resources/w/ui/img/HealthBarBack001.png" - }, - { - "type": "Slider", - "name": "healthBarFill", - "width": 151.2, - "height": 22.8, - "y": 49.8, - "x": 100.6, - "horizontal_gravity": "left", - "vertical_gravity": "top", - "orientation": "horizontal", - "value": 1.0, - "fillMode": true, - "interactive": false, - "textures": { - "track": "resources/w/ui/img/HealthBarFill001.png" - } - }, - { - "type": "TextView", - "name": "healthValue", - "x": 255.0, - "y": 45.5, - "width": 100.0, - "height": 44.0, - "horizontal_gravity": "left", - "vertical_gravity": "top", - "text": "200/200", - "fontSize": 20, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": false, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "FrameLayout", - "vertical_align": "top", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 528, - "children": [ - { - "type": "StaticImage", - "name": "toast001", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 0, - "visible" : false, - "texture": "resources/w/ui/img/toast/item_received001.png" - }, - { - "type": "StaticImage", - "name": "toast002", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 104, - "visible" : false, - "texture": "resources/w/ui/img/toast/item_removed001.png" - }, - { - "type": "StaticImage", - "name": "toast003", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 208, - "visible" : false, - "texture": "resources/w/ui/img/toast/quest_completed001.png" - }, - { - "type": "TextView", - "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 62, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 166, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож 2.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 270, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож 3.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - } - ] - } - ] - } -} diff --git a/resources/w/ui/hud_uni_int_full.json b/resources/w/ui/hud_uni_int_full.json deleted file mode 100644 index 317a60e..0000000 --- a/resources/w/ui/hud_uni_int_full.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "phoneButton", - "horizontal_gravity": "right", - "vertical_gravity": "bottom", - "x": -46, - "y": -46, - "width": 229, - "height": 229, - "clickZoneWidth": 104, - "clickZoneHeight": 104, - "textures": { - "normal": "resources/w/ui/img/Phone001_State=Default.png", - "hover": "resources/w/ui/img/Phone001_State=Selected.png", - "pressed": "resources/w/ui/img/Phone001_State=Tap.png" - } - }, - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "inventoryButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 110, - "width": 165, - "height": 165, - "clickZoneWidth": 151, - "clickZoneHeight": 151, - "textures": { - "normal": "resources/w/ui/img/Inventory001_State=Default001.png", - "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", - "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "journalButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 220, - "width": 165, - "height": 165, - "clickZoneWidth": 89, - "clickZoneHeight": 89, - "textures": { - "normal": "resources/w/ui/img/Journal001_State=Default.png", - "hover": "resources/w/ui/img/Journal001_State=Selected.png", - "pressed": "resources/w/ui/img/Journal001_State=Tap.png" - } - }, - { - "type": "Button", - "name": "darklandsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 330, - "width": 165, - "height": 165, - "clickZoneWidth": 89, - "clickZoneHeight": 89, - "textures": { - "normal": "resources/w/ui/img/Darklands002_State=Default003.png", - "hover": "resources/w/ui/img/Darklands002_State=Selected003.png", - "pressed": "resources/w/ui/img/Darklands002_State=Tap003.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Location_uni_int.png" - }, - { - "type": "FrameLayout", - "vertical_align": "top", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 528, - "children": [ - { - "type": "StaticImage", - "name": "toast001", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 0, - "visible" : false, - "texture": "resources/w/ui/img/toast/item_received001.png" - }, - { - "type": "StaticImage", - "name": "toast002", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 104, - "visible" : false, - "texture": "resources/w/ui/img/toast/item_removed001.png" - }, - { - "type": "StaticImage", - "name": "toast003", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 208, - "visible" : false, - "texture": "resources/w/ui/img/toast/quest_completed001.png" - }, - { - "type": "TextView", - "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 62, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 166, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож 2.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 270, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож 3.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/hud_uni_int_step10.json b/resources/w/ui/hud_uni_int_step10.json deleted file mode 100644 index 16a5b1f..0000000 --- a/resources/w/ui/hud_uni_int_step10.json +++ /dev/null @@ -1,197 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "phoneButton", - "horizontal_gravity": "right", - "vertical_gravity": "bottom", - "x": -46, - "y": -46, - "width": 229, - "height": 229, - "clickZoneWidth": 104, - "clickZoneHeight": 104, - "textures": { - "normal": "resources/w/ui/img/Phone001_State=Default.png", - "hover": "resources/w/ui/img/Phone001_State=Selected.png", - "pressed": "resources/w/ui/img/Phone001_State=Tap.png" - } - }, - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "inventoryButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 110, - "width": 165, - "height": 165, - "clickZoneWidth": 151, - "clickZoneHeight": 151, - "textures": { - "normal": "resources/w/ui/img/Inventory001_State=Default001.png", - "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", - "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "journalButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 220, - "width": 165, - "height": 165, - "clickZoneWidth": 89, - "clickZoneHeight": 89, - "textures": { - "normal": "resources/w/ui/img/Journal001_State=Default.png", - "hover": "resources/w/ui/img/Journal001_State=Selected.png", - "pressed": "resources/w/ui/img/Journal001_State=Tap.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Location_uni_int.png" - }, - { - "type": "FrameLayout", - "vertical_align": "top", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 528, - "children": [ - { - "type": "StaticImage", - "name": "toast001", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 0, - "visible" : false, - "texture": "resources/w/ui/img/toast/item_received001.png" - }, - { - "type": "StaticImage", - "name": "toast002", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 104, - "visible" : false, - "texture": "resources/w/ui/img/toast/item_removed001.png" - }, - { - "type": "StaticImage", - "name": "toast003", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 208, - "visible" : false, - "texture": "resources/w/ui/img/toast/quest_completed001.png" - }, - { - "type": "TextView", - "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 62, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 166, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож 2.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 270, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож 3.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - } - ] - } - ] - } -} diff --git a/resources/w/ui/hud_uni_int_step13android.json b/resources/w/ui/hud_uni_int_step13android.json deleted file mode 100644 index 86f5db1..0000000 --- a/resources/w/ui/hud_uni_int_step13android.json +++ /dev/null @@ -1,260 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "inventoryButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 110, - "width": 165, - "height": 165, - "clickZoneWidth": 151, - "clickZoneHeight": 151, - "textures": { - "normal": "resources/w/ui/img/Inventory001_State=Default001.png", - "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", - "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "journalButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 220, - "width": 165, - "height": 165, - "clickZoneWidth": 89, - "clickZoneHeight": 89, - "textures": { - "normal": "resources/w/ui/img/Journal001_State=Default.png", - "hover": "resources/w/ui/img/Journal001_State=Selected.png", - "pressed": "resources/w/ui/img/Journal001_State=Tap.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Location_uni_int.png" - }, - { - "type": "StaticImage", - "name": "hint_darklands002", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "width": 470, - "height": 178, - "x": 0, - "y": 80, - "texture": "resources/w/ui/img/Hint_darklands002_attack.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 600 - } - }, - { - "type": "StaticImage", - "name": "healthBarPanel", - "width": 389, - "height": 132.2, - "y": -5, - "x": -5, - "horizontal_gravity": "left", - "vertical_align": "top", - "texture": "resources/w/ui/img/HealthBarBase002.png" - }, - { - "type": "StaticImage", - "name": "healthBarBorder", - "width": 151.2, - "height": 22.8, - "y": 49.8, - "x": 100.6, - "horizontal_gravity": "left", - "vertical_align": "top", - "texture": "resources/w/ui/img/HealthBarBack001.png" - }, - { - "type": "Slider", - "name": "healthBarFill", - "width": 151.2, - "height": 22.8, - "y": 49.8, - "x": 100.6, - "horizontal_gravity": "left", - "vertical_gravity": "top", - "orientation": "horizontal", - "value": 1.0, - "fillMode": true, - "interactive": false, - "textures": { - "track": "resources/w/ui/img/HealthBarFill001.png" - } - }, - { - "type": "TextView", - "name": "healthValue", - "x": 255.0, - "y": 45.5, - "width": 100.0, - "height": 44.0, - "horizontal_gravity": "left", - "vertical_gravity": "top", - "text": "200/200", - "fontSize": 20, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": false, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "FrameLayout", - "vertical_align": "top", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 528, - "children": [ - { - "type": "StaticImage", - "name": "toast001", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 0, - "visible" : false, - "texture": "resources/w/ui/img/toast/item_received001.png" - }, - { - "type": "StaticImage", - "name": "toast002", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 104, - "visible" : false, - "texture": "resources/w/ui/img/toast/item_removed001.png" - }, - { - "type": "StaticImage", - "name": "toast003", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 208, - "visible" : false, - "texture": "resources/w/ui/img/toast/quest_completed001.png" - }, - { - "type": "TextView", - "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 62, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 166, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож 2.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 270, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "Серебряный нож 3.", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - } - ] - } - ] - } -} diff --git a/resources/w/ui/portrait_screen_phone.json b/resources/w/ui/portrait_screen_phone.json index 9ab6405..4bb8eee 100644 --- a/resources/w/ui/portrait_screen_phone.json +++ b/resources/w/ui/portrait_screen_phone.json @@ -126,7 +126,87 @@ "hover": "resources/w/ui/img/phone2/IconMessenger001.png", "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" } + }, + { + "type": "StaticImage", + "name": "hint_m001arrow", + "width": 48, + "height": 170, + "x": -110, + "y": -400, + "horizontal_gravity": "center", + "vertical_gravity": "center", + "texture": "resources/w/ui/img/hint_arrow_up.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_m001", + "width": 621, + "height": 234, + "x": 0, + "y": -470, + "horizontal_gravity": "center", + "vertical_gravity": "center", + "texture": "resources/w/ui/img/Hint_m002.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_m003arrow", + "width": 48, + "height": 170, + "x": 110, + "y": 130, + "horizontal_gravity": "center", + "vertical_gravity": "center", + "texture": "resources/w/ui/img/hint_arrow_down_small.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_m003", + "width": 636, + "height": 356, + "x": 0, + "y": 250, + "horizontal_gravity": "center", + "vertical_gravity": "center", + "texture": "resources/w/ui/img/Hint_m003.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui/portrait_screen_phone_chat_list.json b/resources/w/ui/portrait_screen_phone_chat_list.json index 6a4912c..991e0f0 100644 --- a/resources/w/ui/portrait_screen_phone_chat_list.json +++ b/resources/w/ui/portrait_screen_phone_chat_list.json @@ -29,7 +29,7 @@ "y": -60, "width": 882, "height": 1416, - "clickZoneWidth": 600, + "clickZoneWidth": 600, "clickZoneHeight": 900, "textures": { "normal": "resources/w/ui/img/phone/PhoneChatList001.png", @@ -241,7 +241,27 @@ ] } ] + }, + { + "type": "StaticImage", + "name": "hint_m002", + "width": 600, + "height": 234, + "x": 0, + "y": -160, + "horizontal_gravity": "center", + "vertical_gravity": "center", + "texture": "resources/w/ui/img/Hint_m001.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui/portrait_screen_phone_chat_list_hint001.json b/resources/w/ui/portrait_screen_phone_chat_list_hint001.json deleted file mode 100644 index ab9e5ef..0000000 --- a/resources/w/ui/portrait_screen_phone_chat_list_hint001.json +++ /dev/null @@ -1,266 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "vertical_align": "center", - "horizontal_align": "center", - "children": [ - { - "type": "Button", - "name": "phoneExitButton", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.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/phone/PhoneChatList001.png", - "hover": "resources/w/ui/img/phone/PhoneChatList001.png", - "pressed": "resources/w/ui/img/phone/PhoneChatList001.png" - } - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "spacing": 0, - "x": 0, - "y": 0, - "width": 637.5, - "height": 800, - "children": [ - { - "type": "FrameLayout", - "name": "chat1frame", - "width": 637.5, - "height": 126, - "children": [ - { - "type": "TextButton", - "name": "chat1button", - "x": 0.0, - "y": 0.0, - "width": 637.5, - "height": 126, - "text": "Айпери", - "textPaddingY": 16.0, - "textPaddingX": 128.0, - "fontSize": 40, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "textures": { - "normal": "resources/w/ui/img/phone/ChatListItem001.png", - "hover": "resources/w/ui/img/phone/ChatListItem001.png", - "pressed": "resources/w/ui/img/phone/ChatListItem001.png" - } - }, - { - "type": "StaticImage", - "name": "chat1Unread", - "x": 570, - "y": 50, - "width": 41, - "height": 41, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, - { - "type": "TextView", - "name": "chat1msg", - "x": 128.0, - "y": 60.0, - "width": 637.5, - "height": 126, - "text": "Бекзат, помнишь мы ски...", - "fontSize": 32, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 0.8, - 0.8, - 0.8, - 1.0 - ] - } - ] - }, - { - "type": "FrameLayout", - "name": "chat2frame", - "width": 637.5, - "height": 126, - "children": [ - { - "type": "TextButton", - "name": "chat2button", - "x": 0.0, - "y": 0.0, - "width": 637.5, - "height": 126, - "text": "Атам", - "textPaddingY": 16.0, - "textPaddingX": 128.0, - "fontSize": 40, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "textures": { - "normal": "resources/w/ui/img/phone/ChatListItem002.png", - "hover": "resources/w/ui/img/phone/ChatListItem002.png", - "pressed": "resources/w/ui/img/phone/ChatListItem002.png" - } - }, - { - "type": "StaticImage", - "name": "chat2Unread", - "x": 570, - "y": 50, - "width": 41, - "height": 41, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, - { - "type": "TextView", - "name": "chat2msg", - "x": 128.0, - "y": 60.0, - "width": 637.5, - "height": 126, - "text": "Бекзат, сынок, мы c мамой...", - "fontSize": 32, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 0.8, - 0.8, - 0.8, - 1.0 - ] - } - ] - }, - { - "type": "FrameLayout", - "name": "chat3frame", - "width": 637.5, - "height": 126, - "children": [ - { - "type": "TextButton", - "name": "chat3button", - "x": 0.0, - "y": 0.0, - "width": 637.5, - "height": 126, - "text": "БишкекНовости", - "textPaddingY": 16.0, - "textPaddingX": 128.0, - "fontSize": 40, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "textures": { - "normal": "resources/w/ui/img/phone/ChatListItem003.png", - "hover": "resources/w/ui/img/phone/ChatListItem003.png", - "pressed": "resources/w/ui/img/phone/ChatListItem003.png" - } - }, - { - "type": "StaticImage", - "name": "chat3Unread", - "x": 570, - "y": 50, - "width": 41, - "height": 41, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, - { - "type": "TextView", - "name": "chat3msg", - "x": 128.0, - "y": 60.0, - "width": 637.5, - "height": 124, - "text": "Жители Бишкека все чаще...", - "fontSize": 32, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 0.8, - 0.8, - 0.8, - 1.0 - ] - } - ] - } - ] - }, - { - "type": "StaticImage", - "name": "hint_m002", - "width": 600, - "height": 234, - "x": 0, - "y": -160, - "horizontal_gravity": "center", - "vertical_gravity": "center", - "texture": "resources/w/ui/img/Hint_m001.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/portrait_screen_phone_hint001.json b/resources/w/ui/portrait_screen_phone_hint001.json deleted file mode 100644 index 5c11bff..0000000 --- a/resources/w/ui/portrait_screen_phone_hint001.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "vertical_align": "center", - "horizontal_align": "center", - "children": [ - { - "type": "Button", - "name": "phoneExitButton", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.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", - "name": "phoneTimeDay", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 637.5, - "height": 172, - "texture": "resources/w/ui/img/phone2/ClockDay001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeNight", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui/img/phone2/ClockNight001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeDawn", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui/img/phone2/ClockMorning001.png" - }, - { - "type": "Button", - "name": "phoneBank", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -110, - "y": -60, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconBank001.png", - "hover": "resources/w/ui/img/phone2/IconBank001.png", - "pressed": "resources/w/ui/img/phone2/IconBank001.png" - } - }, - { - "type": "Button", - "name": "phoneTaxi", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 110, - "y": -60, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconTaxi001.png", - "hover": "resources/w/ui/img/phone2/IconTaxi001.png", - "pressed": "resources/w/ui/img/phone2/IconTaxi001.png" - } - }, - { - "type": "Button", - "name": "phoneVideo", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 110, - "y": -240, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconVideo001.png", - "hover": "resources/w/ui/img/phone2/IconVideo001.png", - "pressed": "resources/w/ui/img/phone2/IconVideo001.png" - } - }, - { - "type": "Button", - "name": "phoneMessenger", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -110, - "y": -240, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconMessenger001.png", - "hover": "resources/w/ui/img/phone2/IconMessenger001.png", - "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" - } - }, - { - "type": "StaticImage", - "name": "hint_m001arrow", - "width": 48, - "height": 170, - "x": -110, - "y": -400, - "horizontal_gravity": "center", - "vertical_gravity": "center", - "texture": "resources/w/ui/img/hint_arrow_up.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m001", - "width": 621, - "height": 234, - "x": 0, - "y": -470, - "horizontal_gravity": "center", - "vertical_gravity": "center", - "texture": "resources/w/ui/img/Hint_m002.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} \ 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 deleted file mode 100644 index 27a4237..0000000 --- a/resources/w/ui/portrait_screen_phone_hint001_002.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "vertical_align": "center", - "horizontal_align": "center", - "children": [ - { - "type": "Button", - "name": "phoneExitButton", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.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", - "name": "phoneTimeDay", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 637.5, - "height": 172, - "texture": "resources/w/ui/img/phone2/ClockDay001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeNight", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui/img/phone2/ClockNight001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeDawn", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui/img/phone2/ClockMorning001.png" - }, - { - "type": "Button", - "name": "phoneBank", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -110, - "y": -60, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconBank001.png", - "hover": "resources/w/ui/img/phone2/IconBank001.png", - "pressed": "resources/w/ui/img/phone2/IconBank001.png" - } - }, - { - "type": "Button", - "name": "phoneTaxi", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 110, - "y": -60, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconTaxi001.png", - "hover": "resources/w/ui/img/phone2/IconTaxi001.png", - "pressed": "resources/w/ui/img/phone2/IconTaxi001.png" - } - }, - { - "type": "Button", - "name": "phoneVideo", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 110, - "y": -240, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconVideo001.png", - "hover": "resources/w/ui/img/phone2/IconVideo001.png", - "pressed": "resources/w/ui/img/phone2/IconVideo001.png" - } - }, - { - "type": "Button", - "name": "phoneMessenger", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -110, - "y": -240, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconMessenger001.png", - "hover": "resources/w/ui/img/phone2/IconMessenger001.png", - "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" - } - }, - { - "type": "StaticImage", - "name": "hint_m001arrow", - "width": 48, - "height": 170, - "x": -110, - "y": -400, - "horizontal_gravity": "center", - "vertical_gravity": "center", - "texture": "resources/w/ui/img/hint_arrow_up.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m001", - "width": 621, - "height": 234, - "x": 0, - "y": -470, - "horizontal_gravity": "center", - "vertical_gravity": "center", - "texture": "resources/w/ui/img/Hint_m002.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m003arrow", - "width": 48, - "height": 170, - "x" : 110, - "y" : 130, - "horizontal_gravity": "center", - "vertical_gravity" : "center", - "texture": "resources/w/ui/img/hint_arrow_down_small.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m003", - "width": 636, - "height": 356, - "x" : 0, - "y" : 250, - "horizontal_gravity": "center", - "vertical_gravity" : "center", - "texture": "resources/w/ui/img/Hint_m003.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} diff --git a/resources/w/ui/portrait_screen_phone_hint002.json b/resources/w/ui/portrait_screen_phone_hint002.json deleted file mode 100644 index f8ff3b5..0000000 --- a/resources/w/ui/portrait_screen_phone_hint002.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "vertical_align": "center", - "horizontal_align": "center", - "children": [ - { - "type": "Button", - "name": "phoneExitButton", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.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", - "name": "phoneTimeDay", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 637.5, - "height": 172, - "texture": "resources/w/ui/img/phone2/ClockDay001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeNight", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui/img/phone2/ClockNight001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeDawn", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui/img/phone2/ClockMorning001.png" - }, - { - "type": "Button", - "name": "phoneBank", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -110, - "y": -60, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconBank001.png", - "hover": "resources/w/ui/img/phone2/IconBank001.png", - "pressed": "resources/w/ui/img/phone2/IconBank001.png" - } - }, - { - "type": "Button", - "name": "phoneTaxi", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 110, - "y": -60, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconTaxi001.png", - "hover": "resources/w/ui/img/phone2/IconTaxi001.png", - "pressed": "resources/w/ui/img/phone2/IconTaxi001.png" - } - }, - { - "type": "Button", - "name": "phoneVideo", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 110, - "y": -240, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconVideo001.png", - "hover": "resources/w/ui/img/phone2/IconVideo001.png", - "pressed": "resources/w/ui/img/phone2/IconVideo001.png" - } - }, - { - "type": "Button", - "name": "phoneMessenger", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -110, - "y": -240, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconMessenger001.png", - "hover": "resources/w/ui/img/phone2/IconMessenger001.png", - "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" - } - }, - { - "type": "StaticImage", - "name": "hint_m003arrow", - "width": 48, - "height": 170, - "x" : 110, - "y" : 130, - "horizontal_gravity": "center", - "vertical_gravity" : "center", - "texture": "resources/w/ui/img/hint_arrow_down_small.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m003", - "width": 636, - "height": 356, - "x" : 0, - "y" : 250, - "horizontal_gravity": "center", - "vertical_gravity" : "center", - "texture": "resources/w/ui/img/Hint_m003.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} diff --git a/resources/w/ui/screen_phone.json b/resources/w/ui/screen_phone.json index 15a36d5..689641a 100644 --- a/resources/w/ui/screen_phone.json +++ b/resources/w/ui/screen_phone.json @@ -126,7 +126,87 @@ "hover": "resources/w/ui/img/phone2/IconMessenger001.png", "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" } + }, + { + "type": "StaticImage", + "name": "hint_m001arrow", + "width": 170, + "height": 48, + "x": -220, + "y": 150, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/hint_arrow_left.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_m001", + "width": 414, + "height": 156, + "x": -420, + "y": 100, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/Hint_m002.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_m003arrow", + "width": 170, + "height": 48, + "x": 220, + "y": 270, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/hint_arrow_right.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_m003", + "width": 318, + "height": 178, + "x": 420, + "y": 220, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/Hint_m003.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui/screen_phone_chat_list.json b/resources/w/ui/screen_phone_chat_list.json index 1a435aa..ab3d713 100644 --- a/resources/w/ui/screen_phone_chat_list.json +++ b/resources/w/ui/screen_phone_chat_list.json @@ -7,7 +7,7 @@ "vertical_align": "center", "horizontal_align": "center", "children": [ - { + { "type": "Button", "name": "phoneExitButton", "horizontal_gravity": "center", @@ -29,7 +29,7 @@ "y": -60, "width": 617.4, "height": 991.2, - "clickZoneWidth": 500, + "clickZoneWidth": 500, "clickZoneHeight": 800, "textures": { "normal": "resources/w/ui/img/phone/PhoneChatList001.png", @@ -81,35 +81,35 @@ "pressed": "resources/w/ui/img/phone/ChatListItem001.png" } }, - { - "type": "StaticImage", - "name": "chat1Unread", - "x" : 408, - "y" : 24, - "width": 28.7, - "height": 28.7, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, - { - "type": "TextView", - "name": "chat1msg", + { + "type": "StaticImage", + "name": "chat1Unread", + "x": 408, + "y": 24, + "width": 28.7, + "height": 28.7, + "texture": "resources/w/ui/img/phone/ChatListUnread1.png" + }, + { + "type": "TextView", + "name": "chat1msg", "x": 100.0, "y": 36.0, "width": 446.25, "height": 88.2, - "text": "Бекзат, помнишь мы ски...", + "text": "Бекзат, помнишь мы ски...", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", "textCentered": false, "topAligned": true, "wrap": true, - "color": [ + "color": [ 0.8, 0.8, 0.8, 1.0 ] - } + } ] }, { @@ -145,15 +145,15 @@ "pressed": "resources/w/ui/img/phone/ChatListItem002.png" } }, - { - "type": "StaticImage", - "name": "chat2Unread", - "x" : 408, - "y" : 24, - "width": 28.7, - "height": 28.7, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, + { + "type": "StaticImage", + "name": "chat2Unread", + "x": 408, + "y": 24, + "width": 28.7, + "height": 28.7, + "texture": "resources/w/ui/img/phone/ChatListUnread1.png" + }, { "type": "TextView", "name": "chat2msg", @@ -176,7 +176,7 @@ } ] }, - { + { "type": "FrameLayout", "name": "chat3frame", "width": 446.25, @@ -209,15 +209,15 @@ "pressed": "resources/w/ui/img/phone/ChatListItem003.png" } }, - { - "type": "StaticImage", - "name": "chat3Unread", - "x" : 408, - "y" : 24, - "width": 28.7, - "height": 28.7, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, + { + "type": "StaticImage", + "name": "chat3Unread", + "x": 408, + "y": 24, + "width": 28.7, + "height": 28.7, + "texture": "resources/w/ui/img/phone/ChatListUnread1.png" + }, { "type": "TextView", "name": "chat3msg", @@ -241,7 +241,27 @@ ] } ] + }, + { + "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 + }, + "visible": false } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui/screen_phone_chat_list_hint001.json b/resources/w/ui/screen_phone_chat_list_hint001.json deleted file mode 100644 index 7b79d36..0000000 --- a/resources/w/ui/screen_phone_chat_list_hint001.json +++ /dev/null @@ -1,266 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "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", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.png" - } - }, - { - "type": "Button", - "name": "phoneMain", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "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", - "pressed": "resources/w/ui/img/phone/PhoneChatList001.png" - } - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "top", - "horizontal_align": "center", - "spacing": 0, - "x": 0, - "y": 100, - "width": "match_parent", - "height": 800, - "children": [ - { - "type": "FrameLayout", - "name": "chat1frame", - "width": 446.25, - "height": 88.2, - "children": [ - { - "type": "TextButton", - "name": "chat1button", - "x": 0.0, - "y": 0.0, - "width": 446.25, - "height": 88.2, - "text": "Айпери", - "textPaddingY": 0.0, - "textPaddingX": 100.0, - "fontSize": 32, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "textures": { - "normal": "resources/w/ui/img/phone/ChatListItem001.png", - "hover": "resources/w/ui/img/phone/ChatListItem001.png", - "pressed": "resources/w/ui/img/phone/ChatListItem001.png" - } - }, - { - "type": "StaticImage", - "name": "chat1Unread", - "x" : 408, - "y" : 24, - "width": 28.7, - "height": 28.7, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, - { - "type": "TextView", - "name": "chat1msg", - "x": 100.0, - "y": 36.0, - "width": 446.25, - "height": 88.2, - "text": "Бекзат, помнишь мы ски...", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 0.8, - 0.8, - 0.8, - 1.0 - ] - } - ] - }, - { - "type": "FrameLayout", - "name": "chat2frame", - "width": 446.25, - "height": 88.2, - "children": [ - { - "type": "TextButton", - "name": "chat2button", - "x": 0.0, - "y": 0.0, - "width": 446.25, - "height": 88.2, - "text": "Атам", - "textPaddingY": 0.0, - "textPaddingX": 100.0, - "fontSize": 32, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "textures": { - "normal": "resources/w/ui/img/phone/ChatListItem002.png", - "hover": "resources/w/ui/img/phone/ChatListItem002.png", - "pressed": "resources/w/ui/img/phone/ChatListItem002.png" - } - }, - { - "type": "StaticImage", - "name": "chat2Unread", - "x" : 408, - "y" : 24, - "width": 28.7, - "height": 28.7, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, - { - "type": "TextView", - "name": "chat2msg", - "x": 100.0, - "y": 36.0, - "width": 446.25, - "height": 88.2, - "text": "Бекзат, сынок, мы c мамой ...", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 0.8, - 0.8, - 0.8, - 1.0 - ] - } - ] - }, - { - "type": "FrameLayout", - "name": "chat3frame", - "width": 446.25, - "height": 88.2, - "children": [ - { - "type": "TextButton", - "name": "chat3button", - "x": 0.0, - "y": 0.0, - "width": 446.25, - "height": 88.2, - "text": "БишкекНовости", - "textPaddingY": 0.0, - "textPaddingX": 100.0, - "fontSize": 32, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "textures": { - "normal": "resources/w/ui/img/phone/ChatListItem003.png", - "hover": "resources/w/ui/img/phone/ChatListItem003.png", - "pressed": "resources/w/ui/img/phone/ChatListItem003.png" - } - }, - { - "type": "StaticImage", - "name": "chat3Unread", - "x" : 408, - "y" : 24, - "width": 28.7, - "height": 28.7, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, - { - "type": "TextView", - "name": "chat3msg", - "x": 100.0, - "y": 36.0, - "width": 446.25, - "height": 88.2, - "text": "Жители Бишкека все чаще ...", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 0.8, - 0.8, - 0.8, - 1.0 - ] - } - ] - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/screen_phone_hint001.json b/resources/w/ui/screen_phone_hint001.json deleted file mode 100644 index 98dbc08..0000000 --- a/resources/w/ui/screen_phone_hint001.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "vertical_align": "center", - "horizontal_align": "center", - "children": [ - { - "type": "Button", - "name": "phoneExitButton", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.png" - } - }, - { - "type": "Button", - "name": "phoneMain", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": -60, - "width": 617.4, - "height": 991.2, - "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", - "name": "phoneTimeDay", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui/img/phone2/ClockDay001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeNight", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui/img/phone2/ClockNight001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeDawn", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui/img/phone2/ClockMorning001.png" - }, - { - "type": "Button", - "name": "phoneBank", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -80, - "y": -60, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconBank001.png", - "hover": "resources/w/ui/img/phone2/IconBank001.png", - "pressed": "resources/w/ui/img/phone2/IconBank001.png" - } - }, - { - "type": "Button", - "name": "phoneTaxi", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 80, - "y": -60, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconTaxi001.png", - "hover": "resources/w/ui/img/phone2/IconTaxi001.png", - "pressed": "resources/w/ui/img/phone2/IconTaxi001.png" - } - }, - { - "type": "Button", - "name": "phoneVideo", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 80, - "y": -190, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconVideo001.png", - "hover": "resources/w/ui/img/phone2/IconVideo001.png", - "pressed": "resources/w/ui/img/phone2/IconVideo001.png" - } - }, - { - "type": "Button", - "name": "phoneMessenger", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -80, - "y": -190, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconMessenger001.png", - "hover": "resources/w/ui/img/phone2/IconMessenger001.png", - "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" - } - }, - { - "type": "StaticImage", - "name": "hint_m001arrow", - "width": 170, - "height": 48, - "x" : -220, - "y" : 150, - "horizontal_gravity": "center", - "vertical_gravity" : "bottom", - "texture": "resources/w/ui/img/hint_arrow_left.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m001", - "width": 414, - "height": 156, - "x" : -420, - "y" : 100, - "horizontal_gravity": "center", - "vertical_gravity" : "bottom", - "texture": "resources/w/ui/img/Hint_m002.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/screen_phone_hint001_002.json b/resources/w/ui/screen_phone_hint001_002.json deleted file mode 100644 index e0a0750..0000000 --- a/resources/w/ui/screen_phone_hint001_002.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "vertical_align": "center", - "horizontal_align": "center", - "children": [ - { - "type": "Button", - "name": "phoneExitButton", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.png" - } - }, - { - "type": "Button", - "name": "phoneMain", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": -60, - "width": 617.4, - "height": 991.2, - "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", - "name": "phoneTimeDay", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui/img/phone2/ClockDay001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeNight", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui/img/phone2/ClockNight001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeDawn", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui/img/phone2/ClockMorning001.png" - }, - { - "type": "Button", - "name": "phoneBank", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -80, - "y": -60, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconBank001.png", - "hover": "resources/w/ui/img/phone2/IconBank001.png", - "pressed": "resources/w/ui/img/phone2/IconBank001.png" - } - }, - { - "type": "Button", - "name": "phoneTaxi", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 80, - "y": -60, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconTaxi001.png", - "hover": "resources/w/ui/img/phone2/IconTaxi001.png", - "pressed": "resources/w/ui/img/phone2/IconTaxi001.png" - } - }, - { - "type": "Button", - "name": "phoneVideo", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 80, - "y": -190, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconVideo001.png", - "hover": "resources/w/ui/img/phone2/IconVideo001.png", - "pressed": "resources/w/ui/img/phone2/IconVideo001.png" - } - }, - { - "type": "Button", - "name": "phoneMessenger", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -80, - "y": -190, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconMessenger001.png", - "hover": "resources/w/ui/img/phone2/IconMessenger001.png", - "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" - } - }, - { - "type": "StaticImage", - "name": "hint_m001arrow", - "width": 170, - "height": 48, - "x": -220, - "y": 150, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/hint_arrow_left.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m001", - "width": 414, - "height": 156, - "x": -420, - "y": 100, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Hint_m002.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m003arrow", - "width": 170, - "height": 48, - "x": 220, - "y": 270, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/hint_arrow_right.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m003", - "width": 318, - "height": 178, - "x": 420, - "y": 220, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/Hint_m003.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/screen_phone_hint002.json b/resources/w/ui/screen_phone_hint002.json deleted file mode 100644 index a72ecb4..0000000 --- a/resources/w/ui/screen_phone_hint002.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "vertical_align": "center", - "horizontal_align": "center", - "children": [ - { - "type": "Button", - "name": "phoneExitButton", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.png" - } - }, - { - "type": "Button", - "name": "phoneMain", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": -60, - "width": 617.4, - "height": 991.2, - "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", - "name": "phoneTimeDay", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui/img/phone2/ClockDay001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeNight", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui/img/phone2/ClockNight001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeDawn", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui/img/phone2/ClockMorning001.png" - }, - { - "type": "Button", - "name": "phoneBank", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -80, - "y": -60, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconBank001.png", - "hover": "resources/w/ui/img/phone2/IconBank001.png", - "pressed": "resources/w/ui/img/phone2/IconBank001.png" - } - }, - { - "type": "Button", - "name": "phoneTaxi", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 80, - "y": -60, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconTaxi001.png", - "hover": "resources/w/ui/img/phone2/IconTaxi001.png", - "pressed": "resources/w/ui/img/phone2/IconTaxi001.png" - } - }, - { - "type": "Button", - "name": "phoneVideo", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 80, - "y": -190, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconVideo001.png", - "hover": "resources/w/ui/img/phone2/IconVideo001.png", - "pressed": "resources/w/ui/img/phone2/IconVideo001.png" - } - }, - { - "type": "Button", - "name": "phoneMessenger", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -80, - "y": -190, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconMessenger001.png", - "hover": "resources/w/ui/img/phone2/IconMessenger001.png", - "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" - } - }, - { - "type": "StaticImage", - "name": "hint_m003arrow", - "width": 170, - "height": 48, - "x" : 220, - "y" : 270, - "horizontal_gravity": "center", - "vertical_gravity" : "bottom", - "texture": "resources/w/ui/img/hint_arrow_right.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m003", - "width": 318, - "height": 178, - "x" : 420, - "y" : 220, - "horizontal_gravity": "center", - "vertical_gravity" : "bottom", - "texture": "resources/w/ui/img/Hint_m003.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui/screen_settings.json b/resources/w/ui/screen_settings.json index e1059d4..c44812e 100644 --- a/resources/w/ui/screen_settings.json +++ b/resources/w/ui/screen_settings.json @@ -103,6 +103,16 @@ "textCentered": true, "color": [1.0, 1.0, 1.0, 1.0] }, + { + "type": "TextButton", + "name": "tutorialToggleButton", + "width": 500, + "height": 40, + "text": "Обучение: ВКЛ", + "fontSize": 32, + "textCentered": true, + "color": [1.0, 1.0, 1.0, 1.0] + }, { "type": "TextButton", "name": "graphicsButton", diff --git a/resources/w/ui/screen_settings_nomusic_web.json b/resources/w/ui/screen_settings_nomusic_web.json index 32617b5..8e5ecc2 100644 --- a/resources/w/ui/screen_settings_nomusic_web.json +++ b/resources/w/ui/screen_settings_nomusic_web.json @@ -90,6 +90,16 @@ "textCentered": true, "color": [1.0, 1.0, 1.0, 1.0] }, + { + "type": "TextButton", + "name": "tutorialToggleButton", + "width": 500, + "height": 40, + "text": "Обучение: ВКЛ", + "fontSize": 32, + "textCentered": true, + "color": [1.0, 1.0, 1.0, 1.0] + }, { "type": "TextButton", "name": "graphicsButton", diff --git a/resources/w/ui_en/hud_step5ab.json b/resources/w/ui_en/hud_dorm.json similarity index 52% rename from resources/w/ui_en/hud_step5ab.json rename to resources/w/ui_en/hud_dorm.json index fc3626b..11f0985 100644 --- a/resources/w/ui_en/hud_step5ab.json +++ b/resources/w/ui_en/hud_dorm.json @@ -83,26 +83,27 @@ "vertical_gravity": "bottom", "texture": "resources/w/ui_en/img/Location_dorm.png" }, - { + { "type": "StaticImage", "name": "hint6aarrow", - "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "horizontal_gravity": "right", + "vertical_gravity": "bottom", "width": 118, "height": 118, "x": 80, "y": 60, - "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png", + "visible": false }, - { + { "type": "StaticImage", "name": "hint6a", "width": 606, "height": 207, - "x" : 110, - "y" : 80, + "x": 110, + "y": 80, "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "vertical_gravity": "bottom", "texture": "resources/w/ui_en/img/Hint6a.png", "pulse": { "minScale": 0.92, @@ -111,24 +112,26 @@ }, "fadeIn": { "durationMs": 1000 - } + }, + "visible": false }, - { + { "type": "StaticImage", "name": "hint6barrow", - "horizontal_gravity": "right", - "vertical_gravity": "top", + "horizontal_gravity": "right", + "vertical_gravity": "top", "width": 118, "height": 118, "x": 80, "y": 200, - "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png", + "visible": false }, - { + { "type": "StaticImage", "name": "hint6b", - "horizontal_gravity": "right", - "vertical_gravity": "top", + "horizontal_gravity": "right", + "vertical_gravity": "top", "width": 630.4, "height": 220.8, "x": 80, @@ -141,19 +144,20 @@ }, "fadeIn": { "durationMs": 1000 - } + }, + "visible": false }, - { + { "type": "StaticImage", "name": "hint7arrow", - "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "horizontal_gravity": "right", + "vertical_gravity": "bottom", "width": 118, "height": 118, "x": 80, "y": 60, "texture": "resources/w/ui/img/hint_arrow_right_bottom.png", - "visible":false, + "visible": false, "pulse": { "minScale": 0.92, "maxScale": 1.08, @@ -163,16 +167,16 @@ "durationMs": 1000 } }, - { + { "type": "StaticImage", "name": "hint7", "width": 579.2, "height": 214.4, - "x" : 110, - "y" : 80, - "visible":false, + "x": 110, + "y": 80, + "visible": false, "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "vertical_gravity": "bottom", "texture": "resources/w/ui_en/img/Hint_m004.png", "pulse": { "minScale": 0.92, @@ -182,7 +186,123 @@ "fadeIn": { "durationMs": 1000 } + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint2", + "width": 660, + "height": 220, + "horizontal_gravity": "center", + "texture": "resources/w/ui_en/img/Hint2.png", + "pulse": { + "minScale": 0.88, + "maxScale": 0.95, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint3", + "width": 692, + "height": 312, + "horizontal_gravity": "center", + "texture": "resources/w/ui_en/img/Hint3.png", + "pulse": { + "minScale": 0.88, + "maxScale": 0.95, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint4", + "width": 705, + "height": 234, + "horizontal_gravity": "center", + "texture": "resources/w/ui_en/img/Hint4.png", + "pulse": { + "minScale": 0.88, + "maxScale": 0.95, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint5", + "width": 606, + "height": 234.7, + "horizontal_gravity": "center", + "texture": "resources/w/ui_en/img/Hint5.png", + "pulse": { + "minScale": 0.88, + "maxScale": 0.95, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui_en/hud_step5abandroid.json b/resources/w/ui_en/hud_dorm_android.json similarity index 52% rename from resources/w/ui_en/hud_step5abandroid.json rename to resources/w/ui_en/hud_dorm_android.json index d185f56..101a824 100644 --- a/resources/w/ui_en/hud_step5abandroid.json +++ b/resources/w/ui_en/hud_dorm_android.json @@ -83,26 +83,27 @@ "vertical_gravity": "bottom", "texture": "resources/w/ui_en/img/Location_dorm.png" }, - { + { "type": "StaticImage", "name": "hint6aarrow", - "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "horizontal_gravity": "right", + "vertical_gravity": "bottom", "width": 118, "height": 118, "x": 80, "y": 60, - "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png", + "visible": false }, - { + { "type": "StaticImage", "name": "hint6a", "width": 606, "height": 207, - "x" : 110, - "y" : 80, + "x": 110, + "y": 80, "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "vertical_gravity": "bottom", "texture": "resources/w/ui_en/img/Hint6a.png", "pulse": { "minScale": 0.92, @@ -111,24 +112,26 @@ }, "fadeIn": { "durationMs": 1000 - } + }, + "visible": false }, - { + { "type": "StaticImage", "name": "hint6barrow", - "horizontal_gravity": "right", - "vertical_gravity": "top", + "horizontal_gravity": "right", + "vertical_gravity": "top", "width": 118, "height": 118, "x": 80, "y": 200, - "texture": "resources/w/ui/img/hint_arrow_right_bottom.png" + "texture": "resources/w/ui/img/hint_arrow_right_bottom.png", + "visible": false }, - { + { "type": "StaticImage", "name": "hint6b", - "horizontal_gravity": "right", - "vertical_gravity": "top", + "horizontal_gravity": "right", + "vertical_gravity": "top", "width": 630.4, "height": 220.8, "x": 80, @@ -141,19 +144,20 @@ }, "fadeIn": { "durationMs": 1000 - } + }, + "visible": false }, - { + { "type": "StaticImage", "name": "hint7arrow", - "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "horizontal_gravity": "right", + "vertical_gravity": "bottom", "width": 118, "height": 118, "x": 80, "y": 60, "texture": "resources/w/ui/img/hint_arrow_right_bottom.png", - "visible":false, + "visible": false, "pulse": { "minScale": 0.92, "maxScale": 1.08, @@ -163,16 +167,16 @@ "durationMs": 1000 } }, - { + { "type": "StaticImage", "name": "hint7", "width": 579.2, "height": 214.4, - "x" : 110, - "y" : 80, - "visible":false, + "x": 110, + "y": 80, + "visible": false, "horizontal_gravity": "right", - "vertical_gravity" : "bottom", + "vertical_gravity": "bottom", "texture": "resources/w/ui_en/img/Hint_m004android.png", "pulse": { "minScale": 0.92, @@ -182,7 +186,123 @@ "fadeIn": { "durationMs": 1000 } + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint2", + "width": 660, + "height": 220, + "horizontal_gravity": "center", + "texture": "resources/w/ui_en/img/Hint2android.png", + "pulse": { + "minScale": 0.88, + "maxScale": 0.95, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint3", + "width": 692, + "height": 312, + "horizontal_gravity": "center", + "texture": "resources/w/ui_en/img/Hint3android.png", + "pulse": { + "minScale": 0.88, + "maxScale": 0.95, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint4", + "width": 705, + "height": 195, + "horizontal_gravity": "center", + "texture": "resources/w/ui_en/img/Hint4android.png", + "pulse": { + "minScale": 0.88, + "maxScale": 0.95, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] + }, + { + "type": "LinearLayout", + "orientation": "vertical", + "vertical_align": "center", + "horizontal_align": "center", + "spacing": 0, + "width": "match_parent", + "height": 600, + "y": 300, + "children": [ + { + "type": "StaticImage", + "name": "hint5", + "width": 606, + "height": 234.7, + "horizontal_gravity": "center", + "texture": "resources/w/ui_en/img/Hint5.png", + "pulse": { + "minScale": 0.88, + "maxScale": 0.95, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + } + ] } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui_en/hud_step0.json b/resources/w/ui_en/hud_step0.json deleted file mode 100644 index ac93cd9..0000000 --- a/resources/w/ui_en/hud_step0.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_dorm.png" - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/hud_step1.json b/resources/w/ui_en/hud_step1.json deleted file mode 100644 index b2196b7..0000000 --- a/resources/w/ui_en/hud_step1.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_dorm.png" - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint2", - "width": 660, - "height": 220, - "horizontal_gravity": "center", - "texture": "resources/w/ui_en/img/Hint2.png", - "pulse": { - "minScale": 0.88, - "maxScale": 0.95, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/hud_step1android.json b/resources/w/ui_en/hud_step1android.json deleted file mode 100644 index 403a0e4..0000000 --- a/resources/w/ui_en/hud_step1android.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_dorm.png" - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint2", - "width": 660, - "height": 220, - "horizontal_gravity": "center", - "texture": "resources/w/ui_en/img/Hint2android.png", - "pulse": { - "minScale": 0.88, - "maxScale": 0.95, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/hud_step2.json b/resources/w/ui_en/hud_step2.json deleted file mode 100644 index 66287dd..0000000 --- a/resources/w/ui_en/hud_step2.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_dorm.png" - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint3", - "width": 692, - "height": 312, - "horizontal_gravity": "center", - "texture": "resources/w/ui_en/img/Hint3.png", - "pulse": { - "minScale": 0.88, - "maxScale": 0.95, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/hud_step2android.json b/resources/w/ui_en/hud_step2android.json deleted file mode 100644 index 38e3966..0000000 --- a/resources/w/ui_en/hud_step2android.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_dorm.png" - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint3", - "width": 692, - "height": 312, - "horizontal_gravity": "center", - "texture": "resources/w/ui_en/img/Hint3android.png", - "pulse": { - "minScale": 0.88, - "maxScale": 0.95, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/hud_step3.json b/resources/w/ui_en/hud_step3.json deleted file mode 100644 index ca91fb9..0000000 --- a/resources/w/ui_en/hud_step3.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_dorm.png" - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint4", - "width": 705, - "height": 234, - "horizontal_gravity": "center", - "texture": "resources/w/ui_en/img/Hint4.png", - "pulse": { - "minScale": 0.88, - "maxScale": 0.95, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/hud_step3android.json b/resources/w/ui_en/hud_step3android.json deleted file mode 100644 index 377514f..0000000 --- a/resources/w/ui_en/hud_step3android.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_dorm.png" - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint4", - "width": 705, - "height": 195, - "horizontal_gravity": "center", - "texture": "resources/w/ui_en/img/Hint4android.png", - "pulse": { - "minScale": 0.88, - "maxScale": 0.95, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/hud_step4.json b/resources/w/ui_en/hud_step4.json deleted file mode 100644 index f671f65..0000000 --- a/resources/w/ui_en/hud_step4.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_dorm.png" - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "center", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 600, - "y": 300, - "children": [ - { - "type": "StaticImage", - "name": "hint5", - "width": 606, - "height": 234.7, - "horizontal_gravity": "center", - "texture": "resources/w/ui_en/img/Hint5.png", - "pulse": { - "minScale": 0.88, - "maxScale": 0.95, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/hud_step5a.json b/resources/w/ui_en/hud_step5a.json deleted file mode 100644 index 5a37914..0000000 --- a/resources/w/ui_en/hud_step5a.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "phoneButton", - "horizontal_gravity": "right", - "vertical_gravity": "bottom", - "x": -46, - "y": -46, - "width": 229, - "height": 229, - "clickZoneWidth": 104, - "clickZoneHeight": 104, - "textures": { - "normal": "resources/w/ui/img/Phone001_State=Default.png", - "hover": "resources/w/ui/img/Phone001_State=Selected.png", - "pressed": "resources/w/ui/img/Phone001_State=Tap.png" - } - }, - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "inventoryButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 110, - "width": 165, - "height": 165, - "clickZoneWidth": 151, - "clickZoneHeight": 151, - "textures": { - "normal": "resources/w/ui/img/Inventory001_State=Default001.png", - "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", - "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" - } - }, - { - "type": "StaticImage", - "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": 207, - "x" : 110, - "y" : 80, - "horizontal_gravity": "right", - "vertical_gravity" : "bottom", - "texture": "resources/w/ui_en/img/Hint6a.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_dorm.png" - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/hud_step5b.json b/resources/w/ui_en/hud_step5b.json deleted file mode 100644 index 861020f..0000000 --- a/resources/w/ui_en/hud_step5b.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "inventoryButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 110, - "width": 165, - "height": 165, - "clickZoneWidth": 151, - "clickZoneHeight": 151, - "textures": { - "normal": "resources/w/ui/img/Inventory001_State=Default001.png", - "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", - "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "journalButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 220, - "width": 165, - "height": 165, - "clickZoneWidth": 89, - "clickZoneHeight": 89, - "textures": { - "normal": "resources/w/ui/img/Journal001_State=Default.png", - "hover": "resources/w/ui/img/Journal001_State=Selected.png", - "pressed": "resources/w/ui/img/Journal001_State=Tap.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/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": 630.4, - "height": 220.8, - "x": 80, - "y": 100, - "texture": "resources/w/ui_en/img/Hint6b.png", - "pulse": { - "minScale": 0.82, - "maxScale": 0.9, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/hud_uni_int_step11.json b/resources/w/ui_en/hud_uni_int.json similarity index 89% rename from resources/w/ui_en/hud_uni_int_step11.json rename to resources/w/ui_en/hud_uni_int.json index 8c73549..c068536 100644 --- a/resources/w/ui_en/hud_uni_int_step11.json +++ b/resources/w/ui_en/hud_uni_int.json @@ -99,38 +99,8 @@ "horizontal_gravity": "center", "vertical_gravity": "bottom", "texture": "resources/w/ui_en/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": 138, - "x": 100, - "y": 250, - "texture": "resources/w/ui_en/img/Hint_darklands001.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 600 - } - }, - { "type": "FrameLayout", "vertical_align": "top", "horizontal_align": "center", @@ -145,7 +115,7 @@ "width": 504, "height": 132, "y": 0, - "visible" : false, + "visible": false, "texture": "resources/w/ui_en/img/toast/item_received001.png" }, { @@ -155,7 +125,7 @@ "width": 504, "height": 132, "y": 104, - "visible" : false, + "visible": false, "texture": "resources/w/ui_en/img/toast/item_removed001.png" }, { @@ -165,19 +135,19 @@ "width": 504, "height": 132, "y": 208, - "visible" : false, + "visible": false, "texture": "resources/w/ui_en/img/toast/quest_completed001.png" }, - { + { "type": "TextView", "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 62, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -191,16 +161,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 166, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -214,16 +184,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 270, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -238,7 +208,39 @@ ] } ] + }, + { + "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", + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_darklands001", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "width": 470, + "height": 138, + "x": 100, + "y": 250, + "texture": "resources/w/ui_en/img/Hint_darklands001.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + }, + "visible": false } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui_en/hud_uni_int_step11android.json b/resources/w/ui_en/hud_uni_int_android.json similarity index 89% rename from resources/w/ui_en/hud_uni_int_step11android.json rename to resources/w/ui_en/hud_uni_int_android.json index a5e6fd1..5b87322 100644 --- a/resources/w/ui_en/hud_uni_int_step11android.json +++ b/resources/w/ui_en/hud_uni_int_android.json @@ -99,38 +99,8 @@ "horizontal_gravity": "center", "vertical_gravity": "bottom", "texture": "resources/w/ui_en/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": 138, - "x": 100, - "y": 250, - "texture": "resources/w/ui_en/img/Hint_darklands001android.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 600 - } - }, - { "type": "FrameLayout", "vertical_align": "top", "horizontal_align": "center", @@ -145,7 +115,7 @@ "width": 504, "height": 132, "y": 0, - "visible" : false, + "visible": false, "texture": "resources/w/ui_en/img/toast/item_received001.png" }, { @@ -155,7 +125,7 @@ "width": 504, "height": 132, "y": 104, - "visible" : false, + "visible": false, "texture": "resources/w/ui_en/img/toast/item_removed001.png" }, { @@ -165,19 +135,19 @@ "width": 504, "height": 132, "y": 208, - "visible" : false, + "visible": false, "texture": "resources/w/ui_en/img/toast/quest_completed001.png" }, - { + { "type": "TextView", "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 62, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -191,16 +161,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 166, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -214,16 +184,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 270, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -238,7 +208,39 @@ ] } ] + }, + { + "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", + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_darklands001", + "horizontal_gravity": "right", + "vertical_gravity": "top", + "width": 470, + "height": 138, + "x": 100, + "y": 250, + "texture": "resources/w/ui_en/img/Hint_darklands001android.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + }, + "visible": false } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui_en/hud_uni_int_step12.json b/resources/w/ui_en/hud_uni_int_dark.json similarity index 84% rename from resources/w/ui_en/hud_uni_int_step12.json rename to resources/w/ui_en/hud_uni_int_dark.json index f4ccc8a..2657125 100644 --- a/resources/w/ui_en/hud_uni_int_step12.json +++ b/resources/w/ui_en/hud_uni_int_dark.json @@ -65,62 +65,36 @@ "horizontal_gravity": "center", "vertical_gravity": "bottom", "texture": "resources/w/ui_en/img/Location_uni_int.png" - }, - { - "type": "StaticImage", - "name": "hint_darklands003_arrow", - "width": 24, - "height": 118, - "x": 210, - "y": 110, - "texture": "resources/w/ui/img/hint_arrow_up.png" }, { "type": "StaticImage", - "name": "hint_darklands003", - "width": 442, - "height": 188, - "x": 130, - "y": 200, - "texture": "resources/w/ui_en/img/Hint_darklands003_hp.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 600 - } - }, - { - "type": "StaticImage", "name": "healthBarPanel", "width": 389, "height": 132.2, "y": -5, - "x": -5, + "x": -5, "horizontal_gravity": "left", "vertical_align": "top", "texture": "resources/w/ui/img/HealthBarBase002.png" }, - { + { "type": "StaticImage", "name": "healthBarBorder", "width": 151.2, "height": 22.8, "y": 49.8, - "x": 100.6, + "x": 100.6, "horizontal_gravity": "left", "vertical_align": "top", "texture": "resources/w/ui/img/HealthBarBack001.png" }, - { + { "type": "Slider", "name": "healthBarFill", "width": 151.2, "height": 22.8, "y": 49.8, - "x": 100.6, + "x": 100.6, "horizontal_gravity": "left", "vertical_gravity": "top", "orientation": "horizontal", @@ -131,7 +105,7 @@ "track": "resources/w/ui/img/HealthBarFill001.png" } }, - { + { "type": "TextView", "name": "healthValue", "x": 255.0, @@ -153,7 +127,7 @@ 1.0 ] }, - { + { "type": "FrameLayout", "vertical_align": "top", "horizontal_align": "center", @@ -168,7 +142,7 @@ "width": 504, "height": 132, "y": 0, - "visible" : false, + "visible": false, "texture": "resources/w/ui_en/img/toast/item_received001.png" }, { @@ -178,7 +152,7 @@ "width": 504, "height": 132, "y": 104, - "visible" : false, + "visible": false, "texture": "resources/w/ui_en/img/toast/item_removed001.png" }, { @@ -188,19 +162,19 @@ "width": 504, "height": 132, "y": 208, - "visible" : false, + "visible": false, "texture": "resources/w/ui_en/img/toast/quest_completed001.png" }, - { + { "type": "TextView", "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 62, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -214,16 +188,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 166, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -237,16 +211,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 270, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -261,7 +235,55 @@ ] } ] + }, + { + "type": "StaticImage", + "name": "hint_darklands003_arrow", + "width": 24, + "height": 118, + "x": 210, + "y": 110, + "texture": "resources/w/ui/img/hint_arrow_up.png", + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_darklands003", + "width": 442, + "height": 188, + "x": 130, + "y": 200, + "texture": "resources/w/ui_en/img/Hint_darklands003_hp.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_darklands002", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "width": 446, + "height": 158, + "x": 0, + "y": 80, + "texture": "resources/w/ui_en/img/Hint_darklands002_attack.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + }, + "visible": false } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui_en/hud_uni_int_step13android.json b/resources/w/ui_en/hud_uni_int_dark_android.json similarity index 81% rename from resources/w/ui_en/hud_uni_int_step13android.json rename to resources/w/ui_en/hud_uni_int_dark_android.json index b7f36fb..45dc042 100644 --- a/resources/w/ui_en/hud_uni_int_step13android.json +++ b/resources/w/ui_en/hud_uni_int_dark_android.json @@ -56,7 +56,7 @@ "pressed": "resources/w/ui/img/Journal001_State=Tap.png" } }, - { + { "type": "StaticImage", "name": "location", "width": 380, @@ -68,52 +68,33 @@ }, { "type": "StaticImage", - "name": "hint_darklands002", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "width": 446, - "height": 158, - "x": 0, - "y": 80, - "texture": "resources/w/ui_en/img/Hint_darklands002_attackandroid.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 600 - } - }, - { - "type": "StaticImage", "name": "healthBarPanel", "width": 389, "height": 132.2, "y": -5, - "x": -5, + "x": -5, "horizontal_gravity": "left", "vertical_align": "top", "texture": "resources/w/ui/img/HealthBarBase002.png" }, - { + { "type": "StaticImage", "name": "healthBarBorder", "width": 151.2, "height": 22.8, "y": 49.8, - "x": 100.6, + "x": 100.6, "horizontal_gravity": "left", "vertical_align": "top", "texture": "resources/w/ui/img/HealthBarBack001.png" }, - { + { "type": "Slider", "name": "healthBarFill", "width": 151.2, "height": 22.8, "y": 49.8, - "x": 100.6, + "x": 100.6, "horizontal_gravity": "left", "vertical_gravity": "top", "orientation": "horizontal", @@ -124,7 +105,7 @@ "track": "resources/w/ui/img/HealthBarFill001.png" } }, - { + { "type": "TextView", "name": "healthValue", "x": 255.0, @@ -146,7 +127,7 @@ 1.0 ] }, - { + { "type": "FrameLayout", "vertical_align": "top", "horizontal_align": "center", @@ -161,7 +142,7 @@ "width": 504, "height": 132, "y": 0, - "visible" : false, + "visible": false, "texture": "resources/w/ui_en/img/toast/item_received001.png" }, { @@ -171,7 +152,7 @@ "width": 504, "height": 132, "y": 104, - "visible" : false, + "visible": false, "texture": "resources/w/ui_en/img/toast/item_removed001.png" }, { @@ -181,19 +162,19 @@ "width": 504, "height": 132, "y": 208, - "visible" : false, + "visible": false, "texture": "resources/w/ui_en/img/toast/quest_completed001.png" }, - { + { "type": "TextView", "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 62, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -207,16 +188,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 166, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -230,16 +211,16 @@ 1.0 ] }, - { + { "type": "TextView", "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", + "horizontal_gravity": "center", + "vertical_gravity": "top", "y": 270, - "x": 54, + "x": 54, "width": 400, "height": 100, - "visible" : false, + "visible": false, "text": "", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", @@ -254,6 +235,54 @@ ] } ] + }, + { + "type": "StaticImage", + "name": "hint_darklands003_arrow", + "width": 24, + "height": 118, + "x": 210, + "y": 110, + "texture": "resources/w/ui/img/hint_arrow_up.png", + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_darklands003", + "width": 442, + "height": 188, + "x": 130, + "y": 200, + "texture": "resources/w/ui_en/img/Hint_darklands003_hp.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_darklands002", + "horizontal_gravity": "center", + "vertical_gravity": "top", + "width": 446, + "height": 158, + "x": 0, + "y": 80, + "texture": "resources/w/ui_en/img/Hint_darklands002_attackandroid.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 600 + }, + "visible": false } ] } diff --git a/resources/w/ui_en/hud_uni_int_dark_full.json b/resources/w/ui_en/hud_uni_int_dark_full.json deleted file mode 100644 index 1dd1a99..0000000 --- a/resources/w/ui_en/hud_uni_int_dark_full.json +++ /dev/null @@ -1,241 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "inventoryButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 110, - "width": 165, - "height": 165, - "clickZoneWidth": 151, - "clickZoneHeight": 151, - "textures": { - "normal": "resources/w/ui/img/Inventory001_State=Default001.png", - "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", - "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "journalButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 220, - "width": 165, - "height": 165, - "clickZoneWidth": 89, - "clickZoneHeight": 89, - "textures": { - "normal": "resources/w/ui/img/Journal001_State=Default.png", - "hover": "resources/w/ui/img/Journal001_State=Selected.png", - "pressed": "resources/w/ui/img/Journal001_State=Tap.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_uni_int.png" - }, - { - "type": "StaticImage", - "name": "healthBarPanel", - "width": 389, - "height": 132.2, - "y": -5, - "x": -5, - "horizontal_gravity": "left", - "vertical_align": "top", - "texture": "resources/w/ui/img/HealthBarBase002.png" - }, - { - "type": "StaticImage", - "name": "healthBarBorder", - "width": 151.2, - "height": 22.8, - "y": 49.8, - "x": 100.6, - "horizontal_gravity": "left", - "vertical_align": "top", - "texture": "resources/w/ui/img/HealthBarBack001.png" - }, - { - "type": "Slider", - "name": "healthBarFill", - "width": 151.2, - "height": 22.8, - "y": 49.8, - "x": 100.6, - "horizontal_gravity": "left", - "vertical_gravity": "top", - "orientation": "horizontal", - "value": 1.0, - "fillMode": true, - "interactive": false, - "textures": { - "track": "resources/w/ui/img/HealthBarFill001.png" - } - }, - { - "type": "TextView", - "name": "healthValue", - "x": 255.0, - "y": 45.5, - "width": 100.0, - "height": 44.0, - "horizontal_gravity": "left", - "vertical_gravity": "top", - "text": "200/200", - "fontSize": 20, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": false, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "FrameLayout", - "vertical_align": "top", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 528, - "children": [ - { - "type": "StaticImage", - "name": "toast001", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 0, - "visible" : false, - "texture": "resources/w/ui_en/img/toast/item_received001.png" - }, - { - "type": "StaticImage", - "name": "toast002", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 104, - "visible" : false, - "texture": "resources/w/ui_en/img/toast/item_removed001.png" - }, - { - "type": "StaticImage", - "name": "toast003", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 208, - "visible" : false, - "texture": "resources/w/ui_en/img/toast/quest_completed001.png" - }, - { - "type": "TextView", - "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 62, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 166, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 270, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - } - ] - } - ] - } -} diff --git a/resources/w/ui_en/hud_uni_int_full.json b/resources/w/ui_en/hud_uni_int_full.json deleted file mode 100644 index 0d036d3..0000000 --- a/resources/w/ui_en/hud_uni_int_full.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "phoneButton", - "horizontal_gravity": "right", - "vertical_gravity": "bottom", - "x": -46, - "y": -46, - "width": 229, - "height": 229, - "clickZoneWidth": 104, - "clickZoneHeight": 104, - "textures": { - "normal": "resources/w/ui/img/Phone001_State=Default.png", - "hover": "resources/w/ui/img/Phone001_State=Selected.png", - "pressed": "resources/w/ui/img/Phone001_State=Tap.png" - } - }, - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "inventoryButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 110, - "width": 165, - "height": 165, - "clickZoneWidth": 151, - "clickZoneHeight": 151, - "textures": { - "normal": "resources/w/ui/img/Inventory001_State=Default001.png", - "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", - "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "journalButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 220, - "width": 165, - "height": 165, - "clickZoneWidth": 89, - "clickZoneHeight": 89, - "textures": { - "normal": "resources/w/ui/img/Journal001_State=Default.png", - "hover": "resources/w/ui/img/Journal001_State=Selected.png", - "pressed": "resources/w/ui/img/Journal001_State=Tap.png" - } - }, - { - "type": "Button", - "name": "darklandsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 330, - "width": 165, - "height": 165, - "clickZoneWidth": 89, - "clickZoneHeight": 89, - "textures": { - "normal": "resources/w/ui/img/Darklands002_State=Default003.png", - "hover": "resources/w/ui/img/Darklands002_State=Selected003.png", - "pressed": "resources/w/ui/img/Darklands002_State=Tap003.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_uni_int.png" - }, - { - "type": "FrameLayout", - "vertical_align": "top", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 528, - "children": [ - { - "type": "StaticImage", - "name": "toast001", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 0, - "visible" : false, - "texture": "resources/w/ui_en/img/toast/item_received001.png" - }, - { - "type": "StaticImage", - "name": "toast002", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 104, - "visible" : false, - "texture": "resources/w/ui_en/img/toast/item_removed001.png" - }, - { - "type": "StaticImage", - "name": "toast003", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 208, - "visible" : false, - "texture": "resources/w/ui_en/img/toast/quest_completed001.png" - }, - { - "type": "TextView", - "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 62, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 166, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 270, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/hud_uni_int_step10.json b/resources/w/ui_en/hud_uni_int_step10.json deleted file mode 100644 index 79b7036..0000000 --- a/resources/w/ui_en/hud_uni_int_step10.json +++ /dev/null @@ -1,197 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "phoneButton", - "horizontal_gravity": "right", - "vertical_gravity": "bottom", - "x": -46, - "y": -46, - "width": 229, - "height": 229, - "clickZoneWidth": 104, - "clickZoneHeight": 104, - "textures": { - "normal": "resources/w/ui/img/Phone001_State=Default.png", - "hover": "resources/w/ui/img/Phone001_State=Selected.png", - "pressed": "resources/w/ui/img/Phone001_State=Tap.png" - } - }, - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "inventoryButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 110, - "width": 165, - "height": 165, - "clickZoneWidth": 151, - "clickZoneHeight": 151, - "textures": { - "normal": "resources/w/ui/img/Inventory001_State=Default001.png", - "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", - "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "journalButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 220, - "width": 165, - "height": 165, - "clickZoneWidth": 89, - "clickZoneHeight": 89, - "textures": { - "normal": "resources/w/ui/img/Journal001_State=Default.png", - "hover": "resources/w/ui/img/Journal001_State=Selected.png", - "pressed": "resources/w/ui/img/Journal001_State=Tap.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_uni_int.png" - }, - { - "type": "FrameLayout", - "vertical_align": "top", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 528, - "children": [ - { - "type": "StaticImage", - "name": "toast001", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 0, - "visible" : false, - "texture": "resources/w/ui_en/img/toast/item_received001.png" - }, - { - "type": "StaticImage", - "name": "toast002", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 104, - "visible" : false, - "texture": "resources/w/ui_en/img/toast/item_removed001.png" - }, - { - "type": "StaticImage", - "name": "toast003", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 208, - "visible" : false, - "texture": "resources/w/ui_en/img/toast/quest_completed001.png" - }, - { - "type": "TextView", - "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 62, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 166, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 270, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - } - ] - } - ] - } -} diff --git a/resources/w/ui_en/hud_uni_int_step13.json b/resources/w/ui_en/hud_uni_int_step13.json deleted file mode 100644 index b6c9401..0000000 --- a/resources/w/ui_en/hud_uni_int_step13.json +++ /dev/null @@ -1,260 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "children": [ - { - "type": "Button", - "name": "settingsButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -35, - "y": -35, - "width": 200, - "height": 200, - "clickZoneWidth": 176, - "clickZoneHeight": 176, - "textures": { - "normal": "resources/w/ui/img/Settings001_State=Default001.png", - "hover": "resources/w/ui/img/Settings001_State=Selected001.png", - "pressed": "resources/w/ui/img/Settings001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "inventoryButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 110, - "width": 165, - "height": 165, - "clickZoneWidth": 151, - "clickZoneHeight": 151, - "textures": { - "normal": "resources/w/ui/img/Inventory001_State=Default001.png", - "hover": "resources/w/ui/img/Inventory001_State=Selected001.png", - "pressed": "resources/w/ui/img/Inventory001_State=Tap001.png" - } - }, - { - "type": "Button", - "name": "journalButton", - "horizontal_gravity": "right", - "vertical_gravity": "top", - "x": -18, - "y": 220, - "width": 165, - "height": 165, - "clickZoneWidth": 89, - "clickZoneHeight": 89, - "textures": { - "normal": "resources/w/ui/img/Journal001_State=Default.png", - "hover": "resources/w/ui/img/Journal001_State=Selected.png", - "pressed": "resources/w/ui/img/Journal001_State=Tap.png" - } - }, - { - "type": "StaticImage", - "name": "location", - "width": 380, - "height": 64, - "y": 30, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Location_uni_int.png" - }, - { - "type": "StaticImage", - "name": "hint_darklands002", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "width": 446, - "height": 158, - "x": 0, - "y": 80, - "texture": "resources/w/ui_en/img/Hint_darklands002_attack.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 600 - } - }, - { - "type": "StaticImage", - "name": "healthBarPanel", - "width": 389, - "height": 132.2, - "y": -5, - "x": -5, - "horizontal_gravity": "left", - "vertical_align": "top", - "texture": "resources/w/ui/img/HealthBarBase002.png" - }, - { - "type": "StaticImage", - "name": "healthBarBorder", - "width": 151.2, - "height": 22.8, - "y": 49.8, - "x": 100.6, - "horizontal_gravity": "left", - "vertical_align": "top", - "texture": "resources/w/ui/img/HealthBarBack001.png" - }, - { - "type": "Slider", - "name": "healthBarFill", - "width": 151.2, - "height": 22.8, - "y": 49.8, - "x": 100.6, - "horizontal_gravity": "left", - "vertical_gravity": "top", - "orientation": "horizontal", - "value": 1.0, - "fillMode": true, - "interactive": false, - "textures": { - "track": "resources/w/ui/img/HealthBarFill001.png" - } - }, - { - "type": "TextView", - "name": "healthValue", - "x": 255.0, - "y": 45.5, - "width": 100.0, - "height": 44.0, - "horizontal_gravity": "left", - "vertical_gravity": "top", - "text": "200/200", - "fontSize": 20, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": false, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "FrameLayout", - "vertical_align": "top", - "horizontal_align": "center", - "spacing": 0, - "width": "match_parent", - "height": 528, - "children": [ - { - "type": "StaticImage", - "name": "toast001", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 0, - "visible" : false, - "texture": "resources/w/ui_en/img/toast/item_received001.png" - }, - { - "type": "StaticImage", - "name": "toast002", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 104, - "visible" : false, - "texture": "resources/w/ui_en/img/toast/item_removed001.png" - }, - { - "type": "StaticImage", - "name": "toast003", - "horizontal_gravity": "center", - "width": 504, - "height": 132, - "y": 208, - "visible" : false, - "texture": "resources/w/ui_en/img/toast/quest_completed001.png" - }, - { - "type": "TextView", - "name": "toast001text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 62, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast002text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 166, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - }, - { - "type": "TextView", - "name": "toast003text", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 270, - "x": 54, - "width": 400, - "height": 100, - "visible" : false, - "text": "", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ] - } - ] - } - ] - } -} diff --git a/resources/w/ui_en/portrait_screen_phone.json b/resources/w/ui_en/portrait_screen_phone.json index 6cef148..896dd11 100644 --- a/resources/w/ui_en/portrait_screen_phone.json +++ b/resources/w/ui_en/portrait_screen_phone.json @@ -126,7 +126,87 @@ "hover": "resources/w/ui/img/phone2/IconMessenger001.png", "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" } + }, + { + "type": "StaticImage", + "name": "hint_m001arrow", + "width": 48, + "height": 170, + "x": -110, + "y": -400, + "horizontal_gravity": "center", + "vertical_gravity": "center", + "texture": "resources/w/ui/img/hint_arrow_up.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_m001", + "width": 621, + "height": 207, + "x": 0, + "y": -470, + "horizontal_gravity": "center", + "vertical_gravity": "center", + "texture": "resources/w/ui_en/img/Hint_m002.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_m003arrow", + "width": 48, + "height": 170, + "x": 110, + "y": 130, + "horizontal_gravity": "center", + "vertical_gravity": "center", + "texture": "resources/w/ui/img/hint_arrow_down_small.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_m003", + "width": 636, + "height": 280, + "x": 0, + "y": 250, + "horizontal_gravity": "center", + "vertical_gravity": "center", + "texture": "resources/w/ui_en/img/Hint_m003.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui_en/portrait_screen_phone_chat_list.json b/resources/w/ui_en/portrait_screen_phone_chat_list.json index 0e967ff..28df29a 100644 --- a/resources/w/ui_en/portrait_screen_phone_chat_list.json +++ b/resources/w/ui_en/portrait_screen_phone_chat_list.json @@ -29,7 +29,7 @@ "y": -60, "width": 882, "height": 1416, - "clickZoneWidth": 600, + "clickZoneWidth": 600, "clickZoneHeight": 900, "textures": { "normal": "resources/w/ui_en/img/phone/PhoneChatList001.png", @@ -241,7 +241,27 @@ ] } ] + }, + { + "type": "StaticImage", + "name": "hint_m002", + "width": 600, + "height": 234, + "x": 0, + "y": -160, + "horizontal_gravity": "center", + "vertical_gravity": "center", + "texture": "resources/w/ui_en/img/Hint_m001.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui_en/portrait_screen_phone_chat_list_hint001.json b/resources/w/ui_en/portrait_screen_phone_chat_list_hint001.json deleted file mode 100644 index 5701420..0000000 --- a/resources/w/ui_en/portrait_screen_phone_chat_list_hint001.json +++ /dev/null @@ -1,266 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "vertical_align": "center", - "horizontal_align": "center", - "children": [ - { - "type": "Button", - "name": "phoneExitButton", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.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_en/img/phone/PhoneChatList001.png", - "hover": "resources/w/ui_en/img/phone/PhoneChatList001.png", - "pressed": "resources/w/ui_en/img/phone/PhoneChatList001.png" - } - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "spacing": 0, - "x": 0, - "y": 0, - "width": 637.5, - "height": 800, - "children": [ - { - "type": "FrameLayout", - "name": "chat1frame", - "width": 637.5, - "height": 126, - "children": [ - { - "type": "TextButton", - "name": "chat1button", - "x": 0.0, - "y": 0.0, - "width": 637.5, - "height": 126, - "text": "Aiperi", - "textPaddingY": 16.0, - "textPaddingX": 128.0, - "fontSize": 40, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "textures": { - "normal": "resources/w/ui/img/phone/ChatListItem001.png", - "hover": "resources/w/ui/img/phone/ChatListItem001.png", - "pressed": "resources/w/ui/img/phone/ChatListItem001.png" - } - }, - { - "type": "StaticImage", - "name": "chat1Unread", - "x": 570, - "y": 50, - "width": 41, - "height": 41, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, - { - "type": "TextView", - "name": "chat1msg", - "x": 128.0, - "y": 60.0, - "width": 637.5, - "height": 126, - "text": "Bekzat, remember we ...", - "fontSize": 32, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 0.8, - 0.8, - 0.8, - 1.0 - ] - } - ] - }, - { - "type": "FrameLayout", - "name": "chat2frame", - "width": 637.5, - "height": 126, - "children": [ - { - "type": "TextButton", - "name": "chat2button", - "x": 0.0, - "y": 0.0, - "width": 637.5, - "height": 126, - "text": "Dad", - "textPaddingY": 16.0, - "textPaddingX": 128.0, - "fontSize": 40, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "textures": { - "normal": "resources/w/ui/img/phone/ChatListItem002.png", - "hover": "resources/w/ui/img/phone/ChatListItem002.png", - "pressed": "resources/w/ui/img/phone/ChatListItem002.png" - } - }, - { - "type": "StaticImage", - "name": "chat2Unread", - "x": 570, - "y": 50, - "width": 41, - "height": 41, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, - { - "type": "TextView", - "name": "chat2msg", - "x": 128.0, - "y": 60.0, - "width": 637.5, - "height": 126, - "text": "Bekzat, son, I and ...", - "fontSize": 32, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 0.8, - 0.8, - 0.8, - 1.0 - ] - } - ] - }, - { - "type": "FrameLayout", - "name": "chat3frame", - "width": 637.5, - "height": 126, - "children": [ - { - "type": "TextButton", - "name": "chat3button", - "x": 0.0, - "y": 0.0, - "width": 637.5, - "height": 126, - "text": "Bishkek.News", - "textPaddingY": 16.0, - "textPaddingX": 128.0, - "fontSize": 40, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "textures": { - "normal": "resources/w/ui/img/phone/ChatListItem003.png", - "hover": "resources/w/ui/img/phone/ChatListItem003.png", - "pressed": "resources/w/ui/img/phone/ChatListItem003.png" - } - }, - { - "type": "StaticImage", - "name": "chat3Unread", - "x": 570, - "y": 50, - "width": 41, - "height": 41, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, - { - "type": "TextView", - "name": "chat3msg", - "x": 128.0, - "y": 60.0, - "width": 637.5, - "height": 124, - "text": "Bishkek residents are ...", - "fontSize": 32, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 0.8, - 0.8, - 0.8, - 1.0 - ] - } - ] - } - ] - }, - { - "type": "StaticImage", - "name": "hint_m002", - "width": 600, - "height": 234, - "x": 0, - "y": -160, - "horizontal_gravity": "center", - "vertical_gravity": "center", - "texture": "resources/w/ui_en/img/Hint_m001.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/portrait_screen_phone_hint001.json b/resources/w/ui_en/portrait_screen_phone_hint001.json deleted file mode 100644 index 90429c9..0000000 --- a/resources/w/ui_en/portrait_screen_phone_hint001.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "vertical_align": "center", - "horizontal_align": "center", - "children": [ - { - "type": "Button", - "name": "phoneExitButton", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.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_en/img/phone2/Phone002.png", - "hover": "resources/w/ui_en/img/phone2/Phone002.png", - "pressed": "resources/w/ui_en/img/phone2/Phone002.png" - } - }, - { - "type": "StaticImage", - "name": "phoneTimeDay", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 637.5, - "height": 172, - "texture": "resources/w/ui_en/img/phone2/ClockDay001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeNight", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui_en/img/phone2/ClockNight001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeDawn", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui_en/img/phone2/ClockMorning001.png" - }, - { - "type": "Button", - "name": "phoneBank", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -110, - "y": -60, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconBank001.png", - "hover": "resources/w/ui/img/phone2/IconBank001.png", - "pressed": "resources/w/ui/img/phone2/IconBank001.png" - } - }, - { - "type": "Button", - "name": "phoneTaxi", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 110, - "y": -60, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconTaxi001.png", - "hover": "resources/w/ui/img/phone2/IconTaxi001.png", - "pressed": "resources/w/ui/img/phone2/IconTaxi001.png" - } - }, - { - "type": "Button", - "name": "phoneVideo", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 110, - "y": -240, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconVideo001.png", - "hover": "resources/w/ui/img/phone2/IconVideo001.png", - "pressed": "resources/w/ui/img/phone2/IconVideo001.png" - } - }, - { - "type": "Button", - "name": "phoneMessenger", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -110, - "y": -240, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconMessenger001.png", - "hover": "resources/w/ui/img/phone2/IconMessenger001.png", - "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" - } - }, - { - "type": "StaticImage", - "name": "hint_m001arrow", - "width": 48, - "height": 170, - "x": -110, - "y": -400, - "horizontal_gravity": "center", - "vertical_gravity": "center", - "texture": "resources/w/ui/img/hint_arrow_up.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m001", - "width": 621, - "height": 207, - "x": 0, - "y": -470, - "horizontal_gravity": "center", - "vertical_gravity": "center", - "texture": "resources/w/ui_en/img/Hint_m002.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/portrait_screen_phone_hint001_002.json b/resources/w/ui_en/portrait_screen_phone_hint001_002.json deleted file mode 100644 index e1832ee..0000000 --- a/resources/w/ui_en/portrait_screen_phone_hint001_002.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "vertical_align": "center", - "horizontal_align": "center", - "children": [ - { - "type": "Button", - "name": "phoneExitButton", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.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_en/img/phone2/Phone002.png", - "hover": "resources/w/ui_en/img/phone2/Phone002.png", - "pressed": "resources/w/ui_en/img/phone2/Phone002.png" - } - }, - { - "type": "StaticImage", - "name": "phoneTimeDay", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 637.5, - "height": 172, - "texture": "resources/w/ui_en/img/phone2/ClockDay001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeNight", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui_en/img/phone2/ClockNight001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeDawn", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui_en/img/phone2/ClockMorning001.png" - }, - { - "type": "Button", - "name": "phoneBank", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -110, - "y": -60, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconBank001.png", - "hover": "resources/w/ui/img/phone2/IconBank001.png", - "pressed": "resources/w/ui/img/phone2/IconBank001.png" - } - }, - { - "type": "Button", - "name": "phoneTaxi", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 110, - "y": -60, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconTaxi001.png", - "hover": "resources/w/ui/img/phone2/IconTaxi001.png", - "pressed": "resources/w/ui/img/phone2/IconTaxi001.png" - } - }, - { - "type": "Button", - "name": "phoneVideo", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 110, - "y": -240, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconVideo001.png", - "hover": "resources/w/ui/img/phone2/IconVideo001.png", - "pressed": "resources/w/ui/img/phone2/IconVideo001.png" - } - }, - { - "type": "Button", - "name": "phoneMessenger", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -110, - "y": -240, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconMessenger001.png", - "hover": "resources/w/ui/img/phone2/IconMessenger001.png", - "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" - } - }, - { - "type": "StaticImage", - "name": "hint_m001arrow", - "width": 48, - "height": 170, - "x": -110, - "y": -400, - "horizontal_gravity": "center", - "vertical_gravity": "center", - "texture": "resources/w/ui/img/hint_arrow_up.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m001", - "width": 621, - "height": 207, - "x": 0, - "y": -470, - "horizontal_gravity": "center", - "vertical_gravity": "center", - "texture": "resources/w/ui_en/img/Hint_m002.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m003arrow", - "width": 48, - "height": 170, - "x" : 110, - "y" : 130, - "horizontal_gravity": "center", - "vertical_gravity" : "center", - "texture": "resources/w/ui/img/hint_arrow_down_small.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m003", - "width": 636, - "height": 280, - "x" : 0, - "y" : 250, - "horizontal_gravity": "center", - "vertical_gravity" : "center", - "texture": "resources/w/ui_en/img/Hint_m003.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} diff --git a/resources/w/ui_en/portrait_screen_phone_hint002.json b/resources/w/ui_en/portrait_screen_phone_hint002.json deleted file mode 100644 index 2dc0630..0000000 --- a/resources/w/ui_en/portrait_screen_phone_hint002.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "vertical_align": "center", - "horizontal_align": "center", - "children": [ - { - "type": "Button", - "name": "phoneExitButton", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.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_en/img/phone2/Phone002.png", - "hover": "resources/w/ui_en/img/phone2/Phone002.png", - "pressed": "resources/w/ui_en/img/phone2/Phone002.png" - } - }, - { - "type": "StaticImage", - "name": "phoneTimeDay", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 637.5, - "height": 172, - "texture": "resources/w/ui_en/img/phone2/ClockDay001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeNight", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui_en/img/phone2/ClockNight001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeDawn", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 200, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui_en/img/phone2/ClockMorning001.png" - }, - { - "type": "Button", - "name": "phoneBank", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -110, - "y": -60, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconBank001.png", - "hover": "resources/w/ui/img/phone2/IconBank001.png", - "pressed": "resources/w/ui/img/phone2/IconBank001.png" - } - }, - { - "type": "Button", - "name": "phoneTaxi", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 110, - "y": -60, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconTaxi001.png", - "hover": "resources/w/ui/img/phone2/IconTaxi001.png", - "pressed": "resources/w/ui/img/phone2/IconTaxi001.png" - } - }, - { - "type": "Button", - "name": "phoneVideo", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 110, - "y": -240, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconVideo001.png", - "hover": "resources/w/ui/img/phone2/IconVideo001.png", - "pressed": "resources/w/ui/img/phone2/IconVideo001.png" - } - }, - { - "type": "Button", - "name": "phoneMessenger", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -110, - "y": -240, - "width": 170, - "height": 170, - "textures": { - "normal": "resources/w/ui/img/phone2/IconMessenger001.png", - "hover": "resources/w/ui/img/phone2/IconMessenger001.png", - "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" - } - }, - { - "type": "StaticImage", - "name": "hint_m003arrow", - "width": 48, - "height": 170, - "x" : 110, - "y" : 130, - "horizontal_gravity": "center", - "vertical_gravity" : "center", - "texture": "resources/w/ui/img/hint_arrow_down_small.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m003", - "width": 636, - "height": 280, - "x" : 0, - "y" : 250, - "horizontal_gravity": "center", - "vertical_gravity" : "center", - "texture": "resources/w/ui_en/img/Hint_m003.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} diff --git a/resources/w/ui_en/screen_phone.json b/resources/w/ui_en/screen_phone.json index 2f24e64..86c4837 100644 --- a/resources/w/ui_en/screen_phone.json +++ b/resources/w/ui_en/screen_phone.json @@ -21,7 +21,7 @@ "pressed": "resources/transparent.png" } }, - { + { "type": "Button", "name": "phoneMain", "horizontal_gravity": "center", @@ -47,7 +47,7 @@ "height": 120.4, "texture": "resources/w/ui_en/img/phone2/ClockDay001.png" }, - { + { "type": "StaticImage", "name": "phoneTimeNight", "horizontal_gravity": "center", @@ -57,7 +57,7 @@ "height": 120.4, "texture": "resources/w/ui_en/img/phone2/ClockNight001.png" }, - { + { "type": "StaticImage", "name": "phoneTimeDawn", "horizontal_gravity": "center", @@ -126,7 +126,87 @@ "hover": "resources/w/ui/img/phone2/IconMessenger001.png", "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" } + }, + { + "type": "StaticImage", + "name": "hint_m001arrow", + "width": 170, + "height": 48, + "x": -220, + "y": 150, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/hint_arrow_left.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_m001", + "width": 414, + "height": 138, + "x": -420, + "y": 100, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui_en/img/Hint_m002.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_m003arrow", + "width": 170, + "height": 48, + "x": 220, + "y": 270, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/hint_arrow_right.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false + }, + { + "type": "StaticImage", + "name": "hint_m003", + "width": 318, + "height": 140, + "x": 420, + "y": 220, + "horizontal_gravity": "center", + "vertical_gravity": "bottom", + "texture": "resources/w/ui_en/img/Hint_m003.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui_en/screen_phone_chat_list.json b/resources/w/ui_en/screen_phone_chat_list.json index 00d5f2c..0c73668 100644 --- a/resources/w/ui_en/screen_phone_chat_list.json +++ b/resources/w/ui_en/screen_phone_chat_list.json @@ -7,7 +7,7 @@ "vertical_align": "center", "horizontal_align": "center", "children": [ - { + { "type": "Button", "name": "phoneExitButton", "horizontal_gravity": "center", @@ -29,7 +29,7 @@ "y": -60, "width": 617.4, "height": 991.2, - "clickZoneWidth": 500, + "clickZoneWidth": 500, "clickZoneHeight": 800, "textures": { "normal": "resources/w/ui_en/img/phone/PhoneChatList001.png", @@ -81,35 +81,35 @@ "pressed": "resources/w/ui/img/phone/ChatListItem001.png" } }, - { - "type": "StaticImage", - "name": "chat1Unread", - "x" : 408, - "y" : 24, - "width": 28.7, - "height": 28.7, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, - { - "type": "TextView", - "name": "chat1msg", + { + "type": "StaticImage", + "name": "chat1Unread", + "x": 408, + "y": 24, + "width": 28.7, + "height": 28.7, + "texture": "resources/w/ui/img/phone/ChatListUnread1.png" + }, + { + "type": "TextView", + "name": "chat1msg", "x": 100.0, "y": 36.0, "width": 446.25, "height": 88.2, - "text": "Bekzat, remember we ...", + "text": "Bekzat, remember we ...", "fontSize": 24, "fontPath": "resources/fonts/DroidSans.ttf", "textCentered": false, "topAligned": true, "wrap": true, - "color": [ + "color": [ 0.8, 0.8, 0.8, 1.0 ] - } + } ] }, { @@ -145,15 +145,15 @@ "pressed": "resources/w/ui/img/phone/ChatListItem002.png" } }, - { - "type": "StaticImage", - "name": "chat2Unread", - "x" : 408, - "y" : 24, - "width": 28.7, - "height": 28.7, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, + { + "type": "StaticImage", + "name": "chat2Unread", + "x": 408, + "y": 24, + "width": 28.7, + "height": 28.7, + "texture": "resources/w/ui/img/phone/ChatListUnread1.png" + }, { "type": "TextView", "name": "chat2msg", @@ -176,7 +176,7 @@ } ] }, - { + { "type": "FrameLayout", "name": "chat3frame", "width": 446.25, @@ -209,15 +209,15 @@ "pressed": "resources/w/ui/img/phone/ChatListItem003.png" } }, - { - "type": "StaticImage", - "name": "chat3Unread", - "x" : 408, - "y" : 24, - "width": 28.7, - "height": 28.7, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, + { + "type": "StaticImage", + "name": "chat3Unread", + "x": 408, + "y": 24, + "width": 28.7, + "height": 28.7, + "texture": "resources/w/ui/img/phone/ChatListUnread1.png" + }, { "type": "TextView", "name": "chat3msg", @@ -241,7 +241,27 @@ ] } ] + }, + { + "type": "StaticImage", + "name": "hint_m002", + "width": 400, + "height": 156, + "x": 420, + "y": 0, + "horizontal_gravity": "center", + "vertical_gravity": "top", + "texture": "resources/w/ui_en/img/Hint_m001.png", + "pulse": { + "minScale": 0.92, + "maxScale": 1.08, + "periodMs": 1500 + }, + "fadeIn": { + "durationMs": 1000 + }, + "visible": false } ] } -} \ No newline at end of file +} diff --git a/resources/w/ui_en/screen_phone_chat_list_hint001.json b/resources/w/ui_en/screen_phone_chat_list_hint001.json deleted file mode 100644 index f70ff9c..0000000 --- a/resources/w/ui_en/screen_phone_chat_list_hint001.json +++ /dev/null @@ -1,266 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "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_en/img/Hint_m001.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "Button", - "name": "phoneExitButton", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.png" - } - }, - { - "type": "Button", - "name": "phoneMain", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": -60, - "width": 617.4, - "height": 991.2, - "clickZoneWidth": 500, - "clickZoneHeight": 800, - "textures": { - "normal": "resources/w/ui_en/img/phone/PhoneChatList001.png", - "hover": "resources/w/ui_en/img/phone/PhoneChatList001.png", - "pressed": "resources/w/ui_en/img/phone/PhoneChatList001.png" - } - }, - { - "type": "LinearLayout", - "orientation": "vertical", - "vertical_align": "top", - "horizontal_align": "center", - "spacing": 0, - "x": 0, - "y": 100, - "width": "match_parent", - "height": 800, - "children": [ - { - "type": "FrameLayout", - "name": "chat1frame", - "width": 446.25, - "height": 88.2, - "children": [ - { - "type": "TextButton", - "name": "chat1button", - "x": 0.0, - "y": 0.0, - "width": 446.25, - "height": 88.2, - "text": "Aiperi", - "textPaddingY": 0.0, - "textPaddingX": 100.0, - "fontSize": 32, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "textures": { - "normal": "resources/w/ui/img/phone/ChatListItem001.png", - "hover": "resources/w/ui/img/phone/ChatListItem001.png", - "pressed": "resources/w/ui/img/phone/ChatListItem001.png" - } - }, - { - "type": "StaticImage", - "name": "chat1Unread", - "x" : 408, - "y" : 24, - "width": 28.7, - "height": 28.7, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, - { - "type": "TextView", - "name": "chat1msg", - "x": 100.0, - "y": 36.0, - "width": 446.25, - "height": 88.2, - "text": "Bekzat, remember we ...", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 0.8, - 0.8, - 0.8, - 1.0 - ] - } - ] - }, - { - "type": "FrameLayout", - "name": "chat2frame", - "width": 446.25, - "height": 88.2, - "children": [ - { - "type": "TextButton", - "name": "chat2button", - "x": 0.0, - "y": 0.0, - "width": 446.25, - "height": 88.2, - "text": "Dad", - "textPaddingY": 0.0, - "textPaddingX": 100.0, - "fontSize": 32, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "textures": { - "normal": "resources/w/ui/img/phone/ChatListItem002.png", - "hover": "resources/w/ui/img/phone/ChatListItem002.png", - "pressed": "resources/w/ui/img/phone/ChatListItem002.png" - } - }, - { - "type": "StaticImage", - "name": "chat2Unread", - "x" : 408, - "y" : 24, - "width": 28.7, - "height": 28.7, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, - { - "type": "TextView", - "name": "chat2msg", - "x": 100.0, - "y": 36.0, - "width": 446.25, - "height": 88.2, - "text": "Bekzat, son, I and ...", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 0.8, - 0.8, - 0.8, - 1.0 - ] - } - ] - }, - { - "type": "FrameLayout", - "name": "chat3frame", - "width": 446.25, - "height": 88.2, - "children": [ - { - "type": "TextButton", - "name": "chat3button", - "x": 0.0, - "y": 0.0, - "width": 446.25, - "height": 88.2, - "text": "Bishkek.News", - "textPaddingY": 0.0, - "textPaddingX": 100.0, - "fontSize": 32, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 1.0, - 1.0, - 1.0, - 1.0 - ], - "textures": { - "normal": "resources/w/ui/img/phone/ChatListItem003.png", - "hover": "resources/w/ui/img/phone/ChatListItem003.png", - "pressed": "resources/w/ui/img/phone/ChatListItem003.png" - } - }, - { - "type": "StaticImage", - "name": "chat3Unread", - "x" : 408, - "y" : 24, - "width": 28.7, - "height": 28.7, - "texture": "resources/w/ui/img/phone/ChatListUnread1.png" - }, - { - "type": "TextView", - "name": "chat3msg", - "x": 100.0, - "y": 36.0, - "width": 446.25, - "height": 88.2, - "text": "Bishkek residents are ...", - "fontSize": 24, - "fontPath": "resources/fonts/DroidSans.ttf", - "textCentered": false, - "topAligned": true, - "wrap": true, - "color": [ - 0.8, - 0.8, - 0.8, - 1.0 - ] - } - ] - } - ] - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/screen_phone_hint001.json b/resources/w/ui_en/screen_phone_hint001.json deleted file mode 100644 index e3e8253..0000000 --- a/resources/w/ui_en/screen_phone_hint001.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "vertical_align": "center", - "horizontal_align": "center", - "children": [ - { - "type": "Button", - "name": "phoneExitButton", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.png" - } - }, - { - "type": "Button", - "name": "phoneMain", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": -60, - "width": 617.4, - "height": 991.2, - "clickZoneWidth": 500, - "clickZoneHeight": 800, - "textures": { - "normal": "resources/w/ui_en/img/phone2/Phone002.png", - "hover": "resources/w/ui_en/img/phone2/Phone002.png", - "pressed": "resources/w/ui_en/img/phone2/Phone002.png" - } - }, - { - "type": "StaticImage", - "name": "phoneTimeDay", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui_en/img/phone2/ClockDay001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeNight", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui_en/img/phone2/ClockNight001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeDawn", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui_en/img/phone2/ClockMorning001.png" - }, - { - "type": "Button", - "name": "phoneBank", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -80, - "y": -60, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconBank001.png", - "hover": "resources/w/ui/img/phone2/IconBank001.png", - "pressed": "resources/w/ui/img/phone2/IconBank001.png" - } - }, - { - "type": "Button", - "name": "phoneTaxi", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 80, - "y": -60, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconTaxi001.png", - "hover": "resources/w/ui/img/phone2/IconTaxi001.png", - "pressed": "resources/w/ui/img/phone2/IconTaxi001.png" - } - }, - { - "type": "Button", - "name": "phoneVideo", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 80, - "y": -190, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconVideo001.png", - "hover": "resources/w/ui/img/phone2/IconVideo001.png", - "pressed": "resources/w/ui/img/phone2/IconVideo001.png" - } - }, - { - "type": "Button", - "name": "phoneMessenger", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -80, - "y": -190, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconMessenger001.png", - "hover": "resources/w/ui/img/phone2/IconMessenger001.png", - "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" - } - }, - { - "type": "StaticImage", - "name": "hint_m001arrow", - "width": 170, - "height": 48, - "x" : -220, - "y" : 150, - "horizontal_gravity": "center", - "vertical_gravity" : "bottom", - "texture": "resources/w/ui/img/hint_arrow_left.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m001", - "width": 414, - "height": 138, - "x" : -420, - "y" : 100, - "horizontal_gravity": "center", - "vertical_gravity" : "bottom", - "texture": "resources/w/ui_en/img/Hint_m002.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/screen_phone_hint001_002.json b/resources/w/ui_en/screen_phone_hint001_002.json deleted file mode 100644 index f88c2f7..0000000 --- a/resources/w/ui_en/screen_phone_hint001_002.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "vertical_align": "center", - "horizontal_align": "center", - "children": [ - { - "type": "Button", - "name": "phoneExitButton", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.png" - } - }, - { - "type": "Button", - "name": "phoneMain", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": -60, - "width": 617.4, - "height": 991.2, - "clickZoneWidth": 500, - "clickZoneHeight": 800, - "textures": { - "normal": "resources/w/ui_en/img/phone2/Phone002.png", - "hover": "resources/w/ui_en/img/phone2/Phone002.png", - "pressed": "resources/w/ui_en/img/phone2/Phone002.png" - } - }, - { - "type": "StaticImage", - "name": "phoneTimeDay", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui_en/img/phone2/ClockDay001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeNight", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui_en/img/phone2/ClockNight001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeDawn", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui_en/img/phone2/ClockMorning001.png" - }, - { - "type": "Button", - "name": "phoneBank", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -80, - "y": -60, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconBank001.png", - "hover": "resources/w/ui/img/phone2/IconBank001.png", - "pressed": "resources/w/ui/img/phone2/IconBank001.png" - } - }, - { - "type": "Button", - "name": "phoneTaxi", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 80, - "y": -60, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconTaxi001.png", - "hover": "resources/w/ui/img/phone2/IconTaxi001.png", - "pressed": "resources/w/ui/img/phone2/IconTaxi001.png" - } - }, - { - "type": "Button", - "name": "phoneVideo", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 80, - "y": -190, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconVideo001.png", - "hover": "resources/w/ui/img/phone2/IconVideo001.png", - "pressed": "resources/w/ui/img/phone2/IconVideo001.png" - } - }, - { - "type": "Button", - "name": "phoneMessenger", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -80, - "y": -190, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconMessenger001.png", - "hover": "resources/w/ui/img/phone2/IconMessenger001.png", - "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" - } - }, - { - "type": "StaticImage", - "name": "hint_m001arrow", - "width": 170, - "height": 48, - "x": -220, - "y": 150, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/hint_arrow_left.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m001", - "width": 414, - "height": 138, - "x": -420, - "y": 100, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Hint_m002.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m003arrow", - "width": 170, - "height": 48, - "x": 220, - "y": 270, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui/img/hint_arrow_right.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m003", - "width": 318, - "height": 140, - "x": 420, - "y": 220, - "horizontal_gravity": "center", - "vertical_gravity": "bottom", - "texture": "resources/w/ui_en/img/Hint_m003.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/screen_phone_hint002.json b/resources/w/ui_en/screen_phone_hint002.json deleted file mode 100644 index f26d5f6..0000000 --- a/resources/w/ui_en/screen_phone_hint002.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "root": { - "type": "FrameLayout", - "name": "hud_root", - "width": "match_parent", - "height": "match_parent", - "vertical_align": "center", - "horizontal_align": "center", - "children": [ - { - "type": "Button", - "name": "phoneExitButton", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": 0, - "width": "match_parent", - "height": "match_parent", - "textures": { - "normal": "resources/transparent.png", - "hover": "resources/transparent.png", - "pressed": "resources/transparent.png" - } - }, - { - "type": "Button", - "name": "phoneMain", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "y": -60, - "width": 617.4, - "height": 991.2, - "clickZoneWidth": 500, - "clickZoneHeight": 800, - "textures": { - "normal": "resources/w/ui_en/img/phone2/Phone002.png", - "hover": "resources/w/ui_en/img/phone2/Phone002.png", - "pressed": "resources/w/ui_en/img/phone2/Phone002.png" - } - }, - { - "type": "StaticImage", - "name": "phoneTimeDay", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui_en/img/phone2/ClockDay001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeNight", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui_en/img/phone2/ClockNight001.png" - }, - { - "type": "StaticImage", - "name": "phoneTimeDawn", - "horizontal_gravity": "center", - "vertical_gravity": "top", - "y": 120, - "width": 446.25, - "height": 120.4, - "texture": "resources/w/ui_en/img/phone2/ClockMorning001.png" - }, - { - "type": "Button", - "name": "phoneBank", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -80, - "y": -60, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconBank001.png", - "hover": "resources/w/ui/img/phone2/IconBank001.png", - "pressed": "resources/w/ui/img/phone2/IconBank001.png" - } - }, - { - "type": "Button", - "name": "phoneTaxi", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 80, - "y": -60, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconTaxi001.png", - "hover": "resources/w/ui/img/phone2/IconTaxi001.png", - "pressed": "resources/w/ui/img/phone2/IconTaxi001.png" - } - }, - { - "type": "Button", - "name": "phoneVideo", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": 80, - "y": -190, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconVideo001.png", - "hover": "resources/w/ui/img/phone2/IconVideo001.png", - "pressed": "resources/w/ui/img/phone2/IconVideo001.png" - } - }, - { - "type": "Button", - "name": "phoneMessenger", - "horizontal_gravity": "center", - "vertical_gravity": "center", - "x": -80, - "y": -190, - "width": 119, - "height": 119, - "textures": { - "normal": "resources/w/ui/img/phone2/IconMessenger001.png", - "hover": "resources/w/ui/img/phone2/IconMessenger001.png", - "pressed": "resources/w/ui/img/phone2/IconMessenger001.png" - } - }, - { - "type": "StaticImage", - "name": "hint_m003arrow", - "width": 170, - "height": 48, - "x" : 220, - "y" : 270, - "horizontal_gravity": "center", - "vertical_gravity" : "bottom", - "texture": "resources/w/ui/img/hint_arrow_right.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - }, - { - "type": "StaticImage", - "name": "hint_m003", - "width": 318, - "height": 140, - "x" : 420, - "y" : 220, - "horizontal_gravity": "center", - "vertical_gravity" : "bottom", - "texture": "resources/w/ui_en/img/Hint_m003.png", - "pulse": { - "minScale": 0.92, - "maxScale": 1.08, - "periodMs": 1500 - }, - "fadeIn": { - "durationMs": 1000 - } - } - ] - } -} \ No newline at end of file diff --git a/resources/w/ui_en/screen_settings.json b/resources/w/ui_en/screen_settings.json index 082a296..e1b3c5d 100644 --- a/resources/w/ui_en/screen_settings.json +++ b/resources/w/ui_en/screen_settings.json @@ -103,6 +103,16 @@ "textCentered": true, "color": [1.0, 1.0, 1.0, 1.0] }, + { + "type": "TextButton", + "name": "tutorialToggleButton", + "width": 500, + "height": 40, + "text": "", + "fontSize": 32, + "textCentered": true, + "color": [1.0, 1.0, 1.0, 1.0] + }, { "type": "TextButton", "name": "graphicsButton", diff --git a/resources/w/ui_en/screen_settings_nomusic_web.json b/resources/w/ui_en/screen_settings_nomusic_web.json index c2a91b8..ead6910 100644 --- a/resources/w/ui_en/screen_settings_nomusic_web.json +++ b/resources/w/ui_en/screen_settings_nomusic_web.json @@ -90,6 +90,16 @@ "textCentered": true, "color": [1.0, 1.0, 1.0, 1.0] }, + { + "type": "TextButton", + "name": "tutorialToggleButton", + "width": 500, + "height": 40, + "text": "", + "fontSize": 32, + "textCentered": true, + "color": [1.0, 1.0, 1.0, 1.0] + }, { "type": "TextButton", "name": "graphicsButton", diff --git a/src/Environment.cpp b/src/Environment.cpp index f714cfd..422d948 100644 --- a/src/Environment.cpp +++ b/src/Environment.cpp @@ -16,14 +16,13 @@ namespace FRG { - int Environment::windowHeaderHeight = 0; int Environment::width = CONST_DEFAULT_WIDTH; int Environment::height = CONST_DEFAULT_HEIGHT; float Environment::zoom = DEFAULT_ZOOM; -bool Environment::enableLogging = false; -//bool Environment::enableLogging = true; +//bool Environment::enableLogging = false; +bool Environment::enableLogging = true; SDL_Window* Environment::window = nullptr; diff --git a/src/Game.cpp b/src/Game.cpp index d6f3736..cf07c02 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -394,7 +394,9 @@ namespace FRG menuManager.startGameFunc = [this]() { mainThreadHandler.EnqueueMainThreadTask([this]() { performResetToInitialState(); + applyTutorialSetting(); gameState.currentLocationName = "location_dorm"; + menuManager.showGameplayHud(); // first HUD frame drawn from the fresh state currentLocation()->scriptEngine.callLocationEnterCallback(); this->audioPlayer->crossFadeMusicAsync("music/obshaga.ogg"); menuManager.lastMusicTrack = "music/obshaga.ogg"; @@ -471,14 +473,6 @@ namespace FRG it->second->onPlayerTaxiRequired = [this]() { menuManager.tutorialShowTaxiHint(); }; - - menuManager.tutorialUnlockInteractiveObjectsFunc = [this]() - { - if (gameState.locations["location_dorm"]) - { - gameState.locations["location_dorm"]->state.tutorialInteractiveObjectsLocked = false; - } - }; } void Game::performFullReset() { @@ -491,10 +485,7 @@ namespace FRG gameState.money = 5500; gameState.globalInts.clear(); gameState.globalFloats.clear(); - gameState.tutorialStep = TutorialStep::Step0; - gameState.uniIntTutorialState = UniIntTutorialState::Step10; - gameState.tutorialPhonePickedUp = false; - gameState.tutorialJournalPickedUp = false; + gameState.tutorialStep = TutorialStep::AdvanceDialogue; gameState.tutorialPhoneChatScreenOpened = false; gameState.tutorialJournalScreenOpened = false; gameState.tutorialNeedOpenTaxiScreen = false; @@ -547,7 +538,7 @@ namespace FRG // sol2 state (GameState::load only touches map entries // that already exist). // Locations survive this reset, so any one-shot callbacks they consumed - // during the previous playthrough (tutorial unlock, taxi request) must be + // during the previous playthrough (taxi request) must be // re-armed here -- createLocations() normally does this, but doesn't run // on this fast path. rearmDormOneShotCallbacks(); @@ -564,6 +555,13 @@ namespace FRG performFullReset(); } + // Runs after either reset path. start_state.json always holds the start of the + // tutorial; a disabled tutorial is simply one that is already completed. + void Game::applyTutorialSetting() { + if (!menuManager.tutorialEnabledSetting) + gameState.tutorialStep = TutorialStep::Completed; + } + void Game::saveInitialState() { nlohmann::json root; gameState.save(root); @@ -837,7 +835,10 @@ namespace FRG if (gameState.locations["location_dorm"]->player) gameState.locations["location_dorm"]->player->state.onDeathAnimComplete = [this]() { startDarklandsTransition(); }; - gameState.locations["location_dorm"]->state.tutorialInteractiveObjectsLocked = true; + // Objects can be picked up once the tutorial reaches "pick up an item". + gameState.locations["location_dorm"]->areInteractiveObjectsLocked = [this]() { + return gameState.tutorialStep < TutorialStep::PickUpItem; + }; //Dorm set up taxi: @@ -928,15 +929,13 @@ namespace FRG } // Wire tutorial advance callbacks for all locations. - // advanceTutorialStep() guards against double-advancing, so sharing is safe. + // completeTutorialStep() only acts on the current step, so sharing is safe. for (auto& [name, loc] : gameState.locations) { loc->dialogueSystem.setOnDialogueAdvanced([this]() { - menuManager.advanceTutorialStep(); + gameState.completeTutorialStep(TutorialStep::AdvanceDialogue); }); loc->onPlayerFloorWalk = [this]() { - if (gameState.tutorialStep == TutorialStep::Step2) { - menuManager.advanceTutorialStep(); - } + gameState.completeTutorialStep(TutorialStep::Walk); menuManager.onPlayerStartedWalking(); }; } @@ -1434,10 +1433,8 @@ namespace FRG Environment::zoom = zoomMax; } //logger() << "Current zoom: " << Environment::zoom << std::endl; - // Tutorial step3 → step4: any mouse-wheel scroll counts as "zoom gesture". - if (gameState.tutorialStep == TutorialStep::Step3) { - menuManager.advanceTutorialStep(); - } + // Tutorial: any mouse-wheel scroll counts as the "zoom gesture". + gameState.completeTutorialStep(TutorialStep::Zoom); } if (event.type == SDL_KEYDOWN && event.key.repeat == 0) { @@ -1595,11 +1592,9 @@ namespace FRG if (newZoom > zoomMax) newZoom = zoomMax; Environment::zoom = newZoom; - // Tutorial step3 → step4: detect a significant pinch-zoom (≥ 2 zoom units). - if (gameState.tutorialStep == TutorialStep::Step3) { - if (std::abs(Environment::zoom - pinchStartZoom) >= 2.0f) { - menuManager.advanceTutorialStep(); - } + // Tutorial: detect a significant pinch-zoom (≥ 2 zoom units). + if (std::abs(Environment::zoom - pinchStartZoom) >= 2.0f) { + gameState.completeTutorialStep(TutorialStep::Zoom); } } @@ -1738,16 +1733,16 @@ namespace FRG // Forwarded for dialogue hover and (when cameraDragging) camera rotation. currentLocation()->handleMotion(fingerId, eventX, eventY, mx, my); - // Tutorial step1 → step2: detect a significant camera rotation on BOTH axes. + // Tutorial: detect a significant camera rotation on BOTH axes. // ~0.15 rad (≈8.6°) per axis ensures the user intentionally panned in 2D, // not just nudged a single axis by accident. static constexpr float TUTORIAL_ROTATION_THRESHOLD = 0.15f; if (cameraDragging - && gameState.tutorialStep == TutorialStep::Step1) { + && gameState.tutorialStep == TutorialStep::RotateCamera) { float deltaAz = std::abs(currentLocation()->state.cameraAzimuth - dragStartAzimuth); float deltaInc = std::abs(currentLocation()->state.cameraInclination - dragStartInclination); if (deltaAz >= TUTORIAL_ROTATION_THRESHOLD && deltaInc >= TUTORIAL_ROTATION_THRESHOLD) { - menuManager.advanceTutorialStep(); + gameState.completeTutorialStep(TutorialStep::RotateCamera); } } } diff --git a/src/Game.h b/src/Game.h index b95cd43..eb10016 100644 --- a/src/Game.h +++ b/src/Game.h @@ -137,9 +137,11 @@ namespace FRG { // never synchronously from a Lua/cutscene call stack. void performResetToInitialState(); void performFullReset(); + // Applies MenuManager::tutorialEnabledSetting to the freshly reset state (new games only). + void applyTutorialSetting(); void saveInitialState(); - // (Re-)arms one-shot gameplay callbacks (tutorial unlock, taxi request) that + // (Re-)arms one-shot gameplay callbacks (taxi request) that // createLocations() wires up but that get consumed (set to nullptr) once used // during play. Must be called after gameState.load() on the fast reset path, // since that path keeps the existing Location objects instead of recreating them. diff --git a/src/GameState.cpp b/src/GameState.cpp index 13de307..8abcbdd 100644 --- a/src/GameState.cpp +++ b/src/GameState.cpp @@ -5,6 +5,27 @@ namespace FRG { +// Saves made before the tutorial rework kept the dorm and the university tutorials +// as two state machines (tutorialStep 0..6 + uniIntTutorialState 0..4); map them +// onto the single TutorialStep sequence. +static TutorialStep migrateLegacyTutorialStep(int dormStep, int uniIntState) +{ + if (dormStep <= 4) return static_cast(dormStep); // Step0..Step4 kept their values + switch (uniIntState) { + case 2: return TutorialStep::DarklandsHealth; // DarklandsActive + case 3: return TutorialStep::DarklandsAttack; // DarklandsStep13 + case 4: return TutorialStep::Completed; // DarklandsFull + default: return TutorialStep::EnterDarklands; // Step10 / Step11 + } +} + +bool GameState::completeTutorialStep(TutorialStep step) +{ + if (tutorialStep != step || step == TutorialStep::Completed) return false; + tutorialStep = static_cast(static_cast(step) + 1); + return true; +} + void GameState::save(nlohmann::json& out) const { // Timestamp @@ -35,10 +56,7 @@ void GameState::save(nlohmann::json& out) const out["globalFloats"] = std::move(gf); // --- Tutorial --- - out["tutorialStep"] = static_cast(tutorialStep); - out["uniIntTutorialState"] = static_cast(uniIntTutorialState); - out["tutorialPhonePickedUp"] = tutorialPhonePickedUp; - out["tutorialJournalPickedUp"] = tutorialJournalPickedUp; + out["tutorialStep"] = static_cast(tutorialStep); out["tutorialPhoneChatScreenOpened"] = tutorialPhoneChatScreenOpened; out["tutorialJournalScreenOpened"] = tutorialJournalScreenOpened; out["tutorialNeedOpenTaxiScreen"] = tutorialNeedOpenTaxiScreen; @@ -118,10 +136,11 @@ void GameState::load(const nlohmann::json& in) //logger() << "GameState::load step 5" << std::endl; // --- Tutorial --- - tutorialStep = static_cast(in.value("tutorialStep", static_cast(tutorialStep))); - uniIntTutorialState = static_cast(in.value("uniIntTutorialState", static_cast(uniIntTutorialState))); - tutorialPhonePickedUp = in.value("tutorialPhonePickedUp", tutorialPhonePickedUp); - tutorialJournalPickedUp = in.value("tutorialJournalPickedUp", tutorialJournalPickedUp); + if (in.contains("uniIntTutorialState")) { + tutorialStep = migrateLegacyTutorialStep(in.value("tutorialStep", 0), in["uniIntTutorialState"].get()); + } else { + tutorialStep = static_cast(in.value("tutorialStep", static_cast(tutorialStep))); + } tutorialPhoneChatScreenOpened = in.value("tutorialPhoneChatScreenOpened", tutorialPhoneChatScreenOpened); tutorialJournalScreenOpened = in.value("tutorialJournalScreenOpened", tutorialJournalScreenOpened); tutorialNeedOpenTaxiScreen = in.value("tutorialNeedOpenTaxiScreen", tutorialNeedOpenTaxiScreen); diff --git a/src/GameState.h b/src/GameState.h index 0627645..051ba6e 100644 --- a/src/GameState.h +++ b/src/GameState.h @@ -11,22 +11,20 @@ namespace FRG { +// The tutorial is one linear sequence: each step shows its hint until the player +// performs the action, then moves on to the next step (GameState::completeTutorialStep). +// Values are saved; AdvanceDialogue..PickUpItem keep the numbers of the old Step0..Step4. enum class TutorialStep { - Step0, // Dialogue hint: "click to advance" - Step1, // Camera rotation hint - Step2, // Floor tap / walk hint - Step3, // Pinch-zoom hint - Step4, // Pick-up item hint - Step5, // Post-pickup reaction - Step6, // Tutorial complete -}; - -enum class UniIntTutorialState { - Step10, - Step11, - DarklandsActive, - DarklandsStep13, - DarklandsFull + AdvanceDialogue, // dorm: "click to advance the dialogue" + RotateCamera, // dorm + Walk, // dorm: tap the floor + Zoom, // dorm; interactive objects stay locked until this is done + PickUpItem, // dorm: take the phone or the journal + EnterDarklands, // uni_interior: press the darklands button (once the spell note is picked up) + DarklandsHealth, // uni_interior darklands: health bar hint, until the player walks + DarklandsExplore, // uni_interior darklands: no hint, until the ghost zone is reached + DarklandsAttack, // uni_interior darklands: attack hint, until an enemy is killed + Completed // no more hints; a new game starts here when the tutorial is disabled }; struct StoredChatMessage { @@ -56,13 +54,15 @@ struct GameState : public ISaveable { Quest::QuestJournal questJournal; // --- Tutorial --- - TutorialStep tutorialStep = TutorialStep::Step0; - UniIntTutorialState uniIntTutorialState = UniIntTutorialState::Step10; - bool tutorialPhonePickedUp = false; - bool tutorialJournalPickedUp = false; - bool tutorialPhoneChatScreenOpened = false; - bool tutorialJournalScreenOpened = false; - bool tutorialNeedOpenTaxiScreen = false; + TutorialStep tutorialStep = TutorialStep::AdvanceDialogue; + // Hints that run alongside the linear steps, until the tutorial is Completed. + bool tutorialPhoneChatScreenOpened = false; // "open the messenger" hint is done + bool tutorialJournalScreenOpened = false; // "open the journal" hint is done + bool tutorialNeedOpenTaxiScreen = false; // "call a taxi" hint is showing + + bool isTutorialActive() const { return tutorialStep != TutorialStep::Completed; } + // Moves to the next step if `step` is the current one; returns whether it did. + bool completeTutorialStep(TutorialStep step); // --- Phone / chat --- bool chatUnread[3] = { true, true, true }; diff --git a/src/Location.cpp b/src/Location.cpp index de5812f..268340c 100644 --- a/src/Location.cpp +++ b/src/Location.cpp @@ -1631,7 +1631,7 @@ namespace FRG // Check if player reached target interactive object if (auto* obj = getTargetInteractiveObject(); - !state.tutorialInteractiveObjectsLocked && obj && player && !obj->state.isAnimating) + !(areInteractiveObjectsLocked && areInteractiveObjectsLocked()) && obj && player && !obj->state.isAnimating) { const Eigen::Vector3f& approachTarget = obj->state.hasInteractionPosition ? obj->state.interactionPosition diff --git a/src/Location.h b/src/Location.h index e894f1b..baa4643 100644 --- a/src/Location.h +++ b/src/Location.h @@ -101,14 +101,18 @@ namespace FRG std::function onPlayerTaxiRequired; + // Optional, set by Game. While it returns true the player can't pick up / + // use interactive objects (the dorm tutorial unlocks them step by step). + std::function areInteractiveObjectsLocked; + // Set by Game after setup(). Lua and onDeathAnimComplete call this to // request the transition without coupling Location to Game directly. std::function requestDarklandsTransition; std::function requestNightDayTransition; - // Set by Game after setup(). Lua calls this to advance the uni_interior HUD - // from step12 to step13 (trigger-zone encounter hint). + // Set by Game after setup(). Lua calls this to advance the uni_interior darklands + // tutorial to the attack hint (trigger-zone encounter). std::function requestAdvanceDarklandsHud; std::function requestClosePhone; diff --git a/src/LocationState.cpp b/src/LocationState.cpp index d177a19..62a4ccf 100644 --- a/src/LocationState.cpp +++ b/src/LocationState.cpp @@ -17,7 +17,6 @@ void LocationState::save(nlohmann::json& out) const out["isNight"] = isNight; out["isDawn"] = isDawn; - out["tutorialInteractiveObjectsLocked"] = tutorialInteractiveObjectsLocked; // Taxi stuff: @@ -122,7 +121,6 @@ void LocationState::load(const nlohmann::json& in) isNight = in.value("isNight", false); isDawn = in.value("isDawn", false); - tutorialInteractiveObjectsLocked = in.value("tutorialInteractiveObjectsLocked", false); //logger() << "LocationState::load step 2" << std::endl; diff --git a/src/LocationState.h b/src/LocationState.h index 7f680a0..24077d7 100644 --- a/src/LocationState.h +++ b/src/LocationState.h @@ -24,9 +24,6 @@ struct LocationState : public ISaveable { bool isNight = false; bool isDawn = false; - // ---- Tutorial ---- - bool tutorialInteractiveObjectsLocked = false; - NpcCar taxiCarInitialState; NpcCar taxiCar; diff --git a/src/MenuManager.cpp b/src/MenuManager.cpp index 61ab985..b600c5e 100644 --- a/src/MenuManager.cpp +++ b/src/MenuManager.cpp @@ -247,49 +247,17 @@ namespace FRG { } void MenuManager::loadUiRoots(const std::string& zipFile) { - hudRoot = loadLocalizedUi("resources/w/ui/hud_step0.json", zipFile); - -#if defined(__ANDROID__) - hudStep1Root = loadLocalizedUi("resources/w/ui/hud_step1android.json", zipFile); - hudStep2Root = loadLocalizedUi("resources/w/ui/hud_step2android.json", zipFile); -#else - hudStep1Root = loadLocalizedUi("resources/w/ui/hud_step1.json", zipFile); - hudStep2Root = loadLocalizedUi("resources/w/ui/hud_step2.json", zipFile); -#endif #ifdef __ANDROID__ - hudStep3Root = loadLocalizedUi("resources/w/ui/hud_step3android.json", zipFile); + hudDormRoot = loadLocalizedUi("resources/w/ui/hud_dorm_android.json", zipFile); + hudUniIntRoot = loadLocalizedUi("resources/w/ui/hud_uni_int_android.json", zipFile); + hudUniIntDarkRoot = loadLocalizedUi("resources/w/ui/hud_uni_int_dark_android.json", zipFile); #else - hudStep3Root = loadLocalizedUi("resources/w/ui/hud_step3.json", zipFile); + hudDormRoot = loadLocalizedUi("resources/w/ui/hud_dorm.json", zipFile); + hudUniIntRoot = loadLocalizedUi("resources/w/ui/hud_uni_int.json", zipFile); + hudUniIntDarkRoot = loadLocalizedUi("resources/w/ui/hud_uni_int_dark.json", zipFile); #endif - - hudStep4Root = loadLocalizedUi("resources/w/ui/hud_step4.json", zipFile); - hudStep5aRoot = loadLocalizedUi("resources/w/ui/hud_step5a.json", zipFile); - hudStep5bRoot = loadLocalizedUi("resources/w/ui/hud_step5b.json", zipFile); - -#ifdef __ANDROID__ - hudStep5abRoot = loadLocalizedUi("resources/w/ui/hud_step5abandroid.json", zipFile); -#else - hudStep5abRoot = loadLocalizedUi("resources/w/ui/hud_step5ab.json", zipFile); -#endif - - hudUniExtRoot = loadLocalizedUi("resources/w/ui/hud_uni_ext.json", zipFile); - hudUniIntStep10Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step10.json", zipFile); - -#ifdef __ANDROID__ - hudUniIntStep11Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step11android.json", zipFile); -#else - hudUniIntStep11Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step11.json", zipFile); -#endif - hudUniIntStep12Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step12.json", zipFile); - -#ifdef __ANDROID__ - hudUniIntStep13Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step13android.json", zipFile); -#else - hudUniIntStep13Root = loadLocalizedUi("resources/w/ui/hud_uni_int_step13.json", zipFile); -#endif - hudUniIntFullRoot = loadLocalizedUi("resources/w/ui/hud_uni_int_full.json", zipFile); - hudUniIntDarkFullRoot = loadLocalizedUi("resources/w/ui/hud_uni_int_dark_full.json", zipFile); - hudUniExtDarkRoot = loadLocalizedUi("resources/w/ui/hud_uni_ext_dark.json", zipFile); + hudUniExtRoot = loadLocalizedUi("resources/w/ui/hud_uni_ext.json", zipFile); + hudUniExtDarkRoot = loadLocalizedUi("resources/w/ui/hud_uni_ext_dark.json", zipFile); //hudCutsceneRoot_ = loadLocalizedUi("resources/w/ui/hud_cutscene.json", zipFile); hudCutsceneRoot_ = loadUiFromFile("resources/w/ui/hud_cutscene.json", renderer, zipFile); @@ -298,9 +266,6 @@ namespace FRG { hudTopHintRoot_ = loadLocalizedUi("resources/w/ui/hud_top_hint01.json", zipFile); phoneMainRoot = loadLocalizedUi("resources/w/ui/screen_phone.json", zipFile); - phoneMainHintARoot = loadLocalizedUi("resources/w/ui/screen_phone_hint001.json", zipFile); - phoneMainHintBRoot = loadLocalizedUi("resources/w/ui/screen_phone_hint002.json", zipFile); - phoneMainHintABRoot = loadLocalizedUi("resources/w/ui/screen_phone_hint001_002.json", zipFile); phoneBankRoot = loadLocalizedUi("resources/w/ui/screen_phone_bank.json", zipFile); phoneVideoRoot = loadLocalizedUi("resources/w/ui/screen_phone_video.json", zipFile); @@ -308,18 +273,13 @@ namespace FRG { phoneMapUniRoot = loadLocalizedUi("resources/w/ui/screen_phone_map_uni.json", zipFile); verticalPhoneMainRoot = loadLocalizedUi("resources/w/ui/portrait_screen_phone.json", zipFile); - verticalPhoneMainHintARoot = loadLocalizedUi("resources/w/ui/portrait_screen_phone_hint001.json", zipFile); - verticalPhoneMainHintBRoot = loadLocalizedUi("resources/w/ui/portrait_screen_phone_hint002.json", zipFile); - verticalPhoneMainHintABRoot= loadLocalizedUi("resources/w/ui/portrait_screen_phone_hint001_002.json", zipFile); verticalPhoneBankRoot = loadLocalizedUi("resources/w/ui/portrait_screen_phone_bank.json", zipFile); verticalPhoneVideoRoot = loadLocalizedUi("resources/w/ui/portrait_screen_phone_video.json", zipFile); verticalPhoneMapDormRoot = loadLocalizedUi("resources/w/ui/portrait_screen_phone_map_dorm.json", zipFile); verticalPhoneMapUniRoot = loadLocalizedUi("resources/w/ui/portrait_screen_phone_map_uni.json", zipFile); phoneChatListRoot = loadLocalizedUi("resources/w/ui/screen_phone_chat_list.json", zipFile); - phoneChatListHintRoot = loadLocalizedUi("resources/w/ui/screen_phone_chat_list_hint001.json", zipFile); verticalPhoneChatListRoot = loadLocalizedUi("resources/w/ui/portrait_screen_phone_chat_list.json", zipFile); - verticalPhoneChatListHintRoot = loadLocalizedUi("resources/w/ui/portrait_screen_phone_chat_list_hint001.json", zipFile); phoneChat1Root = loadLocalizedUi("resources/w/ui/screen_phone_chat1.json", zipFile); phoneChat2Root = loadLocalizedUi("resources/w/ui/screen_phone_chat2.json", zipFile); phoneChat3Root = loadLocalizedUi("resources/w/ui/screen_phone_chat3.json", zipFile); @@ -417,64 +377,83 @@ namespace FRG { } void MenuManager::enterGameplay(bool isFromLoad) { - if (!isFromLoad && uiState_ == GameUiState::MainMenu && startGameFunc) startGameFunc(); - uiState_ = GameUiState::Gameplay; - uiManager.replaceRoot(hudRoot); - topUiManager.replaceRoot(hudTopHintRoot_); if (isFromLoad) { uiManager.clearMenuStack(); topUiManager.clearMenuStack(); } - - applyCurrentHealthBar(); - - uiManager.setButtonCallback("inventoryButton", [this](const std::string&) { - openInventory(); - }); - if (uiManager.findButton("settingsButton")) { - uiManager.setButtonCallback("settingsButton", [this](const std::string&) { - showModalMenuScreen(); - }); - } - - if (isFromLoad) - applyHudForCurrentState(); + // A new game resets the state on a later main-thread task, which then shows the + // HUD itself; the main menu stays up until then. Showing the HUD now would draw + // one frame from the previous game's state (e.g. its phone/journal buttons). + if (!isFromLoad && uiState_ == GameUiState::MainMenu && startGameFunc) + startGameFunc(); + else + showGameplayHud(); } - void MenuManager::applyHudForCurrentState() { - // Clear the step-0 dialogue hint unless we're actually at step 0. - if (gameState_.tutorialStep != TutorialStep::Step0) - topUiManager.replaceRoot(nullptr); - + std::shared_ptr MenuManager::gameplayHudRoot() const { const std::string& loc = gameState_.currentLocationName; + if (loc == "uni_exterior") return gameState_.isDarklands ? hudUniExtDarkRoot : hudUniExtRoot; + if (loc == "uni_interior") return gameState_.isDarklands ? hudUniIntDarkRoot : hudUniIntRoot; + return hudDormRoot; // dorm, or a new game before the location is set + } - // Non-dorm locations: reuse the existing location-change logic. - if (loc == "uni_exterior" || loc == "uni_interior") { - onLocationChanged(loc); - return; + void MenuManager::showGameplayHud() { + uiState_ = GameUiState::Gameplay; + uiManager.replaceRoot(gameplayHudRoot()); + applyCurrentHealthBar(); + setupGameplayHudCallbacks(); + refreshHudVisibility(); + } + + void MenuManager::refreshHudVisibility() { + if (!inventory) return; // update() already ticks during loading, before setup() + + const TutorialStep step = gameState_.tutorialStep; + const bool tutorial = gameState_.isTutorialActive(); + const bool hasPhone = inventory->hasItem("phone"); + const bool hasJournal = inventory->hasItem("journal"); + const bool hasNote = inventory->hasItem("note_spell"); + const bool dark = gameState_.isDarklands; + + auto show = [this](std::initializer_list names, bool visible) { + for (const char* name : names) uiManager.setNodeVisible(name, visible); + }; + + // --- HUD buttons: present while the matching item is in the inventory --- + show({ "inventoryButton" }, inventory->getCount() > 0); + show({ "phoneButton" }, hasPhone && !dark); + show({ "journalButton" }, hasJournal); + show({ "darklandsButton" }, hasNote && !dark); + + // --- Tutorial hints --- + // The dialogue hint lives in topUiManager so it is drawn above the dialogue. + if (!cutsceneHudActive_) { + auto topRoot = (step == TutorialStep::AdvanceDialogue) ? hudTopHintRoot_ : nullptr; + if (topUiManager.getRoot() != topRoot) topUiManager.replaceRoot(topRoot); } - // Dorm (or pre-first-teleport): select HUD root by tutorial step. - std::shared_ptr nextRoot; - switch (gameState_.tutorialStep) { - case TutorialStep::Step0: nextRoot = hudRoot; break; - case TutorialStep::Step1: nextRoot = hudStep1Root; break; - case TutorialStep::Step2: nextRoot = hudStep2Root; break; - case TutorialStep::Step3: nextRoot = hudStep3Root; break; - case TutorialStep::Step4: nextRoot = hudStep4Root; break; - default: break; // Step5/6 handled below - } + // Dorm HUD: one hint per linear step... + show({ "hint2" }, step == TutorialStep::RotateCamera); + show({ "hint3" }, step == TutorialStep::Walk); + show({ "hint4" }, step == TutorialStep::Zoom); + show({ "hint5" }, step == TutorialStep::PickUpItem); + // ...then the hints for the picked-up items, which can be done in any order. + const bool chatHint = tutorial && !gameState_.tutorialPhoneChatScreenOpened; + const bool journalHint = tutorial && !gameState_.tutorialJournalScreenOpened; + const bool taxiHint = tutorial && gameState_.tutorialNeedOpenTaxiScreen; + show({ "hint6a", "hint6aarrow" }, hasPhone && chatHint && !taxiHint); + show({ "hint6b", "hint6barrow" }, hasJournal && journalHint); + show({ "hint7", "hint7arrow" }, taxiHint); - if (nextRoot) { - uiManager.replaceRoot(nextRoot); - applyCurrentHealthBar(); - uiManager.setButtonCallback("inventoryButton", [this](const std::string&) { openInventory(); }); - if (uiManager.findButton("settingsButton")) - uiManager.setButtonCallback("settingsButton", [this](const std::string&) { showModalMenuScreen(); }); - } else { - // Step5 or Step6: pick the right variant and apply hint visibility. - refreshItemPickupHud(); - } + // Phone screens. + show({ "hint_m001", "hint_m001arrow" }, chatHint); // main screen: open the messenger + show({ "hint_m003", "hint_m003arrow" }, taxiHint); // main screen: open the taxi app + show({ "hint_m002" }, chatHint); // chat list: open a chat + + // University interior HUDs. + show({ "hint_darklands001", "hint_darklands001_arrow" }, step == TutorialStep::EnterDarklands && hasNote); + show({ "hint_darklands003", "hint_darklands003_arrow" }, step == TutorialStep::DarklandsHealth); + show({ "hint_darklands002" }, step == TutorialStep::DarklandsAttack); } void MenuManager::showMainMenu() { @@ -762,12 +741,35 @@ namespace FRG { uiManager.setTextButtonCallback("soundToggleButton", [this](const std::string&) { audioPlayer_.setSoundEnabled(!audioPlayer_.isSoundEnabled()); const bool on = audioPlayer_.isSoundEnabled(); - uiManager.setTextButtonText("soundToggleButton", on ? soundToggleOn : soundToggleOff); + uiManager.setTextButtonText("soundToggleButton", on ? soundToggleOn : soundToggleOff); /*uiManager.setTextButtonColor("soundToggleButton", on ? std::array{ 0.2f, 0.9f, 0.2f, 1.0f } : std::array{ 0.9f, 0.2f, 0.2f, 1.0f });*/ audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg"); }); + + setupTutorialToggle(); + } + + // Tutorial on/off button shared by the settings screens — takes effect on the next new game only. + void MenuManager::setupTutorialToggle() { + if (g_currentLanguage == Language::English) + { + tutorialToggleOn = "Tutorial: ON"; + tutorialToggleOff = "Tutorial: OFF"; + } + else if (g_currentLanguage == Language::Russian) + { + tutorialToggleOn = u8"Обучение: ВКЛ"; + tutorialToggleOff = u8"Обучение: ВЫКЛ"; + } + + uiManager.setTextButtonText("tutorialToggleButton", tutorialEnabledSetting ? tutorialToggleOn : tutorialToggleOff); + uiManager.setTextButtonCallback("tutorialToggleButton", [this](const std::string&) { + tutorialEnabledSetting = !tutorialEnabledSetting; + uiManager.setTextButtonText("tutorialToggleButton", tutorialEnabledSetting ? tutorialToggleOn : tutorialToggleOff); + audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg"); + }); } void MenuManager::showSettingsGraphicsScreen() { @@ -956,6 +958,8 @@ namespace FRG { audioPlayer_.playSoundAsync("resources/audio/751089__smallconfusion__mechanical-plastic-click-11.ogg"); }); + setupTutorialToggle(); + uiManager.setTextButtonCallback("musicDownloadButton", [this](const std::string&) { if (musicDownloadStarted) return; // Already downloading, ignore further clicks @@ -1264,9 +1268,6 @@ namespace FRG { gameState_.tutorialJournalScreenOpened = true; journalMenuStackDepth_ = 1; - uiManager.setNodeVisible("hint6b", false); - uiManager.setNodeVisible("hint6barrow", false); - const bool portrait = isPortraitMode(); uiManager.pushMenuFromSavedRoot(portrait ? portraitQuestJournalListRoot : questJournalRoot); @@ -1330,24 +1331,8 @@ namespace FRG { uiState_ = GameUiState::PhoneScreen; currentPhoneSubScreen_ = PhoneSubScreen::Main; - if (isPortraitMode()) { - if (gameState_.tutorialNeedOpenTaxiScreen && (gameState_.tutorialPhoneChatScreenOpened == false)) - uiManager.pushMenuFromSavedRoot(verticalPhoneMainHintABRoot); - else if (gameState_.tutorialNeedOpenTaxiScreen) - uiManager.pushMenuFromSavedRoot(verticalPhoneMainHintBRoot); - else if (gameState_.tutorialPhoneChatScreenOpened == false) - uiManager.pushMenuFromSavedRoot(verticalPhoneMainHintARoot); - else - uiManager.pushMenuFromSavedRoot(verticalPhoneMainRoot); - } else if (gameState_.tutorialNeedOpenTaxiScreen && (gameState_.tutorialPhoneChatScreenOpened == false)) { - uiManager.pushMenuFromSavedRoot(phoneMainHintABRoot); - } else if (gameState_.tutorialNeedOpenTaxiScreen) { - uiManager.pushMenuFromSavedRoot(phoneMainHintBRoot); - } else if (gameState_.tutorialPhoneChatScreenOpened == false) { - uiManager.pushMenuFromSavedRoot(phoneMainHintARoot); - } else { - uiManager.pushMenuFromSavedRoot(phoneMainRoot); - } + uiManager.pushMenuFromSavedRoot(isPortraitMode() ? verticalPhoneMainRoot : phoneMainRoot); + refreshHudVisibility(); uiManager.setButtonCallback("phoneExitButton", [this](const std::string&) { @@ -1400,14 +1385,8 @@ namespace FRG { void MenuManager::openPhoneMessenger() { currentPhoneSubScreen_ = PhoneSubScreen::ChatList; - if (gameState_.tutorialPhoneChatScreenOpened) - { - uiManager.pushMenuFromSavedRoot(isPortraitMode() ? verticalPhoneChatListRoot : phoneChatListRoot); - } - else - { - uiManager.pushMenuFromSavedRoot(isPortraitMode() ? verticalPhoneChatListHintRoot : phoneChatListHintRoot); - } + uiManager.pushMenuFromSavedRoot(isPortraitMode() ? verticalPhoneChatListRoot : phoneChatListRoot); + refreshHudVisibility(); refreshChatUnreadIndicators(); uiManager.setButtonCallback("phoneExitButton", [this](const std::string&) { @@ -1625,14 +1604,7 @@ namespace FRG { chatFrameBuffer_.reset(); uiManager.popMenu(); uiManager.updateAllLayouts(); - if (gameState_.tutorialPhoneChatScreenOpened) - { - uiManager.setNodeVisible("hint_m002", false); - } - else - { - uiManager.setNodeVisible("hint_m002", true); - } + refreshHudVisibility(); refreshChatUnreadIndicators(); } @@ -1652,31 +1624,7 @@ namespace FRG { const int depth = uiManager.menuStackSize(); for (int i = 0; i < depth; ++i) uiManager.popMenu(); uiManager.updateAllLayouts(); - - if (gameState_.tutorialNeedOpenTaxiScreen) - { - uiManager.setNodeVisible("hint7", true); - uiManager.setNodeVisible("hint7arrow", true); - - uiManager.setNodeVisible("hint6a", false); - uiManager.setNodeVisible("hint6aarrow", false); - } - else - { - uiManager.setNodeVisible("hint7", false); - uiManager.setNodeVisible("hint7arrow", false); - - if (gameState_.tutorialPhoneChatScreenOpened) - { - uiManager.setNodeVisible("hint6a", false); - uiManager.setNodeVisible("hint6aarrow", false); - } - else - { - uiManager.setNodeVisible("hint6a", true); - uiManager.setNodeVisible("hint6aarrow", true); - } - } + refreshHudVisibility(); } void MenuManager::closePhoneScreenFromChat() { @@ -1727,80 +1675,9 @@ namespace FRG { void MenuManager::tutorialShowTaxiHint() { logger() << "tutorialShowTaxiHint" << std::endl; - gameState_.tutorialNeedOpenTaxiScreen = true; - if (uiState_ == GameUiState::Gameplay) - { - uiManager.setNodeVisible("hint6a", false); - uiManager.setNodeVisible("hint6aarrow", false); - - uiManager.setNodeVisible("hint7", true); - uiManager.setNodeVisible("hint7arrow", true); - } - } - - // Registers phoneButton / journalButton callbacks on the current HUD root - // and hides any hints that have already been completed. - // Called after every replaceRoot during step 5. - void MenuManager::setupStep5Callbacks() { - if (uiManager.findButton("phoneButton")) { - uiManager.setButtonCallback("phoneButton", [this](const std::string&) { - openPhoneScreen(); - }); - } - if (uiManager.findButton("inventoryButton")) { - uiManager.setButtonCallback("inventoryButton", [this](const std::string&) { - openInventory(); - }); - } - if (uiManager.findButton("journalButton")) { - uiManager.setButtonCallback("journalButton", [this](const std::string&) { - openQuestJournal(); - }); - } - if (uiManager.findButton("settingsButton")) { - uiManager.setButtonCallback("settingsButton", [this](const std::string&) { - showModalMenuScreen(); - }); - } - if (gameState_.tutorialNeedOpenTaxiScreen) - { - uiManager.setNodeVisible("hint6a", false); - uiManager.setNodeVisible("hint6aarrow", false); - - uiManager.setNodeVisible("hint7", true); - uiManager.setNodeVisible("hint7arrow", true); - } - else - { - uiManager.setNodeVisible("hint7", false); - uiManager.setNodeVisible("hint7arrow", false); - } - - if (gameState_.tutorialPhoneChatScreenOpened) { - uiManager.setNodeVisible("hint6a", false); - uiManager.setNodeVisible("hint6aarrow", false); - } - else - { - if (!gameState_.tutorialNeedOpenTaxiScreen) - { - uiManager.setNodeVisible("hint6a", true); - uiManager.setNodeVisible("hint6aarrow", true); - } - } - if (gameState_.tutorialJournalScreenOpened) - { - uiManager.setNodeVisible("hint6b", false); - uiManager.setNodeVisible("hint6barrow", false); - } - else - { - uiManager.setNodeVisible("hint6b", true); - uiManager.setNodeVisible("hint6barrow", true); - } - if (gameState_.tutorialPhoneChatScreenOpened && gameState_.tutorialJournalScreenOpened) { - gameState_.tutorialStep = TutorialStep::Step6; - } + if (!gameState_.isTutorialActive()) return; + gameState_.tutorialNeedOpenTaxiScreen = true; // cleared when the taxi is ordered + refreshHudVisibility(); } void MenuManager::setupGameplayHudCallbacks() { @@ -1823,28 +1700,9 @@ namespace FRG { void MenuManager::onLocationChanged(const std::string& locationName) { if (uiState_ != GameUiState::Gameplay) return; gameState_.currentLocationName = locationName; + showGameplayHud(); - if (locationName == "uni_exterior") { - uiManager.replaceRoot(gameState_.isDarklands ? hudUniExtDarkRoot : hudUniExtRoot); - applyCurrentHealthBar(); - setupGameplayHudCallbacks(); - if (gameState_.isDarklands) - { - audioPlayer_.crossFadeMusicAsync("music/bishkek fight calm.ogg"); - lastMusicTrack = "music/bishkek fight calm.ogg"; - } - else if (gameState_.isNight) - { - audioPlayer_.crossFadeMusicAsync("music/bishkek night.ogg"); - lastMusicTrack = "music/bishkek night.ogg"; - } - else - { - audioPlayer_.crossFadeMusicAsync("music/bishkek univer day.ogg"); - lastMusicTrack = "music/bishkek univer day.ogg"; - } - } else if (locationName == "uni_interior") { - applyUniIntHud(); + if (locationName == "uni_exterior" || locationName == "uni_interior") { if (gameState_.isDarklands) { audioPlayer_.crossFadeMusicAsync("music/bishkek fight calm.ogg"); @@ -1861,11 +1719,6 @@ namespace FRG { lastMusicTrack = "music/bishkek univer day.ogg"; } } else { - // Returning to dorm: reuse step5ab, suppress already-completed hints - uiManager.replaceRoot(hudStep5abRoot); - applyCurrentHealthBar(); - setupStep5Callbacks(); - if (gameState_.isNight) { audioPlayer_.crossFadeMusicAsync("music/bishkek night.ogg"); @@ -1879,96 +1732,11 @@ namespace FRG { } } - void MenuManager::advanceTutorialStep() { - std::shared_ptr nextRoot; - - switch (gameState_.tutorialStep) { - case TutorialStep::Step0: - gameState_.tutorialStep = TutorialStep::Step1; - nextRoot = hudStep1Root; - topUiManager.replaceRoot(nullptr); - break; - case TutorialStep::Step1: - gameState_.tutorialStep = TutorialStep::Step2; - nextRoot = hudStep2Root; - break; - case TutorialStep::Step2: - gameState_.tutorialStep = TutorialStep::Step3; - nextRoot = hudStep3Root; - break; - case TutorialStep::Step3: - gameState_.tutorialStep = TutorialStep::Step4; - nextRoot = hudStep4Root; - if (tutorialUnlockInteractiveObjectsFunc) - { - tutorialUnlockInteractiveObjectsFunc(); - tutorialUnlockInteractiveObjectsFunc = nullptr; - } - break; - default: - return; // Step4/Step5 transitions are driven by onItemPickedUp - } - - if (uiState_ == GameUiState::Gameplay && nextRoot) { - uiManager.replaceRoot(nextRoot); - applyCurrentHealthBar(); - - uiManager.setButtonCallback("inventoryButton", [this](const std::string&) { - openInventory(); - }); - if (uiManager.findButton("settingsButton")) { - uiManager.setButtonCallback("settingsButton", [this](const std::string&) { - showModalMenuScreen(); - }); - } - } - } - void MenuManager::onItemPickedUp(const std::string& itemId) { - if (itemId == "note_spell" && gameState_.uniIntTutorialState == UniIntTutorialState::Step10) { - gameState_.uniIntTutorialState = UniIntTutorialState::Step11; - if (gameState_.currentLocationName == "uni_interior" && uiState_ == GameUiState::Gameplay) - applyUniIntHud(); - } - - if (gameState_.tutorialStep != TutorialStep::Step4 && gameState_.tutorialStep != TutorialStep::Step5) { - return; - } - - // Dorm tutorial HUD logic must not run in other locations. - // currentLocationName is empty only before the first teleport (still in dorm). - if (!gameState_.currentLocationName.empty() && gameState_.currentLocationName != "location_dorm") { - return; - } - - if (itemId == "phone") gameState_.tutorialPhonePickedUp = true; - if (itemId == "journal") gameState_.tutorialJournalPickedUp = true; - - if (gameState_.tutorialStep == TutorialStep::Step4) { - gameState_.tutorialStep = TutorialStep::Step5; - } - - refreshItemPickupHud(); - } - - void MenuManager::refreshItemPickupHud() { - if (uiState_ != GameUiState::Gameplay) return; - - std::shared_ptr nextRoot; - if (gameState_.tutorialPhonePickedUp && gameState_.tutorialJournalPickedUp) { - nextRoot = hudStep5abRoot; - } else if (gameState_.tutorialPhonePickedUp) { - nextRoot = hudStep5aRoot; - } else if (gameState_.tutorialJournalPickedUp) { - nextRoot = hudStep5bRoot; - } - - if (nextRoot) { - uiManager.replaceRoot(nextRoot); - applyCurrentHealthBar(); - // Register item-screen buttons and re-apply any already-completed hint visibility. - setupStep5Callbacks(); - } + // The new item's HUD button appears through refreshHudVisibility(). + if (itemId == "phone" || itemId == "journal") + gameState_.completeTutorialStep(TutorialStep::PickUpItem); + refreshHudVisibility(); } void MenuManager::refreshQuestJournalUi() { @@ -2351,70 +2119,32 @@ namespace FRG { { logger() << "MenuManager::setDarklandsMode called" << std::endl; - if (gameState_.currentLocationName == "uni_interior") { - if (enabled && gameState_.uniIntTutorialState == UniIntTutorialState::Step11) { - gameState_.uniIntTutorialState = UniIntTutorialState::DarklandsActive; - } - applyUniIntHud(); - } else if (gameState_.currentLocationName == "uni_exterior") { - if (uiState_ == GameUiState::Gameplay) { - uiManager.replaceRoot(enabled ? hudUniExtDarkRoot : hudUniExtRoot); - applyCurrentHealthBar(); - setupGameplayHudCallbacks(); - } - } else { - uiManager.setNodeVisible("darklandsButton", !enabled); - uiManager.setNodeVisible("phoneButton", !enabled); - } - } + if (enabled && gameState_.currentLocationName == "uni_interior" && inventory->hasItem("note_spell")) + gameState_.completeTutorialStep(TutorialStep::EnterDarklands); - void MenuManager::applyUniIntHud() - { - if (uiState_ != GameUiState::Gameplay) return; - std::shared_ptr root; - if (gameState_.isDarklands) { - switch (gameState_.uniIntTutorialState) { - case UniIntTutorialState::DarklandsStep13: root = hudUniIntStep13Root; break; - case UniIntTutorialState::DarklandsFull: root = hudUniIntDarkFullRoot; break; - default: root = hudUniIntStep12Root; break; - } - } else { - switch (gameState_.uniIntTutorialState) { - case UniIntTutorialState::Step10: root = hudUniIntStep10Root; break; - case UniIntTutorialState::Step11: root = hudUniIntStep11Root; break; - default: root = hudUniIntFullRoot; break; - } - } - uiManager.replaceRoot(root); - applyCurrentHealthBar(); - setupGameplayHudCallbacks(); + if (uiState_ == GameUiState::Gameplay) + showGameplayHud(); // darklands has its own HUD layouts } void MenuManager::onPlayerStartedWalking() { - if (gameState_.currentLocationName == "uni_interior" - && gameState_.isDarklands - && gameState_.uniIntTutorialState == UniIntTutorialState::DarklandsActive) { - uiManager.setNodeVisible("hint_darklands003", false); - uiManager.setNodeVisible("hint_darklands003_arrow", false); - } + if (gameState_.currentLocationName == "uni_interior" && gameState_.isDarklands) + gameState_.completeTutorialStep(TutorialStep::DarklandsHealth); } void MenuManager::advanceUniIntDarklandsHud() { - if (gameState_.uniIntTutorialState != UniIntTutorialState::DarklandsActive) return; - gameState_.uniIntTutorialState = UniIntTutorialState::DarklandsStep13; - if (gameState_.currentLocationName == "uni_interior" && gameState_.isDarklands && uiState_ == GameUiState::Gameplay) - applyUniIntHud(); + // The ghost zone can be reached without a floor tap (DarklandsHealth never completed). + if (gameState_.tutorialStep == TutorialStep::DarklandsHealth + || gameState_.tutorialStep == TutorialStep::DarklandsExplore) + gameState_.tutorialStep = TutorialStep::DarklandsAttack; } void MenuManager::onEnemyKilledInUniInterior() { - if (gameState_.uniIntTutorialState != UniIntTutorialState::DarklandsActive - && gameState_.uniIntTutorialState != UniIntTutorialState::DarklandsStep13) return; - gameState_.uniIntTutorialState = UniIntTutorialState::DarklandsFull; - if (gameState_.currentLocationName == "uni_interior" && gameState_.isDarklands && uiState_ == GameUiState::Gameplay) - applyUniIntHud(); + // The last tutorial step; like the attack hint, also ends the earlier darklands hints. + if (gameState_.tutorialStep >= TutorialStep::DarklandsHealth) + gameState_.tutorialStep = TutorialStep::Completed; } void MenuManager::updateHealthBar(float hp, float maxHp) { @@ -2554,6 +2284,8 @@ namespace FRG { void MenuManager::update(float deltaMs) { updateToasts(deltaMs); chatUiManager.update(deltaMs); + if (uiState_ != GameUiState::MainMenu && uiState_ != GameUiState::About) + refreshHudVisibility(); } void MenuManager::drawChatFbo(Renderer& renderer) { @@ -2615,6 +2347,7 @@ namespace FRG { root["fullscreen"] = Environment::isFullscreen; root["language"] = FRG::languageToCode(FRG::g_currentLanguage); root["shadow"] = shadowsEnabled; + root["tutorial"] = tutorialEnabledSetting; saveJsonToFile(root, "settings.json"); } @@ -2646,6 +2379,8 @@ namespace FRG { Environment::setFullscreen(root["fullscreen"].get()); #endif } + if (root.contains("tutorial")) + tutorialEnabledSetting = root["tutorial"].get(); if (root.contains("shadow")) { if (shadowMapSettingsChangedFunc) { diff --git a/src/MenuManager.h b/src/MenuManager.h index a64f68c..1fc2f62 100644 --- a/src/MenuManager.h +++ b/src/MenuManager.h @@ -63,6 +63,10 @@ namespace FRG { void tutorialShowTaxiHint(); + // Shows the HUD for the current location with its callbacks wired and visibility + // applied. Game calls it once a new game's state has been reset. + void showGameplayHud(); + void setChatUnread(int chatIndex, bool unread, const std::string& previewMsg = ""); void spendMoney(int amount); @@ -75,7 +79,6 @@ namespace FRG { std::function chatOpenCallback; std::function skipCutsceneFunc; std::function callTaxiFunc; - std::function tutorialUnlockInteractiveObjectsFunc; std::function onSaveGame; std::function onLoadGame; std::function getSlotInfoFunc; @@ -93,7 +96,6 @@ namespace FRG { void onChatBubbleReady(const std::string& text, bool incoming); void setDarklandsMode(bool enabled); - void advanceTutorialStep(); void onItemPickedUp(const std::string& itemId); void onLocationChanged(const std::string& locationName); void onEnemyKilledInUniInterior(); @@ -137,6 +139,9 @@ namespace FRG { #else bool shadowsEnabled = true; #endif + // Applied only when a new game starts (off = start with the tutorial Completed); + // saved games keep their own tutorial progress. + bool tutorialEnabledSetting = true; std::string lastMusicTrack; #ifdef __EMSCRIPTEN__ @@ -160,15 +165,18 @@ namespace FRG { AudioPlayerAsync& audioPlayer_; void enterGameplay(bool isFromLoad = false); - void applyHudForCurrentState(); + // HUD layout for the current location and darklands mode. + std::shared_ptr gameplayHudRoot() const; + // Single place that decides which HUD buttons and tutorial hints are visible: + // buttons follow the inventory, hints follow gameState_.tutorialStep and the + // tutorial flags. Runs every frame; names absent from the shown screen are skipped. + void refreshHudVisibility(); void refreshQuestJournalUi(); void reloadLocalizedGameContent(); std::shared_ptr loadLocalizedUi(const std::string& basePath, const std::string& zipFile); std::shared_ptr loadLocalizedTexture(const std::string& basePath, const std::string& zipFile); void loadUiRoots(const std::string& zipFile); void selectQuestByIndex(int index); - void refreshItemPickupHud(); - void setupStep5Callbacks(); void setupGameplayHudCallbacks(); void openPhoneMessenger(); void openPhoneBank(); @@ -182,7 +190,6 @@ namespace FRG { void openPhoneChatFromList(int chatIndex, std::shared_ptr chatRoot); void returnToPhoneChatList(); void closePhoneScreenFromChat(); - void applyUniIntHud(); void rebuildChatBubblesFromHistory(int chatIndex, bool isPortrait); void showModalMenuScreen(); @@ -196,7 +203,8 @@ namespace FRG { void showCreditsScreen(); void showSettingsScreen(); void showSettingsGraphicsScreen(); - + void setupTutorialToggle(); + #ifdef __EMSCRIPTEN__ void showSettingsNoMusicWebScreen(); @@ -235,30 +243,19 @@ namespace FRG { int journalMenuStackDepth_ = 0; std::vector visibleQuestIds; - std::shared_ptr hudRoot; - std::shared_ptr hudStep1Root; - std::shared_ptr hudStep2Root; - std::shared_ptr hudStep3Root; - std::shared_ptr hudStep4Root; - std::shared_ptr hudStep5aRoot; - std::shared_ptr hudStep5bRoot; - std::shared_ptr hudStep5abRoot; + // One HUD per location (+ darklands variant); each holds all of its buttons and + // tutorial hints, refreshHudVisibility() shows the relevant ones. + std::shared_ptr hudDormRoot; std::shared_ptr hudUniExtRoot; - std::shared_ptr hudUniIntStep10Root; - std::shared_ptr hudUniIntStep11Root; - std::shared_ptr hudUniIntStep12Root; - std::shared_ptr hudUniIntFullRoot; - std::shared_ptr hudUniIntStep13Root; - std::shared_ptr hudUniIntDarkFullRoot; std::shared_ptr hudUniExtDarkRoot; + std::shared_ptr hudUniIntRoot; + std::shared_ptr hudUniIntDarkRoot; std::shared_ptr hudCutsceneRoot_; + // "Click to advance the dialogue" hint; drawn by topUiManager, above the dialogue. std::shared_ptr hudTopHintRoot_; std::shared_ptr phoneMainRoot; - std::shared_ptr phoneMainHintARoot; - std::shared_ptr phoneMainHintBRoot; - std::shared_ptr phoneMainHintABRoot; std::shared_ptr phoneBankRoot; std::shared_ptr phoneVideoRoot; @@ -267,17 +264,12 @@ namespace FRG { // Portrait-mode (vertical) equivalents for screens that have a portrait layout std::shared_ptr verticalPhoneMainRoot; - std::shared_ptr verticalPhoneMainHintARoot; - std::shared_ptr verticalPhoneMainHintBRoot; - std::shared_ptr verticalPhoneMainHintABRoot; std::shared_ptr verticalPhoneBankRoot; std::shared_ptr verticalPhoneVideoRoot; std::shared_ptr verticalPhoneMapDormRoot; std::shared_ptr verticalPhoneMapUniRoot; std::shared_ptr phoneChatListRoot; - std::shared_ptr phoneChatListHintRoot; std::shared_ptr verticalPhoneChatListRoot; - std::shared_ptr verticalPhoneChatListHintRoot; std::shared_ptr phoneChat1Root; std::shared_ptr phoneChat2Root; std::shared_ptr phoneChat3Root; @@ -367,6 +359,8 @@ namespace FRG { std::string musicToggleOff; std::string soundToggleOn; std::string soundToggleOff; + std::string tutorialToggleOn; + std::string tutorialToggleOff; std::string fullScreenToggleOn; std::string fullScreenToggleOff; std::string shadowToggleOn; diff --git a/src/UiManager.cpp b/src/UiManager.cpp index 64283d0..9a48413 100644 --- a/src/UiManager.cpp +++ b/src/UiManager.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "GameConstants.h" namespace FRG { @@ -1535,6 +1536,14 @@ namespace FRG { renderer.PopProjectionMatrix(); } + // Buttons under a hidden node (the node itself or any ancestor) must not react to touches. + static void collectVisibleInteractives(const std::shared_ptr& node, std::unordered_set& out) { + if (!node || !node->visible) return; + if (node->button) out.insert(node->button.get()); + if (node->textButton) out.insert(node->textButton.get()); + for (auto& c : node->children) collectVisibleInteractives(c, out); + } + static std::shared_ptr findNodeByName(const std::shared_ptr& node, const std::string& name) { if (!node) return nullptr; if (!name.empty() && node->name == name) return node; @@ -1847,11 +1856,13 @@ namespace FRG { void UiManager::onTouchDown(int64_t fingerId, int x, int y) { // Iterate allInteractives in reverse DFS order: later-declared elements have higher priority. // At most one button or textButton is pressed per touch. + std::unordered_set visibleInteractives; + collectVisibleInteractives(root, visibleInteractives); for (auto it = allInteractives.rbegin(); it != allInteractives.rend(); ++it) { if (std::holds_alternative>(*it)) { auto& b = std::get>(*it); //logger() << "onTouchDown found the button: " << b->name << std::endl; - if (b->state != ButtonState::Disabled && + if (visibleInteractives.count(b.get()) && b->state != ButtonState::Disabled && b->getClickZoneRect().containsConsideringBorder((float)x, (float)y, b->border)) { b->state = ButtonState::Pressed; pressedButtons[fingerId] = b; @@ -1861,7 +1872,7 @@ namespace FRG { } } else { auto& tb = std::get>(*it); - if (tb->state != ButtonState::Disabled && + if (visibleInteractives.count(tb.get()) && tb->state != ButtonState::Disabled && tb->getClickZoneRect().containsConsideringBorder((float)x, (float)y, tb->border)) { tb->state = ButtonState::Pressed; pressedTextButtons[fingerId] = tb; @@ -2197,6 +2208,9 @@ namespace FRG { if (!root) return false; auto node = findNodeByName(root, nodeName); if (!node) return false; + // Replay the fade-in when a hidden image is revealed, as if its screen was just shown. + if (visible && !node->visible && node->staticImage && node->staticImage->fadeInEnabled) + node->staticImage->fadeInElapsedMs = 0.0f; node->visible = visible; return true; } diff --git a/src/UiManager.h b/src/UiManager.h index 505423a..464690c 100644 --- a/src/UiManager.h +++ b/src/UiManager.h @@ -370,6 +370,7 @@ namespace FRG { static constexpr int64_t MOUSE_FINGER_ID = -1LL; void replaceRoot(std::shared_ptr newRoot); + std::shared_ptr getRoot() const { return root; } void loadFromFile(const std::string& path, Renderer& renderer, const std::string& zipFile = ""); void appendFromFile(const std::string& path, Renderer& renderer, const std::string& zipFile = "");