qianzhuqing 3 years ago
parent
commit
fee47a973f
37 changed files with 6623 additions and 152 deletions
  1. BIN
      Assets/GameMain/DataTables/CustomBody.bytes
  2. BIN
      Assets/GameMain/DataTables/CustomBody.txt
  3. BIN
      Assets/GameMain/DataTables/CustomFace.bytes
  4. BIN
      Assets/GameMain/DataTables/CustomFace.txt
  5. 31 2
      Assets/GameMain/Meshes/Player/baseani.controller
  6. 53 0
      Assets/GameMain/Meshes/Player/stand.anim
  7. 8 0
      Assets/GameMain/Meshes/Player/stand.anim.meta
  8. 60 2
      Assets/GameMain/Model/8.controller
  9. 31 2
      Assets/GameMain/Model/BIANXINGQI(8).FBX.meta
  10. BIN
      Assets/GameMain/Model/cloth/111.mor
  11. 7 0
      Assets/GameMain/Model/cloth/111.mor.meta
  12. BIN
      Assets/GameMain/Model/cloth/bianyifu.FBX
  13. 947 0
      Assets/GameMain/Model/cloth/123123.FBX.meta
  14. 0 100
      Assets/GameMain/Model/cloth/bianyifu.FBX.meta
  15. 5151 0
      Assets/GameMain/Model/stand 1.anim
  16. 8 0
      Assets/GameMain/Model/stand 1.anim.meta
  17. 53 0
      Assets/GameMain/Model/stand.anim
  18. 8 0
      Assets/GameMain/Model/stand.anim.meta
  19. 15 0
      Assets/GameMain/Scenes/CustomRole.unity
  20. 1 1
      Assets/GameMain/Scripts/DataTable/DRAircraft.cs
  21. 1 1
      Assets/GameMain/Scripts/DataTable/DRArmor.cs
  22. 1 1
      Assets/GameMain/Scripts/DataTable/DRAsteroid.cs
  23. 12 1
      Assets/GameMain/Scripts/DataTable/DRCustomBody.cs
  24. 13 3
      Assets/GameMain/Scripts/DataTable/DRCustomFace.cs
  25. 1 1
      Assets/GameMain/Scripts/DataTable/DREntity.cs
  26. 1 1
      Assets/GameMain/Scripts/DataTable/DRMusic.cs
  27. 1 1
      Assets/GameMain/Scripts/DataTable/DRScene.cs
  28. 1 1
      Assets/GameMain/Scripts/DataTable/DRSound.cs
  29. 1 1
      Assets/GameMain/Scripts/DataTable/DRThruster.cs
  30. 1 1
      Assets/GameMain/Scripts/DataTable/DRUIForm.cs
  31. 1 1
      Assets/GameMain/Scripts/DataTable/DRUISound.cs
  32. 1 1
      Assets/GameMain/Scripts/DataTable/DRWeapon.cs
  33. 34 5
      Assets/GameMain/Scripts/Entity/EntityData/RoleCustomBoneData.cs
  34. 177 23
      Assets/GameMain/Scripts/Game/CustomRole/CustomManager.cs
  35. 2 1
      Assets/GameMain/Scripts/UI/UICustomNor.cs
  36. 1 1
      Assets/Launcher.unity
  37. 1 1
      ProjectSettings/EditorBuildSettings.asset

BIN
Assets/GameMain/DataTables/CustomBody.bytes


BIN
Assets/GameMain/DataTables/CustomBody.txt


BIN
Assets/GameMain/DataTables/CustomFace.bytes


BIN
Assets/GameMain/DataTables/CustomFace.txt


+ 31 - 2
Assets/GameMain/Meshes/Player/baseani.controller

