diff --git a/Assets/Animation/Weapon.meta b/Assets/Animation/Weapon.meta
new file mode 100644
index 0000000000000000000000000000000000000000..665239c70d1495025daabcdfc645a328bdbbb9cc
--- /dev/null
+++ b/Assets/Animation/Weapon.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2861206e27f104a4ba04b38797fcb918
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Animation/Weapon/Shotgun.meta b/Assets/Animation/Weapon/Shotgun.meta
new file mode 100644
index 0000000000000000000000000000000000000000..3fced12fb569daff08da26a86464e1ef0e81f8e5
--- /dev/null
+++ b/Assets/Animation/Weapon/Shotgun.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 881a91770d97f5347b50bda6c090459e
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Animation/Weapon/Shotgun/ShotgunAC.controller b/Assets/Animation/Weapon/Shotgun/ShotgunAC.controller
new file mode 100644
index 0000000000000000000000000000000000000000..d9aa8ad2b285787543916391b32685ecb018c259
--- /dev/null
+++ b/Assets/Animation/Weapon/Shotgun/ShotgunAC.controller
@@ -0,0 +1,156 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-3015141956847414878
+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: 4694944761652573996}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.25
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-2932040551290010254
+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: Shoot
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 403345630472883052}
+ 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!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: Shoot
+ m_Type: 9
+ m_DefaultFloat: 0
+ m_DefaultInt: 0
+ m_DefaultBool: 0
+ m_Controller: {fileID: 0}
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: 2139695930946727004}
+ 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!1102 &403345630472883052
+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: -3015141956847414878}
+ 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: d3e027581d27a374a8b4f605a2cb08b4, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1107 &2139695930946727004
+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: 4694944761652573996}
+ m_Position: {x: 50, y: 220, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 403345630472883052}
+ m_Position: {x: 260, y: 120, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions:
+ - {fileID: -2932040551290010254}
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 280, y: 40, z: 0}
+ m_EntryPosition: {x: 50, y: 120, z: 0}
+ m_ExitPosition: {x: 350, y: 260, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: 4694944761652573996}
+--- !u!1102 &4694944761652573996
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: ShotgunIdle
+ 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: 64747908855bf17469e2ae7f195d8cc3, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
diff --git a/Assets/Animation/Weapon/Shotgun/ShotgunAC.controller.meta b/Assets/Animation/Weapon/Shotgun/ShotgunAC.controller.meta
new file mode 100644
index 0000000000000000000000000000000000000000..1734aec75a7525fa4666708222865743b3926a70
--- /dev/null
+++ b/Assets/Animation/Weapon/Shotgun/ShotgunAC.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fba56601ad3d5ed40920811c2eb373bf
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 9100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Animation/Weapon/Shotgun/ShotgunIdle.anim b/Assets/Animation/Weapon/Shotgun/ShotgunIdle.anim
new file mode 100644
index 0000000000000000000000000000000000000000..7fe674d81022408705143dbc75a43452196e11f6
--- /dev/null
+++ b/Assets/Animation/Weapon/Shotgun/ShotgunIdle.anim
@@ -0,0 +1,181 @@
+%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: ShotgunIdle
+ 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: -75, z: -3}
+ 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: 1
+ value: {x: 0, y: -75, z: -3}
+ 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: 1
+ 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: 1
+ 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: 1
+ value: -75
+ 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: -3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: -3
+ 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/Animation/Weapon/Shotgun/ShotgunIdle.anim.meta b/Assets/Animation/Weapon/Shotgun/ShotgunIdle.anim.meta
new file mode 100644
index 0000000000000000000000000000000000000000..992b59dbc46f6de077940cc0f601f9a920a34832
--- /dev/null
+++ b/Assets/Animation/Weapon/Shotgun/ShotgunIdle.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 64747908855bf17469e2ae7f195d8cc3
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Animation/Weapon/Shotgun/ShotgunShoot.anim b/Assets/Animation/Weapon/Shotgun/ShotgunShoot.anim
new file mode 100644
index 0000000000000000000000000000000000000000..6cdd8c933c5cf5a775b6b3742fae5a17ba41ec9e
--- /dev/null
+++ b/Assets/Animation/Weapon/Shotgun/ShotgunShoot.anim
@@ -0,0 +1,217 @@
+%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: -75, z: -3}
+ 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.33333334
+ value: {x: 0, y: -75, z: 3}
+ 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.75
+ value: {x: 0, y: -75, z: -3}
+ 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.75
+ 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.33333334
+ 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: -75
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.33333334
+ value: -75
+ 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: -3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.33333334
+ value: 3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.75
+ value: -3
+ 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/Animation/Weapon/Shotgun/ShotgunShoot.anim.meta b/Assets/Animation/Weapon/Shotgun/ShotgunShoot.anim.meta
new file mode 100644
index 0000000000000000000000000000000000000000..d45f6d4b292789c0a60a91fc878e776b0f7ff5b8
--- /dev/null
+++ b/Assets/Animation/Weapon/Shotgun/ShotgunShoot.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d3e027581d27a374a8b4f605a2cb08b4
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Import/Shotgun/Shotgun.prefab b/Assets/Import/Shotgun/Shotgun.prefab
index 3f47c911c2c80b2b950b8cb93181adc4b81fb64a..cfd3c251ae903436c25d0d1541f17f359a40292f 100644
--- a/Assets/Import/Shotgun/Shotgun.prefab
+++ b/Assets/Import/Shotgun/Shotgun.prefab
@@ -121,6 +121,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 3790940302414444703}
+ - component: {fileID: 8817356352402705709}
m_Layer: 0
m_Name: Shotgun
m_TagString: Untagged
@@ -143,6 +144,25 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &8817356352402705709
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6122667496871242782}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: fba56601ad3d5ed40920811c2eb373bf, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &7045222887912866780
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/Weapon/WeaponHolder.prefab b/Assets/Prefabs/Weapon/WeaponHolder.prefab
index fc9ab1b9a7265d0c092a4fe196c82830830df0b0..0180f9c54fde25457c00d7cf7f9f5aa4933f9a61 100644
--- a/Assets/Prefabs/Weapon/WeaponHolder.prefab
+++ b/Assets/Prefabs/Weapon/WeaponHolder.prefab
@@ -5365,6 +5365,7 @@ MonoBehaviour:
timeBetweenBullets: 0.5
range: 6
angleInterval: 15
+ animator: {fileID: 6159765108978020025}
--- !u!114 &8055158884872431924
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -6072,6 +6073,14 @@ PrefabInstance:
propertyPath: m_Name
value: Shotgun
objectReference: {fileID: 0}
+ - target: {fileID: 8817356352402705709, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
+ propertyPath: m_UpdateMode
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8817356352402705709, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
+ propertyPath: m_ApplyRootMotion
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
--- !u!4 &1997992154694834955 stripped
@@ -6079,6 +6088,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 3790940302414444703, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
m_PrefabInstance: {fileID: 3397521002358743956}
m_PrefabAsset: {fileID: 0}
+--- !u!95 &6159765108978020025 stripped
+Animator:
+ m_CorrespondingSourceObject: {fileID: 8817356352402705709, guid: 885b9e9a37b89bb4fbe11687026933da, type: 3}
+ m_PrefabInstance: {fileID: 3397521002358743956}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &7440994361082727519
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Level 01.unity b/Assets/Scenes/Level 01.unity
index af3c875d848938e947b76aede2a7051e0fb3649a..84836eb7cd89671092b1b973f5f2f5187560f210 100644
--- a/Assets/Scenes/Level 01.unity
+++ b/Assets/Scenes/Level 01.unity
@@ -262,6 +262,14 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7101622832953997244, guid: d794c4727125dfc44bfeef90cac9f5e3, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.40252638
+ objectReference: {fileID: 0}
+ - target: {fileID: 7101622832953997244, guid: d794c4727125dfc44bfeef90cac9f5e3, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.18047905
+ objectReference: {fileID: 0}
- target: {fileID: 8707842788588381506, guid: d794c4727125dfc44bfeef90cac9f5e3, type: 3}
propertyPath: m_RootOrder
value: 2
diff --git a/Assets/Scripts/Player/PlayerShotgun.cs b/Assets/Scripts/Player/PlayerShotgun.cs
index 37d3f8eeaa8906ea0259b23c5cc9a2beee7663ac..63d22c4fb108ff3644ae5a25e0c33f6eaed3eb02 100644
--- a/Assets/Scripts/Player/PlayerShotgun.cs
+++ b/Assets/Scripts/Player/PlayerShotgun.cs
@@ -22,7 +22,8 @@ public class PlayerShotgun : MonoBehaviour
ParticleSystem gunParticles;
LineRenderer[] gunLines;
AudioSource gunAudio;
- Light gunLight;
+ Light gunLight;
+ public Animator animator;
float effectsDisplayTime = 0.05f;
private void OnEnable()
@@ -123,6 +124,7 @@ public class PlayerShotgun : MonoBehaviour
gunParticles.Stop();
gunParticles.Play();
+ animator.SetTrigger("Shoot");
for (int i = 0; i < gunLines.Length; i++)
{
@@ -138,8 +140,7 @@ public class PlayerShotgun : MonoBehaviour
if (enemyHealth != null)
{
- enemyHealth.TakeDamage(damagePerShot - (int) Vector3.Distance(transform.position, enemyHealth.transform.position) * 2, shootHits[i].point);
- print(damagePerShot - (int) (Vector3.Distance(transform.position, enemyHealth.transform.position) * 3));
+ enemyHealth.TakeDamage(damagePerShot - (int) (Vector3.Distance(transform.position, enemyHealth.transform.position) * 3), shootHits[i].point);
}
gunLines[i].SetPosition(1, shootHits[i].point);