AR加对战整体处理

Assets/Scripts/Scenes/Ride/Network/MapUDPService.cs

@@ -447,7 +447,7 @@ namespace Assets.Scenes.Ride.Scripts
         /// <returns></returns>
         public static List<OnlineUser> GetOnlineUsers(params int[] routeId)
         {
-            var result = onlineUserHelper.OnlineUsers.Where(u => routeId.Contains(u.RouteId) && u.CompetitionId == 0).ToList();
+            var result = onlineUserHelper.OnlineUsers.Where(u => routeId.Contains(u.RouteId) && u.CompetitionId == 0 && u.RoomId == 0).ToList();
 
             return result;
         }

Assets/Scripts/Scenes/Ride/Scripts/SingleUIManager.cs

@@ -21,6 +21,10 @@ namespace Assets.Scenes.Ride.Scripts
             {
                 selectPanel.SetActive(true);//显示选择单人、影子骑行模式
             }
+            else
+            {
+                reviewPanel.SetActive(false);
+            }
         }
         protected override void Update()
         {

Assets/Scripts/UI/Prefab/GameRoom/GameRoomPlayerPanel.cs

@@ -43,7 +43,7 @@ class GameRoomPlayerPanel : MonoBehaviour
       
         UIManager.AddEvent(gameObject, EventTriggerType.PointerClick, (e) =>
         {
-            if (App.gameRoomDetail.UserId == UserId)
+            if (App.gameRoomDetail.UserId == UserId || App.CurrentUser.Id == UserId)
                 return;
             kickModal.SetActive(true);
         });

Assets/Scripts/UI/Prefab/Panel/GameRoomListController.cs

@@ -732,6 +732,8 @@ public class GameRoomListController : PFUIPanel
                 t.transform.Find("Country").GetComponent<RawImage>().texture = UIManager.Instance.loginRegOptions.GetCountryImageByName(item.Country);
                 t.transform.Find("Name").GetComponent<Text>().text = item.NickName;
                 t.transform.Find("Timer").GetComponent<Text>().text = item.TotalTime;
+                t.transform.Find("DNF").gameObject.SetActive(item.IsDNF);
+                t.transform.Find("DNF_L").gameObject.SetActive(item.IsDNF);
             }
         }
     }

Assets/Scripts/Utils/Davinci.cs

@@ -22,6 +22,7 @@ public class Davinci : MonoBehaviour
     private bool enableLog = false;
     private float fadeTime = 1;
     private bool cached = true;
+    private bool duplicate = false;
 
     private enum RendererType
     {
@@ -102,6 +103,7 @@ public class Davinci : MonoBehaviour
         if (enableLog)
             Debug.Log("[Davinci] Target as UIImage set : " + image);
 
+        duplicate = image.mainTexture.name.Equals(url);
         rendererType = RendererType.uiImage;
         this.targetObj = image.gameObject;
         return this;
@@ -253,7 +255,11 @@ public class Davinci : MonoBehaviour
             error("Url has not been set. Use 'load' funtion to set image url.");
             return;
         }
-
+        if (duplicate)
+        {
+            Debug.Log("[Davinci] Start Duplicate.");
+            return;
+        }
         try
         {
             Uri uri = new Uri(url);
@@ -452,6 +458,7 @@ public class Davinci : MonoBehaviour
                     {
                         image = targetObj.GetComponent<RawImage>();
                         targetObj.GetComponent<RawImage>().texture = texture;
+                        texture.name = url;
                     }
                     else if (targetObj.GetComponent<Image>())
                     {
@@ -459,6 +466,7 @@ public class Davinci : MonoBehaviour
                         Sprite sprite = Sprite.Create(texture,
                              new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
                         targetObj.GetComponent<Image>().sprite = sprite;
+                        sprite.texture.name = url;
                     }
 
                     if (image == null)