diff --git a/Assets/External/Ifacialmocap/UnityRecieve_FACEMOTION3D_and_iFacialMocap.cs b/Assets/External/Ifacialmocap/UnityRecieve_FACEMOTION3D_and_iFacialMocap.cs index 33966d87..006e6e7f 100644 --- a/Assets/External/Ifacialmocap/UnityRecieve_FACEMOTION3D_and_iFacialMocap.cs +++ b/Assets/External/Ifacialmocap/UnityRecieve_FACEMOTION3D_and_iFacialMocap.cs @@ -13,6 +13,7 @@ public class UnityRecieve_FACEMOTION3D_and_iFacialMocap : MonoBehaviour // broadcast address public bool gameStartWithConnect = true; public string iOS_IPAddress = "255.255.255.255"; + public bool mirrorMode = false; // 좌우 반전 모드 설정 private UdpClient client; private bool StartFlag = true; @@ -141,17 +142,39 @@ public class UnityRecieve_FACEMOTION3D_and_iFacialMocap : MonoBehaviour { if (meshRenderer != null && meshRenderer.sharedMesh != null) { - int index = meshRenderer.sharedMesh.GetBlendShapeIndex(mappedShapeName); - if (index > -1) + // 대소문자 구분 없이 블렌드쉐입 찾기 + for (int i = 0; i < meshRenderer.sharedMesh.blendShapeCount; i++) { - meshRenderer.SetBlendShapeWeight(index, weight); + string blendShapeName = meshRenderer.sharedMesh.GetBlendShapeName(i); + if (string.Equals(blendShapeName, mappedShapeName, StringComparison.OrdinalIgnoreCase)) + { + meshRenderer.SetBlendShapeWeight(i, weight); + break; + } } } } } } - + // BlendShape 이름 정규화 함수 + string NormalizeBlendShapeName(string name) + { + if (name.EndsWith("_L")) + name = name.Substring(0, name.Length - 2) + "Left"; + else if (name.EndsWith("_R")) + name = name.Substring(0, name.Length - 2) + "Right"; + + // 카멜케이스화: 언더스코어 기준 분리 후 각 파트 첫 글자 대문자 + string[] parts = name.Split('_'); + for (int i = 0; i < parts.Length; i++) + { + if (parts[i].Length > 0) + parts[i] = char.ToUpper(parts[i][0]) + parts[i].Substring(1); + } + return string.Join("", parts); + } + //BlendShapeとボーンの回転の設定 //set blendshapes & bone rotation void SetAnimation_inside_Unity_settings() @@ -177,6 +200,44 @@ public class UnityRecieve_FACEMOTION3D_and_iFacialMocap : MonoBehaviour if (strArray2.Length == 2) { + // 이름 정규화 먼저 적용 + strArray2[0] = NormalizeBlendShapeName(strArray2[0]); + if (mirrorMode) + { + string originalShapeName = strArray2[0]; + string shapeNameLower = originalShapeName.ToLowerInvariant(); + // eye 블렌드쉐입 매핑 (key는 소문자, value는 Unity 카멜케이스) + Dictionary eyeMirrorMap = new Dictionary() { + {"eyelookupleft", "EyeLookUpRight"}, + {"eyelookupright", "EyeLookUpLeft"}, + {"eyelookdownleft", "EyeLookDownRight"}, + {"eyelookdownright", "EyeLookDownLeft"}, + {"eyelookinleft", "EyeLookInRight"}, + {"eyelookinright", "EyeLookInLeft"}, + {"eyelookoutleft", "EyeLookOutRight"}, + {"eyelookoutright", "EyeLookOutLeft"}, + {"eyewideleft", "EyeWideRight"}, + {"eyewideright", "EyeWideLeft"}, + {"eyesquintleft", "EyeSquintRight"}, + {"eyesquintright", "EyeSquintLeft"}, + {"eyeblinkleft", "EyeBlinkRight"}, + {"eyeblinkright", "EyeBlinkLeft"} + }; + string mirroredName = originalShapeName; + if (eyeMirrorMap.ContainsKey(shapeNameLower)) + { + mirroredName = eyeMirrorMap[shapeNameLower]; + } + else if (originalShapeName.Contains("Right")) + { + mirroredName = originalShapeName.Replace("Right", "Left"); + } + else if (originalShapeName.Contains("Left")) + { + mirroredName = originalShapeName.Replace("Left", "Right"); + } + strArray2[0] = mirroredName; + } SetBlendShapeWeightFromStrArray(strArray2); } } @@ -190,20 +251,56 @@ public class UnityRecieve_FACEMOTION3D_and_iFacialMocap : MonoBehaviour string[] commaList = strArray2[1].Split(','); if (strArray2[0] == "head" && headBone != null) { - headBone.localRotation = Quaternion.Euler(float.Parse(commaList[0], CultureInfo.InvariantCulture), -float.Parse(commaList[1], CultureInfo.InvariantCulture), -float.Parse(commaList[2], CultureInfo.InvariantCulture)); + float x = float.Parse(commaList[0], CultureInfo.InvariantCulture); + float y = float.Parse(commaList[1], CultureInfo.InvariantCulture); + float z = float.Parse(commaList[2], CultureInfo.InvariantCulture); + + if (mirrorMode) + { + y = -y; // Y축 회전 반전 + } + + headBone.localRotation = Quaternion.Euler(x, y, -z); if (headPositionObject != null) { - headPositionObject.localPosition = new Vector3(-float.Parse(commaList[3], CultureInfo.InvariantCulture), float.Parse(commaList[4], CultureInfo.InvariantCulture), float.Parse(commaList[5], CultureInfo.InvariantCulture)); + float posX = -float.Parse(commaList[3], CultureInfo.InvariantCulture); + float posY = float.Parse(commaList[4], CultureInfo.InvariantCulture); + float posZ = float.Parse(commaList[5], CultureInfo.InvariantCulture); + + if (mirrorMode) + { + posX = -posX; // X축 위치 반전 + } + + headPositionObject.localPosition = new Vector3(posX, posY, posZ); } } else if (strArray2[0] == "rightEye" && rightEyeBone != null) { - rightEyeBone.localRotation = Quaternion.Euler(float.Parse(commaList[0], CultureInfo.InvariantCulture), -float.Parse(commaList[1], CultureInfo.InvariantCulture), float.Parse(commaList[2], CultureInfo.InvariantCulture)); + float x = float.Parse(commaList[0], CultureInfo.InvariantCulture); + float y = float.Parse(commaList[1], CultureInfo.InvariantCulture); + float z = float.Parse(commaList[2], CultureInfo.InvariantCulture); + + if (mirrorMode) + { + y = -y; // Y축 회전 반전 + } + + rightEyeBone.localRotation = Quaternion.Euler(x, y, z); } else if (strArray2[0] == "leftEye" && leftEyeBone != null) { - leftEyeBone.localRotation = Quaternion.Euler(float.Parse(commaList[0], CultureInfo.InvariantCulture), -float.Parse(commaList[1], CultureInfo.InvariantCulture), float.Parse(commaList[2], CultureInfo.InvariantCulture)); + float x = float.Parse(commaList[0], CultureInfo.InvariantCulture); + float y = float.Parse(commaList[1], CultureInfo.InvariantCulture); + float z = float.Parse(commaList[2], CultureInfo.InvariantCulture); + + if (mirrorMode) + { + y = -y; // Y축 회전 반전 + } + + leftEyeBone.localRotation = Quaternion.Euler(x, y, z); } } } diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar/Y Bot.Materials/Alpha_Body_MAT.asset b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar/Y Bot.Materials/Alpha_Body_MAT.asset index 37025a67..101e8953 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar/Y Bot.Materials/Alpha_Body_MAT.asset +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar/Y Bot.Materials/Alpha_Body_MAT.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2524e52cf96a8ea537ca16050ff84924c5124b1644e244771f00c58f5011f8aa -size 2220 +oid sha256:430d4309a3db96648e09a074875bfb451e7f7330049cf0ff475d909747c58f4d +size 23404 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar/Y Bot.Materials/Alpha_Joints_MAT.asset b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar/Y Bot.Materials/Alpha_Joints_MAT.asset index 798d7e97..cf342f76 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar/Y Bot.Materials/Alpha_Joints_MAT.asset +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar/Y Bot.Materials/Alpha_Joints_MAT.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4830793093d5e1bd37be035fd528d7f1325e73bbce86609a04862922f9dfd556 -size 2223 +oid sha256:5bfc94bc818fb5242623522679b8bbb94254dcbc897a3e376548d0d22b1fd09c +size 23354 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar/Y Bot.Meshes/Alpha_Joints.baked.asset b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar/Y Bot.Meshes/Alpha_Joints.baked.asset index 71f0f5a6..7246590c 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar/Y Bot.Meshes/Alpha_Joints.baked.asset +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/BaseAvatar/Y Bot.Meshes/Alpha_Joints.baked.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0e2c7d85464a7eb533a59e961443f8e50a095904d4c0091c218e30b474c3e67 -size 2915186 +oid sha256:ac59760e5d645e5c0bb4189c12df5e2bd1facfe235153f18c1382c4682d4a092 +size 2915190 diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackRigidBody.cs b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackRigidBody.cs index da6ea31c..9b60ab2f 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackRigidBody.cs +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackRigidBody.cs @@ -26,11 +26,15 @@ public class OptitrackRigidBody : MonoBehaviour [Tooltip("The ID of the rigid body to track.")] public int rigidBodyId; + [Tooltip("The name of the prop to track. If set, this will override the rigidBodyId.")] + public string propName; + [Tooltip("Whether to use network compensation for this rigid body.")] public bool useNetworkCompensation = true; private OptitrackStreamingClient m_streamingClient; private bool m_isRigidBodyFound = false; + private int m_resolvedRigidBodyId = -1; public bool isRigidBodyFound { @@ -46,7 +50,22 @@ public class OptitrackRigidBody : MonoBehaviour return; } - m_streamingClient.RegisterRigidBody(this, rigidBodyId); + // Resolve prop name to ID if provided + if (!string.IsNullOrEmpty(propName)) + { + m_resolvedRigidBodyId = m_streamingClient.GetRigidBodyIdByName(propName); + if (m_resolvedRigidBodyId == -1) + { + Debug.LogWarning($"OptitrackRigidBody: Could not find rigid body with name '{propName}'", this); + return; + } + } + else + { + m_resolvedRigidBodyId = rigidBodyId; + } + + m_streamingClient.RegisterRigidBody(this, m_resolvedRigidBodyId); } @@ -72,10 +91,10 @@ public class OptitrackRigidBody : MonoBehaviour void Update() { - if (m_streamingClient == null) + if (m_streamingClient == null || m_resolvedRigidBodyId == -1) return; - OptitrackRigidBodyState rbState = m_streamingClient.GetLatestRigidBodyState(rigidBodyId, useNetworkCompensation); + OptitrackRigidBodyState rbState = m_streamingClient.GetLatestRigidBodyState(m_resolvedRigidBodyId, useNetworkCompensation); if (rbState != null) { m_isRigidBodyFound = rbState.IsTracked; @@ -94,7 +113,10 @@ public class OptitrackRigidBody : MonoBehaviour void UpdatePose() { - OptitrackRigidBodyState rbState = m_streamingClient.GetLatestRigidBodyState(rigidBodyId, useNetworkCompensation); + if (m_streamingClient == null || m_resolvedRigidBodyId == -1) + return; + + OptitrackRigidBodyState rbState = m_streamingClient.GetLatestRigidBodyState(m_resolvedRigidBodyId, useNetworkCompensation); if (rbState != null) { m_isRigidBodyFound = rbState.IsTracked; diff --git a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackStreamingClient.cs b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackStreamingClient.cs index a1673ff5..1d4cad2c 100644 --- a/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackStreamingClient.cs +++ b/Assets/External/OptiTrack Unity Plugin/OptiTrack/Scripts/OptitrackStreamingClient.cs @@ -747,19 +747,19 @@ public class OptitrackStreamingClient : MonoBehaviour /// The specified rigid body definition, or null if not found. public OptitrackRigidBodyDefinition GetRigidBodyDefinitionById( Int32 rigidBodyId ) { - for ( int i = 0; i < m_rigidBodyDefinitions.Count; ++i ) - { - OptitrackRigidBodyDefinition rbDef = m_rigidBodyDefinitions[i]; - - if ( rbDef.Id == rigidBodyId ) - { - return rbDef; - } - } - - return null; + return m_rigidBodyDefinitions.Find( def => def.Id == rigidBodyId ); } + /// + /// Gets the rigid body ID by its name. + /// + /// The name of the rigid body to find. + /// The ID of the rigid body if found, -1 otherwise. + public int GetRigidBodyIdByName(string rigidBodyName) + { + var definition = m_rigidBodyDefinitions.Find(def => def.Name == rigidBodyName); + return definition != null ? definition.Id : -1; + } /// Retrieves the definition of the skeleton with the specified asset name. /// The name of the skeleton for which to retrieve the definition. diff --git a/Assets/ResourcesData/Background/School Classroom/Scene/Global Volume Profile.asset b/Assets/ResourcesData/Background/School Classroom/Scene/Global Volume Profile.asset index 84aadbc8..906e125f 100644 --- a/Assets/ResourcesData/Background/School Classroom/Scene/Global Volume Profile.asset +++ b/Assets/ResourcesData/Background/School Classroom/Scene/Global Volume Profile.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1af30dcd89c7da5b3a00db082125c401c3ac6d30d69798b5df01c760fc208cc -size 7208 +oid sha256:a301506b3051f2b0804a5390655ca2397b0012007700fe4dfe17ffac1de71e69 +size 8964 diff --git a/Assets/ResourcesData/Background/School Classroom/Scene/School Classroom.unity b/Assets/ResourcesData/Background/School Classroom/Scene/School Classroom.unity index 0e078e87..bde2a0a1 100644 --- a/Assets/ResourcesData/Background/School Classroom/Scene/School Classroom.unity +++ b/Assets/ResourcesData/Background/School Classroom/Scene/School Classroom.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:897d77c8fe75adcbf3551eb940f5d0af7f3ef94dedd4b8746e83db28f1fb44d3 -size 141461 +oid sha256:0efcb54a73aba89f37eb32227ea84406c30213b9f1500d27a61bb4dc257ea40d +size 137465 diff --git a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_250504_스트릿/Materials/Body_Copy.mat b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_250504_스트릿/Materials/Body_Copy.mat index 1e77f964..f07b4a83 100644 --- a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_250504_스트릿/Materials/Body_Copy.mat +++ b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_250504_스트릿/Materials/Body_Copy.mat @@ -8,12 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Body_Copy - m_Shader: {fileID: 4800000, guid: df12117ecd77c31469c224178886498e, type: 3} + m_Shader: {fileID: 4800000, guid: efa77a80ca0344749b4f19fdd5891cbe, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: - - _ENVIRONMENTREFLECTIONS_OFF + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -57,7 +56,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 5fb374899fc31d745ad0472d627d01a9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseMap: @@ -890,7 +889,7 @@ Material: - _DitherFadeoutNormalScaleFix: 1 - _DitherMaxValue: 255 - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlendAlpha: 10 - _DstBlendAlphaFA: 1 - _DstBlendFA: 1 - _DummyProperty: 0 @@ -1214,7 +1213,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.06 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 @@ -1540,7 +1539,7 @@ Material: - _BackFaceTintColor: {r: 1, g: 1, b: 1, a: 1} - _BackfaceColor: {r: 0, g: 0, b: 0, a: 0} - _BacklightColor: {r: 0.85, g: 0.8, b: 0.7, a: 1} - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 1, g: 0.9669811, b: 0.9669811, a: 1} - _BaseColor2: {r: 1, g: 1, b: 1, a: 1} - _BaseMapStackingLayer10MaskTexChannel: {r: 0, g: 1, b: 0, a: 0} - _BaseMapStackingLayer10TexUVAnimSpeed: {r: 0, g: 0, b: 0, a: 0} @@ -1598,7 +1597,7 @@ Material: - _CharacterAreaColorFillTextureUVScrollSpeed: {r: 0, g: 0, b: 0, a: 1} - _CharacterAreaColorFillTextureUVTilingOffset: {r: 1, g: 1, b: 0, a: 0} - _CharacterBoundCenterPosWS: {r: 0, g: 0, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 0.9669811, b: 0.9669811, a: 1} - _Color2nd: {r: 1, g: 1, b: 1, a: 1} - _Color3rd: {r: 1, g: 1, b: 1, a: 1} - _DepthTexRimLightAndShadowWidthMultiplierFromVertexColorChannelMask: {r: 0, g: 1, b: 0, a: 0} @@ -1696,7 +1695,7 @@ Material: - _MatCapUVTiling: {r: 1, g: 1, b: 0, a: 0} - _NiloToonSelfShadowMappingTintColor: {r: 1, g: 1, b: 1, a: 1} - _OcclusionMapChannelMask: {r: 0, g: 1, b: 0, a: 0} - - _OutlineColor: {r: 0.6, g: 0.56, b: 0.73, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineLitColor: {r: 1, g: 0.19999996, b: 0, a: 0} - _OutlineOcclusionAreaTintColor: {r: 1, g: 1, b: 1, a: 1} - _OutlinePreLightingReplaceColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_250504_스트릿/Materials/Lit.mat b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_250504_스트릿/Materials/Lit.mat index 67efa7d9..f0796197 100644 --- a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_250504_스트릿/Materials/Lit.mat +++ b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_250504_스트릿/Materials/Lit.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Lit - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: df12117ecd77c31469c224178886498e, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -17,18 +17,57 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _AlphaMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _AnisotropyScaleMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _AnisotropyShiftNoiseMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _AnisotropyTangentMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _AudioLinkLocalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _AudioLinkMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BacklightColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BaseColorMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BaseMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Bump2ndMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Bump2ndScaleMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -45,14 +84,118 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DissolveMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DissolveNoiseMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DitherTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Emission2ndBlendMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Emission2ndGradTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Emission2ndMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionBlendMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionGradTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _GlitterColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _GlitterShapeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Main2ndBlendMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Main2ndDissolveMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Main2ndDissolveNoiseMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Main2ndTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Main3rdBlendMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Main3rdDissolveMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Main3rdDissolveNoiseMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Main3rdTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainColorAdjustMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainGradationTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MatCap2ndBlendMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MatCap2ndBumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MatCap2ndTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MatCapBlendMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MatCapBumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MatCapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -61,10 +204,66 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineVectorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineWidthMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _ParallaxMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _ReflectionColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ReflectionCubeTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _RimColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _RimShadeMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Shadow2ndColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Shadow3rdColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ShadowBlurMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ShadowBorderMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ShadowColorTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ShadowStrengthMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SmoothnessTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SpecGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -83,44 +282,521 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AAStrength: 1 - _AddPrecomputedVelocity: 0 + - _AlphaBoostFA: 10 - _AlphaClip: 0 + - _AlphaMaskMode: 0 + - _AlphaMaskScale: 1 + - _AlphaMaskValue: 0 - _AlphaToMask: 0 + - _Anisotropy2MatCap: 0 + - _Anisotropy2MatCap2nd: 0 + - _Anisotropy2Reflection: 0 + - _Anisotropy2ndBitangentWidth: 1 + - _Anisotropy2ndShift: 0 + - _Anisotropy2ndShiftNoiseScale: 0 + - _Anisotropy2ndSpecularStrength: 0 + - _Anisotropy2ndTangentWidth: 1 + - _AnisotropyBitangentWidth: 1 + - _AnisotropyScale: 1 + - _AnisotropyShift: 0 + - _AnisotropyShiftNoiseScale: 0 + - _AnisotropySpecularStrength: 1 + - _AnisotropyTangentWidth: 1 + - _ApplyReflection: 0 + - _ApplySpecular: 1 + - _ApplySpecularFA: 1 + - _AsOverlay: 0 + - _AsUnlit: 0 + - _AudioLink2Emission: 0 + - _AudioLink2Emission2nd: 0 + - _AudioLink2Emission2ndGrad: 0 + - _AudioLink2EmissionGrad: 0 + - _AudioLink2Main2nd: 0 + - _AudioLink2Main3rd: 0 + - _AudioLink2Vertex: 0 + - _AudioLinkAsLocal: 0 + - _AudioLinkMask_UVMode: 0 + - _AudioLinkUVMode: 1 + - _AudioLinkVertexUVMode: 1 + - _BackfaceForceShadow: 0 + - _BacklightBackfaceMask: 1 + - _BacklightBlur: 0.05 + - _BacklightBorder: 0.35 + - _BacklightDirectivity: 5 + - _BacklightMainStrength: 0 + - _BacklightNormalStrength: 1 + - _BacklightReceiveShadow: 1 + - _BacklightViewStrength: 1 + - _BeforeExposureLimit: 10000 + - _BitKey0: 0 + - _BitKey1: 0 + - _BitKey10: 0 + - _BitKey11: 0 + - _BitKey12: 0 + - _BitKey13: 0 + - _BitKey14: 0 + - _BitKey15: 0 + - _BitKey16: 0 + - _BitKey17: 0 + - _BitKey18: 0 + - _BitKey19: 0 + - _BitKey2: 0 + - _BitKey20: 0 + - _BitKey21: 0 + - _BitKey22: 0 + - _BitKey23: 0 + - _BitKey24: 0 + - _BitKey25: 0 + - _BitKey26: 0 + - _BitKey27: 0 + - _BitKey28: 0 + - _BitKey29: 0 + - _BitKey3: 0 + - _BitKey30: 0 + - _BitKey31: 0 + - _BitKey4: 0 + - _BitKey5: 0 + - _BitKey6: 0 + - _BitKey7: 0 + - _BitKey8: 0 + - _BitKey9: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 + - _BlendOp: 0 + - _BlendOpAlpha: 0 + - _BlendOpAlphaFA: 4 + - _BlendOpFA: 4 + - _Bump2ndMap_UVMode: 0 + - _Bump2ndScale: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 + - _ColorMask: 15 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 + - _DissolveNoiseStrength: 0.1 + - _DistanceFadeMode: 0 + - _DistanceFadeRimFresnelPower: 5 + - _DitherMaxValue: 255 - _DstBlend: 0 - _DstBlendAlpha: 0 + - _DstBlendAlphaFA: 1 + - _DstBlendFA: 1 + - _DummyProperty: 0 + - _Emission2ndBlend: 1 + - _Emission2ndBlendMode: 1 + - _Emission2ndFluorescence: 0 + - _Emission2ndGradSpeed: 1 + - _Emission2ndMainStrength: 0 + - _Emission2ndMap_UVMode: 0 + - _Emission2ndParallaxDepth: 0 + - _Emission2ndUseGrad: 0 + - _EmissionBlend: 1 + - _EmissionBlendMode: 1 + - _EmissionFluorescence: 0 + - _EmissionGradSpeed: 1 + - _EmissionMainStrength: 0 + - _EmissionMap_UVMode: 0 + - _EmissionParallaxDepth: 0 + - _EmissionUseGrad: 0 - _EnvironmentReflections: 1 + - _FlipNormal: 0 + - _GSAAStrength: 0 + - _GlitterAngleRandomize: 0 + - _GlitterApplyShape: 0 + - _GlitterApplyTransparency: 1 + - _GlitterBackfaceMask: 0 + - _GlitterColorTex_UVMode: 0 + - _GlitterEnableLighting: 1 + - _GlitterMainStrength: 0 + - _GlitterNormalStrength: 1 + - _GlitterPostContrast: 1 + - _GlitterScaleRandomize: 0 + - _GlitterSensitivity: 0.25 + - _GlitterShadowMask: 0 + - _GlitterUVMode: 0 + - _GlitterVRParallaxStrength: 0 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 + - _IDMask1: 0 + - _IDMask2: 0 + - _IDMask3: 0 + - _IDMask4: 0 + - _IDMask5: 0 + - _IDMask6: 0 + - _IDMask7: 0 + - _IDMask8: 0 + - _IDMaskCompile: 0 + - _IDMaskControlsDissolve: 0 + - _IDMaskFrom: 8 + - _IDMaskIndex1: 0 + - _IDMaskIndex2: 0 + - _IDMaskIndex3: 0 + - _IDMaskIndex4: 0 + - _IDMaskIndex5: 0 + - _IDMaskIndex6: 0 + - _IDMaskIndex7: 0 + - _IDMaskIndex8: 0 + - _IDMaskIsBitmap: 0 + - _IDMaskPrior1: 0 + - _IDMaskPrior2: 0 + - _IDMaskPrior3: 0 + - _IDMaskPrior4: 0 + - _IDMaskPrior5: 0 + - _IDMaskPrior6: 0 + - _IDMaskPrior7: 0 + - _IDMaskPrior8: 0 + - _IgnoreEncryption: 0 + - _Invisible: 0 + - _LightMaxLimit: 1 + - _LightMinLimit: 0.05 + - _Main2ndDissolveNoiseStrength: 0.1 + - _Main2ndEnableLighting: 1 + - _Main2ndTexAlphaMode: 0 + - _Main2ndTexAngle: 0 + - _Main2ndTexBlendMode: 0 + - _Main2ndTexIsDecal: 0 + - _Main2ndTexIsLeftOnly: 0 + - _Main2ndTexIsMSDF: 0 + - _Main2ndTexIsRightOnly: 0 + - _Main2ndTexShouldCopy: 0 + - _Main2ndTexShouldFlipCopy: 0 + - _Main2ndTexShouldFlipMirror: 0 + - _Main2ndTex_Cull: 0 + - _Main2ndTex_UVMode: 0 + - _Main3rdDissolveNoiseStrength: 0.1 + - _Main3rdEnableLighting: 1 + - _Main3rdTexAlphaMode: 0 + - _Main3rdTexAngle: 0 + - _Main3rdTexBlendMode: 0 + - _Main3rdTexIsDecal: 0 + - _Main3rdTexIsLeftOnly: 0 + - _Main3rdTexIsMSDF: 0 + - _Main3rdTexIsRightOnly: 0 + - _Main3rdTexShouldCopy: 0 + - _Main3rdTexShouldFlipCopy: 0 + - _Main3rdTexShouldFlipMirror: 0 + - _Main3rdTex_Cull: 0 + - _Main3rdTex_UVMode: 0 + - _MainGradationStrength: 0 + - _MatCap2ndApplyTransparency: 1 + - _MatCap2ndBackfaceMask: 0 + - _MatCap2ndBlend: 1 + - _MatCap2ndBlendMode: 1 + - _MatCap2ndBumpScale: 1 + - _MatCap2ndCustomNormal: 0 + - _MatCap2ndEnableLighting: 1 + - _MatCap2ndLod: 0 + - _MatCap2ndMainStrength: 0 + - _MatCap2ndNormalStrength: 1 + - _MatCap2ndPerspective: 1 + - _MatCap2ndShadowMask: 0 + - _MatCap2ndVRParallaxStrength: 1 + - _MatCap2ndZRotCancel: 1 + - _MatCapApplyTransparency: 1 + - _MatCapBackfaceMask: 0 + - _MatCapBlend: 1 + - _MatCapBlendMode: 1 + - _MatCapBumpScale: 1 + - _MatCapCustomNormal: 0 + - _MatCapEnableLighting: 1 + - _MatCapLod: 0 + - _MatCapMainStrength: 0 + - _MatCapNormalStrength: 1 + - _MatCapPerspective: 1 + - _MatCapShadowMask: 0 + - _MatCapVRParallaxStrength: 1 + - _MatCapZRotCancel: 1 - _Metallic: 0 - _Mode: 0 + - _MonochromeLighting: 0 - _OcclusionStrength: 1 + - _OffsetFactor: 0 + - _OffsetUnits: 0 + - _OutlineAlphaToMask: 0 + - _OutlineBlendOp: 0 + - _OutlineBlendOpAlpha: 0 + - _OutlineBlendOpAlphaFA: 4 + - _OutlineBlendOpFA: 4 + - _OutlineColorMask: 15 + - _OutlineCull: 1 + - _OutlineDeleteMesh: 0 + - _OutlineDisableInVR: 0 + - _OutlineDstBlend: 0 + - _OutlineDstBlendAlpha: 10 + - _OutlineDstBlendAlphaFA: 1 + - _OutlineDstBlendFA: 1 + - _OutlineEnableLighting: 1 + - _OutlineFixWidth: 0.5 + - _OutlineLitApplyTex: 0 + - _OutlineLitOffset: -8 + - _OutlineLitScale: 10 + - _OutlineLitShadowReceive: 0 + - _OutlineOffsetFactor: 0 + - _OutlineOffsetUnits: 0 + - _OutlineSrcBlend: 1 + - _OutlineSrcBlendAlpha: 1 + - _OutlineSrcBlendAlphaFA: 0 + - _OutlineSrcBlendFA: 1 + - _OutlineStencilComp: 8 + - _OutlineStencilFail: 0 + - _OutlineStencilPass: 0 + - _OutlineStencilReadMask: 255 + - _OutlineStencilRef: 0 + - _OutlineStencilWriteMask: 255 + - _OutlineStencilZFail: 0 + - _OutlineVectorScale: 1 + - _OutlineVectorUVMode: 0 + - _OutlineVertexR2Width: 0 + - _OutlineWidth: 0.08 + - _OutlineZBias: 0 + - _OutlineZClip: 1 + - _OutlineZTest: 2 + - _OutlineZWrite: 1 - _Parallax: 0.02 + - _ParallaxOffset: 0.5 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _Reflectance: 0.04 + - _ReflectionApplyTransparency: 1 + - _ReflectionBlendMode: 1 + - _ReflectionCubeEnableLighting: 1 + - _ReflectionCubeOverride: 0 + - _ReflectionNormalStrength: 1 + - _RimApplyTransparency: 1 + - _RimBackfaceMask: 1 + - _RimBlendMode: 1 + - _RimBlur: 0.65 + - _RimBorder: 0.5 + - _RimDirRange: 0 + - _RimDirStrength: 0 + - _RimEnableLighting: 1 + - _RimFresnelPower: 3.5 + - _RimIndirBlur: 0.1 + - _RimIndirBorder: 0.5 + - _RimIndirRange: 0 + - _RimMainStrength: 0 + - _RimNormalStrength: 1 + - _RimShadeBlur: 1 + - _RimShadeBorder: 0.5 + - _RimShadeFresnelPower: 1 + - _RimShadeNormalStrength: 1 + - _RimShadowMask: 0.5 + - _RimVRParallaxStrength: 1 + - _Shadow2ndBlur: 0.1 + - _Shadow2ndBorder: 0.15 + - _Shadow2ndNormalStrength: 1 + - _Shadow2ndReceive: 0 + - _Shadow3rdBlur: 0.1 + - _Shadow3rdBorder: 0.25 + - _Shadow3rdNormalStrength: 1 + - _Shadow3rdReceive: 0 + - _ShadowBlur: 0.1 + - _ShadowBlurMaskLOD: 0 + - _ShadowBorder: 0.5 + - _ShadowBorderMaskLOD: 0 + - _ShadowBorderRange: 0.08 + - _ShadowColorType: 0 + - _ShadowEnvStrength: 0 + - _ShadowFlatBlur: 1 + - _ShadowFlatBorder: 1 + - _ShadowMainStrength: 0 + - _ShadowMaskType: 0 + - _ShadowNormalStrength: 1 + - _ShadowPostAO: 0 + - _ShadowReceive: 0 + - _ShadowStrength: 1 + - _ShadowStrengthMaskLOD: 0 + - _ShiftBackfaceUV: 0 - _Smoothness: 0 - _SmoothnessTextureChannel: 0 + - _SpecularBlur: 0 + - _SpecularBorder: 0.5 - _SpecularHighlights: 1 + - _SpecularNormalStrength: 1 + - _SpecularToon: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 + - _SrcBlendAlphaFA: 0 + - _SrcBlendFA: 1 + - _StencilComp: 8 + - _StencilFail: 0 + - _StencilPass: 0 + - _StencilReadMask: 255 + - _StencilRef: 0 + - _StencilWriteMask: 255 + - _StencilZFail: 0 + - _SubpassCutoff: 0.5 - _Surface: 0 + - _TessEdge: 10 + - _TessFactorMax: 3 + - _TessShrink: 0 + - _TessStrength: 0.5 + - _TransparentMode: 0 + - _UDIMDiscardCompile: 0 + - _UDIMDiscardMode: 0 + - _UDIMDiscardRow0_0: 0 + - _UDIMDiscardRow0_1: 0 + - _UDIMDiscardRow0_2: 0 + - _UDIMDiscardRow0_3: 0 + - _UDIMDiscardRow1_0: 0 + - _UDIMDiscardRow1_1: 0 + - _UDIMDiscardRow1_2: 0 + - _UDIMDiscardRow1_3: 0 + - _UDIMDiscardRow2_0: 0 + - _UDIMDiscardRow2_1: 0 + - _UDIMDiscardRow2_2: 0 + - _UDIMDiscardRow2_3: 0 + - _UDIMDiscardRow3_0: 0 + - _UDIMDiscardRow3_1: 0 + - _UDIMDiscardRow3_2: 0 + - _UDIMDiscardRow3_3: 0 + - _UDIMDiscardUV: 0 - _UVSec: 0 + - _UseAnisotropy: 0 + - _UseAudioLink: 0 + - _UseBacklight: 0 + - _UseBump2ndMap: 0 + - _UseBumpMap: 0 + - _UseClippingCanceller: 0 + - _UseDither: 0 + - _UseEmission: 0 + - _UseEmission2nd: 0 + - _UseGlitter: 0 + - _UseMain2ndTex: 0 + - _UseMain3rdTex: 0 + - _UseMatCap: 0 + - _UseMatCap2nd: 0 + - _UseOutline: 0 + - _UsePOM: 0 + - _UseParallax: 0 + - _UseReflection: 0 + - _UseRim: 0 + - _UseRimShade: 0 + - _UseShadow: 0 + - _VertexLightStrength: 0 - _WorkflowMode: 1 + - _ZClip: 1 + - _ZTest: 4 - _ZWrite: 1 + - _e2gai: 2 + - _e2gci: 2 + - _egai: 2 + - _egci: 2 + - _lilDirectionalLightStrength: 1 + - _lilShadowCasterBias: 0 + - _lilToonVersion: 45 m_Colors: - - _BaseColor: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1} - - _Color: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1} + - _AudioLinkDefaultValue: {r: 0, g: 0, b: 2, a: 0.75} + - _AudioLinkLocalMapParams: {r: 120, g: 1, b: 0, a: 0} + - _AudioLinkMask_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} + - _AudioLinkStart: {r: 0, g: 0, b: 0, a: 0} + - _AudioLinkUVParams: {r: 0.25, g: 0, b: 0, a: 0.125} + - _AudioLinkVertexStart: {r: 0, g: 0, b: 0, a: 0} + - _AudioLinkVertexStrength: {r: 0, g: 0, b: 0, a: 1} + - _AudioLinkVertexUVParams: {r: 0.25, g: 0, b: 0, a: 0.125} + - _BackfaceColor: {r: 0, g: 0, b: 0, a: 0} + - _BacklightColor: {r: 0.85, g: 0.8, b: 0.7, a: 1} + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color2nd: {r: 1, g: 1, b: 1, a: 1} + - _Color3rd: {r: 1, g: 1, b: 1, a: 1} + - _DissolveColor: {r: 1, g: 1, b: 1, a: 1} + - _DissolveNoiseMask_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} + - _DissolveParams: {r: 0, g: 0, b: 0.5, a: 0.1} + - _DissolvePos: {r: 0, g: 0, b: 0, a: 0} + - _DistanceFade: {r: 0.1, g: 0.01, b: 0, a: 0} + - _DistanceFadeColor: {r: 0, g: 0, b: 0, a: 1} + - _DistanceFadeRimColor: {r: 0, g: 0, b: 0, a: 0} + - _Emission2ndBlendMask_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} + - _Emission2ndBlink: {r: 0, g: 0, b: 3.141593, a: 0} + - _Emission2ndColor: {r: 1, g: 1, b: 1, a: 1} + - _Emission2ndMap_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} + - _EmissionBlendMask_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} + - _EmissionBlink: {r: 0, g: 0, b: 3.141593, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionMap_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} + - _GlitterAtras: {r: 1, g: 1, b: 0, a: 0} + - _GlitterColor: {r: 1, g: 1, b: 1, a: 1} + - _GlitterParams1: {r: 256, g: 256, b: 0.16, a: 50} + - _GlitterParams2: {r: 0.25, g: 0, b: 0, a: 0} + - _Keys: {r: 0, g: 0, b: 0, a: 0} + - _LightDirectionOverride: {r: 0.001, g: 0.002, b: 0.001, a: 0} + - _Main2ndDissolveColor: {r: 1, g: 1, b: 1, a: 1} + - _Main2ndDissolveNoiseMask_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} + - _Main2ndDissolveParams: {r: 0, g: 0, b: 0.5, a: 0.1} + - _Main2ndDissolvePos: {r: 0, g: 0, b: 0, a: 0} + - _Main2ndDistanceFade: {r: 0.1, g: 0.01, b: 0, a: 0} + - _Main2ndTexDecalAnimation: {r: 1, g: 1, b: 1, a: 30} + - _Main2ndTexDecalSubParam: {r: 1, g: 1, b: 0, a: 1} + - _Main2ndTex_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} + - _Main3rdDissolveColor: {r: 1, g: 1, b: 1, a: 1} + - _Main3rdDissolveNoiseMask_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} + - _Main3rdDissolveParams: {r: 0, g: 0, b: 0.5, a: 0.1} + - _Main3rdDissolvePos: {r: 0, g: 0, b: 0, a: 0} + - _Main3rdDistanceFade: {r: 0.1, g: 0.01, b: 0, a: 0} + - _Main3rdTexDecalAnimation: {r: 1, g: 1, b: 1, a: 30} + - _Main3rdTexDecalSubParam: {r: 1, g: 1, b: 0, a: 1} + - _Main3rdTex_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} + - _MainTexHSVG: {r: 0, g: 1, b: 1, a: 1} + - _MainTex_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} + - _MatCap2ndBlendUV1: {r: 0, g: 0, b: 0, a: 0} + - _MatCap2ndColor: {r: 1, g: 1, b: 1, a: 1} + - _MatCapBlendUV1: {r: 0, g: 0, b: 0, a: 0} + - _MatCapColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0.6, g: 0.56, b: 0.73, a: 1} + - _OutlineLitColor: {r: 1, g: 0.19999996, b: 0, a: 0} + - _OutlineTexHSVG: {r: 0, g: 1, b: 1, a: 1} + - _OutlineTex_ScrollRotate: {r: 0, g: 0, b: 0, a: 0} + - _ReflectionColor: {r: 1, g: 1, b: 1, a: 1} + - _ReflectionCubeColor: {r: 0, g: 0, b: 0, a: 1} + - _RimColor: {r: 0.65999997, g: 0.5, b: 0.47999996, a: 1} + - _RimIndirColor: {r: 1, g: 1, b: 1, a: 1} + - _RimShadeColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + - _Shadow2ndColor: {r: 0.68, g: 0.65999997, b: 0.78999996, a: 1} + - _Shadow3rdColor: {r: 0, g: 0, b: 0, a: 0} + - _ShadowAOShift: {r: 1, g: 0, b: 1, a: 0} + - _ShadowAOShift2: {r: 1, g: 0, b: 1, a: 0} + - _ShadowBorderColor: {r: 1, g: 0.09999997, b: 0, a: 1} + - _ShadowColor: {r: 0.82, g: 0.76, b: 0.85, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _e2ga0: {r: 1, g: 0, b: 0, a: 0} + - _e2ga1: {r: 1, g: 0, b: 0, a: 1} + - _e2ga2: {r: 1, g: 0, b: 0, a: 0} + - _e2ga3: {r: 1, g: 0, b: 0, a: 0} + - _e2ga4: {r: 1, g: 0, b: 0, a: 0} + - _e2ga5: {r: 1, g: 0, b: 0, a: 0} + - _e2ga6: {r: 1, g: 0, b: 0, a: 0} + - _e2ga7: {r: 1, g: 0, b: 0, a: 0} + - _e2gc0: {r: 1, g: 1, b: 1, a: 0} + - _e2gc1: {r: 1, g: 1, b: 1, a: 1} + - _e2gc2: {r: 1, g: 1, b: 1, a: 0} + - _e2gc3: {r: 1, g: 1, b: 1, a: 0} + - _e2gc4: {r: 1, g: 1, b: 1, a: 0} + - _e2gc5: {r: 1, g: 1, b: 1, a: 0} + - _e2gc6: {r: 1, g: 1, b: 1, a: 0} + - _e2gc7: {r: 1, g: 1, b: 1, a: 0} + - _ega0: {r: 1, g: 0, b: 0, a: 0} + - _ega1: {r: 1, g: 0, b: 0, a: 1} + - _ega2: {r: 1, g: 0, b: 0, a: 0} + - _ega3: {r: 1, g: 0, b: 0, a: 0} + - _ega4: {r: 1, g: 0, b: 0, a: 0} + - _ega5: {r: 1, g: 0, b: 0, a: 0} + - _ega6: {r: 1, g: 0, b: 0, a: 0} + - _ega7: {r: 1, g: 0, b: 0, a: 0} + - _egc0: {r: 1, g: 1, b: 1, a: 0} + - _egc1: {r: 1, g: 1, b: 1, a: 1} + - _egc2: {r: 1, g: 1, b: 1, a: 0} + - _egc3: {r: 1, g: 1, b: 1, a: 0} + - _egc4: {r: 1, g: 1, b: 1, a: 0} + - _egc5: {r: 1, g: 1, b: 1, a: 0} + - _egc6: {r: 1, g: 1, b: 1, a: 0} + - _egc7: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] m_AllowLocking: 1 --- !u!114 &5197786610425732457 diff --git a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_250504_스트릿/치요_250504_스트릿_01_Edit.prefab b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_250504_스트릿/치요_250504_스트릿_01_Edit.prefab index 70495a17..c41476ba 100644 --- a/Assets/ResourcesData/Character/@003_치요/Avatar/치요_250504_스트릿/치요_250504_스트릿_01_Edit.prefab +++ b/Assets/ResourcesData/Character/@003_치요/Avatar/치요_250504_스트릿/치요_250504_스트릿_01_Edit.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:118bbd85c9dc3f7fa04c89f3f02d7097365b4632de55fbf059fc4b7e6cda851a -size 1712635 +oid sha256:55ea0b6292e0e87ed6e11f684d07cf972f392bfe20a24937ed946d764e8657ed +size 913693 diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_250504_멜로우퍼프/Materials/Shinano_costume_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_250504_멜로우퍼프/Materials/Shinano_costume_Copy.mat index dcf42267..0045b609 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_250504_멜로우퍼프/Materials/Shinano_costume_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_250504_멜로우퍼프/Materials/Shinano_costume_Copy.mat @@ -699,8 +699,8 @@ Material: - _AudioLinkVertexUVParams: {r: 0.25, g: 0, b: 0, a: 0.125} - _BackfaceColor: {r: 0, g: 0, b: 0, a: 0} - _BacklightColor: {r: 0.85, g: 0.8, b: 0.7, a: 1} - - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _Color2nd: {r: 1, g: 1, b: 1, a: 1} - _Color3rd: {r: 1, g: 1, b: 1, a: 1} - _DissolveColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_250504_멜로우퍼프/Materials/body_Copy.mat b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_250504_멜로우퍼프/Materials/body_Copy.mat index 81d3840e..0439d74c 100644 --- a/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_250504_멜로우퍼프/Materials/body_Copy.mat +++ b/Assets/ResourcesData/Character/@004_김마늘/Avatar/김마늘_250504_멜로우퍼프/Materials/body_Copy.mat @@ -8,12 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: body_Copy - m_Shader: {fileID: 4800000, guid: df12117ecd77c31469c224178886498e, type: 3} + m_Shader: {fileID: 4800000, guid: efa77a80ca0344749b4f19fdd5891cbe, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: - - _OCCLUSIONMAP + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -57,7 +56,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: aaf6f951d0734a440a42ccda9d5c6a84, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseMap: @@ -890,7 +889,7 @@ Material: - _DitherFadeoutNormalScaleFix: 1 - _DitherMaxValue: 255 - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlendAlpha: 10 - _DstBlendAlphaFA: 1 - _DstBlendFA: 1 - _DummyProperty: 0 @@ -1214,7 +1213,7 @@ Material: - _OutlineVectorScale: 1 - _OutlineVectorUVMode: 0 - _OutlineVertexR2Width: 0 - - _OutlineWidth: 0.5 + - _OutlineWidth: 0.06 - _OutlineWidthExtraMultiplier: 1 - _OutlineZBias: 0 - _OutlineZClip: 1 @@ -1540,7 +1539,7 @@ Material: - _BackFaceTintColor: {r: 1, g: 1, b: 1, a: 1} - _BackfaceColor: {r: 0, g: 0, b: 0, a: 0} - _BacklightColor: {r: 0.85, g: 0.8, b: 0.7, a: 1} - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 1, g: 0.96862745, b: 0.96862745, a: 1} - _BaseColor2: {r: 1, g: 1, b: 1, a: 1} - _BaseMapStackingLayer10MaskTexChannel: {r: 0, g: 1, b: 0, a: 0} - _BaseMapStackingLayer10TexUVAnimSpeed: {r: 0, g: 0, b: 0, a: 0} @@ -1598,7 +1597,7 @@ Material: - _CharacterAreaColorFillTextureUVScrollSpeed: {r: 0, g: 0, b: 0, a: 1} - _CharacterAreaColorFillTextureUVTilingOffset: {r: 1, g: 1, b: 0, a: 0} - _CharacterBoundCenterPosWS: {r: 0, g: 0, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 0.96862745, b: 0.96862745, a: 1} - _Color2nd: {r: 1, g: 1, b: 1, a: 1} - _Color3rd: {r: 1, g: 1, b: 1, a: 1} - _DepthTexRimLightAndShadowWidthMultiplierFromVertexColorChannelMask: {r: 0, g: 1, b: 0, a: 0} @@ -1696,7 +1695,7 @@ Material: - _MatCapUVTiling: {r: 1, g: 1, b: 0, a: 0} - _NiloToonSelfShadowMappingTintColor: {r: 1, g: 1, b: 1, a: 1} - _OcclusionMapChannelMask: {r: 0, g: 1, b: 0, a: 0} - - _OutlineColor: {r: 0.6, g: 0.56, b: 0.73, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} - _OutlineLitColor: {r: 1, g: 0.19999996, b: 0, a: 0} - _OutlineOcclusionAreaTintColor: {r: 1, g: 1, b: 1, a: 1} - _OutlinePreLightingReplaceColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/ResourcesData/Etc/Fake Shadow/Fake Shadow_Pos.prefab b/Assets/ResourcesData/Etc/Fake Shadow/Fake Shadow_Pos.prefab index 0015aefb..1e9064c2 100644 --- a/Assets/ResourcesData/Etc/Fake Shadow/Fake Shadow_Pos.prefab +++ b/Assets/ResourcesData/Etc/Fake Shadow/Fake Shadow_Pos.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd5b962a1b619c7c7f8ec676c9d38d20ed4a62407f8d5d5420370ac4a6f31245 -size 7840 +oid sha256:015c1962357ca99f6877aa0f0448651e7a0446edd56dcea218e76b90021bf795 +size 7809 diff --git a/Assets/ResourcesData/Etc/Fantasy Skybox/Cubemaps/Classic/FS000_Day_01.mat b/Assets/ResourcesData/Etc/Fantasy Skybox/Cubemaps/Classic/FS000_Day_01.mat index 2b93751f..093ab5f2 100644 --- a/Assets/ResourcesData/Etc/Fantasy Skybox/Cubemaps/Classic/FS000_Day_01.mat +++ b/Assets/ResourcesData/Etc/Fantasy Skybox/Cubemaps/Classic/FS000_Day_01.mat @@ -2,20 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: FS000_Day_01 m_Shader: {fileID: 103, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _MAPPING_LATITUDE_LONGITUDE_LAYOUT + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _MAPPING_LATITUDE_LONGITUDE_LAYOUT m_LightmapFlags: 5 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -51,6 +56,7 @@ Material: m_Texture: {fileID: 2800000, guid: 2c76d37ffceed4757b073a103989f976, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Exposure: 1 - _ImageType: 0 @@ -61,3 +67,5 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _Tint: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 0.5019608} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ResourcesData/Etc/Prop/School Class Desk Chair/Glb/School Classroom Desk Chair.glb.meta b/Assets/ResourcesData/Etc/Prop/School Class Desk Chair/Glb/School Classroom Desk Chair.glb.meta index 515fccfe..1ec0d784 100644 --- a/Assets/ResourcesData/Etc/Prop/School Class Desk Chair/Glb/School Classroom Desk Chair.glb.meta +++ b/Assets/ResourcesData/Etc/Prop/School Class Desk Chair/Glb/School Classroom Desk Chair.glb.meta @@ -8,5 +8,5 @@ ScriptedImporter: assetBundleName: assetBundleVariant: script: {fileID: 11500000, guid: cc45016b844e7624dae3aec10fb443ea, type: 3} - reverseAxis: 0 - renderPipeline: 0 + reverseAxis: 2 + renderPipeline: 1 diff --git a/Assets/ResourcesData/Project/250505_Chiyo/250505_Chiyo_Avatars.unity b/Assets/ResourcesData/Project/250505_Chiyo/250505_Chiyo_Avatars.unity index 9eed16b0..533cacb7 100644 --- a/Assets/ResourcesData/Project/250505_Chiyo/250505_Chiyo_Avatars.unity +++ b/Assets/ResourcesData/Project/250505_Chiyo/250505_Chiyo_Avatars.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10bca006219a7dd3f97fe589d89cf070a6246f569052a03474c07cc7a257d1c2 -size 98824 +oid sha256:30afc7e4d61cb988b0e9b774371e9cd2775432ff5856d2b7c3bb50216b5c5d6a +size 445552 diff --git a/Assets/Scripts/KindRetargeting/LimbWeightController.cs b/Assets/Scripts/KindRetargeting/LimbWeightController.cs index 72886165..7221f485 100644 --- a/Assets/Scripts/KindRetargeting/LimbWeightController.cs +++ b/Assets/Scripts/KindRetargeting/LimbWeightController.cs @@ -135,7 +135,32 @@ namespace KindRetargeting private void Gethnad() { - //손탐지 로직 넣기 + // 모든 LimbWeightController 찾기 + LimbWeightController[] allControllers = FindObjectsOfType(); + + foreach (LimbWeightController controller in allControllers) + { + // 자기 자신은 제외 + if (controller == this) continue; + + // CustomRetargetingScript 가져오기 + CustomRetargetingScript otherCrs = controller.GetComponent(); + if (otherCrs == null) continue; + + // 왼손과 오른손 Transform 가져오기 + Transform leftHand = otherCrs.sourceAnimator.GetBoneTransform(HumanBodyBones.LeftHand); + Transform rightHand = otherCrs.sourceAnimator.GetBoneTransform(HumanBodyBones.RightHand); + + // 손이 존재하면 props 리스트에 추가 + if (leftHand != null) + { + props.Add(leftHand); + } + if (rightHand != null) + { + props.Add(rightHand); + } + } } private void InitWeightLayers()