diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteOverviewPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteOverviewPanel.prefab index dc92ad0d..6e4c5809 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteOverviewPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/NewRouteOverviewPanel.prefab @@ -1107,8 +1107,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -16} - m_SizeDelta: {x: 0, y: -16} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0.018218994} m_Pivot: {x: 0, y: 1} --- !u!222 &3728196983329410265 CanvasRenderer: @@ -2123,12 +2123,12 @@ PrefabInstance: - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -2328,12 +2328,12 @@ PrefabInstance: - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -2348,12 +2348,12 @@ PrefabInstance: - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -2383,12 +2383,12 @@ PrefabInstance: - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -2398,12 +2398,12 @@ PrefabInstance: - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -2413,7 +2413,7 @@ PrefabInstance: - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.y - value: -2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8763288661036287962, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index c43cd2b6..554613a8 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -221,18 +221,19 @@ public class MainController : BaseScene //{ // UIManager.ShowHomePanel(); //}); -//#if UNITY_ANDROID || UNITY_IOS -// if (!App.IsRowerMode.HasValue) -// { -// UIManager.ShowRowerSelector(); -// return; -// } -// if (App.IsRowerMode == true) -// { -// UIManager.ShowRowerPanel(); -// return; -// } -//#endif + //#if UNITY_ANDROID || UNITY_IOS + // if (!App.IsRowerMode.HasValue) + // { + // UIManager.ShowRowerSelector(); + // return; + // } + // if (App.IsRowerMode == true) + // { + // UIManager.ShowRowerPanel(); + // return; + // } + //#endif + LastRide();//检查本地异常中断的骑行并弹窗提示继续 if (App.MainSceneParam.ContainsKey("Name") && !string.IsNullOrEmpty(App.MainSceneParam["Name"])) { UIManager.ShowHomePanel(); @@ -267,7 +268,6 @@ public class MainController : BaseScene } UIManager.UpdateJoinCompetition();//查询当前我参加的赛事 - LastRide();//检查本地异常中断的骑行并弹窗提示继续 } float maxt = 0f; //用于获取全服最值内容 @@ -404,7 +404,10 @@ public class MainController : BaseScene var tempRecordData = Newtonsoft.Json.JsonConvert.DeserializeObject(content); App.tempRecordData = tempRecordData; - UIManager.ShowConfirm(App.GetLocalString("Reconnect"), App.GetLocalString("Did you want to reconnect the trip that was interrupted abnormally?"), () => { SceneManager.LoadScene("Ride"); }); + UIManager.ShowConfirm(App.GetLocalString("Reconnect"), App.GetLocalString("Did you want to reconnect the trip that was interrupted abnormally?"), () => { SceneManager.LoadScene("Ride"); },2,()=> { + Helper.DelectDir(PFConstants.MapWorkoutRecordTempFolder); + App.tempRecordData = null; + }); } } } diff --git a/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs index 69aadc62..fb6bbe35 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs @@ -66,7 +66,7 @@ namespace Assets.Scenes.Ride.Scripts } if (canvasGroup.alpha == 0) { - StartGame(); + //StartGame(); transform.gameObject.SetActive(false); } } @@ -195,6 +195,8 @@ namespace Assets.Scenes.Ride.Scripts canvasGroup.blocksRaycasts = false; depressFlag = true; slider.DOValue(process, 1); + + StartGame(); } protected virtual void Cancel(BaseEventData baseEvent) { diff --git a/Assets/Scripts/UI/Prefab/NewRoute/NewRouteItemController.cs b/Assets/Scripts/UI/Prefab/NewRoute/NewRouteItemController.cs index 82ce9d49..dba8c1d9 100644 --- a/Assets/Scripts/UI/Prefab/NewRoute/NewRouteItemController.cs +++ b/Assets/Scripts/UI/Prefab/NewRoute/NewRouteItemController.cs @@ -22,15 +22,21 @@ public class NewRouteItemController : MonoBehaviour public void Initial(MapRouteAreaItem area, Dictionary caches = null) { - if (area.CoverImage != null) - { - Utils.DisplayImageTempDict(GetComponent(), area.CoverImage, caches); - } transform.Find("Panel/Text").GetComponent().text = area.Name; GetComponent