@@ -33,7 +33,10 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 7856177798788273316}
-    m_Position: {x: 287, y: 236, z: 0}
+    m_Position: {x: 450, y: 270, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 8630514289286363772}
+    m_Position: {x: 209.20331, y: 338.30225, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -43,7 +46,7 @@ AnimatorStateMachine:
   m_EntryPosition: {x: 50, y: 120, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 7856177798788273316}
+  m_DefaultState: {fileID: 8630514289286363772}
 --- !u!1102 &7856177798788273316
 AnimatorState:
   serializedVersion: 5
@@ -70,3 +73,29 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &8630514289286363772
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: stand
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: e6942a79ae4bbdd429feef3c9d0ef377, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

+ 53 - 0
Assets/GameMain/Meshes/Player/stand.anim

@@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: stand
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 0
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 30
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

+ 8 - 0
Assets/GameMain/Meshes/Player/stand.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e6942a79ae4bbdd429feef3c9d0ef377
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 60 - 2
Assets/GameMain/Model/8.controller

@@ -33,7 +33,13 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 4312635860885776039}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 250, y: 180, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 5951754101363861995}
+    m_Position: {x: 173.63785, y: 224.33551, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 4321239445375086989}
+    m_Position: {x: 193.94775, y: 299.93347, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -43,7 +49,7 @@ AnimatorStateMachine:
   m_EntryPosition: {x: 50, y: 120, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 4312635860885776039}
+  m_DefaultState: {fileID: 4321239445375086989}
 --- !u!1102 &4312635860885776039
 AnimatorState:
   serializedVersion: 5
@@ -70,3 +76,55 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &4321239445375086989
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: stand 1
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: fd4f5b7fed90a844985b520ac60806a3, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &5951754101363861995
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: stand
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: afefb4e1a12baa246a094d2dd0cf15af, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

+ 31 - 2
Assets/GameMain/Model/BIANXINGQI(8).FBX.meta

@@ -5,7 +5,7 @@ ModelImporter:
   internalIDToNameTable:
   - first:
       74: 1827226128182048838
-    second: Take 001
+    second: stand
   externalObjects: {}
   materials:
     materialImportMode: 1
@@ -38,7 +38,36 @@ ModelImporter:
     animationWrapMode: 0
     extraExposedTransformPaths: []
     extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: stand
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 70
+      lastFrame: 75
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
     isReadable: 0
   meshes:
     lODScreenPercentages: []

BIN
Assets/GameMain/Model/cloth/111.mor


+ 7 - 0
Assets/GameMain/Model/cloth/111.mor.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e559e50fa02d192418cda44e1083dd3f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/GameMain/Model/cloth/bianyifu.FBX


+ 947 - 0
Assets/GameMain/Model/cloth/123123.FBX.meta

@@ -0,0 +1,947 @@
+fileFormatVersion: 2
+guid: 82ec964429872124bbcd1c0d3e9d2966
+ModelImporter:
+  serializedVersion: 19301
+  internalIDToNameTable:
+  - first:
+      74: 1827226128182048838
+    second: stand
+  externalObjects: {}
+  materials:
+    materialImportMode: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 3
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: stand
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 0
+      lastFrame: 0
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human:
+    - boneName: Pelvis
+      humanName: Hips
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Thigh_L
+      humanName: LeftUpperLeg
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Thigh_R
+      humanName: RightUpperLeg
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Calf_L
+      humanName: LeftLowerLeg
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Calf_R
+      humanName: RightLowerLeg
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Foot_L
+      humanName: LeftFoot
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Foot_R
+      humanName: RightFoot
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Spine_02
+      humanName: Spine
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Spine_03
+      humanName: Chest
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Neck_01
+      humanName: Neck
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Head
+      humanName: Head
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Clavicle_L
+      humanName: LeftShoulder
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Clavicle_R
+      humanName: RightShoulder
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: UpperArm_L
+      humanName: LeftUpperArm
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: UpperArm_R
+      humanName: RightUpperArm
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Forearm_L
+      humanName: LeftLowerArm
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Forearm_R
+      humanName: RightLowerArm
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Hand_L
+      humanName: LeftHand
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Hand_R
+      humanName: RightHand
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Toe_0_L
+      humanName: LeftToes
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Toe_0_L 1
+      humanName: RightToes
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: YAN1
+      humanName: LeftEye
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: YAN2
+      humanName: RightEye
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: Bone002
+      humanName: Jaw
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger0
+      humanName: Left Thumb Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger01
+      humanName: Left Thumb Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger02
+      humanName: Left Thumb Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger1
+      humanName: Left Index Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger11
+      humanName: Left Index Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger12
+      humanName: Left Index Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger2
+      humanName: Left Middle Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger21
+      humanName: Left Middle Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger22
+      humanName: Left Middle Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger3
+      humanName: Left Ring Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger31
+      humanName: Left Ring Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger32
+      humanName: Left Ring Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger4
+      humanName: Left Little Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger41
+      humanName: Left Little Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: L Finger42
+      humanName: Left Little Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger0
+      humanName: Right Thumb Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger01
+      humanName: Right Thumb Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger02
+      humanName: Right Thumb Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger1
+      humanName: Right Index Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger11
+      humanName: Right Index Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger12
+      humanName: Right Index Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger2
+      humanName: Right Middle Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger21
+      humanName: Right Middle Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger22
+      humanName: Right Middle Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger3
+      humanName: Right Ring Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger31
+      humanName: Right Ring Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger32
+      humanName: Right Ring Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger4
+      humanName: Right Little Proximal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger41
+      humanName: Right Little Intermediate
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    - boneName: R Finger42
+      humanName: Right Little Distal
+      limit:
+        min: {x: 0, y: 0, z: 0}
+        max: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        length: 0
+        modified: 0
+    skeleton:
+    - name: 123123(Clone)
+      parentName: 
+      position: {x: 0, y: 0, z: 0}
+      rotation: {x: 0, y: 0, z: 0, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Root
+      parentName: 123123(Clone)
+      position: {x: -0, y: 0, z: -5.3895377e-10}
+      rotation: {x: 0.00000006657903, y: -0, z: -0, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Bip_01
+      parentName: Root
+      position: {x: -1.33868e-12, y: 0.97554535, z: -0.00003078404}
+      rotation: {x: -0.50000036, y: 0.49999967, z: 0.49999967, w: 0.50000036}
+      scale: {x: 0.99999994, y: 0.99999994, z: 1}
+    - name: Footsteps
+      parentName: Bip_01
+      position: {x: -0, y: 0, z: -0.9731035}
+      rotation: {x: 0, y: -0, z: -0.7071063, w: 0.70710725}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Pelvis
+      parentName: Bip_01
+      position: {x: -0, y: 0, z: 0}
+      rotation: {x: 0.49999994, y: -0.5000007, z: -0.49999943, w: -0.49999994}
+      scale: {x: 1.0000008, y: 1.0000007, z: 1.0000007}
+    - name: Spine_01
+      parentName: Pelvis
+      position: {x: -0.0964517, y: 0.03281761, z: 0.000000039916472}
+      rotation: {x: 0.000002026558, y: 0.0000006556511, z: 0.00039815903, w: -1}
+      scale: {x: 1.0000002, y: 1.0000001, z: 0.99999994}
+    - name: Thigh_L
+      parentName: Spine_01
+      position: {x: 0.09647775, y: -0.032740995, z: 0.08831793}
+      rotation: {x: -0.022220645, y: -0.99622124, z: 0.004625551, w: -0.083833724}
+      scale: {x: 1.0000001, y: 1.0000001, z: 1.0000005}
+    - name: Calf_L
+      parentName: Thigh_L
+      position: {x: -0.428791, y: -0.0000000037252903, z: 0}
+      rotation: {x: 0.000000024912875, y: 0.00000009685753, z: 0.0057825777, w: 0.99998325}
+      scale: {x: 1.0000007, y: 1.0000011, z: 1.0000006}
+    - name: Foot_L
+      parentName: Calf_L
+      position: {x: -0.4737686, y: -0.000000011175871, z: 0}
+      rotation: {x: -0.088245995, y: 0.08246496, z: 0.011973337, w: 0.99260706}
+      scale: {x: 1, y: 1.0000004, z: 1.0000002}
+    - name: Toe_0_L
+      parentName: Foot_L
+      position: {x: -0.07507512, y: 0.072868235, z: 0}
+      rotation: {x: -0.017079338, y: -0.016210908, z: -0.72510695, w: 0.6882336}
+      scale: {x: 1.0000002, y: 0.99999994, z: 1.0000006}
+    - name: Thigh_R
+      parentName: Spine_01
+      position: {x: 0.09647775, y: -0.032740507, z: -0.08831802}
+      rotation: {x: -0.022396155, y: -0.9968376, z: -0.0048351954, w: 0.0760907}
+      scale: {x: 1.0000007, y: 1.0000006, z: 1.0000008}
+    - name: Calf_R
+      parentName: Thigh_R
+      position: {x: -0.428791, y: 0, z: 0}
+      rotation: {x: -0.00000001315493, y: 0.0000000074505797, z: 0.005769569, w: 0.9999834}
+      scale: {x: 1.000001, y: 1.0000007, z: 1.0000007}
+    - name: Foot_R
+      parentName: Calf_R
+      position: {x: -0.4737685, y: 0, z: 0}
+      rotation: {x: 0.14674261, y: -0.07337932, z: -0.01314243, w: 0.98636174}
+      scale: {x: 0.9999998, y: 1.0000001, z: 1.0000002}
+    - name: Toe_0_L 1
+      parentName: Foot_R
+      position: {x: -0.07507512, y: 0.072868235, z: 0.000000029802322}
+      rotation: {x: -0.0067155957, y: 0.006079793, z: -0.71469367, w: 0.699379}
+      scale: {x: 1, y: 0.9999991, z: 1.0000004}
+    - name: Spine_02
+      parentName: Spine_01
+      position: {x: -0.12061608, y: -0.000054351985, z: 0.00000007856606}
+      rotation: {x: 0.0007063065, y: 0.00049403915, z: -0.033130508, w: -0.99945074}
+      scale: {x: 1.0000002, y: 1, z: 1.0000001}
+    - name: Spine_03
+      parentName: Spine_02
+      position: {x: -0.0683614, y: -0.00016500056, z: -0.00000041013118}
+      rotation: {x: 0.0011173786, y: 0.0006086529, z: 0.14088534, w: 0.9900251}
+      scale: {x: 1.0000002, y: 1.0000002, z: 1.0000002}
+    - name: Neck_01
+      parentName: Spine_03
+      position: {x: -0.28208947, y: 0.015612036, z: 0.00000005250331}
+      rotation: {x: -0.00000002118759, y: 0.0000008568168, z: -0.3089759, w: 0.9510699}
+      scale: {x: 1, y: 1.0000006, z: 1.0000002}
+    - name: Head
+      parentName: Neck_01
+      position: {x: -0.06515503, y: 0.000000029802322, z: 0}
+      rotation: {x: -0.0070667276, y: 0.009604544, z: 0.00035205486, w: -0.99992883}
+      scale: {x: 0.9999997, y: 0.9999992, z: 0.9999997}
+    - name: YAN
+      parentName: Head
+      position: {x: -0.11841917, y: 0.034935057, z: 0.0015731864}
+      rotation: {x: -0.32500154, y: 0.9456407, z: -0.003858698, w: -0.011083578}
+      scale: {x: 1.0000002, y: 1, z: 1}
+    - name: YAN1
+      parentName: YAN
+      position: {x: -0.0095011, y: 0.007201314, z: -0.037780702}
+      rotation: {x: 0.0000002398155, y: 0.00000028125936, z: 0.4167076, w: -0.9090406}
+      scale: {x: 1.0000002, y: 1, z: 1.0000001}
+    - name: YANZHU_L
+      parentName: YAN1
+      position: {x: -0.03563571, y: 0.004206538, z: -0.00069734827}
+      rotation: {x: -0.0040447726, y: -0.024222057, z: -0.18934579, w: 0.9816033}
+      scale: {x: 1.0000005, y: 1, z: 1}
+    - name: YAN2
+      parentName: YAN
+      position: {x: -0.00950098, y: 0.007201433, z: 0.040130675}
+      rotation: {x: 0.0000002398155, y: 0.00000028125936, z: 0.4167076, w: -0.9090406}
+      scale: {x: 1.0000002, y: 1, z: 1.0000001}
+    - name: YANZHU_R
+      parentName: YAN2
+      position: {x: -0.03563565, y: 0.0042066574, z: 0.00015259907}
+      rotation: {x: -0.0040447726, y: -0.024222057, z: -0.18934579, w: 0.9816033}
+      scale: {x: 1.0000005, y: 1, z: 1}
+    - name: Bone001
+      parentName: Head
+      position: {x: -0.13642621, y: 0.01442945, z: -0.09607947}
+      rotation: {x: 0.19672897, y: -0.68104124, z: -0.695321, w: 0.118360795}
+      scale: {x: 1.0000005, y: 1.0000006, z: 1.0000001}
+    - name: Bone002
+      parentName: Bone001
+      position: {x: -0.0996567, y: 0.0000005811453, z: 0}
+      rotation: {x: -0.0000009005887, y: -0.00000013969836, z: -0.10564522, w: 0.99440396}
+      scale: {x: 0.9999998, y: 0.99999994, z: 1.0000002}
+    - name: Bone003
+      parentName: Bone002
+      position: {x: -0.09435141, y: 0.000000059604645, z: 0}
+      rotation: {x: -0, y: -0, z: 0.0000000074505797, w: 1}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Bone004
+      parentName: Head
+      position: {x: -0.023285866, y: -0.10813931, z: 0.0018925667}
+      rotation: {x: -0.009074749, y: -0.99988997, z: 0.0073347325, w: 0.009161558}
+      scale: {x: 1.0000005, y: 1.0000006, z: 1.0000004}
+    - name: Bone005
+      parentName: Bone004
+      position: {x: -0.10627997, y: -0.000000059604645, z: -0.000000002736087}
+      rotation: {x: 0.00000016471314, y: 0.000000009313227, z: -0.103935935, w: 0.994584}
+      scale: {x: 0.9999997, y: 0.9999997, z: 0.9999999}
+    - name: Bone006
+      parentName: Bone005
+      position: {x: -0.104361534, y: 0, z: -7.1054274e-15}
+      rotation: {x: -1.4210855e-14, y: -8.881784e-16, z: -1.5340107e-15, w: 1}
+      scale: {x: 1.0000005, y: 1.0000005, z: 1.0000002}
+    - name: RY2
+      parentName: Spine_03
+      position: {x: -0.082221985, y: 0.050444216, z: 0.08365238}
+      rotation: {x: -0.5248991, y: 0.84656113, z: 0.048747, w: 0.07374935}
+      scale: {x: 1.0000006, y: 1.0000001, z: 0.99999994}
+    - name: RY22
+      parentName: RY2
+      position: {x: -0.07548119, y: 0, z: 0.00000011920929}
+      rotation: {x: 0.00000006193295, y: -0.00000003434253, z: 2.1269345e-15, w: 1}
+      scale: {x: 0.99999976, y: 1.0000001, z: 0.99999994}
+    - name: Clavicle_L
+      parentName: Spine_03
+      position: {x: -0.21929204, y: -0.0063536167, z: 0.05015914}
+      rotation: {x: -0.5865645, y: -0.042105585, z: 0.80832154, w: 0.028030047}
+      scale: {x: 1, y: 1.0000001, z: 1.0000006}
+    - name: UpperArm_L
+      parentName: Clavicle_L
+      position: {x: -0.092243135, y: 0, z: 0.00000011920929}
+      rotation: {x: 0.23843978, y: 0.1397108, z: 0.01083017, w: 0.96099436}
+      scale: {x: 0.99999994, y: 1.0000012, z: 1.0000011}
+    - name: Forearm_L
+      parentName: UpperArm_L
+      position: {x: -0.2942347, y: 0.000000014901161, z: 0.00000011920929}
+      rotation: {x: -0.001442223, y: 0.015249899, z: 0.03281593, w: 0.99934405}
+      scale: {x: 0.99999994, y: 1.0000004, z: 1.0000001}
+    - name: Hand_L
+      parentName: Forearm_L
+      position: {x: -0.24826992, y: 0.000000007450581, z: 0}
+      rotation: {x: 0.7436866, y: -0.041887123, z: 0.02499058, w: -0.66674685}
+      scale: {x: 1.0000001, y: 1.0000004, z: 1.0000002}
+    - name: L Finger0
+      parentName: Hand_L
+      position: {x: -0.018303037, y: 0.020910144, z: -0.039728545}
+      rotation: {x: 0.369297, y: -0.34175035, z: 0.06050679, w: 0.8620704}
+      scale: {x: 0.9999998, y: 1, z: 1.0000002}
+    - name: L Finger01
+      parentName: L Finger0
+      position: {x: -0.0196864, y: 0, z: 0}
+      rotation: {x: 0.000000029802319, y: -0.000000119209275, z: -0.036159877, w: 0.9993461}
+      scale: {x: 1, y: 1.0000004, z: 1}
+    - name: L Finger02
+      parentName: L Finger01
+      position: {x: -0.0196864, y: 0.000000059604645, z: -0.000000059604645}
+      rotation: {x: 0.00000011213402, y: 0.00000009250631, z: -0.032034736, w: 0.9994868}
+      scale: {x: 1, y: 0.99999994, z: 1.0000002}
+    - name: L Finger3
+      parentName: Hand_L
+      position: {x: -0.06964362, y: 0.0015187263, z: 0.019442067}
+      rotation: {x: -0.043739833, y: 0.08255067, z: -0.029816978, w: 0.99517995}
+      scale: {x: 1.0000005, y: 0.9999997, z: 1}
+    - name: L Finger31
+      parentName: L Finger3
+      position: {x: -0.019063711, y: 0, z: -0.000000007450581}
+      rotation: {x: 0.00000010058272, y: 0.00000016391257, z: -0.04108928, w: 0.99915546}
+      scale: {x: 1, y: 1.0000005, z: 1.0000007}
+    - name: L Finger32
+      parentName: L Finger31
+      position: {x: -0.025264233, y: 0, z: 0}
+      rotation: {x: 0.00000006891787, y: 0.000000014901161, z: 0.018992007, w: 0.9998197}
+      scale: {x: 0.9999998, y: 1, z: 0.99999994}
+    - name: L Finger2
+      parentName: Hand_L
+      position: {x: -0.07107124, y: 0.0027757883, z: -0.00040628389}
+      rotation: {x: 0.000005871056, y: 0.036458448, z: -0.03420074, w: 0.99874985}
+      scale: {x: 1.0000001, y: 0.9999998, z: 1.0000001}
+    - name: L Finger21
+      parentName: L Finger2
+      position: {x: -0.032127053, y: 0, z: 0}
+      rotation: {x: -0.000000061856475, y: 0.0000000037252854, z: -0.040359676, w: 0.9991852}
+      scale: {x: 1, y: 1.0000005, z: 1.0000004}
+    - name: L Finger22
+      parentName: L Finger21
+      position: {x: -0.02756098, y: 0.00000011920929, z: 0.000000007450581}
+      rotation: {x: -0.00000014877918, y: 0.00000004775923, z: 0.049120195, w: 0.9987929}
+      scale: {x: 1.0000002, y: 0.99999934, z: 0.99999946}
+    - name: L Finger1
+      parentName: Hand_L
+      position: {x: -0.06928593, y: 0.0066125393, z: -0.021980025}
+      rotation: {x: 0.00005590914, y: 0.010125631, z: 0.011082532, w: 0.9998874}
+      scale: {x: 1.0000002, y: 0.99999994, z: 1.0000002}
+    - name: L Finger11
+      parentName: L Finger1
+      position: {x: -0.019493729, y: 0, z: -0.000000007450581}
+      rotation: {x: 0.00000002630983, y: -0.00000048801246, z: -0.040527195, w: 0.9991785}
+      scale: {x: 1, y: 1.0000002, z: 1.0000005}
+    - name: L Finger12
+      parentName: L Finger11
+      position: {x: -0.025734663, y: 0, z: 0.0000000037252903}
+      rotation: {x: 0.000000071491016, y: -0.00000013290911, z: -0.0017811129, w: 0.99999845}
+      scale: {x: 1.0000001, y: 1.0000007, z: 1.0000005}
+    - name: L Finger4
+      parentName: Hand_L
+      position: {x: -0.062058955, y: 0.008446097, z: 0.039050415}
+      rotation: {x: -0.002622423, y: 0.07846021, z: -0.0149479, w: 0.9968018}
+      scale: {x: 1.0000004, y: 0.99999994, z: 1.0000002}
+    - name: L Finger41
+      parentName: L Finger4
+      position: {x: -0.0196864, y: 0, z: 0}
+      rotation: {x: -0.00000022235305, y: -0.00000051408955, z: -0.041188665, w: 0.9991514}
+      scale: {x: 0.9999998, y: 1.0000002, z: 1.0000002}
+    - name: L Finger42
+      parentName: L Finger41
+      position: {x: -0.01262936, y: 0, z: 0.000000007450581}
+      rotation: {x: 0.00000016154115, y: -0.00000012495626, z: -0.04883074, w: 0.9988071}
+      scale: {x: 0.9999998, y: 1.0000002, z: 1.0000004}
+    - name: Clavicle_R
+      parentName: Spine_03
+      position: {x: -0.21929204, y: -0.0063533187, z: -0.05015917}
+      rotation: {x: 0.5860782, y: 0.042249892, z: 0.80866116, w: 0.028183805}
+      scale: {x: 1.0000002, y: 0.99999994, z: 1.0000002}
+    - name: UpperArm_R
+      parentName: Clavicle_R
+      position: {x: -0.092243105, y: -0.000000029802322, z: 0.00000011920929}
+      rotation: {x: 0.2348713, y: 0.1397484, z: -0.011711482, w: -0.9618569}
+      scale: {x: 1.0000005, y: 1.0000006, z: 1.0000011}
+    - name: Forearm_R
+      parentName: UpperArm_R
+      position: {x: -0.2942347, y: 0.000000014901161, z: 0}
+      rotation: {x: 0.00111027, y: -0.013688006, z: 0.032658096, w: 0.99937224}
+      scale: {x: 1.0000004, y: 1.0000001, z: 1.0000001}
+    - name: Hand_R
+      parentName: Forearm_R
+      position: {x: -0.24826986, y: 0.000000007450581, z: 0.00000011920929}
+      rotation: {x: -0.7434076, y: 0.048385978, z: 0.032251958, w: -0.6663061}
+      scale: {x: 1, y: 1.0000002, z: 0.9999997}
+    - name: R Finger0
+      parentName: Hand_R
+      position: {x: -0.014956832, y: 0.021848202, z: 0.038699035}
+      rotation: {x: -0.3645602, y: 0.34933597, z: 0.0697269, w: 0.86034787}
+      scale: {x: 1.0000001, y: 1.0000002, z: 1.0000006}
+    - name: R Finger01
+      parentName: R Finger0
+      position: {x: -0.01968643, y: 0, z: 0.000000059604645}
+      rotation: {x: 0.000000029802319, y: 0.000000029802319, z: -0.036159996, w: 0.9993461}
+      scale: {x: 1.0000004, y: 1.0000006, z: 1.0000001}
+    - name: R Finger02
+      parentName: R Finger01
+      position: {x: -0.019686341, y: 0, z: -0.000000059604645}
+      rotation: {x: 0.000000028630856, y: 0.00000005973957, z: -0.03203474, w: 0.99948674}
+      scale: {x: 1.0000006, y: 1.000001, z: 1.0000002}
+    - name: R Finger1
+      parentName: Hand_R
+      position: {x: -0.06951401, y: 0.0065621138, z: 0.02396522}
+      rotation: {x: 0.0012718734, y: -0.0101110125, z: -0.02134079, w: 0.99972034}
+      scale: {x: 1.0000005, y: 1.0000008, z: 0.99999994}
+    - name: R Finger11
+      parentName: R Finger1
+      position: {x: -0.029911697, y: -0.00000011920929, z: -0.000000007450581}
+      rotation: {x: -0.00000019720748, y: 0.00000048428757, z: -0.040526267, w: 0.9991785}
+      scale: {x: 1.0000002, y: 1.0000001, z: 1}
+    - name: R Finger12
+      parentName: R Finger11
+      position: {x: -0.025734693, y: 0, z: 0.000000007450581}
+      rotation: {x: 0.000000085093575, y: -0.000000060689715, z: -0.0017811763, w: 0.99999845}
+      scale: {x: 1, y: 1.0000002, z: 1}
+    - name: R Finger2
+      parentName: Hand_R
+      position: {x: -0.07101557, y: 0.0007483959, z: 0.0021636449}
+      rotation: {x: 0.0007386504, y: -0.036451064, z: -0.054593526, w: 0.99784285}
+      scale: {x: 1.0000004, y: 1.0000007, z: 1}
+    - name: R Finger21
+      parentName: R Finger2
+      position: {x: -0.032126933, y: 0, z: -0.0000000037252903}
+      rotation: {x: -0.00000014266695, y: -0.0000003464519, z: -0.040364485, w: 0.999185}
+      scale: {x: 1.0000004, y: 1.0000002, z: 1.0000002}
+    - name: R Finger22
+      parentName: R Finger21
+      position: {x: -0.02756092, y: -0.00000011920929, z: 0.000000007450581}
+      rotation: {x: 0.0000000081101215, y: 0.000000080766405, z: 0.049120147, w: 0.9987929}
+      scale: {x: 1.0000005, y: 1.0000004, z: 1.0000001}
+    - name: R Finger4
+      parentName: Hand_R
+      position: {x: -0.06409684, y: 0.0104545355, z: -0.040956892}
+      rotation: {x: 0.0023238347, y: -0.0660403, z: -0.010653884, w: 0.9977574}
+      scale: {x: 1.0000004, y: 1.0000006, z: 0.99999994}
+    - name: R Finger41
+      parentName: R Finger4
+      position: {x: -0.01968649, y: 0, z: 0.000000007450581}
+      rotation: {x: -0.000000005122272, y: 0.00000011920923, z: -0.04118526, w: 0.9991515}
+      scale: {x: 1.0000007, y: 1.000001, z: 1.0000001}
+    - name: R Finger42
+      parentName: R Finger41
+      position: {x: -0.01262939, y: -0.00000011920929, z: 0.0000000037252903}
+      rotation: {x: 0.000000003970235, y: -0.0000000109621014, z: -0.04883061, w: 0.9988071}
+      scale: {x: 0.9999997, y: 0.99999946, z: 0.99999994}
+    - name: R Finger3
+      parentName: Hand_R
+      position: {x: -0.06913158, y: 0.0051350594, z: -0.01927507}
+      rotation: {x: 0.043973748, y: -0.064863734, z: -0.02549567, w: 0.9965987}
+      scale: {x: 1.0000004, y: 1.0000005, z: 1.0000001}
+    - name: R Finger31
+      parentName: R Finger3
+      position: {x: -0.028140157, y: 0, z: 0}
+      rotation: {x: 0.00000020861613, y: -0.00000045448513, z: -0.041090228, w: 0.99915546}
+      scale: {x: 0.99999994, y: 1, z: 1.0000001}
+    - name: R Finger32
+      parentName: R Finger31
+      position: {x: -0.019860744, y: 0.00000011920929, z: 0}
+      rotation: {x: -0.00000008621936, y: -0.0000000034845287, z: 0.018992186, w: 0.9998197}
+      scale: {x: 1, y: 1.0000001, z: 1.0000001}
+    - name: RY1
+      parentName: Spine_03
+      position: {x: -0.08011818, y: 0.050750583, z: -0.08331715}
+      rotation: {x: -0.53217626, y: 0.8416021, z: -0.04619302, w: -0.07975321}
+      scale: {x: 1.0000005, y: 0.99999994, z: 1.0000002}
+    - name: RY11
+      parentName: RY1
+      position: {x: -0.075481296, y: 0, z: -0.00000023841858}
+      rotation: {x: -0.000000045634803, y: -0.000000047031783, z: -0.00000004470348,
+        w: 1}
+      scale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
+    - name: model
+      parentName: 123123(Clone)
+      position: {x: 5.3128324, y: 0.0000007748604, z: -6.025983}
+      rotation: {x: 1, y: 0, z: 0, w: -0.00000013315805}
+      scale: {x: 1, y: 1, z: 1}
+    - name: Standard_nv
+      parentName: model
+      position: {x: -5.3128324, y: -0.00000089367575, z: -6.025983}
+      rotation: {x: 1, y: 0, z: -0, w: 0.0000000754979}
+      scale: {x: 1, y: 1, z: 1}
+    - name: FE_BTM001
+      parentName: 123123(Clone)
+      position: {x: -0, y: 0, z: 0}
+      rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+      scale: {x: 1, y: 1, z: 1}
+    - name: FE_Hair001
+      parentName: 123123(Clone)
+      position: {x: -0, y: 0, z: 0}
+      rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+      scale: {x: 1, y: 1, z: 1}
+    - name: FE_Top001
+      parentName: 123123(Clone)
+      position: {x: -0, y: 0, z: 3.8501105e-10}
+      rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+      scale: {x: 1, y: 1, z: 1}
+    - name: FE_SH001
+      parentName: 123123(Clone)
+      position: {x: -0, y: 0, z: 0}
+      rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+      scale: {x: 1, y: 1, z: 1}
+    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: 1
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 3
+  humanoidOversampling: 1
+  avatarSetup: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 100
Assets/GameMain/Model/cloth/bianyifu.FBX.meta

@@ -1,100 +0,0 @@
-fileFormatVersion: 2
-guid: 240d37c4bd40f7044b0386934ecc8b86
-ModelImporter:
-  serializedVersion: 19301
-  internalIDToNameTable:
-  - first:
-      74: 1827226128182048838
-    second: Take 001
-  externalObjects: {}
-  materials:
-    materialImportMode: 1
-    materialName: 0
-    materialSearch: 1
-    materialLocation: 1
-  animations:
-    legacyGenerateAnimations: 4
-    bakeSimulation: 0
-    resampleCurves: 1
-    optimizeGameObjects: 0
-    motionNodeName: 
-    rigImportErrors: 
-    rigImportWarnings: 
-    animationImportErrors: 
-    animationImportWarnings: 
-    animationRetargetingWarnings: 
-    animationDoRetargetingWarnings: 0
-    importAnimatedCustomProperties: 0
-    importConstraints: 0
-    animationCompression: 3
-    animationRotationError: 0.5
-    animationPositionError: 0.5
-    animationScaleError: 0.5
-    animationWrapMode: 0
-    extraExposedTransformPaths: []
-    extraUserProperties: []
-    clipAnimations: []
-    isReadable: 1
-  meshes:
-    lODScreenPercentages: []
-    globalScale: 1
-    meshCompression: 0
-    addColliders: 0
-    useSRGBMaterialColor: 1
-    sortHierarchyByName: 1
-    importVisibility: 1
-    importBlendShapes: 1
-    importCameras: 1
-    importLights: 1
-    fileIdsGeneration: 2
-    swapUVChannels: 0
-    generateSecondaryUV: 0
-    useFileUnits: 1
-    keepQuads: 0
-    weldVertices: 1
-    preserveHierarchy: 0
-    skinWeightsMode: 0
-    maxBonesPerVertex: 4
-    minBoneWeight: 0.001
-    meshOptimizationFlags: -1
-    indexFormat: 0
-    secondaryUVAngleDistortion: 8
-    secondaryUVAreaDistortion: 15.000001
-    secondaryUVHardAngle: 88
-    secondaryUVPackMargin: 4
-    useFileScale: 1
-  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: 1
-    skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {instanceID: 0}
-  autoGenerateAvatarMappingIfUnspecified: 1
-  animationType: 3
-  humanoidOversampling: 1
-  avatarSetup: 1
-  additionalBone: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

File diff suppressed because it is too large
+ 5151 - 0
Assets/GameMain/Model/stand 1.anim


+ 8 - 0
Assets/GameMain/Model/stand 1.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fd4f5b7fed90a844985b520ac60806a3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 53 - 0
Assets/GameMain/Model/stand.anim

@@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: stand
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 0
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 30
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

+ 8 - 0
Assets/GameMain/Model/stand.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: afefb4e1a12baa246a094d2dd0cf15af
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
Assets/GameMain/Scenes/CustomRole.unity

@@ -347,6 +347,21 @@ PrefabInstance:
       propertyPath: m_Materials.Array.data[15]
       value: 
       objectReference: {fileID: 2100000, guid: bc8be32b47a94d547a3a88f0ffac5ac2, type: 2}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.size
+      value: 143
+      objectReference: {fileID: 0}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[84]
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -1314833244017027695, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
+        type: 3}
+      propertyPath: m_BlendShapeWeights.Array.data[87]
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 2fd13e1bcc307cf409ba3aeaab94e9cb,
         type: 3}
       propertyPath: m_Name

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRAircraft.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-25 20:36:36.434
+// 生成时间:2022-01-27 20:00:40.147
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRArmor.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-25 20:36:36.446
+// 生成时间:2022-01-27 20:00:40.174
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRAsteroid.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-25 20:36:36.450
+// 生成时间:2022-01-27 20:00:40.178
 //------------------------------------------------------------
 
 using GameFramework;

+ 12 - 1
Assets/GameMain/Scripts/DataTable/DRCustomBody.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-25 20:36:36.481
+// 生成时间:2022-01-27 20:00:40.653
 //------------------------------------------------------------
 
 using GameFramework;
@@ -234,6 +234,15 @@ namespace MetaClient
             private set;
         }
 
