对战AR

Assets/Scripts/Scenes/Ride/Model/CyclingModels/BaseCycling.cs

@@ -105,7 +105,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
                     MapUDPService.Send(route.RouteInstance.Id, recorderData.BelongUserId,
                         new double[] { lastData._Lat, lastData._Lon },
                         recorderData.IsCompleted, false, recorderData.EndDistance,
-                        true, 1, lastData._Speed, false, preDistance, weightKg, competitionId: recorderData.Competitionid, recorderData.Saved, 0, lastData._Power, lastData._Cadence, lastData.Ticks, (lastData._FrameRate??0),roomId: (recorderData.RoomId??0));
+                        true, 1, lastData._Speed, false, preDistance, weightKg, competitionId: recorderData.Competitionid, recorderData.Saved, 0, lastData._Power, lastData._Cadence, lastData.Ticks, (lastData._FrameRate??0),roomId: recorderData.RoomId);
                 }
                 else if (recorderData.EndDistance > 0)//没有骑，但是有初始位置的情况
                 {

Assets/Scripts/Scenes/Ride/Model/CyclingModels/GameModel.cs

@@ -29,8 +29,8 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
                 StartTime = DateTime.Now,//UIManager.Now.GetDateTime(),//DateTime.Now
                 selectParam = param,
                 RoomId = App.gameRoomDetail.RoomId,
-        };
-           
+            };
+            App.gameRoomDetail = null;
             if (param != null)
             {
                 recorderData.EndDistance = param.EndDistance;
@@ -55,7 +55,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
         {
             #region  获取当前路线在线用户
             riders.RemoveAll(r => r.IsSelf == false);
-            var onlineUsers = MapUDPService.GetOnlineUsers(recorderData.CurrentRoute.RouteInstance.Id,App.gameRoomDetail.RoomId).Where(d => d.IsSelf == false)
+            var onlineUsers = MapUDPService.GetOnlineUsers(recorderData.CurrentRoute.RouteInstance.Id, recorderData.RoomId).Where(d => d.IsSelf == false)
                 .ToList();
             foreach (var item in onlineUsers)
             {

Assets/Scripts/Scenes/Ride/Model/OutModel.cs

@@ -44,7 +44,9 @@ namespace Assets.Scenes.Ride.Scripts.Model
     }
     public class ExtendInfo
     {
+        public int TotalTicks { get; set; }
         public int RoomId { get; set; }
+        public int FrameRate { get; set; }
         public int UserId { get; set; }
         public static ExtendInfo Parse(string s)
         {
@@ -55,6 +57,8 @@ namespace Assets.Scenes.Ride.Scripts.Model
             {
                 UserId = Convert.ToInt32(info[0]),
                 RoomId = Convert.ToInt32(info[1]),
+                FrameRate = Convert.ToInt32(info[2]),
+                TotalTicks = Convert.ToInt32(info[3]),
             };
             return ex;
         }
@@ -576,8 +580,10 @@ namespace Assets.Scenes.Ride.Scripts.Model
 
         public string WatchIdList { get; set; }
 
-        public int? FrameRate { get; set; }
+        public int FrameRate { get; set; }
         public int? RoomId { get; set; }
+
+        public int GameRoomTotal { get; set; }
         public List<GameRoomModel> RoomList { get; set; }
         public GameRoomModel RoomDetail { get; set; }
 
@@ -746,7 +752,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
 
         public DateTime CreateTime { get; set; }
 
-        public int? FrameRate { get; set; }
+        public int FrameRate { get; set; }
 
         public int RoomId { get; set; }
 

Assets/Scripts/Scenes/Ride/Model/RecorderDataModel.cs

@@ -107,7 +107,7 @@ namespace Assets.Scenes.Ride.Scripts.Model
 
         public int? LastFrame { get; set; }
 
-        public int? RoomId { get; set; }
+        public int RoomId { get; set; }
         /// <summary>
         /// 是否已经保存成功
         /// </summary>