diff --git a/Assets/Models/Environment/Quest1/Animation/Weapon/DefaultShoot.anim b/Assets/Models/Environment/Quest1/Animation/Weapon/DefaultShoot.anim
new file mode 100644
index 0000000000000000000000000000000000000000..ebf7ab8ccfa961d1c63b4f07967699d4a152b624
--- /dev/null
+++ b/Assets/Models/Environment/Quest1/Animation/Weapon/DefaultShoot.anim
@@ -0,0 +1,313 @@
+%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: DefaultShoot
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: -0.0007, y: 0.002859, z: -0.00031}
+ 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.016666668
+ value: {x: -0.0007, y: 0.002859, z: -0.00031}
+ 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.00073, y: 0.00291, z: -0.00033}
+ inSlope: {x: 0, y: 0.0015300045, z: 0}
+ outSlope: {x: 0, y: 0.0015300045, 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.15
+ value: {x: -0.00051, y: 0.00319, z: -0.00013}
+ inSlope: {x: 0.0014999993, y: 0, z: 0.0003}
+ outSlope: {x: 0.0014999993, y: 0, z: 0.0003}
+ 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.21666667
+ value: {x: -0.00046, y: 0.00274, z: -0.00012}
+ 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.28333333
+ value: {x: -0.0007, y: 0.002859, z: -0.00031}
+ 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
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.28333333
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ 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.0007
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.016666668
+ value: -0.0007
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.083333336
+ value: -0.00073
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.15
+ value: -0.00051
+ inSlope: 0.0014999993
+ outSlope: 0.0014999993
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.21666667
+ value: -0.00046
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.28333333
+ value: -0.0007
+ 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.002859
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.016666668
+ value: 0.002859
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.083333336
+ value: 0.00291
+ inSlope: 0.0015300045
+ outSlope: 0.0015300045
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.15
+ value: 0.00319
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.21666667
+ value: 0.00274
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.28333333
+ value: 0.002859
+ 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: -0.00031
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.016666668
+ value: -0.00031
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.083333336
+ value: -0.00033
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.15
+ value: -0.00013
+ inSlope: 0.0003
+ outSlope: 0.0003
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.21666667
+ value: -0.00012
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.28333333
+ value: -0.00031
+ 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}
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 1
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Models/Environment/Quest1/Animation/Weapon/DefaultShoot.anim.meta b/Assets/Models/Environment/Quest1/Animation/Weapon/DefaultShoot.anim.meta
new file mode 100644
index 0000000000000000000000000000000000000000..a56b4a8b8967eae4d37fcd24c7bcf30278bfee59
--- /dev/null
+++ b/Assets/Models/Environment/Quest1/Animation/Weapon/DefaultShoot.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b84f0ddafb1ae49469cd747c54154a01
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Models/Environment/Quest1/Animation/Weapon/DefaultWeaponAC.controller b/Assets/Models/Environment/Quest1/Animation/Weapon/DefaultWeaponAC.controller
new file mode 100644
index 0000000000000000000000000000000000000000..ed24808be3aed49069b3aad028397172323f166d
--- /dev/null
+++ b/Assets/Models/Environment/Quest1/Animation/Weapon/DefaultWeaponAC.controller
@@ -0,0 +1,107 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-7512122822829820548
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Empty State
+ 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: 0}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &-1049778884847399437
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: DefaultShoot
+ 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: b84f0ddafb1ae49469cd747c54154a01, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1107 &-727535535909204975
+AnimatorStateMachine:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Base Layer
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: -7512122822829820548}
+ m_Position: {x: 414.73218, y: 155.43524, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -1049778884847399437}
+ m_Position: {x: 400, y: 20, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_EntryPosition: {x: 50, y: 120, z: 0}
+ m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: -7512122822829820548}
+--- !u!91 &9100000
+AnimatorController:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: DefaultWeaponAC
+ serializedVersion: 5
+ m_AnimatorParameters:
+ - m_Name: IsShooting
+ m_Type: 4
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: -727535535909204975}
+ m_Mask: {fileID: 0}
+ m_Motions: []
+ m_Behaviours: []
+ m_BlendingMode: 0
+ m_SyncedLayerIndex: -1
+ m_DefaultWeight: 0
+ m_IKPass: 0
+ m_SyncedLayerAffectsTiming: 0
+ m_Controller: {fileID: 9100000}
diff --git a/Assets/Models/Environment/Quest1/Animation/Weapon/DefaultWeaponAC.controller.meta b/Assets/Models/Environment/Quest1/Animation/Weapon/DefaultWeaponAC.controller.meta
new file mode 100644
index 0000000000000000000000000000000000000000..e498a0eb1d9453e9db32441109a4a5780781c82c
--- /dev/null
+++ b/Assets/Models/Environment/Quest1/Animation/Weapon/DefaultWeaponAC.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 422bf2b8ac935184190f0c83fdc07573
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 9100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Models/Environment/Quest1/Animation/Weapon/ShotgunAC.controller b/Assets/Models/Environment/Quest1/Animation/Weapon/ShotgunAC.controller
new file mode 100644
index 0000000000000000000000000000000000000000..e096997e90f889eca3dca668342b16b64ed2f268
--- /dev/null
+++ b/Assets/Models/Environment/Quest1/Animation/Weapon/ShotgunAC.controller
@@ -0,0 +1,159 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-8184955067503417260
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: ShotgunShoot
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: -7801914927514730357}
+ 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: a804cd8a97d0c344e99edbdccf53b9d6, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1101 &-7801914927514730357
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 2
+ m_ConditionEvent: IsShooting
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -890809161820421998}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.15875536
+ m_TransitionOffset: 0
+ m_ExitTime: 0.0000000032821332
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-1066377277226039875
+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: IsShooting
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -8184955067503417260}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.75
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1102 &-890809161820421998
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: EmptyState
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: -1066377277226039875}
+ 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: 0}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!91 &9100000
+AnimatorController:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: ShotgunAC
+ serializedVersion: 5
+ m_AnimatorParameters:
+ - m_Name: IsShooting
+ m_Type: 4
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: 891781333596907390}
+ m_Mask: {fileID: 0}
+ m_Motions: []
+ m_Behaviours: []
+ m_BlendingMode: 0
+ m_SyncedLayerIndex: -1
+ m_DefaultWeight: 0
+ m_IKPass: 0
+ m_SyncedLayerAffectsTiming: 0
+ m_Controller: {fileID: 9100000}
+--- !u!1107 &891781333596907390
+AnimatorStateMachine:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Base Layer
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: -8184955067503417260}
+ m_Position: {x: 300, y: 200, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -890809161820421998}
+ m_Position: {x: 300, y: 90, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_EntryPosition: {x: 50, y: 120, z: 0}
+ m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: -890809161820421998}
diff --git a/Assets/Models/Environment/Quest1/Animation/Weapon/ShotgunAC.controller.meta b/Assets/Models/Environment/Quest1/Animation/Weapon/ShotgunAC.controller.meta
new file mode 100644
index 0000000000000000000000000000000000000000..04dd1d8165b6cb4e19181d40028281dc5fdc7bfb
--- /dev/null
+++ b/Assets/Models/Environment/Quest1/Animation/Weapon/ShotgunAC.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 577978479654d0244bf1e0531f479958
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 9100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Models/Environment/Quest1/Animation/Weapon/ShotgunShoot.anim b/Assets/Models/Environment/Quest1/Animation/Weapon/ShotgunShoot.anim
new file mode 100644
index 0000000000000000000000000000000000000000..54c12cd66744c0e66023f9c317a4895fb8aa739d
--- /dev/null
+++ b/Assets/Models/Environment/Quest1/Animation/Weapon/ShotgunShoot.anim
@@ -0,0 +1,271 @@
+%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: ShotgunShoot
+ 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: 229.8, z: -180}
+ 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.05
+ value: {x: 0, y: 229.8, z: -180}
+ 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.2
+ value: {x: 16.385, y: 228.725, z: -180.24}
+ 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.3
+ value: {x: 0, y: 229.8, z: -180}
+ 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: []
+ 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: 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.3
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ 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
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.05
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.2
+ value: 16.385
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3
+ value: 0
+ 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: 229.8
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.05
+ value: 229.8
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.2
+ value: 228.725
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3
+ value: 229.8
+ 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: -180
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.05
+ value: -180
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.2
+ value: -180.24
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.3
+ value: -180
+ 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: []
diff --git a/Assets/Models/Environment/Quest1/Animation/Weapon/ShotgunShoot.anim.meta b/Assets/Models/Environment/Quest1/Animation/Weapon/ShotgunShoot.anim.meta
new file mode 100644
index 0000000000000000000000000000000000000000..0691aa63173593421d2f930d7e1db1efbcd08ad2
--- /dev/null
+++ b/Assets/Models/Environment/Quest1/Animation/Weapon/ShotgunShoot.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a804cd8a97d0c344e99edbdccf53b9d6
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
index 61f4f09e2bb6f07d37802a75da2ae81f0a803925..33d0b685c72ebb234b457201413ccbbee14f4e32 100644
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@@ -10,7 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 214956586}
- component: {fileID: 214956587}
- m_Layer: 0
+ m_Layer: 9
m_Name: BodyAimRig
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -96,7 +96,7 @@ GameObject:
m_Component:
- component: {fileID: 227278767}
- component: {fileID: 227278768}
- m_Layer: 0
+ m_Layer: 9
m_Name: AimRig
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -183,7 +183,7 @@ GameObject:
m_Component:
- component: {fileID: 749261033}
- component: {fileID: 749261034}
- m_Layer: 0
+ m_Layer: 9
m_Name: Rig 1
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -238,7 +238,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 969288974}
- m_Layer: 0
+ m_Layer: 9
m_Name: Target
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -269,7 +269,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5677293674159142646}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:Spine1
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -301,7 +301,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3640176569276755799}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightHand
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -339,7 +339,7 @@ GameObject:
m_Component:
- component: {fileID: 5689354086249812962}
- component: {fileID: 7544983924033923378}
- m_Layer: 0
+ m_Layer: 9
m_Name: CJ_GTASA:Pants
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -433,7 +433,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4069507199416237719}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftUpLeg
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -465,7 +465,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8501889116285953156}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightForeArm
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -497,7 +497,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2229113454451515730}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightHandThumb2
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -529,7 +529,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3529713870518338391}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightToeBase
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -561,7 +561,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1596131159219910058}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightHandThumb3
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -593,7 +593,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4180725907271350393}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftHandIndex2
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -625,7 +625,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7251807230010592376}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightToe_End
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -656,7 +656,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7634160729131461219}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftArm
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -688,7 +688,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 184670040919906426}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:Spine
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -720,7 +720,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3716059518164869070}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftHandThumb2
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -752,7 +752,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6272207404489900002}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightHandIndex2
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -784,7 +784,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2814127528651506156}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftHandThumb4
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -815,7 +815,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7273400761948269607}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftHand
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -848,7 +848,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 811765809070790776}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightShoulder
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -880,7 +880,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6877162138520560638}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftForeArm
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -912,7 +912,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6727868377561533213}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightHandIndex1
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -944,7 +944,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8130948245844734001}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightHandThumb4
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -975,7 +975,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1616242146238931629}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightUpLeg
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1007,7 +1007,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5045347021211580660}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:Head
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1039,7 +1039,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6013527598370455346}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftHandIndex1
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1071,7 +1071,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3502970856577789971}
- m_Layer: 0
+ m_Layer: 9
m_Name: CameraFollow
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1103,7 +1103,7 @@ GameObject:
m_Component:
- component: {fileID: 7304821490210370785}
- component: {fileID: 7549036496069083114}
- m_Layer: 0
+ m_Layer: 9
m_Name: CJ_GTASA:Head
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1190,7 +1190,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4357885637157793893}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:Neck
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1236,7 +1236,7 @@ GameObject:
- component: {fileID: 3512667466596045125}
- component: {fileID: 9131458097506627122}
- component: {fileID: 5303876375831790779}
- m_Layer: 0
+ m_Layer: 9
m_Name: Player
m_TagString: Player
m_Icon: {fileID: 0}
@@ -1311,7 +1311,7 @@ CapsuleCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4349462111621129389}
m_Material: {fileID: 0}
- m_IsTrigger: 0
+ m_IsTrigger: 1
m_Enabled: 1
m_Radius: 0.2
m_Height: 1.8
@@ -1329,7 +1329,7 @@ CharacterController:
m_Enabled: 1
serializedVersion: 2
m_Height: 2
- m_Radius: 0.5
+ m_Radius: 0.22
m_SlopeLimit: 45
m_StepOffset: 0.3
m_SkinWidth: 0.08
@@ -1479,7 +1479,7 @@ MonoBehaviour:
jumpHeight: 2
gravityValue: -9.81
rotationSpeed: 7
- isPlayerHaveWeapon: 01010101
+ isPlayerHaveWeapon: 01000000
weaponList:
- {fileID: 4245098976686868534}
- {fileID: 5485593430591339111}
@@ -1659,7 +1659,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 33688906122987937}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:Spine2
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1693,7 +1693,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4968251091276811691}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftHandIndex3
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1725,7 +1725,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3853733237770577147}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:HeadTop_End
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1756,7 +1756,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 270140141904256004}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightHandIndex3
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1788,7 +1788,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8688261701417011427}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:Hips
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1822,7 +1822,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4428133983530274498}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightLeg
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1854,7 +1854,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2424082204370305723}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightHandThumb1
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1886,7 +1886,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6470868637989590280}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftLeg
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -1919,7 +1919,7 @@ GameObject:
m_Component:
- component: {fileID: 5104806881935406948}
- component: {fileID: 8072444266914824845}
- m_Layer: 0
+ m_Layer: 9
m_Name: CJ_GTASA:Hands
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2020,7 +2020,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2360809016782812430}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftFoot
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2052,7 +2052,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8119577678698539058}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftToeBase
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2084,7 +2084,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 2160138877158340578}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightHandIndex4
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2115,7 +2115,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 140450133544644240}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftShoulder
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2148,7 +2148,7 @@ GameObject:
m_Component:
- component: {fileID: 4973791437478150138}
- component: {fileID: 4530990497766574853}
- m_Layer: 0
+ m_Layer: 9
m_Name: CJ_GTASA:Torso
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2251,7 +2251,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 476468891943644042}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftHandThumb1
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2283,7 +2283,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7580439395009103336}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightArm
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2315,7 +2315,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8334183772873925736}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftHandThumb3
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2348,7 +2348,7 @@ GameObject:
m_Component:
- component: {fileID: 9034296934606876183}
- component: {fileID: 8400698825571484564}
- m_Layer: 0
+ m_Layer: 9
m_Name: CJ_GTASA:Feet
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2438,7 +2438,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1977896875060011497}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:RightFoot
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2470,7 +2470,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5510562570848353773}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftToe_End
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2501,7 +2501,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3185559765872485740}
- m_Layer: 0
+ m_Layer: 9
m_Name: mixamorig:CJ_GTASA:LeftHandIndex4
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -2578,6 +2578,10 @@ PrefabInstance:
propertyPath: m_Name
value: Golok
objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: 5f550350f135ff74899a351f5e0af1b5, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 5f550350f135ff74899a351f5e0af1b5, type: 3}
propertyPath: m_IsActive
value: 0
@@ -2638,6 +2642,10 @@ PrefabInstance:
propertyPath: m_Name
value: GolokModel
objectReference: {fileID: 0}
+ - target: {fileID: 8164078558771037576, guid: 5f550350f135ff74899a351f5e0af1b5, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5f550350f135ff74899a351f5e0af1b5, type: 3}
--- !u!1 &2330412599977800600 stripped
@@ -2852,14 +2860,126 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 3640176569276755799}
m_Modifications:
+ - target: {fileID: 333693025413426224, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 445511573278713224, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 455148989596588350, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 1129032742080710281, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 1478074103657792313, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 1499623325303423859, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 1637864131121400338, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 1642963796662268887, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
- target: {fileID: 1720252466977677541, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
propertyPath: m_Name
value: ShotgunScaler
objectReference: {fileID: 0}
+ - target: {fileID: 1720252466977677541, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 1921929059765404720, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 2873126934714670765, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 4168926241736111777, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 4414071917719200800, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 4423776928196980487, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 4517348337339565753, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 4566124710645136601, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 4585363407497184067, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
- target: {fileID: 4700204478206050179, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
propertyPath: m_audioClip
value:
objectReference: {fileID: 8300000, guid: 00b7d372c1b28094694a64eb1d7d173b, type: 3}
+ - target: {fileID: 5344818677576848858, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 5502899518574580719, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 6508607222176456260, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 6742438336879731140, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 7221921547698450378, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 7243145149075814147, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 7455275827844113907, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 7465161902704050324, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 7553717528176796722, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 7739079031541628761, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 8443567539721418531, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
- target: {fileID: 8577141636946401693, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
propertyPath: animator
value:
@@ -2868,6 +2988,14 @@ PrefabInstance:
propertyPath: playerInput
value:
objectReference: {fileID: 3502970855684404618}
+ - target: {fileID: 8577141636946401693, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: playerAnimator
+ value:
+ objectReference: {fileID: 7059278920872305773}
+ - target: {fileID: 8907822485412063984, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
- target: {fileID: 8988537545757637660, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
propertyPath: m_RootOrder
value: 4
@@ -2916,6 +3044,10 @@ PrefabInstance:
propertyPath: m_Name
value: Shotgun
objectReference: {fileID: 0}
+ - target: {fileID: 8988537545757637663, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
- target: {fileID: 8988537545757637663, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
propertyPath: m_IsActive
value: 0
@@ -2924,6 +3056,22 @@ PrefabInstance:
propertyPath: m_Name
value: ShotgunModel
objectReference: {fileID: 0}
+ - target: {fileID: 8988537546110087808, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 9026952174761281430, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 9068264904290943962, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
+ - target: {fileID: 9174614005918056252, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4049f0191ffe2134286a1ba58a7c2d82, type: 3}
--- !u!4 &5485593430591339108 stripped
@@ -2943,6 +3091,14 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 3640176569276755799}
m_Modifications:
+ - target: {fileID: 770072812, guid: c7e62d64c3a339140b52bb3a0c82aeb7, type: 3}
+ propertyPath: playerInput
+ value:
+ objectReference: {fileID: 3502970855684404618}
+ - target: {fileID: 770072812, guid: c7e62d64c3a339140b52bb3a0c82aeb7, type: 3}
+ propertyPath: playerAnimator
+ value:
+ objectReference: {fileID: 7059278920872305773}
- target: {fileID: 89863930328733903, guid: c7e62d64c3a339140b52bb3a0c82aeb7, type: 3}
propertyPath: m_RootOrder
value: 2
@@ -2991,12 +3147,7 @@ PrefabInstance:
propertyPath: m_Name
value: Classic M4
objectReference: {fileID: 0}
- - target: {fileID: 753388013721813621, guid: c7e62d64c3a339140b52bb3a0c82aeb7, type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
- m_RemovedComponents:
- - {fileID: 5527864457537079415, guid: c7e62d64c3a339140b52bb3a0c82aeb7, type: 3}
+ m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c7e62d64c3a339140b52bb3a0c82aeb7, type: 3}
--- !u!4 &3576508652216636044 stripped
Transform:
@@ -3008,31 +3159,6 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 753388013721813621, guid: c7e62d64c3a339140b52bb3a0c82aeb7, type: 3}
m_PrefabInstance: {fileID: 3502970856532249155}
m_PrefabAsset: {fileID: 0}
---- !u!1 &8947497976260818009 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 5527864458336796186, guid: c7e62d64c3a339140b52bb3a0c82aeb7, type: 3}
- m_PrefabInstance: {fileID: 3502970856532249155}
- m_PrefabAsset: {fileID: 0}
---- !u!114 &770072812
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8947497976260818009}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 27c63be2a8918c741863160b9d9da122, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- damagePerShot: 20
- timeBetweenBullets: 0.15
- range: 100
- shootableMask:
- serializedVersion: 2
- m_Bits: 192
- playerInput: {fileID: 3502970855684404618}
- animator: {fileID: 7059278920872305773}
--- !u!1001 &3502970857424364135
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3064,10 +3190,18 @@ PrefabInstance:
propertyPath: m_Name
value: BowModel
objectReference: {fileID: 0}
+ - target: {fileID: 4738850939398215171, guid: 73235ad7e7287d4459effe3e88d3fd93, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
- target: {fileID: 5549189021126439216, guid: 73235ad7e7287d4459effe3e88d3fd93, type: 3}
propertyPath: m_Name
value: Bow
objectReference: {fileID: 0}
+ - target: {fileID: 5549189021126439216, guid: 73235ad7e7287d4459effe3e88d3fd93, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
- target: {fileID: 5549189021126439216, guid: 73235ad7e7287d4459effe3e88d3fd93, type: 3}
propertyPath: m_IsActive
value: 0
@@ -3120,6 +3254,10 @@ PrefabInstance:
propertyPath: m_audioClip
value:
objectReference: {fileID: 8300000, guid: 468ca0f429adc974abd76fe51610bd62, type: 3}
+ - target: {fileID: 5549189022456346554, guid: 73235ad7e7287d4459effe3e88d3fd93, type: 3}
+ propertyPath: m_Layer
+ value: 9
+ objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 5549189022456346559, guid: 73235ad7e7287d4459effe3e88d3fd93, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 73235ad7e7287d4459effe3e88d3fd93, type: 3}
diff --git a/Assets/Prefabs/Weapons/Classic M4.prefab b/Assets/Prefabs/Weapons/Classic M4.prefab
index eff1ce20b1808f7027b5c2167cc11c656e8ee924..1005d8f2b2117fdd469f41bfb3684ec71f711523 100644
--- a/Assets/Prefabs/Weapons/Classic M4.prefab
+++ b/Assets/Prefabs/Weapons/Classic M4.prefab
@@ -11,13 +11,14 @@ GameObject:
- component: {fileID: 89863930328733903}
- component: {fileID: 3931811052082321258}
- component: {fileID: 1257751245591061408}
- m_Layer: 0
+ - component: {fileID: 190287675037061933}
+ m_Layer: 9
m_Name: Classic M4
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &89863930328733903
Transform:
m_ObjectHideFlags: 0
@@ -90,6 +91,27 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
+--- !u!95 &190287675037061933
+Animator:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 753388013721813621}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 422bf2b8ac935184190f0c83fdc07573, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorStateOnDisable: 0
+ m_WriteDefaultValuesOnDisable: 0
--- !u!1 &3133210468826005084
GameObject:
m_ObjectHideFlags: 0
@@ -101,7 +123,7 @@ GameObject:
- component: {fileID: 4894382207868126828}
- component: {fileID: 1990599553287127789}
- component: {fileID: 5632874338366646371}
- m_Layer: 0
+ m_Layer: 9
m_Name: Magazine
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -184,7 +206,7 @@ GameObject:
- component: {fileID: 5925377508707171899}
- component: {fileID: 8520682653462159248}
- component: {fileID: 3143945397224109139}
- m_Layer: 0
+ m_Layer: 9
m_Name: BoltCarrier
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -267,7 +289,7 @@ GameObject:
- component: {fileID: 43918711215409353}
- component: {fileID: 519943373269999504}
- component: {fileID: 5046704814499621301}
- m_Layer: 0
+ m_Layer: 9
m_Name: ChargingHandle
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -353,8 +375,8 @@ GameObject:
- component: {fileID: 5527864457537079412}
- component: {fileID: 5527864457537079413}
- component: {fileID: 5527864457537079408}
- - component: {fileID: 5527864457537079415}
- m_Layer: 0
+ - component: {fileID: 770072812}
+ m_Layer: 9
m_Name: GunBarrelEnd
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -5485,7 +5507,7 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
---- !u!114 &5527864457537079415
+--- !u!114 &770072812
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -5502,9 +5524,10 @@ MonoBehaviour:
range: 100
shootableMask:
serializedVersion: 2
- m_Bits: 64
+ m_Bits: 192
playerInput: {fileID: 0}
- animator: {fileID: 0}
+ playerAnimator: {fileID: 0}
+ defaultWeaponAnimator: {fileID: 190287675037061933}
--- !u!1 &5608586036008773731
GameObject:
m_ObjectHideFlags: 0
@@ -5516,7 +5539,7 @@ GameObject:
- component: {fileID: 8565863865203001107}
- component: {fileID: 1317628238408682971}
- component: {fileID: 2262499560848449333}
- m_Layer: 0
+ m_Layer: 9
m_Name: Sling
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -5599,7 +5622,7 @@ GameObject:
- component: {fileID: 7955921541038096726}
- component: {fileID: 7894878099837355070}
- component: {fileID: 7477295522738056060}
- m_Layer: 0
+ m_Layer: 9
m_Name: Scope
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -5682,7 +5705,7 @@ GameObject:
- component: {fileID: 5422338775676314160}
- component: {fileID: 3145199404822972227}
- component: {fileID: 877985829008582693}
- m_Layer: 0
+ m_Layer: 9
m_Name: Stock
m_TagString: Untagged
m_Icon: {fileID: 0}
diff --git a/Assets/Prefabs/Weapons/Shotgun.prefab b/Assets/Prefabs/Weapons/Shotgun.prefab
index a775ddf6a85d673a2a88890f750d9462d35076cd..0ae51d5575fd65b44f7a49e830b51a947db446b7 100644
--- a/Assets/Prefabs/Weapons/Shotgun.prefab
+++ b/Assets/Prefabs/Weapons/Shotgun.prefab
@@ -6918,7 +6918,8 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 192
playerInput: {fileID: 0}
- animator: {fileID: 0}
+ playerAnimator: {fileID: 0}
+ shotgunAnimator: {fileID: 7521588437143597476}
--- !u!108 &1771895096009570885
Light:
m_ObjectHideFlags: 0
@@ -7667,6 +7668,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8988537545757637660}
+ - component: {fileID: 7521588437143597476}
m_Layer: 0
m_Name: Shotgun
m_TagString: Untagged
@@ -7691,6 +7693,27 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 229.8, z: -180}
+--- !u!95 &7521588437143597476
+Animator:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8988537545757637663}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 577978479654d0244bf1e0531f479958, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorStateOnDisable: 0
+ m_WriteDefaultValuesOnDisable: 0
--- !u!1 &8988537546110087808
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Weapon/DefaultShooting.cs b/Assets/Scripts/Weapon/DefaultShooting.cs
index 208f7f3eacd00f046868c300a0efb08e61daff95..6d7f7259ab181c51bcfd4a0bf0a53ec1aed66554 100644
--- a/Assets/Scripts/Weapon/DefaultShooting.cs
+++ b/Assets/Scripts/Weapon/DefaultShooting.cs
@@ -25,7 +25,9 @@ public class DefaultShooting : MonoBehaviour
private InputAction jumpAction;
private InputAction shootAction;
[SerializeField]
- private Animator animator;
+ private Animator playerAnimator;
+ [SerializeField]
+ private Animator defaultWeaponAnimator;
private bool isShooting;
void Awake()
@@ -64,7 +66,7 @@ public class DefaultShooting : MonoBehaviour
rb.AddForce(Vector3.up, ForceMode.Impulse);
}
- if (animator.GetBool("IsShooting") && isShooting && timer >= timeBetweenBullets && Time.timeScale != 0)
+ if (playerAnimator.GetBool("IsShooting") && isShooting && timer >= timeBetweenBullets && Time.timeScale != 0)
{
Shoot();
}
@@ -84,6 +86,7 @@ public class DefaultShooting : MonoBehaviour
public void Shoot()
{
timer = 0f;
+ defaultWeaponAnimator.Play("DefaultShoot", -1, 0f);
gunAudio.Play();
diff --git a/Assets/Scripts/Weapon/ShotgunShooting.cs b/Assets/Scripts/Weapon/ShotgunShooting.cs
index 348d562fabe6c7aa88f1017d147b9b8dc13e7459..9bfc79a577a17ce09d494e37599527022f9034c6 100644
--- a/Assets/Scripts/Weapon/ShotgunShooting.cs
+++ b/Assets/Scripts/Weapon/ShotgunShooting.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.InputSystem;
@@ -14,7 +15,8 @@ public class ShotgunShooting : MonoBehaviour
public float maxSpreadRadius = 0.1f;
public LayerMask shootableMask;
public PlayerInput playerInput;
- public Animator animator;
+ public Animator playerAnimator;
+ public Animator shotgunAnimator;
private InputAction jumpAction;
private InputAction shootAction;
@@ -73,7 +75,7 @@ public class ShotgunShooting : MonoBehaviour
rb.AddForce(Vector3.up, ForceMode.Impulse);
}
- if (animator.GetBool("IsShooting") && isShooting && timer >= timeBetweenBullets && Time.timeScale != 0)
+ if (playerAnimator.GetBool("IsShooting") && isShooting && timer >= timeBetweenBullets && Time.timeScale != 0)
{
Shoot();
}
@@ -94,9 +96,10 @@ public class ShotgunShooting : MonoBehaviour
gunLight.enabled = false;
}
- public void Shoot()
+ private void Shoot()
{
timer = 0f;
+ shotgunAnimator.Play("ShotgunShoot", -1, 0f);
gunAudio.Play();
@@ -111,7 +114,7 @@ public class ShotgunShooting : MonoBehaviour
}
}
- public void Spread(Ray shootRay, int i)
+ private void Spread(Ray shootRay, int i)
{
shootLines[i].enabled = true;