+        /// <summary>
+        /// 获取额外保持缩放的骨骼节点。
+        /// </summary>
+        public string ExtraKeepBoneName
+        {
+            get;
+            private set;
+        }
+
         public override bool ParseDataRow(string dataRowString, object userData)
         {
             string[] columnStrings = dataRowString.Split(DataTableExtension.DataSplitSeparators);
@@ -267,6 +276,7 @@ namespace MetaClient
             BiggerBlendName = columnStrings[index++];
             DefaultBlendValue = float.Parse(columnStrings[index++]);
             SmallerBlendName = columnStrings[index++];
+            ExtraKeepBoneName = columnStrings[index++];
 
             GeneratePropertyArray();
             return true;
@@ -301,6 +311,7 @@ namespace MetaClient
                     BiggerBlendName = binaryReader.ReadString();
                     DefaultBlendValue = binaryReader.ReadSingle();
                     SmallerBlendName = binaryReader.ReadString();
+                    ExtraKeepBoneName = binaryReader.ReadString();
                 }
             }
 

+ 13 - 3
Assets/GameMain/Scripts/DataTable/DRCustomFace.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-25 20:36:36.488
+// 生成时间:2022-01-27 20:00:40.660
 //------------------------------------------------------------
 
 using GameFramework;
@@ -19,7 +19,7 @@ using UnityGameFramework.Runtime;
 namespace MetaClient
 {
     /// <summary>
-    /// 自定义面部
+    /// 自定义身体
     /// </summary>
     public class DRCustomFace : DataRowBase
     {
@@ -216,6 +216,15 @@ namespace MetaClient
             private set;
         }
 
+        /// <summary>
+        /// 获取是否镜像。
+        /// </summary>
+        public bool IsMirror
+        {
+            get;
+            private set;
+        }
+
         public override bool ParseDataRow(string dataRowString, object userData)
         {
             string[] columnStrings = dataRowString.Split(DataTableExtension.DataSplitSeparators);
@@ -247,7 +256,7 @@ namespace MetaClient
             ScaleChange = DataTableExtension.ParseVector3(columnStrings[index++]);
             PositionChange = DataTableExtension.ParseVector3(columnStrings[index++]);
             RotationChange = DataTableExtension.ParseVector3(columnStrings[index++]);
-            index++;
+            IsMirror = bool.Parse(columnStrings[index++]);
 
             GeneratePropertyArray();
             return true;
@@ -280,6 +289,7 @@ namespace MetaClient
                     ScaleChange = binaryReader.ReadVector3();
                     PositionChange = binaryReader.ReadVector3();
                     RotationChange = binaryReader.ReadVector3();
+                    IsMirror = binaryReader.ReadBoolean();
                 }
             }
 

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DREntity.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-25 20:36:36.455
+// 生成时间:2022-01-27 20:00:40.346
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRMusic.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-25 20:36:36.459
+// 生成时间:2022-01-27 20:00:40.352
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRScene.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-25 20:36:36.460
+// 生成时间:2022-01-27 20:00:40.355
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRSound.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-25 20:36:36.462
+// 生成时间:2022-01-27 20:00:40.360
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRThruster.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-25 20:36:36.465
+// 生成时间:2022-01-27 20:00:40.364
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRUIForm.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-25 20:36:36.468
+// 生成时间:2022-01-27 20:00:40.431
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRUISound.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-25 20:36:36.470
+// 生成时间:2022-01-27 20:00:40.433
 //------------------------------------------------------------
 
 using GameFramework;

