Merge branch 'dev_cyp' into dev

# Conflicts:
#	Assets/Scripts/App.cs
#	Assets/Scripts/UIManager.cs

Assets/Scripts/Apis/Models/CountryInfo.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Scripts.Apis.Models
+{
+    public class CountryInfo
+    {
+        public string name { get; set; }
+        public List<ProvinceInfo> states;
+    }
+    public class CityInfo
+    {
+        public string name { get;set; }
+    }
+    public class ProvinceInfo
+    {
+        public string name { get; set; }
+        public List<CityInfo> cities;
+    }
+    public class ChinaCityObject 
+    {
+        public string name { get; set; }
+        public string province { get; set; }
+    }
+}

Assets/Scripts/Apis/Models/CountryInfo.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a73f6936353246a4eaa680de61dd1fdf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/App.cs

@@ -44,7 +44,7 @@ public static class App
 
     public static IPEndPoint UdpAddress { get; private set; } = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000);
     public static IPEndPoint TcpAddress { get; private set; } = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 21001);
-
+    public static Dictionary<string, Dictionary<dynamic, Texture>> propTextureCache;
     static App()
     {
 #if !UNITY_EDITOR
@@ -52,5 +52,11 @@ public static class App
         UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
         TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
 #endif
+        propTextureCache = new Dictionary<string, Dictionary<dynamic, Texture>>()
+        {
+            {"mapImgCache",new Dictionary<dynamic, Texture>() },
+            {"mapHBCache",new Dictionary<dynamic, Texture>() },
+            {"recordCache",new Dictionary<dynamic, Texture>() },
+        };
     }
 }

Assets/Scripts/ConfigHelper.cs

@@ -51,6 +51,6 @@ namespace Assets.Scripts
                 return _thirdPartApi;
             }
         }
-        
+
     }
 }

Assets/Scripts/Scenes/LoginController.cs

@@ -300,7 +300,7 @@ public class LoginController : MonoBehaviour
                 UIManager.ShowConfirm("Quit", "Do you want to quit PowerFun?", () =>
                 {
                     Application.Quit();
-                });
+                },2);
             });
         }
 
@@ -341,7 +341,6 @@ public class LoginController : MonoBehaviour
                 //browser.
             }
         }
-
         wxLogin2 = mainContent.Find("FormContainer-wx2");
         if (wxLogin2 != null)
         {

Assets/Scripts/Scenes/MainController.cs

@@ -37,12 +37,12 @@ public class MainController : MonoBehaviour
         UIManager.Instance.Root = root;
         UIManager.Instance.MainPanel = this.transform.Find("Panel").GetComponent<PFUIPanel>();
         UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent<PFUIPanel>();
-
-        if (App.CurrentUser == null)
+#if UNITY_EDITOR
+        if (App.CurrentUser == null) //App.CurrentUser == null
         {
             await Login();
         }
-
+#endif
         //MainMenu.transform.Find("Home").GetComponent<Button>().onClick.AddListener(() =>
         //{
         //    UIManager.ShowHomePanel();

Assets/Scripts/UI/Prefab/Confirm.cs

@@ -69,6 +69,17 @@ public class Confirm : PFUIPanel
         _callback = callback;
     }
 
+    public void SetType(int type)
+    {
+        string ok = "Ok",cancel = "Cancel";
+        if (type == 2) 
+        {
+            ok = "Yes";
+            cancel = "No";
+        }
+        _ok.transform.Find("Text").GetComponent<Text>().text = ok;
+        _cancel.transform.Find("Text").GetComponent<Text>().text = cancel;
+    }
     // Update is called once per frame
     void Update()
     {
@@ -97,4 +108,5 @@ public class Confirm : PFUIPanel
             this.gameObject.SetActive(false);
         });
     }
+
 }

Assets/Scripts/UI/Prefab/MainNav.cs

@@ -37,7 +37,7 @@ public class MainNav : MonoBehaviour
         {
             UIManager.ShowConfirm("Quit", "Do you want to quit PowerFun?", ()=> {
                 Application.Quit();
-            });
+            },2);
         });
 
         UIManager.AddEvent(transform.Find("Setting").gameObject, EventTriggerType.PointerClick, x =>

Assets/Scripts/UI/Prefab/MapList/MapItem.cs

@@ -96,7 +96,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
             SceneManager.LoadScene("Ride");
         });
         transform.Find("Name").GetComponent<Text>().text = myMap.Name;
