From eb937fb3ad5069e77e5bafbc3d04e2ec8c44bc72 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Sat, 22 Feb 2025 10:02:18 +0900 Subject: [PATCH 1/2] deleted the duplicate blueprint files for weapon mechanism and haesol --- .../Playables/Haesol/BPAC_WeaponMechanism1.uasset | 3 --- .../PlayerCharacter/Playables/Haesol/BP_Haesol1.uasset | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BPAC_WeaponMechanism1.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol1.uasset 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 c3d9cd6f..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:e32e5c9e152ac1ac9c25a312b97cab811d7f405e2a8a1279bd50ed051f6de8a6 -size 548838 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol1.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol1.uasset deleted file mode 100644 index bd484546..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e1c8cc81e6ca66b3dd560d263f0e67b4a330d5a62913fc8c91f77b96384d881 -size 1109803 From ee99037e92c5ebc8094eba9d7a3a0c47edef0cf2 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Sat, 22 Feb 2025 11:25:37 +0900 Subject: [PATCH 2/2] fixed the implementation after buggy merge for haesol passives and C skills --- hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset | 4 ++-- .../Character/PlayerCharacter/BP_PlayerCharacterBase.uasset | 4 ++-- .../Playables/Haesol/Animations/BP_AnimHaesolMelee.uasset | 4 ++-- .../Playables/Haesol/BPAC_WeaponMechanism.uasset | 4 ++-- .../PlayerCharacter/Playables/Haesol/BP_Haesol.uasset | 4 ++-- .../Content/Hwanyoung/UI/Player_HUD/WG_CrosshairOnly.uasset | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset b/hwanyoung2/Content/Hwanyoung/BP_HYGameMode.uasset index a4cfde27..68ce99a3 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:8b13aae50ac15d513b8bf990498c4c4ed009d56f4ddf41d5c7ad0cd2131bc69b -size 20046 +oid sha256:31c55cc63244a82ca8b5b69a2c55a80edf791ee28b7b42bae4ad28f6b70e89bc +size 20686 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset index 083208d3..df30b4dd 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:e58d34410c77f04ba9f66318e9483fc88675a433b3078c7a725fa2b2bd84a358 -size 353869 +oid sha256:4f6d209ee62a49e86574bbfe861309da572fe5d2ab73bdfa5ede37ddec7cfffc +size 361618 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 index d556aa17..169768aa 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_AnimHaesolMelee.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_AnimHaesolMelee.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8707f83deb2fcbe9ffaa5620d3e653c4160c9615258d732b60fed4c4e5f6b164 -size 919919 +oid sha256:1a828cdf8bb2b21a7507742ed264db57eac76b98f797a1a63aa1fcb39e0f995f +size 868345 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BPAC_WeaponMechanism.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BPAC_WeaponMechanism.uasset index f7a8880c..cb9b9fe5 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BPAC_WeaponMechanism.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BPAC_WeaponMechanism.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e66c885f300484dbf089270400c5d2bcc707cfa2dff92c54223ae8691952d83b -size 505914 +oid sha256:336f8cb2bbef96f2e013240cd22f092c9d09961436e6486746464003fbc13635 +size 546341 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 46fcecfc..598d2190 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:fb319630237d0146e14ba360a3b16ccc6939faf88c2d9e45cc34da67a83b7dfb -size 1087977 +oid sha256:84fe4f9b921ff75f93609db704068e6be98118d707431ba9c67f0e6a61137b99 +size 1264120 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_CrosshairOnly.uasset b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_CrosshairOnly.uasset index a765d896..c6afc2e8 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_CrosshairOnly.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_CrosshairOnly.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05cc858493e8277ef65a4cb72ecb720a20db058d683a1247d95ff262a24c3bdb -size 74247 +oid sha256:d364f31ce35fe4350ce950a7669c2d050bb5098895829ea4e9102bc3d3e5955f +size 72689