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

Conflicts:
	Assets/Scripts/Models/Person.cs

Signed-off-by: RosimInc <rosim_inc@hotmail.com>

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/Resources/gravestoneBubble2.png.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: f0ae3145accc33c4f98e5ba66267789f
+timeCreated: 1439780562
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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}
@@ -1597,3 +1603,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/Scenes/Tutoriel.unity

@@ -1543,6 +1543,11 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1366676552}
+--- !u!224 &1447041875 stripped
+RectTransform:
+  m_PrefabParentObject: {fileID: 22469390, guid: ed15834f37c9405429c5431022840558,
+    type: 2}
+  m_PrefabInternal: {fileID: 1787461927}
 --- !u!1 &1590742288
 GameObject:
   m_ObjectHideFlags: 0
@@ -1609,6 +1614,88 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1590742288}
+--- !u!1001 &1787461927
+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
 --- !u!1 &1810646880
 GameObject:
   m_ObjectHideFlags: 0
@@ -1700,6 +1787,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 664856231}
+  - {fileID: 1447041875}
   m_Father: {fileID: 750965895}
   m_RootOrder: 0
   m_AnchorMin: {x: 0, y: .899999976}

Assets/Scripts/Models/Person.cs

@@ -129,7 +129,7 @@ namespace DeathBook.Model
 			alive = false;
 
             if (GameLevel.tutorialInt == 4)
-                GameLevel.allowNext = true;
+                GameLevel.tutorialInt = 5;
 
 			foreach (Friendship f in friendsList)
 				f.Other.NotifyFriendWasKilled();

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)

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: