Skip to content

feat 스킬 재사용 대기시간 감소 아티팩트, 스킬 제작 #815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codeGlutton merged 4 commits into from
Sep 23, 2026
Merged

feat 스킬 재사용 대기시간 감소 아티팩트, 스킬 제작 #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da13fa9
feat 스킬 쿨다운 아티팩트 추가
turtlehand Sep 23, 2026
c60018f
feat 공용 쿨다운 스킬 제작
turtlehand Sep 23, 2026
8943b97
feat 스킬 재사용 대기시간 감소 스킬 추가
turtlehand Sep 23, 2026
e769318
fix 설명 재설정
turtlehand Sep 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
214 changes: 107 additions & 107 deletions Config/DefaultGame.ini
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added Content/BP/Animation/Unit/Common/Skill/AM_Common_HourglassTurn.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/BP/Animation/Unit/Mercenary/Barbarian/ABP_Barbarian.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/BP/Animation/Unit/Mercenary/Druid/ABP_Druid.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/BP/Animation/Unit/Mercenary/Druid/Skill/AM_Druid_BlessingOfTime.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/BP/Animation/Unit/Mercenary/Knight/ABP_Knight.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/BP/Animation/Unit/Mercenary/Mage/ABP_Mage.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/BP/Animation/Unit/Mercenary/Mage/Skill/AM_Mage_TickTock.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/BP/Animation/Unit/Mercenary/Mage/Skill/AM_Mage_TimeAcceleration.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/BP/Animation/Unit/Mercenary/Ranger/ABP_Ranger.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/BP/Animation/Unit/Mercenary/Rogue/ABP_Rogue.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/BP/Animation/Unit/Mercenary/Rogue/Skill/AM_Rogue_Cheat.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/BP/DataAsset/Artifact/DA_Artifact_A045_PainKiller.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/BP/DataAsset/Artifact/DA_Artifact_A046_BrokenClock.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/BP/DataAsset/Artifact/DA_Artifact_A047_MagicHat.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/BP/DataAsset/Artifact/DA_Artifact_A048_Inkpot.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/BP/DataAsset/Passive/DA_Passive_P046.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/BP/DataAsset/Passive/DA_Passive_P047.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/BP/DataAsset/Passive/DA_Passive_P048.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/BP/DataAsset/Skill/Common/DA_Common_Spell_Epic_HourglassTurn.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/BP/DataAsset/Skill/Enemy/Stage2/Rat/DA_Rat_ExplosionShot.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/BP/DataAsset/Skill/Enemy/Stage2/Rat/DA_Rat_Shot.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified Content/BP/DataAsset/Skill/Enemy/Stage2/Skeleton_Ranged/DA_Skeleton_Ranged_Shot.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified ...nt/BP/DataAsset/Skill/Enemy/Stage3/Skeleton_Rogue/DA_Skeleton_Rogue_Move_FlashStep.uasset
View file
Open in desktop
Binary file not shown.
Binary file modified ...nt/BP/DataAsset/Skill/Enemy/Stage3/Skeleton_Warrior/DA_Skeleton_Warrior_ImpactLeap.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/BP/DataAsset/Skill/Mercenary/Druid/DA_Druid_Spell_Epic_BlessingOfTime.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/BP/DataAsset/Skill/Mercenary/Mage/DA_Mage_Spell_Epic_TickTock.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/BP/DataAsset/Skill/Mercenary/Mage/DA_Mage_Spell_Rare_TimeAcceleration.uasset
View file
Open in desktop
Binary file not shown.
Binary file added Content/BP/DataAsset/Skill/Mercenary/Rogue/DA_Rogue_Spell_Epic_Cheat.uasset
View file
Open in desktop
Binary file not shown.
Binary file renamed .../DA_Rogue_Spell_Epic_SleightOfHand.uasset → .../DA_Rogue_Spell_Rare_SleightOfHand.uasset
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions Source/P_RD/GameplayTagType.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ namespace AnimationTags
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Common_PyrrhicStrike, "Animation.Montage.Skill.Mercenary.Common.PyrrhicStrike");
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Common_Passion, "Animation.Montage.Skill.Mercenary.Common.Passion");
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Common_Leap, "Animation.Montage.Skill.Mercenary.Common.Leap");
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Common_HourglassTurn, "Animation.Montage.Skill.Mercenary.Common.HourglassTurn");

UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Knight_NormalSlash, "Animation.Montage.Skill.Mercenary.Knight.NormalSlash")
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Knight_HeavyStrike, "Animation.Montage.Skill.Mercenary.Knight.HeavyStrike")
Expand Down Expand Up @@ -109,6 +110,8 @@ namespace AnimationTags
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Mage_GodOfDice, "Animation.Montage.Skill.Mercenary.Mage.GodOfDice");
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Mage_ThunderStorm, "Animation.Montage.Skill.Mercenary.Mage.ThunderStorm");
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Mage_Teleport, "Animation.Montage.Skill.Mercenary.Mage.Teleport");
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Mage_TimeAcceleration, "Animation.Montage.Skill.Mercenary.Mage.TimeAcceleration");
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Mage_TickTock, "Animation.Montage.Skill.Mercenary.Mage.TickTock");


UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Barbarian_NormalSlash, "Animation.Montage.Skill.Mercenary.Barbarian.NormalSlash");
Expand Down Expand Up @@ -158,6 +161,7 @@ namespace AnimationTags
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Rogue_PoisonBomb, "Animation.Montage.Skill.Mercenary.Rogue.PoisonBomb");
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Rogue_Evasion, "Animation.Montage.Skill.Mercenary.Rogue.Evasion");
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Rogue_FlashStep, "Animation.Montage.Skill.Mercenary.Rogue.FlashStep");
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Rogue_Cheat, "Animation.Montage.Skill.Mercenary.Rogue.Cheat");


UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Druid_NormalAttack, "Animation.Montage.Skill.Mercenary.Druid.NormalAttack");
Expand All @@ -182,6 +186,7 @@ namespace AnimationTags
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Druid_AcidRain, "Animation.Montage.Skill.Mercenary.Druid.AcidRain");
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Druid_Invincibility, "Animation.Montage.Skill.Mercenary.Druid.Invincibility");
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Druid_ImmunityBoost, "Animation.Montage.Skill.Mercenary.Druid.ImmunityBoost");
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Mercenary_Druid_BlessingOfTime, "Animation.Montage.Skill.Mercenary.Druid.BlessingOfTime");

UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Enemy_Mushroom_Bodyslam, "Animation.Montage.Skill.Enemy.Mushroom.Bodyslam");
UE_DEFINE_GAMEPLAY_TAG(Animation_Montage_Skill_Enemy_Mushroom_Spore_Exhaustion, "Animation.Montage.Skill.Enemy.Mushroom.Spore.Exhaustion");
Expand Down
6 changes: 6 additions & 0 deletions Source/P_RD/GameplayTagType.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ namespace AnimationTags
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Common_PyrrhicStrike);
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Common_Passion);
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Common_Leap);
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Common_HourglassTurn);

#pragma endregion


Expand Down Expand Up @@ -138,6 +140,8 @@ namespace AnimationTags
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Mage_GodOfDice);
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Mage_ThunderStorm);
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Mage_Teleport);
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Mage_TimeAcceleration);
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Mage_TickTock);

#pragma endregion

Expand Down Expand Up @@ -191,6 +195,7 @@ namespace AnimationTags
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Rogue_PoisonBomb);
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Rogue_Evasion);
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Rogue_FlashStep);
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Rogue_Cheat);

#pragma endregion

Expand All @@ -217,6 +222,7 @@ namespace AnimationTags
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Druid_AcidRain);
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Druid_Invincibility);
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Druid_ImmunityBoost);
P_RD_API UE_DECLARE_GAMEPLAY_TAG_EXTERN(Animation_Montage_Skill_Mercenary_Druid_BlessingOfTime);
#pragma endregion


Expand Down
Loading