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

Assets/Prefabs/NetworkingSphereTutorial.prefab

@@ -0,0 +1,137 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &121098
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 485072}
+  - 33: {fileID: 3344238}
+  - 23: {fileID: 2342116}
+  - 114: {fileID: 11438324}
+  - 54: {fileID: 5425960}
+  m_Layer: 0
+  m_Name: NetworkingSphereTutorial
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &485072
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 121098}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+--- !u!23 &2342116
+MeshRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 121098}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_SubsetIndices: 
+  m_StaticBatchRoot: {fileID: 0}
+  m_UseLightProbes: 1
+  m_ReflectionProbeUsage: 1
+  m_ProbeAnchor: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 1
+  m_ImportantGI: 0
+  m_AutoUVMaxDistance: .5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+--- !u!33 &3344238
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 121098}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!54 &5425960
+Rigidbody:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 121098}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: .800000012
+  m_UseGravity: 0
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!114 &11438324
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 121098}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d11858fd0dc89d1409d681deb6fd8a07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  gameObjects:
+    LinkObj: {fileID: 11495142, guid: fab430cecad80ad4391987a06b550cb7, type: 2}
+    PersonObj: {fileID: 11417564, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2}
+  levelOptions:
+    NumPeople: 10
+    AvgNumFriends: 8
+    FriendshipLikeliness: .600000024
+    SphereRadius: 7
+  strategy:
+    awarenessChange:
+      friendRatio: {x: .200000003, y: .800000012, z: 1.5}
+      lastDeath: {x: .600000024, y: .400000006, z: 1}
+      maxDeathDuration: 10080
+      modifier: .219999999
+    deathNoticing:
+      popularity: {x: .600000024, y: .400000006, z: 1}
+      importance: {x: .75, y: .25, z: 1}
+      numFriends: {x: .800000012, y: .200000003, z: 1}
+      awareness: {x: .800000012, y: .200000003, z: 1}
+      modifier: .0299999993
+    chanceToPost:
+      popularity: {x: .699999988, y: .300000012, z: 1}
+      importance: {x: .699999988, y: .300000012, z: 1}
+      frequency: {x: .699999988, y: .300000012, z: 1}
+      modifier: .100000001
+  sphere: 0
+  rotationSpeed: .699999988
+  torqueForce: 1
+  DetailsPanel: {fileID: 0}
+  dragging: 0
+  delta: {x: 0, y: 0, z: 0}
+  rb: {fileID: 0}
+  peopleNodes: []
+  _selectedNode: {fileID: 0}
+  _timeSinceLastClick: 0
+  _isRotatingTowardsNode: 0
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 121098}
+  m_IsPrefabParent: 1

Assets/Prefabs/NetworkingSphereTutorial.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9adefd6039fcc8644b6aa63861ae1632
+timeCreated: 1439773169
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Timer.prefab

@@ -0,0 +1,92 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &161610
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 224: {fileID: 22469390}
+  - 222: {fileID: 22269172}
+  - 114: {fileID: 11416672}
+  - 114: {fileID: 11425604}
+  m_Layer: 5
+  m_Name: Timer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &11416672
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 161610}
+  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: 1, g: 1, b: 1, 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: 12:12 AM
+--- !u!114 &11425604
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 161610}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5004a4eef0601c94986d478fd24f909e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  TimerText: {fileID: 11416672}
+--- !u!222 &22269172
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 161610}
+--- !u!224 &22469390
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 161610}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_AnchorMin: {x: .400000006, y: .100000001}
+  m_AnchorMax: {x: .600000024, y: .899999976}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: .5, y: .5}
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 161610}
+  m_IsPrefabParent: 1

Assets/Prefabs/Timer.prefab.meta

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

Assets/Scenes/Gameplay.unity

@@ -634,6 +634,11 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 403748469}
+--- !u!224 &464157594 stripped
+RectTransform:
+  m_PrefabParentObject: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558,
+    type: 2}
+  m_PrefabInternal: {fileID: 2119995423}
 --- !u!1 &724929355
 GameObject:
   m_ObjectHideFlags: 0
