Merge branch 'master' of https://github.com/ConjureETS/DeathBook

Assets/Prefabs/PersonDetailsPanel.prefab

@@ -52,24 +52,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &113502
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
-  m_Component:
-  - 224: {fileID: 22474806}
-  - 222: {fileID: 22265720}
-  - 114: {fileID: 11443318}
-  - 114: {fileID: 11400492}
-  m_Layer: 5
-  m_Name: KillButton
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &119830
 GameObject:
   m_ObjectHideFlags: 1
@@ -136,18 +118,18 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &129332
+--- !u!1 &127300
 GameObject:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 4
   m_Component:
-  - 224: {fileID: 22442810}
+  - 224: {fileID: 22470860}
-  - 222: {fileID: 22228656}
+  - 222: {fileID: 22232160}
-  - 114: {fileID: 11499626}
+  - 114: {fileID: 11479644}
   m_Layer: 5
-  m_Name: Text
+  m_Name: FriendsTitle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -215,41 +197,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &151828
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
-  m_Component:
-  - 224: {fileID: 22448920}
-  - 222: {fileID: 22228460}
-  - 114: {fileID: 11494296}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!1 &157272
-GameObject:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 4
-  m_Component:
-  - 224: {fileID: 22432578}
-  - 222: {fileID: 22252258}
-  - 114: {fileID: 11445202}
-  - 114: {fileID: 11491412}
-  m_Layer: 5
-  m_Name: WatchButton
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &158220
 GameObject:
   m_ObjectHideFlags: 1
@@ -325,7 +272,7 @@ GameObject:
   - 222: {fileID: 22241654}
   - 114: {fileID: 11400246}
   m_Layer: 5
-  m_Name: FriendsTitle
+  m_Name: AwarenessTitle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -368,67 +315,14 @@ MonoBehaviour:
     m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 1
-    m_MinSize: 10
+    m_MinSize: 0
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 4
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Friends
+  m_Text: Awareness
---- !u!114 &11400492
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 113502}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1}
-    m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1}
-    m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814}
-    m_ColorMultiplier: 1
-    m_FadeDuration: .100000001
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 11443318}
-  m_OnClick:
-    m_PersistentCalls:
-      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
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -467,9 +361,9 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 0
   m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_NormalColor: {r: .309803933, g: .505882382, b: .741176486, a: 1}
     m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1}
     m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1}
     m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814}
@@ -489,7 +383,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 22417254}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: .999999702
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -508,7 +402,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: .309803933, g: .505882382, b: .741176486, a: 1}
   m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
@@ -538,48 +432,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &11443318
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 113502}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: .309803933, g: .505882382, b: .741176486, a: 1}
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
---- !u!114 &11445202
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 157272}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: .309803933, g: .505882382, b: .741176486, a: 1}
-  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
 --- !u!114 &11452870
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -598,7 +450,7 @@ MonoBehaviour:
   m_Elasticity: .100000001
   m_Inertia: 1
   m_DecelerationRate: .135000005
-  m_ScrollSensitivity: 10
+  m_ScrollSensitivity: 15
   m_HorizontalScrollbar: {fileID: 0}
   m_VerticalScrollbar: {fileID: 11414010}
   m_OnValueChanged:
@@ -671,10 +523,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   ProfilePicture: {fileID: 11440110}
   Name: {fileID: 11472562}
-  FriendsTitle: {fileID: 11400246}
+  FriendsTitle: {fileID: 11479644}
   FriendsPanel: {fileID: 159508}
-  KillButton: {fileID: 11400492}
-  WatchButton: {fileID: 11491412}
   XButton: {fileID: 11494666}
   Container: {fileID: 147852}
   AwarenessBar: {fileID: 11476856}
@@ -733,6 +583,32 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &11479644
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 127300}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1}
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 1
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Friends
 --- !u!114 &11479696
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -766,73 +642,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!114 &11491412
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 157272}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1}
-    m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1}
-    m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814}
-    m_ColorMultiplier: 1
-    m_FadeDuration: .100000001
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 11445202}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
---- !u!114 &11494296
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 151828}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1}
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 1
-    m_MinSize: 0
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: Watch
 --- !u!114 &11494666
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -886,32 +695,6 @@ MonoBehaviour:
         m_CallState: 2
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
---- !u!114 &11499626
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 129332}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1}
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 1
-    m_MinSize: 0
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: Kill
 --- !u!222 &22204826
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -936,18 +719,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 119830}
---- !u!222 &22228460
+--- !u!222 &22232160
 CanvasRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 151828}
+  m_GameObject: {fileID: 127300}
---- !u!222 &22228656
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 129332}
 --- !u!222 &22234000
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -978,18 +755,6 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 107780}
---- !u!222 &22252258
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 157272}
---- !u!222 &22265720
-CanvasRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 113502}
 --- !u!222 &22286240
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -1050,24 +815,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: -20, y: -20}
   m_Pivot: {x: .5, y: .5}
---- !u!224 &22432578
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 157272}
-  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: 22448920}
-  m_Father: {fileID: 22492032}
-  m_RootOrder: 0
-  m_AnchorMin: {x: .0700000003, y: .600000024}
-  m_AnchorMax: {x: .930000007, y: .920000017}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: .5, y: .5}
 --- !u!224 &22436630
 RectTransform:
   m_ObjectHideFlags: 1
@@ -1096,7 +843,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 22484756}
+  - {fileID: 22470860}
   - {fileID: 22464522}
   - {fileID: 22462244}
   m_Father: {fileID: 22475688}
@@ -1106,40 +853,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: .100000381, y: 0}
   m_Pivot: {x: .5, y: .5}
---- !u!224 &22442810
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 129332}
-  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: 22474806}
-  m_RootOrder: 0
-  m_AnchorMin: {x: 0, y: .25}
-  m_AnchorMax: {x: 1, y: .75}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: .5, y: .5}
---- !u!224 &22448920
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 151828}
-  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: 22432578}
-  m_RootOrder: 0
-  m_AnchorMin: {x: 0, y: .25}
-  m_AnchorMax: {x: 1, y: .75}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: .5, y: .5}
 --- !u!224 &22454288
 RectTransform:
   m_ObjectHideFlags: 1
@@ -1150,10 +863,10 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 22471300}
+  m_Father: {fileID: 22492032}
   m_RootOrder: 1
-  m_AnchorMin: {x: .465619415, y: 0}
+  m_AnchorMin: {x: 0, y: .432000011}
-  m_AnchorMax: {x: .857309759, y: 1}
+  m_AnchorMax: {x: 1, y: .705498219}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: .5, y: .5}
@@ -1227,6 +940,23 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: .5, y: .5}
+--- !u!224 &22470860
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 127300}
+  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: 22440948}
+  m_RootOrder: 0
+  m_AnchorMin: {x: 0, y: .800000012}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -7.62939453e-06, y: 0}
+  m_Pivot: {x: .5, y: .5}
 --- !u!224 &22471300
 RectTransform:
   m_ObjectHideFlags: 1
