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

Merge branch 'dev' into Boss-Combat

Browse Source
This commit is contained in:
Philip W 2023-05-08 23:48:56 +01:00
commit 38591bfcac
19 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Art Misc/Gun1/Gun.mb (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Art Misc/Gun1/gun_low.fbx (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_BaseColor.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Height.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Metallic.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Normal.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Roughness.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Gun/Gun.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Gun/GunMaterial.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Gun/pCylinder9_lowpoly_lambert1_BaseColor.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Height.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Metallic.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Normal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Roughness.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Assets/Objects/pendant/collar.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/pendant/pendant.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

2
Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp
View File

@ -70,7 +70,7 @@ void UHoldToInitCombat::OnClickDown()
{ {
const AActor* PlayerActor = GetWorld()->GetFirstPlayerController()->GetPawn(); const AActor* PlayerActor = GetWorld()->GetFirstPlayerController()->GetPawn();
const UStaticMeshComponent* GunComponent = Cast<UStaticMeshComponent>(PlayerActor->GetComponentsByTag(UPrimitiveComponent::StaticClass(), FName("Gun"))[0]); const UStaticMeshComponent* GunComponent = Cast<UStaticMeshComponent>(PlayerActor->GetComponentsByTag(UPrimitiveComponent::StaticClass(), FName("Gun"))[0]);
const FVector GunLocationOffset = GunComponent->GetSocketTransform("Muzzle").TransformPosition(FVector(-100, 0, 0)); const FVector GunLocationOffset = GunComponent->GetSocketTransform("Muzzle").GetLocation();
UNiagaraFunctionLibrary::SpawnSystemAtLocation(GetWorld(), GunEffect, GunLocationOffset, PlayerActor->GetActorRotation()); UNiagaraFunctionLibrary::SpawnSystemAtLocation(GetWorld(), GunEffect, GunLocationOffset, PlayerActor->GetActorRotation());
FOutputDeviceNull AR; FOutputDeviceNull AR;
const FString Command = FString::Printf(TEXT("PlayCameraShakeShoot")); const FString Command = FString::Printf(TEXT("PlayCameraShakeShoot"));

2
Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
View File

@ -272,7 +272,7 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo)
if (GunEffect) if (GunEffect)
{ {
const UStaticMeshComponent* GunComponent = Cast<UStaticMeshComponent>(PlayerActor->GetComponentsByTag(UPrimitiveComponent::StaticClass(), FName("Gun"))[0]); const UStaticMeshComponent* GunComponent = Cast<UStaticMeshComponent>(PlayerActor->GetComponentsByTag(UPrimitiveComponent::StaticClass(), FName("Gun"))[0]);
const FVector GunLocationOffset = GunComponent->GetSocketTransform("Muzzle").TransformPosition(FVector(-100, 0, 0)); const FVector GunLocationOffset = GunComponent->GetSocketTransform("Muzzle").GetLocation();
UNiagaraFunctionLibrary::SpawnSystemAtLocation(GetWorld(), GunEffect, GunLocationOffset, PlayerActor->GetActorRotation()); UNiagaraFunctionLibrary::SpawnSystemAtLocation(GetWorld(), GunEffect, GunLocationOffset, PlayerActor->GetActorRotation());
FOutputDeviceNull AR; FOutputDeviceNull AR;
const FString Command = FString::Printf(TEXT("PlayCameraShakeShoot")); const FString Command = FString::Printf(TEXT("PlayCameraShakeShoot"));