florent/gold_sprint_lpr
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

Final de final de final de reso de bug a 7h32 du mat'

Browse Source
This commit is contained in:
Your Name 2018-03-16 07:32:44 +01:00
parent abdf7ac680
commit f33aa6c989
5 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Scenes/GameScene.unity
View File

@ -5782,6 +5782,9 @@ MonoBehaviour:
TimeText: {fileID: 516481042}
WaitText: {fileID: 969461827}
TransportImage: {fileID: 355284124}
GameObjectToDesactivate:
- {fileID: 683980236}
- {fileID: 1100301917}
rank: 0
Player2: 0
--- !u!114 &1355485053
@ -6219,6 +6222,9 @@ MonoBehaviour:
TimeText: {fileID: 1435436163}
WaitText: {fileID: 1543364355}
TransportImage: {fileID: 576874148}
GameObjectToDesactivate:
- {fileID: 837715587}
- {fileID: 484981402}
rank: 0
Player2: 1
--- !u!114 &1639943197

1
Assets/Scripts/GameScene/GameManager.cs
View File

@ -126,6 +126,7 @@ public class GameManager : MonoBehaviour
Debug.Log("ERROR: BikeManager P1 not registered.");
if (bm2 == null)
Debug.Log("ERROR: BikeManager P2 not registered.");
var temp = HighscoresManager.Current;
}
public void RegisterBike(BikeManager bike, int bikeID)

33
Assets/Scripts/HighscoreRecordMenuManager.cs
View File

