diff --git a/Assets/Scenes/Ride/Scripts/Network/MapUDPService.cs b/Assets/Scenes/Ride/Scripts/Network/MapUDPService.cs index 5ff388ad..c52f0b80 100644 --- a/Assets/Scenes/Ride/Scripts/Network/MapUDPService.cs +++ b/Assets/Scenes/Ride/Scripts/Network/MapUDPService.cs @@ -188,17 +188,24 @@ namespace Assets.Scenes.Ride.Scripts } /// - /// 根据路书获取在线用户 + /// 根据路书获取在线用户(非比赛用户不能看到比赛中的用户) /// /// /// public static List GetOnlineUsers(params int[] routeId) { - //return onlineUsers.Where(n => routeId.Contains(n.RouteId)).ToList(); - var result = onlineUserHelper.OnlineUsers.Where(u => routeId.Contains(u.RouteId)).ToList(); + var result = onlineUserHelper.OnlineUsers.Where(u => routeId.Contains(u.RouteId) && u.CompetitionId == 0).ToList(); return result; } + + //比赛中的人只能看到当前比赛的人 + public static List GetCompetitionOnlineUsers(int competitionId) + { + var result = onlineUserHelper.OnlineUsers.Where(u => u.CompetitionId == competitionId).ToList(); + return result; + } + public static int GetNearRiderCount() { return onlineUserHelper.OnlineUsers.Count(); diff --git a/Assets/Scripts/Apis/UserApi.cs b/Assets/Scripts/Apis/UserApi.cs index 8e562e31..8dc9c3e2 100644 --- a/Assets/Scripts/Apis/UserApi.cs +++ b/Assets/Scripts/Apis/UserApi.cs @@ -126,8 +126,7 @@ namespace Assets.Scripts.Apis public async Task GetNow() { var result = await GetAsync("NoAuth/GetNow"); - - return DateTime.Parse(System.Text.Encoding.UTF8.GetString(result)); + return DateTime.Parse(System.Text.Encoding.UTF8.GetString(result)).ToLocalTime();//将服务器UTC时间转换成当地时区的时间 } public async Task> Register(string Phone, string Pwd, string Captcha)