diff --git a/Assets/Resources/Materials/ShoutBubble.mat b/Assets/Resources/Materials/ShoutBubble.mat index 05294d6..53e7617 100644 --- a/Assets/Resources/Materials/ShoutBubble.mat +++ b/Assets/Resources/Materials/ShoutBubble.mat @@ -18,7 +18,7 @@ Material: first: name: _MainTex second: - m_Texture: {fileID: 2800000, guid: 856ca562f724d934e89bca0999754c23, type: 3} + m_Texture: {fileID: 2800000, guid: f0ae3145accc33c4f98e5ba66267789f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} data: diff --git a/Assets/Scripts/Models/LevelGenerator.cs b/Assets/Scripts/Models/LevelGenerator.cs index 3a1c584..04ff457 100644 --- a/Assets/Scripts/Models/LevelGenerator.cs +++ b/Assets/Scripts/Models/LevelGenerator.cs @@ -76,7 +76,7 @@ namespace DeathBook.Model for (int i = 0; i < totalCount; i++) { p1 = people[i]; - missing = avgConnections - p1.FriendCount; // TODO Add randomness + missing = Mathf.Clamp((int) Utils.GetRandomValue(avgConnections, avgConnections*1.2f, 3), 1, 100) - p1.FriendCount; if (missing <= 0) continue; diff --git a/Assets/Scripts/Models/Person.cs b/Assets/Scripts/Models/Person.cs index 9fd0594..7c5c8c7 100644 --- a/Assets/Scripts/Models/Person.cs +++ b/Assets/Scripts/Models/Person.cs @@ -127,6 +127,7 @@ namespace DeathBook.Model //Debug.Log("Person " + id + " died!"); alive = false; + CurrentStatus = null; if (GameLevel.tutorialInt == 4) GameLevel.tutorialInt = 5; @@ -202,7 +203,7 @@ namespace DeathBook.Model if (!Alive) return; - int time = LevelManager.Instance.GameLevel.DayTime; + int time = GameLevel.DayTime; bool isOnline = IsOnline(time); diff --git a/Assets/Scripts/Timer.cs b/Assets/Scripts/Timer.cs index 2e7ba90..7addf64 100644 --- a/Assets/Scripts/Timer.cs +++ b/Assets/Scripts/Timer.cs @@ -6,12 +6,16 @@ using UnityEngine.UI; public class Timer : MonoBehaviour { - public Text TimerText; - - + public Text TimerText; + int lastTime = -1; void Update() - { - TimerText.text = Utils.GetTimeString(LevelManager.Instance.GameLevel.DayTime); + { + int time = LevelManager.Instance.GameLevel.DayTime / 30; + if (time != lastTime) + { + TimerText.text = Utils.GetTimeString(time * 30); + lastTime = time; + } } }