Station_Obscurum/StationObscurum
8
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed camera system and brightened recipticles

Browse Source
This commit is contained in:
sebastianhampel1
2023-05-10 23:59:58 -04:00
parent d90419f579
commit aafb240391
181 changed files with 35174 additions and 2991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
Assets/Animations/PlayerAnimations/mixamorig_Hips.controller
View File

@ -27,6 +27,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-8917856093049317252
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: IsDead
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7663569941003565567}
m_Solo: 1
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8026316
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-8878422136028988382
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -169,32 +194,6 @@ AnimatorStateTransition:
m_InterruptionSource: 1
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-8166091871703040871
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: testnew
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: 3889779219b916a4a8f6960eddee92cb, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-7663569941003565567
AnimatorState:
serializedVersion: 6
@ -645,7 +644,7 @@ AnimatorStateTransition:
m_ExitTime: 0.78571427
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-4044307373194923611
@ -743,9 +742,9 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.87288135
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_InterruptionSource: 1
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3083909020998727201
@ -970,6 +969,7 @@ AnimatorState:
m_Transitions:
- {fileID: -6438570112116358950}
- {fileID: -8878422136028988382}
- {fileID: 7685810047251688145}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -1270,6 +1270,31 @@ AnimatorStateTransition:
m_InterruptionSource: 1
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &261867820848477991
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: IsDead
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8758987059409697143}
m_Solo: 1
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8125
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &583101868980985703
AnimatorState:
serializedVersion: 6
@ -1321,6 +1346,23 @@ AnimatorStateTransition:
m_InterruptionSource: 1
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1109 &1139268665897790755
AnimatorTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: IsDead
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7663569941003565567}
m_Solo: 1
m_Mute: 0
m_IsExit: 0
serializedVersion: 1
--- !u!1101 &1558585777499293808
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -1463,6 +1505,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &2453540372051695581
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: IsDead
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7663569941003565567}
m_Solo: 1
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.975
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 1
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &2768731725242432938
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -1584,6 +1651,7 @@ AnimatorState:
- {fileID: -2995887536575415147}
- {fileID: 128102589861714503}
- {fileID: -5051798432974650864}
- {fileID: 2453540372051695581}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -1679,6 +1747,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &7685810047251688145
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: IsDead
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7663569941003565567}
m_Solo: 1
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.6590909
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &7721641665470324480
AnimatorState:
serializedVersion: 6
@ -1693,6 +1786,7 @@ AnimatorState:
- {fileID: -8875059232032836885}
- {fileID: -586259129929159061}
- {fileID: -8173335242479003956}
- {fileID: 261867820848477991}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -1885,6 +1979,7 @@ AnimatorState:
m_Transitions:
- {fileID: -7329068066951733316}
- {fileID: -7319978620292223939}
- {fileID: -8917856093049317252}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -1911,7 +2006,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -2941754148986728630}
m_Position: {x: 270, y: 500, z: 0}
m_Position: {x: -130, y: 410, z: 0}
- serializedVersion: 1
m_State: {fileID: 2448133036534709572}
m_Position: {x: 309.8631, y: 112.56933, z: 0}
@ -1927,25 +2022,25 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 8758987059409697143}
m_Position: {x: 550, y: 380, z: 0}
- serializedVersion: 1
m_State: {fileID: -8166091871703040871}
m_Position: {x: 585, y: 445, z: 0}
- serializedVersion: 1
m_State: {fileID: 583101868980985703}
m_Position: {x: 620, y: 510, z: 0}
m_Position: {x: 160, y: 600, z: 0}
- serializedVersion: 1
m_State: {fileID: -7663569941003565567}
m_Position: {x: 840, y: 440, z: 0}
m_Position: {x: 760, y: 510, z: 0}
m_ChildStateMachines:
- serializedVersion: 1
m_StateMachine: {fileID: -6935279036761329183}
m_Position: {x: 0, y: 230, z: 0}
- serializedVersion: 1
m_StateMachine: {fileID: -286622251133759741}
m_Position: {x: 170, y: 260, z: 0}
m_Position: {x: 140, y: 490, z: 0}
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions:
- first: {fileID: -6935279036761329183}
second:
- {fileID: 1139268665897790755}
- first: {fileID: -286622251133759741}
second:
- {fileID: -8458280796029180982}