From 74dd3727f62603f64958790f9e588d47c8f000ff Mon Sep 17 00:00:00 2001 From: miepzerino <o.skotnik@gmail.com> Date: Sat, 23 Dec 2023 03:14:14 +0000 Subject: [PATCH] Added player movement while drilling --- Assets/Characters/Player/Player.prefab | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Assets/Characters/Player/Player.prefab b/Assets/Characters/Player/Player.prefab index 67015b8..5a84793 100644 --- a/Assets/Characters/Player/Player.prefab +++ b/Assets/Characters/Player/Player.prefab @@ -11,7 +11,7 @@ - component: {fileID: 4015561216076182548} - component: {fileID: 5161691884094901785} - component: {fileID: 8187912793618963728} - m_Layer: 0 + m_Layer: 7 m_Name: Rotor m_TagString: Untagged m_Icon: {fileID: 0} @@ -123,7 +123,7 @@ - component: {fileID: 2451348752795735853} - component: {fileID: 5338311196462064651} - component: {fileID: 2350719025294399868} - m_Layer: 0 + m_Layer: 7 m_Name: Player m_TagString: Untagged m_Icon: {fileID: 0} @@ -223,7 +223,7 @@ m_Bits: 0 m_Interpolate: 0 m_SleepingMode: 1 - m_CollisionDetection: 0 + m_CollisionDetection: 1 m_Constraints: 4 --- !u!114 &1512638649171213079 MonoBehaviour: @@ -239,9 +239,12 @@ m_EditorClassIdentifier: moveSpeed: 5 maxFallSpeed: -20 + maxFallSpeedDamge: -10 rotorGO: {fileID: 1519978218308964847} + drillingTime: 1 _isMoving: 0 _isFlying: 0 + _isDrilling: 0 --- !u!114 &6914713383366050867 MonoBehaviour: m_ObjectHideFlags: 0 @@ -331,6 +334,10 @@ m_Calls: [] m_ActionId: 3d1c6017-9298-4bde-8c6e-ad9343a4a520 m_ActionName: UI/TrackedDeviceOrientation + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 646986b3-5de0-4aa2-ac34-b9d8ddc48d6c + m_ActionName: UI/Escape[/Keyboard/escape] m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: m_DefaultActionMap: Player @@ -379,8 +386,8 @@ adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.7205616, y: 0.7178567} - m_EdgeRadius: 0.12 + m_Size: {x: 0.7, y: 0.7} + m_EdgeRadius: 0 --- !u!95 &2451348752795735853 Animator: serializedVersion: 5 @@ -428,12 +435,13 @@ maxDepth: 0 minNormalAngle: 0 maxNormalAngle: 0 - groundDistance: 0.05 - wallDistance: 0.2 + groundDistance: 0.02 + wallDistance: 0.02 ceilingDistance: 0.05 rotorGO: {fileID: 1519978218308964847} _isGrounded: 1 - _isAtWall: 0 + _isAtWallLeft: 0 + _isAtWallRight: 0 _isAtCeiling: 0 --- !u!114 &2350719025294399868 MonoBehaviour: @@ -447,8 +455,12 @@ m_Script: {fileID: 11500000, guid: 352737c44bb3905498d44716afca4984, type: 3} m_Name: m_EditorClassIdentifier: + selfDamage: 0 _maxHealth: 100 _health: 100 _isAlive: 1 isInvincible: 0 invincibilityTime: 0.25 + hitSound: 3 + healSound: 0 + deathSound: 0 -- Gitblit v1.9.3