Skip to content

Commit c2bfef6

Browse files
authored
Merge pull request #889 from skeyll/feature/relogin-on-expiration
Add: login with the used option.
2 parents 794516b + a2f7a51 commit c2bfef6

File tree

3 files changed

+427
-18
lines changed

3 files changed

+427
-18
lines changed

Assets/Scenes/TestingAndValidationScenes/AuthenticationExpirationTest.unity

Lines changed: 238 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%YAML 1.1
1+
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!29 &1
44
OcclusionCullingSettings:
@@ -318,6 +318,141 @@ Transform:
318318
m_Father: {fileID: 0}
319319
m_RootOrder: 4
320320
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
321+
--- !u!1 &95571500
322+
GameObject:
323+
m_ObjectHideFlags: 0
324+
m_CorrespondingSourceObject: {fileID: 0}
325+
m_PrefabInstance: {fileID: 0}
326+
m_PrefabAsset: {fileID: 0}
327+
serializedVersion: 6
328+
m_Component:
329+
- component: {fileID: 95571501}
330+
- component: {fileID: 95571504}
331+
- component: {fileID: 95571503}
332+
- component: {fileID: 95571502}
333+
m_Layer: 0
334+
m_Name: Start Connect Test Button
335+
m_TagString: Untagged
336+
m_Icon: {fileID: 0}
337+
m_NavMeshLayer: 0
338+
m_StaticEditorFlags: 0
339+
m_IsActive: 1
340+
--- !u!224 &95571501
341+
RectTransform:
342+
m_ObjectHideFlags: 0
343+
m_CorrespondingSourceObject: {fileID: 0}
344+
m_PrefabInstance: {fileID: 0}
345+
m_PrefabAsset: {fileID: 0}
346+
m_GameObject: {fileID: 95571500}
347+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
348+
m_LocalPosition: {x: 0, y: 0, z: 0}
349+
m_LocalScale: {x: 1, y: 1, z: 1}
350+
m_ConstrainProportionsScale: 0
351+
m_Children:
352+
- {fileID: 1736631110}
353+
m_Father: {fileID: 413195475}
354+
m_RootOrder: 1
355+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
356+
m_AnchorMin: {x: 0, y: 1}
357+
m_AnchorMax: {x: 0, y: 1}
358+
m_AnchoredPosition: {x: 0, y: -50}
359+
m_SizeDelta: {x: 400, y: 50}
360+
m_Pivot: {x: 0, y: 1}
361+
--- !u!114 &95571502
362+
MonoBehaviour:
363+
m_ObjectHideFlags: 0
364+
m_CorrespondingSourceObject: {fileID: 0}
365+
m_PrefabInstance: {fileID: 0}
366+
m_PrefabAsset: {fileID: 0}
367+
m_GameObject: {fileID: 95571500}
368+
m_Enabled: 1
369+
m_EditorHideFlags: 0
370+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
371+
m_Name:
372+
m_EditorClassIdentifier:
373+
m_Navigation:
374+
m_Mode: 3
375+
m_WrapAround: 0
376+
m_SelectOnUp: {fileID: 0}
377+
m_SelectOnDown: {fileID: 0}
378+
m_SelectOnLeft: {fileID: 0}
379+
m_SelectOnRight: {fileID: 0}
380+
m_Transition: 1
381+
m_Colors:
382+
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
383+
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
384+
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
385+
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
386+
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
387+
m_ColorMultiplier: 1
388+
m_FadeDuration: 0.1
389+
m_SpriteState:
390+
m_HighlightedSprite: {fileID: 0}
391+
m_PressedSprite: {fileID: 0}
392+
m_SelectedSprite: {fileID: 0}
393+
m_DisabledSprite: {fileID: 0}
394+
m_AnimationTriggers:
395+
m_NormalTrigger: Normal
396+
m_HighlightedTrigger: Highlighted
397+
m_PressedTrigger: Pressed
398+
m_SelectedTrigger: Selected
399+
m_DisabledTrigger: Disabled
400+
m_Interactable: 1
401+
m_TargetGraphic: {fileID: 95571503}
402+
m_OnClick:
403+
m_PersistentCalls:
404+
m_Calls:
405+
- m_Target: {fileID: 173140951}
406+
m_TargetAssemblyTypeName: PlayEveryWare.EpicOnlineServices.Tests.AuthenticationExpirationTestManager,
407+
com.playeveryware.eos.samples
408+
m_MethodName: StartConnectTest
409+
m_Mode: 1
410+
m_Arguments:
411+
m_ObjectArgument: {fileID: 0}
412+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
413+
m_IntArgument: 0
414+
m_FloatArgument: 0
415+
m_StringArgument:
416+
m_BoolArgument: 0
417+
m_CallState: 2
418+
--- !u!114 &95571503
419+
MonoBehaviour:
420+
m_ObjectHideFlags: 0
421+
m_CorrespondingSourceObject: {fileID: 0}
422+
m_PrefabInstance: {fileID: 0}
423+
m_PrefabAsset: {fileID: 0}
424+
m_GameObject: {fileID: 95571500}
425+
m_Enabled: 1
426+
m_EditorHideFlags: 0
427+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
428+
m_Name:
429+
m_EditorClassIdentifier:
430+
m_Material: {fileID: 0}
431+
m_Color: {r: 1, g: 1, b: 1, a: 1}
432+
m_RaycastTarget: 1
433+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
434+
m_Maskable: 1
435+
m_OnCullStateChanged:
436+
m_PersistentCalls:
437+
m_Calls: []
438+
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
439+
m_Type: 1
440+
m_PreserveAspect: 0
441+
m_FillCenter: 1
442+
m_FillMethod: 4
443+
m_FillAmount: 1
444+
m_FillClockwise: 1
445+
m_FillOrigin: 0
446+
m_UseSpriteMesh: 0
447+
m_PixelsPerUnitMultiplier: 1
448+
--- !u!222 &95571504
449+
CanvasRenderer:
450+
m_ObjectHideFlags: 0
451+
m_CorrespondingSourceObject: {fileID: 0}
452+
m_PrefabInstance: {fileID: 0}
453+
m_PrefabAsset: {fileID: 0}
454+
m_GameObject: {fileID: 95571500}
455+
m_CullTransparentMesh: 1
321456
--- !u!1 &173140950
322457
GameObject:
323458
m_ObjectHideFlags: 0
@@ -330,7 +465,7 @@ GameObject:
330465
- component: {fileID: 173140951}
331466
- component: {fileID: 173140953}
332467
m_Layer: 0
333-
m_Name: AuthenticationExpirationTestManager
468+
m_Name: Authentication Test Manager Holder
334469
m_TagString: Untagged
335470
m_Icon: {fileID: 0}
336471
m_NavMeshLayer: 0
@@ -514,6 +649,7 @@ RectTransform:
514649
m_ConstrainProportionsScale: 0
515650
m_Children:
516651
- {fileID: 1434202371}
652+
- {fileID: 95571501}
517653
- {fileID: 1543420356}
518654
- {fileID: 1073960550}
519655
- {fileID: 1584886841}
@@ -1192,7 +1328,7 @@ RectTransform:
11921328
m_Children:
11931329
- {fileID: 968635291}
11941330
m_Father: {fileID: 413195475}
1195-
m_RootOrder: 4
1331+
m_RootOrder: 5
11961332
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11971333
m_AnchorMin: {x: 1, y: 0}
11981334
m_AnchorMax: {x: 1, y: 0.5}
@@ -1343,7 +1479,7 @@ RectTransform:
13431479
m_Children:
13441480
- {fileID: 1555304044}
13451481
m_Father: {fileID: 413195475}
1346-
m_RootOrder: 2
1482+
m_RootOrder: 3
13471483
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
13481484
m_AnchorMin: {x: 1, y: 1}
13491485
m_AnchorMax: {x: 1, y: 1}
@@ -1683,7 +1819,20 @@ MonoBehaviour:
16831819
m_HorizontalOverflow: 0
16841820
m_VerticalOverflow: 0
16851821
m_LineSpacing: 1
1686-
m_Text: This is where the log text will go.
1822+
m_Text: 'This is a scene for testing elements of the Epic Online Services Plugin
1823+
for Unity''s authentication.
1824+
1825+
See the comments on ''SetAuthenticationProviderAndLogin`
1826+
and `StartConnectTest` for a description of the tests.
1827+
1828+
Use the dropdown
1829+
to start the authentication expiration token reacquisition methods test.
1830+
1831+
Use
1832+
the button to start the connect login re-connection test.
1833+
1834+
This is where
1835+
the log text will go.'
16871836
--- !u!222 &1165975831
16881837
CanvasRenderer:
16891838
m_ObjectHideFlags: 0
@@ -1789,7 +1938,7 @@ GameObject:
17891938
- component: {fileID: 1434202373}
17901939
- component: {fileID: 1434202372}
17911940
m_Layer: 0
1792-
m_Name: Dropdown (Legacy)
1941+
m_Name: Authentication Token Dropdown
17931942
m_TagString: Untagged
17941943
m_Icon: {fileID: 0}
17951944
m_NavMeshLayer: 0
@@ -1816,7 +1965,7 @@ RectTransform:
18161965
m_AnchorMin: {x: 0, y: 1}
18171966
m_AnchorMax: {x: 0, y: 1}
18181967
m_AnchoredPosition: {x: 0, y: 0}
1819-
m_SizeDelta: {x: 200, y: 50}
1968+
m_SizeDelta: {x: 550, y: 50}
18201969
m_Pivot: {x: 0, y: 1}
18211970
--- !u!114 &1434202372
18221971
MonoBehaviour:
@@ -2154,7 +2303,7 @@ RectTransform:
21542303
m_Children:
21552304
- {fileID: 1706503072}
21562305
m_Father: {fileID: 413195475}
2157-
m_RootOrder: 1
2306+
m_RootOrder: 2
21582307
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
21592308
m_AnchorMin: {x: 0, y: 0}
21602309
m_AnchorMax: {x: 1, y: 1}
@@ -2311,7 +2460,7 @@ RectTransform:
23112460
m_Children:
23122461
- {fileID: 2048279167}
23132462
m_Father: {fileID: 413195475}
2314-
m_RootOrder: 3
2463+
m_RootOrder: 4
23152464
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
23162465
m_AnchorMin: {x: 1, y: 0.5}
23172466
m_AnchorMax: {x: 1, y: 1}
@@ -2611,6 +2760,86 @@ CanvasRenderer:
26112760
m_PrefabAsset: {fileID: 0}
26122761
m_GameObject: {fileID: 1706503071}
26132762
m_CullTransparentMesh: 1
2763+
--- !u!1 &1736631109
2764+
GameObject:
2765+
m_ObjectHideFlags: 0
2766+
m_CorrespondingSourceObject: {fileID: 0}
2767+
m_PrefabInstance: {fileID: 0}
2768+
m_PrefabAsset: {fileID: 0}
2769+
serializedVersion: 6
2770+
m_Component:
2771+
- component: {fileID: 1736631110}
2772+
- component: {fileID: 1736631112}
2773+
- component: {fileID: 1736631111}
2774+
m_Layer: 0
2775+
m_Name: Text (Legacy)
2776+
m_TagString: Untagged
2777+
m_Icon: {fileID: 0}
2778+
m_NavMeshLayer: 0
2779+
m_StaticEditorFlags: 0
2780+
m_IsActive: 1
2781+
--- !u!224 &1736631110
2782+
RectTransform:
2783+
m_ObjectHideFlags: 0
2784+
m_CorrespondingSourceObject: {fileID: 0}
2785+
m_PrefabInstance: {fileID: 0}
2786+
m_PrefabAsset: {fileID: 0}
2787+
m_GameObject: {fileID: 1736631109}
2788+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
2789+
m_LocalPosition: {x: 0, y: 0, z: 0}
2790+
m_LocalScale: {x: 1, y: 1, z: 1}
2791+
m_ConstrainProportionsScale: 0
2792+
m_Children: []
2793+
m_Father: {fileID: 95571501}
2794+
m_RootOrder: 0
2795+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2796+
m_AnchorMin: {x: 0, y: 0}
2797+
m_AnchorMax: {x: 1, y: 1}
2798+
m_AnchoredPosition: {x: 0, y: 0}
2799+
m_SizeDelta: {x: 0, y: 0}
2800+
m_Pivot: {x: 0.5, y: 0.5}
2801+
--- !u!114 &1736631111
2802+
MonoBehaviour:
2803+
m_ObjectHideFlags: 0
2804+
m_CorrespondingSourceObject: {fileID: 0}
2805+
m_PrefabInstance: {fileID: 0}
2806+
m_PrefabAsset: {fileID: 0}
2807+
m_GameObject: {fileID: 1736631109}
2808+
m_Enabled: 1
2809+
m_EditorHideFlags: 0
2810+
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
2811+
m_Name:
2812+
m_EditorClassIdentifier:
2813+
m_Material: {fileID: 0}
2814+
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
2815+
m_RaycastTarget: 1
2816+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
2817+
m_Maskable: 1
2818+
m_OnCullStateChanged:
2819+
m_PersistentCalls:
2820+
m_Calls: []
2821+
m_FontData:
2822+
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
2823+
m_FontSize: 20
2824+
m_FontStyle: 0
2825+
m_BestFit: 0
2826+
m_MinSize: 2
2827+
m_MaxSize: 40
2828+
m_Alignment: 3
2829+
m_AlignByGeometry: 0
2830+
m_RichText: 1
2831+
m_HorizontalOverflow: 0
2832+
m_VerticalOverflow: 0
2833+
m_LineSpacing: 1
2834+
m_Text: Start Connect Test
2835+
--- !u!222 &1736631112
2836+
CanvasRenderer:
2837+
m_ObjectHideFlags: 0
2838+
m_CorrespondingSourceObject: {fileID: 0}
2839+
m_PrefabInstance: {fileID: 0}
2840+
m_PrefabAsset: {fileID: 0}
2841+
m_GameObject: {fileID: 1736631109}
2842+
m_CullTransparentMesh: 1
26142843
--- !u!1 &1792875399
26152844
GameObject:
26162845
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)