lionfish/Gnome-s-Bounty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix animations

Browse Source
This commit is contained in:
Valdimir
2023-07-26 22:21:07 +03:00
parent e65c923810
commit acdd8b7d16
3 changed files with 92 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Animations/Player.controller
+84 -6
View File
@@ -62,7 +62,10 @@ AnimatorState:
m_Name: Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_Transitions:
- {fileID: 2108841758259782539}
- {fileID: -2173756560665335128}
- {fileID: -460738595207219857}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -164,6 +167,31 @@ AnimatorStateMachine:
m_ExitPosition: {x: 640, y: 460, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -7806160175022390470}
--- !u!1101 &-2173756560665335128
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Body_Walk
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -8721553355552428637}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.875
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &-1905273286904407067
AnimatorStateMachine:
serializedVersion: 6
@@ -240,6 +268,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-460738595207219857
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Climb
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2656673392868499701}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.875
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@@ -254,31 +307,31 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Legs_Walk
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Body_ThrowHammer
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Climb
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: Death
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Body
@@ -304,6 +357,31 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &2108841758259782539
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Body_ThrowHammer
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 5948011480812328800}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.875
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &5948011480812328800
AnimatorState:
serializedVersion: 6
Assets/Scenes/Test.unity
+3 -3
View File
@@ -2392,7 +2392,7 @@ GameObject:
- component: {fileID: 841812204}
- component: {fileID: 841812203}
- component: {fileID: 841812202}
m_Layer: 0
m_Layer: 8
m_Name: Goblin
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2474,7 +2474,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_animator: {fileID: 0}
_movementSpeed: 1.5
_movementSpeed: 1.2
_bonesSide: {fileID: 0}
_bonesBack: {fileID: 0}
_spawnPoint: {fileID: 0}
@@ -3037,7 +3037,7 @@ GameObject:
m_Component:
- component: {fileID: 1262117648}
- component: {fileID: 1262117649}
m_Layer: 0
m_Layer: 8
m_Name: Visual
m_TagString: Untagged
m_Icon: {fileID: 0}
Packages/packages-lock.json
+5 -5
View File
@@ -111,7 +111,7 @@
"url": "https://packages.unity.com"
},
"com.unity.burst": {
"version": "1.8.7",
"version": "1.8.4",
"depth": 1,
"source": "registry",
"dependencies": {
@@ -226,18 +226,18 @@
"url": "https://packages.unity.com"
},
"com.unity.services.analytics": {
"version": "5.0.0",
"version": "4.4.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.services.core": "1.10.1"
"com.unity.services.core": "1.8.1",
"com.unity.nuget.newtonsoft-json": "3.0.2"
},
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.10.1",
"version": "1.9.0",
"depth": 1,
"source": "registry",
"dependencies": {