Skip to content

Commit 28b37cc

Browse files
LPLafontaineBLPLafontaineB
committed
Merge branch 'develop' into feature/loading-screen
2 parents 2fff187 + 152448e commit 28b37cc

38 files changed

+1155
-1140
lines changed

‎Assets/BossRoom/Prefabs/UI/LobbyUI.prefab

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,8 @@ MonoBehaviour:
659659
m_text: 'Your Name:'
660660
m_isRightToLeft: 0
661661
m_fontAsset: {fileID: 11400000, guid: 9641ce046d2227445b9684161a165f68, type: 2}
662-
m_sharedMaterial: {fileID: -4106257185398102161, guid: 9641ce046d2227445b9684161a165f68, type: 2}
662+
m_sharedMaterial: {fileID: -4106257185398102161, guid: 9641ce046d2227445b9684161a165f68,
663+
type: 2}
663664
m_fontSharedMaterials: []
664665
m_fontMaterial: {fileID: 0}
665666
m_fontMaterials: []
@@ -975,7 +976,11 @@ MonoBehaviour:
975976
m_Calls: []
976977
m_OnValueChanged:
977978
m_PersistentCalls:
978-
m_Calls: []
979+
m_Calls: [{m_Target: {fileID: 3432713757992463987}, m_TargetAssemblyTypeName: 'Unity.Multiplayer.Samples.BossRoom.Visual.LobbyJoiningUI,
980+
Unity.Multiplayer.Samples.BossRoom.Client', m_MethodName: SanitizeJoinCodeInputText,
981+
m_Mode: 1, m_Arguments: {m_ObjectArgument: {fileID: 0}, m_ObjectArgumentAssemblyTypeName: 'UnityEngine.Object,
982+
UnityEngine', m_IntArgument: 0, m_FloatArgument: 0, m_StringArgument: '',
983+
m_BoolArgument: 0}, m_CallState: 2}]
979984
m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
980985
m_CustomCaretColor: 0
981986
m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
@@ -1189,7 +1194,8 @@ MonoBehaviour:
11891194
'
11901195
m_isRightToLeft: 0
11911196
m_fontAsset: {fileID: 11400000, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
1192-
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
1197+
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e,
1198+
type: 2}
11931199
m_fontSharedMaterials: []
11941200
m_fontMaterial: {fileID: 0}
11951201
m_fontMaterials: []
@@ -1323,7 +1329,8 @@ MonoBehaviour:
13231329
m_text: Lobby List
13241330
m_isRightToLeft: 0
13251331
m_fontAsset: {fileID: 11400000, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
1326-
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
1332+
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e,
1333+
type: 2}
13271334
m_fontSharedMaterials: []
13281335
m_fontMaterial: {fileID: 0}
13291336
m_fontMaterials: []
@@ -1840,7 +1847,8 @@ MonoBehaviour:
18401847
m_text: Join
18411848
m_isRightToLeft: 0
18421849
m_fontAsset: {fileID: 11400000, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
1843-
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
1850+
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e,
1851+
type: 2}
18441852
m_fontSharedMaterials: []
18451853
m_fontMaterial: {fileID: 0}
18461854
m_fontMaterials: []
@@ -1974,7 +1982,8 @@ MonoBehaviour:
19741982
m_text: Private
19751983
m_isRightToLeft: 0
19761984
m_fontAsset: {fileID: 11400000, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
1977-
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
1985+
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e,
1986+
type: 2}
19781987
m_fontSharedMaterials: []
19791988
m_fontMaterial: {fileID: 0}
19801989
m_fontMaterials: []
@@ -2785,7 +2794,8 @@ MonoBehaviour:
27852794
m_text: Displayed Name
27862795
m_isRightToLeft: 0
27872796
m_fontAsset: {fileID: 11400000, guid: 9641ce046d2227445b9684161a165f68, type: 2}
2788-
m_sharedMaterial: {fileID: -4106257185398102161, guid: 9641ce046d2227445b9684161a165f68, type: 2}
2797+
m_sharedMaterial: {fileID: -4106257185398102161, guid: 9641ce046d2227445b9684161a165f68,
2798+
type: 2}
27892799
m_fontSharedMaterials: []
27902800
m_fontMaterial: {fileID: 0}
27912801
m_fontMaterials: []
@@ -3201,7 +3211,8 @@ MonoBehaviour:
32013211
m_text: no lobbies
32023212
m_isRightToLeft: 0
32033213
m_fontAsset: {fileID: 11400000, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
3204-
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
3214+
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e,
3215+
type: 2}
32053216
m_fontSharedMaterials: []
32063217
m_fontMaterial: {fileID: 0}
32073218
m_fontMaterials: []
@@ -3335,7 +3346,8 @@ MonoBehaviour:
33353346
m_text: 0/4
33363347
m_isRightToLeft: 0
33373348
m_fontAsset: {fileID: 11400000, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
3338-
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
3349+
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e,
3350+
type: 2}
33393351
m_fontSharedMaterials: []
33403352
m_fontMaterial: {fileID: 0}
33413353
m_fontMaterials: []
@@ -3602,7 +3614,8 @@ MonoBehaviour:
36023614
m_text: Relay
36033615
m_isRightToLeft: 0
36043616
m_fontAsset: {fileID: 11400000, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
3605-
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
3617+
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e,
3618+
type: 2}
36063619
m_fontSharedMaterials: []
36073620
m_fontMaterial: {fileID: 0}
36083621
m_fontMaterials: []
@@ -4240,7 +4253,8 @@ MonoBehaviour:
42404253
'
42414254
m_isRightToLeft: 0
42424255
m_fontAsset: {fileID: 11400000, guid: 9641ce046d2227445b9684161a165f68, type: 2}
4243-
m_sharedMaterial: {fileID: -4106257185398102161, guid: 9641ce046d2227445b9684161a165f68, type: 2}
4256+
m_sharedMaterial: {fileID: -4106257185398102161, guid: 9641ce046d2227445b9684161a165f68,
4257+
type: 2}
42444258
m_fontSharedMaterials: []
42454259
m_fontMaterial: {fileID: 0}
42464260
m_fontMaterials: []
@@ -4578,7 +4592,8 @@ MonoBehaviour:
45784592
m_text: Quick Join
45794593
m_isRightToLeft: 0
45804594
m_fontAsset: {fileID: 11400000, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
4581-
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
4595+
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e,
4596+
type: 2}
45824597
m_fontSharedMaterials: []
45834598
m_fontMaterial: {fileID: 0}
45844599
m_fontMaterials: []
@@ -4913,7 +4928,8 @@ MonoBehaviour:
49134928
m_text: Create
49144929
m_isRightToLeft: 0
49154930
m_fontAsset: {fileID: 11400000, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
4916-
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
4931+
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e,
4932+
type: 2}
49174933
m_fontSharedMaterials: []
49184934
m_fontMaterial: {fileID: 0}
49194935
m_fontMaterials: []
@@ -5047,7 +5063,8 @@ MonoBehaviour:
50475063
m_text: Join an existing lobby...
50485064
m_isRightToLeft: 0
50495065
m_fontAsset: {fileID: 11400000, guid: 9641ce046d2227445b9684161a165f68, type: 2}
5050-
m_sharedMaterial: {fileID: -4106257185398102161, guid: 9641ce046d2227445b9684161a165f68, type: 2}
5066+
m_sharedMaterial: {fileID: -4106257185398102161, guid: 9641ce046d2227445b9684161a165f68,
5067+
type: 2}
50515068
m_fontSharedMaterials: []
50525069
m_fontMaterial: {fileID: 0}
50535070
m_fontMaterials: []
@@ -5246,7 +5263,8 @@ MonoBehaviour:
52465263
m_text: Room
52475264
m_isRightToLeft: 0
52485265
m_fontAsset: {fileID: 11400000, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
5249-
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e, type: 2}
5266+
m_sharedMaterial: {fileID: -466885322316925189, guid: 1a8c97d4cbe5134499b26527f8609c7e,
5267+
type: 2}
52505268
m_fontSharedMaterials: []
52515269
m_fontMaterial: {fileID: 0}
52525270
m_fontMaterials: []

0 commit comments

Comments
 (0)