diff --git a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab index 4d1318d3..571f12f3 100644 --- a/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/Mobile/CompetitonPanel.prefab @@ -1316,7 +1316,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8563954619679277008 RectTransform: m_ObjectHideFlags: 0 @@ -5537,7 +5537,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 5, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -5892,7 +5892,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6558498179115500272 RectTransform: m_ObjectHideFlags: 0 @@ -6525,7 +6525,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5987798170253205739 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab index 2fdf157d..948a11b5 100644 --- a/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/LoadingPanel.prefab @@ -361,6 +361,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &145307034357954015 GameObject: m_ObjectHideFlags: 0 @@ -452,6 +453,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &184329605262752469 GameObject: m_ObjectHideFlags: 0 @@ -939,7 +941,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 5, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -1009,7 +1011,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2322716380738134732 RectTransform: m_ObjectHideFlags: 0 @@ -1244,6 +1246,7 @@ GameObject: - component: {fileID: 3007624748412546457} - component: {fileID: 3007624748412546459} - component: {fileID: 3007624748412546456} + - component: {fileID: 2904928259100574873} m_Layer: 5 m_Name: AltitudeGraph m_TagString: Untagged @@ -1304,6 +1307,18 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!225 &2904928259100574873 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3007624748412546454} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &3007624748526063403 GameObject: m_ObjectHideFlags: 0 @@ -2569,6 +2584,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &3007624749485164347 GameObject: m_ObjectHideFlags: 0 @@ -2660,6 +2676,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &3007624749581944590 GameObject: m_ObjectHideFlags: 0 @@ -3096,7 +3113,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3007624749774178323 RectTransform: m_ObjectHideFlags: 0 @@ -3169,6 +3186,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &3007624749816966110 GameObject: m_ObjectHideFlags: 0 @@ -3345,6 +3363,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &3007624750023539789 GameObject: m_ObjectHideFlags: 0 @@ -3534,6 +3553,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &3007624750146435811 GameObject: m_ObjectHideFlags: 0 @@ -3712,6 +3732,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &3007624750243088062 GameObject: m_ObjectHideFlags: 0 @@ -3970,6 +3991,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &4752272895894060714 GameObject: m_ObjectHideFlags: 0 @@ -4076,6 +4098,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &4752272896060452082 GameObject: m_ObjectHideFlags: 0 @@ -4182,6 +4205,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: + key: --- !u!1 &8110328268474125505 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs index 38e2f45c..f3ddda3e 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs @@ -252,8 +252,7 @@ namespace Assets.Scenes.Ride.Scripts } AddProcess(20); #endregion - - StartCoroutine(HiddenLoading()); + //StartCoroutine(HiddenLoading()); } private int maxShowCout = 9; private void ShowPlayers(List list) diff --git a/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs index fb6bbe35..5ed54937 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/AbstratctLoadingController.cs @@ -47,7 +47,7 @@ namespace Assets.Scenes.Ride.Scripts { App.TextureCache.Clear(); mapApi = new MapApi(); - ShowLoading(); + //ShowLoading(); } protected virtual void Update() @@ -144,18 +144,18 @@ namespace Assets.Scenes.Ride.Scripts Utils.DisplayImageAysnc(StartCoroutine, mapRouteImage, url, DowloadCallBack); } } - protected void DowloadCallBack(string url) + protected void DowloadCallBack(string url,RawImage rawImage) { if (!App.TextureCache.ContainsKey(url)) { - App.TextureCache.Add(url, mapRouteImage.texture); + App.TextureCache.Add(url, rawImage?.texture); } else { - App.TextureCache[url] = mapRouteImage.texture; + App.TextureCache[url] = rawImage?.texture; } - var canvasGroup = mapRouteImage.GetComponent(); - canvasGroup.DOFade(1, 1); + var canvasGroup = rawImage.GetComponent(); + canvasGroup?.DOFade(1, 1); } //设定当前loading进度 public virtual void AddProcess(float v) diff --git a/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs b/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs index 6b4f08cd..473bba1c 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/BaseUIManager.cs @@ -314,7 +314,8 @@ namespace Assets.Scenes.Ride.Scripts //影子骑行按钮控制 if (mainController.mapRouteRankingList == null || mainController.mapRouteRankingList.Count == 0) { - shadowButton.image.sprite = Resources.Load("Images/Ride/Shadow Mode_no"); + var lang = App.GetLocalLanguage(); + shadowButton.image.sprite = lang == "zh"? Resources.Load("Images/Ride/Shadow Mode_no"): Resources.Load("Images/Ride/Shadow Mode_no"); shadowButton.enabled = false; shadowButton.interactable = false; } diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs index f6db8890..762d7d7b 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs @@ -532,7 +532,7 @@ public class CyclingController : DeviceServiceMonoBase } private IEnumerator Init() { - yield return new WaitForSeconds(1); + yield return null; //new WaitForSeconds(1); mapRoute = mapApi.GetById(routeId).data; loadingController.Init();//初始化loading页面 loadingController.AddProcess(10); diff --git a/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs index 79d26d52..f383f5df 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/LoadingController.cs @@ -127,7 +127,8 @@ namespace Assets.Scenes.Ride.Scripts Utils.DisplayImage(head, userList[0].HeadImage);//头像 country.texture = cyclingController.GetCountryImageByCode(route.CountryCode);//上传者国家 mapCountry.texture = cyclingController.GetCountryImageByName(userList[0].Country);//路书国家 - Utils.DisplayImage(altitudeGraph, route.AltitudeGraph);//海拔图 + //Utils.DisplayImage(altitudeGraph, route.AltitudeGraph);//海拔图 + Utils.DisplayImageAysnc(StartCoroutine, altitudeGraph, route.AltitudeGraph, DowloadCallBack); } #endregion //异步请求mapbox画出当前路书路线图 @@ -140,7 +141,7 @@ namespace Assets.Scenes.Ride.Scripts CreateRankingList(list.data.list); AddProcess(10); } - StartCoroutine(HiddenLoading()); + //StartCoroutine(HiddenLoading()); } //创建排行榜 diff --git a/Assets/Scripts/Utils/Utils.cs b/Assets/Scripts/Utils/Utils.cs index 19264bb6..44860d85 100644 --- a/Assets/Scripts/Utils/Utils.cs +++ b/Assets/Scripts/Utils/Utils.cs @@ -369,7 +369,7 @@ namespace Assets.Scripts } - public static void DisplayImageAysnc(StartCoroutine startCoroutine, RawImage img, string url,Action action) + public static void DisplayImageAysnc(StartCoroutine startCoroutine, RawImage img, string url,Action action) { startCoroutine(DownloadImageCallBack(img, url, action)); } @@ -411,7 +411,7 @@ namespace Assets.Scripts _t.name = MediaUrl; return _t; } - static IEnumerator DownloadImageCallBack(RawImage img, string MediaUrl,Action action) + static IEnumerator DownloadImageCallBack(RawImage img, string MediaUrl,Action action) { UnityWebRequest request = UnityWebRequest.Get(MediaUrl); yield return request.SendWebRequest(); @@ -421,7 +421,7 @@ namespace Assets.Scripts { var data = request.downloadHandler.data; img.texture = Utils.GetDownloadTexture(MediaUrl, data); - action.Invoke(MediaUrl); + action.Invoke(MediaUrl, img); } } /*显示网络图片*/