From 6691dfd3fa3a37f42e8b22b6ee512bcb0a019cc0 Mon Sep 17 00:00:00 2001 From: SJW1024 Date: Wed, 15 Nov 2023 02:14:46 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BA=90=EB=A6=AD=ED=84=B0=20=EC=8A=A4?= =?UTF-8?q?=ED=82=AC=20=EC=B5=9C=EC=A2=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content/Blueprints/BP_DefaultPlayerCharacter.uasset | 4 ++-- Content/Blueprints/BP_defaultplayerstate.uasset | 3 +++ Content/Blueprints/Bp_DeathMatch.uasset | 4 ++-- Content/Blueprints/DefaultClass.uasset | 3 --- Content/Character/Allium/Alium_Q.uasset | 4 ++-- Content/Character/Allium/Alium_Q_Debuff2.uasset | 4 ++-- Content/Character/Allium/Alium_w.uasset | 4 ++-- Content/Character/Allium/Animation/ABP_Allium.uasset | 4 ++-- Content/Character/Allium/Animation/Skill1_Anim.uasset | 4 ++-- Content/Character/Allium/BP_Allium.uasset | 4 ++-- Content/Character/Allium/sound/AL_Q.uasset | 4 ++-- Content/Character/Lb/BP_Lb.uasset | 4 ++-- Content/Character/Lb/BaseArrow.uasset | 4 ++-- Content/Character/Lb/LB_Bolla_Throw.uasset | 4 ++-- Content/Character/Lb/LB_TNT_Fire.uasset | 4 ++-- Content/Character/Lb/Lb_RskillBurst.uasset | 4 ++-- Content/Character/Lb/sound/T_H_Q_Burn.uasset | 2 +- Content/Character/Riana/Animation/Skill1_Anim.uasset | 4 ++-- Content/Character/Riana/Animation/Skill2_Anim.uasset | 4 ++-- Content/Character/Riana/BP_Riana.uasset | 4 ++-- Content/Character/Riana/ESkillAttack_2.uasset | 3 +++ Content/Character/Riana/EskillAttacker.uasset | 3 +++ Content/Character/Riana/Liana_E.uasset | 3 +++ Content/Character/Riana/Liana_Q.uasset | 3 +++ Content/Character/Riana/Liana_W1.uasset | 3 +++ Content/Character/Riana/Liana_W1_BP.uasset | 3 +++ Content/Character/Riana/Liana_W2.uasset | 3 +++ Content/Character/Riana/Liana_W_Floor.uasset | 3 +++ Content/Character/Riana/MP_Bomb-Explosion-1.uasset | 3 +++ Content/Character/Riana/RSkillAttack.uasset | 4 ++-- Content/Character/Riana/Riana_E_Floors.uasset | 3 +++ Content/Character/Riana/Riana_E_floor.uasset | 3 +++ Content/Character/Riana/sound/MP_Catapult.uasset | 3 +++ Content/Character/Riana/sound/RI_water.uasset | 3 +++ Content/Character/Riana/sound/RI_water_2.uasset | 3 +++ Content/Character/Riana/sound/Riana_Q_Boom.uasset | 3 +++ Content/Character/Riana/sound/Riana_Q_Floor.uasset | 3 +++ Content/Character/Riana/sound/Riana_Q_Floor_N.uasset | 3 +++ Content/Character/Riana/sound/Riana_W_Spawn.uasset | 3 +++ Content/Character/Riana/wind_attack.uasset | 3 +++ Content/Character/Riana/wind_loop.uasset | 3 +++ .../Alium/Hit/Alium_E_Hit/Alium_E_Hit_Nia.uasset | 4 ++-- .../EE/Effect/Alium/Hit/Alium_E_Hit/Hcyl_2.uasset | 3 +++ Content/Effect/EE/Effect/ETC/Burning.uasset | 4 ++-- Content/Effect/ETC/Burning/Burning.uasset | 4 ++-- Content/Effect/Liana/Liana_Hit/Liana_Q_Hit.uasset | 4 ++-- .../Liana_Hit/Liana_Q_Hit/Liana_Q_Hit_Nia.uasset | 4 ++-- .../Effect/Liana/Liana_Hit/Liana_Q_Hit_Floor.uasset | 4 ++-- .../Liana/Liana_Hit/Liana_Q_Hit_Floor_Dot.uasset | 3 +++ Content/Effect/Liana/Liana_Skill/Liana_Nomal.uasset | 4 ++-- Content/Effect/Liana/Liana_Skill/Liana_R.uasset | 4 ++-- .../Liana/Liana_Skill/Liana_R/Liana_R_Boom_Nia.uasset | 4 ++-- Content/Effect/Liana/Liana_Skill/Liana_R_Boom.uasset | 4 ++-- .../Liana/Liana_Skill/Liana_W/Liana_W1_Anim.uasset | 4 ++-- .../Liana_Skill/Liana_W/Liana_W_Water_Bust_Nia.uasset | 4 ++-- Content/Maps/DevMap.umap | 4 ++-- Source/Promether/GameModeBase/Deathmatch.cpp | 2 +- .../PlayerGeneric/DefaultPlayerController.cpp | 11 ++++++++--- Source/Promether/PlayerGeneric/DefaultPlayerState.cpp | 4 ++-- 59 files changed, 143 insertions(+), 72 deletions(-) create mode 100644 Content/Blueprints/BP_defaultplayerstate.uasset delete mode 100644 Content/Blueprints/DefaultClass.uasset create mode 100644 Content/Character/Riana/ESkillAttack_2.uasset create mode 100644 Content/Character/Riana/EskillAttacker.uasset create mode 100644 Content/Character/Riana/Liana_E.uasset create mode 100644 Content/Character/Riana/Liana_Q.uasset create mode 100644 Content/Character/Riana/Liana_W1.uasset create mode 100644 Content/Character/Riana/Liana_W1_BP.uasset create mode 100644 Content/Character/Riana/Liana_W2.uasset create mode 100644 Content/Character/Riana/Liana_W_Floor.uasset create mode 100644 Content/Character/Riana/MP_Bomb-Explosion-1.uasset create mode 100644 Content/Character/Riana/Riana_E_Floors.uasset create mode 100644 Content/Character/Riana/Riana_E_floor.uasset create mode 100644 Content/Character/Riana/sound/MP_Catapult.uasset create mode 100644 Content/Character/Riana/sound/RI_water.uasset create mode 100644 Content/Character/Riana/sound/RI_water_2.uasset create mode 100644 Content/Character/Riana/sound/Riana_Q_Boom.uasset create mode 100644 Content/Character/Riana/sound/Riana_Q_Floor.uasset create mode 100644 Content/Character/Riana/sound/Riana_Q_Floor_N.uasset create mode 100644 Content/Character/Riana/sound/Riana_W_Spawn.uasset create mode 100644 Content/Character/Riana/wind_attack.uasset create mode 100644 Content/Character/Riana/wind_loop.uasset create mode 100644 Content/Effect/EE/Effect/Alium/Hit/Alium_E_Hit/Hcyl_2.uasset create mode 100644 Content/Effect/Liana/Liana_Hit/Liana_Q_Hit_Floor_Dot.uasset diff --git a/Content/Blueprints/BP_DefaultPlayerCharacter.uasset b/Content/Blueprints/BP_DefaultPlayerCharacter.uasset index a847e66..9d2ffd5 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:cce6c60de9ed8b0afe5cfd96c6979cdc831d6b927749d8604a420182b6294e6b -size 130551 +oid sha256:5952563f4666f905064f868f48a29fcf0aca136dff8fa8946d2140dfaa91822d +size 143186 diff --git a/Content/Blueprints/BP_defaultplayerstate.uasset b/Content/Blueprints/BP_defaultplayerstate.uasset new file mode 100644 index 0000000..a36d507 --- /dev/null +++ b/Content/Blueprints/BP_defaultplayerstate.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aeaf12490803e1aae8e9fced0229e4a09be5d96260d8d69b73471dfc53fb08c3 +size 29474 diff --git a/Content/Blueprints/Bp_DeathMatch.uasset b/Content/Blueprints/Bp_DeathMatch.uasset index 084a0ca..ec87561 100644 --- a/Content/Blueprints/Bp_DeathMatch.uasset +++ b/Content/Blueprints/Bp_DeathMatch.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8c52b4983ce561a38c08f0425735763ca1199351978fe1d59aa945446c27e4e -size 18830 +oid sha256:ca2f6484ca355e6edd18acbc1a8040f78af923e52a187552c20568ea791d79e2 +size 19422 diff --git a/Content/Blueprints/DefaultClass.uasset b/Content/Blueprints/DefaultClass.uasset deleted file mode 100644 index e1a4511..0000000 --- a/Content/Blueprints/DefaultClass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e8a0c4c04da4fc8856f04a18c5f5a97ec2d366bd739d928d1a2f43fd9dd9831 -size 12732 diff --git a/Content/Character/Allium/Alium_Q.uasset b/Content/Character/Allium/Alium_Q.uasset index df6fc39..7b03dc8 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:b1db0f5e39e4d320a168f824b5d4200c506214dbce935ef99d4503535ac392b8 -size 175065 +oid sha256:f82cbc476e5f95992d94c00e588243e7290efcffeecfe31d6de7d668dd3a2524 +size 186771 diff --git a/Content/Character/Allium/Alium_Q_Debuff2.uasset b/Content/Character/Allium/Alium_Q_Debuff2.uasset index 7ff63db..e02cc04 100644 --- a/Content/Character/Allium/Alium_Q_Debuff2.uasset +++ b/Content/Character/Allium/Alium_Q_Debuff2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:572f5dc7273857cdbe17416b0f3fc499616df835476b9f0cfb60fd9b28be81e1 -size 279931 +oid sha256:691cc14edbe38bbedb4ffdf0bda1ca80522884bf53d26146944ee1b983a5d7c8 +size 304368 diff --git a/Content/Character/Allium/Alium_w.uasset b/Content/Character/Allium/Alium_w.uasset index 6a47037..8bdf1c7 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:941600583eb9d15f7239911a2e0a729b954450de340d631c6802630844cbfd46 -size 184395 +oid sha256:7f693b63b97d3850fe729b66559ce6e22e4840f0fbb9be9351c4b275471ee4c3 +size 180740 diff --git a/Content/Character/Allium/Animation/ABP_Allium.uasset b/Content/Character/Allium/Animation/ABP_Allium.uasset index f16db0a..af8bdd9 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:b5f2e6b884188dbc9492b89c93ccaa4bcc38f64dd55b6814b88dc8247b41f373 -size 311396 +oid sha256:c76d2de2c4d3f0c07ac99d789674bc504f2f0b3fedc4d246a81fd61ec565d19b +size 309158 diff --git a/Content/Character/Allium/Animation/Skill1_Anim.uasset b/Content/Character/Allium/Animation/Skill1_Anim.uasset index 5ea5f7c..a3469a2 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:281f67750692886e4507b163407ddcb5c94d0852f8b24c4c7950f375f556d1f1 -size 153756 +oid sha256:455c6be88f3196e621cd0fa1da767a003c94bb614efc19a6357018c5f0773656 +size 154041 diff --git a/Content/Character/Allium/BP_Allium.uasset b/Content/Character/Allium/BP_Allium.uasset index 229e923..0cb874f 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:13b8bc13f2eff588f2154f6cb45317252630e53d747cfcc7cb2db3a19ce1c066 -size 430892 +oid sha256:c407d680bd57754c059ac3a1cca4a78b2b9279aed13926031b5f6d99406f3cd4 +size 553647 diff --git a/Content/Character/Allium/sound/AL_Q.uasset b/Content/Character/Allium/sound/AL_Q.uasset index 73a2897..5142d6a 100644 --- a/Content/Character/Allium/sound/AL_Q.uasset +++ b/Content/Character/Allium/sound/AL_Q.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08fb4c3130b06c1c994aed7990299c5edd77892f7c959bca77c6959010d065c0 -size 59009 +oid sha256:b73ae483a9c29fb5c12d1270cb9f30154ed95f5c719a64943ea1010a178eb050 +size 59052 diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index ea54857..a28caf6 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:5f2710dba726be43ec6aa657b78e64c04994f74957e89cb0dfa2b06bec4bf1ea -size 411719 +oid sha256:3157f84a2c22afcb3729d3e7755f7774ce801967ebcff65a9ba12a6bdd6acb49 +size 589343 diff --git a/Content/Character/Lb/BaseArrow.uasset b/Content/Character/Lb/BaseArrow.uasset index 63c659c..afe12c1 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:5757793046b6c9799196b88682251317dc987f7ec724d850a39a47976f200793 -size 275921 +oid sha256:b4338b1e9b760727f2902160df66bd9e8be58dcea32aca50283dddd9adb0ccd1 +size 271241 diff --git a/Content/Character/Lb/LB_Bolla_Throw.uasset b/Content/Character/Lb/LB_Bolla_Throw.uasset index ffc0086..f704e0b 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:1a2b24b76a026b8a5783135bc629421be479662fbbecbc2e83566e690d52ec81 -size 169448 +oid sha256:ad07693792ea446a19fa1532e7657d17fbafb1e29f5d58ebea0f8e6091b67d92 +size 160653 diff --git a/Content/Character/Lb/LB_TNT_Fire.uasset b/Content/Character/Lb/LB_TNT_Fire.uasset index 15d5b20..3bc315c 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:2f4f8f35b71b71c148d400d485454720e502a447fcac81b41ed88184fffa1e04 -size 79923 +oid sha256:b0253e776a89b002325b7150d2105533203f6828711971c9574110be0e22d415 +size 80080 diff --git a/Content/Character/Lb/Lb_RskillBurst.uasset b/Content/Character/Lb/Lb_RskillBurst.uasset index 2b77364..85150f5 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:2ad4f97fc4cf258a5469526cd76cc5b15c289586f06660b3d26ba483618c77ee -size 105465 +oid sha256:c0be60e2e994d7998616cd1013bebe096169bc378082b6dfb8f1686debf1042b +size 104913 diff --git a/Content/Character/Lb/sound/T_H_Q_Burn.uasset b/Content/Character/Lb/sound/T_H_Q_Burn.uasset index 4d287c3..060ae35 100644 --- a/Content/Character/Lb/sound/T_H_Q_Burn.uasset +++ b/Content/Character/Lb/sound/T_H_Q_Burn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9ff27ee63800abfd54cfc59f3309cefad0a652ef11e064e9d8e2882f76023f18 +oid sha256:dc7ee5d2ec0a119e417c0f32f00be0850b5beafff5dc248671730a63eea17a6c size 251009 diff --git a/Content/Character/Riana/Animation/Skill1_Anim.uasset b/Content/Character/Riana/Animation/Skill1_Anim.uasset index 4f40d80..e0e029d 100644 --- a/Content/Character/Riana/Animation/Skill1_Anim.uasset +++ b/Content/Character/Riana/Animation/Skill1_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b5f5fdf0729c95ad8fbe4e24f4c08974d256d9032f52145cefb4c6a0b789681 -size 244382 +oid sha256:e44102936a78a9af8a73177235da84b7cc719a7503a832a75e1d91d0a89feef4 +size 244429 diff --git a/Content/Character/Riana/Animation/Skill2_Anim.uasset b/Content/Character/Riana/Animation/Skill2_Anim.uasset index 40ed87b..d740932 100644 --- a/Content/Character/Riana/Animation/Skill2_Anim.uasset +++ b/Content/Character/Riana/Animation/Skill2_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37a344d024a85bc89529065857029c418d502add1c122a115f6961861230f1f7 -size 241677 +oid sha256:469d9713731d408ab17ba66555329bec2955d5f36290b8e00dc27f13940ab616 +size 241672 diff --git a/Content/Character/Riana/BP_Riana.uasset b/Content/Character/Riana/BP_Riana.uasset index bca2f75..8850832 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:90daee8574fa248c151f7f87ca8487457f72db53a80d145a1b3d190e3a850325 -size 137603 +oid sha256:5c55b275d5617180a4ce01b0e1eb8d98720b2eb040011cb1061239f10ac9acf8 +size 468314 diff --git a/Content/Character/Riana/ESkillAttack_2.uasset b/Content/Character/Riana/ESkillAttack_2.uasset new file mode 100644 index 0000000..4242275 --- /dev/null +++ b/Content/Character/Riana/ESkillAttack_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7f5f406ab395d3b2221db337ca07c5e163129ff9427680378797d43ed357b40 +size 91996 diff --git a/Content/Character/Riana/EskillAttacker.uasset b/Content/Character/Riana/EskillAttacker.uasset new file mode 100644 index 0000000..f483fae --- /dev/null +++ b/Content/Character/Riana/EskillAttacker.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4eb1b182aab9c7d2551cc9f9e37755e0f0ce92377880e226512c4b68f0fe45f +size 93532 diff --git a/Content/Character/Riana/Liana_E.uasset b/Content/Character/Riana/Liana_E.uasset new file mode 100644 index 0000000..0821e91 --- /dev/null +++ b/Content/Character/Riana/Liana_E.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69726a17e72bcea9dd9ce0785d737ca6d855924e2f1dbf00856c0ecfe13867f1 +size 66988 diff --git a/Content/Character/Riana/Liana_Q.uasset b/Content/Character/Riana/Liana_Q.uasset new file mode 100644 index 0000000..3a95845 --- /dev/null +++ b/Content/Character/Riana/Liana_Q.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0aaecad1d521d02022d63f317c195b60adf1b00c08f97646a710518004b68220 +size 95803 diff --git a/Content/Character/Riana/Liana_W1.uasset b/Content/Character/Riana/Liana_W1.uasset new file mode 100644 index 0000000..98e4963 --- /dev/null +++ b/Content/Character/Riana/Liana_W1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:825187f899b8fa23d287a048689fb87b1c6dcda42fdb3acf458253ae612b94de +size 85209 diff --git a/Content/Character/Riana/Liana_W1_BP.uasset b/Content/Character/Riana/Liana_W1_BP.uasset new file mode 100644 index 0000000..71153ae --- /dev/null +++ b/Content/Character/Riana/Liana_W1_BP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd5d14efd6b26c079553c27768067cb8e0c61d5efcb26805c1ecd89da7fafe38 +size 28540 diff --git a/Content/Character/Riana/Liana_W2.uasset b/Content/Character/Riana/Liana_W2.uasset new file mode 100644 index 0000000..d2815e5 --- /dev/null +++ b/Content/Character/Riana/Liana_W2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4604334173cae4c5d2b53476c3658cf206a9528937e3d9e899cf7bfa2abd053f +size 30833 diff --git a/Content/Character/Riana/Liana_W_Floor.uasset b/Content/Character/Riana/Liana_W_Floor.uasset new file mode 100644 index 0000000..c9ffa5a --- /dev/null +++ b/Content/Character/Riana/Liana_W_Floor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:151dd086a2cdbe07ba53d12e67afda05901f73f73157500b25858e0e6299d24d +size 193311 diff --git a/Content/Character/Riana/MP_Bomb-Explosion-1.uasset b/Content/Character/Riana/MP_Bomb-Explosion-1.uasset new file mode 100644 index 0000000..68ee663 --- /dev/null +++ b/Content/Character/Riana/MP_Bomb-Explosion-1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05290f30b34e7cf106015875be41ec072dcb64642ee085f9d79e47406e17b4da +size 251158 diff --git a/Content/Character/Riana/RSkillAttack.uasset b/Content/Character/Riana/RSkillAttack.uasset index 09927c0..16c8237 100644 --- a/Content/Character/Riana/RSkillAttack.uasset +++ b/Content/Character/Riana/RSkillAttack.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35d0a6a66d5a6e33ea968e99cae0bba625c3c44f84b2b8d2f0ae3c918c4b4271 -size 95208 +oid sha256:16144784f50c617f6d3207dc3212cf04745119e3bed07a4bf8085dfba879b9f4 +size 103265 diff --git a/Content/Character/Riana/Riana_E_Floors.uasset b/Content/Character/Riana/Riana_E_Floors.uasset new file mode 100644 index 0000000..521b6f5 --- /dev/null +++ b/Content/Character/Riana/Riana_E_Floors.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e97fbc47112598454119463189030790a42159a24ea9acfce1e2e3d735d0fb7c +size 24326 diff --git a/Content/Character/Riana/Riana_E_floor.uasset b/Content/Character/Riana/Riana_E_floor.uasset new file mode 100644 index 0000000..4ff4c82 --- /dev/null +++ b/Content/Character/Riana/Riana_E_floor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf76aa81eb71940609a1f099df5b8d7674c1be41154769123b35c4d25fb470dd +size 630145 diff --git a/Content/Character/Riana/sound/MP_Catapult.uasset b/Content/Character/Riana/sound/MP_Catapult.uasset new file mode 100644 index 0000000..753d19f --- /dev/null +++ b/Content/Character/Riana/sound/MP_Catapult.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:996b85e7ec972b2a9c1c1ce3eef1ba9ae5c3d88b751b69943ab32e75463df68b +size 292517 diff --git a/Content/Character/Riana/sound/RI_water.uasset b/Content/Character/Riana/sound/RI_water.uasset new file mode 100644 index 0000000..efaec34 --- /dev/null +++ b/Content/Character/Riana/sound/RI_water.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a51cba80c3b8337b3c91e3cdededdc2a20ee721418f8da4937c75b5280dddc51 +size 170654 diff --git a/Content/Character/Riana/sound/RI_water_2.uasset b/Content/Character/Riana/sound/RI_water_2.uasset new file mode 100644 index 0000000..15d26f1 --- /dev/null +++ b/Content/Character/Riana/sound/RI_water_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c75cbe8ac64ecebf7496f7e053bd8859db430ed95502b40603972f1712223b5 +size 138513 diff --git a/Content/Character/Riana/sound/Riana_Q_Boom.uasset b/Content/Character/Riana/sound/Riana_Q_Boom.uasset new file mode 100644 index 0000000..b5880c0 --- /dev/null +++ b/Content/Character/Riana/sound/Riana_Q_Boom.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:465e545676666b18347e50b6ac3c21dd72669ea74418516d548dff31280e5adb +size 444417 diff --git a/Content/Character/Riana/sound/Riana_Q_Floor.uasset b/Content/Character/Riana/sound/Riana_Q_Floor.uasset new file mode 100644 index 0000000..5be0b3c --- /dev/null +++ b/Content/Character/Riana/sound/Riana_Q_Floor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3675b6b123989a7bee1aeb025a9901dd9f603391cff965ea95f0dc48b912d381 +size 785664 diff --git a/Content/Character/Riana/sound/Riana_Q_Floor_N.uasset b/Content/Character/Riana/sound/Riana_Q_Floor_N.uasset new file mode 100644 index 0000000..0eb8ed8 --- /dev/null +++ b/Content/Character/Riana/sound/Riana_Q_Floor_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6d6118a1ae194c4b48f329d685e7c2e4f6d10e4c5036e13ed09cc22cfcd1ef0 +size 322002 diff --git a/Content/Character/Riana/sound/Riana_W_Spawn.uasset b/Content/Character/Riana/sound/Riana_W_Spawn.uasset new file mode 100644 index 0000000..a8b1eb9 --- /dev/null +++ b/Content/Character/Riana/sound/Riana_W_Spawn.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:643ff89983d72c9e1954dee1d3bea00c19b6afddbb84c4fe9fe38b082730d731 +size 103199 diff --git a/Content/Character/Riana/wind_attack.uasset b/Content/Character/Riana/wind_attack.uasset new file mode 100644 index 0000000..92532ca --- /dev/null +++ b/Content/Character/Riana/wind_attack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b15a4da769a26517143d021e9e890cf78bf484510932033480178433d2df17a9 +size 379342 diff --git a/Content/Character/Riana/wind_loop.uasset b/Content/Character/Riana/wind_loop.uasset new file mode 100644 index 0000000..e388b62 --- /dev/null +++ b/Content/Character/Riana/wind_loop.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88332f6f2c80427554e346be8fb55314285e5a04fce869311959ae4a2f6875dc +size 437449 diff --git a/Content/Effect/EE/Effect/Alium/Hit/Alium_E_Hit/Alium_E_Hit_Nia.uasset b/Content/Effect/EE/Effect/Alium/Hit/Alium_E_Hit/Alium_E_Hit_Nia.uasset index ad35e69..acafdc6 100644 --- a/Content/Effect/EE/Effect/Alium/Hit/Alium_E_Hit/Alium_E_Hit_Nia.uasset +++ b/Content/Effect/EE/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:72a7183a2beadc078e2174d43af9984dc28c895d5655a9f500c7fd6c3561d92c -size 1530543 +oid sha256:5943b462bfc57f6ee4d317ba7bff6c53823d24cf75b7b401b9647978f7d6f70b +size 1498822 diff --git a/Content/Effect/EE/Effect/Alium/Hit/Alium_E_Hit/Hcyl_2.uasset b/Content/Effect/EE/Effect/Alium/Hit/Alium_E_Hit/Hcyl_2.uasset new file mode 100644 index 0000000..f6dcdcf --- /dev/null +++ b/Content/Effect/EE/Effect/Alium/Hit/Alium_E_Hit/Hcyl_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c17c565338392528f06b22418730b264dfe306e8430ea21088ed8e7f494baa3b +size 18949 diff --git a/Content/Effect/EE/Effect/ETC/Burning.uasset b/Content/Effect/EE/Effect/ETC/Burning.uasset index d88f35b..60fa63d 100644 --- a/Content/Effect/EE/Effect/ETC/Burning.uasset +++ b/Content/Effect/EE/Effect/ETC/Burning.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:007f354dffe09415eda2cf45e4b81306463adb21ac36cac1dae00fcc42ee9db5 -size 22964 +oid sha256:d980e97f20cd753048fd0926b8283af4723f0c1d54e0cf0b91632e59207cad96 +size 23239 diff --git a/Content/Effect/ETC/Burning/Burning.uasset b/Content/Effect/ETC/Burning/Burning.uasset index d82c21c..0a5a977 100644 --- a/Content/Effect/ETC/Burning/Burning.uasset +++ b/Content/Effect/ETC/Burning/Burning.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b6af0b38d5ae5c8090b352573aaa7d419475f5e7ccf24907c1179fd146e64b7 -size 892853 +oid sha256:a6de377e77bcf912b107fa03f642f84d8326cef6f3e55bb23bc826908a7c460c +size 924307 diff --git a/Content/Effect/Liana/Liana_Hit/Liana_Q_Hit.uasset b/Content/Effect/Liana/Liana_Hit/Liana_Q_Hit.uasset index d796015..a082ea2 100644 --- a/Content/Effect/Liana/Liana_Hit/Liana_Q_Hit.uasset +++ b/Content/Effect/Liana/Liana_Hit/Liana_Q_Hit.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e58ebca53d7580be04a41270bb314dfbae98728fcba3924a26480efdc9ab0a7 -size 23179 +oid sha256:805656791c1a4d6f14ef2fa34bff871108fb9a847b777479601533fea16701cf +size 123758 diff --git a/Content/Effect/Liana/Liana_Hit/Liana_Q_Hit/Liana_Q_Hit_Nia.uasset b/Content/Effect/Liana/Liana_Hit/Liana_Q_Hit/Liana_Q_Hit_Nia.uasset index 872d6e1..93c499e 100644 --- a/Content/Effect/Liana/Liana_Hit/Liana_Q_Hit/Liana_Q_Hit_Nia.uasset +++ b/Content/Effect/Liana/Liana_Hit/Liana_Q_Hit/Liana_Q_Hit_Nia.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a256edfddf659ce3f33c2e856fec3aa0f2d460a9d46d3aa168b14d658171d8ba -size 1185292 +oid sha256:33271ea2036d1b27d4b4198f5552c261f5a0b8261ea0a70b00b05161e5b25d83 +size 1221018 diff --git a/Content/Effect/Liana/Liana_Hit/Liana_Q_Hit_Floor.uasset b/Content/Effect/Liana/Liana_Hit/Liana_Q_Hit_Floor.uasset index 734a930..ce507c2 100644 --- a/Content/Effect/Liana/Liana_Hit/Liana_Q_Hit_Floor.uasset +++ b/Content/Effect/Liana/Liana_Hit/Liana_Q_Hit_Floor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb1be9ffb2e8efabd8f702069dc0538cc8ce475d226be6408a278787bbbfdad7 -size 24611 +oid sha256:8e9431f073f70f5087186e026e0856b622405f5ab97f295e454b115d2187531d +size 61060 diff --git a/Content/Effect/Liana/Liana_Hit/Liana_Q_Hit_Floor_Dot.uasset b/Content/Effect/Liana/Liana_Hit/Liana_Q_Hit_Floor_Dot.uasset new file mode 100644 index 0000000..06cafe9 --- /dev/null +++ b/Content/Effect/Liana/Liana_Hit/Liana_Q_Hit_Floor_Dot.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be3669e3889615f68e35e7d253ca6860d4f6caac3bea940773003029f17cf771 +size 145465 diff --git a/Content/Effect/Liana/Liana_Skill/Liana_Nomal.uasset b/Content/Effect/Liana/Liana_Skill/Liana_Nomal.uasset index d3cb44d..0989b1f 100644 --- a/Content/Effect/Liana/Liana_Skill/Liana_Nomal.uasset +++ b/Content/Effect/Liana/Liana_Skill/Liana_Nomal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f54d02478f86f2f812ffa746cd6a62e4eeed75d73c70be87334c16741cf0eb7e -size 24496 +oid sha256:d1144fd9e1e2bdb41ae865367eac7e487a3b9c16ca9264c818efb48201feb54e +size 121319 diff --git a/Content/Effect/Liana/Liana_Skill/Liana_R.uasset b/Content/Effect/Liana/Liana_Skill/Liana_R.uasset index cd2165c..1ce667c 100644 --- a/Content/Effect/Liana/Liana_Skill/Liana_R.uasset +++ b/Content/Effect/Liana/Liana_Skill/Liana_R.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:811909c39ea7d8648419e0c98cba8788216534a82b562f7ca7b47bd9ad87c45e -size 23094 +oid sha256:570aa4f92fc08197d11b85c72ed10dbb95bf3a2bb078e9a358eb45a03cd67efa +size 50639 diff --git a/Content/Effect/Liana/Liana_Skill/Liana_R/Liana_R_Boom_Nia.uasset b/Content/Effect/Liana/Liana_Skill/Liana_R/Liana_R_Boom_Nia.uasset index b2ddca7..f665600 100644 --- a/Content/Effect/Liana/Liana_Skill/Liana_R/Liana_R_Boom_Nia.uasset +++ b/Content/Effect/Liana/Liana_Skill/Liana_R/Liana_R_Boom_Nia.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:420804a867697d66f2f7eb21a21f9ece1ff9f865fe9278e230dae8fad3d5ae69 -size 3293999 +oid sha256:a29aa342d31b9d70a821e39cbeee204a801b8235547bb51dbca083ac7e74efc1 +size 4015260 diff --git a/Content/Effect/Liana/Liana_Skill/Liana_R_Boom.uasset b/Content/Effect/Liana/Liana_Skill/Liana_R_Boom.uasset index e07454b..55b71a2 100644 --- a/Content/Effect/Liana/Liana_Skill/Liana_R_Boom.uasset +++ b/Content/Effect/Liana/Liana_Skill/Liana_R_Boom.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1293351c41844cb8892308e3e6dc660e2e832161cf88835e8a442b3ef2d81a64 -size 96603 +oid sha256:5138a83c0dd3ff5755084b38473d448e8d9f781cd27a3c83511ba5b00a586baf +size 124435 diff --git a/Content/Effect/Liana/Liana_Skill/Liana_W/Liana_W1_Anim.uasset b/Content/Effect/Liana/Liana_Skill/Liana_W/Liana_W1_Anim.uasset index 7de5a61..2b4e76f 100644 --- a/Content/Effect/Liana/Liana_Skill/Liana_W/Liana_W1_Anim.uasset +++ b/Content/Effect/Liana/Liana_Skill/Liana_W/Liana_W1_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c945cc8eca05d611a7c5357a3cb7ab2454c4d23563e5266f65e3b9e560301da -size 17069 +oid sha256:96e41465a32890be939f41efe10eab079853e490d510a66aa6d17937d11dd919 +size 17128 diff --git a/Content/Effect/Liana/Liana_Skill/Liana_W/Liana_W_Water_Bust_Nia.uasset b/Content/Effect/Liana/Liana_Skill/Liana_W/Liana_W_Water_Bust_Nia.uasset index 5c30675..c209d69 100644 --- a/Content/Effect/Liana/Liana_Skill/Liana_W/Liana_W_Water_Bust_Nia.uasset +++ b/Content/Effect/Liana/Liana_Skill/Liana_W/Liana_W_Water_Bust_Nia.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e385393a32fd3f764203088c533212d8a953e1611e06cf7419a11d307b9be258 -size 1545420 +oid sha256:b77a16a66b795d06500f86b32fd35ea7c0bbe1cf3bb14e3adfc4f98185fcec8f +size 1598564 diff --git a/Content/Maps/DevMap.umap b/Content/Maps/DevMap.umap index 4cd2ef5..845a1ce 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:e95243a3a6c324bb03e9fcb3728b9d435f958c21ef4e5df5ebbdc02173d41e4f -size 179688 +oid sha256:67fe2f9962782b879cfe85032c31f5c037e23905c4d4cd2ca3c655da6a785ec4 +size 180419 diff --git a/Source/Promether/GameModeBase/Deathmatch.cpp b/Source/Promether/GameModeBase/Deathmatch.cpp index 8c6ea7e..987808c 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::Riana; } if (Team == TeamType::Null) { diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp index a2df5b5..780bb5c 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerController.cpp @@ -354,6 +354,7 @@ void ADefaultPlayerController::Skill4Triggered() if (GetWorld()->GetUnpausedTimeSeconds() - GetPlayerState()->CooldownDuration[(uint8)CooldownType::Skill4Triggered] <= GetPlayerState()->MaxCooldownDuration[(uint8)CooldownType::Skill4Triggered]) return; + if (!GetPlayerState()->Stats[(uint8)EStats::Skillusable] == 0) { GetPlayerState()->SetState(ECharacterState::Idle); return; @@ -376,6 +377,7 @@ void ADefaultPlayerController::Skill4Triggered() Multicast_SetRotation(GetMouseHitLocation()); Server_SetRotation(GetMouseHitLocation()); + UE_LOG(LogTemp, Warning, TEXT("%f, %f"), GetWorld()->GetUnpausedTimeSeconds() - GetPlayerState()->CooldownDuration[(uint8)CooldownType::Skill4Triggered], GetPlayerState()->MaxCooldownDuration[(uint8)CooldownType::Skill4Triggered]); UE_LOG(LogTemp, Warning, TEXT("Skill4 Triggered")); GetPlayerState()->SetState(ECharacterState::Attack); GetPlayerState()->SetAttackType(CooldownType::Skill4Triggered); @@ -407,9 +409,12 @@ void ADefaultPlayerController::Skill4Triggered() void ADefaultPlayerController::Skill4Completed() { - UE_LOG(LogTemp, Warning, TEXT("Skill4 Completed")); - GetPlayerState()->SetState(ECharacterState::Attack); - GetPlayerState()->SetAttackType(CooldownType::Skill4Comlpleted); + if (GetPlayerState()->Stats[(uint8)EStats::charging] == 0) { + UE_LOG(LogTemp, Warning, TEXT("Skill4 Completed")); + GetPlayerState()->SetState(ECharacterState::Attack); + GetPlayerState()->SetAttackType(CooldownType::Skill4Comlpleted); + } + } void ADefaultPlayerController::RuneSpell1() diff --git a/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp b/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp index ee8237f..4320ed6 100644 --- a/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp +++ b/Source/Promether/PlayerGeneric/DefaultPlayerState.cpp @@ -35,11 +35,11 @@ void ADefaultPlayerState::InitPlayerStats_Implementation(const TArray& St { MaxStats.Append(StatsValue); Stats.Append(StatsValue); - CooldownDuration.Append(CooldownDurationValue); + MaxCooldownDuration.Append(CooldownDurationValue); for (float Value : CooldownDurationValue) { - MaxCooldownDuration.Add(0.0f); + CooldownDuration.Add(0.0f); } for (float Value : StatsValue)