From 06bb51a1981e519e80853f5f876d001e9b5b3fc2 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Mon, 10 Jun 2024 18:40:12 +0900 Subject: [PATCH 1/4] binded input actions for walking and jogging for haesol --- .../Character/PlayerCharacter/BP_PlayerCharacterBase.uasset | 4 ++-- .../PlayerCharacter/Input/InputActions/IA_BlockAttack.uasset | 3 +++ .../Input/InputActions/IA_DefaultAttack.uasset | 3 +++ .../PlayerCharacter/Input/InputActions/IA_Walk.uasset | 3 +++ .../PlayerCharacter/Input/InputActions/IA_WalkChord.uasset | 3 +++ .../Input/InputMappingContexts/BP_DefaultInputContext.uasset | 4 ++-- .../Playables/Haesol/BP_AnimHaesolMelee.uasset | 3 +++ .../PlayerCharacter/Playables/Haesol/NewAnimBlueprint.uasset | 3 --- .../Hwanyoung/Illusions/Assets/Meshes/fox_marble.uasset | 4 ++-- .../Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset | 4 ++-- .../KTP_Effect/Particles/Fly/Others/Trail_02_08.uasset | 4 ++-- .../KTP_Effect/Particles/Fly/Others/energy_04_01.uasset | 4 ++-- .../Animations/Hwando/Anim_Hwando_Run_Soldier.uasset | 4 ++-- 13 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_BlockAttack.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_DefaultAttack.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_Walk.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_WalkChord.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_AnimHaesolMelee.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimBlueprint.uasset diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset index 34a33b3a..f0f252a0 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:51ea105151ab40f6b139fc688a3f126559e31fa9216dc652dcdad48ce114af05 -size 192242 +oid sha256:e8a29db4fd204fc01698c045d45ea2674593759a94d0577b8b18fd2f9c6a2459 +size 232810 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_BlockAttack.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_BlockAttack.uasset new file mode 100644 index 00000000..2a429eb9 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_BlockAttack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6cbf92e57ce17604c83b5f1dfa8cb2d7955735087529f0dffb15dcfe7eba172 +size 1443 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_DefaultAttack.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_DefaultAttack.uasset new file mode 100644 index 00000000..097d2d2e --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_DefaultAttack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:057228cd94257c199101ff67c61512ccbc53abbe3a0b9231cddeb140e5310926 +size 1453 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_Walk.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_Walk.uasset new file mode 100644 index 00000000..fc3cb7b4 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_Walk.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7ed5c2b69b0aa2e911d91340cf29cf0f476d3f637059b0d53957d55c93c7417 +size 1555 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_WalkChord.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_WalkChord.uasset new file mode 100644 index 00000000..292d633e --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_WalkChord.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbbe2d699b182f13bce804d71a49fabebdc78e614bdc4af1c5c5cabc83a0b0b0 +size 1433 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 7177db8f..357aa7ea 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:9daa4508df4c59a295ec2380ae6cdc2ac296e46cf0718c43e67d0b4946407d60 -size 9164 +oid sha256:74425a2d4c43466ea1be3c44110b356e283f6104108dadaf4729690b4768d166 +size 15106 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_AnimHaesolMelee.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_AnimHaesolMelee.uasset new file mode 100644 index 00000000..0431c19c --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_AnimHaesolMelee.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cb6a9ee136709c4b6b7994e7563ecb648012f52d4bbc723fc3b266b1bd4004a +size 217081 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimBlueprint.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimBlueprint.uasset deleted file mode 100644 index 6b3c3eed..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimBlueprint.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59aa88eaf5a4fa80e01f11e7093a1e7345a468d7101d26b6c27255e46bb6e1a1 -size 110732 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/fox_marble.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/fox_marble.uasset index e647dad5..86a4676b 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/fox_marble.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/fox_marble.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae54afed090b255c9ae7ec9dc29a265eb5cafc8b5c47c7001e197b53256db760 -size 1439800 +oid sha256:ab940b9dae1ba9f5035648fe13bef45969804be599a7fb131da30adebc75127c +size 1440306 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AC_CombatSystem.uasset index feeab290..a8ae7f56 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:ae12c4ded0acd749f3251b8e13fcd50ab4b3f4d9f9cd0ac3c4639c44792d62af -size 13694 +oid sha256:9d3bc57bc25ec33c44faf985bc815b3a058f143c67ab88e3242c5527aee9cfc6 +size 56376 diff --git a/hwanyoung2/Content/KTP_Effect/Particles/Fly/Others/Trail_02_08.uasset b/hwanyoung2/Content/KTP_Effect/Particles/Fly/Others/Trail_02_08.uasset index 75c1ea3d..e843ef2a 100644 --- a/hwanyoung2/Content/KTP_Effect/Particles/Fly/Others/Trail_02_08.uasset +++ b/hwanyoung2/Content/KTP_Effect/Particles/Fly/Others/Trail_02_08.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ea94dce74f37f868b85099baf4b2aa36d8d58bdd12d1148eada3b55c471ec0a3 -size 4530499 +oid sha256:a46710aa464540084464bdfc2fd588aea85a24d21bf113507f527cca14f9f7fc +size 3610799 diff --git a/hwanyoung2/Content/KTP_Effect/Particles/Fly/Others/energy_04_01.uasset b/hwanyoung2/Content/KTP_Effect/Particles/Fly/Others/energy_04_01.uasset index 79207d7e..c865d72a 100644 --- a/hwanyoung2/Content/KTP_Effect/Particles/Fly/Others/energy_04_01.uasset +++ b/hwanyoung2/Content/KTP_Effect/Particles/Fly/Others/energy_04_01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:153e94e73a80d4179fc79e9b01dd8117a9381d120cb4de6e932472bbd2720417 -size 4045161 +oid sha256:85062769aca29d7df0616290328c586ac8825da0b41721df25992a74c2c5e396 +size 3242145 diff --git a/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Run_Soldier.uasset b/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Run_Soldier.uasset index d1dcbd57..610e9edf 100644 --- a/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Run_Soldier.uasset +++ b/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Run_Soldier.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8a0814ba03db9fd169917788f21e73fb7e78afea018d4b2e11a7b88f7ffd02ab -size 218374 +oid sha256:bc75caa3b146af566a27d9a7e7ebe90523e22d4384434b45ec4932251d42b8e7 +size 197126 From 68d9fafdf6628dfcba3beff222ff603bb28ebfce Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Mon, 10 Jun 2024 18:41:00 +0900 Subject: [PATCH 2/4] added input action reference for walking, binded IA_Walk to Move() function --- hwanyoung2/Source/hwanyoung2/hwanyoung2Character.cpp | 3 +++ hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.cpp b/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.cpp index f8555b8f..50bfa579 100644 --- a/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.cpp +++ b/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.cpp @@ -117,6 +117,9 @@ void Ahwanyoung2Character::SetupPlayerInputComponent(class UInputComponent* Play //Moving EnhancedInputComponent->BindAction(MoveAction, ETriggerEvent::Triggered, this, &Ahwanyoung2Character::Move); + + //Walking + EnhancedInputComponent->BindAction(WalkAction, ETriggerEvent::Triggered, this, &Ahwanyoung2Character::Move); //Looking EnhancedInputComponent->BindAction(LookAction, ETriggerEvent::Triggered, this, &Ahwanyoung2Character::Look); diff --git a/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h b/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h index 66f0387e..96bdc9a1 100644 --- a/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h +++ b/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h @@ -43,6 +43,10 @@ class Ahwanyoung2Character : public ACharacter UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true")) class UInputAction* LookAction; + /** Walk Input Action */ + UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true")) + class UInputAction* WalkAction; + #pragma endregion private: From 917a1bb6687216ae5a0122a35c1d391ab6552b11 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Tue, 11 Jun 2024 21:52:34 +0900 Subject: [PATCH 3/4] can toggle up inventory UI, can't tell if the input bindings for using item from inventory overlaps with that for normal melee attack --- hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset | 4 ++-- .../PlayerCharacter/BP_HYPlayerCharacController.uasset | 4 ++-- .../Character/PlayerCharacter/BP_PlayerCharacterBase.uasset | 4 ++-- .../Input/InputActions/IA_UseInventoryItem.uasset | 3 +++ .../Input/InputMappingContexts/BP_DefaultInputContext.uasset | 4 ++-- .../InputMappingContexts/BP_InventoryInputContext.uasset | 3 --- .../PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset | 4 ++-- .../Hwanyoung/Illusions/Assets/Meshes/BP_Gochugaru.uasset | 3 --- .../Illusions/Assets/Meshes/Material/BOW_body_mat.uasset | 3 +++ .../Illusions/Assets/Meshes/Material/BOW_gold_mat.uasset | 3 +++ .../Illusions/Assets/Meshes/Material/BOW_nock_mat.uasset | 3 +++ .../Illusions/Assets/Meshes/Material/BOW_string_mat.uasset | 3 +++ .../Illusions/Assets/Meshes/Material/standardSurface1.uasset | 3 +++ .../Illusions/Assets/Meshes/Material/standardSurface2.uasset | 3 +++ .../Illusions/Assets/Meshes/Material/standardSurface3.uasset | 3 +++ .../Illusions/Assets/Meshes/Material/standardSurface4.uasset | 3 +++ .../Illusions/Assets/Meshes/Material/standardSurface5.uasset | 3 +++ .../Illusions/Assets/Meshes/Material/standardSurface7.uasset | 3 +++ .../Illusions/Assets/Meshes/Material/standardSurface8.uasset | 3 +++ .../Content/Hwanyoung/Illusions/Assets/Meshes/Meat.uasset | 4 ++-- .../Content/Hwanyoung/Illusions/Assets/Meshes/Salt.uasset | 4 ++-- .../Content/Hwanyoung/Illusions/Assets/Meshes/Sesame.uasset | 4 ++-- .../Hwanyoung/Illusions/Assets/Meshes/bow_test_v1.uasset | 3 +++ .../Hwanyoung/Illusions/Assets/Meshes/fox_marble.uasset | 4 ++-- .../Hwanyoung/Illusions/Assets/Meshes/medicine_bowl.uasset | 4 ++-- .../Hwanyoung/Illusions/Assets/Meshes/medicine_pot.uasset | 4 ++-- .../Hwanyoung/Illusions/Assets/Meshes/standardSurface1.uasset | 3 --- .../Hwanyoung/Illusions/Assets/Meshes/standardSurface2.uasset | 3 --- .../Hwanyoung/Illusions/Assets/Meshes/standardSurface3.uasset | 3 --- .../Hwanyoung/Illusions/Assets/Meshes/standardSurface4.uasset | 3 --- .../Hwanyoung/Illusions/Assets/Meshes/standardSurface5.uasset | 3 --- .../Hwanyoung/Illusions/Assets/Meshes/standardSurface7.uasset | 3 --- .../Hwanyoung/Illusions/Assets/Meshes/standardSurface8.uasset | 3 --- .../GeneralizedBlueprints/BP_ManualPickUpItemBase.uasset | 3 +++ .../GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset | 3 +++ .../GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset | 3 +++ hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset | 4 ++-- hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemSlot.uasset | 4 ++-- hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap | 4 ++-- .../Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset | 3 +++ 40 files changed, 79 insertions(+), 55 deletions(-) create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_UseInventoryItem.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_InventoryInputContext.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/BP_Gochugaru.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_body_mat.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_gold_mat.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_nock_mat.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_string_mat.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface1.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface2.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface3.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface4.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface5.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface7.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface8.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/bow_test_v1.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface1.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface2.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface3.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface4.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface5.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface7.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface8.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/BP_ManualPickUpItemBase.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset create mode 100644 hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset diff --git a/hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset b/hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset index 6e358361..65636b93 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:da5f65198871264a63c2819ccd9482820777677700cde7ad6f81fa39e186e3cf -size 19667 +oid sha256:977f1644c589b81d8aa33f325287ce73332ff257349757fafd6122dadfee17b5 +size 20055 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset index 59b0ee2c..eec2806e 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:822597a3d8277a8f64a1024d3a5b516e950fc18627768605130e0c193fb998fb -size 19656 +oid sha256:6268717bd6608331d4b94e552778d214f8b82d462e21c28634779b68c033afbd +size 58944 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset index f0f252a0..f5ea03f1 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:e8a29db4fd204fc01698c045d45ea2674593759a94d0577b8b18fd2f9c6a2459 -size 232810 +oid sha256:8e99b04c8265130676765ce99271c5d6d2cc0b29675f682190ccf1cbfd3ad35b +size 252571 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_UseInventoryItem.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_UseInventoryItem.uasset new file mode 100644 index 00000000..71e5cbc7 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputActions/IA_UseInventoryItem.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b86802c0021710133c3f77a5fdbc6b30e1882a2a6de053d76e703a3a91de225 +size 1468 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 357aa7ea..4fbc7c1f 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:74425a2d4c43466ea1be3c44110b356e283f6104108dadaf4729690b4768d166 -size 15106 +oid sha256:47d55c241481c76aa4b3f0515f146bdf5e6f598e987ffa49f2132ac750601f0c +size 16959 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_InventoryInputContext.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_InventoryInputContext.uasset deleted file mode 100644 index 58d34ab3..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Input/InputMappingContexts/BP_InventoryInputContext.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:193a1ab491a998cb9bcdd827a05cc0615a422de3b3dfed523f9c6caf43deea37 -size 3275 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset index a1fcf816..cd5c0166 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/NewAnimMontage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9b0783203b35eb404626fcd0284f7361698db4d49c39760e6ace507d9fc6861 -size 11082 +oid sha256:0421463ddbc5386e144a096a637947215efa67c6c1a914a4565f5951397781a5 +size 11087 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/BP_Gochugaru.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/BP_Gochugaru.uasset deleted file mode 100644 index 54132aed..00000000 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/BP_Gochugaru.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32804412369adc96b2070e843432c4959ecd4f10aa42a30d98bd07590aca37c0 -size 28948 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_body_mat.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_body_mat.uasset new file mode 100644 index 00000000..495e24a1 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_body_mat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5eeb568642159a3a110c2a8fe6166d3778cb354742c504c4cab49e3fe2a53e65 +size 6920 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_gold_mat.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_gold_mat.uasset new file mode 100644 index 00000000..5af74334 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_gold_mat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:974bafa8f3caad934527e18b30ca6c3c4c9f29fec78b5026e9b45a79376bd10c +size 8290 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_nock_mat.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_nock_mat.uasset new file mode 100644 index 00000000..3127b9c5 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_nock_mat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f0ffaa74fd0010d6fb5165f9aa41920548a56c60894e6cb38f95c44dd9c30a2 +size 7964 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_string_mat.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_string_mat.uasset new file mode 100644 index 00000000..ab9e9a37 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/BOW_string_mat.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88bc3a7eb34b40453368f68b347a018090e52325840d39cc072080ca85974630 +size 8138 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface1.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface1.uasset new file mode 100644 index 00000000..f09c8daa --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef90d6e1898aacf6f0620ebf0b96266e1bda2e33501fda2291ff51448a5408e4 +size 8176 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface2.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface2.uasset new file mode 100644 index 00000000..0b5e9cdc --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ce63fbaf4803e5a423113af5c90789eeef14060f1de54e18404dca62e95b944 +size 8249 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface3.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface3.uasset new file mode 100644 index 00000000..ec14148f --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1b68d4bc7a23e098e9334c58bcc4088e87768c386a50fce62240b20bed7757f +size 8266 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface4.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface4.uasset new file mode 100644 index 00000000..7a7d8ce3 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface4.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c708501cdf6f15ecaf5c13aaa64071de086a8e3d4bbba2744355357fd095ed7 +size 8284 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface5.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface5.uasset new file mode 100644 index 00000000..8ac6bc99 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface5.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45aa0ab1dacd181c14d7da18bc9b87cba949fafa2a6f35c9e477cde40a481bcd +size 8183 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface7.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface7.uasset new file mode 100644 index 00000000..810785f6 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface7.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b5fc4c281eb9eaa935d136e01517829350ea6c699645ae86ddfbbb70cb8d332 +size 8148 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface8.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface8.uasset new file mode 100644 index 00000000..24270527 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Material/standardSurface8.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c767232a60632a8ced0d6fbfa97ae5fdb3a9a7e820b8c2e500d3373bee6b79c +size 8252 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Meat.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Meat.uasset index 5323353c..8aad44b6 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Meat.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Meat.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c9f71a7a64a193887584e7f52eebfb080ecd009c48bc0456866f2e5c40b2f8e -size 23975 +oid sha256:9eb3f3aaef07590086baa3d100f3eeaff6512936fcd47d9b8f5c3df300e43de5 +size 26510 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Salt.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Salt.uasset index 04594c3d..1c7fe2ef 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Salt.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Salt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a67eed9abd827107cd02c766175dc01d6b462c682d06db2476f55b1e4f629320 -size 24738 +oid sha256:a211cb4edeca7db5c4824b1d3ab468aa26a0d64dcfac1258e1b79b87b6e8caef +size 27428 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Sesame.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Sesame.uasset index ad582665..ad8b1b04 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Sesame.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/Sesame.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12a6f8d6a74de3feebd777f3652fbc42fc9104e026c4d763ab788621a00012da -size 24995 +oid sha256:1fc879964822fc0d4d20fa91aa019792787dddb7193f107c863fe67057a01627 +size 26916 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/bow_test_v1.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/bow_test_v1.uasset new file mode 100644 index 00000000..f7f6dcb5 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/bow_test_v1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2b27f0678c4096bc98abfa43b6db1dc61996405ea9b2085a273484274300148 +size 75657 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/fox_marble.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/fox_marble.uasset index 86a4676b..43da616c 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/fox_marble.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/fox_marble.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab940b9dae1ba9f5035648fe13bef45969804be599a7fb131da30adebc75127c -size 1440306 +oid sha256:32dfef30b64c5e6b15c854f74602e53df6cc9142381c783a5579e2560be0b6db +size 1458828 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/medicine_bowl.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/medicine_bowl.uasset index 4b4b5589..f994d4d1 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/medicine_bowl.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/medicine_bowl.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80c22c0117a762ac48c4edc09a3ded730dec70275e5fdcd4ef076284288d847f -size 22539 +oid sha256:0e35412f7bb7259f718bb87504b2a4aabd5635529ffb5ad25c7df74121ff544f +size 24188 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/medicine_pot.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/medicine_pot.uasset index 82f52caf..85144a46 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/medicine_pot.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/medicine_pot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be2054a275f4ddbd9ce33b48c6be4272da6113b9fff14a5688d3e3b074c2044b -size 25395 +oid sha256:1b72da5beece3d3c2cc185dcf6a27bb60f4aad52b121ef5c217f61c5acf464bc +size 27045 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface1.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface1.uasset deleted file mode 100644 index f55c30e7..00000000 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87b0df01ef2c26bbbd51f8af7d2d2cb5b5922a8cb58cd03d827b53e3259ab11b -size 8125 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface2.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface2.uasset deleted file mode 100644 index 16a4f05f..00000000 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7c3c3f57b8fda5b3193dd330332a76db3051554ecdc0bae36569f0047754b27 -size 8198 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface3.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface3.uasset deleted file mode 100644 index 36ca67fe..00000000 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface3.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4708122fe70f37d983cbf237fb526fc4603f7ee1a461a3e61a2b5593cd76caf8 -size 8215 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface4.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface4.uasset deleted file mode 100644 index f3dac32a..00000000 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface4.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a30d2734f7cc28f04d939fb59f8d4449bf0ed41050f596d824ee71831ddc7815 -size 8233 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface5.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface5.uasset deleted file mode 100644 index e8afaf74..00000000 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface5.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d3a8a13ec1a1bac2f42732dd724894c3fbf009c9a7825f7bfdec9c4f0292216 -size 8132 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface7.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface7.uasset deleted file mode 100644 index 94c4dade..00000000 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface7.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38d5c6d4c137709785b5fa653f16ff2f9176702034c8fab630dbe745a4b57004 -size 8097 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface8.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface8.uasset deleted file mode 100644 index 391431f5..00000000 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/standardSurface8.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1c804e0a1ac1d229829bf71088927c0ac1bc346cdf81e535c7e53dd46cdb585 -size 8201 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/BP_ManualPickUpItemBase.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/BP_ManualPickUpItemBase.uasset new file mode 100644 index 00000000..f57cc660 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/BP_ManualPickUpItemBase.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3a67bed4b6d9ccdfcf8967804b4762eb3c8c7f857c2d5a085fbd5a45e08f6de +size 23197 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset new file mode 100644 index 00000000..a368f36c --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_FoxMarble.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:380b98ce24f9a1acaed18375351f913798a42b9d391fed4efbbec91e2da7cb14 +size 36049 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset new file mode 100644 index 00000000..83cf903b --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/BP_Gochugaru.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82f4eb93480e92a3535969665b879b22a7380d74d8d0d4e927e7ae9a627f0de0 +size 35023 diff --git a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryHUDWidget.uasset index 0bf02c1b..59a7f596 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:f8d2e770e1b44e2920af6c0d735148db071cfaa42255b2f8e0ea546a94d5dbd7 -size 27066 +oid sha256:eb40f70116bc19f8b856c6d89cd878229dd11bae3332e8e59c31467e8f8b2d8a +size 89130 diff --git a/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemSlot.uasset b/hwanyoung2/Content/Hwanyoung/UI/BP_InventoryItemSlot.uasset index 92761cf8..ff257674 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:e1e63e04d48f46cbf8297448d00e50b93d45805b2b74527dfbe61389f556adb4 -size 55595 +oid sha256:b9ec5b4048607c20918809ff6682a377dc6ed4deec20b86bc55e6e47f4c0a3f9 +size 98690 diff --git a/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap b/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap index cbd53eb1..96c83101 100644 --- a/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap +++ b/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e999e15d87bd4a69c70e1ff54a4ed292bc94e7d82db33206838211a617deff6c -size 39989 +oid sha256:60ad278283a2b6c1d71a0b32a6e7ba6aa6362d1f5366bf0650fb4e7ff1bf69ed +size 44708 diff --git a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset new file mode 100644 index 00000000..35bd94c0 --- /dev/null +++ b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/KV/9XKGKQSU8KNCJ8GHKMAJWM.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2908d106f3228cbd523202857924714ae27d4c8a32dab57244ca73bedcefe282 +size 3557 From 18abbad56df036c2c3d9c25f0a9924c0494e847d Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Tue, 11 Jun 2024 21:53:04 +0900 Subject: [PATCH 4/4] changed some input-related code in player charac controller --- .../Source/hwanyoung2/HYPlayerCharacController.cpp | 13 +------------ .../Source/hwanyoung2/HYPlayerCharacController.h | 13 ------------- hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h | 2 +- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.cpp b/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.cpp index 20779101..4446d95c 100644 --- a/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.cpp +++ b/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.cpp @@ -4,7 +4,6 @@ #include "HYPlayerCharacController.h" #include "HYGameStateBase.h" #include "hwanyoung2Character.h" -#include "EnhancedInputComponent.h" AHYPlayerCharacController::AHYPlayerCharacController() { @@ -48,19 +47,9 @@ void AHYPlayerCharacController::Interact() void AHYPlayerCharacController::SetupInputComponent() { Super::SetupInputComponent(); - - if (UEnhancedInputComponent* EnhancedInputComponent = CastChecked(InputComponent)) { - EnhancedInputComponent->BindAction( - InteractAction, ETriggerEvent::Triggered, - this, &AHYPlayerCharacController::Interact); - EnhancedInputComponent->BindAction( - ToggleInventoryAction, ETriggerEvent::Triggered, - this, &AHYPlayerCharacController::ReloadInventory); - - } } void AHYPlayerCharacController::OnPossess(APawn* InPawn) { - + Super::OnPossess(InPawn); } diff --git a/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.h b/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.h index 3e16c974..42df68d5 100644 --- a/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.h +++ b/hwanyoung2/Source/hwanyoung2/HYPlayerCharacController.h @@ -4,7 +4,6 @@ #include "HYInteractableActor.h" #include "InventoryItem.h" -#include "InputAction.h" #include "CoreMinimal.h" #include "GameFramework/PlayerController.h" #include "HYPlayerCharacController.generated.h" @@ -44,18 +43,6 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite) int32 InventoryWeightLimit; - /** MappingContext */ - UPROPERTY(EditAnywhere, Category = Input, meta = (AllowPrivateAccess = "true")) - class UInputMappingContext* InputMapping; - - /** Toggle inventory GUI Input Action */ - UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true")) - class UInputAction* ToggleInventoryAction; - - /** Interact Input Action */ - UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Input, meta = (AllowPrivateAccess = "true")) - class UInputAction* InteractAction; - #pragma endregion diff --git a/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h b/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h index 96bdc9a1..9457aa56 100644 --- a/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h +++ b/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h @@ -54,7 +54,6 @@ private: void Initialize(); public: - Ahwanyoung2Character(); @@ -69,6 +68,7 @@ public: UFUNCTION(BlueprintCallable, Category = "HY_Character|Camera") FVector GetStartingCameraBoomLocation(); + /** Returns CameraBoom subobject **/ class USpringArmComponent* GetCameraBoom() const { return CameraBoom; } /** Returns FollowCamera subobject **/