AR加对战整体处理

Assets/Resources/UI/Prefab/AR/OnlineVideoPlayer_NV.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f252938bffbfb64419b5575463a1160e
+guid: a35d83bc855a6d94490c962c991b4a3a
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/Resources/UI/Prefab/AR/VidePlayer_NV.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4a12b8c86d5082e41a4d1fabc11c6a29
+guid: 67847dd964fa3aa43a0f7927571c2cb1
 PrefabImporter:
   externalObjects: {}
   userData: 

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)

ProjectSettings/EditorBuildSettings.asset

@@ -6,12 +6,15 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/Login-Mobile.unity
+    path: Assets/Scenes/Login.unity
-    guid: 4be878da00cf764499988cf403faf94d
+    guid: 6dce3e17997730b4492f91dd8fede429
   - enabled: 1
     path: Assets/Scenes/MainScene.unity
     guid: ab586a3c1bacd4a48a55178eb06fe0cc
   - enabled: 1
     path: Assets/Scenes/Ride.unity
     guid: d9f6ee75d0d54714fb4d2f90016a28bc
+  - enabled: 1
+    path: Assets/Scenes/VideoPlay.unity
+    guid: f25b9f482e27079448d130ae1ed0ea34
   m_configObjects: {}

ProjectSettings/GraphicsSettings.asset

@@ -38,7 +38,6 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

ProjectSettings/TagManager.asset

@@ -22,7 +22,7 @@ TagManager:
   - GameRoom04
   - GameRoom05
   - GameRoom06
-  - 
+  - HomePlayer
   - 
   - 
   -