From 1cd43f452763e68b98003e91783ee8e418c09a11 Mon Sep 17 00:00:00 2001 From: HappyTanuki Date: Thu, 9 Nov 2023 22:51:12 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Blueprints/BP_DefaultPlayerCharacter.uasset | 4 ++-- Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset | 4 ++-- Content/Character/Allium/BP_Allium.uasset | 4 ++-- Content/Character/Lb/BP_Lb.uasset | 4 ++-- Content/Character/Lb/BaseArrow.uasset | 3 --- Content/Character/Lb/Effect/T_H_A.uasset | 2 +- Content/Character/Lb/Effect/T_H_E.uasset | 2 +- Content/Character/Lb/Effect/T_H_Q_Burn.uasset | 2 +- Content/Character/Lb/Effect/T_H_Q_shoot.uasset | 2 +- Content/Character/Lb/Effect/T_H_R_Boom.uasset | 2 +- Content/Character/Lb/Effect/T_H_R_Shoot.uasset | 2 +- Content/Character/Lb/LB_BaseAttack.uasset | 3 +++ .../Character/Monster/Knight/BP_HolyKnight.uasset | 3 +++ Content/Character/Monster/Knight/BP_Knignt.uasset | 4 ++-- .../Knight/Skeleton/Monster_Knight_Skeleton.uasset | 4 ++-- Content/Effect/LB/Sound/T_H_W.uasset | 3 +++ Content/Maps/DevMap.umap | 4 ++-- .../PlayerGeneric/DefaultPlayerCharacter.cpp | 4 ++-- .../PlayerGeneric/DefaultPlayerController.cpp | 14 ++++++-------- 19 files changed, 37 insertions(+), 33 deletions(-) delete mode 100644 Content/Character/Lb/BaseArrow.uasset create mode 100644 Content/Character/Lb/LB_BaseAttack.uasset create mode 100644 Content/Character/Monster/Knight/BP_HolyKnight.uasset create mode 100644 Content/Effect/LB/Sound/T_H_W.uasset diff --git a/Content/Blueprints/BP_DefaultPlayerCharacter.uasset b/Content/Blueprints/BP_DefaultPlayerCharacter.uasset index 8b8a483..719fac5 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:e8c82415960d0b58adbb46faa76b95711bf913a53aab55b722faaf06b86922c0 -size 142183 +oid sha256:0ba767ac11dbc05df5b4d23da7c7748826c7b8c1a4c537be9c7120690715602f +size 39211 diff --git a/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset b/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset index eeb8015..05319a5 100644 --- a/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset +++ b/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a893a2c6aa823f8a61795b9d46256f6b8ac741b35b93e38f2ae1f802db2ff70a -size 105394 +oid sha256:e0df2b6c49929989479f6d9f199bd88e5227e8c75f5580bae305d52100f3cfb6 +size 110755 diff --git a/Content/Character/Allium/BP_Allium.uasset b/Content/Character/Allium/BP_Allium.uasset index 5fa6294..1864549 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:5b8f6469924c0030147d25ec9a7b526d8d21386e0d15bd8106e878e4e3297685 -size 162823 +oid sha256:2bd7f7781c5a7d07ef706792570948cbb88e2567a026eae194bee103ceb9f006 +size 159593 diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index 2f2e96f..d01f1c0 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:45b867877174e3067dd3bb6bd2bbd9f8eb5bfcbcc86762849c4cadff5a962de1 -size 402953 +oid sha256:ae855b9d9dd483142acd12798ccf69d801e0fec08511387b9bd7514e266f2439 +size 386232 diff --git a/Content/Character/Lb/BaseArrow.uasset b/Content/Character/Lb/BaseArrow.uasset deleted file mode 100644 index c186582..0000000 --- a/Content/Character/Lb/BaseArrow.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5bc4ed8926ea90e98dc27a6bf0768f7f2f6dc4a344a85c132e6427331c979a3 -size 90927 diff --git a/Content/Character/Lb/Effect/T_H_A.uasset b/Content/Character/Lb/Effect/T_H_A.uasset index 03ccaa2..d452b5b 100644 --- a/Content/Character/Lb/Effect/T_H_A.uasset +++ b/Content/Character/Lb/Effect/T_H_A.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f81e83f1e265fdbcaa46e21a2afaad000524eba7852080e81ca6a3098fe4e9d +oid sha256:9114706929ca6c61f7565df07f74a8446516adb6d79ac0e5c4b8042b40386f6b size 56472 diff --git a/Content/Character/Lb/Effect/T_H_E.uasset b/Content/Character/Lb/Effect/T_H_E.uasset index 2a0d129..95be2f8 100644 --- a/Content/Character/Lb/Effect/T_H_E.uasset +++ b/Content/Character/Lb/Effect/T_H_E.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f46fd8bcdbcadcba98a676241d44e122579ad94ceb6c84d9f5b311953f57cc0 +oid sha256:9147b4fc193ff4c0cb176a30a2ae8d3f1febc32bdfebee9d7e71e45c8ce724fd size 130227 diff --git a/Content/Character/Lb/Effect/T_H_Q_Burn.uasset b/Content/Character/Lb/Effect/T_H_Q_Burn.uasset index c3232c9..633bbf7 100644 --- a/Content/Character/Lb/Effect/T_H_Q_Burn.uasset +++ b/Content/Character/Lb/Effect/T_H_Q_Burn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c83fd1490746d5089ed64696f0b629fececf307225ba8fcddfd096ab84035fe8 +oid sha256:86e3b49ccbc32b31539b6debb3e0cbb56aead0981e37249b3ba00e4426cbf56c size 250968 diff --git a/Content/Character/Lb/Effect/T_H_Q_shoot.uasset b/Content/Character/Lb/Effect/T_H_Q_shoot.uasset index eb40e93..87be17c 100644 --- a/Content/Character/Lb/Effect/T_H_Q_shoot.uasset +++ b/Content/Character/Lb/Effect/T_H_Q_shoot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d682c1953b0f46e64869278d8953b727150718a956711ef97ab9c36710a74e9 +oid sha256:84621d972511a74b9853b90295b78b9702bcb15f1a6482e136bac3c4213ef66f size 116772 diff --git a/Content/Character/Lb/Effect/T_H_R_Boom.uasset b/Content/Character/Lb/Effect/T_H_R_Boom.uasset index 6343c61..0d380b8 100644 --- a/Content/Character/Lb/Effect/T_H_R_Boom.uasset +++ b/Content/Character/Lb/Effect/T_H_R_Boom.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61e978c7e05f707135bb5ea07d85fb8c310a9bd0ec03f6a72f7b2230a64ca3c8 +oid sha256:cfecf3bd70a789aead194b5a9ccdba1b890ae5a18cf96e54e5764682641a456d size 682182 diff --git a/Content/Character/Lb/Effect/T_H_R_Shoot.uasset b/Content/Character/Lb/Effect/T_H_R_Shoot.uasset index 997a6c4..6818cfd 100644 --- a/Content/Character/Lb/Effect/T_H_R_Shoot.uasset +++ b/Content/Character/Lb/Effect/T_H_R_Shoot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e3409949d4a3a7084aec57e85db3731f77e3bcb680e10fe232aaf6493a7ba14 +oid sha256:b4d49e149ae8cab68d9768a619ff88939f98c6f9aa1d5abaf19447744e7f5516 size 537995 diff --git a/Content/Character/Lb/LB_BaseAttack.uasset b/Content/Character/Lb/LB_BaseAttack.uasset new file mode 100644 index 0000000..9ee1bc3 --- /dev/null +++ b/Content/Character/Lb/LB_BaseAttack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb91254e86e6ac20ad34c528cbf43e6c3661864da03b5f98b916d148571db2d7 +size 87549 diff --git a/Content/Character/Monster/Knight/BP_HolyKnight.uasset b/Content/Character/Monster/Knight/BP_HolyKnight.uasset new file mode 100644 index 0000000..004c740 --- /dev/null +++ b/Content/Character/Monster/Knight/BP_HolyKnight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15f44646eab1954278e67f322d59dea5d9d29683794ea99df30ccc9a56d3ba3e +size 67565 diff --git a/Content/Character/Monster/Knight/BP_Knignt.uasset b/Content/Character/Monster/Knight/BP_Knignt.uasset index 6714f7f..2b14da5 100644 --- a/Content/Character/Monster/Knight/BP_Knignt.uasset +++ b/Content/Character/Monster/Knight/BP_Knignt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:029169f9c794e0c6869f700a7635795faa0c50a018589e8e534d2b5a76ba83eb -size 65976 +oid sha256:b4bfa577d662c0fe0be1ae068f23585fdd3c6cbdfa98c888da4582ca6309bf52 +size 25882 diff --git a/Content/Character/Monster/Knight/Skeleton/Monster_Knight_Skeleton.uasset b/Content/Character/Monster/Knight/Skeleton/Monster_Knight_Skeleton.uasset index 46ab280..739cea1 100644 --- a/Content/Character/Monster/Knight/Skeleton/Monster_Knight_Skeleton.uasset +++ b/Content/Character/Monster/Knight/Skeleton/Monster_Knight_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55cc7568aebae0510e7afd20897e7cc0240aa4a309a9751abbc731923939977a -size 15194 +oid sha256:4a15315a43fdf529b19224a2fc8f935ecdc3543d285bd8b9a7de06acd6093bcf +size 16401 diff --git a/Content/Effect/LB/Sound/T_H_W.uasset b/Content/Effect/LB/Sound/T_H_W.uasset new file mode 100644 index 0000000..2589109 --- /dev/null +++ b/Content/Effect/LB/Sound/T_H_W.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94ca14fd8515c9681fd744412411cd1d6b89a546f3bcd494783090b90a714a66 +size 508580 diff --git a/Content/Maps/DevMap.umap b/Content/Maps/DevMap.umap index aa9f3d4..4dcc723 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:6d4f0f8460e8ae5a3b871bc7c9512d0566e3f46537280fd81f4151d5ff71c0c2 -size 179457 +oid sha256:c2e649be8ca3babb4e2a908b5965225c65383a37914975ac9c0a0acb6da1f793 +size 183451 diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp index b29cbfa..755a7c6 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp @@ -100,13 +100,13 @@ float ADefaultPlayerCharacter::TakeDamage_Implementation(float DamageAmount, str { UE_LOG(LogTemp, Warning, TEXT("DamageType : BaseAttack")); - UpdatedHealth = State->Stats[(uint8)EStats::Health] - AttackerState->Stats[(uint8)EStats::AttackDamage] * ADDamageMultiplier; + UpdatedHealth = State->Stats[(uint8)EStats::Health] - DamageAmount * ADDamageMultiplier; } else if (Cast(DamageEvent.DamageTypeClass->GetDefaultObject())) { UE_LOG(LogTemp, Warning, TEXT("DamageType : APDamage")); - UpdatedHealth = State->Stats[(uint8)EStats::Health] - AttackerState->Stats[(uint8)EStats::AbilityPower] * APDamageMultiplier; + UpdatedHealth = State->Stats[(uint8)EStats::Health] - DamageAmount * APDamageMultiplier; } if (UpdatedHealth < 0 || UpdatedHealth < 0.1 ) diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp index ea57948..055582b 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp @@ -331,22 +331,22 @@ void ADefaultPlayerController::Skill3() void ADefaultPlayerController::Skill4Triggered() { - if (GetPlayerState()->Stats[(uint8)EStats::charging] == 1)//������ 1(false)�� �� + if (GetPlayerState()->Stats[(uint8)EStats::charging] == 1) { 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)�� ���� + GetPlayerState()->Stats[(uint8)EStats::charging] = 0; } - else if (GetPlayerState()->Stats[(uint8)EStats::charging] == 2) //������ 2(never)�� �� + else if (GetPlayerState()->Stats[(uint8)EStats::charging] == 2) { 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::Mana] -= GetPlayerState()->Stats[(uint8)EStats::Skill4Cost]; } EndAttack(); GetPlayerState()->Stats[(uint8)EStats::Attackable] = 1; @@ -446,10 +446,10 @@ void ADefaultPlayerController::Move() ObjectSelect(); if (GetPlayerState()->GetCurrentAttackTarget() != GetPawn() && - Cast(GetPlayerState()->GetCurrentAttackTarget())) //������ �ƴϰ� ������ ������ ���(���̵� �Ʊ��̵�)�� �� + Cast(GetPlayerState()->GetCurrentAttackTarget())) { if (!GetPlayerState()->Stats[(uint8)EStats::Attackable] == 0) return; - BeginAttack(); //HitObject�� ������� BeginAttack ���� + BeginAttack(); } else { @@ -469,8 +469,6 @@ void ADefaultPlayerController::Multicast_SetRotation_Implementation(FVector Mous Location.Z = 0; FRotator NewRotation = (MouseHitLocation - Location).Rotation(); - - // ���� X���� �����ϰ� �ʹٸ� �Ʒ��� ���� �ش� ���� �����մϴ�. NewRotation.Pitch = 0;