@@ -1238,7 +968,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 22456054}
-  - {fileID: 22454288}
   - {fileID: 22483690}
   - {fileID: 22486224}
   m_Father: {fileID: 22404366}
@@ -1248,24 +977,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -2.68453979}
   m_SizeDelta: {x: -13.571991, y: -2.64448547}
   m_Pivot: {x: .5, y: .5}
---- !u!224 &22474806
-RectTransform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 113502}
-  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: 22442810}
-  m_Father: {fileID: 22492032}
-  m_RootOrder: 1
-  m_AnchorMin: {x: .0700000003, y: .0799999982}
-  m_AnchorMax: {x: .930000007, y: .400000006}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: .5, y: .5}
 --- !u!224 &22475688
 RectTransform:
   m_ObjectHideFlags: 1
@@ -1296,9 +1007,9 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 22471300}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_AnchorMin: {x: .185000002, y: 0}
-  m_AnchorMax: {x: .450309694, y: .877516687}
+  m_AnchorMax: {x: .520412922, y: .877516687}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: .5, y: .5}
@@ -1312,7 +1023,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 22440948}
+  m_Father: {fileID: 22492032}
   m_RootOrder: 0
   m_AnchorMin: {x: 0, y: .800000012}
   m_AnchorMax: {x: 1, y: 1}
@@ -1331,7 +1042,7 @@ RectTransform:
   m_Children:
   - {fileID: 22489830}
   m_Father: {fileID: 22471300}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_AnchorMin: {x: .901000023, y: .546483397}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
@@ -1364,11 +1075,11 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 22432578}
+  - {fileID: 22484756}
-  - {fileID: 22474806}
+  - {fileID: 22454288}
   m_Father: {fileID: 22475688}
   m_RootOrder: 1
-  m_AnchorMin: {x: .660000026, y: 0}
+  m_AnchorMin: {x: .600000024, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}

Assets/Prefabs/PersonNode.prefab

@@ -17,6 +17,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &147480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 424146}
+  - 33: {fileID: 3395424}
+  - 23: {fileID: 2372840}
+  m_Layer: 0
+  m_Name: BloodSplatter
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!1 &176828
 GameObject:
   m_ObjectHideFlags: 1
@@ -27,8 +44,27 @@ GameObject:
   - 4: {fileID: 498100}
   - 33: {fileID: 3387390}
   - 23: {fileID: 2308108}
+  - 114: {fileID: 11422410}
   m_Layer: 0
-  m_Name: xQuad
+  m_Name: xMarkRight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &177472
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 476902}
+  - 33: {fileID: 3311720}
+  - 23: {fileID: 2315696}
+  - 114: {fileID: 11439868}
+  m_Layer: 0
+  m_Name: xMarkLeft
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -62,12 +98,37 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 193868}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -544.163269, y: -235.973114, z: 0}
+  m_LocalPosition: {x: -.133731544, y: -.756275117, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 424146}
   - {fileID: 496448}
   m_Father: {fileID: 0}
   m_RootOrder: 0
+--- !u!4 &424146
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 147480}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -.0109999999}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 410576}
+  m_RootOrder: 0
+--- !u!4 &476902
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 177472}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -.00999999978}
+  m_LocalScale: {x: 1.25, y: 1.25, z: 1}
+  m_Children: []
+  m_Father: {fileID: 496448}
+  m_RootOrder: 0
 --- !u!4 &496448
 Transform:
   m_ObjectHideFlags: 1
@@ -78,9 +139,10 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: -.00100000005}
   m_LocalScale: {x: .800000012, y: .800000012, z: 1}
   m_Children:
+  - {fileID: 476902}
   - {fileID: 498100}
   m_Father: {fileID: 410576}
-  m_RootOrder: 0
+  m_RootOrder: 1
 --- !u!4 &498100
 Transform:
   m_ObjectHideFlags: 1
@@ -89,17 +151,41 @@ Transform:
   m_GameObject: {fileID: 176828}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -.00999999978}
-  m_LocalScale: {x: 1.5, y: 1.5, z: 1}
+  m_LocalScale: {x: 1.25, y: 1.25, z: 1}
   m_Children: []
   m_Father: {fileID: 496448}
-  m_RootOrder: 0
+  m_RootOrder: 1
 --- !u!23 &2308108
 MeshRenderer:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 176828}
-  m_Enabled: 0
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 65515d5275108d64f993d24ce2e0e11d, 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!23 &2315696
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 177472}
+  m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_Materials:
@@ -165,6 +251,37 @@ MeshRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingOrder: 0
+--- !u!23 &2372840
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 147480}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_Materials:
+  - {fileID: 2100000, guid: 8c192887af84c6d489323981a0248291, 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!33 &3311720
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 177472}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!33 &3312470
 MeshFilter:
   m_ObjectHideFlags: 1
@@ -186,6 +303,13 @@ MeshFilter:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 176828}
   m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!33 &3395424
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 147480}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!54 &5464416
 Rigidbody:
   m_ObjectHideFlags: 1
@@ -241,7 +365,32 @@ MonoBehaviour:
   MiddleColor: {r: 1, g: .921568632, b: .0156862754, a: 1}
   EndColor: {r: 1, g: 0, b: 0, a: 1}
   internQuad: {fileID: 2363438}
-  xQuad: {fileID: 2308108}
+  KillHoldDuration: 2
+  xMarkLeft: {fileID: 11439868}
+  xMarkRight: {fileID: 11422410}
+  bloodSplatter: {fileID: 2372840}
+--- !u!114 &11422410
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 176828}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 51e725985a0e317458c006132d935c25, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &11439868
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 177472}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 51e725985a0e317458c006132d935c25, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &100100000
 Prefab:
   m_ObjectHideFlags: 1

Assets/Resources/Materials/BloodSplatter.mat

