From d9ace397359df1c2b62500cd90423b3ad8b62fab Mon Sep 17 00:00:00 2001 From: Jers Date: Thu, 21 Dec 2023 23:51:36 -0600 Subject: [PATCH] Added unit cards for prebattle menu and setup data binding for allocate/deallocate --- Content/Blueprints/BP_GameState.uasset | 4 ++-- Content/Blueprints/BP_PlayerPawn.uasset | 4 ++-- Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset | 3 +++ Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset | 3 +++ Content/Levels/MainMenu.umap | 2 +- Source/SpaceBattler/Public/UnitInfo.h | 3 +++ 6 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset create mode 100644 Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset diff --git a/Content/Blueprints/BP_GameState.uasset b/Content/Blueprints/BP_GameState.uasset index 2ff1bb0..87b96a7 100644 --- a/Content/Blueprints/BP_GameState.uasset +++ b/Content/Blueprints/BP_GameState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed9da248a6fc5c6009ac0f6ea4baaa631abd3bfe4543f06ae447afd90208faff -size 337826 +oid sha256:75f5ca81023fd6eea639576b7fd164549daf6ecb4880727a45c447f1741042f6 +size 340043 diff --git a/Content/Blueprints/BP_PlayerPawn.uasset b/Content/Blueprints/BP_PlayerPawn.uasset index 192cfaf..5e5cb48 100644 --- a/Content/Blueprints/BP_PlayerPawn.uasset +++ b/Content/Blueprints/BP_PlayerPawn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cfe0163889580d76ca1741b873537fdaef1e2d023c065a5fc08b8c8716a04f4 -size 35548 +oid sha256:adb85ff11a3341c3c130f4d6c4ca4d11a5e535e8c5d18050d0b5e4394be34571 +size 54459 diff --git a/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset b/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset new file mode 100644 index 0000000..56c3b44 --- /dev/null +++ b/Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4fdd76f2234b27ba8e33931605c18d6d57c8bc3e924f551e5834902afbde802 +size 74403 diff --git a/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset b/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset new file mode 100644 index 0000000..2bbcf85 --- /dev/null +++ b/Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0af2dfb434dd40b8a9d9ce31735195849fda4b1855eb8f116e62ce63091d58a2 +size 98699 diff --git a/Content/Levels/MainMenu.umap b/Content/Levels/MainMenu.umap index 874d3bb..199c754 100644 --- a/Content/Levels/MainMenu.umap +++ b/Content/Levels/MainMenu.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63a26f2e75c3cb79eee917c80770fc63f404607e6d002b1fbd355a1a26718b92 +oid sha256:db4c33c4409b45e31b97097c0b3a6a7f48d761e4d423690764f8e296eedc0dd3 size 41472 diff --git a/Source/SpaceBattler/Public/UnitInfo.h b/Source/SpaceBattler/Public/UnitInfo.h index e182628..6909086 100644 --- a/Source/SpaceBattler/Public/UnitInfo.h +++ b/Source/SpaceBattler/Public/UnitInfo.h @@ -23,6 +23,9 @@ protected: UPROPERTY(BlueprintReadWrite, EditAnywhere, meta = (MultiLine = true)) FText Description; + + UPROPERTY(BlueprintReadWrite, EditAnywhere) + UTexture2D* Texture2D; UPROPERTY(BlueprintReadWrite, EditAnywhere) float BaseHP;