lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp

Browse Source 
# Conflicts:
#	Assets/Resources/UI/language.json
This commit is contained in:
Caiyanpeng committed 2021-12-29 14:49:07 +08:00
2 parents bac3334a01 b8a3a30629
commit 0ab425cb52
15 files changed
+249 -116
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Scenes/Ride/Competiton/CountDownFactory.cs
+8 -8
View File
@@ -41,8 +41,8 @@ namespace Assets.Scenes.Ride.Scripts
if (count >= 0 && !competitionModel.recorderData.Saved)
{
ShowCountDown(count, App.GetLocalString("Get Ready!"));//显示倒计时面板信息
Timer.gameObject.SetActive(false);
TimerTitle.gameObject.SetActive(false);
//Timer.gameObject.SetActive(false);
//TimerTitle.gameObject.SetActive(false);
}
else
{
@@ -56,7 +56,7 @@ namespace Assets.Scenes.Ride.Scripts
//显示倒计时面板信息
ShowCountDown(s.Item1, App.GetLocalString("Time Limit"));
#else
ShowCountDown(s.Item1, "Get The First Place. Time Limit");
ShowCountDown(s.Item1, App.GetLocalString("Get The First Place. Time Limit"));
#endif
}
else if (s.Item1 >= 0)
@@ -66,19 +66,19 @@ namespace Assets.Scenes.Ride.Scripts
ShowCountDown(s.Item1, App.GetLocalString("Remaining Time"));
}
//显示当前选手骑行时间
Timer.gameObject.SetActive(true);
TimerTitle.gameObject.SetActive(true);
Timer.text = Helper.FormatTicks(s.Item2);// Helper.FormatTicks(cyclingController.currentPlayer.TotalTicks);
//CountTimer.gameObject.SetActive(true);
//TimerTitle.gameObject.SetActive(true);
CountTimer.text = Helper.FormatTicks(s.Item2);// Helper.FormatTicks(cyclingController.currentPlayer.TotalTicks);
}
}
}
private void ShowCountDown(int count, string text)
{
Title.text = text;
TimerTitle.text = text;
if (count >= 0)
{
CountTimer.text = Helper.FormatTicks(count);
Timer.text = Helper.FormatTicks(count);
}
}
}