diff --git a/Content/Characters/(Shared)/Effects/GE_Cooldown.uasset b/Content/Characters/(Shared)/Effects/GE_Cooldown.uasset index 27fa16d..093dd9b 100644 Binary files a/Content/Characters/(Shared)/Effects/GE_Cooldown.uasset and b/Content/Characters/(Shared)/Effects/GE_Cooldown.uasset differ diff --git a/Content/Characters/Hero1/Abilities/Shield/GE_Hero1_Shield.uasset b/Content/Characters/Hero1/Abilities/Shield/GE_Hero1_Shield.uasset index bb48ca1..66e515f 100644 Binary files a/Content/Characters/Hero1/Abilities/Shield/GE_Hero1_Shield.uasset and b/Content/Characters/Hero1/Abilities/Shield/GE_Hero1_Shield.uasset differ diff --git a/Content/Core/Hud/WBP_Ability.uasset b/Content/Core/Hud/WBP_Ability.uasset index 23e0c52..33ca9fb 100644 Binary files a/Content/Core/Hud/WBP_Ability.uasset and b/Content/Core/Hud/WBP_Ability.uasset differ diff --git a/Content/Core/Hud/WBP_Effect.uasset b/Content/Core/Hud/WBP_Effect.uasset index ae274ed..9077079 100644 Binary files a/Content/Core/Hud/WBP_Effect.uasset and b/Content/Core/Hud/WBP_Effect.uasset differ diff --git a/Content/Core/Hud/WBP_EffectPanel.uasset b/Content/Core/Hud/WBP_EffectPanel.uasset index 50e26ca..7f50411 100644 Binary files a/Content/Core/Hud/WBP_EffectPanel.uasset and b/Content/Core/Hud/WBP_EffectPanel.uasset differ diff --git a/Content/Core/Materials/MI_Clock_Ability.uasset b/Content/Core/Materials/MI_Clock_Ability.uasset new file mode 100644 index 0000000..dd1482a Binary files /dev/null and b/Content/Core/Materials/MI_Clock_Ability.uasset differ diff --git a/Content/Core/Materials/MI_Clock_Effect.uasset b/Content/Core/Materials/MI_Clock_Effect.uasset new file mode 100644 index 0000000..d4a2820 Binary files /dev/null and b/Content/Core/Materials/MI_Clock_Effect.uasset differ diff --git a/Content/Core/Materials/M_Clock.uasset b/Content/Core/Materials/M_Clock.uasset index 8547db9..b15ece3 100644 Binary files a/Content/Core/Materials/M_Clock.uasset and b/Content/Core/Materials/M_Clock.uasset differ diff --git a/Content/Core/Textures/T_AbilityBorder.uasset b/Content/Core/Textures/T_AbilityBorder.uasset index 334ac46..627a5ec 100644 Binary files a/Content/Core/Textures/T_AbilityBorder.uasset and b/Content/Core/Textures/T_AbilityBorder.uasset differ diff --git a/Content/Core/Textures/T_EffectBorder.uasset b/Content/Core/Textures/T_EffectBorder.uasset new file mode 100644 index 0000000..c086a95 Binary files /dev/null and b/Content/Core/Textures/T_EffectBorder.uasset differ diff --git a/Content/Core/Textures/T_EffectCooldown.uasset b/Content/Core/Textures/T_EffectCooldown.uasset new file mode 100644 index 0000000..a12501a Binary files /dev/null and b/Content/Core/Textures/T_EffectCooldown.uasset differ diff --git a/RawAssets/T_AbilityBorder.PNG b/RawAssets/T_AbilityBorder.PNG index a5c631a..a05dcab 100644 Binary files a/RawAssets/T_AbilityBorder.PNG and b/RawAssets/T_AbilityBorder.PNG differ diff --git a/RawAssets/T_AbilityBorder.afphoto b/RawAssets/T_AbilityBorder.afphoto index 603d58b..c13dbe5 100644 Binary files a/RawAssets/T_AbilityBorder.afphoto and b/RawAssets/T_AbilityBorder.afphoto differ diff --git a/RawAssets/T_EffectBorder.PNG b/RawAssets/T_EffectBorder.PNG new file mode 100644 index 0000000..6e74aeb Binary files /dev/null and b/RawAssets/T_EffectBorder.PNG differ diff --git a/RawAssets/T_EffectBorder.afphoto b/RawAssets/T_EffectBorder.afphoto new file mode 100644 index 0000000..d96a031 Binary files /dev/null and b/RawAssets/T_EffectBorder.afphoto differ diff --git a/RawAssets/T_EffectCooldown.afphoto b/RawAssets/T_EffectCooldown.afphoto new file mode 100644 index 0000000..5234bdc Binary files /dev/null and b/RawAssets/T_EffectCooldown.afphoto differ diff --git a/RawAssets/T_EffectCooldown.png b/RawAssets/T_EffectCooldown.png new file mode 100644 index 0000000..b5356bf Binary files /dev/null and b/RawAssets/T_EffectCooldown.png differ diff --git a/Source/CogSample/CogSampleFunctionLibrary_Tag.cpp b/Source/CogSample/CogSampleFunctionLibrary_Tag.cpp index 47d3bc2..33a755c 100644 --- a/Source/CogSample/CogSampleFunctionLibrary_Tag.cpp +++ b/Source/CogSample/CogSampleFunctionLibrary_Tag.cpp @@ -26,12 +26,13 @@ UE_DEFINE_GAMEPLAY_TAG(Tag_Effect_Data_Cost, "Effect.Data.Cost"); UE_DEFINE_GAMEPLAY_TAG(Tag_Effect_Data_Damage, "Effect.Data.Damage"); UE_DEFINE_GAMEPLAY_TAG(Tag_Effect_Data_Heal, "Effect.Data.Heal"); -UE_DEFINE_GAMEPLAY_TAG(Tag_Effect_Type_Damage_Kill, "Effect.Type.Damage.Kill"); -UE_DEFINE_GAMEPLAY_TAG(Tag_Effect_Type_Heal_Full, "Effect.Type.Heal.Full"); -UE_DEFINE_GAMEPLAY_TAG(Tag_Effect_Type_Heal_Revive, "Effect.Type.Heal.Revive"); UE_DEFINE_GAMEPLAY_TAG(Tag_Effect_Type_Cost_Free, "Effect.Type.Cost.Free"); UE_DEFINE_GAMEPLAY_TAG(Tag_Effect_Type_Cost_Overtime, "Effect.Type.Cost.Overtime"); UE_DEFINE_GAMEPLAY_TAG(Tag_Effect_Type_Cost_Stamina, "Effect.Type.Cost.Stamina"); +UE_DEFINE_GAMEPLAY_TAG(Tag_Effect_Type_Damage_Kill, "Effect.Type.Damage.Kill"); +UE_DEFINE_GAMEPLAY_TAG(Tag_Effect_Type_Heal_Full, "Effect.Type.Heal.Full"); +UE_DEFINE_GAMEPLAY_TAG(Tag_Effect_Type_Heal_Revive, "Effect.Type.Heal.Revive"); +UE_DEFINE_GAMEPLAY_TAG(Tag_Effect_Type_Hidden, "Effect.Type.Hidden"); UE_DEFINE_GAMEPLAY_TAG(Tag_Status_Dead, "Status.Dead"); UE_DEFINE_GAMEPLAY_TAG(Tag_Status_Ghost, "Status.Ghost"); diff --git a/Source/CogSample/CogSampleFunctionLibrary_Tag.h b/Source/CogSample/CogSampleFunctionLibrary_Tag.h index c764e60..d823fe5 100644 --- a/Source/CogSample/CogSampleFunctionLibrary_Tag.h +++ b/Source/CogSample/CogSampleFunctionLibrary_Tag.h @@ -29,11 +29,12 @@ UE_DECLARE_GAMEPLAY_TAG_EXTERN(Tag_Effect_Data_Cost); UE_DECLARE_GAMEPLAY_TAG_EXTERN(Tag_Effect_Data_Damage); UE_DECLARE_GAMEPLAY_TAG_EXTERN(Tag_Effect_Data_Heal); +UE_DECLARE_GAMEPLAY_TAG_EXTERN(Tag_Effect_Type_Cost_Overtime); +UE_DECLARE_GAMEPLAY_TAG_EXTERN(Tag_Effect_Type_Cost_Stamina); UE_DECLARE_GAMEPLAY_TAG_EXTERN(Tag_Effect_Type_Damage_Kill); UE_DECLARE_GAMEPLAY_TAG_EXTERN(Tag_Effect_Type_Heal_Full); UE_DECLARE_GAMEPLAY_TAG_EXTERN(Tag_Effect_Type_Heal_Revive); -UE_DECLARE_GAMEPLAY_TAG_EXTERN(Tag_Effect_Type_Cost_Overtime); -UE_DECLARE_GAMEPLAY_TAG_EXTERN(Tag_Effect_Type_Cost_Stamina); +UE_DECLARE_GAMEPLAY_TAG_EXTERN(Tag_Effect_Type_Hidden); UE_DECLARE_GAMEPLAY_TAG_EXTERN(Tag_Status_Dead); UE_DECLARE_GAMEPLAY_TAG_EXTERN(Tag_Status_Ghost);