diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index 48c84d53..f3f9d89e 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/Player/MathAndConvertFns.uasset b/Content/Blueprints/Player/MathAndConvertFns.uasset index 46c77fbe..eb442aa1 100644 Binary files a/Content/Blueprints/Player/MathAndConvertFns.uasset and b/Content/Blueprints/Player/MathAndConvertFns.uasset differ diff --git a/Content/Blueprints/Player/MyGM.uasset b/Content/Blueprints/Player/MyGM.uasset index 8190d9b8..7d6643fa 100644 Binary files a/Content/Blueprints/Player/MyGM.uasset and b/Content/Blueprints/Player/MyGM.uasset differ diff --git a/Content/Blueprints/Player/MyPC.uasset b/Content/Blueprints/Player/MyPC.uasset index f800b6b3..9a40e421 100644 Binary files a/Content/Blueprints/Player/MyPC.uasset and b/Content/Blueprints/Player/MyPC.uasset differ diff --git a/Content/Blueprints/Player/WalkingPawn.uasset b/Content/Blueprints/Player/WalkingPawn.uasset index 305b9dd1..aa7e9767 100644 Binary files a/Content/Blueprints/Player/WalkingPawn.uasset and b/Content/Blueprints/Player/WalkingPawn.uasset differ diff --git a/Content/Blueprints/Player/getFunctions.uasset b/Content/Blueprints/Player/getFunctions.uasset index 93af4903..1e9f5bb3 100644 Binary files a/Content/Blueprints/Player/getFunctions.uasset and b/Content/Blueprints/Player/getFunctions.uasset differ diff --git a/Content/Blueprints/Player/infoHud.uasset b/Content/Blueprints/Player/infoHud.uasset index 8dfdd541..1d130bf0 100644 Binary files a/Content/Blueprints/Player/infoHud.uasset and b/Content/Blueprints/Player/infoHud.uasset differ diff --git a/Content/Blueprints/UI/Actors/KPmaker.uasset b/Content/Blueprints/UI/Actors/KPmaker.uasset index 172fd2e7..1b55217c 100644 Binary files a/Content/Blueprints/UI/Actors/KPmaker.uasset and b/Content/Blueprints/UI/Actors/KPmaker.uasset differ diff --git a/Content/Blueprints/UI/Actors/StreetNameA.uasset b/Content/Blueprints/UI/Actors/StreetNameA.uasset index 46d67bc1..68a8f3ff 100644 Binary files a/Content/Blueprints/UI/Actors/StreetNameA.uasset and b/Content/Blueprints/UI/Actors/StreetNameA.uasset differ diff --git a/Content/Blueprints/UI/Imgs/bkg_btn_whitel.uasset b/Content/Blueprints/UI/Imgs/bkg_btn_whitel.uasset index 5d0253e8..0faf4f35 100644 Binary files a/Content/Blueprints/UI/Imgs/bkg_btn_whitel.uasset and b/Content/Blueprints/UI/Imgs/bkg_btn_whitel.uasset differ diff --git a/Content/Blueprints/UI/Imgs/hint_logo_4you.uasset b/Content/Blueprints/UI/Imgs/hint_logo_4you.uasset index e46abbf5..f62e65e5 100644 Binary files a/Content/Blueprints/UI/Imgs/hint_logo_4you.uasset and b/Content/Blueprints/UI/Imgs/hint_logo_4you.uasset differ diff --git a/Content/Blueprints/UI/Imgs/hint_vtur.uasset b/Content/Blueprints/UI/Imgs/hint_vtur.uasset index ca1cb62a..fa711ff3 100644 Binary files a/Content/Blueprints/UI/Imgs/hint_vtur.uasset and b/Content/Blueprints/UI/Imgs/hint_vtur.uasset differ diff --git a/Content/Blueprints/UI/Imgs/hint_vtur_icon.uasset b/Content/Blueprints/UI/Imgs/hint_vtur_icon.uasset index dcbf8193..6a000631 100644 Binary files a/Content/Blueprints/UI/Imgs/hint_vtur_icon.uasset and b/Content/Blueprints/UI/Imgs/hint_vtur_icon.uasset differ diff --git a/Content/Blueprints/UI/Imgs/icon_view.uasset b/Content/Blueprints/UI/Imgs/icon_view.uasset index 7e4bb46f..963ca5c9 100644 Binary files a/Content/Blueprints/UI/Imgs/icon_view.uasset and b/Content/Blueprints/UI/Imgs/icon_view.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/2D_Plot_Base.uasset b/Content/Blueprints/UI/Imgs/newInterface/2D_Plot_Base.uasset index 8e4d2a2e..10de0015 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/2D_Plot_Base.uasset and b/Content/Blueprints/UI/Imgs/newInterface/2D_Plot_Base.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/Bye.uasset b/Content/Blueprints/UI/Imgs/newInterface/Bye.uasset index 39ddbb9f..e492c342 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/Bye.uasset and b/Content/Blueprints/UI/Imgs/newInterface/Bye.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/KP_AtlasDevelopment.uasset b/Content/Blueprints/UI/Imgs/newInterface/KP_AtlasDevelopment.uasset index 9cbc51b4..ee820dc1 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/KP_AtlasDevelopment.uasset and b/Content/Blueprints/UI/Imgs/newInterface/KP_AtlasDevelopment.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/KP_AtlasDevelopment1.uasset b/Content/Blueprints/UI/Imgs/newInterface/KP_AtlasDevelopment1.uasset index e826586f..a38578d8 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/KP_AtlasDevelopment1.uasset and b/Content/Blueprints/UI/Imgs/newInterface/KP_AtlasDevelopment1.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/KP_AtlasDevelopment_Base.uasset b/Content/Blueprints/UI/Imgs/newInterface/KP_AtlasDevelopment_Base.uasset index e1f7de34..0dee88f4 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/KP_AtlasDevelopment_Base.uasset and b/Content/Blueprints/UI/Imgs/newInterface/KP_AtlasDevelopment_Base.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/Welcome.uasset b/Content/Blueprints/UI/Imgs/newInterface/Welcome.uasset index c7e508c5..2f9da126 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/Welcome.uasset and b/Content/Blueprints/UI/Imgs/newInterface/Welcome.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/elements/bkg_anketa1.uasset b/Content/Blueprints/UI/Imgs/newInterface/elements/bkg_anketa1.uasset index f6dce17e..a1e11aee 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/elements/bkg_anketa1.uasset and b/Content/Blueprints/UI/Imgs/newInterface/elements/bkg_anketa1.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/elements/bkg_anketa__2_.uasset b/Content/Blueprints/UI/Imgs/newInterface/elements/bkg_anketa__2_.uasset index b80e49ef..d8b1f88a 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/elements/bkg_anketa__2_.uasset and b/Content/Blueprints/UI/Imgs/newInterface/elements/bkg_anketa__2_.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/elements/btn_save.uasset b/Content/Blueprints/UI/Imgs/newInterface/elements/btn_save.uasset index 3abbb984..a82c2c4e 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/elements/btn_save.uasset and b/Content/Blueprints/UI/Imgs/newInterface/elements/btn_save.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/elements/inputbkg.uasset b/Content/Blueprints/UI/Imgs/newInterface/elements/inputbkg.uasset new file mode 100644 index 00000000..838feffe Binary files /dev/null and b/Content/Blueprints/UI/Imgs/newInterface/elements/inputbkg.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/icons/icon_broni_active.uasset b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_broni_active.uasset index 9aa6ab9d..8a0bf169 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/icons/icon_broni_active.uasset and b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_broni_active.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/icons/icon_broni_normal.uasset b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_broni_normal.uasset index 2b32e567..aa5caeea 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/icons/icon_broni_normal.uasset and b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_broni_normal.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/icons/icon_like_active.uasset b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_like_active.uasset index fb249aa9..ee26f7ca 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/icons/icon_like_active.uasset and b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_like_active.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/icons/icon_like_normal.uasset b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_like_normal.uasset index e0e38965..81e13aac 100644 Binary files a/Content/Blueprints/UI/Imgs/newInterface/icons/icon_like_normal.uasset and b/Content/Blueprints/UI/Imgs/newInterface/icons/icon_like_normal.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/22.uasset b/Content/Blueprints/UI/Imgs/shit/22.uasset index 754aeb73..0da89570 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/22.uasset and b/Content/Blueprints/UI/Imgs/shit/22.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/33.uasset b/Content/Blueprints/UI/Imgs/shit/33.uasset index 7c90556c..6f8de25d 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/33.uasset and b/Content/Blueprints/UI/Imgs/shit/33.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/9.uasset b/Content/Blueprints/UI/Imgs/shit/9.uasset index 040fa242..67eb6783 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/9.uasset and b/Content/Blueprints/UI/Imgs/shit/9.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/90.uasset b/Content/Blueprints/UI/Imgs/shit/90.uasset index 52f52cae..3f338f15 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/90.uasset and b/Content/Blueprints/UI/Imgs/shit/90.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/91.uasset b/Content/Blueprints/UI/Imgs/shit/91.uasset index 9029aa66..af29425f 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/91.uasset and b/Content/Blueprints/UI/Imgs/shit/91.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_1.uasset b/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_1.uasset index 0b5d0df9..a8e6e054 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_1.uasset and b/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_1.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_3.uasset b/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_3.uasset index 73af0c03..b900bea0 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_3.uasset and b/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_3.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_4.uasset b/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_4.uasset index 4ec959bf..0dc8102b 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_4.uasset and b/Content/Blueprints/UI/Imgs/shit/Custom_Size-5_–_4.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/Custom_Size3.uasset b/Content/Blueprints/UI/Imgs/shit/Custom_Size3.uasset index fb88fb03..7e746fba 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/Custom_Size3.uasset and b/Content/Blueprints/UI/Imgs/shit/Custom_Size3.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/Custom_Size5.uasset b/Content/Blueprints/UI/Imgs/shit/Custom_Size5.uasset index 779abadb..d4d667da 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/Custom_Size5.uasset and b/Content/Blueprints/UI/Imgs/shit/Custom_Size5.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/Custom_Size7.uasset b/Content/Blueprints/UI/Imgs/shit/Custom_Size7.uasset index 0b497313..c9054858 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/Custom_Size7.uasset and b/Content/Blueprints/UI/Imgs/shit/Custom_Size7.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/Custom_Size8.uasset b/Content/Blueprints/UI/Imgs/shit/Custom_Size8.uasset index b448e996..2595fdec 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/Custom_Size8.uasset and b/Content/Blueprints/UI/Imgs/shit/Custom_Size8.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/Custom_Size89.uasset b/Content/Blueprints/UI/Imgs/shit/Custom_Size89.uasset index 5e7e8cff..c72dd93f 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/Custom_Size89.uasset and b/Content/Blueprints/UI/Imgs/shit/Custom_Size89.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/Custom_Size_–1.uasset b/Content/Blueprints/UI/Imgs/shit/Custom_Size_–1.uasset index 94817658..501e6586 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/Custom_Size_–1.uasset and b/Content/Blueprints/UI/Imgs/shit/Custom_Size_–1.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/Custom_Size_–_14.uasset b/Content/Blueprints/UI/Imgs/shit/Custom_Size_–_14.uasset index 4a0f5359..e0de5107 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/Custom_Size_–_14.uasset and b/Content/Blueprints/UI/Imgs/shit/Custom_Size_–_14.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/Custom_Size_–_2.uasset b/Content/Blueprints/UI/Imgs/shit/Custom_Size_–_2.uasset index f1d1cd7d..00fd66f7 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/Custom_Size_–_2.uasset and b/Content/Blueprints/UI/Imgs/shit/Custom_Size_–_2.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/granysy_plana.uasset b/Content/Blueprints/UI/Imgs/shit/granysy_plana.uasset index 8c0c99eb..4b71a68f 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/granysy_plana.uasset and b/Content/Blueprints/UI/Imgs/shit/granysy_plana.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/like.uasset b/Content/Blueprints/UI/Imgs/shit/like.uasset index 044edb99..7f843490 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/like.uasset and b/Content/Blueprints/UI/Imgs/shit/like.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/photo_2020-11-26_15-19-18.uasset b/Content/Blueprints/UI/Imgs/shit/photo_2020-11-26_15-19-18.uasset index 32640aab..95baa4d5 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/photo_2020-11-26_15-19-18.uasset and b/Content/Blueprints/UI/Imgs/shit/photo_2020-11-26_15-19-18.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/window_info_user__2_.uasset b/Content/Blueprints/UI/Imgs/shit/window_info_user__2_.uasset index 7f2d0afe..151fa788 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/window_info_user__2_.uasset and b/Content/Blueprints/UI/Imgs/shit/window_info_user__2_.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/Эскизный_Альбом2_Страница_32.uasset b/Content/Blueprints/UI/Imgs/shit/Эскизный_Альбом2_Страница_32.uasset index ed855f35..e98eaa8d 100644 Binary files a/Content/Blueprints/UI/Imgs/shit/Эскизный_Альбом2_Страница_32.uasset and b/Content/Blueprints/UI/Imgs/shit/Эскизный_Альбом2_Страница_32.uasset differ diff --git a/Content/Blueprints/UI/Imgs/streetNames/BgStrNight2.uasset b/Content/Blueprints/UI/Imgs/streetNames/BgStrNight2.uasset index 49078eec..7ba65d97 100644 Binary files a/Content/Blueprints/UI/Imgs/streetNames/BgStrNight2.uasset and b/Content/Blueprints/UI/Imgs/streetNames/BgStrNight2.uasset differ diff --git a/Content/Blueprints/UI/Materials/WorldSelection.uasset b/Content/Blueprints/UI/Materials/WorldSelection.uasset index 8299c0e8..88d3735d 100644 Binary files a/Content/Blueprints/UI/Materials/WorldSelection.uasset and b/Content/Blueprints/UI/Materials/WorldSelection.uasset differ diff --git a/Content/Blueprints/UI/Others/clientData.uasset b/Content/Blueprints/UI/Others/clientData.uasset new file mode 100644 index 00000000..6b140d21 Binary files /dev/null and b/Content/Blueprints/UI/Others/clientData.uasset differ diff --git a/Content/Blueprints/UI/WBPS/KPWidget.uasset b/Content/Blueprints/UI/WBPS/KPWidget.uasset index 00d3c73f..9e649e0a 100644 Binary files a/Content/Blueprints/UI/WBPS/KPWidget.uasset and b/Content/Blueprints/UI/WBPS/KPWidget.uasset differ diff --git a/Content/Blueprints/UI/WBPS/LoginPage.uasset b/Content/Blueprints/UI/WBPS/LoginPage.uasset index 94de0615..a84b1c9a 100644 Binary files a/Content/Blueprints/UI/WBPS/LoginPage.uasset and b/Content/Blueprints/UI/WBPS/LoginPage.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset index 3e991f69..4768d5d2 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/welcomeData.uasset b/Content/Blueprints/UI/WBPS/Menu/welcomeData.uasset new file mode 100644 index 00000000..ac944c60 Binary files /dev/null and b/Content/Blueprints/UI/WBPS/Menu/welcomeData.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/welcomeWinManager.uasset b/Content/Blueprints/UI/WBPS/Menu/welcomeWinManager.uasset new file mode 100644 index 00000000..a632ca22 Binary files /dev/null and b/Content/Blueprints/UI/WBPS/Menu/welcomeWinManager.uasset differ diff --git a/Content/Maps/MainScene.umap b/Content/Maps/MainScene.umap index 05495426..361fe651 100644 Binary files a/Content/Maps/MainScene.umap and b/Content/Maps/MainScene.umap differ diff --git a/Source/Onejsky4U/Onejsky4UGameModeBase.cpp b/Source/Onejsky4U/Onejsky4UGameModeBase.cpp index bcf4c140..810ed750 100644 --- a/Source/Onejsky4U/Onejsky4UGameModeBase.cpp +++ b/Source/Onejsky4U/Onejsky4UGameModeBase.cpp @@ -137,3 +137,10 @@ bool AOnejsky4UGameModeBase::logFileExists(FString FileName) //FString FilePath = FPlatformProcess::UserDir() + FileName;; return FPaths::FileExists(FileName); } + +FString AOnejsky4UGameModeBase::readFile(FString FileName) { + FString str; + + FFileHelper::LoadFileToString(str,*FileName); + return str; +} diff --git a/Source/Onejsky4U/Onejsky4UGameModeBase.h b/Source/Onejsky4U/Onejsky4UGameModeBase.h index 18c0bb3b..b348ea21 100644 --- a/Source/Onejsky4U/Onejsky4UGameModeBase.h +++ b/Source/Onejsky4U/Onejsky4UGameModeBase.h @@ -35,4 +35,7 @@ class ONEJSKY4U_API AOnejsky4UGameModeBase : public AGameModeBase UFUNCTION(BlueprintCallable, Category = "File") static bool logFileExists(FString FileName); + + UFUNCTION(BlueprintCallable, Category = "File") + static FString readFile(FString FileName); }; \ No newline at end of file