diff --git a/RunningLateGame/Assets/New Physic Material.physicMaterial b/RunningLateGame/Assets/New Physic Material.physicMaterial new file mode 100644 index 0000000..39d4f1d --- /dev/null +++ b/RunningLateGame/Assets/New Physic Material.physicMaterial @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!134 &13400000 +PhysicMaterial: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Physic Material + dynamicFriction: 2 + staticFriction: 2 + bounciness: 0 + frictionCombine: 1 + bounceCombine: 1 diff --git a/RunningLateGame/Assets/New Physic Material.physicMaterial.meta b/RunningLateGame/Assets/New Physic Material.physicMaterial.meta new file mode 100644 index 0000000..4ad4d06 --- /dev/null +++ b/RunningLateGame/Assets/New Physic Material.physicMaterial.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: af5498c8fc3d9184d96e9c33ff76659d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 13400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RunningLateGame/Assets/Prefabs/AIPerson.prefab b/RunningLateGame/Assets/Prefabs/AIPerson.prefab index 270fdf9..09add5e 100644 --- a/RunningLateGame/Assets/Prefabs/AIPerson.prefab +++ b/RunningLateGame/Assets/Prefabs/AIPerson.prefab @@ -847,7 +847,7 @@ Animator: m_Controller: {fileID: 9100000, guid: 40db3173a05ae3242b1c182a09b0a183, type: 2} m_CullingMode: 1 m_UpdateMode: 0 - m_ApplyRootMotion: 1 + m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 m_WarningMessage: diff --git a/RunningLateGame/Assets/Scenes/Playgrounds/FInalScene.unity b/RunningLateGame/Assets/Scenes/Playgrounds/FInalScene.unity index 18ac8a6..ebeb6fe 100644 --- a/RunningLateGame/Assets/Scenes/Playgrounds/FInalScene.unity +++ b/RunningLateGame/Assets/Scenes/Playgrounds/FInalScene.unity @@ -58117,7 +58117,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6565435011949983459, guid: 4727a0261e638a347b36b0a4c15200bd, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: @@ -124117,11 +124118,41 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: 5571806518164592667, guid: fede53ad5812a1046bf12a85cacb875a, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5571806518164592667, guid: fede53ad5812a1046bf12a85cacb875a, type: 3} propertyPath: m_LocalPosition.y value: 0.7249985 objectReference: {fileID: 0} + - target: {fileID: 5571806518164592667, guid: fede53ad5812a1046bf12a85cacb875a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5571806518164592667, guid: fede53ad5812a1046bf12a85cacb875a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5571806518164592667, guid: fede53ad5812a1046bf12a85cacb875a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5571806518164592667, guid: fede53ad5812a1046bf12a85cacb875a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5571806518164592667, guid: fede53ad5812a1046bf12a85cacb875a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6059963189683946240, guid: fede53ad5812a1046bf12a85cacb875a, type: 3} propertyPath: m_StaticEditorFlags @@ -124207,6 +124238,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} + - target: {fileID: 8454057317721622983, guid: fede53ad5812a1046bf12a85cacb875a, + type: 3} + propertyPath: field of view + value: 75 + objectReference: {fileID: 0} - target: {fileID: 8454057317721622983, guid: fede53ad5812a1046bf12a85cacb875a, type: 3} propertyPath: near clip plane @@ -202695,6 +202731,121 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 92f6a3f203d177d418d29d6ca5580013, type: 3} +--- !u!1001 &690184317 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 974238578668270716, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_ActionEvents.Array.data[0].m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 974238578668270716, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 974238578668270716, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_ActionEvents.Array.data[2].m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 974238578668270716, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_ActionEvents.Array.data[3].m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 2119775930974504096, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_LocalPosition.x + value: 508.62494 + objectReference: {fileID: 0} + - target: {fileID: 2119775930974504096, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_LocalPosition.y + value: 2.95 + objectReference: {fileID: 0} + - target: {fileID: 2119775930974504096, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_LocalPosition.z + value: 197.06265 + objectReference: {fileID: 0} + - target: {fileID: 2119775930974504096, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2119775930974504096, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2119775930974504096, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2119775930974504096, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2119775930974504096, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2119775930974504096, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2119775930974504096, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5542111180780342640, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_BackGroundColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5542111180780342640, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_BackGroundColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5542111180780342640, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_BackGroundColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5542111180780342640, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_BackGroundColor.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8047161636021232021, guid: c708a3b79cd542b42bbfedb17e213bc1, + type: 3} + propertyPath: m_Name + value: NestedParentArmature_Unpack + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 974238578668270715, guid: c708a3b79cd542b42bbfedb17e213bc1, type: 3} + - {fileID: 974238578668270716, guid: c708a3b79cd542b42bbfedb17e213bc1, type: 3} + - {fileID: 3543048675319490572, guid: c708a3b79cd542b42bbfedb17e213bc1, type: 3} + m_RemovedGameObjects: + - {fileID: 5542111180780342642, guid: c708a3b79cd542b42bbfedb17e213bc1, type: 3} + - {fileID: 3203261902030645159, guid: c708a3b79cd542b42bbfedb17e213bc1, type: 3} + - {fileID: 3128949090649374765, guid: c708a3b79cd542b42bbfedb17e213bc1, type: 3} + - {fileID: 974238578668270704, guid: c708a3b79cd542b42bbfedb17e213bc1, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c708a3b79cd542b42bbfedb17e213bc1, type: 3} --- !u!1001 &690263085 PrefabInstance: m_ObjectHideFlags: 0 @@ -496107,7 +496258,7 @@ TerrainCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1571048533} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: af5498c8fc3d9184d96e9c33ff76659d, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -745017,3 +745168,4 @@ SceneRoots: - {fileID: 1724433828} - {fileID: 1882649690} - {fileID: 1191548241} + - {fileID: 690184317} diff --git a/RunningLateGame/Assets/Scenes/Playgrounds/FinalScene/NavMesh-navMesh 1.asset b/RunningLateGame/Assets/Scenes/Playgrounds/FinalScene/NavMesh-navMesh 1.asset index 7f4178b..a1237cb 100644 Binary files a/RunningLateGame/Assets/Scenes/Playgrounds/FinalScene/NavMesh-navMesh 1.asset and b/RunningLateGame/Assets/Scenes/Playgrounds/FinalScene/NavMesh-navMesh 1.asset differ diff --git a/RunningLateGame/Assets/Scripts/AI.cs b/RunningLateGame/Assets/Scripts/AI.cs index 71821b2..8cfe1cf 100644 --- a/RunningLateGame/Assets/Scripts/AI.cs +++ b/RunningLateGame/Assets/Scripts/AI.cs @@ -64,9 +64,7 @@ public class AI : MonoBehaviour /// public void Awake() { - _animator = GetComponent(); - _currentState = "Strolling"; - + _agent = GetComponent(); _animator = GetComponent(); @@ -126,7 +124,7 @@ private IEnumerator Strolling() if ((transform.position - destinationCoord).magnitude < 1f) _destinationPointSet = false; - yield return new WaitForSeconds(1f); + yield return new WaitForEndOfFrame(); } ChangeState(); diff --git a/RunningLateGame/Assets/Starter Assets/Runtime/ThirdPersonController/Character/Animations/StarterAssetsThirdPerson.controller b/RunningLateGame/Assets/Starter Assets/Runtime/ThirdPersonController/Character/Animations/StarterAssetsThirdPerson.controller index 82fabf2..b547bb2 100644 --- a/RunningLateGame/Assets/Starter Assets/Runtime/ThirdPersonController/Character/Animations/StarterAssetsThirdPerson.controller +++ b/RunningLateGame/Assets/Starter Assets/Runtime/ThirdPersonController/Character/Animations/StarterAssetsThirdPerson.controller @@ -1,5 +1,33 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7469282255733588732 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: InAir + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1241942381204629156} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 1 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -2702400367771620057, guid: 063aa479676c4084ebf187660ca0a7b8, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &-5602963042399094863 AnimatorStateMachine: serializedVersion: 6 @@ -10,8 +38,17 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: 8339175055766481336} - m_Position: {x: 200, y: 410, z: 0} + m_State: {fileID: 6904719651407550685} + m_Position: {x: 200, y: 400, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7469282255733588732} + m_Position: {x: 200, y: 600, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1645763842379584696} + m_Position: {x: 400, y: 490, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2316907928501487792} + m_Position: {x: 0, y: 490, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -19,51 +56,9 @@ AnimatorStateMachine: m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 10, y: 330, z: 0} m_EntryPosition: {x: 220, y: 330, z: 0} - m_ExitPosition: {x: 780, y: 90, z: 0} + m_ExitPosition: {x: 680, y: 260, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 8339175055766481336} ---- !u!206 &-5557379071981553134 -BlendTree: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Blend Tree - m_Childs: - - serializedVersion: 2 - m_Motion: {fileID: -3100369314251171874, guid: 12e52e465ed793a4d801955e9f964a82, - type: 3} - m_Threshold: 0 - m_Position: {x: 0, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Speed - m_Mirror: 0 - - serializedVersion: 2 - m_Motion: {fileID: 1657602633327794031, guid: 8269a9f8cf495034c817722ac21f309f, - type: 3} - m_Threshold: 2.5 - m_Position: {x: 0, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Speed - m_Mirror: 0 - - serializedVersion: 2 - m_Motion: {fileID: 6564411413370888346, guid: 16114d403eabb53438de032c6f0d1deb, - type: 3} - m_Threshold: 5 - m_Position: {x: 0, y: 0} - m_TimeScale: 1 - m_CycleOffset: 0 - m_DirectBlendParameter: Speed - m_Mirror: 0 - m_BlendParameter: Speed - m_BlendParameterY: Speed - m_MinThreshold: 0 - m_MaxThreshold: 5 - m_UseAutomaticThresholds: 0 - m_NormalizedBlendValues: 0 - m_BlendType: 0 + m_DefaultState: {fileID: 6904719651407550685} --- !u!1101 &-5554260563948360725 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -111,6 +106,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-4639224020698590961 +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: FreeFall + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7469282255733588732} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.037536144 + m_TransitionOffset: 0.23041831 + m_ExitTime: 0.9466194 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-3943826829571047522 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -161,6 +181,58 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &-1645763842379584696 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JumpLand + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1965893691485178243} + 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: 8738420251406115919} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-1241942381204629156 +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: Grounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1645763842379584696} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.09764749 + m_TransitionOffset: 0.08027425 + m_ExitTime: 0.30146867 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -175,31 +247,31 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Jump m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Grounded m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: FreeFall m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: MotionSpeed m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -238,6 +310,28 @@ AnimatorStateTransition: m_InterruptionSource: 2 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &1705606405774109490 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7469282255733588732} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.47048202 + m_TransitionOffset: 0.60876185 + m_ExitTime: 0.66366935 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &1725567275296691115 AnimatorState: serializedVersion: 6 @@ -266,6 +360,56 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &1965893691485178243 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6904719651407550685} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.4340285 + m_TransitionOffset: 0.36290926 + m_ExitTime: 0.39948252 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &2316907928501487792 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JumpStart + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1705606405774109490} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 1 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7478122292733868173, guid: 98f277b0c8055e143b2fcf058d3c27dc, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &2455683505482688366 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -313,6 +457,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 +--- !u!1102 &6904719651407550685 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle Walk Run Blend + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4639224020698590961} + - {fileID: 8635457214972911529} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 1 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 1 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 8571049798372811705} + m_Tag: + m_SpeedParameter: MotionSpeed + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: Speed --- !u!1101 &7604687646627025577 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -363,29 +535,112 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &8339175055766481336 -AnimatorState: - serializedVersion: 6 +--- !u!206 &8571049798372811705 +BlendTree: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Blend Tree - 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: -5557379071981553134} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: -3100369314251171874, guid: 12e52e465ed793a4d801955e9f964a82, + type: 3} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 1657602633327794031, guid: 8269a9f8cf495034c817722ac21f309f, + type: 3} + m_Threshold: 2 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 6564411413370888346, guid: 16114d403eabb53438de032c6f0d1deb, + type: 3} + m_Threshold: 6 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + m_BlendParameter: Speed + m_BlendParameterY: Speed + m_MinThreshold: 0 + m_MaxThreshold: 6 + m_UseAutomaticThresholds: 0 + m_NormalizedBlendValues: 0 + m_BlendType: 0 +--- !u!1101 &8635457214972911529 +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: Jump + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2316907928501487792} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.07026373 + m_TransitionOffset: 0 + m_ExitTime: 0.03574113 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!206 &8738420251406115919 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: -9098803823909532060, guid: 98f277b0c8055e143b2fcf058d3c27dc, + type: 3} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 3062299877480904481, guid: 325a26d62b61fa94cb3c97c435efebc5, + type: 3} + m_Threshold: 2 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: -2817517482862745934, guid: 3c033631149b9c541bcf155cd94cccba, + type: 3} + m_Threshold: 6 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Speed + m_Mirror: 0 + m_BlendParameter: Speed + m_BlendParameterY: Speed + m_MinThreshold: 0 + m_MaxThreshold: 6 + m_UseAutomaticThresholds: 0 + m_NormalizedBlendValues: 0 + m_BlendType: 0 diff --git a/RunningLateGame/ProjectSettings/ProjectSettings.asset b/RunningLateGame/ProjectSettings/ProjectSettings.asset index 55cc5ce..d7a4599 100644 --- a/RunningLateGame/ProjectSettings/ProjectSettings.asset +++ b/RunningLateGame/ProjectSettings/ProjectSettings.asset @@ -139,7 +139,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.1.0 + bundleVersion: 1.1.1 preloadedAssets: - {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2} metroInputSource: 0