From ca79ca8381450c839b639cd3270308bc517d35d4 Mon Sep 17 00:00:00 2001 From: Patrice Vignola Date: Thu, 13 Aug 2015 13:55:16 -0400 Subject: [PATCH 1/4] - Removed some debug logs --- Assets/Scripts/Models/LevelGenerator.cs | 6 + Assets/Tests/PersonTest.cs | 1 - Assets/Tests/SphereSR.cs | 186 ++++++++++++------------ 3 files changed, 96 insertions(+), 97 deletions(-) diff --git a/Assets/Scripts/Models/LevelGenerator.cs b/Assets/Scripts/Models/LevelGenerator.cs index fde2492..c9bfdc1 100644 --- a/Assets/Scripts/Models/LevelGenerator.cs +++ b/Assets/Scripts/Models/LevelGenerator.cs @@ -27,6 +27,12 @@ namespace DeathBook.Model { List people = new List(numPeople); + /* Sphere uniform distribution using the spiral method with the golden angle + * ~2.39996323 rad, the golden angle (the most irrational angle) + * is used here to make sure that the sin and cos functions + * dont end up drawing clusters of points and the spirals are way + * less visible. + */ float dlong = Mathf.PI * (3 - Mathf.Sqrt(5)); //~2.39996323 float dz = (2f / numPeople) * radius; diff --git a/Assets/Tests/PersonTest.cs b/Assets/Tests/PersonTest.cs index 72cfb01..9e5d4a9 100644 --- a/Assets/Tests/PersonTest.cs +++ b/Assets/Tests/PersonTest.cs @@ -21,7 +21,6 @@ public class PersonTest : MonoBehaviour void OnMouseOver() { - Debug.Log("abc"); if (!_highlighted) { _highlighted = true; diff --git a/Assets/Tests/SphereSR.cs b/Assets/Tests/SphereSR.cs index 6f452fe..a3604ea 100644 --- a/Assets/Tests/SphereSR.cs +++ b/Assets/Tests/SphereSR.cs @@ -1,94 +1,88 @@ -using UnityEngine; -using System.Collections; +using UnityEngine; +using System.Collections; using System.Collections.Generic; -using DeathBook.Model; - -public class SphereSR : MonoBehaviour -{ - public FriendshipLink LinkObj; - public PersonTest PersonObj; +using DeathBook.Model; + +public class SphereSR : MonoBehaviour +{ + public FriendshipLink LinkObj; + public PersonTest PersonObj; public int NumPeople = 50; public int AvgNumFriends = 20; - public float FriendshipLikeliness = 0.4f; - public float SphereRadius = 1f; - public float rotationSpeed = 0.7f; - - public float torqueForce = 50f; - private bool dragging = false; - private Vector3 delta = new Vector3(); - private Rigidbody rb; - + public float FriendshipLikeliness = 0.4f; + public float SphereRadius = 1f; + public float rotationSpeed = 0.7f; + + public float torqueForce = 50f; + private bool dragging = false; + private Vector3 delta = new Vector3(); + private Rigidbody rb; + private PersonTest[] peopleNodes; - //TODO private Friendship[] friendships; - private GameObject[] nodes; - - void Awake() - { + //TODO private Friendship[] friendships; + private GameObject[] nodes; + + void Awake() + { LevelGenerator lGen = new LevelGenerator(); - Level lvl = lGen.GenerateLevel(NumPeople, AvgNumFriends, FriendshipLikeliness, SphereRadius); - - InstantiateNodes(lvl); - AssignLinks(lvl); - rb = GetComponent(); - } - - void Update() - { - Vector3 screenMousePos = Input.mousePosition; - - screenMousePos.z = transform.position.z - Camera.main.transform.position.z; - - 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 (Mathf.Sqrt(worldMousePos.x * worldMousePos.x + worldMousePos.y * worldMousePos.y) > SphereRadius + 1f) - { - transform.Rotate(Vector3.one * Time.deltaTime * rotationSpeed); - } - - //when right btn clicked, call the chnge rotation - if (Input.GetMouseButtonDown(1)) - { - dragging = true; - } - else if (Input.GetMouseButtonUp(1)) - { - dragging = false; - delta = new Vector3(); - } - - if (dragging) - { - MoveSphere(); - } - } - - void MoveSphere() - { - float deltaX = Input.GetAxis("Mouse X"); - float deltaY = Input.GetAxis("Mouse Y"); - if (deltaX == 0 && deltaY == 0) - { - delta = new Vector3(); - rb.angularVelocity *= 0.8f; - } - delta += new Vector3(deltaX, deltaY, 0); - //rigidbody.AddTorque(); - rb.AddTorque(Vector3.down * delta.x * torqueForce * Time.deltaTime, ForceMode.Impulse); - rb.AddTorque(Vector3.right * delta.y * torqueForce * Time.deltaTime, ForceMode.Impulse); - Debug.Log(delta.x + ", " + delta.y); - - - } - - private void InstantiateNodes(Level lvl) - { - /* Sphere uniform distribution using the spiral method with the golden angle - * ~2.39996323 rad, the golden angle (the most irrational angle) - * is used here to make sure that the sin and cos functions - * dont end up drawing clusters of points and the spirals are way - * less visible. - */ + Level lvl = lGen.GenerateLevel(NumPeople, AvgNumFriends, FriendshipLikeliness, SphereRadius); + + InstantiateNodes(lvl); + AssignLinks(lvl); + rb = GetComponent(); + } + + void Update() + { + Vector3 screenMousePos = Input.mousePosition; + + screenMousePos.z = transform.position.z - Camera.main.transform.position.z; + + 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 (Mathf.Sqrt(worldMousePos.x * worldMousePos.x + worldMousePos.y * worldMousePos.y) > SphereRadius + 1f) + { + transform.Rotate(Vector3.one * Time.deltaTime * rotationSpeed); + } + + //when right btn clicked, call the chnge rotation + if (Input.GetMouseButtonDown(1)) + { + dragging = true; + } + else if (Input.GetMouseButtonUp(1)) + { + dragging = false; + delta = new Vector3(); + } + + if (dragging) + { + MoveSphere(); + } + } + + void MoveSphere() + { + float deltaX = Input.GetAxis("Mouse X"); + float deltaY = Input.GetAxis("Mouse Y"); + if (deltaX == 0 && deltaY == 0) + { + delta = new Vector3(); + rb.angularVelocity *= 0.8f; + } + delta += new Vector3(deltaX, deltaY, 0); + //rigidbody.AddTorque(); + rb.AddTorque(Vector3.down * delta.x * torqueForce * Time.deltaTime, ForceMode.Impulse); + rb.AddTorque(Vector3.right * delta.y * torqueForce * Time.deltaTime, ForceMode.Impulse); + Debug.Log(delta.x + ", " + delta.y); + + + } + + private void InstantiateNodes(Level lvl) + { peopleNodes = new PersonTest[lvl.people.Count]; int ctr = 0; @@ -100,10 +94,10 @@ public class SphereSR : MonoBehaviour pInst.transform.parent = this.transform; peopleNodes[ctr++] = pInst; - } - } - - private void AssignLinks(Level lvl) + } + } + + private void AssignLinks(Level lvl) { foreach (Friendship f in lvl.friendships) { @@ -111,10 +105,10 @@ public class SphereSR : MonoBehaviour int id1 = f.friend1.id; int id2 = f.friend2.id; link.AttachToObjects(peopleNodes[id1].gameObject, peopleNodes[id2].gameObject); - - // Temporary stuff, for testing - peopleNodes[id1].AddLink(link); + + // Temporary stuff, for testing + peopleNodes[id1].AddLink(link); peopleNodes[id2].AddLink(link); - } - } -} + } + } +} From a548d1e7c415ede3afd94d9baeb11c092d8c506b Mon Sep 17 00:00:00 2001 From: Patrice Vignola Date: Thu, 13 Aug 2015 14:10:50 -0400 Subject: [PATCH 2/4] - Merged the friendship/levelgenerator stuff in the gameplay scene --- Assets/{Tests/Beam.meta => Art.meta} | 4 +- .../Beam/laserPic.png => Art/LinkBeam.png} | Bin .../LinkBeam.png.meta} | 0 Assets/{Tests/Beam => }/Materials.meta | 0 .../laserPic.mat => Materials/LinkBeam.mat} | 2 +- .../LinkBeam.mat.meta} | 0 .../Beam => Prefabs}/FriendshipLink.prefab | 0 .../FriendshipLink.prefab.meta | 0 Assets/Prefabs/NetworkingSphere.prefab | 109 +++++++++++++ Assets/Prefabs/NetworkingSphere.prefab.meta | 8 + Assets/Scenes/Creator.unity | 2 +- Assets/Scenes/Gameplay.unity | 136 +++++----------- .../{Tests/Beam => Scripts}/FriendshipLink.cs | 0 .../Beam => Scripts}/FriendshipLink.cs.meta | 0 Assets/Scripts/NetworkingSphere.cs | 114 ++++++++++++++ .../NetworkingSphere.cs.meta} | 0 Assets/Tests/Center.cs | 146 ------------------ Assets/Tests/PersonTest.prefab.meta | 4 +- 18 files changed, 279 insertions(+), 246 deletions(-) rename Assets/{Tests/Beam.meta => Art.meta} (67%) rename Assets/{Tests/Beam/laserPic.png => Art/LinkBeam.png} (100%) rename Assets/{Tests/Beam/laserPic.png.meta => Art/LinkBeam.png.meta} (100%) rename Assets/{Tests/Beam => }/Materials.meta (100%) rename Assets/{Tests/Beam/Materials/laserPic.mat => Materials/LinkBeam.mat} (99%) rename Assets/{Tests/Beam/Materials/laserPic.mat.meta => Materials/LinkBeam.mat.meta} (100%) rename Assets/{Tests/Beam => Prefabs}/FriendshipLink.prefab (100%) rename Assets/{Tests/Beam => Prefabs}/FriendshipLink.prefab.meta (100%) create mode 100644 Assets/Prefabs/NetworkingSphere.prefab create mode 100644 Assets/Prefabs/NetworkingSphere.prefab.meta rename Assets/{Tests/Beam => Scripts}/FriendshipLink.cs (100%) rename Assets/{Tests/Beam => Scripts}/FriendshipLink.cs.meta (100%) create mode 100644 Assets/Scripts/NetworkingSphere.cs rename Assets/{Tests/Center.cs.meta => Scripts/NetworkingSphere.cs.meta} (100%) delete mode 100644 Assets/Tests/Center.cs diff --git a/Assets/Tests/Beam.meta b/Assets/Art.meta similarity index 67% rename from Assets/Tests/Beam.meta rename to Assets/Art.meta index 07cff06..6f99e12 100644 --- a/Assets/Tests/Beam.meta +++ b/Assets/Art.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 0fe2d64981912a545a084438d8089f68 +guid: bd865f25edf545140a9ed3797bb1b4cb folderAsset: yes -timeCreated: 1439307965 +timeCreated: 1439489157 licenseType: Free DefaultImporter: userData: diff --git a/Assets/Tests/Beam/laserPic.png b/Assets/Art/LinkBeam.png similarity index 100% rename from Assets/Tests/Beam/laserPic.png rename to Assets/Art/LinkBeam.png diff --git a/Assets/Tests/Beam/laserPic.png.meta b/Assets/Art/LinkBeam.png.meta similarity index 100% rename from Assets/Tests/Beam/laserPic.png.meta rename to Assets/Art/LinkBeam.png.meta diff --git a/Assets/Tests/Beam/Materials.meta b/Assets/Materials.meta similarity index 100% rename from Assets/Tests/Beam/Materials.meta rename to Assets/Materials.meta diff --git a/Assets/Tests/Beam/Materials/laserPic.mat b/Assets/Materials/LinkBeam.mat similarity index 99% rename from Assets/Tests/Beam/Materials/laserPic.mat rename to Assets/Materials/LinkBeam.mat index fccb428..9f291df 100644 --- a/Assets/Tests/Beam/Materials/laserPic.mat +++ b/Assets/Materials/LinkBeam.mat @@ -6,7 +6,7 @@ Material: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: laserPic + m_Name: LinkBeam m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 5 diff --git a/Assets/Tests/Beam/Materials/laserPic.mat.meta b/Assets/Materials/LinkBeam.mat.meta similarity index 100% rename from Assets/Tests/Beam/Materials/laserPic.mat.meta rename to Assets/Materials/LinkBeam.mat.meta diff --git a/Assets/Tests/Beam/FriendshipLink.prefab b/Assets/Prefabs/FriendshipLink.prefab similarity index 100% rename from Assets/Tests/Beam/FriendshipLink.prefab rename to Assets/Prefabs/FriendshipLink.prefab diff --git a/Assets/Tests/Beam/FriendshipLink.prefab.meta b/Assets/Prefabs/FriendshipLink.prefab.meta similarity index 100% rename from Assets/Tests/Beam/FriendshipLink.prefab.meta rename to Assets/Prefabs/FriendshipLink.prefab.meta diff --git a/Assets/Prefabs/NetworkingSphere.prefab b/Assets/Prefabs/NetworkingSphere.prefab new file mode 100644 index 0000000..62a7070 --- /dev/null +++ b/Assets/Prefabs/NetworkingSphere.prefab @@ -0,0 +1,109 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &182606 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 433422} + - 33: {fileID: 3303090} + - 23: {fileID: 2322642} + - 114: {fileID: 11432906} + - 54: {fileID: 5423250} + m_Layer: 0 + m_Name: NetworkingSphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &433422 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 182606} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5.96046448e-08, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!23 &2322642 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 182606} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!33 &3303090 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 182606} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!54 &5423250 +Rigidbody: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 182606} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: .800000012 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &11432906 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 182606} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0907c1567bad554c8b995de3459e517, type: 3} + m_Name: + m_EditorClassIdentifier: + LinkObj: {fileID: 11495142, guid: fab430cecad80ad4391987a06b550cb7, type: 2} + PersonObj: {fileID: 11406500, guid: d4b0e683ea5ec974987ea1f6741b333c, type: 2} + NumPeople: 100 + AvgNumFriends: 10 + FriendshipLikeliness: .300000012 + SphereRadius: 7 + rotationSpeed: .699999988 + torqueForce: 1 +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 182606} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/NetworkingSphere.prefab.meta b/Assets/Prefabs/NetworkingSphere.prefab.meta new file mode 100644 index 0000000..192f1e3 --- /dev/null +++ b/Assets/Prefabs/NetworkingSphere.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 136ea38d5deb4c9418beb879167d9b03 +timeCreated: 1439489411 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Creator.unity b/Assets/Scenes/Creator.unity index 9bff2ba..5a43ae9 100644 --- a/Assets/Scenes/Creator.unity +++ b/Assets/Scenes/Creator.unity @@ -258,7 +258,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: LinkObj: {fileID: 11495142, guid: fab430cecad80ad4391987a06b550cb7, type: 2} - PersonObj: {fileID: 11406500, guid: 646dd6566f9e1374caa3af8ad37c43d3, type: 2} + PersonObj: {fileID: 11406500, guid: d4b0e683ea5ec974987ea1f6741b333c, type: 2} NumPeople: 100 AvgNumFriends: 10 FriendshipLikeliness: .300000012 diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index 94ce1de..f9e2958 100644 --- a/Assets/Scenes/Gameplay.unity +++ b/Assets/Scenes/Gameplay.unity @@ -293,100 +293,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 534364716} ---- !u!1 &736567784 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 736567788} - - 33: {fileID: 736567787} - - 23: {fileID: 736567785} - - 114: {fileID: 736567789} - - 54: {fileID: 736567786} - m_Layer: 0 - m_Name: Center - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!23 &736567785 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 736567784} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!54 &736567786 -Rigidbody: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 736567784} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: .800000012 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!33 &736567787 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 736567784} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &736567788 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 736567784} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.96046448e-08, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 ---- !u!114 &736567789 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 736567784} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0907c1567bad554c8b995de3459e517, type: 3} - m_Name: - m_EditorClassIdentifier: - Link: {fileID: 11495142, guid: fab430cecad80ad4391987a06b550cb7, type: 2} - Person: {fileID: 11406500, guid: 646dd6566f9e1374caa3af8ad37c43d3, type: 2} - PointsAmount: 400 - SphereRadius: 7 - rotationSpeed: .699999988 - torqueForce: 50 --- !u!1 &1057734534 GameObject: m_ObjectHideFlags: 0 @@ -611,3 +517,45 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 +--- !u!1001 &2065124246 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} + propertyPath: m_LocalPosition.x + value: 5.96046448e-08 + objectReference: {fileID: 0} + - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} + m_IsPrefabParent: 0 diff --git a/Assets/Tests/Beam/FriendshipLink.cs b/Assets/Scripts/FriendshipLink.cs similarity index 100% rename from Assets/Tests/Beam/FriendshipLink.cs rename to Assets/Scripts/FriendshipLink.cs diff --git a/Assets/Tests/Beam/FriendshipLink.cs.meta b/Assets/Scripts/FriendshipLink.cs.meta similarity index 100% rename from Assets/Tests/Beam/FriendshipLink.cs.meta rename to Assets/Scripts/FriendshipLink.cs.meta diff --git a/Assets/Scripts/NetworkingSphere.cs b/Assets/Scripts/NetworkingSphere.cs new file mode 100644 index 0000000..27825b2 --- /dev/null +++ b/Assets/Scripts/NetworkingSphere.cs @@ -0,0 +1,114 @@ +using UnityEngine; +using System.Collections; +using System.Collections.Generic; +using DeathBook.Model; + +public class NetworkingSphere : MonoBehaviour +{ + public FriendshipLink LinkObj; + public PersonTest PersonObj; + public int NumPeople = 50; + public int AvgNumFriends = 20; + public float FriendshipLikeliness = 0.4f; + public float SphereRadius = 1f; + public float rotationSpeed = 0.7f; + + public float torqueForce = 50f; + private bool dragging = false; + private Vector3 delta = new Vector3(); + private Rigidbody rb; + + private PersonTest[] peopleNodes; + //TODO private Friendship[] friendships; + private GameObject[] nodes; + + void Awake() + { + LevelGenerator lGen = new LevelGenerator(); + Level lvl = lGen.GenerateLevel(NumPeople, AvgNumFriends, FriendshipLikeliness, SphereRadius); + + InstantiateNodes(lvl); + AssignLinks(lvl); + rb = GetComponent(); + } + + void Update() + { + Vector3 screenMousePos = Input.mousePosition; + + screenMousePos.z = transform.position.z - Camera.main.transform.position.z; + + 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 (Mathf.Sqrt(worldMousePos.x * worldMousePos.x + worldMousePos.y * worldMousePos.y) > SphereRadius + 1f) + { + transform.Rotate(Vector3.one * Time.deltaTime * rotationSpeed); + } + + //when right btn clicked, call the chnge rotation + if (Input.GetMouseButtonDown(1)) + { + dragging = true; + } + else if (Input.GetMouseButtonUp(1)) + { + dragging = false; + delta = new Vector3(); + } + + if (dragging) + { + MoveSphere(); + } + } + + void MoveSphere() + { + float deltaX = Input.GetAxis("Mouse X"); + float deltaY = Input.GetAxis("Mouse Y"); + if (deltaX == 0 && deltaY == 0) + { + delta = new Vector3(); + rb.angularVelocity *= 0.8f; + } + delta += new Vector3(deltaX, deltaY, 0); + //rigidbody.AddTorque(); + rb.AddTorque(Vector3.down * delta.x * torqueForce * Time.deltaTime, ForceMode.Impulse); + rb.AddTorque(Vector3.right * delta.y * torqueForce * Time.deltaTime, ForceMode.Impulse); + Debug.Log(delta.x + ", " + delta.y); + + + } + + private void InstantiateNodes(Level lvl) + { + peopleNodes = new PersonTest[lvl.people.Count]; + + int ctr = 0; + foreach (Person p in lvl.people) + { + + PersonTest pInst = Instantiate(PersonObj, p.initialPosition, Quaternion.identity) as PersonTest; + + pInst.transform.parent = this.transform; + + peopleNodes[ctr++] = pInst; + } + } + + private void AssignLinks(Level lvl) + { + foreach (Friendship f in lvl.friendships) + { + FriendshipLink link = Instantiate(LinkObj) as FriendshipLink; + int id1 = f.friend1.id; + int id2 = f.friend2.id; + link.AttachToObjects(peopleNodes[id1].gameObject, peopleNodes[id2].gameObject); + + // Temporary stuff, for testing + peopleNodes[id1].AddLink(link); + peopleNodes[id2].AddLink(link); + } + } +} diff --git a/Assets/Tests/Center.cs.meta b/Assets/Scripts/NetworkingSphere.cs.meta similarity index 100% rename from Assets/Tests/Center.cs.meta rename to Assets/Scripts/NetworkingSphere.cs.meta diff --git a/Assets/Tests/Center.cs b/Assets/Tests/Center.cs deleted file mode 100644 index 22b4f5a..0000000 --- a/Assets/Tests/Center.cs +++ /dev/null @@ -1,146 +0,0 @@ -using UnityEngine; -using System.Collections; -using System.Collections.Generic; - -public class Center : MonoBehaviour -{ - - //public float fov = Camera.main.fieldOfView; - public Vector3 nextPosition; - public float moveSpeed = 0; - - public FriendshipLink Link; - public PersonTest Person; - public int PointsAmount = 50; - public float SphereRadius = 1f; - public float rotationSpeed = 0.7f; - - public float torqueForce = 50f; - private bool dragging = false; - private Vector3 delta = new Vector3(); - private Rigidbody rb; - private PersonTest[] people; - - - private GameObject[] nodes; - - void Awake() - { - InstantiateNodes(); - AssignLinks(); - rb = GetComponent(); - } - - void Update() - { - Vector3 screenMousePos = Input.mousePosition; - - screenMousePos.z = transform.position.z - Camera.main.transform.position.z; - - 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 (Mathf.Sqrt(worldMousePos.x * worldMousePos.x + worldMousePos.y * worldMousePos.y) > SphereRadius + 1f) - { - transform.Rotate(Vector3.one * Time.deltaTime * rotationSpeed); - } - - //when right btn clicked, call the chnge rotation - if (Input.GetMouseButtonDown(1)) - { - dragging = true; - } - else if (Input.GetMouseButtonUp(1)) - { - dragging = false; - delta = new Vector3(); - } - - //camera zoom - if (Input.GetAxis("Mouse ScrollWheel") != 0) - { - Debug.Log("Pressed middle click."); - //Camera.main.transform.position.z += (moveSpeed * Time.deltaTime); - //transform.position = Vector3.Lerp(transform.position, nextPosition, Time.deltaTime * moveSpeed); - //Camera.main.fieldOfView += Input.GetAxis("Mouse ScrollWheel") * 10f; - //Camera.main.transform - } - } - - void FixedUpdate() - { - if (dragging) - { - MoveSphere(); - } - } - - void MoveSphere() - { - float deltaX = Input.GetAxis("Mouse X"); - float deltaY = Input.GetAxis("Mouse Y"); - if (deltaX == 0 && deltaY == 0) - { - delta = new Vector3(); - rb.angularVelocity *= 0.8f; - } - delta += new Vector3(deltaX, deltaY, 0); - rb.AddTorque(Vector3.down * delta.x * torqueForce * Time.fixedDeltaTime, ForceMode.Impulse); - rb.AddTorque(Vector3.right * delta.y * torqueForce * Time.fixedDeltaTime, ForceMode.Impulse); - Debug.Log(delta.x + ", " + delta.y); - - - } - - - - private void InstantiateNodes() - { - /* Sphere uniform distribution using the spiral method with the golden angle - * ~2.39996323 rad, the golden angle (the most irrational angle) - * is used here to make sure that the sin and cos functions - * dont end up drawing clusters of points and the spirals are way - * less visible. - */ - people = new PersonTest[PointsAmount]; - - float goldenAngle = Mathf.PI * (3 - Mathf.Sqrt(5)); - - float zDistance = (2f / PointsAmount) * SphereRadius; - float longitude = 0f; - float z = SphereRadius; - - for (int i = 0; i < PointsAmount; i++) - { - float r = Mathf.Sqrt(SphereRadius * SphereRadius - z * z); - - float x = Mathf.Sin(longitude) * r; - float y = Mathf.Cos(longitude) * r; - - PersonTest simon = Instantiate(Person, new Vector3(x, y, z), Quaternion.identity) as PersonTest; - - simon.transform.parent = this.transform; - - people[i] = simon; - - z -= zDistance; - longitude += goldenAngle; - } - } - - private void AssignLinks() - { - for (int i = 0; i < people.Length / 4; i++) - { - FriendshipLink link = Instantiate(Link) as FriendshipLink; - - int destinationIndex = Random.Range(people.Length / 2, people.Length - 1); - - link.AttachToObjects(people[i].gameObject, people[destinationIndex].gameObject); - - // Temporary stuff, for testing - people[i].AddLink(link); - people[destinationIndex].AddLink(link); - } - } -} diff --git a/Assets/Tests/PersonTest.prefab.meta b/Assets/Tests/PersonTest.prefab.meta index 8f2ef77..5ecbe33 100644 --- a/Assets/Tests/PersonTest.prefab.meta +++ b/Assets/Tests/PersonTest.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 646dd6566f9e1374caa3af8ad37c43d3 -timeCreated: 1439361747 +guid: d4b0e683ea5ec974987ea1f6741b333c +timeCreated: 1439489111 licenseType: Free NativeFormatImporter: userData: From 91fc0710dee2615b9f5a4bc2fa5f8095933ce649 Mon Sep 17 00:00:00 2001 From: RosimInc Date: Thu, 13 Aug 2015 15:35:12 -0400 Subject: [PATCH 3/4] Fixed the generation algorithm Some points were ignored, and probabilities were wrong. Signed-off-by: RosimInc --- Assets/Scenes/Creator.unity | 8 ++++---- Assets/Scripts/Models/LevelGenerator.cs | 11 +++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Assets/Scenes/Creator.unity b/Assets/Scenes/Creator.unity index 9bff2ba..3dfa562 100644 --- a/Assets/Scenes/Creator.unity +++ b/Assets/Scenes/Creator.unity @@ -197,7 +197,7 @@ MeshRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 736567784} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_Materials: @@ -259,9 +259,9 @@ MonoBehaviour: m_EditorClassIdentifier: LinkObj: {fileID: 11495142, guid: fab430cecad80ad4391987a06b550cb7, type: 2} PersonObj: {fileID: 11406500, guid: 646dd6566f9e1374caa3af8ad37c43d3, type: 2} - NumPeople: 100 + NumPeople: 200 AvgNumFriends: 10 - FriendshipLikeliness: .300000012 + FriendshipLikeliness: 1 SphereRadius: 7 rotationSpeed: .699999988 torqueForce: .100000001 @@ -311,7 +311,7 @@ Light: m_SpotAngle: 30 m_CookieSize: 10 m_Shadows: - m_Type: 2 + m_Type: 0 m_Resolution: -1 m_Strength: 1 m_Bias: .0500000007 diff --git a/Assets/Scripts/Models/LevelGenerator.cs b/Assets/Scripts/Models/LevelGenerator.cs index fde2492..13d85fe 100644 --- a/Assets/Scripts/Models/LevelGenerator.cs +++ b/Assets/Scripts/Models/LevelGenerator.cs @@ -73,7 +73,7 @@ namespace DeathBook.Model missing = avgConnections - p1.numFriends; // TODO Add randomness if (missing <= 0) - break; + continue; list.Clear(); @@ -93,13 +93,16 @@ namespace DeathBook.Model float prob = Mathf.Lerp(probability, 1, missing / list.Count); foreach (DistanceNode node in list) { - if (node.dist < smallest.dist && Random.value < prob) + if (node.dist < smallest.dist) smallest = node; } //TODO Code/use a heap instead - friendships.Add(CreateFriendship(p1, smallest.p)); - missing--; + if (Random.value < prob) + { + friendships.Add(CreateFriendship(p1, smallest.p)); + missing--; + } list.Remove(smallest); } } From 0382c1bbe23c94326f09f4f7275b69c3ea818571 Mon Sep 17 00:00:00 2001 From: Patrice Vignola Date: Thu, 13 Aug 2015 17:20:20 -0400 Subject: [PATCH 4/4] - Started the UI --- Assets/Art/Placeholders.meta | 9 + Assets/Art/Placeholders/Mario.jpg | Bin 0 -> 12808 bytes Assets/Art/Placeholders/Mario.jpg.meta | 55 + Assets/Scenes/Gameplay.unity | 1850 ++++++++++++++++++++- Assets/Scripts/PersonDetailsPanel.cs | 13 + Assets/Scripts/PersonDetailsPanel.cs.meta | 12 + Assets/Tests/PersonTest.cs | 2 + 7 files changed, 1930 insertions(+), 11 deletions(-) create mode 100644 Assets/Art/Placeholders.meta create mode 100644 Assets/Art/Placeholders/Mario.jpg create mode 100644 Assets/Art/Placeholders/Mario.jpg.meta create mode 100644 Assets/Scripts/PersonDetailsPanel.cs create mode 100644 Assets/Scripts/PersonDetailsPanel.cs.meta diff --git a/Assets/Art/Placeholders.meta b/Assets/Art/Placeholders.meta new file mode 100644 index 0000000..232ed1e --- /dev/null +++ b/Assets/Art/Placeholders.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: b1b9631be327682448348726b233cda1 +folderAsset: yes +timeCreated: 1439496361 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Placeholders/Mario.jpg b/Assets/Art/Placeholders/Mario.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ce57f378b8395068831bf84f54a9f8d19aca7e19 GIT binary patch literal 12808 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 literal 0 HcmV?d00001 diff --git a/Assets/Art/Placeholders/Mario.jpg.meta b/Assets/Art/Placeholders/Mario.jpg.meta new file mode 100644 index 0000000..d5dc987 --- /dev/null +++ b/Assets/Art/Placeholders/Mario.jpg.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: 0c813218655d0a1468d7269b69deb9d5 +timeCreated: 1439496409 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index f9e2958..96841d0 100644 --- a/Assets/Scenes/Gameplay.unity +++ b/Assets/Scenes/Gameplay.unity @@ -141,8 +141,8 @@ Camera: serializedVersion: 2 x: 0 y: 0 - width: .800000012 - height: .800000012 + width: .699999988 + height: .899999976 near clip plane: .300000012 far clip plane: 1000 field of view: 59 @@ -171,6 +171,589 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 +--- !u!1 &62522045 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 62522046} + - 114: {fileID: 62522047} + - 114: {fileID: 62522048} + - 222: {fileID: 62522050} + - 114: {fileID: 62522049} + m_Layer: 5 + m_Name: Friends + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &62522046 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 62522045} + 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: 340539133} + m_Father: {fileID: 527336302} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: .790000021, y: .75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &62522047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 62522045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 340539133} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: .100000001 + m_Inertia: 1 + m_DecelerationRate: .135000005 + m_ScrollSensitivity: 1 + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 316256949} + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &62522048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 62522045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1200242548, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 1 +--- !u!114 &62522049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 62522045} + 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: .0117647061} + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &62522050 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 62522045} +--- !u!1 &123423716 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 123423717} + m_Layer: 5 + m_Name: Right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &123423717 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 123423716} + 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: 351063639} + - {fileID: 1244733839} + m_Father: {fileID: 766199030} + m_RootOrder: 0 + m_AnchorMin: {x: .660000026, 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!1 &142170007 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 142170008} + - 222: {fileID: 142170010} + - 114: {fileID: 142170009} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &142170008 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 142170007} + 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: 1836100573} + m_RootOrder: 1 + m_AnchorMin: {x: .185000002, y: .546483397} + m_AnchorMax: {x: 1, y: .877516687} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &142170009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 142170007} + 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: 3 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Mario Bros +--- !u!222 &142170010 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 142170007} +--- !u!1 &316256947 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 316256948} + - 222: {fileID: 316256951} + - 114: {fileID: 316256950} + - 114: {fileID: 316256949} + m_Layer: 5 + m_Name: Scrollbar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &316256948 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 316256947} + 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: 923485648} + m_Father: {fileID: 527336302} + m_RootOrder: 2 + m_AnchorMin: {x: .819999993, y: 0} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: 0, y: -4.05311584e-05} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &316256949 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 316256947} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2061169968, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: 0 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1133738260} + m_HandleRect: {fileID: 1133738259} + m_Direction: 2 + m_Value: .999357998 + m_Size: .432668537 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &316256950 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 316256947} + 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: 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 &316256951 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 316256947} +--- !u!1 &340539132 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 340539133} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &340539133 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 340539132} + 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: 1499828096} + - {fileID: 1484724213} + - {fileID: 2033368051} + - {fileID: 797671619} + m_Father: {fileID: 62522046} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -38.9000015} + m_SizeDelta: {x: 0, y: 77.9000015} + m_Pivot: {x: .5, y: .5} +--- !u!1 &351063638 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 351063639} + - 222: {fileID: 351063642} + - 114: {fileID: 351063641} + - 114: {fileID: 351063640} + m_Layer: 5 + m_Name: WatchButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &351063639 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 351063638} + 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: 1598537526} + m_Father: {fileID: 123423717} + m_RootOrder: 0 + m_AnchorMin: {x: .0700000003, y: .600000024} + m_AnchorMax: {x: .930000007, y: .920000017} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &351063640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 351063638} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 351063641} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &351063641 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 351063638} + 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: .309803933, g: .505882382, b: .741176486, a: 1} + m_Sprite: {fileID: 10905, 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 &351063642 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 351063638} +--- !u!1 &443951980 +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} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &443951981 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 443951980} + 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_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 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 443951980} + 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: Recent Posts +--- !u!222 &443951983 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 443951980} +--- !u!1 &466670520 +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} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &466670521 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 466670520} + 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_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -3.05175781e-05, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &466670522 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 466670520} + 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 &466670523 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 466670520} --- !u!1 &523974148 GameObject: m_ObjectHideFlags: 0 @@ -181,8 +764,9 @@ GameObject: - 224: {fileID: 523974151} - 222: {fileID: 523974150} - 114: {fileID: 523974149} + - 114: {fileID: 523974152} m_Layer: 5 - m_Name: RightUI + m_Name: PersonDetails m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -224,14 +808,68 @@ RectTransform: 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: 1057734538} - m_RootOrder: 1 - m_AnchorMin: {x: .800000012, y: 0} - m_AnchorMax: {x: 1, y: .800000012} + m_Children: + - {fileID: 466670521} + - {fileID: 724043966} + m_Father: {fileID: 1608274018} + 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!114 &523974152 +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: 11500000, guid: 88fb1885d6f8fd6409e3866b7707a12a, type: 3} + m_Name: + m_EditorClassIdentifier: + ProfilePicture: {fileID: 646112550} + Name: {fileID: 142170009} + FriendsPanel: {fileID: 0} + KillButton: {fileID: 0} + WatchButton: {fileID: 0} + XButton: {fileID: 0} +--- !u!1 &527336301 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 527336302} + m_Layer: 5 + m_Name: Left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &527336302 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 527336301} + 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: 965203292} + - {fileID: 62522046} + - {fileID: 316256948} + m_Father: {fileID: 766199030} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: .538000047, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: .100000381, y: 0} + m_Pivot: {x: .5, y: .5} --- !u!1 &534364716 GameObject: m_ObjectHideFlags: 0 @@ -261,7 +899,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 1057734538} m_RootOrder: 0 - m_AnchorMin: {x: 0, y: .800000012} + m_AnchorMin: {x: 0, y: .899999976} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} @@ -293,6 +931,357 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 534364716} +--- !u!1 &646112548 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 646112549} + - 222: {fileID: 646112551} + - 114: {fileID: 646112550} + m_Layer: 5 + m_Name: ProfilePicture + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &646112549 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 646112548} + 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: 1836100573} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .147} + m_AnchorMax: {x: .147772685, y: .926483452} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &646112550 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 646112548} + 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: 1} + m_Sprite: {fileID: 21300000, guid: 0c813218655d0a1468d7269b69deb9d5, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &646112551 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 646112548} +--- !u!1 &724043965 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 724043966} + m_Layer: 5 + m_Name: Container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &724043966 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 724043965} + 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: 1836100573} + - {fileID: 766199030} + m_Father: {fileID: 523974151} + m_RootOrder: 1 + m_AnchorMin: {x: .0299999993, y: .0299999993} + m_AnchorMax: {x: .970000029, y: .970000029} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1 &766199029 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 766199030} + m_Layer: 5 + m_Name: Bottom + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &766199030 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 766199029} + 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: 123423717} + - {fileID: 527336302} + m_Father: {fileID: 724043966} + 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_Pivot: {x: .5, y: .5} +--- !u!1 &797671618 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 797671619} + - 222: {fileID: 797671621} + - 114: {fileID: 797671620} + m_Layer: 5 + m_Name: Image 4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &797671619 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 797671618} + 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: 340539133} + m_RootOrder: 3 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -31.7000008, y: .400000006} + m_SizeDelta: {x: 21, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!114 &797671620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 797671618} + 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: 1} + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &797671621 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 797671618} +--- !u!1 &923485647 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 923485648} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &923485648 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 923485647} + 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: 1133738259} + m_Father: {fileID: 316256948} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: .5, y: .5} +--- !u!1 &965203291 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 965203292} + - 222: {fileID: 965203294} + - 114: {fileID: 965203293} + m_Layer: 5 + m_Name: FriendsTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &965203292 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 965203291} + 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: 527336302} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .800000012} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -7.62939453e-06, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &965203293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 965203291} + 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: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Friends +--- !u!222 &965203294 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 965203291} +--- !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_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!1 &1057734534 GameObject: m_ObjectHideFlags: 0 @@ -376,7 +1365,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 534364717} - - {fileID: 523974151} + - {fileID: 1608274018} m_Father: {fileID: 0} m_RootOrder: 3 m_AnchorMin: {x: 0, y: 0} @@ -444,6 +1433,590 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 +--- !u!1 &1133738258 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1133738259} + - 222: {fileID: 1133738261} + - 114: {fileID: 1133738260} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1133738259 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1133738258} + 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: 923485648} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1133738260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1133738258} + 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: 1} + m_Sprite: {fileID: 10905, 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 &1133738261 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1133738258} +--- !u!1 &1244733838 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1244733839} + - 222: {fileID: 1244733842} + - 114: {fileID: 1244733841} + - 114: {fileID: 1244733840} + m_Layer: 5 + m_Name: KillButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1244733839 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1244733838} + 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: 1539338395} + m_Father: {fileID: 123423717} + m_RootOrder: 1 + m_AnchorMin: {x: .0700000003, y: .0799999982} + m_AnchorMax: {x: .930000007, y: .400000006} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1244733840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1244733838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1244733841} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1244733841 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1244733838} + 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: .309803933, g: .505882382, b: .741176486, a: 1} + m_Sprite: {fileID: 10905, 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 &1244733842 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1244733838} +--- !u!1 &1413393085 +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} + m_Layer: 5 + m_Name: WatchArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1413393086 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1413393085} + 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} + 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 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1413393085} + 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 &1413393088 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1413393085} +--- !u!1 &1484724212 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1484724213} + - 222: {fileID: 1484724215} + - 114: {fileID: 1484724214} + m_Layer: 5 + m_Name: Image 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1484724213 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1484724212} + 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: 340539133} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -31.7000008, y: 54.7000008} + m_SizeDelta: {x: 21, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1484724214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1484724212} + 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: 1} + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1484724215 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1484724212} +--- !u!1 &1499828095 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1499828096} + - 222: {fileID: 1499828098} + - 114: {fileID: 1499828097} + m_Layer: 5 + m_Name: Image 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1499828096 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1499828095} + 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: 340539133} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -31.7000008, y: 31} + m_SizeDelta: {x: 21, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1499828097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1499828095} + 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: 1} + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1499828098 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1499828095} +--- !u!1 &1539338394 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1539338395} + - 222: {fileID: 1539338397} + - 114: {fileID: 1539338396} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1539338395 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1539338394} + 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: 1244733839} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1539338396 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1539338394} + 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: Kill +--- !u!222 &1539338397 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1539338394} +--- !u!1 &1598537525 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1598537526} + - 222: {fileID: 1598537528} + - 114: {fileID: 1598537527} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1598537526 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1598537525} + 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: 351063639} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1598537527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1598537525} + 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: Watch +--- !u!222 &1598537528 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1598537525} +--- !u!1 &1608274017 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1608274018} + m_Layer: 5 + m_Name: RightUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1608274018 +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_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_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1 &1836100572 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1836100573} + m_Layer: 5 + m_Name: Top + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1836100573 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1836100572} + 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: 646112549} + - {fileID: 142170008} + m_Father: {fileID: 724043966} + 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_Pivot: {x: .5, y: .5} --- !u!1 &1999982083 GameObject: m_ObjectHideFlags: 0 @@ -517,6 +2090,129 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 +--- !u!1 &2006180048 +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} + m_Layer: 5 + m_Name: RecentPosts + 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 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2006180048} + 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_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!1 &2033368050 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2033368051} + - 222: {fileID: 2033368053} + - 114: {fileID: 2033368052} + m_Layer: 5 + m_Name: Image 3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2033368051 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2033368050} + 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: 340539133} + m_RootOrder: 2 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -31.7000008, y: -28.7999992} + m_SizeDelta: {x: 21, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!114 &2033368052 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2033368050} + 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: 1} + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &2033368053 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2033368050} --- !u!1001 &2065124246 Prefab: m_ObjectHideFlags: 0 @@ -554,8 +2250,140 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} 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/PersonDetailsPanel.cs b/Assets/Scripts/PersonDetailsPanel.cs new file mode 100644 index 0000000..5a9e5bf --- /dev/null +++ b/Assets/Scripts/PersonDetailsPanel.cs @@ -0,0 +1,13 @@ +using UnityEngine; +using System.Collections; +using UnityEngine.UI; + +public class PersonDetailsPanel : MonoBehaviour +{ + public Image ProfilePicture; + public Text Name; + public GameObject FriendsPanel; + public Button KillButton; + public Button WatchButton; + public Button XButton; +} diff --git a/Assets/Scripts/PersonDetailsPanel.cs.meta b/Assets/Scripts/PersonDetailsPanel.cs.meta new file mode 100644 index 0000000..c2af9a7 --- /dev/null +++ b/Assets/Scripts/PersonDetailsPanel.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 88fb1885d6f8fd6409e3866b7707a12a +timeCreated: 1439492090 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tests/PersonTest.cs b/Assets/Tests/PersonTest.cs index 9e5d4a9..0b50d90 100644 --- a/Assets/Tests/PersonTest.cs +++ b/Assets/Tests/PersonTest.cs @@ -5,6 +5,8 @@ using System.Collections.Generic; [RequireComponent(typeof(Collider))] public class PersonTest : MonoBehaviour { + public PersonDetailsPanel DetailsPanel; + // Temporary, for test private List _links; private bool _highlighted = false;