diff --git a/Content/Blueprints/BP_DefaultPlayerCharacter.uasset b/Content/Blueprints/BP_DefaultPlayerCharacter.uasset index 058671a..e7677fc 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:a60e63bc838c1fd6ab5b6da880fe6f21e9ab4d182041e686aa0f127ae046c34b -size 155340 +oid sha256:e168c1d918f01109b4e696f17435306d9a92ae422a4b0fa14d5df7306e874e51 +size 150369 diff --git a/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset b/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset index eeb8015..3069a57 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:3cb47ddd5b82cbb2d3a0d3f364cacf4beff88aa6dd58a61ff58430fb1c01b980 +size 129904 diff --git a/Content/Character/Allium/Alium_P_Buff1.uasset b/Content/Character/Allium/Alium_P_Buff1.uasset new file mode 100644 index 0000000..bd86d62 --- /dev/null +++ b/Content/Character/Allium/Alium_P_Buff1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e81b38f6ba4e45af678acc08a235f22fb9ee6b6e0f3b7b988a9f5b7ffd0807ca +size 238230 diff --git a/Content/Character/Allium/Alium_P_Buff2.uasset b/Content/Character/Allium/Alium_P_Buff2.uasset new file mode 100644 index 0000000..26f5fd0 --- /dev/null +++ b/Content/Character/Allium/Alium_P_Buff2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9dc7888338dad8538d0380e5c9669b641ebded4bd04cbd6cd3197e05747cd0e2 +size 259589 diff --git a/Content/Character/Allium/Alium_Q.uasset b/Content/Character/Allium/Alium_Q.uasset index bb9b1b6..500b1b8 100644 --- a/Content/Character/Allium/Alium_Q.uasset +++ b/Content/Character/Allium/Alium_Q.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:343994fc81bd9cc39aaf3d6fb9bddc292332a8ad371e5201d3d17fc67b4d800f -size 32013 +oid sha256:f87efd665635b197d7539eb84b3af44e7bbd49b44cf16b064202b6ddb98195e6 +size 174779 diff --git a/Content/Character/Allium/Alium_Q_Debuff1.uasset b/Content/Character/Allium/Alium_Q_Debuff1.uasset new file mode 100644 index 0000000..69dab54 --- /dev/null +++ b/Content/Character/Allium/Alium_Q_Debuff1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a411bb2af84d31ba060b4a9c43004567635b559513a0fee269dee4749786335 +size 42978 diff --git a/Content/Character/Allium/Alium_Q_Debuff2.uasset b/Content/Character/Allium/Alium_Q_Debuff2.uasset new file mode 100644 index 0000000..836d3b6 --- /dev/null +++ b/Content/Character/Allium/Alium_Q_Debuff2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9fb880db22cf703fdb2646d39857145afbbda744d18736a92d23afb3e081be5 +size 293461 diff --git a/Content/Character/Allium/Alium_R.uasset b/Content/Character/Allium/Alium_R.uasset index ae26046..c2bf792 100644 --- a/Content/Character/Allium/Alium_R.uasset +++ b/Content/Character/Allium/Alium_R.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:490e60e0de19ae24e0ca500477b528c929a471ed28b4dcbc651f73c4f60b2b8e -size 25961 +oid sha256:d3340dc10aded1e5e7977c23069f3a330475a39dfcc2bb38ab219773db371081 +size 53338 diff --git a/Content/Character/Allium/Alium_R_Attack.uasset b/Content/Character/Allium/Alium_R_Attack.uasset new file mode 100644 index 0000000..1ab5a18 --- /dev/null +++ b/Content/Character/Allium/Alium_R_Attack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2eb7bd29e5777f0aa30c6cc7200bc7648beae94f4ba8cc6147ccc3bad6a45026 +size 108779 diff --git a/Content/Character/Allium/Alium_W.uasset b/Content/Character/Allium/Alium_W.uasset index 89d9bf0..94b08ab 100644 --- a/Content/Character/Allium/Alium_W.uasset +++ b/Content/Character/Allium/Alium_W.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85710b090a7fa45dde5e7b40271c905a147120ba376e87f27bb48f6e6c60350d -size 24224 +oid sha256:70bfb53c784ca93429c1133a59107c55945dfa48adb681f09f2b7de2386bd5a1 +size 188342 diff --git a/Content/Character/Allium/Alium_w_debuff.uasset b/Content/Character/Allium/Alium_w_debuff.uasset new file mode 100644 index 0000000..8e36f2a --- /dev/null +++ b/Content/Character/Allium/Alium_w_debuff.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e14c69f965cd1e4017685a093633a3329c7ab7a65f89e8a19a85904b3d0d6a48 +size 209893 diff --git a/Content/Character/Allium/Aliun_E_Effect.uasset b/Content/Character/Allium/Aliun_E_Effect.uasset new file mode 100644 index 0000000..de01cf7 --- /dev/null +++ b/Content/Character/Allium/Aliun_E_Effect.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eaf6cf692d27c1194311f8257c2b8c573147d25df22cb34dc2d93d197a2a099b +size 140203 diff --git a/Content/Character/Allium/Animation/ABP_Allium.uasset b/Content/Character/Allium/Animation/ABP_Allium.uasset index f6cd5c8..f16db0a 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:f6d55b35eb2776d7d8cf3069ca04db767e4c1e4e9d71b23c0124d8c3250bbb85 -size 281161 +oid sha256:b5f2e6b884188dbc9492b89c93ccaa4bcc38f64dd55b6814b88dc8247b41f373 +size 311396 diff --git a/Content/Character/Allium/Animation/Attack1_Anim.uasset b/Content/Character/Allium/Animation/Attack1_Anim.uasset index e30ad00..7fc46f3 100644 --- a/Content/Character/Allium/Animation/Attack1_Anim.uasset +++ b/Content/Character/Allium/Animation/Attack1_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:028d2313ac5ac5e7844f1abe647212b81a964853c5d55a663af31d4f3ecd22b6 -size 135413 +oid sha256:211033826cc49600261a636083ff53d6e4ff06218a81a1495df7847837a94ceb +size 140823 diff --git a/Content/Character/Allium/Animation/Attack2_Anim.uasset b/Content/Character/Allium/Animation/Attack2_Anim.uasset index 69cc572..12b3fa0 100644 --- a/Content/Character/Allium/Animation/Attack2_Anim.uasset +++ b/Content/Character/Allium/Animation/Attack2_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eeef93d1ef6f8f8b9082c2ba09d47fe519457ed63ac12ce709b89a4689587996 -size 147107 +oid sha256:17223a0e1ed3f645e296cf6babd257dcf5893c939b4c00f9efbaaa14cd071497 +size 152752 diff --git a/Content/Character/Allium/Animation/Attack3_Anim.uasset b/Content/Character/Allium/Animation/Attack3_Anim.uasset index 17c5e2e..5c939bf 100644 --- a/Content/Character/Allium/Animation/Attack3_Anim.uasset +++ b/Content/Character/Allium/Animation/Attack3_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63832c07bf92d5bb41ad7898d6fd03ac0a929a6554af5b9bc3cbd51df50da9b8 -size 153058 +oid sha256:b9305c2dc4523135451b9e4fb3e14263ffd0b014c0e25bf15f39db2c62eb8988 +size 158723 diff --git a/Content/Character/Allium/Animation/Skill1_Anim.uasset b/Content/Character/Allium/Animation/Skill1_Anim.uasset index c5f3364..5ea5f7c 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:281f67750692886e4507b163407ddcb5c94d0852f8b24c4c7950f375f556d1f1 +size 153756 diff --git a/Content/Character/Allium/Animation/Skill2_Anim.uasset b/Content/Character/Allium/Animation/Skill2_Anim.uasset index 8163963..8b81889 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:563f69df1464c1204d3396676dc78cdf40813cd81b8956273bdfcb51a9d92cdb +size 134307 diff --git a/Content/Character/Allium/Animation/Skill3_Anim.uasset b/Content/Character/Allium/Animation/Skill3_Anim.uasset index 3a7b785..9bb4b3d 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:960b1cb8583e58a03df7e8ad164f2bfcfddeae1b36074e6a8568c7ac8b0ef395 +size 153667 diff --git a/Content/Character/Allium/Animation/Skill4_2_Anim.uasset b/Content/Character/Allium/Animation/Skill4_2_Anim.uasset index 8374f13..932b26e 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:59a77c7d25101247c153a75274ca311efc8ebc2ababf24ae218a37c09f530c73 -size 183684 +oid sha256:b3d3ae92f1fa891d84344cee54e974bae602588a4c8b697ad7c8cd141c2a0c03 +size 185213 diff --git a/Content/Character/Allium/BP_Allium.uasset b/Content/Character/Allium/BP_Allium.uasset index a92879f..cc802ce 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:4f32d2c8f4fd20b5b598c4bdf0e4fb07f63a3396ff3c7981ddb37359405eaff9 -size 161942 +oid sha256:d0942f735ca09b547d763eccce10efdb9454662893e3d1c4775034d73f58c872 +size 482307 diff --git a/Content/Character/Allium/sound/AL_A_1.uasset b/Content/Character/Allium/sound/AL_A_1.uasset new file mode 100644 index 0000000..ba54d42 --- /dev/null +++ b/Content/Character/Allium/sound/AL_A_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b11ce89798f37d510d8adc5a198645f5fc64dc49d53a81f60b8a23b820b6940 +size 109764 diff --git a/Content/Character/Allium/sound/AL_A_2.uasset b/Content/Character/Allium/sound/AL_A_2.uasset new file mode 100644 index 0000000..b6ec924 --- /dev/null +++ b/Content/Character/Allium/sound/AL_A_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9075057411ce682b3b90db45613ac6a4962ba04857f62977ef7eb82dcb2dda0 +size 90505 diff --git a/Content/Character/Allium/sound/AL_Q.uasset b/Content/Character/Allium/sound/AL_Q.uasset new file mode 100644 index 0000000..73a2897 --- /dev/null +++ b/Content/Character/Allium/sound/AL_Q.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08fb4c3130b06c1c994aed7990299c5edd77892f7c959bca77c6959010d065c0 +size 59009 diff --git a/Content/Character/Allium/sound/AL_Q_Hited.uasset b/Content/Character/Allium/sound/AL_Q_Hited.uasset new file mode 100644 index 0000000..ee54a19 --- /dev/null +++ b/Content/Character/Allium/sound/AL_Q_Hited.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2664a64ee44152aa72b2af5d61ce68e4fa6725a4c8fd24c05eaac40120ae13e +size 101508 diff --git a/Content/Character/Allium/sound/Al_Q_Boom.uasset b/Content/Character/Allium/sound/Al_Q_Boom.uasset new file mode 100644 index 0000000..b372f90 --- /dev/null +++ b/Content/Character/Allium/sound/Al_Q_Boom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9576e7cccdf330814a57fe9221c89e125c65007613aca8d367b823dc5b2460ee +size 120127 diff --git a/Content/Character/Lb/Animation/ABP_Lb.uasset b/Content/Character/Lb/Animation/ABP_Lb.uasset index 276963a..b7d8e42 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:80f7c53f717b9a6e1b058da7d72f103ec65afe2da4058649a26f4915c2cf929b -size 319867 +oid sha256:83663b81102b40a15e428e7fbc67a7ca4793e6209f3171d44fa88900a282bb10 +size 329300 diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index f06bcf3..741a864 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:e83d04c4d7d33c525e6a0ed0010a09d757680a502243dc8e32793a3486511262 -size 411513 +oid sha256:1b048c4e8e8151d2508f801618ac6498733710db325cb5a8369f247b3b89f7e6 +size 411075 diff --git a/Content/Character/Lb/BaseArrow.uasset b/Content/Character/Lb/BaseArrow.uasset index a496143..e429625 100644 --- a/Content/Character/Lb/BaseArrow.uasset +++ b/Content/Character/Lb/BaseArrow.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8beb8766ceef4bb5225c66ccd7b08e7580038c3d84b04787d7fe550a1f60133 -size 144276 +oid sha256:c3acb4ae3753750e1faaf13646b4fcc7614d6f4351c307f8ccb85479dc16ba48 +size 239209 diff --git a/Content/Character/Lb/Effect/MP_Toxic Goo.mp3 b/Content/Character/Lb/Effect/MP_Toxic Goo.mp3 new file mode 100644 index 0000000..2e91784 Binary files /dev/null and b/Content/Character/Lb/Effect/MP_Toxic Goo.mp3 differ diff --git a/Content/Character/Lb/EskillBuff.uasset b/Content/Character/Lb/EskillBuff.uasset index b7a4816..02e84ee 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:4fa9596929c37a8457ad373dee05b383263e03964dcdc7bc189a55a4b00a9617 -size 173610 +oid sha256:ed273a648bce2d56f7e8ade63b4015d7fb304013becc30c291de40b89eec3907 +size 207220 diff --git a/Content/Character/Lb/LB_Bolla_Throw.uasset b/Content/Character/Lb/LB_Bolla_Throw.uasset index d3ab3a8..ffc0086 100644 --- a/Content/Character/Lb/LB_Bolla_Throw.uasset +++ b/Content/Character/Lb/LB_Bolla_Throw.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6af0371f87c7736d6771baedf7f99069d39dd2624c0af368182c3eaa288253fe -size 133748 +oid sha256:1a2b24b76a026b8a5783135bc629421be479662fbbecbc2e83566e690d52ec81 +size 169448 diff --git a/Content/Character/Lb/LB_Q_Arrow.uasset b/Content/Character/Lb/LB_Q_Arrow.uasset index b9bfc15..78ac326 100644 --- a/Content/Character/Lb/LB_Q_Arrow.uasset +++ b/Content/Character/Lb/LB_Q_Arrow.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfbf9334edda3f60007b8fd16c2caaae6dcac5fc7ece09b34296465331293f6c -size 134674 +oid sha256:88036e86848fff2d6195e918b487cdc024dcf9c51fb8c84eb7403c4eb588d630 +size 170348 diff --git a/Content/Character/Lb/LB_TNT_Fire.uasset b/Content/Character/Lb/LB_TNT_Fire.uasset index 1d4b0f6..15d5b20 100644 --- a/Content/Character/Lb/LB_TNT_Fire.uasset +++ b/Content/Character/Lb/LB_TNT_Fire.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8b74c8603b96d3bcbd077e82ae7d7fb05c1c1bbab1056901a26e3db4db4c277 -size 76528 +oid sha256:2f4f8f35b71b71c148d400d485454720e502a447fcac81b41ed88184fffa1e04 +size 79923 diff --git a/Content/Character/Lb/Lb_EskillBuff.uasset b/Content/Character/Lb/Lb_EskillBuff.uasset index c5eebd0..31cfd16 100644 --- a/Content/Character/Lb/Lb_EskillBuff.uasset +++ b/Content/Character/Lb/Lb_EskillBuff.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1797deb041998dc8fb9edecff230bfebbdc84fdd9bc0adff91471dc5964a0e84 -size 197193 +oid sha256:1d4333701be9d5cd33a689b811dd2fd1188a8fdda9952a78c4763ac3bd2418d6 +size 193917 diff --git a/Content/Character/Lb/Lb_Passive.uasset b/Content/Character/Lb/Lb_Passive.uasset new file mode 100644 index 0000000..289b4f7 --- /dev/null +++ b/Content/Character/Lb/Lb_Passive.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7e3a874d51a13859ea60e96b1443662bd90f5340a299ced72e977162b93d56c +size 216265 diff --git a/Content/Character/Lb/Lb_QskillDebuff.uasset b/Content/Character/Lb/Lb_QskillDebuff.uasset index 1b18d0f..9ef91ed 100644 --- a/Content/Character/Lb/Lb_QskillDebuff.uasset +++ b/Content/Character/Lb/Lb_QskillDebuff.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f27b1121858e74c04babfdb5df45ba3fbd4ddd2485c2067c49d7f17cb8f72bc -size 45692 +oid sha256:3c90874f71302428840d493748172bddfc2797e6666c0e08aeeadc0b93bc5c88 +size 156692 diff --git a/Content/Character/Lb/Lb_RskillBurst.uasset b/Content/Character/Lb/Lb_RskillBurst.uasset index 9ab638a..2b77364 100644 --- a/Content/Character/Lb/Lb_RskillBurst.uasset +++ b/Content/Character/Lb/Lb_RskillBurst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32a992d550435e994a41ace187e76a30ddbe5f956931ed5c3ba4d570b1f564ef -size 126011 +oid sha256:2ad4f97fc4cf258a5469526cd76cc5b15c289586f06660b3d26ba483618c77ee +size 105465 diff --git a/Content/Character/Lb/Lb_WskillDebuff.uasset b/Content/Character/Lb/Lb_WskillDebuff.uasset index b70f94d..0cb51b1 100644 --- a/Content/Character/Lb/Lb_WskillDebuff.uasset +++ b/Content/Character/Lb/Lb_WskillDebuff.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d4bd5ffc2b526dffd78bc70624b2460f229595f2e7d481a415184a8d26c60ba -size 202447 +oid sha256:25fc7133e6418cf44f17c0ef705d83925a7c17f32a8784fc42c12d7ea5ea5dbf +size 261686 diff --git a/Content/Character/Lb/sound/BaseArrow.uasset b/Content/Character/Lb/sound/BaseArrow.uasset new file mode 100644 index 0000000..a816ac1 --- /dev/null +++ b/Content/Character/Lb/sound/BaseArrow.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1de51705ac32de681f5a9595187cd9d255d116aaed2c9f6a905385bfb5dca126 +size 13987 diff --git a/Content/Character/Lb/sound/Missile.uasset b/Content/Character/Lb/sound/Missile.uasset new file mode 100644 index 0000000..6220e01 --- /dev/null +++ b/Content/Character/Lb/sound/Missile.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a9d8c7621abcd9916b6def234e3d68a6be79608ce68e352afa36ac0c67ee242 +size 16485 diff --git a/Content/Character/Lb/sound/Missile11.uasset b/Content/Character/Lb/sound/Missile11.uasset new file mode 100644 index 0000000..33c85cc --- /dev/null +++ b/Content/Character/Lb/sound/Missile11.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cea9979922fd900186eec19ed4401b9412b1009de7fb16ee58eb767d9c42783 +size 78941 diff --git a/Content/Character/Lb/sound/NewMaterial.uasset b/Content/Character/Lb/sound/NewMaterial.uasset new file mode 100644 index 0000000..3005f19 --- /dev/null +++ b/Content/Character/Lb/sound/NewMaterial.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2640835de9d8d4993388b3f0135996c0691b631dd764a5e70dcde7d0ac7f54c +size 5255 diff --git a/Content/Character/Lb/sound/T_H_A.uasset b/Content/Character/Lb/sound/T_H_A.uasset new file mode 100644 index 0000000..a49d832 --- /dev/null +++ b/Content/Character/Lb/sound/T_H_A.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5586f0c63780a6b61e3fc9f226ad95a4fcd321a71237313f89bd0ea0600bf5b5 +size 56514 diff --git a/Content/Character/Lb/sound/T_H_A_reached.uasset b/Content/Character/Lb/sound/T_H_A_reached.uasset new file mode 100644 index 0000000..58ff3e1 --- /dev/null +++ b/Content/Character/Lb/sound/T_H_A_reached.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12ed88f17cc8e0892f34857dae27d0d5d886038719977e3da4c0773973e36438 +size 51430 diff --git a/Content/Character/Lb/sound/T_H_E.uasset b/Content/Character/Lb/sound/T_H_E.uasset new file mode 100644 index 0000000..28e5f19 --- /dev/null +++ b/Content/Character/Lb/sound/T_H_E.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9935c56be74508dcc770bcc888f8b4b9c589a8d31762119528d81b02518e0c5 +size 130225 diff --git a/Content/Character/Lb/sound/T_H_Q_Boom.uasset b/Content/Character/Lb/sound/T_H_Q_Boom.uasset new file mode 100644 index 0000000..03abf22 --- /dev/null +++ b/Content/Character/Lb/sound/T_H_Q_Boom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dea3a7f7580f29fa74c07ea7cd201aa5271d439b54632a57224c983c7a4409a4 +size 321928 diff --git a/Content/Character/Lb/sound/T_H_Q_Burn.uasset b/Content/Character/Lb/sound/T_H_Q_Burn.uasset new file mode 100644 index 0000000..4d287c3 --- /dev/null +++ b/Content/Character/Lb/sound/T_H_Q_Burn.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ff27ee63800abfd54cfc59f3309cefad0a652ef11e064e9d8e2882f76023f18 +size 251009 diff --git a/Content/Character/Lb/sound/T_H_Q_shoot.uasset b/Content/Character/Lb/sound/T_H_Q_shoot.uasset new file mode 100644 index 0000000..e4dd6f4 --- /dev/null +++ b/Content/Character/Lb/sound/T_H_Q_shoot.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3160f0255d0f497da93468182a85f0f9241b97fc5de89231cdd0129b73055fbb +size 116814 diff --git a/Content/Character/Lb/sound/T_H_R_Boom.uasset b/Content/Character/Lb/sound/T_H_R_Boom.uasset new file mode 100644 index 0000000..1863d10 --- /dev/null +++ b/Content/Character/Lb/sound/T_H_R_Boom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd150f877afdcec824f5f8638dcbc506e4a93fa167a39e30274e6be26b10df37 +size 682224 diff --git a/Content/Character/Lb/sound/T_H_R_Hold.uasset b/Content/Character/Lb/sound/T_H_R_Hold.uasset new file mode 100644 index 0000000..308a734 --- /dev/null +++ b/Content/Character/Lb/sound/T_H_R_Hold.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6035811aa8cd6e3d561b7e03aaef23a83342f832a943f63983a8f6b084c3f8c1 +size 785556 diff --git a/Content/Character/Lb/sound/T_H_R_Shoot.uasset b/Content/Character/Lb/sound/T_H_R_Shoot.uasset new file mode 100644 index 0000000..ed21d94 --- /dev/null +++ b/Content/Character/Lb/sound/T_H_R_Shoot.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:328e6cce6dd428f683b94eb9f527558b57851ae8e96842c78bbacb82c463e137 +size 537993 diff --git a/Content/Character/Lb/sound/T_H_W_Shoot.uasset b/Content/Character/Lb/sound/T_H_W_Shoot.uasset new file mode 100644 index 0000000..6dc0d9a --- /dev/null +++ b/Content/Character/Lb/sound/T_H_W_Shoot.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a56c1701d1e87c6e8f4d7b93432a42f12c575f1dfe371d56a0af6934e9a9c14a +size 273722 diff --git a/Content/Character/Lb/sound/T_H_W_Tied.uasset b/Content/Character/Lb/sound/T_H_W_Tied.uasset new file mode 100644 index 0000000..604750a --- /dev/null +++ b/Content/Character/Lb/sound/T_H_W_Tied.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80594b1ac59f18d7b16b60329925dfe2c7382f947776198e6641df6eaa85c049 +size 258874 diff --git a/Content/Character/Riana/BP_Riana.uasset b/Content/Character/Riana/BP_Riana.uasset index 6938360..9f33c31 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:ec58f28eba10b40515b006ddc6d28020ebd92ef641f13d6f6624b42356d58532 +size 36945 diff --git a/Content/Effect/Alium/Alium_E/Alium_E.uasset b/Content/Effect/Alium/Alium_E/Alium_E.uasset index e165c1a..3379678 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:128acdcf225e4767ccb304ef2a9d3ec489ca9e53bc01adc4453fe323ce046715 +oid sha256:ffc2e1d1ff408655b9da169c06e85f37ca20cb2197144c3a865fce58845a3b2a size 3753024 diff --git a/Content/Effect/Alium/Alium_P_Buff1_Nia.uasset b/Content/Effect/Alium/Alium_P_Buff1_Nia.uasset new file mode 100644 index 0000000..6e903ac --- /dev/null +++ b/Content/Effect/Alium/Alium_P_Buff1_Nia.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bfb02f02c9d6a4c18043342543eefb6c398b6ae7aef082ae95edad0646a55b2 +size 612508 diff --git a/Content/Effect/Alium/Alium_P_Buff2_Nia.uasset b/Content/Effect/Alium/Alium_P_Buff2_Nia.uasset new file mode 100644 index 0000000..1d1ecc0 --- /dev/null +++ b/Content/Effect/Alium/Alium_P_Buff2_Nia.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae0b670aef3e542470eeeea35522fc1a6a73f3b077d1dcc04c5dc7db41eb0ad0 +size 1532150 diff --git a/Content/Effect/Alium/Alium_Q/Aliun_Q_Fx.uasset b/Content/Effect/Alium/Alium_Q/Aliun_Q_Fx.uasset index 7285626..686a4df 100644 --- a/Content/Effect/Alium/Alium_Q/Aliun_Q_Fx.uasset +++ b/Content/Effect/Alium/Alium_Q/Aliun_Q_Fx.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd234a42fca3c7058113e2a704551a2087f4c0634b324d21e33818bcbf5d09dd -size 1889202 +oid sha256:dffd0fb4fe06f87277edb5f2ae3d639a8c3ffe6ef9caa6144d9a347055f18a73 +size 1214951 diff --git a/Content/Effect/Alium/Alium_W/Alium_W.uasset b/Content/Effect/Alium/Alium_W/Alium_W.uasset index 6433d6d..47eb1cb 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:e4f41215c0d0ede315562c6a191c9996585251082bda6c5b1751deadb11bd295 -size 5147259 +oid sha256:a47dc60f3af7877f87220b707ecb406575c85e250c8c5d2f069a7cd671de31bd +size 5386413 diff --git a/Content/Effect/Alium/Hit/Alium_E_Hit/Alium_E_Hit_Nia.uasset b/Content/Effect/Alium/Hit/Alium_E_Hit/Alium_E_Hit_Nia.uasset index 9567ed7..4c5076e 100644 --- a/Content/Effect/Alium/Hit/Alium_E_Hit/Alium_E_Hit_Nia.uasset +++ b/Content/Effect/Alium/Hit/Alium_E_Hit/Alium_E_Hit_Nia.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc28fea220acafdcc7eb1c75f53b2864632dceaa3c1253866faf7812c20618dd -size 1500164 +oid sha256:1db9f3a199522755434e3c6046d86add67408dc2a314f82fbe24724ba6f3b767 +size 1498782 diff --git a/Content/Effect/Alium/Hit/Alium_Q_Hit.uasset b/Content/Effect/Alium/Hit/Alium_Q_Hit.uasset index 31fe410..7c21d69 100644 --- a/Content/Effect/Alium/Hit/Alium_Q_Hit.uasset +++ b/Content/Effect/Alium/Hit/Alium_Q_Hit.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0adc3629cdee2a8614254b354ede038935daef5e47c44180f4d16a538e5eb45c -size 25129 +oid sha256:78288ff4ac59cec39dc8a839c5db5fa70ee26702bf7c07c055a5a2580c01d289 +size 25437 diff --git a/Content/Effect/Alium/Hit/Alium_Q_Hit/Alium_Q_Hit.uasset b/Content/Effect/Alium/Hit/Alium_Q_Hit/Alium_Q_Hit.uasset index 67a3165..d7e15c6 100644 --- a/Content/Effect/Alium/Hit/Alium_Q_Hit/Alium_Q_Hit.uasset +++ b/Content/Effect/Alium/Hit/Alium_Q_Hit/Alium_Q_Hit.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ef53cc1cca18ecd653d153668154b9c991972c5bb2ac8de0ae2bbaef5181aa9 -size 1027286 +oid sha256:74b3cc27e3b392c839fee28de42608bd97a3e142f8b65a69d616aa69975a5d0c +size 1026823 diff --git a/Content/Effect/Alium/Hit/Alium_R_Hit.uasset b/Content/Effect/Alium/Hit/Alium_R_Hit.uasset index 7b587f6..8afb75f 100644 --- a/Content/Effect/Alium/Hit/Alium_R_Hit.uasset +++ b/Content/Effect/Alium/Hit/Alium_R_Hit.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01658ed2dab8ce1e630482b81614311c5f34841a37e59ed501c427158d54f247 -size 23011 +oid sha256:ba918b7335b793067010b709e8cbc92ef65ab8fe40a782340d013b0f1aec7fd8 +size 77950 diff --git a/Content/Effect/Alium/Hit/Alium_R_Hit/Alium_R_Hit_Nia.uasset b/Content/Effect/Alium/Hit/Alium_R_Hit/Alium_R_Hit_Nia.uasset index 3dd957d..b3f4cc9 100644 --- a/Content/Effect/Alium/Hit/Alium_R_Hit/Alium_R_Hit_Nia.uasset +++ b/Content/Effect/Alium/Hit/Alium_R_Hit/Alium_R_Hit_Nia.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7a6b5cf83a7237ecf5e7ff5e9eb2581ae24040f0099a812dce50eca53418901 -size 775078 +oid sha256:b90b5715aea6b3aee496887b27fa909b30dc725322ffe89909d72cc6d5adf2de +size 774414 diff --git a/Content/Effect/Alium/Hit/Alium_Simple_Hit.uasset b/Content/Effect/Alium/Hit/Alium_Simple_Hit.uasset index 063f63f..3c43752 100644 --- a/Content/Effect/Alium/Hit/Alium_Simple_Hit.uasset +++ b/Content/Effect/Alium/Hit/Alium_Simple_Hit.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b0d3103fc6aaef7eb7bed556b2ea8f7cbe63cd9bd76f3d2cd3032c7b53540aec -size 24502 +oid sha256:217c0fff129ea74980f29389a226e737969274cfdf45a4f18511c3ad86384ce2 +size 24810 diff --git a/Content/Effect/Alium/Hit/Alium_W_Hit.uasset b/Content/Effect/Alium/Hit/Alium_W_Hit.uasset index aaf33cc..abced65 100644 --- a/Content/Effect/Alium/Hit/Alium_W_Hit.uasset +++ b/Content/Effect/Alium/Hit/Alium_W_Hit.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64d7cf33ee0dff7ac74070798f786e9bf9649a48d2029bdf4f5b73888fa14da1 -size 26974 +oid sha256:7989698efc5fafd08436995923462e70c682704a0ce484a3ff3f00254488b03a +size 24220 diff --git a/Content/Effect/Alium/Hit/Alium_W_Hit/Alium_W_Hit_Nia.uasset b/Content/Effect/Alium/Hit/Alium_W_Hit/Alium_W_Hit_Nia.uasset index de9637d..2f8b946 100644 --- a/Content/Effect/Alium/Hit/Alium_W_Hit/Alium_W_Hit_Nia.uasset +++ b/Content/Effect/Alium/Hit/Alium_W_Hit/Alium_W_Hit_Nia.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a087d02f317cf88b46f3bd654c9947f7122abde0fb2209c7ba14edd9f9cfe061 -size 667569 +oid sha256:b1ee4ae3e98aa5c231399ff7927da2313812cff4d1b5acc2e1d5ed08255212f3 +size 672148 diff --git a/Content/Effect/ETC/Hit_FX/Hit_nomal.uasset b/Content/Effect/ETC/Hit_FX/Hit_nomal.uasset index 3139a2f..a392360 100644 --- a/Content/Effect/ETC/Hit_FX/Hit_nomal.uasset +++ b/Content/Effect/ETC/Hit_FX/Hit_nomal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:873e0b92e18220d0e7ad210a98b6a362bfe5dd5c86c021502aa6eb0f9397763a -size 1558299 +oid sha256:5c083b3a5e382fea49b0e770eabdd21be3850c1bb4ed5c2ca0263174a21d55aa +size 1575345 diff --git a/Content/Effect/ETC/Speed_Down.uasset b/Content/Effect/ETC/Speed_Down.uasset index d6bb78f..c51686b 100644 --- a/Content/Effect/ETC/Speed_Down.uasset +++ b/Content/Effect/ETC/Speed_Down.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad716b9036eba791ddd0ad013a4566b29927f7dd897ef2e87e7e4c8c7412fe67 -size 23009 +oid sha256:fad6d431ffe9d88ec20ebfa07f4b505a28cca151a37cf8f009c477bb59d9304a +size 23298 diff --git a/Content/Effect/ETC/Speed_Down/Speed_Down.uasset b/Content/Effect/ETC/Speed_Down/Speed_Down.uasset index 2b279ab..c51fe2a 100644 --- a/Content/Effect/ETC/Speed_Down/Speed_Down.uasset +++ b/Content/Effect/ETC/Speed_Down/Speed_Down.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a788c2a0f391f749ac4b8c0201db60f73ed77043736930659f045277e9a937e -size 595910 +oid sha256:36d4788547f9ae128e59043a5d31d1403c7f3e8a8889d63662d8c82b070c3c3a +size 633413 diff --git a/Content/Effect/LB/Arrow/Arrow_Flash.uasset b/Content/Effect/LB/Arrow/Arrow_Flash.uasset index 6fc4b39..a637532 100644 --- a/Content/Effect/LB/Arrow/Arrow_Flash.uasset +++ b/Content/Effect/LB/Arrow/Arrow_Flash.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7036040b1e2cba274c767596dc14415dd1a2c06a807a85081475c8b14935617b +oid sha256:3e3d5c324706e06b40ecc9024b4bc921818b5ea406d57f1a0eaf89b5318a1d49 size 892797 diff --git a/Content/Effect/LB/LB_Hit/LB_Q_Hit/LB_Q_Hit.uasset b/Content/Effect/LB/LB_Hit/LB_Q_Hit/LB_Q_Hit.uasset index 74d7008..cbb143b 100644 --- a/Content/Effect/LB/LB_Hit/LB_Q_Hit/LB_Q_Hit.uasset +++ b/Content/Effect/LB/LB_Hit/LB_Q_Hit/LB_Q_Hit.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fbdc3a58bbe809fadc8aff221f4465d7690147f5ff9759fe59eb29cb200f33b -size 1741366 +oid sha256:0be9464c55e50d9ce39a8bcc65d835e9bd2340c543079ac3c0e40a4934b10c95 +size 1740236 diff --git a/Content/Effect/LB/LB_Skill/Q/LB_Q.uasset b/Content/Effect/LB/LB_Skill/Q/LB_Q.uasset index e5c4492..d66b8e2 100644 --- a/Content/Effect/LB/LB_Skill/Q/LB_Q.uasset +++ b/Content/Effect/LB/LB_Skill/Q/LB_Q.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ca896d90b72dab95a85b47cf7aae38c10e76097fe0949ed5ee89b1a12eaa852 -size 2947609 +oid sha256:13bb38254453bbbb3ef7310f8da9b70b69ba0e7f67cd4ed7f3141b1dba16dfb0 +size 2948264 diff --git a/Content/Maps/DevMap.umap b/Content/Maps/DevMap.umap index d182dbc..0a88f50 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:114742f735c0583edde775b26624029a85932f24e7b39bf412ed70c61da68846 -size 179457 +oid sha256:6cf3b51a8c4869ca518887aa92b999b1e9a42afde7c1f5fb941f454deb1f5c58 +size 180554 diff --git a/Source/Promether/AnimNotify/AN_AnimEnd.cpp b/Source/Promether/AnimNotify/AN_AnimEnd.cpp index 60bf3eb..57376f5 100644 --- a/Source/Promether/AnimNotify/AN_AnimEnd.cpp +++ b/Source/Promether/AnimNotify/AN_AnimEnd.cpp @@ -15,7 +15,8 @@ void UAN_AnimEnd::Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* An ADefaultPlayerState* MyState = MyCharacter->GetPlayerState(); if (!MyState) return; - MyState->SetState(ECharacterState::Idle); + MyState->SetState(ECharacterState::Idle); + UE_LOG(LogTemp, Warning, TEXT("State log : %d"), MyState->GetState()); 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/DefaultPlayerCharacter.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp index d77f526..4a10acf 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp @@ -65,64 +65,60 @@ float ADefaultPlayerCharacter::TakeDamage_Implementation(float DamageAmount, str { float ReturnValue = Super::TakeDamage(DamageAmount, DamageEvent, EventInstigator, DamageCauser); - if (HasAuthority()) + ADefaultPlayerState* State = GetPlayerState(); + if (!State) return ReturnValue; + + if (!Cast(DamageCauser)) return ReturnValue; + + ADefaultPlayerState* AttackerState = Cast(DamageCauser)->GetPlayerState(); + if (!AttackerState) return ReturnValue; + + float ADDamageMultiplier = 0; + float APDamageMultiplier = 0; + + if (State->Stats[(uint8)EStats::Armor] >= 0) + ADDamageMultiplier = 100 / (100 + State->Stats[(uint8)EStats::Armor]); + else + ADDamageMultiplier = 2 - 100 / (100 - State->Stats[(uint8)EStats::Armor]); + + if (State->Stats[(uint8)EStats::MagicResistance] >= 0) + APDamageMultiplier = 100 / (100 + State->Stats[(uint8)EStats::MagicResistance]); + else + APDamageMultiplier = 2 - 100 / (100 - State->Stats[(uint8)EStats::MagicResistance]); + + + UE_LOG(LogTemp, Warning, TEXT("%s : ADDamageMultiplier : %f CalculatedDamage : %f"), *DamageCauser->GetName(), ADDamageMultiplier, DamageAmount * ADDamageMultiplier); + UE_LOG(LogTemp, Warning, TEXT("%s : APDamageMultiplier : %f CalculatedDamage : %f"), *DamageCauser->GetName(), APDamageMultiplier, DamageAmount * APDamageMultiplier); + + float UpdatedHealth = 0; + + if (Cast(DamageEvent.DamageTypeClass->GetDefaultObject())) { - UE_LOG(LogTemp, Warning, TEXT("TakeDamage Called On Server")); + UE_LOG(LogTemp, Warning, TEXT("DamageType : BaseAttack")); + + UpdatedHealth = State->Stats[(uint8)EStats::Health] - DamageAmount * ADDamageMultiplier; + } + else + { + UE_LOG(LogTemp, Warning, TEXT("DamageType : APDamage")); + + UpdatedHealth = State->Stats[(uint8)EStats::Health] - DamageAmount * APDamageMultiplier; + } + + if (UpdatedHealth < 0 || UpdatedHealth < 0.1) + { + State->Stats[(uint8)EStats::Health] = 0; + } else { - UE_LOG(LogTemp, Warning, TEXT("TakeDamage Called On Client")); + State->Stats[(uint8)EStats::Health] = UpdatedHealth; } - if (HasAuthority()) - { - if (ADefaultPlayerState* MyState = this->GetInstigatorController()->GetPlayerState()) - { - if (ADefaultPlayerState* EventInstigatorState = EventInstigator->GetPlayerState()) - { - float ADDamageMultiplier = 0; - float APDamageMultiplier = 0; + UE_LOG(LogTemp, Warning, TEXT("Current Health : %f"), State->Stats[(uint8)EStats::Health]); + UE_LOG(LogTemp, Warning, TEXT("U Health : %f"), UpdatedHealth); - if (MyState->Stats[(uint8)EStats::Armor] >= 0) - ADDamageMultiplier = 100 / (100 + MyState->Stats[(uint8)EStats::Armor]); - else - ADDamageMultiplier = 2 - 100 / (100 - MyState->Stats[(uint8)EStats::Armor]); - - if (MyState->Stats[(uint8)EStats::MagicResistance] >= 0) - APDamageMultiplier = 100 / (100 + MyState->Stats[(uint8)EStats::MagicResistance]); - else - APDamageMultiplier = 2 - 100 / (100 - MyState->Stats[(uint8)EStats::MagicResistance]); - - - UE_LOG(LogTemp, Warning, TEXT("%s : ADDamageMultiplier : %f CalculatedDamage : %f"), *DamageCauser->GetName(), ADDamageMultiplier, DamageAmount * ADDamageMultiplier); - UE_LOG(LogTemp, Warning, TEXT("%s : APDamageMultiplier : %f CalculatedDamage : %f"), *DamageCauser->GetName(), APDamageMultiplier, DamageAmount * APDamageMultiplier); - - if (Cast(DamageEvent.DamageTypeClass->GetDefaultObject())) - { - UE_LOG(LogTemp, Warning, TEXT("DamageType : BaseAttack")); - - float UpdatedHealth = MyState->Stats[(uint8)EStats::Health] - EventInstigatorState->Stats[(uint8)EStats::AttackDamage] * ADDamageMultiplier; - if (UpdatedHealth < 0) - { - MyState->Stats[(uint8)EStats::Health] = 0; - } - else - { - MyState->Stats[(uint8)EStats::Health] = UpdatedHealth; - } - - UE_LOG(LogTemp, Warning, TEXT("Current Health : %f"), MyState->Stats[(uint8)EStats::Health]); - } - - } - } - - return ReturnValue; - } - else - { - return -1.0f; - } + return ReturnValue; } diff --git a/Source/Promether/PrometherEnum.h b/Source/Promether/PrometherEnum.h index 8b7f54e..cecbf72 100644 --- a/Source/Promether/PrometherEnum.h +++ b/Source/Promether/PrometherEnum.h @@ -102,9 +102,9 @@ enum class EStats : uint8 HPRegeneration, HealAndShieldpower, Armor, - ArmorBuff, + MaxHealth, MagicResistance, - MagicResistanceBuff, + MaxMana, Tenacity, SlowRisist, AttackSpeed,