Skip to content

Commit 6abecb1

Browse files
committed
MInor fix
1 parent d751a54 commit 6abecb1

2 files changed

Lines changed: 146 additions & 11 deletions

File tree

FRC WebGL/Samples/Demo.unity

Lines changed: 144 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,10 @@ MonoBehaviour:
189189
- {fileID: 1121132170}
190190
_loadInt1Button: {fileID: 141045118}
191191
_loadInt2Button: {fileID: 1281457764}
192+
_loadBool1Button: {fileID: 360524261}
193+
_loadBool2Button: {fileID: 484773023}
192194
_loadString1Button: {fileID: 1939346939}
193195
_loadString2Button: {fileID: 1326402124}
194-
_loadBool1Button: {fileID: 1939346939}
195-
_loadBool2Button: {fileID: 484773023}
196196
_loadJson1Button: {fileID: 751126529}
197197
_loadJson2Button: {fileID: 1121132170}
198198
_debugInfo: {fileID: 261426141}
@@ -230,8 +230,8 @@ RectTransform:
230230
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
231231
m_AnchorMin: {x: 0, y: 0}
232232
m_AnchorMax: {x: 1, y: 0}
233-
m_AnchoredPosition: {x: 1.6442871, y: 0.00024414062}
234-
m_SizeDelta: {x: -198.67, y: 264.603}
233+
m_AnchoredPosition: {x: -0.00024414062, y: 0.00024414062}
234+
m_SizeDelta: {x: -201.96, y: 309.18}
235235
m_Pivot: {x: 0.5, y: 0}
236236
--- !u!114 &261426141
237237
MonoBehaviour:
@@ -316,7 +316,7 @@ MonoBehaviour:
316316
m_VertexBufferAutoSizeReduction: 0
317317
m_useMaxVisibleDescender: 1
318318
m_pageToDisplay: 1
319-
m_margin: {x: 0, y: 0, z: 0, w: 46.023834}
319+
m_margin: {x: 0, y: 0, z: 0, w: 81.77798}
320320
m_isUsingLegacyAnimationComponent: 0
321321
m_isVolumetricText: 0
322322
m_hasFontAssetChanged: 0
@@ -422,7 +422,7 @@ PrefabInstance:
422422
objectReference: {fileID: 0}
423423
- target: {fileID: 3076469077915156723, guid: 44f1f4c64d9438b48b7789bfbc829bda, type: 3}
424424
propertyPath: m_AnchoredPosition.x
425-
value: 0.0015869141
425+
value: 0.0014648438
426426
objectReference: {fileID: 0}
427427
- target: {fileID: 3076469077915156723, guid: 44f1f4c64d9438b48b7789bfbc829bda, type: 3}
428428
propertyPath: m_AnchoredPosition.y
@@ -568,7 +568,7 @@ PrefabInstance:
568568
objectReference: {fileID: 0}
569569
- target: {fileID: 3076469077915156723, guid: 44f1f4c64d9438b48b7789bfbc829bda, type: 3}
570570
propertyPath: m_AnchoredPosition.x
571-
value: 0.0015869141
571+
value: 0.0014648438
572572
objectReference: {fileID: 0}
573573
- target: {fileID: 3076469077915156723, guid: 44f1f4c64d9438b48b7789bfbc829bda, type: 3}
574574
propertyPath: m_AnchoredPosition.y
@@ -725,7 +725,7 @@ PrefabInstance:
725725
objectReference: {fileID: 0}
726726
- target: {fileID: 3076469077915156723, guid: 44f1f4c64d9438b48b7789bfbc829bda, type: 3}
727727
propertyPath: m_AnchoredPosition.x
728-
value: 0.0015869141
728+
value: 0.0014648438
729729
objectReference: {fileID: 0}
730730
- target: {fileID: 3076469077915156723, guid: 44f1f4c64d9438b48b7789bfbc829bda, type: 3}
731731
propertyPath: m_AnchoredPosition.y
@@ -1251,6 +1251,7 @@ RectTransform:
12511251
- {fileID: 1484138573}
12521252
- {fileID: 1124975735}
12531253
- {fileID: 261426140}
1254+
- {fileID: 2105753396}
12541255
m_Father: {fileID: 0}
12551256
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
12561257
m_AnchorMin: {x: 0, y: 0}
@@ -1269,6 +1270,140 @@ MonoBehaviour:
12691270
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
12701271
m_Name:
12711272
m_EditorClassIdentifier:
1273+
--- !u!1 &2105753395
1274+
GameObject:
1275+
m_ObjectHideFlags: 0
1276+
m_CorrespondingSourceObject: {fileID: 0}
1277+
m_PrefabInstance: {fileID: 0}
1278+
m_PrefabAsset: {fileID: 0}
1279+
serializedVersion: 6
1280+
m_Component:
1281+
- component: {fileID: 2105753396}
1282+
- component: {fileID: 2105753398}
1283+
- component: {fileID: 2105753397}
1284+
m_Layer: 5
1285+
m_Name: VersionText
1286+
m_TagString: Untagged
1287+
m_Icon: {fileID: 0}
1288+
m_NavMeshLayer: 0
1289+
m_StaticEditorFlags: 0
1290+
m_IsActive: 1
1291+
--- !u!224 &2105753396
1292+
RectTransform:
1293+
m_ObjectHideFlags: 0
1294+
m_CorrespondingSourceObject: {fileID: 0}
1295+
m_PrefabInstance: {fileID: 0}
1296+
m_PrefabAsset: {fileID: 0}
1297+
m_GameObject: {fileID: 2105753395}
1298+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
1299+
m_LocalPosition: {x: 0, y: 0, z: 0}
1300+
m_LocalScale: {x: 1, y: 1, z: 1}
1301+
m_ConstrainProportionsScale: 0
1302+
m_Children: []
1303+
m_Father: {fileID: 1936665340}
1304+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1305+
m_AnchorMin: {x: 1, y: 0}
1306+
m_AnchorMax: {x: 1, y: 0}
1307+
m_AnchoredPosition: {x: -100.98, y: 0}
1308+
m_SizeDelta: {x: 240.39197, y: 80.971}
1309+
m_Pivot: {x: 1, y: 0}
1310+
--- !u!114 &2105753397
1311+
MonoBehaviour:
1312+
m_ObjectHideFlags: 0
1313+
m_CorrespondingSourceObject: {fileID: 0}
1314+
m_PrefabInstance: {fileID: 0}
1315+
m_PrefabAsset: {fileID: 0}
1316+
m_GameObject: {fileID: 2105753395}
1317+
m_Enabled: 1
1318+
m_EditorHideFlags: 0
1319+
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
1320+
m_Name:
1321+
m_EditorClassIdentifier:
1322+
m_Material: {fileID: 0}
1323+
m_Color: {r: 1, g: 1, b: 1, a: 1}
1324+
m_RaycastTarget: 0
1325+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
1326+
m_Maskable: 1
1327+
m_OnCullStateChanged:
1328+
m_PersistentCalls:
1329+
m_Calls: []
1330+
m_text: 1.0.0
1331+
m_isRightToLeft: 0
1332+
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
1333+
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
1334+
m_fontSharedMaterials: []
1335+
m_fontMaterial: {fileID: 0}
1336+
m_fontMaterials: []
1337+
m_fontColor32:
1338+
serializedVersion: 2
1339+
rgba: 4278190080
1340+
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
1341+
m_enableVertexGradient: 0
1342+
m_colorMode: 3
1343+
m_fontColorGradient:
1344+
topLeft: {r: 1, g: 1, b: 1, a: 1}
1345+
topRight: {r: 1, g: 1, b: 1, a: 1}
1346+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
1347+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
1348+
m_fontColorGradientPreset: {fileID: 0}
1349+
m_spriteAsset: {fileID: 0}
1350+
m_tintAllSprites: 0
1351+
m_StyleSheet: {fileID: 0}
1352+
m_TextStyleHashCode: -1183493901
1353+
m_overrideHtmlColors: 0
1354+
m_faceColor:
1355+
serializedVersion: 2
1356+
rgba: 4294967295
1357+
m_fontSize: 50
1358+
m_fontSizeBase: 50
1359+
m_fontWeight: 400
1360+
m_enableAutoSizing: 0
1361+
m_fontSizeMin: 30
1362+
m_fontSizeMax: 50
1363+
m_fontStyle: 1
1364+
m_HorizontalAlignment: 4
1365+
m_VerticalAlignment: 512
1366+
m_textAlignment: 65535
1367+
m_characterSpacing: 0
1368+
m_wordSpacing: 0
1369+
m_lineSpacing: 0
1370+
m_lineSpacingMax: 0
1371+
m_paragraphSpacing: 0
1372+
m_charWidthMaxAdj: 0
1373+
m_enableWordWrapping: 1
1374+
m_wordWrappingRatios: 0.4
1375+
m_overflowMode: 3
1376+
m_linkedTextComponent: {fileID: 0}
1377+
parentLinkedComponent: {fileID: 0}
1378+
m_enableKerning: 1
1379+
m_enableExtraPadding: 0
1380+
checkPaddingRequired: 0
1381+
m_isRichText: 1
1382+
m_parseCtrlCharacters: 1
1383+
m_isOrthographic: 1
1384+
m_isCullingEnabled: 0
1385+
m_horizontalMapping: 0
1386+
m_verticalMapping: 0
1387+
m_uvLineOffset: 0
1388+
m_geometrySortingOrder: 0
1389+
m_IsTextObjectScaleStatic: 0
1390+
m_VertexBufferAutoSizeReduction: 0
1391+
m_useMaxVisibleDescender: 1
1392+
m_pageToDisplay: 1
1393+
m_margin: {x: 0, y: 0, z: -0.000000075732856, w: 0.14270046}
1394+
m_isUsingLegacyAnimationComponent: 0
1395+
m_isVolumetricText: 0
1396+
m_hasFontAssetChanged: 0
1397+
m_baseMaterial: {fileID: 0}
1398+
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
1399+
--- !u!222 &2105753398
1400+
CanvasRenderer:
1401+
m_ObjectHideFlags: 0
1402+
m_CorrespondingSourceObject: {fileID: 0}
1403+
m_PrefabInstance: {fileID: 0}
1404+
m_PrefabAsset: {fileID: 0}
1405+
m_GameObject: {fileID: 2105753395}
1406+
m_CullTransparentMesh: 1
12721407
--- !u!1001 &6389701955673174628
12731408
PrefabInstance:
12741409
m_ObjectHideFlags: 0
@@ -1339,7 +1474,7 @@ PrefabInstance:
13391474
objectReference: {fileID: 0}
13401475
- target: {fileID: 3076469077915156723, guid: 44f1f4c64d9438b48b7789bfbc829bda, type: 3}
13411476
propertyPath: m_AnchoredPosition.x
1342-
value: 0.0015869141
1477+
value: 0.0014648438
13431478
objectReference: {fileID: 0}
13441479
- target: {fileID: 3076469077915156723, guid: 44f1f4c64d9438b48b7789bfbc829bda, type: 3}
13451480
propertyPath: m_AnchoredPosition.y

FRC WebGL/Samples/Scripts/TestEntryPoint.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ public class TestEntryPoint : MonoBehaviour
1313
[SerializeField, Space] private Button[] _availableButtons;
1414
[SerializeField, Space] private Button _loadInt1Button;
1515
[SerializeField] private Button _loadInt2Button;
16-
[SerializeField, Space] private Button _loadString1Button;
17-
[SerializeField] private Button _loadString2Button;
1816
[SerializeField, Space] private Button _loadBool1Button;
1917
[SerializeField] private Button _loadBool2Button;
18+
[SerializeField, Space] private Button _loadString1Button;
19+
[SerializeField] private Button _loadString2Button;
2020
[SerializeField, Space] private Button _loadJson1Button;
2121
[SerializeField] private Button _loadJson2Button;
2222
[SerializeField, Space] private TextMeshProUGUI _debugInfo;

0 commit comments

Comments
 (0)