Skip to content

Commit 82e7dd8

Browse files
authored
fixed teleport animations/scripts so the animation state doesn't get reset when SetVisibility is toggled (#8781)
1 parent fbfb92b commit 82e7dd8

File tree

4 files changed

+81
-105
lines changed

4 files changed

+81
-105
lines changed

Assets/MRTK/SDK/Features/UX/Animations/Cursors/TeleportCursor/TeleportCursorController.controller

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,6 @@ AnimatorStateMachine:
2222
m_ExitPosition: {x: 800, y: 120, z: 0}
2323
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
2424
m_DefaultState: {fileID: 268147001575462652}
25-
--- !u!1102 &-506156243491230051
26-
AnimatorState:
27-
serializedVersion: 5
28-
m_ObjectHideFlags: 1
29-
m_CorrespondingSourceObject: {fileID: 0}
30-
m_PrefabInstance: {fileID: 0}
31-
m_PrefabAsset: {fileID: 0}
32-
m_Name: TeleportIdle
33-
m_Speed: 1
34-
m_CycleOffset: 0
35-
m_Transitions: []
36-
m_StateMachineBehaviours: []
37-
m_Position: {x: 50, y: 50, z: 0}
38-
m_IKOnFeet: 0
39-
m_WriteDefaultValues: 1
40-
m_Mirror: 0
41-
m_SpeedParameterActive: 0
42-
m_MirrorParameterActive: 0
43-
m_CycleOffsetParameterActive: 0
44-
m_TimeParameterActive: 0
45-
m_Motion: {fileID: 7400000, guid: 9588a2e9594adf94cb613e226589f5e5, type: 2}
46-
m_Tag:
47-
m_SpeedParameter:
48-
m_MirrorParameter:
49-
m_CycleOffsetParameter:
50-
m_TimeParameter:
5125
--- !u!91 &9100000
5226
AnimatorController:
5327
m_ObjectHideFlags: 0
@@ -427,9 +401,6 @@ AnimatorStateMachine:
427401
- serializedVersion: 1
428402
m_State: {fileID: 1102142302649466056}
429403
m_Position: {x: 492, y: 120, z: 0}
430-
- serializedVersion: 1
431-
m_State: {fileID: -506156243491230051}
432-
m_Position: {x: 527, y: 185, z: 0}
433404
m_ChildStateMachines: []
434405
m_AnyStateTransitions: []
435406
m_EntryTransitions: []

