From 8139cd89a52559cdd906cd5866dcc55dbd7003a7 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Fri, 15 Dec 2023 20:14:49 +0000
Subject: [PATCH] Merge branch 'release/v_0.0.1'
---
Assets/Characters/Player/Player.prefab | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/Assets/Characters/Player/Player.prefab b/Assets/Characters/Player/Player.prefab
index 61b138b..78c0fb9 100644
--- a/Assets/Characters/Player/Player.prefab
+++ b/Assets/Characters/Player/Player.prefab
@@ -122,6 +122,7 @@
- component: {fileID: 3884295854780712968}
- component: {fileID: 2451348752795735853}
- component: {fileID: 5338311196462064651}
+ - component: {fileID: 2350719025294399868}
m_Layer: 0
m_Name: Player
m_TagString: Untagged
@@ -378,8 +379,8 @@
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 0.88, y: 0.95}
- m_EdgeRadius: 0
+ m_Size: {x: 0.7205616, y: 0.7178567}
+ m_EdgeRadius: 0.12
--- !u!95 &2451348752795735853
Animator:
serializedVersion: 5
@@ -428,5 +429,27 @@
minNormalAngle: 0
maxNormalAngle: 0
groundDistance: 0.05
+ wallDistance: 0.2
+ ceilingDistance: 0.05
rotorGO: {fileID: 1519978218308964847}
_isGrounded: 1
+ _isAtWall: 0
+ _isAtCeiling: 0
+--- !u!114 &2350719025294399868
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3345854317100013954}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 352737c44bb3905498d44716afca4984, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ _maxHealth: 100
+ _health: 100
+ _isAlive: 1
+ isInvincible: 0
+ invincibilityTime: 0.25
+ selfDamage: 0
--
Gitblit v1.9.3