diff --git a/Content/Blueprints/BP_DefaultPlayerCharacter.uasset b/Content/Blueprints/BP_DefaultPlayerCharacter.uasset index 7ad4111..a47f8ac 100644 --- a/Content/Blueprints/BP_DefaultPlayerCharacter.uasset +++ b/Content/Blueprints/BP_DefaultPlayerCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed03d63b74486bcb4ad8171c4685fae1a53fbcf17b2c56aae2e034b7c5015eb4 -size 102980 +oid sha256:5d988eb6e716f4c217cf980174235fb770bdf11253f7f7e63ca6deec5055e166 +size 102393 diff --git a/Content/Blueprints/Notify/StopActing.uasset b/Content/Blueprints/Notify/StopActing.uasset index 965f10d..e13bda7 100644 --- a/Content/Blueprints/Notify/StopActing.uasset +++ b/Content/Blueprints/Notify/StopActing.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59bf1f97b38e7e9aa484edd9ee2e6d162907fa77e07ce6456751f9e200473e66 -size 14026 +oid sha256:42ef7cbaaef3aa5d513941a20d68949eaf73787e8e209e69fb21db35b9d19e97 +size 53990 diff --git a/Content/Character/Allium/Animation/Skill1_Anim.uasset b/Content/Character/Allium/Animation/Skill1_Anim.uasset index c5f3364..5f22599 100644 --- a/Content/Character/Allium/Animation/Skill1_Anim.uasset +++ b/Content/Character/Allium/Animation/Skill1_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd556610da0df0a6a16fc09f65567c84ea62db0cfa4197a7902cd1472391384f -size 152237 +oid sha256:e56b6bc167cde83785ca84338e510429671cdf7f00e429ddbfb04c04f267e4f8 +size 153762 diff --git a/Content/Character/Allium/Animation/Skill2_Anim.uasset b/Content/Character/Allium/Animation/Skill2_Anim.uasset index 8163963..bbee421 100644 --- a/Content/Character/Allium/Animation/Skill2_Anim.uasset +++ b/Content/Character/Allium/Animation/Skill2_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6539635adc8b24217af1bbc63737c941c084faf30a1ae8c3b25a9082f4a9de0c -size 132678 +oid sha256:e9b3093ce47a9ba21aa9b7b300aa02a1463118fe5c185c2c5ce898879ef83fb7 +size 134264 diff --git a/Content/Character/Allium/Animation/Skill3_Anim.uasset b/Content/Character/Allium/Animation/Skill3_Anim.uasset index 3a7b785..d60ecc7 100644 --- a/Content/Character/Allium/Animation/Skill3_Anim.uasset +++ b/Content/Character/Allium/Animation/Skill3_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:edfd48e96369cd5c11d4c4bb7cd183881e87126d5ce048e1c7e4fcf75a940337 -size 152144 +oid sha256:00988e0f3920ce76000a90cd64f1f829118b8b39f4652746be514546b7d03cbf +size 153682 diff --git a/Content/Character/Allium/Animation/Skill4_2_Anim.uasset b/Content/Character/Allium/Animation/Skill4_2_Anim.uasset index db038ce..8a9e167 100644 --- a/Content/Character/Allium/Animation/Skill4_2_Anim.uasset +++ b/Content/Character/Allium/Animation/Skill4_2_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14924dede128da8b50bd7c9793a288d4ad8acbfa014850a9f0e78c5cd5e19985 -size 182598 +oid sha256:28ab4fc42402b5083aef2271ead96408a289a65c6f2442afe13c7d89198b074b +size 184160 diff --git a/Content/Character/Lb/Animation/E_Anim.uasset b/Content/Character/Lb/Animation/E_Anim.uasset index 7628b40..d33bbaf 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:f21d678000aac53d8ea2afe024bd514f97efea8b1aaa843393587fad37aedaf6 -size 89666 +oid sha256:74adcf693de721558b5aa62aed354eaae2862087ba65a8ff7d3e8c27e50820ee +size 91170 diff --git a/Content/Character/Lb/Animation/Q_Anim.uasset b/Content/Character/Lb/Animation/Q_Anim.uasset index 3592790..f36f29c 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:e3cefd61ddac5380346c7e1fc9f40747cc5597a9dc197b910bca07b832c45166 -size 115087 +oid sha256:a5984063a1930cfdf19321d178f4111d238ec1002f8f48ae35f27c52c98b4a56 +size 113564 diff --git a/Content/Character/Lb/Animation/R2_Anim.uasset b/Content/Character/Lb/Animation/R2_Anim.uasset index 8a69d0e..3eef303 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:228c3f0cc7442f470f1f6ecd7ac3e46d058570c339c3ea599db5a9e6e27da282 -size 164747 +oid sha256:d6ae41ff7a2ddc142713017c4cafff07615f8be9ec4b0db529ae51a24fa2da11 +size 166193 diff --git a/Content/Character/Lb/Animation/W_Anim.uasset b/Content/Character/Lb/Animation/W_Anim.uasset index bb8f739..b1bc693 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:c04e3acd517a9ee4b5fb9fa87af619da7c2e9c216b97d6ad9772cd210547e318 -size 118452 +oid sha256:268ff98f0466c76117c4d86f59f47de528952bd4ee4c0f9221e8eefd0a2c1ffa +size 119984 diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index 980d796..9f77076 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:8e946cefb98a5ed6565c5943efc6b51bf020c23797380b3a2ae75db37cb45ba5 -size 238249 +oid sha256:6c4a13532c7101cd194845f8069db6df96c284efe40301c7c0727f87693ca79c +size 266012 diff --git a/Content/Character/Lb/EskillBuff.uasset b/Content/Character/Lb/EskillBuff.uasset index 4ee7c33..cbe90de 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:d10fea60f675537a077865e12c7f5bdab7d7a58751471eb7271b7f72e91bdb31 -size 93517 +oid sha256:cf5d2c33aa4a67e81d1ac937c98354e4fa3350dc5e633c94220246856b0f0692 +size 92305 diff --git a/Content/Character/Lb/Skeleton/Lb.uasset b/Content/Character/Lb/Skeleton/Lb.uasset index 19bbaad..35bf73c 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:cc32989418fcf75ee7aad3eb0a5b7ff7ac4add3436dc4d26f99775b4b75467a0 -size 20951 +oid sha256:0c9b3c6b51850d620f6e45f1ad68e317b896c11a847b526441952d398bc6ae1c +size 20962 diff --git a/Content/Character/Riana/Animation/Skill1_Anim.uasset b/Content/Character/Riana/Animation/Skill1_Anim.uasset index c050b46..739d5e8 100644 --- a/Content/Character/Riana/Animation/Skill1_Anim.uasset +++ b/Content/Character/Riana/Animation/Skill1_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0640a2008ce02d32601ef85e630fe2ab73725a0fb350f7fab92a49281d484ab -size 238777 +oid sha256:f15ee4e30d086f704c4d179741b69506dd2c86a3ec4b9cfff028d0110f19373f +size 242766 diff --git a/Content/Character/Riana/Animation/Skill2_Anim.uasset b/Content/Character/Riana/Animation/Skill2_Anim.uasset index 5a712a3..9a2e160 100644 --- a/Content/Character/Riana/Animation/Skill2_Anim.uasset +++ b/Content/Character/Riana/Animation/Skill2_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dde93aed881d93919553fbd14587cbea0ba6082b9610b06b6749a2d3ca25364b -size 236012 +oid sha256:1896510ccc0b24a41b66fbde6371c73e6612b383f7cb22c3df482437851a5d82 +size 240054 diff --git a/Content/Character/Riana/Animation/Skill3_Anim.uasset b/Content/Character/Riana/Animation/Skill3_Anim.uasset index ef75984..5c5ee0e 100644 --- a/Content/Character/Riana/Animation/Skill3_Anim.uasset +++ b/Content/Character/Riana/Animation/Skill3_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d207c80c476fac57686c95dbae7c5ec77bf3d53fe6150ed19246eea65f471ca4 -size 235183 +oid sha256:57aaef174e28851a23918a89f2334094a60c4fe855c86ef431d2184bd5a6d9ab +size 236690 diff --git a/Content/Character/Riana/Animation/Skill4_3_Anim.uasset b/Content/Character/Riana/Animation/Skill4_3_Anim.uasset index 86d2780..364f584 100644 --- a/Content/Character/Riana/Animation/Skill4_3_Anim.uasset +++ b/Content/Character/Riana/Animation/Skill4_3_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e208e84d3ac53af1e7e784b215e83e8f94c49fa56ec0c9a2c6bbd213d1142300 -size 302627 +oid sha256:d58bd905f55aed7cb6f658f364156de4e1f3bd054659ad039ced3a803546b47d +size 304141 diff --git a/Content/Maps/DevMap.umap b/Content/Maps/DevMap.umap index 4abe91d..6c4831b 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:b9cb626a34e7de3e2f930faf6c5f4e23b7a5bf7420f69bfa539880e78c5d50c4 -size 179055 +oid sha256:1100c4cf9b9e4b7d555b6ef754a4da8a57cce152acd4b4637037ada519d97c0f +size 179095 diff --git a/Source/Promether/AnimNotify/AN_AnimEnd.cpp b/Source/Promether/AnimNotify/AN_AnimEnd.cpp index 224aebf..053f104 100644 --- a/Source/Promether/AnimNotify/AN_AnimEnd.cpp +++ b/Source/Promether/AnimNotify/AN_AnimEnd.cpp @@ -6,6 +6,7 @@ #include "../PlayerGeneric/DefaultPlayerCharacter.h" #include "../PlayerGeneric/DefaultPlayerState.h" + void UAN_AnimEnd::Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation, const FAnimNotifyEventReference& EventReference) { ADefaultPlayerCharacter* MyCharacter = MeshComp->GetOwner(); @@ -13,6 +14,6 @@ void UAN_AnimEnd::Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* An ADefaultPlayerState* MyState = MyCharacter->GetPlayerState(); if (!MyState) return; - MyState->SetState(ECharacterState::Idle); + } diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp index bd5c6b8..13fab29 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp @@ -14,6 +14,8 @@ #include "DefaultPlayerState.h" #include "DefaultPlayerCamera.h" + + void ADefaultPlayerController::BeginPlay() { Super::BeginPlay(); @@ -246,8 +248,17 @@ void ADefaultPlayerController::SetupInputComponent() void ADefaultPlayerController::Skill1() { + if (!GetPlayerState()->Stats[(uint8)EStats::Skillusable] == 0) + return; if (!(GetPlayerState()->Stats[(uint8)EStats::Mana] >= GetPlayerState()->Stats[(uint8)EStats::Skill1Cost])) return; + GetPlayerState()->Stats[(uint8)EStats::Mana] -= GetPlayerState()->Stats[(uint8)EStats::Skill1Cost]; + EndAttack(); + + GetPlayerState()->Stats[(uint8)EStats::Attackable] = 1; + GetPlayerState()->Stats[(uint8)EStats::Skillusable] = 1; + GetPlayerState()->Stats[(uint8)EStats::Movable] = 1; + ACharacter* HitObject = nullptr; FVector Location = GetPawn()->GetActorLocation(); @@ -266,9 +277,16 @@ void ADefaultPlayerController::Skill1() void ADefaultPlayerController::Skill2() { + if (!GetPlayerState()->Stats[(uint8)EStats::Skillusable] == 0) + return; if (!(GetPlayerState()->Stats[(uint8)EStats::Mana] >= GetPlayerState()->Stats[(uint8)EStats::Skill2Cost])) return; + GetPlayerState()->Stats[(uint8)EStats::Mana] -= GetPlayerState()->Stats[(uint8)EStats::Skill2Cost]; + EndAttack(); + GetPlayerState()->Stats[(uint8)EStats::Attackable] = 1; + GetPlayerState()->Stats[(uint8)EStats::Skillusable] = 1; + GetPlayerState()->Stats[(uint8)EStats::Movable] = 1; ACharacter* HitObject = nullptr; FVector Location = GetPawn()->GetActorLocation(); Location.Z = 0; @@ -286,8 +304,15 @@ void ADefaultPlayerController::Skill2() void ADefaultPlayerController::Skill3() { + if (!GetPlayerState()->Stats[(uint8)EStats::Skillusable] == 0) + return; if (!(GetPlayerState()->Stats[(uint8)EStats::Mana] >= GetPlayerState()->Stats[(uint8)EStats::Skill3Cost])) return; + GetPlayerState()->Stats[(uint8)EStats::Mana] -= GetPlayerState()->Stats[(uint8)EStats::Skill3Cost]; + EndAttack(); + GetPlayerState()->Stats[(uint8)EStats::Attackable] = 1; + GetPlayerState()->Stats[(uint8)EStats::Skillusable] = 1; + GetPlayerState()->Stats[(uint8)EStats::Movable] = 1; ACharacter* HitObject = nullptr; FVector Location = GetPawn()->GetActorLocation(); @@ -306,8 +331,27 @@ void ADefaultPlayerController::Skill3() void ADefaultPlayerController::Skill4Triggered() { - if (!(GetPlayerState()->Stats[(uint8)EStats::Mana] >= GetPlayerState()->Stats[(uint8)EStats::Skill4Cost])) - return; + if (GetPlayerState()->Stats[(uint8)EStats::charging] == 1)//차지가 1(false)일 때 + { + if (!GetPlayerState()->Stats[(uint8)EStats::Skillusable] == 0) + return; + if (!(GetPlayerState()->Stats[(uint8)EStats::Mana] >= GetPlayerState()->Stats[(uint8)EStats::Skill4Cost])) + return; + GetPlayerState()->Stats[(uint8)EStats::Mana] -= GetPlayerState()->Stats[(uint8)EStats::Skill4Cost]; + GetPlayerState()->Stats[(uint8)EStats::charging] = 0;// 수치를 계산하고 charge를 true(0)로 변경 + } + else if (GetPlayerState()->Stats[(uint8)EStats::charging] == 2) //차지가 2(never)일 때 + { + if (!GetPlayerState()->Stats[(uint8)EStats::Skillusable] == 0) + return; + if (!(GetPlayerState()->Stats[(uint8)EStats::Mana] >= GetPlayerState()->Stats[(uint8)EStats::Skill4Cost])) + return; + GetPlayerState()->Stats[(uint8)EStats::Mana] -= GetPlayerState()->Stats[(uint8)EStats::Skill4Cost]; // 그냥 수치 계산만 실행 + } + EndAttack(); + GetPlayerState()->Stats[(uint8)EStats::Attackable] = 1; + GetPlayerState()->Stats[(uint8)EStats::Skillusable] = 1; + GetPlayerState()->Stats[(uint8)EStats::Movable] = 1; ACharacter* HitObject = nullptr; FVector Location = GetPawn()->GetActorLocation(); @@ -378,6 +422,7 @@ void ADefaultPlayerController::ObjectSelect() void ADefaultPlayerController::Move() { + EndAttack(); FHitResult HitResult; TArray> ObjectTypes; ObjectTypes.Add(UEngineTypes::ConvertToObjectType(ECollisionChannel::ECC_WorldStatic)); @@ -385,11 +430,14 @@ void ADefaultPlayerController::Move() GetHitResultUnderCursorForObjects(ObjectTypes, true, HitResult); ACharacter* HitCharacter = Cast(HitResult.GetActor()); //오브젝트를 가져와 HitCharactor에 저장<<추후 적 캐릭터일때만 저장으로 변경해야함 + HitTarget = Cast(HitResult.GetActor()); UE_LOG(LogTemp, Warning, TEXT("%s"), *HitResult.GetActor()->GetName()); if (HitResult.GetActor() != GetPawn()) //지금은 HitObject가 null이 아닐 경우 Attack()을 실행하는 코드지만, HitObject가 적 캐릭터일 때 실행으로 변경해야함 { + if (!GetPlayerState()->Stats[(uint8)EStats::Attackable] == 0) + return; if (!HitCharacter) { FVector Destination = GetMouseHitLocation(); @@ -398,10 +446,12 @@ void ADefaultPlayerController::Move() this->MoveToLocation(Destination); return; } - Attack(HitCharacter); //HitObject를 대상으로 Attack 실행 + BeginAttack(); //HitObject를 대상으로 BeginAttack 실행 } else { + if (!GetPlayerState()->Stats[(uint8)EStats::Movable] == 0) + return; FVector Destination = GetMouseHitLocation(); GetPlayerState()->SetState(ECharacterState::Moving); SimpleMoveToLocation(this, Destination); @@ -415,7 +465,14 @@ void ADefaultPlayerController::Multicast_SetRotation_Implementation(FVector Mous FVector Location = GetPawn()->GetActorLocation(); Location.Z = 0; - GetPawn()->SetActorRotation((MouseHitLocation - Location).Rotation()); + FRotator NewRotation = (MouseHitLocation - Location).Rotation(); + + // 만약 X축을 고정하고 싶다면 아래와 같이 해당 값을 설정합니다. + + NewRotation.Pitch = 0; + + GetPawn()->SetActorRotation(NewRotation); + } void ADefaultPlayerController::Server_SetRotation_Implementation(FVector MouseHitLocation) @@ -572,24 +629,53 @@ void ADefaultPlayerController::OnMoveCompleted(FAIRequestID RequestID, const FPa GetPlayerState()->SetState(ECharacterState::Idle); } +FTimerHandle TimerHandle; + +void ADefaultPlayerController::BeginAttack() +{ + GetWorldTimerManager().SetTimer(TimerHandle, this, &ADefaultPlayerController::RepeatedAttack, 0.1f, true); +} + +void ADefaultPlayerController::EndAttack() +{ + + GetWorldTimerManager().ClearTimer(TimerHandle); +} + +void ADefaultPlayerController::RepeatedAttack() +{ + if (!GetPlayerState()->Stats[(uint8)EStats::Attackable] == 0) + return; + ACharacter* HitCharacter = HitTarget; + Attack(HitCharacter); +} + + + void ADefaultPlayerController::Attack(ACharacter* HitObject) { + float MinDistance = GetPlayerState()->Stats[(uint8)EStats:: AttackRange]; - FVector Destination = HitObject->GetActorLocation(); // HitObject의 위치를 목적지로 설정 + FVector Destination = HitTarget->GetActorLocation(); // HitObject의 위치를 목적지로 설정 if (FVector::Dist(Destination, GetPawn()->GetActorLocation()) <= MinDistance) { if ((GetPlayerState()->CooldownDuration[(uint8)CooldownType::Attack] != 0)) return; + Destination = HitObject->GetActorLocation(); // HitObject의 위치를 목적지로 설정 FVector Location = GetPawn()->GetActorLocation(); - Location.Z = 0; + Location.X = 0; Server_StopMove(); Multicast_StopMove(); - Multicast_SetRotation(GetMouseHitLocation()); - Server_SetRotation(GetMouseHitLocation()); + Multicast_SetRotation(Destination); + Server_SetRotation(Destination); + + + + UE_LOG(LogTemp, Warning, TEXT("Attack")); GetPlayerState()->SetState(ECharacterState::Attack); diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.h b/Source/Promether/PlayerGeneric/DefaultPlayerController.h index 166d56d..16c38c4 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.h +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.h @@ -64,13 +64,20 @@ public: void OnMoveCompleted(FAIRequestID RequestID, const FPathFollowingResult &MovementResult); + void BeginAttack(); + void EndAttack(); + void RepeatedAttack(); - void Attack(ACharacter* HitObject); + + void Attack(ACharacter* HitCharacter); UPROPERTY(BlueprintReadWrite) float MouseClickInterval; + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "My Actor") + ACharacter * HitTarget; + private: UPROPERTY(EditAnywhere, Category = "Input") TSoftObjectPtr PlayerInputMapping; diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerState.h b/Source/Promether/PlayerGeneric/DefaultPlayerState.h index d566af0..117cc17 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerState.h +++ b/Source/Promether/PlayerGeneric/DefaultPlayerState.h @@ -27,6 +27,9 @@ public: void SetCharacterBPRef(UClass* Value) { CharacterBPRef = Value; } UClass* GetCharacterBPRef() const { return CharacterBPRef; } + + + UFUNCTION(BlueprintCallable) void SetTeam(TeamType Value) { Team = Value; } UFUNCTION(BlueprintCallable) diff --git a/Source/Promether/PrometherEnum.h b/Source/Promether/PrometherEnum.h index e7da3d1..610758b 100644 --- a/Source/Promether/PrometherEnum.h +++ b/Source/Promether/PrometherEnum.h @@ -47,6 +47,8 @@ enum class CooldownType : uint8 SIZE }; + + enum class CCType : uint32 { None = 0x00000000, @@ -126,9 +128,13 @@ enum class EStats : uint8 HealthRegenerationGrowth, ManaGrowth, ManaRegenerationGrowth, + Movable, + Skillusable, + Attackable, + charging, Skill1Cost, Skill2Cost, Skill3Cost, Skill4Cost, - SIZE + SIZE, }; \ No newline at end of file