From 2d64ca13ea77b2479da2db77424d717a9cc5074e Mon Sep 17 00:00:00 2001 From: Patrice Vignola Date: Sun, 16 Aug 2015 03:15:08 -0400 Subject: [PATCH] - Added the awareness levels and restricted the focus to double clicks on nodes --- Assets/Art/AwarenessGradient.png | Bin 0 -> 17820 bytes Assets/Art/AwarenessGradient.png.meta | 55 +++ Assets/Materials/AwarenessLevel.mat | 161 ++++++++ Assets/Materials/AwarenessLevel.mat.meta | 8 + Assets/Materials/FriendAwarenessLevel.mat | 161 ++++++++ .../Materials/FriendAwarenessLevel.mat.meta | 8 + Assets/Materials/UIMask.mat | 195 +++++++++ Assets/Materials/UIMask.mat.meta | 8 + Assets/Prefabs/AwarenessBar.prefab | 86 ++++ Assets/Prefabs/AwarenessBar.prefab.meta | 8 + Assets/Prefabs/FriendAwarenessBar.prefab | 86 ++++ Assets/Prefabs/FriendAwarenessBar.prefab.meta | 8 + Assets/Prefabs/PersonDetailsPanel.prefab | 99 ++++- Assets/Scenes/Gameplay.unity | 384 +++++++++++++----- Assets/Scripts/Models/Friendship.cs | 18 +- Assets/Scripts/NetworkingSphere.cs | 21 +- Assets/Scripts/PersonDetailsPanel.cs | 38 +- Assets/Scripts/PersonNode.cs | 1 - Assets/Scripts/RatioProgression.meta | 9 + .../RatioProgression/RatioProgression.cs | 28 ++ .../RatioProgression/RatioProgression.cs.meta | 12 + Assets/Scripts/UIFriendPicture.cs | 1 + Assets/Shaders.meta | 9 + Assets/Shaders/RatioProgression.meta | 9 + Assets/Shaders/RatioProgression/Mask.shader | 23 ++ .../Shaders/RatioProgression/Mask.shader.meta | 9 + .../RatioProgression/RatioProgression.shader | 86 ++++ .../RatioProgression.shader.meta | 9 + .../RatioProgressionMasked.shader | 96 +++++ .../RatioProgressionMasked.shader.meta | 9 + 30 files changed, 1513 insertions(+), 132 deletions(-) create mode 100644 Assets/Art/AwarenessGradient.png create mode 100644 Assets/Art/AwarenessGradient.png.meta create mode 100644 Assets/Materials/AwarenessLevel.mat create mode 100644 Assets/Materials/AwarenessLevel.mat.meta create mode 100644 Assets/Materials/FriendAwarenessLevel.mat create mode 100644 Assets/Materials/FriendAwarenessLevel.mat.meta create mode 100644 Assets/Materials/UIMask.mat create mode 100644 Assets/Materials/UIMask.mat.meta create mode 100644 Assets/Prefabs/AwarenessBar.prefab create mode 100644 Assets/Prefabs/AwarenessBar.prefab.meta create mode 100644 Assets/Prefabs/FriendAwarenessBar.prefab create mode 100644 Assets/Prefabs/FriendAwarenessBar.prefab.meta create mode 100644 Assets/Scripts/RatioProgression.meta create mode 100644 Assets/Scripts/RatioProgression/RatioProgression.cs create mode 100644 Assets/Scripts/RatioProgression/RatioProgression.cs.meta create mode 100644 Assets/Shaders.meta create mode 100644 Assets/Shaders/RatioProgression.meta create mode 100644 Assets/Shaders/RatioProgression/Mask.shader create mode 100644 Assets/Shaders/RatioProgression/Mask.shader.meta create mode 100644 Assets/Shaders/RatioProgression/RatioProgression.shader create mode 100644 Assets/Shaders/RatioProgression/RatioProgression.shader.meta create mode 100644 Assets/Shaders/RatioProgression/RatioProgressionMasked.shader create mode 100644 Assets/Shaders/RatioProgression/RatioProgressionMasked.shader.meta diff --git a/Assets/Art/AwarenessGradient.png b/Assets/Art/AwarenessGradient.png new file mode 100644 index 0000000000000000000000000000000000000000..9dbebd14639ef580d5734ec57fab400a62f81561 GIT binary patch literal 17820 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 literal 0 HcmV?d00001 diff --git a/Assets/Art/AwarenessGradient.png.meta b/Assets/Art/AwarenessGradient.png.meta new file mode 100644 index 0000000..eddbb79 --- /dev/null +++ b/Assets/Art/AwarenessGradient.png.meta @@ -0,0 +1,55 @@ +fileFormatVersion: 2 +guid: a023c2b27dbaaec45ae34c278711bc24 +timeCreated: 1439697534 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/AwarenessLevel.mat b/Assets/Materials/AwarenessLevel.mat new file mode 100644 index 0000000..3432091 --- /dev/null +++ b/Assets/Materials/AwarenessLevel.mat @@ -0,0 +1,161 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: AwarenessLevel + m_Shader: {fileID: 4800000, guid: dc0fe2d53692d3a4288028f8d5372963, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 0} + 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: _Cutoff + second: .5 + data: + first: + name: _SrcBlend + second: 1 + data: + first: + name: _DstBlend + second: 0 + 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: _EmissionScaleUI + second: 0 + data: + first: + name: _Mode + second: 0 + data: + first: + name: _Metallic + second: 0 + data: + first: + name: _Stencil + second: 0 + data: + first: + name: _Ratio + 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} + data: + first: + name: _EmissionColorUI + second: {r: 1, g: 1, b: 1, a: 1} + data: + first: + name: _CompletedColor + second: {r: 1, g: 1, b: 1, a: 1} + data: + first: + name: _RemainingColor + second: {r: 0, g: 0, b: 0, a: .137254909} diff --git a/Assets/Materials/AwarenessLevel.mat.meta b/Assets/Materials/AwarenessLevel.mat.meta new file mode 100644 index 0000000..d2ef574 --- /dev/null +++ b/Assets/Materials/AwarenessLevel.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 085386af6af570a47b29380efacfa18d +timeCreated: 1439697617 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/FriendAwarenessLevel.mat b/Assets/Materials/FriendAwarenessLevel.mat new file mode 100644 index 0000000..c4e794b --- /dev/null +++ b/Assets/Materials/FriendAwarenessLevel.mat @@ -0,0 +1,161 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: FriendAwarenessLevel + m_Shader: {fileID: 4800000, guid: a3a1c69b0135240439146d369cea2dbb, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 0} + 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: _Cutoff + second: .5 + data: + first: + name: _SrcBlend + second: 1 + data: + first: + name: _DstBlend + second: 0 + 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: _EmissionScaleUI + second: 0 + data: + first: + name: _Mode + second: 0 + data: + first: + name: _Metallic + second: 0 + data: + first: + name: _Stencil + second: 0 + data: + first: + name: _Ratio + 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} + data: + first: + name: _EmissionColorUI + second: {r: 1, g: 1, b: 1, a: 1} + data: + first: + name: _CompletedColor + second: {r: 1, g: 1, b: 1, a: 1} + data: + first: + name: _RemainingColor + second: {r: 0, g: 0, b: 0, a: .137254909} diff --git a/Assets/Materials/FriendAwarenessLevel.mat.meta b/Assets/Materials/FriendAwarenessLevel.mat.meta new file mode 100644 index 0000000..e8c170d --- /dev/null +++ b/Assets/Materials/FriendAwarenessLevel.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 52cd241b11349d24f97ee7f4ea93a967 +timeCreated: 1439704187 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/UIMask.mat b/Assets/Materials/UIMask.mat new file mode 100644 index 0000000..d0aaa0e --- /dev/null +++ b/Assets/Materials/UIMask.mat @@ -0,0 +1,195 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: UIMask + m_Shader: {fileID: 4800000, guid: 705181f423730b9468fdb10a3b99c156, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 0} + 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: _DecalTex + 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} + data: + first: + name: _SpecGlossMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + data: + first: + name: _Cutoff + second: .899999976 + data: + first: + name: _Shininess + second: 1 + data: + first: + name: _SrcBlend + second: 1 + data: + first: + name: _DstBlend + second: 0 + 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: _EmissionScaleUI + second: 0 + data: + first: + name: _Mode + second: 0 + data: + first: + name: _Metallic + second: 0 + data: + first: + name: _Stencil + second: 33.2599983 + data: + first: + name: _StencilComp + second: 205.600006 + data: + first: + name: _StencilOp + second: -50 + data: + first: + name: _StencilReadMask + second: 196.050003 + data: + first: + name: _StencilWriteMask + second: 489 + data: + first: + name: _ColorMask + second: 160 + m_Colors: + data: + first: + name: _EmissionColor + second: {r: 0, g: 0, b: 0, a: 0} + data: + first: + name: _Color + second: {r: .448529422, g: .29022491, b: .29022491, a: 1} + data: + first: + name: _SpecColor + second: {r: .200000003, g: .200000003, b: .200000003, a: 1} + data: + first: + name: _EmissionColorUI + second: {r: 1, g: 1, b: 1, a: 1} + data: + first: + name: _Emission + second: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Materials/UIMask.mat.meta b/Assets/Materials/UIMask.mat.meta new file mode 100644 index 0000000..0e1eb91 --- /dev/null +++ b/Assets/Materials/UIMask.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c22c190fd4877414fa5e862acdae3e64 +timeCreated: 1439699720 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/AwarenessBar.prefab b/Assets/Prefabs/AwarenessBar.prefab new file mode 100644 index 0000000..4ced324 --- /dev/null +++ b/Assets/Prefabs/AwarenessBar.prefab @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &195468 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22454528} + - 222: {fileID: 22255394} + - 114: {fileID: 11430582} + - 114: {fileID: 11478878} + m_Layer: 5 + m_Name: AwarenessBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &11430582 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 195468} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 085386af6af570a47b29380efacfa18d, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 21300000, guid: a023c2b27dbaaec45ae34c278711bc24, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11478878 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 195468} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 51e725985a0e317458c006132d935c25, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &22255394 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 195468} +--- !u!224 &22454528 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 195468} + 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 + m_AnchorMin: {x: .185000002, y: .147} + m_AnchorMax: {x: .464206487, y: .5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 195468} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/AwarenessBar.prefab.meta b/Assets/Prefabs/AwarenessBar.prefab.meta new file mode 100644 index 0000000..1a1ec99 --- /dev/null +++ b/Assets/Prefabs/AwarenessBar.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 926fe94f393f0e540bb2f1c5678ecc08 +timeCreated: 1439698905 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/FriendAwarenessBar.prefab b/Assets/Prefabs/FriendAwarenessBar.prefab new file mode 100644 index 0000000..7ab75ca --- /dev/null +++ b/Assets/Prefabs/FriendAwarenessBar.prefab @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &195468 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22454528} + - 222: {fileID: 22255394} + - 114: {fileID: 11430582} + - 114: {fileID: 11478878} + m_Layer: 5 + m_Name: FriendAwarenessBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &11430582 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 195468} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 52cd241b11349d24f97ee7f4ea93a967, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 21300000, guid: a023c2b27dbaaec45ae34c278711bc24, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11478878 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 195468} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 51e725985a0e317458c006132d935c25, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &22255394 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 195468} +--- !u!224 &22454528 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 195468} + 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 + m_AnchorMin: {x: .185000002, y: .147} + m_AnchorMax: {x: .464206487, y: .5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 195468} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/FriendAwarenessBar.prefab.meta b/Assets/Prefabs/FriendAwarenessBar.prefab.meta new file mode 100644 index 0000000..ccc93bf --- /dev/null +++ b/Assets/Prefabs/FriendAwarenessBar.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 62ba8147df32d4e42883e8204d32c66c +timeCreated: 1439704172 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/PersonDetailsPanel.prefab b/Assets/Prefabs/PersonDetailsPanel.prefab index 1723fdd..24977fd 100644 --- a/Assets/Prefabs/PersonDetailsPanel.prefab +++ b/Assets/Prefabs/PersonDetailsPanel.prefab @@ -273,6 +273,7 @@ GameObject: serializedVersion: 4 m_Component: - 224: {fileID: 22458514} + - 222: {fileID: 22286240} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -280,6 +281,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &163070 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22454288} + - 222: {fileID: 22205402} + - 114: {fileID: 11478634} + - 114: {fileID: 11476856} + m_Layer: 5 + m_Name: AwarenessBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &189194 GameObject: m_ObjectHideFlags: 1 @@ -469,8 +488,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 11431992} m_HandleRect: {fileID: 22417254} m_Direction: 2 - m_Value: .999378026 - m_Size: .427392036 + m_Value: 0 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -657,7 +676,41 @@ MonoBehaviour: WatchButton: {fileID: 11491412} XButton: {fileID: 11494666} Container: {fileID: 147852} + AwarenessBar: {fileID: 11476856} + FriendAwarenessBar: {fileID: 11478878, guid: 62ba8147df32d4e42883e8204d32c66c, type: 2} FriendPicture: {fileID: 11469406, guid: 16a1d168f1ef75b4690435675a9e69b0, type: 2} +--- !u!114 &11476856 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 163070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 51e725985a0e317458c006132d935c25, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &11478634 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 163070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 085386af6af570a47b29380efacfa18d, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 21300000, guid: a023c2b27dbaaec45ae34c278711bc24, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 --- !u!114 &11478962 MonoBehaviour: m_ObjectHideFlags: 1 @@ -864,6 +917,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 125710} +--- !u!222 &22205402 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 163070} --- !u!222 &22213958 CanvasRenderer: m_ObjectHideFlags: 1 @@ -930,6 +989,12 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 113502} +--- !u!222 &22286240 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 159508} --- !u!224 &22404366 RectTransform: m_ObjectHideFlags: 1 @@ -1074,6 +1139,23 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} +--- !u!224 &22454288 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 163070} + 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: 22471300} + m_RootOrder: 1 + m_AnchorMin: {x: .185000002, y: .147} + m_AnchorMax: {x: .464206487, y: .5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} --- !u!224 &22456054 RectTransform: m_ObjectHideFlags: 1 @@ -1103,10 +1185,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 22464522} m_RootOrder: 0 - m_AnchorMin: {x: .5, y: 1} - m_AnchorMax: {x: .5, y: 1} - m_AnchoredPosition: {x: 0, y: -65.95298} - m_SizeDelta: {x: 90, y: 132} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} --- !u!224 &22462244 RectTransform: @@ -1155,6 +1237,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 22456054} + - {fileID: 22454288} - {fileID: 22483690} - {fileID: 22486224} m_Father: {fileID: 22404366} @@ -1212,7 +1295,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 22471300} - m_RootOrder: 1 + m_RootOrder: 2 m_AnchorMin: {x: .185000002, y: .546483397} m_AnchorMax: {x: 1, y: .877516687} m_AnchoredPosition: {x: 0, y: 0} @@ -1247,7 +1330,7 @@ RectTransform: m_Children: - {fileID: 22489830} m_Father: {fileID: 22471300} - m_RootOrder: 2 + m_RootOrder: 3 m_AnchorMin: {x: .901000023, y: .546483397} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index fca9018..99454eb 100644 --- a/Assets/Scenes/Gameplay.unity +++ b/Assets/Scenes/Gameplay.unity @@ -196,6 +196,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1011525171} + - {fileID: 941214653} - {fileID: 403748470} - {fileID: 350457696} - {fileID: 906703074} @@ -334,7 +336,7 @@ RectTransform: m_Children: - {fileID: 1366676553} m_Father: {fileID: 122634401} - m_RootOrder: 1 + m_RootOrder: 3 m_AnchorMin: {x: 0, y: .550000012} m_AnchorMax: {x: 1, y: .699999988} m_AnchoredPosition: {x: 0, y: 0} @@ -396,7 +398,7 @@ RectTransform: m_Children: - {fileID: 724929356} m_Father: {fileID: 122634401} - m_RootOrder: 0 + m_RootOrder: 2 m_AnchorMin: {x: 0, y: .699999988} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -616,7 +618,7 @@ RectTransform: - {fileID: 2009587059} - {fileID: 1197925314} m_Father: {fileID: 122634401} - m_RootOrder: 2 + m_RootOrder: 4 m_AnchorMin: {x: 0, y: .200000003} m_AnchorMax: {x: 1, y: .550000012} m_AnchoredPosition: {x: 0, y: 0} @@ -649,6 +651,128 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 906703073} +--- !u!1 &941214652 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 941214653} + - 222: {fileID: 941214655} + - 114: {fileID: 941214654} + m_Layer: 5 + m_Name: MaskBot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &941214653 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 941214652} + 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: 122634401} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: .224000007} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &941214654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 941214652} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: c22c190fd4877414fa5e862acdae3e64, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &941214655 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 941214652} +--- !u!1 &1011525170 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1011525171} + - 222: {fileID: 1011525173} + - 114: {fileID: 1011525172} + m_Layer: 5 + m_Name: MaskTop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1011525171 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1011525170} + 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: 122634401} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .367000014} + m_AnchorMax: {x: .5, y: 1} + m_AnchoredPosition: {x: 0, y: -1.90734863e-06} + m_SizeDelta: {x: 0, y: -3.81469727e-06} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1011525172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1011525170} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: c22c190fd4877414fa5e862acdae3e64, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1011525173 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1011525170} --- !u!1 &1126063559 GameObject: m_ObjectHideFlags: 0 @@ -709,118 +833,16 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 ---- !u!1001 &1197925313 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 906703074} - m_Modifications: - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchorMin.x - value: .0299999993 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchorMin.y - value: .0299999993 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchorMax.x - value: .970000029 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchorMax.y - value: .970000029 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_Pivot.x - value: .5 - objectReference: {fileID: 0} - - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_Pivot.y - value: .5 - objectReference: {fileID: 0} - - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchorMin.y - value: .578712046 - objectReference: {fileID: 0} - - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_AnchorMax.y - value: .999643743 - objectReference: {fileID: 0} - - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_Value - value: .999384761 - objectReference: {fileID: 0} - - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2} - propertyPath: m_Size - value: .420931697 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2} - m_IsPrefabParent: 0 --- !u!224 &1197925314 stripped RectTransform: m_PrefabParentObject: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} - m_PrefabInternal: {fileID: 1197925313} + m_PrefabInternal: {fileID: 1582401601} --- !u!114 &1197925315 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11476684, guid: c993e87661906234fba410e55ed66832, type: 2} - m_PrefabInternal: {fileID: 1197925313} + m_PrefabInternal: {fileID: 1582401601} m_Script: {fileID: 11500000, guid: 88fb1885d6f8fd6409e3866b7707a12a, type: 3} --- !u!1 &1366676552 GameObject: @@ -918,7 +940,7 @@ RectTransform: - {fileID: 268520030} - {fileID: 142867288} m_Father: {fileID: 122634401} - m_RootOrder: 3 + m_RootOrder: 5 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: .200000003} m_AnchoredPosition: {x: 0, y: 0} @@ -951,6 +973,152 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1411243505} +--- !u!1001 &1582401601 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 906703074} + m_Modifications: + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMin.x + value: .0299999993 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMin.y + value: .0299999993 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMax.x + value: .970000029 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMax.y + value: .970000029 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_Pivot.x + value: .5 + objectReference: {fileID: 0} + - target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_Pivot.y + value: .5 + objectReference: {fileID: 0} + - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMax.x + value: .862309754 + objectReference: {fileID: 0} + - target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMin.x + value: .515309691 + objectReference: {fileID: 0} + - target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchorMax.x + value: .515309691 + objectReference: {fileID: 0} + - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1858163984 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Models/Friendship.cs b/Assets/Scripts/Models/Friendship.cs index a1ff053..6443f2e 100644 --- a/Assets/Scripts/Models/Friendship.cs +++ b/Assets/Scripts/Models/Friendship.cs @@ -5,7 +5,7 @@ using DeathBook.Util; namespace DeathBook.Model { - public class Friendship : Updatable + public class Friendship : Updatable, IComparable { private Person self; public Person Self { get { return self; } } @@ -53,6 +53,22 @@ namespace DeathBook.Model return weight * 0.1f; } + public int CompareTo(Friendship other) + { + int value = 0; + + if (this.Friend.AwarenessLevel < other.Friend.AwarenessLevel) + { + value = 1; + } + else if (this.Friend.AwarenessLevel > other.Friend.AwarenessLevel) + { + value = -1; + } + + return value; + } + /*internal enum Knowledge { Alive, Doubt, Dead diff --git a/Assets/Scripts/NetworkingSphere.cs b/Assets/Scripts/NetworkingSphere.cs index d143c66..f483379 100644 --- a/Assets/Scripts/NetworkingSphere.cs +++ b/Assets/Scripts/NetworkingSphere.cs @@ -39,6 +39,7 @@ public class NetworkingSphere : MonoBehaviour private PersonNode[] peopleNodes; private PersonNode _selectedNode; + private float _timeSinceLastClick; // Used to disable the physics when the user has clicked on a node private bool _isRotatingTowardsNode = false; @@ -61,6 +62,11 @@ public class NetworkingSphere : MonoBehaviour void Update() { + if (_timeSinceLastClick < 2f) + { + _timeSinceLastClick += Time.deltaTime; + } + 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 @@ -142,20 +148,23 @@ public class NetworkingSphere : MonoBehaviour private void OnNodeClicked(PersonNode node) { - if (node == _selectedNode) return; - if (_selectedNode != null) { _selectedNode.Select(false); } + if (_timeSinceLastClick < 0.5f && node == _selectedNode) + { + // We focus on the node if double clicked + FocusOnNode(node); + } + + _timeSinceLastClick = 0f; + DetailsPanel.SetNode(node); node.Select(true); _selectedNode = node; - - // Testing to see how it looks and feels like - FocusOnNode(node); } private void AssignLinks(Level lvl) @@ -223,7 +232,7 @@ public class NetworkingSphere : MonoBehaviour float ratio = 0f; - while (ratio < 1f) + while (ratio < 1f && transform.localRotation != finalRot) { ratio += Time.deltaTime / 1.5f; diff --git a/Assets/Scripts/PersonDetailsPanel.cs b/Assets/Scripts/PersonDetailsPanel.cs index aa7e182..10e0fb3 100644 --- a/Assets/Scripts/PersonDetailsPanel.cs +++ b/Assets/Scripts/PersonDetailsPanel.cs @@ -3,6 +3,7 @@ using System.Collections; using UnityEngine.UI; using DeathBook.Model; using DeathBook.Util; +using System.Collections.Generic; public class PersonDetailsPanel : MonoBehaviour, IObserver { @@ -13,6 +14,8 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver public Button WatchButton; public Button XButton; public GameObject Container; + public RatioProgression AwarenessBar; + public RatioProgression FriendAwarenessBar; public UIFriendPicture FriendPicture; @@ -53,6 +56,8 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver KillButton.gameObject.SetActive(_model.Alive); WatchButton.gameObject.SetActive(_model.Alive); + AwarenessBar.SetCompletedRatio(_model.AwarenessLevel); + foreach (Transform picture in FriendsPanel.transform) { Destroy(picture.gameObject); @@ -69,23 +74,40 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver float height = 1f / _model.FriendList.Count; - for (int i = 0; i < _model.FriendList.Count; i++) + // We copy the list so we can sort it without affecting the model data + List list = new List(_model.FriendList); + list.Sort(); + + for (int i = 0; i < list.Count; i++) { - Person friend = _model.FriendList[i].Friend; + Person friend = list[i].Friend; + float minY = 1f - (height - 0.01f) * (i + 1) - i * 0.01f; + float maxY = 1f - height * i; + + // Friend picture UIFriendPicture friendPicture = Instantiate(FriendPicture) as UIFriendPicture; - - friendPicture.Model = friend; - Image picture = friendPicture.Picture; + friendPicture.Model = friend; 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.anchorMin = new Vector2(0.022f, minY); + picture.rectTransform.anchorMax = new Vector2(0.26f, maxY); picture.rectTransform.offsetMin = Vector2.zero; picture.rectTransform.offsetMax = Vector2.zero; + + // Awareness bar + RatioProgression awarenessBar = Instantiate(FriendAwarenessBar) as RatioProgression; + RectTransform barRectTrans = awarenessBar.GetComponent(); + + awarenessBar.SetCompletedRatio(friend.AwarenessLevel); + + awarenessBar.transform.SetParent(FriendsPanel.transform); + barRectTrans.anchorMin = new Vector2(0.28f, minY); + barRectTrans.anchorMax = new Vector2(1f, maxY); + barRectTrans.offsetMin = Vector2.zero; + barRectTrans.offsetMax = Vector2.zero; } } diff --git a/Assets/Scripts/PersonNode.cs b/Assets/Scripts/PersonNode.cs index 71b3def..3c79943 100644 --- a/Assets/Scripts/PersonNode.cs +++ b/Assets/Scripts/PersonNode.cs @@ -30,7 +30,6 @@ public class PersonNode : MonoBehaviour, IObserver private Renderer _renderer; private Transform _transform; - public Person Model { get { return _model; } diff --git a/Assets/Scripts/RatioProgression.meta b/Assets/Scripts/RatioProgression.meta new file mode 100644 index 0000000..0617045 --- /dev/null +++ b/Assets/Scripts/RatioProgression.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 32f37163e04c7e04cb5e5272d4ae8f07 +folderAsset: yes +timeCreated: 1434607146 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/RatioProgression/RatioProgression.cs b/Assets/Scripts/RatioProgression/RatioProgression.cs new file mode 100644 index 0000000..8612c50 --- /dev/null +++ b/Assets/Scripts/RatioProgression/RatioProgression.cs @@ -0,0 +1,28 @@ +using UnityEngine; +using System.Collections; +using UnityEngine.UI; + +public class RatioProgression : MonoBehaviour +{ + private Material _material; + + void Awake() + { + if (GetComponent() != null) + { + // GetComponent().material creates its own instance of the material, so it's not shared + _material = GetComponent().material; + } + else if (GetComponent() != null) + { + // For the UI images, GetComponent().material is a shared material, so we have to clone it + _material = Instantiate(GetComponent().material); + GetComponent().material = _material; + } + } + + public void SetCompletedRatio(float ratio) + { + _material.SetFloat("_Ratio", ratio); + } +} diff --git a/Assets/Scripts/RatioProgression/RatioProgression.cs.meta b/Assets/Scripts/RatioProgression/RatioProgression.cs.meta new file mode 100644 index 0000000..00c635c --- /dev/null +++ b/Assets/Scripts/RatioProgression/RatioProgression.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 51e725985a0e317458c006132d935c25 +timeCreated: 1434607162 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UIFriendPicture.cs b/Assets/Scripts/UIFriendPicture.cs index 47e5196..425cfdd 100644 --- a/Assets/Scripts/UIFriendPicture.cs +++ b/Assets/Scripts/UIFriendPicture.cs @@ -29,5 +29,6 @@ public class UIFriendPicture : MonoBehaviour public void OnClick() { _model.SelectNode(); + _model.SelectNode(); } } diff --git a/Assets/Shaders.meta b/Assets/Shaders.meta new file mode 100644 index 0000000..2886261 --- /dev/null +++ b/Assets/Shaders.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: b851a2b38a8a3a449a2e7643db91fb71 +folderAsset: yes +timeCreated: 1439697098 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/RatioProgression.meta b/Assets/Shaders/RatioProgression.meta new file mode 100644 index 0000000..f6e8101 --- /dev/null +++ b/Assets/Shaders/RatioProgression.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 98bfe83c2fad00b4aafed7c7978b7365 +folderAsset: yes +timeCreated: 1434606270 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/RatioProgression/Mask.shader b/Assets/Shaders/RatioProgression/Mask.shader new file mode 100644 index 0000000..333996d --- /dev/null +++ b/Assets/Shaders/RatioProgression/Mask.shader @@ -0,0 +1,23 @@ +Shader "Custom/MaskTest" { + + Properties + { + _MainTex ("Base (RGB) Alpha (A)", 2D) = "white" {} + _Cutoff ("Base Alpha cutoff", Range (0,.9)) = .5 + _Stencil ("Stencil Ref", Float) = 0 + } + + SubShader { + Tags {"Queue" = "Transparent+1"} + Offset 0, -1 + ColorMask 0 + ZWrite On + Pass + { + AlphaTest Greater [_Cutoff] + SetTexture [_MainTex] { + combine texture * primary, texture + } + } + } + } \ No newline at end of file diff --git a/Assets/Shaders/RatioProgression/Mask.shader.meta b/Assets/Shaders/RatioProgression/Mask.shader.meta new file mode 100644 index 0000000..e56c225 --- /dev/null +++ b/Assets/Shaders/RatioProgression/Mask.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 705181f423730b9468fdb10a3b99c156 +timeCreated: 1439703308 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/RatioProgression/RatioProgression.shader b/Assets/Shaders/RatioProgression/RatioProgression.shader new file mode 100644 index 0000000..9e6d21e --- /dev/null +++ b/Assets/Shaders/RatioProgression/RatioProgression.shader @@ -0,0 +1,86 @@ +// http://wiki.unity3d.com/index.php?title=Shader_Code + +Shader "Pat Shaders/RatioProgression" +{ + Properties + { + _CompletedColor ("Completed Tint", Color) = (0,0,0,0) + _RemainingColor ("Remaining Tint", Color) = (1,1,1,1) + + _MainTex ("Texture", 2D) = "white" {} + + _Ratio ("Ratio", Range(0,1)) = 0.5 + } + + SubShader + { + // http://docs.unity3d.com/460/Documentation/Manual/SL-SubshaderTags.html + Tags + { + "Queue"="Transparent-1" + + } + + // http://docs.unity3d.com/Manual/SL-Blend.html + Blend One OneMinusSrcAlpha + + Pass + { + CGPROGRAM + + #pragma vertex vert + #pragma fragment frag + + fixed4 _CompletedColor; + fixed4 _RemainingColor; + float _Ratio; + sampler2D _MainTex; + + // Data transferred from application to vertex program + struct vertexInput + { + float4 vertex : POSITION; + float2 texcoord0 : TEXCOORD0; // Normalized, from 0 to 1 + }; + + // Data transferred from vertex program to fragment program + struct fragmentInput + { + float4 position : SV_POSITION; + float2 texcoord0 : TEXCOORD0; // Normalized, from 0 to 1 + }; + + // Vertex program + fragmentInput vert(vertexInput i) + { + fragmentInput o; + + o.position = mul(UNITY_MATRIX_MVP, i.vertex); // Model*View*Projection matrix + o.texcoord0 = i.texcoord0; + + return o; + } + + // Fragment program + fixed4 frag(fragmentInput i) : COLOR + { + float4 color; + + if (i.texcoord0.x <= _Ratio) + { + color = tex2D(_MainTex, i.texcoord0) * _CompletedColor; + } + else + { + color = tex2D(_MainTex, i.texcoord0) * _RemainingColor; + } + + color.rgb = color.rgb * color.a; + + return color; + } + + ENDCG + } + } +} diff --git a/Assets/Shaders/RatioProgression/RatioProgression.shader.meta b/Assets/Shaders/RatioProgression/RatioProgression.shader.meta new file mode 100644 index 0000000..7b70031 --- /dev/null +++ b/Assets/Shaders/RatioProgression/RatioProgression.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: dc0fe2d53692d3a4288028f8d5372963 +timeCreated: 1434590948 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/RatioProgression/RatioProgressionMasked.shader b/Assets/Shaders/RatioProgression/RatioProgressionMasked.shader new file mode 100644 index 0000000..ac54858 --- /dev/null +++ b/Assets/Shaders/RatioProgression/RatioProgressionMasked.shader @@ -0,0 +1,96 @@ +// http://wiki.unity3d.com/index.php?title=Shader_Code + +Shader "Pat Shaders/RatioProgressionMasked" +{ + Properties + { + _CompletedColor ("Completed Tint", Color) = (0,0,0,0) + _RemainingColor ("Remaining Tint", Color) = (1,1,1,1) + + _MainTex ("Texture", 2D) = "white" {} + + _Ratio ("Ratio", Range(0,1)) = 0.5 + + // To avoid "Material doesn't have stencil properties" message + _Stencil ("Stencil Ref", Float) = 0 + } + + SubShader + { + // http://docs.unity3d.com/460/Documentation/Manual/SL-SubshaderTags.html + Tags + { + "Queue"="Transparent+2" + + } + + // http://docs.unity3d.com/Manual/SL-Blend.html + Blend One OneMinusSrcAlpha + + Pass + { + Stencil { + Ref 2 + Comp always + Pass replace + ZFail decrWrap + } + + CGPROGRAM + + #pragma vertex vert + #pragma fragment frag + + fixed4 _CompletedColor; + fixed4 _RemainingColor; + float _Ratio; + sampler2D _MainTex; + + // Data transferred from application to vertex program + struct vertexInput + { + float4 vertex : POSITION; + float2 texcoord0 : TEXCOORD0; // Normalized, from 0 to 1 + }; + + // Data transferred from vertex program to fragment program + struct fragmentInput + { + float4 position : SV_POSITION; + float2 texcoord0 : TEXCOORD0; // Normalized, from 0 to 1 + }; + + // Vertex program + fragmentInput vert(vertexInput i) + { + fragmentInput o; + + o.position = mul(UNITY_MATRIX_MVP, i.vertex); // Model*View*Projection matrix + o.texcoord0 = i.texcoord0; + + return o; + } + + // Fragment program + fixed4 frag(fragmentInput i) : COLOR + { + float4 color; + + if (i.texcoord0.x <= _Ratio) + { + color = tex2D(_MainTex, i.texcoord0) * _CompletedColor; + } + else + { + color = tex2D(_MainTex, i.texcoord0) * _RemainingColor; + } + + color.rgb = color.rgb * color.a; + + return color; + } + + ENDCG + } + } +} diff --git a/Assets/Shaders/RatioProgression/RatioProgressionMasked.shader.meta b/Assets/Shaders/RatioProgression/RatioProgressionMasked.shader.meta new file mode 100644 index 0000000..3eacb39 --- /dev/null +++ b/Assets/Shaders/RatioProgression/RatioProgressionMasked.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: a3a1c69b0135240439146d369cea2dbb +timeCreated: 1439704164 +licenseType: Free +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: