From 11fcaff47e0071f8a0e04ebf3f68da72749a3526 Mon Sep 17 00:00:00 2001 From: "DESKTOP-S4BOTN2\\user" Date: Sat, 28 Feb 2026 18:27:50 +0900 Subject: [PATCH] =?UTF-8?q?ADD:=20260228=20=EC=B9=98=EC=9A=94=EB=A7=88?= =?UTF-8?q?=EB=8A=98=20=EB=B0=A9=EC=86=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scene/Greenhouse Flower/GlobalVolumeProfile.asset | 4 ++-- .../Avatar/치요_260228_메이드복/Materials/(A) 1_Copy.mat | 6 +++++- .../Avatar/치요_260228_메이드복/Materials/(B) 1_Copy.mat | 6 +++++- .../Avatar/치요_260228_메이드복/Materials/Black_Copy.mat | 9 ++++++--- .../Avatar/치요_260228_메이드복/Materials/Body_Copy.mat | 6 +++++- .../Avatar/치요_260228_메이드복/Materials/Face_Copy.mat | 6 +++++- .../Materials/Hairpins_Blue 1_Copy.mat | 6 +++++- .../치요_260228_메이드복/Materials/Hairpins_Blue_Copy.mat | 6 +++++- .../Avatar/치요_260228_메이드복/Materials/White 1_Copy.mat | 6 +++++- .../치요_260228_메이드복_Biped_Edit Variant.prefab | 4 ++-- .../MagicaPreBuildData/MagicaPreBuild_4278a1e3.asset | 3 +++ .../MagicaPreBuildData/MagicaPreBuild_4278a1e3.asset.meta | 8 ++++++++ .../MagicaPreBuildData/PreBuild_가슴 (1)_63c9b4d9.asset | 4 ++-- .../MagicaPreBuildData/PreBuild_뒷머리 (1)_107af1a7.asset | 4 ++-- .../MagicaPreBuildData/PreBuild_치마 (6)_7ae27377.asset | 2 +- .../김마늘_260228_메이드복/Materials/1.White 2_Copy.mat | 8 ++++++-- .../Avatar/김마늘_260228_메이드복/Materials/10_Copy.mat | 6 +++++- .../Avatar/김마늘_260228_메이드복/Materials/1_Copy.mat | 6 +++++- .../Avatar/김마늘_260228_메이드복/Materials/2_Copy.mat | 6 +++++- .../Avatar/김마늘_260228_메이드복/Materials/3_Copy.mat | 6 +++++- .../Avatar/김마늘_260228_메이드복/Materials/8_Copy.mat | 2 +- .../Avatar/김마늘_260228_메이드복/Materials/9_Copy.mat | 6 +++++- .../Materials/Ash Veil Lilac 1_Copy.mat | 6 +++++- .../Materials/Ash Veil Lilac_Copy.mat | 6 +++++- .../Materials/ClothA_Black_mtl_Copy.mat | 6 +++++- .../Materials/ClothB_WhiteBlue_Copy.mat | 6 +++++- .../김마늘_260228_메이드복/Materials/Diamond_Copy.mat | 8 ++++++-- .../Avatar/김마늘_260228_메이드복/Materials/Face 1_Copy.mat | 6 +++++- .../김마늘_260228_메이드복/Materials/Fur_Black_mtl_Copy.mat | 6 +++++- .../김마늘_260228_메이드복/Materials/Gold_mtl_Copy.mat | 6 +++++- .../김마늘_260228_메이드복/Materials/NaturalNail_Copy.mat | 6 +++++- .../Materials/New Material 23_Copy.mat | 8 ++++++-- .../Avatar/김마늘_260228_메이드복/Materials/Silver_Copy.mat | 6 +++++- .../Avatar/김마늘_260228_메이드복/Materials/body 1_Copy.mat | 6 +++++- .../김마늘_260228_메이드복/Materials/face_alpha_Copy.mat | 6 +++++- .../김마늘_260228_메이드복_Biped_Edit Variant.prefab | 4 ++-- Assets/ResourcesData/Project/260223_모션촬영/모션.meta | 8 ++++++++ Assets/ResourcesData/Project/260228_치요마늘방송.meta | 8 ++++++++ .../260228_치요마늘방송/260228_치요마늘방송.unity | 3 +++ .../260228_치요마늘방송/260228_치요마늘방송.unity.meta | 7 +++++++ 40 files changed, 188 insertions(+), 44 deletions(-) create mode 100644 Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/MagicaPreBuild_4278a1e3.asset create mode 100644 Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/MagicaPreBuild_4278a1e3.asset.meta create mode 100644 Assets/ResourcesData/Project/260223_모션촬영/모션.meta create mode 100644 Assets/ResourcesData/Project/260228_치요마늘방송.meta create mode 100644 Assets/ResourcesData/Project/260228_치요마늘방송/260228_치요마늘방송.unity create mode 100644 Assets/ResourcesData/Project/260228_치요마늘방송/260228_치요마늘방송.unity.meta diff --git a/Assets/ResourcesData/Background/[공용]온실 정원/Scene/Greenhouse Flower/GlobalVolumeProfile.asset b/Assets/ResourcesData/Background/[공용]온실 정원/Scene/Greenhouse Flower/GlobalVolumeProfile.asset index a6d35c7c4..ed39edb9f 100644 --- a/Assets/ResourcesData/Background/[공용]온실 정원/Scene/Greenhouse Flower/GlobalVolumeProfile.asset +++ b/Assets/ResourcesData/Background/[공용]온실 정원/Scene/Greenhouse Flower/GlobalVolumeProfile.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc002b37f6c6a86fecc28f5bf7fa6e1ec69f3e3dec899224195fc8b81627b116 -size 9323 +oid sha256:b1d8491735dea4b6b20332047b098a598d660c168da0645ad931ddd2959d64df +size 28127 diff --git a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/(A) 1_Copy.mat b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/(A) 1_Copy.mat index 7eb5fb2dc..87c01e640 100644 --- a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/(A) 1_Copy.mat +++ b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/(A) 1_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: (A) 1_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _BASEMAP_STACKING_LAYER1 - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS @@ -23,6 +25,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1246,7 +1249,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.05 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 @@ -1874,3 +1877,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/(B) 1_Copy.mat b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/(B) 1_Copy.mat index 3b9769d2f..f589514a6 100644 --- a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/(B) 1_Copy.mat +++ b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/(B) 1_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: (B) 1_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _BASEMAP_STACKING_LAYER1 - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS @@ -23,6 +25,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1246,7 +1249,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.01 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 @@ -1874,3 +1877,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Black_Copy.mat b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Black_Copy.mat index 802f0a530..372d043a1 100644 --- a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Black_Copy.mat +++ b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Black_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Black_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS - _NORMALMAP @@ -19,8 +21,8 @@ Material: m_DoubleSidedGI: 1 m_CustomRenderQueue: 2000 stringTagMap: {} - disabledShaderPasses: - - MOTIONVECTORS + disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1244,7 +1246,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.08 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 @@ -1842,3 +1844,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Body_Copy.mat b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Body_Copy.mat index 343d98064..863c72e90 100644 --- a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Body_Copy.mat +++ b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Body_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Body_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS - _MATCAP_ADD @@ -19,6 +21,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -802,7 +805,7 @@ Material: - _OutlineUseBakedSmoothNormal: 1 - _OutlineUsePreLightingReplaceColor: 0 - _OutlineUseReplaceColor: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZOffset: 0.0001 - _OutlineZOffsetForFaceArea: 0.02 @@ -1180,3 +1183,4 @@ Material: - _UV3ScrollSpeed: {r: 0, g: 0, b: 0, a: 0} - _ZOffsetMaskMapChannelMask: {r: 0, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Face_Copy.mat b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Face_Copy.mat index 4d9cbf6a9..a67730953 100644 --- a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Face_Copy.mat +++ b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Face_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Face_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS - _FACE_MASK_ON @@ -22,6 +24,7 @@ Material: stringTagMap: {} disabledShaderPasses: - NiloToonOutline + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -805,7 +808,7 @@ Material: - _OutlineUseBakedSmoothNormal: 1 - _OutlineUsePreLightingReplaceColor: 0 - _OutlineUseReplaceColor: 0 - - _OutlineWidth: 0.55 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZOffset: 0.0001 - _OutlineZOffsetForFaceArea: 0.02 @@ -1183,3 +1186,4 @@ Material: - _UV3ScrollSpeed: {r: 0, g: 0, b: 0, a: 0} - _ZOffsetMaskMapChannelMask: {r: 0, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Hairpins_Blue 1_Copy.mat b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Hairpins_Blue 1_Copy.mat index acff7b69f..d63fb94ce 100644 --- a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Hairpins_Blue 1_Copy.mat +++ b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Hairpins_Blue 1_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Hairpins_Blue 1_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _BASEMAP_STACKING_LAYER1 - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS @@ -21,6 +23,7 @@ Material: m_CustomRenderQueue: 3000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1247,7 +1250,7 @@ Material: - _OutlineVectorScale: 1.25 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.035 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 @@ -1845,3 +1848,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Hairpins_Blue_Copy.mat b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Hairpins_Blue_Copy.mat index e1b357429..27f59571e 100644 --- a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Hairpins_Blue_Copy.mat +++ b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/Hairpins_Blue_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Hairpins_Blue_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _BASEMAP_STACKING_LAYER1 - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS @@ -21,6 +23,7 @@ Material: m_CustomRenderQueue: 3000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1247,7 +1250,7 @@ Material: - _OutlineVectorScale: 1.25 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.035 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 @@ -1845,3 +1848,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/White 1_Copy.mat b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/White 1_Copy.mat index 717bac8ac..8d7fcd6d7 100644 --- a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/White 1_Copy.mat +++ b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/Materials/White 1_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: White 1_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHAOVERRIDEMAP - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS @@ -23,6 +25,7 @@ Material: m_CustomRenderQueue: 2499 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1249,7 +1252,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.15 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 @@ -1877,3 +1880,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/치요_260228_메이드복_Biped_Edit Variant.prefab b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/치요_260228_메이드복_Biped_Edit Variant.prefab index 772e021e9..5ff5002bc 100644 --- a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/치요_260228_메이드복_Biped_Edit Variant.prefab +++ b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_260228_메이드복/치요_260228_메이드복_Biped_Edit Variant.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8121dfd5388688f072ed05cb279d102e49b3ec99fbc3427c973fcf5523ae7060 -size 73615 +oid sha256:cec9fb17b200c204b3b49dd2235806a614705b0711273ba54167f81db845d45f +size 115817 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/MagicaPreBuild_4278a1e3.asset b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/MagicaPreBuild_4278a1e3.asset new file mode 100644 index 000000000..94724e5d0 --- /dev/null +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/MagicaPreBuild_4278a1e3.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17dcdd5f92e547f736ac9b054ed1fcfed6a755278040ea3ab1f1d47280172ada +size 9982364 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/MagicaPreBuild_4278a1e3.asset.meta b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/MagicaPreBuild_4278a1e3.asset.meta new file mode 100644 index 000000000..467496bd1 --- /dev/null +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/MagicaPreBuild_4278a1e3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 47d639185cb35274791b3c137863f12d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/PreBuild_가슴 (1)_63c9b4d9.asset b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/PreBuild_가슴 (1)_63c9b4d9.asset index e98f9b388..016f9016e 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/PreBuild_가슴 (1)_63c9b4d9.asset +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/PreBuild_가슴 (1)_63c9b4d9.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b33ca0d5868267476c60a6f54d9bfbd4a9a649f721007a4835420d448d9a430 -size 83802 +oid sha256:6652a23d307ad1d22478b97b778bc32849b781d332274f654917c6a179ff2404 +size 34413 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/PreBuild_뒷머리 (1)_107af1a7.asset b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/PreBuild_뒷머리 (1)_107af1a7.asset index 31a4df3a6..e1be7e84f 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/PreBuild_뒷머리 (1)_107af1a7.asset +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/PreBuild_뒷머리 (1)_107af1a7.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3c046ff745c71711104d2d3da3addfbb6574a1d5a34d29f80937221e3893757 -size 81947 +oid sha256:5f6af0c880e2459d2623b61727805634b357403058ef394d5df1d440a87eb03d +size 81950 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/PreBuild_치마 (6)_7ae27377.asset b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/PreBuild_치마 (6)_7ae27377.asset index 6c8dd66eb..41114f1db 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/PreBuild_치마 (6)_7ae27377.asset +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/MagicaPreBuildData/PreBuild_치마 (6)_7ae27377.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d0da4a7d0431f607487eb8a5c2d07351e10798d6bde38df9354b0a15b23cec0 +oid sha256:b1bb13e3de07a36f75efc8bbebf168bed8dec83165c1b2aafd8313464c048e0a size 34879 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/1.White 2_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/1.White 2_Copy.mat index b95426c3f..1a76408ce 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/1.White 2_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/1.White 2_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 1.White 2_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS - _MATCAP_ADD @@ -50,6 +52,7 @@ Material: stringTagMap: {} disabledShaderPasses: - NiloToonOutline + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1249,8 +1252,8 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 - - _OutlineWidthExtraMultiplier: 0.2 + - _OutlineWidth: 0.2 + - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 - _OutlineZOffset: 0 @@ -1869,3 +1872,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/10_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/10_Copy.mat index 12ca010ae..7e073aaea 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/10_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/10_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 10_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _BASEMAP_STACKING_LAYER1 - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS @@ -24,6 +26,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1232,7 +1235,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0.01 - _OutlineZClip: 1 @@ -1855,3 +1858,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/1_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/1_Copy.mat index 2f2c9a722..e6c8bac8b 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/1_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/1_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 1_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHAOVERRIDEMAP - _ALPHATEST_ON @@ -25,6 +27,7 @@ Material: m_CustomRenderQueue: 2499 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1233,7 +1236,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0.01 - _OutlineZClip: 1 @@ -1856,3 +1859,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/2_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/2_Copy.mat index 92bbb3b45..0805e15a0 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/2_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/2_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 2_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS - _MATCAP_ADD @@ -24,6 +26,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1227,7 +1230,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0.01 - _OutlineZClip: 1 @@ -1820,3 +1823,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/3_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/3_Copy.mat index b76cda9db..2baa16084 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/3_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/3_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 3_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS - _MATCAP_ADD @@ -24,6 +26,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1227,7 +1230,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0.01 - _OutlineZClip: 1 @@ -1820,3 +1823,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/8_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/8_Copy.mat index 02385730b..c9c600c08 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/8_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/8_Copy.mat @@ -1232,7 +1232,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/9_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/9_Copy.mat index 2246a947a..40916b562 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/9_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/9_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: 9_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS - _MATCAP_ADD @@ -24,6 +26,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1227,7 +1230,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0.01 - _OutlineZClip: 1 @@ -1820,3 +1823,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Ash Veil Lilac 1_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Ash Veil Lilac 1_Copy.mat index a5f9c20ee..ccd2b6c02 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Ash Veil Lilac 1_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Ash Veil Lilac 1_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Ash Veil Lilac 1_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _BASEMAP_STACKING_LAYER1 - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS @@ -52,6 +54,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1257,7 +1260,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 @@ -1877,3 +1880,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Ash Veil Lilac_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Ash Veil Lilac_Copy.mat index 89365456b..32ae8e354 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Ash Veil Lilac_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Ash Veil Lilac_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Ash Veil Lilac_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHAOVERRIDEMAP - _BASEMAP_STACKING_LAYER1 @@ -52,6 +54,7 @@ Material: m_CustomRenderQueue: 2470 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1257,7 +1260,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 @@ -1877,3 +1880,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/ClothA_Black_mtl_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/ClothA_Black_mtl_Copy.mat index 3762e2fd3..8f9a5e90b 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/ClothA_Black_mtl_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/ClothA_Black_mtl_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ClothA_Black_mtl_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _BASEMAP_STACKING_LAYER1 - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS @@ -24,6 +26,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1227,7 +1230,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 @@ -1820,3 +1823,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/ClothB_WhiteBlue_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/ClothB_WhiteBlue_Copy.mat index b65d7dd7a..962bf402c 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/ClothB_WhiteBlue_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/ClothB_WhiteBlue_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ClothB_WhiteBlue_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS - _MATCAP_ADD @@ -23,6 +25,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1226,7 +1229,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0.01 - _OutlineZClip: 1 @@ -1819,3 +1822,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Diamond_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Diamond_Copy.mat index a203eecae..9635833e5 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Diamond_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Diamond_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Diamond_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHAOVERRIDEMAP - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS @@ -24,6 +26,7 @@ Material: stringTagMap: {} disabledShaderPasses: - NiloToonOutline + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1252,8 +1255,8 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.08 - - _OutlineWidthExtraMultiplier: 4 + - _OutlineWidth: 0.2 + - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 - _OutlineZOffset: 0.0001 @@ -1854,3 +1857,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Face 1_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Face 1_Copy.mat index 3e471f2f0..d888c81b6 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Face 1_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Face 1_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Face 1_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS - _EMISSION @@ -23,6 +25,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -800,7 +803,7 @@ Material: - _OutlineUseBakedSmoothNormal: 1 - _OutlineUsePreLightingReplaceColor: 0 - _OutlineUseReplaceColor: 0 - - _OutlineWidth: 0.35 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZOffset: 0.0001 - _OutlineZOffsetForFaceArea: 0.02 @@ -1176,3 +1179,4 @@ Material: - _UV3ScrollSpeed: {r: 0, g: 0, b: 0, a: 0} - _ZOffsetMaskMapChannelMask: {r: 0, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Fur_Black_mtl_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Fur_Black_mtl_Copy.mat index 8023a001f..6718276f6 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Fur_Black_mtl_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Fur_Black_mtl_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Fur_Black_mtl_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS - _MATCAP_ADD @@ -21,6 +23,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1278,7 +1281,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 @@ -1874,3 +1877,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Gold_mtl_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Gold_mtl_Copy.mat index af3068745..cd3854b6f 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Gold_mtl_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Gold_mtl_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Gold_mtl_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS - _MATCAP_ADD @@ -23,6 +25,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1226,7 +1229,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 @@ -1819,3 +1822,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/NaturalNail_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/NaturalNail_Copy.mat index 23ef4055a..a86b6e787 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/NaturalNail_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/NaturalNail_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: NaturalNail_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHAOVERRIDEMAP - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS @@ -22,6 +24,7 @@ Material: m_CustomRenderQueue: 2499 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -1225,7 +1228,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 @@ -1848,3 +1851,4 @@ Material: - _egc6: {r: 1, g: 1, b: 1, a: 0} - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/New Material 23_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/New Material 23_Copy.mat index 70078cf4d..b4e169bc6 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/New Material 23_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/New Material 23_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: New Material 23_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS - _MATCAP_BLEND @@ -24,6 +26,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -859,8 +862,8 @@ Material: - _OutlineUseBakedSmoothNormal: 1 - _OutlineUsePreLightingReplaceColor: 0 - _OutlineUseReplaceColor: 0 - - _OutlineWidth: 0.5 - - _OutlineWidthExtraMultiplier: 0.5 + - _OutlineWidth: 0.2 + - _OutlineWidthExtraMultiplier: 1 - _OutlineZOffset: 0.0001 - _OutlineZOffsetForFaceArea: 0.02 - _OutlineZOffsetMaskRemapEnd: 1 @@ -1261,3 +1264,4 @@ Material: - _UvAnimSpeed: {r: 0, g: 0, b: 0, a: 0} - _ZOffsetMaskMapChannelMask: {r: 0, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Silver_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Silver_Copy.mat index f099f0896..42f582d12 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Silver_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/Silver_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Silver_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS - _MATCAP_ADD @@ -22,6 +24,7 @@ Material: stringTagMap: {} disabledShaderPasses: - NiloToonOutline + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -777,7 +780,7 @@ Material: - _OutlineUseBakedSmoothNormal: 1 - _OutlineUsePreLightingReplaceColor: 0 - _OutlineUseReplaceColor: 0 - - _OutlineWidth: 0.011 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZOffset: 0.0001 - _OutlineZOffsetForFaceArea: 0.02 @@ -1162,3 +1165,4 @@ Material: - _UV3ScrollSpeed: {r: 0, g: 0, b: 0, a: 0} - _ZOffsetMaskMapChannelMask: {r: 0, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/body 1_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/body 1_Copy.mat index 3aad3f392..3e56c2b1e 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/body 1_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/body 1_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: body 1_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS - _OUTLINEWIDTHMAP @@ -20,6 +22,7 @@ Material: m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -798,7 +801,7 @@ Material: - _OutlineUseBakedSmoothNormal: 1 - _OutlineUsePreLightingReplaceColor: 0 - _OutlineUseReplaceColor: 0 - - _OutlineWidth: 0.35 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZOffset: 0.0001 - _OutlineZOffsetForFaceArea: 0.02 @@ -1175,3 +1178,4 @@ Material: - _UV3ScrollSpeed: {r: 0, g: 0, b: 0, a: 0} - _ZOffsetMaskMapChannelMask: {r: 0, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/face_alpha_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/face_alpha_Copy.mat index 984a93300..ff116ee2a 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/face_alpha_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/Materials/face_alpha_Copy.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: face_alpha_Copy m_Shader: {fileID: 4800000, guid: b4f674f383806e5419ee221e39445de0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHAOVERRIDEMAP - _DEPTHTEX_RIMLIGHT_FIX_DOTTED_LINE_ARTIFACTS @@ -23,6 +25,7 @@ Material: stringTagMap: {} disabledShaderPasses: - NiloToonOutline + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -801,7 +804,7 @@ Material: - _OutlineUseBakedSmoothNormal: 1 - _OutlineUsePreLightingReplaceColor: 0 - _OutlineUseReplaceColor: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.2 - _OutlineWidthExtraMultiplier: 1 - _OutlineZOffset: 0.0001 - _OutlineZOffsetForFaceArea: 0.02 @@ -1178,3 +1181,4 @@ Material: - _UV3ScrollSpeed: {r: 0, g: 0, b: 0, a: 0} - _ZOffsetMaskMapChannelMask: {r: 0, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/김마늘_260228_메이드복_Biped_Edit Variant.prefab b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/김마늘_260228_메이드복_Biped_Edit Variant.prefab index 22a55b7c4..43d4d49af 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/김마늘_260228_메이드복_Biped_Edit Variant.prefab +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_260228_메이드복/김마늘_260228_메이드복_Biped_Edit Variant.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b8010a77a7924212cd054553516a1454a905b954884c81c27946836ef4018d9 -size 58532 +oid sha256:1eebc895461b327010ace5341d867a150cb9e780222b51ff978207901fe7776d +size 218725 diff --git a/Assets/ResourcesData/Project/260223_모션촬영/모션.meta b/Assets/ResourcesData/Project/260223_모션촬영/모션.meta new file mode 100644 index 000000000..5e925329c --- /dev/null +++ b/Assets/ResourcesData/Project/260223_모션촬영/모션.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09e16419e0bf9d5408d401c4afb71cfd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResourcesData/Project/260228_치요마늘방송.meta b/Assets/ResourcesData/Project/260228_치요마늘방송.meta new file mode 100644 index 000000000..3b6bdf968 --- /dev/null +++ b/Assets/ResourcesData/Project/260228_치요마늘방송.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 62e8d66c0dc4ed24d968447a93d6f055 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResourcesData/Project/260228_치요마늘방송/260228_치요마늘방송.unity b/Assets/ResourcesData/Project/260228_치요마늘방송/260228_치요마늘방송.unity new file mode 100644 index 000000000..3ed64fcf4 --- /dev/null +++ b/Assets/ResourcesData/Project/260228_치요마늘방송/260228_치요마늘방송.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5dfafc2d413f1a5d982173e88b159a15e7e1607b42bf628fd33d0a39ff8f69b2 +size 1679450 diff --git a/Assets/ResourcesData/Project/260228_치요마늘방송/260228_치요마늘방송.unity.meta b/Assets/ResourcesData/Project/260228_치요마늘방송/260228_치요마늘방송.unity.meta new file mode 100644 index 000000000..f1117fa05 --- /dev/null +++ b/Assets/ResourcesData/Project/260228_치요마늘방송/260228_치요마늘방송.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8883d53a52e907947976ccb07a0f9381 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: