Skip to content

Commit 7ab17a0

Browse files
dbirmandbirman
committed
Fixing many bugs
1 parent eb61611 commit 7ab17a0

File tree

9 files changed

+250
-148
lines changed

9 files changed

+250
-148
lines changed

‎Assets/Prefabs/SettingsMenu/Menus/ExperimentMenu.prefab‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -653,13 +653,13 @@ RectTransform:
653653
- {fileID: 8925502043681074252}
654654
- {fileID: 4137781434693871483}
655655
m_Father: {fileID: 1909864815618867342}
656-
m_RootOrder: 1
656+
m_RootOrder: 0
657657
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
658-
m_AnchorMin: {x: 1, y: 0}
659-
m_AnchorMax: {x: 1, y: 1}
660-
m_AnchoredPosition: {x: 813.5, y: 0}
661-
m_SizeDelta: {x: 500, y: 0}
662-
m_Pivot: {x: 1, y: 0.5}
658+
m_AnchorMin: {x: 0.5, y: 0.5}
659+
m_AnchorMax: {x: 0.5, y: 0.5}
660+
m_AnchoredPosition: {x: -0.00012207031, y: 0}
661+
m_SizeDelta: {x: 500, y: 50}
662+
m_Pivot: {x: 0.5, y: 0.5}
663663
--- !u!222 &6024718594126969813
664664
CanvasRenderer:
665665
m_ObjectHideFlags: 0
@@ -3456,16 +3456,16 @@ RectTransform:
34563456
m_LocalScale: {x: 1.0006404, y: 1.0006403, z: 1.0006403}
34573457
m_ConstrainProportionsScale: 0
34583458
m_Children:
3459-
- {fileID: 7047575450600247972}
34603459
- {fileID: 3066221252148358747}
3460+
- {fileID: 7047575450600247972}
34613461
m_Father: {fileID: 3614724520646927962}
34623462
m_RootOrder: 1
34633463
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
34643464
m_AnchorMin: {x: 0, y: 0}
34653465
m_AnchorMax: {x: 0, y: 0}
34663466
m_AnchoredPosition: {x: 0, y: 0}
3467-
m_SizeDelta: {x: 0, y: 50}
3468-
m_Pivot: {x: 0.5, y: 1}
3467+
m_SizeDelta: {x: 1625, y: 50}
3468+
m_Pivot: {x: 0, y: 1}
34693469
--- !u!222 &9208426107008935037
34703470
CanvasRenderer:
34713471
m_ObjectHideFlags: 0
@@ -3872,13 +3872,13 @@ RectTransform:
38723872
m_Children:
38733873
- {fileID: 3463134205953932359}
38743874
m_Father: {fileID: 1909864815618867342}
3875-
m_RootOrder: 0
3875+
m_RootOrder: 1
38763876
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3877-
m_AnchorMin: {x: 0, y: 0.5}
3878-
m_AnchorMax: {x: 0, y: 0.5}
3879-
m_AnchoredPosition: {x: -0.00006099609, y: 0}
3877+
m_AnchorMin: {x: 1, y: 0.5}
3878+
m_AnchorMax: {x: 1, y: 0.5}
3879+
m_AnchoredPosition: {x: -17.13, y: 0}
38803880
m_SizeDelta: {x: 267, y: 30}
3881-
m_Pivot: {x: 0, y: 0.5}
3881+
m_Pivot: {x: 1, y: 0.5}
38823882
--- !u!222 &8080080724534934925
38833883
CanvasRenderer:
38843884
m_ObjectHideFlags: 0

‎Assets/Scenes/TrajectoryPlanner.unity‎

