Merge branch '3DBody' of http://git.zxkedu.com:33769/JiNan/VirtualFramework into 3DBody

Assets/Art/Fonts/PingFang Medium SDF.asset

@@ -5839,6 +5839,21 @@ MonoBehaviour:
     m_Scale: 1
     m_AtlasIndex: 0
     m_ClassDefinitionType: 0
+  - m_Index: 93
+    m_Metrics:
+      m_Width: 39.328125
+      m_Height: 46.53125
+      m_HorizontalBearingX: 2.25
+      m_HorizontalBearingY: 46.53125
+      m_HorizontalAdvance: 43.828125
+    m_GlyphRect:
+      m_X: 108
+      m_Y: 500
+      m_Width: 40
+      m_Height: 47
+    m_Scale: 1
+    m_AtlasIndex: 0
+    m_ClassDefinitionType: 0
   m_CharacterTable:
   - m_ElementType: 1
     m_Unicode: 13
@@ -7344,6 +7359,10 @@ MonoBehaviour:
     m_Unicode: 31532
     m_GlyphIndex: 5291
     m_Scale: 1
+  - m_ElementType: 1
+    m_Unicode: 122
+    m_GlyphIndex: 93
+    m_Scale: 1
   m_AtlasTextures:
   - {fileID: -6779730198970019552}
   m_AtlasTextureIndex: 0
@@ -8846,6 +8865,10 @@ MonoBehaviour:
     m_Y: 3248
     m_Width: 101
     m_Height: 104
+  - m_X: 98
+    m_Y: 490
+    m_Width: 59
+    m_Height: 66
   m_FreeGlyphRects:
   - m_X: 63
     m_Y: 168
@@ -8887,18 +8910,6 @@ MonoBehaviour:
     m_Y: 694
     m_Width: 27
     m_Height: 4
-  - m_X: 90
-    m_Y: 490
-    m_Width: 69
-    m_Height: 4
-  - m_X: 98
-    m_Y: 490
-    m_Width: 61
-    m_Height: 72
-  - m_X: 130
-    m_Y: 490
-    m_Width: 29
-    m_Height: 102
   - m_X: 91
     m_Y: 797
     m_Width: 12
@@ -10019,6 +10030,22 @@ MonoBehaviour:
     m_Y: 3148
     m_Width: 3696
     m_Height: 100
+  - m_X: 90
+    m_Y: 490
+    m_Width: 8
+    m_Height: 4
+  - m_X: 98
+    m_Y: 556
+    m_Width: 61
+    m_Height: 6
+  - m_X: 130
+    m_Y: 556
+    m_Width: 29
+    m_Height: 36
+  - m_X: 157
+    m_Y: 490
+    m_Width: 2
+    m_Height: 102
   m_fontInfo:
     Name: 
     PointSize: 0

Assets/Art/头颈面部解剖FBX/01.FBX.meta

@@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: b915f477ab572d542a95703b980f56f3
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Test.unity

@@ -1981,10 +1981,18 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: -8640948963244648401, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: -8618668803074135612, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: -8005441971623430056, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: -4889895864073793145, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
       propertyPath: m_Name
       value: SM_long_levator_costarum_muscle_Left
@@ -1997,6 +2005,14 @@ PrefabInstance:
       propertyPath: m_Name
       value: SM_Innermost_intercostal_muscle_of_the_third_rib_Left
       objectReference: {fileID: 0}
+    - target: {fileID: -312680825953016493, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 728485624903442463, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
       propertyPath: m_Name
       value: SM_JiRou
@@ -2005,6 +2021,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1445837778586285284, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4394918157920065491, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
       propertyPath: m_Name
       value: SM_Innermost_intercostal_muscle_of_the_second_rib_Left
@@ -2029,8 +2049,18 @@ PrefabInstance:
       propertyPath: m_Name
       value: SM_Innermost_intercostal_muscle_of_the_first_rib_Left
       objectReference: {fileID: 0}
+    - target: {fileID: 8357750301333683098, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8408620713583050493, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
-    m_RemovedGameObjects: []
+    m_RemovedGameObjects:
+    - {fileID: -9220291736520169723, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
+    - {fileID: 5815114519766787646, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
     m_AddedGameObjects: []
     m_AddedComponents:
     - targetCorrespondingSourceObject: {fileID: -814238308703985274, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
@@ -2357,9 +2387,6 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: -2120059782403917261, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
       insertIndex: -1
       addedObject: {fileID: 328498975}
-    - targetCorrespondingSourceObject: {fileID: -9220291736520169723, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1878624809}
     - targetCorrespondingSourceObject: {fileID: -4069463777988707319, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
       insertIndex: -1
       addedObject: {fileID: 670843896}
@@ -2393,9 +2420,6 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 7465725733020427662, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
       insertIndex: -1
       addedObject: {fileID: 245980538}
-    - targetCorrespondingSourceObject: {fileID: 5815114519766787646, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 2121074421}
     - targetCorrespondingSourceObject: {fileID: -4786976179311133234, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
       insertIndex: -1
       addedObject: {fileID: 1906233106}
@@ -46714,33 +46738,6 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 7911072355902173148, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
---- !u!1 &1878624805 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -9220291736520169723, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
-  m_PrefabInstance: {fileID: 78428758}
-  m_PrefabAsset: {fileID: 0}
---- !u!64 &1878624809
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1878624805}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 5
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -4343894637153277696, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
 --- !u!1 &1879088395 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7008961405205808911, guid: 3a238d0d1a934684a8db230279184d7d, type: 3}
@@ -53522,33 +53519,6 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: -3841996285255971046, guid: 5755b628fc33efd4bb8984f770e4e884, type: 3}
---- !u!1 &2121074417 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5815114519766787646, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
-  m_PrefabInstance: {fileID: 78428758}
-  m_PrefabAsset: {fileID: 0}
---- !u!64 &2121074421
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2121074417}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 5
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -6890000190700793029, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
 --- !u!1 &2121935945 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2020319259352049155, guid: b436b6a86c9d4ea45b307ea81996bb1a, type: 3}