From 67cb3b3dbf2c38d7e64a0f39d61cf15a8b668e75 Mon Sep 17 00:00:00 2001 From: Harrison Hough Date: Mon, 8 Jul 2024 14:04:06 +0300 Subject: [PATCH] Feature/shader override update (#306) - shader override functionality rework to support other property types --- .../UI/CustomEditors/AvatarConfigEditor.cs | 140 +- LICENSE.md | 2 +- .../Prefabs/RPM_Template_Avatar_XR.prefab | 2408 +++++++++++------ .../Data/ScriptableObjects/AvatarConfig.cs | 13 + Runtime/Core/Scripts/Data/ShaderProperty.cs | 74 + .../Scripts/Operations/AvatarProcessor.cs | 53 +- Tests/Editor/AvatarConfigProcessorTests.cs | 2 +- Tests/Editor/AvatarLoaderWindowTests.cs | 15 +- 8 files changed, 1734 insertions(+), 973 deletions(-) diff --git a/Editor/Core/Scripts/UI/CustomEditors/AvatarConfigEditor.cs b/Editor/Core/Scripts/UI/CustomEditors/AvatarConfigEditor.cs index 448aff24..d5661a87 100644 --- a/Editor/Core/Scripts/UI/CustomEditors/AvatarConfigEditor.cs +++ b/Editor/Core/Scripts/UI/CustomEditors/AvatarConfigEditor.cs @@ -38,13 +38,14 @@ public class AvatarConfigEditor : UnityEditor.Editor private VisualElement root; private Action textureChannelChanged; + private SerializedProperty shaderPropertyMappingList; + public override VisualElement CreateInspectorGUI() { root = new VisualElement(); visualTreeAsset.CloneTree(root); - avatarConfigTarget = (AvatarConfig) target; - + shaderPropertyMappingList = serializedObject.FindProperty("ShaderPropertyMapping"); SetupLod(); SetupPose(); SetupTextureAtlas(); @@ -255,65 +256,106 @@ private void SetupShader() var shader = root.Q("ShaderOverride"); shader.SetValueWithoutNotify(avatarConfigTarget.Shader); + shader.RegisterValueChangedCallback(x => + { + avatarConfigTarget.Shader = (Shader) x.newValue; + Save(); + SetupShader(); + } + ); var shaderPropertiesContainer = root.Q("ShaderProperties"); - CreateShaderProperties(shaderPropertiesContainer); - - textureChannelChanged += () => ShowShaderProperties(shaderPropertiesContainer); - if (shader.value == null) + shaderPropertiesContainer.Clear(); + shaderPropertiesContainer.style.display = DisplayStyle.Flex; + shaderPropertiesContainer.style.flexDirection = FlexDirection.Column; + if (avatarConfigTarget.Shader == null) { shaderPropertiesContainer.style.display = DisplayStyle.None; } else { - ShowShaderProperties(shaderPropertiesContainer); - } - - shader.RegisterValueChangedCallback(x => + shaderPropertiesContainer.style.display = DisplayStyle.Flex; + shaderPropertiesContainer.style.marginTop = 10; + shaderPropertiesContainer.style.left = 10; + shaderPropertiesContainer.style.right = 10; + var titleRowContainer = new VisualElement(); + titleRowContainer.style.flexDirection = FlexDirection.Row; + titleRowContainer.style.marginBottom = 7; + titleRowContainer.style.marginTop = 7; + titleRowContainer.style.left = 10; + titleRowContainer.style.right = 10; + var sourceTitleField = new Label("Source Property") { - avatarConfigTarget.Shader = (Shader) x.newValue; - Save(); - if (x.newValue == null) + style = { - shaderPropertiesContainer.style.display = DisplayStyle.None; + width = 200, unityFontStyleAndWeight = FontStyle.Bold, // Make the text bold + unityTextAlign = TextAnchor.MiddleLeft } - else - { - ShowShaderProperties(shaderPropertiesContainer); - } - } - ); - } - - private void ShowShaderProperties(VisualElement shaderPropertiesContainer) - { - shaderPropertiesContainer.style.display = DisplayStyle.Flex; - foreach (var child in shaderPropertiesContainer.Children()) - { - if (avatarConfigTarget.TextureChannel.Contains((TextureChannel) Enum.Parse(typeof(TextureChannel), child.name))) + }; + titleRowContainer.Add(sourceTitleField); + var targetTitleField = new Label("Target Property") { - child.style.display = DisplayStyle.Flex; - } - else + style = { width = 200, marginRight = 10, flexGrow = 0.8f, unityFontStyleAndWeight = FontStyle.Bold, } + }; + titleRowContainer.Add(targetTitleField); + var typeTitleField = new Label("Type") { - child.style.display = DisplayStyle.None; - } - } - } - - private void CreateShaderProperties(VisualElement shaderPropertiesContainer) - { - foreach (TextureChannel textureChannel in Enum.GetValues(typeof(TextureChannel))) - { - var field = new TextField(textureChannel.ToString()); - field.name = textureChannel.ToString(); - var property = avatarConfigTarget.ShaderProperties.FindIndex(x => x.TextureChannel == textureChannel); - field.SetValueWithoutNotify(avatarConfigTarget.ShaderProperties[property].PropertyName); - field.RegisterValueChangedCallback(x => + style = { width = 70, alignSelf = Align.FlexEnd, unityFontStyleAndWeight = FontStyle.Bold, } + }; + titleRowContainer.Add(typeTitleField); + shaderPropertiesContainer.Add(titleRowContainer); + for (int i = 0; i < shaderPropertyMappingList.arraySize; i++) { - avatarConfigTarget.ShaderProperties[property].PropertyName = x.newValue; - Save(); - }); - shaderPropertiesContainer.Add(field); + SerializedProperty mapping = shaderPropertyMappingList.GetArrayElementAtIndex(i); + + var propertyContainer = new VisualElement(); + propertyContainer.style.flexDirection = FlexDirection.Column; + //propertyContainer.style.marginBottom = 10; + + var horizontalContainer = new VisualElement(); + horizontalContainer.style.flexDirection = FlexDirection.Row; + horizontalContainer.style.marginBottom = 7; + horizontalContainer.style.marginTop = 7; + horizontalContainer.style.left = 10; + horizontalContainer.style.right = 10; + // Alternating background colors + propertyContainer.style.backgroundColor = i % 2 == 0 ? new StyleColor(new Color(0.25f, 0.25f, 0.25f)) : new StyleColor(new Color(0.3f, 0.3f, 0.3f)); + + var sourcePropertyField = new Label(mapping.FindPropertyRelative("SourceProperty").stringValue) + { + style = + { + width = 200, unityFontStyleAndWeight = FontStyle.Bold, // Make the text bold + unityTextAlign = TextAnchor.MiddleLeft + } + }; + horizontalContainer.Add(sourcePropertyField); + + var targetPropertyField = new TextField + { + value = mapping.FindPropertyRelative("TargetProperty").stringValue, + //style = { flexGrow = 1, marginTop = 5 } + style = { width = 200, marginRight = 10, flexGrow = 0.8f } + }; + targetPropertyField.RegisterValueChangedCallback(evt => + { + mapping.FindPropertyRelative("TargetProperty").stringValue = evt.newValue; + Save(); + }); + horizontalContainer.Add(targetPropertyField); + + var propertyTypeField = new EnumField((ShaderPropertyType) mapping.FindPropertyRelative("Type").enumValueIndex) + { + style = { width = 70, alignSelf = Align.FlexEnd } + }; + propertyTypeField.RegisterValueChangedCallback(evt => + { + mapping.FindPropertyRelative("Type").enumValueIndex = (int) (ShaderPropertyType) evt.newValue; + Save(); + }); + horizontalContainer.Add(propertyTypeField); + propertyContainer.Add(horizontalContainer); + shaderPropertiesContainer.Add(propertyContainer); + } } } diff --git a/LICENSE.md b/LICENSE.md index 32f725b9..9785d781 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,7 @@ The MIT License (MIT) ===================== -Copyright © 2022 Ready Player Me +Copyright © 2024 Ready Player Me Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/Runtime/Core/Prefabs/RPM_Template_Avatar_XR.prefab b/Runtime/Core/Prefabs/RPM_Template_Avatar_XR.prefab index faeb2b1d..016a65a3 100644 --- a/Runtime/Core/Prefabs/RPM_Template_Avatar_XR.prefab +++ b/Runtime/Core/Prefabs/RPM_Template_Avatar_XR.prefab @@ -32,71 +32,7 @@ Transform: m_Father: {fileID: 5976559264272304134} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &46387676364772822 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3389019770639509815} - m_Layer: 0 - m_Name: RightFoot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3389019770639509815 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 46387676364772822} - m_LocalRotation: {x: 0.5075793, y: 0.01168566, z: -0.006884976, w: 0.8614983} - m_LocalPosition: {x: 9.858923e-10, y: 0.44385898, z: 0.0000000110740075} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 520747142562339256} - m_Father: {fileID: 6519879114355414834} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &61981311877114487 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 520747142562339256} - m_Layer: 0 - m_Name: RightToeBase - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &520747142562339256 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 61981311877114487} - m_LocalRotation: {x: 0.26795614, y: -0.045383528, z: 0.0126472805, w: 0.96227854} - m_LocalPosition: {x: 0.000000004663889, y: 0.14884391, z: -0.0000000031432137} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5761424782992724688} - m_Father: {fileID: 3389019770639509815} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &179465288756132349 +--- !u!1 &14179485482296018 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -104,37 +40,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3142139341261095415} - - component: {fileID: 2919256008897126051} + - component: {fileID: 2869701011446114756} + - component: {fileID: 428747979750558170} m_Layer: 0 - m_Name: Renderer_Glasses + m_Name: Renderer_Facewear m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3142139341261095415 +--- !u!4 &2869701011446114756 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 179465288756132349} + m_GameObject: {fileID: 14179485482296018} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 102036880391305847} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &2919256008897126051 +--- !u!137 &428747979750558170 SkinnedMeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 179465288756132349} + m_GameObject: {fileID: 14179485482296018} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -147,8 +83,7 @@ SkinnedMeshRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: 0} + m_Materials: [] m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -171,17 +106,150 @@ SkinnedMeshRenderer: m_SortingOrder: 0 serializedVersion: 2 m_Quality: 0 - m_UpdateWhenOffscreen: 0 + m_UpdateWhenOffscreen: 1 m_SkinnedMotionVectors: 1 m_Mesh: {fileID: 0} - m_Bones: [] - m_BlendShapeWeights: [] + m_Bones: + - {fileID: 653006319648011869} + - {fileID: 1742174952809795998} + - {fileID: 6086067838021744431} + - {fileID: 2964679435411402452} + - {fileID: 5313067685771254982} + - {fileID: 1753235285395614866} + - {fileID: 951800846783028410} + - {fileID: 2948841536725397666} + - {fileID: 1580807354009173943} + - {fileID: 2824212238030324271} + - {fileID: 7865147615622889260} + - {fileID: 6563755017700551969} + - {fileID: 8974411542560441870} + - {fileID: 6887086374748173657} + - {fileID: 7667547333101346925} + - {fileID: 1989977092641839893} + - {fileID: 4350197714668561955} + - {fileID: 6127256754085874755} + - {fileID: 3416984164707394624} + - {fileID: 2420220195915115111} + - {fileID: 7067762718269621414} + - {fileID: 8110688432950143261} + - {fileID: 5785110694936909839} + - {fileID: 7905697782806330321} + - {fileID: 6021118635121464414} + - {fileID: 1806134583476569231} + - {fileID: 7213558272655851157} + - {fileID: 8866075391529668115} + - {fileID: 434899538492123260} + - {fileID: 1471273207165568843} + - {fileID: 8508769269074860358} + - {fileID: 4107372925954991385} + - {fileID: 6312314621438057841} + - {fileID: 4190204734410134682} + - {fileID: 7416518633330449713} + - {fileID: 2131266308831145104} + - {fileID: 7793291723524511435} + - {fileID: 4074738206657261955} + - {fileID: 719487646799985610} + - {fileID: 9126021504029772081} + - {fileID: 1785639112329632868} + - {fileID: 2342670733928724441} + - {fileID: 3029142726222032024} + - {fileID: 5753698997921466609} + - {fileID: 1886610861357636765} + - {fileID: 6935826237939446495} + - {fileID: 562089331414282999} + - {fileID: 3020888731182475228} + - {fileID: 7229307272604099168} + - {fileID: 7330794086257368592} + - {fileID: 432152973721324744} + - {fileID: 7217032588521044530} + - {fileID: 6957610007672907683} + - {fileID: 6701623881660958862} + - {fileID: 6617194683241784411} + - {fileID: 5081918875725165678} + - {fileID: 7024168370948894233} + - {fileID: 5056127322786321012} + - {fileID: 6757651241381593229} + - {fileID: 817425539223292257} + - {fileID: 3174444511919147157} + - {fileID: 8314308576825104932} + - {fileID: 8618274981446302139} + - {fileID: 6677794194931965738} + - {fileID: 71720422140463150} + - {fileID: 2430903567846824004} + - {fileID: 6179925595560489140} + - {fileID: 5976559264272304134} + - {fileID: 1537187920367528200} + - {fileID: 6214955168804345297} + - {fileID: 1361118140237204316} + - {fileID: 5855246587918988030} + - {fileID: 2599065370091473185} + - {fileID: 1657208171033807971} + - {fileID: 1353839887058895065} + - {fileID: 8148467495373556574} + - {fileID: 4901479080994954998} + - {fileID: 6519879114355414834} + - {fileID: 3389019770639509815} + - {fileID: 520747142562339256} + - {fileID: 5761424782992724688} + m_BlendShapeWeights: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 m_RootBone: {fileID: 653006319648011869} m_AABB: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_DirtyAABB: 0 ---- !u!1 &333631273066913195 +--- !u!1 &46387676364772822 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -189,31 +257,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5753698997921466609} + - component: {fileID: 3389019770639509815} m_Layer: 0 - m_Name: RightForeArm + m_Name: RightFoot m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5753698997921466609 +--- !u!4 &3389019770639509815 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 333631273066913195} - m_LocalRotation: {x: -0.0004151094, y: -0.11467468, z: 0.00059804565, w: 0.99340284} - m_LocalPosition: {x: 0.000000006373739, y: 0.12970816, z: 0.00000007529161} + m_GameObject: {fileID: 46387676364772822} + m_LocalRotation: {x: 0.5075793, y: 0.01168566, z: -0.006884976, w: 0.8614983} + m_LocalPosition: {x: 9.858923e-10, y: 0.44385898, z: 0.0000000110740075} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1886610861357636765} - m_Father: {fileID: 3029142726222032024} + - {fileID: 520747142562339256} + m_Father: {fileID: 6519879114355414834} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &355605156797320747 +--- !u!1 &61981311877114487 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -221,30 +289,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8148467495373556574} + - component: {fileID: 520747142562339256} m_Layer: 0 - m_Name: LeftToe_End + m_Name: RightToeBase m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8148467495373556574 +--- !u!4 &520747142562339256 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 355605156797320747} - m_LocalRotation: {x: 0.006908051, y: -0.69842064, z: -0.017669877, w: 0.715436} - m_LocalPosition: {x: 0.0000010130461, y: 0.09907498, z: -0.0000000018626451} + m_GameObject: {fileID: 61981311877114487} + m_LocalRotation: {x: 0.26795614, y: -0.045383528, z: 0.0126472805, w: 0.96227854} + m_LocalPosition: {x: 0.000000004663889, y: 0.14884391, z: -0.0000000031432137} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1353839887058895065} + m_Children: + - {fileID: 5761424782992724688} + m_Father: {fileID: 3389019770639509815} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &523272850139422625 +--- !u!1 &333631273066913195 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -252,25 +321,88 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4190204734410134682} + - component: {fileID: 5753698997921466609} m_Layer: 0 - m_Name: LeftHandPinky3 + m_Name: RightForeArm m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4190204734410134682 +--- !u!4 &5753698997921466609 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 523272850139422625} - m_LocalRotation: {x: 0.11511232, y: 0.048729446, z: -0.0011097637, w: 0.99215597} - m_LocalPosition: {x: -0, y: 0.0000009313226, z: 0.020310964} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_GameObject: {fileID: 333631273066913195} + m_LocalRotation: {x: -0.0004151094, y: -0.11467468, z: 0.00059804565, w: 0.99340284} + m_LocalPosition: {x: 0.000000006373739, y: 0.12970816, z: 0.00000007529161} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1886610861357636765} + m_Father: {fileID: 3029142726222032024} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &355605156797320747 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8148467495373556574} + m_Layer: 0 + m_Name: LeftToe_End + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8148467495373556574 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 355605156797320747} + m_LocalRotation: {x: 0.006908051, y: -0.69842064, z: -0.017669877, w: 0.715436} + m_LocalPosition: {x: 0.0000010130461, y: 0.09907498, z: -0.0000000018626451} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1353839887058895065} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &523272850139422625 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4190204734410134682} + m_Layer: 0 + m_Name: LeftHandPinky3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4190204734410134682 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 523272850139422625} + m_LocalRotation: {x: 0.11511232, y: 0.048729446, z: -0.0011097637, w: 0.99215597} + m_LocalPosition: {x: -0, y: 0.0000009313226, z: 0.020310964} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7416518633330449713} m_Father: {fileID: 6312314621438057841} @@ -569,7 +701,7 @@ Transform: m_Father: {fileID: 6935826237939446495} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &903722800664473423 +--- !u!1 &917136830668235057 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -577,37 +709,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6231812889824038270} - - component: {fileID: 2135326974857759997} + - component: {fileID: 8707829238490915643} + - component: {fileID: 6229415717004424390} m_Layer: 0 - m_Name: Renderer_Avatar + m_Name: Renderer_EyeLeft m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6231812889824038270 +--- !u!4 &8707829238490915643 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 903722800664473423} + m_GameObject: {fileID: 917136830668235057} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 102036880391305847} - m_RootOrder: 13 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &2135326974857759997 +--- !u!137 &6229415717004424390 SkinnedMeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 903722800664473423} + m_GameObject: {fileID: 917136830668235057} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -621,7 +753,7 @@ SkinnedMeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 0} + - {fileID: -3655324315213880867, guid: dd1f9c886e182774f936520a12921cca, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -644,17 +776,150 @@ SkinnedMeshRenderer: m_SortingOrder: 0 serializedVersion: 2 m_Quality: 0 - m_UpdateWhenOffscreen: 0 + m_UpdateWhenOffscreen: 1 m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: 0} - m_Bones: [] - m_BlendShapeWeights: [] + m_Mesh: {fileID: -798518654966007424, guid: dd1f9c886e182774f936520a12921cca, type: 3} + m_Bones: + - {fileID: 653006319648011869} + - {fileID: 1742174952809795998} + - {fileID: 6086067838021744431} + - {fileID: 2964679435411402452} + - {fileID: 5313067685771254982} + - {fileID: 1753235285395614866} + - {fileID: 951800846783028410} + - {fileID: 2948841536725397666} + - {fileID: 1580807354009173943} + - {fileID: 2824212238030324271} + - {fileID: 7865147615622889260} + - {fileID: 6563755017700551969} + - {fileID: 8974411542560441870} + - {fileID: 6887086374748173657} + - {fileID: 7667547333101346925} + - {fileID: 1989977092641839893} + - {fileID: 4350197714668561955} + - {fileID: 6127256754085874755} + - {fileID: 3416984164707394624} + - {fileID: 2420220195915115111} + - {fileID: 7067762718269621414} + - {fileID: 8110688432950143261} + - {fileID: 5785110694936909839} + - {fileID: 7905697782806330321} + - {fileID: 6021118635121464414} + - {fileID: 1806134583476569231} + - {fileID: 7213558272655851157} + - {fileID: 8866075391529668115} + - {fileID: 434899538492123260} + - {fileID: 1471273207165568843} + - {fileID: 8508769269074860358} + - {fileID: 4107372925954991385} + - {fileID: 6312314621438057841} + - {fileID: 4190204734410134682} + - {fileID: 7416518633330449713} + - {fileID: 2131266308831145104} + - {fileID: 7793291723524511435} + - {fileID: 4074738206657261955} + - {fileID: 719487646799985610} + - {fileID: 9126021504029772081} + - {fileID: 1785639112329632868} + - {fileID: 2342670733928724441} + - {fileID: 3029142726222032024} + - {fileID: 5753698997921466609} + - {fileID: 1886610861357636765} + - {fileID: 6935826237939446495} + - {fileID: 562089331414282999} + - {fileID: 3020888731182475228} + - {fileID: 7229307272604099168} + - {fileID: 7330794086257368592} + - {fileID: 432152973721324744} + - {fileID: 7217032588521044530} + - {fileID: 6957610007672907683} + - {fileID: 6701623881660958862} + - {fileID: 6617194683241784411} + - {fileID: 5081918875725165678} + - {fileID: 7024168370948894233} + - {fileID: 5056127322786321012} + - {fileID: 6757651241381593229} + - {fileID: 817425539223292257} + - {fileID: 3174444511919147157} + - {fileID: 8314308576825104932} + - {fileID: 8618274981446302139} + - {fileID: 6677794194931965738} + - {fileID: 71720422140463150} + - {fileID: 2430903567846824004} + - {fileID: 6179925595560489140} + - {fileID: 5976559264272304134} + - {fileID: 1537187920367528200} + - {fileID: 6214955168804345297} + - {fileID: 1361118140237204316} + - {fileID: 5855246587918988030} + - {fileID: 2599065370091473185} + - {fileID: 1657208171033807971} + - {fileID: 1353839887058895065} + - {fileID: 8148467495373556574} + - {fileID: 4901479080994954998} + - {fileID: 6519879114355414834} + - {fileID: 3389019770639509815} + - {fileID: 520747142562339256} + - {fileID: 5761424782992724688} + m_BlendShapeWeights: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 m_RootBone: {fileID: 653006319648011869} m_AABB: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} - m_DirtyAABB: 0 ---- !u!1 &917136830668235057 + m_DirtyAABB: 1 +--- !u!1 &985270584509772965 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -662,37 +927,323 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8707829238490915643} - - component: {fileID: 6229415717004424390} + - component: {fileID: 2131266308831145104} m_Layer: 0 - m_Name: Renderer_EyeLeft + m_Name: Neck m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8707829238490915643 +--- !u!4 &2131266308831145104 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 985270584509772965} + m_LocalRotation: {x: 0.20306909, y: -0.0000000109485665, z: -0.00000009576376, w: 0.9791644} + m_LocalPosition: {x: 1.1146639e-13, y: 0.15557493, z: -0.00000001117585} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7793291723524511435} + m_Father: {fileID: 2964679435411402452} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1035550595059273801 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5313067685771254982} + m_Layer: 0 + m_Name: LeftShoulder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5313067685771254982 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035550595059273801} + m_LocalRotation: {x: 0.4708521, y: -0.56125146, z: 0.43453315, w: 0.5239046} + m_LocalPosition: {x: -0.047136005, y: 0.14114802, z: -0.0062549915} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1753235285395614866} + m_Father: {fileID: 2964679435411402452} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1037097576651194020 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2964679435411402452} + m_Layer: 0 + m_Name: Spine2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2964679435411402452 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1037097576651194020} + m_LocalRotation: {x: 0.047201388, y: 0.00000036116776, z: -0.000000121903, w: 0.9988854} + m_LocalPosition: {x: 1.7763568e-15, y: 0.12180678, z: -0.00000001862647} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5313067685771254982} + - {fileID: 2131266308831145104} + - {fileID: 1785639112329632868} + m_Father: {fileID: 6086067838021744431} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1074027020237734814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7217032588521044530} + m_Layer: 0 + m_Name: RightHandMiddle0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7217032588521044530 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1074027020237734814} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.0036099982, y: -0.0076479856, z: 0.034285985} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6957610007672907683} + m_Father: {fileID: 6935826237939446495} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1109424676887434065 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4074738206657261955} + m_Layer: 0 + m_Name: HeadTop_End + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4074738206657261955 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1109424676887434065} + m_LocalRotation: {x: -0.003611795, y: -0.00000026072615, z: -0.00000029764962, w: 0.9999935} + m_LocalPosition: {x: -2.7711167e-13, y: 0.22634402, z: 0.037322994} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7793291723524511435} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1312638176643943739 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2420220195915115111} + m_Layer: 0 + m_Name: LeftHandMiddle4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2420220195915115111 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1312638176643943739} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.00030900072, y: 0.0011371913, z: 0.02496392} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3416984164707394624} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1542947952568371595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2430903567846824004} + m_Layer: 0 + m_Name: RightHandThumb4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2430903567846824004 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1542947952568371595} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.00067012256, y: 0.0010259917, z: 0.024590973} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 71720422140463150} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1578962536893617747 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6021118635121464414} + m_Layer: 0 + m_Name: LeftHandRing4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6021118635121464414 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1578962536893617747} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.0002559647, y: 0.0016060378, z: 0.02432591} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7905697782806330321} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1857708808500866755 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6757651241381593229} + m_Layer: 0 + m_Name: RightHandRing2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6757651241381593229 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857708808500866755} + m_LocalRotation: {x: 0.30174065, y: -0.007293692, z: -0.039558083, w: 0.9525411} + m_LocalPosition: {x: -0.0000010244548, y: 0.00000003981404, z: 0.038994964} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 817425539223292257} + m_Father: {fileID: 5056127322786321012} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1996318751551711922 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2109267002371350211} + - component: {fileID: 2781162089379798594} + m_Layer: 0 + m_Name: Renderer_EyeRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2109267002371350211 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 917136830668235057} + m_GameObject: {fileID: 1996318751551711922} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 102036880391305847} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &6229415717004424390 +--- !u!137 &2781162089379798594 SkinnedMeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 917136830668235057} + m_GameObject: {fileID: 1996318751551711922} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -731,7 +1282,7 @@ SkinnedMeshRenderer: m_Quality: 0 m_UpdateWhenOffscreen: 1 m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: -798518654966007424, guid: dd1f9c886e182774f936520a12921cca, type: 3} + m_Mesh: {fileID: -5721790524815882852, guid: dd1f9c886e182774f936520a12921cca, type: 3} m_Bones: - {fileID: 653006319648011869} - {fileID: 1742174952809795998} @@ -872,7 +1423,7 @@ SkinnedMeshRenderer: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_DirtyAABB: 1 ---- !u!1 &985270584509772965 +--- !u!1 &2309274314351346536 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -880,97 +1431,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2131266308831145104} + - component: {fileID: 5855246587918988030} m_Layer: 0 - m_Name: Neck + m_Name: LeftUpLeg m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2131266308831145104 +--- !u!4 &5855246587918988030 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 985270584509772965} - m_LocalRotation: {x: 0.20306909, y: -0.0000000109485665, z: -0.00000009576376, w: 0.9791644} - m_LocalPosition: {x: 1.1146639e-13, y: 0.15557493, z: -0.00000001117585} + m_GameObject: {fileID: 2309274314351346536} + m_LocalRotation: {x: -0.0011102018, y: -0.009655561, z: -0.9999528, w: 0.000010876092} + m_LocalPosition: {x: -0.09534399, y: 0.00519189, z: -0.0033020005} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7793291723524511435} - m_Father: {fileID: 2964679435411402452} + - {fileID: 2599065370091473185} + m_Father: {fileID: 653006319648011869} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1035550595059273801 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5313067685771254982} - m_Layer: 0 - m_Name: LeftShoulder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5313067685771254982 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1035550595059273801} - m_LocalRotation: {x: 0.4708521, y: -0.56125146, z: 0.43453315, w: 0.5239046} - m_LocalPosition: {x: -0.047136005, y: 0.14114802, z: -0.0062549915} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1753235285395614866} - m_Father: {fileID: 2964679435411402452} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1037097576651194020 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2964679435411402452} - m_Layer: 0 - m_Name: Spine2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2964679435411402452 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1037097576651194020} - m_LocalRotation: {x: 0.047201388, y: 0.00000036116776, z: -0.000000121903, w: 0.9988854} - m_LocalPosition: {x: 1.7763568e-15, y: 0.12180678, z: -0.00000001862647} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5313067685771254982} - - {fileID: 2131266308831145104} - - {fileID: 1785639112329632868} - m_Father: {fileID: 6086067838021744431} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1074027020237734814 +--- !u!1 &2437346793933133647 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -978,124 +1463,33 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7217032588521044530} + - component: {fileID: 7793291723524511435} m_Layer: 0 - m_Name: RightHandMiddle0 + m_Name: Head m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7217032588521044530 +--- !u!4 &7793291723524511435 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1074027020237734814} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.0036099982, y: -0.0076479856, z: 0.034285985} + m_GameObject: {fileID: 2437346793933133647} + m_LocalRotation: {x: -0.16267604, y: 0.00000025744902, z: 0.00000036969016, w: 0.98667955} + m_LocalPosition: {x: -7.893686e-14, y: 0.122638226, z: -0.000000019092127} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6957610007672907683} - m_Father: {fileID: 6935826237939446495} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1109424676887434065 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4074738206657261955} - m_Layer: 0 - m_Name: HeadTop_End - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4074738206657261955 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1109424676887434065} - m_LocalRotation: {x: -0.003611795, y: -0.00000026072615, z: -0.00000029764962, w: 0.9999935} - m_LocalPosition: {x: -2.7711167e-13, y: 0.22634402, z: 0.037322994} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7793291723524511435} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1312638176643943739 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2420220195915115111} - m_Layer: 0 - m_Name: LeftHandMiddle4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2420220195915115111 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1312638176643943739} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.00030900072, y: 0.0011371913, z: 0.02496392} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3416984164707394624} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1542947952568371595 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2430903567846824004} - m_Layer: 0 - m_Name: RightHandThumb4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2430903567846824004 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1542947952568371595} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.00067012256, y: 0.0010259917, z: 0.024590973} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 71720422140463150} + - {fileID: 4074738206657261955} + - {fileID: 719487646799985610} + - {fileID: 9126021504029772081} + m_Father: {fileID: 2131266308831145104} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1578962536893617747 +--- !u!1 &2479754672779321810 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1103,62 +1497,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6021118635121464414} + - component: {fileID: 8314308576825104932} m_Layer: 0 - m_Name: LeftHandRing4 + m_Name: RightPalm m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6021118635121464414 +--- !u!4 &8314308576825104932 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1578962536893617747} + m_GameObject: {fileID: 2479754672779321810} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.0002559647, y: 0.0016060378, z: 0.02432591} + m_LocalPosition: {x: -0.00086298585, y: -0.001272097, z: 0.047822952} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7905697782806330321} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1857708808500866755 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6757651241381593229} - m_Layer: 0 - m_Name: RightHandRing2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6757651241381593229 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857708808500866755} - m_LocalRotation: {x: 0.30174065, y: -0.007293692, z: -0.039558083, w: 0.9525411} - m_LocalPosition: {x: -0.0000010244548, y: 0.00000003981404, z: 0.038994964} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 817425539223292257} - m_Father: {fileID: 5056127322786321012} - m_RootOrder: 0 + m_Father: {fileID: 6935826237939446495} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1996318751551711922 +--- !u!1 &2676794793085094540 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1166,37 +1528,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2109267002371350211} - - component: {fileID: 2781162089379798594} + - component: {fileID: 6002603499457266910} + - component: {fileID: 7678754975613446787} m_Layer: 0 - m_Name: Renderer_EyeRight + m_Name: Renderer_Headwear m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2109267002371350211 +--- !u!4 &6002603499457266910 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1996318751551711922} + m_GameObject: {fileID: 2676794793085094540} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 102036880391305847} - m_RootOrder: 1 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &2781162089379798594 +--- !u!137 &7678754975613446787 SkinnedMeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1996318751551711922} + m_GameObject: {fileID: 2676794793085094540} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -1209,8 +1571,7 @@ SkinnedMeshRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: -3655324315213880867, guid: dd1f9c886e182774f936520a12921cca, type: 3} + m_Materials: [] m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1235,7 +1596,7 @@ SkinnedMeshRenderer: m_Quality: 0 m_UpdateWhenOffscreen: 1 m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: -5721790524815882852, guid: dd1f9c886e182774f936520a12921cca, type: 3} + m_Mesh: {fileID: 0} m_Bones: - {fileID: 653006319648011869} - {fileID: 1742174952809795998} @@ -1375,104 +1736,7 @@ SkinnedMeshRenderer: m_AABB: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} - m_DirtyAABB: 1 ---- !u!1 &2309274314351346536 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5855246587918988030} - m_Layer: 0 - m_Name: LeftUpLeg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5855246587918988030 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2309274314351346536} - m_LocalRotation: {x: -0.0011102018, y: -0.009655561, z: -0.9999528, w: 0.000010876092} - m_LocalPosition: {x: -0.09534399, y: 0.00519189, z: -0.0033020005} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2599065370091473185} - m_Father: {fileID: 653006319648011869} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2437346793933133647 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7793291723524511435} - m_Layer: 0 - m_Name: Head - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7793291723524511435 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2437346793933133647} - m_LocalRotation: {x: -0.16267604, y: 0.00000025744902, z: 0.00000036969016, w: 0.98667955} - m_LocalPosition: {x: -7.893686e-14, y: 0.122638226, z: -0.000000019092127} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4074738206657261955} - - {fileID: 719487646799985610} - - {fileID: 9126021504029772081} - m_Father: {fileID: 2131266308831145104} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2479754672779321810 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8314308576825104932} - m_Layer: 0 - m_Name: RightPalm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8314308576825104932 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2479754672779321810} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.00086298585, y: -0.001272097, z: 0.047822952} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6935826237939446495} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_DirtyAABB: 0 --- !u!1 &2704899880789712235 GameObject: m_ObjectHideFlags: 0 @@ -1728,7 +1992,7 @@ Transform: m_Father: {fileID: 6935826237939446495} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3491183115607791209 +--- !u!1 &3534328718894817476 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1736,37 +2000,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7863846525134926031} - - component: {fileID: 2586493815762165728} + - component: {fileID: 9092101663281152623} + - component: {fileID: 4363976183104839647} m_Layer: 0 - m_Name: Renderer_Facewear + m_Name: Renderer_Outfit_Footwear m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7863846525134926031 +--- !u!4 &9092101663281152623 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3491183115607791209} + m_GameObject: {fileID: 3534328718894817476} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 102036880391305847} - m_RootOrder: 7 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &2586493815762165728 +--- !u!137 &4363976183104839647 SkinnedMeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3491183115607791209} + m_GameObject: {fileID: 3534328718894817476} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -1780,7 +2044,7 @@ SkinnedMeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 0} + - {fileID: 276613572443664286, guid: dd1f9c886e182774f936520a12921cca, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1803,17 +2067,98 @@ SkinnedMeshRenderer: m_SortingOrder: 0 serializedVersion: 2 m_Quality: 0 - m_UpdateWhenOffscreen: 0 + m_UpdateWhenOffscreen: 1 m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: 0} - m_Bones: [] + m_Mesh: {fileID: 2088888104269501087, guid: dd1f9c886e182774f936520a12921cca, type: 3} + m_Bones: + - {fileID: 653006319648011869} + - {fileID: 1742174952809795998} + - {fileID: 6086067838021744431} + - {fileID: 2964679435411402452} + - {fileID: 5313067685771254982} + - {fileID: 1753235285395614866} + - {fileID: 951800846783028410} + - {fileID: 2948841536725397666} + - {fileID: 1580807354009173943} + - {fileID: 2824212238030324271} + - {fileID: 7865147615622889260} + - {fileID: 6563755017700551969} + - {fileID: 8974411542560441870} + - {fileID: 6887086374748173657} + - {fileID: 7667547333101346925} + - {fileID: 1989977092641839893} + - {fileID: 4350197714668561955} + - {fileID: 6127256754085874755} + - {fileID: 3416984164707394624} + - {fileID: 2420220195915115111} + - {fileID: 7067762718269621414} + - {fileID: 8110688432950143261} + - {fileID: 5785110694936909839} + - {fileID: 7905697782806330321} + - {fileID: 6021118635121464414} + - {fileID: 1806134583476569231} + - {fileID: 7213558272655851157} + - {fileID: 8866075391529668115} + - {fileID: 434899538492123260} + - {fileID: 1471273207165568843} + - {fileID: 8508769269074860358} + - {fileID: 4107372925954991385} + - {fileID: 6312314621438057841} + - {fileID: 4190204734410134682} + - {fileID: 7416518633330449713} + - {fileID: 2131266308831145104} + - {fileID: 7793291723524511435} + - {fileID: 4074738206657261955} + - {fileID: 719487646799985610} + - {fileID: 9126021504029772081} + - {fileID: 1785639112329632868} + - {fileID: 2342670733928724441} + - {fileID: 3029142726222032024} + - {fileID: 5753698997921466609} + - {fileID: 1886610861357636765} + - {fileID: 6935826237939446495} + - {fileID: 562089331414282999} + - {fileID: 3020888731182475228} + - {fileID: 7229307272604099168} + - {fileID: 7330794086257368592} + - {fileID: 432152973721324744} + - {fileID: 7217032588521044530} + - {fileID: 6957610007672907683} + - {fileID: 6701623881660958862} + - {fileID: 6617194683241784411} + - {fileID: 5081918875725165678} + - {fileID: 7024168370948894233} + - {fileID: 5056127322786321012} + - {fileID: 6757651241381593229} + - {fileID: 817425539223292257} + - {fileID: 3174444511919147157} + - {fileID: 8314308576825104932} + - {fileID: 8618274981446302139} + - {fileID: 6677794194931965738} + - {fileID: 71720422140463150} + - {fileID: 2430903567846824004} + - {fileID: 6179925595560489140} + - {fileID: 5976559264272304134} + - {fileID: 1537187920367528200} + - {fileID: 6214955168804345297} + - {fileID: 1361118140237204316} + - {fileID: 5855246587918988030} + - {fileID: 2599065370091473185} + - {fileID: 1657208171033807971} + - {fileID: 1353839887058895065} + - {fileID: 8148467495373556574} + - {fileID: 4901479080994954998} + - {fileID: 6519879114355414834} + - {fileID: 3389019770639509815} + - {fileID: 520747142562339256} + - {fileID: 5761424782992724688} m_BlendShapeWeights: [] m_RootBone: {fileID: 653006319648011869} m_AABB: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} - m_DirtyAABB: 0 ---- !u!1 &3534328718894817476 + m_DirtyAABB: 1 +--- !u!1 &3556999998615702392 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1821,37 +2166,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9092101663281152623} - - component: {fileID: 4363976183104839647} + - component: {fileID: 5636615916403496566} + - component: {fileID: 74993256942121130} m_Layer: 0 - m_Name: Renderer_Outfit_Footwear + m_Name: Renderer_Avatar_Transparent m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &9092101663281152623 +--- !u!4 &5636615916403496566 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3534328718894817476} + m_GameObject: {fileID: 3556999998615702392} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 102036880391305847} - m_RootOrder: 11 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &4363976183104839647 +--- !u!137 &74993256942121130 SkinnedMeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3534328718894817476} + m_GameObject: {fileID: 3556999998615702392} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -1864,8 +2209,7 @@ SkinnedMeshRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: 276613572443664286, guid: dd1f9c886e182774f936520a12921cca, type: 3} + m_Materials: [] m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1890,7 +2234,7 @@ SkinnedMeshRenderer: m_Quality: 0 m_UpdateWhenOffscreen: 1 m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: 2088888104269501087, guid: dd1f9c886e182774f936520a12921cca, type: 3} + m_Mesh: {fileID: 0} m_Bones: - {fileID: 653006319648011869} - {fileID: 1742174952809795998} @@ -1973,12 +2317,64 @@ SkinnedMeshRenderer: - {fileID: 3389019770639509815} - {fileID: 520747142562339256} - {fileID: 5761424782992724688} - m_BlendShapeWeights: [] + m_BlendShapeWeights: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 m_RootBone: {fileID: 653006319648011869} m_AABB: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} - m_DirtyAABB: 1 + m_DirtyAABB: 0 --- !u!1 &3596133536635632750 GameObject: m_ObjectHideFlags: 0 @@ -2979,91 +3375,6 @@ Transform: m_Father: {fileID: 6179925595560489140} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5043864152056020855 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1400680146692210828} - - component: {fileID: 2698904032871233205} - m_Layer: 0 - m_Name: Renderer_Headwear - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1400680146692210828 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5043864152056020855} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 102036880391305847} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &2698904032871233205 -SkinnedMeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5043864152056020855} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 3 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - serializedVersion: 2 - m_Quality: 0 - m_UpdateWhenOffscreen: 0 - m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: 0} - m_Bones: [] - m_BlendShapeWeights: [] - m_RootBone: {fileID: 653006319648011869} - m_AABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_DirtyAABB: 0 --- !u!1 &5074412873543772436 GameObject: m_ObjectHideFlags: 0 @@ -3388,6 +3699,223 @@ Transform: m_Father: {fileID: 2824212238030324271} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6153677642902651531 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5749424526105541717} + - component: {fileID: 7672131815480760674} + m_Layer: 0 + m_Name: Renderer_Avatar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5749424526105541717 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6153677642902651531} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 102036880391305847} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &7672131815480760674 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6153677642902651531} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 3 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: [] + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 1 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 0} + m_Bones: + - {fileID: 653006319648011869} + - {fileID: 1742174952809795998} + - {fileID: 6086067838021744431} + - {fileID: 2964679435411402452} + - {fileID: 5313067685771254982} + - {fileID: 1753235285395614866} + - {fileID: 951800846783028410} + - {fileID: 2948841536725397666} + - {fileID: 1580807354009173943} + - {fileID: 2824212238030324271} + - {fileID: 7865147615622889260} + - {fileID: 6563755017700551969} + - {fileID: 8974411542560441870} + - {fileID: 6887086374748173657} + - {fileID: 7667547333101346925} + - {fileID: 1989977092641839893} + - {fileID: 4350197714668561955} + - {fileID: 6127256754085874755} + - {fileID: 3416984164707394624} + - {fileID: 2420220195915115111} + - {fileID: 7067762718269621414} + - {fileID: 8110688432950143261} + - {fileID: 5785110694936909839} + - {fileID: 7905697782806330321} + - {fileID: 6021118635121464414} + - {fileID: 1806134583476569231} + - {fileID: 7213558272655851157} + - {fileID: 8866075391529668115} + - {fileID: 434899538492123260} + - {fileID: 1471273207165568843} + - {fileID: 8508769269074860358} + - {fileID: 4107372925954991385} + - {fileID: 6312314621438057841} + - {fileID: 4190204734410134682} + - {fileID: 7416518633330449713} + - {fileID: 2131266308831145104} + - {fileID: 7793291723524511435} + - {fileID: 4074738206657261955} + - {fileID: 719487646799985610} + - {fileID: 9126021504029772081} + - {fileID: 1785639112329632868} + - {fileID: 2342670733928724441} + - {fileID: 3029142726222032024} + - {fileID: 5753698997921466609} + - {fileID: 1886610861357636765} + - {fileID: 6935826237939446495} + - {fileID: 562089331414282999} + - {fileID: 3020888731182475228} + - {fileID: 7229307272604099168} + - {fileID: 7330794086257368592} + - {fileID: 432152973721324744} + - {fileID: 7217032588521044530} + - {fileID: 6957610007672907683} + - {fileID: 6701623881660958862} + - {fileID: 6617194683241784411} + - {fileID: 5081918875725165678} + - {fileID: 7024168370948894233} + - {fileID: 5056127322786321012} + - {fileID: 6757651241381593229} + - {fileID: 817425539223292257} + - {fileID: 3174444511919147157} + - {fileID: 8314308576825104932} + - {fileID: 8618274981446302139} + - {fileID: 6677794194931965738} + - {fileID: 71720422140463150} + - {fileID: 2430903567846824004} + - {fileID: 6179925595560489140} + - {fileID: 5976559264272304134} + - {fileID: 1537187920367528200} + - {fileID: 6214955168804345297} + - {fileID: 1361118140237204316} + - {fileID: 5855246587918988030} + - {fileID: 2599065370091473185} + - {fileID: 1657208171033807971} + - {fileID: 1353839887058895065} + - {fileID: 8148467495373556574} + - {fileID: 4901479080994954998} + - {fileID: 6519879114355414834} + - {fileID: 3389019770639509815} + - {fileID: 520747142562339256} + - {fileID: 5761424782992724688} + m_BlendShapeWeights: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + m_RootBone: {fileID: 653006319648011869} + m_AABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_DirtyAABB: 0 --- !u!1 &6169588713487165942 GameObject: m_ObjectHideFlags: 0 @@ -3761,10 +4289,240 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5056127322786321012} - m_Father: {fileID: 6935826237939446495} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6647745908201384737 + m_Father: {fileID: 6935826237939446495} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6647745908201384737 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 434899538492123260} + m_Layer: 0 + m_Name: LeftHandThumb3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &434899538492123260 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6647745908201384737} + m_LocalRotation: {x: 0.11298376, y: 0.050621588, z: -0.07914138, w: 0.9891455} + m_LocalPosition: {x: -0.0000011846423, y: -0.0000069998205, z: 0.033792026} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1471273207165568843} + m_Father: {fileID: 8866075391529668115} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6673374408023703905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2342670733928724441} + m_Layer: 0 + m_Name: RightArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2342670733928724441 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6673374408023703905} + m_LocalRotation: {x: 0.090275325, y: -0.06730587, z: -0.0027847907, w: 0.9936361} + m_LocalPosition: {x: -0.0000000019790605, y: 0.11889598, z: -0.00000008915413} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3029142726222032024} + m_Father: {fileID: 1785639112329632868} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6707292477060829039 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5781666331537422713} + - component: {fileID: 998367928323478687} + m_Layer: 0 + m_Name: Renderer_Hair + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5781666331537422713 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6707292477060829039} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 102036880391305847} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &998367928323478687 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6707292477060829039} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 3 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -1016875900976486646, guid: dd1f9c886e182774f936520a12921cca, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 1 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 6238772448965099435, guid: dd1f9c886e182774f936520a12921cca, type: 3} + m_Bones: + - {fileID: 653006319648011869} + - {fileID: 1742174952809795998} + - {fileID: 6086067838021744431} + - {fileID: 2964679435411402452} + - {fileID: 5313067685771254982} + - {fileID: 1753235285395614866} + - {fileID: 951800846783028410} + - {fileID: 2948841536725397666} + - {fileID: 1580807354009173943} + - {fileID: 2824212238030324271} + - {fileID: 7865147615622889260} + - {fileID: 6563755017700551969} + - {fileID: 8974411542560441870} + - {fileID: 6887086374748173657} + - {fileID: 7667547333101346925} + - {fileID: 1989977092641839893} + - {fileID: 4350197714668561955} + - {fileID: 6127256754085874755} + - {fileID: 3416984164707394624} + - {fileID: 2420220195915115111} + - {fileID: 7067762718269621414} + - {fileID: 8110688432950143261} + - {fileID: 5785110694936909839} + - {fileID: 7905697782806330321} + - {fileID: 6021118635121464414} + - {fileID: 1806134583476569231} + - {fileID: 7213558272655851157} + - {fileID: 8866075391529668115} + - {fileID: 434899538492123260} + - {fileID: 1471273207165568843} + - {fileID: 8508769269074860358} + - {fileID: 4107372925954991385} + - {fileID: 6312314621438057841} + - {fileID: 4190204734410134682} + - {fileID: 7416518633330449713} + - {fileID: 2131266308831145104} + - {fileID: 7793291723524511435} + - {fileID: 4074738206657261955} + - {fileID: 719487646799985610} + - {fileID: 9126021504029772081} + - {fileID: 1785639112329632868} + - {fileID: 2342670733928724441} + - {fileID: 3029142726222032024} + - {fileID: 5753698997921466609} + - {fileID: 1886610861357636765} + - {fileID: 6935826237939446495} + - {fileID: 562089331414282999} + - {fileID: 3020888731182475228} + - {fileID: 7229307272604099168} + - {fileID: 7330794086257368592} + - {fileID: 432152973721324744} + - {fileID: 7217032588521044530} + - {fileID: 6957610007672907683} + - {fileID: 6701623881660958862} + - {fileID: 6617194683241784411} + - {fileID: 5081918875725165678} + - {fileID: 7024168370948894233} + - {fileID: 5056127322786321012} + - {fileID: 6757651241381593229} + - {fileID: 817425539223292257} + - {fileID: 3174444511919147157} + - {fileID: 8314308576825104932} + - {fileID: 8618274981446302139} + - {fileID: 6677794194931965738} + - {fileID: 71720422140463150} + - {fileID: 2430903567846824004} + - {fileID: 6179925595560489140} + - {fileID: 5976559264272304134} + - {fileID: 1537187920367528200} + - {fileID: 6214955168804345297} + - {fileID: 1361118140237204316} + - {fileID: 5855246587918988030} + - {fileID: 2599065370091473185} + - {fileID: 1657208171033807971} + - {fileID: 1353839887058895065} + - {fileID: 8148467495373556574} + - {fileID: 4901479080994954998} + - {fileID: 6519879114355414834} + - {fileID: 3389019770639509815} + - {fileID: 520747142562339256} + - {fileID: 5761424782992724688} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 653006319648011869} + m_AABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_DirtyAABB: 1 +--- !u!1 &6760998030277602892 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3772,31 +4530,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 434899538492123260} + - component: {fileID: 6935826237939446495} m_Layer: 0 - m_Name: LeftHandThumb3 + m_Name: RightHand m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &434899538492123260 +--- !u!4 &6935826237939446495 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6647745908201384737} - m_LocalRotation: {x: 0.11298376, y: 0.050621588, z: -0.07914138, w: 0.9891455} - m_LocalPosition: {x: -0.0000011846423, y: -0.0000069998205, z: 0.033792026} + m_GameObject: {fileID: 6760998030277602892} + m_LocalRotation: {x: -0.7556835, y: -0.055729456, z: 0.008045651, w: 0.6525121} + m_LocalPosition: {x: -0.0011260062, y: 0.12896903, z: -0.001967161} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1471273207165568843} - m_Father: {fileID: 8866075391529668115} + - {fileID: 562089331414282999} + - {fileID: 7217032588521044530} + - {fileID: 7024168370948894233} + - {fileID: 8314308576825104932} + - {fileID: 8618274981446302139} + - {fileID: 6179925595560489140} + m_Father: {fileID: 1886610861357636765} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6673374408023703905 +--- !u!1 &6819253672236348521 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3804,31 +4567,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2342670733928724441} + - component: {fileID: 1785639112329632868} m_Layer: 0 - m_Name: RightArm + m_Name: RightShoulder m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2342670733928724441 +--- !u!4 &1785639112329632868 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6673374408023703905} - m_LocalRotation: {x: 0.090275325, y: -0.06730587, z: -0.0027847907, w: 0.9936361} - m_LocalPosition: {x: -0.0000000019790605, y: 0.11889598, z: -0.00000008915413} + m_GameObject: {fileID: 6819253672236348521} + m_LocalRotation: {x: 0.47085047, y: 0.5612528, z: -0.43453085, w: 0.52390665} + m_LocalPosition: {x: 0.047135998, y: 0.14114796, z: -0.0062550027} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3029142726222032024} - m_Father: {fileID: 1785639112329632868} - m_RootOrder: 0 + - {fileID: 2342670733928724441} + m_Father: {fileID: 2964679435411402452} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6707292477060829039 +--- !u!1 &6935597219510839653 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3836,37 +4599,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5781666331537422713} - - component: {fileID: 998367928323478687} + - component: {fileID: 3787543779153370665} + - component: {fileID: 2342889070551728946} m_Layer: 0 - m_Name: Renderer_Hair + m_Name: Renderer_Body m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5781666331537422713 +--- !u!4 &3787543779153370665 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6707292477060829039} + m_GameObject: {fileID: 6935597219510839653} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 102036880391305847} - m_RootOrder: 4 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &998367928323478687 +--- !u!137 &2342889070551728946 SkinnedMeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6707292477060829039} + m_GameObject: {fileID: 6935597219510839653} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -3880,7 +4643,7 @@ SkinnedMeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: -1016875900976486646, guid: dd1f9c886e182774f936520a12921cca, type: 3} + - {fileID: -7831265160038725598, guid: dd1f9c886e182774f936520a12921cca, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3905,7 +4668,7 @@ SkinnedMeshRenderer: m_Quality: 0 m_UpdateWhenOffscreen: 1 m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: 6238772448965099435, guid: dd1f9c886e182774f936520a12921cca, type: 3} + m_Mesh: {fileID: -8208244941744126863, guid: dd1f9c886e182774f936520a12921cca, type: 3} m_Bones: - {fileID: 653006319648011869} - {fileID: 1742174952809795998} @@ -3994,7 +4757,7 @@ SkinnedMeshRenderer: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_DirtyAABB: 1 ---- !u!1 &6760998030277602892 +--- !u!1 &7300106256684902415 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4002,36 +4765,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6935826237939446495} + - component: {fileID: 8437302568290520753} m_Layer: 0 - m_Name: RightHand + m_Name: Armature m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6935826237939446495 +--- !u!4 &8437302568290520753 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6760998030277602892} - m_LocalRotation: {x: -0.7556835, y: -0.055729456, z: 0.008045651, w: 0.6525121} - m_LocalPosition: {x: -0.0011260062, y: 0.12896903, z: -0.001967161} + m_GameObject: {fileID: 7300106256684902415} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 562089331414282999} - - {fileID: 7217032588521044530} - - {fileID: 7024168370948894233} - - {fileID: 8314308576825104932} - - {fileID: 8618274981446302139} - - {fileID: 6179925595560489140} - m_Father: {fileID: 1886610861357636765} - m_RootOrder: 0 + - {fileID: 653006319648011869} + m_Father: {fileID: 102036880391305847} + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6819253672236348521 +--- !u!1 &7503987530782855931 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4039,31 +4797,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1785639112329632868} + - component: {fileID: 1580807354009173943} m_Layer: 0 - m_Name: RightShoulder + m_Name: LeftForeArmTwist m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1785639112329632868 +--- !u!4 &1580807354009173943 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6819253672236348521} - m_LocalRotation: {x: 0.47085047, y: 0.5612528, z: -0.43453085, w: 0.52390665} - m_LocalPosition: {x: 0.047135998, y: 0.14114796, z: -0.0062550027} + m_GameObject: {fileID: 7503987530782855931} + m_LocalRotation: {x: 0.0000005113643, y: -0.122862, z: -0.00000013320658, w: 0.99242383} + m_LocalPosition: {x: 0.0000000012150849, y: 0.12403384, z: 0.0000009816431} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2342670733928724441} - m_Father: {fileID: 2964679435411402452} - m_RootOrder: 2 + - {fileID: 2824212238030324271} + m_Father: {fileID: 2948841536725397666} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6935597219510839653 +--- !u!1 &7539797019276772422 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4071,37 +4829,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3787543779153370665} - - component: {fileID: 2342889070551728946} + - component: {fileID: 3415872649433214445} + - component: {fileID: 6337321623522937970} m_Layer: 0 - m_Name: Renderer_Body + m_Name: Renderer_Head m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3787543779153370665 +--- !u!4 &3415872649433214445 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6935597219510839653} + m_GameObject: {fileID: 7539797019276772422} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 102036880391305847} - m_RootOrder: 12 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &2342889070551728946 +--- !u!137 &6337321623522937970 SkinnedMeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6935597219510839653} + m_GameObject: {fileID: 7539797019276772422} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -4115,7 +4873,7 @@ SkinnedMeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: -7831265160038725598, guid: dd1f9c886e182774f936520a12921cca, type: 3} + - {fileID: -1756179739759820720, guid: dd1f9c886e182774f936520a12921cca, type: 3} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4140,7 +4898,7 @@ SkinnedMeshRenderer: m_Quality: 0 m_UpdateWhenOffscreen: 1 m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: -8208244941744126863, guid: dd1f9c886e182774f936520a12921cca, type: 3} + m_Mesh: {fileID: 3005894825882173664, guid: dd1f9c886e182774f936520a12921cca, type: 3} m_Bones: - {fileID: 653006319648011869} - {fileID: 1742174952809795998} @@ -4214,22 +4972,108 @@ SkinnedMeshRenderer: - {fileID: 6214955168804345297} - {fileID: 1361118140237204316} - {fileID: 5855246587918988030} - - {fileID: 2599065370091473185} - - {fileID: 1657208171033807971} - - {fileID: 1353839887058895065} - - {fileID: 8148467495373556574} + - {fileID: 2599065370091473185} + - {fileID: 1657208171033807971} + - {fileID: 1353839887058895065} + - {fileID: 8148467495373556574} + - {fileID: 4901479080994954998} + - {fileID: 6519879114355414834} + - {fileID: 3389019770639509815} + - {fileID: 520747142562339256} + - {fileID: 5761424782992724688} + m_BlendShapeWeights: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + m_RootBone: {fileID: 653006319648011869} + m_AABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_DirtyAABB: 1 +--- !u!1 &7617199089194948434 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 653006319648011869} + m_Layer: 0 + m_Name: Hips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &653006319648011869 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7617199089194948434} + m_LocalRotation: {x: 0.016230416, y: 0.000026233864, z: 0.00000042075527, w: 0.9998683} + m_LocalPosition: {x: 1.121589e-13, y: 1.01919, z: 0.010031001} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1742174952809795998} + - {fileID: 5855246587918988030} - {fileID: 4901479080994954998} - - {fileID: 6519879114355414834} - - {fileID: 3389019770639509815} - - {fileID: 520747142562339256} - - {fileID: 5761424782992724688} - m_BlendShapeWeights: [] - m_RootBone: {fileID: 653006319648011869} - m_AABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_DirtyAABB: 1 ---- !u!1 &7300106256684902415 + m_Father: {fileID: 8437302568290520753} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7838740435638952796 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4237,31 +5081,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8437302568290520753} + - component: {fileID: 432152973721324744} m_Layer: 0 - m_Name: Armature + m_Name: RightHandIndex4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8437302568290520753 +--- !u!4 &432152973721324744 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7300106256684902415} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 7838740435638952796} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.00029500015, y: 0.0010249328, z: 0.022364022} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 653006319648011869} - m_Father: {fileID: 102036880391305847} - m_RootOrder: 15 + m_Children: [] + m_Father: {fileID: 7330794086257368592} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7503987530782855931 +--- !u!1 &7979753599038156789 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4269,31 +5112,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1580807354009173943} + - component: {fileID: 8508769269074860358} m_Layer: 0 - m_Name: LeftForeArmTwist + m_Name: LeftHandPinky0 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1580807354009173943 +--- !u!4 &8508769269074860358 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7503987530782855931} - m_LocalRotation: {x: 0.0000005113643, y: -0.122862, z: -0.00000013320658, w: 0.99242383} - m_LocalPosition: {x: 0.0000000012150849, y: 0.12403384, z: 0.0000009816431} + m_GameObject: {fileID: 7979753599038156789} + m_LocalRotation: {x: 0.018333424, y: -0.14033581, z: 0.20703535, w: 0.96804243} + m_LocalPosition: {x: -0.022999004, y: -0.009420145, z: 0.034074087} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2824212238030324271} - m_Father: {fileID: 2948841536725397666} - m_RootOrder: 0 + - {fileID: 4107372925954991385} + m_Father: {fileID: 2824212238030324271} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7539797019276772422 +--- !u!1 &8000127016493797272 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4301,37 +5144,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3415872649433214445} - - component: {fileID: 6337321623522937970} + - component: {fileID: 1535011734004001151} + - component: {fileID: 6146320642155018673} m_Layer: 0 - m_Name: Renderer_Head + m_Name: Renderer_Glasses m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3415872649433214445 +--- !u!4 &1535011734004001151 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7539797019276772422} + m_GameObject: {fileID: 8000127016493797272} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 102036880391305847} - m_RootOrder: 2 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &6337321623522937970 +--- !u!137 &6146320642155018673 SkinnedMeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7539797019276772422} + m_GameObject: {fileID: 8000127016493797272} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -4344,8 +5187,7 @@ SkinnedMeshRenderer: m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 - m_Materials: - - {fileID: -1756179739759820720, guid: dd1f9c886e182774f936520a12921cca, type: 3} + m_Materials: [] m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4370,7 +5212,7 @@ SkinnedMeshRenderer: m_Quality: 0 m_UpdateWhenOffscreen: 1 m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: 3005894825882173664, guid: dd1f9c886e182774f936520a12921cca, type: 3} + m_Mesh: {fileID: 0} m_Bones: - {fileID: 653006319648011869} - {fileID: 1742174952809795998} @@ -4510,104 +5352,7 @@ SkinnedMeshRenderer: m_AABB: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} - m_DirtyAABB: 1 ---- !u!1 &7617199089194948434 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 653006319648011869} - m_Layer: 0 - m_Name: Hips - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &653006319648011869 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7617199089194948434} - m_LocalRotation: {x: 0.016230416, y: 0.000026233864, z: 0.00000042075527, w: 0.9998683} - m_LocalPosition: {x: 1.121589e-13, y: 1.01919, z: 0.010031001} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1742174952809795998} - - {fileID: 5855246587918988030} - - {fileID: 4901479080994954998} - m_Father: {fileID: 8437302568290520753} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7838740435638952796 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 432152973721324744} - m_Layer: 0 - m_Name: RightHandIndex4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &432152973721324744 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7838740435638952796} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.00029500015, y: 0.0010249328, z: 0.022364022} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7330794086257368592} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7979753599038156789 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8508769269074860358} - m_Layer: 0 - m_Name: LeftHandPinky0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8508769269074860358 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7979753599038156789} - m_LocalRotation: {x: 0.018333424, y: -0.14033581, z: 0.20703535, w: 0.96804243} - m_LocalPosition: {x: -0.022999004, y: -0.009420145, z: 0.034074087} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4107372925954991385} - m_Father: {fileID: 2824212238030324271} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_DirtyAABB: 0 --- !u!1 &8253106554869280246 GameObject: m_ObjectHideFlags: 0 @@ -4900,15 +5645,15 @@ Transform: - {fileID: 3689487517496247668} - {fileID: 5781666331537422713} - {fileID: 512869404471134292} - - {fileID: 1400680146692210828} - - {fileID: 7863846525134926031} - - {fileID: 3142139341261095415} + - {fileID: 6002603499457266910} + - {fileID: 2869701011446114756} + - {fileID: 1535011734004001151} - {fileID: 7604835661221931720} - {fileID: 3923076911134052055} - {fileID: 9092101663281152623} - {fileID: 3787543779153370665} - - {fileID: 6231812889824038270} - - {fileID: 8917623531341294587} + - {fileID: 5749424526105541717} + - {fileID: 5636615916403496566} - {fileID: 8437302568290520753} m_Father: {fileID: 0} m_RootOrder: 0 @@ -4951,88 +5696,3 @@ MonoBehaviour: BodyType: 3 OutfitGender: 1 SkinTone: '#b36d5e' ---- !u!1 &9187843987779319710 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8917623531341294587} - - component: {fileID: 6595569422764818457} - m_Layer: 0 - m_Name: Renderer_Avatar_Transparent - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8917623531341294587 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9187843987779319710} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 102036880391305847} - m_RootOrder: 14 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &6595569422764818457 -SkinnedMeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9187843987779319710} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 3 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - serializedVersion: 2 - m_Quality: 0 - m_UpdateWhenOffscreen: 0 - m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: 0} - m_Bones: [] - m_BlendShapeWeights: [] - m_RootBone: {fileID: 653006319648011869} - m_AABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_DirtyAABB: 0 diff --git a/Runtime/Core/Scripts/Data/ScriptableObjects/AvatarConfig.cs b/Runtime/Core/Scripts/Data/ScriptableObjects/AvatarConfig.cs index 83d49d22..30635c96 100644 --- a/Runtime/Core/Scripts/Data/ScriptableObjects/AvatarConfig.cs +++ b/Runtime/Core/Scripts/Data/ScriptableObjects/AvatarConfig.cs @@ -47,6 +47,19 @@ public class AvatarConfig : ScriptableObject new ShaderProperty(Core.TextureChannel.Occlusion, string.Empty), }; + public List ShaderPropertyMapping = new List + { + new ShaderPropertyMapping("baseColorTexture", "_MainTex", ShaderPropertyType.Texture), + new ShaderPropertyMapping("normalTexture", "_BumpMap", ShaderPropertyType.Texture), + new ShaderPropertyMapping("metallicRoughnessTexture", string.Empty, ShaderPropertyType.Texture), + new ShaderPropertyMapping("metallicFactor", "metallicFactor", ShaderPropertyType.Float), + new ShaderPropertyMapping("roughnessFactor", "", ShaderPropertyType.Float), + new ShaderPropertyMapping("emissiveTexture", "emissiveTexture", ShaderPropertyType.Texture), + new ShaderPropertyMapping("emissiveFactor", "emissiveFactor", ShaderPropertyType.Color), + new ShaderPropertyMapping("occlusionTexture", "occlusionTexture", ShaderPropertyType.Texture), + new ShaderPropertyMapping("occlusionTexture_strength", "", ShaderPropertyType.Float), + }; + public List MorphTargets = new List(); } } diff --git a/Runtime/Core/Scripts/Data/ShaderProperty.cs b/Runtime/Core/Scripts/Data/ShaderProperty.cs index 4ba0522f..6e5896e4 100644 --- a/Runtime/Core/Scripts/Data/ShaderProperty.cs +++ b/Runtime/Core/Scripts/Data/ShaderProperty.cs @@ -1,4 +1,5 @@ using System; +using UnityEngine; namespace ReadyPlayerMe.Core { @@ -14,4 +15,77 @@ public ShaderProperty(TextureChannel textureChannel, string propertyName) PropertyName = propertyName; } } + + [Serializable] + public class ShaderPropertyMapping + { + public string SourceProperty; + public string TargetProperty; + public ShaderPropertyType Type; + + public ShaderPropertyMapping(string sourceProperty, string targetProperty, ShaderPropertyType type) + { + SourceProperty = sourceProperty; + TargetProperty = targetProperty; + Type = type; + } + } + + public enum ShaderPropertyType + { + Texture, + Float, + Color, + Vector + } + + public static class ShaderMaterialOverrideHelper + { + public static void ApplyOverrides(Material sourceMaterial, Material targetMaterial, ShaderPropertyMapping[] propertyMappings) + { + if (sourceMaterial == null || targetMaterial == null) + { + Debug.LogError("Source or Target Material is not set."); + return; + } + + foreach (var mapping in propertyMappings) + { + if (!sourceMaterial.HasProperty(mapping.SourceProperty) || !targetMaterial.HasProperty(mapping.TargetProperty)) + { + if (!string.IsNullOrEmpty(mapping.TargetProperty)) + { + Debug.LogWarning($"Property not found in source or target material. SourceProperty:{mapping.SourceProperty} TargetProperty:{mapping.TargetProperty}"); + } + continue; + } + + switch (mapping.Type) + { + case ShaderPropertyType.Texture: + var texture = sourceMaterial.GetTexture(mapping.SourceProperty); + targetMaterial.SetTexture(mapping.TargetProperty, texture); + break; + + case ShaderPropertyType.Float: + var floatValue = sourceMaterial.GetFloat(mapping.SourceProperty); + targetMaterial.SetFloat(mapping.TargetProperty, floatValue); + break; + + case ShaderPropertyType.Color: + var colorValue = sourceMaterial.GetColor(mapping.SourceProperty); + targetMaterial.SetColor(mapping.TargetProperty, colorValue); + break; + + case ShaderPropertyType.Vector: + var vectorValue = sourceMaterial.GetVector(mapping.SourceProperty); + targetMaterial.SetVector(mapping.TargetProperty, vectorValue); + break; + default: + Debug.LogWarning("Unknown property type."); + break; + } + } + } + } } diff --git a/Runtime/Core/Scripts/Operations/AvatarProcessor.cs b/Runtime/Core/Scripts/Operations/AvatarProcessor.cs index bb3101d7..3cc23da7 100644 --- a/Runtime/Core/Scripts/Operations/AvatarProcessor.cs +++ b/Runtime/Core/Scripts/Operations/AvatarProcessor.cs @@ -174,57 +174,22 @@ private void RenameChildMeshes(GameObject avatar, AvatarConfig avatarConfig = nu renderer.name = $"{RENDERER_PREFIX}_{assetName}"; renderer.sharedMaterial.name = $"{MATERIAL_PREFIX}_{assetName}"; - var textureByPropertyName = SetTextures(renderer, assetName); - SetShader(renderer, avatarConfig, textureByPropertyName); - SetMeshName(renderer, assetName); - } - } - - /// - /// Set the names of each . - /// - /// Search for textures in this renderer. - /// Name of the asset. - /// - /// Naming convention is 'Avatar_PropertyName_AssetName'. This makes it easier to view them in profiler - private Dictionary SetTextures(Renderer renderer, string assetName) - { - var texturesByPropertyName = new Dictionary(); - - foreach (var property in ShaderProperties) - { - var propertyID = Shader.PropertyToID(property.Value); - if (renderer.sharedMaterial.HasProperty(propertyID)) + if (avatarConfig != null && avatarConfig.Shader != null) { - var texture = renderer.sharedMaterial.GetTexture(propertyID); - if (texture != null) - { - texture.name = $"{AVATAR_PREFIX}{property}_{assetName}"; - texturesByPropertyName.Add(property.Key, texture); - } + OverrideShader(renderer, avatarConfig); } - } - return texturesByPropertyName; + SetMeshName(renderer, assetName); + } } - private void SetShader(Renderer renderer, AvatarConfig avatarConfig, Dictionary texturesByPropertyName) + private void OverrideShader(Renderer renderer, AvatarConfig avatarConfig) { - if (avatarConfig == null || avatarConfig.Shader == null) return; - - var material = new Material(avatarConfig.Shader); - material.name = renderer.name; - - foreach (var textureByName in texturesByPropertyName) - { - var shaderProperties = avatarConfig.ShaderProperties; - var propertyName = shaderProperties.Find(x => x.TextureChannel == textureByName.Key).PropertyName; - var propertyID = Shader.PropertyToID(propertyName); - material.SetTexture(propertyID, textureByName.Value); - } - - renderer.sharedMaterial = material; + var sourceMaterial = renderer.sharedMaterial; + var targetMaterial = new Material(avatarConfig.Shader); + ShaderMaterialOverrideHelper.ApplyOverrides(sourceMaterial, targetMaterial, avatarConfig.ShaderPropertyMapping.ToArray()); + renderer.sharedMaterial = targetMaterial; } /// diff --git a/Tests/Editor/AvatarConfigProcessorTests.cs b/Tests/Editor/AvatarConfigProcessorTests.cs index f33267f2..b06a10d8 100644 --- a/Tests/Editor/AvatarConfigProcessorTests.cs +++ b/Tests/Editor/AvatarConfigProcessorTests.cs @@ -11,7 +11,7 @@ public class AvatarConfigProcessorTests private const string MORPHTARGETS_EXPECTED_DEFAULT = "mouthOpen,mouthSmile"; private const string MORPHTARGETS_EXPECTED_NONE = "none"; private const string AVATAR_QUERY_PARAMS_ACTUAL = - "pose=A&lod=0&textureAtlas=none&textureSizeLimit=1024&textureChannels=baseColor,normal,metallicRoughness,emissive,occlusion&useHands=false&useDracoMeshCompression=false&useMeshOptCompression=false"; + "pose=T&lod=0&textureAtlas=none&textureSizeLimit=1024&textureChannels=baseColor,normal,metallicRoughness,emissive,occlusion&useHands=false&useDracoMeshCompression=false&useMeshOptCompression=false"; private readonly string[] morphTargetsDefault = { "mouthOpen", "mouthSmile" }; private readonly string[] morphTargetsNone = { "none" }; private readonly TextureChannel[] textureChannelsAll = diff --git a/Tests/Editor/AvatarLoaderWindowTests.cs b/Tests/Editor/AvatarLoaderWindowTests.cs index 36ede84c..dc3007a6 100644 --- a/Tests/Editor/AvatarLoaderWindowTests.cs +++ b/Tests/Editor/AvatarLoaderWindowTests.cs @@ -28,10 +28,15 @@ public void Cleanup() [UnityTest] public IEnumerator Avatar_Loaded_Stored_And_No_Overrides() { - AvatarLoaderEditor window = EditorWindow.GetWindow(); - - MethodInfo loadAvatarMethod = typeof(AvatarLoaderEditor).GetMethod("LoadAvatar", BindingFlags.NonPublic | BindingFlags.Instance); - + var window = EditorWindow.GetWindow(); + + var loadAvatarMethod = typeof(AvatarLoaderEditor).GetMethod("LoadAvatar", BindingFlags.NonPublic | BindingFlags.Instance); + var useEyeAnimationsToggle = typeof(AvatarLoaderEditor).GetField("useEyeAnimations", BindingFlags.NonPublic | BindingFlags.Instance); + var useVoiceToAnimToggle = typeof(AvatarLoaderEditor).GetField("useVoiceToAnim", BindingFlags.NonPublic | BindingFlags.Instance); + var previousUseEyeAnimations = (bool) useEyeAnimationsToggle.GetValue(window); + var previousUseVoiceToAnim = (bool) useVoiceToAnimToggle.GetValue(window); + useEyeAnimationsToggle.SetValue(window, false); + useVoiceToAnimToggle.SetValue(window, false); Assert.IsNotNull(loadAvatarMethod); loadAvatarMethod.Invoke(window, new object[] { TestAvatarData.DefaultAvatarUri.ModelUrl }); @@ -47,6 +52,8 @@ public IEnumerator Avatar_Loaded_Stored_And_No_Overrides() Assert.IsNotNull(avatar); var overrides = PrefabUtility.HasPrefabInstanceAnyOverrides(avatar.gameObject, false); Assert.IsFalse(overrides); + useVoiceToAnimToggle.SetValue(window, previousUseVoiceToAnim); + useEyeAnimationsToggle.SetValue(window, previousUseEyeAnimations); } } }