From 2894404a89b97b9b3546774e53cc0ce9c05f155f Mon Sep 17 00:00:00 2001 From: koritsa Date: Mon, 18 May 2026 22:41:19 +0300 Subject: [PATCH] Setup basic test level --- Config/DefaultEngine.ini | 2 +- Content/Blueprints/GM_Main.uasset | 4 ++-- Content/Test/Actors/BP_TestBed.uasset | 3 +++ Content/Test/Actors/BP_TestPC.uasset | 3 +++ Content/Test/Actors/BP_TestWardrobe.uasset | 3 +++ Content/Test/Maps/TestLevel.umap | 3 +++ Content/Test/Materials/MI_Black.uasset | 3 +++ Content/Test/Materials/MI_Blue.uasset | 3 +++ Content/Test/Materials/MI_Orange.uasset | 3 +++ Content/Test/Materials/M_SimpleColor.uasset | 3 +++ Source/NakedDesire/SaveGame/GlobalSaveGameData.cpp | 4 ++-- Source/NakedDesire/SaveGame/GlobalSaveGameData.h | 2 +- 12 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 Content/Test/Actors/BP_TestBed.uasset create mode 100644 Content/Test/Actors/BP_TestPC.uasset create mode 100644 Content/Test/Actors/BP_TestWardrobe.uasset create mode 100644 Content/Test/Maps/TestLevel.umap create mode 100644 Content/Test/Materials/MI_Black.uasset create mode 100644 Content/Test/Materials/MI_Blue.uasset create mode 100644 Content/Test/Materials/MI_Orange.uasset create mode 100644 Content/Test/Materials/M_SimpleColor.uasset diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index a5eb4b08..d85b4a37 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -1,7 +1,7 @@ [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/Maps/MainMenu.MainMenu +EditorStartupMap=/Game/Test/Maps/TestLevel.TestLevel LocalMapOptions= TransitionMap=None bUseSplitscreen=True diff --git a/Content/Blueprints/GM_Main.uasset b/Content/Blueprints/GM_Main.uasset index 1fb808bc..d542a534 100644 --- a/Content/Blueprints/GM_Main.uasset +++ b/Content/Blueprints/GM_Main.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97f8a5adf9f2e68d9f2d780e2af91cb03dc72765a8cad2eadefa6c3e0b162268 -size 133932 +oid sha256:f9549fef1755bbd30c03631280f4d1ee81f9be83b96a30f352d7a64b9b963845 +size 143613 diff --git a/Content/Test/Actors/BP_TestBed.uasset b/Content/Test/Actors/BP_TestBed.uasset new file mode 100644 index 00000000..e39c77eb --- /dev/null +++ b/Content/Test/Actors/BP_TestBed.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12a9a091d9db52814e87b36c8815a8ad58a96622bc0efb29c6b1d39e0ea74bec +size 28880 diff --git a/Content/Test/Actors/BP_TestPC.uasset b/Content/Test/Actors/BP_TestPC.uasset new file mode 100644 index 00000000..1596beca --- /dev/null +++ b/Content/Test/Actors/BP_TestPC.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5f862b40715c32d69a1c0fd7180d9ceaf70905c872459c4104ce4b876ccfd0e +size 28746 diff --git a/Content/Test/Actors/BP_TestWardrobe.uasset b/Content/Test/Actors/BP_TestWardrobe.uasset new file mode 100644 index 00000000..0b4cfc02 --- /dev/null +++ b/Content/Test/Actors/BP_TestWardrobe.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f37ae271030727fbdf8e9a125bfaa7554bff7990e17dc2c7082604c715ecdc5 +size 28855 diff --git a/Content/Test/Maps/TestLevel.umap b/Content/Test/Maps/TestLevel.umap new file mode 100644 index 00000000..456fe8c2 --- /dev/null +++ b/Content/Test/Maps/TestLevel.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d830458b5cbb550b389e2de4769a69f6f9aea4fedc7408617ed4abf54f16707c +size 47438 diff --git a/Content/Test/Materials/MI_Black.uasset b/Content/Test/Materials/MI_Black.uasset new file mode 100644 index 00000000..eb09faa6 --- /dev/null +++ b/Content/Test/Materials/MI_Black.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de06c6be77f7199120fa059ce8a90499ea9a64eca01996f7ed27279b303de99f +size 7455 diff --git a/Content/Test/Materials/MI_Blue.uasset b/Content/Test/Materials/MI_Blue.uasset new file mode 100644 index 00000000..fd17fd3e --- /dev/null +++ b/Content/Test/Materials/MI_Blue.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b40c5893eabb7d2624c1b59d00d9abb4a4c2c89230298b0c5143a7705a136566 +size 8660 diff --git a/Content/Test/Materials/MI_Orange.uasset b/Content/Test/Materials/MI_Orange.uasset new file mode 100644 index 00000000..1641ccc4 --- /dev/null +++ b/Content/Test/Materials/MI_Orange.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c9d41525b0b60afe080276f0a78f7a243e48cce36e7c35ed1c4ae0c520597f2 +size 8661 diff --git a/Content/Test/Materials/M_SimpleColor.uasset b/Content/Test/Materials/M_SimpleColor.uasset new file mode 100644 index 00000000..4f4ddfc4 --- /dev/null +++ b/Content/Test/Materials/M_SimpleColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:496c71ffb071d8787451510daff818698999ca347a54049f16a4aec489121bda +size 12256 diff --git a/Source/NakedDesire/SaveGame/GlobalSaveGameData.cpp b/Source/NakedDesire/SaveGame/GlobalSaveGameData.cpp index e2ad4b34..61f46e1d 100644 --- a/Source/NakedDesire/SaveGame/GlobalSaveGameData.cpp +++ b/Source/NakedDesire/SaveGame/GlobalSaveGameData.cpp @@ -58,9 +58,9 @@ UGlobalSaveGameData* UGlobalSaveGameData::LoadOrCreateSaveGame(UClothingList* De } bool UGlobalSaveGameData::SaveGame(const TArray CurrentWardrobeClothing, - const TArray CurrentPlayerClothing, int32 Money) + const TArray CurrentPlayerClothing, int32 InMoney) { - if (UGlobalSaveGameData* Save = CreateNewSaveGame(CurrentWardrobeClothing, CurrentPlayerClothing, (float)Money)) + if (UGlobalSaveGameData* Save = CreateNewSaveGame(CurrentWardrobeClothing, CurrentPlayerClothing, (float)InMoney)) { return UGameplayStatics::SaveGameToSlot(Save, SLOT_NAME, SLOT_PLAYER); } diff --git a/Source/NakedDesire/SaveGame/GlobalSaveGameData.h b/Source/NakedDesire/SaveGame/GlobalSaveGameData.h index 0ed9631b..75c271e9 100644 --- a/Source/NakedDesire/SaveGame/GlobalSaveGameData.h +++ b/Source/NakedDesire/SaveGame/GlobalSaveGameData.h @@ -34,7 +34,7 @@ public: static UGlobalSaveGameData* LoadOrCreateSaveGame(UClothingList* DefaultPlayerClothing, UClothingList* DefaultWardrobeClothing); UFUNCTION(BlueprintCallable) - static bool SaveGame(TArray CurrentWardrobeClothing, TArray CurrentPlayerClothing, int32 Money); + static bool SaveGame(TArray CurrentWardrobeClothing, TArray CurrentPlayerClothing, int32 InMoney); private: static UGlobalSaveGameData* CreateNewSaveGame(TArray CurrentWardrobeClothing, TArray CurrentPlayerClothing, float InMoney);