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

修复比赛结束时观察者模式看不到结果&观察者不用连接设备

Browse Source
This commit is contained in:
lishuo 2021-07-28 16:30:07 +08:00
parent 4a8239a2db
commit 978debcd23
5 changed files with 2559 additions and 2140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4682
Assets/Resources/UI/Prefab/Match/onlinePlayer.prefab
View File

File diff suppressed because it is too large Load Diff

2
Assets/Resources/UI/Prefab/Match/onlinePlayer.prefab.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3ce179eef26cbf94ba2bd307690e4beb
guid: 2fe2d472537f7874797d676190b7255a
PrefabImporter:
externalObjects: {}
userData:

1
Assets/Scripts/Scenes/Ride/Competiton/CompetitionRankingItem.cs
View File

@ -54,6 +54,7 @@ namespace Assets.Scenes.Ride.Scripts
{
Background.color = selectedColor;
Ratio.color = Color.white;
Distance.color = Color.white;
}
else
{

12
Assets/Scripts/Scenes/Ride/Model/CyclingModels/CompetitionModel.cs
View File

@ -164,7 +164,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
#region 骑行结束，比赛结果展示数据
var results = new List<CompetitionResultModel>();
if (recorderData.IsCompleted || recorderData.Saved || mapCompetition.HasRecord)
if (recorderData.IsCompleted || recorderData.Saved || mapCompetition.HasRecord || CanQuit())
{
var users1 = userList.Where(d => d.IsCompleted || d.Saved);
if ((users1.Any() && users1.Any(d => mapWorkoutRecordRankings.All(u => u.UserId != d.Id)))
@ -311,12 +311,14 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
//关门时间到了退出骑行场景
public bool CanQuit()
{
if (mapCompetition?.FirstEndTime.HasValue??false)
var end1 = (int)Math.Floor((mapCompetition.EndTime.ToLocalTime() - Now).TotalSeconds);
if (!FirstEndTime.HasValue)
{
var closeDateTime = mapCompetition?.FirstEndTime.Value.ToLocalTime().AddMinutes(mapCompetition?.CloseTime??0 );
return Now >= closeDateTime;
return end1 <= 0;
}
return false;
var end2 = (int)Math.Floor((FirstEndTime.Value.ToLocalTime().AddMinutes(mapCompetition.CloseTime) - Now).TotalSeconds);
return end2 <= 0;
}
public bool CanStart()

2
Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs
View File

@ -171,7 +171,7 @@ namespace Assets.Scenes.Ride.Scripts
#if UNITY_EDITOR
checkAnt = true;
#endif
if (!checkAnt)
if (!checkAnt && !cyclingController.isWatch)
{
var alert = (GameObject)Instantiate(Resources.Load("UI/Prefab/Ride/Alert"), panel.transform);
alert.SetActive(true);