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/AC_Player.controller | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 160 insertions(+), 14 deletions(-)
diff --git a/Assets/Characters/Player/AC_Player.controller b/Assets/Characters/Player/AC_Player.controller
index 9da6a87..08682b6 100644
--- a/Assets/Characters/Player/AC_Player.controller
+++ b/Assets/Characters/Player/AC_Player.controller
@@ -9,9 +9,6 @@
m_Name:
m_Conditions:
- m_ConditionMode: 2
- m_ConditionEvent: IsMoving
- m_EventTreshold: 0
- - m_ConditionMode: 2
m_ConditionEvent: IsFlying
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
@@ -28,6 +25,59 @@
m_InterruptionSource: 1
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
+--- !u!1102 &-8776216366201631375
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: player_death
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours:
+ - {fileID: -2493127153716391096}
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: cec1a898bd6cf1f4f87968928d9016ea, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &-8551537280866366805
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: player_hit
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 0}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1107 &-8244801798701371434
AnimatorStateMachine:
serializedVersion: 6
@@ -46,12 +96,18 @@
- serializedVersion: 1
m_State: {fileID: 7984510369417086179}
m_Position: {x: 620, y: 200, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -8776216366201631375}
+ m_Position: {x: 620, y: 300, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -8551537280866366805}
+ m_Position: {x: 620, y: 390, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
- m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_AnyStatePosition: {x: 400, y: 310, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 880, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
@@ -67,9 +123,6 @@
- m_ConditionMode: 2
m_ConditionEvent: IsMoving
m_EventTreshold: 0
- - m_ConditionMode: 2
- m_ConditionEvent: IsFlying
- m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 68305137226140118}
m_Solo: 0
@@ -84,6 +137,32 @@
m_InterruptionSource: 1
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
+--- !u!1102 &-7583940583200162132
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: player_death
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: cec1a898bd6cf1f4f87968928d9016ea, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1107 &-3544671305424738950
AnimatorStateMachine:
serializedVersion: 6
@@ -92,12 +171,16 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
- m_ChildStates: []
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: -7583940583200162132}
+ m_Position: {x: 200, y: 0, z: 0}
m_ChildStateMachines:
- serializedVersion: 1
m_StateMachine: {fileID: -8244801798701371434}
m_Position: {x: 320, y: 110, z: 0}
- m_AnyStateTransitions: []
+ m_AnyStateTransitions:
+ - {fileID: 7389560801624237999}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
@@ -106,6 +189,23 @@
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 68305137226140118}
+--- !u!114 &-2493127153716391096
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 40c71d8fcb09c1d4ba6bf7f07a33b574, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ boolName: CanMove
+ updateOnState: 1
+ updateOnStateMachine: 0
+ valueOnEnter: 0
+ valueOnExit: 0
--- !u!1101 &-1567565794043545918
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -126,7 +226,7 @@
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
- m_TransitionDuration: 0
+ m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
@@ -160,6 +260,30 @@
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: IsAtWall
+ m_Type: 4
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: IsAtCeiling
+ m_Type: 4
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ - m_Name: IsAlive
+ m_Type: 4
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 1
+ m_Controller: {fileID: 0}
+ - m_Name: CanMove
+ m_Type: 4
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 1
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
@@ -238,11 +362,8 @@
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- - m_ConditionMode: 2
+ - m_ConditionMode: 1
m_ConditionEvent: IsGrounded
- m_EventTreshold: 0
- - m_ConditionMode: 2
- m_ConditionEvent: IsFlying
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 68305137226140118}
@@ -314,6 +435,31 @@
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1101 &7389560801624237999
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 2
+ m_ConditionEvent: IsAlive
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -8776216366201631375}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 0
--- !u!1101 &7462440421188174382
AnimatorStateTransition:
m_ObjectHideFlags: 1
--
Gitblit v1.9.3