自主拍摄视频测试

Assets/Scripts/Scenes/MainController.cs

@@ -433,6 +433,7 @@ public class MainController : BaseScene
         if (DataSorceChanged)
         {
             DataSorceChanged = false;
+
             UIManager.ShowGameRoomDetailPanel();
             return;
         }
@@ -625,7 +626,6 @@ public class MainController : BaseScene
                 UIManager.CloseConfirm();
                 App.Model = "GameRoom";
                 MapUDPService.SendJoinGameRoom(roomId, App.CurrentUser.Id, UIManager.Now.GetDateTime().ToUniversalTime());
-                MapUDPService.SendQueryGameRoomList(App.CurrentUser.Id, 0, 1, arr[3]);
             });
             Utils.CopyToClipboard("");
         }

Assets/Scripts/Scenes/Ride/GameRoom/GameRoomResultScript.cs

@@ -119,7 +119,7 @@ namespace Assets.Scripts.Scenes.Scripts
                 }
 
                 //当前用户排名
-                var currentRanking = list.Where(c => c.UserId == cyclingController.CurrentPlayer.UserId).FirstOrDefault();
+                var currentRanking = list.Where(c => c.UserId == cyclingController.CurrentUserId).FirstOrDefault();
                 if (currentRanking != null)
                 {
                     Utils.DisplayImage(Head, currentRanking.WxHeadImg, true);

Assets/Scripts/Scenes/Ride/GameRoom/GameRoomUIManager.cs

@@ -152,8 +152,8 @@ namespace Assets.Scenes.Ride.Scripts
             if (mainController.isQuit && !Saved)
             {
                 Saved = true;
+                UIManager.CloseGameRoomCountDownPanel();
                 ShowResultList();
-                FindObjectOfType<GameRoomCountDownController>()?.Close();
             }
         }
 

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

@@ -112,7 +112,7 @@ namespace Assets.Scenes.Ride.Scripts
                 SendHeartbeat();
             }
         }
-        //查询房间
+        //查询房间列表
         public static void SendQueryGameRoomList(int userId,int pageIndex,int pageSize,string roomIdOrName)
         {
             var cmd = new QueryGameRoomListCommand()
@@ -128,6 +128,7 @@ namespace Assets.Scenes.Ride.Scripts
             var sendBytes = Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(cmd));
             _udpService.Send(sendBytes, sendBytes.Length);
         }
+     
         //创建房间
         public static void SendCreateGameRoom(string name, int routeId, string pwd, DateTime createTime , int closeTime, int maxMembers,double averageGrade,double totalClimb,double distance,bool enable3D,bool enableAR,string mapName,string fileName,string fileUrl,string altitudeGraph)
         {

Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs

@@ -580,6 +580,8 @@ namespace Assets.Scenes.Ride.Scripts
                 cancelPanel.SetActive(true);
                 cancelPanel.transform.SetAsLastSibling();
             }
+
+            UIManager.CloseGameRoomCountDownPanel();
         }
         //显示设备连接
         public void ShowDevicePanel(BaseEventData baseEventData)

Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs

@@ -147,6 +147,7 @@ namespace Assets.Scenes.Ride.Scripts
         //上传数据
         public override void Upload()
         {
+			UIManager.CloseGameRoomCountDownPanel();
 			if (mainController.cyclingController.recorderData != null&&!mainController.cyclingController.recorderData.Saved)//处理重复上传的问题
 			{
 				mainController.Save(TotalDistance);

Assets/Scripts/Scenes/VideoRide/AbstractVideoPlayer.cs

@@ -113,7 +113,7 @@ namespace Assets.Scripts.Scenes.VideoRide
             if (animator != null)
             {
                 animator.SetFloat("preSpeed", (float)preSpeed);
-                animator.SetFloat("speed", (float)speed);
+                animator.SetFloat("speed", (float)Speed);
                 animator.SetFloat("grade", (float)currentSlope);
                 animator.SetFloat("power", (float)power);
             }

Assets/Scripts/Scenes/VideoRide/OnlineVideoPlayer.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using UnityEngine;
+using UnityEngine;
 
 namespace Assets.Scripts.Scenes.VideoRide
 {
@@ -45,12 +44,17 @@ namespace Assets.Scripts.Scenes.VideoRide
             this.userId = userId;
             this.power = power;
             this.speed = speed;
-            this.Speed = speed/3.6;
+            this.Speed = speed;
+            this.OnlineSpeed = this.Speed/3.6f;
             this.Diff = endDistance - currentPlayerDistance;
             this.currentFrame = frame;
             this.PreDistance = preDistance * 1000;
             this.EndDistance = endDistance * 1000;
-            this.OnlineSpeed = speed / 3.6;
+        }
+
+        public override void ComputePlayer()
+        {
+            distance = this.speed;
         }
     }
 }

Assets/Scripts/Scenes/VideoRide/VideoPlayer.cs

@@ -31,6 +31,7 @@ namespace Assets.Scripts.Scenes.VideoRide
         public void Complete()
         {
             start = false;
+            UIManager.CloseGameRoomCountDownPanel();
             var uimanager= FindObjectOfType<VideoUIManager>();
             if (uimanager!= null)
             {
@@ -142,8 +143,8 @@ namespace Assets.Scripts.Scenes.VideoRide
             }
             this.PreDistance = preDistance * 1000;
             this.EndDistance = endDistance * 1000;
-           
 
+            this.Speed = speed;
             if (manager.IsQuit())
             {
                 this.OnlineSpeed = 0;