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 42c43849..6fc1c5cc 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: 22200 + serializedVersion: 21300 internalIDToNameTable: - first: 74: -623603649343465320 @@ -44,36 +44,7 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - 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 + clipAnimations: [] isReadable: 0 meshes: lODScreenPercentages: [] @@ -82,7 +53,6 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -110,7 +80,6 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 - strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -139,11 +108,10 @@ ModelImporter: skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 1 + animationType: 2 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 a84df7dc..05719fc5 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: 22200 + serializedVersion: 21300 internalIDToNameTable: - first: 74: -623603649343465320 @@ -39,36 +39,7 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - 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 + clipAnimations: [] isReadable: 0 meshes: lODScreenPercentages: [] @@ -77,7 +48,6 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -105,7 +75,6 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 - strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -134,11 +103,10 @@ ModelImporter: skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 1 + animationType: 2 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 b3b00161..e27948be 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: 22200 + serializedVersion: 21300 internalIDToNameTable: - first: 74: -623603649343465320 @@ -34,36 +34,7 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - 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 + clipAnimations: [] isReadable: 0 meshes: lODScreenPercentages: [] @@ -72,7 +43,6 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -100,7 +70,6 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 - strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -129,11 +98,10 @@ ModelImporter: skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 1 + animationType: 2 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 e6bcb3e6..0f80bb00 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: 22200 + serializedVersion: 21300 internalIDToNameTable: - first: 74: -623603649343465320 @@ -34,36 +34,7 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - 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 + clipAnimations: [] isReadable: 0 meshes: lODScreenPercentages: [] @@ -72,7 +43,6 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -100,7 +70,6 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 - strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -129,11 +98,10 @@ ModelImporter: skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 1 + animationType: 2 humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/创巾静态已铺好模型(静态)/chuangjinqian.fbx b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/创巾静态已铺好模型(静态)/chuangjinqian.fbx new file mode 100644 index 00000000..8657c890 Binary files /dev/null and b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/创巾静态已铺好模型(静态)/chuangjinqian.fbx differ diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/创巾静态已铺好模型(静态)/chuangjinqian.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/创巾静态已铺好模型(静态)/chuangjinqian.fbx.meta new file mode 100644 index 00000000..b3cd542e --- /dev/null +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/创巾静态已铺好模型(静态)/chuangjinqian.fbx.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 54a959f50d61ad748bebecff213a8b48 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: pasted__M_ShouShuDao1.004 + second: {fileID: 2100000, guid: 40835405dc39fae4ba42169f596c513c, type: 2} + 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: diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity index 75c4c891..dcebdea7 100644 --- a/Assets/Scenes/LouDiXuMuQvan.unity +++ b/Assets/Scenes/LouDiXuMuQvan.unity @@ -1722,6 +1722,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 30318410115208252, guid: 894c89228d4df964f87c711fbe1a2569, type: 3} m_PrefabInstance: {fileID: 215620240} m_PrefabAsset: {fileID: 0} +--- !u!1001 &326604139 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 738442634} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} + propertyPath: m_Name + value: chuangjinqian + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} +--- !u!4 &326604140 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 54a959f50d61ad748bebecff213a8b48, type: 3} + m_PrefabInstance: {fileID: 326604139} + m_PrefabAsset: {fileID: 0} --- !u!1 &330585543 GameObject: m_ObjectHideFlags: 0 @@ -3988,6 +4054,7 @@ Transform: - {fileID: 908061173} - {fileID: 112275700} - {fileID: 890524227} + - {fileID: 326604140} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &758617108 diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml index 177dbf38..b34ee742 100644 --- a/Data/Xml/Exam.xml +++ b/Data/Xml/Exam.xml @@ -2552,15 +2552,15 @@ - + - + - + @@ -2613,7 +2613,6 @@ - @@ -2655,7 +2654,7 @@ - +