Add Reload animation state

ignore jetbrain plugin

Add Reload animation state
ignore jetbrain plugin
I_Jemin
Commit 0b098c5c6a9c9a07afad760b34d06c9131c1315a 0b098c5c 1 parent ef8d11f7
Showing 8 changed files with 201 additions and 157 deletions
.gitignore
Assets/OpenVR-Shooter/Assets/Gun/M4A1_PBR.controller
Assets/OpenVR-Shooter/Assets/Gun/Ready.anim
Assets/OpenVR-Shooter/Assets/Gun/Ready.anim.meta
Assets/OpenVR-Shooter/Assets/Gun/ReadyComplete.anim → Assets/OpenVR-Shooter/Assets/Gun/Reload.anim
Assets/OpenVR-Shooter/Assets/Gun/ReadyComplete.anim.meta → Assets/OpenVR-Shooter/Assets/Gun/Reload.anim.meta
Assets/OpenVR-Shooter/Scripts/GunScript/Gun.cs
ProjectSettings/ProjectVersion.txt
--- a/.gitignore
View file @0b098c5
+++ b/.gitignore
View file @0b098c5
@@ -4,8 +4,11 @@
 /[Bb]uild/
 /[Bb]uilds/
 /Assets/AssetStoreTools*
+ /Assets/Plugins*
+ /.idea*
 
 # Visual Studio 2015 cache directory
+ 
 /.vs/
 
 # Autogenerated VS/MD/Consulo solution and project files
