diff --git a/backgrounds/home/kitchen.png b/backgrounds/home/kitchen.png index a746260..df09adc 100644 Binary files a/backgrounds/home/kitchen.png and b/backgrounds/home/kitchen.png differ diff --git a/backgrounds/home/kitchen_depth.pdn b/backgrounds/home/kitchen_depth.pdn deleted file mode 100644 index 762c03e..0000000 Binary files a/backgrounds/home/kitchen_depth.pdn and /dev/null differ diff --git a/backgrounds/home/kitchen_depth.png b/backgrounds/home/kitchen_depth.png index 594bf69..1741031 100644 Binary files a/backgrounds/home/kitchen_depth.png and b/backgrounds/home/kitchen_depth.png differ diff --git a/backgrounds/home/outside.png b/backgrounds/home/outside.png index f13aa9a..f1e21ef 100644 Binary files a/backgrounds/home/outside.png and b/backgrounds/home/outside.png differ diff --git a/backgrounds/home/outside_albedo.png b/backgrounds/home/outside_albedo.png index fb093e2..b167608 100644 Binary files a/backgrounds/home/outside_albedo.png and b/backgrounds/home/outside_albedo.png differ diff --git a/backgrounds/home/outside_albedo__.png b/backgrounds/home/outside_albedo__.png deleted file mode 100644 index 4fe44e4..0000000 Binary files a/backgrounds/home/outside_albedo__.png and /dev/null differ diff --git a/backgrounds/home/outside_depth.png b/backgrounds/home/outside_depth.png index b94a966..6c38505 100644 Binary files a/backgrounds/home/outside_depth.png and b/backgrounds/home/outside_depth.png differ diff --git a/backgrounds/home/qwen_image_21_pixel_00001_.png b/backgrounds/home/qwen_image_21_pixel_00001_.png deleted file mode 100644 index 59812dd..0000000 Binary files a/backgrounds/home/qwen_image_21_pixel_00001_.png and /dev/null differ diff --git a/backgrounds/home/vestibule.png b/backgrounds/home/vestibule.png index 9592df5..2f9dcad 100644 Binary files a/backgrounds/home/vestibule.png and b/backgrounds/home/vestibule.png differ diff --git a/backgrounds/home/vestibule_depth.png b/backgrounds/home/vestibule_depth.png index 1459513..491328b 100644 Binary files a/backgrounds/home/vestibule_depth.png and b/backgrounds/home/vestibule_depth.png differ diff --git a/interactives/morning_interactives.json b/interactives/morning_interactives.json index f3ab637..6016335 100644 --- a/interactives/morning_interactives.json +++ b/interactives/morning_interactives.json @@ -8,17 +8,49 @@ "enabled": true, "visible": true, "cursor": "PointingHand", - "hitArea": { - "type": "rect", - "x": 0.27239782, - "y": 0.7092288, - "width": 0.06675094, - "height": 0.17319852, - "radius": 0.05 + "hitArea": { + "type": "polygon", + "x": 0.2788022, + "y": 0.7062248, + "width": 0.091567576, + "height": 0.17770463, + "radius": 0.05, + "vertices": [ + { + "x": 0.27960268, + "y": 0.7317591 + }, + { + "x": 0.32073653, + "y": 0.716739 + }, + { + "x": 0.34555304, + "y": 0.84337497 + }, + { + "x": 0.3732654, + "y": 0.86139894 + }, + { + "x": 0.3386896, + "y": 0.8872055 + }, + { + "x": 0.3082694, + "y": 0.7610366 + } + ] + }, + "highlight": { + "color": "#FFD70044", + "scale": 1, + "duration": 0.12 }, - "highlight": { "color": "#FFD70044", "scale": 1, "duration": 0.12 }, "actions": { - "onClick": { "scenario": "scenarios/prolog/morning_cloak.scenario" } + "onClick": { + "scenario": "scenarios/prolog/morning_cloak.scenario" + } } }, { @@ -29,11 +61,24 @@ "enabled": true, "visible": true, "cursor": "PointingHand", - "hitArea": { "type": "rect", "x": 0.30, "y": 0.66, "width": 0.10, "height": 0.09 }, - "highlight": { "color": "#9966FF44", "scale": 1, "duration": 0.12 }, + "hitArea": { + "type": "rect", + "x": 0.79553235, + "y": 0.74711686, + "width": 0.09439635, + "height": 0.07047379, + "radius": 0.05 + }, + "highlight": { + "color": "#9966FF44", + "scale": 1, + "duration": 0.12 + }, "actions": { - "onClick": { "scenario": "scenarios/prolog/morning_book.scenario" } + "onClick": { + "scenario": "scenarios/prolog/morning_book.scenario" + } } } ] -} +} \ No newline at end of file diff --git a/scenarios/home/home_kitchen_default.scenario b/scenarios/home/home_kitchen_default.scenario index a67b1e7..d8f0828 100644 --- a/scenarios/home/home_kitchen_default.scenario +++ b/scenarios/home/home_kitchen_default.scenario @@ -1,7 +1,7 @@ scene: home_kitchen priority: 10 --- -light_set [{"x":0.43052286,"y":0.5760054,"radius":500,"influence":1,"color":"#ffff00"},{"x":0.103702,"y":0.26946074,"radius":500,"influence":1,"color":"#ffff00"}] +light_set [{"x":0.6731463,"y":0.4611617,"radius":500,"influence":1,"color":"#ffff00"},{"x":0.13467516,"y":0.3151215,"radius":500,"influence":1,"color":"#ffff00"}] select "Комната оборудованная под кухню" key=rooms/kitchen/prompt option "Выйти" key=rooms/kitchen/opt_exit -> :exit diff --git a/scenarios/home/home_outside_default.scenario b/scenarios/home/home_outside_default.scenario index dbc47aa..5671789 100644 --- a/scenarios/home/home_outside_default.scenario +++ b/scenarios/home/home_outside_default.scenario @@ -1,7 +1,7 @@ scene: home_outside priority: 10 --- -light_set [{"x":0.29462293,"y":0.43369123,"radius":100,"influence":1,"color":"#ffff00"},{"x":0.29967362,"y":0.62050235,"radius":100,"influence":1,"color":"#ffff00"},{"x":0.49256954,"y":0.40350124,"radius":100,"influence":1,"color":"#ffff00"},{"x":0.5846468,"y":0.37935096,"radius":100,"influence":1,"color":"#ffff00"},{"x":0.33943588,"y":0.41643897,"radius":100,"influence":1,"color":"#ffff00"},{"x":0.43495983,"y":0.41557643,"radius":100,"influence":1,"color":"#ffff00"},{"x":0.30102944,"y":0.5208026,"radius":100,"influence":1,"color":"#ffff00"},{"x":0.67573905,"y":0.40436372,"radius":100,"influence":1,"color":"#ffff00"},{"x":0.3522381,"y":0.5113151,"radius":100,"influence":1,"color":"#ffff00"},{"x":0.6782009,"y":0.507865,"radius":150,"influence":1,"color":"#ffff00"}] +light_set [{"x":0.805989,"y":0.28035545,"radius":100,"influence":1,"color":"#ffff00"},{"x":0.6052956,"y":0.40425685,"radius":100,"influence":1,"color":"#ffff00"},{"x":0.85641646,"y":0.49430165,"radius":100,"influence":1,"color":"#ffff00"},{"x":0.7054866,"y":0.4456003,"radius":150,"influence":1,"color":"#ffff00"},{"x":0.6645251,"y":0.26138362,"radius":100,"influence":1,"color":"#ffff00"}] select "" option "Зайти в дом" key=home_outside/opt_enter -> :enter option "В город" key=home_outside/opt_town -> :town diff --git a/scenarios/home/home_vestibule_default.scenario b/scenarios/home/home_vestibule_default.scenario index 4f59276..a9a6ee4 100644 --- a/scenarios/home/home_vestibule_default.scenario +++ b/scenarios/home/home_vestibule_default.scenario @@ -1,7 +1,7 @@ scene: home_vestibule priority: 40 --- -light_set [{"x":0.32427186,"y":0.5831858,"radius":300,"influence":1,"color":"#ffff00"},{"x":0.11262136,"y":0.44159293,"radius":300,"influence":0.6,"color":"#ffff00"}] +light_set [{"x":0.31837204,"y":0.58041835,"radius":300,"influence":1,"color":"#ffff00"},{"x":0.11557116,"y":0.44574395,"radius":300,"influence":0.6,"color":"#ffff00"}] select "" option "В рабочую комнату" key=vestibule/diner/opt_workroom -> :workroom option "В обеденную комнату" key=vestibule/diner/opt_dinerroom -> :kitchen diff --git a/scenarios/home/home_workroom_default.scenario b/scenarios/home/home_workroom_default.scenario index 8a45e1b..26a640d 100644 --- a/scenarios/home/home_workroom_default.scenario +++ b/scenarios/home/home_workroom_default.scenario @@ -1,7 +1,7 @@ scene: home_workroom priority: 10 --- -light_set [{"x":0.45825243,"y":0.5865044,"radius":300,"influence":1,"color":"#ffff00"},{"x":0.5190939,"y":0.52787614,"radius":300,"influence":1,"color":"#ffff00"},{"x":0.77411,"y":0.45929205,"radius":300,"influence":1,"color":"#ffff00"},{"x":0.8699029,"y":0.4869469,"radius":300,"influence":1,"color":"#ffff00"}] +light_set [{"x":0.45825243,"y":0.5865044,"radius":300,"influence":1,"color":"#ffff00"},{"x":0.53163075,"y":0.5458637,"radius":300,"influence":1,"color":"#ffff00"},{"x":0.77411,"y":0.45929205,"radius":300,"influence":1,"color":"#ffff00"},{"x":0.8699029,"y":0.4869469,"radius":300,"influence":1,"color":"#ffff00"}] select "Рабочий кабинет, тут тебя никто не будет отвлекать от исследований" key=rooms/workroom/prompt option "Выйти" key=rooms/workroom/opt_exit -> :exit