@@ -0,0 +1,165 @@
+%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: BloodSplatter
+  m_Shader: {fileID: 32, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 5
+  m_CustomRenderQueue: -1
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 2800000, guid: 53b43f40f83eccf429bfd482f09effb1, 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: _Cutoff
+        second: .5
+      data:
+        first:
+          name: _Shininess
+        second: .257999986
+      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: _Ratio
+        second: 0
+    m_Colors:
+      data:
+        first:
+          name: _EmissionColor
+        second: {r: 0, g: 0, b: 0, a: 0}
+      data:
+        first:
+          name: _Color
+        second: {r: 1, g: 1, b: 1, a: 1}
+      data:
+        first:
+          name: _SpecColor
+        second: {r: .5, g: .5, b: .5, a: 0}
+      data:
+        first:
+          name: _EmissionColorUI
+        second: {r: 1, g: 1, b: 1, a: 1}
+      data:
+        first:
+          name: _CompletedColor
+        second: {r: 0, g: 0, b: 0, a: 0}
+      data:
+        first:
+          name: _RemainingColor
+        second: {r: 1, g: 1, b: 1, a: 1}

Assets/Resources/Materials/BloodSplatter.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8c192887af84c6d489323981a0248291
+timeCreated: 1439745852
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Materials/BloodSplatter.png.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 53b43f40f83eccf429bfd482f09effb1
+timeCreated: 1439745776
+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: 0
+  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: 1
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Materials/externQuad.mat

@@ -2,7 +2,7 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
@@ -11,7 +11,6 @@ Material:
   m_ShaderKeywords: 
   m_LightmapFlags: 5
   m_CustomRenderQueue: -1
-  stringTagMap: {}
   m_SavedProperties:
     serializedVersion: 2
     m_TexEnvs:
@@ -79,6 +78,10 @@ Material:
           m_Scale: {x: 1, y: 1}
           m_Offset: {x: 0, y: 0}
     m_Floats:
+      data:
+        first:
+          name: _Cutoff
+        second: .5
       data:
         first:
           name: _SrcBlend
@@ -87,10 +90,6 @@ Material:
         first:
           name: _DstBlend
         second: 0
-      data:
-        first:
-          name: _Cutoff
-        second: .5
       data:
         first:
           name: _Parallax
@@ -119,6 +118,10 @@ Material:
         first:
           name: _UVSec
         second: 0
+      data:
+        first:
+          name: _EmissionScaleUI
+        second: 0
       data:
         first:
           name: _Mode
@@ -127,6 +130,10 @@ Material:
         first:
           name: _Metallic
         second: 0
+      data:
+        first:
+          name: _Ratio
+        second: .5
     m_Colors:
       data:
         first:
@@ -136,3 +143,15 @@ Material:
         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: 0, g: 0, b: 0, a: 0}
+      data:
+        first:
+          name: _RemainingColor
+        second: {r: 1, g: 1, b: 1, a: 1}

Assets/Resources/Materials/xMarkLeft.mat

@@ -2,16 +2,15 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  m_Name: xMark
+  m_Name: xMarkLeft
-  m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: bb0f298d1fd9ff24c8aed06d334c0b1f, type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 5
   m_CustomRenderQueue: -1
-  stringTagMap: {}
   m_SavedProperties:
     serializedVersion: 2
     m_TexEnvs:
@@ -19,7 +18,7 @@ Material:
         first:
           name: _MainTex
         second:
-          m_Texture: {fileID: 2800000, guid: 84643d1735e87de44889f90b3540c999, type: 3}
+          m_Texture: {fileID: 2800000, guid: efd71283395b4f7468fd7cd652d22155, type: 3}
           m_Scale: {x: 1, y: 1}
           m_Offset: {x: 0, y: 0}
       data:
@@ -79,6 +78,10 @@ Material:
           m_Scale: {x: 1, y: 1}
           m_Offset: {x: 0, y: 0}
     m_Floats:
+      data:
+        first:
+          name: _Cutoff
+        second: .5
       data:
         first:
           name: _SrcBlend
@@ -87,10 +90,6 @@ Material:
         first:
           name: _DstBlend
         second: 0
-      data:
-        first:
-          name: _Cutoff
-        second: .5
       data:
         first:
           name: _Parallax
@@ -127,6 +126,10 @@ Material:
         first:
           name: _Metallic
         second: 0
+      data:
+        first:
+          name: _Ratio
+        second: 0
     m_Colors:
       data:
         first:
@@ -136,3 +139,11 @@ Material:
         first:
           name: _Color
         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: 1, g: 1, b: 1, a: 0}

Assets/Resources/Materials/xMarkLeft.png.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: efd71283395b4f7468fd7cd652d22155
+timeCreated: 1439738572
+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: 1
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Materials/xMarkRight.mat

