From fb2c0a0c5c117407187066b3ae7978ef837b0a5c Mon Sep 17 00:00:00 2001 From: Vova <3emaster@gmail.com> Date: Sun, 28 Apr 2024 15:17:19 +0300 Subject: [PATCH] option for change visual character --- .../Prefabs/{Player.prefab => Sophie.prefab} | 165 +-------- ...{Player.prefab.meta => Sophie.prefab.meta} | 2 +- Assets/Scenes/City.unity | 337 +++++++++++++----- Assets/Scripts/Player/BaseCharacter.cs | 11 +- Assets/Scripts/Player/HoldPoint.cs | 6 + Assets/Scripts/Player/HoldPoint.cs.meta | 2 + Assets/Scripts/Player/Player.cs | 7 +- 7 files changed, 290 insertions(+), 240 deletions(-) rename Assets/Prefabs/{Player.prefab => Sophie.prefab} (89%) rename Assets/Prefabs/{Player.prefab.meta => Sophie.prefab.meta} (74%) create mode 100644 Assets/Scripts/Player/HoldPoint.cs create mode 100644 Assets/Scripts/Player/HoldPoint.cs.meta diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Sophie.prefab similarity index 89% rename from Assets/Prefabs/Player.prefab rename to Assets/Prefabs/Sophie.prefab index a949fb5b..fcedccd2 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Sophie.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3284961431740112554 +--- !u!1 &3340653082405403251 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,130 +8,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3284961431740112560} - - component: {fileID: 3284961431740112563} - - component: {fileID: 3284961431740112562} - - component: {fileID: 6434834345686826594} - - component: {fileID: 3658533965490984325} - m_Layer: 0 - m_Name: Player - m_TagString: Player - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3284961431740112560 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3284961431740112554} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3034368942645999326} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!195 &3284961431740112563 -NavMeshAgent: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3284961431740112554} - m_Enabled: 1 - m_AgentTypeID: 0 - m_Radius: 0.3 - m_Speed: 3.5 - m_Acceleration: 8 - avoidancePriority: 50 - m_AngularSpeed: 600 - m_StoppingDistance: 0 - m_AutoTraverseOffMeshLink: 1 - m_AutoBraking: 1 - m_AutoRepath: 1 - m_Height: 1.7 - m_BaseOffset: -0.12 - m_WalkableMask: 4294967295 - m_ObstacleAvoidanceType: 4 ---- !u!114 &3284961431740112562 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3284961431740112554} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c802a0d9d32b0c04b841113e87b83e4b, type: 3} - m_Name: - m_EditorClassIdentifier: - _navAgent: {fileID: 3284961431740112563} - _animator: {fileID: 3284961433283168241} - _holdPoint: {fileID: 3284961432807806020} ---- !u!136 &6434834345686826594 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3284961431740112554} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.38 - m_Height: 1.8 - m_Direction: 1 - m_Center: {x: 0, y: 0.95, z: 0} ---- !u!54 &3658533965490984325 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3284961431740112554} - serializedVersion: 4 - m_Mass: 0.0000001 - m_Drag: 0 - m_AngularDrag: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!1 &3284961432807806021 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3284961432807806020} + - component: {fileID: 3340653082405403250} m_Layer: 0 m_Name: HoldPoint m_TagString: Untagged @@ -139,28 +16,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3284961432807806020 +--- !u!4 &3340653082405403250 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3284961432807806021} + m_GameObject: {fileID: 3340653082405403251} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.12, z: 0.0384} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3756894681279164157} + m_Father: {fileID: 4028978448423354571} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &3284961431633072437 +--- !u!1001 &3340653081230671619 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 3284961431740112560} + m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: -8679921383154817045, guid: 32790d47acc86814982f18993097a759, type: 3} @@ -1023,31 +900,31 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 1852576806548013000, guid: 32790d47acc86814982f18993097a759, type: 3} insertIndex: -1 - addedObject: {fileID: 3284961432807806020} + addedObject: {fileID: 3340653082405403250} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 32790d47acc86814982f18993097a759, type: 3} insertIndex: -1 - addedObject: {fileID: 3284961433283168241} + addedObject: {fileID: 3340653081799682503} - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 32790d47acc86814982f18993097a759, type: 3} insertIndex: -1 - addedObject: {fileID: 3624213172115043560} + addedObject: {fileID: 3567185080109308638} m_SourcePrefab: {fileID: 100100000, guid: 32790d47acc86814982f18993097a759, type: 3} ---- !u!1 &2402651526520908900 stripped +--- !u!1 &2494162510804697682 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 32790d47acc86814982f18993097a759, type: 3} - m_PrefabInstance: {fileID: 3284961431633072437} + m_PrefabInstance: {fileID: 3340653081230671619} m_PrefabAsset: {fileID: 0} ---- !u!95 &3284961433283168241 +--- !u!95 &3340653081799682503 Animator: serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2402651526520908900} + m_GameObject: {fileID: 2494162510804697682} m_Enabled: 1 m_Avatar: {fileID: 9000000, guid: 32790d47acc86814982f18993097a759, type: 3} m_Controller: {fileID: 9100000, guid: 6abd17ae3669e8d448186fd24a2aadb7, type: 2} @@ -1062,27 +939,21 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &3624213172115043560 +--- !u!114 &3567185080109308638 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2402651526520908900} + m_GameObject: {fileID: 2494162510804697682} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cf9ddd6d77ff9a7479edaeb2c8ae1078, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &3034368942645999326 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 32790d47acc86814982f18993097a759, - type: 3} - m_PrefabInstance: {fileID: 3284961431633072437} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3756894681279164157 stripped +--- !u!4 &4028978448423354571 stripped Transform: m_CorrespondingSourceObject: {fileID: 1852576806548013000, guid: 32790d47acc86814982f18993097a759, type: 3} - m_PrefabInstance: {fileID: 3284961431633072437} + m_PrefabInstance: {fileID: 3340653081230671619} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Player.prefab.meta b/Assets/Prefabs/Sophie.prefab.meta similarity index 74% rename from Assets/Prefabs/Player.prefab.meta rename to Assets/Prefabs/Sophie.prefab.meta index c8bfd46f..dee6112c 100644 --- a/Assets/Prefabs/Player.prefab.meta +++ b/Assets/Prefabs/Sophie.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c0021857f236ae341a3c917b9da4dfaf +guid: b64ae4c0433f8c44eada97d1cf57b92d PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/City.unity b/Assets/Scenes/City.unity index 04ba7d0e..73660456 100644 --- a/Assets/Scenes/City.unity +++ b/Assets/Scenes/City.unity @@ -4183,6 +4183,25 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: color: {r: 1, g: 1, b: 1, a: 1} +--- !u!1 &744126073 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 959365028} + - component: {fileID: 959365031} + - component: {fileID: 959365030} + - component: {fileID: 959365029} + m_Layer: 0 + m_Name: Player + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &749553635 GameObject: m_ObjectHideFlags: 0 @@ -4211,7 +4230,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 749553635} serializedVersion: 2 - m_LocalRotation: {x: 0.38268346, y: 0.000000022481224, z: -0.0000000093120285, w: 0.92387956} + m_LocalRotation: {x: 0.38268346, y: -0.000000022481213, z: 0.000000009312023, w: 0.92387956} m_LocalPosition: {x: 29.11, y: 5, z: -5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -4314,7 +4333,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -4355,6 +4374,50 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!1 &765765262 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 765765263} + - component: {fileID: 765765264} + m_Layer: 0 + m_Name: HoldPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &765765263 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 765765262} + serializedVersion: 2 + m_LocalRotation: {x: -0.041477025, y: 0.0056949714, z: 0.0024146046, w: 0.99912035} + m_LocalPosition: {x: 0, y: 0.04, z: 0.035} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1139821600} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &765765264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 765765262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99527458161e16442b3fb76c8f585ec8, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &780261547 GameObject: m_ObjectHideFlags: 0 @@ -4743,7 +4806,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 835327588} serializedVersion: 2 - m_LocalRotation: {x: 0.38268346, y: 0.000000022481224, z: -0.0000000093120285, w: 0.92387956} + m_LocalRotation: {x: 0.38268346, y: -0.000000022481213, z: 0.000000009312023, w: 0.92387956} m_LocalPosition: {x: 29.11, y: 5, z: -5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -5261,12 +5324,81 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 953289704} m_Mesh: {fileID: 6966450866789282503, guid: b012bf224421b074fbc3ee5693d35ddc, type: 3} ---- !u!4 &959365028 stripped +--- !u!4 &959365028 Transform: - m_CorrespondingSourceObject: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, - type: 3} - m_PrefabInstance: {fileID: 1291994925} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744126073} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 148.4, y: 6.7, z: 243.6} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1112075239} + - {fileID: 1844600461} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!136 &959365029 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744126073} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.38 + m_Height: 1.8 + m_Direction: 1 + m_Center: {x: 0, y: 0.95, z: 0} +--- !u!114 &959365030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744126073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c802a0d9d32b0c04b841113e87b83e4b, type: 3} + m_Name: + m_EditorClassIdentifier: + _navAgent: {fileID: 959365031} +--- !u!195 &959365031 +NavMeshAgent: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 744126073} + m_Enabled: 1 + m_AgentTypeID: 0 + m_Radius: 0.3 + m_Speed: 3.5 + m_Acceleration: 8 + avoidancePriority: 50 + m_AngularSpeed: 600 + m_StoppingDistance: 0 + m_AutoTraverseOffMeshLink: 1 + m_AutoBraking: 1 + m_AutoRepath: 1 + m_Height: 1.7 + m_BaseOffset: -0.12 + m_WalkableMask: 4294967295 + m_ObstacleAvoidanceType: 4 --- !u!1 &977752441 GameObject: m_ObjectHideFlags: 0 @@ -5991,6 +6123,12 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1133394518} m_Mesh: {fileID: -7466543106272945133, guid: b012bf224421b074fbc3ee5693d35ddc, type: 3} +--- !u!4 &1139821600 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2530251679569251172, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + m_PrefabInstance: {fileID: 1844600460} + m_PrefabAsset: {fileID: 0} --- !u!1 &1142566630 GameObject: m_ObjectHideFlags: 0 @@ -6275,84 +6413,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1278044913} m_CullTransparentMesh: 1 ---- !u!1001 &1291994925 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3034368942645999326, guid: c0021857f236ae341a3c917b9da4dfaf, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.1 - objectReference: {fileID: 0} - - target: {fileID: 3284961431740112554, guid: c0021857f236ae341a3c917b9da4dfaf, - type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - - target: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, - type: 3} - propertyPath: m_LocalPosition.x - value: 148.4 - objectReference: {fileID: 0} - - target: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, - type: 3} - propertyPath: m_LocalPosition.y - value: 6.7 - objectReference: {fileID: 0} - - target: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, - type: 3} - propertyPath: m_LocalPosition.z - value: 243.6 - objectReference: {fileID: 0} - - target: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 3658533965490984325, guid: c0021857f236ae341a3c917b9da4dfaf, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1112075239} - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c0021857f236ae341a3c917b9da4dfaf, type: 3} --- !u!1 &1305860724 GameObject: m_ObjectHideFlags: 0 @@ -8270,6 +8330,111 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1826400545} m_CullTransparentMesh: 1 +--- !u!1001 &1844600460 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 959365028} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + propertyPath: m_Name + value: Lizzy + objectReference: {fileID: 0} + - target: {fileID: 5866666021909216657, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 6abd17ae3669e8d448186fd24a2aadb7, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -2530251679569251172, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + insertIndex: 0 + addedObject: {fileID: 765765263} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1844600463} + m_SourcePrefab: {fileID: 100100000, guid: 094143b068357224fabf0fa92fee31cb, type: 3} +--- !u!4 &1844600461 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + m_PrefabInstance: {fileID: 1844600460} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1844600462 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 094143b068357224fabf0fa92fee31cb, + type: 3} + m_PrefabInstance: {fileID: 1844600460} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1844600463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1844600462} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf9ddd6d77ff9a7479edaeb2c8ae1078, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1861131928 GameObject: m_ObjectHideFlags: 0 @@ -9178,4 +9343,4 @@ SceneRoots: - {fileID: 1381062366} - {fileID: 1880854723} - {fileID: 495189437} - - {fileID: 1291994925} + - {fileID: 959365028} diff --git a/Assets/Scripts/Player/BaseCharacter.cs b/Assets/Scripts/Player/BaseCharacter.cs index 3d960e36..2080d501 100644 --- a/Assets/Scripts/Player/BaseCharacter.cs +++ b/Assets/Scripts/Player/BaseCharacter.cs @@ -7,10 +7,9 @@ public class BlockingAnimation : Attribute { } public abstract class BaseCharacter : MonoBehaviour { [SerializeField] - public NavMeshAgent _navAgent; - [SerializeField] - public Animator _animator; + protected NavMeshAgent _navAgent; + protected Animator _animator; private const string WALK_VELOCITY = "WalkVelocity"; private readonly Queue _tasks = new Queue(); private PlayerTasks _currentTask; @@ -18,6 +17,12 @@ public abstract class BaseCharacter : MonoBehaviour private Action _OnAnimationFinish; private AnimationStates _currentAnimation; + protected void IntCharacter() + { + _animator=GetComponentInChildren(); + + } + private void Update() { if (PlayerHelper.IsBlockingAnimation(_currentAnimation)) diff --git a/Assets/Scripts/Player/HoldPoint.cs b/Assets/Scripts/Player/HoldPoint.cs new file mode 100644 index 00000000..1deb17b0 --- /dev/null +++ b/Assets/Scripts/Player/HoldPoint.cs @@ -0,0 +1,6 @@ +using UnityEngine; + +public class HoldPoint : MonoBehaviour +{ + +} diff --git a/Assets/Scripts/Player/HoldPoint.cs.meta b/Assets/Scripts/Player/HoldPoint.cs.meta new file mode 100644 index 00000000..077124c5 --- /dev/null +++ b/Assets/Scripts/Player/HoldPoint.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 99527458161e16442b3fb76c8f585ec8 \ No newline at end of file diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index e69de0c0..f059e23c 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -8,8 +8,7 @@ public class Player : BaseCharacter public event EventHandler OnContainerChanged; public static Player Instance { get; private set; } - [SerializeField] - private Transform _holdPoint; + private HoldPoint _holdPoint; private PlayerStates _currentActing; @@ -43,6 +42,8 @@ public class Player : BaseCharacter private void Start() { + base.IntCharacter(); + _holdPoint= GetComponentInChildren(); GameManager.Instance.Time.OnMinuteChanged += UpdateStatsByClock; _animator.applyRootMotion = true; _navAgent.updatePosition = false; @@ -120,7 +121,7 @@ public class Player : BaseCharacter public void SetContainerItem(ContainerItem containerItem) { - containerItem.transform.parent = _holdPoint; + containerItem.transform.parent = _holdPoint.transform; containerItem.transform.localPosition = Vector3.zero; _containerItem = containerItem; OnContainerChanged.Invoke(this,true);