--- a/Assets/OpenVR-Shooter/Assets/Gun/M4A1_PBR.controller
View file @0b098c5
+++ b/Assets/OpenVR-Shooter/Assets/Gun/M4A1_PBR.controller
View file @0b098c5
@@ -14,6 +14,12 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 0}
+   - m_Name: Reload
+     m_Type: 9
+     m_DefaultFloat: 0
+     m_DefaultInt: 0
+     m_DefaultBool: 0
+     m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -27,6 +33,30 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+ --- !u!1101 &1101395826455393168
+ AnimatorStateTransition:
+   m_ObjectHideFlags: 1
+   m_PrefabParentObject: {fileID: 0}
+   m_PrefabInternal: {fileID: 0}
+   m_Name: 
+   m_Conditions:
+   - m_ConditionMode: 1
+     m_ConditionEvent: Reload
+     m_EventTreshold: 0
+   m_DstStateMachine: {fileID: 0}
+   m_DstState: {fileID: 1102080190254683606}
+   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!1101 &1101864254702660336
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -112,18 +142,20 @@ AnimatorState:
   m_SpeedParameterActive: 0
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
+   m_TimeParameterActive: 0
   m_Motion: {fileID: 7400000, guid: 98dd316a60c8ecd479a325df5bb32fd7, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
+   m_TimeParameter: 
 --- !u!1102 &1102080190254683606
 AnimatorState:
   serializedVersion: 5
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-   m_Name: Ready
+   m_Name: Reload
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
@@ -136,11 +168,13 @@ AnimatorState:
   m_SpeedParameterActive: 0
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
+   m_TimeParameterActive: 0
   m_Motion: {fileID: 7400000, guid: 4f6d4cb5103b9a846bd2b156c452e4c6, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
+   m_TimeParameter: 
 --- !u!1102 &1102602552620100714
 AnimatorState:
   serializedVersion: 5
@@ -150,7 +184,8 @@ AnimatorState:
   m_Name: Idle
   m_Speed: 1
   m_CycleOffset: 0
-   m_Transitions: []
+   m_Transitions:
+   - {fileID: 1101395826455393168}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -159,18 +194,20 @@ AnimatorState:
   m_SpeedParameterActive: 0
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
+   m_TimeParameterActive: 0
   m_Motion: {fileID: 7400000, guid: f750ec2235cbee441a2077fdcd236343, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
+   m_TimeParameter: 
 --- !u!1102 &1102696271512118140
 AnimatorState:
   serializedVersion: 5
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-   m_Name: ReadyComplete
+   m_Name: Ready
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -182,11 +219,13 @@ AnimatorState:
   m_SpeedParameterActive: 0
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
+   m_TimeParameterActive: 0
   m_Motion: {fileID: 7400000, guid: e01f6e3532db19c48aa6030a848988a0, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
+   m_TimeParameter: 
 --- !u!1107 &1107188464712007082
 AnimatorStateMachine:
   serializedVersion: 5
@@ -197,10 +236,10 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 1102602552620100714}
-     m_Position: {x: 96, y: 12, z: 0}
+     m_Position: {x: 84, y: 0, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102080190254683606}
-     m_Position: {x: 348, y: 12, z: 0}
+     m_Position: {x: 360, y: 0, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102038195148562506}
     m_Position: {x: 300, y: 204, z: 0}
--- a/Assets/OpenVR-Shooter/Assets/Gun/Ready.anim
View file @0b098c5
+++ b/Assets/OpenVR-Shooter/Assets/Gun/Ready.anim
View file @0b098c5
@@ -18,12 +18,6 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-         value: {x: -89.98, y: 0, z: 179.99998}
-         inSlope: {x: 0, y: 0, z: 0}
-         outSlope: {x: 0, y: 0, z: 0}
-         tangentMode: 0
-       - serializedVersion: 2
-         time: 0.15
         value: {x: -89.98, y: -160, z: 179.99998}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -32,32 +26,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: M4A1/Gun/DustCover
-   m_PositionCurves:
-   - curve:
-       serializedVersion: 2
-       m_Curve:
-       - serializedVersion: 2
-         time: 0
-         value: {x: 0.00001709239, y: 0.001290798, z: 0.00006345308}
-         inSlope: {x: 0, y: 0, z: 0}
-         outSlope: {x: 0, y: 0, z: 0}
-         tangentMode: 0
-       - serializedVersion: 2
-         time: 0.11666667
-         value: {x: 0.00001709239, y: 0.0006, z: 0.000063}
-         inSlope: {x: 0, y: 0, z: 0}
-         outSlope: {x: 0, y: 0, z: 0}
-         tangentMode: 0
-       - serializedVersion: 2
-         time: 0.36666667
-         value: {x: 0.00001709239, y: 0.001290798, z: 0.00006345308}
-         inSlope: {x: 0, y: 0, z: 0}
-         outSlope: {x: 0, y: 0, z: 0}
-         tangentMode: 0
-       m_PreInfinity: 2
-       m_PostInfinity: 2
-       m_RotationOrder: 4
-     path: M4A1/Gun/Bolt
+   m_PositionCurves: []
   m_ScaleCurves: []
   m_FloatCurves: []
   m_PPtrCurves: []
@@ -69,18 +38,11 @@ AnimationClip:
   m_ClipBindingConstant:
     genericBindings:
     - serializedVersion: 2
-       path: 798275541
-       attribute: 1
-       script: {fileID: 0}
-       typeID: 4
-       customType: 0
-       isPPtrCurve: 0
-     - serializedVersion: 2
       path: 1787346884
       attribute: 4
       script: {fileID: 0}
       typeID: 4
-       customType: 14
+       customType: 4
       isPPtrCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
@@ -88,7 +50,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-     m_StopTime: 0.36666667
+     m_StopTime: 0
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -113,12 +75,6 @@ AnimationClip:
         inSlope: 0
         outSlope: 0
         tangentMode: 136
-       - serializedVersion: 2
-         time: 0.15
-         value: -89.98
-         inSlope: 0
-         outSlope: 0
-         tangentMode: 136
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -131,12 +87,6 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-         value: 0
-         inSlope: 0
-         outSlope: 0
-         tangentMode: 136
-       - serializedVersion: 2
-         time: 0.15
         value: -160
         inSlope: 0
         outSlope: 0
@@ -157,12 +107,6 @@ AnimationClip:
         inSlope: 0
         outSlope: 0
         tangentMode: 136
-       - serializedVersion: 2
-         time: 0.15
-         value: 179.99998
-         inSlope: 0
-         outSlope: 0
-         tangentMode: 136
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -170,90 +114,6 @@ AnimationClip:
     path: M4A1/Gun/DustCover
     classID: 4
     script: {fileID: 0}
-   - curve:
-       serializedVersion: 2
-       m_Curve:
-       - serializedVersion: 2
-         time: 0
-         value: 0.00001709239
-         inSlope: 0
-         outSlope: 0
-         tangentMode: 136
-       - serializedVersion: 2
-         time: 0.11666667
-         value: 0.00001709239
-         inSlope: 0
-         outSlope: 0
-         tangentMode: 136
-       - serializedVersion: 2
-         time: 0.36666667
-         value: 0.00001709239
-         inSlope: 0
-         outSlope: 0
-         tangentMode: 136
-       m_PreInfinity: 2
-       m_PostInfinity: 2
-       m_RotationOrder: 4
-     attribute: m_LocalPosition.x
-     path: M4A1/Gun/Bolt
-     classID: 4
-     script: {fileID: 0}
-   - curve:
-       serializedVersion: 2
-       m_Curve:
-       - serializedVersion: 2
-         time: 0
-         value: 0.001290798
-         inSlope: 0
-         outSlope: 0
-         tangentMode: 136
-       - serializedVersion: 2
-         time: 0.11666667
-         value: 0.0006
-         inSlope: 0
-         outSlope: 0
-         tangentMode: 136
-       - serializedVersion: 2
-         time: 0.36666667
-         value: 0.001290798
-         inSlope: 0
-         outSlope: 0
-         tangentMode: 136
-       m_PreInfinity: 2
-       m_PostInfinity: 2
-       m_RotationOrder: 4
-     attribute: m_LocalPosition.y
-     path: M4A1/Gun/Bolt
-     classID: 4
-     script: {fileID: 0}
-   - curve:
-       serializedVersion: 2
-       m_Curve:
-       - serializedVersion: 2
-         time: 0
-         value: 0.00006345308
-         inSlope: 0
-         outSlope: 0
-         tangentMode: 136
-       - serializedVersion: 2
-         time: 0.11666667
-         value: 0.000063
-         inSlope: 0
-         outSlope: 0
-         tangentMode: 136
-       - serializedVersion: 2
-         time: 0.36666667
-         value: 0.00006345308
-         inSlope: 0
-         outSlope: 0
-         tangentMode: 136
-       m_PreInfinity: 2
-       m_PostInfinity: 2
-       m_RotationOrder: 4
-     attribute: m_LocalPosition.z
-     path: M4A1/Gun/Bolt
-     classID: 4
-     script: {fileID: 0}
   m_EulerEditorCurves:
   - curve:
       serializedVersion: 2
--- a/Assets/OpenVR-Shooter/Assets/Gun/Ready.anim.meta
View file @0b098c5
+++ b/Assets/OpenVR-Shooter/Assets/Gun/Ready.anim.meta
View file @0b098c5
 fileFormatVersion: 2
- guid: 4f6d4cb5103b9a846bd2b156c452e4c6
- timeCreated: 1509071540
+ guid: e01f6e3532db19c48aa6030a848988a0
+ timeCreated: 1509075175
 licenseType: Pro
 NativeFormatImporter:
   mainObjectFileID: 7400000
--- a/Assets/OpenVR-Shooter/Assets/Gun/ReadyComplete.anim → Assets/OpenVR-Shooter/Assets/Gun/Reload.anim
View file @0b098c5
+++ b/Assets/OpenVR-Shooter/Assets/Gun/ReadyComplete.anim → Assets/OpenVR-Shooter/Assets/Gun/Reload.anim
View file @0b098c5
@@ -5,7 +5,7 @@ AnimationClip:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-   m_Name: ReadyComplete
+   m_Name: Reload
   serializedVersion: 6
   m_Legacy: 0
   m_Compressed: 0
@@ -18,6 +18,12 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
+         value: {x: -89.98, y: 0, z: 179.99998}
+         inSlope: {x: 0, y: 0, z: 0}
+         outSlope: {x: 0, y: 0, z: 0}
+         tangentMode: 0
+       - serializedVersion: 2
+         time: 0.15
         value: {x: -89.98, y: -160, z: 179.99998}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -26,7 +32,32 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: M4A1/Gun/DustCover
-   m_PositionCurves: []
+   m_PositionCurves:
+   - curve:
+       serializedVersion: 2
+       m_Curve:
+       - serializedVersion: 2
+         time: 0
+         value: {x: 0.00001709239, y: 0.001290798, z: 0.00006345308}
+         inSlope: {x: 0, y: 0, z: 0}
+         outSlope: {x: 0, y: 0, z: 0}
+         tangentMode: 0
+       - serializedVersion: 2
+         time: 0.11666667
+         value: {x: 0.00001709239, y: 0.0006, z: 0.000063}
+         inSlope: {x: 0, y: 0, z: 0}
+         outSlope: {x: 0, y: 0, z: 0}
+         tangentMode: 0
+       - serializedVersion: 2
+         time: 0.36666667
+         value: {x: 0.00001709239, y: 0.001290798, z: 0.00006345308}
+         inSlope: {x: 0, y: 0, z: 0}
+         outSlope: {x: 0, y: 0, z: 0}
+         tangentMode: 0
+       m_PreInfinity: 2
+       m_PostInfinity: 2
+       m_RotationOrder: 4
+     path: M4A1/Gun/Bolt
   m_ScaleCurves: []
   m_FloatCurves: []
   m_PPtrCurves: []
@@ -38,11 +69,18 @@ AnimationClip:
   m_ClipBindingConstant:
     genericBindings:
     - serializedVersion: 2
+       path: 798275541
+       attribute: 1
+       script: {fileID: 0}
+       typeID: 4
+       customType: 0
+       isPPtrCurve: 0
+     - serializedVersion: 2
       path: 1787346884
       attribute: 4
       script: {fileID: 0}
       typeID: 4
-       customType: 14
+       customType: 4
       isPPtrCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
@@ -50,7 +88,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-     m_StopTime: 0
+     m_StopTime: 0.36666667
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -75,6 +113,12 @@ AnimationClip:
         inSlope: 0
         outSlope: 0
         tangentMode: 136
+       - serializedVersion: 2
+         time: 0.15
+         value: -89.98
+         inSlope: 0
+         outSlope: 0
+         tangentMode: 136
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -87,6 +131,12 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
+         value: 0
+         inSlope: 0
+         outSlope: 0
+         tangentMode: 136
+       - serializedVersion: 2
+         time: 0.15
         value: -160
         inSlope: 0
         outSlope: 0
@@ -107,6 +157,12 @@ AnimationClip:
         inSlope: 0
         outSlope: 0
         tangentMode: 136
+       - serializedVersion: 2
+         time: 0.15
+         value: 179.99998
+         inSlope: 0
+         outSlope: 0
+         tangentMode: 136
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -114,6 +170,90 @@ AnimationClip:
     path: M4A1/Gun/DustCover
     classID: 4
     script: {fileID: 0}
+   - curve:
+       serializedVersion: 2
+       m_Curve:
+       - serializedVersion: 2
+         time: 0
+         value: 0.00001709239
+         inSlope: 0
+         outSlope: 0
+         tangentMode: 136
+       - serializedVersion: 2
+         time: 0.11666667
+         value: 0.00001709239
+         inSlope: 0
+         outSlope: 0
+         tangentMode: 136
+       - serializedVersion: 2
+         time: 0.36666667
+         value: 0.00001709239
+         inSlope: 0
+         outSlope: 0
+         tangentMode: 136
+       m_PreInfinity: 2
+       m_PostInfinity: 2
+       m_RotationOrder: 4
+     attribute: m_LocalPosition.x
+     path: M4A1/Gun/Bolt
+     classID: 4
+     script: {fileID: 0}
+   - curve:
+       serializedVersion: 2
+       m_Curve:
+       - serializedVersion: 2
+         time: 0
+         value: 0.001290798
+         inSlope: 0
+         outSlope: 0
+         tangentMode: 136
+       - serializedVersion: 2
+         time: 0.11666667
+         value: 0.0006
+         inSlope: 0
+         outSlope: 0
+         tangentMode: 136
+       - serializedVersion: 2
+         time: 0.36666667
+         value: 0.001290798
+         inSlope: 0
+         outSlope: 0
+         tangentMode: 136
+       m_PreInfinity: 2
+       m_PostInfinity: 2
+       m_RotationOrder: 4
+     attribute: m_LocalPosition.y
+     path: M4A1/Gun/Bolt
+     classID: 4
+     script: {fileID: 0}
+   - curve:
+       serializedVersion: 2
+       m_Curve:
+       - serializedVersion: 2
+         time: 0
+         value: 0.00006345308
+         inSlope: 0
+         outSlope: 0
+         tangentMode: 136
+       - serializedVersion: 2
+         time: 0.11666667
+         value: 0.000063
+         inSlope: 0
+         outSlope: 0
+         tangentMode: 136
+       - serializedVersion: 2
+         time: 0.36666667
+         value: 0.00006345308
+         inSlope: 0
+         outSlope: 0
+         tangentMode: 136
+       m_PreInfinity: 2
+       m_PostInfinity: 2
+       m_RotationOrder: 4
+     attribute: m_LocalPosition.z
+     path: M4A1/Gun/Bolt
+     classID: 4
+     script: {fileID: 0}
   m_EulerEditorCurves:
   - curve:
       serializedVersion: 2
--- a/Assets/OpenVR-Shooter/Assets/Gun/ReadyComplete.anim.meta → Assets/OpenVR-Shooter/Assets/Gun/Reload.anim.meta
View file @0b098c5
+++ b/Assets/OpenVR-Shooter/Assets/Gun/ReadyComplete.anim.meta → Assets/OpenVR-Shooter/Assets/Gun/Reload.anim.meta
View file @0b098c5
 fileFormatVersion: 2
- guid: e01f6e3532db19c48aa6030a848988a0
- timeCreated: 1509075175
+ guid: 4f6d4cb5103b9a846bd2b156c452e4c6
+ timeCreated: 1509071540
 licenseType: Pro
 NativeFormatImporter:
   mainObjectFileID: 7400000
--- a/Assets/OpenVR-Shooter/Scripts/GunScript/Gun.cs
View file @0b098c5
+++ b/Assets/OpenVR-Shooter/Scripts/GunScript/Gun.cs
View file @0b098c5
@@ -202,6 +202,8 @@ public class Gun : MonoBehaviour
 		// Update 함수에서 if문에 걸려 Shot 발사가 못되게 막음
 		// Reload 함수에서 if문에 걸려 Reload 함수가 중단되게 함
 		state = GUN_STATE.RELOADING;
+ 		
+ 		gunAnimator.SetTrigger("Reload");
 
 		// 잠시 장전소요 시간만큼 대기
 		yield return new WaitForSeconds(reloadTime);
--- a/ProjectSettings/ProjectVersion.txt
View file @0b098c5
+++ b/ProjectSettings/ProjectVersion.txt
View file @0b098c5
- m_EditorVersion: 2017.2.0p3
+ m_EditorVersion: 2017.3.1p2