@ -12,6 +12,9 @@ public class HighscoreRecordMenuManager : BaseInputBehavior
public Text TimeText;
public Text WaitText;
public Image TransportImage;
public GameObject[] GameObjectToDesactivate;
public string XAxisName
{
get { return !Player2 ? GameManager.Instance.XAxisP1 : GameManager.Instance.XAxisP2; }
@ -66,7 +69,7 @@ public class HighscoreRecordMenuManager : BaseInputBehavior
WaitText.text = "En attente du joueur " + (Player2 ? "1" : "2");
}
if (Recorders[OtherPlayerIndex].Finished)
if (Recorders[OtherPlayerIndex]!=null && Recorders[OtherPlayerIndex].Finished)
GameManager.Instance.DisplayMenu();
}
return;
@ -107,14 +110,20 @@ public class HighscoreRecordMenuManager : BaseInputBehavior
if (Recorders[OtherPlayerIndex]==null || !Recorders[OtherPlayerIndex].Finished)
{
waitFor = true;
foreach (var letter in Letters)
{
letter.GetComponent<HighscoreLetterManager> ().disabled = true;
}
DisableLetters ();
}
}
void DisableLetters()
{
foreach (var letter in Letters)
{
letter.GetComponent<HighscoreLetterManager> ().disabled = false;
}
}
private void Awake()
{
//InputDelay = 250;
@ -123,7 +132,11 @@ public class HighscoreRecordMenuManager : BaseInputBehavior
WaitText.gameObject.SetActive (false);
foreach (var letter in Letters)
{
letter.GetComponent<HighscoreLetterManager> ().disabled = false;
letter.SetActive(true);
}
foreach (var g in GameObjectToDesactivate)
{
g.SetActive(true);
}
//on récupère le highscore du joueur
Entry = Player2 ? GameManager.Instance.EntryP2 : GameManager.Instance.EntryP1;
@ -135,6 +148,14 @@ public class HighscoreRecordMenuManager : BaseInputBehavior
{
if (!HighscoresManager.Current.IsANewRecord(Entry))
{
foreach (var letter in Letters)
{
letter.SetActive(false);
}
foreach (var g in GameObjectToDesactivate)
{
g.SetActive(false);
}
Finish ();
}
}

20
Assets/Scripts/HighscoresManager.cs
View File

@ -35,16 +35,16 @@ public class HighscoresManager
private void Init()
{
Entries.Clear();
Entries.Add(new HighscoreEntry { rank = 1, pseudo = "Toto", transport = 0, time = new TimeSpan(0, 0, 0, 30, 30) });
Entries.Add(new HighscoreEntry { rank = 2, pseudo = "Tata", transport = 0, time = new TimeSpan(0, 0, 0, 30, 30) });
Entries.Add(new HighscoreEntry { rank = 3, pseudo = "Titi", transport = 0, time = new TimeSpan(0, 0, 0, 30, 30) });
Entries.Add(new HighscoreEntry { rank = 4, pseudo = "Toto", transport = 0, time = new TimeSpan(0, 0, 0, 30, 30) });
Entries.Add(new HighscoreEntry { rank = 5, pseudo = "Toto", transport = 0, time = new TimeSpan(0, 0, 0, 30, 30) });
Entries.Add(new HighscoreEntry { rank = 6, pseudo = "Toto", transport = 0, time = new TimeSpan(0, 0, 0, 30, 30) });
Entries.Add(new HighscoreEntry { rank = 7, pseudo = "Toto", transport = 0, time = new TimeSpan(0, 0, 0, 30, 30) });
Entries.Add(new HighscoreEntry { rank = 8, pseudo = "Toto", transport = 0, time = new TimeSpan(0, 0, 0, 30, 30) });
Entries.Add(new HighscoreEntry { rank = 9, pseudo = "Toto", transport = 0, time = new TimeSpan(0, 0, 0, 30, 30) });
Entries.Add(new HighscoreEntry { rank = 10, pseudo = "Toto", transport = 0, time = new TimeSpan(0, 0, 0, 30, 30) });
Entries.Add(new HighscoreEntry { rank = 1, pseudo = "Toto", transport = 0, time = new TimeSpan(0, 0, 0, 50, 30) });
Entries.Add(new HighscoreEntry { rank = 2, pseudo = "Tata", transport = 0, time = new TimeSpan(0, 0, 0, 55, 30) });
Entries.Add(new HighscoreEntry { rank = 3, pseudo = "Titi", transport = 0, time = new TimeSpan(0, 0, 0, 52, 30) });
Entries.Add(new HighscoreEntry { rank = 4, pseudo = "Tutu", transport = 0, time = new TimeSpan(0, 0, 0, 42, 30) });
Entries.Add(new HighscoreEntry { rank = 5, pseudo = "Popo", transport = 0, time = new TimeSpan(0, 0, 0, 40, 30) });
Entries.Add(new HighscoreEntry { rank = 6, pseudo = "Papa", transport = 0, time = new TimeSpan(0, 0, 0, 50, 0) });
Entries.Add(new HighscoreEntry { rank = 7, pseudo = "Mama", transport = 0, time = new TimeSpan(0, 0, 1, 30, 30) });
Entries.Add(new HighscoreEntry { rank = 8, pseudo = "Mimi", transport = 0, time = new TimeSpan(0, 0, 1, 50, 10) });
Entries.Add(new HighscoreEntry { rank = 9, pseudo = "Nana", transport = 0, time = new TimeSpan(0, 0, 1, 55, 0) });
Entries.Add(new HighscoreEntry { rank = 10, pseudo = "Dada", transport = 0, time = new TimeSpan(0, 0, 1, 30, 0) });
WriteFile();
LoadFile();
}

2
Assets/StreamingAssets/highscores.json
View File

@ -1 +1 @@
{"Items":[{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Tata","transport":0,"timeStr":"0:30:30"},{"pseudo":"Titi","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"},{"pseudo":"Toto","transport":0,"timeStr":"0:30:30"}]}
{"Items":[{"pseudo":"Toto","transport":0,"timeStr":"0:50:30"},{"pseudo":"Tata","transport":0,"timeStr":"0:55:30"},{"pseudo":"Titi","transport":0,"timeStr":"0:52:30"},{"pseudo":"Tutu","transport":0,"timeStr":"0:42:30"},{"pseudo":"Popo","transport":0,"timeStr":"0:40:30"},{"pseudo":"Papa","transport":0,"timeStr":"0:50:0"},{"pseudo":"Mama","transport":0,"timeStr":"1:30:30"},{"pseudo":"Mimi","transport":0,"timeStr":"1:50:10"},{"pseudo":"Nana","transport":0,"timeStr":"1:55:0"},{"pseudo":"Dada","transport":0,"timeStr":"1:30:0"}]}