diff --git a/Assets/Prefabs/PersonDetailsPanel.prefab b/Assets/Prefabs/PersonDetailsPanel.prefab index fc2a19e..1723fdd 100644 --- a/Assets/Prefabs/PersonDetailsPanel.prefab +++ b/Assets/Prefabs/PersonDetailsPanel.prefab @@ -395,7 +395,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 11443318} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 11476684} + m_MethodName: KillNode + 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 &11411578 @@ -457,8 +469,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 11431992} m_HandleRect: {fileID: 22417254} m_Direction: 2 - m_Value: 1 - m_Size: .427392095 + m_Value: .999378026 + m_Size: .427392036 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -645,7 +657,7 @@ MonoBehaviour: WatchButton: {fileID: 11491412} XButton: {fileID: 11494666} Container: {fileID: 147852} - UIFriendPicture: {fileID: 11467422, guid: 16a1d168f1ef75b4690435675a9e69b0, type: 2} + FriendPicture: {fileID: 11469406, guid: 16a1d168f1ef75b4690435675a9e69b0, type: 2} --- !u!114 &11478962 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1093,7 +1105,7 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: .5, y: 1} m_AnchorMax: {x: .5, y: 1} - m_AnchoredPosition: {x: 0, y: -65.9999924} + m_AnchoredPosition: {x: 0, y: -65.95298} m_SizeDelta: {x: 90, y: 132} m_Pivot: {x: .5, y: .5} --- !u!224 &22462244 diff --git a/Assets/Prefabs/PersonNode.prefab b/Assets/Prefabs/PersonNode.prefab index e54d840..51bf4c8 100644 --- a/Assets/Prefabs/PersonNode.prefab +++ b/Assets/Prefabs/PersonNode.prefab @@ -62,7 +62,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 193868} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -544.163269, y: -235.973114, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 496448} @@ -75,7 +75,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 136744} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -.00100000005} m_LocalScale: {x: .800000012, y: .800000012, z: 1} m_Children: - {fileID: 498100} diff --git a/Assets/Prefabs/UIFriendPicture.prefab b/Assets/Prefabs/UIFriendPicture.prefab index 92f3668..8e778a0 100644 --- a/Assets/Prefabs/UIFriendPicture.prefab +++ b/Assets/Prefabs/UIFriendPicture.prefab @@ -10,6 +10,8 @@ GameObject: - 224: {fileID: 22403202} - 222: {fileID: 22221002} - 114: {fileID: 11467422} + - 114: {fileID: 11469406} + - 114: {fileID: 11492734} m_Layer: 5 m_Name: UIFriendPicture m_TagString: Untagged @@ -38,6 +40,47 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &11469406 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 115844} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 343d57f2bac42ae48ba9722c53e5526f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &11492734 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 115844} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + delegates: + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 11469406} + m_MethodName: OnClick + 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.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!222 &22221002 CanvasRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index 27da76c..d276475 100644 --- a/Assets/Scenes/Gameplay.unity +++ b/Assets/Scenes/Gameplay.unity @@ -136,7 +136,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438} + m_BackGroundColor: {r: .0994694307, g: .150959909, b: .258823544, a: 1} m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -171,16 +171,84 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 ---- !u!1 &443951980 +--- !u!1 &122634400 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 443951981} - - 222: {fileID: 443951983} - - 114: {fileID: 443951982} + - 224: {fileID: 122634401} + m_Layer: 5 + m_Name: RightUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &122634401 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 122634400} + 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: 403748470} + - {fileID: 350457696} + - {fileID: 906703074} + - {fileID: 1411243506} + m_Father: {fileID: 750965895} + m_RootOrder: 1 + m_AnchorMin: {x: .699999988, y: 0} + m_AnchorMax: {x: 1, y: .899999976} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1 &142867287 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 142867288} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &142867288 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 142867287} + 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: 1411243506} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: .850000024} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1 &268520029 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 268520030} + - 222: {fileID: 268520032} + - 114: {fileID: 268520031} m_Layer: 5 m_Name: Title m_TagString: Untagged @@ -188,29 +256,219 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &443951981 +--- !u!224 &268520030 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 443951980} + m_GameObject: {fileID: 268520029} 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: 2006180051} + m_Father: {fileID: 1411243506} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .699999988} + m_AnchorMax: {x: 1, y: .925000012} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -3.05175781e-05, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &268520031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 268520029} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Watchs +--- !u!222 &268520032 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 268520029} +--- !u!1 &350457695 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 350457696} + - 222: {fileID: 350457698} + - 114: {fileID: 350457697} + m_Layer: 5 + m_Name: Trending + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &350457696 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 350457695} + 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: 1366676553} + m_Father: {fileID: 122634401} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .550000012} + m_AnchorMax: {x: 1, y: .699999988} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &350457697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 350457695} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .847058833, g: .874509811, b: .917647064, a: 1} + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &350457698 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 350457695} +--- !u!1 &403748469 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 403748470} + - 222: {fileID: 403748472} + - 114: {fileID: 403748471} + m_Layer: 5 + m_Name: RecentPosts + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &403748470 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 403748469} + 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: 724929356} + m_Father: {fileID: 122634401} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .699999988} + 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!114 &403748471 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 403748469} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .847058833, g: .874509811, b: .917647064, a: 1} + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &403748472 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 403748469} +--- !u!1 &724929355 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 724929356} + - 222: {fileID: 724929358} + - 114: {fileID: 724929357} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &724929356 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 724929355} + 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: 403748470} m_RootOrder: 0 m_AnchorMin: {x: 0, y: .800000012} m_AnchorMax: {x: 1, y: .949999988} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!114 &443951982 +--- !u!114 &724929357 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 443951980} + m_GameObject: {fileID: 724929355} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} @@ -231,88 +489,113 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Recent Posts ---- !u!222 &443951983 +--- !u!222 &724929358 CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 443951980} ---- !u!1 &466670520 + m_GameObject: {fileID: 724929355} +--- !u!1 &750965894 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 466670521} - - 222: {fileID: 466670523} - - 114: {fileID: 466670522} + - 224: {fileID: 750965895} + - 223: {fileID: 750965898} + - 114: {fileID: 750965897} + - 114: {fileID: 750965896} m_Layer: 5 - m_Name: Title + m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &466670521 + m_IsActive: 1 +--- !u!224 &750965895 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 466670520} + m_GameObject: {fileID: 750965894} 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: 523974151} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: .828599989} - m_AnchorMax: {x: 1, y: .957099974} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1858163985} + - {fileID: 122634401} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -3.05175781e-05, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!114 &466670522 + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &750965896 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 466670520} + m_GameObject: {fileID: 750965894} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 4 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Person Details ---- !u!222 &466670523 -CanvasRenderer: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &750965897 +MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 466670520} ---- !u!1 &523974148 + m_GameObject: {fileID: 750965894} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &750965898 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 750965894} + m_Enabled: 1 + serializedVersion: 2 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!1 &906703073 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 523974151} - - 222: {fileID: 523974150} - - 114: {fileID: 523974149} + - 224: {fileID: 906703074} + - 222: {fileID: 906703076} + - 114: {fileID: 906703075} m_Layer: 5 m_Name: PersonDetails m_TagString: Untagged @@ -320,196 +603,118 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &523974149 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 523974148} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: .39199999} - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &523974150 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 523974148} ---- !u!224 &523974151 +--- !u!224 &906703074 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 523974148} + m_GameObject: {fileID: 906703073} 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: 466670521} - - {fileID: 724043966} - m_Father: {fileID: 1608274018} + - {fileID: 2009587059} + - {fileID: 1197925314} + m_Father: {fileID: 122634401} m_RootOrder: 2 m_AnchorMin: {x: 0, y: .200000003} m_AnchorMax: {x: 1, y: .550000012} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!1 &534364716 +--- !u!114 &906703075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 906703073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .847058833, g: .874509811, b: .917647064, a: 1} + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &906703076 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 906703073} +--- !u!1 &1126063559 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 534364717} - - 222: {fileID: 534364719} - - 114: {fileID: 534364718} - m_Layer: 5 - m_Name: TopUI + - 4: {fileID: 1126063561} + - 108: {fileID: 1126063560} + m_Layer: 0 + m_Name: Directional Light m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &534364717 -RectTransform: +--- !u!108 &1126063560 +Light: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 534364716} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1126063559} + m_Enabled: 1 + serializedVersion: 6 + m_Type: 1 + m_Color: {r: 1, g: .956862748, b: .839215696, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_Strength: 1 + m_Bias: .0500000007 + m_NormalBias: .400000006 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 4 + m_BounceIntensity: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_AreaSize: {x: 1, y: 1} +--- !u!4 &1126063561 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1126063559} + m_LocalRotation: {x: .408217937, y: -.234569728, z: .109381676, w: .875426054} + m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1057734538} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: .899999976} - 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!114 &534364718 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 534364716} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: .39199999} - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &534364719 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 534364716} ---- !u!224 &724043966 stripped -RectTransform: - m_PrefabParentObject: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, - type: 2} - m_PrefabInternal: {fileID: 1009381200} ---- !u!114 &724043967 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11476684, guid: c993e87661906234fba410e55ed66832, - type: 2} - m_PrefabInternal: {fileID: 1009381200} - m_Script: {fileID: 11500000, guid: 88fb1885d6f8fd6409e3866b7707a12a, type: 3} ---- !u!1 &811802576 stripped -GameObject: - m_PrefabParentObject: {fileID: 147852, guid: c993e87661906234fba410e55ed66832, type: 2} - m_PrefabInternal: {fileID: 1009381200} ---- !u!1 &997683484 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 997683485} - - 222: {fileID: 997683487} - - 114: {fileID: 997683486} - m_Layer: 5 - m_Name: Trending - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &997683485 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 997683484} - 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: 2116360766} - m_Father: {fileID: 1608274018} + m_Father: {fileID: 0} m_RootOrder: 1 - m_AnchorMin: {x: 0, y: .550000012} - m_AnchorMax: {x: 1, y: .699999988} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!114 &997683486 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 997683484} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: .39199999} - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &997683487 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 997683484} ---- !u!1001 &1009381200 +--- !u!1001 &1197925313 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 523974151} + m_TransformParent: {fileID: 906703074} m_Modifications: - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} propertyPath: m_LocalPosition.x @@ -585,7 +790,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} propertyPath: m_AnchorMin.y - value: .590630949 + value: .593776882 objectReference: {fileID: 0} - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} propertyPath: m_AnchorMax.x @@ -593,213 +798,111 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} propertyPath: m_AnchorMax.y - value: .999632359 + value: .999643743 objectReference: {fileID: 0} - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2} propertyPath: m_Value - value: .999377966 + value: .999384761 objectReference: {fileID: 0} - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2} propertyPath: m_Size - value: .40900141 - objectReference: {fileID: 0} - - target: {fileID: 11458616, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 0c813218655d0a1468d7269b69deb9d5, - type: 3} - - target: {fileID: 11402414, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 0c813218655d0a1468d7269b69deb9d5, - type: 3} - - target: {fileID: 11450318, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 0c813218655d0a1468d7269b69deb9d5, - type: 3} - - target: {fileID: 11469610, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 0c813218655d0a1468d7269b69deb9d5, - type: 3} - - target: {fileID: 22458514, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchoredPosition.y - value: -65.9512253 + value: .420931697 objectReference: {fileID: 0} - target: {fileID: 11476684, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: Container + propertyPath: FriendPicture value: - objectReference: {fileID: 811802576} - - target: {fileID: 11476684, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: UIFriendPicture - value: - objectReference: {fileID: 11467422, guid: 16a1d168f1ef75b4690435675a9e69b0, + objectReference: {fileID: 11469406, guid: 16a1d168f1ef75b4690435675a9e69b0, type: 2} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2} m_IsPrefabParent: 0 ---- !u!1 &1057734534 +--- !u!224 &1197925314 stripped +RectTransform: + m_PrefabParentObject: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, + type: 2} + m_PrefabInternal: {fileID: 1197925313} +--- !u!114 &1197925315 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 11476684, guid: c993e87661906234fba410e55ed66832, + type: 2} + m_PrefabInternal: {fileID: 1197925313} + m_Script: {fileID: 11500000, guid: 88fb1885d6f8fd6409e3866b7707a12a, type: 3} +--- !u!1 &1366676552 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 1057734538} - - 223: {fileID: 1057734537} - - 114: {fileID: 1057734536} - - 114: {fileID: 1057734535} + - 224: {fileID: 1366676553} + - 222: {fileID: 1366676555} + - 114: {fileID: 1366676554} m_Layer: 5 - m_Name: Canvas + m_Name: Title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1057734535 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1057734534} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1057734536 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1057734534} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 ---- !u!223 &1057734537 -Canvas: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1057734534} - m_Enabled: 1 - serializedVersion: 2 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!224 &1057734538 +--- !u!224 &1366676553 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1057734534} + m_GameObject: {fileID: 1366676552} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 534364717} - - {fileID: 1608274018} - m_Father: {fileID: 0} - m_RootOrder: 3 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!1 &1126063559 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1126063561} - - 108: {fileID: 1126063560} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &1126063560 -Light: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1126063559} - m_Enabled: 1 - serializedVersion: 6 - m_Type: 1 - m_Color: {r: 1, g: .956862748, b: .839215696, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_Strength: 1 - m_Bias: .0500000007 - m_NormalBias: .400000006 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_Lightmapping: 4 - m_BounceIntensity: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 - m_AreaSize: {x: 1, y: 1} ---- !u!4 &1126063561 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1126063559} - m_LocalRotation: {x: .408217937, y: -.234569728, z: .109381676, w: .875426054} - m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 ---- !u!1 &1413393085 + m_Father: {fileID: 350457696} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .600000024} + m_AnchorMax: {x: 1, y: .899999976} + m_AnchoredPosition: {x: -1.21593475e-05, y: 0} + m_SizeDelta: {x: -3.05180001e-05, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1366676554 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1366676552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Trending +--- !u!222 &1366676555 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1366676552} +--- !u!1 &1411243505 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 1413393086} - - 222: {fileID: 1413393088} - - 114: {fileID: 1413393087} + - 224: {fileID: 1411243506} + - 222: {fileID: 1411243508} + - 114: {fileID: 1411243507} m_Layer: 5 m_Name: WatchArea m_TagString: Untagged @@ -807,38 +910,38 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1413393086 +--- !u!224 &1411243506 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1413393085} + m_GameObject: {fileID: 1411243505} 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: 2084455285} - - {fileID: 1619281955} - m_Father: {fileID: 1608274018} + - {fileID: 268520030} + - {fileID: 142867288} + m_Father: {fileID: 122634401} m_RootOrder: 3 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: .200000003} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!114 &1413393087 +--- !u!114 &1411243507 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1413393085} + m_GameObject: {fileID: 1411243505} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: .39199999} + m_Color: {r: .847058833, g: .874509811, b: .917647064, a: 1} m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -847,80 +950,73 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!222 &1413393088 +--- !u!222 &1411243508 CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1413393085} ---- !u!1 &1608274017 + m_GameObject: {fileID: 1411243505} +--- !u!1 &1858163984 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 1608274018} + - 224: {fileID: 1858163985} + - 222: {fileID: 1858163987} + - 114: {fileID: 1858163986} m_Layer: 5 - m_Name: RightUI + m_Name: TopUI m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1608274018 +--- !u!224 &1858163985 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1608274017} - 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: 2006180051} - - {fileID: 997683485} - - {fileID: 523974151} - - {fileID: 1413393086} - m_Father: {fileID: 1057734538} - m_RootOrder: 1 - m_AnchorMin: {x: .699999988, y: 0} - m_AnchorMax: {x: 1, y: .899999976} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!1 &1619281954 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1619281955} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1619281955 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1619281954} + m_GameObject: {fileID: 1858163984} 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: 1413393086} - m_RootOrder: 1 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: .850000024} + m_Father: {fileID: 750965895} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .899999976} + 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!114 &1858163986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1858163984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .23137255, g: .349019617, b: .596078455, a: 1} + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1858163987 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1858163984} --- !u!1 &1999982083 GameObject: m_ObjectHideFlags: 0 @@ -994,68 +1090,72 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 ---- !u!1 &2006180048 +--- !u!1 &2009587058 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 2006180051} - - 222: {fileID: 2006180050} - - 114: {fileID: 2006180049} + - 224: {fileID: 2009587059} + - 222: {fileID: 2009587061} + - 114: {fileID: 2009587060} m_Layer: 5 - m_Name: RecentPosts + m_Name: Title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2006180049 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2006180048} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: .39199999} - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &2006180050 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2006180048} ---- !u!224 &2006180051 + m_IsActive: 0 +--- !u!224 &2009587059 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2006180048} + m_GameObject: {fileID: 2009587058} 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: 443951981} - m_Father: {fileID: 1608274018} + m_Children: [] + m_Father: {fileID: 906703074} m_RootOrder: 0 - m_AnchorMin: {x: 0, y: .699999988} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: .828599989} + m_AnchorMax: {x: 1, y: .957099974} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -3.05175781e-05, y: 0} m_Pivot: {x: .5, y: .5} +--- !u!114 &2009587060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2009587058} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Person Details +--- !u!222 &2009587061 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2009587058} --- !u!1001 &2065124246 Prefab: m_ObjectHideFlags: 0 @@ -1098,151 +1198,7 @@ Prefab: - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} propertyPath: DetailsPanel value: - objectReference: {fileID: 724043967} - - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: levelOptions.NumPeople - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: levelOptions.AvgNumFriends - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: levelOptions.FriendshipLikeliness - value: .600000024 - objectReference: {fileID: 0} + objectReference: {fileID: 1197925315} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} m_IsPrefabParent: 0 ---- !u!1 &2084455284 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 2084455285} - - 222: {fileID: 2084455287} - - 114: {fileID: 2084455286} - m_Layer: 5 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2084455285 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2084455284} - 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: 1413393086} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: .699999988} - m_AnchorMax: {x: 1, y: .925000012} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -3.05175781e-05, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!114 &2084455286 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2084455284} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 4 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Watchs ---- !u!222 &2084455287 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2084455284} ---- !u!1 &2116360765 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 2116360766} - - 222: {fileID: 2116360768} - - 114: {fileID: 2116360767} - m_Layer: 5 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2116360766 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2116360765} - 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: 997683485} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: .600000024} - m_AnchorMax: {x: 1, y: .899999976} - m_AnchoredPosition: {x: -1.21593475e-05, y: 0} - m_SizeDelta: {x: -3.05180001e-05, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!114 &2116360767 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2116360765} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 4 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Trending ---- !u!222 &2116360768 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2116360765} diff --git a/Assets/Scripts/Models/Person.cs b/Assets/Scripts/Models/Person.cs index 51ec1ff..f03871f 100644 --- a/Assets/Scripts/Models/Person.cs +++ b/Assets/Scripts/Models/Person.cs @@ -48,6 +48,8 @@ namespace DeathBook.Model private Sprite picture; public Sprite Picture { get { return picture; } } + private Action onSelected; + public Action OnSelected {get {return onSelected;} set { onSelected = value; } } public Person(int id, string fName, string lName, Vector3 pos, int conn, int disconn, float freq, Sprite pic) { @@ -126,5 +128,13 @@ namespace DeathBook.Model foreach (Friendship f in deadFriendsList) f.Update(deltaTime); } + + public void SelectNode() + { + if (OnSelected != null) + { + OnSelected(); + } + } } } \ No newline at end of file diff --git a/Assets/Scripts/NetworkingSphere.cs b/Assets/Scripts/NetworkingSphere.cs index 60d6859..0577568 100644 --- a/Assets/Scripts/NetworkingSphere.cs +++ b/Assets/Scripts/NetworkingSphere.cs @@ -4,25 +4,25 @@ using System.Collections.Generic; using DeathBook.Model; public class NetworkingSphere : MonoBehaviour -{ - public GameObjectsOptions gameObjects = new GameObjectsOptions(); - public LevelOptions levelOptions = new LevelOptions(); - private NetworkDisconnection sphere; - - [System.Serializable] - public class GameObjectsOptions - { - public Link LinkObj; - public PersonNode PersonObj; - } - - [System.Serializable] - public class LevelOptions - { - public int NumPeople = 50; - public int AvgNumFriends = 20; - public float FriendshipLikeliness = 0.4f; - public float SphereRadius = 1f; +{ + public GameObjectsOptions gameObjects = new GameObjectsOptions(); + public LevelOptions levelOptions = new LevelOptions(); + private NetworkDisconnection sphere; + + [System.Serializable] + public class GameObjectsOptions + { + public Link LinkObj; + public PersonNode PersonObj; + } + + [System.Serializable] + public class LevelOptions + { + public int NumPeople = 50; + public int AvgNumFriends = 20; + public float FriendshipLikeliness = 0.4f; + public float SphereRadius = 1f; } public float rotationSpeed = 0.7f; @@ -32,33 +32,36 @@ public class NetworkingSphere : MonoBehaviour private bool dragging = false; private Vector3 delta = new Vector3(); - private Rigidbody rb; - + private Rigidbody rb; + private LevelManager manager; private PersonNode[] peopleNodes; private PersonNode _selectedNode; + // Used to disable the physics when the user has clicked on a node + private bool _isRotatingTowardsNode = false; + void Awake() - { - manager = LevelManager.Instance; - manager.NewLevel(levelOptions.NumPeople, levelOptions.AvgNumFriends, levelOptions.FriendshipLikeliness, levelOptions.SphereRadius); + { + manager = LevelManager.Instance; + manager.NewLevel(levelOptions.NumPeople, levelOptions.AvgNumFriends, levelOptions.FriendshipLikeliness, levelOptions.SphereRadius); Level lvl = manager.GameLevel; InstantiateNodes(lvl); AssignLinks(lvl); rb = GetComponent(); - } - - void OnGUI() - { - int time = manager.GameLevel.DayTime; - GUI.Button(new Rect(50, 50, 100, 40), Utils.GetTimeString(time)); + } + + void OnGUI() + { + int time = manager.GameLevel.DayTime; + GUI.Button(new Rect(50, 50, 100, 40), Utils.GetTimeString(time)); } void Update() - { + { manager.GameLevel.Update(Time.deltaTime); //TEMPORARY QUICK FIX: Even though we are never moving the sphere, it starts moving as soon as it stops rotating @@ -70,7 +73,7 @@ public class NetworkingSphere : MonoBehaviour Vector3 worldMousePos = Camera.main.ScreenToWorldPoint(screenMousePos); - // If the world position of the mouse is greater than the radius of the sphere, we are outside + // If the world position of the mouse is greater than the radius of the sphere, we are outside if (Mathf.Sqrt(worldMousePos.x * worldMousePos.x + worldMousePos.y * worldMousePos.y) > levelOptions.SphereRadius + 1f) { transform.Rotate(Vector3.one * Time.deltaTime * rotationSpeed); @@ -87,20 +90,20 @@ public class NetworkingSphere : MonoBehaviour delta = new Vector3(); } - if (dragging) + if (dragging && !_isRotatingTowardsNode) { MoveSphere(); - } - - - //scroll - if (Input.GetAxis("Mouse ScrollWheel") != 0) - { - // if (Camera.main.ScreenToViewportPoint(Input.mousePosition) < new Vector3(1,1,1)) - if (Camera.main.ScreenToViewportPoint(Input.mousePosition).x < 1) - { - Camera.main.fieldOfView -= Input.GetAxis("Mouse ScrollWheel") * 10f; - } + } + + + //scroll + if (Input.GetAxis("Mouse ScrollWheel") != 0) + { + // if (Camera.main.ScreenToViewportPoint(Input.mousePosition) < new Vector3(1,1,1)) + if (Camera.main.ScreenToViewportPoint(Input.mousePosition).x < 1) + { + Camera.main.fieldOfView -= Input.GetAxis("Mouse ScrollWheel") * 10f; + } } } @@ -140,26 +143,29 @@ public class NetworkingSphere : MonoBehaviour private void OnNodeClicked(PersonNode node) { + if (node == _selectedNode) return; + if (_selectedNode != null) { _selectedNode.Select(false); - } - - node.Kill(); + } DetailsPanel.SetNode(node); node.Select(true); _selectedNode = node; + + // Testing to see how it looks and feels like + FocusOnNode(node); } private void AssignLinks(Level lvl) { foreach (FriendshipLink f in lvl.Friendships) - { + { Link link = Instantiate(gameObjects.LinkObj) as Link; int id1 = f.Friend1.id; - int id2 = f.Friend2.id; + int id2 = f.Friend2.id; link.Model = f; link.AttachToObjects(peopleNodes[id1].gameObject, peopleNodes[id2].gameObject); @@ -168,4 +174,65 @@ public class NetworkingSphere : MonoBehaviour peopleNodes[id2].AddLink(link); } } + + public void FocusOnNode(PersonNode node) + { + StopCoroutine("RotateTowardsNodeCoroutine"); + StartCoroutine("RotateTowardsNodeCoroutine", node); + + /* + Debug.Log(node.transform.eulerAngles); + + float xangle = (Mathf.Atan2(finalPos.z, finalPos.y) - Mathf.Atan2(initialPos.z, initialPos.y)) * Mathf.Rad2Deg; + + Debug.Log(node.transform.position); + transform.Rotate(new Vector3(90, 0, 0)); + //transform.rotation = transform.rotation * Quaternion.AngleAxis(xangle, Vector3.right); + Debug.Log(xangle); + float yAngle = (Mathf.Atan2(finalPos.x, finalPos.z) - Mathf.Atan2(node.transform.position.x, node.transform.position.z)) * Mathf.Rad2Deg; + Debug.Log(yAngle); + //transform.Rotate(new Vector3(xangle, yAngle, 0)); + + //float zAngle = (Mathf.Atan2(finalPos.y, finalPos.x) - Mathf.Atan2(initialPos.y, initialPos.x)) * Mathf.Rad2Deg; + + //transform.rotation = transform.rotation * Quaternion.AngleAxis(xangle, Vector3.right) * Quaternion.AngleAxis(yAngle, Vector3.up) * Quaternion.AngleAxis(zAngle, Vector3.forward); + */ + } + + private IEnumerator RotateTowardsNodeCoroutine(PersonNode node) + { + _isRotatingTowardsNode = true; + rb.angularVelocity = Vector3.zero; + + //Vector3 finalPos = new Vector3(0f, 0f, -SphereRadius); + + Quaternion initialRot = transform.localRotation; + + + transform.localRotation = Quaternion.identity; // Temporary hack for the game jam + + + Vector3 nodePos = node.transform.position; + + Vector3 longDir = nodePos; + longDir.y = 0; + + float xAngle = Mathf.Asin(nodePos.normalized.y) * Mathf.Rad2Deg; // Latitude + float yAngle = Vector3.Angle(-Vector3.forward, longDir) * (longDir.x < 0 ? -1 : 1); // Longitude + + Quaternion finalRot = Quaternion.AngleAxis(-xAngle, Vector3.right) * Quaternion.AngleAxis(yAngle, Vector3.up); + + float ratio = 0f; + + while (ratio < 1f) + { + ratio += Time.deltaTime / 1.5f; + + transform.localRotation = Quaternion.Lerp(initialRot, finalRot, Mathf.SmoothStep(0f, 1f, ratio)); + + yield return null; + } + + _isRotatingTowardsNode = false; + } } diff --git a/Assets/Scripts/PersonDetailsPanel.cs b/Assets/Scripts/PersonDetailsPanel.cs index b36a4ad..aa7e182 100644 --- a/Assets/Scripts/PersonDetailsPanel.cs +++ b/Assets/Scripts/PersonDetailsPanel.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; using UnityEngine.UI; -using DeathBook.Model; +using DeathBook.Model; using DeathBook.Util; public class PersonDetailsPanel : MonoBehaviour, IObserver @@ -14,7 +14,7 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver public Button XButton; public GameObject Container; - public Image UIFriendPicture; + public UIFriendPicture FriendPicture; private PersonNode _node; private Person _model; @@ -30,7 +30,7 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver { _model.UnSubscribe(this); } - + _node = node; _model = node.Model; @@ -50,6 +50,9 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver { Name.text = _model.Name; + KillButton.gameObject.SetActive(_model.Alive); + WatchButton.gameObject.SetActive(_model.Alive); + foreach (Transform picture in FriendsPanel.transform) { Destroy(picture.gameObject); @@ -70,24 +73,19 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver { Person friend = _model.FriendList[i].Friend; - Image friendPicture = Instantiate(UIFriendPicture) as Image; + UIFriendPicture friendPicture = Instantiate(FriendPicture) as UIFriendPicture; - friendPicture.sprite = friend.Picture; + friendPicture.Model = friend; - friendPicture.transform.SetParent(FriendsPanel.transform); - friendPicture.rectTransform.anchorMin = new Vector2(0.022f, 1f - (height - 0.01f) * (i + 1) - i * 0.01f); - friendPicture.rectTransform.anchorMax = new Vector2(0.26f, (1f - height * i)); - friendPicture.rectTransform.offsetMin = Vector2.zero; - friendPicture.rectTransform.offsetMax = Vector2.zero; + Image picture = friendPicture.Picture; - if (i == _model.FriendList.Count - 1) - { - Debug.Log(friendPicture.rectTransform.position); - } - else if (i == 0) - { - Debug.Log(friendPicture.rectTransform.position); - } + picture.sprite = friend.Picture; + + picture.transform.SetParent(FriendsPanel.transform); + picture.rectTransform.anchorMin = new Vector2(0.022f, 1f - (height - 0.01f) * (i + 1) - i * 0.01f); + picture.rectTransform.anchorMax = new Vector2(0.26f, (1f - height * i)); + picture.rectTransform.offsetMin = Vector2.zero; + picture.rectTransform.offsetMax = Vector2.zero; } } @@ -96,4 +94,9 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver Container.SetActive(false); _node.Select(false); } + + public void KillNode() + { + _node.Kill(); + } } diff --git a/Assets/Scripts/PersonNode.cs b/Assets/Scripts/PersonNode.cs index f56545e..71b3def 100644 --- a/Assets/Scripts/PersonNode.cs +++ b/Assets/Scripts/PersonNode.cs @@ -1,177 +1,178 @@ -using UnityEngine; -using System.Collections; -using System.Collections.Generic; +using UnityEngine; +using System.Collections; +using System.Collections.Generic; using DeathBook.Model; -using DeathBook.Util; -using System; - -[RequireComponent(typeof(Collider))] -public class PersonNode : MonoBehaviour, IObserver +using DeathBook.Util; +using System; + +[RequireComponent(typeof(Collider))] +public class PersonNode : MonoBehaviour, IObserver { private const float UpdateFrequency = 0.5f; - private float time = 0; - - public Action OnClicked; - - public Color SelectedColor = Color.blue; - - public Color StartColor = Color.green; - public Color MiddleColor = Color.yellow; - public Color EndColor = Color.red; - - public Renderer internQuad; - public Renderer xQuad; - - private List _links; - private bool _highlighted = false; - private bool _selected = false; - - private Person _model; - private Renderer _renderer; + private float time = 0; + + public Action OnClicked; + + public Color SelectedColor = Color.blue; + + public Color StartColor = Color.green; + public Color MiddleColor = Color.yellow; + public Color EndColor = Color.red; + + public Renderer internQuad; + public Renderer xQuad; + + private List _links; + private bool _highlighted = false; + private bool _selected = false; + + private Person _model; + private Renderer _renderer; private Transform _transform; - - - public Person Model - { - get { return _model; } - set - { - _model = value; - _model.Subscribe(this); - UpdateInfo(); - SetProfilePicture(); - } - } - - private void SetProfilePicture() - { - internQuad.material.mainTexture = _model.Picture.texture; - internQuad.material.SetTexture("_MainTex", _model.Picture.texture); - } - - void Awake() - { - _links = new List(); - _renderer = GetComponent(); - _transform = GetComponent(); - } - - void Update() + + + public Person Model + { + get { return _model; } + set + { + _model = value; + _model.Subscribe(this); + _model.OnSelected += () => { OnClicked(this); }; + UpdateInfo(); + SetProfilePicture(); + } + } + + private void SetProfilePicture() + { + internQuad.material.mainTexture = _model.Picture.texture; + internQuad.material.SetTexture("_MainTex", _model.Picture.texture); + } + + void Awake() + { + _links = new List(); + _renderer = GetComponent(); + _transform = GetComponent(); + } + + void Update() { time += Time.deltaTime; if (time > UpdateFrequency) { _model.Update(time); time = 0; - } - - // Find another way to do it if it lags to much - _transform.LookAt(new Vector3(_transform.position.x, _transform.position.y, _transform.position.z + 1)); - } - - public void AddLink(Link link) - { - _links.Add(link); - } - - public void Select(bool state) - { - _selected = state; - UpdateLinks(state); - - if (state) - { - _renderer.material.color = SelectedColor; - } - else - { - UpdateInfo(); - } - } - - private void UpdateLinks(bool isHighlighted) - { - foreach (Link link in _links) - { - link.Highlight(isHighlighted); - } + } + + // Find another way to do it if it lags to much + _transform.LookAt(new Vector3(_transform.position.x, _transform.position.y, _transform.position.z + 1)); + } + + public void AddLink(Link link) + { + _links.Add(link); + } + + public void Select(bool state) + { + _selected = state; + UpdateLinks(state); + + if (state) + { + _renderer.material.color = SelectedColor; + } + else + { + UpdateInfo(); + } + } + + private void UpdateLinks(bool isHighlighted) + { + foreach (Link link in _links) + { + link.Highlight(isHighlighted); + } } public void Kill() { _model.Kill(); - } - - public void Notify() + } + + public void Notify() { - //Debug.Log("Received notification! " + Model.AwarenessLevel); - UpdateInfo(); - } - - private void UpdateInfo() - { - //If dead -> set offline until all friends are aware, then add a big red X to profile pic - if (_model.Alive) - { - xQuad.enabled = false; - SetColors(); - } - else - { - xQuad.enabled = true; - gameObject.GetComponent().material.color = new Color32(50, 50, 50, 1); - UpdateLinks(false); - } - } - - private void SetColors() - { - //set greyed out for offline - if (_model.Online) - { - internQuad.material.color = new Color32(255, 255, 255, 1); - } - else - { - internQuad.material.color = new Color32(80, 80, 80, 1); - } - - if (_model.AwarenessLevel < 0.5) - { - gameObject.GetComponent().material.color = Color.Lerp(StartColor, MiddleColor, _model.AwarenessLevel * 2); - } - else - { - gameObject.GetComponent().material.color = Color.Lerp(MiddleColor, EndColor, _model.AwarenessLevel * 2 - 1); - } - } - - void OnMouseEnter() - { - if (!_selected && !_highlighted) - { - UpdateLinks(true); - } - - _highlighted = true; - } - - void OnMouseExit() - { - if (!_selected) - { - UpdateLinks(false); - } - - _highlighted = false; - } - - void OnMouseDown() - { - // The sphere should be subscribed to this event and update the data accordingly - if (OnClicked != null) - { - OnClicked(this); - } - } -} + //Debug.Log("Received notification! " + Model.AwarenessLevel); + UpdateInfo(); + } + + private void UpdateInfo() + { + //If dead -> set offline until all friends are aware, then add a big red X to profile pic + if (_model.Alive) + { + xQuad.enabled = false; + SetColors(); + } + else + { + xQuad.enabled = true; + gameObject.GetComponent().material.color = new Color32(50, 50, 50, 1); + UpdateLinks(false); + } + } + + private void SetColors() + { + //set greyed out for offline + if (_model.Online) + { + internQuad.material.color = new Color32(255, 255, 255, 1); + } + else + { + internQuad.material.color = new Color32(80, 80, 80, 1); + } + + if (_model.AwarenessLevel < 0.5) + { + gameObject.GetComponent().material.color = Color.Lerp(StartColor, MiddleColor, _model.AwarenessLevel * 2); + } + else + { + gameObject.GetComponent().material.color = Color.Lerp(MiddleColor, EndColor, _model.AwarenessLevel * 2 - 1); + } + } + + void OnMouseEnter() + { + if (!_selected && !_highlighted) + { + UpdateLinks(true); + } + + _highlighted = true; + } + + void OnMouseExit() + { + if (!_selected) + { + UpdateLinks(false); + } + + _highlighted = false; + } + + void OnMouseDown() + { + // The sphere should be subscribed to this event and update the data accordingly + if (OnClicked != null) + { + OnClicked(this); + } + } +} diff --git a/Assets/Scripts/UIFriendPicture.cs b/Assets/Scripts/UIFriendPicture.cs new file mode 100644 index 0000000..47e5196 --- /dev/null +++ b/Assets/Scripts/UIFriendPicture.cs @@ -0,0 +1,33 @@ +using UnityEngine; +using System.Collections; +using DeathBook.Model; +using UnityEngine.UI; + +[RequireComponent(typeof(Image))] +public class UIFriendPicture : MonoBehaviour +{ + private Person _model; + + public Person Model + { + get { return _model; } + set { _model = value; } + } + + private Image _picture; + + public Image Picture + { + get { return _picture; } + } + + void Awake() + { + _picture = GetComponent(); + } + + public void OnClick() + { + _model.SelectNode(); + } +} diff --git a/Assets/Scripts/UIFriendPicture.cs.meta b/Assets/Scripts/UIFriendPicture.cs.meta new file mode 100644 index 0000000..bddc54f --- /dev/null +++ b/Assets/Scripts/UIFriendPicture.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 343d57f2bac42ae48ba9722c53e5526f +timeCreated: 1439693427 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: