RochesterX/Crash-Course
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

Demo Overhaul

Browse Source
This commit is contained in:
RochesterX
2025-02-08 18:54:21 -05:00
parent 16dec36792
commit 71a4f070d5
14 changed files with 3579 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3196
Assets/Animations/Bones/AirPunch.anim Normal file
View File

File diff suppressed because it is too large Load Diff

8
Assets/Animations/Bones/AirPunch.anim.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: eb8fa292b9d2f43bd9dedb423b25c937
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

166
Assets/Animations/Bones/Bones.controller
View File

@@ -25,6 +25,81 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-6908172086093276855
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: state
m_EventTreshold: 2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -65348665591799820}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.2
m_TransitionOffset: 0
m_ExitTime: 0.5
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-6412564485926626614
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: punch
m_EventTreshold: 0
- m_ConditionMode: 6
m_ConditionEvent: state
m_EventTreshold: 2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 2500419510660092995}
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 &-3941187688435178234
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: -65348665591799820}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3289816270970516984
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -75,6 +150,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-2141031755032314946
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: state
m_EventTreshold: 1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 2600039493493020915}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.6808511
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &-1538096663108953913
AnimatorStateMachine:
serializedVersion: 6
@@ -96,9 +196,13 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 4390441580030614539}
m_Position: {x: 60, y: 80, z: 0}
- serializedVersion: 1
m_State: {fileID: 2500419510660092995}
m_Position: {x: 100, y: -140, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 5263795009836994554}
- {fileID: -6412564485926626614}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
@@ -106,7 +210,7 @@ AnimatorStateMachine:
m_EntryPosition: {x: 890, y: 0, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 2600039493493020915}
m_DefaultState: {fileID: 1699472617733096240}
--- !u!1101 &-1491732674038617540
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -204,7 +308,7 @@ AnimatorController:
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 1
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
@@ -272,6 +376,35 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &2500419510660092995
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: AirPunch
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -3941187688435178234}
- {fileID: -2141031755032314946}
- {fileID: 7802407454979388569}
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: eb8fa292b9d2f43bd9dedb423b25c937, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &2600039493493020915
AnimatorState:
serializedVersion: 6
@@ -312,6 +445,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 7801668757208663834}
- {fileID: -6908172086093276855}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -338,6 +472,9 @@ AnimatorStateTransition:
- m_ConditionMode: 1
m_ConditionEvent: punch
m_EventTreshold: 0
- m_ConditionMode: 7
m_ConditionEvent: state
m_EventTreshold: 2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4390441580030614539}
m_Solo: 0
@@ -374,3 +511,28 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &7802407454979388569
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: state
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1699472617733096240}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.65116274
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1

23
Assets/Animations/Bones/Idle.anim
View File

@@ -1582,4 +1582,25 @@ AnimationClip:
flags: 0
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
m_Events:
- time: 0
functionName: EnableCancellation
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 0
functionName: ReturnToMaxSpeed
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 0
functionName: DisableHurtbox
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0

7
Assets/Animations/Bones/TrevorPunch.anim
View File

@@ -2798,3 +2798,10 @@ AnimationClip:
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 0.43333334
functionName: ReturnToMaxSpeed
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0

23
Assets/Animations/Bones/Walk.anim
View File

@@ -1850,4 +1850,25 @@ AnimationClip:
flags: 0
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
m_Events:
- time: 0
functionName: ReturnToMaxSpeed
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 0
functionName: EnableCancellation
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 0
functionName: DisableHurtbox
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0