From af9e8b75f30b3b8186062a302fed3c74c541fc87 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Mon, 25 Dec 2023 22:41:43 +0000
Subject: [PATCH] missed commit
---
Assets/Characters/Player/Player.prefab | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 105 insertions(+), 9 deletions(-)
diff --git a/Assets/Characters/Player/Player.prefab b/Assets/Characters/Player/Player.prefab
index 78c0fb9..40dca14 100644
--- a/Assets/Characters/Player/Player.prefab
+++ b/Assets/Characters/Player/Player.prefab
@@ -1,5 +1,89 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &543903730345431029
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8344281483481019165}
+ - component: {fileID: 4973217154622375317}
+ m_Layer: 7
+ m_Name: Drill
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &8344281483481019165
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 543903730345431029}
+ 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: 2368348636056148999}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &4973217154622375317
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 543903730345431029}
+ m_Enabled: 0
+ 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_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+ 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: 0
+ m_Sprite: {fileID: 21300000, guid: 9b63dee9d78a1b44e9d4f8d91e41057e, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 1, y: 1}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
--- !u!1 &1519978218308964847
GameObject:
m_ObjectHideFlags: 0
@@ -11,7 +95,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 +207,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}
@@ -144,6 +228,7 @@
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4015561216076182548}
+ - {fileID: 8344281483481019165}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &916538189430653628
@@ -223,7 +308,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 +324,12 @@
m_EditorClassIdentifier:
moveSpeed: 5
maxFallSpeed: -20
+ maxFallSpeedDamge: -10
rotorGO: {fileID: 1519978218308964847}
_isMoving: 0
_isFlying: 0
+ _isDrillingLeftRight: 0
+ _isDrillingDown: 0
--- !u!114 &6914713383366050867
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -331,6 +419,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 +471,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 +520,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,9 +540,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
- selfDamage: 0
+ hitSound: 3
+ healSound: 0
+ deathSound: 0
--
Gitblit v1.9.3