From cdab08dcdf9009c94157e8b013c09ae24dff2a82 Mon Sep 17 00:00:00 2001 From: MH261677 Date: Fri, 11 Nov 2022 23:33:37 +0000 Subject: [PATCH] Added Dialouge box for Shop --- Content/Levels/MerchantPrototype.umap | 4 ++-- Content/Merchant/BP_MerchantGameMode.uasset | 4 ++-- Content/Merchant/BP_OPENDIAL.uasset | 3 +++ Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 3 +++ Source/the_twilight_abyss/PlayerTemp/TempCharacter.h | 3 ++- 5 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 Content/Merchant/BP_OPENDIAL.uasset diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap index ae52d8b..4d2eef1 100644 --- a/Content/Levels/MerchantPrototype.umap +++ b/Content/Levels/MerchantPrototype.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ef2465e4c7f6a5910df3ec5a3923c9a0f80eb17ddb1411de806275274b50ba1 -size 24707 +oid sha256:ec29ba0db3dfe4058261d9534947c299b31f5b36d3a91ddfdd70f1606afd1b3d +size 23329 diff --git a/Content/Merchant/BP_MerchantGameMode.uasset b/Content/Merchant/BP_MerchantGameMode.uasset index 191ec17..f9bbf98 100644 --- a/Content/Merchant/BP_MerchantGameMode.uasset +++ b/Content/Merchant/BP_MerchantGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a545be89d77a055ffcd3fcc1812d0c7bc90cfd0ff31e24e2d9cb4a33eb026df -size 19048 +oid sha256:2d2407c9aeda28720c26b714c16034f1209ee213730b0931ebd93ead214b261c +size 27962 diff --git a/Content/Merchant/BP_OPENDIAL.uasset b/Content/Merchant/BP_OPENDIAL.uasset new file mode 100644 index 0000000..fd13ac9 --- /dev/null +++ b/Content/Merchant/BP_OPENDIAL.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3e50d88d0164a436cb9cc9eba8b4ffac17f428bf6b858db7a987a726d78ce6b +size 33581 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index f5f9681..ed9890a 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -75,4 +75,7 @@ void ATempCharacter::LineTraceLogic() UE_LOG(LogTemp, Display, TEXT("HIT: %s"), *OutHit.GetActor()->GetName()); } } + + + } diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 6843434..a726a8d 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -21,6 +21,8 @@ protected: void ForwardInput(float Axis); void RightMoveInput(float Axis); + + TSubclassOf WidgetClass; //defining the widget class public: // Called every frame @@ -35,5 +37,4 @@ public: float TraceDistance = 200; void LineTraceLogic(); - };