From d6c58e8c155101ef57fd93b18028bd9d68ac2f94 Mon Sep 17 00:00:00 2001 From: SJW1024 Date: Wed, 15 Nov 2023 04:14:43 +0900 Subject: [PATCH] Merge remote-tracking branch 'origin/ssasin' into SJW1024 # Conflicts: # Content/Blueprints/BP_DefaultPlayerCharacter.uasset # Content/Blueprints/Bp_DefaultplayerController.uasset # Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset # Content/Character/Allium/BP_Allium.uasset # Content/Character/Lb/BP_Lb.uasset # Content/Character/Lb/LB_Bolla_Throw.uasset # Content/Character/Lb/Lb_RskillBurst.uasset # Content/Character/Lb/Lb_WskillDebuff.uasset # Content/Character/Riana/BP_Riana.uasset # Content/Maps/DevMap.umap --- Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset | 4 ++-- Content/Blueprints/UI/NewWidgetBlueprint.uasset | 3 +++ Content/Blueprints/UI/fddfd/리아나E.uasset | 3 +++ Content/Blueprints/UI/fddfd/리아나Q.uasset | 3 +++ Content/Blueprints/UI/fddfd/리아나R.uasset | 3 +++ Content/Blueprints/UI/fddfd/리아나_P.uasset | 3 +++ Content/Blueprints/UI/fddfd/리아나_W.uasset | 3 +++ Content/Blueprints/UI/fddfd/메인_UI.uasset | 3 +++ Content/Blueprints/UI/fddfd/불투명_ver_.uasset | 3 +++ Content/Blueprints/UI/fddfd/스킬칸.uasset | 3 +++ Content/Blueprints/UI/fddfd/알리움P.uasset | 3 +++ Content/Blueprints/UI/fddfd/알리움R.uasset | 3 +++ Content/Blueprints/UI/fddfd/체력+마나_배경_.uasset | 3 +++ Content/Blueprints/UI/fddfd/체력바.uasset | 3 +++ Content/Blueprints/UI/fddfd/파운드E.uasset | 3 +++ Content/Blueprints/UI/fddfd/파운드Q.uasset | 3 +++ Content/Blueprints/UI/fddfd/파운드R.uasset | 3 +++ Content/Blueprints/UI/fddfd/파운드W.uasset | 3 +++ Content/Character/Allium/BP_Allium.uasset | 4 ++-- Content/Character/Lb/BP_Lb.uasset | 4 ++-- Content/Character/Riana/BP_Riana.uasset | 4 ++-- 21 files changed, 59 insertions(+), 8 deletions(-) create mode 100644 Content/Blueprints/UI/NewWidgetBlueprint.uasset create mode 100644 Content/Blueprints/UI/fddfd/리아나E.uasset create mode 100644 Content/Blueprints/UI/fddfd/리아나Q.uasset create mode 100644 Content/Blueprints/UI/fddfd/리아나R.uasset create mode 100644 Content/Blueprints/UI/fddfd/리아나_P.uasset create mode 100644 Content/Blueprints/UI/fddfd/리아나_W.uasset create mode 100644 Content/Blueprints/UI/fddfd/메인_UI.uasset create mode 100644 Content/Blueprints/UI/fddfd/불투명_ver_.uasset create mode 100644 Content/Blueprints/UI/fddfd/스킬칸.uasset create mode 100644 Content/Blueprints/UI/fddfd/알리움P.uasset create mode 100644 Content/Blueprints/UI/fddfd/알리움R.uasset create mode 100644 Content/Blueprints/UI/fddfd/체력+마나_배경_.uasset create mode 100644 Content/Blueprints/UI/fddfd/체력바.uasset create mode 100644 Content/Blueprints/UI/fddfd/파운드E.uasset create mode 100644 Content/Blueprints/UI/fddfd/파운드Q.uasset create mode 100644 Content/Blueprints/UI/fddfd/파운드R.uasset create mode 100644 Content/Blueprints/UI/fddfd/파운드W.uasset diff --git a/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset b/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset index 3069a57..9ac8038 100644 --- a/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset +++ b/Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3cb47ddd5b82cbb2d3a0d3f364cacf4beff88aa6dd58a61ff58430fb1c01b980 -size 129904 +oid sha256:4d727fd3c0e1cf15fbfda0532e82ae540dfe2c96e602e69ccf120dee3cedb250 +size 127335 diff --git a/Content/Blueprints/UI/NewWidgetBlueprint.uasset b/Content/Blueprints/UI/NewWidgetBlueprint.uasset new file mode 100644 index 0000000..4aacf9f --- /dev/null +++ b/Content/Blueprints/UI/NewWidgetBlueprint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:035b630a450a101775204e745ae3c04f2c3a616ba4da3c2ddf3baa6f4f1c13d7 +size 30207 diff --git a/Content/Blueprints/UI/fddfd/리아나E.uasset b/Content/Blueprints/UI/fddfd/리아나E.uasset new file mode 100644 index 0000000..aee8511 --- /dev/null +++ b/Content/Blueprints/UI/fddfd/리아나E.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5c015fb6cb2149684b9939505a01e8fb43a61d9c10f239bc2dc9d1720f43ce1 +size 393367 diff --git a/Content/Blueprints/UI/fddfd/리아나Q.uasset b/Content/Blueprints/UI/fddfd/리아나Q.uasset new file mode 100644 index 0000000..817ac6c --- /dev/null +++ b/Content/Blueprints/UI/fddfd/리아나Q.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b354f56e7616be70622a7f34160cfa2d75cb61b75f2ae2eeebbc299d921c9436 +size 472737 diff --git a/Content/Blueprints/UI/fddfd/리아나R.uasset b/Content/Blueprints/UI/fddfd/리아나R.uasset new file mode 100644 index 0000000..4122bcd --- /dev/null +++ b/Content/Blueprints/UI/fddfd/리아나R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc624036674f2ab1cb2f9ad04f4d4bc60ed2754b206bdcbe80b49bc0de6fd1ac +size 215454 diff --git a/Content/Blueprints/UI/fddfd/리아나_P.uasset b/Content/Blueprints/UI/fddfd/리아나_P.uasset new file mode 100644 index 0000000..2727a1c --- /dev/null +++ b/Content/Blueprints/UI/fddfd/리아나_P.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6dfff22f3f33447840e2a2112b552e6981ac2c249de095c3c8a0b2c3eb9b3d9 +size 543347 diff --git a/Content/Blueprints/UI/fddfd/리아나_W.uasset b/Content/Blueprints/UI/fddfd/리아나_W.uasset new file mode 100644 index 0000000..375a2ce --- /dev/null +++ b/Content/Blueprints/UI/fddfd/리아나_W.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afcb7151c4c9b190291dd60dfb0904adbacf8af322d22b2f5fef0d5fb88bcac0 +size 527561 diff --git a/Content/Blueprints/UI/fddfd/메인_UI.uasset b/Content/Blueprints/UI/fddfd/메인_UI.uasset new file mode 100644 index 0000000..e99860e --- /dev/null +++ b/Content/Blueprints/UI/fddfd/메인_UI.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dde4915603d7000ec731afb7ba9a62a8a6157f9cb2a49309198b9c8eeb507b96 +size 18848 diff --git a/Content/Blueprints/UI/fddfd/불투명_ver_.uasset b/Content/Blueprints/UI/fddfd/불투명_ver_.uasset new file mode 100644 index 0000000..7fe6b31 --- /dev/null +++ b/Content/Blueprints/UI/fddfd/불투명_ver_.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3f80ac1aafbd8ebbe4961a95f79bb8d87aba7577e9c79d870d1fe043b167895 +size 11880 diff --git a/Content/Blueprints/UI/fddfd/스킬칸.uasset b/Content/Blueprints/UI/fddfd/스킬칸.uasset new file mode 100644 index 0000000..9cc2511 --- /dev/null +++ b/Content/Blueprints/UI/fddfd/스킬칸.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:daab3d174231f628fc741e40d989f258c625b2fe4662b2a6c59adb2f36340b85 +size 9075 diff --git a/Content/Blueprints/UI/fddfd/알리움P.uasset b/Content/Blueprints/UI/fddfd/알리움P.uasset new file mode 100644 index 0000000..6343b9a --- /dev/null +++ b/Content/Blueprints/UI/fddfd/알리움P.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4b878c053c258a211bc2fdf4d63e909673e9a2fcafebe448672dfc55325df1e +size 334108 diff --git a/Content/Blueprints/UI/fddfd/알리움R.uasset b/Content/Blueprints/UI/fddfd/알리움R.uasset new file mode 100644 index 0000000..7fca1f2 --- /dev/null +++ b/Content/Blueprints/UI/fddfd/알리움R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2b7e97c29cdc9191fab2af39ff25088add481ec9c731eb032ead68bd55bf32a +size 370720 diff --git a/Content/Blueprints/UI/fddfd/체력+마나_배경_.uasset b/Content/Blueprints/UI/fddfd/체력+마나_배경_.uasset new file mode 100644 index 0000000..fe679fc --- /dev/null +++ b/Content/Blueprints/UI/fddfd/체력+마나_배경_.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e7afc9ae94f6bba7b6bd2195b484b3c6938dc6f8fa1fa7d76a449760cc5b50c +size 9916 diff --git a/Content/Blueprints/UI/fddfd/체력바.uasset b/Content/Blueprints/UI/fddfd/체력바.uasset new file mode 100644 index 0000000..61a9315 --- /dev/null +++ b/Content/Blueprints/UI/fddfd/체력바.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6358f935676e5e8ed8715f30514733128e4d19d7c5c673487821c6a279dc7a04 +size 9230 diff --git a/Content/Blueprints/UI/fddfd/파운드E.uasset b/Content/Blueprints/UI/fddfd/파운드E.uasset new file mode 100644 index 0000000..524c8ac --- /dev/null +++ b/Content/Blueprints/UI/fddfd/파운드E.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:599cdb86673236b727cefbf035c12f8f6ac1b2e101553dab7661fd0cb0ffb0b7 +size 310419 diff --git a/Content/Blueprints/UI/fddfd/파운드Q.uasset b/Content/Blueprints/UI/fddfd/파운드Q.uasset new file mode 100644 index 0000000..e7bf141 --- /dev/null +++ b/Content/Blueprints/UI/fddfd/파운드Q.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b4bc30bc828f360528a6939b85dfc2ea194f71e6b593bf219c7b97745bc6360 +size 460118 diff --git a/Content/Blueprints/UI/fddfd/파운드R.uasset b/Content/Blueprints/UI/fddfd/파운드R.uasset new file mode 100644 index 0000000..e690009 --- /dev/null +++ b/Content/Blueprints/UI/fddfd/파운드R.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bcaa87a47135a4d6296430663d88577501a6626c7c3eab9d0f148894559c4691 +size 398130 diff --git a/Content/Blueprints/UI/fddfd/파운드W.uasset b/Content/Blueprints/UI/fddfd/파운드W.uasset new file mode 100644 index 0000000..56e6db0 --- /dev/null +++ b/Content/Blueprints/UI/fddfd/파운드W.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cc7b7ecacaedc452db9a5b78b0f5e0186d2e6fd54764e48522c96295d32967b +size 401681 diff --git a/Content/Character/Allium/BP_Allium.uasset b/Content/Character/Allium/BP_Allium.uasset index 0cb874f..145beb6 100644 --- a/Content/Character/Allium/BP_Allium.uasset +++ b/Content/Character/Allium/BP_Allium.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c407d680bd57754c059ac3a1cca4a78b2b9279aed13926031b5f6d99406f3cd4 -size 553647 +oid sha256:3e1c041b5ab2bfd53f621781141dd48bcedb71c34b7e7841566958c2b1fa02fd +size 551128 diff --git a/Content/Character/Lb/BP_Lb.uasset b/Content/Character/Lb/BP_Lb.uasset index a28caf6..c77fda9 100644 --- a/Content/Character/Lb/BP_Lb.uasset +++ b/Content/Character/Lb/BP_Lb.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3157f84a2c22afcb3729d3e7755f7774ce801967ebcff65a9ba12a6bdd6acb49 -size 589343 +oid sha256:1bc4d7a941c8067262ec71cea9b61b1a5190fa1bbfdf8529e566d5dfbac0c047 +size 579818 diff --git a/Content/Character/Riana/BP_Riana.uasset b/Content/Character/Riana/BP_Riana.uasset index 8850832..2ad6e24 100644 --- a/Content/Character/Riana/BP_Riana.uasset +++ b/Content/Character/Riana/BP_Riana.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c55b275d5617180a4ce01b0e1eb8d98720b2eb040011cb1061239f10ac9acf8 -size 468314 +oid sha256:d950ac2d7a9b126ed22bdf027b60ebc05c33ed23df3acad2949c8c3e708bb906 +size 447929