diff --git a/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset b/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset index 2cd9eda3..1ba31aba 100644 Binary files a/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset and b/Content/CombatSystem/Blueprints/BP_CombatCharacter.uasset differ diff --git a/Content/CombatSystem/CourseFiles/Animations/Death/Death_Back.uasset b/Content/CombatSystem/CourseFiles/Animations/Death/Death_Back.uasset new file mode 100644 index 00000000..5ab08d6e Binary files /dev/null and b/Content/CombatSystem/CourseFiles/Animations/Death/Death_Back.uasset differ diff --git a/Content/CombatSystem/CourseFiles/Animations/Death/Death_Back_Montage.uasset b/Content/CombatSystem/CourseFiles/Animations/Death/Death_Back_Montage.uasset new file mode 100644 index 00000000..d9ec913e Binary files /dev/null and b/Content/CombatSystem/CourseFiles/Animations/Death/Death_Back_Montage.uasset differ diff --git a/Content/CombatSystem/CourseFiles/Animations/Death/Death_Fwd.uasset b/Content/CombatSystem/CourseFiles/Animations/Death/Death_Fwd.uasset new file mode 100644 index 00000000..a2f34099 Binary files /dev/null and b/Content/CombatSystem/CourseFiles/Animations/Death/Death_Fwd.uasset differ diff --git a/Content/CombatSystem/CourseFiles/Animations/Death/Death_Fwd_Montage.uasset b/Content/CombatSystem/CourseFiles/Animations/Death/Death_Fwd_Montage.uasset new file mode 100644 index 00000000..cf5f4a09 Binary files /dev/null and b/Content/CombatSystem/CourseFiles/Animations/Death/Death_Fwd_Montage.uasset differ diff --git a/Content/ParagonGideon/Characters/Heroes/Gideon/Meshes/GideonRetargeter.uasset b/Content/ParagonGideon/Characters/Heroes/Gideon/Meshes/GideonRetargeter.uasset new file mode 100644 index 00000000..e8dde4c7 Binary files /dev/null and b/Content/ParagonGideon/Characters/Heroes/Gideon/Meshes/GideonRetargeter.uasset differ diff --git a/Content/ParagonKwang/Characters/Heroes/Kwang/Meshes/Kwang_Skeleton.uasset b/Content/ParagonKwang/Characters/Heroes/Kwang/Meshes/Kwang_Skeleton.uasset index dc882dd8..20a138cf 100644 Binary files a/Content/ParagonKwang/Characters/Heroes/Kwang/Meshes/Kwang_Skeleton.uasset and b/Content/ParagonKwang/Characters/Heroes/Kwang/Meshes/Kwang_Skeleton.uasset differ diff --git a/Source/D1/CombatPlayerCharacter.cpp b/Source/D1/CombatPlayerCharacter.cpp index 44c7a647..c0a79834 100644 --- a/Source/D1/CombatPlayerCharacter.cpp +++ b/Source/D1/CombatPlayerCharacter.cpp @@ -755,7 +755,13 @@ void ACombatPlayerCharacter::RotateToTargetUpdate(float Value) void ACombatPlayerCharacter::PerformDeath() { - EnableRagdoll(); + if(!DeathAnimations.IsEmpty()) + { + const int randomIdx = FMath::RandRange(0, DeathAnimations.Num() - 1); + PlayAnimMontage(DeathAnimations[randomIdx]); + } + else + EnableRagdoll(); if(bHitFront) //충돌을 좀 더 그럴싸하게 하기 위해서 피격방향으로 충격 ApplyHitReactionPhysicsVelocity(2000.f); diff --git a/Source/D1/CombatPlayerCharacter.h b/Source/D1/CombatPlayerCharacter.h index 1b81e421..1f970ccd 100644 --- a/Source/D1/CombatPlayerCharacter.h +++ b/Source/D1/CombatPlayerCharacter.h @@ -220,6 +220,8 @@ public: TObjectPtr KnockdownFrontMontage; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Montage", meta = (AllowPrivateAccess = "true")) TObjectPtr KnockdownBackMontage; + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Montage|Death", meta = (AllowPrivateAccess = "true")) + TArray> DeathAnimations; private: //Timeline UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category = "Timeline", meta = (AllowPrivateAccess = "true"))