Skip to content

Commit 43af734

Browse files
LPLafontaineBSamuelBellomo
LPLafontaineB
and
SamuelBellomo
authored
fix: profile management UX [MTT-3762] (#677)
* Adding information about changing profile for IP-based connections too * clarified how to create a new profile if no profiles exist Co-authored-by: Sam Bellomo <[email protected]>
1 parent 46fde12 commit 43af734

File tree

3 files changed

+32
-5
lines changed

3 files changed

+32
-5
lines changed

‎Assets/Prefabs/UI/ProfilePopup.prefab

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ RectTransform:
2929
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
3030
m_LocalPosition: {x: 0, y: 0, z: 0}
3131
m_LocalScale: {x: 1, y: 1, z: 1}
32+
m_ConstrainProportionsScale: 0
3233
m_Children:
3334
- {fileID: 308858387347636212}
3435
m_Father: {fileID: 5256809350279027989}
@@ -173,6 +174,7 @@ RectTransform:
173174
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
174175
m_LocalPosition: {x: 0, y: 0, z: 0}
175176
m_LocalScale: {x: 1, y: 1, z: 1}
177+
m_ConstrainProportionsScale: 0
176178
m_Children:
177179
- {fileID: 8636502446461490653}
178180
m_Father: {fileID: 8325028574622319795}
@@ -212,6 +214,7 @@ RectTransform:
212214
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
213215
m_LocalPosition: {x: 0, y: 0, z: 0}
214216
m_LocalScale: {x: 1, y: 1, z: 1}
217+
m_ConstrainProportionsScale: 0
215218
m_Children:
216219
- {fileID: 3508908234963436960}
217220
m_Father: {fileID: 4373642838666737816}
@@ -359,6 +362,7 @@ RectTransform:
359362
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
360363
m_LocalPosition: {x: 0, y: 0, z: 0}
361364
m_LocalScale: {x: 1, y: 1, z: 1}
365+
m_ConstrainProportionsScale: 0
362366
m_Children:
363367
- {fileID: 2740622290426150689}
364368
- {fileID: 3663859968322904847}
@@ -459,7 +463,10 @@ MonoBehaviour:
459463
m_HideMobileInput: 0
460464
m_CharacterValidation: 0
461465
m_CharacterLimit: 0
462-
m_OnEndEdit:
466+
m_OnSubmit:
467+
m_PersistentCalls:
468+
m_Calls: []
469+
m_OnDidEndEdit:
463470
m_PersistentCalls:
464471
m_Calls: []
465472
m_OnValueChanged:
@@ -514,6 +521,7 @@ RectTransform:
514521
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
515522
m_LocalPosition: {x: 0, y: 0, z: 0}
516523
m_LocalScale: {x: 1, y: 1, z: 1}
524+
m_ConstrainProportionsScale: 0
517525
m_Children: []
518526
m_Father: {fileID: 4373642838666737816}
519527
m_RootOrder: 2
@@ -649,6 +657,7 @@ RectTransform:
649657
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
650658
m_LocalPosition: {x: 0, y: 0, z: 0}
651659
m_LocalScale: {x: 1, y: 1, z: 1}
660+
m_ConstrainProportionsScale: 0
652661
m_Children: []
653662
m_Father: {fileID: 5256809350279027989}
654663
m_RootOrder: 1
@@ -794,6 +803,7 @@ RectTransform:
794803
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
795804
m_LocalPosition: {x: 0, y: 0, z: 0}
796805
m_LocalScale: {x: 1, y: 1, z: 1}
806+
m_ConstrainProportionsScale: 0
797807
m_Children: []
798808
m_Father: {fileID: 2837639234489633647}
799809
m_RootOrder: 0
@@ -928,6 +938,7 @@ RectTransform:
928938
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
929939
m_LocalPosition: {x: 0, y: 0, z: 0}
930940
m_LocalScale: {x: 1, y: 1, z: 1}
941+
m_ConstrainProportionsScale: 0
931942
m_Children: []
932943
m_Father: {fileID: 8322859058506382341}
933944
m_RootOrder: 0
@@ -1004,6 +1015,7 @@ RectTransform:
10041015
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
10051016
m_LocalPosition: {x: 0, y: 0, z: -3}
10061017
m_LocalScale: {x: 1, y: 1, z: 1}
1018+
m_ConstrainProportionsScale: 0
10071019
m_Children: []
10081020
m_Father: {fileID: 4373642838666737816}
10091021
m_RootOrder: 5
@@ -1136,6 +1148,7 @@ RectTransform:
11361148
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
11371149
m_LocalPosition: {x: 0, y: 0, z: 0}
11381150
m_LocalScale: {x: 1, y: 1, z: 1}
1151+
m_ConstrainProportionsScale: 0
11391152
m_Children: []
11401153
m_Father: {fileID: 1112429885581047226}
11411154
m_RootOrder: 0
@@ -1270,6 +1283,7 @@ RectTransform:
12701283
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
12711284
m_LocalPosition: {x: 0, y: 0, z: 0}
12721285
m_LocalScale: {x: 1, y: 1, z: 1}
1286+
m_ConstrainProportionsScale: 0
12731287
m_Children: []
12741288
m_Father: {fileID: 6816691608007158159}
12751289
m_RootOrder: 0
@@ -1350,6 +1364,7 @@ RectTransform:
13501364
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
13511365
m_LocalPosition: {x: 0, y: 0, z: 0}
13521366
m_LocalScale: {x: 1, y: 1, z: 1}
1367+
m_ConstrainProportionsScale: 0
13531368
m_Children:
13541369
- {fileID: 8322859058506382341}
13551370
m_Father: {fileID: 9203681094594139131}
@@ -1475,14 +1490,15 @@ RectTransform:
14751490
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
14761491
m_LocalPosition: {x: 0, y: 0, z: 0}
14771492
m_LocalScale: {x: 1, y: 1, z: 1}
1493+
m_ConstrainProportionsScale: 0
14781494
m_Children: []
14791495
m_Father: {fileID: 8622804673161887298}
14801496
m_RootOrder: 0
14811497
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
14821498
m_AnchorMin: {x: 0.5, y: 0.5}
14831499
m_AnchorMax: {x: 0.5, y: 0.5}
14841500
m_AnchoredPosition: {x: 0, y: -78}
1485-
m_SizeDelta: {x: 300, y: 50}
1501+
m_SizeDelta: {x: 500, y: 100}
14861502
m_Pivot: {x: 0.5, y: 0.5}
14871503
--- !u!222 &7473255022138282109
14881504
CanvasRenderer:
@@ -1512,7 +1528,9 @@ MonoBehaviour:
15121528
m_OnCullStateChanged:
15131529
m_PersistentCalls:
15141530
m_Calls: []
1515-
m_text: no profiles found
1531+
m_text: 'No profiles found.
1532+
1533+
Use the input field below to create a new profile'
15161534
m_isRightToLeft: 0
15171535
m_fontAsset: {fileID: 11400000, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
15181536
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
@@ -1539,7 +1557,7 @@ MonoBehaviour:
15391557
m_faceColor:
15401558
serializedVersion: 2
15411559
rgba: 4294967295
1542-
m_fontSize: 27.45
1560+
m_fontSize: 29.4
15431561
m_fontSizeBase: 24
15441562
m_fontWeight: 400
15451563
m_enableAutoSizing: 1
@@ -1611,6 +1629,7 @@ RectTransform:
16111629
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
16121630
m_LocalPosition: {x: 0, y: 0, z: 0}
16131631
m_LocalScale: {x: 1, y: 1, z: 1}
1632+
m_ConstrainProportionsScale: 0
16141633
m_Children:
16151634
- {fileID: 8692014401391636172}
16161635
- {fileID: 5010917677710842271}
@@ -1722,6 +1741,7 @@ RectTransform:
17221741
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
17231742
m_LocalPosition: {x: 0, y: 0, z: 0}
17241743
m_LocalScale: {x: 1, y: 1, z: 1}
1744+
m_ConstrainProportionsScale: 0
17251745
m_Children: []
17261746
m_Father: {fileID: 4373642838666737816}
17271747
m_RootOrder: 0
@@ -1797,6 +1817,7 @@ RectTransform:
17971817
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
17981818
m_LocalPosition: {x: 0, y: 0, z: 0}
17991819
m_LocalScale: {x: 1, y: 1, z: 1}
1820+
m_ConstrainProportionsScale: 0
18001821
m_Children: []
18011822
m_Father: {fileID: 6816691608007158159}
18021823
m_RootOrder: 1
@@ -1875,6 +1896,7 @@ RectTransform:
18751896
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
18761897
m_LocalPosition: {x: 0, y: 0, z: 0}
18771898
m_LocalScale: {x: 1, y: 1, z: 1}
1899+
m_ConstrainProportionsScale: 0
18781900
m_Children:
18791901
- {fileID: 8622804673161887298}
18801902
- {fileID: 8325028574622319795}
@@ -1947,6 +1969,7 @@ RectTransform:
19471969
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
19481970
m_LocalPosition: {x: 0, y: 0, z: 0}
19491971
m_LocalScale: {x: 1, y: 1, z: 1}
1972+
m_ConstrainProportionsScale: 0
19501973
m_Children:
19511974
- {fileID: 3714666480274556032}
19521975
- {fileID: 4674447631423677201}
@@ -2076,6 +2099,7 @@ RectTransform:
20762099
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
20772100
m_LocalPosition: {x: 0, y: 0, z: 0}
20782101
m_LocalScale: {x: 1, y: 1, z: 1}
2102+
m_ConstrainProportionsScale: 0
20792103
m_Children:
20802104
- {fileID: 2837639234489633647}
20812105
- {fileID: 3384831129064044213}
@@ -2162,6 +2186,7 @@ RectTransform:
21622186
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
21632187
m_LocalPosition: {x: 0, y: 0, z: 0}
21642188
m_LocalScale: {x: 1, y: 1, z: 1}
2189+
m_ConstrainProportionsScale: 0
21652190
m_Children: []
21662191
m_Father: {fileID: 4373642838666737816}
21672192
m_RootOrder: 1
@@ -2237,6 +2262,7 @@ RectTransform:
22372262
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
22382263
m_LocalPosition: {x: 0, y: 0, z: 0}
22392264
m_LocalScale: {x: 1, y: 1, z: 1}
2265+
m_ConstrainProportionsScale: 0
22402266
m_Children:
22412267
- {fileID: 5256809350279027989}
22422268
m_Father: {fileID: 8622804673161887298}

‎Assets/Scripts/Gameplay/UI/ConnectionStatusMessageUIManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void OnConnectStatus(ConnectStatus status)
4444
case ConnectStatus.Success:
4545
break;
4646
case ConnectStatus.LoggedInAgain:
47-
PopupManager.ShowPopupPanel("Connection Failed", "You have logged in elsewhere using the same account.");
47+
PopupManager.ShowPopupPanel("Connection Failed", "You have logged in elsewhere using the same account. If you still want to connect, select a different profile by using the 'Change Profile' button.");
4848
break;
4949
case ConnectStatus.IncompatibleBuildType:
5050
PopupManager.ShowPopupPanel("Connection Failed", "Server and client builds are not compatible. You cannot connect a release build to a development build or an in-editor session.");

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
1818
* Connection feedback + IP connection window [MTT-2315] [MTT-3234] (#613)
1919
* First import of all the vandal imp artwork (#637)
2020
* Updated boss room's root scene to automatically load child scenes at editor time (#653)
21+
* Users can change profile in-game in addition to the -AuthProfile command line argument (#636)
2122

2223
### Changed
2324
* Bump NGO to pre.9 (#643)

0 commit comments

Comments
 (0)