@@ -1296,6 +1301,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 256633604}
+  - {fileID: 464157594}
   m_Father: {fileID: 750965895}
   m_RootOrder: 0
   m_AnchorMin: {x: 0, y: .899999976}
@@ -1581,3 +1587,85 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 2112992425}
+--- !u!1001 &2119995423
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1858163985}
+    m_Modifications:
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_AnchorMin.x
+      value: .400000006
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_AnchorMin.y
+      value: .100000001
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_AnchorMax.x
+      value: .600000024
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_AnchorMax.y
+      value: .899999976
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_Pivot.x
+      value: .5
+      objectReference: {fileID: 0}
+    - target: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558, type: 2}
+      propertyPath: m_Pivot.y
+      value: .5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: ed15834f37c9405429c5431022840558, type: 2}
+  m_IsPrefabParent: 0

Assets/Scripts/Models/Level.cs

@@ -26,7 +26,7 @@ namespace DeathBook.Model
 
 		private float globalAwareness; //on a scale from 0 to 1
 		public float GlobalAwareness { get { return globalAwareness; } }
-        public int tutorialInt = 0;
+        public int tutorialInt = -1;
         public bool allowNext = true;
 
 		private GameStrategy strategy = null;

Assets/Scripts/Models/Person.cs

@@ -104,14 +104,14 @@ namespace DeathBook.Model
 
 		public bool Kill()
 		{
-            if (Online || ((LevelManager.Instance.GameLevel.tutorialInt < 4) && (LevelManager.Instance.GameLevel.tutorialInt >= 0)))
+            if (Online || (LevelManager.Instance.GameLevel.tutorialInt > -1 && LevelManager.Instance.GameLevel.tutorialInt < 4))
 			    return false;
 
 			//Debug.Log("Person " + id + " died!");
 			alive = false;
 
             if (LevelManager.Instance.GameLevel.tutorialInt == 4)
-                LevelManager.Instance.GameLevel.allowNext = true;
+                LevelManager.Instance.GameLevel.tutorialInt = 5;
 
 			foreach (Friendship f in friendsList)
 				f.Other.NotifyFriendWasKilled();
@@ -119,6 +119,11 @@ namespace DeathBook.Model
 
 			LevelManager.Instance.GameLevel.RegisterKill(this);
 
+            if (LevelManager.Instance.GameLevel.tutorialInt == 5 && LevelManager.Instance.GameLevel.NumDead == 3)
+            {
+                LevelManager.Instance.GameLevel.tutorialInt = 6;
+            }
+
 			return true;
 		}
 

Assets/Scripts/Models/Utils.cs

@@ -31,7 +31,10 @@ namespace DeathBook.Model
 
 		public static string GetTimeString(int time)
 		{
-			return time / 60 + "h " + time % 60 + "m";
+            float dTime = time / 60;
+
+            // Quick patch, but it's working (1 hour off)
+            return ((dTime % 12) + 1) + ":" + (time % 60).ToString("D2") + ((dTime >= 11 && dTime <= 22) ? " PM" : " AM");
 		}
 	}
 }

Assets/Scripts/NetworkingSphere.cs

@@ -56,13 +56,6 @@ public class NetworkingSphere : MonoBehaviour
         rb = GetComponent<Rigidbody>();
     }
 
-	void OnGUI()
-    {
-		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()
     {
         if (_timeSinceLastClick < 2f)
@@ -167,7 +160,7 @@ public class NetworkingSphere : MonoBehaviour
 
         if (!_isRotatingTowardsNode || node != _selectedNode)
         {
-            if ((lvl.tutorialInt > 1) || (lvl.tutorialInt > 1))
+            if ((lvl.tutorialInt == -1) || (lvl.tutorialInt > 1) || (lvl.tutorialInt > 1))
                 FocusOnNode(node);
         }
         

Assets/Scripts/Timer.cs

@@ -0,0 +1,17 @@
+using UnityEngine;
+using System.Collections;
+using DeathBook.Util;
+using DeathBook.Model;
+using UnityEngine.UI;
+
+public class Timer : MonoBehaviour
+{
+    public Text TimerText;
+
+    
+
+    void Update()
+    {
+        TimerText.text = Utils.GetTimeString(LevelManager.Instance.GameLevel.DayTime);
+    }
+}

Assets/Scripts/Timer.cs.meta

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

Assets/Scripts/TutorialScript.cs

@@ -14,25 +14,22 @@ public class TutorialScript : MonoBehaviour {
     void Start()
     {
         lvl = LevelManager.Instance.GameLevel;
+        lvl.tutorialInt = 0;
     }
 
-    void Update() {
+    void Update()
-
+    {
-
+        btnNext.gameObject.SetActive(lvl.allowNext);
-        btnNext.enabled = lvl.allowNext;
-        
-        
-        
 
         if (lvl.tutorialInt == 0)
         {
             Time.timeScale = 0;
             lvl.allowNext = true;
-            tutorialText.text = "The facebook servers are full!\nMark Zuckerberg hired you, Death, to kill off a few of his users.\n\nCareful, or you might scare them away from Mark's website...";
+            tutorialText.text = "The Slaugthr servers are full!\nMark Zuckerberg hired you, Death, to kill off a few of his annoying users.\n\nCareful, or you might scare the rest away from Mark's website...";
         }
         else if (lvl.tutorialInt == 1)
         {
-            tutorialText.text = "See how navigating works by holding the right mouse button and moving the sphere.\n\nThen, hit Next!";
+            tutorialText.text = "See how navigating works by holding the right mouse button and moving the network around.\n\nThen, hit Next!";
         }
         else if (lvl.tutorialInt == 2)
         {
@@ -40,17 +37,23 @@ public class TutorialScript : MonoBehaviour {
         }
         else if (lvl.tutorialInt == 3)
         {
-            tutorialText.text = "Let's see what happens when you click on a user's friend list.";
+            tutorialText.text = "Let's see what happens when you click on a friend's picture in the selected user's friend list.";
         }
         else if (lvl.tutorialInt == 4)
         {
-            tutorialText.text = "Alright, time for our first victim.\nHold the LEFT mouse button over a user until the X is complete.\nBeware! The user must be offline to be killed!";
+            tutorialText.text = "Alright, time for our first victim.\nHold down the LEFT mouse button over a user until the X is complete. Beware! The user must be offline (darker picture) to be killed!";
-            tutorialText.text += "\n\nYou can hold the mouse button until the user goes offline.";
+            tutorialText.text += "\n\nIf the user is online, you can hold the mouse button until he goes offline.";
         }
         else if (lvl.tutorialInt == 5)
         {
-            tutorialText.text = "Kill many users to see how the color changes\n\nRemember, as users realize something is wrong with facebook,\nthe entire network will turn red!\n\nHaveFun!";
+            tutorialText.text = "Kill 2 more users to see how the color of the links and the borders changes.\n\nRemember, as users realize something is wrong with Slaugthr, the entire network will turn red!";
+        }
+        else if (lvl.tutorialInt == 6) 
+        {
+            tutorialText.text = "Finally, notice the big \"Global Awareness\" bar at the bottom right corner of the screen. When it reaches 100%, it means you have been noticed and you lose!";
+            tutorialText.text += "\n\nHit next to start playing.";
             lvl.allowNext = true;
+            Time.timeScale = 0f;
         }
         else
         {
@@ -62,13 +65,19 @@ public class TutorialScript : MonoBehaviour {
 
     public void btnClick()
     {
+        if (lvl.tutorialInt == 0)
+        {
+            Time.timeScale = 1;
+        }
+
+        if (lvl.tutorialInt == 6)
+        {
+            Application.LoadLevel("Gameplay");
+            Time.timeScale = 1;
+        }
 
         lvl.tutorialInt++;
-        //Debug.Log(lvl.tutorialInt + ", aasfasf");
-        Time.timeScale = 1;
-        tutorialText.text = "eee";
         lvl.allowNext = false;
-        //panel.transform.Translate(Vector3.right * 100);
     }
 	
 }

ProjectSettings/EditorBuildSettings.asset

@@ -5,7 +5,9 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 1
-    path: Assets/Scenes/Gameplay.unity
   - enabled: 1
     path: Assets/Scenes/splash.unity
+  - enabled: 1
+    path: Assets/Scenes/Tutoriel.unity
+  - enabled: 1
+    path: Assets/Scenes/Gameplay.unity