diff --git a/Config/1DefaultDeviceProfiles.ini b/Config/DefaultDeviceProfiles1.ini similarity index 100% rename from Config/1DefaultDeviceProfiles.ini rename to Config/DefaultDeviceProfiles1.ini diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 4f4909fa..40608d4f 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -76,6 +76,7 @@ r.Shadow.UnbuiltPreviewInGame=False r.RayTracing.UseTextureLod=True r.SupportStationarySkylight=False r.SupportLowQualityLightmaps=False +r.DefaultFeature.AntiAliasing=1 [/Script/Engine.CollisionProfile] -Profiles=(Name="NoCollision",CollisionEnabled=NoCollision,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="No collision",bCanModify=False) diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 71300455..c9dfe0b8 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -7,7 +7,7 @@ ProjectID=F58CF58249FB6CF654B46CA3DB0FE64D Build=IfProjectHasCode BuildConfiguration=PPBC_Development BuildTarget= -StagingDirectory=(Path="D:/shared/Builds/fortis_unstable_67") +StagingDirectory=(Path="E:/tempBuilds/fortis") FullRebuild=False ForDistribution=False IncludeDebugFiles=False @@ -74,4 +74,5 @@ bSkipMovies=False +IniKeyBlacklist=IniSectionBlacklist +DirectoriesToAlwaysStageAsUFS=(Path="Script") +DirectoriesToAlwaysStageAsNonUFS=(Path="Script") ++DirectoriesToAlwaysStageAsNonUFS=(Path="Txt") diff --git a/Content/Blueprints/Building/BP_BuildingsManager.uasset b/Content/Blueprints/Building/BP_BuildingsManager.uasset index 052bade9..62809558 100644 Binary files a/Content/Blueprints/Building/BP_BuildingsManager.uasset and b/Content/Blueprints/Building/BP_BuildingsManager.uasset differ diff --git a/Content/Blueprints/Data/freestyleTags1.uasset b/Content/Blueprints/Data/freestyleTags1.uasset new file mode 100644 index 00000000..99fde358 Binary files /dev/null and b/Content/Blueprints/Data/freestyleTags1.uasset differ diff --git a/Content/Blueprints/Data/freestyleTags2.uasset b/Content/Blueprints/Data/freestyleTags2.uasset new file mode 100644 index 00000000..fa4a05c2 Binary files /dev/null and b/Content/Blueprints/Data/freestyleTags2.uasset differ diff --git a/Content/Blueprints/Data/freestyleTags3.uasset b/Content/Blueprints/Data/freestyleTags3.uasset new file mode 100644 index 00000000..d4b99ca3 Binary files /dev/null and b/Content/Blueprints/Data/freestyleTags3.uasset differ diff --git a/Content/Blueprints/Data/otradaTags.uasset b/Content/Blueprints/Data/otradaTags.uasset new file mode 100644 index 00000000..56252063 Binary files /dev/null and b/Content/Blueprints/Data/otradaTags.uasset differ diff --git a/Content/Blueprints/Data/takticsTags.uasset b/Content/Blueprints/Data/takticsTags.uasset new file mode 100644 index 00000000..6dba4fb0 Binary files /dev/null and b/Content/Blueprints/Data/takticsTags.uasset differ diff --git a/Content/Blueprints/Data/traditioTags.uasset b/Content/Blueprints/Data/traditioTags.uasset new file mode 100644 index 00000000..8d3950df Binary files /dev/null and b/Content/Blueprints/Data/traditioTags.uasset differ diff --git a/Content/Blueprints/Environment/BP_Elevator.uasset b/Content/Blueprints/Environment/BP_Elevator.uasset index 966f8bf4..2544de52 100644 Binary files a/Content/Blueprints/Environment/BP_Elevator.uasset and b/Content/Blueprints/Environment/BP_Elevator.uasset differ diff --git a/Content/Blueprints/Environment/BP_SplineMovement.uasset b/Content/Blueprints/Environment/BP_SplineMovement.uasset index 32b25f55..938addd8 100644 Binary files a/Content/Blueprints/Environment/BP_SplineMovement.uasset and b/Content/Blueprints/Environment/BP_SplineMovement.uasset differ diff --git a/Content/Blueprints/Managers/BP_Controller.uasset b/Content/Blueprints/Managers/BP_Controller.uasset index 6c26d3a0..3c651f53 100644 Binary files a/Content/Blueprints/Managers/BP_Controller.uasset and b/Content/Blueprints/Managers/BP_Controller.uasset differ diff --git a/Content/Blueprints/Managers/BP_GameInstance.uasset b/Content/Blueprints/Managers/BP_GameInstance.uasset index 6491c6bf..91adeca4 100644 Binary files a/Content/Blueprints/Managers/BP_GameInstance.uasset and b/Content/Blueprints/Managers/BP_GameInstance.uasset differ diff --git a/Content/Blueprints/Points/BP_Point.uasset b/Content/Blueprints/Points/BP_Point.uasset index 27d24b5e..c72782ab 100644 Binary files a/Content/Blueprints/Points/BP_Point.uasset and b/Content/Blueprints/Points/BP_Point.uasset differ diff --git a/Content/Blueprints/Startup/BP_ControllerStartupLevel.uasset b/Content/Blueprints/Startup/BP_ControllerStartupLevel.uasset index e12ed0a0..fd089c28 100644 Binary files a/Content/Blueprints/Startup/BP_ControllerStartupLevel.uasset and b/Content/Blueprints/Startup/BP_ControllerStartupLevel.uasset differ diff --git a/Content/Blueprints/Structures/Struct_Flat.uasset b/Content/Blueprints/Structures/Struct_Flat.uasset index f0b2771f..2cf71729 100644 Binary files a/Content/Blueprints/Structures/Struct_Flat.uasset and b/Content/Blueprints/Structures/Struct_Flat.uasset differ diff --git a/Content/Blueprints/Structures/Struct_RenderPathFlatID.uasset b/Content/Blueprints/Structures/Struct_RenderPathFlatID.uasset index 09c27151..6b741373 100644 Binary files a/Content/Blueprints/Structures/Struct_RenderPathFlatID.uasset and b/Content/Blueprints/Structures/Struct_RenderPathFlatID.uasset differ diff --git a/Content/Blueprints/Structures/struct_tags.uasset b/Content/Blueprints/Structures/struct_tags.uasset new file mode 100644 index 00000000..bfef09d3 Binary files /dev/null and b/Content/Blueprints/Structures/struct_tags.uasset differ diff --git a/Content/Blueprints/Utils/BP_WidgetRender.uasset b/Content/Blueprints/Utils/BP_WidgetRender.uasset index d1967a65..2f8ab72e 100644 Binary files a/Content/Blueprints/Utils/BP_WidgetRender.uasset and b/Content/Blueprints/Utils/BP_WidgetRender.uasset differ diff --git a/Content/Core/Data/LevelsRC/DT_LevelsRC.uasset b/Content/Core/Data/LevelsRC/DT_LevelsRC.uasset index e1fab89d..eb9e9a5d 100644 Binary files a/Content/Core/Data/LevelsRC/DT_LevelsRC.uasset and b/Content/Core/Data/LevelsRC/DT_LevelsRC.uasset differ diff --git a/Content/Freestyle/Maps/Interiors/S01/Interior_S01_F01.umap b/Content/Freestyle/Maps/Interiors/S01/Interior_S01_F01.umap index bd4b03b6..1909f59e 100644 Binary files a/Content/Freestyle/Maps/Interiors/S01/Interior_S01_F01.umap and b/Content/Freestyle/Maps/Interiors/S01/Interior_S01_F01.umap differ diff --git a/Content/HUD/Templates/UW_BaseWidget.uasset b/Content/HUD/Templates/UW_BaseWidget.uasset index e85e9cfd..fd287383 100644 Binary files a/Content/HUD/Templates/UW_BaseWidget.uasset and b/Content/HUD/Templates/UW_BaseWidget.uasset differ diff --git a/Content/HUD/Templates/UW_TemplateButton.uasset b/Content/HUD/Templates/UW_TemplateButton.uasset index 69977f4d..37f78a27 100644 Binary files a/Content/HUD/Templates/UW_TemplateButton.uasset and b/Content/HUD/Templates/UW_TemplateButton.uasset differ diff --git a/Content/HUD/Templates/tagList.uasset b/Content/HUD/Templates/tagList.uasset new file mode 100644 index 00000000..ab940d0a Binary files /dev/null and b/Content/HUD/Templates/tagList.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/freestyle/default.uasset b/Content/HUD/Textures/Buttons/checkbox/freestyle/default.uasset new file mode 100644 index 00000000..98b3e39f Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/freestyle/default.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/freestyle/disabled.uasset b/Content/HUD/Textures/Buttons/checkbox/freestyle/disabled.uasset new file mode 100644 index 00000000..82937514 Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/freestyle/disabled.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/freestyle/hovered.uasset b/Content/HUD/Textures/Buttons/checkbox/freestyle/hovered.uasset new file mode 100644 index 00000000..e611075a Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/freestyle/hovered.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/freestyle/selected.uasset b/Content/HUD/Textures/Buttons/checkbox/freestyle/selected.uasset new file mode 100644 index 00000000..7bd8815b Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/freestyle/selected.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/stories/default.uasset b/Content/HUD/Textures/Buttons/checkbox/stories/default.uasset new file mode 100644 index 00000000..bab98bc4 Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/stories/default.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/stories/disabled.uasset b/Content/HUD/Textures/Buttons/checkbox/stories/disabled.uasset new file mode 100644 index 00000000..108c01bb Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/stories/disabled.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/stories/hovered.uasset b/Content/HUD/Textures/Buttons/checkbox/stories/hovered.uasset new file mode 100644 index 00000000..7c325e5c Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/stories/hovered.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/stories/selected.uasset b/Content/HUD/Textures/Buttons/checkbox/stories/selected.uasset new file mode 100644 index 00000000..6606d505 Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/stories/selected.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/taktika/default.uasset b/Content/HUD/Textures/Buttons/checkbox/taktika/default.uasset new file mode 100644 index 00000000..5cda621e Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/taktika/default.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/taktika/disabled.uasset b/Content/HUD/Textures/Buttons/checkbox/taktika/disabled.uasset new file mode 100644 index 00000000..d2f34cf7 Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/taktika/disabled.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/taktika/hovered.uasset b/Content/HUD/Textures/Buttons/checkbox/taktika/hovered.uasset new file mode 100644 index 00000000..af297010 Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/taktika/hovered.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/taktika/selected.uasset b/Content/HUD/Textures/Buttons/checkbox/taktika/selected.uasset new file mode 100644 index 00000000..f3d94e3b Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/taktika/selected.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/traditio/default.uasset b/Content/HUD/Textures/Buttons/checkbox/traditio/default.uasset new file mode 100644 index 00000000..3b55dbbb Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/traditio/default.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/traditio/disabled.uasset b/Content/HUD/Textures/Buttons/checkbox/traditio/disabled.uasset new file mode 100644 index 00000000..52c352b5 Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/traditio/disabled.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/traditio/hovered.uasset b/Content/HUD/Textures/Buttons/checkbox/traditio/hovered.uasset new file mode 100644 index 00000000..fbe32bcd Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/traditio/hovered.uasset differ diff --git a/Content/HUD/Textures/Buttons/checkbox/traditio/selected.uasset b/Content/HUD/Textures/Buttons/checkbox/traditio/selected.uasset new file mode 100644 index 00000000..be15718d Binary files /dev/null and b/Content/HUD/Textures/Buttons/checkbox/traditio/selected.uasset differ diff --git a/Content/HUD/Widgets/UW_ButtonPoint.uasset b/Content/HUD/Widgets/UW_ButtonPoint.uasset index 1d023292..e5793425 100644 Binary files a/Content/HUD/Widgets/UW_ButtonPoint.uasset and b/Content/HUD/Widgets/UW_ButtonPoint.uasset differ diff --git a/Content/HUD/Widgets/UW_ElevatorVR.uasset b/Content/HUD/Widgets/UW_ElevatorVR.uasset index 68b43c07..a589fd00 100644 Binary files a/Content/HUD/Widgets/UW_ElevatorVR.uasset and b/Content/HUD/Widgets/UW_ElevatorVR.uasset differ diff --git a/Content/HUD/Widgets/UW_FavoriteUnitVR.uasset b/Content/HUD/Widgets/UW_FavoriteUnitVR.uasset index b42dd558..7c6dad8e 100644 Binary files a/Content/HUD/Widgets/UW_FavoriteUnitVR.uasset and b/Content/HUD/Widgets/UW_FavoriteUnitVR.uasset differ diff --git a/Content/HUD/Widgets/UW_FilterFlatCard.uasset b/Content/HUD/Widgets/UW_FilterFlatCard.uasset index 080b8567..e76c039b 100644 Binary files a/Content/HUD/Widgets/UW_FilterFlatCard.uasset and b/Content/HUD/Widgets/UW_FilterFlatCard.uasset differ diff --git a/Content/HUD/Widgets/UW_FilterFlatField.uasset b/Content/HUD/Widgets/UW_FilterFlatField.uasset index 0215bc3d..401fef02 100644 Binary files a/Content/HUD/Widgets/UW_FilterFlatField.uasset and b/Content/HUD/Widgets/UW_FilterFlatField.uasset differ diff --git a/Content/HUD/Widgets/UW_FilterFlatPanel.uasset b/Content/HUD/Widgets/UW_FilterFlatPanel.uasset index e0f19de8..1796155e 100644 Binary files a/Content/HUD/Widgets/UW_FilterFlatPanel.uasset and b/Content/HUD/Widgets/UW_FilterFlatPanel.uasset differ diff --git a/Content/HUD/Widgets/UW_FlatCardAdvanced.uasset b/Content/HUD/Widgets/UW_FlatCardAdvanced.uasset index 5f824cdb..be438350 100644 Binary files a/Content/HUD/Widgets/UW_FlatCardAdvanced.uasset and b/Content/HUD/Widgets/UW_FlatCardAdvanced.uasset differ diff --git a/Content/HUD/Widgets/UW_FlatCardVR.uasset b/Content/HUD/Widgets/UW_FlatCardVR.uasset index 283cf99f..9a408986 100644 Binary files a/Content/HUD/Widgets/UW_FlatCardVR.uasset and b/Content/HUD/Widgets/UW_FlatCardVR.uasset differ diff --git a/Content/HUD/Widgets/UW_Keyboard.uasset b/Content/HUD/Widgets/UW_Keyboard.uasset index a35fc6a5..f2e9ce7f 100644 Binary files a/Content/HUD/Widgets/UW_Keyboard.uasset and b/Content/HUD/Widgets/UW_Keyboard.uasset differ diff --git a/Content/HUD/Widgets/UW_LoginGeneral.uasset b/Content/HUD/Widgets/UW_LoginGeneral.uasset index 34844e4e..6fadc275 100644 Binary files a/Content/HUD/Widgets/UW_LoginGeneral.uasset and b/Content/HUD/Widgets/UW_LoginGeneral.uasset differ diff --git a/Content/HUD/Widgets/UW_LoginPage.uasset b/Content/HUD/Widgets/UW_LoginPage.uasset index 2307fe6d..a717f74c 100644 Binary files a/Content/HUD/Widgets/UW_LoginPage.uasset and b/Content/HUD/Widgets/UW_LoginPage.uasset differ diff --git a/Content/HUD/Widgets/UW_Main.uasset b/Content/HUD/Widgets/UW_Main.uasset index f09adeae..f20394f8 100644 Binary files a/Content/HUD/Widgets/UW_Main.uasset and b/Content/HUD/Widgets/UW_Main.uasset differ diff --git a/Content/HUD/Widgets/UW_MainVR.uasset b/Content/HUD/Widgets/UW_MainVR.uasset index 2c1f78cb..52b1e1a4 100644 Binary files a/Content/HUD/Widgets/UW_MainVR.uasset and b/Content/HUD/Widgets/UW_MainVR.uasset differ diff --git a/Content/HUD/Widgets/UW_MainWindowVR.uasset b/Content/HUD/Widgets/UW_MainWindowVR.uasset index 66d69dc6..69efe439 100644 Binary files a/Content/HUD/Widgets/UW_MainWindowVR.uasset and b/Content/HUD/Widgets/UW_MainWindowVR.uasset differ diff --git a/Content/HUD/Widgets/UW_MenuFlat.uasset b/Content/HUD/Widgets/UW_MenuFlat.uasset index 7252cf8f..a6c896a2 100644 Binary files a/Content/HUD/Widgets/UW_MenuFlat.uasset and b/Content/HUD/Widgets/UW_MenuFlat.uasset differ diff --git a/Content/HUD/Widgets/UW_Offer.uasset b/Content/HUD/Widgets/UW_Offer.uasset index f27cabe5..2bd8117b 100644 Binary files a/Content/HUD/Widgets/UW_Offer.uasset and b/Content/HUD/Widgets/UW_Offer.uasset differ diff --git a/Content/HUD/Widgets/UW_OfferScale.uasset b/Content/HUD/Widgets/UW_OfferScale.uasset index a1f3e62f..ac343286 100644 Binary files a/Content/HUD/Widgets/UW_OfferScale.uasset and b/Content/HUD/Widgets/UW_OfferScale.uasset differ diff --git a/Content/HUD/Widgets/UW_RCSelection.uasset b/Content/HUD/Widgets/UW_RCSelection.uasset index f0835ae2..9a3d1762 100644 Binary files a/Content/HUD/Widgets/UW_RCSelection.uasset and b/Content/HUD/Widgets/UW_RCSelection.uasset differ diff --git a/Content/HUD/Widgets/UW_SendOrPrint.uasset b/Content/HUD/Widgets/UW_SendOrPrint.uasset index 3de53e27..078254aa 100644 Binary files a/Content/HUD/Widgets/UW_SendOrPrint.uasset and b/Content/HUD/Widgets/UW_SendOrPrint.uasset differ diff --git a/Content/Maps/L_Startup.umap b/Content/Maps/L_Startup.umap index ea1ced40..fd80bc02 100644 Binary files a/Content/Maps/L_Startup.umap and b/Content/Maps/L_Startup.umap differ diff --git a/Content/Otrada/Maps/Interior_Levels/A_11/A11_F23-25.umap b/Content/Otrada/Maps/Interior_Levels/A_11/A11_F23-25.umap index 3b08fa05..8ad5591d 100644 Binary files a/Content/Otrada/Maps/Interior_Levels/A_11/A11_F23-25.umap and b/Content/Otrada/Maps/Interior_Levels/A_11/A11_F23-25.umap differ diff --git a/Content/Otrada/Maps/Interior_Levels/A_11/A11_F23-25_Reflection.umap b/Content/Otrada/Maps/Interior_Levels/A_11/A11_F23-25_Reflection.umap index 17ea41b9..f78553d6 100644 Binary files a/Content/Otrada/Maps/Interior_Levels/A_11/A11_F23-25_Reflection.umap and b/Content/Otrada/Maps/Interior_Levels/A_11/A11_F23-25_Reflection.umap differ diff --git a/Content/Otrada/Maps/Interior_Levels/A_12/A12_F24-26.umap b/Content/Otrada/Maps/Interior_Levels/A_12/A12_F24-26.umap index 28ee3faa..adef24f7 100644 Binary files a/Content/Otrada/Maps/Interior_Levels/A_12/A12_F24-26.umap and b/Content/Otrada/Maps/Interior_Levels/A_12/A12_F24-26.umap differ diff --git a/Content/Otrada/Maps/L_Developer_Otrada.umap b/Content/Otrada/Maps/L_Developer_Otrada.umap index 59da4da6..275e48aa 100644 Binary files a/Content/Otrada/Maps/L_Developer_Otrada.umap and b/Content/Otrada/Maps/L_Developer_Otrada.umap differ diff --git a/Script/Python/DownloadWebPage.py b/Content/Script/Python/DownloadWebPage.py similarity index 100% rename from Script/Python/DownloadWebPage.py rename to Content/Script/Python/DownloadWebPage.py diff --git a/Script/Python/SendMesage.py b/Content/Script/Python/SendMesage.py similarity index 88% rename from Script/Python/SendMesage.py rename to Content/Script/Python/SendMesage.py index 4c71966d..46d4a402 100644 --- a/Script/Python/SendMesage.py +++ b/Content/Script/Python/SendMesage.py @@ -10,37 +10,36 @@ from email.mime.image import MIMEImage # Изображен from email.mime.audio import MIMEAudio # Аудио from email.mime.multipart import MIMEMultipart # Многокомпонентный объект import sys # для чтения аргументов - -ArgvAmount = 9 #импорт аргументов -if len(sys.argv) == ArgvAmount: +if len(sys.argv)==5: addr_to = sys.argv[1] filefold = sys.argv[2] - addr_from = sys.argv[3] - password = sys.argv[4] - smtp_address = sys.argv[5] - smtp_port = int(sys.argv[6]) - message_header = sys.argv[7] - message_description = sys.argv[8] - + msgText = sys.argv[3] + msgTheme = sys.argv[4] + print(addr_to) + print(filefold) else: sys.exit() -def send_email(addr_to, msg_subj, msg_text, files): # Пароль / now from argv +def send_email(addr_to, msg_subj, msg_text, files): + addr_from = "reception@fortisgroup.ru" # Отправитель + #addr_from = sys.argv[1] + password = "123432Reception" # Пароль msg = MIMEMultipart() # Создаем сообщение msg['From'] = addr_from # Адресат msg['To'] = addr_to # Получатель msg['Subject'] = msg_subj # Тема сообщения + body = msg_text # Текст сообщения - msg.attach(MIMEText(body, 'plain')) # Добавляем в сообщение текст + msg.attach(MIMEText(body, 'html')) # Добавляем в сообщение текст process_attachement(msg, files) #======== Этот блок настраивается для каждого почтового провайдера отдельно =============================================== - server = smtplib.SMTP_SSL(smtp_address, smtp_port) - #server.ehlo(addr_from) - server.set_debuglevel(1) + server = smtplib.SMTP_SSL('Mail.nic.ru',465) # Создаем объект SMTP + server.ehlo() + #server.set_debuglevel(1) #server.starttls() # Начинаем шифрованный обмен по TLS server.login(addr_from, password) # Получаем доступ @@ -89,11 +88,10 @@ def attach_file(msg, filepath): # Функция п -# Использование функции send_email() -#addr_to = "andronchik92@gmail.com" # Получатель +# Использование функции send_email # Получатель files = [] files = [filefold] # Список файлов, если вложений нет, то files=[] # Если нужно отправить все файлы из заданной папки, нужно указать её print("here i send mail") -send_email(addr_to, message_header, message_description, files) \ No newline at end of file +send_email(addr_to, msgTheme, msgText, files) diff --git a/Content/Tradicio/Maps/L_DeveloperTradition.umap b/Content/Tradicio/Maps/L_DeveloperTradition.umap index a2569ddb..ef4ce46e 100644 Binary files a/Content/Tradicio/Maps/L_DeveloperTradition.umap and b/Content/Tradicio/Maps/L_DeveloperTradition.umap differ diff --git a/Content/Tradicio/Maps/Tradicio_MainScene.umap b/Content/Tradicio/Maps/Tradicio_MainScene.umap index b280ea89..35bfeef0 100644 Binary files a/Content/Tradicio/Maps/Tradicio_MainScene.umap and b/Content/Tradicio/Maps/Tradicio_MainScene.umap differ diff --git a/Content/Txt/managers.txt b/Content/Txt/managers.txt new file mode 100644 index 00000000..186e0fde --- /dev/null +++ b/Content/Txt/managers.txt @@ -0,0 +1,6 @@ +Кагарманова Анна - kagarmanova.av@fortisgroup.ru +Ленская Елена - lenskaya.es@fortisgroup.ru +Шахоткин Владимир - shahotkin.vu@fortisgroup.ru +Кулешова Марина - Kuleshova.mv@fortisgroup.ru +Тумашов Илья Викторович - tumashov.iv@fortisgroup.ru +Test user - andronchik92@gmail.com \ No newline at end of file diff --git a/Content/VRTemplate/Blueprints/BP_PawnVR.uasset b/Content/VRTemplate/Blueprints/BP_PawnVR.uasset index 5e1d655a..106ba7ab 100644 Binary files a/Content/VRTemplate/Blueprints/BP_PawnVR.uasset and b/Content/VRTemplate/Blueprints/BP_PawnVR.uasset differ