diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.fbx.meta index 6fc1c5cc..42c43849 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: c88a7609779fa1d4090ead6612db10d5 ModelImporter: - serializedVersion: 21300 + serializedVersion: 22200 internalIDToNameTable: - first: 74: -623603649343465320 @@ -44,7 +44,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: 46chuangjin + takeName: + internalID: 3060610079319413300 + firstFrame: 3800 + lastFrame: 3960 + 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: 0 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -53,6 +82,7 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -80,6 +110,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -108,10 +139,11 @@ ModelImporter: skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 1 humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/jianjian/jianjian.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/jianjian/jianjian.fbx.meta index 05719fc5..a84df7dc 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/jianjian/jianjian.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/jianjian/jianjian.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 7f18bcb14ed4e3e4ebd09c7ab20c10ca ModelImporter: - serializedVersion: 21300 + serializedVersion: 22200 internalIDToNameTable: - first: 74: -623603649343465320 @@ -39,7 +39,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: 46jianjian + takeName: + internalID: 3060610079319413300 + firstFrame: 3800 + lastFrame: 3960 + 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: 0 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -48,6 +77,7 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -75,6 +105,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -103,10 +134,11 @@ ModelImporter: skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 1 humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhudao.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhudao.fbx.meta index e27948be..b3b00161 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhudao.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhudao.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: a2a1f988a08d26440b0eda4029929157 ModelImporter: - serializedVersion: 21300 + serializedVersion: 22200 internalIDToNameTable: - first: 74: -623603649343465320 @@ -34,7 +34,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: 46zhudao + takeName: + internalID: 3060610079319413300 + firstFrame: 3800 + lastFrame: 3960 + 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: 0 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -43,6 +72,7 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -70,6 +100,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -98,10 +129,11 @@ ModelImporter: skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 1 humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhushou.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhushou.fbx.meta index 0f80bb00..e6bcb3e6 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhushou.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhushou.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: a03311e14cdec924aa5ae3bde1a2206e ModelImporter: - serializedVersion: 21300 + serializedVersion: 22200 internalIDToNameTable: - first: 74: -623603649343465320 @@ -34,7 +34,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: 46zhushou + takeName: + internalID: 3060610079319413300 + firstFrame: 3800 + lastFrame: 3960 + 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: 0 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -43,6 +72,7 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -70,6 +100,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -98,10 +129,11 @@ ModelImporter: skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 1 humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity index d27cd24a..87e58ae8 100644 --- a/Assets/Scenes/LouDiXuMuQvan.unity +++ b/Assets/Scenes/LouDiXuMuQvan.unity @@ -4959,7 +4959,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: ea1d392e4345dc341be80a904b50d0de, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2223639932434330405, guid: ea1d392e4345dc341be80a904b50d0de, type: 3} propertyPath: m_PlayAutomatically diff --git a/Data/Xml/Study.xml b/Data/Xml/Study.xml index 17db6f0c..628946f5 100644 --- a/Data/Xml/Study.xml +++ b/Data/Xml/Study.xml @@ -1300,10 +1300,10 @@ - - - - + + + + @@ -1354,7 +1354,7 @@ - + @@ -1389,16 +1389,16 @@ - + - - - - - - - - + + + + + + + + @@ -1419,11 +1419,11 @@ - + - + @@ -1440,7 +1440,7 @@ - + @@ -1449,15 +1449,17 @@ + + - + - + @@ -1469,7 +1471,7 @@ - + @@ -1482,10 +1484,11 @@ + + - - - + + @@ -1494,7 +1497,7 @@ - + @@ -1502,13 +1505,13 @@ - + - - + + @@ -1517,6 +1520,7 @@ + @@ -1524,83 +1528,65 @@ - + + + + + - + + - - - - - - + - - - - - - - - - - - - - - - + + + + + + + - + + + - - - - + + + + + + - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + @@ -1609,15 +1595,20 @@ + + + - + + + + - @@ -1629,7 +1620,11 @@ + + + + @@ -1645,41 +1640,59 @@ - + - - - + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1692,7 +1705,8 @@ - + + @@ -1700,7 +1714,12 @@ - + + + + + + @@ -2505,7 +2524,7 @@ - + @@ -2541,7 +2560,7 @@ - + @@ -2603,7 +2622,7 @@ - + @@ -2643,11 +2662,11 @@ - - - - - + + + + + @@ -2675,9 +2694,9 @@ - - - + + + @@ -2708,7 +2727,7 @@ - +