diff --git a/Content/CombatSystem/Blueprints/AI/GruntlingEnemy/Animations/Death/ExoGame_Gruntling_Death_Montage.uasset b/Content/CombatSystem/Blueprints/AI/GruntlingEnemy/Animations/Death/ExoGame_Gruntling_Death_Montage.uasset index efe5b908..b6d5400f 100644 Binary files a/Content/CombatSystem/Blueprints/AI/GruntlingEnemy/Animations/Death/ExoGame_Gruntling_Death_Montage.uasset and b/Content/CombatSystem/Blueprints/AI/GruntlingEnemy/Animations/Death/ExoGame_Gruntling_Death_Montage.uasset differ diff --git a/Content/CombatSystem/Blueprints/AI/GruntlingEnemy/Animations/Death/ExoGame_Gruntling_Death_Small_Alt_Montage.uasset b/Content/CombatSystem/Blueprints/AI/GruntlingEnemy/Animations/Death/ExoGame_Gruntling_Death_Small_Alt_Montage.uasset index 16662c37..b174bb4d 100644 Binary files a/Content/CombatSystem/Blueprints/AI/GruntlingEnemy/Animations/Death/ExoGame_Gruntling_Death_Small_Alt_Montage.uasset and b/Content/CombatSystem/Blueprints/AI/GruntlingEnemy/Animations/Death/ExoGame_Gruntling_Death_Small_Alt_Montage.uasset differ diff --git a/Content/CombatSystem/Blueprints/AI/GruntlingEnemy/Animations/Death/ExoGame_Gruntling_Death_Small_Montage.uasset b/Content/CombatSystem/Blueprints/AI/GruntlingEnemy/Animations/Death/ExoGame_Gruntling_Death_Small_Montage.uasset index f59631a5..b5de6dcf 100644 Binary files a/Content/CombatSystem/Blueprints/AI/GruntlingEnemy/Animations/Death/ExoGame_Gruntling_Death_Small_Montage.uasset and b/Content/CombatSystem/Blueprints/AI/GruntlingEnemy/Animations/Death/ExoGame_Gruntling_Death_Small_Montage.uasset differ diff --git a/Content/CombatSystem/CourseFiles/SoundFX/A_Ability_MeteorImpact_Cue.uasset b/Content/CombatSystem/CourseFiles/SoundFX/A_Ability_MeteorImpact_Cue.uasset new file mode 100644 index 00000000..914be628 Binary files /dev/null and b/Content/CombatSystem/CourseFiles/SoundFX/A_Ability_MeteorImpact_Cue.uasset differ diff --git a/Content/CombatSystem/CourseFiles/SoundFX/Gruntling/A_Guardian_Death_Cue.uasset b/Content/CombatSystem/CourseFiles/SoundFX/Gruntling/A_Guardian_Death_Cue.uasset new file mode 100644 index 00000000..a0f90b27 Binary files /dev/null and b/Content/CombatSystem/CourseFiles/SoundFX/Gruntling/A_Guardian_Death_Cue.uasset differ diff --git a/Content/CombatSystem/CourseFiles/SoundFX/Hammer/A_Hammer_Swing_Cue.uasset b/Content/CombatSystem/CourseFiles/SoundFX/Hammer/A_Hammer_Swing_Cue.uasset new file mode 100644 index 00000000..37995afe Binary files /dev/null and b/Content/CombatSystem/CourseFiles/SoundFX/Hammer/A_Hammer_Swing_Cue.uasset differ diff --git a/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_A_Montage.uasset b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_A_Montage.uasset index b044157c..1a15d714 100644 Binary files a/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_A_Montage.uasset and b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_A_Montage.uasset differ diff --git a/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_C_Montage.uasset b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_C_Montage.uasset index 461a0827..1ccd6533 100644 Binary files a/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_C_Montage.uasset and b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_C_Montage.uasset differ diff --git a/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_Combo_Montage.uasset b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_Combo_Montage.uasset index adef76af..e3478eb3 100644 Binary files a/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_Combo_Montage.uasset and b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_Combo_Montage.uasset differ diff --git a/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/FrostGiant_Attack_MeleeB_Montage.uasset b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/FrostGiant_Attack_MeleeB_Montage.uasset index c68b260d..9e503bdd 100644 Binary files a/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/FrostGiant_Attack_MeleeB_Montage.uasset and b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/FrostGiant_Attack_MeleeB_Montage.uasset differ diff --git a/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Intro/ExoGame_FrostGiant_Intro_Loop_Montage1.uasset b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Intro/ExoGame_FrostGiant_Intro_Loop_Montage1.uasset index 4cafe10a..59dadec2 100644 Binary files a/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Intro/ExoGame_FrostGiant_Intro_Loop_Montage1.uasset and b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Intro/ExoGame_FrostGiant_Intro_Loop_Montage1.uasset differ diff --git a/Source/D1/CombatPlayerController.h b/Source/D1/CombatPlayerController.h index 7ea584ba..dd8555b9 100644 --- a/Source/D1/CombatPlayerController.h +++ b/Source/D1/CombatPlayerController.h @@ -17,7 +17,7 @@ class D1_API ACombatPlayerController : public APlayerController //public: // virtual void BeginPlay() override; -//CombatHUD ·Î ¿Å±è +//CombatHUD 로 옮김 //private: // UPROPERTY(EditDefaultsOnly, Category = UI) // TSubclassOf MainHUDClass;