I_Jemin / Unity-OpenVR-Shooter-Template

Go to a project
Toggle navigation Toggle navigation pinning
I_Jemin
0b098c5c 1 parent ef8d11f7

Add Reload animation state 

ignore jetbrain plugin
Inline Side-by-side
Showing 8 changed files with 201 additions and 157 deletions
...@@ -4,8 +4,11 @@ ...@@ -4,8 +4,11 @@
4 /[Bb]uild/ 4 /[Bb]uild/
5 /[Bb]uilds/ 5 /[Bb]uilds/
6 /Assets/AssetStoreTools* 6 /Assets/AssetStoreTools*
7 +/Assets/Plugins*
8 +/.idea*
7 9
8 # Visual Studio 2015 cache directory 10 # Visual Studio 2015 cache directory
11 +
9 /.vs/ 12 /.vs/
10 13
11 # Autogenerated VS/MD/Consulo solution and project files 14 # Autogenerated VS/MD/Consulo solution and project files
......
...@@ -14,6 +14,12 @@ AnimatorController: ...@@ -14,6 +14,12 @@ AnimatorController:
14 m_DefaultInt: 0 14 m_DefaultInt: 0
15 m_DefaultBool: 0 15 m_DefaultBool: 0
16 m_Controller: {fileID: 0} 16 m_Controller: {fileID: 0}
17 + - m_Name: Reload
18 + m_Type: 9
19 + m_DefaultFloat: 0
20 + m_DefaultInt: 0
21 + m_DefaultBool: 0
22 + m_Controller: {fileID: 0}
17 m_AnimatorLayers: 23 m_AnimatorLayers:
18 - serializedVersion: 5 24 - serializedVersion: 5
19 m_Name: Base Layer 25 m_Name: Base Layer
...@@ -27,6 +33,30 @@ AnimatorController: ...@@ -27,6 +33,30 @@ AnimatorController:
27 m_IKPass: 0 33 m_IKPass: 0
28 m_SyncedLayerAffectsTiming: 0 34 m_SyncedLayerAffectsTiming: 0
29 m_Controller: {fileID: 9100000} 35 m_Controller: {fileID: 9100000}
36 +--- !u!1101 &1101395826455393168
37 +AnimatorStateTransition:
38 + m_ObjectHideFlags: 1
39 + m_PrefabParentObject: {fileID: 0}
40 + m_PrefabInternal: {fileID: 0}
41 + m_Name:
42 + m_Conditions:
43 + - m_ConditionMode: 1
44 + m_ConditionEvent: Reload
45 + m_EventTreshold: 0
46 + m_DstStateMachine: {fileID: 0}
47 + m_DstState: {fileID: 1102080190254683606}
48 + m_Solo: 0
49 + m_Mute: 0
50 + m_IsExit: 0
51 + serializedVersion: 3
52 + m_TransitionDuration: 0.25
53 + m_TransitionOffset: 0
54 + m_ExitTime: 0.75
55 + m_HasExitTime: 0
56 + m_HasFixedDuration: 1
57 + m_InterruptionSource: 0
58 + m_OrderedInterruption: 1
59 + m_CanTransitionToSelf: 1
30 --- !u!1101 &1101864254702660336 60 --- !u!1101 &1101864254702660336
31 AnimatorStateTransition: 61 AnimatorStateTransition:
32 m_ObjectHideFlags: 1 62 m_ObjectHideFlags: 1
...@@ -112,18 +142,20 @@ AnimatorState: ...@@ -112,18 +142,20 @@ AnimatorState:
112 m_SpeedParameterActive: 0 142 m_SpeedParameterActive: 0
113 m_MirrorParameterActive: 0 143 m_MirrorParameterActive: 0
114 m_CycleOffsetParameterActive: 0 144 m_CycleOffsetParameterActive: 0
145 + m_TimeParameterActive: 0
115 m_Motion: {fileID: 7400000, guid: 98dd316a60c8ecd479a325df5bb32fd7, type: 2} 146 m_Motion: {fileID: 7400000, guid: 98dd316a60c8ecd479a325df5bb32fd7, type: 2}
116 m_Tag: 147 m_Tag:
117 m_SpeedParameter: 148 m_SpeedParameter:
118 m_MirrorParameter: 149 m_MirrorParameter:
119 m_CycleOffsetParameter: 150 m_CycleOffsetParameter:
151 + m_TimeParameter:
120 --- !u!1102 &1102080190254683606 152 --- !u!1102 &1102080190254683606
121 AnimatorState: 153 AnimatorState:
122 serializedVersion: 5 154 serializedVersion: 5
123 m_ObjectHideFlags: 1 155 m_ObjectHideFlags: 1
124 m_PrefabParentObject: {fileID: 0} 156 m_PrefabParentObject: {fileID: 0}
125 m_PrefabInternal: {fileID: 0} 157 m_PrefabInternal: {fileID: 0}
126 - m_Name: Ready 158 + m_Name: Reload
127 m_Speed: 1 159 m_Speed: 1
128 m_CycleOffset: 0 160 m_CycleOffset: 0
129 m_Transitions: 161 m_Transitions:
...@@ -136,11 +168,13 @@ AnimatorState: ...@@ -136,11 +168,13 @@ AnimatorState:
136 m_SpeedParameterActive: 0 168 m_SpeedParameterActive: 0
137 m_MirrorParameterActive: 0 169 m_MirrorParameterActive: 0
138 m_CycleOffsetParameterActive: 0 170 m_CycleOffsetParameterActive: 0
171 + m_TimeParameterActive: 0
139 m_Motion: {fileID: 7400000, guid: 4f6d4cb5103b9a846bd2b156c452e4c6, type: 2} 172 m_Motion: {fileID: 7400000, guid: 4f6d4cb5103b9a846bd2b156c452e4c6, type: 2}
140 m_Tag: 173 m_Tag:
141 m_SpeedParameter: 174 m_SpeedParameter:
142 m_MirrorParameter: 175 m_MirrorParameter:
143 m_CycleOffsetParameter: 176 m_CycleOffsetParameter:
177 + m_TimeParameter:
144 --- !u!1102 &1102602552620100714 178 --- !u!1102 &1102602552620100714
145 AnimatorState: 179 AnimatorState:
146 serializedVersion: 5 180 serializedVersion: 5
...@@ -150,7 +184,8 @@ AnimatorState: ...@@ -150,7 +184,8 @@ AnimatorState:
150 m_Name: Idle 184 m_Name: Idle
151 m_Speed: 1 185 m_Speed: 1
152 m_CycleOffset: 0 186 m_CycleOffset: 0
153 - m_Transitions: [] 187 + m_Transitions:
188 + - {fileID: 1101395826455393168}
154 m_StateMachineBehaviours: [] 189 m_StateMachineBehaviours: []
155 m_Position: {x: 50, y: 50, z: 0} 190 m_Position: {x: 50, y: 50, z: 0}
156 m_IKOnFeet: 0 191 m_IKOnFeet: 0
...@@ -159,18 +194,20 @@ AnimatorState: ...@@ -159,18 +194,20 @@ AnimatorState:
159 m_SpeedParameterActive: 0 194 m_SpeedParameterActive: 0
160 m_MirrorParameterActive: 0 195 m_MirrorParameterActive: 0
161 m_CycleOffsetParameterActive: 0 196 m_CycleOffsetParameterActive: 0
197 + m_TimeParameterActive: 0
162 m_Motion: {fileID: 7400000, guid: f750ec2235cbee441a2077fdcd236343, type: 2} 198 m_Motion: {fileID: 7400000, guid: f750ec2235cbee441a2077fdcd236343, type: 2}
163 m_Tag: 199 m_Tag:
164 m_SpeedParameter: 200 m_SpeedParameter:
165 m_MirrorParameter: 201 m_MirrorParameter:
166 m_CycleOffsetParameter: 202 m_CycleOffsetParameter:
203 + m_TimeParameter:
167 --- !u!1102 &1102696271512118140 204 --- !u!1102 &1102696271512118140
168 AnimatorState: 205 AnimatorState:
169 serializedVersion: 5 206 serializedVersion: 5
170 m_ObjectHideFlags: 1 207 m_ObjectHideFlags: 1
171 m_PrefabParentObject: {fileID: 0} 208 m_PrefabParentObject: {fileID: 0}
172 m_PrefabInternal: {fileID: 0} 209 m_PrefabInternal: {fileID: 0}
173 - m_Name: ReadyComplete 210 + m_Name: Ready
174 m_Speed: 1 211 m_Speed: 1
175 m_CycleOffset: 0 212 m_CycleOffset: 0
176 m_Transitions: [] 213 m_Transitions: []
...@@ -182,11 +219,13 @@ AnimatorState: ...@@ -182,11 +219,13 @@ AnimatorState:
182 m_SpeedParameterActive: 0 219 m_SpeedParameterActive: 0
183 m_MirrorParameterActive: 0 220 m_MirrorParameterActive: 0
184 m_CycleOffsetParameterActive: 0 221 m_CycleOffsetParameterActive: 0
222 + m_TimeParameterActive: 0
185 m_Motion: {fileID: 7400000, guid: e01f6e3532db19c48aa6030a848988a0, type: 2} 223 m_Motion: {fileID: 7400000, guid: e01f6e3532db19c48aa6030a848988a0, type: 2}
186 m_Tag: 224 m_Tag:
187 m_SpeedParameter: 225 m_SpeedParameter:
188 m_MirrorParameter: 226 m_MirrorParameter:
189 m_CycleOffsetParameter: 227 m_CycleOffsetParameter:
228 + m_TimeParameter:
190 --- !u!1107 &1107188464712007082 229 --- !u!1107 &1107188464712007082
191 AnimatorStateMachine: 230 AnimatorStateMachine:
192 serializedVersion: 5 231 serializedVersion: 5
...@@ -197,10 +236,10 @@ AnimatorStateMachine: ...@@ -197,10 +236,10 @@ AnimatorStateMachine:
197 m_ChildStates: 236 m_ChildStates:
198 - serializedVersion: 1 237 - serializedVersion: 1
199 m_State: {fileID: 1102602552620100714} 238 m_State: {fileID: 1102602552620100714}
200 - m_Position: {x: 96, y: 12, z: 0} 239 + m_Position: {x: 84, y: 0, z: 0}
201 - serializedVersion: 1 240 - serializedVersion: 1
202 m_State: {fileID: 1102080190254683606} 241 m_State: {fileID: 1102080190254683606}
203 - m_Position: {x: 348, y: 12, z: 0} 242 + m_Position: {x: 360, y: 0, z: 0}
204 - serializedVersion: 1 243 - serializedVersion: 1
205 m_State: {fileID: 1102038195148562506} 244 m_State: {fileID: 1102038195148562506}
206 m_Position: {x: 300, y: 204, z: 0} 245 m_Position: {x: 300, y: 204, z: 0}
......
...@@ -18,12 +18,6 @@ AnimationClip: ...@@ -18,12 +18,6 @@ AnimationClip:
18 m_Curve: 18 m_Curve:
19 - serializedVersion: 2 19 - serializedVersion: 2
20 time: 0 20 time: 0
21 - value: {x: -89.98, y: 0, z: 179.99998}
22 - inSlope: {x: 0, y: 0, z: 0}
23 - outSlope: {x: 0, y: 0, z: 0}
24 - tangentMode: 0
25 - - serializedVersion: 2
26 - time: 0.15
27 value: {x: -89.98, y: -160, z: 179.99998} 21 value: {x: -89.98, y: -160, z: 179.99998}
28 inSlope: {x: 0, y: 0, z: 0} 22 inSlope: {x: 0, y: 0, z: 0}
29 outSlope: {x: 0, y: 0, z: 0} 23 outSlope: {x: 0, y: 0, z: 0}
...@@ -32,32 +26,7 @@ AnimationClip: ...@@ -32,32 +26,7 @@ AnimationClip:
32 m_PostInfinity: 2 26 m_PostInfinity: 2
33 m_RotationOrder: 4 27 m_RotationOrder: 4
34 path: M4A1/Gun/DustCover 28 path: M4A1/Gun/DustCover
35 - m_PositionCurves: 29 + m_PositionCurves: []
36 - - curve:
37 - serializedVersion: 2
38 - m_Curve:
39 - - serializedVersion: 2
40 - time: 0
41 - value: {x: 0.00001709239, y: 0.001290798, z: 0.00006345308}
42 - inSlope: {x: 0, y: 0, z: 0}
43 - outSlope: {x: 0, y: 0, z: 0}
44 - tangentMode: 0
45 - - serializedVersion: 2
46 - time: 0.11666667
47 - value: {x: 0.00001709239, y: 0.0006, z: 0.000063}
48 - inSlope: {x: 0, y: 0, z: 0}
49 - outSlope: {x: 0, y: 0, z: 0}
50 - tangentMode: 0
51 - - serializedVersion: 2
52 - time: 0.36666667
53 - value: {x: 0.00001709239, y: 0.001290798, z: 0.00006345308}
54 - inSlope: {x: 0, y: 0, z: 0}
55 - outSlope: {x: 0, y: 0, z: 0}
56 - tangentMode: 0
57 - m_PreInfinity: 2
58 - m_PostInfinity: 2
59 - m_RotationOrder: 4
60 - path: M4A1/Gun/Bolt
61 m_ScaleCurves: [] 30 m_ScaleCurves: []
62 m_FloatCurves: [] 31 m_FloatCurves: []
63 m_PPtrCurves: [] 32 m_PPtrCurves: []
...@@ -69,18 +38,11 @@ AnimationClip: ...@@ -69,18 +38,11 @@ AnimationClip:
69 m_ClipBindingConstant: 38 m_ClipBindingConstant:
70 genericBindings: 39 genericBindings:
71 - serializedVersion: 2 40 - serializedVersion: 2
72 - path: 798275541
73 - attribute: 1
74 - script: {fileID: 0}
75 - typeID: 4
76 - customType: 0
77 - isPPtrCurve: 0
78 - - serializedVersion: 2
79 path: 1787346884 41 path: 1787346884
80 attribute: 4 42 attribute: 4
81 script: {fileID: 0} 43 script: {fileID: 0}
82 typeID: 4 44 typeID: 4
83 - customType: 14 45 + customType: 4
84 isPPtrCurve: 0 46 isPPtrCurve: 0
85 pptrCurveMapping: [] 47 pptrCurveMapping: []
86 m_AnimationClipSettings: 48 m_AnimationClipSettings:
...@@ -88,7 +50,7 @@ AnimationClip: ...@@ -88,7 +50,7 @@ AnimationClip:
88 m_AdditiveReferencePoseClip: {fileID: 0} 50 m_AdditiveReferencePoseClip: {fileID: 0}
89 m_AdditiveReferencePoseTime: 0 51 m_AdditiveReferencePoseTime: 0
90 m_StartTime: 0 52 m_StartTime: 0
91 - m_StopTime: 0.36666667 53 + m_StopTime: 0
92 m_OrientationOffsetY: 0 54 m_OrientationOffsetY: 0
93 m_Level: 0 55 m_Level: 0
94 m_CycleOffset: 0 56 m_CycleOffset: 0
...@@ -113,12 +75,6 @@ AnimationClip: ...@@ -113,12 +75,6 @@ AnimationClip:
113 inSlope: 0 75 inSlope: 0
114 outSlope: 0 76 outSlope: 0
115 tangentMode: 136 77 tangentMode: 136
116 - - serializedVersion: 2
117 - time: 0.15
118 - value: -89.98
119 - inSlope: 0
120 - outSlope: 0
121 - tangentMode: 136
122 m_PreInfinity: 2 78 m_PreInfinity: 2
123 m_PostInfinity: 2 79 m_PostInfinity: 2
124 m_RotationOrder: 4 80 m_RotationOrder: 4
...@@ -131,12 +87,6 @@ AnimationClip: ...@@ -131,12 +87,6 @@ AnimationClip:
131 m_Curve: 87 m_Curve:
132 - serializedVersion: 2 88 - serializedVersion: 2
133 time: 0 89 time: 0
134 - value: 0
135 - inSlope: 0
136 - outSlope: 0
137 - tangentMode: 136
138 - - serializedVersion: 2
139 - time: 0.15
140 value: -160 90 value: -160
141 inSlope: 0 91 inSlope: 0
142 outSlope: 0 92 outSlope: 0
...@@ -157,12 +107,6 @@ AnimationClip: ...@@ -157,12 +107,6 @@ AnimationClip:
157 inSlope: 0 107 inSlope: 0
158 outSlope: 0 108 outSlope: 0
159 tangentMode: 136 109 tangentMode: 136
160 - - serializedVersion: 2
161 - time: 0.15
162 - value: 179.99998
163 - inSlope: 0
164 - outSlope: 0
165 - tangentMode: 136
166 m_PreInfinity: 2 110 m_PreInfinity: 2
167 m_PostInfinity: 2 111 m_PostInfinity: 2
168 m_RotationOrder: 4 112 m_RotationOrder: 4
...@@ -170,90 +114,6 @@ AnimationClip: ...@@ -170,90 +114,6 @@ AnimationClip:
170 path: M4A1/Gun/DustCover 114 path: M4A1/Gun/DustCover
171 classID: 4 115 classID: 4
172 script: {fileID: 0} 116 script: {fileID: 0}
173 - - curve:
174 - serializedVersion: 2
175 - m_Curve:
176 - - serializedVersion: 2
177 - time: 0
178 - value: 0.00001709239
179 - inSlope: 0
180 - outSlope: 0
181 - tangentMode: 136
182 - - serializedVersion: 2
183 - time: 0.11666667
184 - value: 0.00001709239
185 - inSlope: 0
186 - outSlope: 0
187 - tangentMode: 136
188 - - serializedVersion: 2
189 - time: 0.36666667
190 - value: 0.00001709239
191 - inSlope: 0
192 - outSlope: 0
193 - tangentMode: 136
194 - m_PreInfinity: 2
195 - m_PostInfinity: 2
196 - m_RotationOrder: 4
197 - attribute: m_LocalPosition.x
198 - path: M4A1/Gun/Bolt
199 - classID: 4
200 - script: {fileID: 0}
201 - - curve:
202 - serializedVersion: 2
203 - m_Curve:
204 - - serializedVersion: 2
205 - time: 0
206 - value: 0.001290798
207 - inSlope: 0
208 - outSlope: 0
209 - tangentMode: 136
210 - - serializedVersion: 2
211 - time: 0.11666667
212 - value: 0.0006
213 - inSlope: 0
214 - outSlope: 0
215 - tangentMode: 136
216 - - serializedVersion: 2
217 - time: 0.36666667
218 - value: 0.001290798
219 - inSlope: 0
220 - outSlope: 0
221 - tangentMode: 136
222 - m_PreInfinity: 2
223 - m_PostInfinity: 2
224 - m_RotationOrder: 4
225 - attribute: m_LocalPosition.y
226 - path: M4A1/Gun/Bolt
227 - classID: 4
228 - script: {fileID: 0}
229 - - curve:
230 - serializedVersion: 2
231 - m_Curve:
232 - - serializedVersion: 2
233 - time: 0
234 - value: 0.00006345308
235 - inSlope: 0
236 - outSlope: 0
237 - tangentMode: 136
238 - - serializedVersion: 2
239 - time: 0.11666667
240 - value: 0.000063
241 - inSlope: 0
242 - outSlope: 0
243 - tangentMode: 136
244 - - serializedVersion: 2
245 - time: 0.36666667
246 - value: 0.00006345308
247 - inSlope: 0
248 - outSlope: 0
249 - tangentMode: 136
250 - m_PreInfinity: 2
251 - m_PostInfinity: 2
252 - m_RotationOrder: 4
253 - attribute: m_LocalPosition.z
254 - path: M4A1/Gun/Bolt
255 - classID: 4
256 - script: {fileID: 0}
257 m_EulerEditorCurves: 117 m_EulerEditorCurves:
258 - curve: 118 - curve:
259 serializedVersion: 2 119 serializedVersion: 2
......
1 fileFormatVersion: 2 1 fileFormatVersion: 2
2 -guid: 4f6d4cb5103b9a846bd2b156c452e4c6 2 +guid: e01f6e3532db19c48aa6030a848988a0
3 -timeCreated: 1509071540 3 +timeCreated: 1509075175
4 licenseType: Pro 4 licenseType: Pro
5 NativeFormatImporter: 5 NativeFormatImporter:
6 mainObjectFileID: 7400000 6 mainObjectFileID: 7400000
......
...@@ -5,7 +5,7 @@ AnimationClip: ...@@ -5,7 +5,7 @@ AnimationClip:
5 m_ObjectHideFlags: 0 5 m_ObjectHideFlags: 0
6 m_PrefabParentObject: {fileID: 0} 6 m_PrefabParentObject: {fileID: 0}
7 m_PrefabInternal: {fileID: 0} 7 m_PrefabInternal: {fileID: 0}
8 - m_Name: ReadyComplete 8 + m_Name: Reload
9 serializedVersion: 6 9 serializedVersion: 6
10 m_Legacy: 0 10 m_Legacy: 0
11 m_Compressed: 0 11 m_Compressed: 0
...@@ -18,6 +18,12 @@ AnimationClip: ...@@ -18,6 +18,12 @@ AnimationClip:
18 m_Curve: 18 m_Curve:
19 - serializedVersion: 2 19 - serializedVersion: 2
20 time: 0 20 time: 0
21 + value: {x: -89.98, y: 0, z: 179.99998}
22 + inSlope: {x: 0, y: 0, z: 0}
23 + outSlope: {x: 0, y: 0, z: 0}
24 + tangentMode: 0
25 + - serializedVersion: 2
26 + time: 0.15
21 value: {x: -89.98, y: -160, z: 179.99998} 27 value: {x: -89.98, y: -160, z: 179.99998}
22 inSlope: {x: 0, y: 0, z: 0} 28 inSlope: {x: 0, y: 0, z: 0}
23 outSlope: {x: 0, y: 0, z: 0} 29 outSlope: {x: 0, y: 0, z: 0}
...@@ -26,7 +32,32 @@ AnimationClip: ...@@ -26,7 +32,32 @@ AnimationClip:
26 m_PostInfinity: 2 32 m_PostInfinity: 2
27 m_RotationOrder: 4 33 m_RotationOrder: 4
28 path: M4A1/Gun/DustCover 34 path: M4A1/Gun/DustCover
29 - m_PositionCurves: [] 35 + m_PositionCurves:
36 + - curve:
37 + serializedVersion: 2
38 + m_Curve:
39 + - serializedVersion: 2
40 + time: 0
41 + value: {x: 0.00001709239, y: 0.001290798, z: 0.00006345308}
42 + inSlope: {x: 0, y: 0, z: 0}
43 + outSlope: {x: 0, y: 0, z: 0}
44 + tangentMode: 0
45 + - serializedVersion: 2
46 + time: 0.11666667
47 + value: {x: 0.00001709239, y: 0.0006, z: 0.000063}
48 + inSlope: {x: 0, y: 0, z: 0}
49 + outSlope: {x: 0, y: 0, z: 0}
50 + tangentMode: 0
51 + - serializedVersion: 2
52 + time: 0.36666667
53 + value: {x: 0.00001709239, y: 0.001290798, z: 0.00006345308}
54 + inSlope: {x: 0, y: 0, z: 0}
55 + outSlope: {x: 0, y: 0, z: 0}
56 + tangentMode: 0
57 + m_PreInfinity: 2
58 + m_PostInfinity: 2
59 + m_RotationOrder: 4
60 + path: M4A1/Gun/Bolt
30 m_ScaleCurves: [] 61 m_ScaleCurves: []
31 m_FloatCurves: [] 62 m_FloatCurves: []
32 m_PPtrCurves: [] 63 m_PPtrCurves: []
...@@ -38,11 +69,18 @@ AnimationClip: ...@@ -38,11 +69,18 @@ AnimationClip:
38 m_ClipBindingConstant: 69 m_ClipBindingConstant:
39 genericBindings: 70 genericBindings:
40 - serializedVersion: 2 71 - serializedVersion: 2
72 + path: 798275541
73 + attribute: 1
74 + script: {fileID: 0}
75 + typeID: 4
76 + customType: 0
77 + isPPtrCurve: 0
78 + - serializedVersion: 2
41 path: 1787346884 79 path: 1787346884
42 attribute: 4 80 attribute: 4
43 script: {fileID: 0} 81 script: {fileID: 0}
44 typeID: 4 82 typeID: 4
45 - customType: 14 83 + customType: 4
46 isPPtrCurve: 0 84 isPPtrCurve: 0
47 pptrCurveMapping: [] 85 pptrCurveMapping: []
48 m_AnimationClipSettings: 86 m_AnimationClipSettings:
...@@ -50,7 +88,7 @@ AnimationClip: ...@@ -50,7 +88,7 @@ AnimationClip:
50 m_AdditiveReferencePoseClip: {fileID: 0} 88 m_AdditiveReferencePoseClip: {fileID: 0}
51 m_AdditiveReferencePoseTime: 0 89 m_AdditiveReferencePoseTime: 0
52 m_StartTime: 0 90 m_StartTime: 0
53 - m_StopTime: 0 91 + m_StopTime: 0.36666667
54 m_OrientationOffsetY: 0 92 m_OrientationOffsetY: 0
55 m_Level: 0 93 m_Level: 0
56 m_CycleOffset: 0 94 m_CycleOffset: 0
...@@ -75,6 +113,12 @@ AnimationClip: ...@@ -75,6 +113,12 @@ AnimationClip:
75 inSlope: 0 113 inSlope: 0
76 outSlope: 0 114 outSlope: 0
77 tangentMode: 136 115 tangentMode: 136
116 + - serializedVersion: 2
117 + time: 0.15
118 + value: -89.98
119 + inSlope: 0
120 + outSlope: 0
121 + tangentMode: 136
78 m_PreInfinity: 2 122 m_PreInfinity: 2
79 m_PostInfinity: 2 123 m_PostInfinity: 2
80 m_RotationOrder: 4 124 m_RotationOrder: 4
...@@ -87,6 +131,12 @@ AnimationClip: ...@@ -87,6 +131,12 @@ AnimationClip:
87 m_Curve: 131 m_Curve:
88 - serializedVersion: 2 132 - serializedVersion: 2
89 time: 0 133 time: 0
134 + value: 0
135 + inSlope: 0
136 + outSlope: 0
137 + tangentMode: 136
138 + - serializedVersion: 2
139 + time: 0.15
90 value: -160 140 value: -160
91 inSlope: 0 141 inSlope: 0
92 outSlope: 0 142 outSlope: 0
...@@ -107,6 +157,12 @@ AnimationClip: ...@@ -107,6 +157,12 @@ AnimationClip:
107 inSlope: 0 157 inSlope: 0
108 outSlope: 0 158 outSlope: 0
109 tangentMode: 136 159 tangentMode: 136
160 + - serializedVersion: 2
161 + time: 0.15
162 + value: 179.99998
163 + inSlope: 0
164 + outSlope: 0
165 + tangentMode: 136
110 m_PreInfinity: 2 166 m_PreInfinity: 2
111 m_PostInfinity: 2 167 m_PostInfinity: 2
112 m_RotationOrder: 4 168 m_RotationOrder: 4
...@@ -114,6 +170,90 @@ AnimationClip: ...@@ -114,6 +170,90 @@ AnimationClip:
114 path: M4A1/Gun/DustCover 170 path: M4A1/Gun/DustCover
115 classID: 4 171 classID: 4
116 script: {fileID: 0} 172 script: {fileID: 0}
173 + - curve:
174 + serializedVersion: 2
175 + m_Curve:
176 + - serializedVersion: 2
177 + time: 0
178 + value: 0.00001709239
179 + inSlope: 0
180 + outSlope: 0
181 + tangentMode: 136
182 + - serializedVersion: 2
183 + time: 0.11666667
184 + value: 0.00001709239
185 + inSlope: 0
186 + outSlope: 0
187 + tangentMode: 136
188 + - serializedVersion: 2
189 + time: 0.36666667
190 + value: 0.00001709239
191 + inSlope: 0
192 + outSlope: 0
193 + tangentMode: 136
194 + m_PreInfinity: 2
195 + m_PostInfinity: 2
196 + m_RotationOrder: 4
197 + attribute: m_LocalPosition.x
198 + path: M4A1/Gun/Bolt
199 + classID: 4
200 + script: {fileID: 0}
201 + - curve:
202 + serializedVersion: 2
203 + m_Curve:
204 + - serializedVersion: 2
205 + time: 0
206 + value: 0.001290798
207 + inSlope: 0
208 + outSlope: 0
209 + tangentMode: 136
210 + - serializedVersion: 2
211 + time: 0.11666667
212 + value: 0.0006
213 + inSlope: 0
214 + outSlope: 0
215 + tangentMode: 136
216 + - serializedVersion: 2
217 + time: 0.36666667
218 + value: 0.001290798
219 + inSlope: 0
220 + outSlope: 0
221 + tangentMode: 136
222 + m_PreInfinity: 2
223 + m_PostInfinity: 2
224 + m_RotationOrder: 4
225 + attribute: m_LocalPosition.y
226 + path: M4A1/Gun/Bolt
227 + classID: 4
228 + script: {fileID: 0}
229 + - curve:
230 + serializedVersion: 2
231 + m_Curve:
232 + - serializedVersion: 2
233 + time: 0
234 + value: 0.00006345308
235 + inSlope: 0
236 + outSlope: 0
237 + tangentMode: 136
238 + - serializedVersion: 2
239 + time: 0.11666667
240 + value: 0.000063
241 + inSlope: 0
242 + outSlope: 0
243 + tangentMode: 136
244 + - serializedVersion: 2
245 + time: 0.36666667
246 + value: 0.00006345308
247 + inSlope: 0
248 + outSlope: 0
249 + tangentMode: 136
250 + m_PreInfinity: 2
251 + m_PostInfinity: 2
252 + m_RotationOrder: 4
253 + attribute: m_LocalPosition.z
254 + path: M4A1/Gun/Bolt
255 + classID: 4
256 + script: {fileID: 0}
117 m_EulerEditorCurves: 257 m_EulerEditorCurves:
118 - curve: 258 - curve:
119 serializedVersion: 2 259 serializedVersion: 2
......
1 fileFormatVersion: 2 1 fileFormatVersion: 2
2 -guid: e01f6e3532db19c48aa6030a848988a0 2 +guid: 4f6d4cb5103b9a846bd2b156c452e4c6
3 -timeCreated: 1509075175 3 +timeCreated: 1509071540
4 licenseType: Pro 4 licenseType: Pro
5 NativeFormatImporter: 5 NativeFormatImporter:
6 mainObjectFileID: 7400000 6 mainObjectFileID: 7400000
......
...@@ -202,6 +202,8 @@ public class Gun : MonoBehaviour ...@@ -202,6 +202,8 @@ public class Gun : MonoBehaviour
202 // Update 함수에서 if문에 걸려 Shot 발사가 못되게 막음 202 // Update 함수에서 if문에 걸려 Shot 발사가 못되게 막음
203 // Reload 함수에서 if문에 걸려 Reload 함수가 중단되게 함 203 // Reload 함수에서 if문에 걸려 Reload 함수가 중단되게 함
204 state = GUN_STATE.RELOADING; 204 state = GUN_STATE.RELOADING;
205 +
206 + gunAnimator.SetTrigger("Reload");
205 207
206 // 잠시 장전소요 시간만큼 대기 208 // 잠시 장전소요 시간만큼 대기
207 yield return new WaitForSeconds(reloadTime); 209 yield return new WaitForSeconds(reloadTime);
......
1 -m_EditorVersion: 2017.2.0p3 1 +m_EditorVersion: 2017.3.1p2
......