From f0b55cacafdf0223001fc061b1af493ffeae5e03 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Thu, 1 May 2025 19:06:11 +0900 Subject: [PATCH 1/6] BT: bunny state can go fleeing <--> seen --- .../Hwanyoung/Character/NPC/Behavior/BT_PuzzleNPCBase.uasset | 4 ++-- .../BT_Services/BTS_ChangeStateToAttackIfAttacked.uasset | 4 ++-- .../BT_Services/BTS_ChangeStateToFleeIfAttacked.uasset | 3 +++ .../NPC/Behavior/BT_Tasks/BTT_WaitForPuzzleEnd.uasset | 3 +++ .../Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset | 4 ++-- .../Character/NPC/Spring-Bunny/BP_InteractableBunny.uasset | 4 ++-- 6 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Services/BTS_ChangeStateToFleeIfAttacked.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_WaitForPuzzleEnd.uasset diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_PuzzleNPCBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_PuzzleNPCBase.uasset index 0e08d41f..a39dac8d 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:fd1e5851447f11dabbff0e26cda1ea646f0e00f4f75880ac12dc45271b4d45db -size 25083 +oid sha256:21ccf4cb9d0736a8d0527d0c6a64ee47107decd62ba1ae1ab3bf421aa2185857 +size 30939 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Services/BTS_ChangeStateToAttackIfAttacked.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Services/BTS_ChangeStateToAttackIfAttacked.uasset index fdb30762..796da9c4 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Services/BTS_ChangeStateToAttackIfAttacked.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Services/BTS_ChangeStateToAttackIfAttacked.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8b1ed9566640e0a8a08b56270a852af85c0b172ce4cc7eeff4e86d215d9ff37 -size 43890 +oid sha256:af0492d6235c9a88733407aa72af93fd686fc85efe0819a6bcaaa75da4e8d340 +size 43001 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Services/BTS_ChangeStateToFleeIfAttacked.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Services/BTS_ChangeStateToFleeIfAttacked.uasset new file mode 100644 index 00000000..588e352f --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Services/BTS_ChangeStateToFleeIfAttacked.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7f240fa9c6d1e0ed4e54f3c94108603dc7c5a34b6abc24a2825372edeb95bba +size 50107 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_WaitForPuzzleEnd.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_WaitForPuzzleEnd.uasset new file mode 100644 index 00000000..70477bd2 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_WaitForPuzzleEnd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:986cfb37c18331e7987d7becb65b7c6e50c21de061022d9754d2894f6816568a +size 28150 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 b73778f7..d10221ce 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:2421e684cff57252ad797acb0075d35eb1c32acb0e1a6ed9d7fd00f836f5b7fb -size 115179 +oid sha256:ca857fcedd384549181859c4c44400b542e56878b2bfb21feac2786cf5d50410 +size 105804 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 077d1f15..0a5987d4 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:b034e197a2b74de244113e3a4c6732f60950ed5e8e9eb161c280c2a1abcdf0c0 -size 140357 +oid sha256:8c793f250c9bc322de6ee72143baac73897e42dd6210513e503c0ed0cf1ebefb +size 135909 From 36ba2fc70a912817e6e65b22a6e76af3e81e4273 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Thu, 1 May 2025 19:06:45 +0900 Subject: [PATCH 2/6] minor rig changes, i don't even know what they are so you can probably ignore them --- .../Mannequins/Rigs/CR_Mannequin_BasicFootIK.uasset | 4 ++-- .../Characters/Mannequins/Rigs/CR_Mannequin_Procedural.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hwanyoung2/Content/Characters/Mannequins/Rigs/CR_Mannequin_BasicFootIK.uasset b/hwanyoung2/Content/Characters/Mannequins/Rigs/CR_Mannequin_BasicFootIK.uasset index f9c827a9..4ad9b16e 100644 --- a/hwanyoung2/Content/Characters/Mannequins/Rigs/CR_Mannequin_BasicFootIK.uasset +++ b/hwanyoung2/Content/Characters/Mannequins/Rigs/CR_Mannequin_BasicFootIK.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:968ba2fa8bf2bca36556b5623b895b9ac9db162f9c2936acda0b0504239543b4 -size 580522 +oid sha256:735bd0b35a3f420056226f124430cb276e15167bb65a01813066831efa41d6e0 +size 454541 diff --git a/hwanyoung2/Content/Characters/Mannequins/Rigs/CR_Mannequin_Procedural.uasset b/hwanyoung2/Content/Characters/Mannequins/Rigs/CR_Mannequin_Procedural.uasset index 98e02048..1c0f1dc4 100644 --- a/hwanyoung2/Content/Characters/Mannequins/Rigs/CR_Mannequin_Procedural.uasset +++ b/hwanyoung2/Content/Characters/Mannequins/Rigs/CR_Mannequin_Procedural.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d1abd304377e26c3c7e5a3b7488c522b118cc62ba0f574e9a63ec2e6ca22ac6 -size 2267523 +oid sha256:6a6e828df83042283267b77424445e5d1ee154d8fcc62df7c7777fcd6a30c5df +size 1208453 From 38fe73dee0f81bd7741134c0da3973ad623ff42e Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Thu, 1 May 2025 19:07:07 +0900 Subject: [PATCH 3/6] i forgot to add this on the first commit --- .../Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset index 9f2a65f9..696fd29e 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:1425394ff3ea1476f6bb27e998084809986d2ee18cd497c8c992b8b00d4de4b8 -size 346864 +oid sha256:1352caae4032279ebf26ad3975d02e0c1e43f6533e7123d6fbf684cceed0bc28 +size 345441 From 84cfc72ef91e0af31bbe2db33006b55d9f4807a5 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Thu, 1 May 2025 19:07:30 +0900 Subject: [PATCH 4/6] merge for dragon anims --- .../NPC/Spring-Dragon/Assets/Animation/AM_DragonMove.uasset | 4 ++-- .../Spring-Dragon/Assets/Animation/DragonMotionChange.uasset | 4 ++-- .../NPC/Spring-Dragon/Assets/Animation/DragonSpinSeq.uasset | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/Animation/AM_DragonMove.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/Animation/AM_DragonMove.uasset index 03b90d8d..e586fe69 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/Animation/AM_DragonMove.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/Animation/AM_DragonMove.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39c561e2df463be7641a8dbd4f97da48d087f3ec1173e5a53fbefdc73a6492d3 -size 2721593 +oid sha256:67db0f2fcb336eeb8709a2a23296e4d3489bb91d7a24071718f5747d73fce523 +size 2683990 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/Animation/DragonMotionChange.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/Animation/DragonMotionChange.uasset index 39106659..12d87067 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/Animation/DragonMotionChange.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/Animation/DragonMotionChange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21359785579a4880a140b38f58348e83425db707d9d6b0c2c86326321a565002 -size 2587923 +oid sha256:491d069e2bd1a9883f113970edbc1c5b35357d135d01cc6c0a91a371e70c0a7d +size 2550303 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/Animation/DragonSpinSeq.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/Animation/DragonSpinSeq.uasset index 4d9f9ee6..b10db2b8 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/Animation/DragonSpinSeq.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/Animation/DragonSpinSeq.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:354311fd1cb33786ff7fdff304e2133d75c2138e1b63101d9d4d98837fa08e3c -size 5833805 +oid sha256:eeef86a9d58507bb518444d99789ff5620ee8ca413e9ebe27ee8195e3ff3ef0e +size 5796179 From d778a0b0e71f52061a2f09c023fad574f0de4b68 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Thu, 1 May 2025 19:08:20 +0900 Subject: [PATCH 5/6] fixed some dialogue options and added korean trasnlations --- .../DialogueableSystem/DT_DiaglueTable.uasset | 4 ++-- .../Localization/Dialogue/Dialogue.csv | 1 + .../Localization/Dialogue/Dialogue.manifest | Bin 84490 -> 90230 bytes .../Localization/Dialogue/en/Dialogue.archive | Bin 55926 -> 58682 bytes .../Dialogue/ko-KR/Dialogue.archive | Bin 51864 -> 54462 bytes 5 files changed, 3 insertions(+), 2 deletions(-) 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 16a5a444..20292b63 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:e7694fb84933fd5898d8b30e6a72b9f2cf035b6396e72b35a9069306b35dd4f8 -size 14194 +oid sha256:33d8e142beddd94a02ed8df12c9efce5c30536c7f0c1a1eebb43c6dc031e1b34 +size 16140 diff --git a/hwanyoung2/Content/Localization/Dialogue/Dialogue.csv b/hwanyoung2/Content/Localization/Dialogue/Dialogue.csv index 088691d2..2b0fc4f1 100644 --- a/hwanyoung2/Content/Localization/Dialogue/Dialogue.csv +++ b/hwanyoung2/Content/Localization/Dialogue/Dialogue.csv @@ -4,3 +4,4 @@ Date/Time,Word Count,en,ko-KR 2025.04.30-22.20.42,505,505,0 2025.04.30-23.53.17,600,600,0 2025.04.30-23.59.29,600,592,0 +2025.05.01-18.43.00,632,632,0 diff --git a/hwanyoung2/Content/Localization/Dialogue/Dialogue.manifest b/hwanyoung2/Content/Localization/Dialogue/Dialogue.manifest index 1b400d3fee2ccbe70951bffe2e87d67f87c13adc..0979807aba86e38a54b2be083dabe4f23b5219da 100644 GIT binary patch delta 2711 zcmds&K~ED=5XWZ)JQ9sjg2B+lAc|PocDK8gG_mcrq|u;w@Zy1hg@Q<1X^CP&(3|n3 zS;;0|jENrr<-k!rn&>z1z$Y+z@x;O3>{=pn@M0h#n|*I)-rL!k_n-N{r!P8we&|>` zY`0aV>OcQ@%O6^8cZ%XlQXI)kLM+Ki7Of~LbXz} z{^+O9WKI?ZpRyzu*?V2a8C#b4F3UK+FZtQ8$NH9}Ax)W*dA=CI_bBsC{NIogV@|GO zi~GHm$Loh|cR6DcK$@Rt865&iiAm5y;he>30ZCUaQc4qcWXrP0k%a%+4ubliai%Yd z(34r2kh@Zo3b9V{d5t*gj8(L%Kk?>N|3CH+yXK-1cKh{*@pbo|^&k_&JcIM9%t?&7 z$#|b%HJIzNfb%BL654clNP|dASSR=@9*mjB>~M}0@`Ue^ghkR;h(UrxawMkd>so|Y z8cC5cIS5ZIzjwJSc+_WnU$G_5LRHH6F0-^V-D||s#HQ&sNW;YGc<3g{>DlN>99qm4 zr{^NOoUVf(9gATI31&saV@`#8&a&@Z^xu^|{c&9WOlXwDyfRPTnwP_q@N0j$t18ffGm#eg$LLlg4{%2l-s}< zW8c(oFf$5ZF@!FMcZ(;DPld0@KNMVt+2PSf)3Q&os&PAFZoKU_+Kk{?%xGWPdoaxw zn2MzWx;Is{8%#aUk^c$i#+?CUvMpH(fopYVV;jDS5at@)s(oBRt58yZfocPw_M-<- z7R95QGNu-dvS%J}l|x+~U3Xbg!piygwvO*-k0x5M9=IO$FF$ENJtIn~JBe4BUcs!; zoz18-=Z5W&36wsIp`?H+pXm)^BY6OpVvcx1xkIT}JJ$8bUhXS|+nssfAl&$T!8q9y z9Px~De{?A-nl0|t`?|)(+G@*bw1wdPfYEg{x=r==t?@xwYT;d)(f*4-O#rAuTc8KE vBb8!xC6DZ2RjSvk%>;ZC9WoAK-s~~H?H2=YU#AC+fs_8)`4hob$>{tA5I?yC delta 40 wcmex%fVFE1>jpN{%}nMdwVNMpHLBP?#gs9Dd3%Bbqm<0#4ccPUGZGm208pb2zW@LL diff --git a/hwanyoung2/Content/Localization/Dialogue/en/Dialogue.archive b/hwanyoung2/Content/Localization/Dialogue/en/Dialogue.archive index 36a8c8766d558f5f3a4ffaba6e4c7ff134948cd2..44934312a51c8d0b309eac33eef70094abdade2a 100644 GIT binary patch delta 1097 zcmZWnO-NKx82xmFq@tAC7=cf!u|?X9z4>cQc{6W@3?bc3i=gqpnsG*FMiU}5T?Bzd zcMysety)bXK0{NhX<&YoAu5m{hH&AcMVmIQJKud6NetfmefM79Io~SC4Gj{jvW4XX>^ zaFQK(Ho0rS3ZUX!6>K~}G|x1=afuIOgQ9(M!FW0`e^5M|wMt0rey>7F8ljt*=Qb(W zlUOGyObP698mB>=BxwrWkevD)swtd?X++Ev6ZM(m;f;`?&}>GbhK!zX6*DVmgtB%- z*qk+9KUnDCqJq0BRcHer){Lj%J5w{A0XqTQR@6Gh zz_wX3O`=XwKPFHpDn5Tn9Xq}e%9fV8UtzAy?s9gs^hPpzT&TOmrZBhtYm zI6L!PEWRJmde&B2p_TbzFTb48)`wT^Oov64$KDfFbQP-vU$c;-_+UFZa-!LLnN zcb6(T7`B}*G|BjYkyyBY*{GBz>c!5xzTRtQ;^eSDS%UO@18=x3q#u_WR8l-mP^=d((JE%I!J6InSRZfrT6eqcpEilDsgAgo905-5G b91p(nqjurck5d<(}Z?dxa0QP`l8@l*WDlKFmbNAOIM`AOMKRJjZmp z9Kj#}e8+&j?6)8Q_^s@>+`^QyaIE0SKL8*Ayv2CAAOPgD+`@F#l*TLoAOPgD+`=J~ tQ5qkU5DgBKkkLw$zHL;qoP&@QO&F_y7eT6Dm{O6PP#KzszFsteW5Z(ZAf1QbuxH#&Snm z$dY?ka+x6S%8uN^Q_4QphD^yihqjM5myyX2Ui4!i29!?#acRo6JURfy0Bd_1t2u{g z%FdzDgv>yE^ZCo<{HmzI<^;Bzh+cf6j`eUWYW4H|sbd#cj}V^xgUM|>1q0C046%k#{txZ}qy!U6 zx{y*!*BCPlUFm=Zb+KJOjdzLYhGK~o+$^j$mqvD&M@OE^ro|jWw$uUlJnHCk(9va9 zQ*7P7Zr4LgsOlpfWW=rO2(j6{`97Pz{ZuZPCm+|(Uai+=Q4dGH$!H5!f5>tJYsd6H zoIGByTc1Y(`<+lvK?*D7sKeC=PZljjc99u=kCSR|baTR#U(fsn DwTYVE delta 47 zcmV+~0MP%wsRNjm1F-xevo0hWOq0lYptBfqeg?BfaMA&@XnN#7vu3>(0<(a^bP$u8 F)Fc8E6^Q@< From 4e1bfde84b54eb5a2554ee70e4662a55526d8246 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Thu, 1 May 2025 19:09:02 +0900 Subject: [PATCH 6/6] updated the map from the updates in puzzle NPC + changed the fonts for the dialogue WG --- hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap | 4 ++-- .../Hwanyoung/UI/Dialogue_HUD/BP_DialogueWidget.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap b/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap index 12b0171b..51443bd5 100644 --- a/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap +++ b/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fc5730fcc7a24e063c870206dad57068442c3d9bade2823d9bcae22b93e526d -size 21478836 +oid sha256:da2fc09234434a67bfabcd7f8a37bd4e0822a1cb70aa8fe1c96d561e0586d007 +size 21479234 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Dialogue_HUD/BP_DialogueWidget.uasset b/hwanyoung2/Content/Hwanyoung/UI/Dialogue_HUD/BP_DialogueWidget.uasset index 23048752..7748d317 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Dialogue_HUD/BP_DialogueWidget.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Dialogue_HUD/BP_DialogueWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75894304193f711c200f49cb86b68a6f9ca881d21061415ebfed6c9caa4aff31 -size 97480 +oid sha256:46c84897f9fb77e2099bd7826f97991750c50a2553a36ad82f18b257af39fce5 +size 98176