-        Utils.DisplayImage(StartCoroutine, transform.Find("MapTitleImg").GetComponent<RawImage>(), myMap.CoverImage);
+        
 
         transform.Find("Hot").gameObject.SetActive(myMap.IsFire);
         var props = transform.Find("Props");
@@ -115,7 +115,30 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
             UIManager.Instance.collectDict[myMap.IsFavorite];
         transform.Find("BtnInfo").GetComponent<Button>().onClick.AddListener(Info);
         transform.Find("BtnRide").GetComponent<Button>().onClick.AddListener(Ride);
-        Utils.DisplayImage(StartCoroutine, transform.Find("MapHBImg").GetComponent<RawImage>(), myMap.AltitudeGraph);
+        if (App.propTextureCache["mapImgCache"].ContainsKey(myMap.Id))
+        {
+            transform.Find("MapTitleImg").GetComponent<RawImage>().texture =
+                App.propTextureCache["mapImgCache"][myMap.Id];
+        }
+        else 
+        {
+            Utils.DisplayImage(StartCoroutine, transform.Find("MapTitleImg").GetComponent<RawImage>(), myMap.CoverImage, (t) =>
+            {
+                App.propTextureCache["mapImgCache"].Add(myMap.Id, t);
+            });
+        }
+        if (App.propTextureCache["mapHBCache"].ContainsKey(myMap.Id))
+        {
+            transform.Find("MapHBImg").GetComponent<RawImage>().texture =
+                App.propTextureCache["mapHBCache"][myMap.Id];
+        }
+        else 
+        {
+            Utils.DisplayImage(StartCoroutine, transform.Find("MapHBImg").GetComponent<RawImage>(), myMap.AltitudeGraph,(t)=> 
+            {
+                App.propTextureCache["mapHBCache"].Add(myMap.Id, t);
+            });
+        }
         SetActive4Button(false);
     }
 
@@ -159,7 +182,10 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
     }
     public void OnPointerExit(PointerEventData eventData)
     {
-        transform.DOLocalMoveY(localY.Value, 0.3f);
+        if (localY != null) 
+        {
+            transform.DOLocalMoveY(localY.Value, 0.3f);
+        }
         transform.Find("CollectImg").gameObject.SetActive(false);
         transform.Find("Shadow").gameObject.SetActive(false);
         Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);

Assets/Scripts/UI/Prefab/Panel/EditUserController.cs

@@ -256,9 +256,9 @@ public class EditUserController : PFUIPanel
     {
         UIManager.ShowConfirm("Logout", "Do you want to log out and change accounts?", () => 
         {
-            SceneManager.LoadScene("1-Login");
+            SceneManager.LoadScene("Login");
             UIManager.CloseConfirm();
-        });
+        },2);
     }
 
     // Update is called once per frame

Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs

@@ -32,9 +32,9 @@ public class UserInfoController : PFUIPanel
              {
                  UIManager.ShowConfirm("Logout", "Do you want to log out and change accounts?", () =>
                  {
-                     SceneManager.LoadScene("1-Login");
+                     SceneManager.LoadScene("Login");
                      UIManager.CloseConfirm();
-                 });
+                 },2);
              });
         infoPanel = transform.Find("InfoPanel").Find("P");
         

Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs

@@ -34,7 +34,17 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle
         left = transform.Find("Left");
         row1 = left.Find("Main").Find("Row1");
         row2 = left.Find("Main").Find("Row2");
-        Utils.DisplayImage(StartCoroutine, transform.Find("CoverImage").GetComponent<RawImage>(), result.RouteImage);
+        if (App.propTextureCache["recordCache"].ContainsKey(result.Id))
+        {
+            transform.Find("CoverImage").GetComponent<RawImage>().texture = App.propTextureCache["recordCache"][result.Id];
+        }
+        else 
+        {
+            Utils.DisplayImage(StartCoroutine, transform.Find("CoverImage").GetComponent<RawImage>(), result.RouteImage,(t)=> 
+            {
+                App.propTextureCache["recordCache"].Add(result.Id, t);
+            });
+        }
         left.Find("Main").Find("Name").GetComponent<Text>().text = result.RouteName;
         left.Find("Main").Find("Time").GetComponent<Text>().text = result.CreateTime.ToString("yyyy-MM-dd HH:mm:ss");
         row1.Find("Time").GetComponent<Text>().text = $"<color={titleColor}>Riding time:</color>{result.TrainingTime}";