+ 1 - 1
Assets/GameMain/Scripts/DataTable/DRWeapon.cs

@@ -5,7 +5,7 @@
 // Feedback: mailto:ellan@gameframework.cn
 //------------------------------------------------------------
 // 此文件由工具自动生成,请勿直接修改。
-// 生成时间:2022-01-25 20:36:36.472
+// 生成时间:2022-01-27 20:00:40.435
 //------------------------------------------------------------
 
 using GameFramework;

+ 34 - 5
Assets/GameMain/Scripts/Entity/EntityData/RoleCustomBoneData.cs

@@ -8,8 +8,17 @@ namespace MetaClient
     {
         public Dictionary<int, PartData> bodyList;
         public Dictionary<int, PartData> faceList;
+        /// <summary>
+        /// 初始缩放
+        /// </summary>
         public Dictionary<string, Vector3> orginLocalScaleList;
+        /// <summary>
+        /// 缩放总系数
+        /// </summary>
         public Dictionary<string, Vector3> orginChangeScaleList;
+        /// <summary>
+        /// 实际缩放值
+        /// </summary>
         public Dictionary<string, Vector3> ChangedScaleParamsList;
         public Dictionary<string, Vector3> orginLocalPositionList;
         public Dictionary<string, Vector3> orginLocalRotationList;
@@ -59,6 +68,9 @@ namespace MetaClient
         public string smallerBlendName;
         public bool useBlend;
         public bool oneBlend;
+        public string[] extraBones = null;
+        public bool keepChild = true;
+        public bool isMirror;
 
         public float minChangeValue;
         public float maxChangeValue;
@@ -76,7 +88,7 @@ namespace MetaClient
             pathValue = "";
         }
 
