From 7830aa9d5b1c20da312e6d9dcefe0b9dabb068a5 Mon Sep 17 00:00:00 2001 From: Julia Vlasenko Date: Mon, 18 Sep 2023 00:36:42 +1000 Subject: [PATCH] Sakura Material --- Japan_Raid/Config/DefaultEditorPerProjectUserSettings.ini | 6 ++++++ Japan_Raid/Content/Levels/Foliage_Main.umap | 4 ++-- Japan_Raid/Content/Levels/LV_blocking_mesh.umap | 4 ++-- Japan_Raid/Content/MainMap.umap | 4 ++-- Japan_Raid/Content/Material/Foliage/M_Sakura.uasset | 3 +++ Japan_Raid/Content/Material/Foliage/M_Sakura_Bark.uasset | 3 +++ Japan_Raid/Content/Material/Foliage/M_Sakura_Brunch.uasset | 3 +++ Japan_Raid/Content/Material/Foliage/M_Sakura_Cap.uasset | 3 +++ Japan_Raid/Content/Material/Foliage/M_Sakura_Leaf.uasset | 3 +++ Japan_Raid/Content/Textures/Tiles/T_Sakura_Bark.uasset | 2 +- Japan_Raid/Content/Textures/Tiles/T_Sakura_Brunch.uasset | 2 +- Japan_Raid/Content/Textures/Unique/U_Sakura_Cap.uasset | 2 +- Japan_Raid/Content/Textures/Unique/U_Sakura_Leaf.uasset | 3 +++ .../Content/Textures/Unique/U_Sakura_Leaf_Opacity.uasset | 3 +++ 14 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 Japan_Raid/Config/DefaultEditorPerProjectUserSettings.ini create mode 100644 Japan_Raid/Content/Material/Foliage/M_Sakura.uasset create mode 100644 Japan_Raid/Content/Material/Foliage/M_Sakura_Bark.uasset create mode 100644 Japan_Raid/Content/Material/Foliage/M_Sakura_Brunch.uasset create mode 100644 Japan_Raid/Content/Material/Foliage/M_Sakura_Cap.uasset create mode 100644 Japan_Raid/Content/Material/Foliage/M_Sakura_Leaf.uasset create mode 100644 Japan_Raid/Content/Textures/Unique/U_Sakura_Leaf.uasset create mode 100644 Japan_Raid/Content/Textures/Unique/U_Sakura_Leaf_Opacity.uasset diff --git a/Japan_Raid/Config/DefaultEditorPerProjectUserSettings.ini b/Japan_Raid/Config/DefaultEditorPerProjectUserSettings.ini new file mode 100644 index 00000000..ac67f0dd --- /dev/null +++ b/Japan_Raid/Config/DefaultEditorPerProjectUserSettings.ini @@ -0,0 +1,6 @@ +[/Script/MaterialEditor.MaterialEditorSettings] +MaliOfflineCompilerPath=(FilePath="") +DefaultPreviewWidth=250 +DefaultPreviewHeight=250 +PreviewBackground=(bShowBorder=False,BorderColor=(B=255,G=255,R=255,A=255),BackgroundType=SolidColor,BackgroundColor=(B=0,G=0,R=0,A=255),Checkerboard=(ColorOne=(B=128,G=128,R=128,A=255),ColorTwo=(B=64,G=64,R=64,A=255),Size=32)) + diff --git a/Japan_Raid/Content/Levels/Foliage_Main.umap b/Japan_Raid/Content/Levels/Foliage_Main.umap index e5c01935..5db01cd9 100644 --- a/Japan_Raid/Content/Levels/Foliage_Main.umap +++ b/Japan_Raid/Content/Levels/Foliage_Main.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:198cba01575e90cd5fd79a092bf26ecf8e6aa82bf663f720c827b789382ba728 -size 125370 +oid sha256:eb5fc9999f8f816815bdccb88e7f2d8acad2e3521c8b6729048f5def04341f1d +size 126033 diff --git a/Japan_Raid/Content/Levels/LV_blocking_mesh.umap b/Japan_Raid/Content/Levels/LV_blocking_mesh.umap index 84d65363..f440bf3e 100644 --- a/Japan_Raid/Content/Levels/LV_blocking_mesh.umap +++ b/Japan_Raid/Content/Levels/LV_blocking_mesh.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec0a648e3953813004a47861b2ba5c142b06be893c26450d49a603ffd7fdf337 -size 509727 +oid sha256:0bde7f34087745dd2fa2d13d431b2623c41019ef9634f7eaeb65a82ddd5a156d +size 508329 diff --git a/Japan_Raid/Content/MainMap.umap b/Japan_Raid/Content/MainMap.umap index ec11b215..af51c8a2 100644 --- a/Japan_Raid/Content/MainMap.umap +++ b/Japan_Raid/Content/MainMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cab83e707af948959dcfea4ce216a0af7dc4f018adcd51095a1cd5130d9870c2 -size 13513 +oid sha256:b3e065c1c7b2192073e96430f6490ba09d1e8f6ed5adbb8d45ecef1f8f0e8182 +size 13539 diff --git a/Japan_Raid/Content/Material/Foliage/M_Sakura.uasset b/Japan_Raid/Content/Material/Foliage/M_Sakura.uasset new file mode 100644 index 00000000..4bd653b5 --- /dev/null +++ b/Japan_Raid/Content/Material/Foliage/M_Sakura.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:982eed6eecc10b5c49f89dabdc4f546a9d74f9f75d25f788e002a77202e3fc23 +size 1474 diff --git a/Japan_Raid/Content/Material/Foliage/M_Sakura_Bark.uasset b/Japan_Raid/Content/Material/Foliage/M_Sakura_Bark.uasset new file mode 100644 index 00000000..51cdba5e --- /dev/null +++ b/Japan_Raid/Content/Material/Foliage/M_Sakura_Bark.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a22eee83da8dc0e33e306020c5a4cc7f9fc2ba6b91d9d7981a95fd7e702e4c1 +size 12454 diff --git a/Japan_Raid/Content/Material/Foliage/M_Sakura_Brunch.uasset b/Japan_Raid/Content/Material/Foliage/M_Sakura_Brunch.uasset new file mode 100644 index 00000000..effabf6a --- /dev/null +++ b/Japan_Raid/Content/Material/Foliage/M_Sakura_Brunch.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1dd4db6009a0cbf1e22d6f9c02da3ddc658d70d21628880ab379fcd9ba088cb8 +size 9382 diff --git a/Japan_Raid/Content/Material/Foliage/M_Sakura_Cap.uasset b/Japan_Raid/Content/Material/Foliage/M_Sakura_Cap.uasset new file mode 100644 index 00000000..cfddebd2 --- /dev/null +++ b/Japan_Raid/Content/Material/Foliage/M_Sakura_Cap.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94c6f0a62465923fbfbb5e7501f13b2fc3a291083e77c45aba370bcddd93a5bf +size 10927 diff --git a/Japan_Raid/Content/Material/Foliage/M_Sakura_Leaf.uasset b/Japan_Raid/Content/Material/Foliage/M_Sakura_Leaf.uasset new file mode 100644 index 00000000..4c5a6c84 --- /dev/null +++ b/Japan_Raid/Content/Material/Foliage/M_Sakura_Leaf.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82fa8ae87639517eb5bd6210181e4b42dcc87eb8117d244b3bffd96441f19fa1 +size 13696 diff --git a/Japan_Raid/Content/Textures/Tiles/T_Sakura_Bark.uasset b/Japan_Raid/Content/Textures/Tiles/T_Sakura_Bark.uasset index 512c7a9c..7f9d473c 100644 --- a/Japan_Raid/Content/Textures/Tiles/T_Sakura_Bark.uasset +++ b/Japan_Raid/Content/Textures/Tiles/T_Sakura_Bark.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb595d6e47dc4d8a816e05f9b6a2088f2c4f2c7cebf20b0c130ca4c5e7e71601 +oid sha256:abf468cb6db5c727fb515d4fa20008f53b1f5ac03ddfcf75683a5e73ebfdf937 size 22013753 diff --git a/Japan_Raid/Content/Textures/Tiles/T_Sakura_Brunch.uasset b/Japan_Raid/Content/Textures/Tiles/T_Sakura_Brunch.uasset index 5cfe3347..eae64bc5 100644 --- a/Japan_Raid/Content/Textures/Tiles/T_Sakura_Brunch.uasset +++ b/Japan_Raid/Content/Textures/Tiles/T_Sakura_Brunch.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff6eeff9cec5821604a9baa578713bfa2667bd49a91d29d683f71f0fdf9462ae +oid sha256:f898bf0ac7a8962404a1d8a4beb037b79adb76b34e2f55642396fbc94c456c41 size 18923490 diff --git a/Japan_Raid/Content/Textures/Unique/U_Sakura_Cap.uasset b/Japan_Raid/Content/Textures/Unique/U_Sakura_Cap.uasset index 6c20b01f..ee2b2d8f 100644 --- a/Japan_Raid/Content/Textures/Unique/U_Sakura_Cap.uasset +++ b/Japan_Raid/Content/Textures/Unique/U_Sakura_Cap.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5a81d39d817ee807cf31cac9cb8e86229648c547f1ea1d5b85168035043451b +oid sha256:5b23d364b955e7a619ae48e5bf289fe1b14c020b31ff14a3b766178c71cc9008 size 16980585 diff --git a/Japan_Raid/Content/Textures/Unique/U_Sakura_Leaf.uasset b/Japan_Raid/Content/Textures/Unique/U_Sakura_Leaf.uasset new file mode 100644 index 00000000..5b7c03c0 --- /dev/null +++ b/Japan_Raid/Content/Textures/Unique/U_Sakura_Leaf.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd1470827da171fbbeb131cb1e3b906c9e7e1ae9d7c59499d3245b54910a775b +size 13726341 diff --git a/Japan_Raid/Content/Textures/Unique/U_Sakura_Leaf_Opacity.uasset b/Japan_Raid/Content/Textures/Unique/U_Sakura_Leaf_Opacity.uasset new file mode 100644 index 00000000..8a4b449a --- /dev/null +++ b/Japan_Raid/Content/Textures/Unique/U_Sakura_Leaf_Opacity.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6b7160bc95ac1bd459aec86a13580281351e7c28e519fb1140084e7741c0118 +size 230478