diff --git a/hwanyoung2/Content/Asian_Village/materials/trees_materials/M_bark.uasset b/hwanyoung2/Content/Asian_Village/materials/trees_materials/M_bark.uasset index 708595e3..dd1d18f3 100644 --- a/hwanyoung2/Content/Asian_Village/materials/trees_materials/M_bark.uasset +++ b/hwanyoung2/Content/Asian_Village/materials/trees_materials/M_bark.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:833a4e1f8a5b5a56e97779bed47ce75c287c59b50f43a4686b33edb7d2883e8d -size 72842 +oid sha256:3d2b9e05188e034aaa5a13b97724ad7f2c979a9e355450229fb72eb9e922848e +size 72731 diff --git a/hwanyoung2/Content/Asian_Village/materials/trees_materials/M_foliage.uasset b/hwanyoung2/Content/Asian_Village/materials/trees_materials/M_foliage.uasset index 5a1ad97c..f7a99561 100644 --- a/hwanyoung2/Content/Asian_Village/materials/trees_materials/M_foliage.uasset +++ b/hwanyoung2/Content/Asian_Village/materials/trees_materials/M_foliage.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:236bb0db01c181f35d9e90e10b56f350bda4efbe14b0e8977a3c1efa4ce37f45 -size 65918 +oid sha256:6a16b8d824fc96643e4f5c86a2507d6e55f00e779092942525469e488c240048 +size 65987 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset index eeb9d634..f4a24157 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:c806a201d32896eb1ccc25da6d2bff8d1c9e7340e0b0dbd0cd576b8129684bcc -size 387923 +oid sha256:a4a8feb520ed2f50bc7e6e77819f357970cfb5171865afdc813aa1b312ac32f1 +size 399972 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset index 2d2ca68c..76f8c114 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:308157f5557f1e74f3b570a6953b608c1c5f23b03a6048d1f90d358a8c0108d3 -size 716881 +oid sha256:1573db96031334c5a4046bd3eb76052afb2c2503b1929be0266bbb2dad980874 +size 721303 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 2008621f..60c930db 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:4c65222bc4f81ce1202f98f847c22c6ff09f3cc674f964710f0d141f91c15ef5 -size 751840 +oid sha256:73a9c614249eaa6a622eafa2024e9c892563d4cfa805cea111a8f3e4d43752a9 +size 751013 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 6824b17a..20f8cb52 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:4e48a2bf8a654a8bb8b68001f5edcfaf933947b12492d11a02de983ab242a955 -size 1804963 +oid sha256:28cfa2e2c597c442dedf811a324f16e0d5fafd52331e7d19181a69cc666dc061 +size 1936619 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol_Dup.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol_Dup.uasset new file mode 100644 index 00000000..8ea7967f --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol_Dup.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98df354e63f9e56784027353dc379ac306e25ee73559b0f537e7bfd273bc8258 +size 1926834 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Storm.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Storm.uasset index cb987ab1..9bb7f495 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Storm.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Storm.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:393dd5413f246a647586781c125b8e7c546d4684d5937151e1eacec46b544753 -size 485588 +oid sha256:b1c95af628f36a4eadc4eab5c070e0d06917560ea0055593b85f98a1259c5cb9 +size 484941 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MF_CameraMasking.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MF_CameraMasking.uasset deleted file mode 100644 index 4d48fdb9..00000000 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MF_CameraMasking.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05b7d69c24c2f3ad2555d82987467615d9dfb6f20724613ad7e14c9c271290de -size 11856 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MF_OcclusionMasking.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MF_OcclusionMasking.uasset deleted file mode 100644 index 504f1465..00000000 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MF_OcclusionMasking.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8cfdbfbf735a85e6b3234a2549285406e79c27f73426b31bea2a45dea9d44909 -size 28755 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MPC_PlayerLocations.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MPC_PlayerLocations.uasset deleted file mode 100644 index 61cbc44c..00000000 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MPC_PlayerLocations.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c745d8b8bcd0a5f8f3ce6890e5eadd9746ad23480e90dc39f79207101eeef5b -size 1946 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/M_TestMasking.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/M_TestMasking.uasset deleted file mode 100644 index 06c9850d..00000000 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/M_TestMasking.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ec39b277c9409c226a0a155e25c2f10650de99ab8186b5825f966c9340fe49a -size 16157 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/MI_Trajectory.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/MI_Trajectory.uasset new file mode 100644 index 00000000..04236110 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/MI_Trajectory.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0ee0e1d6de575cb18282b65868870c100318312f2d518670f23fb709053e8a2 +size 12298 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/M_P1.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/M_P1.uasset new file mode 100644 index 00000000..ded846a4 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/M_P1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1779902bbaf545490a2e501d8172b20105d423dde67d9a424f9fff688284bfdb +size 9321 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/M_Spline_Trajectory.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/M_Spline_Trajectory.uasset new file mode 100644 index 00000000..a448ce04 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/M_Spline_Trajectory.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30590774dd65591c88cacb9e047d6de149c9f9e6e5f4e58d66065d02d28023c9 +size 17824 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/M_Spline_Trajectory2.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/M_Spline_Trajectory2.uasset new file mode 100644 index 00000000..e9639968 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/M_Spline_Trajectory2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92fda2fbedc01934b895353c8d2f5b449a0cea7307429e16bdb4efc7d50f2822 +size 22546 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/Path_4.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/Path_4.uasset new file mode 100644 index 00000000..e1fae856 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/Path_4.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:634fbd1fc5c711842908854b526efd05a98a5d918fc3e787717262d9ae78d040 +size 21665 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/OcclusionMaskSystem/MF_CameraMasking.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/OcclusionMaskSystem/MF_CameraMasking.uasset new file mode 100644 index 00000000..201662b7 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/OcclusionMaskSystem/MF_CameraMasking.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ee0e6cdb3a9d403fc89ed603f154ce39ec8140fac55c23222b82c8d68c690da +size 11914 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/OcclusionMaskSystem/MF_OcclusionMasking.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/OcclusionMaskSystem/MF_OcclusionMasking.uasset new file mode 100644 index 00000000..bf8de6e3 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/OcclusionMaskSystem/MF_OcclusionMasking.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94ab01842b07967af53dfd99f836709dc5c4432fa9767eaf10ff464ee27a25e4 +size 28842 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/OcclusionMaskSystem/MPC_PlayerLocations.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/OcclusionMaskSystem/MPC_PlayerLocations.uasset new file mode 100644 index 00000000..4c62ee04 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/OcclusionMaskSystem/MPC_PlayerLocations.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:381914fb255fbdcd7101fe33ab5c1a2edd35055498e08f0a54ce16e909398cc8 +size 2004 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/OcclusionMaskSystem/M_TestMasking.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/OcclusionMaskSystem/M_TestMasking.uasset new file mode 100644 index 00000000..3b65b168 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/OcclusionMaskSystem/M_TestMasking.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5aeacf78a786cfa2388e2a82549a5e8a869b0141b2ea51df4e82a4861558ba0b +size 16273 diff --git a/hwanyoung2/Content/Naganeupseong/Materials/Master/MM_Basic.uasset b/hwanyoung2/Content/Naganeupseong/Materials/Master/MM_Basic.uasset index 76ff5e6c..33910200 100644 --- a/hwanyoung2/Content/Naganeupseong/Materials/Master/MM_Basic.uasset +++ b/hwanyoung2/Content/Naganeupseong/Materials/Master/MM_Basic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44aa3940cc6ae5f2acc8d3f1fb755d39df4af642d7f717328e102bd35e48b58b -size 52266 +oid sha256:0495f09b5c21ce10760fad701e3a58f7cd879372ed50ae74fa23e51a3e6259bc +size 52291 diff --git a/hwanyoung2/Content/StylizedEnvironment/Materials/Master/M_Base.uasset b/hwanyoung2/Content/StylizedEnvironment/Materials/Master/M_Base.uasset index f63eba85..310fd76f 100644 --- a/hwanyoung2/Content/StylizedEnvironment/Materials/Master/M_Base.uasset +++ b/hwanyoung2/Content/StylizedEnvironment/Materials/Master/M_Base.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddd6b1de1aaa11629a19a61f216e50bb08da4e96ed53b2197446e50697782313 -size 49836 +oid sha256:8120ebfa64702a34b3b784dbd0e1167aa37e7ba2dd83cd2a8da01c88efc5febe +size 49933 diff --git a/hwanyoung2/Content/StylizedEnvironment/Materials/Master/M_Base2.uasset b/hwanyoung2/Content/StylizedEnvironment/Materials/Master/M_Base2.uasset index 2fb98a99..bac46ade 100644 --- a/hwanyoung2/Content/StylizedEnvironment/Materials/Master/M_Base2.uasset +++ b/hwanyoung2/Content/StylizedEnvironment/Materials/Master/M_Base2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f35fe9fd92ba1c3782285dd340c38e4e92b9ca2951841ac731af85192d41ba0 -size 37656 +oid sha256:c7057d74fbf93d616a78d1942f1d12f5b4d98f1b289b68cc2d3f98998c783a5c +size 37752 diff --git a/hwanyoung2/Content/StylizedEnvironment/Materials/Master/M_Plant.uasset b/hwanyoung2/Content/StylizedEnvironment/Materials/Master/M_Plant.uasset index d1a10e6d..8f95cdfe 100644 --- a/hwanyoung2/Content/StylizedEnvironment/Materials/Master/M_Plant.uasset +++ b/hwanyoung2/Content/StylizedEnvironment/Materials/Master/M_Plant.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f8b0d4888dc712b0dcec221b275ec7f57c49101606ba8b1ebe0f12e6f73c84f -size 70270 +oid sha256:e8e5460abb5f81c31fb79d3738d610ba676b5eeaa786aacb550b0371e415a0be +size 71318 diff --git a/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h b/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h index 1553f249..bef41cc5 100644 --- a/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h +++ b/hwanyoung2/Source/hwanyoung2/hwanyoung2Character.h @@ -80,10 +80,10 @@ public: protected: - UPROPERTY(BlueprintReadOnly, Category = "HY_Character|Camera") + UPROPERTY(BlueprintReadOnly, EditAnywhere, Category = "HY_Character|Camera") float StartingCameraBoomArmLength; - UPROPERTY(BlueprintReadOnly, Category = "HY_Character|Camera") + UPROPERTY(BlueprintReadOnly, EditAnywhere, Category = "HY_Character|Camera") FVector StartingCameraBoomLocation; UPROPERTY(BlueprintReadOnly, EditAnywhere, Category = "HY_Character|Camera")