Assets/Scripts/UIManager.cs

@@ -9,6 +9,9 @@ using Newtonsoft.Json;
 using UnityEngine.UI;
 using Assets.Scripts.UI.Control;
 using Assets.Scripts;
+using Assets.Scripts.Apis.Models;
+using System.Linq;
+using Newtonsoft.Json.Linq;
 using System;
 
 public class UIManager : MonoBehaviour
@@ -155,8 +158,10 @@ public class UIManager : MonoBehaviour
             { false,Resources.Load<Sprite>("Images/p-4灰")},
             { true,Resources.Load<Sprite>("Images/p-4")},
         };
-
-        if(_now == null)
+        var a = Resources.Load<TextAsset>("UI/simpleCountry");
+        var clist = JsonConvert.DeserializeObject<List<CountryInfo>>(a.text);
+        
+		if(_now == null)
         {
             InitNow();
         }
@@ -398,6 +403,8 @@ public class UIManager : MonoBehaviour
 
     public static void ShowMapListPanel()
     {
+        Debug.Log("清空");
+        App.propTextureCache["recordCache"].Clear();
         UIManager.Show(UIManager.Instance.MapListPanel, UIManager.Instance.MainPanel);
     }
     public static void ShowMapDetailPanel(int id)
@@ -584,7 +591,7 @@ public class UIManager : MonoBehaviour
     }
 
     Confirm confirm = null;
-    public static void ShowConfirm(string title, string content, UnityAction action)
+    public static void ShowConfirm(string title, string content, UnityAction action,int type=1)
     {
         if (UIManager.Instance == null)
         {
@@ -601,6 +608,7 @@ public class UIManager : MonoBehaviour
             UIManager.Instance.confirm.Show();
             UIManager.Instance.confirm.Set(title, content, action);
         }
+        UIManager.Instance.confirm.SetType(type);
     }
     public static void CloseConfirm() 
     {
@@ -670,4 +678,5 @@ public class UIManager : MonoBehaviour
     {
         UIManager.Instance = null;
     }
+    
 }

Assets/Scripts/Utils/Utils.cs

@@ -199,28 +199,36 @@ namespace Assets.Scripts
                 }
                 else UnityEngine.Object.DestroyImmediate(child.gameObject);
             }
+            Resources.UnloadUnusedAssets();
+            GC.Collect();
         }
         /*删除父亲节点下的所有孩子*/
 
         /*显示网络图片*/
         public delegate Coroutine StartCoroutine(IEnumerator routine);
-        public static void DisplayImage(StartCoroutine startCoroutine,RawImage img, string url) 
+        public static void DisplayImage(StartCoroutine startCoroutine,RawImage img, string url, Action<Texture> action=null) 
         {
-            startCoroutine(DownloadImage(img, url));
+            startCoroutine(DownloadImage(img, url,action));
         }
 
         public static void DisplayImageAysnc(StartCoroutine startCoroutine, RawImage img, string url,Action<string> action)
         {
             startCoroutine(DownloadImageCallBack(img, url, action));
         }
-        static IEnumerator DownloadImage(RawImage img,string MediaUrl)
+        static IEnumerator DownloadImage(RawImage img,string MediaUrl, Action<Texture> action = null)
         {
             UnityWebRequest request = UnityWebRequestTexture.GetTexture(MediaUrl);
             yield return request.SendWebRequest();
             if (request.isNetworkError || request.isHttpError)
                 Debug.Log(request.error);
-            else
+            else 
+            {
                 img.texture = ((DownloadHandlerTexture)request.downloadHandler).texture;
+                if (action != null) 
+                {
+                    action.Invoke(img.texture);
+                }
+            }
         }
 
         static IEnumerator DownloadImageCallBack(RawImage img, string MediaUrl,Action<string> action)