diff --git a/Assets/Scripts/Scenes/LoginController.cs b/Assets/Scripts/Scenes/LoginController.cs index 531aff18..fc864042 100644 --- a/Assets/Scripts/Scenes/LoginController.cs +++ b/Assets/Scripts/Scenes/LoginController.cs @@ -1239,10 +1239,7 @@ public class LoginController : BaseScene App.CurrentUser = data; App.RideSetting.Sensitivity = data.Sensitivity; //查询我参加的比赛 - Task.Run(() => - { - UIManager.UpdateJoinCompetition(); - }); + UIManager.UpdateJoinCompetition(); //SceneManager.LoadSceneAsync("MainScene"); StartCoroutine("LoadMain"); } diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index 53180c5f..d7ccc9ea 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -107,10 +107,8 @@ public class MainController : BaseScene //UIManager.ShowBigMapPanel(); //UIManager.ShowEarthPanel(); } - - Task.Run(() => { - UIManager.UpdateJoinCompetition();//查询当前我参加的赛事 - }); + + UIManager.UpdateJoinCompetition();//查询当前我参加的赛事 } diff --git a/Assets/Scripts/UI/Prefab/Panel/RaceAlertController.cs b/Assets/Scripts/UI/Prefab/Panel/RaceAlertController.cs index bda6e6b3..474b16eb 100644 --- a/Assets/Scripts/UI/Prefab/Panel/RaceAlertController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/RaceAlertController.cs @@ -19,6 +19,7 @@ namespace Assets.Scenes.Ride.Scripts public int CompetitionId { get; set; } public int RouteId { get; set; } + public string SceneName { get; set; } protected override void Awake() { @@ -57,11 +58,17 @@ namespace Assets.Scenes.Ride.Scripts Content.text = content; CompetitionId = competitionId; RouteId = routeId; + SceneName = sceneName; } //切换到当前用户视角 public void Go(BaseEventData baseEventData) { + if (SceneName.Equals("Ride")) + { + var playerController = FindObjectOfType(); + playerController.Upload(); + } App.CompetitionIdList.Add(CompetitionId); App.CompetionId = CompetitionId; App.RouteIdParam = RouteId; diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index eb7c161f..4c01b60a 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -416,7 +416,7 @@ public class UIManager : MonoBehaviour { if (App.CurrentScene.Equals("Ride")) { - ShowRaceAlertPanel(); + var mRaceAlertPanel = ShowRaceAlertPanel(); if (mRaceAlertPanel != null) { mRaceAlertPanel.Set(e.StartTime.ToLocalTime(), Now.GetDateTime(), e.title, e.SceneName, e.competitionId, e.routeId); @@ -717,9 +717,11 @@ public class UIManager : MonoBehaviour UIManager.Show(UIManager.Instance.EditUserPanel, UIManager.Instance.MainPanel); } - public static void ShowRaceAlertPanel() + public static RaceAlertController ShowRaceAlertPanel() { - UIManager.Show(UIManager.Instance.RaceAlertPanel, null, true); + var raceAlertPanel = UIManager.Instance.RaceAlertPanel; + UIManager.Show(raceAlertPanel, null, true); + return raceAlertPanel; } public static RaceAlertController ShowRaceAlertBanelPanel()