@@ -0,0 +1,149 @@
+%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: xMarkRight
+  m_Shader: {fileID: 4800000, guid: b0aba77b532f48a48b23f8b41fbe3bcd, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 5
+  m_CustomRenderQueue: -1
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 2800000, guid: 0fd4daec51f3afd48a2410f5fe9a02af, 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: _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: _Mode
+        second: 0
+      data:
+        first:
+          name: _Metallic
+        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: _CompletedColor
+        second: {r: 1, g: 1, b: 1, a: 1}
+      data:
+        first:
+          name: _RemainingColor
+        second: {r: 1, g: 1, b: 1, a: 0}

Assets/Resources/Materials/xMarkRight.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 65515d5275108d64f993d24ce2e0e11d
+timeCreated: 1439740902
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Materials/xMarkRight.png.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 0fd4daec51f3afd48a2410f5fe9a02af
+timeCreated: 1439738554
+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: 1
+  textureType: 0
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/TextFiles.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: c91f8e405df42f74e880b3973908352f
+folderAsset: yes
+timeCreated: 1439749971
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/TextFiles/MenNames.txt.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f1f6e2863779cb1479023150ff18fd79
+timeCreated: 1439750276
+licenseType: Free
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/TextFiles/WomenNames.txt.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ee73b21cee1c9d040888f275acce66fd
+timeCreated: 1439750222
+licenseType: Free
+TextScriptImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Gameplay.unity

@@ -241,6 +241,168 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: .5, y: .5}
+--- !u!1001 &255508666
+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: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_Size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 22492032, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22492032, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22492032, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22492032, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMax.x
+      value: .400000006
+      objectReference: {fileID: 0}
+    - target: {fileID: 22440948, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 22440948, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22440948, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_SizeDelta.x
+      value: -7.62939453e-06
+      objectReference: {fileID: 0}
+    - target: {fileID: 22440948, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMin.x
+      value: .462000012
+      objectReference: {fileID: 0}
+    - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMax.x
+      value: .831619442
+      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_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMin.y
+      value: .30400002
+      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.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_AnchorMax.y
+      value: .720465124
+      objectReference: {fileID: 0}
+    - target: {fileID: 11472562, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_FontData.m_Alignment
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 11479644, guid: c993e87661906234fba410e55ed66832, type: 2}
+      propertyPath: m_FontData.m_Alignment
+      value: 4
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &268520029
 GameObject:
   m_ObjectHideFlags: 0
@@ -772,138 +934,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_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: 11452870, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_ScrollSensitivity
-      value: 15
-      objectReference: {fileID: 0}
-    - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Colors.m_NormalColor.r
-      value: .309803933
-      objectReference: {fileID: 0}
-    - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Colors.m_NormalColor.g
-      value: .505882382
-      objectReference: {fileID: 0}
-    - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Colors.m_NormalColor.b
-      value: .741176486
-      objectReference: {fileID: 0}
-    - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Transition
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 11431992, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Color.r
-      value: .309803933
-      objectReference: {fileID: 0}
-    - target: {fileID: 11431992, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Color.g
-      value: .505882382
-      objectReference: {fileID: 0}
-    - target: {fileID: 11431992, guid: c993e87661906234fba410e55ed66832, type: 2}
-      propertyPath: m_Color.b
-      value: .741176486
-      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: 255508666}
 --- !u!114 &1197925315 stripped
 MonoBehaviour:
   m_PrefabParentObject: {fileID: 11476684, guid: c993e87661906234fba410e55ed66832,
     type: 2}
-  m_PrefabInternal: {fileID: 1197925313}
+  m_PrefabInternal: {fileID: 255508666}
   m_Script: {fileID: 11500000, guid: 88fb1885d6f8fd6409e3866b7707a12a, type: 3}
 --- !u!1 &1366676552
 GameObject:
@@ -1064,7 +1104,7 @@ RectTransform:
   m_Father: {fileID: 122634401}
   m_RootOrder: 0
   m_AnchorMin: {x: 0, y: .367000014}
-  m_AnchorMax: {x: .455000013, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: -1.90734863e-06}
   m_SizeDelta: {x: 0, y: -3.81469727e-06}
   m_Pivot: {x: .5, y: .5}
@@ -1338,6 +1378,126 @@ Prefab:
       propertyPath: DetailsPanel
       value: 
       objectReference: {fileID: 1197925315}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.awarenessChange.friendRatio.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.awarenessChange.friendRatio.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.awarenessChange.friendRatio.z
+      value: .200000003
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.awarenessChange.lastDeath.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.deathNoticing.popularity.x
+      value: .100000001
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.deathNoticing.importance.x
+      value: .100000001
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.deathNoticing.numFriends.x
+      value: .100000001
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.deathNoticing.awareness.x
+      value: .100000001
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.chanceToPost.popularity.x
+      value: .100000001
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.chanceToPost.importance.x
+      value: .100000001
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.chanceToPost.frequency.x
+      value: .100000001
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.awarenessChange.lastDeath.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.deathNoticing.popularity.y
+      value: .899999976
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.deathNoticing.importance.y
+      value: .899999976
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.deathNoticing.numFriends.y
+      value: .899999976
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.deathNoticing.awareness.y
+      value: .899999976
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.chanceToPost.popularity.y
+      value: .899999976
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.chanceToPost.importance.y
+      value: .899999976
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.chanceToPost.frequency.y
+      value: .899999976
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.awarenessChange.lastDeath.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.deathNoticing.popularity.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.deathNoticing.importance.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.deathNoticing.numFriends.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.deathNoticing.awareness.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.chanceToPost.popularity.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.chanceToPost.importance.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: strategy.chanceToPost.frequency.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: levelOptions.NumPeople
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: levelOptions.AvgNumFriends
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
+      propertyPath: levelOptions.FriendshipLikeliness
+      value: .600000024
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
   m_IsPrefabParent: 0

Assets/Scripts/Models/Friendship.cs

@@ -40,6 +40,9 @@ namespace DeathBook.Model
 
 			//This function is only called when friend is dead
 			//awareness = Mathf.Min(awareness + deltaTime * CalculateWeight(), 1);
+
+			link.Awareness += Self.Strategy.GetDeathNoticing(1f /*Friend.Popularity*/, Link.Importance, Self.FriendCount, Self.AwarenessLevel);
+
 			link.Awareness = Mathf.Min(link.Awareness + deltaTime * 0.1f, 1f);
 			if (link.Awareness >= 1f)
 			{
@@ -48,17 +51,6 @@ namespace DeathBook.Model
 			}
 		}
 
-		//returns a number between 0 and 1
-		private float CalculateWeight()
-		{
-			float weight = 0;
-
-			weight += link.Importance;
-			//weight += friend.TimeBetweenPosts;
-
-			return weight * 0.1f;
-		}
-
         public int CompareTo(Friendship other)
         {
             int value = 0;
@@ -74,10 +66,5 @@ namespace DeathBook.Model
 
             return value;
         }
-
-		/*internal enum Knowledge
-		{
-			Alive, Doubt, Dead
-		}*/
 	}
 }

Assets/Scripts/Models/GameStrategy.cs

@@ -0,0 +1,86 @@
+using UnityEngine;
+using System.Collections;
+using System.Collections.Generic;
+using System;
+
+namespace DeathBook.Model
+{
+	[System.Serializable]
+	public class GameStrategy
+	{
+		[System.Serializable]
+		public class AwarenessChangeOptions
+		{
+			public Vector3 friendRatio = new Vector3();
+			public Vector3 lastDeath = new Vector3();
+			public float maxDeathDuration = 24 * 60 * 7;
+		}
+		
+		[System.Serializable]
+		public class DeathNoticingOptions
+		{
+			public Vector3 popularity = new Vector3();
+			public Vector3 importance = new Vector3();
+			public Vector3 numFriends = new Vector3();
+			public Vector3 awareness = new Vector3();
+		}
+		
+		[System.Serializable]
+		public class ChanceToPostOptions
+		{
+			public Vector3 popularity = new Vector3();
+			public Vector3 importance = new Vector3();
+			public Vector3 frequency = new Vector3();
+		}
+
+
+		public AwarenessChangeOptions awarenessChange = new AwarenessChangeOptions();
+		public DeathNoticingOptions deathNoticing = new DeathNoticingOptions();
+		public ChanceToPostOptions chanceToPost = new ChanceToPostOptions();
+
+		public float GetAwarenessChange(int numDeadFriends, int numAliveFriends, int sinceLastDeath)
+		{
+			float friendsRatioInd = numAliveFriends == 0 ? 1 : GetValue(Mathf.Min(numDeadFriends / numAliveFriends, 1), awarenessChange.friendRatio);
+			
+			float max = awarenessChange.maxDeathDuration;
+			float lastDeathInd = GetValue(1 - Mathf.Min(sinceLastDeath, max) / max, awarenessChange.lastDeath);
+
+			//Debug.Log(lastDeathInd + "    " + friendsRatioInd);
+			
+			return Mathf.Clamp(friendsRatioInd * lastDeathInd, 0, 1);
+		}
+
+		public float GetDeathNoticing(float friendPopularity, float friendshipImportance, int numAliveFriends, float awareness)
+		{
+			float popularityInd = GetValue(friendPopularity, deathNoticing.popularity);
+
+			float importanceInd = GetValue(friendshipImportance, deathNoticing.importance);
+
+			//TODO Should be inverse and there should be an expected number of friends
+			float aliveFriendsInd = GetValue(numAliveFriends, deathNoticing.numFriends);
+
+			float awarenessInd = GetValue(awareness, deathNoticing.awareness);
+
+			return Mathf.Clamp(popularityInd * importanceInd * aliveFriendsInd * awarenessInd, 0, 1); 
+		}
+
+		public float GetChanceToPost(float friendPopularity, float friendshipImportance)
+		{
+			float popularityInd = GetValue(1 - friendPopularity, deathNoticing.popularity);
+
+			float importanceInd = GetValue(1 - friendshipImportance, deathNoticing.importance);
+
+			return Mathf.Clamp(popularityInd * importanceInd, 0, 1); 
+		}
+
+		public float GetChanceToRead()
+		{
+			return 0;
+		}
+
+		private float GetValue(float data, Vector3 modifier)
+		{
+			return Mathf.Clamp(modifier[0] + modifier[1] * data, 0, 1) * modifier[2];
+		}
+	}
+}

