diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/nvzhushou_xishou/nvzhushou_xishou.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/nvzhushou_xishou/nvzhushou_xishou.fbx.meta index 9f8f30af..0741ea7f 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/nvzhushou_xishou/nvzhushou_xishou.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/nvzhushou_xishou/nvzhushou_xishou.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 2de7256753d09ed4e90226e09652cca0 ModelImporter: - serializedVersion: 21300 + serializedVersion: 22200 internalIDToNameTable: - first: 74: -623603649343465320 @@ -148,6 +148,7 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -175,6 +176,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -199,14 +201,15 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 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/zhijin/zhijin.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/zhijin/zhijin.fbx.meta index feb16fb9..a2c7a035 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/zhijin/zhijin.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/zhijin/zhijin.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: be7f28f8b62754942a777770653e1620 ModelImporter: - serializedVersion: 21300 + serializedVersion: 22200 internalIDToNameTable: - first: 74: -623603649343465320 @@ -48,6 +48,7 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -75,6 +76,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -99,14 +101,15 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 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/zhijin/zhijin.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/zhijin/zhijin.txt new file mode 100644 index 00000000..4b364724 --- /dev/null +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/zhijin/zhijin.txt @@ -0,0 +1 @@ +0-215 擦手 \ No newline at end of file diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/zhijin/zhijin.txt.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/zhijin/zhijin.txt.meta new file mode 100644 index 00000000..8712b268 --- /dev/null +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/zhijin/zhijin.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ea2317864f15b654a910314dae50e04d +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/七步洗手/ZhuDao_xishou.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/七步洗手/ZhuDao_xishou.fbx.meta index d1c090c1..e4d27b4e 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/七步洗手/ZhuDao_xishou.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/七步洗手/ZhuDao_xishou.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: c2ddc27444f01e942b5504d171ddb5d3 ModelImporter: - serializedVersion: 21300 + serializedVersion: 22200 internalIDToNameTable: - first: 74: -623603649343465320 @@ -34,7 +34,94 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: "\u6D17\u624B" + takeName: + internalID: 3060610079319413300 + firstFrame: 900 + lastFrame: 2290 + 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 + - serializedVersion: 16 + name: "\u64E6\u624B\u7EB8\u64E6\u624B" + takeName: + internalID: -6004787696405322892 + firstFrame: 2290 + lastFrame: 2520 + 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 + - serializedVersion: 16 + name: "\u6D88\u6BD2\u6DB2\u6D88\u6BD2" + takeName: + internalID: -5880667880897408871 + firstFrame: 2520 + lastFrame: 2750 + 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 +130,7 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -70,6 +158,7 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -98,10 +187,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/七步洗手/ZhuDao_xishou.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/七步洗手/ZhuDao_xishou.txt new file mode 100644 index 00000000..9e8cbdd0 --- /dev/null +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/七步洗手/ZhuDao_xishou.txt @@ -0,0 +1,3 @@ +900-2290 洗手 +2290-2520 擦手纸擦手 +2520-2750 消毒液消毒 \ No newline at end of file diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/七步洗手/ZhuDao_xishou.txt.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/七步洗手/ZhuDao_xishou.txt.meta new file mode 100644 index 00000000..aa6aab77 --- /dev/null +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/七步洗手/ZhuDao_xishou.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 590b8d73e6c03134c886f4c3d8c6d229 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/穿衣服(含有主刀角色网格模型)/ZhuDao_chaunyifu/Materials/pasted__Mat3d66-10582850-7-81382.mat b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/穿衣服(含有主刀角色网格模型)/ZhuDao_chaunyifu/Materials/pasted__Mat3d66-10582850-7-81382.mat index 2eb4d203..05d67235 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/穿衣服(含有主刀角色网格模型)/ZhuDao_chaunyifu/Materials/pasted__Mat3d66-10582850-7-81382.mat +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/穿衣服(含有主刀角色网格模型)/ZhuDao_chaunyifu/Materials/pasted__Mat3d66-10582850-7-81382.mat @@ -30,7 +30,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity index 9bd2636e..c31a6fe0 100644 --- a/Assets/Scenes/LouDiXuMuQvan.unity +++ b/Assets/Scenes/LouDiXuMuQvan.unity @@ -419,61 +419,54 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 490020475} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} propertyPath: m_LocalPosition.x value: 50 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 6d0303911f413ab4391ab98ee2c2f263, - type: 3} + - target: {fileID: 919132149155446097, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} propertyPath: m_Name value: room_xishou objectReference: {fileID: 0} + - target: {fileID: 5431312701416729119, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -481,8 +474,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} --- !u!4 &556458935 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, - type: 3} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} m_PrefabInstance: {fileID: 556458934} m_PrefabAsset: {fileID: 0} --- !u!1001 &667147657 @@ -493,72 +485,108 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 738442634} m_Modifications: - - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, - type: 3} + - target: {fileID: -8794960103364426898, guid: be7f28f8b62754942a777770653e1620, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -1.056075 + objectReference: {fileID: 0} + - target: {fileID: -8794960103364426898, guid: be7f28f8b62754942a777770653e1620, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -37.391716 + objectReference: {fileID: 0} + - target: {fileID: -8794960103364426898, guid: be7f28f8b62754942a777770653e1620, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 46.93567 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, type: 3} propertyPath: m_LocalPosition.x value: 50 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, - type: 3} + - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, - type: 3} + - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, - type: 3} + - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, - type: 3} + - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, - type: 3} + - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, - type: 3} + - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, - type: 3} + - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, - type: 3} + - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, - type: 3} + - target: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: be7f28f8b62754942a777770653e1620, - type: 3} + - target: {fileID: -7164026451762343707, guid: be7f28f8b62754942a777770653e1620, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 59.909534 + objectReference: {fileID: 0} + - target: {fileID: -7164026451762343707, guid: be7f28f8b62754942a777770653e1620, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 56.099926 + objectReference: {fileID: 0} + - target: {fileID: -7164026451762343707, guid: be7f28f8b62754942a777770653e1620, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.8536438 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: be7f28f8b62754942a777770653e1620, type: 3} propertyPath: m_Name value: zhijin objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: be7f28f8b62754942a777770653e1620, type: 3} + insertIndex: -1 + addedObject: {fileID: 667147660} m_SourcePrefab: {fileID: 100100000, guid: be7f28f8b62754942a777770653e1620, type: 3} --- !u!4 &667147658 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, - type: 3} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: be7f28f8b62754942a777770653e1620, type: 3} m_PrefabInstance: {fileID: 667147657} m_PrefabAsset: {fileID: 0} +--- !u!1 &667147659 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: be7f28f8b62754942a777770653e1620, type: 3} + m_PrefabInstance: {fileID: 667147657} + m_PrefabAsset: {fileID: 0} +--- !u!111 &667147660 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 667147659} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: -623603649343465320, guid: be7f28f8b62754942a777770653e1620, type: 3} + m_Animations: + - {fileID: -623603649343465320, guid: be7f28f8b62754942a777770653e1620, type: 3} + m_WrapMode: 0 + m_PlayAutomatically: 0 + m_AnimatePhysics: 0 + m_CullingType: 0 --- !u!1 &738442633 GameObject: m_ObjectHideFlags: 0 @@ -650,68 +678,55 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2316947449395224660} m_Modifications: - - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, - type: 3} + - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, type: 3} propertyPath: m_LocalScale.x value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, - type: 3} + - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, type: 3} propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, - type: 3} + - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, type: 3} propertyPath: m_LocalPosition.x value: -2.4831567 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, - type: 3} + - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, type: 3} propertyPath: m_LocalPosition.y value: 0.606 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, - type: 3} + - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, type: 3} propertyPath: m_LocalPosition.z value: -3.432 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, - type: 3} + - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, - type: 3} + - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, - type: 3} + - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, - type: 3} + - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, - type: 3} + - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, - type: 3} + - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, - type: 3} + - target: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: ba7ff58e8aebc764f9fba519058c003f, - type: 3} + - target: {fileID: 919132149155446097, guid: ba7ff58e8aebc764f9fba519058c003f, type: 3} propertyPath: m_Name value: zhuozi objectReference: {fileID: 0} @@ -722,8 +737,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: ba7ff58e8aebc764f9fba519058c003f, type: 3} --- !u!4 &1052001024 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, - type: 3} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ba7ff58e8aebc764f9fba519058c003f, type: 3} m_PrefabInstance: {fileID: 1052001023} m_PrefabAsset: {fileID: 0} --- !u!1001 &1149311295 @@ -734,77 +748,102 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 738442634} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_LocalPosition.z value: -1.388 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, - type: 3} + - target: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 6669da75e54121749895f8a9990e5dcd, - type: 3} + - target: {fileID: -1461242666614159145, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_Name value: ZhuDao_chaunyifu objectReference: {fileID: 0} - - target: {fileID: 8717716694209848564, guid: 6669da75e54121749895f8a9990e5dcd, - type: 3} + - target: {fileID: 7498500524086036043, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7770369591733304147, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8717716694209848564, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} + insertIndex: -1 + addedObject: {fileID: 1149311298} m_SourcePrefab: {fileID: 100100000, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} --- !u!4 &1149311296 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, - type: 3} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} m_PrefabInstance: {fileID: 1149311295} m_PrefabAsset: {fileID: 0} +--- !u!1 &1149311297 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} + m_PrefabInstance: {fileID: 1149311295} + m_PrefabAsset: {fileID: 0} +--- !u!111 &1149311298 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1149311297} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 3060610079319413300, guid: c2ddc27444f01e942b5504d171ddb5d3, type: 3} + m_Animations: + - {fileID: 3060610079319413300, guid: c2ddc27444f01e942b5504d171ddb5d3, type: 3} + - {fileID: -5880667880897408871, guid: c2ddc27444f01e942b5504d171ddb5d3, type: 3} + - {fileID: -6004787696405322892, guid: c2ddc27444f01e942b5504d171ddb5d3, type: 3} + m_WrapMode: 0 + m_PlayAutomatically: 0 + m_AnimatePhysics: 0 + m_CullingType: 0 --- !u!1001 &1932204885 PrefabInstance: m_ObjectHideFlags: 0 @@ -813,68 +852,55 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 738442634} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, - type: 3} + - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} propertyPath: m_LocalPosition.x value: 50 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, - type: 3} + - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, - type: 3} + - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, - type: 3} + - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, - type: 3} + - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, - type: 3} + - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, - type: 3} + - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, - type: 3} + - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, - type: 3} + - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, - type: 3} + - target: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -6759168120721293040, guid: 2de7256753d09ed4e90226e09652cca0, - type: 3} + - target: {fileID: -6759168120721293040, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 2de7256753d09ed4e90226e09652cca0, - type: 3} + - target: {fileID: 919132149155446097, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} propertyPath: m_Name value: nvzhushou_xishou objectReference: {fileID: 0} - - target: {fileID: 1009965917947399484, guid: 2de7256753d09ed4e90226e09652cca0, - type: 3} + - target: {fileID: 1009965917947399484, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} @@ -885,8 +911,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} --- !u!4 &1932204886 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, - type: 3} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2de7256753d09ed4e90226e09652cca0, type: 3} m_PrefabInstance: {fileID: 1932204885} m_PrefabAsset: {fileID: 0} --- !u!1 &372759386918019368 @@ -933,63 +958,51 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5684450782462886339} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, - type: 3} + - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, type: 3} propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, - type: 3} + - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, - type: 3} + - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, type: 3} propertyPath: m_LocalPosition.y value: -0.347 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, - type: 3} + - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, - type: 3} + - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, - type: 3} + - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, - type: 3} + - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, - type: 3} + - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, - type: 3} + - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, - type: 3} + - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, - type: 3} + - target: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 29ec14ed384865244bfa2f71f0598d5f, - type: 3} + - target: {fileID: 919132149155446097, guid: 29ec14ed384865244bfa2f71f0598d5f, type: 3} propertyPath: m_Name value: SM_YaoPinLei objectReference: {fileID: 0} @@ -1000,8 +1013,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 29ec14ed384865244bfa2f71f0598d5f, type: 3} --- !u!4 &1357383184244558919 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, - type: 3} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 29ec14ed384865244bfa2f71f0598d5f, type: 3} m_PrefabInstance: {fileID: 1357383184244558918} m_PrefabAsset: {fileID: 0} --- !u!1 &1790901109577145605 @@ -1028,63 +1040,51 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5684450782462886339} m_Modifications: - - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, - type: 3} + - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, - type: 3} + - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, - type: 3} + - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, - type: 3} + - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, - type: 3} + - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, - type: 3} + - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, - type: 3} + - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, - type: 3} + - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, - type: 3} + - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, - type: 3} + - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, - type: 3} + - target: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: bab6a621eac3c364d8e3b2175bb7e836, - type: 3} + - target: {fileID: 919132149155446097, guid: bab6a621eac3c364d8e3b2175bb7e836, type: 3} propertyPath: m_Name value: SM_JianZiLei objectReference: {fileID: 0} @@ -1095,8 +1095,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: bab6a621eac3c364d8e3b2175bb7e836, type: 3} --- !u!4 &2125983990281363815 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, - type: 3} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bab6a621eac3c364d8e3b2175bb7e836, type: 3} m_PrefabInstance: {fileID: 2125983990281363814} m_PrefabAsset: {fileID: 0} --- !u!1001 &2316947449395224659 @@ -1107,89 +1106,73 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5684450782462886339} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + - target: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -5128840629778815003, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + - target: {fileID: -5128840629778815003, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: -1994268927848270761, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + - target: {fileID: -1994268927848270761, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} propertyPath: m_LocalPosition.z value: -3.971 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + - target: {fileID: 919132149155446097, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} propertyPath: m_Name value: jingwu objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} insertIndex: 2 addedObject: {fileID: 1052001024} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} --- !u!4 &2316947449395224660 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, - type: 3} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 06be2ce632f10c2449522121c1a50cc5, type: 3} m_PrefabInstance: {fileID: 2316947449395224659} m_PrefabAsset: {fileID: 0} --- !u!23 &2415228932035627993 @@ -1475,66 +1458,58 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5684450782462886339} m_Modifications: - - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, - type: 3} + - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, - type: 3} + - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, - type: 3} + - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3} propertyPath: m_LocalPosition.y value: -0.349 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, - type: 3} + - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, - type: 3} + - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, - type: 3} + - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, - type: 3} + - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, - type: 3} + - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, - type: 3} + - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, - type: 3} + - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, - type: 3} + - target: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: e7a91a7be44e48e4c92ed033f514c4bf, - type: 3} + - target: {fileID: 919132149155446097, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3} propertyPath: m_Name value: SM_BuLiaoLei objectReference: {fileID: 0} + - target: {fileID: 2819952676442950184, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1542,8 +1517,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3} --- !u!4 &6425333899769779390 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, - type: 3} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3} m_PrefabInstance: {fileID: 6425333899769779389} m_PrefabAsset: {fileID: 0} --- !u!33 &6732776260616629681 @@ -1790,63 +1764,51 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5684450782462886339} m_Modifications: - - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, - type: 3} + - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, - type: 3} + - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, type: 3} propertyPath: m_LocalPosition.x value: -0.31713417 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, - type: 3} + - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, type: 3} propertyPath: m_LocalPosition.y value: 1.074466 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, - type: 3} + - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, type: 3} propertyPath: m_LocalPosition.z value: 0.0126160085 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, - type: 3} + - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, - type: 3} + - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, - type: 3} + - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, - type: 3} + - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, - type: 3} + - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, - type: 3} + - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, - type: 3} + - target: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: a0e0f7332037eee4d807eb38c7e94c9f, - type: 3} + - target: {fileID: 919132149155446097, guid: a0e0f7332037eee4d807eb38c7e94c9f, type: 3} propertyPath: m_Name value: chuangbu objectReference: {fileID: 0} @@ -1857,8 +1819,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: a0e0f7332037eee4d807eb38c7e94c9f, type: 3} --- !u!4 &8898465471929917295 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, - type: 3} + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a0e0f7332037eee4d807eb38c7e94c9f, type: 3} m_PrefabInstance: {fileID: 8898465471929917294} m_PrefabAsset: {fileID: 0} --- !u!4 &8985457696969263610 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index f033cf44..5b3ac64b 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -257,6 +257,7 @@ GameObject: - component: {fileID: 591671970} - component: {fileID: 591671969} - component: {fileID: 591671968} + - component: {fileID: 591671976} m_Layer: 0 m_Name: FlyCamera m_TagString: MainCamera @@ -458,6 +459,19 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 19.976, y: 11.67, z: 0} +--- !u!114 &591671976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 591671967} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b2c08eae7cce6c9479adebcaad5706c3, type: 3} + m_Name: + m_EditorClassIdentifier: + animSpeed: 1 --- !u!1 &1160234425 GameObject: m_ObjectHideFlags: 0 diff --git a/Data/App.xml b/Data/App.xml index 0ec147da..95627b8e 100644 --- a/Data/App.xml +++ b/Data/App.xml @@ -514,7 +514,6 @@ 帽子 - Environment/room_xishou/SM_YiShengMaoZi1.005 帽子 @@ -522,15 +521,34 @@ 口罩 - Environment/room_xishou/SM_YiShengKouZhao1.005 口罩 + + 水龙头 + Environment/room_xishou/shuiguan + 水龙头 + + + + + 消毒凝胶 + Environment/room_xishou/xiaoduye.001 + 消毒凝胶 + + + + 擦手纸 + Environment/room_xishou/zhihe_zhi + 擦手纸 + + + @@ -569,6 +587,10 @@ + + + + @@ -787,10 +809,24 @@ - + + + + + + + + + + + + + + + @@ -852,6 +888,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +