diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index ffc2dd52..5cc14616 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -170,7 +170,7 @@ AgentRadius=15.000000 r.DiffuseFromCaptures=1 [/Script/WindowsTargetPlatform.WindowsTargetSettings] -DefaultGraphicsRHI=DefaultGraphicsRHI_DX11 +DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 [/Script/Engine.UserInterfaceSettings] UIScaleCurve=(EditorCurveData=(Keys=((Time=480.000000,Value=0.444000),(Time=720.000000,Value=0.666000),(Time=1080.000000,Value=1.000000),(Time=8640.000000,Value=8.000000)),DefaultValue=340282346638528859811704183484516925440.000000,PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant),ExternalCurve=CurveFloat'"/Game/Blueprints/UI/Others/4kDpi.4kDpi"') diff --git a/Content/Blueprints/Bps.uasset b/Content/Blueprints/Bps.uasset index 7a060676..81dd08de 100644 Binary files a/Content/Blueprints/Bps.uasset and b/Content/Blueprints/Bps.uasset differ diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index 8ed51c83..d5f583b2 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset index 728764d8..a6b1d2dc 100644 Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ diff --git a/Content/Blueprints/Player/VR/VRPawn.uasset b/Content/Blueprints/Player/VR/VRPawn.uasset index 05dcd24b..608663c5 100644 Binary files a/Content/Blueprints/Player/VR/VRPawn.uasset and b/Content/Blueprints/Player/VR/VRPawn.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset index ea5b80c4..58fb4d5a 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/Utils/Sky/dirt_bike_track_01_4k.uasset b/Content/Blueprints/Utils/Sky/dirt_bike_track_01_4k.uasset index 2feb5006..1ade24d7 100644 Binary files a/Content/Blueprints/Utils/Sky/dirt_bike_track_01_4k.uasset and b/Content/Blueprints/Utils/Sky/dirt_bike_track_01_4k.uasset differ diff --git a/Content/Blueprints/Utils/Sky/dirt_bike_track_01_4k_re.uasset b/Content/Blueprints/Utils/Sky/dirt_bike_track_01_4k_re.uasset new file mode 100644 index 00000000..9af37064 Binary files /dev/null and b/Content/Blueprints/Utils/Sky/dirt_bike_track_01_4k_re.uasset differ diff --git a/Content/Maps/DayLight.umap b/Content/Maps/DayLight.umap index 5a73bb2f..118fa292 100644 Binary files a/Content/Maps/DayLight.umap and b/Content/Maps/DayLight.umap differ diff --git a/Content/Maps/Landscape_textures.umap b/Content/Maps/Landscape_textures.umap index 66b92872..33d968d2 100644 Binary files a/Content/Maps/Landscape_textures.umap and b/Content/Maps/Landscape_textures.umap differ diff --git a/Content/Maps/MainScene.umap b/Content/Maps/MainScene.umap index 5002de08..253086b3 100644 Binary files a/Content/Maps/MainScene.umap and b/Content/Maps/MainScene.umap differ diff --git a/Content/Maps/NightLight.umap b/Content/Maps/NightLight.umap index c8a55039..bf4fa9d6 100644 Binary files a/Content/Maps/NightLight.umap and b/Content/Maps/NightLight.umap differ diff --git a/Content/Mavis/Meshes/Exterior/LandscapeTextured/M_Trans1_Inst.uasset b/Content/Mavis/Meshes/Exterior/LandscapeTextured/M_Trans1_Inst.uasset index d7395c05..75c20437 100644 Binary files a/Content/Mavis/Meshes/Exterior/LandscapeTextured/M_Trans1_Inst.uasset and b/Content/Mavis/Meshes/Exterior/LandscapeTextured/M_Trans1_Inst.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/LandscapeTextured/overlay.uasset b/Content/Mavis/Meshes/Exterior/LandscapeTextured/overlay.uasset index a9ce6289..7ca74d6b 100644 Binary files a/Content/Mavis/Meshes/Exterior/LandscapeTextured/overlay.uasset and b/Content/Mavis/Meshes/Exterior/LandscapeTextured/overlay.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/LandscapeTextured/overlay2.uasset b/Content/Mavis/Meshes/Exterior/LandscapeTextured/overlay2.uasset index f5891673..1ad6aa8a 100644 Binary files a/Content/Mavis/Meshes/Exterior/LandscapeTextured/overlay2.uasset and b/Content/Mavis/Meshes/Exterior/LandscapeTextured/overlay2.uasset differ diff --git a/Content/NatureAssets/Trees/Beech/Materials/MI_beerchbillboard_01.uasset b/Content/NatureAssets/Trees/Beech/Materials/MI_beerchbillboard_01.uasset index e41b6c86..0ffe048c 100644 Binary files a/Content/NatureAssets/Trees/Beech/Materials/MI_beerchbillboard_01.uasset and b/Content/NatureAssets/Trees/Beech/Materials/MI_beerchbillboard_01.uasset differ diff --git a/Content/NatureAssets/Trees/Beech/st_meshes/LOD_T_3.uasset b/Content/NatureAssets/Trees/Beech/st_meshes/LOD_T_3.uasset index 7c430b29..31dcbe0a 100644 Binary files a/Content/NatureAssets/Trees/Beech/st_meshes/LOD_T_3.uasset and b/Content/NatureAssets/Trees/Beech/st_meshes/LOD_T_3.uasset differ diff --git a/Content/NatureAssets/Trees/MasterMaterials/M_FoliageBillBoard.uasset b/Content/NatureAssets/Trees/MasterMaterials/M_FoliageBillBoard.uasset index 2f335114..6e339a33 100644 Binary files a/Content/NatureAssets/Trees/MasterMaterials/M_FoliageBillBoard.uasset and b/Content/NatureAssets/Trees/MasterMaterials/M_FoliageBillBoard.uasset differ diff --git a/Content/imageConverter/costyl.vbs b/Content/imageConverter/costyl.vbs index 6add0b85..4b92bf89 100644 --- a/Content/imageConverter/costyl.vbs +++ b/Content/imageConverter/costyl.vbs @@ -3,5 +3,5 @@ if wscript.arguments.count<>6 then wscript.quit set sh = createobject("wscript.shell") set fs = createobject("scripting.filesystemobject") dir=fs.getparentfoldername(wscript.scriptfullname) -sh.run """"&dir&"\doWork.bat"&""" """&wscript.arguments(0)&""" """&wscript.arguments(1)&""" """&wscript.arguments(2)&""" """&wscript.arguments(3)&""" """&wscript.arguments(4)&""" """&wscript.arguments(5)&"""",0 +sh.run """"&dir&"\doWork.bat"&""" """&wscript.arguments(0)&""" """&wscript.arguments(1)&""" """&wscript.arguments(2)&""" """&wscript.arguments(3)&""" """&wscript.arguments(4)&""" """&wscript.arguments(5)&"""" rem &wscript.arguments(0) \ No newline at end of file diff --git a/Content/imageConverter/doWork.bat b/Content/imageConverter/doWork.bat index 61b30390..d6a66d3a 100644 --- a/Content/imageConverter/doWork.bat +++ b/Content/imageConverter/doWork.bat @@ -7,17 +7,18 @@ set defpath=%1 set shotpath=%2 set kppath=%3 set netpath=%4 -set mgrPath=%cd%\mogrify.exe +set mgrPath="%cd%\mogrify.exe" set defvidpath=%5 set vidpath=%6 -rem convert screenshots to jpg -cd /d %shotpath% -%mgrPath% -resize x1080 -quality 80 -format jpg *photo_?.png - rem convert kp to jpg -cd %kppath% +cd /d %kppath% %mgrPath% -format jpg *.png + +rem convert screenshots to jpg +cd %shotpath% +%mgrPath% -adaptive-resize 1920 -quality 80 *photo_?.jpg + del *.png rem move video to client folder @@ -25,4 +26,4 @@ robocopy %vidpath% %defvidpath% /mov rem copy all data to network robocopy %defpath% %netpath% /mir - +pause \ No newline at end of file diff --git a/changeLog.txt b/changeLog.txt index 03925812..602f884b 100644 --- a/changeLog.txt +++ b/changeLog.txt @@ -27,3 +27,11 @@ v1.0 добавлено: -интеграция с CRM для чтения и добавления клиентов и лидов -сохранение данных(скриншоты, КП по избранным, информация по сеансу) локально и на другую машину в локальной сети, адрес удаленной папки прописывается в файле \piterGraphicsC\Saved\netLocation + +v1.1 +добавлено: +-изменения в сохранении данных, добавлено отдельное сохранение изображений для кп + +v1.12 +изменено: +-расширение окружения, отредактирована hdri, исправление багов \ No newline at end of file