Skip to content

Cherrypick: Lobby Visual Rework #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 8, 2022
Merged

Cherrypick: Lobby Visual Rework #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
240 changes: 213 additions & 27 deletions Assets/BossRoom/Prefabs/UI/IPPopup.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,15 +189,16 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7207922465784669414}
- {fileID: 3922962363196413880}
m_Father: {fileID: 7211620873335412190}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 80, y: -24.663475}
m_SizeDelta: {x: 160, y: 49.32695}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -15, y: -32.3}
m_SizeDelta: {x: 191.5, y: 64.8}
m_Pivot: {x: 1, y: 1}
--- !u!222 &2162395241664750301
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -249,8 +250,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_TintColors:
- {r: 0.681, g: 0.6342607, b: 0.584298, a: 1}
- {r: 1, g: 1, b: 1, a: 1}
- {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}
--- !u!114 &1146989341565134001
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -342,7 +343,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 168}
m_AnchoredPosition: {x: 0, y: 125}
m_SizeDelta: {x: 351.2328, y: 74.9954}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1772128666558346541
Expand Down Expand Up @@ -442,6 +443,97 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &1744874828343043826
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7207922465784669414}
- component: {fileID: 4423380880871866321}
- component: {fileID: 5168908336122243771}
- component: {fileID: 5103307801264146900}
m_Layer: 5
m_Name: JoinToggleBorder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7207922465784669414
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1744874828343043826}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5360785957834520664}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 220.375, y: 92.58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4423380880871866321
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1744874828343043826}
m_CullTransparentMesh: 1
--- !u!114 &5168908336122243771
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1744874828343043826}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 298518cc35452404bbec1592572f23eb, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 0
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &5103307801264146900
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1744874828343043826}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86fd4fbcc3fc84b228fc9c4cb612c32a, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TintColors:
- {r: 0.54901963, g: 0.54901963, b: 0.54901963, a: 0}
- {r: 1, g: 1, b: 1, a: 1}
--- !u!1 &2091371516226210259
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -477,7 +569,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 74.9954}
m_SizeDelta: {x: 0, y: 60}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &3266033845783689121
CanvasRenderer:
Expand Down Expand Up @@ -534,7 +626,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 31.95
m_fontSize: 50
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -793,7 +885,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 168}
m_AnchoredPosition: {x: 0, y: 125.000015}
m_SizeDelta: {x: 351.2328, y: 74.9954}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3744961511776045358
Expand Down Expand Up @@ -923,7 +1015,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 925362719653560221}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
Expand Down Expand Up @@ -985,8 +1077,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 20
m_fontSizeBase: 20
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
Expand Down Expand Up @@ -1057,7 +1149,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5360785957834520664}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
Expand Down Expand Up @@ -1119,8 +1211,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 20
m_fontSizeBase: 20
m_fontSize: 24
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
Expand Down Expand Up @@ -1240,6 +1332,97 @@ MonoBehaviour:
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!1 &4269576300304280103
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8334914665808330226}
- component: {fileID: 5721188117814502558}
- component: {fileID: 4613260058036252427}
- component: {fileID: 4992990316083676702}
m_Layer: 5
m_Name: CreateToggleBorder
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8334914665808330226
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4269576300304280103}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 925362719653560221}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 220.375, y: 92.58}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5721188117814502558
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4269576300304280103}
m_CullTransparentMesh: 1
--- !u!114 &4613260058036252427
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4269576300304280103}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 298518cc35452404bbec1592572f23eb, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 0
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &4992990316083676702
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4269576300304280103}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86fd4fbcc3fc84b228fc9c4cb612c32a, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TintColors:
- {r: 0.54901963, g: 0.54901963, b: 0.54901963, a: 0}
- {r: 1, g: 1, b: 1, a: 1}
--- !u!1 &4363443222934554037
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1427,15 +1610,16 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8334914665808330226}
- {fileID: 3364346682957362099}
m_Father: {fileID: 7211620873335412190}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 245, y: -24.663475}
m_SizeDelta: {x: 160, y: 49.32695}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 15, y: -32.3}
m_SizeDelta: {x: 191.5, y: 64.8}
m_Pivot: {x: 0, y: 1}
--- !u!222 &4676932742985563135
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1487,8 +1671,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_TintColors:
- {r: 0.681, g: 0.6342607, b: 0.584298, a: 1}
- {r: 1, g: 1, b: 1, a: 1}
- {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}
--- !u!114 &1998613087429313438
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1660,7 +1844,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 74.995}
m_SizeDelta: {x: 0, y: 60}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &8005476179083983394
CanvasRenderer:
Expand Down Expand Up @@ -1717,7 +1901,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 31.95
m_fontSize: 50
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -2376,7 +2560,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 80}
m_SizeDelta: {x: 0, y: 60}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &6634905022760130131
CanvasRenderer:
Expand Down Expand Up @@ -2568,7 +2752,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5924530127146065184}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
Expand Down Expand Up @@ -2652,7 +2836,9 @@ MonoBehaviour:
m_IPJoiningUI: {fileID: 4035387343632270047}
m_IPHostingUI: {fileID: 6512829474060433337}
m_JoinTabButtonTinter: {fileID: 5820100690359471312}
m_JoinTabButtonBorderTinter: {fileID: 5103307801264146900}
m_HostTabButtonTinter: {fileID: 7888223589903858095}
m_HostTabButtonBorderTinter: {fileID: 4992990316083676702}
m_SignInSpinner: {fileID: 8543714399569277319}
--- !u!1 &6720699109820320406
GameObject:
Expand Down Expand Up @@ -3348,7 +3534,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 72.25492}
m_AnchoredPosition: {x: 0, y: 58}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5540966166362907071
Expand Down
Loading