Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Updated Merchant

Browse Source 
Fixed crash error and merchant dialouge box pops up now, Started working on item stacking
This commit is contained in:
MH261677 2023-01-12 13:05:43 +00:00
parent 320a74d4bb
commit c107c9a490
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Blueprints/Combat_UI/CombatCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Levels/MerchantPrototype.umap (Stored with Git LFS)
View File

Binary file not shown.

2
Source/the_twilight_abyss/InteractableEnvironment/InteractableEnvironmentObject.h
View File

@ -24,7 +24,7 @@ public:
// Called every frame // Called every frame
virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
UPROPERTY(EditDefaults) UPROPERTY(EditDefaultsOnly)
bool bInteractable = false; bool bInteractable = false;
UFUNCTION(Blueprintcallable) UFUNCTION(Blueprintcallable)

3
Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
View File

@ -77,13 +77,14 @@ void ATempCharacter::LineTraceLogic()
if (bHit) if (bHit)
{ {
//we store the GetItem function from InventoryComponent into ItemArray variable //we store the GetItem function from InventoryComponent into ItemArray variable
auto ItemArray = OutHit.GetActor()->FindComponentByClass<UInventoryComponent>()->GetItem(0);
if(OutHit.GetActor() == nullptr) if(OutHit.GetActor() == nullptr)
{ {
return; return;
} }
if(OutHit.GetActor()->FindComponentByClass<UInventoryComponent>()) if(OutHit.GetActor()->FindComponentByClass<UInventoryComponent>())
{ {
auto ItemArray = OutHit.GetActor()->FindComponentByClass<UInventoryComponent>()->GetItem(0);
if(GoldBalance >= ItemArray->ItemCostPrice) if(GoldBalance >= ItemArray->ItemCostPrice)
{ {
GoldBalance -= ItemArray->ItemCostPrice; GoldBalance -= ItemArray->ItemCostPrice;