diff --git a/Content/Character/Allium/Alium_Q.uasset b/Content/Character/Allium/Alium_Q.uasset new file mode 100644 index 0000000..bb9b1b6 --- /dev/null +++ b/Content/Character/Allium/Alium_Q.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:343994fc81bd9cc39aaf3d6fb9bddc292332a8ad371e5201d3d17fc67b4d800f +size 32013 diff --git a/Content/Character/Allium/Animation/ABP_Allium.uasset b/Content/Character/Allium/Animation/ABP_Allium.uasset index b113783..12f4816 100644 --- a/Content/Character/Allium/Animation/ABP_Allium.uasset +++ b/Content/Character/Allium/Animation/ABP_Allium.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80c31209d89d21aa3abeaaa0c83c3f9767999458fa43c9496bf79af92c6b4271 -size 280736 +oid sha256:23c04641a51111194bb918d52135e2b69f6646c05320b97197ed51a33bfe8a8a +size 281109 diff --git a/Content/Character/Allium/Animation/Skill4_2_Anim.uasset b/Content/Character/Allium/Animation/Skill4_2_Anim.uasset index db038ce..5b65ec0 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:fe755b80812ca4c86bd9b60c3846783c3ddf5378ac5c2d5ac4b86d606b3457fd +size 182656 diff --git a/Content/Character/Allium/BP_Allium.uasset b/Content/Character/Allium/BP_Allium.uasset index 10e125c..5fa6294 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:0612af232772bf9dc4793b17427758cd6358a643dcbc52cd1314284dc1e9623e -size 130554 +oid sha256:5b8f6469924c0030147d25ec9a7b526d8d21386e0d15bd8106e878e4e3297685 +size 162823 diff --git a/Content/Effect/Alium/Alium_E/Alium_E.uasset b/Content/Effect/Alium/Alium_E/Alium_E.uasset index 176e77d..e165c1a 100644 --- a/Content/Effect/Alium/Alium_E/Alium_E.uasset +++ b/Content/Effect/Alium/Alium_E/Alium_E.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:221e40e8ce3a5bb7e9298134517a2f3ae5638c9e60d9b8b34e29ea703de0b1c0 -size 3618441 +oid sha256:128acdcf225e4767ccb304ef2a9d3ec489ca9e53bc01adc4453fe323ce046715 +size 3753024 diff --git a/Content/Effect/Alium/Alium_W.uasset b/Content/Effect/Alium/Alium_W.uasset index fbd8460..71dcff2 100644 --- a/Content/Effect/Alium/Alium_W.uasset +++ b/Content/Effect/Alium/Alium_W.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa9519be97683fd81875ae5f2216bed480e97212f04d2e1faa17040185820b46 -size 28647 +oid sha256:7a13be2f24efeef7dee780882ca278c7e6a926d5640c3f7347d6c0036b8b135d +size 24735 diff --git a/Content/Effect/Alium/Alium_W/Alium_W.uasset b/Content/Effect/Alium/Alium_W/Alium_W.uasset index 45280ec..6433d6d 100644 --- a/Content/Effect/Alium/Alium_W/Alium_W.uasset +++ b/Content/Effect/Alium/Alium_W/Alium_W.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:347780967c25dbff26dd2c4f449c4a47dedaf8da9f00f8f4e73e3e0f0a5d7d70 -size 3807034 +oid sha256:e4f41215c0d0ede315562c6a191c9996585251082bda6c5b1751deadb11bd295 +size 5147259 diff --git a/Content/Effect/Alium/Aliun_E.uasset b/Content/Effect/Alium/Aliun_E.uasset index 7affd16..d1c1d8c 100644 --- a/Content/Effect/Alium/Aliun_E.uasset +++ b/Content/Effect/Alium/Aliun_E.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92e4df8ad206044b1f2a37cc04f89688ddc6409f1919ebe34c51bafbe047c673 -size 24468 +oid sha256:aea4359c510acf6ffb657bcbc2f279e7312b4c9b32ab776993a82aee8ef65fd8 +size 31457 diff --git a/Content/Maps/DevMap.umap b/Content/Maps/DevMap.umap index a6cc4f5..89e5575 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:731aa0c55cd03685844825eb0507fdac3ea6befb184f533d09c2bcc867337633 -size 179143 +oid sha256:3d8084aed10cabbc1c8a9793e0cbd00d5ccafa34372d4acbd619566e66faab98 +size 179183 diff --git a/Source/Promether/AnimNotify/AN_AnimEnd.cpp b/Source/Promether/AnimNotify/AN_AnimEnd.cpp index 053f104..60bf3eb 100644 --- a/Source/Promether/AnimNotify/AN_AnimEnd.cpp +++ b/Source/Promether/AnimNotify/AN_AnimEnd.cpp @@ -9,11 +9,16 @@ 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); + MyState->Stats[(uint8)EStats::Attackable] = 0; + MyState->Stats[(uint8)EStats::Skillusable] = 0; + MyState->Stats[(uint8)EStats::Movable] = 0; + } diff --git a/Source/Promether/GameModeBase/Deathmatch.cpp b/Source/Promether/GameModeBase/Deathmatch.cpp index db8175f..8c6ea7e 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::Lb; + Type = CharacterType::Allium; } if (Team == TeamType::Null) { diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp index 0cc4b57..3b4914f 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp @@ -248,7 +248,7 @@ void ADefaultPlayerController::SetupInputComponent() void ADefaultPlayerController::Skill1() { - if (!GetPlayerState()->Stats[(uint8)EStats::Skillusable] == 0) + if (GetPlayerState()->Stats[(uint8)EStats::Skillusable] == 1) return; if (!(GetPlayerState()->Stats[(uint8)EStats::Mana] >= GetPlayerState()->Stats[(uint8)EStats::Skill1Cost])) return; @@ -277,7 +277,7 @@ void ADefaultPlayerController::Skill1() void ADefaultPlayerController::Skill2() { - if (!GetPlayerState()->Stats[(uint8)EStats::Skillusable] == 0) + if (GetPlayerState()->Stats[(uint8)EStats::Skillusable] == 1) return; if (!(GetPlayerState()->Stats[(uint8)EStats::Mana] >= GetPlayerState()->Stats[(uint8)EStats::Skill2Cost])) return; @@ -304,7 +304,7 @@ void ADefaultPlayerController::Skill2() void ADefaultPlayerController::Skill3() { - if (!GetPlayerState()->Stats[(uint8)EStats::Skillusable] == 0) + if (GetPlayerState()->Stats[(uint8)EStats::Skillusable] == 1) return; if (!(GetPlayerState()->Stats[(uint8)EStats::Mana] >= GetPlayerState()->Stats[(uint8)EStats::Skill3Cost])) return; @@ -355,7 +355,7 @@ void ADefaultPlayerController::Skill4Triggered() ACharacter* HitObject = nullptr; FVector Location = GetPawn()->GetActorLocation(); - Location.Z = 0; + //Location.Z = 0; Server_StopMove(); Multicast_StopMove(); @@ -436,7 +436,7 @@ void ADefaultPlayerController::Move() if (HitResult.GetActor() != GetPawn()) //지금은 HitObject가 null이 아닐 경우 Attack()을 실행하는 코드지만, HitObject가 적 캐릭터일 때 실행으로 변경해야함 { - if (!GetPlayerState()->Stats[(uint8)EStats::Attackable] == 0) + if (GetPlayerState()->Stats[(uint8)EStats::Attackable] == 1) return; if (!HitCharacter) {