From 7616e09a40bed941ec458f91eba561d44f842c91 Mon Sep 17 00:00:00 2001
From: lishuo <lishuo@juze.pro>
Date: Fri, 17 Dec 2021 11:10:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=AA=91=E8=A1=8Cloading=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D&=E7=BA=BF=E8=B7=AF=E9=9B=86=E5=90=88?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=BC=82=E6=AD=A5=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Panel/Mobile/NewRouteOverviewPanel.prefab | 26 +++++++++----------
 Assets/Scripts/Scenes/MainController.cs       |  5 +++-
 .../Scripts/AbstratctLoadingController.cs     |  4 ++-
 .../Prefab/NewRoute/NewRouteItemController.cs | 14 +++++++---
 .../Panel/NewRouteOverviewController.cs       |  2 +-
 5 files changed, 31 insertions(+), 20 deletions(-)

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..deb42e78 100644
--- a/Assets/Scripts/Scenes/MainController.cs
+++ b/Assets/Scripts/Scenes/MainController.cs
@@ -404,7 +404,10 @@ public class MainController : BaseScene
                 var tempRecordData = Newtonsoft.Json.JsonConvert.DeserializeObject<TempRecordData>(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<string, Texture> caches = null)
     {
-        if (area.CoverImage != null) 
-        {
-            Utils.DisplayImageTempDict(GetComponent<RawImage>(), area.CoverImage, caches);
-        }
         transform.Find("Panel/Text").GetComponent<Text>().text = area.Name;
         GetComponent<Button>().onClick.RemoveAllListeners();
         GetComponent<Button>().onClick.AddListener(() =>
         {
             UIManager.ShowNewRouteDetailPanel(area);
         });
+        StartCoroutine(displayImage(area, caches));
+    }
+
+    IEnumerator displayImage(MapRouteAreaItem area, Dictionary<string, Texture> caches = null)
+    {
+        yield return null;
+        if (area.CoverImage != null)
+        {
+            Utils.DisplayImageTempDict(GetComponent<RawImage>(), area.CoverImage, caches);
+        }
     }
 }
diff --git a/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs b/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs
index 3efe20ad..4a567e07 100644
--- a/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/NewRouteOverviewController.cs
@@ -105,7 +105,7 @@ public class NewRouteOverviewController: PFUIPanel
         //        });
         //#endif
     }
-    int pageIndex = 0, pageSize = 10;
+    int pageIndex = 0, pageSize = 5;
     bool isEnd = false,isLock = false;
     private void Refresh()
     {

From 2c8457c75e89d05687afec7ea54579333188d5e7 Mon Sep 17 00:00:00 2001
From: lishuo <lishuo@juze.pro>
Date: Fri, 17 Dec 2021 11:24:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=AD=E6=96=AD=E9=AA=91=E8=A1=8C?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Scenes/MainController.cs | 26 ++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs
index deb42e78..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; //用于获取全服最值内容