Lines changed: 77 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -749,15 +749,15 @@ Transform:
749749
m_Father: {fileID: 0}
750750
m_RootOrder: 8
751751
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
752-
--- !u!114 &1020089445 stripped
752+
--- !u!114 &1020089447 stripped
753753
MonoBehaviour:
754-
m_CorrespondingSourceObject: {fileID: 8649147448947455835, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
754+
m_CorrespondingSourceObject: {fileID: 1111053594748486506, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
755755
m_PrefabInstance: {fileID: 341190943874437988}
756756
m_PrefabAsset: {fileID: 0}
757757
m_GameObject: {fileID: 0}
758758
m_Enabled: 1
759759
m_EditorHideFlags: 0
760-
m_Script: {fileID: 11500000, guid: eb50476a2f404ef4bb87f6de9dd43a57, type: 3}
760+
m_Script: {fileID: 11500000, guid: 7b743370ac3e4ec2a1668f5455a8ef8a, type: 3}
761761
m_Name:
762762
m_EditorClassIdentifier:
763763
--- !u!114 &1047957689 stripped
@@ -903,6 +903,11 @@ RectTransform:
903903
m_CorrespondingSourceObject: {fileID: 2395954049702337235, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
904904
m_PrefabInstance: {fileID: 341190943874437988}
905905
m_PrefabAsset: {fileID: 0}
906+
--- !u!1 &1301728378 stripped
907+
GameObject:
908+
m_CorrespondingSourceObject: {fileID: 9110716641384000381, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
909+
m_PrefabInstance: {fileID: 341190943874437988}
910+
m_PrefabAsset: {fileID: 0}
906911
--- !u!114 &1307370777 stripped
907912
MonoBehaviour:
908913
m_CorrespondingSourceObject: {fileID: 341190945177056893, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
@@ -1181,15 +1186,15 @@ PrefabInstance:
11811186
- target: {fileID: 7375321954526526105, guid: cfe4069a636d24749b8858eb289cac65, type: 3}
11821187
propertyPath: _activeExperimentUI
11831188
value:
1184-
objectReference: {fileID: 1020089445}
1189+
objectReference: {fileID: 0}
11851190
- target: {fileID: 7375321954526526105, guid: cfe4069a636d24749b8858eb289cac65, type: 3}
11861191
propertyPath: activeExpListBehavior
11871192
value:
1188-
objectReference: {fileID: 1020089445}
1193+
objectReference: {fileID: 0}
11891194
- target: {fileID: 7375321954526526105, guid: cfe4069a636d24749b8858eb289cac65, type: 3}
11901195
propertyPath: _activeExpListBehavior
11911196
value:
1192-
objectReference: {fileID: 1020089445}
1197+
objectReference: {fileID: 0}
11931198
- target: {fileID: 7375321954526526105, guid: cfe4069a636d24749b8858eb289cac65, type: 3}
11941199
propertyPath: _insertionPrefabParentT
11951200
value:
@@ -1297,7 +1302,7 @@ PrefabInstance:
12971302
- target: {fileID: 7375321954526526105, guid: cfe4069a636d24749b8858eb289cac65, type: 3}
12981303
propertyPath: InsertionListChangeEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target
12991304
value:
1300-
objectReference: {fileID: 1020089445}
1305+
objectReference: {fileID: 1556897675}
13011306
- target: {fileID: 7375321954526526105, guid: cfe4069a636d24749b8858eb289cac65, type: 3}
13021307
propertyPath: InsertionNameChangeEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target
13031308
value:
@@ -1309,7 +1314,7 @@ PrefabInstance:
13091314
- target: {fileID: 7375321954526526105, guid: cfe4069a636d24749b8858eb289cac65, type: 3}
13101315
propertyPath: ExperimentListChangeEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target
13111316
value:
1312-
objectReference: {fileID: 1020089445}
1317+
objectReference: {fileID: 1556897675}
13131318
- target: {fileID: 7375321954526526105, guid: cfe4069a636d24749b8858eb289cac65, type: 3}
13141319
propertyPath: ExperimentListChangeEvent.m_PersistentCalls.m_Calls.Array.data[1].m_Target
13151320
value:
@@ -1526,7 +1531,7 @@ MonoBehaviour:
15261531
m_CorrespondingSourceObject: {fileID: 4272515941860082285, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
15271532
m_PrefabInstance: {fileID: 341190943874437988}
15281533
m_PrefabAsset: {fileID: 0}
1529-
m_GameObject: {fileID: 0}
1534+
m_GameObject: {fileID: 1301728378}
15301535
m_Enabled: 1
15311536
m_EditorHideFlags: 0
15321537
m_Script: {fileID: 11500000, guid: ef8f26d31ab1d734bbc23784541694bf, type: 3}
@@ -1537,12 +1542,28 @@ MonoBehaviour:
15371542
m_CorrespondingSourceObject: {fileID: 7532817799878068805, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
15381543
m_PrefabInstance: {fileID: 341190943874437988}
15391544
m_PrefabAsset: {fileID: 0}
1540-
m_GameObject: {fileID: 0}
1545+
m_GameObject: {fileID: 1301728378}
15411546
m_Enabled: 1
15421547
m_EditorHideFlags: 0
15431548
m_Script: {fileID: 11500000, guid: a0526e6704a227043a78c93fa5a9722e, type: 3}
15441549
m_Name:
15451550
m_EditorClassIdentifier:
1551+
--- !u!114 &1556897675
1552+
MonoBehaviour:
1553+
m_ObjectHideFlags: 0
1554+
m_CorrespondingSourceObject: {fileID: 0}
1555+
m_PrefabInstance: {fileID: 0}
1556+
m_PrefabAsset: {fileID: 0}
1557+
m_GameObject: {fileID: 1301728378}
1558+
m_Enabled: 1
1559+
m_EditorHideFlags: 0
1560+
m_Script: {fileID: 11500000, guid: eb50476a2f404ef4bb87f6de9dd43a57, type: 3}
1561+
m_Name:
1562+
m_EditorClassIdentifier:
1563+
_accountsManager: {fileID: 809984607}
1564+
_optionList: {fileID: 1020089447}
1565+
_insertionPrefabParentT: {fileID: 1289697145}
1566+
_insertionPrefabGO: {fileID: 2594497399418726603, guid: 15d8c14afd6b3764886833a616bc6c2e, type: 3}
15461567
--- !u!114 &1572420109 stripped
15471568
MonoBehaviour:
15481569
m_CorrespondingSourceObject: {fileID: 6854367561162462583, guid: 3d86af372ed9f2e41b42b525846d962f, type: 3}
@@ -1870,15 +1891,15 @@ PrefabInstance:
18701891
objectReference: {fileID: 1703646459}
18711892
- target: {fileID: 341190943836035196, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
18721893
propertyPath: m_AnchorMax.y
1873-
value: 1
1894+
value: 0
18741895
objectReference: {fileID: 0}
18751896
- target: {fileID: 341190943836035196, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
18761897
propertyPath: m_AnchorMin.y
1877-
value: 1
1898+
value: 0
18781899
objectReference: {fileID: 0}
18791900
- target: {fileID: 341190943836035196, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
18801901
propertyPath: m_AnchoredPosition.x
1881-
value: 169.88
1902+
value: 0
18821903
objectReference: {fileID: 0}
18831904
- target: {fileID: 341190943836276264, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
18841905
propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -1974,19 +1995,19 @@ PrefabInstance:
19741995
objectReference: {fileID: 1445581475}
19751996
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
19761997
propertyPath: m_AnchorMax.y
1977-
value: 1
1998+
value: 0
19781999
objectReference: {fileID: 0}
19792000
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
19802001
propertyPath: m_AnchorMin.y
1981-
value: 1
2002+
value: 0
19822003
objectReference: {fileID: 0}
19832004
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
19842005
propertyPath: m_AnchoredPosition.x
1985-
value: 354.84
2006+
value: 0
19862007
objectReference: {fileID: 0}
19872008
- target: {fileID: 341190944034978748, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
19882009
propertyPath: m_AnchoredPosition.y
1989-
value: -15
2010+
value: 0
19902011
objectReference: {fileID: 0}
19912012
- target: {fileID: 341190944083206642, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
19922013
propertyPath: m_Name
@@ -2178,19 +2199,19 @@ PrefabInstance:
21782199
objectReference: {fileID: 0}
21792200
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
21802201
propertyPath: m_AnchorMax.y
2181-
value: 1
2202+
value: 0
21822203
objectReference: {fileID: 0}
21832204
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
21842205
propertyPath: m_AnchorMin.y
2185-
value: 1
2206+
value: 0
21862207
objectReference: {fileID: 0}
21872208
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
21882209
propertyPath: m_AnchoredPosition.x
2189-
value: 384.91998
2210+
value: 0
21902211
objectReference: {fileID: 0}
21912212
- target: {fileID: 341190944410943211, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
21922213
propertyPath: m_AnchoredPosition.y
2193-
value: -15
2214+
value: 0
21942215
objectReference: {fileID: 0}
21952216
- target: {fileID: 341190944411999430, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
21962217
propertyPath: m_AnchorMax.y
@@ -2776,6 +2797,18 @@ PrefabInstance:
27762797
propertyPath: m_AnchoredPosition.y
27772798
value: -22.5
27782799
objectReference: {fileID: 0}
2800+
- target: {fileID: 1111053594748486506, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
2801+
propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
2802+
value:
2803+
objectReference: {fileID: 1556897675}
2804+
- target: {fileID: 1111053594748486506, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
2805+
propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
2806+
value: SelectExperiment
2807+
objectReference: {fileID: 0}
2808+
- target: {fileID: 1111053594748486506, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
2809+
propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
2810+
value: ActiveExperimentUI, trajectoryplanner.accounts
2811+
objectReference: {fileID: 0}
27792812
- target: {fileID: 1167238124764359298, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
27802813
propertyPath: m_AnchorMax.y
27812814
value: 1
@@ -2790,7 +2823,7 @@ PrefabInstance:
27902823
objectReference: {fileID: 0}
27912824
- target: {fileID: 1167238124764359298, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
27922825
propertyPath: m_AnchoredPosition.y
2793-
value: -664.25
2826+
value: -682
27942827
objectReference: {fileID: 0}
27952828
- target: {fileID: 1386578852705045263, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
27962829
propertyPath: m_AnchorMax.y
@@ -3078,7 +3111,7 @@ PrefabInstance:
30783111
objectReference: {fileID: 0}
30793112
- target: {fileID: 2783893624780736455, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
30803113
propertyPath: m_AnchoredPosition.y
3081-
value: -195
3114+
value: -213.5
30823115
objectReference: {fileID: 0}
30833116
- target: {fileID: 2822526365176310521, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
30843117
propertyPath: m_Navigation.m_Mode
@@ -3118,19 +3151,19 @@ PrefabInstance:
31183151
objectReference: {fileID: 0}
31193152
- target: {fileID: 3281950704911050635, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
31203153
propertyPath: m_AnchorMax.y
3121-
value: 1
3154+
value: 0.5
31223155
objectReference: {fileID: 0}
31233156
- target: {fileID: 3281950704911050635, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
31243157
propertyPath: m_AnchorMin.y
3125-
value: 1
3158+
value: 0.5
31263159
objectReference: {fileID: 0}
31273160
- target: {fileID: 3281950704911050635, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
3128-
propertyPath: m_AnchoredPosition.x
3129-
value: 946
3161+
propertyPath: m_LocalPosition.z
3162+
value: 0.00092697144
31303163
objectReference: {fileID: 0}
31313164
- target: {fileID: 3281950704911050635, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
3132-
propertyPath: m_AnchoredPosition.y
3133-
value: -135.75
3165+
propertyPath: m_AnchoredPosition.x
3166+
value: -12.719971
31343167
objectReference: {fileID: 0}
31353168
- target: {fileID: 3334374373121848842, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
31363169
propertyPath: m_AnchorMax.x
@@ -3708,6 +3741,18 @@ PrefabInstance:
37083741
propertyPath: m_AnchoredPosition.y
37093742
value: 0
37103743
objectReference: {fileID: 0}
3744+
- target: {fileID: 6252372463387194785, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
3745+
propertyPath: m_AnchorMax.y
3746+
value: 1
3747+
objectReference: {fileID: 0}
3748+
- target: {fileID: 6252372463387194785, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
3749+
propertyPath: m_AnchorMin.y
3750+
value: 1
3751+
objectReference: {fileID: 0}
3752+
- target: {fileID: 6252372463387194785, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
3753+
propertyPath: m_AnchoredPosition.y
3754+
value: -120
3755+
objectReference: {fileID: 0}
37113756
- target: {fileID: 6254825169256529800, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
37123757
propertyPath: m_AnchorMax.x
37133758
value: 1
@@ -3718,7 +3763,7 @@ PrefabInstance:
37183763
objectReference: {fileID: 0}
37193764
- target: {fileID: 6254825169256529800, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
37203765
propertyPath: m_AnchorMin.y
3721-
value: 0
3766+
value: 0.00000023841858
37223767
objectReference: {fileID: 0}
37233768
- target: {fileID: 6256937153660463079, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
37243769
propertyPath: m_AnchorMax.y
@@ -4280,7 +4325,8 @@ PrefabInstance:
42804325
propertyPath: m_IsActive
42814326
value: 0
42824327
objectReference: {fileID: 0}
4283-
m_RemovedComponents: []
4328+
m_RemovedComponents:
4329+
- {fileID: 8649147448947455835, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
42844330
m_SourcePrefab: {fileID: 100100000, guid: 94cdeca105038d74ea47b57e6b99eb4e, type: 3}
42854331
--- !u!114 &341190943874437989 stripped
42864332
MonoBehaviour:

0 commit comments

Comments
 (0)