-        public PartData(int _id,string[] _bones,float _min,float _max,Vector3 _scaleChange,Vector3 _posChange,Vector3 _rotChange,bool _useBlend,string _bigBlendName,string _smallBlendName,float _defaultValue = 0)
+        public PartData(int _id,string[] _bones,float _min,float _max,Vector3 _scaleChange,Vector3 _posChange,Vector3 _rotChange,bool _useBlend,string _bigBlendName,string _smallBlendName,float _defaultValue = 0,string _extrabone = "",bool _keepChildScale = true,bool _isMirror = false)
         {
             id = _id;
             vecValue = Vector3.zero;
@@ -90,8 +102,9 @@ namespace MetaClient
             useBlend = _useBlend;
             biggerBlendName = _bigBlendName;
             smallerBlendName = _smallBlendName;
+            isMirror = _isMirror;
 
-            if(biggerBlendName == "" || biggerBlendName == "no" || smallerBlendName == "" || smallerBlendName == "no")
+            if (biggerBlendName == "" || biggerBlendName == "no" || smallerBlendName == "" || smallerBlendName == "no")
             {
                 oneBlend = true;
             }else
@@ -101,22 +114,38 @@ namespace MetaClient
 
             if(_useBlend)
             {
-                if(oneBlend)
+                if (oneBlend)
                 {
                     floatValue = 0;
-                }else
+                }
+                else
                 {
                     floatValue = 0.5f;
                 }
-                
+
                 minChangeValue = 0;
                 maxChangeValue = 1;
             }
             else
             {
                 floatValue = 1;
+                if (scaleChange.x == 1 || scaleChange.y == 1 || scaleChange.z == 1)
+                {
+                    floatValue = 1;
+                }
+
+                if (positionChange.x == 1 || positionChange.y == 1 || positionChange.z == 1 || rotationChange.x == 1 || rotationChange.y == 1 || rotationChange.z == 1)
+                {
+                    floatValue = 0;
+                }
+
                 minChangeValue = _min;
                 maxChangeValue = _max;
+                if(_extrabone != "")
+                {
+                    extraBones = _extrabone.Split(',');
+                }
+                keepChild = _keepChildScale;
             }
         }
     }

