diff --git a/Assets/Editor/ExportAssets.cs b/Assets/Editor/ExportAssets.cs new file mode 100644 index 00000000..4849c89a --- /dev/null +++ b/Assets/Editor/ExportAssets.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEditor; + +public class ExportAssets : MonoBehaviour +{ + [@MenuItem("Juze/Build Asset Bundles")] + static void BuildAssetBundles() + { + + BuildPipeline.BuildAssetBundles(Application.streamingAssetsPath, BuildAssetBundleOptions.UncompressedAssetBundle, BuildTarget.StandaloneWindows); + } + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Editor/ExportAssets.cs.meta b/Assets/Editor/ExportAssets.cs.meta new file mode 100644 index 00000000..978ee64c --- /dev/null +++ b/Assets/Editor/ExportAssets.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9696ca9d085337943844a940a23e41f3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Ride/Scripts/LoadingController.cs b/Assets/Scenes/Ride/Scripts/LoadingController.cs index cfcb7d7a..1d06233d 100644 --- a/Assets/Scenes/Ride/Scripts/LoadingController.cs +++ b/Assets/Scenes/Ride/Scripts/LoadingController.cs @@ -70,7 +70,7 @@ namespace Assets.Scenes.Ride.Scripts //展示当前路书图片 public void SetMapRouteImage(string url) { - Utils.DisplayImage(StartCoroutine, mapRouteImage, url); + Utils.DisplayImage(mapRouteImage, url); } public void DrawMapRoute(MapDataModel mapData) { @@ -214,12 +214,12 @@ namespace Assets.Scenes.Ride.Scripts { uploadByUserName.text = userList[0].Name; var countryUrl = App.Host + $"User/GetCountryImg?userid={userList[0].Id}"; - Utils.DisplayImage(StartCoroutine, head, userList[0].HeadImage);//头像 + Utils.DisplayImage(head, userList[0].HeadImage);//头像 country.texture = cyclingController.GetCountryImageByCode(route.CountryCode);//上传者国家 mapCountry.texture = cyclingController.GetCountryImageByName(userList[0].Country);//路书国家 - Utils.DisplayImage(StartCoroutine, altitudeGraph, route.AltitudeGraph);//海拔图 + Utils.DisplayImage(altitudeGraph, route.AltitudeGraph);//海拔图 loadingPanel.SetActive(false); } #endregion diff --git a/Assets/Scenes/Ride/Scripts/NearByItemScript.cs b/Assets/Scenes/Ride/Scripts/NearByItemScript.cs index b3743e3d..1f522ee3 100644 --- a/Assets/Scenes/Ride/Scripts/NearByItemScript.cs +++ b/Assets/Scenes/Ride/Scripts/NearByItemScript.cs @@ -52,14 +52,14 @@ namespace Assets.Scenes.Ride.Scripts { if (!_headUrl.Equals(url)) { - if (App.TextureCache.ContainsKey(url)) - { - Head.texture = App.TextureCache[url]; - } - else - { - Utils.DisplayImageAysnc(StartCoroutine, Head, url, ImageCallBack); - } + //if (App.TextureCache.ContainsKey(url)) + //{ + // Head.texture = App.TextureCache[url]; + //} + //else + //{ + Utils.DisplayImage(Head, url, true); + //} //Utils.DisplayImage(StartCoroutine, Head, url); //StartCoroutine(DownloadImage(Head, url)); @@ -69,30 +69,30 @@ namespace Assets.Scenes.Ride.Scripts Head.material = material; } } - private void ImageCallBack(string url) - { - if (!App.TextureCache.ContainsKey(url)) - App.TextureCache.Add(url, Head.texture); - } + //private void ImageCallBack(string url) + //{ + // if (!App.TextureCache.ContainsKey(url)) + // App.TextureCache.Add(url, Head.texture); + //} - IEnumerator DownloadImage(RawImage img, string MediaUrl) - { - if (!App.TextureCache.ContainsKey(MediaUrl)) - { - UnityWebRequest request = UnityWebRequestTexture.GetTexture(MediaUrl); - yield return request.SendWebRequest(); - if (request.isNetworkError || request.isHttpError) - Debug.Log(request.error); - else - img.texture = ((DownloadHandlerTexture)request.downloadHandler).texture; + //IEnumerator DownloadImage(RawImage img, string MediaUrl) + //{ + // if (!App.TextureCache.ContainsKey(MediaUrl)) + // { + // UnityWebRequest request = UnityWebRequestTexture.GetTexture(MediaUrl); + // yield return request.SendWebRequest(); + // if (request.isNetworkError || request.isHttpError) + // Debug.Log(request.error); + // else + // img.texture = ((DownloadHandlerTexture)request.downloadHandler).texture; - App.TextureCache.Add(MediaUrl, img.texture); - } - else - { - img.texture = App.TextureCache["MediaUrl"]; - } - } + // App.TextureCache.Add(MediaUrl, img.texture); + // } + // else + // { + // img.texture = App.TextureCache["MediaUrl"]; + // } + //} public void setCountry(Texture texture) { diff --git a/Assets/Scenes/Ride/Scripts/RankingItemScript.cs b/Assets/Scenes/Ride/Scripts/RankingItemScript.cs index 314c5b14..9ecd7169 100644 --- a/Assets/Scenes/Ride/Scripts/RankingItemScript.cs +++ b/Assets/Scenes/Ride/Scripts/RankingItemScript.cs @@ -41,7 +41,7 @@ namespace Assets.Scenes.Ride.Scripts } public void SetHead(string url) { - Utils.DisplayImage(StartCoroutine, head, url); + Utils.DisplayImage(head, url); } public void SetCountry(Texture texture) { diff --git a/Assets/Scenes/Ride/Scripts/ResultPanelScript.cs b/Assets/Scenes/Ride/Scripts/ResultPanelScript.cs index aa0eb863..17494ffc 100644 --- a/Assets/Scenes/Ride/Scripts/ResultPanelScript.cs +++ b/Assets/Scenes/Ride/Scripts/ResultPanelScript.cs @@ -111,7 +111,7 @@ namespace Assets.Scenes.Ride.Scripts mapName.text = route.Name; distance.text = route.Distance.ToString("f1")+"KM"; country.texture = cyclingController.GetCountryImageByCode(route.CountryCode); - Utils.DisplayImage(StartCoroutine, altudeGraph, route.AltitudeGraph); + Utils.DisplayImage(altudeGraph, route.AltitudeGraph); //绑定骑行记录结果 rideTime.text = Helper.FormatTicks(record.RiderDatas.Count); rideDistance.text = record.RiderDatas.Last()._Distance.ToString("f1")+"KM"; diff --git a/Assets/Scenes/Ride/Scripts/ReviewItemScript.cs b/Assets/Scenes/Ride/Scripts/ReviewItemScript.cs index a3e815b1..abdce6f0 100644 --- a/Assets/Scenes/Ride/Scripts/ReviewItemScript.cs +++ b/Assets/Scenes/Ride/Scripts/ReviewItemScript.cs @@ -38,25 +38,25 @@ namespace Assets.Scenes.Ride.Scripts public void SetHead(string url) { - if (App.TextureCache.ContainsKey(url)) - { - Head.texture = App.TextureCache[url]; - } - else - { - Utils.DisplayImageAysnc(StartCoroutine, Head, url, ImageCallBack); - } - Utils.DisplayImage(StartCoroutine,Head,url); + //if (App.TextureCache.ContainsKey(url)) + //{ + // Head.texture = App.TextureCache[url]; + //} + //else + //{ + // Utils.DisplayImage(Head, url, true); + //} + Utils.DisplayImage(Head,url, true); var rect = ((RectTransform)Head.transform).rect; Material material = Instantiate(Resources.Load("UI/Material/RoundedCornersTextureMaterial")); material.SetVector(Shader.PropertyToID("_WidthHeightRadius"), new Vector4(rect.width, rect.height, rect.height, 0)); Head.material = material; } - private void ImageCallBack(string url) - { - if (!App.TextureCache.ContainsKey(url)) - App.TextureCache.Add(url, Head.texture); - } + //private void ImageCallBack(string url) + //{ + // if (!App.TextureCache.ContainsKey(url)) + // App.TextureCache.Add(url, Head.texture); + //} public void SetDistance(double distance) { _distance = distance; diff --git a/Assets/Scenes/Ride/Scripts/SelectPlayerItemScript.cs b/Assets/Scenes/Ride/Scripts/SelectPlayerItemScript.cs index 39ad85aa..816c7491 100644 --- a/Assets/Scenes/Ride/Scripts/SelectPlayerItemScript.cs +++ b/Assets/Scenes/Ride/Scripts/SelectPlayerItemScript.cs @@ -65,14 +65,14 @@ namespace Assets.Scenes.Ride.Scripts public void SetHeadImage(string url) { Head = transform.Find("Head").GetComponent(); - if (App.TextureCache.ContainsKey(url)) - { - Head.texture = App.TextureCache[url]; - } - else - { - Utils.DisplayImageAysnc(StartCoroutine, Head, url, ImageCallBack); - } + //if (App.TextureCache.ContainsKey(url)) + //{ + // Head.texture = App.TextureCache[url]; + //} + //else + //{ + Utils.DisplayImage(Head, url, true); + //} var rect = ((RectTransform)Head.transform).rect; Material material = Instantiate(Resources.Load("UI/Material/RoundedCornersTextureMaterial")); diff --git a/Assets/Scenes/Ride/Scripts/SingleUIManager.cs b/Assets/Scenes/Ride/Scripts/SingleUIManager.cs index f1757ea5..66c8f5ad 100644 --- a/Assets/Scenes/Ride/Scripts/SingleUIManager.cs +++ b/Assets/Scenes/Ride/Scripts/SingleUIManager.cs @@ -271,7 +271,7 @@ namespace Assets.Scenes.Ride.Scripts cameraZ = float.Parse(cameraArr[2]); } totalDistance.text = Math.Round(mainController.GetMapData().TotalDistance, 1).ToString() + "KM";//总里程 - Utils.DisplayImage(StartCoroutine, altitudeGraph, route.RouteInstance.AltitudeGraph);//渲染海拔图 + Utils.DisplayImage(altitudeGraph, route.RouteInstance.AltitudeGraph);//渲染海拔图 if (mainController.mapRouteRankingList == null || mainController.mapRouteRankingList.Count == 0) { @@ -589,7 +589,7 @@ namespace Assets.Scenes.Ride.Scripts if (App.CurrentUser != null) { - Utils.DisplayImage(StartCoroutine, head, App.CurrentUser.WxHeadImg); + Utils.DisplayImage(head, App.CurrentUser.WxHeadImg); } } diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 37903f0d..55f2f640 100644 --- a/Assets/Scripts/App.cs +++ b/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> propTextureCache; + static App() { #if !UNITY_EDITOR @@ -52,11 +52,6 @@ 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>() - { - {"mapImgCache",new Dictionary() }, - {"mapHBCache",new Dictionary() }, - {"recordCache",new Dictionary() }, - }; + } } diff --git a/Assets/Scripts/Scenes/LoginController.cs b/Assets/Scripts/Scenes/LoginController.cs index 6ab52dbd..cecc28fd 100644 --- a/Assets/Scripts/Scenes/LoginController.cs +++ b/Assets/Scripts/Scenes/LoginController.cs @@ -434,7 +434,7 @@ public class LoginController : MonoBehaviour var r = await ConfigHelper.userApi.GetHeadImg(s); if (!string.IsNullOrEmpty(r)) { - Utils.DisplayImage(StartCoroutine, loginContainer.Find("Avatar").GetComponent(), r); + Utils.DisplayImage(loginContainer.Find("Avatar").GetComponent(), r); avatarName = s; } else @@ -568,13 +568,11 @@ public class LoginController : MonoBehaviour if (data.Value("success") != null && data.Value("success") == "False") { wxLogin2.gameObject.SetActive(true); - Utils.DisplayImage(StartCoroutine, - wxLogin2.Find("Avatar").GetComponent(), + Utils.DisplayImage(wxLogin2.Find("Avatar").GetComponent(), wxInfoJson.Value("headimgurl")); wxLogin2.Find("NickName").GetComponent().text = wxInfoJson.Value("nickname"); wxLogin3.gameObject.SetActive(true); - Utils.DisplayImage(StartCoroutine, - wxLogin3.Find("Avatar").GetComponent(), + Utils.DisplayImage(wxLogin3.Find("Avatar").GetComponent(), wxInfoJson.Value("headimgurl")); wxLogin3.Find("NickName").GetComponent().text = wxInfoJson.Value("nickname"); pageNums = 5; @@ -790,8 +788,7 @@ public class LoginController : MonoBehaviour } else { - Utils.DisplayImage(StartCoroutine, - wxLogin3.Find("Avatar").GetComponent(), + Utils.DisplayImage(wxLogin3.Find("Avatar").GetComponent(), data.WxHeadImg); } wxLogin3.Find("Wx").gameObject.SetActive(type == 1); diff --git a/Assets/Scripts/UI/Prefab/BigMap/Tips.cs b/Assets/Scripts/UI/Prefab/BigMap/Tips.cs index b67e52b8..5e1f6708 100644 --- a/Assets/Scripts/UI/Prefab/BigMap/Tips.cs +++ b/Assets/Scripts/UI/Prefab/BigMap/Tips.cs @@ -117,7 +117,7 @@ public class Tips : MonoBehaviour //altitudeGraph - Utils.DisplayImage(StartCoroutine, altitudeGraph, _model.AltitudeGraph); + Utils.DisplayImage(altitudeGraph, _model.AltitudeGraph); //Utils.DisplayImage(StartCoroutine, altitudeGraph, "http://192.168.0.97:5082/Map/AltitudeGraph?id=1215"); } diff --git a/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs b/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs index 9be64671..235b3f90 100644 --- a/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs +++ b/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs @@ -31,7 +31,7 @@ public class QuickLoginUser : MonoBehaviour this.user = user; if (!string.IsNullOrEmpty(user.Avatar)) { - Utils.DisplayImage(StartCoroutine, transform.Find("Avatar").GetComponent(), user.Avatar); + Utils.DisplayImage(transform.Find("Avatar").GetComponent(), user.Avatar); } else { diff --git a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs index adcb83d7..2ab1dedc 100644 --- a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs +++ b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs @@ -115,30 +115,10 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, UIManager.Instance.collectDict[myMap.IsFavorite]; transform.Find("BtnInfo").GetComponent