diff --git a/Assets/Prefabs/NetworkingSphere.prefab b/Assets/Prefabs/NetworkingSphere.prefab index 94c7961..05e5e3e 100644 --- a/Assets/Prefabs/NetworkingSphere.prefab +++ b/Assets/Prefabs/NetworkingSphere.prefab @@ -88,12 +88,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0907c1567bad554c8b995de3459e517, type: 3} m_Name: m_EditorClassIdentifier: - LinkObj: {fileID: 11495142, guid: fab430cecad80ad4391987a06b550cb7, type: 2} - PersonObj: {fileID: 11417564, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2} - NumPeople: 50 - AvgNumFriends: 8 - FriendshipLikeliness: .400000006 - SphereRadius: 7 + gameObjects: + LinkObj: {fileID: 11495142, guid: fab430cecad80ad4391987a06b550cb7, type: 2} + PersonObj: {fileID: 11417564, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2} + levelOptions: + NumPeople: 50 + AvgNumFriends: 8 + FriendshipLikeliness: .600000024 + SphereRadius: 7 rotationSpeed: .699999988 torqueForce: 1 DetailsPanel: {fileID: 0} 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/Resources/Materials/skullLogo.mat b/Assets/Resources/Materials/skullLogo.mat new file mode 100644 index 0000000..0af990f --- /dev/null +++ b/Assets/Resources/Materials/skullLogo.mat @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: skullLogo + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + stringTagMap: {} + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: 25ff200345c91d641a8f4edfe64cdc95, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _BumpMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _DetailNormalMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _ParallaxMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _OcclusionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _EmissionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _DetailMask + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _DetailAlbedoMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _MetallicGlossMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + data: + first: + name: _SrcBlend + second: 1 + data: + first: + name: _DstBlend + second: 0 + data: + first: + name: _Cutoff + second: .5 + data: + first: + name: _Parallax + second: .0199999996 + data: + first: + name: _ZWrite + second: 1 + data: + first: + name: _Glossiness + second: .5 + data: + first: + name: _BumpScale + second: 1 + data: + first: + name: _OcclusionStrength + second: 1 + data: + first: + name: _DetailNormalMapScale + second: 1 + data: + first: + name: _UVSec + second: 0 + data: + first: + name: _Mode + second: 0 + data: + first: + name: _Metallic + second: 0 + m_Colors: + data: + first: + name: _EmissionColor + second: {r: 0, g: 0, b: 0, a: 1} + data: + first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Resources/Materials/skullLogo.mat.meta b/Assets/Resources/Materials/skullLogo.mat.meta new file mode 100644 index 0000000..78049f4 --- /dev/null +++ b/Assets/Resources/Materials/skullLogo.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17f2c3e8895cc004db164dd0f8963cd2 +timeCreated: 1439707135 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Materials/splash.mat b/Assets/Resources/Materials/splash.mat new file mode 100644 index 0000000..a1df4cf --- /dev/null +++ b/Assets/Resources/Materials/splash.mat @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: splash + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + stringTagMap: {} + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: a36d12e06ea9bd446b8aa07497d246dd, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _BumpMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _DetailNormalMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _ParallaxMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _OcclusionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _EmissionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _DetailMask + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _DetailAlbedoMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _MetallicGlossMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + data: + first: + name: _SrcBlend + second: 1 + data: + first: + name: _DstBlend + second: 0 + data: + first: + name: _Cutoff + second: .5 + data: + first: + name: _Parallax + second: .0199999996 + data: + first: + name: _ZWrite + second: 1 + data: + first: + name: _Glossiness + second: .5 + data: + first: + name: _BumpScale + second: 1 + data: + first: + name: _OcclusionStrength + second: 1 + data: + first: + name: _DetailNormalMapScale + second: 1 + data: + first: + name: _UVSec + second: 0 + data: + first: + name: _Mode + second: 0 + data: + first: + name: _Metallic + second: 0 + m_Colors: + data: + first: + name: _EmissionColor + second: {r: 0, g: 0, b: 0, a: 1} + data: + first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Resources/Materials/splash.mat.meta b/Assets/Resources/Materials/splash.mat.meta new file mode 100644 index 0000000..9a36690 --- /dev/null +++ b/Assets/Resources/Materials/splash.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30af58f30cfd7f143a3f5748b216fe5b +timeCreated: 1439708198 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/skullLogo.png.meta b/Assets/Resources/skullLogo.png.meta index 1596376..130ab95 100644 --- a/Assets/Resources/skullLogo.png.meta +++ b/Assets/Resources/skullLogo.png.meta @@ -30,22 +30,22 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 rGBM: 0 compressionQuality: 50 - spriteMode: 0 + 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: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/Assets/Resources/slaughterLogo.png b/Assets/Resources/slaughterLogo.png new file mode 100644 index 0000000..4740d12 Binary files /dev/null and b/Assets/Resources/slaughterLogo.png differ diff --git a/Assets/Resources/slaughterLogo.png.meta b/Assets/Resources/slaughterLogo.png.meta new file mode 100644 index 0000000..f536eab --- /dev/null +++ b/Assets/Resources/slaughterLogo.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: eaaa90877e079004eb38be08a3e86db7 +timeCreated: 1439706021 +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: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/splash.png b/Assets/Resources/splash.png new file mode 100644 index 0000000..9f22a53 Binary files /dev/null and b/Assets/Resources/splash.png differ diff --git a/Assets/Resources/splash.png.meta b/Assets/Resources/splash.png.meta new file mode 100644 index 0000000..88fe3b9 --- /dev/null +++ b/Assets/Resources/splash.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: a36d12e06ea9bd446b8aa07497d246dd +timeCreated: 1439707873 +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: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index 43717db..4814948 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 @@ -159,6 +159,7 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: .0219999999 + m_StereoMirrorMode: 0 --- !u!4 &61719365 Transform: m_ObjectHideFlags: 0 @@ -171,16 +172,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 +257,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 +490,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,192 +604,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 &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 @@ -581,7 +791,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} propertyPath: m_AnchorMin.y - value: .549793065 + value: .578712046 objectReference: {fileID: 0} - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} propertyPath: m_AnchorMax.x @@ -589,200 +799,115 @@ 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 + value: .420931697 objectReference: {fileID: 0} - - target: {fileID: 11458616, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_Sprite + - target: {fileID: 11476684, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: FriendPicture 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} + objectReference: {fileID: 11469406, guid: 16a1d168f1ef75b4690435675a9e69b0, + type: 2} + - target: {fileID: 22458514, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchoredPosition.y + value: -65.9662552 + objectReference: {fileID: 0} 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 @@ -790,38 +915,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 @@ -830,80 +955,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 @@ -950,6 +1068,7 @@ MonoBehaviour: m_SubmitButton: Submit m_CancelButton: Cancel m_InputActionsPerSecond: 10 + m_RepeatDelay: .5 m_AllowActivationOnMobileDevice: 0 --- !u!114 &1999982086 MonoBehaviour: @@ -977,68 +1096,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 @@ -1081,151 +1204,7 @@ Prefab: - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} propertyPath: DetailsPanel value: - objectReference: {fileID: 724043967} - - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: FriendshipLikeliness - value: .600000024 - objectReference: {fileID: 0} - - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: NumPeople - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: AvgNumFriends - value: 4 - 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/Scenes/UiTweaking.unity b/Assets/Scenes/UiTweaking.unity index df8408b..5e717ec 100644 --- a/Assets/Scenes/UiTweaking.unity +++ b/Assets/Scenes/UiTweaking.unity @@ -136,7 +136,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: .117647059, g: .176470593, b: .286274523, a: 1} + m_BackGroundColor: {r: .847058833, g: .874509811, b: .917647064, a: 1} m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -218,7 +218,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .117647059, g: .176470593, b: .286274523, a: 1} + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -413,7 +413,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .215686277, g: .325490206, b: .541176498, a: 1} + m_Color: {r: .23137255, g: .349019617, b: .596078455, a: 1} m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -733,23 +733,19 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} propertyPath: m_AnchorMin.y - value: .415405631 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} propertyPath: m_AnchorMax.y - value: .999999881 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_Value - value: .999999702 - objectReference: {fileID: 0} - - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_Size - value: .58459425 + - target: {fileID: 22458514, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchoredPosition.y + value: -65.965889 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2} @@ -1078,14 +1074,6 @@ Prefab: propertyPath: levelOptions.SphereRadius value: 7 objectReference: {fileID: 0} - - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: levelOptions.FriendshipLikeliness - value: .600000024 - objectReference: {fileID: 0} - - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: levelOptions.AvgNumFriends - value: 8 - objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} m_IsPrefabParent: 0 diff --git a/Assets/Scenes/splash.unity b/Assets/Scenes/splash.unity new file mode 100644 index 0000000..407d510 --- /dev/null +++ b/Assets/Scenes/splash.unity @@ -0,0 +1,532 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +SceneSettings: + m_ObjectHideFlags: 0 + m_PVSData: + m_PVSObjectsArray: [] + m_PVSPortalsArray: [] + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: .25 + backfaceThreshold: 100 +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_Fog: 0 + m_FogColor: {r: .5, g: .5, b: .5, a: 1} + m_FogMode: 3 + m_FogDensity: .00999999978 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: .211999997, g: .226999998, b: .259000003, a: 1} + m_AmbientEquatorColor: {r: .114, g: .125, b: .133000001, a: 1} + m_AmbientGroundColor: {r: .0469999984, g: .0430000015, b: .0350000001, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: .5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} +--- !u!127 &3 +LevelGameManager: + m_ObjectHideFlags: 0 +--- !u!157 &4 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 5 + m_GIWorkflowMode: 0 + m_LightmapsMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 3 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AOMaxDistance: 1 + m_Padding: 2 + m_CompAOExponent: 0 + m_LightmapParameters: {fileID: 0} + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_LightmapSnapshot: {fileID: 0} + m_RuntimeCPUUsage: 25 +--- !u!196 &5 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentRadius: .5 + agentHeight: 2 + agentSlope: 45 + agentClimb: .400000006 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + accuratePlacement: 0 + minRegionArea: 2 + cellSize: .166666672 + manualCellSize: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &12356507 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 12356509} + - 108: {fileID: 12356508} + 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 &12356508 +Light: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 12356507} + 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 &12356509 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 12356507} + 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: 2 +--- !u!1 &608195445 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 608195450} + - 20: {fileID: 608195449} + - 92: {fileID: 608195448} + - 124: {fileID: 608195447} + - 81: {fileID: 608195446} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &608195446 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 608195445} + m_Enabled: 1 +--- !u!124 &608195447 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 608195445} + m_Enabled: 1 +--- !u!92 &608195448 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 608195445} + m_Enabled: 1 +--- !u!20 &608195449 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 608195445} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: .300000012 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_HDR: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: .0219999999 + m_StereoMirrorMode: 0 +--- !u!4 &608195450 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 608195445} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 +--- !u!1 &613726785 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 613726789} + - 114: {fileID: 613726788} + - 114: {fileID: 613726787} + - 114: {fileID: 613726786} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &613726786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 613726785} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AllowActivationOnStandalone: 0 +--- !u!114 &613726787 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 613726785} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: .5 + m_AllowActivationOnMobileDevice: 0 +--- !u!114 &613726788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 613726785} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!4 &613726789 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 613726785} + 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: 0} + m_RootOrder: 3 +--- !u!1 &805318196 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 805318197} + - 222: {fileID: 805318199} + - 114: {fileID: 805318198} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &805318197 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 805318196} + 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: 2125224430} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} +--- !u!114 &805318198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 805318196} + 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: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &805318199 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 805318196} +--- !u!1 &1671688409 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1671688410} + - 33: {fileID: 1671688413} + - 64: {fileID: 1671688412} + - 23: {fileID: 1671688411} + m_Layer: 0 + m_Name: Quad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1671688410 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1671688409} + 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: 0} + m_RootOrder: 0 +--- !u!23 &1671688411 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1671688409} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 2100000, guid: 17f2c3e8895cc004db164dd0f8963cd2, type: 2} + 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!64 &1671688412 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1671688409} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &1671688413 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1671688409} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &2125224426 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2125224430} + - 223: {fileID: 2125224429} + - 114: {fileID: 2125224428} + - 114: {fileID: 2125224427} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2125224427 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2125224426} + 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 &2125224428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2125224426} + 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 &2125224429 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2125224426} + 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 &2125224430 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2125224426} + 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: 805318197} + m_Father: {fileID: 0} + m_RootOrder: 4 + 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} diff --git a/Assets/Scenes/splash.unity.meta b/Assets/Scenes/splash.unity.meta new file mode 100644 index 0000000..23cd7f0 --- /dev/null +++ b/Assets/Scenes/splash.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 551926e94351f4248a01898e8c79c890 +timeCreated: 1439706445 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Link.cs b/Assets/Scripts/Link.cs index f2730c9..865a70e 100644 --- a/Assets/Scripts/Link.cs +++ b/Assets/Scripts/Link.cs @@ -9,8 +9,10 @@ public class Link : MonoBehaviour, IObserver private float highlightAlpha = 0.8f; private float defaultAlpha = 0.5f; - private Color currentDefaultColor; - private Color currentHighlightColor; + private Color color; + + private Color baseColor = new Color(0.3f, 0.7f, 1f); + private Color inactiveColor = new Color(0.15f, 0.15f, 0.05f); private static float defaultScale = 0.03f; private float hightlightScale = 0.2f; @@ -40,7 +42,7 @@ public class Link : MonoBehaviour, IObserver model.Subscribe(this); //Make it between 0.1 and 0.4 - GetColors(Model.Awareness); + GetColors(); hightlightScale = Model.Importance * 0.3f + 0.1f; Highlight(false); } @@ -66,8 +68,10 @@ public class Link : MonoBehaviour, IObserver public void Notify() { - GetColors(Model.Awareness); + GetColors(); UpdateBeam(); + if (Model.KillCount == 2) + hightlightScale = 0.1f; //TODO SR } @@ -115,29 +119,23 @@ public class Link : MonoBehaviour, IObserver UpdateBeam(); } - private void GetColors(float level) + private void GetColors() { - //If level is 0.0, green [0,1,0]. - //If level is 0.5, yellow [1,1,0]. - //If level is 1.0, red [1,0,0]. - - float r = 1f; - float g = 1f; - - if (level < 0.5f) - r = Mathf.Lerp(0, 1, level*2); + if (Model.KillCount == 0) + color = baseColor; + else if (Model.KillCount == 2) + color = inactiveColor; else - g = Mathf.Lerp(1, 0, level * 2 - 1); - - currentDefaultColor = new Color(r, g, 0f, defaultAlpha); - currentHighlightColor = new Color(r, g, 0f, highlightAlpha); + color = new Color(1f, Mathf.Lerp(1, 0, Model.Awareness), 0f); } private void UpdateBeam() { float width = isHighlighted ? hightlightScale : defaultScale; BeamLine.SetWidth(width, width); + + color.a = isHighlighted ? highlightAlpha : defaultAlpha; - _renderer.material.SetColor("_TintColor", isHighlighted ? currentHighlightColor : currentDefaultColor); + _renderer.material.SetColor("_TintColor", color); } } diff --git a/Assets/Scripts/Models/Friendship.cs b/Assets/Scripts/Models/Friendship.cs index a1ff053..9106811 100644 --- a/Assets/Scripts/Models/Friendship.cs +++ b/Assets/Scripts/Models/Friendship.cs @@ -27,6 +27,12 @@ namespace DeathBook.Model this.link = link; } + public void NotifyFriendWasKilled() + { + Link.KillCount++; + Self.NotifyFriendWasKilled(this); + } + public void Update(float deltaTime) { if (noticedDeath) diff --git a/Assets/Scripts/Models/FriendshipLink.cs b/Assets/Scripts/Models/FriendshipLink.cs index 231a861..5357c1a 100644 --- a/Assets/Scripts/Models/FriendshipLink.cs +++ b/Assets/Scripts/Models/FriendshipLink.cs @@ -20,6 +20,13 @@ namespace DeathBook.Model set { awareness = value; NotifyObservers(); } } + private int killCount = 0; //Number of people dead in this relationship + public int KillCount + { + get { return killCount; } + set { killCount = value; NotifyObservers(); } + } + public FriendshipLink(Person p1, Person p2, float importance) { friend1 = p1; diff --git a/Assets/Scripts/Models/Level.cs b/Assets/Scripts/Models/Level.cs index 83b74b1..fe663d6 100644 --- a/Assets/Scripts/Models/Level.cs +++ b/Assets/Scripts/Models/Level.cs @@ -6,7 +6,7 @@ namespace DeathBook.Model { public class Level : Observable, Updatable { - private const float TimeScale = 30f; + private const float TimeScale = 30*4f; private int score; public int Score { get { return score; } } @@ -17,8 +17,12 @@ namespace DeathBook.Model public List Friendships { get { return friendships; } } //1 = 1 minute - private float gameTime; + private float gameTime; // real seconds elapsed since beginning public int GameTime { get { return (int)(gameTime * TimeScale); } } + //Time of day, between 0 minute to 1440 minutes (a day) + public int DayTime { get { return GameTime % (24*60); } } + + private int lastHour = -1; private float globalAwareness; //on a scale from 0 to 1 public float GlobalAwareness { get { return globalAwareness; } } @@ -32,7 +36,12 @@ namespace DeathBook.Model public void Update(float deltaTime) { gameTime += deltaTime; - NotifyObservers(); + int hour = DayTime / 60; + if (hour != lastHour) + { + lastHour = hour; + NotifyObservers(); + } //TODO Global awareness - start trends } diff --git a/Assets/Scripts/Models/LevelGenerator.cs b/Assets/Scripts/Models/LevelGenerator.cs index b380224..a87f12f 100644 --- a/Assets/Scripts/Models/LevelGenerator.cs +++ b/Assets/Scripts/Models/LevelGenerator.cs @@ -133,9 +133,20 @@ namespace DeathBook.Model private Person CreatePerson(int id, float x, float y, float z) { Vector3 pos = new Vector3(x, y, z); - //Vector2 times = + //Value between 3 and 21 + float connectionDuration = Utils.GetRandomValue(12, 9, 3); + int connectionTime = Random.Range(0, 24 * 60); + int disconnectionTime = (connectionTime + (int)(connectionDuration * 60)) % (24 * 60); + float freq = Utils.GetRandomValue(0, 1, 3); - Person p = new Person(id, pos); + bool isFemale = Random.value <= 0.5; + + string fName = "Fifi"; //isFemale ? NameGenerator.GetFemaleName() : NameGenerator.GetMaleName(); + string lName = "Brindacier"; //NameGenerator.GetLastName(); + + Sprite pic = isFemale ? PictureGenerator.GetFemalePicture() : PictureGenerator.GetMalePicture(); + + Person p = new Person(id, fName, lName, pos, connectionTime, disconnectionTime, freq, pic); return p; } diff --git a/Assets/Scripts/Models/Person.cs b/Assets/Scripts/Models/Person.cs index c6b78b2..f03871f 100644 --- a/Assets/Scripts/Models/Person.cs +++ b/Assets/Scripts/Models/Person.cs @@ -28,14 +28,13 @@ namespace DeathBook.Model private int friendCount = 0; public int FriendCount { get { return friendCount; } } - private int timeBetweenPosts; // f = 1/T; - public int TimeBetweenPosts { get { return timeBetweenPosts; } } + private float postFrequency; //on a scale from 0 to 1 + public float PostFrequency { get { return postFrequency; } } - private float connectionTime; - public float ConnectionTime { get { return connectionTime; } } - - private float disconnectionTime; - public float DisconnectionTime { get { return disconnectionTime; } } + private int connectionTime; + public int ConnectionTime { get { return connectionTime; } } + private int disconnectionTime; + public int DisconnectionTime { get { return disconnectionTime; } } private float awarenessLevel = 0; //on a scale from 0 to 1 public float AwarenessLevel { get { return awarenessLevel; } } @@ -44,23 +43,27 @@ namespace DeathBook.Model public bool Alive { get { return alive; } } private bool online = true; - public bool Online { get { return online; } } + public bool Online { get { return online; } set { online = value; NotifyObservers(); } } 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, Vector3 pos) + public Person(int id, string fName, string lName, Vector3 pos, int conn, int disconn, float freq, Sprite pic) { this.id = id; - initialPosition = pos; + this.firstName = fName; + this.lastName = lName; + this.initialPosition = pos; + this.connectionTime = conn; + this.disconnectionTime = disconn; + Debug.Log("I am " + id + " and I connect at " + Utils.GetTimeString(connectionTime) + " until " + Utils.GetTimeString(disconnectionTime)); + this.postFrequency = freq; + this.picture = pic; - // TODO Use names from db - firstName = "Mark"; - lastName = "Zuckerberg"; - - // For testing purposes - picture = UnityEngine.Random.Range(0, 2) == 0 ? PictureGenerator.GetFemalePicture() : PictureGenerator.GetMalePicture(); + online = IsOnline(0); } public void AddFriendship(Friendship f) @@ -78,13 +81,18 @@ namespace DeathBook.Model deadFriendsList.Add(f); } - public void Kill() + public bool Kill() { + if (Online) + return false; + Debug.Log("Person " + id + " died!"); alive = false; foreach (Friendship f in friendsList) - f.Friend.NotifyFriendWasKilled(f.Other); + f.Other.NotifyFriendWasKilled(); NotifyObservers(); + + return true; } public void NoticeDeath(Friendship f) @@ -96,12 +104,22 @@ namespace DeathBook.Model NotifyObservers(); } + //Time in hours + private bool IsOnline(int time) + { + if (ConnectionTime < DisconnectionTime) + return (time > ConnectionTime && time < DisconnectionTime); + return !(time < ConnectionTime && time > DisconnectionTime); + } + public void Update(float deltaTime) { - //TODO Update if connected - int time = LevelManager.Instance.GameLevel.GameTime; + int time = LevelManager.Instance.GameLevel.DayTime; + bool isOnline = IsOnline(time); + if (isOnline != Online) + Online = isOnline; //The following actions are only performed if user is online if (!Online) @@ -110,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/Models/Utils.cs b/Assets/Scripts/Models/Utils.cs index 08f33ca..fcb58e8 100644 --- a/Assets/Scripts/Models/Utils.cs +++ b/Assets/Scripts/Models/Utils.cs @@ -28,5 +28,10 @@ namespace DeathBook.Model } return (sum / numSteps * 2 - 1) * range + mean; } + + public static string GetTimeString(int time) + { + return time / 60 + "h " + time % 60 + "m"; + } } } diff --git a/Assets/Scripts/NetworkingSphere.cs b/Assets/Scripts/NetworkingSphere.cs index 07a9f52..ae1d579 100644 --- a/Assets/Scripts/NetworkingSphere.cs +++ b/Assets/Scripts/NetworkingSphere.cs @@ -1,9 +1,9 @@ -using UnityEngine; -using System.Collections; -using System.Collections.Generic; -using DeathBook.Model; - -public class NetworkingSphere : MonoBehaviour +using UnityEngine; +using System.Collections; +using System.Collections.Generic; +using DeathBook.Model; + +public class NetworkingSphere : MonoBehaviour { public GameObjectsOptions gameObjects = new GameObjectsOptions(); public LevelOptions levelOptions = new LevelOptions(); @@ -23,72 +23,76 @@ public class NetworkingSphere : MonoBehaviour public int AvgNumFriends = 20; public float FriendshipLikeliness = 0.4f; public float SphereRadius = 1f; - } - - public float rotationSpeed = 0.7f; - public float torqueForce = 50f; - - public PersonDetailsPanel DetailsPanel; - - private bool dragging = false; - private Vector3 delta = new Vector3(); + } + + public float rotationSpeed = 0.7f; + public float torqueForce = 50f; + + public PersonDetailsPanel DetailsPanel; + + private bool dragging = false; + private Vector3 delta = new Vector3(); private Rigidbody rb; - private LevelManager manager; - - private PersonNode[] peopleNodes; - - private PersonNode _selectedNode; - - void Awake() + 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); - Level lvl = manager.GameLevel; - - InstantiateNodes(lvl); - AssignLinks(lvl); - rb = GetComponent(); + Level lvl = manager.GameLevel; + + InstantiateNodes(lvl); + AssignLinks(lvl); + rb = GetComponent(); } - /*void OnGUI() + void OnGUI() { - GUI.Button(new Rect(10, 100, 400, 40), manager.GameLevel.GameTime + ""); - }*/ - - void Update() + 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 - transform.position = Vector3.zero; - - Vector3 screenMousePos = Input.mousePosition; - - screenMousePos.z = transform.position.z - Camera.main.transform.position.z; - - Vector3 worldMousePos = Camera.main.ScreenToWorldPoint(screenMousePos); - + 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 + transform.position = Vector3.zero; + + 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) > levelOptions.SphereRadius + 1f) - { - transform.Rotate(Vector3.one * Time.deltaTime * rotationSpeed); - } - - //when right btn clicked, call the change rotation - if (Input.GetMouseButtonDown(1)) - { - dragging = true; - } - else if (Input.GetMouseButtonUp(1)) - { - dragging = false; - delta = new Vector3(); - } - - if (dragging) - { - MoveSphere(); + if (Mathf.Sqrt(worldMousePos.x * worldMousePos.x + worldMousePos.y * worldMousePos.y) > levelOptions.SphereRadius + 1f) + { + transform.Rotate(Vector3.one * Time.deltaTime * rotationSpeed); + } + + //when right btn clicked, call the change rotation + if (Input.GetMouseButtonDown(1)) + { + dragging = true; + } + else if (Input.GetMouseButtonUp(1)) + { + dragging = false; + delta = new Vector3(); + } + + if (dragging && !_isRotatingTowardsNode) + { + MoveSphere(); } @@ -100,71 +104,135 @@ public class NetworkingSphere : MonoBehaviour { Camera.main.fieldOfView -= Input.GetAxis("Mouse ScrollWheel") * 10f; } - } - } - - 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.deltaTime, ForceMode.Impulse); - rb.AddTorque(Vector3.right * delta.y * torqueForce * Time.deltaTime, ForceMode.Impulse); - } - - private void InstantiateNodes(Level lvl) - { - peopleNodes = new PersonNode[lvl.People.Count]; - - for (int i = 0; i < lvl.People.Count; i++) - { - Person person = lvl.People[i]; - - PersonNode pInst = Instantiate(gameObjects.PersonObj, person.InitialPosition, Quaternion.identity) as PersonNode; - - pInst.OnClicked += OnNodeClicked; - - pInst.Model = person; - pInst.transform.parent = this.transform; - - peopleNodes[i] = pInst; - } - } - - private void OnNodeClicked(PersonNode node) - { - if (_selectedNode != null) - { - _selectedNode.Select(false); + } + } + + 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.deltaTime, ForceMode.Impulse); + rb.AddTorque(Vector3.right * delta.y * torqueForce * Time.deltaTime, ForceMode.Impulse); + } + + private void InstantiateNodes(Level lvl) + { + peopleNodes = new PersonNode[lvl.People.Count]; + + for (int i = 0; i < lvl.People.Count; i++) + { + Person person = lvl.People[i]; + + PersonNode pInst = Instantiate(gameObjects.PersonObj, person.InitialPosition, Quaternion.identity) as PersonNode; + + pInst.OnClicked += OnNodeClicked; + + pInst.Model = person; + pInst.transform.parent = this.transform; + + peopleNodes[i] = pInst; + } + } + + 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; - } - - private void AssignLinks(Level lvl) - { - foreach (FriendshipLink f in lvl.Friendships) + 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; + Link link = Instantiate(gameObjects.LinkObj) as Link; + int id1 = f.Friend1.id; int id2 = f.Friend2.id; - link.Model = f; - link.AttachToObjects(peopleNodes[id1].gameObject, peopleNodes[id2].gameObject); - - // Temporary stuff, for testing - peopleNodes[id1].AddLink(link); - peopleNodes[id2].AddLink(link); - } - } -} + link.Model = f; + link.AttachToObjects(peopleNodes[id1].gameObject, peopleNodes[id2].gameObject); + + // Temporary stuff, for testing + peopleNodes[id1].AddLink(link); + 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..ee31868 100644 --- a/Assets/Scripts/PersonDetailsPanel.cs +++ b/Assets/Scripts/PersonDetailsPanel.cs @@ -1,99 +1,102 @@ -using UnityEngine; -using System.Collections; -using UnityEngine.UI; +using UnityEngine; +using System.Collections; +using UnityEngine.UI; using DeathBook.Model; -using DeathBook.Util; - -public class PersonDetailsPanel : MonoBehaviour, IObserver -{ - public Image ProfilePicture; - public Text Name; - public GameObject FriendsPanel; - public Button KillButton; - public Button WatchButton; - public Button XButton; - public GameObject Container; - - public Image UIFriendPicture; - - private PersonNode _node; - private Person _model; - - void Awake() - { - Container.SetActive(false); - } - - public void SetNode(PersonNode node) - { - if (_model != null) - { - _model.UnSubscribe(this); - } - - _node = node; - _model = node.Model; - - _model.Subscribe(this); - - Container.SetActive(true); - - UpdateInfo(); - } - - public void Notify() - { - UpdateInfo(); - } - - private void UpdateInfo() - { - Name.text = _model.Name; - - foreach (Transform picture in FriendsPanel.transform) - { - Destroy(picture.gameObject); - } - - ProfilePicture.sprite = _model.Picture; - - RectTransform panelTrans = FriendsPanel.GetComponent(); - - panelTrans.anchorMin = new Vector2(0f, -0.3125f * _model.FriendList.Count); - panelTrans.anchorMax = new Vector2(1f, 1f); - panelTrans.offsetMin = Vector2.zero; - panelTrans.offsetMax = Vector2.zero; - - float height = 1f / _model.FriendList.Count; - - for (int i = 0; i < _model.FriendList.Count; i++) - { - Person friend = _model.FriendList[i].Friend; - - Image friendPicture = Instantiate(UIFriendPicture) as Image; - - friendPicture.sprite = friend.Picture; - - 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; - - if (i == _model.FriendList.Count - 1) - { - Debug.Log(friendPicture.rectTransform.position); - } - else if (i == 0) - { - Debug.Log(friendPicture.rectTransform.position); - } - } - } - - public void Close() - { - Container.SetActive(false); - _node.Select(false); - } -} +using DeathBook.Util; + +public class PersonDetailsPanel : MonoBehaviour, IObserver +{ + public Image ProfilePicture; + public Text Name; + public GameObject FriendsPanel; + public Button KillButton; + public Button WatchButton; + public Button XButton; + public GameObject Container; + + public UIFriendPicture FriendPicture; + + private PersonNode _node; + private Person _model; + + void Awake() + { + Container.SetActive(false); + } + + public void SetNode(PersonNode node) + { + if (_model != null) + { + _model.UnSubscribe(this); + } + + _node = node; + _model = node.Model; + + _model.Subscribe(this); + + Container.SetActive(true); + + UpdateInfo(); + } + + public void Notify() + { + UpdateInfo(); + } + + private void UpdateInfo() + { + Name.text = _model.Name; + + KillButton.gameObject.SetActive(_model.Alive); + WatchButton.gameObject.SetActive(_model.Alive); + + foreach (Transform picture in FriendsPanel.transform) + { + Destroy(picture.gameObject); + } + + ProfilePicture.sprite = _model.Picture; + + RectTransform panelTrans = FriendsPanel.GetComponent(); + + panelTrans.anchorMin = new Vector2(0f, -0.3125f * _model.FriendList.Count); + panelTrans.anchorMax = new Vector2(1f, 1f); + panelTrans.offsetMin = Vector2.zero; + panelTrans.offsetMax = Vector2.zero; + + float height = 1f / _model.FriendList.Count; + + for (int i = 0; i < _model.FriendList.Count; i++) + { + Person friend = _model.FriendList[i].Friend; + + UIFriendPicture friendPicture = Instantiate(FriendPicture) as UIFriendPicture; + + friendPicture.Model = friend; + + Image picture = friendPicture.Picture; + + 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; + } + } + + public void Close() + { + 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: