From 810b4b1680dc024a1a56861eafa792b7ad3a5ecf Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 26 Jan 2023 18:12:24 +0000 Subject: [PATCH] TemporarilyBroken TempCharacter.cpp Attempted to fix the close button currently it crashes. --- Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- .../Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset | 4 ++-- Content/Blueprints/Player/BP_MyTempCharacter.uasset | 4 ++-- Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp | 2 +- Source/the_twilight_abyss/PlayerTemp/TempCharacter.h | 6 ++++++ 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 95ef963..af30af7 100644 --- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:465dda65f6f573e5b213f73e85bf00219e3bbcc762d215532bb138add6695028 -size 82954 +oid sha256:fe3a4ab394636a9f640bfd6b48f1124b36aa73681728412f0aa58ad4d604cb8e +size 79935 diff --git a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset index f4f9818..3659a77 100644 --- a/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset +++ b/Content/Blueprints/Merchant/Merchant_UI/BP_ShopSelector.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42aa0e6d25904de056d4d64509aa7c804155c5b3a212ada658ca10dcb63f3e32 -size 55403 +oid sha256:1e9ac1ff7478dfef5edd2254f1241a9b10b7b79d228f1c7fa962c0579a7b2183 +size 53418 diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index 3cd68ed..a5cecf1 100644 --- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48787fb18ad9d51b32e5b837c8c1605b11d1b60014c75f2efa1ab910d621415b -size 56881 +oid sha256:443a43ffede70052c0fb3aa89ba6b5ed76bbe89ac6526cead6d574165d0e1c36 +size 54865 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index 50029de..da1d08c 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -161,7 +161,7 @@ void ATempCharacter::InputEnabler() ThisCamera->SetWorldLocation(OriginalCameraLocation); ThisCamera->SetWorldRotation(OriginalCameraRotation); ThisCamera->FieldOfView = OriginalCameraFOV; - + ItemSelectorWidget->SetVisibility(ESlateVisibility::Hidden); //ulog the originalcameralocation value UE_LOG(LogTemp, Display, TEXT("Original Camera Location: %s"), *OriginalCameraLocation.ToString()); } diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h index 51c6394..5333280 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.h @@ -32,6 +32,12 @@ public: UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Inventory, meta = (AllowPrivateAccess = "true")) class UInventoryComponent* Inventory; //Using the InventoryComponent class + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "ItemSelector") + UUserWidget* ItemSelectorWidget; + + UPROPERTY(EditAnywhere, Category = "Widgets") + TSubclassOf ItemSelector; + // Called to bind functionality to input virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override;