From 7048cfd27999c54ab163bbefa76edf810eea4333 Mon Sep 17 00:00:00 2001 From: Tom Hewitt <32467948+iamtomhewitt@users.noreply.github.com> Date: Sat, 28 Dec 2019 22:16:07 +0000 Subject: [PATCH] Revert "Issue#26" --- Assets/Scenes/Dashboard.unity | 32 ++--- .../Online List/UI/Online List Entry.prefab | 119 ++++++++++-------- 2 files changed, 86 insertions(+), 65 deletions(-) diff --git a/Assets/Scenes/Dashboard.unity b/Assets/Scenes/Dashboard.unity index d3f4a1df..2178eb03 100644 --- a/Assets/Scenes/Dashboard.unity +++ b/Assets/Scenes/Dashboard.unity @@ -1321,7 +1321,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 10.604004, y: -7.630005} + m_AnchoredPosition: {x: 10.604, y: -7.749996} m_SizeDelta: {x: 2.9, y: 2.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &110342467 @@ -1859,7 +1859,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1.5899658, y: -1.6300049} + m_AnchoredPosition: {x: 1.5899658, y: -1.75} m_SizeDelta: {x: 2.9, y: 2.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &163220746 @@ -4569,7 +4569,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1920043809} m_HandleRect: {fileID: 1920043808} m_Direction: 2 - m_Value: 1.0000006 + m_Value: 1.0000002 m_Size: 0.7404387 m_NumberOfSteps: 0 m_OnValueChanged: @@ -6689,7 +6689,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: 5 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -8987,7 +8987,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: 7.3552, y: -4.55} + m_AnchoredPosition: {x: 7.3552, y: -4.6} m_SizeDelta: {x: 0.2486, y: 0.2486} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &816526461 @@ -9224,7 +9224,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1.5900269, y: -6.130005} + m_AnchoredPosition: {x: 1.5900269, y: -6.249996} m_SizeDelta: {x: 2.9, y: 5.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &840664273 @@ -9659,8 +9659,8 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 5 + m_ChildAlignment: 1 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -13038,7 +13038,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: -6.5734, y: -4.55} + m_AnchoredPosition: {x: -6.5734, y: -4.6} m_SizeDelta: {x: 1.7519, y: 0.28677} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1206929985 @@ -14088,7 +14088,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 7.5894775, y: -7.630005} + m_AnchoredPosition: {x: 7.5894814, y: -7.75} m_SizeDelta: {x: 2.9, y: 2.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1273118027 @@ -14163,7 +14163,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 7.5894775, y: -4.630005} + m_AnchoredPosition: {x: 7.5894775, y: -4.75} m_SizeDelta: {x: 2.9, y: 2.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1281220135 @@ -15076,7 +15076,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 7.5892944, y: -1.6300049} + m_AnchoredPosition: {x: 7.5892944, y: -1.75} m_SizeDelta: {x: 2.9, y: 2.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1328514300 @@ -20534,7 +20534,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 4.589905, y: -6.130005} + m_AnchoredPosition: {x: 4.589901, y: -6.249996} m_SizeDelta: {x: 2.9, y: 5.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1763180177 @@ -21473,7 +21473,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 13.619019, y: -4.630005} + m_AnchoredPosition: {x: 13.619015, y: -4.75} m_SizeDelta: {x: 2.9, y: 8.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1833876608 @@ -22100,7 +22100,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 10.604004, y: -3.130005} + m_AnchoredPosition: {x: 10.604, y: -3.25} m_SizeDelta: {x: 2.9, y: 5.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1870469004 @@ -23681,7 +23681,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 4.589905, y: -1.6300049} + m_AnchoredPosition: {x: 4.589901, y: -1.75} m_SizeDelta: {x: 2.9, y: 2.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2062732455 diff --git a/Assets/Widgets/Online List/UI/Online List Entry.prefab b/Assets/Widgets/Online List/UI/Online List Entry.prefab index 58918b82..acf9e6ef 100644 --- a/Assets/Widgets/Online List/UI/Online List Entry.prefab +++ b/Assets/Widgets/Online List/UI/Online List Entry.prefab @@ -109,13 +109,13 @@ RectTransform: m_Children: - {fileID: 532257249627644813} m_Father: {fileID: 8526732701419245917} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 7.427003, y: 0} - m_SizeDelta: {x: 7.427, y: 6} - m_Pivot: {x: 1, y: 1} + m_AnchoredPosition: {x: 10.451, y: 0} + m_SizeDelta: {x: -20.901, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8275654659780976893 CanvasRenderer: m_ObjectHideFlags: 0 @@ -206,7 +206,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!1 &8526732701419245906 +--- !u!1 &8526732700845780675 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -214,67 +214,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8526732701419245917} - - component: {fileID: 8526732701419245916} - - component: {fileID: 2187768445933579914} - - component: {fileID: 2721093486479943567} - - component: {fileID: 5007768401199300998} + - component: {fileID: 8526732700845780674} + - component: {fileID: 8526732700845780684} + - component: {fileID: 8526732700845780685} m_Layer: 5 - m_Name: Online List Entry + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8526732701419245917 +--- !u!224 &8526732700845780674 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8526732701419245906} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 8526732700845780675} + 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: - - {fileID: 7199965381600177832} - m_Father: {fileID: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_Children: [] + m_Father: {fileID: 8526732701419245917} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 382.62024, y: 432.4865} - m_SizeDelta: {x: 18.802, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8526732701419245916 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8526732701419245906} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5ee3ab51911b2304998017fb815796a8, type: 3} - m_Name: - m_EditorClassIdentifier: - nameText: {fileID: 2721093486479943567} - taskId: ---- !u!222 &2187768445933579914 + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0.0000009536743, y: 0} + m_SizeDelta: {x: 41.398, y: 6.1260004} + m_Pivot: {x: 0, y: 1} +--- !u!222 &8526732700845780684 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8526732701419245906} + m_GameObject: {fileID: 8526732700845780675} m_CullTransparentMesh: 0 ---- !u!114 &2721093486479943567 +--- !u!114 &8526732700845780685 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8526732701419245906} + m_GameObject: {fileID: 8526732700845780675} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -287,20 +270,58 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: d9f34d8218de7804b9cbc0e3167c9854, type: 3} - m_FontSize: 3 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 5 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 0 m_AlignByGeometry: 1 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Name ---- !u!114 &5007768401199300998 +--- !u!1 &8526732701419245906 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8526732701419245917} + - component: {fileID: 8526732701419245916} + m_Layer: 5 + m_Name: Online List Entry + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8526732701419245917 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8526732701419245906} + 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: + - {fileID: 8526732700845780674} + - {fileID: 7199965381600177832} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 386.4219, y: 432.4865} + m_SizeDelta: {x: 26.405, y: 5.64} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8526732701419245916 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -309,8 +330,8 @@ MonoBehaviour: m_GameObject: {fileID: 8526732701419245906} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Script: {fileID: 11500000, guid: 5ee3ab51911b2304998017fb815796a8, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 + nameText: {fileID: 8526732700845780685} + removeUrl: