diff --git a/xiaofang/Assets/Resources/Character/Capsule.prefab b/xiaofang/Assets/Resources/Character/Capsule.prefab new file mode 100644 index 00000000..0d35bbd8 --- /dev/null +++ b/xiaofang/Assets/Resources/Character/Capsule.prefab @@ -0,0 +1,135 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2907630901887348949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2907630901887348954} + - component: {fileID: 2907630901887348953} + - component: {fileID: 2907630901887348952} + - component: {fileID: 2907630901887348951} + - component: {fileID: 2907630901887348950} + - component: {fileID: 2907630901887348955} + m_Layer: 0 + m_Name: Capsule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2907630901887348954 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2907630901887348949} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.38, y: 0.92, z: 22.99} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2907630901887348953 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2907630901887348949} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2907630901887348952 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2907630901887348949} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!136 &2907630901887348951 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2907630901887348949} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + m_Radius: 3 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &2907630901887348950 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2907630901887348949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea3c4e24ebc42194181651236cdf30f1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!95 &2907630901887348955 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2907630901887348949} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 4c604a8ba818eb24396a44c2f341fa66, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/xiaofang/Assets/Resources/Character/Capsule.prefab.meta b/xiaofang/Assets/Resources/Character/Capsule.prefab.meta new file mode 100644 index 00000000..e9850b46 --- /dev/null +++ b/xiaofang/Assets/Resources/Character/Capsule.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cb61a92f105ea18418e946bf54862340 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Scenes/Tmap.unity b/xiaofang/Assets/Scenes/Tmap.unity index a3d625a3..e3d2bdf5 100644 --- a/xiaofang/Assets/Scenes/Tmap.unity +++ b/xiaofang/Assets/Scenes/Tmap.unity @@ -644,6 +644,37 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 8247531935023718731, guid: fd1c82754b6d075418084a7122853590, type: 3} +--- !u!1 &159404401 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 159404402} + m_Layer: 0 + m_Name: resurrection1 (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &159404402 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 159404401} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.57, y: 0.09127469, z: 41.01} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &174502147 PrefabInstance: m_ObjectHideFlags: 0 @@ -2274,6 +2305,37 @@ MonoBehaviour: Character: {fileID: 1818103170} target: {fileID: 1149486592} distanceText: {fileID: 1878753544} +--- !u!1 &572123195 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 572123196} + m_Layer: 0 + m_Name: resurrection1 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &572123196 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 572123195} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -16.29, y: 0.09127469, z: 30.01} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &575870043 PrefabInstance: m_ObjectHideFlags: 0 @@ -2632,6 +2694,37 @@ Transform: m_CorrespondingSourceObject: {fileID: 4288134429248652, guid: c5eaad6f5e691084ea2c598ff8a0763d, type: 3} m_PrefabInstance: {fileID: 635197096} m_PrefabAsset: {fileID: 0} +--- !u!1 &669092464 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 669092465} + m_Layer: 0 + m_Name: resurrection1 (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &669092465 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 669092464} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 11.2, y: 0.09127469, z: 9.69} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &677470297 PrefabInstance: m_ObjectHideFlags: 0 @@ -3655,6 +3748,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 996888829} + - component: {fileID: 996888830} m_Layer: 0 m_Name: -------------------------------------- (3) m_TagString: Untagged @@ -3677,6 +3771,25 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &996888830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 996888828} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a06553bf892f7d2478e70adbc5774a58, type: 3} + m_Name: + m_EditorClassIdentifier: + re: + - {fileID: 2066636152} + - {fileID: 572123195} + - {fileID: 159404401} + - {fileID: 1909439590} + - {fileID: 1481648095} + - {fileID: 669092464} --- !u!1001 &1005926285 PrefabInstance: m_ObjectHideFlags: 0 @@ -4284,139 +4397,6 @@ MonoBehaviour: verticalAimingSpeed: 6 maxVerticalAngle: 30 minVerticalAngle: -60 ---- !u!1 &1077104709 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1077104714} - - component: {fileID: 1077104713} - - component: {fileID: 1077104712} - - component: {fileID: 1077104711} - - component: {fileID: 1077104710} - - component: {fileID: 1077104715} - m_Layer: 0 - m_Name: Capsule - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1077104710 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077104709} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ea3c4e24ebc42194181651236cdf30f1, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!136 &1077104711 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077104709} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - m_Radius: 3 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1077104712 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077104709} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1077104713 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077104709} - m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1077104714 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077104709} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.38, y: 0.92, z: 22.99} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &1077104715 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077104709} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 4c604a8ba818eb24396a44c2f341fa66, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1120021972 GameObject: m_ObjectHideFlags: 0 @@ -7003,6 +6983,37 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: fe2cd694e0a69d24eafdb2fe4c7f1440, type: 3} m_PrefabInstance: {fileID: 1471280777} m_PrefabAsset: {fileID: 0} +--- !u!1 &1481648095 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1481648096} + m_Layer: 0 + m_Name: resurrection1 (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1481648096 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1481648095} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 9.9, y: 0.09127469, z: 29.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1500884554 PrefabInstance: m_ObjectHideFlags: 0 @@ -8756,6 +8767,37 @@ Transform: m_Father: {fileID: 1389580918} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1909439590 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1909439591} + m_Layer: 0 + m_Name: resurrection1 (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1909439591 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1909439590} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.91, y: 0.09127469, z: 56.05} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1911115496 GameObject: m_ObjectHideFlags: 0 @@ -9246,6 +9288,37 @@ Transform: m_CorrespondingSourceObject: {fileID: 464554, guid: 9ca6ece3cb0ff304aa0e55dc6ab7b521, type: 3} m_PrefabInstance: {fileID: 2065075992} m_PrefabAsset: {fileID: 0} +--- !u!1 &2066636152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2066636153} + m_Layer: 0 + m_Name: resurrection1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2066636153 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2066636152} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -16.29, y: 0.09127469, z: 9.69} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2082736079 GameObject: m_ObjectHideFlags: 0 @@ -9354,7 +9427,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2548037664796047208, guid: 9e4797c6e2ce28c4a9d37a399f4151e2, type: 3} propertyPath: m_LocalPosition.x - value: -3.586214 + value: -17.6 objectReference: {fileID: 0} - target: {fileID: 2548037664796047208, guid: 9e4797c6e2ce28c4a9d37a399f4151e2, type: 3} propertyPath: m_LocalPosition.y @@ -9362,7 +9435,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2548037664796047208, guid: 9e4797c6e2ce28c4a9d37a399f4151e2, type: 3} propertyPath: m_LocalPosition.z - value: 7.604426 + value: 23.65 objectReference: {fileID: 0} - target: {fileID: 2548037664796047208, guid: 9e4797c6e2ce28c4a9d37a399f4151e2, type: 3} propertyPath: m_LocalRotation.w @@ -9430,3 +9503,60 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9e4797c6e2ce28c4a9d37a399f4151e2, type: 3} +--- !u!1001 &2907630900810539152 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2907630901887348949, guid: cb61a92f105ea18418e946bf54862340, type: 3} + propertyPath: m_Name + value: Capsule + objectReference: {fileID: 0} + - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} + propertyPath: m_LocalPosition.x + value: -2.38 + objectReference: {fileID: 0} + - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} + propertyPath: m_LocalPosition.y + value: 0.92 + objectReference: {fileID: 0} + - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} + propertyPath: m_LocalPosition.z + value: 22.99 + objectReference: {fileID: 0} + - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2907630901887348954, guid: cb61a92f105ea18418e946bf54862340, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cb61a92f105ea18418e946bf54862340, type: 3} diff --git a/xiaofang/Assets/Script/Character/CharacterAin.cs b/xiaofang/Assets/Script/Character/CharacterAin.cs index eddd3be7..f5f23d3d 100644 --- a/xiaofang/Assets/Script/Character/CharacterAin.cs +++ b/xiaofang/Assets/Script/Character/CharacterAin.cs @@ -20,6 +20,9 @@ public enum CharacterSkill jump,//2 Rescue//3 } + + + public class CharacterAin : MonoBehaviour { private Animator ain; @@ -163,5 +166,9 @@ public class CharacterAin : MonoBehaviour } } + IEnumerator jiutimer(float timer) + { + yield return new WaitForSeconds(timer); + } } diff --git a/xiaofang/Assets/Script/Character/CharacterControl.cs b/xiaofang/Assets/Script/Character/CharacterControl.cs index 93ba02e7..ef07f055 100644 --- a/xiaofang/Assets/Script/Character/CharacterControl.cs +++ b/xiaofang/Assets/Script/Character/CharacterControl.cs @@ -51,7 +51,7 @@ public class CharacterControl : MonoBehaviour private Button recubtn; - + public GameObject cha; // Start is called before the first frame update void Start() { @@ -226,6 +226,14 @@ public class CharacterControl : MonoBehaviour { yield return new WaitForSeconds(2); Characterain.SetSkillAin(CharacterSkill.NoSkill); + cha.GetComponent().Setnpcstate(NpcState.Healthy); + //cha = null; } + /* public NpcState Setnpcstate() + { + Debug.Log("Setnpcstate调用"); + return NpcState.Healthy; + }*/ + } diff --git a/xiaofang/Assets/Script/Resurrection.cs b/xiaofang/Assets/Script/Resurrection.cs new file mode 100644 index 00000000..09dc0767 --- /dev/null +++ b/xiaofang/Assets/Script/Resurrection.cs @@ -0,0 +1,35 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Resurrection : MonoBehaviour +{ + + public List re = new List();//使用list存储复活点位置 + + private GameObject ga; + // Start is called before the first frame update + void Start() + { + ga =(GameObject)Resources.Load("Character/Capsule");//从resousce资源中加载npc + Init(); + } + + private void Init() + { + //for (int i = 0; i <3; i++) + //{ + // GameObject instance = (GameObject)Instantiate(ga);//实例化npc + // int a = Random.Range(0,5);//用随机数保证出生位置的随机性 + // Vector3 va = re[a].transform.position; //创建局部变量用来保存出生点的位置信息 + // instance.transform.position = va; + //} + } + + + // Update is called once per frame + void Update() + { + + } +} diff --git a/xiaofang/Assets/Script/Resurrection.cs.meta b/xiaofang/Assets/Script/Resurrection.cs.meta new file mode 100644 index 00000000..74a2bed4 --- /dev/null +++ b/xiaofang/Assets/Script/Resurrection.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a06553bf892f7d2478e70adbc5774a58 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Script/npc/RecuseNpc.cs b/xiaofang/Assets/Script/npc/RecuseNpc.cs index 010126ae..64a7d6ab 100644 --- a/xiaofang/Assets/Script/npc/RecuseNpc.cs +++ b/xiaofang/Assets/Script/npc/RecuseNpc.cs @@ -2,10 +2,24 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; + +public enum NpcState +{ + Injuried, //受伤 + Healthy//健康 + +} + public class RecuseNpc : MonoBehaviour { private Button recusebtn; - private void Start() + + private CharacterControl chain; + + private NpcState ns = NpcState.Injuried; + + private bool statebool = false; + private void Awake() { recusebtn = GameObject.Find("Canvas/Recuse").GetComponent