fix

54993306 · Sep 27, 2022 · 12ae57b · 12ae57b
1 parent 451777d
commit 12ae57b
Show file tree

Hide file tree

Showing 260 changed files with 933 additions and 12,866 deletions.
diff --git a/.vs/AvatarClothes/v17/.suo b/.vs/AvatarClothes/v17/.suo
diff --git a/Assets/Example.cs b/Assets/Example.cs
@@ -16,6 +16,7 @@ public class Example : MonoBehaviour
 
     [SerializeField] private SkinnedMeshRenderer head, body, top, bottom, footwear, hair, glasses, beard;
     private Material currentHeadMat;
+    private Material cacheHeadMat;
 
     private void Start()
     {
@@ -44,6 +45,7 @@ private IEnumerator InitOutlook()
                         int index = instance.transform.GetSiblingIndex();
                         head.sharedMesh = outlookConfig.data[index].headMesh;
                         head.sharedMaterial = currentHeadMat != null ? currentHeadMat : outlookConfig.data[index].headMaterial;
+                        cacheHeadMat = outlookConfig.data[index].headMaterial;
 
                         body.sharedMesh = outlookConfig.data[index].bodyMesh;
                         body.sharedMaterial = outlookConfig.data[index].bodyMaterial;
@@ -138,10 +140,13 @@ private IEnumerator InitBeard()
                                 beard.sharedMesh = beardConfig.data[index].beardMesh;
                                 beard.sharedMaterial = beardConfig.data[index].beardMaterial;
                                 currentHeadMat = null;
+                                if (cacheHeadMat != null) head.sharedMaterial = cacheHeadMat;
                                 break;
                             case AvatarBeardData.Type.Texture:
                                 head.sharedMaterial = beardConfig.data[index].beardMaterial;
                                 currentHeadMat = beardConfig.data[index].beardMaterial;
+                                beard.sharedMesh = null;
+                                beard.sharedMaterial = null;
                                 break;
                         }
                     }

diff --git a/Assets/New Folder.meta b/Assets/New Folder.meta
diff --git a/Assets/New Folder/05.fbm.meta b/Assets/New Folder/05.fbm.meta
diff --git a/Assets/New Folder/05.fbm/Wolf3D-fullbody-template-m-v2-N-arms.jpg b/Assets/New Folder/05.fbm/Wolf3D-fullbody-template-m-v2-N-arms.jpg
diff --git a/Assets/New Folder/05.fbm/Wolf3D-fullbody-template-m-v2-N-arms.jpg.meta b/Assets/New Folder/05.fbm/Wolf3D-fullbody-template-m-v2-N-arms.jpg.meta
diff --git a/Assets/New Folder/05.fbm/Wolf3D_Teeth.jpg b/Assets/New Folder/05.fbm/Wolf3D_Teeth.jpg
diff --git a/Assets/New Folder/05.fbm/Wolf3D_Teeth.jpg.meta b/Assets/New Folder/05.fbm/Wolf3D_Teeth.jpg.meta
diff --git a/Assets/New Folder/05.fbm/baseColor.jpg b/Assets/New Folder/05.fbm/baseColor.jpg
diff --git a/Assets/New Folder/05.fbm/baseColor.jpg.meta b/Assets/New Folder/05.fbm/baseColor.jpg.meta
diff --git a/Assets/New Folder/05.fbm/outfit-basic-01-v2-m-bottom-D.jpg b/Assets/New Folder/05.fbm/outfit-basic-01-v2-m-bottom-D.jpg