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<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());
 		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<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());
 		FOutputDeviceNull AR;
 		const FString Command = FString::Printf(TEXT("PlayCameraShakeShoot"));