From 6ad01c50dfe839bb7c3a02710d3ae7e0018f3e11 Mon Sep 17 00:00:00 2001 From: lishuo Date: Fri, 18 Jun 2021 18:26:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E4=B9=A6=E4=B8=8A=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E7=9A=84=E4=BA=BA=E8=BF=87=E6=BB=A4=E6=8E=89=E6=AF=94=E8=B5=9B?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=94=A8=E6=88=B7=EF=BC=8C=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8UTC=E6=97=B6=E9=97=B4=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E6=88=90=E5=BD=93=E5=9C=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/Ride/Scripts/Network/MapUDPService.cs | 13 ++++++++++--- Assets/Scripts/Apis/UserApi.cs | 3 +-- 2 files changed, 11 insertions(+), 5 deletions(-) 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)