Assets/Scripts/Models/GameStrategy.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 9885183170e38dc418850b2e911f4cfe
+timeCreated: 1439717430
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Models/Level.cs

@@ -28,10 +28,41 @@ namespace DeathBook.Model
 		public float GlobalAwareness { get { return globalAwareness; } }
         public int tutorialInt = 0;
 
-		public Level(List<Person> people, List<FriendshipLink> friendships)
+		private GameStrategy strategy = null;
+		public GameStrategy Strategy { get { return strategy; } }
+
+		private int numAlive;
+		public int NumAlive { get { return numAlive; } set { numAlive = value; NotifyObservers(); } }
+
+		private int numDead;
+		public int NumDead { get { return numDead; } set { numDead = value; NotifyObservers(); } }
+
+		private float awareness;
+		public float Awareness { get { return awareness; } set { awareness = value; NotifyObservers(); } }
+
+
+		public Level(List<Person> people, List<FriendshipLink> friendships, GameStrategy strategy)
 		{
 			this.people = people;
 			this.friendships = friendships;
+			this.strategy = strategy;
+			this.numAlive = people.Count;
+			this.numDead = 0;
+			this.awareness = 0;
+		}
+
+		public void RegisterKill(Person p)
+		{
+			numDead++;
+			numAlive--;
+			Awareness = (Awareness * (NumAlive + 1) - p.AwarenessLevel) / NumAlive;
+			Debug.Log("Killed - " + p.AwarenessLevel + " nK = " + numAlive);
+		}
+
+		public void AddAwareness(float addition)
+		{
+			Awareness += addition / NumAlive;
+			Debug.Log("Added - " + addition + " nK = " + numAlive);
 		}
 
 		public void Update(float deltaTime)
@@ -43,8 +74,6 @@ namespace DeathBook.Model
 				lastHour = hour;
 				NotifyObservers();
 			}
-
-			//TODO Global awareness - start trends
 		}
 	}
 }

Assets/Scripts/Models/LevelGenerator.cs

@@ -13,7 +13,7 @@ namespace DeathBook.Model
 		private const float minConnTime = 3;
 		private const float maxConnTime = 20;
 
-		public Level GenerateLevel(int numPeople, int avgFriends, float probability, float radius)
+		public Level GenerateLevel(int numPeople, int avgFriends, float probability, float radius, GameStrategy strategy)
 		{
 			this.numPeople = numPeople;
 			this.avgConnections = avgFriends;
@@ -23,7 +23,7 @@ namespace DeathBook.Model
 			List<Person> people = CreatePeople();
 			List<FriendshipLink> friendships = CreateFriendships(people);
 
-			return new Level(people, friendships);
+			return new Level(people, friendships, strategy);
 		}
 
 		private List<Person> CreatePeople()
@@ -141,12 +141,13 @@ namespace DeathBook.Model
 
 			bool isFemale = Random.value <= 0.5;
 			
+            /*
 			string fName = "Fifi"; //isFemale ? NameGenerator.GetFemaleName() : NameGenerator.GetMaleName();
-			string lName = "Brindacier"; //NameGenerator.GetLastName();
+			string lName = "Brindacier"; //NameGenerator.GetLastName();*/
 
-			Sprite pic = isFemale ? PictureGenerator.GetFemalePicture() : PictureGenerator.GetMalePicture();
+            var generatedPerson = isFemale ? PersonGenerator.GetGeneratedFemale() : PersonGenerator.GetGeneratedMale();
 
-			Person p = new Person(id, fName, lName, pos, connectionTime, disconnectionTime, freq, pic);
+            Person p = new Person(id, generatedPerson.FirstName, generatedPerson.LastName, pos, connectionTime, disconnectionTime, freq, generatedPerson.Picture);
 
 			return p;
 		}

Assets/Scripts/Models/LevelManager.cs

@@ -15,9 +15,9 @@ namespace DeathBook.Model
 
 		private LevelManager() {}
 
-		public void NewLevel(int numPeople, int avgFriends, float probability, float radius)
+		public Level NewLevel(int numPeople, int avgFriends, float probability, float radius, GameStrategy strategy)
 		{
-			level = gen.GenerateLevel(numPeople, avgFriends, probability, radius);
+			return level = gen.GenerateLevel(numPeople, avgFriends, probability, radius, strategy);
 		}
 	}
 }

Assets/Scripts/Models/NameParser.cs

@@ -0,0 +1,58 @@
+using UnityEngine;
+using System.Collections;
+using System.Collections.Generic;
+using SimpleJSON;
+
+// Names generated from http://www.uinames.com
+public class NameParser : MonoBehaviour
+{
+    private string[] maleFirstNames;
+    private string[] femaleFirstNames;
+
+    private string[] maleLastNames;
+    private string[] femaleLastNames;
+
+    public NameParser(int count)
+    {
+        maleFirstNames = new string[count];
+        femaleFirstNames = new string[count];
+
+        maleLastNames = new string[count];
+        femaleLastNames = new string[count];
+
+        TextAsset femaleJson = Resources.Load("TextFiles/WomenNames") as TextAsset;
+        TextAsset maleJson = Resources.Load("TextFiles/MenNames") as TextAsset;
+
+        var parsedFemales = JSON.Parse(femaleJson.text);
+        var parsedMales = JSON.Parse(maleJson.text);
+
+        for (int i = 0; i < count; i++)
+        {
+            femaleFirstNames[i] = parsedFemales[i]["name"];
+            femaleLastNames[i] = parsedFemales[i]["surname"];
+
+            maleFirstNames[i] = parsedMales[i]["name"];
+            maleLastNames[i] = parsedMales[i]["surname"];
+        }
+    }
+
+    public string GetFemaleFirstName(int index)
+    {
+        return femaleFirstNames[index];
+    }
+
+    public string GetMaleFirstName(int index)
+    {
+        return maleFirstNames[index];
+    }
+
+    public string GetFemaleLastName(int index)
+    {
+        return femaleLastNames[index];
+    }
+
+    public string GetMaleLastName(int index)
+    {
+        return maleLastNames[index];
+    }
+}

Assets/Scripts/Models/NameParser.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: cb64766bc3173cc479631225a688a263
+timeCreated: 1439750059
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Models/Person.cs

@@ -37,7 +37,17 @@ namespace DeathBook.Model
 		public int DisconnectionTime { get { return disconnectionTime; } }
 
 		private float awarenessLevel = 0; //on a scale from 0 to 1
-		public float AwarenessLevel { get { return awarenessLevel; } }
+		public float AwarenessLevel { get { return awarenessLevel; }
+			set
+			{
+				float change = value - awarenessLevel;
+				awarenessLevel = value;
+				LevelManager.Instance.GameLevel.AddAwareness(change);
+			}
+		}
+
+		private int lastFriendDeath = 0;
+		public int LastFriendDeath { get { return lastFriendDeath; } }
 
 		private bool alive = true;
 		public bool Alive { get { return alive; } }
