diff --git a/hwanyoung2/Content/FMOD/Desktop/Master.bank b/hwanyoung2/Content/FMOD/Desktop/Master.bank index 0a839382..43e4b3b2 100644 Binary files a/hwanyoung2/Content/FMOD/Desktop/Master.bank and b/hwanyoung2/Content/FMOD/Desktop/Master.bank differ diff --git a/hwanyoung2/Content/FMOD/Desktop/Master.strings.bank b/hwanyoung2/Content/FMOD/Desktop/Master.strings.bank index 2f1860d7..cdfb6a9b 100644 Binary files a/hwanyoung2/Content/FMOD/Desktop/Master.strings.bank and b/hwanyoung2/Content/FMOD/Desktop/Master.strings.bank differ diff --git a/hwanyoung2/Content/FMOD/Events/SFX/Combat/Sword_Block_Redy.uasset b/hwanyoung2/Content/FMOD/Events/SFX/Combat/Sword_Block_Redy.uasset new file mode 100644 index 00000000..7ad5d14e --- /dev/null +++ b/hwanyoung2/Content/FMOD/Events/SFX/Combat/Sword_Block_Redy.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:749f9ad82c9f36a44d4025ad632bea417c62e9fadf8ae1d0ebfc6999ad363ea5 +size 1504 diff --git a/hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset b/hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset index 8617a9d2..fac5b70e 100644 --- a/hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset +++ b/hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c8a6fb06e7dd83eab29f45861a2ef791d630e9a029d2cc118cb81d69e9d805c -size 8509 +oid sha256:5c4c94c69aed4228c44d821935cc78a9edd8884401e02e60e0b4b7fc3725b88e +size 8689 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 ba6993f9..63ee76b6 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:a42546ff0418247a057a38ff0c8da65fa70afbecd12cdec28c6f8be2d257cb79 -size 529391 +oid sha256:9494b7189eec8fd001f25f242fe6ffcd63b1a0b994085a73612cfb7e4c49fb0d +size 529855 diff --git a/hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br b/hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br index d5412ec5..52e78c42 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br and b/hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br differ diff --git a/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Asset/{4f34473d-1e56-44db-8dd1-60284d90f95e}.user.xml b/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Asset/{4f34473d-1e56-44db-8dd1-60284d90f95e}.user.xml new file mode 100644 index 00000000..499a839a --- /dev/null +++ b/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Asset/{4f34473d-1e56-44db-8dd1-60284d90f95e}.user.xml @@ -0,0 +1,4 @@ + + + + diff --git a/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Mixer.user.xml b/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Mixer.user.xml new file mode 100644 index 00000000..b71bfad7 --- /dev/null +++ b/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Mixer.user.xml @@ -0,0 +1,4 @@ + + + + diff --git a/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml b/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml new file mode 100644 index 00000000..42c2c72f --- /dev/null +++ b/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml @@ -0,0 +1,23 @@ + + + + + {ce30ebda-7d4b-4a2c-ad18-34f04ac67163} + + + {c81ff576-a715-479d-877b-e0a0201464b5} + + + + + Mixer 1 + + + AAAABgAAAB4ATQBpAHgAZQByACAAUgBvAHUAdABpAG4AZwAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQjAAAADgBNAGkAeABlAHIAIAAyAAAAQgHZ0MsAAwAA///5DwAAAA////2eAAAD7v//+RAAAAAu///9nQAAA+0AAAABAAAAAAeA///5EAAAAC7///2dAAAD7QAAAA4ATQBpAHgAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAEqAAABjQAABbcAAAVMAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMgAAAEIB2dDLAAMAAAAAAxkAAAD7AAAHOgAAA6wAAAMaAAABGgAABzkAAAOrAAAAAAAAAAAKAAAAAxoAAAEaAAAHOQAAA6sAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMQAAAEIB2dDLAAMAAP//+H/////4AAAAAAAABBD///pLAAAAeP///moAAAO7AAAAAQIAAAAHgP//+IAAAAAX/////wAABA8AAAAeAEUAdgBlAG4AdAAgAEIAcgBvAHcAcwBlAHIAIAAxAAAAQgHZ0MsAAwAA///7eAAAAIH///0JAAADcP//+3kAAACg///9CAAAA28AAAABAAAAAAeA///7eQAAAKD///0IAAADbw== + + + {44345994-b449-453f-9198-e8f3accd1e71} + + + + diff --git a/hwanyoung2/Content/Illusions/.user/Metadata/Workspace.user.xml b/hwanyoung2/Content/Illusions/.user/Metadata/Workspace.user.xml index ce95b656..42c2c72f 100644 --- a/hwanyoung2/Content/Illusions/.user/Metadata/Workspace.user.xml +++ b/hwanyoung2/Content/Illusions/.user/Metadata/Workspace.user.xml @@ -10,10 +10,10 @@ - Event Editor 1 + Mixer 1 - AAAABgAAAB4ATQBpAHgAZQByACAAUgBvAHUAdABpAG4AZwAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQjAAAADgBNAGkAeABlAHIAIAAyAAAAQgHZ0MsAAwAA///5DwAAAA////2eAAAD7v//+RAAAAAu///9nQAAA+0AAAABAAAAAAeA///5EAAAAC7///2dAAAD7QAAAA4ATQBpAHgAZQByACAAMQAAAEIB2dDLAAMAAAAAASkAAAFuAAAFuAAABU0AAAEqAAABjQAABbcAAAVMAAAAAAAAAAAKAAAAASoAAAGNAAAFtwAABUwAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMgAAAEIB2dDLAAMAAAAAAxkAAAD7AAAHOgAAA6wAAAMaAAABGgAABzkAAAOrAAAAAAAAAAAKAAAAAxoAAAEaAAAHOQAAA6sAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMfAAABOwAABz4AAAR+AAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAeAEUAdgBlAG4AdAAgAEIAcgBvAHcAcwBlAHIAIAAxAAAAQgHZ0MsAAwAA///7eAAAAIH///0JAAADcP//+3kAAACg///9CAAAA28AAAABAAAAAAeA///7eQAAAKD///0IAAADbw== + AAAABgAAAB4ATQBpAHgAZQByACAAUgBvAHUAdABpAG4AZwAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQjAAAADgBNAGkAeABlAHIAIAAyAAAAQgHZ0MsAAwAA///5DwAAAA////2eAAAD7v//+RAAAAAu///9nQAAA+0AAAABAAAAAAeA///5EAAAAC7///2dAAAD7QAAAA4ATQBpAHgAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAEqAAABjQAABbcAAAVMAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMgAAAEIB2dDLAAMAAAAAAxkAAAD7AAAHOgAAA6wAAAMaAAABGgAABzkAAAOrAAAAAAAAAAAKAAAAAxoAAAEaAAAHOQAAA6sAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMQAAAEIB2dDLAAMAAP//+H/////4AAAAAAAABBD///pLAAAAeP///moAAAO7AAAAAQIAAAAHgP//+IAAAAAX/////wAABA8AAAAeAEUAdgBlAG4AdAAgAEIAcgBvAHcAcwBlAHIAIAAxAAAAQgHZ0MsAAwAA///7eAAAAIH///0JAAADcP//+3kAAACg///9CAAAA28AAAABAAAAAAeA///7eQAAAKD///0IAAADbw== {44345994-b449-453f-9198-e8f3accd1e71} diff --git a/hwanyoung2/Content/Illusions/Metadata/Event/{0162e111-f1a7-4332-9374-df0d0b524270}.xml b/hwanyoung2/Content/Illusions/Metadata/Event/{0162e111-f1a7-4332-9374-df0d0b524270}.xml index 119e3751..ba672f7c 100644 --- a/hwanyoung2/Content/Illusions/Metadata/Event/{0162e111-f1a7-4332-9374-df0d0b524270}.xml +++ b/hwanyoung2/Content/Illusions/Metadata/Event/{0162e111-f1a7-4332-9374-df0d0b524270}.xml @@ -43,7 +43,6 @@ {d3926a6b-14bd-40e6-ab29-9e023ee00930} - {cb7bb3e5-3f51-42cd-824a-369fbe446ab6} {785b0acb-f7f2-4db5-bace-9b789afd59d2} @@ -59,7 +58,8 @@ {e47abdf7-dae0-48c3-9390-d849fcf690eb} {0ed212a8-7a93-4fc5-9170-2f0cf9a3d3e3} - {576bebce-91eb-426f-b810-3355b8e38790} + {885af59d-4fc0-43ed-b793-f210850dfc73} + {2ed33599-f021-49ae-b804-6fa79699b25e} {fd68f481-f9f0-4276-a35a-ca01d97b898b} @@ -88,6 +88,8 @@ {1650f3b0-843c-4890-ae3c-2ce68762e753} {45ebdebe-08b5-42f2-99a1-767783651e1e} {17208c18-0f3c-47ab-a83e-3561abf878cb} + {95112368-33ac-42f6-9761-fda006f67244} + {b4502383-7a8c-4398-b2ac-80da19f0d806} {6f9d303c-1531-4146-847a-84b373f45080} @@ -98,6 +100,8 @@ {bc5387e9-cde4-4c60-98e5-957fcb905072} {6f69944c-031f-43d2-9ee2-74ea313cd10c} {acbca048-b9b0-4f21-82a6-5815425654eb} + {211fd357-a9db-4585-b973-9e46228ec2d7} + {5dd8462c-3701-42a7-bb9e-714117a1c7d5} {12611626-c1e9-4a03-9e2c-239360a2bf43} @@ -108,6 +112,8 @@ {0d18126a-c9a2-4ae0-bc2f-231b3ab4d861} {2bfbcbfd-e261-478c-989e-9f708d6d9995} {bd21ccdc-bc84-43da-88cd-bec0a0343f43} + {57665fda-0e74-4641-b017-c931ec3b5e27} + {bb554359-5e7e-4d62-b408-5475430e7520} {4d7cc331-35e6-4fe0-b331-a23f4b09f05e} @@ -118,6 +124,8 @@ {a315392f-e9da-41b8-ac25-4d3134776be3} {a47b976b-21cc-4355-97b6-d022ab46cf40} {1cc7c114-8425-4a35-b835-dba7f8a6c4a1} + {6a5f8254-de19-4985-b794-7a00b8450d93} + {a4cb9507-bd93-4df0-ac3b-47b85d2d2f06} {d35e65c4-7781-42f9-8803-e8abf98c9c7d} @@ -128,6 +136,8 @@ {8d54df83-3d22-4a1d-a975-88381aba2f16} {92640573-049c-45dc-a35d-8b60c3142ea9} {652dacc3-6f21-417e-be73-353fb984c6e6} + {6088ca58-10ee-4590-9693-428da039e6c1} + {51273709-c0cb-4a9d-913f-cdf361119ab4} {09368c67-c38f-471e-8724-2f037ef656ce} @@ -151,11 +161,6 @@ {9a49e543-ba43-41d8-b168-13c36ecc7b00} - - - {576bebce-91eb-426f-b810-3355b8e38790} - - {d0fdbb4e-a1fe-4465-a50b-0b0c03d0958e} @@ -185,7 +190,19 @@ 0 - + + + 0 + + + + + 0.19999999999999996 + + + 0 + + {ce5ad5b4-4b99-48b3-b975-0dac0e680231} @@ -196,7 +213,6 @@ 1.375 - {c09732f7-9221-4c95-9290-09d959498d74} {29bb7599-a4de-4984-8062-c00710512db8} @@ -230,6 +246,16 @@ 0 + + + 0 + + + + + 0.19999999999999996 + + -3 @@ -254,6 +280,9 @@ true + + true + 0.52346584635028914 @@ -267,14 +296,13 @@ 120 - 1 + 14 1 - - -8 + -11.5 {ab5aedc1-6760-41dd-b64c-379a2061f3d0} @@ -297,9 +325,22 @@ 0.34999999999999998 + + + 0 + + + + + 0.19999999999999996 + + + 0 + + - -13.5 + -4.5 Audio 3 @@ -367,6 +408,19 @@ {36cc7843-edb7-4e51-bce5-2bb2ab7b5c1e} + + + 0 + + + + + 0.19999999999999996 + + + 0 + + -9.5 @@ -405,6 +459,16 @@ 0 + + + 0 + + + + + 0.19999999999999996 + + Audio 4 @@ -436,7 +500,6 @@ 1.8260425417216566 - {e55b32d5-eefe-4545-b48e-ec9051b25c76} @@ -444,6 +507,19 @@ {fca07dd1-5a10-4a57-bc1c-227e7cbe9964} + + + 0 + + + + + 0.19999999999999996 + + + 0 + + Audio 5 @@ -485,6 +561,9 @@ {c2137f46-33b8-42d5-bc81-f01d0bc6d285} + + {fa9106a3-c780-411f-8c85-7dda8b3a1c63} + {93257320-4715-4f5f-b381-1c84365f02cb} @@ -707,6 +786,25 @@ + + + 0.20000000000000001 + + + {95112368-33ac-42f6-9761-fda006f67244} + {b4502383-7a8c-4398-b2ac-80da19f0d806} + {211fd357-a9db-4585-b973-9e46228ec2d7} + {5dd8462c-3701-42a7-bb9e-714117a1c7d5} + {57665fda-0e74-4641-b017-c931ec3b5e27} + {bb554359-5e7e-4d62-b408-5475430e7520} + {6a5f8254-de19-4985-b794-7a00b8450d93} + {a4cb9507-bd93-4df0-ac3b-47b85d2d2f06} + {6088ca58-10ee-4590-9693-428da039e6c1} + {51273709-c0cb-4a9d-913f-cdf361119ab4} + {885af59d-4fc0-43ed-b793-f210850dfc73} + {2ed33599-f021-49ae-b804-6fa79699b25e} + + 1 diff --git a/hwanyoung2/Content/Illusions/Metadata/Event/{39fdeb39-b470-4496-81c0-a51364334328}.xml b/hwanyoung2/Content/Illusions/Metadata/Event/{39fdeb39-b470-4496-81c0-a51364334328}.xml index 174b0dff..1bd94e2f 100644 --- a/hwanyoung2/Content/Illusions/Metadata/Event/{39fdeb39-b470-4496-81c0-a51364334328}.xml +++ b/hwanyoung2/Content/Illusions/Metadata/Event/{39fdeb39-b470-4496-81c0-a51364334328}.xml @@ -8,7 +8,7 @@ Tk Block Ready - 2 + 1 {58f76323-7476-4fc2-9d75-933801901ec4} @@ -103,10 +103,14 @@ - 1.0082083333333332 + 1.0482083333333332 - 0.25 + 0.20999999999999996 + + + + -9 {98f90c10-d94e-4a1c-b2f6-9fa8055eee67} @@ -127,6 +131,7 @@ + {c48a2a5e-8b78-4e85-9824-09fbbef9c85a} @@ -151,7 +156,6 @@ {a8686f2a-47e2-40d8-bf8a-44d6a8704259} - {6f54c828-9aa3-4b71-a4ca-c61c8a9140b6} @@ -183,7 +187,6 @@ - diff --git a/hwanyoung2/Content/Illusions/Metadata/Event/{87c1a6b0-a412-48cb-841a-1f4b9e6cdf23}.xml b/hwanyoung2/Content/Illusions/Metadata/Event/{87c1a6b0-a412-48cb-841a-1f4b9e6cdf23}.xml index 6208946a..03734fac 100644 --- a/hwanyoung2/Content/Illusions/Metadata/Event/{87c1a6b0-a412-48cb-841a-1f4b9e6cdf23}.xml +++ b/hwanyoung2/Content/Illusions/Metadata/Event/{87c1a6b0-a412-48cb-841a-1f4b9e6cdf23}.xml @@ -8,7 +8,7 @@ sword draw - 2 + 1 {58f76323-7476-4fc2-9d75-933801901ec4} @@ -148,7 +148,6 @@ {11e819cf-de1d-4786-aa6b-5afa980a992d} - {fe96b0d3-2d60-4502-8454-bd7259c2671f} @@ -177,7 +176,6 @@ - diff --git a/hwanyoung2/Content/Illusions/Metadata/Event/{bdc55829-ec2d-45b8-ae8b-0a0ba1e9229c}.xml b/hwanyoung2/Content/Illusions/Metadata/Event/{bdc55829-ec2d-45b8-ae8b-0a0ba1e9229c}.xml new file mode 100644 index 00000000..cd1a8027 --- /dev/null +++ b/hwanyoung2/Content/Illusions/Metadata/Event/{bdc55829-ec2d-45b8-ae8b-0a0ba1e9229c}.xml @@ -0,0 +1,184 @@ + + + + + Sword Block Redy + + + 0 + + + {58f76323-7476-4fc2-9d75-933801901ec4} + + + {a3138947-7b8c-4422-b96b-b11a81efa4bb} + + + {4c5a1f95-73c3-49ce-bc1a-646a26077ccc} + + + {db510565-d5d4-4cdd-b103-39fac15d071e} + + + {fab2f031-6d0b-4bcf-9f8a-096ded102729} + + + {0247b7c1-d5a9-4c5e-b6a0-0067848c0831} + + + {da75bf1c-7bfd-4e4f-b102-a1fdce5ac771} + {af4e442c-d80d-42e8-8a9e-aadcf57967ee} + + + {0ef5047d-5ee5-479c-8f9d-017cf533383f} + + + {9c5265c8-c3c8-41f5-9212-f803a3d9a96e} + + + + + {d55820ea-912d-4a5f-a4d7-c32efb11aa2c} + + + + + {d55820ea-912d-4a5f-a4d7-c32efb11aa2c} + + + + + {6fbf5cf9-91e9-415e-8153-5e43670e4a55} + + + {fe2cfa36-dcdc-4f3d-8915-bdeb55f16202} + + + {ac0156d5-fdee-4b48-ac6c-2bffcb52ba19} + + + + + + + {f596111c-c887-490a-8356-de1fd5d17eff} + + + + + {cd936137-589f-49fc-b5ba-625fe5bab565} + + + {9da92785-5709-4d8f-976c-293c0a6baa40} + + + + + {cd936137-589f-49fc-b5ba-625fe5bab565} + + + + + {b9905b06-ba2e-489e-a12e-0a8c3f9e96f6} + + + {4c027363-8bad-4e2e-994f-bd75454de2cb} + + + {a3138947-7b8c-4422-b96b-b11a81efa4bb} + + + + + {65ec09ea-56b3-4083-a2d4-1375b452aa7f} + + + + + + Audio 1 + + + {9a5651cc-4095-4034-827e-5e2441dab888} + + + {40fba1d7-66e2-4aa8-895f-da6f5ed11112} + + + {d55820ea-912d-4a5f-a4d7-c32efb11aa2c} + + + + + 0.92000000000000004 + + + {1fdd81d6-add9-4e95-a5c1-b886d24d9052} + + + + + Audio 2 + + + {51e57e9b-2712-4de0-9274-ac4339780411} + + + {4c999229-005b-44af-994e-16b67afdc41f} + + + {3a95c3bd-065a-47fc-87d8-8a8ac6d1e04a} + + + {d55820ea-912d-4a5f-a4d7-c32efb11aa2c} + + + + + {2c864f77-2687-4ca9-a261-8f6e524e393b} + + + + + + + {31a56d56-6551-486a-93f3-e2fd3d9d9f6d} + {98809baf-e8fc-499f-9c57-358780242cd3} + + + + + + volume + + + -80 + + + 416.666687 + + + 416.666687 + + + -80 + + + + + {ba535724-0e73-4866-b35d-a101bf09058b} + + + + + + + + 2400 + + + 0.413965493 + + + + diff --git a/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap b/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap index a0983088..b9c68fcf 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:5b825fae5f9e5795d2b5ba079278304c686383268c15abb254451ecdab214495 -size 52669 +oid sha256:041fa43a3c4b3dd76b11bd76b3a1bd20fc450624dcb8830e470eecdeb2d737b1 +size 53885