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

fixes

Browse Source
This commit is contained in:
MarcoHampel
2023-10-18 21:56:09 -04:00
parent 1872f09868
commit f05ae959ea
23 changed files with 287 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Assets/Animations/PlayerAnimations/Idle/X Bot@Idle.fbx → Assets/Animations/PlayerAnimations/Idle/PlayerIdle.fbx
View File

33
Assets/Animations/PlayerAnimations/Idle/X Bot@Idle.fbx.meta → Assets/Animations/PlayerAnimations/Idle/PlayerIdle.fbx.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3bc973c7992a5774fa8723d1065bfe28
guid: be1b71370e0a8824594b2e60f834ce7b
ModelImporter:
serializedVersion: 21300
internalIDToNameTable: []
@ -31,36 +31,7 @@ ModelImporter:
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: Idle
takeName: mixamo.com
internalID: -203655887218126122
firstFrame: 0
lastFrame: 59
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []

0
Assets/Animations/PlayerAnimations/Idle/X Bot@Pistol Idle.fbx → Assets/Animations/PlayerAnimations/Idle/PlayerPistolIdle.fbx
View File

33
Assets/Animations/PlayerAnimations/Running/X Bot@Running.fbx.meta → Assets/Animations/PlayerAnimations/Idle/PlayerPistolIdle.fbx.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 54a418da24d11804b83af7708b40f0c1
guid: 5c2ba5be7605c5f409365e3b25ec4104
ModelImporter:
serializedVersion: 21300
internalIDToNameTable: []
@ -31,36 +31,7 @@ ModelImporter:
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: Running
takeName: mixamo.com
internalID: -203655887218126122
firstFrame: 0
lastFrame: 21
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []

0
Assets/Animations/PlayerAnimations/Running/X Bot@Pistol Run.fbx → Assets/Animations/PlayerAnimations/Running/PlayerPistol.fbx
View File

4
Assets/Animations/PlayerAnimations/Running/X Bot@Pistol Run.fbx.meta → Assets/Animations/PlayerAnimations/Running/PlayerPistol.fbx.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e35ac80a5338e544788e07c1e73fb2a2
guid: b745b26e63ff7c347b89bdfbbc57a28b
ModelImporter:
serializedVersion: 21300
internalIDToNameTable: []
@ -33,7 +33,7 @@ ModelImporter:
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: Pistol Run
name: mixamo.com
takeName: mixamo.com
internalID: -203655887218126122
firstFrame: 0

0
Assets/Animations/PlayerAnimations/Running/X Bot@Running.fbx → Assets/Animations/PlayerAnimations/Running/PlayerRunning.fbx
View File

33
Assets/Animations/PlayerAnimations/Idle/X Bot@Pistol Idle.fbx.meta → Assets/Animations/PlayerAnimations/Running/PlayerRunning.fbx.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 995daa6cc74179043b8b31348a750c1e
guid: a0a4d13267a3c6f41a314c43592fd39c
ModelImporter:
serializedVersion: 21300
internalIDToNameTable: []
@ -31,36 +31,7 @@ ModelImporter:
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: Pistol Idle
takeName: mixamo.com
internalID: -203655887218126122
firstFrame: 0
lastFrame: 40
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []

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

@ -909,7 +909,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -203655887218126122, guid: 54a418da24d11804b83af7708b40f0c1, type: 3}
m_Motion: {fileID: -203655887218126122, guid: a0a4d13267a3c6f41a314c43592fd39c, type: 3}
m_Tag:
m_SpeedParameter: RunningSpeed
m_MirrorParameter:
@ -1071,7 +1071,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -203655887218126122, guid: e35ac80a5338e544788e07c1e73fb2a2, type: 3}
m_Motion: {fileID: -203655887218126122, guid: b745b26e63ff7c347b89bdfbbc57a28b, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -1251,55 +1251,55 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 1
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: RunningSpeed
m_Type: 1
m_DefaultFloat: 1
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: SideSpeed
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: IsCarrying
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: HasGun
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: WasHit
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: IsDead
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: StrafingSpeed
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: StrafingDirection
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -1800,7 +1800,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -203655887218126122, guid: 3bc973c7992a5774fa8723d1065bfe28, type: 3}
m_Motion: {fileID: -203655887218126122, guid: be1b71370e0a8824594b2e60f834ce7b, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -2311,7 +2311,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -203655887218126122, guid: 995daa6cc74179043b8b31348a750c1e, type: 3}
m_Motion: {fileID: -203655887218126122, guid: 5c2ba5be7605c5f409365e3b25ec4104, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -2524,10 +2524,10 @@ AnimatorStateMachine:
m_Position: {x: -130, y: 410, z: 0}
- serializedVersion: 1
m_State: {fileID: 2448133036534709572}
m_Position: {x: 309.8631, y: 112.56933, z: 0}
m_Position: {x: 310, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: -9042336647299626999}
m_Position: {x: 560, y: 220, z: 0}
m_Position: {x: 600, y: 250, z: 0}
- serializedVersion: 1
m_State: {fileID: -2847804469841402747}
m_Position: {x: 560, y: 80, z: 0}
@ -2536,7 +2536,7 @@ AnimatorStateMachine:
m_Position: {x: 500, y: 30, z: 0}
- serializedVersion: 1
m_State: {fileID: 8758987059409697143}
m_Position: {x: 550, y: 380, z: 0}
m_Position: {x: 350, y: 290, z: 0}
- serializedVersion: 1
m_State: {fileID: 583101868980985703}
m_Position: {x: 160, y: 600, z: 0}