Updated Positions of Items to Merchant Shop
Fixed the origin of the items and properly positioned and scaled items to make the merchant shop work fully
This commit is contained in:
parent
a838c82e9c
commit
0779e31c75
BIN
Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset
(Stored with Git LFS)
BIN
Content/Assets/Objects/MerchantShop/MerchantShopModular_JellyJar_low.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset
(Stored with Git LFS)
BIN
Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
Content/Levels/Build.umap
(Stored with Git LFS)
BIN
Content/Levels/Build.umap
(Stored with Git LFS)
Binary file not shown.
@ -219,7 +219,7 @@ void ATempCharacter::InputDisabler()
|
||||
{
|
||||
PlayerCharacter->DisableInput(GetWorld()->GetFirstPlayerController());
|
||||
}
|
||||
//TURNING OFF CROSSHAIR & IMPORTANT STATS
|
||||
//TURNING OFF CROSSHAIR
|
||||
|
||||
CrossHairWidget->SetVisibility(ESlateVisibility::Hidden);
|
||||
ImportantStatsWidget->SetVisibility(ESlateVisibility::Hidden);
|
||||
@ -228,14 +228,14 @@ void ATempCharacter::InputDisabler()
|
||||
APlayerController* PlayerController = GetWorld()->GetFirstPlayerController();
|
||||
PlayerController->SetInputMode(FInputModeUIOnly());
|
||||
PlayerController->bShowMouseCursor = true;
|
||||
|
||||
disableTab = true;
|
||||
if (ThisCamera != nullptr)
|
||||
{
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
OriginalCameraLocation = ThisCamera->GetComponentLocation();
|
||||
OriginalCameraRotation = ThisCamera->GetComponentRotation();
|
||||
OriginalCameraFOV = ThisCamera->FieldOfView;
|
||||
UE_LOG(LogTemp, Display, TEXT("Original Camera Location: %s"), *OriginalCameraLocation.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
@ -246,27 +246,20 @@ void ATempCharacter::InputEnabler()
|
||||
{
|
||||
PlayerCharacter->EnableInput(GetWorld()->GetFirstPlayerController());
|
||||
}
|
||||
|
||||
//TURNING ON THE CROSSHAIR AND IMPORTANTSTATS WIDGET
|
||||
|
||||
CrossHairWidget->SetVisibility(ESlateVisibility::Visible);
|
||||
ImportantStatsWidget->SetVisibility(ESlateVisibility::Visible);
|
||||
|
||||
//Reset UI Mode
|
||||
APlayerController* PlayerController = GetWorld()->GetFirstPlayerController();
|
||||
PlayerController->SetInputMode(FInputModeGameOnly());
|
||||
PlayerController->bShowMouseCursor = false;
|
||||
|
||||
|
||||
UE_LOG(LogTemp, Display, TEXT("Enabling Inputs"));
|
||||
disableTab = true;
|
||||
TraceDistance = 300;
|
||||
if (ThisCamera != nullptr)
|
||||
{
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
ThisCamera->SetWorldLocation(OriginalCameraLocation);
|
||||
ThisCamera->SetWorldRotation(OriginalCameraRotation);
|
||||
ThisCamera->FieldOfView = OriginalCameraFOV;
|
||||
ThisCamera->ResetRelativeTransform();
|
||||
UE_LOG(LogTemp, Display, TEXT("Original Camera Location: %s"), *OriginalCameraLocation.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user