From 10e7c24570dcef34fbf4b8bc4a87c52d7339e29b Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Thu, 2 Jan 2025 14:36:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Animation/39/diantuizi/diantuizi.fbx.meta | 38 +++++++++++++++++-- .../Animation/39/diantuizi/diantuizi.txt | 1 + .../Animation/39/diantuizi/diantuizi.txt.meta | 7 ++++ .../Animation/39/zhudao.fbx.meta | 38 +++++++++++++++++-- .../A_QvanChangJing/Animation/39/zhudao.txt | 1 + .../Animation/39/zhudao.txt.meta | 7 ++++ Assets/Scenes/LouDiXuMuQvan.unity | 26 ++++++++++++- Data/Xml/Exam.xml | 12 +++++- Data/Xml/Study.xml | 15 +++++++- 9 files changed, 134 insertions(+), 11 deletions(-) create mode 100644 Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/diantuizi/diantuizi.txt create mode 100644 Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/diantuizi/diantuizi.txt.meta create mode 100644 Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/zhudao.txt create mode 100644 Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/zhudao.txt.meta diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/diantuizi/diantuizi.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/diantuizi/diantuizi.fbx.meta index e49cbf13..220cc15a 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/diantuizi/diantuizi.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/diantuizi/diantuizi.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 3f52c0764fcadfd46b62fa4918747a00 ModelImporter: - serializedVersion: 21300 + serializedVersion: 22200 internalIDToNameTable: - first: 74: -623603649343465320 @@ -49,7 +49,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: "39\u7535\u63A8\u5B50\u52A8\u753B" + takeName: + internalID: 3060610079319413300 + firstFrame: 2900 + lastFrame: 3060 + 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: [] @@ -58,6 +87,7 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -85,6 +115,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -113,10 +144,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/39/diantuizi/diantuizi.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/diantuizi/diantuizi.txt new file mode 100644 index 00000000..3a88f143 --- /dev/null +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/diantuizi/diantuizi.txt @@ -0,0 +1 @@ +2900-3060 39电推子动画 \ No newline at end of file diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/diantuizi/diantuizi.txt.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/diantuizi/diantuizi.txt.meta new file mode 100644 index 00000000..ee634644 --- /dev/null +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/diantuizi/diantuizi.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 914598c1c48ac2f429c398a8fd80fa9f +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/zhudao.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/zhudao.fbx.meta index 7ae00c0a..eecdbe17 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/zhudao.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/zhudao.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 8d7e23f189bb9b8478f60d719a1526d8 ModelImporter: - serializedVersion: 21300 + serializedVersion: 22200 internalIDToNameTable: - first: 74: -623603649343465320 @@ -34,7 +34,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: "39\u4E3B\u5200\u52A8\u753B" + takeName: + internalID: 3060610079319413300 + firstFrame: 2900 + lastFrame: 3060 + 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/39/zhudao.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/zhudao.txt new file mode 100644 index 00000000..a80d9f61 --- /dev/null +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/zhudao.txt @@ -0,0 +1 @@ +2900-3060 39主刀动画 \ No newline at end of file diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/zhudao.txt.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/zhudao.txt.meta new file mode 100644 index 00000000..2d3f3a72 --- /dev/null +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/39/zhudao.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 16747967da8169e4484a075bebcdefce +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity index 65a363b7..1131df4e 100644 --- a/Assets/Scenes/LouDiXuMuQvan.unity +++ b/Assets/Scenes/LouDiXuMuQvan.unity @@ -25024,13 +25024,37 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 7727bd72595ec474ebebf27f0bff9a0d, type: 3} + insertIndex: -1 + addedObject: {fileID: 2051739464} m_SourcePrefab: {fileID: 100100000, guid: 7727bd72595ec474ebebf27f0bff9a0d, type: 3} --- !u!4 &2051739462 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 7727bd72595ec474ebebf27f0bff9a0d, type: 3} m_PrefabInstance: {fileID: 2051739461} m_PrefabAsset: {fileID: 0} +--- !u!1 &2051739463 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 7727bd72595ec474ebebf27f0bff9a0d, type: 3} + m_PrefabInstance: {fileID: 2051739461} + m_PrefabAsset: {fileID: 0} +--- !u!111 &2051739464 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2051739463} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 3060610079319413300, guid: 8d7e23f189bb9b8478f60d719a1526d8, type: 3} + m_Animations: + - {fileID: 3060610079319413300, guid: 8d7e23f189bb9b8478f60d719a1526d8, type: 3} + m_WrapMode: 0 + m_PlayAutomatically: 0 + m_AnimatePhysics: 0 + m_CullingType: 0 --- !u!1001 &2098757215 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml index 8d863f8c..478e38f7 100644 --- a/Data/Xml/Exam.xml +++ b/Data/Xml/Exam.xml @@ -517,6 +517,14 @@ + + 保定绳 + Environment/SM_QvanChangJing/SM_BuLiaoLei/Helix001 + 保定绳 + + + + 体重秤 @@ -761,8 +769,8 @@ 监测记录表 + + 保定绳 + Environment/SM_QvanChangJing/SM_BuLiaoLei/Helix001 + 保定绳 + + @@ -598,7 +604,7 @@ - + @@ -1250,7 +1256,12 @@ - + + + + + +