赛事微调&mapbox sqlite dll 更新

Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs

@@ -162,9 +162,9 @@ namespace Assets.Scenes.Ride.Scripts
             _canEnter = competition.CanEnter;
             #region 赛事基本信息
             //赛事名称
-            CompetitionTitle.text = competition.Title;
+            CompetitionTitle.text = GetMaxString(competition.Title,40);
             //线路名称
-            mapName.text = route.Name;
+            mapName.text = GetMaxString(route.Name, 68);
             //距离
             distance.text = route.Distance.ToString("f1") + "KM";
             //海拔
@@ -172,7 +172,7 @@ namespace Assets.Scenes.Ride.Scripts
             //平均破度
             slope.text = Math.Round(route.AverageGrade, 2).ToString() + "%";
             //比赛开始时间
-            StartTime.text = competition.StartTime.ToLocalTime().ToString()+" TO "+ competition.EndTime.ToLocalTime().ToString();
+            StartTime.text = competition.StartTime.ToLocalTime().ToString();//+" TO "+ competition.EndTime.ToLocalTime().ToString();
             //比赛结束时间
            // EndTime.text = competition.EndTime.ToLocalTime().ToString();
             //比赛状态
@@ -203,7 +203,7 @@ namespace Assets.Scenes.Ride.Scripts
                 //异步请求mapbox画出当前路书路线图 
                 DrawMapRouteAsync(route.Id, 1);
             }
-            AddProcess(30);
+            AddProcess(20);
             #endregion
 
             StartCoroutine(HiddenLoading());
@@ -234,7 +234,7 @@ namespace Assets.Scenes.Ride.Scripts
         //查看赛事详情
         protected void ReadCompetitionPreview(BaseEventData baseEvent)
         {
-            Application.OpenURL(App.CurrentUser.WebHost + $"#/Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}");
+            Application.OpenURL(App.CurrentUser.WebHost + $"/Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}");
         }
         protected override void StartRide(BaseEventData baseEvent)
         {
@@ -262,7 +262,7 @@ namespace Assets.Scenes.Ride.Scripts
         }
         protected void GoDetail(BaseEventData baseEvent)
         {
-            Application.OpenURL(App.CurrentUser.WebHost + $"#/Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}");
+            Application.OpenURL(App.CurrentUser.WebHost + $"/Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}");
         }
 
         private void UpdateCompetition()
@@ -323,6 +323,7 @@ namespace Assets.Scenes.Ride.Scripts
                     if (data.result)
                     {
                         UpdateCompetition();
+                        App.CompetitionIdList.Remove(cyclingController.competition.Id);
                         UIManager.UpdateJoinCompetition();
                         Utils.showToast(gameObject, "success", 2, 1);
                     }

Assets/Scripts/Scenes/Ride/Competiton/CompetitionRankingFactory.cs

@@ -63,6 +63,8 @@ namespace Assets.Scenes.Ride.Scripts
             rankingList = ss?.Sorts;
 
             if (rankingList == null) return;
+
+            rankingList = rankingList.OrderByDescending(u => u.IsCompleted).ThenBy(d => d.CreateTime).ThenByDescending(d => d.EndDistance).ToList();
             //当前参赛总人数
             var totalCount = rankingList.Count();
             OnlineUserNum.text = " "+totalCount.ToString();
