From ca4ae06aef06f708c827cad64dda41f91daa53d5 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Thu, 8 Aug 2024 10:00:47 +0900 Subject: [PATCH] Reapply "push before merge" This reverts commit 5b3217f2e63c7ca55f4aebbabb19025de8081794. --- .../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, 48 insertions(+), 18 deletions(-) create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_HighLimbsGeoSG3.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_Joints_MAT1.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_Take_001.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_mixamo_com.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_PhysicsAsset.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Skeleton.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_HaesolBow.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Mesh/bow_test_v1.uasset delete mode 100644 hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/bow_test_v1.uasset create mode 100644 hwanyoung2/Content/Standing_Aim_Overdraw_Anim_mixamo_com.uasset delete mode 100644 hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/A2/H9MJMZCFVTV40932SFK4YJ.uasset create mode 100644 hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/I7/FUX2A0TO8J977DUDT6DRI8.uasset create 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 6fda3931..bf9b697b 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:207682bcaa7a30bb5b57b7f02708ab7eb81edcee69e1417d654d0ec1c44640b2 -size 282 +oid sha256:dc83fa0467b25c0ee93eaf3bc2cd5b21cc6e8951e1956f70a44fd00757d4c969 +size 273 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 new file mode 100644 index 00000000..466b2968 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_HighLimbsGeoSG3.uasset @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..64f86c19 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Beta_Joints_MAT1.uasset @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..f7a480be --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw.uasset @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..0870b291 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_Take_001.uasset @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..2bcfeed7 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Anim_mixamo_com.uasset @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..42458840 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_PhysicsAsset.uasset @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..30578805 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Mixamo/Standing_Aim_Overdraw_Skeleton.uasset @@ -0,0 +1,3 @@ +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 44bf1432..ed42d7b8 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:40e6fe15bf65cb4a6479e0264a859d2a79a74ff92c3028b10b5b2ec3a05eac36 -size 282 +oid sha256:b313d633bc2ed79b61bfb2b6c44574222a5bb5ae768508bff76157e0e83ffe2b +size 273 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_HaesolBow.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_HaesolBow.uasset new file mode 100644 index 00000000..690e321c --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_HaesolBow.uasset @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..5f1c508c --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Mesh/bow_test_v1.uasset @@ -0,0 +1,3 @@ +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 deleted file mode 100644 index f7f6dcb5..00000000 --- a/hwanyoung2/Content/Hwanyoung/Illusions/Assets/Meshes/bow_test_v1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -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 020a429e..1d033afa 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:8c3a7f3c4884488cfe21abc985aba06e56c1143e6888d7ce272f6e2843a8abdb -size 279 +oid sha256:b81d3da416a60a0b318ff46d1a1846bb764fd821be99b87736f002f5d10c2033 +size 334 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 1a25b3dd..5bc5764e 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:1f50389be16706353db220f57b8c85e2ef5c62a412435980b8282afa9ac661da -size 51723 +oid sha256:552034396e1c315a39e6484bdacf48337706fe93a753c8b104708459b288a540 +size 51227 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 5c83e99f..d8881251 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:8cfa43af058a185d4e019c2dc2b8d47a35c9d7a49a29e14ff0501d50ee0010be -size 12623220 +oid sha256:2b888178c6e4e4de3764d3299153121bf3f120bfba0ca4e139668c916aa3fa51 +size 12623229 diff --git a/hwanyoung2/Content/Standing_Aim_Overdraw_Anim_mixamo_com.uasset b/hwanyoung2/Content/Standing_Aim_Overdraw_Anim_mixamo_com.uasset new file mode 100644 index 00000000..82d23893 --- /dev/null +++ b/hwanyoung2/Content/Standing_Aim_Overdraw_Anim_mixamo_com.uasset @@ -0,0 +1,3 @@ +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 f2ba21eb..18cd0b6d 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:d36ce4ac9909bfad3ce09ea6b595036a81c69539760c43b8b649ef361d7dc490 -size 281 +oid sha256:23c585c2ad166ac40442b753ec120a6cb460295cf4a4c2f4ccb69a03b11a38b9 +size 272 diff --git a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/A2/H9MJMZCFVTV40932SFK4YJ.uasset b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/A2/H9MJMZCFVTV40932SFK4YJ.uasset deleted file mode 100644 index b51db3b2..00000000 --- a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/A2/H9MJMZCFVTV40932SFK4YJ.uasset +++ /dev/null @@ -1,3 +0,0 @@ -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 new file mode 100644 index 00000000..cca9d01b --- /dev/null +++ b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/I7/FUX2A0TO8J977DUDT6DRI8.uasset @@ -0,0 +1,3 @@ +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 new file mode 100644 index 00000000..db8780b6 --- /dev/null +++ b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/E/N2/07SIF863S94RG3QZOWIWI7.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1131471cd4501b073cdefb7505612d9bf83ca9e5d939592425cb598568a67e60 +size 9107