Skip to content
This repository was archived by the owner on Sep 17, 2022. It is now read-only.

Commit 9881504

Browse files
Vin-dictiveVin-dictive
committed
Changes in UI for ARstage
1 parent 59c665a commit 9881504

File tree

2 files changed

+169
-45
lines changed

2 files changed

+169
-45
lines changed

‎Assets/Scenes/ARStage.unity‎

Lines changed: 154 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ GameObject:
131131
m_Component:
132132
- component: {fileID: 114593917}
133133
- component: {fileID: 114593918}
134+
- component: {fileID: 114593920}
135+
- component: {fileID: 114593919}
134136
m_Layer: 5
135137
m_Name: Bottom Buttons
136138
m_TagString: Untagged
@@ -159,8 +161,8 @@ RectTransform:
159161
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
160162
m_AnchorMin: {x: 0, y: 0}
161163
m_AnchorMax: {x: 1, y: 0}
162-
m_AnchoredPosition: {x: 0, y: 154.7998}
163-
m_SizeDelta: {x: 0, y: 154.88559}
164+
m_AnchoredPosition: {x: 0, y: 180.09998}
165+
m_SizeDelta: {x: 0, y: 180}
164166
m_Pivot: {x: 1, y: 1}
165167
--- !u!114 &114593918
166168
MonoBehaviour:
@@ -175,18 +177,55 @@ MonoBehaviour:
175177
m_Name:
176178
m_EditorClassIdentifier:
177179
m_Padding:
178-
m_Left: 25
179-
m_Right: 25
180-
m_Top: 25
181-
m_Bottom: 25
180+
m_Left: 20
181+
m_Right: 20
182+
m_Top: 20
183+
m_Bottom: 20
182184
m_ChildAlignment: 4
183-
m_Spacing: 25
185+
m_Spacing: 10
184186
m_ChildForceExpandWidth: 1
185187
m_ChildForceExpandHeight: 1
186-
m_ChildControlWidth: 1
187-
m_ChildControlHeight: 1
188+
m_ChildControlWidth: 0
189+
m_ChildControlHeight: 0
188190
m_ChildScaleWidth: 0
189191
m_ChildScaleHeight: 0
192+
--- !u!114 &114593919
193+
MonoBehaviour:
194+
m_ObjectHideFlags: 0
195+
m_CorrespondingSourceObject: {fileID: 0}
196+
m_PrefabInstance: {fileID: 0}
197+
m_PrefabAsset: {fileID: 0}
198+
m_GameObject: {fileID: 114593916}
199+
m_Enabled: 1
200+
m_EditorHideFlags: 0
201+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
202+
m_Name:
203+
m_EditorClassIdentifier:
204+
m_Material: {fileID: 0}
205+
m_Color: {r: 0.12941177, g: 0.14509805, b: 0.16078432, a: 0.47058824}
206+
m_RaycastTarget: 1
207+
m_Maskable: 1
208+
m_OnCullStateChanged:
209+
m_PersistentCalls:
210+
m_Calls: []
211+
m_Sprite: {fileID: 0}
212+
m_Type: 0
213+
m_PreserveAspect: 0
214+
m_FillCenter: 1
215+
m_FillMethod: 4
216+
m_FillAmount: 1
217+
m_FillClockwise: 1
218+
m_FillOrigin: 0
219+
m_UseSpriteMesh: 0
220+
m_PixelsPerUnitMultiplier: 1
221+
--- !u!222 &114593920
222+
CanvasRenderer:
223+
m_ObjectHideFlags: 0
224+
m_CorrespondingSourceObject: {fileID: 0}
225+
m_PrefabInstance: {fileID: 0}
226+
m_PrefabAsset: {fileID: 0}
227+
m_GameObject: {fileID: 114593916}
228+
m_CullTransparentMesh: 0
190229
--- !u!1 &145743102
191230
GameObject:
192231
m_ObjectHideFlags: 0
@@ -261,6 +300,81 @@ CanvasRenderer:
261300
m_PrefabAsset: {fileID: 0}
262301
m_GameObject: {fileID: 145743102}
263302
m_CullTransparentMesh: 0
303+
--- !u!1 &218829090
304+
GameObject:
305+
m_ObjectHideFlags: 0
306+
m_CorrespondingSourceObject: {fileID: 0}
307+
m_PrefabInstance: {fileID: 0}
308+
m_PrefabAsset: {fileID: 0}
309+
serializedVersion: 6
310+
m_Component:
311+
- component: {fileID: 218829091}
312+
- component: {fileID: 218829093}
313+
- component: {fileID: 218829092}
314+
m_Layer: 5
315+
m_Name: CommentsBox
316+
m_TagString: Untagged
317+
m_Icon: {fileID: 0}
318+
m_NavMeshLayer: 0
319+
m_StaticEditorFlags: 0
320+
m_IsActive: 1
321+
--- !u!224 &218829091
322+
RectTransform:
323+
m_ObjectHideFlags: 0
324+
m_CorrespondingSourceObject: {fileID: 0}
325+
m_PrefabInstance: {fileID: 0}
326+
m_PrefabAsset: {fileID: 0}
327+
m_GameObject: {fileID: 218829090}
328+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
329+
m_LocalPosition: {x: 0, y: 0, z: 0}
330+
m_LocalScale: {x: 1, y: 1, z: 1}
331+
m_Children:
332+
- {fileID: 703624899}
333+
m_Father: {fileID: 1149782917}
334+
m_RootOrder: 2
335+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
336+
m_AnchorMin: {x: 0, y: 0}
337+
m_AnchorMax: {x: 1, y: 0}
338+
m_AnchoredPosition: {x: 0, y: 259.15}
339+
m_SizeDelta: {x: 0, y: 158.10004}
340+
m_Pivot: {x: 0.5, y: 0.5}
341+
--- !u!114 &218829092
342+
MonoBehaviour:
343+
m_ObjectHideFlags: 0
344+
m_CorrespondingSourceObject: {fileID: 0}
345+
m_PrefabInstance: {fileID: 0}
346+
m_PrefabAsset: {fileID: 0}
347+
m_GameObject: {fileID: 218829090}
348+
m_Enabled: 1
349+
m_EditorHideFlags: 0
350+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
351+
m_Name:
352+
m_EditorClassIdentifier:
353+
m_Material: {fileID: 0}
354+
m_Color: {r: 0.12941177, g: 0.14509805, b: 0.16078432, a: 0.47058824}
355+
m_RaycastTarget: 1
356+
m_Maskable: 1
357+
m_OnCullStateChanged:
358+
m_PersistentCalls:
359+
m_Calls: []
360+
m_Sprite: {fileID: 0}
361+
m_Type: 0
362+
m_PreserveAspect: 0
363+
m_FillCenter: 1
364+
m_FillMethod: 4
365+
m_FillAmount: 1
366+
m_FillClockwise: 1
367+
m_FillOrigin: 0
368+
m_UseSpriteMesh: 0
369+
m_PixelsPerUnitMultiplier: 1
370+
--- !u!222 &218829093
371+
CanvasRenderer:
372+
m_ObjectHideFlags: 0
373+
m_CorrespondingSourceObject: {fileID: 0}
374+
m_PrefabInstance: {fileID: 0}
375+
m_PrefabAsset: {fileID: 0}
376+
m_GameObject: {fileID: 218829090}
377+
m_CullTransparentMesh: 0
264378
--- !u!1 &371620375
265379
GameObject:
266380
m_ObjectHideFlags: 0
@@ -298,7 +412,7 @@ RectTransform:
298412
m_AnchorMin: {x: 0, y: 0}
299413
m_AnchorMax: {x: 0, y: 0}
300414
m_AnchoredPosition: {x: 0, y: 0}
301-
m_SizeDelta: {x: 0, y: 0}
415+
m_SizeDelta: {x: 100.3045, y: 145.06757}
302416
m_Pivot: {x: 0.5, y: 0.5}
303417
--- !u!114 &371620377
304418
MonoBehaviour:
@@ -522,7 +636,7 @@ RectTransform:
522636
m_AnchorMin: {x: 0, y: 0}
523637
m_AnchorMax: {x: 0, y: 0}
524638
m_AnchoredPosition: {x: 0, y: 0}
525-
m_SizeDelta: {x: 0, y: 0}
639+
m_SizeDelta: {x: 100.3045, y: 145.06757}
526640
m_Pivot: {x: 0.5, y: 0.5}
527641
--- !u!114 &581808777
528642
MonoBehaviour:
@@ -868,12 +982,12 @@ MonoBehaviour:
868982
m_faceColor:
869983
serializedVersion: 2
870984
rgba: 4294967295
871-
m_fontSize: 45
872-
m_fontSizeBase: 45
985+
m_fontSize: 50
986+
m_fontSizeBase: 50
873987
m_fontWeight: 400
874988
m_enableAutoSizing: 0
875989
m_fontSizeMin: 18
876-
m_fontSizeMax: 72
990+
m_fontSizeMax: 65
877991
m_fontStyle: 0
878992
m_HorizontalAlignment: 2
879993
m_VerticalAlignment: 512
@@ -925,18 +1039,18 @@ RectTransform:
9251039
m_PrefabInstance: {fileID: 0}
9261040
m_PrefabAsset: {fileID: 0}
9271041
m_GameObject: {fileID: 703624896}
928-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1042+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
9291043
m_LocalPosition: {x: 0, y: 0, z: 0}
9301044
m_LocalScale: {x: 1, y: 1, z: 1}
9311045
m_Children: []
932-
m_Father: {fileID: 1149782917}
933-
m_RootOrder: 2
1046+
m_Father: {fileID: 218829091}
1047+
m_RootOrder: 0
9341048
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
935-
m_AnchorMin: {x: 0, y: 0.08113889}
936-
m_AnchorMax: {x: 1, y: 0.22982432}
937-
m_AnchoredPosition: {x: 0, y: 0.33789062}
938-
m_SizeDelta: {x: 0, y: 0.67596436}
939-
m_Pivot: {x: 0.5, y: 0.5}
1049+
m_AnchorMin: {x: 0, y: 0}
1050+
m_AnchorMax: {x: 1, y: 1}
1051+
m_AnchoredPosition: {x: 0, y: 0}
1052+
m_SizeDelta: {x: 0, y: 0}
1053+
m_Pivot: {x: 0.5, y: 1}
9401054
--- !u!1 &753343935
9411055
GameObject:
9421056
m_ObjectHideFlags: 0
@@ -974,7 +1088,7 @@ RectTransform:
9741088
m_AnchorMin: {x: 0, y: 0}
9751089
m_AnchorMax: {x: 0, y: 0}
9761090
m_AnchoredPosition: {x: 0, y: 0}
977-
m_SizeDelta: {x: 0, y: 0}
1091+
m_SizeDelta: {x: 100.3045, y: 145.06757}
9781092
m_Pivot: {x: 0.5, y: 0.5}
9791093
--- !u!114 &753343937
9801094
MonoBehaviour:
@@ -1257,15 +1371,15 @@ RectTransform:
12571371
m_GameObject: {fileID: 981664036}
12581372
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
12591373
m_LocalPosition: {x: 0, y: 0, z: 0}
1260-
m_LocalScale: {x: 1, y: 1, z: 1}
1374+
m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
12611375
m_Children: []
12621376
m_Father: {fileID: 1328576795}
12631377
m_RootOrder: 0
12641378
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
12651379
m_AnchorMin: {x: 0, y: 0}
12661380
m_AnchorMax: {x: 0, y: 0}
12671381
m_AnchoredPosition: {x: 0, y: 0}
1268-
m_SizeDelta: {x: 165.81818, y: 60}
1382+
m_SizeDelta: {x: 104.16243, y: 62}
12691383
m_Pivot: {x: 0.5, y: 0.5}
12701384
--- !u!114 &981664038
12711385
MonoBehaviour:
@@ -1386,7 +1500,7 @@ RectTransform:
13861500
m_GameObject: {fileID: 993349782}
13871501
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
13881502
m_LocalPosition: {x: 0, y: 0, z: 0}
1389-
m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
1503+
m_LocalScale: {x: 1, y: 1, z: 1}
13901504
m_Children:
13911505
- {fileID: 1487940039}
13921506
m_Father: {fileID: 114593917}
@@ -1395,7 +1509,7 @@ RectTransform:
13951509
m_AnchorMin: {x: 0, y: 0}
13961510
m_AnchorMax: {x: 0, y: 0}
13971511
m_AnchoredPosition: {x: 0, y: 0}
1398-
m_SizeDelta: {x: 0, y: 0}
1512+
m_SizeDelta: {x: 145.91281, y: 162.53375}
13991513
m_Pivot: {x: 0.5, y: 0.5}
14001514
--- !u!114 &993349784
14011515
MonoBehaviour:
@@ -1599,7 +1713,7 @@ RectTransform:
15991713
m_AnchorMin: {x: 0, y: 0}
16001714
m_AnchorMax: {x: 0, y: 0}
16011715
m_AnchoredPosition: {x: 0, y: 0}
1602-
m_SizeDelta: {x: 0, y: 0}
1716+
m_SizeDelta: {x: 100.3045, y: 145.06757}
16031717
m_Pivot: {x: 0.5, y: 0.5}
16041718
--- !u!114 &1138899816
16051719
MonoBehaviour:
@@ -1724,7 +1838,7 @@ RectTransform:
17241838
m_Children:
17251839
- {fileID: 1328576795}
17261840
- {fileID: 114593917}
1727-
- {fileID: 703624899}
1841+
- {fileID: 218829091}
17281842
m_Father: {fileID: 763329528}
17291843
m_RootOrder: 3
17301844
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1999,7 +2113,7 @@ RectTransform:
19992113
m_AnchorMin: {x: 0, y: 1}
20002114
m_AnchorMax: {x: 1, y: 1}
20012115
m_AnchoredPosition: {x: 0, y: 0}
2002-
m_SizeDelta: {x: 0, y: 109.63243}
2116+
m_SizeDelta: {x: 0, y: 160}
20032117
m_Pivot: {x: 1, y: 1}
20042118
--- !u!114 &1328576796
20052119
MonoBehaviour:
@@ -2014,7 +2128,7 @@ MonoBehaviour:
20142128
m_Name:
20152129
m_EditorClassIdentifier:
20162130
m_Material: {fileID: 0}
2017-
m_Color: {r: 1, g: 1, b: 1, a: 0}
2131+
m_Color: {r: 0.12941177, g: 0.14509805, b: 0.16078432, a: 0.47058824}
20182132
m_RaycastTarget: 1
20192133
m_Maskable: 1
20202134
m_OnCullStateChanged:
@@ -2051,14 +2165,14 @@ MonoBehaviour:
20512165
m_Name:
20522166
m_EditorClassIdentifier:
20532167
m_Padding:
2054-
m_Left: 0
2055-
m_Right: 0
2056-
m_Top: 0
2057-
m_Bottom: 0
2168+
m_Left: 25
2169+
m_Right: 25
2170+
m_Top: 25
2171+
m_Bottom: 25
20582172
m_ChildAlignment: 3
2059-
m_Spacing: 0
2173+
m_Spacing: 25
20602174
m_ChildForceExpandWidth: 1
2061-
m_ChildForceExpandHeight: 1
2175+
m_ChildForceExpandHeight: 0
20622176
m_ChildControlWidth: 0
20632177
m_ChildControlHeight: 0
20642178
m_ChildScaleWidth: 0
@@ -2196,7 +2310,7 @@ RectTransform:
21962310
m_GameObject: {fileID: 1487940038}
21972311
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
21982312
m_LocalPosition: {x: 0, y: 0, z: 0}
2199-
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
2313+
m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
22002314
m_Children: []
22012315
m_Father: {fileID: 993349783}
22022316
m_RootOrder: 0
@@ -2278,7 +2392,7 @@ RectTransform:
22782392
m_AnchorMin: {x: 0, y: 0}
22792393
m_AnchorMax: {x: 0, y: 0}
22802394
m_AnchoredPosition: {x: 0, y: 0}
2281-
m_SizeDelta: {x: 532.1884, y: 60}
2395+
m_SizeDelta: {x: 460.229, y: 64.50248}
22822396
m_Pivot: {x: 0.5, y: 0.5}
22832397
--- !u!114 &1545845629
22842398
MonoBehaviour:
@@ -2334,7 +2448,7 @@ MonoBehaviour:
23342448
m_fontSizeMin: 18
23352449
m_fontSizeMax: 65
23362450
m_fontStyle: 0
2337-
m_HorizontalAlignment: 2
2451+
m_HorizontalAlignment: 1
23382452
m_VerticalAlignment: 512
23392453
m_textAlignment: 65535
23402454
m_characterSpacing: 0

‎Assets/Scripts/ParametersMenu.cs‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,25 @@ private void FixedUpdate()
4949
panelFlag = true;
5050
}
5151
List<string> variables = new List<string>(objectParameter.Keys);
52-
foreach (var variable in variables)
52+
//If variables.Count == 0 means if there are no parameters itself then SubmitParametersButton should be not interactable
53+
if(variables.Count == 0)
5354
{
54-
if (!customParameters.ContainsKey(variable))
55+
SubmitParametersButton.interactable = false;
56+
57+
}
58+
else
59+
{
60+
foreach (var variable in variables)
5561
{
56-
SubmitParametersButton.interactable = false;
57-
break;
62+
if (!customParameters.ContainsKey(variable))
63+
{
64+
SubmitParametersButton.interactable = false;
65+
break;
66+
}
67+
SubmitParametersButton.interactable = true;
5868
}
59-
SubmitParametersButton.interactable = true;
6069
}
70+
6171

6272

6373
}

0 commit comments

Comments
 (0)