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 2021-12-29 17:40:45 +08:00
commit 816742898f
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Scripts/Apis/Models/MapRoute.cs
View File

@ -6,6 +6,11 @@ using System.Threading.Tasks;
namespace Assets.Scripts.Apis.Models namespace Assets.Scripts.Apis.Models
{ {
public class SimpleMapRoute
{
public int Id { get; set; }
public string Name { get; set; }
}
public class MapRoute public class MapRoute
{ {
public int Id { get; set; } public int Id { get; set; }

2
Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs
View File

@ -460,7 +460,7 @@ namespace Assets.Scenes.Ride.Scripts
var route = App.RouteList.Where(c => c.Id == item.RouteId).FirstOrDefault(); var route = App.RouteList.Where(c => c.Id == item.RouteId).FirstOrDefault();
if (route != null) if (route != null)
{ {
user.RouteName = route.NickName; user.RouteName = route.Name;
} }
if (item != null) if (item != null)
{ {

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

@ -1161,7 +1161,7 @@ public BaseUIManager singleUIManager;
var tempContent = Newtonsoft.Json.JsonConvert.SerializeObject(tempRecordData); var tempContent = Newtonsoft.Json.JsonConvert.SerializeObject(tempRecordData);
System.IO.File.WriteAllText(filePath, tempContent); System.IO.File.WriteAllText(filePath, tempContent);
} }
int RankingId; public int RankingId;
public void Save(double totalDistance) public void Save(double totalDistance)
{ {
ClearTempFile(); ClearTempFile();

4
Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs
View File

@ -93,7 +93,7 @@ namespace Assets.Scenes.Ride.Scripts
{ {
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}RoutesRecords/{cyclingController.RankingId}?Token={App.CurrentUser.cookie}", cyclingController.mapRoute.NickName, "By " + App.CurrentUser.Nickname,null);
} }
else else
{ {
@ -105,7 +105,7 @@ namespace Assets.Scenes.Ride.Scripts
{ {
if (App.weChatController.IsWeChatAppInstalled()) 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}RoutesRecords/{cyclingController.RankingId}?Token={App.CurrentUser.cookie}", cyclingController.mapRoute.NickName, "By " + App.CurrentUser.Nickname,null);
} }
else else
{ {