Assets/MRTK/SDK/Features/UX/Animations/Cursors/TeleportCursor/TeleportInvalid.anim

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
--- !u!74 &7400000
44
AnimationClip:
55
m_ObjectHideFlags: 0
6-
m_PrefabParentObject: {fileID: 0}
7-
m_PrefabInternal: {fileID: 0}
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
89
m_Name: TeleportInvalid
910
serializedVersion: 6
1011
m_Legacy: 0
@@ -199,23 +200,23 @@ AnimationClip:
199200
outSlope: Infinity
200201
tangentMode: 103
201202
weightedMode: 0
202-
inWeight: 0.33333334
203-
outWeight: 0.33333334
203+
inWeight: 0
204+
outWeight: 0
204205
- serializedVersion: 3
205206
time: 1
206207
value: 0
207208
inSlope: Infinity
208209
outSlope: Infinity
209210
tangentMode: 103
210211
weightedMode: 0
211-
inWeight: 0.33333334
212-
outWeight: 0.33333334
212+
inWeight: 0
213+
outWeight: 0
213214
m_PreInfinity: 2
214215
m_PostInfinity: 2
215216
m_RotationOrder: 4
216-
attribute: m_IsActive
217+
attribute: m_Enabled
217218
path: TeleportArrow
218-
classID: 1
219+
classID: 23
219220
script: {fileID: 0}
220221
- curve:
221222
serializedVersion: 2
@@ -227,23 +228,23 @@ AnimationClip:
227228
outSlope: Infinity
228229
tangentMode: 103
229230
weightedMode: 0
230-
inWeight: 0.33333334
231-
outWeight: 0.33333334
231+
inWeight: 0
232+
outWeight: 0
232233
- serializedVersion: 3
233234
time: 1
234235
value: 1
235236
inSlope: Infinity
236237
outSlope: Infinity
237238
tangentMode: 103
238239
weightedMode: 0
239-
inWeight: 0.33333334
240-
outWeight: 0.33333334
240+
inWeight: 0
241+
outWeight: 0
241242
m_PreInfinity: 2
242243
m_PostInfinity: 2
243244
m_RotationOrder: 4
244-
attribute: m_IsActive
245+
attribute: m_Enabled
245246
path: TeleportMid
246-
classID: 1
247+
classID: 23
247248
script: {fileID: 0}
248249
m_PPtrCurves: []
249250
m_SampleRate: 60
@@ -254,49 +255,49 @@ AnimationClip:
254255
m_ClipBindingConstant:
255256
genericBindings:
256257
- serializedVersion: 2
257-
path: 3923819429
258+
path: 1112903405
258259
attribute: 2108656497
259260
script: {fileID: 0}
260261
typeID: 23
261262
customType: 22
262263
isPPtrCurve: 0
263264
- serializedVersion: 2
264-
path: 3093145629
265-
attribute: 2086281974
265+
path: 3595436678
266+
attribute: 3305885265
266267
script: {fileID: 0}
267-
typeID: 1
268+
typeID: 23
268269
customType: 0
269270
isPPtrCurve: 0
270271
- serializedVersion: 2
271-
path: 3923819429
272-
attribute: 2086281974
272+
path: 1112903405
273+
attribute: 3305885265
273274
script: {fileID: 0}
274-
typeID: 1
275+
typeID: 23
275276
customType: 0
276277
isPPtrCurve: 0
277278
- serializedVersion: 2
278-
path: 3923819429
279+
path: 1112903405
279280
attribute: 1
280281
script: {fileID: 0}
281282
typeID: 4
282283
customType: 0
283284
isPPtrCurve: 0
284285
- serializedVersion: 2
285-
path: 3923819429
286+
path: 1112903405
286287
attribute: 1303350129
287288
script: {fileID: 0}
288289
typeID: 23
289290
customType: 22
290291
isPPtrCurve: 0
291292
- serializedVersion: 2
292-
path: 3923819429
293+
path: 1112903405
293294
attribute: 1571785585
294295
script: {fileID: 0}
295296
typeID: 23
296297
customType: 22
297298
isPPtrCurve: 0
298299
- serializedVersion: 2
299-
path: 3923819429
300+
path: 1112903405
300301
attribute: 1840221041
301302
script: {fileID: 0}
302303
typeID: 23
@@ -566,23 +567,23 @@ AnimationClip:
566567
outSlope: Infinity
567568
tangentMode: 103
568569
weightedMode: 0
569-
inWeight: 0.33333334
570-
outWeight: 0.33333334
570+
inWeight: 0
571+
outWeight: 0
571572
- serializedVersion: 3
572573
time: 1
573574
value: 0
574575
inSlope: Infinity
575576
outSlope: Infinity
576577
tangentMode: 103
577578
weightedMode: 0
578-
inWeight: 0.33333334
579-
outWeight: 0.33333334
579+
inWeight: 0
580+
outWeight: 0
580581
m_PreInfinity: 2
581582
m_PostInfinity: 2
582583
m_RotationOrder: 4
583-
attribute: m_IsActive
584+
attribute: m_Enabled
584585
path: TeleportArrow
585-
classID: 1
586+
classID: 23
586587
script: {fileID: 0}
587588
- curve:
588589
serializedVersion: 2
@@ -594,26 +595,25 @@ AnimationClip:
594595
outSlope: Infinity
595596
tangentMode: 103
596597
weightedMode: 0
597-
inWeight: 0.33333334
598-
outWeight: 0.33333334
598+
inWeight: 0
599+
outWeight: 0
599600
- serializedVersion: 3
600601
time: 1
601602
value: 1
602603
inSlope: Infinity
603604
outSlope: Infinity
604605
tangentMode: 103
605606
weightedMode: 0
606-
inWeight: 0.33333334
607-
outWeight: 0.33333334
607+
inWeight: 0
608+
outWeight: 0
608609
m_PreInfinity: 2
609610
m_PostInfinity: 2
610611
m_RotationOrder: 4
611-
attribute: m_IsActive
612+
attribute: m_Enabled
612613
path: TeleportMid
613-
classID: 1
614+
classID: 23
614615
script: {fileID: 0}
615616
m_EulerEditorCurves: []
616617
m_HasGenericRootTransform: 0
617618
m_HasMotionFloatCurves: 0
618-
m_GenerateMotionCurves: 0
619619
m_Events: []

0 commit comments

Comments
 (0)