From 90fd6327ef0653dc11b16f65d6adb2e726883f81 Mon Sep 17 00:00:00 2001 From: NTG Date: Thu, 25 Jan 2024 03:56:13 +0900 Subject: [PATCH] =?UTF-8?q?Closes=20#164=20y=EC=B6=95=20=EC=9B=80=EC=A7=81?= =?UTF-8?q?=EC=9E=84=20=EB=B3=B4=EC=99=84=20=EB=B0=8F=20=EB=8C=80=EC=8B=9C?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/01.Scenes/03.CombatTest.unity | 350 ++++----------- .../01.Scenes/03.Zelda_Stage_Test 1.unity | 398 ++++-------------- .../Character/CombatPlayer/CombatPlayer.cs | 124 ++++-- .../CombatPlayer/StateMachines/Dash.cs | 9 +- .../Characters/Players/CombatPlayer.prefab | 358 ++++++++++++++++ .../Players/CombatPlayer.prefab.meta | 7 + 6 files changed, 620 insertions(+), 626 deletions(-) create mode 100644 BlueWater/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab create mode 100644 BlueWater/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab.meta diff --git a/BlueWater/Assets/01.Scenes/03.CombatTest.unity b/BlueWater/Assets/01.Scenes/03.CombatTest.unity index d8dcaddc2..23eef07a9 100644 --- a/BlueWater/Assets/01.Scenes/03.CombatTest.unity +++ b/BlueWater/Assets/01.Scenes/03.CombatTest.unity @@ -1465,7 +1465,7 @@ Transform: m_GameObject: {fileID: 334724472} serializedVersion: 2 m_LocalRotation: {x: 0.25967023, y: 0, z: 0, w: 0.9656974} - m_LocalPosition: {x: 0, y: 21, z: -34.5} + m_LocalPosition: {x: 0, y: 20, z: -34.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3097,7 +3097,7 @@ MonoBehaviour: m_Priority: 10 m_StandbyUpdate: 2 m_LookAt: {fileID: 0} - m_Follow: {fileID: 1299601287} + m_Follow: {fileID: 0} m_Lens: FieldOfView: 25 OrthographicSize: 15.39 @@ -3126,7 +3126,7 @@ Transform: m_GameObject: {fileID: 879331193} serializedVersion: 2 m_LocalRotation: {x: 0.25967023, y: 0, z: 0, w: 0.9656974} - m_LocalPosition: {x: 0, y: 21, z: -34.5} + m_LocalPosition: {x: 0, y: 20, z: -34.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -4197,6 +4197,74 @@ RectTransform: m_AnchoredPosition: {x: 960, y: 540} m_SizeDelta: {x: 1920, y: 1080} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &1126104589 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2391945466483065398, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_Name + value: CombatPlayer + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d9472bd7185627847ae4d5b1d3d3bb8a, type: 3} --- !u!1 &1236881600 GameObject: m_ObjectHideFlags: 0 @@ -4272,157 +4340,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1236881600} m_CullTransparentMesh: 1 ---- !u!1 &1299601285 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1299601287} - - component: {fileID: 1299601286} - - component: {fileID: 1299601290} - - component: {fileID: 1299601288} - - component: {fileID: 1299601289} - m_Layer: 9 - m_Name: CombatPlayer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!136 &1299601286 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1299601285} - 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.5 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!4 &1299601287 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1299601285} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3681369633043129453} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1299601288 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1299601285} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Actions: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2, - type: 3} - m_NotificationBehavior: 0 - m_UIInputModule: {fileID: 0} - m_DeviceLostEvent: - m_PersistentCalls: - m_Calls: [] - m_DeviceRegainedEvent: - m_PersistentCalls: - m_Calls: [] - m_ControlsChangedEvent: - m_PersistentCalls: - m_Calls: [] - m_ActionEvents: [] - m_NeverAutoSwitchControlSchemes: 0 - m_DefaultControlScheme: - m_DefaultActionMap: Player - m_SplitScreenIndex: -1 - m_Camera: {fileID: 0} ---- !u!114 &1299601289 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1299601285} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5258cddac7934c1469d147dddbdb5023, type: 3} - m_Name: - m_EditorClassIdentifier: - autoInit: 0 - moveSpeed: 10 - k__BackingField: 20 - k__BackingField: 0.5 - k__BackingField: 0 - k__BackingField: 1 - k__BackingField: 10 - k__BackingField: 10 - k__BackingField: 1.5 - k__BackingField: 180 - k__BackingField: 0.5 - k__BackingField: - serializedVersion: 2 - m_Bits: 8192 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - playerInput: {fileID: 1299601288} - k__BackingField: {fileID: 1299601290} - visualLook: {fileID: 3681369633043129453} - k__BackingField: {fileID: 5645603178983921320} - k__BackingField: [] ---- !u!54 &1299601290 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1299601285} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - 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: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 112 - m_CollisionDetection: 0 --- !u!1 &1328364437 GameObject: m_ObjectHideFlags: 0 @@ -6431,62 +6348,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 39.639412, y: 7, z: 33.724197} m_Center: {x: -0.09309006, y: 0, z: 0.1822586} ---- !u!4 &3681369633043129453 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4538256932451224584} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -1, z: 0} - m_LocalScale: {x: 6, y: 6, z: 6} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1299601287} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4538256932451224584 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3681369633043129453} - - component: {fileID: 7788477260171398020} - - component: {fileID: 5645603178983921320} - - component: {fileID: 7788477260171398021} - m_Layer: 0 - m_Name: VisualLook - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!95 &5645603178983921320 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4538256932451224584} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: d675b8a88eec8a54e90303ce988360a8, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_AnimatePhysics: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!1001 &6569975607144876774 PrefabInstance: m_ObjectHideFlags: 0 @@ -6603,73 +6464,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 53a5952d905610548b93367641aa8244, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!212 &7788477260171398020 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4538256932451224584} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 - m_Sprite: {fileID: 2608582141572372013, guid: 88b84319f88e542e495fc1f6338dc3ab, - type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.16, y: 0.22} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &7788477260171398021 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4538256932451224584} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e16f62f7d451b504fae5474be03a6da7, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -6686,4 +6480,4 @@ SceneRoots: - {fileID: 1068410571} - {fileID: 1328364443} - {fileID: 888439616} - - {fileID: 1299601287} + - {fileID: 1126104589} diff --git a/BlueWater/Assets/01.Scenes/03.Zelda_Stage_Test 1.unity b/BlueWater/Assets/01.Scenes/03.Zelda_Stage_Test 1.unity index 258768990..b236ed2ce 100644 --- a/BlueWater/Assets/01.Scenes/03.Zelda_Stage_Test 1.unity +++ b/BlueWater/Assets/01.Scenes/03.Zelda_Stage_Test 1.unity @@ -30462,7 +30462,7 @@ Transform: m_GameObject: {fileID: 334724472} serializedVersion: 2 m_LocalRotation: {x: 0.25967023, y: 0, z: 0, w: 0.9656974} - m_LocalPosition: {x: 202.84, y: 21, z: -57.348} + m_LocalPosition: {x: 202.84, y: 20, z: -57.348} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -80302,7 +80302,7 @@ Transform: m_GameObject: {fileID: 879331193} serializedVersion: 2 m_LocalRotation: {x: 0.25967023, y: 0, z: 0, w: 0.9656974} - m_LocalPosition: {x: 202.84, y: 21, z: -57.348} + m_LocalPosition: {x: 202.84, y: 20, z: -57.348} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -106638,182 +106638,12 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -2026350702032400335, guid: aa576a991b150fa4f86e1ab87712e4fb, type: 3} ---- !u!1 &1155666205 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1155666210} - - component: {fileID: 1155666209} - - component: {fileID: 1155666208} - - component: {fileID: 1155666207} - - component: {fileID: 1155666206} - - component: {fileID: 1155666211} - m_Layer: 9 - m_Name: CombatPlayer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1155666206 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1155666205} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5258cddac7934c1469d147dddbdb5023, type: 3} - m_Name: - m_EditorClassIdentifier: - autoInit: 0 - maxHp: 100 - currentHp: 0 - moveSpeed: 10 - k__BackingField: 20 - k__BackingField: 0.5 - k__BackingField: 0 - k__BackingField: 1 - k__BackingField: 10 - k__BackingField: 10 - k__BackingField: 1.5 - k__BackingField: 180 - k__BackingField: 0.5 - k__BackingField: - serializedVersion: 2 - m_Bits: 8192 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - playerInput: {fileID: 1155666207} - k__BackingField: {fileID: 1155666208} - visualLook: {fileID: 2054688361} - k__BackingField: {fileID: 2054688358} - k__BackingField: [] ---- !u!114 &1155666207 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1155666205} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Actions: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2, - type: 3} - m_NotificationBehavior: 0 - m_UIInputModule: {fileID: 0} - m_DeviceLostEvent: - m_PersistentCalls: - m_Calls: [] - m_DeviceRegainedEvent: - m_PersistentCalls: - m_Calls: [] - m_ControlsChangedEvent: - m_PersistentCalls: - m_Calls: [] - m_ActionEvents: [] - m_NeverAutoSwitchControlSchemes: 0 - m_DefaultControlScheme: - m_DefaultActionMap: Player - m_SplitScreenIndex: -1 - m_Camera: {fileID: 0} ---- !u!54 &1155666208 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1155666205} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - 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: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 112 - m_CollisionDetection: 0 ---- !u!136 &1155666209 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1155666205} - 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.5 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!4 &1155666210 +--- !u!4 &1155666210 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + m_PrefabInstance: {fileID: 5991036092397138249} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1155666205} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 202.84, y: 1, z: -22.848} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2054688361} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &1155666211 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1155666205} - 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: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 0} --- !u!1 &1156862298 GameObject: m_ObjectHideFlags: 0 @@ -186843,152 +186673,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 6650362319974403577, guid: 27febafe2c9f13c45bd0dddca86424b8, type: 3} ---- !u!1 &2054688357 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2054688361} - - component: {fileID: 2054688360} - - component: {fileID: 2054688358} - - component: {fileID: 2054688359} - - component: {fileID: 2054688362} - m_Layer: 0 - m_Name: VisualLook - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!95 &2054688358 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2054688357} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: d675b8a88eec8a54e90303ce988360a8, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_AnimatePhysics: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &2054688359 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2054688357} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e16f62f7d451b504fae5474be03a6da7, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!212 &2054688360 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2054688357} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 - m_Sprite: {fileID: 2608582141572372013, guid: 88b84319f88e542e495fc1f6338dc3ab, - type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.16, y: 0.22} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &2054688361 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2054688357} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -1, z: 0} - m_LocalScale: {x: 6, y: 6, z: 6} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1155666210} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &2054688362 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2054688357} - 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: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 0} --- !u!1 &2055564319 GameObject: m_ObjectHideFlags: 0 @@ -196676,6 +196360,74 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 0} +--- !u!1001 &5991036092397138249 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2391945466483065398, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_Name + value: CombatPlayer + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalPosition.x + value: 202.84 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalPosition.z + value: -22.848 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8934240191915016273, guid: d9472bd7185627847ae4d5b1d3d3bb8a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d9472bd7185627847ae4d5b1d3d3bb8a, type: 3} --- !u!1001 &6569975607144876774 PrefabInstance: m_ObjectHideFlags: 0 @@ -196848,5 +196600,5 @@ SceneRoots: - {fileID: 1328364443} - {fileID: 417739632} - {fileID: 888439616} - - {fileID: 1155666210} + - {fileID: 5991036092397138249} - {fileID: 1561795904} diff --git a/BlueWater/Assets/02.Scripts/Character/CombatPlayer/CombatPlayer.cs b/BlueWater/Assets/02.Scripts/Character/CombatPlayer/CombatPlayer.cs index bad9afca1..4c6d643a1 100644 --- a/BlueWater/Assets/02.Scripts/Character/CombatPlayer/CombatPlayer.cs +++ b/BlueWater/Assets/02.Scripts/Character/CombatPlayer/CombatPlayer.cs @@ -16,6 +16,7 @@ namespace BlueWaterProject [SerializeField] private float maxHp = 100f; [SerializeField] private float currentHp; [SerializeField] private float moveSpeed = 5f; + [SerializeField] private float maxSlopeAngle = 50f; [field: Title("대쉬")] [field: SerializeField] public float DashForce { get; set; } = 20f; @@ -44,10 +45,15 @@ namespace BlueWaterProject [field: SerializeField] public Rigidbody Rb { get; set; } [SerializeField] private Transform visualLook; [field: SerializeField] public Animator Animator { get; set; } + [SerializeField] private Transform groundCheck; private Vector2 movementInput; - public Vector3 PreviousDir { get; set; } = Vector3.back; + public Vector3 PreviousDirection { get; set; } = Vector3.back; [field: SerializeField] public Collider[] HitColliders { get; set; } + private RaycastHit slopeHit; + private int groundLayer; + + private const float RAY_DISTANCE = 3f; private static readonly int XDirectionHash = Animator.StringToHash("xDirection"); private static readonly int ZDirectionHash = Animator.StringToHash("zDirection"); @@ -55,6 +61,14 @@ namespace BlueWaterProject public readonly int isDashingHash = Animator.StringToHash("isDashing"); public readonly int isAttackingHash = Animator.StringToHash("isAttacking"); + private void OnDrawGizmosSelected() + { + var lossyScale = transform.lossyScale; + var boxSize = new Vector3(lossyScale.x, 0.4f, lossyScale.z * 0.5f); + Gizmos.color = IsGrounded() ? Color.blue : Color.red; + Gizmos.DrawWireCube(groundCheck.position, boxSize); + } + [Button("셋팅 초기화")] private void Init() { @@ -62,6 +76,7 @@ namespace BlueWaterProject Rb = GetComponent(); visualLook = transform.Find("VisualLook"); Animator = visualLook.GetComponent(); + groundCheck = transform.Find("GroundCheck"); } private void Awake() @@ -75,6 +90,7 @@ namespace BlueWaterProject private void Start() { HitColliders = new Collider[MaxHitNum]; + groundLayer = 1 << LayerMask.NameToLayer("Ground"); SetCurrentHp(maxHp); } @@ -90,10 +106,31 @@ namespace BlueWaterProject } private void Update() + { + var isMoving = Rb.velocity.magnitude > 0.1f; + if (isMoving) + { + PreviousDirection = Rb.velocity.normalized; + Animator.SetFloat(XDirectionHash, PreviousDirection.x); + Animator.SetFloat(ZDirectionHash, PreviousDirection.z); + } + Animator.SetBool(IsMovingHash, isMoving); + + var localScale = visualLook.localScale; + localScale.x = Rb.velocity.x switch + { + > 0.01f => Mathf.Abs(localScale.x), + < -0.01f => -Mathf.Abs(localScale.x), + _ => localScale.x + }; + visualLook.localScale = localScale; + } + + private void FixedUpdate() { HandleMovement(); } - + public void TakeDamage(float attackerPower, Vector3? attackPos = null) { if (IsDashing) return; @@ -156,35 +193,72 @@ namespace BlueWaterProject private void HandleMovement() { - if (!IsDashing) - { - var movement = new Vector3(movementInput.x, 0, movementInput.y); - var moveDirection = movement.normalized; - Rb.velocity = moveDirection * moveSpeed; - } - - var localScale = visualLook.localScale; - localScale.x = Rb.velocity.x switch - { - > 0.01f => Mathf.Abs(localScale.x), - < -0.01f => -Mathf.Abs(localScale.x), - _ => localScale.x - }; - visualLook.localScale = localScale; + var movement = new Vector3(movementInput.x, 0, movementInput.y); + var moveDirection = IsDashing ? PreviousDirection : movement.normalized; - if (Rb.velocity != Vector3.zero) + var velocity = CalculateNextFrameGroundAngle(moveDirection) < maxSlopeAngle ? moveDirection : Vector3.zero; + var gravity = Vector3.down * Mathf.Abs(Rb.velocity.y); + + if (IsOnSlope() || velocity == moveDirection && IsGrounded()) { - PreviousDir = Rb.velocity.normalized; - Animator.SetFloat(XDirectionHash, PreviousDir.x); - Animator.SetFloat(ZDirectionHash, PreviousDir.z); + velocity = Vector3.ProjectOnPlane(moveDirection, slopeHit.normal).normalized; + gravity = Vector3.zero; + Rb.useGravity = false; } - var isMoving = Rb.velocity != Vector3.zero; - Animator.SetBool(IsMovingHash, isMoving); + else + { + Rb.useGravity = true; + } + + var moveValue = IsDashing ? DashForce : moveSpeed; + Rb.velocity = velocity * moveValue + gravity; + } + + public bool IsOnSlope() + { + var ray = new Ray(transform.position, Vector3.down); + + if (Physics.Raycast(ray, out slopeHit, RAY_DISTANCE, groundLayer)) + { + var angle = Vector3.Angle(Vector3.up, slopeHit.normal); + Debug.DrawRay(transform.position, Vector3.down, angle != 0f && angle < maxSlopeAngle ? Color.blue : Color.red); + return angle != 0f && angle < maxSlopeAngle; + } + Debug.DrawRay(transform.position, Vector3.down, Color.red); + return false; + } + + private bool IsGrounded() + { + var lossyScale = transform.lossyScale; + var boxSize = new Vector3(lossyScale.x, 0.4f, lossyScale.z * 0.5f); + return Physics.CheckBox(groundCheck.position, boxSize, Quaternion.identity, groundLayer); + } + + private float CalculateNextFrameGroundAngle(Vector3 direction) + { + var nextFramePlayerPosition = transform.position + direction * (3f * moveSpeed * Time.fixedDeltaTime); + + if (Physics.Raycast(nextFramePlayerPosition, Vector3.down, out var hitInfo, RAY_DISTANCE, groundLayer)) + { + if (Vector3.Angle(Vector3.up, hitInfo.normal) > maxSlopeAngle) + { + Debug.DrawRay(hitInfo.point, hitInfo.normal, Color.red); + } + else + { + Debug.DrawRay(hitInfo.point, hitInfo.normal, Color.cyan); + } + Debug.DrawRay(nextFramePlayerPosition, Vector3.down, Color.green); + return Vector3.Angle(Vector3.up, hitInfo.normal); + } + Debug.DrawRay(nextFramePlayerPosition, Vector3.down, Color.magenta); + return 0; } public void AttackTiming() { - var attackDirection = PreviousDir; + var attackDirection = PreviousDirection; Array.Clear(HitColliders, 0, MaxHitNum); @@ -234,5 +308,7 @@ namespace BlueWaterProject { currentHp = value; } + + public RaycastHit GetSlopeHit() => slopeHit; } } \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Character/CombatPlayer/StateMachines/Dash.cs b/BlueWater/Assets/02.Scripts/Character/CombatPlayer/StateMachines/Dash.cs index f2199447e..9857433fa 100644 --- a/BlueWater/Assets/02.Scripts/Character/CombatPlayer/StateMachines/Dash.cs +++ b/BlueWater/Assets/02.Scripts/Character/CombatPlayer/StateMachines/Dash.cs @@ -19,7 +19,14 @@ namespace BlueWaterProject public override void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) { - combatPlayer.Rb.velocity = combatPlayer.PreviousDir * combatPlayer.DashForce; + // var dashDirection = combatPlayer.PreviousDirection; + // + // if (combatPlayer.IsOnSlope()) + // { + // dashDirection = Vector3.ProjectOnPlane(dashDirection, combatPlayer.GetSlopeHit().normal).normalized; + // } + // + // combatPlayer.Rb.velocity = dashDirection * combatPlayer.DashForce; if (stateInfo.normalizedTime >= 1.0f) { diff --git a/BlueWater/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab b/BlueWater/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab new file mode 100644 index 000000000..fbaeff306 --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab @@ -0,0 +1,358 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &87732673861481097 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8557381169392297019} + - component: {fileID: 1564585232883027199} + - component: {fileID: 3138574858532492034} + - component: {fileID: 6230115818254112785} + - component: {fileID: 6407473152449951742} + m_Layer: 0 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8557381169392297019 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87732673861481097} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 6, y: 6, z: 6} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 8934240191915016273} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1564585232883027199 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87732673861481097} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 2608582141572372013, guid: 88b84319f88e542e495fc1f6338dc3ab, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.16, y: 0.22} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &3138574858532492034 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87732673861481097} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: d675b8a88eec8a54e90303ce988360a8, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &6230115818254112785 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87732673861481097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e16f62f7d451b504fae5474be03a6da7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!64 &6407473152449951742 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87732673861481097} + 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: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 0} +--- !u!1 &2391945466483065398 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8934240191915016273} + - component: {fileID: 6858674358337067996} + - component: {fileID: 7729150195808218711} + - component: {fileID: 6121288256300454469} + - component: {fileID: 4906016173319036404} + - component: {fileID: 2650321273105086144} + m_Layer: 9 + m_Name: CombatPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8934240191915016273 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2391945466483065398} + 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: 8557381169392297019} + - {fileID: 7407663186225048994} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &6858674358337067996 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2391945466483065398} + 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.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 1, z: 0} +--- !u!54 &7729150195808218711 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2391945466483065398} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + 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: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 112 + m_CollisionDetection: 0 +--- !u!114 &6121288256300454469 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2391945466483065398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2, + type: 3} + m_NotificationBehavior: 0 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: [] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!114 &4906016173319036404 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2391945466483065398} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5258cddac7934c1469d147dddbdb5023, type: 3} + m_Name: + m_EditorClassIdentifier: + autoInit: 0 + maxHp: 100 + currentHp: 0 + moveSpeed: 10 + maxSlopeAngle: 50 + k__BackingField: 20 + k__BackingField: 0.5 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 10 + k__BackingField: 10 + k__BackingField: 1.5 + k__BackingField: 180 + k__BackingField: 0.5 + k__BackingField: + serializedVersion: 2 + m_Bits: 8192 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + playerInput: {fileID: 6121288256300454469} + k__BackingField: {fileID: 7729150195808218711} + visualLook: {fileID: 8557381169392297019} + k__BackingField: {fileID: 3138574858532492034} + groundCheck: {fileID: 7407663186225048994} + k__BackingField: [] +--- !u!64 &2650321273105086144 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2391945466483065398} + 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: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 0} +--- !u!1 &3669261844365681366 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7407663186225048994} + m_Layer: 9 + m_Name: GroundCheck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7407663186225048994 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3669261844365681366} + 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: [] + m_Father: {fileID: 8934240191915016273} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/BlueWater/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab.meta b/BlueWater/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab.meta new file mode 100644 index 000000000..7d51f4335 --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d9472bd7185627847ae4d5b1d3d3bb8a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: