lishuo/powerfun-unity
1
1 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scripts/UI/Prefab/Panel/NewRouteDetailController.cs
This commit is contained in:
Caiyanpeng committed 2021-12-28 11:26:34 +08:00
2 parents 2b390717c2 ffc98f1a58
commit f23fc4b4c0
45 files changed
+4765 -1412
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/Utils/Utils.cs
+3 -3
View File
@@ -415,7 +415,7 @@ namespace Assets.Scripts
}
public static void DisplayImageAysnc(StartCoroutine startCoroutine, RawImage img, string url,Action<string> action)
public static void DisplayImageAysnc(StartCoroutine startCoroutine, RawImage img, string url,Action<string,RawImage> action)
{
startCoroutine(DownloadImageCallBack(img, url, action));
}
@@ -482,7 +482,7 @@ namespace Assets.Scripts
_t.name = MediaUrl;
return _t;
}
static IEnumerator DownloadImageCallBack(RawImage img, string MediaUrl,Action<string> action)
static IEnumerator DownloadImageCallBack(RawImage img, string MediaUrl,Action<string,RawImage> action)
{
UnityWebRequest request = UnityWebRequest.Get(MediaUrl);
yield return request.SendWebRequest();
@@ -492,7 +492,7 @@ namespace Assets.Scripts
{
var data = request.downloadHandler.data;
img.texture = Utils.GetDownloadTexture(MediaUrl, data);
action.Invoke(MediaUrl);
action.Invoke(MediaUrl, img);
}
}
/*显示网络图片*/