From 7e9f767bf52dd93933677693a95fc0f97562eaae Mon Sep 17 00:00:00 2001 From: cs260086 Date: Mon, 8 May 2023 22:03:11 +0100 Subject: [PATCH 1/3] Added Gun model + texture maps into the Art_Misc folder --- Art Misc/Gun1/Gun.mb | 3 +++ Art Misc/Gun1/gun_low.fbx | 3 +++ .../material_maps/pCylinder9_lowpoly_lambert1_BaseColor.png | 3 +++ .../Gun1/material_maps/pCylinder9_lowpoly_lambert1_Height.png | 3 +++ .../material_maps/pCylinder9_lowpoly_lambert1_Metallic.png | 3 +++ .../Gun1/material_maps/pCylinder9_lowpoly_lambert1_Normal.png | 3 +++ .../material_maps/pCylinder9_lowpoly_lambert1_Roughness.png | 3 +++ 7 files changed, 21 insertions(+) create mode 100644 Art Misc/Gun1/Gun.mb create mode 100644 Art Misc/Gun1/gun_low.fbx create mode 100644 Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_BaseColor.png create mode 100644 Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Height.png create mode 100644 Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Metallic.png create mode 100644 Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Normal.png create mode 100644 Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Roughness.png diff --git a/Art Misc/Gun1/Gun.mb b/Art Misc/Gun1/Gun.mb new file mode 100644 index 0000000..2e17c4e --- /dev/null +++ b/Art Misc/Gun1/Gun.mb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e15b8b109b94690843c42035045db314c2ef6c2889b7e0397cb9b2b867b3b03f +size 2360644 diff --git a/Art Misc/Gun1/gun_low.fbx b/Art Misc/Gun1/gun_low.fbx new file mode 100644 index 0000000..075c08b --- /dev/null +++ b/Art Misc/Gun1/gun_low.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:486ef24cef9426a662a8b945a05a659da79cfdfc102530504993de9ff6d17993 +size 131744 diff --git a/Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_BaseColor.png b/Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_BaseColor.png new file mode 100644 index 0000000..3fd1705 --- /dev/null +++ b/Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_BaseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:feb19b0fc0f8d618d2e0eb9added1629ae32ec3a2b6f92f182a94e2823e0ab0b +size 1704862 diff --git a/Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Height.png b/Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Height.png new file mode 100644 index 0000000..e347dfd --- /dev/null +++ b/Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Height.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6852503772d5bc0d47703c2b7d3a042fb77d4a74a24d6a4fbfece2192ec2507 +size 116771 diff --git a/Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Metallic.png b/Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Metallic.png new file mode 100644 index 0000000..849116e --- /dev/null +++ b/Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Metallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07dc80502b33b07c5c95081791169d5ee699416ce5c8c80ce074c288d82b58d3 +size 456514 diff --git a/Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Normal.png b/Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Normal.png new file mode 100644 index 0000000..c5e5f08 --- /dev/null +++ b/Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bab4dbf0a1b7aaa3b90933fd786f5c84bfa11185b5d14568e07ff82e6d2aefe7 +size 1070995 diff --git a/Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Roughness.png b/Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Roughness.png new file mode 100644 index 0000000..948d335 --- /dev/null +++ b/Art Misc/Gun1/material_maps/pCylinder9_lowpoly_lambert1_Roughness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f276a16583634acfef59f1af7349dd3f3f88cf4f3c1c131bb699ebd7d5fb2caa +size 182619 From a17a80cf1313869519dc29ea30af2736bc1e93c8 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 8 May 2023 22:44:19 +0100 Subject: [PATCH 2/3] Applied Pendant Texture --- Content/Assets/Objects/pendant/collar.uasset | 3 --- Content/Assets/Objects/pendant/pendant.uasset | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 Content/Assets/Objects/pendant/collar.uasset diff --git a/Content/Assets/Objects/pendant/collar.uasset b/Content/Assets/Objects/pendant/collar.uasset deleted file mode 100644 index 8d15fba..0000000 --- a/Content/Assets/Objects/pendant/collar.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9cd4aed468311cbac49ce80bd9170817046a25224900d257d40eef8e53ea94c -size 26052 diff --git a/Content/Assets/Objects/pendant/pendant.uasset b/Content/Assets/Objects/pendant/pendant.uasset index b67ac6c..d2164c2 100644 --- a/Content/Assets/Objects/pendant/pendant.uasset +++ b/Content/Assets/Objects/pendant/pendant.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c03ee4fe18639fe2fd058649936b21ab6d1c86e2ff194acb56ed3e5944fdf1f -size 383701 +oid sha256:4c9854b03904662b2b36e258a64f36de2b725125570724f977f9be4bbb6758bb +size 383848 From b32e3c21d9b9d1a34027dee0de20d3f4578bc22e Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 8 May 2023 23:40:44 +0100 Subject: [PATCH 3/3] Applied New Gun Model to Combat Character --- Content/Assets/Gun/Gun.uasset | 3 +++ Content/Assets/Gun/GunMaterial.uasset | 3 +++ .../Assets/Gun/pCylinder9_lowpoly_lambert1_BaseColor.uasset | 3 +++ Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Height.uasset | 3 +++ .../Assets/Gun/pCylinder9_lowpoly_lambert1_Metallic.uasset | 3 +++ Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Normal.uasset | 3 +++ .../Assets/Gun/pCylinder9_lowpoly_lambert1_Roughness.uasset | 3 +++ Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- .../the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp | 2 +- .../the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp | 2 +- 10 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 Content/Assets/Gun/Gun.uasset create mode 100644 Content/Assets/Gun/GunMaterial.uasset create mode 100644 Content/Assets/Gun/pCylinder9_lowpoly_lambert1_BaseColor.uasset create mode 100644 Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Height.uasset create mode 100644 Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Metallic.uasset create mode 100644 Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Normal.uasset create mode 100644 Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Roughness.uasset diff --git a/Content/Assets/Gun/Gun.uasset b/Content/Assets/Gun/Gun.uasset new file mode 100644 index 0000000..e8d3e77 --- /dev/null +++ b/Content/Assets/Gun/Gun.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d3b49addab1af772b5e7be8413d1938c60cb9ca9b11089670bffea67d5ce799 +size 151934 diff --git a/Content/Assets/Gun/GunMaterial.uasset b/Content/Assets/Gun/GunMaterial.uasset new file mode 100644 index 0000000..eb57629 --- /dev/null +++ b/Content/Assets/Gun/GunMaterial.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99392202cf4e11191831f3149439bb51ffeeca8d9bfdff3d8bc09616fd534e8c +size 35338 diff --git a/Content/Assets/Gun/pCylinder9_lowpoly_lambert1_BaseColor.uasset b/Content/Assets/Gun/pCylinder9_lowpoly_lambert1_BaseColor.uasset new file mode 100644 index 0000000..4ca845b --- /dev/null +++ b/Content/Assets/Gun/pCylinder9_lowpoly_lambert1_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d8193268e6ab668df393e0a3f224e3f37996b812923449f25ff3ac81cd3c9dc +size 2073201 diff --git a/Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Height.uasset b/Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Height.uasset new file mode 100644 index 0000000..b0676fa --- /dev/null +++ b/Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Height.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc395cef76477b5fe612f85b08f6d01960feca076fb9014dbf3d8c52ca6864f8 +size 134147 diff --git a/Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Metallic.uasset b/Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Metallic.uasset new file mode 100644 index 0000000..d3e02fe --- /dev/null +++ b/Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Metallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:731b41e987a9c294ff12721ccbb6187ec8ec4a6d8bca9afb413c02cdcb8a35c5 +size 482661 diff --git a/Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Normal.uasset b/Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Normal.uasset new file mode 100644 index 0000000..3116771 --- /dev/null +++ b/Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:218bd33207cb4606109d878169e2acce81a27c9b7d75c78170e1eb4887942f7b +size 1259630 diff --git a/Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Roughness.uasset b/Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Roughness.uasset new file mode 100644 index 0000000..1541bfd --- /dev/null +++ b/Content/Assets/Gun/pCylinder9_lowpoly_lambert1_Roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a489d28b4d09d42e81bc97bc8430126c3819329f27d53561da4659a5c7e6bacb +size 205022 diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 155172e..c805727 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:9b8b8f32b2eb36e234605977e47dc74fd8b69113857b48d10f6c41c43752c4b0 -size 174740 +oid sha256:ea5733b446028d56d56b6540c9061981e36ff55dab5288af945c15efc82599db +size 175180 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp index 0ff2e49..4d4630b 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp @@ -70,7 +70,7 @@ void UHoldToInitCombat::OnClickDown() { const AActor* PlayerActor = GetWorld()->GetFirstPlayerController()->GetPawn(); const UStaticMeshComponent* GunComponent = Cast(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()); FOutputDeviceNull AR; const FString Command = FString::Printf(TEXT("PlayCameraShakeShoot")); diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index f2c00b5..56d3a5b 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -272,7 +272,7 @@ void ATurnBaseCombatV2::ExecuteCast(FString Combo) if (GunEffect) { const UStaticMeshComponent* GunComponent = Cast(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()); FOutputDeviceNull AR; const FString Command = FString::Printf(TEXT("PlayCameraShakeShoot"));