diff --git a/Content/Character/BP_Folder/DefaultClass.uasset b/Content/Character/BP_Folder/DefaultClass.uasset index 290e04d..070c573 100644 --- a/Content/Character/BP_Folder/DefaultClass.uasset +++ b/Content/Character/BP_Folder/DefaultClass.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5ed77da0ce480dc769b0b85a288efb92533d78c89c87e099f1113df2782f898 -size 18108 +oid sha256:98c8a8eafe4d199b6f8b13e3ff1fc763b75718a83a19879f08ae54d3171e89d0 +size 34772 diff --git a/Content/Character/Lb/Animation/ABP_Lb.uasset b/Content/Character/Lb/Animation/ABP_Lb.uasset index 8700d33..493f3af 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:9106395cf5962f94dbfd58c77289cabe04829abd6c6d4e94fd1dc650d77deb29 -size 275233 +oid sha256:bb1f2e4bdb532036b4d1ba7dbf6a4286fd471a53369c1f1eb9f0bb785c8800b6 +size 303416 diff --git a/Content/Character/Lb/Animation/R1_Anim.uasset b/Content/Character/Lb/Animation/R1_Anim.uasset index 4a5eb40..e7f7184 100644 --- a/Content/Character/Lb/Animation/R1_Anim.uasset +++ b/Content/Character/Lb/Animation/R1_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e482c12f9233091ad310daf9432f4773dba20592e67dbb77eb4a93f22bf954a -size 77110 +oid sha256:d71615249a5ae4fa14c8db5e3b419f47f3577ffa83d7d8ac77daacae7c399fcb +size 77129 diff --git a/Content/Character/Lb/Animation/R2_Anim.uasset b/Content/Character/Lb/Animation/R2_Anim.uasset index b86911a..b352c03 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:0c5d110cbc5ae8d4b489b73f7a2b7b955803f0ebc65b45c53054e3777484f8b8 -size 164688 +oid sha256:4cfcd9e3f9cbfa6aaf9114969819ec25b19c43c51c72f741b4f21feaa8d5978e +size 164743 diff --git a/Content/Character/Riana/Animation/ABP_Riana.uasset b/Content/Character/Riana/Animation/ABP_Riana.uasset new file mode 100644 index 0000000..31d9165 --- /dev/null +++ b/Content/Character/Riana/Animation/ABP_Riana.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6ab8c7cedf9b7edff8ac5d728af9495548063b01a935d42c7ac28f59150f09f +size 328801 diff --git a/Content/Character/Riana/Animation/Skill3_Anim.uasset b/Content/Character/Riana/Animation/Skill3_Anim.uasset index 2971305..ef75984 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:98351f36274d3fa4d24a4b412190e29f1ed1bdb0f65a0b19c31e752043439aad -size 232728 +oid sha256:d207c80c476fac57686c95dbae7c5ec77bf3d53fe6150ed19246eea65f471ca4 +size 235183 diff --git a/Content/Character/Riana/Animation/Skill4_3_Anim.uasset b/Content/Character/Riana/Animation/Skill4_3_Anim.uasset index 2047ae6..86d2780 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:43c9f5f1437c71a029ee74ea05f46948c12c704f778d1e2f0c4dfe3c13e0dbba -size 300215 +oid sha256:e208e84d3ac53af1e7e784b215e83e8f94c49fa56ec0c9a2c6bbd213d1142300 +size 302627 diff --git a/Content/Character/Riana/BP_Riana.uasset b/Content/Character/Riana/BP_Riana.uasset index 2365802..2e8aa4b 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:bde9cd65e2ab75ed06ae9db07a01ef03cd1ed94e8a9bdbf6402e1e850a20e556 -size 34359 +oid sha256:c21e9b8605595d4c8b890bb9a254fdb13a0571e726e14bbc16afdaf8cf7dee9b +size 34177 diff --git a/Content/Effect/ETC/Burning.uasset b/Content/Effect/ETC/Burning.uasset index 122040d..2f9ce9b 100644 --- a/Content/Effect/ETC/Burning.uasset +++ b/Content/Effect/ETC/Burning.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aae95b8020e46c60b8691e209c9ab55bf9caab64ba46da28e1b6c75476903b1f -size 852156 +oid sha256:17b145213e627593f25ecac880ab195efe963c75e42d22ac120d4bee1545e420 +size 603080 diff --git a/Content/InputActions/InputMappingContext.uasset b/Content/InputActions/InputMappingContext.uasset index 8ecb215..2fd3946 100644 --- a/Content/InputActions/InputMappingContext.uasset +++ b/Content/InputActions/InputMappingContext.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:850f747974f408d1ea8bc0bce5cc3c71a10ea8587d0e14f17afc7da0e3049c7c -size 9369 +oid sha256:35d094b2b806fa5159b55f6d14f03017dfcfe13545af429d379432ec5f02f6f9 +size 10912 diff --git a/Content/InputActions/Skill4.uasset b/Content/InputActions/Skill4.uasset index 1a57b3b..a177354 100644 --- a/Content/InputActions/Skill4.uasset +++ b/Content/InputActions/Skill4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b53eb34d07639a7c357d1a9dfbf9ccd5e5a2d1dc47bf60f784f98e0f18e9c46 -size 1323 +oid sha256:0f316965e3f12b135169cd83fd7accf644205ab51b48d81efbc93dd401ebd0bd +size 1392 diff --git a/Content/InputActions/Skill4_End.uasset b/Content/InputActions/Skill4_End.uasset new file mode 100644 index 0000000..6bec5f9 --- /dev/null +++ b/Content/InputActions/Skill4_End.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b7cb2a0d4b9554f2e40b924c03423f726bf79276780a1adb8ca4a38138f1857 +size 1343 diff --git a/Content/Maps/DevMap.umap b/Content/Maps/DevMap.umap index 5ffae8b..e58ad2f 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:0d9a9522dd9b5cb02d50c470bd973be7c84386ed9c61ed9aa6ba548dc683ba0d -size 181517 +oid sha256:c9afef7d4a4148de462e3c3648f0b66eba196b79af30c6f869ff27414ba7d875 +size 181915 diff --git a/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset b/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset index c5c3b84..ebdbe1e 100644 --- a/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset +++ b/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a60a29ad596546d481e43dfb8698842a78cc07f4a4b1000fa397cfba4e72331 -size 158206 +oid sha256:e5b331a2fb1da7f9b37c7eee2254836f1eec8e2e41e00838db4a765343755de9 +size 44941 diff --git a/Content/StarterContent/Materials/M_Basic_Floor.uasset b/Content/StarterContent/Materials/M_Basic_Floor.uasset index 07401c9..bbad12e 100644 --- a/Content/StarterContent/Materials/M_Basic_Floor.uasset +++ b/Content/StarterContent/Materials/M_Basic_Floor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:38e9963796183aa39c6cd4219fe60403740c902dadd223b96e37158f5b8e07f8 -size 9515 +oid sha256:5c198493d3a6c0c9dc45fb0e6f964bcb8ec2560507e322ba0fc33ddd7acd4ca4 +size 9609 diff --git a/Content/StarterContent/Particles/Materials/M_Radial_Gradient.uasset b/Content/StarterContent/Particles/Materials/M_Radial_Gradient.uasset index 96f3272..71f3a68 100644 --- a/Content/StarterContent/Particles/Materials/M_Radial_Gradient.uasset +++ b/Content/StarterContent/Particles/Materials/M_Radial_Gradient.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:969f0add70f571adb7e14da5ca542a15955166103efd54168a5e248826564781 -size 10357 +oid sha256:4a2fa64d2953b0d60e01d147b4a139bbf1704b59924ba097a38b735e46a34293 +size 10467 diff --git a/Content/StarterContent/Particles/Materials/M_radial_ramp.uasset b/Content/StarterContent/Particles/Materials/M_radial_ramp.uasset index bc957b9..dbb07b9 100644 --- a/Content/StarterContent/Particles/Materials/M_radial_ramp.uasset +++ b/Content/StarterContent/Particles/Materials/M_radial_ramp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:880794e3875c4394f93e280b35524a677e72a5a1edb06b03c8a0ae9efc2b51a6 -size 10366 +oid sha256:2ead6fd037a59631d300e27941a8f9a67aae91e306096cded5bd598026c03b7a +size 10471 diff --git a/Content/StarterContent/Particles/Materials/m_flare_01.uasset b/Content/StarterContent/Particles/Materials/m_flare_01.uasset index 4b49de3..6999e57 100644 --- a/Content/StarterContent/Particles/Materials/m_flare_01.uasset +++ b/Content/StarterContent/Particles/Materials/m_flare_01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57377e5d237609372f0837407d7c9f35a5ba00bf81aa049102d699105af8a025 -size 14010 +oid sha256:4c39c6b073961d3f83eb48231c01a2bc9ca61fca41675eb5ac7ae3eb6ea46cfd +size 14106 diff --git a/Source/Promether/AnimNotify/AN_Skill4_End.cpp b/Source/Promether/AnimNotify/AN_Skill4_End.cpp new file mode 100644 index 0000000..6b1afdc --- /dev/null +++ b/Source/Promether/AnimNotify/AN_Skill4_End.cpp @@ -0,0 +1,14 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "AN_Skill4_End.h" + +#include "../PlayerGeneric/DefaultPlayerCharacter.h" + +void UAN_Skill4_End::Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation, const FAnimNotifyEventReference& EventReference) +{ + ADefaultPlayerCharacter* MyCharacter = MeshComp->GetOwner(); + if (!MyCharacter) return; + + MyCharacter->Skill4_End(); +} diff --git a/Source/Promether/AnimNotify/AN_Skill4_End.h b/Source/Promether/AnimNotify/AN_Skill4_End.h new file mode 100644 index 0000000..e2750dd --- /dev/null +++ b/Source/Promether/AnimNotify/AN_Skill4_End.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_Skill4_End.generated.h" + +/** + * + */ +UCLASS() +class PROMETHER_API UAN_Skill4_End : public UAnimNotify +{ + GENERATED_BODY() + +public: + virtual void Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation, const FAnimNotifyEventReference& EventReference) override; +}; diff --git a/Source/Promether/GameModeBase/Deathmatch.cpp b/Source/Promether/GameModeBase/Deathmatch.cpp index 8c6ea7e..db8175f 100644 --- a/Source/Promether/GameModeBase/Deathmatch.cpp +++ b/Source/Promether/GameModeBase/Deathmatch.cpp @@ -133,7 +133,7 @@ FString ADeathmatch::InitNewPlayer(APlayerController* NewPlayerController, const //DebugPerpose if (Type == CharacterType::Lukriel) { - Type = CharacterType::Allium; + Type = CharacterType::Lb; } if (Team == TeamType::Null) { diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp index 76e1f35..263de6d 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp @@ -186,6 +186,16 @@ void ADefaultPlayerCharacter::NetMulticast_Skill4_Implementation() BP_Skill4(); } +void ADefaultPlayerCharacter::Skill4_End_Implementation() +{ + NetMulticast_Skill4_End(); +} + +void ADefaultPlayerCharacter::NetMulticast_Skill4_End_Implementation() +{ + BP_Skill4_End(); +} + void ADefaultPlayerCharacter::Skill5_Implementation() { NetMulticast_Skill5(); diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h index 9cfb097..6b9496a 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h @@ -65,6 +65,14 @@ public: UFUNCTION(NetMulticast, Reliable) void NetMulticast_Skill4(); + UFUNCTION(BlueprintCallable, Server, Reliable) + void Skill4_End(); + //Override me + UFUNCTION(BlueprintImplementableEvent) + void BP_Skill4_End(); + UFUNCTION(NetMulticast, Reliable) + void NetMulticast_Skill4_End(); + UFUNCTION(BlueprintCallable, Server, Reliable) void Skill5(); //Override me diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp index 6e6e94b..b1b19e4 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp @@ -133,6 +133,7 @@ ADefaultPlayerController::ADefaultPlayerController() IA_SKILL2(TEXT("/Script/EnhancedInput.InputAction'/Game/InputActions/Skill2.Skill2'")), IA_SKILL3(TEXT("/Script/EnhancedInput.InputAction'/Game/InputActions/Skill3.Skill3'")), IA_SKILL4(TEXT("/Script/EnhancedInput.InputAction'/Game/InputActions/Skill4.Skill4'")), + IA_SKILL4_End(TEXT("/Script/EnhancedInput.InputAction'/Game/InputActions/Skill4_End.Skill4_End'")), IA_RUNESPELL1(TEXT("/Script/EnhancedInput.InputAction'/Game/InputActions/RuneSpell1.RuneSpell1'")), IA_RUNESPELL2(TEXT("/Script/EnhancedInput.InputAction'/Game/InputActions/RuneSpell2.RuneSpell2'")), IA_WARD(TEXT("/Script/EnhancedInput.InputAction'/Game/InputActions/Ward.Ward'")), @@ -160,6 +161,11 @@ ADefaultPlayerController::ADefaultPlayerController() UE_LOG(LogTemp, Error, TEXT("IA_ULTIMATESKILL load failed.")); return; } + if (!IA_SKILL4_End.Succeeded()) + { + UE_LOG(LogTemp, Error, TEXT("IA_ULTIMATESKILL load failed.")); + return; + } if (!IA_RUNESPELL1.Succeeded()) { UE_LOG(LogTemp, Error, TEXT("IA_RUNESPELL1 load failed.")); @@ -196,6 +202,7 @@ ADefaultPlayerController::ADefaultPlayerController() Skill2Action = IA_SKILL2.Object; Skill3Action = IA_SKILL3.Object; Skill4Action = IA_SKILL4.Object; + Skill4_EndAction = IA_SKILL4_End.Object; RuneSpell1Action = IA_RUNESPELL1.Object; RuneSpell2Action = IA_RUNESPELL2.Object; WardAction = IA_WARD.Object; @@ -221,6 +228,7 @@ void ADefaultPlayerController::SetupInputComponent() EnhancedInputComponent->BindAction(Skill2Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill2); EnhancedInputComponent->BindAction(Skill3Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill3); EnhancedInputComponent->BindAction(Skill4Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill4); + EnhancedInputComponent->BindAction(Skill4_EndAction.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Skill4_End); EnhancedInputComponent->BindAction(RuneSpell1Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::RuneSpell1); EnhancedInputComponent->BindAction(RuneSpell2Action.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::RuneSpell2); EnhancedInputComponent->BindAction(WardAction.Get(), ETriggerEvent::Triggered, this, &ADefaultPlayerController::Ward); @@ -294,6 +302,21 @@ void ADefaultPlayerController::Skill4() GetPlayerState()->SetAttackType(CooldownType::Skill4Started); } +void ADefaultPlayerController::Skill4_End() +{ + FVector Location = GetPawn()->GetActorLocation(); + Location.Z = 0; + + SimpleMoveToLocation(this, Location); + this->MoveToLocation(Location); + + GetPawn()->SetActorRotation((GetMouseHitLocation() - Location).Rotation()); + + UE_LOG(LogTemp, Warning, TEXT("Skill4_End")); + GetPlayerState()->SetState(ECharacterState::Attack); + GetPlayerState()->SetAttackType(CooldownType::Skill4Comlpleted); +} + void ADefaultPlayerController::RuneSpell1() { UE_LOG(LogTemp, Warning, TEXT("RuneSpell1")); diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.h b/Source/Promether/PlayerGeneric/DefaultPlayerController.h index 22d92c7..149817b 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.h +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.h @@ -35,6 +35,7 @@ public: void Skill2(); void Skill3(); void Skill4(); + void Skill4_End(); void RuneSpell1(); void RuneSpell2(); void Ward(); @@ -71,6 +72,8 @@ private: TSoftObjectPtr Skill3Action; UPROPERTY(EditAnywhere, Category = "Input") TSoftObjectPtr Skill4Action; + UPROPERTY(EditAnywhere, Category = "Input") + TSoftObjectPtr Skill4_EndAction; UPROPERTY(EditAnywhere, Category = "Input") TSoftObjectPtr RuneSpell1Action; UPROPERTY(EditAnywhere, Category = "Input")