+ 177 - 23
Assets/GameMain/Scripts/Game/CustomRole/CustomManager.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using GameFramework.Event;
 using UnityEngine;
 using GameFramework.DataTable;
+using DG.Tweening;
 
 namespace MetaClient
 {
@@ -51,7 +52,9 @@ namespace MetaClient
                     dtCB[i].IsBlend,
                     dtCB[i].BiggerBlendName,
                     dtCB[i].SmallerBlendName,
-                    dtCB[i].DefaultBlendValue
+                    dtCB[i].DefaultBlendValue,
+                    dtCB[i].ExtraKeepBoneName,
+                    dtCB[i].IsKeepChildrenScale
                     );
                 bodyData.bodyList.Add(dtCB[i].Id, partData);
             }
@@ -71,7 +74,10 @@ namespace MetaClient
                     dtCF[i].IsBlend,
                     dtCF[i].BiggerBlendName,
                     dtCF[i].SmallerBlendName,
-                    dtCF[i].DefaultBlendValue
+                    dtCF[i].DefaultBlendValue,
+                    "",
+                    true,
+                    dtCF[i].IsMirror
                     );
                 bodyData.faceList.Add(dtCF[i].Id, partData);
             }
@@ -190,7 +196,7 @@ namespace MetaClient
             Debug.Log(partData.id + " : "+ partData.floatValue);
             if(partData.oneBlend)
             {
-                RefreshRoleBlendShape(partData.biggerBlendName, partData.floatValue);
+                RefreshRoleBlendShape(partData.biggerBlendName, partData.floatValue * 100);
                 return;
             }
             if(partData.floatValue == 0.5f)