@@ -51,6 +61,17 @@ namespace DeathBook.Model
 		private Action onSelected;
 		public Action OnSelected {get {return onSelected;} set { onSelected = value; } }
 
+		private GameStrategy strategy;
+		public GameStrategy Strategy
+		{
+			get
+			{
+				if (strategy == null)
+					strategy = LevelManager.Instance.GameLevel.Strategy;
+				return strategy;
+			}
+		}
+
 		public Person(int id, string fName, string lName, Vector3 pos, int conn, int disconn, float freq, Sprite pic)
 		{
 			this.id = id;
@@ -59,7 +80,7 @@ namespace DeathBook.Model
 			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));
+			//Debug.Log("I am " + id + " and I connect at " + Utils.GetTimeString(connectionTime) + " until " + Utils.GetTimeString(disconnectionTime));
 			this.postFrequency = freq;
 			this.picture = pic;
 
@@ -75,7 +96,7 @@ namespace DeathBook.Model
 
 		public void NotifyFriendWasKilled(Friendship f)
 		{
-			Debug.Log("I am " + id + " and my friend " + f.Friend.Id + " was killed");
+			//Debug.Log("I am " + id + " and my friend " + f.Friend.Id + " was killed");
 			numAliveFriends--;
 			numDeadFriends++;
 			deadFriendsList.Add(f);
@@ -86,22 +107,30 @@ namespace DeathBook.Model
 			if (Online)
 				return false;
 
-			Debug.Log("Person " + id + " died!");
+			//Debug.Log("Person " + id + " died!");
 			alive = false;
 			foreach (Friendship f in friendsList)
 				f.Other.NotifyFriendWasKilled();
 			NotifyObservers();
 
+			LevelManager.Instance.GameLevel.RegisterKill(this);
+
 			return true;
 		}
 
 		public void NoticeDeath(Friendship f)
 		{
-			//TODO apply more rules here
+			int deathTime = LevelManager.Instance.GameLevel.GameTime;
-			awarenessLevel = Mathf.Min(AwarenessLevel + 0.2f, 1f);
+			int sinceLastDeath = numDeadFriends == 0 ? int.MaxValue/2 : deathTime - lastFriendDeath;
-			Debug.Log("I am " + id + " and I know my friend " + f.Friend.Id + " was killed.. " + AwarenessLevel);
+
-			//TODO remove from dead friends list to accelerate
+			float strategyOutput = Strategy.GetAwarenessChange(numDeadFriends, numAliveFriends, sinceLastDeath);
+
+			AwarenessLevel = Mathf.Min(AwarenessLevel + strategyOutput, 1f);
+
 			NotifyObservers();
+
+			
+			//Debug.Log("I am " + id + " and I know my friend " + f.Friend.Id + " was killed.. " + strategyOutput);
 		}
 
 		//Time in hours
@@ -114,6 +143,9 @@ namespace DeathBook.Model
 
 		public void Update(float deltaTime)
 		{
+			if (!Alive)
+				return;
+
 			int time = LevelManager.Instance.GameLevel.DayTime;
 
 			bool isOnline = IsOnline(time);
@@ -137,4 +169,4 @@ namespace DeathBook.Model
 			}
 		}
 	}
-}
+}

Assets/Scripts/Models/PersonGenerator.cs

@@ -0,0 +1,77 @@
+using UnityEngine;
+using System.Collections;
+using System.Collections.Generic;
+using System;
+
+// Pictures generated from http://uifaces.com
+public class PersonGenerator
+{
+    private const int PICTURES_COUNT = 185;
+
+    private static List<int> pictureIndexesMale;
+    private static List<int> pictureIndexesFemale;
+
+    private static NameParser nameParser;
+
+    public struct GeneratedPerson
+    {
+        public Sprite Picture;
+        public string FirstName;
+        public string LastName;
+    }
+
+    static PersonGenerator()
+    {
+        nameParser = new NameParser(PICTURES_COUNT);
+
+        // Might be a little heavy, but since it's only done once, it's not that bad
+        pictureIndexesMale = new List<int>(PICTURES_COUNT);
+        pictureIndexesFemale = new List<int>(PICTURES_COUNT);
+
+        for (int i = 1; i <= PICTURES_COUNT; i++)
+        {
+            pictureIndexesFemale.Add(i);
+            pictureIndexesMale.Add(i);
+        }
+    }
+
+    public static GeneratedPerson GetGeneratedFemale()
+    {
+        // Might be a little heavy, but since it's only done once, it's not that bad
+
+        int index = UnityEngine.Random.Range(0, pictureIndexesFemale.Count);
+
+        int picID = pictureIndexesFemale[index];
+
+        pictureIndexesFemale.RemoveAt(index);
+
+        GeneratedPerson person = new GeneratedPerson()
+        {
+            Picture = Resources.Load<Sprite>(String.Format("ProfilePictures/F_{0}", picID)),
+            FirstName = nameParser.GetFemaleFirstName(index),
+            LastName = nameParser.GetFemaleLastName(index)
+        };
+
+        return person;
+    }
+
+    public static GeneratedPerson GetGeneratedMale()
+    {
+        // Might be a little heavy, but since it's only done once, it's not that bad
+
+        int index = UnityEngine.Random.Range(0, pictureIndexesMale.Count);
+
+        int picID = pictureIndexesMale[index];
+
+        pictureIndexesMale.RemoveAt(index);
+
+        GeneratedPerson person = new GeneratedPerson()
+        {
+            Picture = Resources.Load<Sprite>(String.Format("ProfilePictures/M_{0}", picID)),
+            FirstName = nameParser.GetMaleFirstName(index),
+            LastName = nameParser.GetMaleLastName(index)
+        };
+
+        return person;
+    }
+}

Assets/Scripts/Models/PictureGenerator.cs

@@ -1,52 +0,0 @@
-using UnityEngine;
-using System.Collections;
-using System.Collections.Generic;
-using System;
-
-//www.uifaces.com
-public class PictureGenerator
-{
-    private const int PICTURES_COUNT = 185;
-
-    private static List<int> pictureIndexesMale;
-    private static List<int> pictureIndexesFemale;
-
-    static PictureGenerator()
-    {
-        // Might be a little heavy, but since it's only done once, it's not that bad
-        pictureIndexesMale = new List<int>(PICTURES_COUNT);
-        pictureIndexesFemale = new List<int>(PICTURES_COUNT);
-
-        for (int i = 0; i < PICTURES_COUNT; i++)
-        {
-            pictureIndexesFemale.Add(i);
-            pictureIndexesMale.Add(i);
-        }
-    }
-
-    public static Sprite GetFemalePicture()
-    {
-        // Might be a little heavy, but since it's only done once, it's not that bad
-
-        int index = UnityEngine.Random.Range(1, pictureIndexesFemale.Count);
-
-        int picID = pictureIndexesFemale[index];
-
-        pictureIndexesFemale.RemoveAt(index);
-
-        return Resources.Load<Sprite>(String.Format("ProfilePictures/F_{0}", picID));
-    }
-
-    public static Sprite GetMalePicture()
-    {
-        // Might be a little heavy, but since it's only done once, it's not that bad
-
-        int index = UnityEngine.Random.Range(1, pictureIndexesMale.Count);
-
-        int picID = pictureIndexesMale[index];
-
-        pictureIndexesMale.RemoveAt(index);
-
-        return Resources.Load<Sprite>(String.Format("ProfilePictures/M_{0}", picID));
-    }
-}

