diff --git a/Content/Blueprints/Managers/BP_Controller.uasset b/Content/Blueprints/Managers/BP_Controller.uasset index de7672c2..37a0c8dc 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 3643e9e8..c4169567 100644 Binary files a/Content/Blueprints/Managers/BP_GameInstance.uasset and b/Content/Blueprints/Managers/BP_GameInstance.uasset differ diff --git a/Content/Blueprints/Managers/BP_PawnWalking.uasset b/Content/Blueprints/Managers/BP_PawnWalking.uasset index ee9648fa..04e54935 100644 Binary files a/Content/Blueprints/Managers/BP_PawnWalking.uasset and b/Content/Blueprints/Managers/BP_PawnWalking.uasset differ diff --git a/Content/Blueprints/Managers/Floor/BP_FloorManager.uasset b/Content/Blueprints/Managers/Floor/BP_FloorManager.uasset index 75b3835b..08c5a800 100644 Binary files a/Content/Blueprints/Managers/Floor/BP_FloorManager.uasset and b/Content/Blueprints/Managers/Floor/BP_FloorManager.uasset differ diff --git a/Content/Core/Data/LevelsRC/DT_LevelsRC.uasset b/Content/Core/Data/LevelsRC/DT_LevelsRC.uasset index 137eb25d..513ea443 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/HUD/Widgets/UW_FlatCardVR.uasset b/Content/HUD/Widgets/UW_FlatCardVR.uasset index f69a5884..547bb506 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_MainVR.uasset b/Content/HUD/Widgets/UW_MainVR.uasset index c2507b63..50a12324 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_MenuFlat.uasset b/Content/HUD/Widgets/UW_MenuFlat.uasset index ce428ac9..e31e821d 100644 Binary files a/Content/HUD/Widgets/UW_MenuFlat.uasset and b/Content/HUD/Widgets/UW_MenuFlat.uasset differ diff --git a/Content/Maps/L_DeveloperTactics.umap b/Content/Maps/L_DeveloperTactics.umap index f57353cc..a94e3d0c 100644 Binary files a/Content/Maps/L_DeveloperTactics.umap and b/Content/Maps/L_DeveloperTactics.umap differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1_1.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1_1.uasset index 700ff677..5f24dd19 100644 Binary files a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1_1.uasset and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1_1.uasset differ diff --git a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1_1.uasset b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1_1.uasset index 16a6f8bd..db274cff 100644 Binary files a/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1_1.uasset and b/Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1_1.uasset differ diff --git a/Source/FORTIS_Taktika/Private/ResComLevelPackLoader.cpp b/Source/FORTIS_Taktika/Private/ResComLevelPackLoader.cpp index 324cf0f4..f940629c 100644 --- a/Source/FORTIS_Taktika/Private/ResComLevelPackLoader.cpp +++ b/Source/FORTIS_Taktika/Private/ResComLevelPackLoader.cpp @@ -24,20 +24,20 @@ void AResComLevelPackLoader::Tick(float DeltaTime) { Super::Tick(DeltaTime); - if (packLoading->IsLoaded()) + /*if (packLoading->IsLoaded()) { Destroy(); - } + }*/ } -void AResComLevelPackLoader::LoadPack(FFloorPack* pack) -{ - FLatentActionInfo latentInfo; - latentInfo.CallbackTarget = this; - latentInfo.UUID = 0; - latentInfo.Linkage = 0; +//void AResComLevelPackLoader::LoadPack(FFloorPack* pack) +//{ +// FLatentActionInfo latentInfo; +// latentInfo.CallbackTarget = this; +// latentInfo.UUID = 0; +// latentInfo.Linkage = 0; - latentInfo.ExecutionFunction = "OnLevelPreview"; + /*latentInfo.ExecutionFunction = "OnLevelPreview"; for (auto& level : pack.levelsPreview) { ++queueElem.visibleCnt; @@ -60,5 +60,5 @@ void AResComLevelPackLoader::LoadPack(FFloorPack* pack) ++latentInfo.UUID; UGameplayStatics::LoadStreamLevel(this, *level, true, true, latentInfo); } - return true; -} \ No newline at end of file + return true;*/ +//} \ No newline at end of file diff --git a/Source/FORTIS_Taktika/Public/ResComLevelPackLoader.h b/Source/FORTIS_Taktika/Public/ResComLevelPackLoader.h index c88fc492..70863784 100644 --- a/Source/FORTIS_Taktika/Public/ResComLevelPackLoader.h +++ b/Source/FORTIS_Taktika/Public/ResComLevelPackLoader.h @@ -12,11 +12,11 @@ class FORTIS_TAKTIKA_API AResComLevelPackLoader : public AActor { GENERATED_BODY() private: - FFloorPack* packLoading; + //FFloorPack* packLoading; public: // Sets default values for this actor's properties AResComLevelPackLoader(); - AResComLevelPackLoader(FFloorPack* pack) : packLoading(pack){} + //AResComLevelPackLoader(FFloorPack* pack) : packLoading(pack){} protected: // Called when the game starts or when spawned @@ -25,6 +25,6 @@ protected: public: // Called every frame virtual void Tick(float DeltaTime) override; - void LoadPack(FFloorPack* pack); + //void LoadPack(FFloorPack* pack); };