@@ -216,21 +222,22 @@ namespace MetaClient
         /// <param name="changeValue"></param>
         private void ChangeBone(PartData partData,Vector3 changeValue)
         {
-            if (changeValue.x == 0.5f)
-            {
-                partData.floatValue = 1;
-            }
-            if (changeValue.x < 0.5f)
-            {
-                partData.floatValue = partData.minChangeValue + (1 - partData.minChangeValue) * (changeValue.x / 0.5f);
-            }
-            if (changeValue.x > 0.5f)
-            {
-                partData.floatValue = 1 + (partData.maxChangeValue - 1) * ((changeValue.x - 0.5f) / 0.5f);
-            }
-            Debug.Log(partData.id + " : " + changeValue + " 转换后 :" + partData.floatValue);
             if (partData.scaleChange != Vector3.zero)
             {
+                if (changeValue.x == 0.5f)
+                {
+                    partData.floatValue = 1;
+                }
+                if (changeValue.x < 0.5f)
+                {
+                    partData.floatValue = partData.minChangeValue + (1 - partData.minChangeValue) * (changeValue.x / 0.5f);
+                }
+                if (changeValue.x > 0.5f)
+                {
+                    partData.floatValue = 1 + (partData.maxChangeValue - 1) * ((changeValue.x - 0.5f) / 0.5f);
+                }
+                Debug.Log(partData.id + " : " + changeValue + " 转换后 :" + partData.floatValue);
+
                 for (int i = 0; i < partData.bones.Length; i++)
                 {
                     //var orginBoneScale = bodyData.orginWorldScaleList[partData.bones[i]];
@@ -250,20 +257,47 @@ namespace MetaClient
                         partData.scaleChange.z == 1 ? partData.floatValue * orginBoneScale.z * changeScale.z : scale.z
                         );
 
-                    
+
                     bodyData.changedScaleList[partData.bones[i]] = newBoneScale;
-                    bodyData.ChangedScaleParamsList[partData.bones[i]] = new Vector3(newBoneScale.x/orginBoneScale.x/changeScale.x, newBoneScale.y / orginBoneScale.y / changeScale.y, newBoneScale.z / orginBoneScale.z / changeScale.z);
+                    bodyData.ChangedScaleParamsList[partData.bones[i]] = new Vector3(newBoneScale.x / orginBoneScale.x / changeScale.x, newBoneScale.y / orginBoneScale.y / changeScale.y, newBoneScale.z / orginBoneScale.z / changeScale.z);
                     Debug.Log(partData.bones[i] + " : " + bodyData.ChangedScaleParamsList[partData.bones[i]]);
+
+                    if(!partData.keepChild)
+                    {
+                        continue;
+                    }
                     //子物体
                     var count = nowBone.childCount;
                     for (int j = 0; j < count; j++)
                     {
                         var childname = nowBone.GetChild(j).name;
-                        if(bones.ContainsKey(childname))
+                        if (bones.ContainsKey(childname))
+                        {
+                            var orginChildBoneScale = bodyData.orginLocalScaleList[childname];
+                            var beforeChildScaleParams = bodyData.ChangedScaleParamsList[childname];
+                            bodyData.orginChangeScaleList[childname] = new Vector3(orginBoneScale.x / newBoneScale.x, orginBoneScale.y / newBoneScale.y, orginBoneScale.z / newBoneScale.z);
+                            bodyData.changedScaleList[childname] = new Vector3(
+                                beforeChildScaleParams.x * bodyData.orginChangeScaleList[childname].x * orginChildBoneScale.x,
+                                beforeChildScaleParams.y * bodyData.orginChangeScaleList[childname].y * orginChildBoneScale.y,
+                                beforeChildScaleParams.z * bodyData.orginChangeScaleList[childname].z * orginChildBoneScale.z
+                                );
+                            Debug.Log(childname + " : " + bodyData.ChangedScaleParamsList[childname]);
+                        }
+                    }
+
+                    if (partData.extraBones == null || partData.extraBones.Length == 0)
+                    {
+                        continue;
+                    }
+
+                    for (int j = 0; j < partData.extraBones.Length; j++)
+                    {
+                        var childname = partData.extraBones[j];
+                        if (bones.ContainsKey(childname))
                         {
                             var orginChildBoneScale = bodyData.orginLocalScaleList[childname];
                             var beforeChildScaleParams = bodyData.ChangedScaleParamsList[childname];
-                            bodyData.orginChangeScaleList[childname] = new Vector3(orginBoneScale.x/newBoneScale.x, orginBoneScale.y / newBoneScale.y, orginBoneScale.z / newBoneScale.z);
+                            bodyData.orginChangeScaleList[childname] = new Vector3(orginBoneScale.x / newBoneScale.x, orginBoneScale.y / newBoneScale.y, orginBoneScale.z / newBoneScale.z);
                             bodyData.changedScaleList[childname] = new Vector3(
                                 beforeChildScaleParams.x * bodyData.orginChangeScaleList[childname].x * orginChildBoneScale.x,
                                 beforeChildScaleParams.y * bodyData.orginChangeScaleList[childname].y * orginChildBoneScale.y,
@@ -278,16 +312,65 @@ namespace MetaClient
             //修改位置
             if (partData.positionChange != Vector3.zero)
             {
+                if (changeValue.x == 0.5f)
+                {
+                    partData.floatValue = 0;
+                }
+                if (changeValue.x < 0.5f)
+                {
+                    partData.floatValue = partData.minChangeValue * (0.5f - changeValue.x) * 2;
+                }
+                if (changeValue.x > 0.5f)
+                {
+                    partData.floatValue = partData.maxChangeValue * (changeValue.x - 0.5f) * 2;
+                }
+                Debug.Log(partData.id + " : " + changeValue + " 转换后 :" + partData.floatValue);
                 for (int i = 0; i < partData.bones.Length; i++)
                 {
-
+                    var nowBone = bones[partData.bones[i]];
+                    var orginBonePosition = bodyData.orginLocalPositionList[partData.bones[i]];
+                    var newBonePosition = new Vector3(
+                        partData.positionChange.x == 1 ? partData.floatValue + orginBonePosition.x : orginBonePosition.x,
+                        partData.positionChange.y == 1 ? partData.floatValue + orginBonePosition.y : orginBonePosition.y,
+                        partData.positionChange.z == 1 ? partData.floatValue + orginBonePosition.z : orginBonePosition.z
+                        );
+                    bodyData.changedPositionList[partData.bones[i]] = newBonePosition;
                 }
             }
 
             //修改旋转
             if (partData.rotationChange != Vector3.zero)
             {
-
+                if (changeValue.x == 0.5f)
+                {
+                    partData.floatValue = 0;
+                }
+                if (changeValue.x < 0.5f)
+                {
+                    partData.floatValue = partData.minChangeValue * (0.5f - changeValue.x) * 2;
+                }
+                if (changeValue.x > 0.5f)
+                {
+                    partData.floatValue = partData.maxChangeValue * (changeValue.x - 0.5f) * 2;
+                }
+                Debug.Log(partData.id + " : " + changeValue + " 转换后 :" + partData.floatValue);
+                for (int i = 0; i < partData.bones.Length; i++)
+                {
+                    var changeVal = 1;
+                    if(i == 1 && partData.isMirror)
+                    {
+                        changeVal = -1;
+                    }
+                    var nowBone = bones[partData.bones[i]];
+                    var rotate = nowBone.localEulerAngles;
+                    var orginBoneRot = bodyData.orginLocalRotationList[partData.bones[i]];
+                    var newBoneRot = new Vector3(
+                        partData.rotationChange.x == 1 ? changeVal * partData.floatValue + orginBoneRot.x : rotate.x,
+                        partData.rotationChange.y == 1 ? changeVal * partData.floatValue + orginBoneRot.y : rotate.y,
+                        partData.rotationChange.z == 1 ? changeVal * partData.floatValue + orginBoneRot.z : rotate.z
+                        );
+                    bodyData.changedRotationList[partData.bones[i]] = newBoneRot;
+                }
             }
 
             RefreshRoleBone();
@@ -341,7 +424,39 @@ namespace MetaClient
                     return 0.5f + (partData.floatValue - 1) / (partData.maxChangeValue - 1)/2;
                 }
             }
-            
+
+            if (partData.positionChange.x == 1 || partData.positionChange.y == 1 || partData.positionChange.z == 1)
+            {
+                if (partData.floatValue == 0)
+                {
+                    return 0.5f;
+                }
+                if (partData.floatValue < 0)
+                {
+                    return partData.floatValue / partData.maxChangeValue/2;
+                }
+                if (partData.floatValue > 0)
+                {
+                    return 0.5f + partData.floatValue / partData.maxChangeValue / 2;
+                }
+            }
+
+            if (partData.rotationChange.x == 1 || partData.rotationChange.y == 1 || partData.rotationChange.z == 1)
+            {
+                if (partData.floatValue == 0)
+                {
+                    return 0.5f;
+                }
+                if (partData.floatValue < 0)
+                {
+                    return partData.floatValue / partData.maxChangeValue / 2;
+                }
+                if (partData.floatValue > 0)
+                {
+                    return 0.5f + partData.floatValue / partData.maxChangeValue / 2;
+                }
+            }
+
             return 0.5f;
         }
         /// <summary>
@@ -449,6 +564,22 @@ namespace MetaClient
                 //testPlayer.SetBoneWorldScale(key, value, bodyData.orginLocalScaleList[key], bodyData.orginWorldScaleList[key]);
                 testPlayer.SetBoneScale(key, value);
             }
+
+            foreach (var item in bodyData.changedPositionList)
+            {
+                var key = item.Key;
+                var value = item.Value;
+                
+                testPlayer.SetBonePos(key, value);
+            }
+
+            foreach (var item in bodyData.changedRotationList)
+            {
+                var key = item.Key;
+                var value = item.Value;
+
+                testPlayer.SetBoneRot(key, value);
+            }
         }
         /// <summary>
         /// 旋转模特
