diff --git a/Assets/Prefabs/PersonDetailsPanel.prefab b/Assets/Prefabs/PersonDetailsPanel.prefab index 7676c75..2c447a9 100644 --- a/Assets/Prefabs/PersonDetailsPanel.prefab +++ b/Assets/Prefabs/PersonDetailsPanel.prefab @@ -106,7 +106,7 @@ GameObject: m_IsActive: 1 --- !u!1 &122380 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 @@ -155,7 +155,7 @@ GameObject: m_IsActive: 1 --- !u!1 &130792 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 @@ -200,6 +200,21 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &147852 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22404366} + m_Layer: 5 + m_Name: Container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &151828 GameObject: m_ObjectHideFlags: 1 @@ -442,8 +457,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 11431992} m_HandleRect: {fileID: 22417254} m_Direction: 2 - m_Value: .999377966 - m_Size: .40900141 + m_Value: .99938184 + m_Size: .427392095 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -629,6 +644,7 @@ MonoBehaviour: KillButton: {fileID: 11400492} WatchButton: {fileID: 11491412} XButton: {fileID: 11494666} + Container: {fileID: 147852} UIFriendPicture: {fileID: 11467422, guid: 16a1d168f1ef75b4690435675a9e69b0, type: 2} --- !u!114 &11478962 MonoBehaviour: @@ -789,7 +805,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 11488168} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 11476684} + m_MethodName: Close + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!114 &11499626 @@ -890,6 +918,25 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 113502} +--- !u!224 &22404366 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 147852} + 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: 22471300} + - {fileID: 22475688} + m_Father: {fileID: 22436630} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} --- !u!224 &22417254 RectTransform: m_ObjectHideFlags: 1 @@ -953,8 +1000,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 22471300} - - {fileID: 22475688} + - {fileID: 22404366} m_Father: {fileID: 0} m_RootOrder: 0 m_AnchorMin: {x: .0299999993, y: .0299999993} @@ -1047,8 +1093,8 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: .5, y: 1} m_AnchorMax: {x: .5, y: 1} - m_AnchoredPosition: {x: 0, y: -69.4488983} - m_SizeDelta: {x: 90, y: 139} + m_AnchoredPosition: {x: 0, y: -65.95327} + m_SizeDelta: {x: 90, y: 132} m_Pivot: {x: .5, y: .5} --- !u!224 &22462244 RectTransform: @@ -1099,12 +1145,12 @@ RectTransform: - {fileID: 22456054} - {fileID: 22483690} - {fileID: 22486224} - m_Father: {fileID: 22436630} + m_Father: {fileID: 22404366} m_RootOrder: 0 m_AnchorMin: {x: 0, y: .670000017} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -2.68453979} + m_SizeDelta: {x: -13.571991, y: -2.64448547} m_Pivot: {x: .5, y: .5} --- !u!224 &22474806 RectTransform: @@ -1136,12 +1182,12 @@ RectTransform: m_Children: - {fileID: 22440948} - {fileID: 22492032} - m_Father: {fileID: 22436630} + m_Father: {fileID: 22404366} m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: .639999986} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 1.44245148} + m_SizeDelta: {x: -13.571991, y: -5.12869263} m_Pivot: {x: .5, y: .5} --- !u!224 &22483690 RectTransform: diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index 194fe47..20ff212 100644 --- a/Assets/Scenes/Gameplay.unity +++ b/Assets/Scenes/Gameplay.unity @@ -427,126 +427,16 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 534364716} ---- !u!1001 &713252352 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 523974151} - m_Modifications: - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchorMin.x - value: .0299999993 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchorMin.y - value: .0299999993 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchorMax.x - value: .970000029 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchorMax.y - value: .970000029 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_Pivot.x - value: .5 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_Pivot.y - value: .5 - objectReference: {fileID: 0} - - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchorMin.y - value: .54311353 - objectReference: {fileID: 0} - - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchorMax.y - value: .999645948 - objectReference: {fileID: 0} - - target: {fileID: 22458514, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchoredPosition.y - value: -65.95327 - objectReference: {fileID: 0} - - target: {fileID: 22458514, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_SizeDelta.y - value: 132 - objectReference: {fileID: 0} - - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_Value - value: .999348521 - objectReference: {fileID: 0} - - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_Size - value: .456532389 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2} - m_IsPrefabParent: 0 --- !u!224 &724043966 stripped RectTransform: m_PrefabParentObject: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - m_PrefabInternal: {fileID: 713252352} + m_PrefabInternal: {fileID: 1267491657} --- !u!114 &724043967 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11476684, guid: c993e87661906234fba410e55ed66832, type: 2} - m_PrefabInternal: {fileID: 713252352} + m_PrefabInternal: {fileID: 1267491657} m_Script: {fileID: 11500000, guid: 88fb1885d6f8fd6409e3866b7707a12a, type: 3} --- !u!1 &997683484 GameObject: @@ -761,6 +651,100 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 +--- !u!1001 &1267491657 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 523974151} + m_Modifications: + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMin.x + value: .0299999993 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMin.y + value: .0299999993 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMax.x + value: .970000029 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMax.y + value: .970000029 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_Pivot.x + value: .5 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_Pivot.y + value: .5 + objectReference: {fileID: 0} + - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1413393085 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/NetworkingSphere.cs b/Assets/Scripts/NetworkingSphere.cs index 724a62d..9ab14a9 100644 --- a/Assets/Scripts/NetworkingSphere.cs +++ b/Assets/Scripts/NetworkingSphere.cs @@ -117,7 +117,7 @@ public class NetworkingSphere : MonoBehaviour _selectedNode.Select(false); } - DetailsPanel.SetModel(node.Model); + DetailsPanel.SetNode(node); node.Select(true); _selectedNode = node; diff --git a/Assets/Scripts/PersonDetailsPanel.cs b/Assets/Scripts/PersonDetailsPanel.cs index 4b13a26..35c235e 100644 --- a/Assets/Scripts/PersonDetailsPanel.cs +++ b/Assets/Scripts/PersonDetailsPanel.cs @@ -11,22 +11,32 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver public Button KillButton; public Button WatchButton; public Button XButton; + public GameObject Container; public Image UIFriendPicture; + private PersonNode _node; private Person _model; - public void SetModel(Person model) + void Awake() + { + Container.SetActive(false); + } + + public void SetNode(PersonNode node) { if (_model != null) { _model.UnSubscribe(this); } - _model = model; + _node = node; + _model = node.Model; _model.Subscribe(this); + Container.SetActive(true); + UpdateInfo(); } @@ -44,8 +54,8 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver Destroy(picture.gameObject); } - //FriendsPanel.GetComponent().sizeDelta = new Vector2(90f, 21 * _model.FriendList.Count); - + ProfilePicture.sprite = _model.Picture; + RectTransform panelTrans = FriendsPanel.GetComponent(); panelTrans.anchorMin = new Vector2(0f, -0.3125f * _model.FriendList.Count); @@ -57,7 +67,6 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver for (int i = 0; i < _model.FriendList.Count; i++) { - // Temporary, until the model changes Person friend = _model.FriendList[i].friend1 == _model ? _model.FriendList[i].friend2 : _model.FriendList[i].friend1; Image friendPicture = Instantiate(UIFriendPicture) as Image; @@ -79,7 +88,11 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver Debug.Log(friendPicture.rectTransform.position); } } + } - + public void Close() + { + Container.SetActive(false); + _node.Select(false); } }