@@ -97,6 +99,10 @@ namespace Assets.Scenes.Ride.Scripts
         private void CreateOrUpdate(CompetitionRankingSortModel item)
         {
             var rankingList = FindObjectsOfType<CompetitionRankingItem>();
+            foreach (var o in rankingList)
+            {
+                o.transform.SetAsFirstSibling();
+            }
             var competitionRankingItem = rankingList.Where(c => c.UserId == item.UserId).FirstOrDefault();
             //如果当前有这个用户则更新没有则创建并setslibingindex
             if (competitionRankingItem == null)

Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs

@@ -29,6 +29,8 @@ namespace Assets.Scenes.Ride.Scripts
 
         Text RankingTitle { get; set; }
         Text TimerTitle { get; set; }
+        Text CloseTime { get; set; }
+        Text CloseTitle { get; set; }
         private void Awake()
         {
             cyclingController = FindObjectOfType<CyclingController>();
@@ -46,8 +48,10 @@ namespace Assets.Scenes.Ride.Scripts
             ThirdHead = transform.Find("Ranking/ThirdHead").GetComponent<RawImage>();
             TitleImage = transform.Find("TitleImage").gameObject;
             WatchTitle = transform.Find("WatchTitle").gameObject;
+            CloseTitle = transform.Find("CloseTitle").GetComponent<Text>();
+            CloseTime = transform.Find("CloseTime").GetComponent<Text>();
+
 
-            
             SpriteTop = Resources.Load<Sprite>("Images/Ride/Match/top-1");
             SpriteSecond = Resources.Load<Sprite>("Images/Ride/Match/top-2");
             SpriteThrid = Resources.Load<Sprite>("Images/Ride/Match/top-3");
@@ -58,11 +62,21 @@ namespace Assets.Scenes.Ride.Scripts
         float time = 1;
         private void Update()
         {
+            var model =  cyclingController.cyclingController as CompetitionModel;
+            if (model != null)
+            {
+                var s = model.EndCountDown();
+                //显示关门时间
+                var isshow = s.Item3 && s.Item1 >= 0 && !cyclingController.isWatch;
+                CloseTime.text = Helper.FormatTicks(s.Item1);
+                CloseTitle.gameObject.SetActive(isshow);
+                CloseTime.gameObject.SetActive(isshow);
+            }
             time -= Time.deltaTime;
             while (time < 0)
             {
                 Refresh();
-                time = 1;
+                time += 1;
             }
         }
 
@@ -84,7 +98,6 @@ namespace Assets.Scenes.Ride.Scripts
             {
                 var list = model?.competitionRankingModel?.Results;
                 if (list == null) return;
-
                 var parent = transform.Find("ScrollView/Viewport/Content");
 
                 Mine.SetActive(!cyclingController.isWatch);
@@ -178,7 +191,7 @@ namespace Assets.Scenes.Ride.Scripts
                     finalRankingItemScript.setSource(item.DeviceType);
                     finalRankingItemScript.setUserId(item.UserId,item.WxHeadImg);
                     finalRankingItemScript.setRanking(item.Index);
-                    finalRankingItemScript.setHeartRate(item.HeartRate.ToString("f0"));
+                    finalRankingItemScript.setHeartRate(item.HeartRate);
                     finalRankingItemScript.setName(item.Name);
                     finalRankingItemScript.setPower(item.Power.ToString());
                     finalRankingItemScript.setRatio(item.WeightKg.ToString("f2"));

Assets/Scripts/Scenes/Ride/Competiton/CompetitionUIManager.cs

@@ -24,7 +24,7 @@ namespace Assets.Scenes.Ride.Scripts
             //隐藏单人骑行时间
             var spilitLineH2 = transform.Find("Panel/ComputerPanel/SpilitLineH2").gameObject;
             var raceViewBtn = transform.Find("Panel/RaceViewButton").gameObject;
-            raceViewBtn.SetActive(true);
+            raceViewBtn.SetActive(mainController.isWatch);
             viewButton.gameObject.SetActive(false);
             UIManager.AddEvent(raceViewBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, ChangeView);
 

Assets/Scripts/Scenes/Ride/Competiton/CompetitionWatcherFactory.cs

@@ -43,7 +43,7 @@ namespace Assets.Scenes.Ride.Scripts
                     var finalRankingItem = Instantiate(Resources.Load<GameObject>("UI/Prefab/Match/FinalRankingItem"), parent);
                     var finalRankingItemScript = finalRankingItem.GetComponent<FinalRankingItemScript>();
                     finalRankingItemScript.setRanking(item.Index);
-                    finalRankingItemScript.setHeartRate(item.HeartRate.ToString("f0"));
+                    finalRankingItemScript.setHeartRate(item.HeartRate);
                     finalRankingItemScript.setName(item.Name);
                     finalRankingItemScript.setPower(item.Power.ToString());
                     finalRankingItemScript.setRatio(item.WeightKg.ToString("f2"));

Assets/Scripts/Scenes/Ride/Competiton/FinalRankingItemScript.cs

@@ -152,9 +152,9 @@ namespace Assets.Scenes.Ride.Scripts
             Ranking.text = ranking.ToString().PadLeft(3,'0');
         }
 
-        public void setHeartRate(string heartRate)
+        public void setHeartRate(double? heartRate)
         {
-            if (!heartRate.Equals("0"))
+            if (heartRate.HasValue)
             {
                 HeartRate.text = heartRate + "bpm";
             }