From d95020b910bc69ab733f87d5d0238fe2d1164590 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Sat, 16 Dec 2023 18:52:45 +0000
Subject: [PATCH] Overhauled audio management
---
Assets/Characters/Player/Player.prefab | 73 +++++++++++++++++++++++++++++++++---
1 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/Assets/Characters/Player/Player.prefab b/Assets/Characters/Player/Player.prefab
index cd4439a..4b725e2 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}
@@ -40,7 +40,7 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1519978218308964847}
- m_Enabled: 0
+ m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
@@ -121,7 +121,9 @@
- component: {fileID: 6914713383366050867}
- component: {fileID: 3884295854780712968}
- component: {fileID: 2451348752795735853}
- m_Layer: 0
+ - component: {fileID: 5338311196462064651}
+ - component: {fileID: 2350719025294399868}
+ m_Layer: 7
m_Name: Player
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -237,9 +239,10 @@
m_EditorClassIdentifier:
moveSpeed: 5
maxFallSpeed: -20
+ maxFallSpeedDamge: -10
+ rotorGO: {fileID: 1519978218308964847}
_isMoving: 0
_isFlying: 0
- rotorGO: {fileID: 1519978218308964847}
--- !u!114 &6914713383366050867
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -329,6 +332,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
@@ -377,8 +384,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
@@ -400,3 +407,57 @@
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &5338311196462064651
+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: 020eca3b7119d5d4a91c826741855730, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ castFilter:
+ useTriggers: 0
+ useLayerMask: 0
+ useDepth: 0
+ useOutsideDepth: 0
+ useNormalAngle: 0
+ useOutsideNormalAngle: 0
+ layerMask:
+ serializedVersion: 2
+ m_Bits: 0
+ minDepth: 0
+ maxDepth: 0
+ 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:
+ selfDamage: 0
+ _maxHealth: 100
+ _health: 100
+ _isAlive: 1
+ isInvincible: 0
+ invincibilityTime: 0.25
+ hitSound: 3
+ healSound: 0
+ deathSound: 0
--
Gitblit v1.9.3