From 42fd02358c9fd5381f08675278657189e2ae78c7 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Thu, 8 Aug 2024 09:21:51 +0900 Subject: [PATCH] Revert "push before merge" This reverts commit f13816d379f59372ef244a6d789736d46eb9fc44. --- .../Character/PlayerCharacter/BP_PlayerCharacterBase.uasset | 4 ++-- .../Haesol/Animations/Mixamo/Beta_HighLimbsGeoSG3.uasset | 3 --- .../Haesol/Animations/Mixamo/Beta_Joints_MAT1.uasset | 3 --- .../Haesol/Animations/Mixamo/Standing_Aim_Overdraw.uasset | 3 --- .../Mixamo/Standing_Aim_Overdraw_Anim_Take_001.uasset | 3 --- .../Mixamo/Standing_Aim_Overdraw_Anim_mixamo_com.uasset | 3 --- .../Mixamo/Standing_Aim_Overdraw_PhysicsAsset.uasset | 3 --- .../Animations/Mixamo/Standing_Aim_Overdraw_Skeleton.uasset | 3 --- .../PlayerCharacter/Playables/Haesol/BP_Haesol.uasset | 4 ++-- .../PlayerCharacter/Playables/Haesol/BP_HaesolBow.uasset | 3 --- .../PlayerCharacter/Playables/Haesol/Mesh/bow_test_v1.uasset | 3 --- .../Hwanyoung/Illusions/Assets/Meshes/bow_test_v1.uasset | 3 +++ .../Content/Hwanyoung/Interactables/ItemDataTable.uasset | 4 ++-- .../Meshs/Characters/Meshs/SKEL_Soldier_1.uasset | 4 ++-- .../Meshs/Characters/Meshs/SKM_Soldier_1.uasset | 4 ++-- .../Content/Standing_Aim_Overdraw_Anim_mixamo_com.uasset | 3 --- hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap | 4 ++-- .../Maps/ThirdPersonMap/0/A2/H9MJMZCFVTV40932SFK4YJ.uasset | 3 +++ .../Maps/ThirdPersonMap/0/I7/FUX2A0TO8J977DUDT6DRI8.uasset | 3 --- .../Maps/ThirdPersonMap/E/N2/07SIF863S94RG3QZOWIWI7.uasset | 3 --- 20 files changed, 18 insertions(+), 48 deletions(-) delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_HighLimbsGeoSG3.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_Joints_MAT1.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_Take_001.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_mixamo_com.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_PhysicsAsset.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Skeleton.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_HaesolBow.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Mesh/bow_test_v1.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/bow_test_v1.uasset delete mode 100644 hwanyoung2/Content/Standing_Aim_Overdraw_Anim_mixamo_com.uasset create mode 100644 hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/A2/H9MJMZCFVTV40932SFK4YJ.uasset delete mode 100644 hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/I7/FUX2A0TO8J977DUDT6DRI8.uasset delete mode 100644 hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/E/N2/07SIF863S94RG3QZOWIWI7.uasset diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset index 05b8d973..ec61385d 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:b32f306a99076febb2a2b5c2169aea7aa224c2c9eeb108d7066c743b5749fa4d -size 354626 +oid sha256:dc5493423c50779a6039c876fc8601a775435ac065edddddd927b2d7a821bc66 +size 353825 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_HighLimbsGeoSG3.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_HighLimbsGeoSG3.uasset deleted file mode 100644 index 466b2968..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_HighLimbsGeoSG3.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7840f86386d43136d308556876af5adc3c2b9cbda282226b7ad02c4a6ce134e3 -size 8314 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_Joints_MAT1.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_Joints_MAT1.uasset deleted file mode 100644 index 64f86c19..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_Joints_MAT1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee2c5976fac9664caae41cfb1d857b53312c42ea43c3f15649efb3f64bb04b02 -size 7997 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw.uasset deleted file mode 100644 index f7a480be..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d734ac9c225b41419ebb7e75eb55f1284b017fcfd1f29a2785e4bebefd05805 -size 6289545 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_Take_001.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_Take_001.uasset deleted file mode 100644 index 0870b291..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_Take_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a74977ed846aec695b86ae6d2fa41e664ca5feab44a6668235e969c9dbdc9ec -size 293026 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_mixamo_com.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_mixamo_com.uasset deleted file mode 100644 index 2bcfeed7..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_mixamo_com.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:595a93d96c22cfa64bb5446c6643e3115470447c33b23baf166056f32eb4402b -size 326412 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_PhysicsAsset.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_PhysicsAsset.uasset deleted file mode 100644 index 42458840..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_PhysicsAsset.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:095d32b3c764f751103c6dd9ec62a76b1d01a8223a01a0b5f4da98c04eb3c848 -size 30274 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Skeleton.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Skeleton.uasset deleted file mode 100644 index 30578805..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Skeleton.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13fbcca1e7331149de79acdcb73f16e99c04d77eca928762140b532881cac856 -size 28911 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 88ba6813..427b25b4 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:60523c4e8a8fb35a2e20c6015e72484b13f9159725bcd06445ffc8f9bba0295a -size 577206 +oid sha256:c08e190ba033a32fb54dfd3a2f6d91e26b255d77b46a07e703a94286d05ad58b +size 572435 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_HaesolBow.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_HaesolBow.uasset deleted file mode 100644 index 690e321c..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_HaesolBow.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:103173fc1e93158af130e0e2a3cdcbdc8d13676eaed4d672263c7ee173caea48 -size 21357 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Mesh/bow_test_v1.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Mesh/bow_test_v1.uasset deleted file mode 100644 index 5f1c508c..00000000 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Mesh/bow_test_v1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a927acdf71aa5eb8bfce9137d843ad3a766250a3dcac989b03398259e826ed52 -size 76155 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/Interactables/ItemDataTable.uasset b/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset index ca2cd8dc..90f1b812 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:354b14c7fa7a59272fa94fd20ef501e1320761b76f73f240258b3ba9a2ea2156 -size 271 +oid sha256:6285b226ddaa7fe86cda51dc3cf027db4a8cc1de9932bfa4b1c5dae7312b16e6 +size 310 diff --git a/hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKEL_Soldier_1.uasset b/hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKEL_Soldier_1.uasset index 5bc5764e..1a25b3dd 100644 --- a/hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKEL_Soldier_1.uasset +++ b/hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKEL_Soldier_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:552034396e1c315a39e6484bdacf48337706fe93a753c8b104708459b288a540 -size 51227 +oid sha256:1f50389be16706353db220f57b8c85e2ef5c62a412435980b8282afa9ac661da +size 51723 diff --git a/hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKM_Soldier_1.uasset b/hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKM_Soldier_1.uasset index d8881251..5c83e99f 100644 --- a/hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKM_Soldier_1.uasset +++ b/hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/SKM_Soldier_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b888178c6e4e4de3764d3299153121bf3f120bfba0ca4e139668c916aa3fa51 -size 12623229 +oid sha256:8cfa43af058a185d4e019c2dc2b8d47a35c9d7a49a29e14ff0501d50ee0010be +size 12623220 diff --git a/hwanyoung2/Content/Standing_Aim_Overdraw_Anim_mixamo_com.uasset b/hwanyoung2/Content/Standing_Aim_Overdraw_Anim_mixamo_com.uasset deleted file mode 100644 index 82d23893..00000000 --- a/hwanyoung2/Content/Standing_Aim_Overdraw_Anim_mixamo_com.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f361ebb7c7714999fdb51934f4a326580a0744df148f1ada1269417ecb2bbe57 -size 457979 diff --git a/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap b/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap index 40a90c17..91ebb7b9 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:13238295f578f36f137d25e77587c627aafaa829920affd9893a820324f5144d -size 53344 +oid sha256:002d61172026d50688ef2b49d2231b9194b00f75638e9a9384d3ddbf8365b7fd +size 57804 diff --git a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/A2/H9MJMZCFVTV40932SFK4YJ.uasset b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/A2/H9MJMZCFVTV40932SFK4YJ.uasset new file mode 100644 index 00000000..b51db3b2 --- /dev/null +++ b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/A2/H9MJMZCFVTV40932SFK4YJ.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da98602c0b14babd30967deda72cc5b971fe3d2e8bb335afe717c70526c798de +size 4155 diff --git a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/I7/FUX2A0TO8J977DUDT6DRI8.uasset b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/I7/FUX2A0TO8J977DUDT6DRI8.uasset deleted file mode 100644 index cca9d01b..00000000 --- a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/I7/FUX2A0TO8J977DUDT6DRI8.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52281c51287ddd207534351cff9d538ef56e99accfc9fbf05ceedf08f92af510 -size 9105 diff --git a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/E/N2/07SIF863S94RG3QZOWIWI7.uasset b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/E/N2/07SIF863S94RG3QZOWIWI7.uasset deleted file mode 100644 index db8780b6..00000000 --- a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/E/N2/07SIF863S94RG3QZOWIWI7.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1131471cd4501b073cdefb7505612d9bf83ca9e5d939592425cb598568a67e60 -size 9107