diff --git a/Content/Blueprints/Player/BP_HouseMesh.uasset b/Content/Blueprints/Player/BP_HouseMesh.uasset index 7b14c1c69..14de842a6 100644 Binary files a/Content/Blueprints/Player/BP_HouseMesh.uasset and b/Content/Blueprints/Player/BP_HouseMesh.uasset differ diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index 515339429..21515d850 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/Player/WalkingPawn.uasset b/Content/Blueprints/Player/WalkingPawn.uasset index 5a55112e1..9f1c6d19c 100644 Binary files a/Content/Blueprints/Player/WalkingPawn.uasset and b/Content/Blueprints/Player/WalkingPawn.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset index f0190c814..d2741ae66 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset and b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/lift3dPanel.uasset b/Content/Blueprints/UI/WBPS/Menu/lift3dPanel.uasset deleted file mode 100644 index 1abd6150a..000000000 Binary files a/Content/Blueprints/UI/WBPS/Menu/lift3dPanel.uasset and /dev/null differ diff --git a/Content/Blueprints/UI/WBPS/Menu/selectFloorElev.uasset b/Content/Blueprints/UI/WBPS/Menu/selectFloorElev.uasset new file mode 100644 index 000000000..49e8ed428 Binary files /dev/null and b/Content/Blueprints/UI/WBPS/Menu/selectFloorElev.uasset differ diff --git a/Content/Blueprints/Utils/Generators/HumanAI/manChar_Child.uasset b/Content/Blueprints/Utils/Generators/HumanAI/manChar_Child.uasset new file mode 100644 index 000000000..4816e340a Binary files /dev/null and b/Content/Blueprints/Utils/Generators/HumanAI/manChar_Child.uasset differ diff --git a/Content/Blueprints/Utils/Generators/HumanAI/manchildBT.uasset b/Content/Blueprints/Utils/Generators/HumanAI/manchildBT.uasset new file mode 100644 index 000000000..990739a4e Binary files /dev/null and b/Content/Blueprints/Utils/Generators/HumanAI/manchildBT.uasset differ diff --git a/Content/Blueprints/Utils/RTManage.uasset b/Content/Blueprints/Utils/RTManage.uasset index 1a2987bb5..a6fc4644b 100644 Binary files a/Content/Blueprints/Utils/RTManage.uasset and b/Content/Blueprints/Utils/RTManage.uasset differ diff --git a/Content/Blueprints/world/BM_Elevator.uasset b/Content/Blueprints/world/BM_Elevator.uasset new file mode 100644 index 000000000..d5000dc69 Binary files /dev/null and b/Content/Blueprints/world/BM_Elevator.uasset differ diff --git a/Content/Blueprints/world/BP_flatSign.uasset b/Content/Blueprints/world/BP_flatSign.uasset new file mode 100644 index 000000000..082ba5723 Binary files /dev/null and b/Content/Blueprints/world/BP_flatSign.uasset differ diff --git a/Content/Blueprints/world/BP_floorSign.uasset b/Content/Blueprints/world/BP_floorSign.uasset new file mode 100644 index 000000000..c296e9174 Binary files /dev/null and b/Content/Blueprints/world/BP_floorSign.uasset differ diff --git a/Content/Maps/Interior/GP2/S02Lifts.umap b/Content/Maps/Interior/GP2/S02Lifts.umap new file mode 100644 index 000000000..ce134ae98 Binary files /dev/null and b/Content/Maps/Interior/GP2/S02Lifts.umap differ diff --git a/Content/Maps/Masharov_Yard.umap b/Content/Maps/Masharov_Yard.umap index e4f9f86e3..80aa5d048 100644 Binary files a/Content/Maps/Masharov_Yard.umap and b/Content/Maps/Masharov_Yard.umap differ diff --git a/Content/Maps/Masharov_cars.umap b/Content/Maps/Masharov_cars.umap index 3e2c93a22..1cdbc718a 100644 Binary files a/Content/Maps/Masharov_cars.umap and b/Content/Maps/Masharov_cars.umap differ diff --git a/Content/Maps/Masharov_people.umap b/Content/Maps/Masharov_people.umap index 50b9d5e8b..931587a9a 100644 Binary files a/Content/Maps/Masharov_people.umap and b/Content/Maps/Masharov_people.umap differ diff --git a/Content/Maps/mainScene.umap b/Content/Maps/mainScene.umap index 8514bace5..95bf0cf1d 100644 Binary files a/Content/Maps/mainScene.umap and b/Content/Maps/mainScene.umap differ diff --git a/Content/Materials/LiftPanel.uasset b/Content/Materials/LiftPanel.uasset new file mode 100644 index 000000000..5422bf1c7 Binary files /dev/null and b/Content/Materials/LiftPanel.uasset differ diff --git a/Content/Materials/Masters/Common/M_Emissive.uasset b/Content/Materials/Masters/Common/M_Emissive.uasset index 7988dbfe6..58769ba32 100644 Binary files a/Content/Materials/Masters/Common/M_Emissive.uasset and b/Content/Materials/Masters/Common/M_Emissive.uasset differ diff --git a/Content/Meshes/Exterior/Main/New/SM_ST_3ETC.uasset b/Content/Meshes/Exterior/Main/New/SM_ST_3ETC.uasset index 113c75f67..d66c27053 100644 Binary files a/Content/Meshes/Exterior/Main/New/SM_ST_3ETC.uasset and b/Content/Meshes/Exterior/Main/New/SM_ST_3ETC.uasset differ diff --git a/Content/Meshes/Exterior/Main/SM_Main_secondary_3.uasset b/Content/Meshes/Exterior/Main/SM_Main_secondary_3.uasset index 0a8ef38df..3d30e3295 100644 Binary files a/Content/Meshes/Exterior/Main/SM_Main_secondary_3.uasset and b/Content/Meshes/Exterior/Main/SM_Main_secondary_3.uasset differ diff --git a/Content/Meshes/Interior/GP2/MOP/Elevator/SM_Button_Elevator.uasset b/Content/Meshes/Interior/GP2/MOP/Elevator/SM_Button_Elevator.uasset index f8ac5d7d1..8b3a187bf 100644 Binary files a/Content/Meshes/Interior/GP2/MOP/Elevator/SM_Button_Elevator.uasset and b/Content/Meshes/Interior/GP2/MOP/Elevator/SM_Button_Elevator.uasset differ diff --git a/Content/Meshes/Interior/GP2/MOP/Elevator/SM_Elevator.uasset b/Content/Meshes/Interior/GP2/MOP/Elevator/SM_Elevator.uasset index 2a97fa6ab..e7d35f27d 100644 Binary files a/Content/Meshes/Interior/GP2/MOP/Elevator/SM_Elevator.uasset and b/Content/Meshes/Interior/GP2/MOP/Elevator/SM_Elevator.uasset differ diff --git a/Content/Meshes/MAF/SM_Chair_002_B.uasset b/Content/Meshes/MAF/SM_Chair_002_B.uasset index f26191e14..1821d435c 100644 Binary files a/Content/Meshes/MAF/SM_Chair_002_B.uasset and b/Content/Meshes/MAF/SM_Chair_002_B.uasset differ diff --git a/Content/Meshes/MAF/SM_StreetLamp600cm.uasset b/Content/Meshes/MAF/SM_StreetLamp600cm.uasset index d8bc59c05..50de2d8e3 100644 Binary files a/Content/Meshes/MAF/SM_StreetLamp600cm.uasset and b/Content/Meshes/MAF/SM_StreetLamp600cm.uasset differ diff --git a/Content/Meshes/MAF/SM_Table_1.uasset b/Content/Meshes/MAF/SM_Table_1.uasset index 287e99f62..5c881947c 100644 Binary files a/Content/Meshes/MAF/SM_Table_1.uasset and b/Content/Meshes/MAF/SM_Table_1.uasset differ diff --git a/Content/Meshes/MAF/SM_TrashCan/SM_TrashCan.uasset b/Content/Meshes/MAF/SM_TrashCan/SM_TrashCan.uasset index 1eaf2b662..3463f04a8 100644 Binary files a/Content/Meshes/MAF/SM_TrashCan/SM_TrashCan.uasset and b/Content/Meshes/MAF/SM_TrashCan/SM_TrashCan.uasset differ diff --git a/Content/Sequence/shots.uasset b/Content/Sequence/shots.uasset index 8751728de..1a9891349 100644 Binary files a/Content/Sequence/shots.uasset and b/Content/Sequence/shots.uasset differ diff --git a/Content/Textures/T_LiftInfo_Mask.uasset b/Content/Textures/T_LiftInfo_Mask.uasset new file mode 100644 index 000000000..04eec5775 Binary files /dev/null and b/Content/Textures/T_LiftInfo_Mask.uasset differ diff --git a/Content/script/SendMesage.py b/Content/script/SendMesage.py index 073f66959..88f294b86 100644 --- a/Content/script/SendMesage.py +++ b/Content/script/SendMesage.py @@ -22,9 +22,9 @@ else: sys.exit() def send_email(addr_to, msg_subj, msg_text, files): - addr_from = "print@enco72.ru" # Отправитель + addr_from = "info@masharov-kvartal.ru" # Отправитель #addr_from = sys.argv[1] - password = "jhPN