From 088ab9a2b8f7f9ddfa1727d1c7b6f2eda400d9cb Mon Sep 17 00:00:00 2001
From: lishuo <lishuo@juze.pro>
Date: Wed, 29 Dec 2021 19:06:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=94=E8=B5=9B=E5=88=86=E4=BA=AB=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98&tcp=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UI/Prefab/Match/Mobile/CompetitonPanel.prefab    | 12 ++++++++++++
 .../Ride/Competiton/CompetitionResultFactory.cs      |  6 +++---
 Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs  | 11 ++++++-----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab
index e3cdacb3..cedb4ab1 100644
--- a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab
+++ b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab
@@ -3217,6 +3217,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!114 &8647795171597459386
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3229,6 +3230,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3622b843b296d2e46ba722beb139f040, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  newNav: {fileID: 0}
 --- !u!1 &6558498177537283755
 GameObject:
   m_ObjectHideFlags: 0
@@ -7614,6 +7616,16 @@ PrefabInstance:
       propertyPath: m_FontData.m_Alignment
       value: 6
       objectReference: {fileID: 0}
+    - target: {fileID: 6582060407730122472, guid: 3bf4a1387517769468dd74f58f7dc777,
+        type: 3}
+      propertyPath: m_FontData.m_VerticalOverflow
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6582060407730122472, guid: 3bf4a1387517769468dd74f58f7dc777,
+        type: 3}
+      propertyPath: m_FontData.m_HorizontalOverflow
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3bf4a1387517769468dd74f58f7dc777, type: 3}
 --- !u!224 &978563753921066300 stripped
diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs
index ab14a9b4..851f8836 100644
--- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs
+++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs
@@ -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
             {
diff --git a/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs
index 5d9bcb9e..6a3f584f 100644
--- a/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs
+++ b/Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs
@@ -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();