Merge branch 'dev_cyp' into dev

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

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)