Assets/Scripts/NetworkingSphere.cs

@@ -7,6 +7,7 @@ public class NetworkingSphere : MonoBehaviour
 {
 	public GameObjectsOptions gameObjects = new GameObjectsOptions();
 	public LevelOptions levelOptions = new LevelOptions();
+	public GameStrategy strategy = new GameStrategy();
 	private NetworkDisconnection sphere;
 
 	[System.Serializable]
@@ -47,8 +48,7 @@ public class NetworkingSphere : MonoBehaviour
     void Awake()
     {
 		manager = LevelManager.Instance;
-		manager.NewLevel(levelOptions.NumPeople, levelOptions.AvgNumFriends, levelOptions.FriendshipLikeliness, levelOptions.SphereRadius);
+		Level lvl = manager.NewLevel(levelOptions.NumPeople, levelOptions.AvgNumFriends, levelOptions.FriendshipLikeliness, levelOptions.SphereRadius, strategy);
-		Level lvl = manager.GameLevel;
 
         InstantiateNodes(lvl);
         AssignLinks(lvl);
@@ -59,6 +59,7 @@ public class NetworkingSphere : MonoBehaviour
 	{
 		int time = manager.GameLevel.DayTime;
 		GUI.Button(new Rect(50, 50, 100, 40), Utils.GetTimeString(time));
+		GUI.Button(new Rect(160, 50, 100, 40), manager.GameLevel.Awareness + "");
 	}
 
     void Update()
@@ -149,15 +150,18 @@ public class NetworkingSphere : MonoBehaviour
 
     private void OnNodeClicked(PersonNode node)
     {
+        rb.angularVelocity = Vector3.zero;
+
         if (_selectedNode != null)
         {
             _selectedNode.Select(false);
         }
 
-        if (_selectedNode != node)
+        if (!_isRotatingTowardsNode || node != _selectedNode)
         {
             FocusOnNode(node);
         }
+        
 
         /*
         if (_timeSinceLastClick < 0.5f && node == _selectedNode)

Assets/Scripts/PersonDetailsPanel.cs

@@ -11,8 +11,6 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver
     public Text Name;
     public Text FriendsTitle;
     public GameObject FriendsPanel;
-    public Button KillButton;
-    public Button WatchButton;
     public Button XButton;
     public GameObject Container;
     public RatioProgression AwarenessBar;
@@ -54,9 +52,6 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver
     {
         Name.text = _model.Name;
 
-        KillButton.gameObject.SetActive(_model.Alive);
-        WatchButton.gameObject.SetActive(_model.Alive);
-
         AwarenessBar.SetCompletedRatio(_model.AwarenessLevel);
 
         foreach (Transform picture in FriendsPanel.transform)
@@ -65,28 +60,37 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver
         }
 
         ProfilePicture.sprite = _model.Picture;
-        
-        RectTransform panelTrans = FriendsPanel.GetComponent<RectTransform>();
-
-        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;
 
         // We copy the list so we can sort it without affecting the model data
         List<Friendship> list = new List<Friendship>(_model.FriendList);
         list.Sort();
 
-        FriendsTitle.text = string.Concat("Friends (", list.Count, ")");
+        int aliveCount = list.Count - _model.DeadFriendList.Count;
+
+        RectTransform panelTrans = FriendsPanel.GetComponent<RectTransform>();
+
+        panelTrans.anchorMin = new Vector2(0f, 1f - 0.4f * aliveCount);
+        panelTrans.anchorMax = new Vector2(1f, 1f);
+        panelTrans.offsetMin = Vector2.zero;
+        panelTrans.offsetMax = Vector2.zero;
+
+        float height = 1f / aliveCount;
+
+        FriendsTitle.text = string.Concat("Friends (", aliveCount, ")");
+
+        int index = 0;
 
         for (int i = 0; i < list.Count; i++)
         {
             Person friend = list[i].Friend;
+            
+            if (!friend.Alive)
+            {
+                continue;
+            }
 
-            float minY = 1f - (height - 0.01f) * (i + 1) - i * 0.01f;
+            float minY = 1f - (height - 0.01f) * (index + 1) - index * 0.01f;
-            float maxY = 1f - height * i;
+            float maxY = 1f - height * index;
 
             // Friend picture
             UIFriendPicture friendPicture = Instantiate(FriendPicture) as UIFriendPicture;
@@ -111,6 +115,8 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver
             barRectTrans.anchorMax = new Vector2(1f, maxY);
             barRectTrans.offsetMin = Vector2.zero;
             barRectTrans.offsetMax = Vector2.zero;
+
+            ++index;
         }
     }
 
@@ -119,9 +125,4 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver
         Container.SetActive(false);
         _node.Select(false);
     }
-
-    public void KillNode()
-    {
-        _node.Kill();
-    }
 }

Assets/Scripts/PersonNode.cs

@@ -20,7 +20,10 @@ public class PersonNode : MonoBehaviour, IObserver
     public Color EndColor = Color.red;
 
     public Renderer internQuad;
-    public Renderer xQuad;
+    public float KillHoldDuration = 2f;
+    public RatioProgression xMarkLeft;
+    public RatioProgression xMarkRight;
+    public Renderer bloodSplatter;
 
     private List<Link> _links;
     private bool _highlighted = false;
@@ -30,6 +33,8 @@ public class PersonNode : MonoBehaviour, IObserver
     private Renderer _renderer;
     private Transform _transform;
 
+    private float _holdDuration;
+
     public Person Model
     {
         get { return _model; }
@@ -99,9 +104,48 @@ public class PersonNode : MonoBehaviour, IObserver
 
 	public void Kill()
 	{
-		_model.Kill();
+        if (_model.Kill())
+        {
+            StartCoroutine(SplashBlood());
+        }
 	}
 
+    private IEnumerator SplashBlood()
+    {
+        bloodSplatter.gameObject.SetActive(true);
+
+        float ratio = 0f;
+
+        Vector3 finalScale = Vector3.one * 1.7f;
+
+        while (ratio < 1f)
+        {
+            ratio += Time.deltaTime / 0.4f;
+
+            bloodSplatter.transform.localScale = Vector3.Lerp(Vector3.zero, finalScale, ratio);
+
+            yield return null;
+        }
+
+        ratio = 0f;
+
+        Color initialColor = bloodSplatter.material.color;
+        Color finalColor = initialColor;
+        finalColor.a = 0f;
+
+        // Fade out
+        while (ratio < 1f)
+        {
+            ratio += Time.deltaTime / 1f;
+
+            bloodSplatter.material.color = Color.Lerp(initialColor, finalColor, ratio);
+
+            yield return null;
+        }
+
+        bloodSplatter.gameObject.SetActive(false);
+    }
+
     public void Notify()
     {
 		//Debug.Log("Received notification! " + Model.AwarenessLevel);
@@ -113,12 +157,10 @@ public class PersonNode : MonoBehaviour, IObserver
         //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<Renderer>().material.color = new Color32(50, 50, 50, 1);
             UpdateLinks(false);
         }
@@ -168,10 +210,38 @@ public class PersonNode : MonoBehaviour, IObserver
 
     void OnMouseDown()
     {
+        _holdDuration = 0f;
+
         // The sphere should be subscribed to this event and update the data accordingly
         if (OnClicked != null)
         {
             OnClicked(this);
         }
     }
+
+    void OnMouseDrag()
+    {
+        if (!_model.Alive) return;
+
+        Debug.Log(_model.Alive);
+
+        _holdDuration += Time.deltaTime;
+        
+        xMarkLeft.SetCompletedRatio(Mathf.Clamp(_holdDuration - 0.025f, 0f, 1f));
+        xMarkRight.SetCompletedRatio(Mathf.Clamp(_holdDuration - 1.025f, 0f, 1f));
+
+        if (_holdDuration >= KillHoldDuration)
+        {
+            Kill();
+        }
+    }
+
+    void OnMouseUp()
+    {
+        if (_model.Alive)
+        {
+            xMarkLeft.SetCompletedRatio(0f);
+            xMarkRight.SetCompletedRatio(0f);
+        }
+    }
 }

Assets/Scripts/SimpleJSON.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 14ea719f8026fd044b3afebc5e05ca57
+folderAsset: yes
+timeCreated: 1439750110
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/SimpleJSON/SimpleJSON.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: c3f618bcc002ff146a4341b7d7c40a4e
+timeCreated: 1439750123
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Shaders/RatioProgression/RatioProgressionDiagonalLeft.shader

@@ -0,0 +1,86 @@
+// http://wiki.unity3d.com/index.php?title=Shader_Code
+
+Shader "Pat Shaders/RatioProgressionDiagonalLeft"
+{
+	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 && i.texcoord0.y >= 1 - _Ratio)
+					{
+						color = tex2D(_MainTex, i.texcoord0) * _CompletedColor;
+					}
+					else
+					{
+						color = tex2D(_MainTex, i.texcoord0) * _RemainingColor;
+					}
+					
+					color.rgb = color.rgb * color.a;
+					
+					return color;
+				}
+
+			ENDCG
+		}
+	}
+}

Assets/Shaders/RatioProgression/RatioProgressionDiagonalLeft.shader.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: bb0f298d1fd9ff24c8aed06d334c0b1f
+timeCreated: 1439740748
+licenseType: Free
+ShaderImporter:
+  defaultTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Shaders/RatioProgression/RatioProgressionDiagonalRight.shader

@@ -0,0 +1,86 @@
+// http://wiki.unity3d.com/index.php?title=Shader_Code
+
+Shader "Pat Shaders/RatioProgressionDiagonalRight"
+{
+	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 >= 1 - _Ratio && i.texcoord0.y >= 1 - _Ratio)
+					{
+						color = tex2D(_MainTex, i.texcoord0) * _CompletedColor;
+					}
+					else
+					{
+						color = tex2D(_MainTex, i.texcoord0) * _RemainingColor;
+					}
+					
+					color.rgb = color.rgb * color.a;
+					
+					return color;
+				}
+
+			ENDCG
+		}
+	}
+}

Assets/Shaders/RatioProgression/RatioProgressionDiagonalRight.shader.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: b0aba77b532f48a48b23f8b41fbe3bcd
+timeCreated: 1439740921
+licenseType: Free
+ShaderImporter:
+  defaultTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/ProjectSettings.asset

@@ -3,14 +3,17 @@
 --- !u!129 &1
 PlayerSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 6
   AndroidProfiler: 0
   defaultScreenOrientation: 4
   targetDevice: 2
+  targetGlesGraphics: -1
+  targetIOSGraphics: -1
   targetResolution: 0
   accelerometerFrequency: 60
   companyName: DefaultCompany
   productName: DeathBook
+  cloudProjectId: 
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_ShowUnitySplashScreen: 1
@@ -23,6 +26,7 @@ PlayerSettings:
   m_ActiveColorSpace: 0
   m_MTRendering: 1
   m_MobileMTRendering: 0
+  m_UseDX11: 1
   m_Stereoscopic3D: 0
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1
@@ -77,7 +81,6 @@ PlayerSettings:
   metroEnableIndependentInputSource: 0
   metroEnableLowLatencyPresentationAPI: 0
   xboxOneDisableKinectGpuReservation: 0
-  virtualRealitySupported: 0
   productGUID: 402278fad2098ce4eab29439139ae9ad
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 9
@@ -120,7 +123,6 @@ PlayerSettings:
   iOSLaunchScreenCustomXibPath: 
   AndroidTargetDevice: 0
   AndroidSplashScreenScale: 0
-  androidSplashScreen: {fileID: 0}
   AndroidKeystoreName: 
   AndroidKeyaliasName: 
   AndroidTVCompatibility: 1
@@ -134,7 +136,6 @@ PlayerSettings:
   resolutionDialogBanner: {fileID: 0}
   m_BuildTargetIcons: []
   m_BuildTargetBatching: []
-  m_BuildTargetGraphicsAPIs: []
   webPlayerTemplate: APPLICATION:Default
   m_TemplateCustomTags: {}
   actionOnDotNetUnhandledException: 1
@@ -196,7 +197,6 @@ PlayerSettings:
   ps4ApplicationParam2: 0
   ps4ApplicationParam3: 0
   ps4ApplicationParam4: 0
-  ps4GarlicHeapSize: 2048
   ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
   ps4pnSessions: 1
   ps4pnPresence: 1
@@ -339,7 +339,8 @@ PlayerSettings:
   blackberrySquareSplashScreen: {fileID: 0}
   tizenProductDescription: 
   tizenProductURL: 
-  tizenSigningProfileName: 
+  tizenCertificatePath: 
+  tizenCertificatePassword: 
   tizenGPSPermissions: 0
   tizenMicrophonePermissions: 0
   stvDeviceAddress: 
@@ -397,9 +398,4 @@ PlayerSettings:
   - WebGL::template
   WebGL::emscriptenArgs: 
   WebGL::template: APPLICATION:Default
-  firstStreamedSceneWithResources: 0
+  firstStreamedLevelWithResources: 0
-  cloudProjectId: 
-  projectId: 
-  projectName: 
-  organizationId: 
-  cloudEnabled: 0

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 5.1.1f1
+m_EditorVersion: 5.0.2f1
 m_StandardAssetsVersion: 0