AR视频direction文件相关调整

2022-05-25 18:40:47 +08:00
1 parent d876c20def
commit 17c2a44e40
@@ -142,6 +142,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
                            Cadence = item.Cadence,
                            TotalTicks = item.TotalTicks,
                            WeightKg = item.WeightKg,
+                            Sex = item.Sex,
                        });
                    }
                    {
@@ -161,7 +162,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
                            Headimage = item.HeadImage,
                            CreateTime = DateTime.MaxValue,
                            EndDistance = item.EndDistance,
-                            IsCompleted = item.IsCompleted
+                            IsCompleted = item.IsCompleted,
                        });
                    }
                }
@@ -292,6 +293,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
                    EndDistance = item.EndDistance,
                    PreDistance = item.PreDistance,
                    WeightKg = item.WeightKg,
+                    Sex = item.Sex,
                });
            }

@@ -10,6 +10,12 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
 {
    public class GameModel : BaseCycling
    {
+        /// <summary>
+        /// 第一个到终点的时间
+        /// </summary>
+        public DateTime? FirstEndTime { get; private set; }
+        public GameRoomModel GameRoom { get; private set; }
+
        public GameModel(Route route,RouteResultParam param)
            : base(route, CyclingModel.Single)
        {
@@ -30,6 +36,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
                selectParam = param,
                RoomId = App.gameRoomDetail.RoomId,
            };
+            GameRoom = App.gameRoomDetail;
            App.gameRoomDetail = null;
            if (param != null)
            {
@@ -68,6 +75,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
                    EndDistance = item.EndDistance,
                    PreDistance = item.PreDistance,
                    WeightKg = item.WeightKg,
+                    Sex = item.Sex,
                    FrameRate = item.FrameRate,
                });
            }
@@ -75,5 +83,20 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
            #endregion
            base.Run(targetData);
        }
+
+        protected override void BeforeRunAfterPakcData()
+        {
+            base.BeforeRunAfterPakcData();
+
+            var userList = MapUDPService.GetOnlineUsers(recorderData.CurrentRoute.RouteInstance.Id,recorderData.RoomId).Where(c=>c.IsSelf == false).OrderByDescending(u => u.Saved).ThenBy(d => d.CreateTime).ThenByDescending(d => d.EndDistance);
+            if (userList.Any())
+            {
+                foreach (var item in userList)
+                {
+                    if(!FirstEndTime.HasValue && item.IsCompleted)
+                        FirstEndTime = Now.AddMinutes(GameRoom.CloseTime);
+                }
+            }
+        }
    }
 }
@@ -91,6 +91,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
                    EndDistance = item.EndDistance,
                    PreDistance = item.PreDistance,
                    WeightKg = item.WeightKg,
+                    Sex = item.Sex,
                });
            }

@@ -80,6 +80,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.CyclingModels
                    EndDistance = item.EndDistance,
                    PreDistance = item.PreDistance,
                    WeightKg = item.WeightKg,
+                    Sex = item.Sex,
                    FrameRate = item.FrameRate,
                });
            }
@@ -10,7 +10,7 @@ namespace Assets.Scenes.Ride.Scripts.Model.RiderModels
    public class OnlineRiderModel : BaseRider
    {
        public override RiderType riderType => RiderType.Online;
-
+        public int Sex { get; set; } = 0;
        public double PreDistance { get; set; } = 0;
        public double Speed { get; set; } = 0;
        public double WeightKg { get; set; } = 0;
@@ -8,6 +8,7 @@ using System;
 using ChartAndGraph;
 using DG.Tweening;
 using System.Collections;
+using Assets.Scenes.Ride.Scripts.Model.CyclingModels;

 namespace Assets.Scenes.Ride.Scripts
 {
@@ -61,7 +62,7 @@ namespace Assets.Scenes.Ride.Scripts
 				weight = App.CurrentUser.Weight;
 				bicycleWeight = App.CurrentUser.BicycleWeight;
 //#if UNITY_EDITOR
-                power = 300;
+                power = 400;
 //#endif
                mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100);
 			}
@@ -122,8 +123,25 @@ namespace Assets.Scenes.Ride.Scripts
 					mainController.SaveRealTime();
 				}
 			}
+			HandleForGameRoom();
 		}
-        protected override void BeforeRun()
+
+		private bool gameRoomHandled { get; set; }
+		private void HandleForGameRoom()
+		{
+			var model = mainController.cyclingController as GameModel;
+			if (model != null && model.FirstEndTime.HasValue && !gameRoomHandled)
+			{
+				gameRoomHandled = true;
+				var gap = model.FirstEndTime.Value - UIManager.Now.GetDateTime();
+				var seconds = Math.Floor(gap.TotalSeconds);
+				UIManager.ShowGameRoomCountDownPanel((int)seconds, () => {
+					Upload();
+				});
+			}
+		}
+
+		protected override void BeforeRun()
 		{
 			//if (mainController != null)
 			//{
@@ -157,7 +175,7 @@ namespace Assets.Scenes.Ride.Scripts
 			nextPosition.x -= 14f;
 			nextPosition.y += 5f;
 			//人物移动 停止条件 到中间且线未加载完
-			if ( GetStart() && chartDataSourceScript.ReachMid(viewIndex) && !chartDataSourceScript.ReachEnd())
+			if ( GetStart() && chartDataSourceScript.ReachMid(CurrentIndex) && !chartDataSourceScript.ReachEnd())
 			{
 				var currentDistance = CurrentDistance;
 				var distance = Distance;