diff --git a/Config/DefaultLightmass.ini b/Config/DefaultLightmass.ini index 33c60b6c..60a23e87 100644 --- a/Config/DefaultLightmass.ini +++ b/Config/DefaultLightmass.ini @@ -1,4 +1,4 @@ [DevOptions.GPULightmass] NumPrimaryGISamples=64 -NumSecondaryGISamples=16 +NumSecondaryGISamples=32 FireflyClampingThreshold=1000.0 diff --git a/Content/AssetPacks/bathroom/SM_GlassCurtain.uasset b/Content/AssetPacks/bathroom/SM_GlassCurtain.uasset index 7d1605b2..90c57629 100644 Binary files a/Content/AssetPacks/bathroom/SM_GlassCurtain.uasset and b/Content/AssetPacks/bathroom/SM_GlassCurtain.uasset differ diff --git a/Content/Blueprints/BPSChunk.uasset b/Content/Blueprints/BPSChunk.uasset index 7dd6854b..932732d2 100644 Binary files a/Content/Blueprints/BPSChunk.uasset and b/Content/Blueprints/BPSChunk.uasset differ diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index db80c6c2..82a4e4a8 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/Player/GameplayFunctions.uasset b/Content/Blueprints/Player/GameplayFunctions.uasset index 5087a3fb..dfb9024a 100644 Binary files a/Content/Blueprints/Player/GameplayFunctions.uasset and b/Content/Blueprints/Player/GameplayFunctions.uasset differ diff --git a/Content/Blueprints/Player/MathAndConvertFns.uasset b/Content/Blueprints/Player/MathAndConvertFns.uasset index 36326c1a..89b9495a 100644 Binary files a/Content/Blueprints/Player/MathAndConvertFns.uasset and b/Content/Blueprints/Player/MathAndConvertFns.uasset differ diff --git a/Content/Blueprints/Player/MyPC.uasset b/Content/Blueprints/Player/MyPC.uasset index 5e766ab7..f800b6b3 100644 Binary files a/Content/Blueprints/Player/MyPC.uasset and b/Content/Blueprints/Player/MyPC.uasset differ diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset index e810bfad..6d8625ac 100644 Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ diff --git a/Content/Blueprints/Player/freePawn.uasset b/Content/Blueprints/Player/freePawn.uasset new file mode 100644 index 00000000..4c561e22 Binary files /dev/null and b/Content/Blueprints/Player/freePawn.uasset differ diff --git a/Content/Blueprints/Player/getFunctions.uasset b/Content/Blueprints/Player/getFunctions.uasset index 5516ae6b..93af4903 100644 Binary files a/Content/Blueprints/Player/getFunctions.uasset and b/Content/Blueprints/Player/getFunctions.uasset differ diff --git a/Content/Blueprints/UI/Actors/FlatPoint.uasset b/Content/Blueprints/UI/Actors/FlatPoint.uasset index 0040cce1..96139eb4 100644 Binary files a/Content/Blueprints/UI/Actors/FlatPoint.uasset and b/Content/Blueprints/UI/Actors/FlatPoint.uasset differ diff --git a/Content/Blueprints/UI/Actors/FloorPoint.uasset b/Content/Blueprints/UI/Actors/FloorPoint.uasset index 7abc9d29..607aaac2 100644 Binary files a/Content/Blueprints/UI/Actors/FloorPoint.uasset and b/Content/Blueprints/UI/Actors/FloorPoint.uasset differ diff --git a/Content/Blueprints/UI/Actors/KPmaker.uasset b/Content/Blueprints/UI/Actors/KPmaker.uasset new file mode 100644 index 00000000..172fd2e7 Binary files /dev/null and b/Content/Blueprints/UI/Actors/KPmaker.uasset differ diff --git a/Content/Blueprints/UI/Imgs/newInterface/KP_AtlasDevelopment.uasset b/Content/Blueprints/UI/Imgs/newInterface/KP_AtlasDevelopment.uasset new file mode 100644 index 00000000..9cbc51b4 Binary files /dev/null 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 new file mode 100644 index 00000000..e826586f Binary files /dev/null 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 new file mode 100644 index 00000000..e1f7de34 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/newInterface/KP_AtlasDevelopment_Base.uasset differ diff --git a/Content/Blueprints/UI/Materials/FasadHide.uasset b/Content/Blueprints/UI/Materials/FasadHide.uasset index 77c093f9..162c2340 100644 Binary files a/Content/Blueprints/UI/Materials/FasadHide.uasset and b/Content/Blueprints/UI/Materials/FasadHide.uasset differ diff --git a/Content/Blueprints/UI/Materials/M_KPrender.uasset b/Content/Blueprints/UI/Materials/M_KPrender.uasset new file mode 100644 index 00000000..cbf3ef4f Binary files /dev/null and b/Content/Blueprints/UI/Materials/M_KPrender.uasset differ diff --git a/Content/Blueprints/UI/NewWidgetBlueprint.uasset b/Content/Blueprints/UI/NewWidgetBlueprint.uasset deleted file mode 100644 index 5ba81366..00000000 Binary files a/Content/Blueprints/UI/NewWidgetBlueprint.uasset and /dev/null differ diff --git a/Content/Blueprints/UI/Others/FlatData.uasset b/Content/Blueprints/UI/Others/FlatData.uasset index 8753315c..c9b46994 100644 Binary files a/Content/Blueprints/UI/Others/FlatData.uasset and b/Content/Blueprints/UI/Others/FlatData.uasset differ diff --git a/Content/Blueprints/UI/Others/FlatInfo.uasset b/Content/Blueprints/UI/Others/FlatInfo.uasset index 060d94b1..e5b6fa95 100644 Binary files a/Content/Blueprints/UI/Others/FlatInfo.uasset and b/Content/Blueprints/UI/Others/FlatInfo.uasset differ diff --git a/Content/Blueprints/UI/WBPS/KPWidget.uasset b/Content/Blueprints/UI/WBPS/KPWidget.uasset new file mode 100644 index 00000000..3072055d Binary files /dev/null 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 4e5dbe8c..fcfe0674 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/Favorites.uasset b/Content/Blueprints/UI/WBPS/Menu/Favorites.uasset index dacf8804..ed1f3c82 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/Favorites.uasset and b/Content/Blueprints/UI/WBPS/Menu/Favorites.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/FlatInfo.uasset b/Content/Blueprints/UI/WBPS/Menu/FlatInfo.uasset index 873811b6..4f5cb7ec 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/FlatInfo.uasset and b/Content/Blueprints/UI/WBPS/Menu/FlatInfo.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset index 6eb9d9e0..1bb54b06 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/MenuBtn.uasset b/Content/Blueprints/UI/WBPS/Menu/MenuBtn.uasset index 2d1784c0..7bc08aa6 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/MenuBtn.uasset and b/Content/Blueprints/UI/WBPS/Menu/MenuBtn.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/map.uasset b/Content/Blueprints/UI/WBPS/Menu/map.uasset index 56640c99..7759fb66 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/map.uasset and b/Content/Blueprints/UI/WBPS/Menu/map.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/Filter.uasset b/Content/Blueprints/UI/WBPS/filter/Filter.uasset index 0ad7e382..1e516457 100644 Binary files a/Content/Blueprints/UI/WBPS/filter/Filter.uasset and b/Content/Blueprints/UI/WBPS/filter/Filter.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset b/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset index e97a4efe..ba56af87 100644 Binary files a/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset and b/Content/Blueprints/UI/WBPS/filter/FlatCard.uasset differ diff --git a/Content/Blueprints/UI/WBPS/filter/kpTag.uasset b/Content/Blueprints/UI/WBPS/filter/kpTag.uasset new file mode 100644 index 00000000..cbc2d02f Binary files /dev/null and b/Content/Blueprints/UI/WBPS/filter/kpTag.uasset differ diff --git a/Content/Maps/DayLightStatic.umap b/Content/Maps/DayLightStatic.umap index 855b999b..49981113 100644 Binary files a/Content/Maps/DayLightStatic.umap and b/Content/Maps/DayLightStatic.umap differ diff --git a/Content/Maps/MainScene.umap b/Content/Maps/MainScene.umap index dcae23c9..e5252788 100644 Binary files a/Content/Maps/MainScene.umap and b/Content/Maps/MainScene.umap differ diff --git a/Content/Maps/S02/S02F03.umap b/Content/Maps/S02/S02F03.umap index e3da7bbc..eef1b934 100644 Binary files a/Content/Maps/S02/S02F03.umap and b/Content/Maps/S02/S02F03.umap differ diff --git a/Content/Maps/S02/S02F04.umap b/Content/Maps/S02/S02F04.umap index c0890e78..1f74cbb2 100644 Binary files a/Content/Maps/S02/S02F04.umap and b/Content/Maps/S02/S02F04.umap differ diff --git a/Content/Maps/S02/S02F05.umap b/Content/Maps/S02/S02F05.umap index 1fedf852..dd7abb10 100644 Binary files a/Content/Maps/S02/S02F05.umap and b/Content/Maps/S02/S02F05.umap differ diff --git a/Content/Maps/S02/S02F07.umap b/Content/Maps/S02/S02F07.umap index d51a348b..6c3b53c6 100644 Binary files a/Content/Maps/S02/S02F07.umap and b/Content/Maps/S02/S02F07.umap differ diff --git a/Content/Maps/S02/S02F20.umap b/Content/Maps/S02/S02F20.umap index 7d30b613..41f90684 100644 Binary files a/Content/Maps/S02/S02F20.umap and b/Content/Maps/S02/S02F20.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03.umap b/Content/Maps/S04/S04F03/S04F03.umap index 2a126d0e..e3ebd31e 100644 Binary files a/Content/Maps/S04/S04F03/S04F03.umap and b/Content/Maps/S04/S04F03/S04F03.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03A01.umap b/Content/Maps/S04/S04F03/S04F03A01.umap index 2fb0375a..97bec0e9 100644 Binary files a/Content/Maps/S04/S04F03/S04F03A01.umap and b/Content/Maps/S04/S04F03/S04F03A01.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03A02.umap b/Content/Maps/S04/S04F03/S04F03A02.umap index a3960e3a..2648a09f 100644 Binary files a/Content/Maps/S04/S04F03/S04F03A02.umap and b/Content/Maps/S04/S04F03/S04F03A02.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03A03.umap b/Content/Maps/S04/S04F03/S04F03A03.umap index eed25a21..f2e4604b 100644 Binary files a/Content/Maps/S04/S04F03/S04F03A03.umap and b/Content/Maps/S04/S04F03/S04F03A03.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03A04.umap b/Content/Maps/S04/S04F03/S04F03A04.umap index 2b355fdb..1c568c23 100644 Binary files a/Content/Maps/S04/S04F03/S04F03A04.umap and b/Content/Maps/S04/S04F03/S04F03A04.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03A05.umap b/Content/Maps/S04/S04F03/S04F03A05.umap index 70ddf802..8df1befc 100644 Binary files a/Content/Maps/S04/S04F03/S04F03A05.umap and b/Content/Maps/S04/S04F03/S04F03A05.umap differ diff --git a/Content/Maps/S04/S04F03/S04F03Refl.umap b/Content/Maps/S04/S04F03/S04F03Refl.umap index 998fc969..bf2d1559 100644 Binary files a/Content/Maps/S04/S04F03/S04F03Refl.umap and b/Content/Maps/S04/S04F03/S04F03Refl.umap differ diff --git a/Content/Maps/shadowMeshes.umap b/Content/Maps/shadowMeshes.umap index 08495814..f4872740 100644 Binary files a/Content/Maps/shadowMeshes.umap and b/Content/Maps/shadowMeshes.umap differ diff --git a/Content/Meshes/Danis/S02/MOP/SM_S02F04A00.uasset b/Content/Meshes/Danis/S02/MOP/SM_S02F04A00.uasset index 6dd8ba03..91de76c3 100644 Binary files a/Content/Meshes/Danis/S02/MOP/SM_S02F04A00.uasset and b/Content/Meshes/Danis/S02/MOP/SM_S02F04A00.uasset differ diff --git a/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_Detail.uasset b/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_Detail.uasset index 7396c320..a92c237e 100644 Binary files a/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_Detail.uasset and b/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_Detail.uasset differ diff --git a/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_Detail_re_20.uasset b/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_Detail_re_20.uasset index 278e45d4..2836a4a6 100644 Binary files a/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_Detail_re_20.uasset and b/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_Detail_re_20.uasset differ diff --git a/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_PublicDoor.uasset b/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_PublicDoor.uasset index 09bf78d5..30c593ea 100644 Binary files a/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_PublicDoor.uasset and b/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_PublicDoor.uasset differ diff --git a/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_re_20.uasset b/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_re_20.uasset index 0234e7b8..c73be10c 100644 Binary files a/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_re_20.uasset and b/Content/Meshes/Danis/S02/MOP/SM_S02F04A00_re_20.uasset differ diff --git a/Content/Meshes/Danis/S02/SM_DoorLoggia_S02F20.uasset b/Content/Meshes/Danis/S02/SM_DoorLoggia_S02F20.uasset index 2eb5aca0..8c074d08 100644 Binary files a/Content/Meshes/Danis/S02/SM_DoorLoggia_S02F20.uasset and b/Content/Meshes/Danis/S02/SM_DoorLoggia_S02F20.uasset differ diff --git a/Content/Meshes/Danis/S02/SM_DoorLoggia_S02F4_5_7.uasset b/Content/Meshes/Danis/S02/SM_DoorLoggia_S02F4_5_7.uasset index 3ef77606..2ec16edc 100644 Binary files a/Content/Meshes/Danis/S02/SM_DoorLoggia_S02F4_5_7.uasset and b/Content/Meshes/Danis/S02/SM_DoorLoggia_S02F4_5_7.uasset differ diff --git a/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03.uasset b/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03.uasset index 9dfbfb4d..dde82f90 100644 Binary files a/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03.uasset and b/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03.uasset differ diff --git a/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_001.uasset b/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_001.uasset index bf8fcf65..9216b12d 100644 Binary files a/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_001.uasset and b/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_001.uasset differ diff --git a/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_002.uasset b/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_002.uasset index a5f2cf7f..869a0a11 100644 Binary files a/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_002.uasset and b/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_002.uasset differ diff --git a/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_003.uasset b/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_003.uasset index 96996b7a..dfd3948f 100644 Binary files a/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_003.uasset and b/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_003.uasset differ diff --git a/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_004.uasset b/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_004.uasset index 848c98cc..3fa0f894 100644 Binary files a/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_004.uasset and b/Content/Meshes/Danis/S04/SM_DoorLoggia_S04F03_SM_DoorLoggia_S04F03_004.uasset differ diff --git a/Source/Onejsky4U/Onejsky4UGameModeBase.cpp b/Source/Onejsky4U/Onejsky4UGameModeBase.cpp index 912377ae..bcf4c140 100644 --- a/Source/Onejsky4U/Onejsky4UGameModeBase.cpp +++ b/Source/Onejsky4U/Onejsky4UGameModeBase.cpp @@ -22,7 +22,8 @@ bool AOnejsky4UGameModeBase::AppendStringToFile(FString FileName, FString Data) FString FilePath; // default documents directory path + FileName - FilePath = FPlatformProcess::UserDir() + FileName; + // FilePath = FPlatformProcess::UserDir() + FileName; + FilePath = FileName; UE_LOG(LogTemp, Log, TEXT("File path: %s"), *FilePath); // check file existence and write data to a file @@ -133,6 +134,6 @@ void AOnejsky4UGameModeBase::GetExcelData(FString Command) bool AOnejsky4UGameModeBase::logFileExists(FString FileName) { - FString FilePath = FPlatformProcess::UserDir() + FileName;; - return FPaths::FileExists(FilePath); + //FString FilePath = FPlatformProcess::UserDir() + FileName;; + return FPaths::FileExists(FileName); }