@@ -462,5 +593,28 @@ namespace MetaClient
             }
             testPlayer.RotateSelf(offset);
         }
+
+
+        public void ChangeCustomCamera(ECustomStyple type)
+        {
+            switch (type)
+            {
+                case ECustomStyple.None:
+                    break;
+                case ECustomStyple.NieLian:
+                    Camera.main.transform.DOMove(new Vector3(-0.26f, 0.4f, -5), 0.3f);
+                    Camera.main.DOOrthoSize(0.25f, 0.3f);
+                    break;
+                case ECustomStyple.Body:
+                case ECustomStyple.Cloth:
+                    Camera.main.transform.DOMove(new Vector3(0, -0.24f, -5), 0.3f);
+                    Camera.main.DOOrthoSize(1.5f, 0.3f);
+                    break;
+                case ECustomStyple.Ornament:
+                    break;
+                default:
+                    break;
+            }
+        }
     }
 }

+ 2 - 1
Assets/GameMain/Scripts/UI/UICustomNor.cs

@@ -46,9 +46,10 @@ namespace MetaClient
                     uICustom.isTween = false;
                     uICustom.HistoryAdd(eCustomStyple+"");
                     uICustom.ChangeECustomStyple(eCustomStyple);
-                    Debug.Log("222" + eCustomStyple);
+                    //Debug.Log("222" + eCustomStyple);
                 });
             });
+            CustomManager.Instance.ChangeCustomCamera(eCustomStyple);
             Debug.Log("333");
             uICustom.rightView.transform.DOLocalMoveX(uICustom.tween_rightMax, tweenTime).SetEase(Ease.InOutBack).OnComplete(() => {
                 uICustom.rightView.transform.DOLocalMoveX(0, tweenTime).SetEase(Ease.InOutBack).OnComplete(() => {

+ 1 - 1
Assets/Launcher.unity

@@ -657,7 +657,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 11499388, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3}
       propertyPath: m_EditorResourceMode
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 11499388, guid: adb3eb1c35fcff14f89fba7b05c9d71c, type: 3}
       propertyPath: m_JsonHelperTypeName

+ 1 - 1
ProjectSettings/EditorBuildSettings.asset

@@ -11,7 +11,7 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/GameMain/Scenes/Menu.unity
     guid: b031b4f2980561542a7f7ba41391edc3
-  - enabled: 0
+  - enabled: 1
     path: Assets/GameMain/Scenes/CustomRole.unity
     guid: b474370e72ceec54ea3cb09d8765a548
   - enabled: 1