From 037d5442a526ff3e5cc3e39c01c286ca18df1f1a Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Sat, 22 Jun 2024 09:55:29 +0900 Subject: [PATCH] inventory shows collected items, new anim BPs are created and modified for combat system --- .../Content/Characters/Mannequins/Animations/ABP_Manny.uasset | 4 ++-- hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset | 4 ++-- .../Character/PlayerCharacter/BP_PlayerCharacterBase.uasset | 4 ++-- .../Input/InputMappingContexts/BP_DefaultInputContext.uasset | 2 +- .../Playables/Haesol/Animations/BP_AnimHaesolMelee.uasset | 3 +++ .../Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset | 3 +++ .../Playables/Haesol/Animations/NewBlendSpace.uasset | 3 +++ .../Playables/Haesol/BP_AnimHaesolMelee.uasset | 3 --- .../PlayerCharacter/Playables/Haesol/BP_Haesol.uasset | 3 +++ .../PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset | 3 --- .../Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset | 4 ++-- .../Illusions/GeneralizedBlueprints/AC_HPSystem.uasset | 4 ++-- .../GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset | 4 ++-- .../GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset | 4 ++-- .../Content/Hwanyoung/Interactables/ItemDataTable.uasset | 4 ++-- hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset | 4 ++-- hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemSlot.uasset | 4 ++-- .../Content/Hwanyoung/UI/BP_InventoryItemToolTip.uasset | 4 ++-- .../Animations/Hwando/Anim_Hwando_Walk_Soldier.uasset | 4 ++-- .../Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset | 2 +- .../Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset | 2 +- 21 files changed, 39 insertions(+), 33 deletions(-) create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_AnimHaesolMelee.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/NewBlendSpace.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_AnimHaesolMelee.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset diff --git a/hwanyoung2/Content/Characters/Mannequins/Animations/ABP_Manny.uasset b/hwanyoung2/Content/Characters/Mannequins/Animations/ABP_Manny.uasset index a0f1c835..ffa3ea89 100644 --- a/hwanyoung2/Content/Characters/Mannequins/Animations/ABP_Manny.uasset +++ b/hwanyoung2/Content/Characters/Mannequins/Animations/ABP_Manny.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d024d66f3a543739fffc97adc1727f1ba8693886151d965aad25d2a1bf59f2c6 -size 372033 +oid sha256:0731ab856928284ce2d86453a611e33c33455128d9ae7ddcf6b122b1122d3bea +size 372181 diff --git a/hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset b/hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset index 65636b93..6f9bbc3d 100644 --- a/hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset +++ b/hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:977f1644c589b81d8aa33f325287ce73332ff257349757fafd6122dadfee17b5 -size 20055 +oid sha256:27a0fd8b8d875aa40b1caff420aee7d7c8e418302bdf6fa13b8da2952b1e8b3c +size 20046 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset index 166edb72..8c8f02fb 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:297c7a5aa6d0b7d7fe9be41fd769021baf56d416a4933d93a3bd252c79c2eda1 -size 330823 +oid sha256:a1929b57461021cd7ae943c18f98d87f30e3846c5350bd24899b6c038d50b76a +size 342751 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_DefaultInputContext.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_DefaultInputContext.uasset index 7cfd43dc..003d98cf 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_DefaultInputContext.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_DefaultInputContext.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cf4ec31ced0d0d23d7aa0fe9070fcdcb5f11b75b487c15f1382237b5a97891f +oid sha256:ff46d646bbf7947f78730024b81568280f0d38b401212dacb6b858e24f72d9b9 size 17570 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_AnimHaesolMelee.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_AnimHaesolMelee.uasset new file mode 100644 index 00000000..2a74475e --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_AnimHaesolMelee.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f289a1fdbd2cbfcb3692d1d83e09ca4a0155d655ad708622caac5dfafc1c19ac +size 216981 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset new file mode 100644 index 00000000..176e9ff7 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5aece608b017514f471563d6292834b24298853ae5bec5cd04621e0f48ebba2a +size 24317 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/NewBlendSpace.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/NewBlendSpace.uasset new file mode 100644 index 00000000..4fca4053 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/NewBlendSpace.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2aa24d31df581ff45fe83b7f15d6b6f4d7c97645950c1e5ea4c53c51ce7700a +size 8219 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_AnimHaesolMelee.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_AnimHaesolMelee.uasset deleted file mode 100644 index 0431c19c..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_AnimHaesolMelee.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cb6a9ee136709c4b6b7994e7563ecb648012f52d4bbc723fc3b266b1bd4004a -size 217081 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset new file mode 100644 index 00000000..12d0f897 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a164c31ff6382f968292eefd4e4455d14b406fb29968eed2d8878924fdda5df8 +size 87987 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset deleted file mode 100644 index 3c836f6a..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a3e9063efe72119070a02df993830232247be3b3481e3a0eb676adcde536151 -size 11082 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset index a8ae7f56..fbb3add8 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d3bc57bc25ec33c44faf985bc815b3a058f143c67ab88e3242c5527aee9cfc6 -size 56376 +oid sha256:e1aa68b0b213d7e83397b753958a3efda3824a9cc8458b07dc992279e0af69a0 +size 151807 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.uasset index 25bc8992..7d3cd101 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_HPSystem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6c8a4421814852216593494af60638b97941d9d2709ce5535a33d9cdcd4509e -size 141244 +oid sha256:d2cbe95c0f92c718b1e591064be46b919b6111f3f8c77562b8a2535a781e1fb9 +size 140590 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset index 4c0e3673..bc7e85d2 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:335eb111d05b601594f328d690fa800a06bd364d19d5d50a0cf8ed8589524ed7 -size 34920 +oid sha256:75523ec3eb21701ce85a151bbc334c957e67451ef058cd7686c4ef47943ed8b4 +size 34910 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset index badbd059..e2052160 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b483026a4f3baa982fa8a9ebdb5b0cdee55d7efe044f78a856ba259f0b44d64 -size 35121 +oid sha256:455047dce51e6b4e5f4ff1e7d1e96db860b0fa8523e0a500926f9828db8661bc +size 35112 diff --git a/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset b/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset index e46acb60..be750cce 100644 --- a/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset +++ b/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6293bc64694cf17719004371f0176e7bd7bce9e2e455f473468c2547352b9f6 -size 4532 +oid sha256:616b0b02b3e10bef9065a45dd4826cc01a81bddc11856ad88ab80d01095ba6e1 +size 4640 diff --git a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset index 13e6775e..1923919b 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bcf4ee07bfa31052bda30d6020acd715850b4fb0b2c1ea321c6981543f939de -size 92836 +oid sha256:4c15c8408ac6c3be70b358ce57d54a5181333517a89b1b771e25870405ee7bee +size 96447 diff --git a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemSlot.uasset b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemSlot.uasset index ff257674..beff28bb 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemSlot.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemSlot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9ec5b4048607c20918809ff6682a377dc6ed4deec20b86bc55e6e47f4c0a3f9 -size 98690 +oid sha256:6d697f13446bf0de3f79a721d04fcc80300f257ddab956864befba0d41b5ced0 +size 100244 diff --git a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemToolTip.uasset b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemToolTip.uasset index b62600b9..dca1ffa9 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemToolTip.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemToolTip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ff9feaa28f7c42a1e942806b246c970e509520a33d9a0ed9bab6be01839577d -size 60331 +oid sha256:cef16da4eb26b899540e4dc7f09e5d450623d3acda952771a2c4132b8f8128c9 +size 63735 diff --git a/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Walk_Soldier.uasset b/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Walk_Soldier.uasset index e47f8ab0..1e1920d9 100644 --- a/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Walk_Soldier.uasset +++ b/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Walk_Soldier.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:faf67968765893e3d2e54bc0823779a40834d0345773112fcc3bb9a6db2926bc -size 297722 +oid sha256:cb47edcfc8b275ff8460d550586eabcc95db348b34ba09424ce578878e641384 +size 276529 diff --git a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset index 5b40ec2e..6ba0e871 100644 --- a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset +++ b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/8C/DRE9MDZ0125X9A8Q4VUQIL.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b592ee98547c7e865ea81839f389248bfca79a99cfe259202b6f4f2f5cbc7e8f +oid sha256:b76d00779b1014dfb0f0a548c4adf4655b0c5a2cae0e1825bec7561dd466d4d8 size 3632 diff --git a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset index ba62773a..ebd68fea 100644 --- a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset +++ b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85400bb0ed8c0750598b074f41855266217c2adabe06b4dd267809223bd473c7 +oid sha256:477883f3086e73df2cf6da982367610a5e6bcb41aec6712f0a0ac1e5ac2335a9 size 3632