diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/zhihui.fbx.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/zhihui.fbx.meta index c22f88f4..0a188167 100644 --- a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/zhihui.fbx.meta +++ b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/zhihui.fbx.meta @@ -24,7 +24,7 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 @@ -92,13 +92,13 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 3 humanoidOversampling: 1 - avatarSetup: 0 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/zhihui_g.fbx b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/zhihui_g.fbx deleted file mode 100644 index 66545a2e..00000000 Binary files a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/zhihui_g.fbx and /dev/null differ diff --git a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/zhihui_g.fbx.meta b/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/zhihui_g.fbx.meta deleted file mode 100644 index a7123bf2..00000000 --- a/xiaofang/Assets/Prefabs/HYLPrefabs/MoXing/zhihui_g.fbx.meta +++ /dev/null @@ -1,107 +0,0 @@ -fileFormatVersion: 2 -guid: 909caf105e4d0eb49ba1bf98e002e8ab -ModelImporter: - serializedVersion: 21300 - internalIDToNameTable: [] - externalObjects: {} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 1 - 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: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 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: 1 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 3 - humanoidOversampling: 1 - avatarSetup: 1 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/xiaofang/Assets/Scenes/Tmap 1.unity b/xiaofang/Assets/Scenes/Tmap 1.unity index d72b0f80..ea7a0bae 100644 --- a/xiaofang/Assets/Scenes/Tmap 1.unity +++ b/xiaofang/Assets/Scenes/Tmap 1.unity @@ -3634,7 +3634,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: b4bc8a6718ad365439657b4dace25c94, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5866666021909216657, guid: b4bc8a6718ad365439657b4dace25c94, type: 3} propertyPath: m_Controller @@ -3651,11 +3651,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: b4bc8a6718ad365439657b4dace25c94, type: 3} m_PrefabInstance: {fileID: 272025129} m_PrefabAsset: {fileID: 0} ---- !u!95 &272025132 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: b4bc8a6718ad365439657b4dace25c94, type: 3} - m_PrefabInstance: {fileID: 272025129} - m_PrefabAsset: {fileID: 0} --- !u!1 &272591050 GameObject: m_ObjectHideFlags: 0 @@ -3697,7 +3692,7 @@ MonoBehaviour: point2: {fileID: 0} point2Dir: {x: 0, y: 1, z: 0} update: 1 - mesh: {fileID: 1797554496} + mesh: {fileID: 845666898} --- !u!65 &272591052 BoxCollider: m_ObjectHideFlags: 0 @@ -3760,7 +3755,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272591050} - m_Mesh: {fileID: 1797554496} + m_Mesh: {fileID: 845666898} --- !u!4 &272591055 Transform: m_ObjectHideFlags: 0 @@ -4752,6 +4747,7 @@ Transform: - {fileID: 946635801} - {fileID: 1271748203} - {fileID: 272025130} + - {fileID: 1600741273} m_Father: {fileID: 0} m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4780,7 +4776,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ea9eb82687dfa674e883273cd7c73386, type: 3} m_Name: m_EditorClassIdentifier: - ain: {fileID: 272025132} + ain: {fileID: 1600741272} characterState: 0 PlayerCollider: {fileID: 382802810} --- !u!114 &382802815 @@ -4872,7 +4868,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b0e8bb916545c834b8981bdf116ec889, type: 3} m_Name: m_EditorClassIdentifier: - CharacterAnimator: {fileID: 946635802} + CharacterAnimator: {fileID: 1600741272} player: {fileID: 382802812} relativePosition: {x: 0, y: 0, z: 0} relativeRotation: {x: 0, y: 0, z: 0} @@ -9082,6 +9078,170 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &845666898 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pipe + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 0 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 0 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: + m_VertexData: + serializedVersion: 3 + m_VertexCount: 0 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 0 + _typelessdata: + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &860755619 PrefabInstance: m_ObjectHideFlags: 0 @@ -9763,11 +9923,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: cb3fa301a56f31a4d8301eccece5521b, type: 3} m_PrefabInstance: {fileID: 946635800} m_PrefabAsset: {fileID: 0} ---- !u!95 &946635802 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: cb3fa301a56f31a4d8301eccece5521b, type: 3} - m_PrefabInstance: {fileID: 946635800} - m_PrefabAsset: {fileID: 0} --- !u!1001 &947202399 PrefabInstance: m_ObjectHideFlags: 0 @@ -22867,6 +23022,81 @@ Transform: m_CorrespondingSourceObject: {fileID: 408378, guid: 74d0d3e646b67204b8f191af25ed2e3e, type: 3} m_PrefabInstance: {fileID: 1599886499} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1600741271 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 382802812} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + propertyPath: m_Name + value: zhihui + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: b6b0af1684cf4a3459f82fde7a3622e6, type: 2} + - target: {fileID: 5866666021909216657, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + propertyPath: m_ApplyRootMotion + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} +--- !u!95 &1600741272 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + m_PrefabInstance: {fileID: 1600741271} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1600741273 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1cf6cb03a2969d64bb4f8bc4c437e035, type: 3} + m_PrefabInstance: {fileID: 1600741271} + m_PrefabAsset: {fileID: 0} --- !u!1 &1604673291 GameObject: m_ObjectHideFlags: 0 @@ -24711,170 +24941,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -4992915516971869870, guid: 0c9b084f2070bda45b87da961d2eb0f6, type: 3} ---- !u!43 &1797554496 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Pipe - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 0 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 0 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: - m_VertexData: - serializedVersion: 3 - m_VertexCount: 0 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 0 - _typelessdata: - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &1805548635 PrefabInstance: m_ObjectHideFlags: 0