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

2025-04-17 10:43:13 +08:00 · 2025-04-17 10:43:13 +08:00 · c1e138c2c4
commit c1e138c2c4
parent 126a15e0b6 0862d8d2cb
13 changed files with 17158 additions and 2073 deletions
--- a/Assets/Art/Fonts/PingFang
+++ b/Assets/Art/Fonts/PingFang
@ -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
--- a/Assets/Art/Fonts/pingfangSc/PingFangSC-Medium
+++ b/Assets/Art/Fonts/pingfangSc/PingFangSC-Medium
--- a/Assets/Art/头颈面部解剖FBX.rar
+++ b/Assets/Art/头颈面部解剖FBX.rar
--- a/Assets/Art/头颈面部解剖FBX/XiongNeiCeShenJing.FBX
+++ b/Assets/Art/头颈面部解剖FBX/XiongNeiCeShenJing.FBX
--- a/Assets/Art/头颈面部解剖FBX/XiongNeiCeShenJing.FBX.meta
+++ b/Assets/Art/头颈面部解剖FBX/XiongNeiCeShenJing.FBX.meta
@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: 7beb44d8097093b4ca15d296d2fbd5a2
+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: 
--- a/Assets/Art/头颈面部解剖FBX/XiongNeiCeShenJing_Right.FBX
+++ b/Assets/Art/头颈面部解剖FBX/XiongNeiCeShenJing_Right.FBX
--- a/Assets/Art/头颈面部解剖FBX/XiongNeiCeShenJing_Right.FBX.meta
+++ b/Assets/Art/头颈面部解剖FBX/XiongNeiCeShenJing_Right.FBX.meta
@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: 90af037caa262774090fc966297ef97c
+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: 
--- a/Assets/Art/头颈面部解剖FBX.rar.meta
+++ b/Assets/Art/头颈面部解剖FBX.rar.meta
@ -1,5 +1,6 @@
 fileFormatVersion: 2
-guid: e04c3287aa301c64a9884ebfb728ee54
+guid: ab772d8ef92f5704aa54a8f1a5e6a643
+folderAsset: yes
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Scenes/Scripts/SetFalse.cs
+++ b/Assets/Scenes/Scripts/SetFalse.cs
@ -0,0 +1,33 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SetFalse : MonoBehaviour
+{
+
+    public Transform[] hiddenChildren;
+
+    [ContextMenu("隐藏")]
+    // Start is called before the first frame update
+    void Setttt()
+    {
+  
+        HideChildrenRecursively(transform);
+
+    }
+
+    void Start()
+    {
+    }
+
+    void HideChildrenRecursively(Transform parent)
+    {
+        foreach (Transform child in parent)
+        {
+            // 隐藏当前子物体
+            child.gameObject.SetActive(false);
+            // 递归调用以处理子物体的子物体
+            HideChildrenRecursively(child);
+        }
+    }
+}
--- a/Assets/Scenes/Scripts/SetFalse.cs.meta
+++ b/Assets/Scenes/Scripts/SetFalse.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1f127f2bf137e12439e2b140488ef479
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/Test.unity
+++ b/Assets/Scenes/Test.unity
--- a/Assets/Scripts/Controller/Body3DController.cs
+++ b/Assets/Scripts/Controller/Body3DController.cs
@ -217,6 +217,8 @@ public class Body3DController : MonoSingleton<Body3DController>
        else
        {
            GameObject obj = Utility.FindObj(body.Path);
+       
+            //if (obj != null) { Debug.Log("????" + body.Path + "????"); };
            var bodyObjItem = obj.GetOrAddComponent<Body3DObjItem>();
            bodyObjItem.Init(body);
            objs.Add(obj, bodyObjItem);
--- a/Data/Xml/3DJiePao.xml
+++ b/Data/Xml/3DJiePao.xml