diff --git a/resources/w/ui/img/phone/chat02_01in.png b/resources/w/ui/img/phone/chat02_01in.png new file mode 100644 index 0000000..a777c64 --- /dev/null +++ b/resources/w/ui/img/phone/chat02_01in.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0460d81e052c1dfcc5efb56f02e9564612b455aac43445a0f00392993ed4291c +size 111909 diff --git a/resources/w/ui/img/phone/chat02_02out.png b/resources/w/ui/img/phone/chat02_02out.png new file mode 100644 index 0000000..c4121b3 --- /dev/null +++ b/resources/w/ui/img/phone/chat02_02out.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9dac5338cd6d89f08ad205b5f9a11428791f202e0ab7e8192e2c75d438556a42 +size 30607 diff --git a/resources/w/ui/img/phone/chat02_03in.png b/resources/w/ui/img/phone/chat02_03in.png new file mode 100644 index 0000000..ffef319 --- /dev/null +++ b/resources/w/ui/img/phone/chat02_03in.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c21fb40a0ad1ba9a9537d7bd72a684d18b4e34fd21d5a2fd6ea1363244ea0f6 +size 10520 diff --git a/resources/w/ui/img/phone/chat02_04out.png b/resources/w/ui/img/phone/chat02_04out.png new file mode 100644 index 0000000..9f656b0 --- /dev/null +++ b/resources/w/ui/img/phone/chat02_04out.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab1e769f56425e550fb2930a5680f16ae4de5e039a33b060496dead65051c8c9 +size 28034 diff --git a/resources/w/ui/img/phone/chat02_05in.png b/resources/w/ui/img/phone/chat02_05in.png new file mode 100644 index 0000000..f194916 --- /dev/null +++ b/resources/w/ui/img/phone/chat02_05in.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01b36c335f0273309727e4d292b1eed07102bd1a8ec954d8c673a4cda68093e4 +size 21619 diff --git a/resources/w/ui/img/phone/chat02_06in.png b/resources/w/ui/img/phone/chat02_06in.png new file mode 100644 index 0000000..3bb7753 --- /dev/null +++ b/resources/w/ui/img/phone/chat02_06in.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99b3e91742b84ed8403f5bb1121030fdb277a240f5915b31771268b7785eb462 +size 62580 diff --git a/resources/w/ui/img/phone/chat02_07in.png b/resources/w/ui/img/phone/chat02_07in.png new file mode 100644 index 0000000..c4c4a70 --- /dev/null +++ b/resources/w/ui/img/phone/chat02_07in.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02f63111bc495bef002bdaa12a858ae890a05f52d8a2164d3b37f4602f398791 +size 79518 diff --git a/resources/w/ui/img/phone/chat02_08out.png b/resources/w/ui/img/phone/chat02_08out.png new file mode 100644 index 0000000..eaa83f2 --- /dev/null +++ b/resources/w/ui/img/phone/chat02_08out.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd0835b0fa01081777944a6b0dcb0ea728de4456a4183dc07178699c5a97a4cd +size 26347 diff --git a/resources/w/ui/img/phone/chat02_09in.png b/resources/w/ui/img/phone/chat02_09in.png new file mode 100644 index 0000000..ef29c27 --- /dev/null +++ b/resources/w/ui/img/phone/chat02_09in.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b01459f5924237a9b70c730bb05248ff440bef1067e593572543aa33c7f7d12 +size 64043 diff --git a/resources/w/ui/img/phone/chat02_10in.png b/resources/w/ui/img/phone/chat02_10in.png new file mode 100644 index 0000000..8ba1bf2 --- /dev/null +++ b/resources/w/ui/img/phone/chat02_10in.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfc591430404513130c076680031a16105bc93b4dea84cccbc6b085162a15926 +size 42336 diff --git a/resources/w/ui/screen_phone_chat.json b/resources/w/ui/screen_phone_chat1.json similarity index 100% rename from resources/w/ui/screen_phone_chat.json rename to resources/w/ui/screen_phone_chat1.json diff --git a/resources/w/ui/screen_phone_chat2.json b/resources/w/ui/screen_phone_chat2.json new file mode 100644 index 0000000..209ad37 --- /dev/null +++ b/resources/w/ui/screen_phone_chat2.json @@ -0,0 +1,178 @@ +{ + "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, + "textures": { + "normal": "resources/w/ui/img/phone/PhoneChat001.png", + "hover": "resources/w/ui/img/phone/PhoneChat001.png", + "pressed": "resources/w/ui/img/phone/PhoneChat001.png" + } + }, + { + "type": "StaticImage", + "name": "message01in", + "width": 320.6, + "height": 148.4, + "x" : 430, + "y" : 991.6, + "horizontal_gravity": "left", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/phone/chat02_01in.png" + }, + { + "type": "StaticImage", + "name": "message02out", + "width": 320.6, + "height": 64.4, + "x" : 430, + "y" : 917.2, + "horizontal_gravity": "right", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/phone/chat02_02out.png" + }, + { + "type": "StaticImage", + "name": "message03in", + "width": 103.6, + "height": 43.4, + "x" : 430, + "y" : 863.8, + "horizontal_gravity": "left", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/phone/chat02_03in.png" + }, + { + "type": "StaticImage", + "name": "message04out", + "width": 320.6, + "height": 64.4, + "x" : 430, + "y" : 789.4, + "horizontal_gravity": "right", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/phone/chat02_04out.png" + }, + { + "type": "StaticImage", + "name": "message05in", + "width": 243.6, + "height": 43.4, + "x" : 430, + "y" : 746, + "horizontal_gravity": "left", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/phone/chat02_05in.png" + }, + { + "type": "StaticImage", + "name": "message06in", + "width": 320.6, + "height": 85.4, + "x" : 430, + "y" : 650.6, + "horizontal_gravity": "left", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/phone/chat02_06in.png" + }, + { + "type": "StaticImage", + "name": "message07in", + "width": 320.6, + "height": 106.4, + "x" : 430, + "y" : 534.2, + "horizontal_gravity": "left", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/phone/chat02_07in.png" + }, + { + "type": "StaticImage", + "name": "message08out", + "width": 320.6, + "height": 64.4, + "x" : 430, + "y" : 459.8, + "horizontal_gravity": "right", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/phone/chat02_08out.png" + }, + { + "type": "StaticImage", + "name": "message09in", + "width": 320.6, + "height": 85.4, + "x" : 430, + "y" : 364.4, + "horizontal_gravity": "left", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/phone/chat02_09in.png" + }, + { + "type": "StaticImage", + "name": "message10in", + "width": 320.6, + "height": 64.4, + "x" : 430, + "y" : 290, + "horizontal_gravity": "left", + "vertical_gravity": "bottom", + "texture": "resources/w/ui/img/phone/chat02_10in.png" + }, + { + "type": "TextButton", + "name": "chatTitleButton", + "horizontal_gravity": "center", + "x": 0.0, + "y": 20.0, + "width": 446.25, + "height": 78.4, + "text": "Айпери", + "textPaddingY": 16.0, + "textPaddingX": 140.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/CharHeader001.png", + "hover": "resources/w/ui/img/phone/CharHeader001.png", + "pressed": "resources/w/ui/img/phone/CharHeader001.png" + } + } + ] + } +} \ No newline at end of file diff --git a/src/MenuManager.cpp b/src/MenuManager.cpp index ed333ea..e6c5f8c 100644 --- a/src/MenuManager.cpp +++ b/src/MenuManager.cpp @@ -82,7 +82,7 @@ namespace ZL { hudStep5bRoot = loadUiFromFile("resources/w/ui/hud_step5b.json", renderer, zipFile); hudStep5abRoot = loadUiFromFile("resources/w/ui/hud_step5ab.json", renderer, zipFile); //phoneScreenRoot = loadUiFromFile("resources/w/ui/screen_phone_chat_list.json", renderer, zipFile); - phoneScreenRoot = loadUiFromFile("resources/w/ui/screen_phone_chat.json", renderer, zipFile); + phoneScreenRoot = loadUiFromFile("resources/w/ui/screen_phone_chat2.json", renderer, zipFile); newInventoryRoot = loadUiFromFile("resources/w/ui/screen_inventory.json", renderer, zipFile); questJournalRoot = loadUiFromFile("resources/w/ui/screen_journal.json", renderer, zipFile);