Skip to content

Commit 7e72c28

Browse files
thalbernthalbern
authored
Merge pull request #7070 from thalbern/user/bethalha/interactable_scene_fix
Fixed prefabs in interactable scene
2 parents 4dbfe93 + 4e9bf08 commit 7e72c28

File tree

13 files changed

+1003
-443
lines changed

13 files changed

+1003
-443
lines changed

‎Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables/Scenes/InteractablesExamples.unity‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3393,17 +3393,17 @@ PrefabInstance:
33933393
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
33943394
type: 3}
33953395
propertyPath: profiles.Array.data[0].Themes.Array.size
3396-
value: 1
3396+
value: 2
33973397
objectReference: {fileID: 0}
33983398
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
33993399
type: 3}
34003400
propertyPath: profiles.Array.data[1].Themes.Array.size
3401-
value: 1
3401+
value: 2
34023402
objectReference: {fileID: 0}
34033403
- target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237,
34043404
type: 3}
34053405
propertyPath: profiles.Array.data[2].Themes.Array.size
3406-
value: 1
3406+
value: 2
34073407
objectReference: {fileID: 0}
34083408
- target: {fileID: 9004932328701866534, guid: 64790b91b91094d49942373c4e83c237,
34093409
type: 3}
@@ -5095,30 +5095,10 @@ PrefabInstance:
50955095
propertyPath: m_LocalScale.z
50965096
value: 1.8
50975097
objectReference: {fileID: 0}
5098-
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5099-
type: 3}
5100-
propertyPath: m_textInfo.characterCount
5101-
value: 0
5102-
objectReference: {fileID: 0}
5103-
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5104-
type: 3}
5105-
propertyPath: m_textInfo.spaceCount
5106-
value: 0
5107-
objectReference: {fileID: 0}
5108-
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5109-
type: 3}
5110-
propertyPath: m_textInfo.wordCount
5111-
value: 0
5112-
objectReference: {fileID: 0}
5113-
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5114-
type: 3}
5115-
propertyPath: m_textInfo.lineCount
5116-
value: 0
5117-
objectReference: {fileID: 0}
5118-
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5098+
- target: {fileID: 4607504470098667674, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
51195099
type: 3}
5120-
propertyPath: m_textInfo.pageCount
5121-
value: 0
5100+
propertyPath: m_Mesh
5101+
value:
51225102
objectReference: {fileID: 0}
51235103
- target: {fileID: 2204069621878992557, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
51245104
type: 3}
@@ -5150,10 +5130,30 @@ PrefabInstance:
51505130
propertyPath: m_text
51515131
value: Normal
51525132
objectReference: {fileID: 0}
5153-
- target: {fileID: 4607504470098667674, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5133+
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
51545134
type: 3}
5155-
propertyPath: m_Mesh
5156-
value:
5135+
propertyPath: m_textInfo.characterCount
5136+
value: 0
5137+
objectReference: {fileID: 0}
5138+
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5139+
type: 3}
5140+
propertyPath: m_textInfo.spaceCount
5141+
value: 0
5142+
objectReference: {fileID: 0}
5143+
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5144+
type: 3}
5145+
propertyPath: m_textInfo.wordCount
5146+
value: 0
5147+
objectReference: {fileID: 0}
5148+
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5149+
type: 3}
5150+
propertyPath: m_textInfo.lineCount
5151+
value: 0
5152+
objectReference: {fileID: 0}
5153+
- target: {fileID: 7060011145322376313, guid: 3f1f46cbecbe08e46a303ccfdb5b498a,
5154+
type: 3}
5155+
propertyPath: m_textInfo.pageCount
5156+
value: 0
51575157
objectReference: {fileID: 0}
51585158
m_RemovedComponents: []
51595159
m_SourcePrefab: {fileID: 100100000, guid: 3f1f46cbecbe08e46a303ccfdb5b498a, type: 3}
@@ -6361,27 +6361,27 @@ PrefabInstance:
63616361
propertyPath: m_LocalScale.z
63626362
value: 0.24414062
63636363
objectReference: {fileID: 0}
6364-
- target: {fileID: 4610967451646196, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
6364+
- target: {fileID: 4891684840272184, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
63656365
propertyPath: m_LocalScale.x
63666366
value: 0.34179688
63676367
objectReference: {fileID: 0}
6368-
- target: {fileID: 4610967451646196, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
6368+
- target: {fileID: 4891684840272184, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
63696369
propertyPath: m_LocalScale.y
63706370
value: 0.34179688
63716371
objectReference: {fileID: 0}
6372-
- target: {fileID: 4610967451646196, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
6372+
- target: {fileID: 4891684840272184, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
63736373
propertyPath: m_LocalScale.z
63746374
value: 0.24414062
63756375
objectReference: {fileID: 0}
6376-
- target: {fileID: 4891684840272184, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
6376+
- target: {fileID: 4610967451646196, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
63776377
propertyPath: m_LocalScale.x
63786378
value: 0.34179688
63796379
objectReference: {fileID: 0}
6380-
- target: {fileID: 4891684840272184, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
6380+
- target: {fileID: 4610967451646196, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
63816381
propertyPath: m_LocalScale.y
63826382
value: 0.34179688
63836383
objectReference: {fileID: 0}
6384-
- target: {fileID: 4891684840272184, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
6384+
- target: {fileID: 4610967451646196, guid: 8b83134143223104c9bc3865a565cab3, type: 3}
63856385
propertyPath: m_LocalScale.z
63866386
value: 0.24414062
63876387
objectReference: {fileID: 0}

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/AnimationButton.prefab‎

Lines changed: 64 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,8 @@ GameObject:
265265
- component: {fileID: 65169310230401214}
266266
- component: {fileID: 114750426120364918}
267267
- component: {fileID: 1181576808188907290}
268-
- component: {fileID: 6267116981273118353}
268+
- component: {fileID: 5465629378273397920}
269+
- component: {fileID: 7752241226031117965}
269270
m_Layer: 0
270271
m_Name: AnimationButton
271272
m_TagString: Untagged
@@ -330,14 +331,10 @@ MonoBehaviour:
330331
OnClick:
331332
m_PersistentCalls:
332333
m_Calls: []
333-
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
334-
Culture=neutral, PublicKeyToken=null
335334
Events:
336335
- Event:
337336
m_PersistentCalls:
338337
m_Calls: []
339-
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
340-
Culture=neutral, PublicKeyToken=null
341338
ClassName: InteractableAudioReceiver
342339
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.UI.InteractableAudioReceiver,
343340
Microsoft.MixedReality.Toolkit.SDK, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
@@ -370,8 +367,6 @@ MonoBehaviour:
370367
EventValue:
371368
m_PersistentCalls:
372369
m_Calls: []
373-
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
374-
Culture=neutral, PublicKeyToken=null
375370
Options: []
376371
enabledOnStart: 1
377372
--- !u!114 &1181576808188907290
@@ -393,7 +388,7 @@ MonoBehaviour:
393388
localCenter: {x: 0, y: 0, z: -0.012441406}
394389
bounds: {x: 0.22007813, y: 0.063828126}
395390
touchableCollider: {fileID: 65169310230401214}
396-
--- !u!114 &6267116981273118353
391+
--- !u!114 &5465629378273397920
397392
MonoBehaviour:
398393
m_ObjectHideFlags: 0
399394
m_CorrespondingSourceObject: {fileID: 0}
@@ -402,46 +397,88 @@ MonoBehaviour:
402397
m_GameObject: {fileID: 1795626731574084}
403398
m_Enabled: 1
404399
m_EditorHideFlags: 0
405-
m_Script: {fileID: 11500000, guid: 093b74c6a1bc6234b92de4381632b9e4, type: 3}
400+
m_Script: {fileID: 11500000, guid: 63c897c097799da4a900032ad3471c47, type: 3}
406401
m_Name:
407402
m_EditorClassIdentifier:
408-
OnTouchStarted:
403+
movingButtonVisuals: {fileID: 0}
404+
distanceSpaceMode: 1
405+
startPushDistance: -0.002706699
406+
maxPushDistance: 0.2
407+
pressDistance: 0.007906422
408+
releaseDistanceDelta: 0.004763037
409+
returnSpeed: 25
410+
releaseOnTouchEnd: 1
411+
enforceFrontPush: 1
412+
TouchBegin:
409413
m_PersistentCalls:
410414
m_Calls:
411-
- m_Target: {fileID: 114750426120364918}
412-
m_MethodName: SetInputDown
413-
m_Mode: 1
415+
- m_Target: {fileID: 7752241226031117965}
416+
m_MethodName: OnHandPressTouched
417+
m_Mode: 0
414418
m_Arguments:
415419
m_ObjectArgument: {fileID: 0}
416-
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
420+
m_ObjectArgumentAssemblyTypeName:
417421
m_IntArgument: 0
418422
m_FloatArgument: 0
419423
m_StringArgument:
420424
m_BoolArgument: 0
421425
m_CallState: 2
422-
m_TypeName: Microsoft.MixedReality.Toolkit.UI.TouchEvent, Microsoft.MixedReality.Toolkit.SDK,
423-
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
424-
OnTouchCompleted:
426+
TouchEnd:
425427
m_PersistentCalls:
426428
m_Calls:
427-
- m_Target: {fileID: 114750426120364918}
428-
m_MethodName: SetInputUp
429-
m_Mode: 1
429+
- m_Target: {fileID: 7752241226031117965}
430+
m_MethodName: OnHandPressCompleted
431+
m_Mode: 0
430432
m_Arguments:
431433
m_ObjectArgument: {fileID: 0}
432-
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
434+
m_ObjectArgumentAssemblyTypeName:
433435
m_IntArgument: 0
434436
m_FloatArgument: 0
435437
m_StringArgument:
436438
m_BoolArgument: 0
437439
m_CallState: 2
438-
m_TypeName: Microsoft.MixedReality.Toolkit.UI.TouchEvent, Microsoft.MixedReality.Toolkit.SDK,
439-
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
440-
OnTouchUpdated:
440+
ButtonPressed:
441441
m_PersistentCalls:
442-
m_Calls: []
443-
m_TypeName: Microsoft.MixedReality.Toolkit.UI.TouchEvent, Microsoft.MixedReality.Toolkit.SDK,
444-
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
442+
m_Calls:
443+
- m_Target: {fileID: 7752241226031117965}
444+
m_MethodName: OnHandPressTriggered
445+
m_Mode: 0
446+
m_Arguments:
447+
m_ObjectArgument: {fileID: 0}
448+
m_ObjectArgumentAssemblyTypeName:
449+
m_IntArgument: 0
450+
m_FloatArgument: 0
451+
m_StringArgument:
452+
m_BoolArgument: 0
453+
m_CallState: 2
454+
ButtonReleased:
455+
m_PersistentCalls:
456+
m_Calls:
457+
- m_Target: {fileID: 7752241226031117965}
458+
m_MethodName: OnHandPressCompleted
459+
m_Mode: 0
460+
m_Arguments:
461+
m_ObjectArgument: {fileID: 0}
462+
m_ObjectArgumentAssemblyTypeName:
463+
m_IntArgument: 0
464+
m_FloatArgument: 0
465+
m_StringArgument:
466+
m_BoolArgument: 0
467+
m_CallState: 2
468+
--- !u!114 &7752241226031117965
469+
MonoBehaviour:
470+
m_ObjectHideFlags: 0
471+
m_CorrespondingSourceObject: {fileID: 0}
472+
m_PrefabInstance: {fileID: 0}
473+
m_PrefabAsset: {fileID: 0}
474+
m_GameObject: {fileID: 1795626731574084}
475+
m_Enabled: 1
476+
m_EditorHideFlags: 0
477+
m_Script: {fileID: 11500000, guid: 881d1ff8f009f5148b9f192e6ba31223, type: 3}
478+
m_Name:
479+
m_EditorClassIdentifier:
480+
routingTarget: {fileID: 114750426120364918}
481+
InteractableOnClick: 1
445482
--- !u!1 &1927372669350608
446483
GameObject:
447484
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)