From 2a5fdd4700f4cde84ac122eb7419674ddb27eeec Mon Sep 17 00:00:00 2001 From: 7heIVIaze Date: Sat, 22 Feb 2025 12:03:18 +0900 Subject: [PATCH] conflict fixed --- .../NPC/BP_AggroNPCControllerBase2.uasset | 4 ++-- .../Hwanyoung/Character/NPC/BP_Goblin.uasset | 4 ++-- .../Character/NPC/Behavior/BT_Goblin.uasset | 4 ++-- .../Haesol/BPAC_WeaponMechanism1.uasset | 3 --- .../Playables/Haesol/BP_Haesol.uasset | 4 ++-- .../Playables/Haesol/BP_Haesol1.uasset | 4 ++-- .../Content/Hwanyoung/Levels/Spring-Sharon.umap | 4 ++-- .../Intermediate/ReimportCache/3688439234.bin | Bin 631 -> 631 bytes 8 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BPAC_WeaponMechanism1.uasset diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCControllerBase2.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCControllerBase2.uasset index ae69cce7..ae156f23 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCControllerBase2.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCControllerBase2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:061657d4252c8b3a55c0e7a68f4f6985f6fb4f97329edcc843350ae43bcd9b5a -size 357685 +oid sha256:374f0f666cdc06f3840eebcb228c263533d8a4a7c5fe52b433238700c3669028 +size 352474 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_Goblin.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_Goblin.uasset index 720823ac..c00f45e0 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_Goblin.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_Goblin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5f487ed0c8fb5af003df5f3f7b16d7d4f39fc9fb5d5b65ff1038ee49f2b28df -size 186234 +oid sha256:9aff44ada6d0d80a728d0186781cba383b3f8ddc0f56259297b4fe126c8b0809 +size 210583 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Goblin.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Goblin.uasset index e0c6cd28..15dd0eae 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Goblin.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Goblin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e41520a1d3897a33a9965b400508ee2e29c99558ac42e06c49fa0119a5224ac2 -size 14167 +oid sha256:f6e8b9a6e90d69a0409ac4d5248193bac82437a4b92a836f0c04a4caaadf6a1e +size 14126 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BPAC_WeaponMechanism1.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BPAC_WeaponMechanism1.uasset deleted file mode 100644 index a47e372c..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BPAC_WeaponMechanism1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b611547d416c3a3421b3a6ec6079753d5360c4d99c5c666d7e7b89e4818d01e5 -size 546108 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset index 598d2190..9129b9d3 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84fe4f9b921ff75f93609db704068e6be98118d707431ba9c67f0e6a61137b99 -size 1264120 +oid sha256:efbf6f1286a844b96fbc0a3460b7869b9593b93ff2303ded0c8a11cc025f81fe +size 1273050 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol1.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol1.uasset index b13ff59e..9b0162b3 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol1.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7660086300875a0923a09a623ef6b19b07a61c1fac9231f3c02dbb71c20268a8 -size 1261312 +oid sha256:ce890ee9850747c60e9766c28e40e0d5d0a0ab891de589cd305f5d0499ffd0a8 +size 1245308 diff --git a/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap b/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap index dad75214..75365053 100644 --- a/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap +++ b/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3aa3f3ff551ff251dcd94d8ab1c47777026a2e1803dd59df8d5622e1e30ec575 -size 3527571 +oid sha256:7f3ee2df2fc5b31821d07a0e7c24cbebba69ffa6127f21c1dc5c6da585bd3960 +size 3528889 diff --git a/hwanyoung2/Intermediate/ReimportCache/3688439234.bin b/hwanyoung2/Intermediate/ReimportCache/3688439234.bin index 218f106dd7b55123d6a1ea1114af0ca70defb71c..f1edc7edba1d3e311ca556cd1192f6e47b438201 100644 GIT binary patch delta 36 qcmey)@||VEWXZ&&Wb5J*AhNVBNGwP#GD;~fD9S8JE#A21G$Q~I#18TR delta 36 scmey)@||VEWXa+Z>*5ki>w?6B)FPvl;)0^glGI}B#H8enYfdu)02D3`@&Et;