Merge remote-tracking branch 'origin/dev_memory' into dev_cyp

# Conflicts:
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scenes/Login.unity
This commit is contained in:
Caiyanpeng committed 2021-11-15 11:34:49 +08:00
commit 402f19b8a5
728 files changed
+31285 -60

No files matched your search

@@ -249,8 +249,8 @@ public class RouteItem : MonoBehaviour
UIManager.ShowConfirm("ReRide", "Ride again?", () =>
{
App.RouteIdParam = routeResult.RouteId;
App.routeResult = routeResult;
App.routeResult.ContinueCyclingParam = null;
App.routeResult = null;//routeResult;
//App.routeResult.ContinueCyclingParam = null;
RecordFromUrl();
SceneManager.LoadScene("Ride");
});