diff --git a/Content/Blueprints/BP_DefaultPlayerCharacter.uasset b/Content/Blueprints/BP_DefaultPlayerCharacter.uasset new file mode 100644 index 0000000..7ad4111 --- /dev/null +++ b/Content/Blueprints/BP_DefaultPlayerCharacter.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed03d63b74486bcb4ad8171c4685fae1a53fbcf17b2c56aae2e034b7c5015eb4 +size 102980 diff --git a/Content/Blueprints/DefaultClass.uasset b/Content/Blueprints/DefaultClass.uasset new file mode 100644 index 0000000..e1a4511 --- /dev/null +++ b/Content/Blueprints/DefaultClass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e8a0c4c04da4fc8856f04a18c5f5a97ec2d366bd739d928d1a2f43fd9dd9831 +size 12732 diff --git a/Content/Blueprints/Notify/ContinueActing.uasset b/Content/Blueprints/Notify/ContinueActing.uasset new file mode 100644 index 0000000..b5a29a8 --- /dev/null +++ b/Content/Blueprints/Notify/ContinueActing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7ae0c32df64ec0400847696174792b47d0196bf4a7b3f1cf42dbb26724c3d82 +size 3855 diff --git a/Content/Blueprints/Notify/ContinueAttack.uasset b/Content/Blueprints/Notify/ContinueAttack.uasset new file mode 100644 index 0000000..ee7501c --- /dev/null +++ b/Content/Blueprints/Notify/ContinueAttack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d99517784b93d74e322385926fd04e622f04be3a0d4e9bed1e831a6fd5498cc8 +size 3855 diff --git a/Content/Blueprints/Notify/ContinueMoving.uasset b/Content/Blueprints/Notify/ContinueMoving.uasset new file mode 100644 index 0000000..c2442cc --- /dev/null +++ b/Content/Blueprints/Notify/ContinueMoving.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f384ceebe3f4f23a5d593fc64a784bc6f4b210d287bac1a27dc2e03a65d295c3 +size 3855 diff --git a/Content/Blueprints/Notify/ContinueSkilluse.uasset b/Content/Blueprints/Notify/ContinueSkilluse.uasset new file mode 100644 index 0000000..122aa21 --- /dev/null +++ b/Content/Blueprints/Notify/ContinueSkilluse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b290c705aacab9bac94a5fa987677d6a8d257228bfdac41fd18f32f76fc864db +size 3881 diff --git a/Content/Blueprints/Notify/Rotating.uasset b/Content/Blueprints/Notify/Rotating.uasset new file mode 100644 index 0000000..67991e5 --- /dev/null +++ b/Content/Blueprints/Notify/Rotating.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba1f424ef906ac9156583ad03b311f5d2b5300174c72a5635b38903967433fe9 +size 22179 diff --git a/Content/Blueprints/Notify/StopActing.uasset b/Content/Blueprints/Notify/StopActing.uasset new file mode 100644 index 0000000..965f10d --- /dev/null +++ b/Content/Blueprints/Notify/StopActing.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59bf1f97b38e7e9aa484edd9ee2e6d162907fa77e07ce6456751f9e200473e66 +size 14026 diff --git a/Content/Blueprints/Notify/StopAttack.uasset b/Content/Blueprints/Notify/StopAttack.uasset new file mode 100644 index 0000000..9c4d270 --- /dev/null +++ b/Content/Blueprints/Notify/StopAttack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f7de2ff99b7e0d81fdec737b2001cbe2f4d22004505ca01fea68084437c85cb +size 3803 diff --git a/Content/Blueprints/Notify/StopMoving.uasset b/Content/Blueprints/Notify/StopMoving.uasset new file mode 100644 index 0000000..f2b2c65 --- /dev/null +++ b/Content/Blueprints/Notify/StopMoving.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1535f43fd5a9ad52ef6541ac34f82f2857c92b2a4d879dddb25b68fe0583cacf +size 3803 diff --git a/Content/Blueprints/Notify/StopSkilluse.uasset b/Content/Blueprints/Notify/StopSkilluse.uasset new file mode 100644 index 0000000..2397097 --- /dev/null +++ b/Content/Blueprints/Notify/StopSkilluse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0774b0d26f9cd208ddd33c4f8bd4261d61f57ae44e3039663adf97440c8e47e +size 3829 diff --git a/Content/Blueprints/Notify/WallEnd.uasset b/Content/Blueprints/Notify/WallEnd.uasset new file mode 100644 index 0000000..ea4c28c --- /dev/null +++ b/Content/Blueprints/Notify/WallEnd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51022217f5e3a241d114246f85ae9ec538c112a78e734a4a59f388de014af7d7 +size 9390 diff --git a/Content/Blueprints/UI/NameBar_UI/Hp_UI.uasset b/Content/Blueprints/UI/NameBar_UI/Hp_UI.uasset new file mode 100644 index 0000000..816b56b --- /dev/null +++ b/Content/Blueprints/UI/NameBar_UI/Hp_UI.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2877acbc721a9df5d84792b419234aeb962f087a60ac7a603d94d00b6c9113c +size 8232 diff --git a/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset b/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset new file mode 100644 index 0000000..46b0ea0 --- /dev/null +++ b/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34405aea280fc58dfc0e1c30360da97999b2d5ca3f411ed7903ed20cc08383b2 +size 89790 diff --git a/Content/Character/Allium/BP_Allium.uasset b/Content/Character/Allium/BP_Allium.uasset index 9122094..10e125c 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:f2170a5f1bef59fe201c622cace975291f9352897ca17b186c05cacd41e8709a -size 130328 +oid sha256:0612af232772bf9dc4793b17427758cd6358a643dcbc52cd1314284dc1e9623e +size 130554 diff --git a/Content/Character/BP_Folder/BP_DefaultPlayerCharacter.uasset b/Content/Character/BP_Folder/BP_DefaultPlayerCharacter.uasset deleted file mode 100644 index 67fc4cc..0000000 --- a/Content/Character/BP_Folder/BP_DefaultPlayerCharacter.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:593ac8b14902ff3cf56e93f7dfb7415ab8cf10bd717378d6a04eff2beb3921d0 -size 106010 diff --git a/Content/Character/BP_Folder/DefaultClass.uasset b/Content/Character/BP_Folder/DefaultClass.uasset deleted file mode 100644 index 53535d1..0000000 --- a/Content/Character/BP_Folder/DefaultClass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25cdab2bc7f4974adf1757b7cb5f49a1992c2138539efa84aa91d1ed1e1f402d -size 12818 diff --git a/Content/Character/Lb/Animation/Q_Anim.uasset b/Content/Character/Lb/Animation/Q_Anim.uasset index fb7dbb4..3592790 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:d68b54e7884d73592bdd8d1f482beae22a1a46528d79b893c8da7671d26811de -size 115061 +oid sha256:e3cefd61ddac5380346c7e1fc9f40747cc5597a9dc197b910bca07b832c45166 +size 115087 diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index 9f47318..2a2539b 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:5c39784d45dfac8cce880c52bff49faa73e19f7cbd349d6cb9aa0e22c5bd34f6 -size 233790 +oid sha256:ef3a8d2091e2f05a34e607cc7d77dc9cc06dae22cde931e47403e2099bbef919 +size 225250 diff --git a/Content/Character/Lb/EskillBuff.uasset b/Content/Character/Lb/EskillBuff.uasset index 31e306e..52dd2d0 100644 --- a/Content/Character/Lb/EskillBuff.uasset +++ b/Content/Character/Lb/EskillBuff.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9628fbbcc216c910586edbfe2ebb76fc2a99e98ea91c55602d72811081609fd6 -size 100232 +oid sha256:16f2ee0c1da6bd0f378feb16a43266eb6d20baf925ef69f4d8e8548c4a566f14 +size 98732 diff --git a/Content/Character/Notify/ContinueActing.uasset b/Content/Character/Notify/ContinueActing.uasset deleted file mode 100644 index 3d812b8..0000000 --- a/Content/Character/Notify/ContinueActing.uasset +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 1424564..0000000 --- a/Content/Character/Notify/ContinueAttack.uasset +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 187e806..0000000 --- a/Content/Character/Notify/ContinueMoving.uasset +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index ab788f5..0000000 --- a/Content/Character/Notify/ContinueSkilluse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 1721fbc..0000000 --- a/Content/Character/Notify/Rotating.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:722e1ba1cb36019a359f0a97fb2e4dd68f1bf9d66e18a5cbf36590126b04b1bf -size 22176 diff --git a/Content/Character/Notify/StopActing.uasset b/Content/Character/Notify/StopActing.uasset deleted file mode 100644 index eb91ba7..0000000 --- a/Content/Character/Notify/StopActing.uasset +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index a127bb7..0000000 --- a/Content/Character/Notify/StopAttack.uasset +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 0c1b150..0000000 --- a/Content/Character/Notify/StopMoving.uasset +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index ef1b0a6..0000000 --- a/Content/Character/Notify/StopSkilluse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 4826891..0000000 --- a/Content/Character/Notify/WallEnd.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b57495a973ca98558fe0b6be6675bd5389086e123ea354379b4a56b2da6c69e2 -size 9387 diff --git a/Content/Character/Riana/BP_Riana.uasset b/Content/Character/Riana/BP_Riana.uasset index 2e8aa4b..6938360 100644 --- a/Content/Character/Riana/BP_Riana.uasset +++ b/Content/Character/Riana/BP_Riana.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c21e9b8605595d4c8b890bb9a254fdb13a0571e726e14bbc16afdaf8cf7dee9b -size 34177 +oid sha256:c484c3539bde1614235fc8a2262d923166c8050e030bed85a5a6368434f73b53 +size 36354 diff --git a/Content/Maps/DevMap.umap b/Content/Maps/DevMap.umap index bae0ed6..54d300c 100644 --- a/Content/Maps/DevMap.umap +++ b/Content/Maps/DevMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c3f62cb9b51532e3d85b3cc6ec7d1278a5f04df62f77849e61d67600dc3c0aaf -size 244002 +oid sha256:b3f39c3aa2f0c7cf8c4c6038d81ec823474c5a05d4e0754ca5267d76f8e9eaa6 +size 178928 diff --git a/Content/UI/NameBar_UI/Hp_UI.uasset b/Content/UI/NameBar_UI/Hp_UI.uasset deleted file mode 100644 index e6f88ce..0000000 --- a/Content/UI/NameBar_UI/Hp_UI.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e6ecc3639214822da96a4b9d2f29be315e6d9e364219f7694e2c7b7b18d5d0d -size 10744 diff --git a/Content/UI/NameBar_UI/NameBar_UI.uasset b/Content/UI/NameBar_UI/NameBar_UI.uasset deleted file mode 100644 index 15fde60..0000000 --- a/Content/UI/NameBar_UI/NameBar_UI.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bbd86d0f18bc22c27040bb40d268b9d83d502a7885dfc02fceaf79bdf8f28bf7 -size 76313 diff --git a/Source/Promether/DefaultStats.h b/Source/Promether/DefaultStats.h deleted file mode 100644 index 9c74487..0000000 --- a/Source/Promether/DefaultStats.h +++ /dev/null @@ -1,79 +0,0 @@ -#pragma once - -#include "CoreMinimal.h" -#include "DefaultStats.generated.h" - -USTRUCT(Atomic, BlueprintType) -struct FDefaultStats -{ - GENERATED_BODY() - - UPROPERTY(EditAnywhere, BlueprintReadWrite) - int32 XP; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float Health; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float HPRegeneration; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float HealAndShieldpower; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float Armor; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float MagicResistance; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float Tenacity; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float SlowRisist; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float AttackSpeed; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float AttackDamage; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float AbilityPower; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float CriticalStrikeChance; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float CriticalStrikeDamage; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float ArmorPenetration; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float MagicPenetration; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float LifeSteal; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float PhysicalVamp; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float Omnivamp; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float AbilityHaste; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float Mana; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float ManaRegeneration; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float Energy; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float EnergyRegeneration; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float AttackRange; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float MovementSpeed; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float GoldGeneration; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float AttackDamageGrowth; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float AttackSpeedGrowth; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float ArmorGrowth; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float MagicResistanceGrowth; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float HealthGrowth; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float HealthRegenerationGrowth; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float ManaGrowth; - UPROPERTY(EditAnywhere, BlueprintReadWrite) - float ManaRegenerationGrowth; -}; diff --git a/Source/Promether/MyActor.cpp b/Source/Promether/MyActor.cpp deleted file mode 100644 index 03ff5b6..0000000 --- a/Source/Promether/MyActor.cpp +++ /dev/null @@ -1,34 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "MyActor.h" -#include "Net/UnrealNetwork.h" - -// Sets default values -AMyActor::AMyActor() -{ - // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. - PrimaryActorTick.bCanEverTick = true; - -} - -// Called when the game starts or when spawned -void AMyActor::BeginPlay() -{ - Super::BeginPlay(); - -} - -// Called every frame -void AMyActor::Tick(float DeltaTime) -{ - Super::Tick(DeltaTime); - -} - -void AMyActor::GetLifetimeReplicatedProps(TArray& OutLifetimeProps) const -{ - Super::GetLifetimeReplicatedProps(OutLifetimeProps); - - DOREPLIFETIME(AMyActor, example); -} diff --git a/Source/Promether/MyActor.h b/Source/Promether/MyActor.h deleted file mode 100644 index d89eb56..0000000 --- a/Source/Promether/MyActor.h +++ /dev/null @@ -1,30 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "GameFramework/Actor.h" -#include "PrometherEnum.h" -#include "MyActor.generated.h" - -UCLASS() -class PROMETHER_API AMyActor : public AActor -{ - GENERATED_BODY() - -public: - // Sets default values for this actor's properties - AMyActor(); - -protected: - // Called when the game starts or when spawned - virtual void BeginPlay() override; - -public: - // Called every frame - virtual void Tick(float DeltaTime) override; - void GetLifetimeReplicatedProps(TArray< FLifetimeProperty >& OutLifetimeProps) const override; - - UPROPERTY(Replicated, EditAnywhere, BlueprintReadWrite) - FDefaultStats example; -}; diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp index 111935d..b1ca90d 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp @@ -384,16 +384,14 @@ void ADefaultPlayerController::Move() ObjectTypes.Add(UEngineTypes::ConvertToObjectType(ECollisionChannel::ECC_Pawn)); GetHitResultUnderCursorForObjects(ObjectTypes, true, HitResult); - ACharacter* HitObject = Cast(HitResult.GetActor()); //오브젝트를 가져와 HitCharactor에 저장<<추후 적 캐릭터일때만 저장으로 변경해야함 + ACharacter* HitCharacter = Cast(HitResult.GetActor()); //오브젝트를 가져와 HitCharactor에 저장<<추후 적 캐릭터일때만 저장으로 변경해야함 - if (HitObject != nullptr) //지금은 HitObject가 null이 아닐 경우 Attack()을 실행하는 코드지만, HitObject가 적 캐릭터일 때 실행으로 변경해야함 + if (HitCharacter != nullptr) //지금은 HitObject가 null이 아닐 경우 Attack()을 실행하는 코드지만, HitObject가 적 캐릭터일 때 실행으로 변경해야함 { - - Attack(HitObject); //HitObject를 대상으로 Attack 실행 + Attack(HitCharacter); //HitObject를 대상으로 Attack 실행 } else { - HitObject = nullptr; FVector Destination = GetMouseHitLocation(); GetPlayerState()->SetState(ECharacterState::Moving); SimpleMoveToLocation(this, Destination); @@ -402,11 +400,6 @@ void ADefaultPlayerController::Move() } - - - - - void ADefaultPlayerController::Multicast_SetRotation_Implementation(FVector MouseHitLocation) { FVector Location = GetPawn()->GetActorLocation(); @@ -571,55 +564,37 @@ void ADefaultPlayerController::OnMoveCompleted(FAIRequestID RequestID, const FPa void ADefaultPlayerController::Attack(ACharacter* HitObject) { - + if (!HitObject) return; + float MinDistance = GetPlayerState()->Stats[(uint8)EStats:: AttackRange]; - FVector Destination = HitObject->GetActorLocation(); // HitObject의 위치를 목적지로 설정 - if (FVector::Dist(Destination, GetPawn()->GetActorLocation()) <= MinDistance) - { - if ((GetPlayerState()->CooldownDuration[(uint8)CooldownType::Attack] == 0)) - { - FVector Location = GetPawn()->GetActorLocation(); - Location.Z = 0; + FVector Destination = HitObject->GetActorLocation(); // HitObject의 위치를 목적지로 설정 - Server_StopMove(); - Multicast_StopMove(); + if (FVector::Dist(Destination, GetPawn()->GetActorLocation()) <= MinDistance) + { + if ((GetPlayerState()->CooldownDuration[(uint8)CooldownType::Attack] != 0)) + return; - Multicast_SetRotation(GetMouseHitLocation()); - Server_SetRotation(GetMouseHitLocation()); + FVector Location = GetPawn()->GetActorLocation(); + Location.Z = 0; - UE_LOG(LogTemp, Warning, TEXT("Attack")); - GetPlayerState()->SetState(ECharacterState::Attack); - GetPlayerState()->SetAttackType(CooldownType::Attack); - } - else - { - FVector Location = GetPawn()->GetActorLocation(); - Location.Z = 0; + Server_StopMove(); + Multicast_StopMove(); - Server_StopMove(); - Multicast_StopMove(); + Multicast_SetRotation(GetMouseHitLocation()); + Server_SetRotation(GetMouseHitLocation()); - Multicast_SetRotation(GetMouseHitLocation()); - Server_SetRotation(GetMouseHitLocation()); - - UE_LOG(LogTemp, Warning, TEXT("Attack")); - GetPlayerState()->SetState(ECharacterState::Idle); - GetPlayerState()->SetAttackType(CooldownType::Attack); - } - - } - else - { - GetPlayerState()->SetState(ECharacterState::Moving); - SimpleMoveToLocation(this, Destination); + UE_LOG(LogTemp, Warning, TEXT("Attack")); + GetPlayerState()->SetState(ECharacterState::Attack); + GetPlayerState()->SetAttackType(CooldownType::Attack); + } + else + { + GetPlayerState()->SetState(ECharacterState::Moving); + SimpleMoveToLocation(this, Destination); - Destination = HitObject->GetActorLocation(); // HitObject의 위치를 목적지로 설정 - this->MoveToLocation(Destination); - - - } - - + Destination = HitObject->GetActorLocation(); // HitObject의 위치를 목적지로 설정 + this->MoveToLocation(Destination); + } } void ADefaultPlayerController::MoveToLocation_Implementation(FVector Location) diff --git a/Source/Promether/PrometherEnum.h b/Source/Promether/PrometherEnum.h index e2d31e4..e7da3d1 100644 --- a/Source/Promether/PrometherEnum.h +++ b/Source/Promether/PrometherEnum.h @@ -2,7 +2,6 @@ #include "CoreMinimal.h" #include "DamageType/BaseAttack.h" -#include "DefaultStats.h" UENUM(BlueprintType) enum class CharacterType : uint8