janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-29 12:52:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Weapon Pickup start

Browse Source 
+ started weapon pickup
This commit is contained in:
Noah4ever
2021-10-18 19:24:56 +02:00
parent 0c274a031f
commit 631938fa22
10 changed files with 10644 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Assets/Animations/Weapons/USP.anim
View File

@@ -19,7 +19,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
value: {x: 0, y: -90, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -28,7 +28,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.3
value: {x: 0, y: 0, z: 0}
value: {x: 0, y: -90, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -79,7 +79,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -1.3934289, y: 1.5959997, z: -0.9728899}
value: {x: 0.641, y: -0.339, z: 1.397}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -88,7 +88,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.3
value: {x: -1.3934289, y: 1.5959997, z: -0.9728899}
value: {x: 0.641, y: -0.339, z: 1.397}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -325,7 +325,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -1.3934289
value: 0.641
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -334,7 +334,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: -1.3934289
value: 0.641
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -353,7 +353,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.5959997
value: -0.339
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -362,7 +362,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: 1.5959997
value: -0.339
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -381,7 +381,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.9728899
value: 1.397
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -390,7 +390,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: -0.9728899
value: 1.397
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -437,7 +437,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: -90
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -446,7 +446,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.3
value: 0
value: -90
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -1075,7 +1075,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path:
path: USP Hammer
classID: 4
script: {fileID: 0}
- curve:
@@ -1085,17 +1085,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path:
path: USP Hammer
classID: 4
script: {fileID: 0}
- curve:
@@ -1108,6 +1098,16 @@ AnimationClip:
path: USP Hammer
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
@@ -1115,7 +1115,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: USP Hammer
path:
classID: 4
script: {fileID: 0}
- curve:
@@ -1125,7 +1125,7 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: USP Hammer
path:
classID: 4
script: {fileID: 0}
m_HasGenericRootTransform: 1

29
Assets/Animations/Weapons/USP.controller
View File

@@ -15,6 +15,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 4420670033728139345}
m_Position: {x: 440, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: -3603873323399095863}
m_Position: {x: 475, y: 185, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -25,6 +28,32 @@ AnimatorStateMachine:
m_ExitPosition: {x: 50, y: 230, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -3265146705065767202}
--- !u!1102 &-3603873323399095863
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: USP_Aim
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: 63e2e242c77faff4bacf60d0c3bec592, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-3265146705065767202
AnimatorState:
serializedVersion: 6

315
Assets/Animations/Weapons/USP_Aim.anim Normal file
View File

@@ -0,0 +1,315 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: USP_Aim
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: -90.049, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.083333336
value: {x: -0.003, y: -90.394, z: -4.001}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0.641, y: -0.278, z: 1.397}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.083333336
value: {x: -0.011569738, y: -0.2964635, z: 1.3980203}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.083333336
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.641
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: -0.011569738
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.278
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: -0.2964635
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1.397
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: 1.3980203
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: -0.003
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -90.049
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: -90.394
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.y
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.083333336
value: -4.001
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path:
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path:
classID: 4
script: {fileID: 0}
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []

8
Assets/Animations/Weapons/USP_Aim.anim.meta Normal file
View File

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

24
Assets/Animations/Weapons/USP_Idle.anim
View File

@@ -20,7 +20,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -1.3934289, y: 1.5959997, z: -0.9728899}
value: {x: 0.641, y: -0.339, z: 1.397}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -29,7 +29,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
value: {x: -1.3934289, y: 1.61, z: -0.9728899}
value: {x: 0.641, y: -0.319, z: 1.397}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -38,7 +38,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: -1.3934289, y: 1.5959997, z: -0.9728899}
value: {x: 0.641, y: -0.339, z: 1.397}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@@ -93,7 +93,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -1.3934289
value: 0.641
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -102,7 +102,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: -1.3934289
value: 0.641
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -111,7 +111,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: -1.3934289
value: 0.641
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -130,7 +130,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.5959997
value: -0.339
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -139,7 +139,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 1.61
value: -0.319
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -148,7 +148,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1.5959997
value: -0.339
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -167,7 +167,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -0.9728899
value: 1.397
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -176,7 +176,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: -0.9728899
value: 1.397
inSlope: 0
outSlope: 0
tangentMode: 136
@@ -185,7 +185,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: -0.9728899
value: 1.397
inSlope: 0
outSlope: 0
tangentMode: 136