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
This commit is contained in:
Caiyanpeng committed 2021-12-29 19:48:23 +08:00
2 parents 0fe5b3a953 088ab9a2b8
commit 914e2719c1
3 files changed
+21 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs
+3 -3
View File
@@ -235,9 +235,9 @@ namespace Assets.Scenes.Ride.Scripts
private void ShareWechat(BaseEventData baseEventData)
{
if (App.weChatController.IsWeChatAppInstalled())
if (!App.weChatController.IsWeChatAppInstalled())
{
App.weChatController.ShareWebpageToWX(0, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.NickName, "By " + App.CurrentUser.Nickname, null);
App.weChatController.ShareWebpageToWX(0, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.Title, "By " + App.CurrentUser.Nickname, null);
}
else
{
@@ -249,7 +249,7 @@ namespace Assets.Scenes.Ride.Scripts
{
if (App.weChatController.IsWeChatAppInstalled())
{
App.weChatController.ShareWebpageToWX(1, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.NickName, "By " + App.CurrentUser.Nickname,null);
App.weChatController.ShareWebpageToWX(1, $"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}", cyclingController.competition.Title, "By " + App.CurrentUser.Nickname,null);
}
else
{
Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs
+6 -5
View File
@@ -457,13 +457,13 @@ namespace Assets.Scenes.Ride.Scripts
foreach (var user in onlineUsers)
{
var item = msgs.FirstOrDefault(u => u.MemberId == user.Id);
var route = App.RouteList.Where(c => c.Id == item.RouteId).FirstOrDefault();
if (route != null)
{
user.RouteName = route.Name;
}
if (item != null)
{
var route = App.RouteList.Where(c => c.Id == item.RouteId).FirstOrDefault();
if (route != null)
{
user.RouteName = route.Name;
}
user.LastActiveTime = DateTime.Now;
user.RouteId = item.RouteId;
@@ -518,6 +518,7 @@ namespace Assets.Scenes.Ride.Scripts
//去除自己的数据和命令包
//mes.RemoveAll(item => item.MemberId == App.CurrentUser.Id || item.Point[0] == 0);
//list.RemoveAll(item => item.Point[0] == 0 && item.Point[1] == 0);
list.RemoveAll(item => item.Point[0] == null || item.Point[1] == null);
//去除重复数据
list = list.Distinct(new OlineUserComparer()).ToList();