diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 3c8954e..57105e6 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -2,6 +2,7 @@ GameDefaultMap=/Game/Maps/DevMap.DevMap EditorStartupMap=/Game/Maps/DevMap.DevMap GameInstanceClass=/Script/Promether.DefaultGameInstance +ServerDefaultMap=/Game/Maps/DevMap.DevMap [/Script/WindowsTargetPlatform.WindowsTargetSettings] DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 diff --git a/Content/Blueprint/BP_DefaultState.uasset b/Content/Blueprint/BP_DefaultState.uasset deleted file mode 100644 index 50ad2b5..0000000 --- a/Content/Blueprint/BP_DefaultState.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2f089aa9e01c23782be05a3c4c8afad48a9087f1546f8008c7917f5f518199f -size 29031 diff --git a/Content/Character/Allium/BP_Allium.uasset b/Content/Character/Allium/BP_Allium.uasset index 4b38caf..d65b310 100644 --- a/Content/Character/Allium/BP_Allium.uasset +++ b/Content/Character/Allium/BP_Allium.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0efcaf369dd9f9f28b5ad2ceeaeab0c055d85a0235413c1c6400d64a8281b076 -size 33521 +oid sha256:9badfd45987b6bd3b5a305561a5a4f936de41ded9979460ed7c96d84e980ceed +size 42428 diff --git a/Content/Character/Lb/Animation/ABP_Lb.uasset b/Content/Character/Lb/Animation/ABP_Lb.uasset index 6b1b402..df4122c 100644 --- a/Content/Character/Lb/Animation/ABP_Lb.uasset +++ b/Content/Character/Lb/Animation/ABP_Lb.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72080db93ed3fd3baf68b0be109e1ed6e5b14618061edc775ac083a4272ac95b -size 278735 +oid sha256:2a25a592d826825d1d3b4bac2adab7cd96a99a926a53db64b45b955d529e9d3f +size 263503 diff --git a/Content/Character/Lb/Animation/E_Anim.uasset b/Content/Character/Lb/Animation/E_Anim.uasset index ad3b3af..7628b40 100644 --- a/Content/Character/Lb/Animation/E_Anim.uasset +++ b/Content/Character/Lb/Animation/E_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:203341d7a9a0313e2ab36bfc64e5bd020d2d279f75ae6e848bf9cab5bf7f7cf1 -size 85554 +oid sha256:f21d678000aac53d8ea2afe024bd514f97efea8b1aaa843393587fad37aedaf6 +size 89666 diff --git a/Content/Character/Lb/Animation/Q_Anim.uasset b/Content/Character/Lb/Animation/Q_Anim.uasset index b8a4f1b..fb7dbb4 100644 --- a/Content/Character/Lb/Animation/Q_Anim.uasset +++ b/Content/Character/Lb/Animation/Q_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc9b646fa83f495db4b830220d6027d4eeac7dd3d180eb0af8905490cf281b70 -size 110128 +oid sha256:d68b54e7884d73592bdd8d1f482beae22a1a46528d79b893c8da7671d26811de +size 115061 diff --git a/Content/Character/Lb/Animation/R2_Anim.uasset b/Content/Character/Lb/Animation/R2_Anim.uasset index 46b981a..b86911a 100644 --- a/Content/Character/Lb/Animation/R2_Anim.uasset +++ b/Content/Character/Lb/Animation/R2_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2856e466c714579d7b8708a8ffc85a83b148fa3f6f39931c2fd3a352893f91e -size 160609 +oid sha256:0c5d110cbc5ae8d4b489b73f7a2b7b955803f0ebc65b45c53054e3777484f8b8 +size 164688 diff --git a/Content/Character/Lb/Animation/W_Anim.uasset b/Content/Character/Lb/Animation/W_Anim.uasset index d0b334b..bb8f739 100644 --- a/Content/Character/Lb/Animation/W_Anim.uasset +++ b/Content/Character/Lb/Animation/W_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ef29498e914f326a202cce4625c89fbe6fef7ae22dc37c1608f6b8d4edfd868 -size 114373 +oid sha256:c04e3acd517a9ee4b5fb9fa87af619da7c2e9c216b97d6ad9772cd210547e318 +size 118452 diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index 2dbe5ee..b8b2dbc 100644 --- a/Content/Character/Lb/BP_Lb.uasset +++ b/Content/Character/Lb/BP_Lb.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e51ed1e0291cacac1538cc1fda68329339189b9edbfd814cad76d61a9aa24dbe -size 73288 +oid sha256:fb4ac8c87b1fc6b97f11da1e4c96955ec7cc478b87821469a132e17d99894a25 +size 109032 diff --git a/Content/Character/Lb/Effect/Missile.uasset b/Content/Character/Lb/Effect/Missile.uasset new file mode 100644 index 0000000..a3bfeb0 --- /dev/null +++ b/Content/Character/Lb/Effect/Missile.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb90bb224133bbfd935dd11a757dc60d64f518255d231afb4c4b652ff20c7f42 +size 16487 diff --git a/Content/Character/Lb/Effect/Missile11.uasset b/Content/Character/Lb/Effect/Missile11.uasset new file mode 100644 index 0000000..47533bd --- /dev/null +++ b/Content/Character/Lb/Effect/Missile11.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d90451304aa5ffccdcd580eef47a68a0559aa1adf40bb5f4961f4eaf4894e5d +size 40654 diff --git a/Content/Character/Lb/Effect/NewMaterial.uasset b/Content/Character/Lb/Effect/NewMaterial.uasset new file mode 100644 index 0000000..e7de0a5 --- /dev/null +++ b/Content/Character/Lb/Effect/NewMaterial.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2774ab60f92d95c300b51198e32be4f35c1653cd1d653ec27f59d954d4c6bd05 +size 5257 diff --git a/Content/Character/Lb/Skeleton/Lb.uasset b/Content/Character/Lb/Skeleton/Lb.uasset index b2f8e92..19bbaad 100644 --- a/Content/Character/Lb/Skeleton/Lb.uasset +++ b/Content/Character/Lb/Skeleton/Lb.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d80d24c0f3a7aeb2e5be1b8cd6fe0e7474c6aa7f52a64301d3e485d0f4605863 -size 20319 +oid sha256:cc32989418fcf75ee7aad3eb0a5b7ff7ac4add3436dc4d26f99775b4b75467a0 +size 20951 diff --git a/Content/Character/Notify/ContinueActing.uasset b/Content/Character/Notify/ContinueActing.uasset new file mode 100644 index 0000000..3d812b8 --- /dev/null +++ b/Content/Character/Notify/ContinueActing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8753a1338702bdaaf81d515b81b2c196b72ad37a4925daadedc80b391c704e0b +size 3852 diff --git a/Content/Character/Notify/ContinueAttack.uasset b/Content/Character/Notify/ContinueAttack.uasset new file mode 100644 index 0000000..1424564 --- /dev/null +++ b/Content/Character/Notify/ContinueAttack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9e7290cf65a1870ae39c1f0dc538113381bd531c882777c2b2d5e8aaa3dd826 +size 3852 diff --git a/Content/Character/Notify/ContinueMoving.uasset b/Content/Character/Notify/ContinueMoving.uasset new file mode 100644 index 0000000..187e806 --- /dev/null +++ b/Content/Character/Notify/ContinueMoving.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bded3f64d0494c498b62d34078b31aa57d089e08d3aca92cdf249bfd58e58545 +size 3852 diff --git a/Content/Character/Notify/ContinueSkilluse.uasset b/Content/Character/Notify/ContinueSkilluse.uasset new file mode 100644 index 0000000..ab788f5 --- /dev/null +++ b/Content/Character/Notify/ContinueSkilluse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1acf5a82ff800aa1f6a03bc92d96eab444cc9a25adcf625424ac8d594c147807 +size 3878 diff --git a/Content/Character/Notify/Rotating.uasset b/Content/Character/Notify/Rotating.uasset new file mode 100644 index 0000000..4b501ea --- /dev/null +++ b/Content/Character/Notify/Rotating.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91d70510270971c37f2ca062eaaed6a22a7b8ca059724a32ebafcea74d9ecb5e +size 57531 diff --git a/Content/Character/Notify/StopActing.uasset b/Content/Character/Notify/StopActing.uasset new file mode 100644 index 0000000..eb91ba7 --- /dev/null +++ b/Content/Character/Notify/StopActing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5be04eccdd27290f9f1c9f31457ccb405b7c4004c2954969b9c17b457416cbee +size 14117 diff --git a/Content/Character/Notify/StopAttack.uasset b/Content/Character/Notify/StopAttack.uasset new file mode 100644 index 0000000..a127bb7 --- /dev/null +++ b/Content/Character/Notify/StopAttack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8df777d340af4469c26b113afaf6eab4209525c55840ac91fd6bebfb43f0f0f0 +size 3800 diff --git a/Content/Character/Notify/StopMoving.uasset b/Content/Character/Notify/StopMoving.uasset new file mode 100644 index 0000000..0c1b150 --- /dev/null +++ b/Content/Character/Notify/StopMoving.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afa3a6a90a159064e7753f9fc209193b68d7d0ef0e1ccce897198e460e031c67 +size 3800 diff --git a/Content/Character/Notify/StopSkilluse.uasset b/Content/Character/Notify/StopSkilluse.uasset new file mode 100644 index 0000000..ef1b0a6 --- /dev/null +++ b/Content/Character/Notify/StopSkilluse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26697316f25273118fbcd217fe1a5f48d5f2faf26d954ff83cd4e88fa0fc8bc3 +size 3826 diff --git a/Content/Character/Notify/WallEnd.uasset b/Content/Character/Notify/WallEnd.uasset new file mode 100644 index 0000000..4826891 --- /dev/null +++ b/Content/Character/Notify/WallEnd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b57495a973ca98558fe0b6be6675bd5389086e123ea354379b4a56b2da6c69e2 +size 9387 diff --git a/Content/Maps/DevMap.umap b/Content/Maps/DevMap.umap new file mode 100644 index 0000000..2404469 --- /dev/null +++ b/Content/Maps/DevMap.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac7da83d7b779f1b7ad2bc245f2034fec5d7919f3a74faaa2cf26b6ffe72cf12 +size 181094 diff --git a/Content/Maps/Untitled.umap b/Content/Maps/Untitled.umap new file mode 100644 index 0000000..7a9aa03 --- /dev/null +++ b/Content/Maps/Untitled.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a36218beca4eff11888aaf61c012df87c726ffca88541348f67089f84fc6ce11 +size 178041 diff --git a/Content/StarterContent/Architecture/Floor_400x400.uasset b/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34af..80155b1 100644 --- a/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 -size 14948 +oid sha256:44357b5a4270d0cb911a98ae0a386edd55119db2b42bc103d9af18b60894dcc2 +size 15287 diff --git a/Content/StarterContent/Materials/M_Basic_Floor.uasset b/Content/StarterContent/Materials/M_Basic_Floor.uasset new file mode 100644 index 0000000..07401c9 --- /dev/null +++ b/Content/StarterContent/Materials/M_Basic_Floor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38e9963796183aa39c6cd4219fe60403740c902dadd223b96e37158f5b8e07f8 +size 9515 diff --git a/Content/StarterContent/Particles/Materials/M_Burst.uasset b/Content/StarterContent/Particles/Materials/M_Burst.uasset new file mode 100644 index 0000000..8b6ae42 --- /dev/null +++ b/Content/StarterContent/Particles/Materials/M_Burst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19bf8a8995e63597472be08617fc5c11494c214561d92ba58cc866bbd3fc9258 +size 15675 diff --git a/Content/StarterContent/Particles/Materials/M_Dust_Particle.uasset b/Content/StarterContent/Particles/Materials/M_Dust_Particle.uasset new file mode 100644 index 0000000..6a1195e --- /dev/null +++ b/Content/StarterContent/Particles/Materials/M_Dust_Particle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e054c7225139c4ed10e8695158b930b64c97deabca1f3c8160b382d40b082e94 +size 8718 diff --git a/Content/StarterContent/Particles/Materials/M_Radial_Gradient.uasset b/Content/StarterContent/Particles/Materials/M_Radial_Gradient.uasset new file mode 100644 index 0000000..96f3272 --- /dev/null +++ b/Content/StarterContent/Particles/Materials/M_Radial_Gradient.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:969f0add70f571adb7e14da5ca542a15955166103efd54168a5e248826564781 +size 10357 diff --git a/Content/StarterContent/Particles/Materials/M_Spark.uasset b/Content/StarterContent/Particles/Materials/M_Spark.uasset new file mode 100644 index 0000000..1754977 --- /dev/null +++ b/Content/StarterContent/Particles/Materials/M_Spark.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4d87a9647f2c232d84745d5c6379f3ad1d6dd2f11310af74f48c20c981d2cd5 +size 9786 diff --git a/Content/StarterContent/Particles/Materials/M_radial_ramp.uasset b/Content/StarterContent/Particles/Materials/M_radial_ramp.uasset new file mode 100644 index 0000000..bc957b9 --- /dev/null +++ b/Content/StarterContent/Particles/Materials/M_radial_ramp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:880794e3875c4394f93e280b35524a677e72a5a1edb06b03c8a0ae9efc2b51a6 +size 10366 diff --git a/Content/StarterContent/Particles/Materials/m_flare_01.uasset b/Content/StarterContent/Particles/Materials/m_flare_01.uasset new file mode 100644 index 0000000..4b49de3 --- /dev/null +++ b/Content/StarterContent/Particles/Materials/m_flare_01.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57377e5d237609372f0837407d7c9f35a5ba00bf81aa049102d699105af8a025 +size 14010 diff --git a/Content/StarterContent/Particles/P_Ambient_Dust.uasset b/Content/StarterContent/Particles/P_Ambient_Dust.uasset new file mode 100644 index 0000000..bf2e439 --- /dev/null +++ b/Content/StarterContent/Particles/P_Ambient_Dust.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01ef616c7a8bd90cd1b7a13efb18a56f33346efbae51efa31f09804478b7621d +size 43456 diff --git a/Content/StarterContent/Props/Materials/M_Shelf.uasset b/Content/StarterContent/Props/Materials/M_Shelf.uasset new file mode 100644 index 0000000..11fbc3b --- /dev/null +++ b/Content/StarterContent/Props/Materials/M_Shelf.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3a633e42f4a149f8846cda390b26211dc51bc1dbff29f17269679ef6fb15708 +size 14571 diff --git a/Source/Promether/AnimNotify/AN_AnimEnd.cpp b/Source/Promether/AnimNotify/AN_AnimEnd.cpp new file mode 100644 index 0000000..224aebf --- /dev/null +++ b/Source/Promether/AnimNotify/AN_AnimEnd.cpp @@ -0,0 +1,18 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "AN_AnimEnd.h" + +#include "../PlayerGeneric/DefaultPlayerCharacter.h" +#include "../PlayerGeneric/DefaultPlayerState.h" + +void UAN_AnimEnd::Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation, const FAnimNotifyEventReference& EventReference) +{ + ADefaultPlayerCharacter* MyCharacter = MeshComp->GetOwner(); + if (!MyCharacter) return; + + ADefaultPlayerState* MyState = MyCharacter->GetPlayerState(); + if (!MyState) return; + + MyState->SetState(ECharacterState::Idle); +} diff --git a/Source/Promether/AnimNotify/AN_AnimEnd.h b/Source/Promether/AnimNotify/AN_AnimEnd.h new file mode 100644 index 0000000..fe368fb --- /dev/null +++ b/Source/Promether/AnimNotify/AN_AnimEnd.h @@ -0,0 +1,19 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Animation/AnimNotifies/AnimNotify.h" +#include "AN_AnimEnd.generated.h" + +/** + * + */ +UCLASS() +class PROMETHER_API UAN_AnimEnd : public UAnimNotify +{ + GENERATED_BODY() + +public: + virtual void Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation, const FAnimNotifyEventReference& EventReference) override; +}; diff --git a/Source/Promether/AnimNotify/AN_Attack.cpp b/Source/Promether/AnimNotify/AN_Attack.cpp index 90827fb..7070d73 100644 --- a/Source/Promether/AnimNotify/AN_Attack.cpp +++ b/Source/Promether/AnimNotify/AN_Attack.cpp @@ -8,11 +8,8 @@ void UAN_Attack::Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation, const FAnimNotifyEventReference& EventReference) { - if (ADefaultPlayerCharacter* MyCharacter = MeshComp->GetOwner()) - { - if (AController* MyController = MyCharacter->GetController()) - { - MyCharacter->Attack(); - } - } + ADefaultPlayerCharacter* MyCharacter = MeshComp->GetOwner(); + if (!MyCharacter) return; + + MyCharacter->Attack(); } \ No newline at end of file diff --git a/Source/Promether/AnimNotify/AN_Skill1.cpp b/Source/Promether/AnimNotify/AN_Skill1.cpp index 3e76f1b..08d26ee 100644 --- a/Source/Promether/AnimNotify/AN_Skill1.cpp +++ b/Source/Promether/AnimNotify/AN_Skill1.cpp @@ -7,11 +7,8 @@ void UAN_Skill1::Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation, const FAnimNotifyEventReference& EventReference) { - if (ADefaultPlayerCharacter* MyCharacter = MeshComp->GetOwner()) - { - if (AController* MyController = MyCharacter->GetController()) - { - MyCharacter->Skill1(); - } - } + ADefaultPlayerCharacter* MyCharacter = MeshComp->GetOwner(); + if (!MyCharacter) return; + + MyCharacter->Skill1(); } diff --git a/Source/Promether/AnimNotify/AN_Skill2.cpp b/Source/Promether/AnimNotify/AN_Skill2.cpp index a500b3c..9ebf7b2 100644 --- a/Source/Promether/AnimNotify/AN_Skill2.cpp +++ b/Source/Promether/AnimNotify/AN_Skill2.cpp @@ -7,11 +7,8 @@ void UAN_Skill2::Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation, const FAnimNotifyEventReference& EventReference) { - if (ADefaultPlayerCharacter* MyCharacter = MeshComp->GetOwner()) - { - if (AController* MyController = MyCharacter->GetController()) - { - MyCharacter->Skill2(); - } - } + ADefaultPlayerCharacter* MyCharacter = MeshComp->GetOwner(); + if (!MyCharacter) return; + + MyCharacter->Skill2(); } diff --git a/Source/Promether/AnimNotify/AN_Skill3.cpp b/Source/Promether/AnimNotify/AN_Skill3.cpp index ed1c8a8..8c2b5e7 100644 --- a/Source/Promether/AnimNotify/AN_Skill3.cpp +++ b/Source/Promether/AnimNotify/AN_Skill3.cpp @@ -7,11 +7,8 @@ void UAN_Skill3::Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation, const FAnimNotifyEventReference& EventReference) { - if (ADefaultPlayerCharacter* MyCharacter = MeshComp->GetOwner()) - { - if (AController* MyController = MyCharacter->GetController()) - { - MyCharacter->Skill3(); - } - } + ADefaultPlayerCharacter* MyCharacter = MeshComp->GetOwner(); + if (!MyCharacter) return; + + MyCharacter->Skill3(); } diff --git a/Source/Promether/AnimNotify/AN_Skill4.cpp b/Source/Promether/AnimNotify/AN_Skill4.cpp index afaeb0f..e73362a 100644 --- a/Source/Promether/AnimNotify/AN_Skill4.cpp +++ b/Source/Promether/AnimNotify/AN_Skill4.cpp @@ -7,11 +7,8 @@ void UAN_Skill4::Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation, const FAnimNotifyEventReference& EventReference) { - if (ADefaultPlayerCharacter* MyCharacter = MeshComp->GetOwner()) - { - if (AController* MyController = MyCharacter->GetController()) - { - MyCharacter->Skill4(); - } - } + ADefaultPlayerCharacter* MyCharacter = MeshComp->GetOwner(); + if (!MyCharacter) return; + + MyCharacter->Skill4(); } diff --git a/Source/Promether/AnimNotify/AN_Skill5.cpp b/Source/Promether/AnimNotify/AN_Skill5.cpp new file mode 100644 index 0000000..10c0e7c --- /dev/null +++ b/Source/Promether/AnimNotify/AN_Skill5.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "AN_Skill5.h" + diff --git a/Source/Promether/AnimNotify/AN_Skill5.h b/Source/Promether/AnimNotify/AN_Skill5.h new file mode 100644 index 0000000..1d760ab --- /dev/null +++ b/Source/Promether/AnimNotify/AN_Skill5.h @@ -0,0 +1,17 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Animation/AnimNotifies/AnimNotify.h" +#include "AN_Skill5.generated.h" + +/** + * + */ +UCLASS() +class PROMETHER_API UAN_Skill5 : public UAnimNotify +{ + GENERATED_BODY() + +}; diff --git a/Source/Promether/AnimNotify/AN_Skill6.cpp b/Source/Promether/AnimNotify/AN_Skill6.cpp new file mode 100644 index 0000000..e2f2afd --- /dev/null +++ b/Source/Promether/AnimNotify/AN_Skill6.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "AN_Skill6.h" + diff --git a/Source/Promether/AnimNotify/AN_Skill6.h b/Source/Promether/AnimNotify/AN_Skill6.h new file mode 100644 index 0000000..60c37e3 --- /dev/null +++ b/Source/Promether/AnimNotify/AN_Skill6.h @@ -0,0 +1,17 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Animation/AnimNotifies/AnimNotify.h" +#include "AN_Skill6.generated.h" + +/** + * + */ +UCLASS() +class PROMETHER_API UAN_Skill6 : public UAnimNotify +{ + GENERATED_BODY() + +}; diff --git a/Source/Promether/AnimNotify/AN_Skill7.cpp b/Source/Promether/AnimNotify/AN_Skill7.cpp new file mode 100644 index 0000000..8866e78 --- /dev/null +++ b/Source/Promether/AnimNotify/AN_Skill7.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "AN_Skill7.h" + diff --git a/Source/Promether/AnimNotify/AN_Skill7.h b/Source/Promether/AnimNotify/AN_Skill7.h new file mode 100644 index 0000000..51b923b --- /dev/null +++ b/Source/Promether/AnimNotify/AN_Skill7.h @@ -0,0 +1,17 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Animation/AnimNotifies/AnimNotify.h" +#include "AN_Skill7.generated.h" + +/** + * + */ +UCLASS() +class PROMETHER_API UAN_Skill7 : public UAnimNotify +{ + GENERATED_BODY() + +}; diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp index c5daaf7..384cfa6 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp @@ -4,6 +4,7 @@ #include "DefaultPlayerCharacter.h" #include "DefaultPlayerState.h" #include "Engine/DamageEvents.h" +#include "Kismet/GameplayStatics.h" ADefaultPlayerCharacter::ADefaultPlayerCharacter() { @@ -78,9 +79,10 @@ void ADefaultPlayerCharacter::Tick(float DeltaTime) void ADefaultPlayerCharacter::Attack_Implementation() { + //UGameplayStatics::ApplyDamage(Target, MyState->GetAttackDamage(), Cast(GetOwner()), this, UBaseAttack::StaticClass()); } -float ADefaultPlayerCharacter::TakeDamage(float DamageAmount, struct FDamageEvent const& DamageEvent, class AController* EventInstigator, AActor* DamageCauser) +float ADefaultPlayerCharacter::TakeDamage_Implementation(float DamageAmount, struct FDamageEvent const& DamageEvent, class AController* EventInstigator, AActor* DamageCauser) { float ReturnValue = Super::TakeDamage(DamageAmount, DamageEvent, EventInstigator, DamageCauser); @@ -146,28 +148,70 @@ float ADefaultPlayerCharacter::TakeDamage(float DamageAmount, struct FDamageEven void ADefaultPlayerCharacter::Skill1_Implementation() { + NetMulticast_Skill1(); +} + +void ADefaultPlayerCharacter::NetMulticast_Skill1_Implementation() +{ + BP_Skill1(); } void ADefaultPlayerCharacter::Skill2_Implementation() { + NetMulticast_Skill2(); +} + +void ADefaultPlayerCharacter::NetMulticast_Skill2_Implementation() +{ + BP_Skill2(); } void ADefaultPlayerCharacter::Skill3_Implementation() { + NetMulticast_Skill3(); +} + +void ADefaultPlayerCharacter::NetMulticast_Skill3_Implementation() +{ + BP_Skill3(); } void ADefaultPlayerCharacter::Skill4_Implementation() { + NetMulticast_Skill4(); +} + +void ADefaultPlayerCharacter::NetMulticast_Skill4_Implementation() +{ + BP_Skill4(); } void ADefaultPlayerCharacter::Skill5_Implementation() { + NetMulticast_Skill5(); +} + +void ADefaultPlayerCharacter::NetMulticast_Skill5_Implementation() +{ + BP_Skill5(); } void ADefaultPlayerCharacter::Skill6_Implementation() { + NetMulticast_Skill6(); +} + +void ADefaultPlayerCharacter::NetMulticast_Skill6_Implementation() +{ + BP_Skill6(); } void ADefaultPlayerCharacter::Skill7_Implementation() { + NetMulticast_Skill7(); +} + +void ADefaultPlayerCharacter::NetMulticast_Skill7_Implementation() +{ + BP_Skill7(); } diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h index e18fd50..9cfb097 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h @@ -22,27 +22,72 @@ public: virtual void Tick(float DeltaTime) override; UFUNCTION(BlueprintNativeEvent) - void Attack() ; - virtual float TakeDamage( float Damage, + void Attack(); + UFUNCTION(BlueprintNativeEvent) + float TakeDamage( float Damage, struct FDamageEvent const& DamageEvent, AController* EventInstigator, AActor* DamageCauser ) override; - UFUNCTION(BlueprintNativeEvent) - void Skill1(); - UFUNCTION(BlueprintNativeEvent) - void Skill2(); - UFUNCTION(BlueprintNativeEvent) - void Skill3(); - UFUNCTION(BlueprintNativeEvent) - void Skill4(); - UFUNCTION(BlueprintNativeEvent) + + + + UFUNCTION(BlueprintCallable, Server, Reliable) + void Skill1(); + //Override me + UFUNCTION(BlueprintImplementableEvent) + void BP_Skill1(); + UFUNCTION(NetMulticast, Reliable) + void NetMulticast_Skill1(); + + UFUNCTION(BlueprintCallable, Server, Reliable) + void Skill2(); + //Override me + UFUNCTION(BlueprintImplementableEvent) + void BP_Skill2(); + UFUNCTION(NetMulticast, Reliable) + void NetMulticast_Skill2(); + + UFUNCTION(BlueprintCallable, Server, Reliable) + void Skill3(); + //Override me + UFUNCTION(BlueprintImplementableEvent) + void BP_Skill3(); + UFUNCTION(NetMulticast, Reliable) + void NetMulticast_Skill3(); + + UFUNCTION(BlueprintCallable, Server, Reliable) + void Skill4(); + //Override me + UFUNCTION(BlueprintImplementableEvent) + void BP_Skill4(); + UFUNCTION(NetMulticast, Reliable) + void NetMulticast_Skill4(); + + UFUNCTION(BlueprintCallable, Server, Reliable) void Skill5(); - UFUNCTION(BlueprintNativeEvent) + //Override me + UFUNCTION(BlueprintImplementableEvent) + void BP_Skill5(); + UFUNCTION(NetMulticast, Reliable) + void NetMulticast_Skill5(); + + UFUNCTION(BlueprintCallable, Server, Reliable) void Skill6(); - UFUNCTION(BlueprintNativeEvent) + //Override me + UFUNCTION(BlueprintImplementableEvent) + void BP_Skill6(); + UFUNCTION(NetMulticast, Reliable) + void NetMulticast_Skill6(); + + UFUNCTION(BlueprintCallable, Server, Reliable) void Skill7(); + //Override me + UFUNCTION(BlueprintImplementableEvent) + void BP_Skill7(); + UFUNCTION(NetMulticast, Reliable) + void NetMulticast_Skill7(); float GetHealth() const { return Health; } float GetHPRegeneration() const { return HPRegeneration; }