From 19c97af41087e7dee7247b09df5a1e2642102751 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Mon, 12 May 2025 22:42:58 +0900 Subject: [PATCH 1/8] dokkaebi static mesh, needs to work on rig anims --- .../NPC/Mobs/MAT/FabricPlainNaturalSheer009_4K_001.uasset | 3 +++ .../Hwanyoung/Character/NPC/Mobs/MAT/Material_001.uasset | 3 +++ .../NPC/Mobs/MAT/Poliigon_MetalGoldPaint_7253_4K.uasset | 3 +++ .../Hwanyoung/Character/NPC/Mobs/MAT/TowelCotton001_1K.uasset | 3 +++ .../Content/Hwanyoung/Character/NPC/Mobs/MAT/face.uasset | 3 +++ .../Content/Hwanyoung/Character/NPC/Mobs/MAT/face_base.uasset | 3 +++ .../Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_base.uasset | 3 +++ .../Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_normals.uasset | 3 +++ .../Hwanyoung/Character/NPC/Mobs/MAT/gi_roughness.uasset | 3 +++ .../Content/Hwanyoung/Character/NPC/Mobs/MAT/hair.uasset | 3 +++ .../Content/Hwanyoung/Character/NPC/Mobs/MAT/hair_base.uasset | 3 +++ .../Content/Hwanyoung/Character/NPC/Mobs/MAT/hair_emit.uasset | 3 +++ .../Hwanyoung/Character/NPC/Mobs/MAT/medallion_base.uasset | 3 +++ .../Hwanyoung/Character/NPC/Mobs/MAT/medallion_normal.uasset | 3 +++ .../Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_base.uasset | 3 +++ .../Hwanyoung/Character/NPC/Mobs/MAT/staff_normals.uasset | 3 +++ .../Hwanyoung/Character/NPC/Mobs/MAT/staff_roughness.uasset | 3 +++ .../Content/Hwanyoung/Character/NPC/Mobs/MAT/wood.uasset | 3 +++ .../Content/Hwanyoung/Character/NPC/Mobs/dokkaebi.uasset | 3 +++ 19 files changed, 57 insertions(+) create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/FabricPlainNaturalSheer009_4K_001.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/Material_001.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/Poliigon_MetalGoldPaint_7253_4K.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/TowelCotton001_1K.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/face.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/face_base.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_base.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_normals.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_roughness.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair_base.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair_emit.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/medallion_base.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/medallion_normal.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_base.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_normals.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_roughness.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/wood.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/dokkaebi.uasset diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/FabricPlainNaturalSheer009_4K_001.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/FabricPlainNaturalSheer009_4K_001.uasset new file mode 100644 index 00000000..3b97be63 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/FabricPlainNaturalSheer009_4K_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2129d7073dd83f51c9de7e9cfdf8da17fac398a75f4e5be8f3e54a6bd47ef76a +size 17401 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/Material_001.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/Material_001.uasset new file mode 100644 index 00000000..f0c2a994 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/Material_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bfba1b4a0d07c2c3c450f1b2e614476e8f633aaf2b7988c5fe8e139ff96635a +size 9379 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/Poliigon_MetalGoldPaint_7253_4K.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/Poliigon_MetalGoldPaint_7253_4K.uasset new file mode 100644 index 00000000..9d6d4e28 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/Poliigon_MetalGoldPaint_7253_4K.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f13878d55395c720b65ad4373182305a97c08ab5493c5ed8c96e52b600ac0297 +size 9200 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/TowelCotton001_1K.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/TowelCotton001_1K.uasset new file mode 100644 index 00000000..d253c10a --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/TowelCotton001_1K.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cebaa61f53c6d25c00aab6b4da3bd40ffc0371679d363245bec9825907035f3 +size 9255 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/face.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/face.uasset new file mode 100644 index 00000000..84aa751f --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/face.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3537291e5ba2bc5f7c2989eec7575f0e97af6cb10702f68dbbba98a2ea2d5d9c +size 11381 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/face_base.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/face_base.uasset new file mode 100644 index 00000000..fafe36ed --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/face_base.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d56190ac18b6db583a36469707bc7c6b0268395a0fbd2ee09645e45c8dd0a016 +size 67022 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_base.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_base.uasset new file mode 100644 index 00000000..57d3f07d --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_base.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c771c71d92bcef392aec09fe33c4e7708d6fdaccacf0c9d26d6161a66c49a4d3 +size 8803594 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_normals.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_normals.uasset new file mode 100644 index 00000000..2d0475ae --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_normals.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed1c66c27998b0c34281cc092be02633e7d2fe2960b142ba867ae20c3ac0c362 +size 6154734 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_roughness.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_roughness.uasset new file mode 100644 index 00000000..303e6ac8 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/gi_roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:709dc505b7b1497832c58438cf07c57ffa3b347bac71ef587c16836baaf29f20 +size 2387037 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair.uasset new file mode 100644 index 00000000..0a2a6c33 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8d9e51708d7d027d5261d9a56369b7bb09d1c37df9a0d6c99a2453cff273da6 +size 13390 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair_base.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair_base.uasset new file mode 100644 index 00000000..a1f908da --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair_base.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:203953b76fe5738badb00b3f0a47e1e13ab15d6596d85754b5870d02e2b02fcf +size 130393 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair_emit.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair_emit.uasset new file mode 100644 index 00000000..86be7b9b --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/hair_emit.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0e198206c990f7c8da1703e9e013817769f1257a05385a4b6c37e0b325aa11b +size 120535 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/medallion_base.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/medallion_base.uasset new file mode 100644 index 00000000..caaa89fe --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/medallion_base.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:719c8d9b89c103ede8c516eabd2c70974a2fe24d147c2f44bad06c84aeb82809 +size 36601 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/medallion_normal.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/medallion_normal.uasset new file mode 100644 index 00000000..9563a909 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/medallion_normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a35994759f15603c4f8183482f4137aa726a4025cfa18debf3f4c585d80ecb2 +size 910649 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_base.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_base.uasset new file mode 100644 index 00000000..320ec9c4 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_base.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe65c040f1020e1026535a346fabc7a42f17dfda92569b77f127d6b63d12461c +size 755645 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_normals.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_normals.uasset new file mode 100644 index 00000000..7ce97f5c --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_normals.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6dad76349dcca5636d3b87e70849ba93de39dabfb4a9a788d4e404629d69837 +size 777836 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_roughness.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_roughness.uasset new file mode 100644 index 00000000..2c4e7d19 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/staff_roughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b1d0d0029fa45cd1790dcae29ded0015072d5afd0bb21f968ca90a90c090730 +size 777886 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/wood.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/wood.uasset new file mode 100644 index 00000000..a1291cf3 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/MAT/wood.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4526fd20a0f59d5af5e873950bedd334f95c30951c443017b3d402f821e116d1 +size 14389 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/dokkaebi.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/dokkaebi.uasset new file mode 100644 index 00000000..cb35bee5 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/dokkaebi.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0a3bd490f0d0ed1ed8ccfc15fcd44cf83d73a7167d023819dc06afdfac3e0aa +size 2258087 From a5abbd2d7b1d6a410c4b349fa003fcf46a3e3ae4 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Mon, 12 May 2025 22:52:07 +0900 Subject: [PATCH 2/8] merge from reaven's UI edits --- .../Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset index 9c92b08b..3f3b5e6e 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bd46f50fd20bddbab7b41b13f007a90ecadf3388655f668f6fbdb4abf606235 -size 262061 +oid sha256:f1b58a84e95d337a3ad1b4f34b594265bc6c9049678dd24f53ab5d1261dbe062 +size 260796 From 6883e2cbba0129fe9221348da1a5136bcc3d5a27 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Mon, 12 May 2025 22:52:46 +0900 Subject: [PATCH 3/8] changed the dialogue struct for temporary SFX implementation --- .../SystemBP/DialogueableSystem/BP_DialogueComponent.uasset | 4 ++-- .../SystemBP/DialogueableSystem/DT_DiaglueTable.uasset | 4 ++-- .../SystemBP/DialogueableSystem/S_DiagloueStructure.uasset | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/BP_DialogueComponent.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/BP_DialogueComponent.uasset index cb94d7bd..3b0b602e 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/BP_DialogueComponent.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/BP_DialogueComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b970b12a723cbfbb371b339dfa67ba7ec818401d4bc5e41bd93140c98a5d257c -size 413391 +oid sha256:34e3f4ad4b48d45ae4b406748b2ddd4f7918831852589dcc10436fc5133720f3 +size 405899 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/DT_DiaglueTable.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/DT_DiaglueTable.uasset index 56ad904e..0c22f472 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/DT_DiaglueTable.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/DT_DiaglueTable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ee75dbf108ae5c24a92406c6db08f8fe6d9708347af75b1fa51a84419410d9c -size 49046 +oid sha256:aa6362817b4c971ab5e4ad68772da6f9cfdabfd80c47adbdee9a1dee5a891e40 +size 48887 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/S_DiagloueStructure.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/S_DiagloueStructure.uasset index 3b3880df..f5a4c241 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/S_DiagloueStructure.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/S_DiagloueStructure.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a932e624b1e7c01e9429b8dafc643e8c01a64098cb647d08be35da461ef55a7a -size 12782 +oid sha256:83ac7fa2be7a49d19586ea9211abbcbf98747e46ffec1aa2867bc850236e68f4 +size 12965 From 4c9d3cdc7c54f8d0266a6e79c1a79851ca056115 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Mon, 12 May 2025 22:53:21 +0900 Subject: [PATCH 4/8] merging from sfx branch for rock fall --- .../Illusions/Assets/Combat/sfx_combat_rockfall.uasset | 4 ++-- .../Environment/sfx_impact_rock_fall_huge_neu_ground_1.uasset | 4 ++-- .../sfx_impact_rock_fall_large_neu_ground_1.uasset | 4 ++-- .../Environment/sfx_impact_rock_fall_medium_grass_1.uasset | 4 ++-- .../Environment/sfx_impact_rock_fall_medium_grass_2.uasset | 4 ++-- .../Environment/sfx_impact_rock_fall_medium_grass_3.uasset | 4 ++-- .../sfx_impact_rock_fall_medium_neu_ground_1.uasset | 4 ++-- .../sfx_impact_rock_fall_medium_neu_ground_2.uasset | 4 ++-- .../sfx_impact_rock_fall_medium_neu_ground_3.uasset | 4 ++-- .../Content/Illusions/Assets/Music/BunnyPuzzle_Mix_2.uasset | 3 +++ .../Illusions/Assets/Music/BunnyPuzzle_Mix_ending.uasset | 3 +++ 11 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_2.uasset create mode 100644 hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_ending.uasset diff --git a/hwanyoung2/Content/Illusions/Assets/Combat/sfx_combat_rockfall.uasset b/hwanyoung2/Content/Illusions/Assets/Combat/sfx_combat_rockfall.uasset index cced57fb..190cfbea 100644 --- a/hwanyoung2/Content/Illusions/Assets/Combat/sfx_combat_rockfall.uasset +++ b/hwanyoung2/Content/Illusions/Assets/Combat/sfx_combat_rockfall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fafebcf8c12049340128bb5d14d4ff591642b483cb9e9e51965a86d7ea65e67b -size 132451 +oid sha256:32ba294973e27fdfd975d494322fc5135f4a0aceb3a39cf3ca7d60dab65f5c6e +size 132814 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_huge_neu_ground_1.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_huge_neu_ground_1.uasset index adfcfc49..018ec11d 100644 --- a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_huge_neu_ground_1.uasset +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_huge_neu_ground_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad4fb7759f30b5b997ec73df4ef1e7ca14f31c88bb9ae721778012d2c4abbe4c -size 152934 +oid sha256:080c85310cc99e29c18e5434dc8a39ccc5942bd3b25da23df9fb8f7b4d75f2b0 +size 153222 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_large_neu_ground_1.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_large_neu_ground_1.uasset index 119352a6..858f3d8e 100644 --- a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_large_neu_ground_1.uasset +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_large_neu_ground_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08371361ff7b90229cfe6ab07b31f2b9b78677d3bcea6ace60048cd612c63d11 -size 93826 +oid sha256:e69ea3d969ef4601ecdcebf4854a779561076c0ed4e394459c98641aed3137ec +size 94113 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_1.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_1.uasset index 7e0b49f8..fbdab61b 100644 --- a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_1.uasset +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:896daeffc2b0ed3efeaeeec0717eaaa7652fbe1036e3427e36028fca49d8265a -size 67829 +oid sha256:d3a77b66cb3c02a60ac66455106e285794bc61d0b1697b0680c49d91325d9d5b +size 67915 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_2.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_2.uasset index 65d05096..855bf0f9 100644 --- a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_2.uasset +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d914fa29a96e1b64a1811ab3e1c05109e0f19cf9a41f9cf9fbe3037f0703a06 -size 55592 +oid sha256:8705b6c7eb51fe122271634951759a9ad06304823ea3f47a5537f8341f56c123 +size 55844 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_3.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_3.uasset index 08f5459f..d9e0b3fb 100644 --- a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_3.uasset +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3286bde346ce4c9cd709088b6e72b906f0bfb24b7943263e1b562e30102b46c8 -size 48114 +oid sha256:798b9f7e7430234c23ff211f206fd4dc8204e8474cec37875bac4ed989488dfd +size 48070 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_1.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_1.uasset index 70efe2b8..f80fa2eb 100644 --- a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_1.uasset +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8e2d6149913a3ac573fdaa0281e6602710ad9122ae194c2394bc06db73f34eb -size 77320 +oid sha256:a72f163f8e744472a07680712e5b1bf68375b39bb8add998fff08a4eb0e700e9 +size 77718 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_2.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_2.uasset index 19494577..63997e36 100644 --- a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_2.uasset +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bf2ee9ca683faf5989d157b1d89fea265f0c2b4fddadbee677227c3d1efb202 -size 66049 +oid sha256:bcce04679d9cd28cc06a6f0471e82981a0d137f273fe6ef7dbd4f3b9565a91af +size 66050 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_3.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_3.uasset index 7cd34f92..08f3ae0d 100644 --- a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_3.uasset +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_3.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ce4cc9c7a34fee8108ab6532c72420fb5da4e4c5105e9aec3d8bf8e713ec564 -size 63439 +oid sha256:76fc6b0b0a8b5ab61d1f0c4dd48bbcea9ab58f220609aa0984b6221a20852c29 +size 63455 diff --git a/hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_2.uasset b/hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_2.uasset new file mode 100644 index 00000000..97166d69 --- /dev/null +++ b/hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26b6eec1a54f3650ce0f3352e17bef37e506c790211b04f3f73fae874914cf10 +size 10262840 diff --git a/hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_ending.uasset b/hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_ending.uasset new file mode 100644 index 00000000..32a7f820 --- /dev/null +++ b/hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_ending.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8807ed7611cafbc94b230a82b4e831c9a362530b9c27554573179f5c44640c61 +size 11421631 From 1bd75f8186ba1791b07decf3a358ad100aee36c9 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Mon, 12 May 2025 22:54:53 +0900 Subject: [PATCH 5/8] bunny dialogue debug temp push --- .../Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset | 4 ++-- .../Hwanyoung/Character/NPC/Behavior/BT_PuzzleNPCBase.uasset | 4 ++-- .../Hwanyoung/Character/NPC/Resources/BP_PuzzleArea.uasset | 4 ++-- .../Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset | 4 ++-- .../Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset | 4 ++-- .../Character/NPC/Spring-Bunny/BP_InteractableBunny.uasset | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset index 91856dcb..91f29807 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50d1a601fbcc6a9499e0673879008a9c7b1c14715aad217d2baa18daca3c4bef -size 502000 +oid sha256:1a4c8c516088df83489acb8d4c2d2a3048558642fafe904e5a85981a24f360ec +size 549837 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_PuzzleNPCBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_PuzzleNPCBase.uasset index 9b3905f9..c1dd47b0 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_PuzzleNPCBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_PuzzleNPCBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:654097bed798463578fa8b974a3a565655a051a9298f11fbc6df04c2a8c0ba59 -size 34602 +oid sha256:313b8677690bdb4862d67584a2617fbade6ea6f031389865ed779f026746751d +size 35736 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Resources/BP_PuzzleArea.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Resources/BP_PuzzleArea.uasset index 1c8ead9a..0fd9ac52 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Resources/BP_PuzzleArea.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Resources/BP_PuzzleArea.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a699b261e569e9759004a1a9c37f9d2632004c5f9a1cedbc87f72664100627b0 -size 100163 +oid sha256:918faa32111b0cc11558fe6eb425e33426337cd9c286ab601cbf7be6b76b93cf +size 105846 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset index e4acc468..7133447b 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:217e75da21c747e1489588619589b2c8f6c0beff40f3b72f3d357be346cb5812 -size 185810 +oid sha256:0b3f87fa947ea5b5b12cdb4c58b8c5db72823bd403718fa2def3d51e560a92c2 +size 185800 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset index 1ab17231..bf100322 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67d33d0b50cad4206fe6d8072cd0ef4d2a2d3709e150d925932c63736eac0a5d -size 144453 +oid sha256:27c568e5cb6e2217028074ac5bf04f1f6ad4879da80c4ecf2ac6ddef76ef9472 +size 162092 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_InteractableBunny.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_InteractableBunny.uasset index 908c0b90..5374c147 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_InteractableBunny.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_InteractableBunny.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:759925d4e06dbbc2c20b2d9ecc8428ae833616f38c48484c6fa0c97cd263dc9d -size 149138 +oid sha256:2118e65fc6c68c392db497256244f00f600c176a0bd743ae883745777a95a835 +size 151429 From d2080e63c7d73b858d8a73cf2bb4efbac0e3f83f Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Mon, 12 May 2025 22:55:23 +0900 Subject: [PATCH 6/8] large gonggi stone fall down SFX integrated --- .../Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset | 4 ++-- .../ProjectileBP/BP_LargeGonggiStone.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset index 91d32b89..3b81f14f 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa607a597ca84670646c48e9cd495115e1745169c3eb10fa3a729d260b9507c6 -size 1006445 +oid sha256:dced55b54d6d2c6c00374a73b5794e47266ec4626816270055fe6dc4b3bb2bd6 +size 1033269 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_LargeGonggiStone.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_LargeGonggiStone.uasset index 2afa0d95..ee70764f 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_LargeGonggiStone.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_LargeGonggiStone.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6db374550f4c4074b477c4b63f37d783843140630a62dce0018398c1c18009b4 -size 128624 +oid sha256:c16242242fc0fbeb92ccbfbebba11dd94486e4d33eba6b2c106c260bcb3267f7 +size 135870 From 779c21601ad1cfc2d28bc59d4a2756a16983581f Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Mon, 12 May 2025 22:55:38 +0900 Subject: [PATCH 7/8] dialogue translations added --- .../Localization/Dialogue/en/Dialogue.archive | Bin 89610 -> 87956 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/hwanyoung2/Content/Localization/Dialogue/en/Dialogue.archive b/hwanyoung2/Content/Localization/Dialogue/en/Dialogue.archive index d091ea0a580543b7fe59cba10b901b149e98725e..d16295d5fd9b8147f36fa61a3a2400aea20ef8be 100644 GIT binary patch delta 2467 zcmY*bZERat89v8#Q?DegSJsdP)7})vjhO9P!;Aun)(WeOs;IKi08`~hg$fE=KyJC3 zGRbOEHB_dG5Y35{XeyHz3IufH+CI0r@yE)I$^9^MgQ;-Vu?$&Yi3(CMQdVUs1K!uS zp{pXr*Y~{N&-1*;R|-3)ZtP4g*gAsws3hwG8Cv;VK4b_)Fx1juwVq*No4``1oVS%yp4C>I{1y8MJ$~NudNjY@>#vt7+R7w zkI|CFZFYc|=QLB}~mErlii~|*`krlNhkdsK`;3^7--DE>f^>#27TsoVm2YErE=El28(p0D;j<- zb5+Ow1X&;*;2Ad(k~{6^7x#Uga{GQS<##_0{{rout*p~M%UxX+$_wt-9c;}%%eH(q zcG@?~FB~biv+)=1FxLx1?Bt0%{A>O7gWnPjm$^Obb*)*eZa2r?4E!Ev+E4_Nk}6s3 z&Y>@<2o~CG&J*x@oF)kCqgiYej;@N;Epx4SH0f`mf9N|Q%I029u$Gr+*|%Rxu)?sH zMQx#7YsCxXs?jyQ6reu-VEDA1O`gBbp6l4d)o75i*Tojz`~9yxdE5zz;D`~A2Ssbp z5zQ*-jOMtFqqS$mdCO`YO78(JT#}agL%f^Ft&e|m$5-7DDlEGft+~qDQ#TPWw{Bq} z8e-LARiuiDV7~%!O8ZTm!%s?X9g$NDkt(7SmX`rPGwVm{Ba09Gu+uiWt{s7hvN~{+ z=-V?B$iU4hpqwKe%)^=HUc{^+Ett28%;z4TZy5@|E@N9gMY+i+Sv#6DGsmDU(U{BC zWn{&OVVCM)g|(z|vMP`dGLa)yOf<11HR;p~3LU!>NN&Hg=!)vC%d!@O1nhf#&+_q! zNy-*Jzvm>8&Y3giEtufrpk6WppjaGSO^-lvmmp>3*Qop^aZF2)^-K*&n$N+x!J>VB zzWO8A&VZaEl1F$?r4knX*HT2ANjcv{znK&wgaW`85anQgtq2tb_~ohdyGJdurF1Ea zBC^`uf~R_B1fV$w8jUG9$jy04Asi#3Ez%P=-C?kZKt`(fu43ktioOjkC3QgWD5iP_ z=W_IVp0E5nng@;AqqEWtW5NJa0BZlHows!8Z)b&aU@6!CQ6 z=0Flv5=hoF?!_tHT8uw`CqzGG1tI3}+gAZ(=K|0p9RebVRWw@~_wm7ZFVN#5?E)Fl zP-E~KGFZetmc!{1326_j0nV)KDR>)|kRiGjm1;7Ey138B zWw#oKQ28v}@bFsW&%5jh6gxBN<(r!k>UuYeTTvjdro*z`L_pDOW@Yq!l9$V6F1 zg(0Rf`1Zc^ODR&d_<=DW*QHvLDgucZ!8|G?Zs5W>MB2!1_G(|Z;`#)=M@Oyv#~}ZY zLB(|$RS-2DNmLK&ubvUJNK5CcTgL@stw-e1M!~umHs?{FiSjq9+n2JW_U5;rL)u+{ zY#sJ8s_Gs7L=sgesS^rXc&Na}PI{HjPHMM5oiM^l?0ljy^c!Rn2ui8|kDg~sE}wGw z0FAZuIMV2kn`p2)0GHABrHK=a8>WWSiApj2?ci62y6H=_YY@uDHG`{QLxDpD#f&Q_ z4(l+=A^f;c89q#xZS8~AIB5Ds2qISPKx9|*Ud45#%zTCxc77QzYk^$5{R7D703D4O oQ3#gG#T5KS@o4^7PdyV^2_$ij9%vcS>(_?mCi|5}fOh)+2SN`$GXMYp delta 773 zcmX9+QAkr^6y{v-);8C?F0mTnOqVU2Flvk;5o4)Hi1-jTL}ZASF3}|=5@W0=B@@0`ca6unc5=aUTP zGc~w*nWH3Q036A%V`z?}TDA*tiycCbiKBDMT)?7lJJ19eQ!CM`^2>x(-4D2= z7Lcpw$dY+AU5#Z1F?4~WU9CM$3?HoFH;)2Ge%*SS$;;ZunngWnv&}%BLlz*LUV8d+ z3|j0gh)|bt0gyYPqoTr)3LPa8bX(#$c{)OCCG)u$FJGkdWu-t972k{)y3V5i%ChXF z_?ipwX^Vi`mI$^s3s~*-$qm(B3&wA8wC#1X*zb$tW_uW`+M{&lhC7?Lo&^>YcdFzW ziMyVRG*f^7Wy&X7)hvDOHZU?v{vHQNG)Jos1|Z$&?@?i}cZ_$MB$rzc4GMIHy3?N9 z9{Ds>H|zv?_V~zj1`4A~=p6M72qyHr(qmYNkT<#u)Ecb@oOv=%jbn{Q^t@ov{KlPX zAw?%K0BEx!$~VPu|Snr?T`1$8v)#Y+4BbPOpR~ zKI=Iw-H1@%cQZp@HriAe|5YSKlS6^+OCSLj4Zm*=*f?_S1Q=8$1oZ56V#A&-l^?#| z4bylc0=WLiBnKMUw*d-CGrIm-VFD+cwzfSjM$kpnEtuN?+AFV#75>InFid^itkQ$dLR uM({!kYIs{d1XH47#c`Nn_|`(G6QzZ`Q}D5qpyMk~K|ne>PP| Date: Mon, 12 May 2025 23:35:42 +0900 Subject: [PATCH 8/8] forgot to change the button text to COOK --- .../Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset index 3f3b5e6e..c06bfba9 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1b58a84e95d337a3ad1b4f34b594265bc6c9049678dd24f53ab5d1261dbe062 -size 260796 +oid sha256:ff645515c8de00e245722a987dad5b83c22a425e2c45597806dfab8dee9cbf1e +size 260370