diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index d01f1c0..b38f9a7 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:ae855b9d9dd483142acd12798ccf69d801e0fec08511387b9bd7514e266f2439 -size 386232 +oid sha256:405fa64140f1db07fe4846ff16e0605e48e7fa6d99a7e19b6cf1eacc3ff31606 +size 384731 diff --git a/Content/Character/Lb/Effect/T_H_A.uasset b/Content/Character/Lb/Effect/T_H_A.uasset index d452b5b..1d6473b 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:9114706929ca6c61f7565df07f74a8446516adb6d79ac0e5c4b8042b40386f6b +oid sha256:b112ad2775a4b88fce326ca92c917862f929f7888d0deb0134df60e8b1483b97 size 56472 diff --git a/Content/Character/Lb/Effect/T_H_E.uasset b/Content/Character/Lb/Effect/T_H_E.uasset index 95be2f8..7995a44 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:9147b4fc193ff4c0cb176a30a2ae8d3f1febc32bdfebee9d7e71e45c8ce724fd +oid sha256:0ee28e8a893a9292ed773f1c1fe3b6a9faf16cd3da1509dbf59ac76959ae52f0 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 633bbf7..dfce2e1 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:86e3b49ccbc32b31539b6debb3e0cbb56aead0981e37249b3ba00e4426cbf56c +oid sha256:c5ca870e555af208475b59362c086b178302c0fbc86ad4588d4cdb1bbc0fd0fe 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 87be17c..feebed9 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:84621d972511a74b9853b90295b78b9702bcb15f1a6482e136bac3c4213ef66f +oid sha256:a78638f20da7095eabd8f7affc624ff63503b2abb176bce7be99bbea850d1360 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 0d380b8..7635caf 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:cfecf3bd70a789aead194b5a9ccdba1b890ae5a18cf96e54e5764682641a456d +oid sha256:dfe895df99726e2428967738c5ab530b87af29bf7af5c35ef646692bae92bc1e 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 6818cfd..f113ebf 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:b4d49e149ae8cab68d9768a619ff88939f98c6f9aa1d5abaf19447744e7f5516 +oid sha256:9cd74bf56b73dde55472eeab867dc85a18bfd621560675eaeed5f4e7ba84209f size 537995 diff --git a/Content/Character/Lb/LB_BaseAttack.uasset b/Content/Character/Lb/LB_BaseAttack.uasset index 9ee1bc3..6ca241b 100644 --- a/Content/Character/Lb/LB_BaseAttack.uasset +++ b/Content/Character/Lb/LB_BaseAttack.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb91254e86e6ac20ad34c528cbf43e6c3661864da03b5f98b916d148571db2d7 -size 87549 +oid sha256:d419f43da436ee05cb4260fa371e1563195511239ccd3d7eef3e4f2ddaf5bef6 +size 95714 diff --git a/Content/Character/Monster/Knight/BP_HolyKnight.uasset b/Content/Character/Monster/Knight/BP_HolyKnight.uasset index 004c740..19b84fe 100644 --- a/Content/Character/Monster/Knight/BP_HolyKnight.uasset +++ b/Content/Character/Monster/Knight/BP_HolyKnight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:15f44646eab1954278e67f322d59dea5d9d29683794ea99df30ccc9a56d3ba3e -size 67565 +oid sha256:0ae180ebbd9b0f7e57d5add5bebeb11d0e6cdc577fe0acb2b846dad0fd4486b0 +size 71242 diff --git a/Content/Character/Monster/Knight/BP_Knignt.uasset b/Content/Character/Monster/Knight/BP_Knignt.uasset index 2b14da5..f06ed4b 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:b4bfa577d662c0fe0be1ae068f23585fdd3c6cbdfa98c888da4582ca6309bf52 -size 25882 +oid sha256:8e491fc22d201d812f36fa28d36709371273eec9a73d66d2bb86c5f1ce663d26 +size 25898 diff --git a/Content/Character/Monster/Knight/BP_Spear.uasset b/Content/Character/Monster/Knight/BP_Spear.uasset new file mode 100644 index 0000000..e619e37 --- /dev/null +++ b/Content/Character/Monster/Knight/BP_Spear.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:785b423d2501aa0a4952d0d27ed3ea16526de7f77f131396cf2dd26134f9b8f9 +size 55626 diff --git a/Content/Character/Riana/BP_Riana.uasset b/Content/Character/Riana/BP_Riana.uasset index 6938360..528aa16 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:c484c3539bde1614235fc8a2262d923166c8050e030bed85a5a6368434f73b53 -size 36354 +oid sha256:4b1b899ecd2853722d5289a70a938ba5a9a0e6748ac5b15cd95b6e47dc3b9422 +size 36497 diff --git a/Content/Effect/LB/Sound/T_H_W.uasset b/Content/Effect/LB/Sound/T_H_W.uasset index 2589109..4508c04 100644 --- a/Content/Effect/LB/Sound/T_H_W.uasset +++ b/Content/Effect/LB/Sound/T_H_W.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94ca14fd8515c9681fd744412411cd1d6b89a546f3bcd494783090b90a714a66 +oid sha256:4526c62252ea1d87451fc4bccbf76e31ea7800768b9ea27b0d02b2d953b42a6e size 508580 diff --git a/Content/Maps/DevMap.umap b/Content/Maps/DevMap.umap index 4dcc723..0dfbabf 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:c2e649be8ca3babb4e2a908b5965225c65383a37914975ac9c0a0acb6da1f793 -size 183451 +oid sha256:b0133ef8d2da9b63185377b36bb06b4d000ee86c3c6b5c78769d878f932c7be9 +size 187130 diff --git a/Source/Promether/DamageType/HomingAttack.cpp b/Source/Promether/DamageType/HomingAttack.cpp index 9948809..cf70434 100644 --- a/Source/Promether/DamageType/HomingAttack.cpp +++ b/Source/Promether/DamageType/HomingAttack.cpp @@ -34,7 +34,8 @@ void AHomingAttack::BeginPlay() return; } - ProjectileMovement->HomingTargetComponent = State->GetCurrentAttackTarget()->GetRootComponent(); + Target = State->GetCurrentAttackTarget(); + ProjectileMovement->HomingTargetComponent = Target->GetRootComponent(); } // Called every frame diff --git a/Source/Promether/DamageType/HomingAttack.h b/Source/Promether/DamageType/HomingAttack.h index c9f0d07..eaa9202 100644 --- a/Source/Promether/DamageType/HomingAttack.h +++ b/Source/Promether/DamageType/HomingAttack.h @@ -23,6 +23,9 @@ protected: UPROPERTY(EditAnywhere, BlueprintReadWrite) UProjectileMovementComponent* ProjectileMovement; + UPROPERTY(EditAnywhere, BlueprintReadWrite) + AActor* Target; + public: // Called every frame virtual void Tick(float DeltaTime) override; diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp index 755a7c6..b14c3fb 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp @@ -56,11 +56,11 @@ void ADefaultPlayerCharacter::Tick(float DeltaTime) void ADefaultPlayerCharacter::Attack_Implementation() { - Client_Attack(); + NetMulticast_Attack(); BP_Attack(); } -void ADefaultPlayerCharacter::Client_Attack_Implementation() +void ADefaultPlayerCharacter::NetMulticast_Attack_Implementation() { BP_Attack(); } diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h index b5773d2..a1adc08 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.h @@ -26,8 +26,8 @@ public: //Override me UFUNCTION(BlueprintImplementableEvent) void BP_Attack(); - UFUNCTION(Client, Reliable) - void Client_Attack(); + UFUNCTION(NetMulticast, Reliable) + void NetMulticast_Attack(); UFUNCTION(BlueprintNativeEvent) float TakeDamage( float Damage,