From a73e125a496b79a5b72a692fe4e545fa2928c0b1 Mon Sep 17 00:00:00 2001 From: lishuo Date: Tue, 16 Nov 2021 18:03:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=91=E8=A1=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Mapbox/Unity/Telemetry/TelemetryEditor.cs | 1 + Assets/Resources/Images/Mobile/卡片蒙版.png.meta | 8 ++++---- Assets/Scenes/Ride.unity | 4 ++-- Assets/Scripts/Scenes/BaseScene.cs | 11 +++++++++++ .../Scripts/Scenes/Ride/Scripts/CyclingController.cs | 12 ++++++++++-- Assets/Scripts/UI/Prefab/Device/DeviceView.cs | 2 +- Assets/Scripts/UIManager.cs | 2 ++ 7 files changed, 31 insertions(+), 9 deletions(-) diff --git a/Assets/Mapbox/Unity/Telemetry/TelemetryEditor.cs b/Assets/Mapbox/Unity/Telemetry/TelemetryEditor.cs index f4350135..5392a2d4 100644 --- a/Assets/Mapbox/Unity/Telemetry/TelemetryEditor.cs +++ b/Assets/Mapbox/Unity/Telemetry/TelemetryEditor.cs @@ -81,6 +81,7 @@ namespace Mapbox.Unity.Telemetry postRequest.downloadHandler = new DownloadHandlerBuffer(); postRequest.uploadHandler = new UploadHandlerRaw(bodyRaw); + postRequest.uploadHandler.Dispose(); yield return postRequest.SendWebRequest(); while (!postRequest.isDone) { yield return null; } diff --git a/Assets/Resources/Images/Mobile/卡片蒙版.png.meta b/Assets/Resources/Images/Mobile/卡片蒙版.png.meta index fb2099e7..54cd933b 100644 --- a/Assets/Resources/Images/Mobile/卡片蒙版.png.meta +++ b/Assets/Resources/Images/Mobile/卡片蒙版.png.meta @@ -97,14 +97,14 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 48 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/Scenes/Ride.unity b/Assets/Scenes/Ride.unity index 946e4daf..f5d4900f 100644 --- a/Assets/Scenes/Ride.unity +++ b/Assets/Scenes/Ride.unity @@ -424,7 +424,7 @@ MonoBehaviour: UserName: rasterOptions: useRetina: 0 - useCompression: 0 + useCompression: 1 useMipMap: 0 _terrain: _layerProperty: @@ -4962,7 +4962,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1552436184 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Scenes/BaseScene.cs b/Assets/Scripts/Scenes/BaseScene.cs index 280d769b..8a85f0bc 100644 --- a/Assets/Scripts/Scenes/BaseScene.cs +++ b/Assets/Scripts/Scenes/BaseScene.cs @@ -53,6 +53,17 @@ namespace Assets.Scripts.Scenes private void OnDestroy() { + var objAry = Resources.FindObjectsOfTypeAll(); + + for (int i = 0; i < objAry.Length; ++i) + { + objAry[i] = null;//解除资源的引用 + } + var objAry2 = Resources.FindObjectsOfTypeAll(); + for (int i = 0; i < objAry2.Length; ++i) + { + objAry2[i] = null;//解除资源的引用 + } Resources.UnloadUnusedAssets(); GC.Collect(); } diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs index f8690d71..1261d472 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs @@ -31,6 +31,8 @@ public class CyclingController : DeviceServiceMonoBase public RouteResultParam selectParamModel; public RouteResult routeResult; + public GameObject minicamera; + public Dictionary selectPlayerDic { set; get; } = new Dictionary(); public int preticks; @@ -195,7 +197,7 @@ public class CyclingController : DeviceServiceMonoBase watcher = Resources.Load("UI/Prefab/Match/Watcher"); target = transform.Find("Target"); miniMap = transform.Find("MiniMap").gameObject;//小地图 - + minicamera = transform.Find("MiniCamera").gameObject; //进入倒计时 singleUIManager = UIObject.GetComponent(); TrailRenderer trail = player.GetComponent(); @@ -377,17 +379,23 @@ public class CyclingController : DeviceServiceMonoBase //加载人物和地图以及UI界面 private void InitGameObject() { +#if !(UNITY_IOS || UNITY_ANDROID) + minicamera.SetActive(true); + miniMap.SetActive(true); +#endif map.gameObject.SetActive(true); player.SetActive(true); UIObject.SetActive(true); singleUIManager = UIObject.AddComponent(); - miniMap.SetActive(true); map.OnTileFinished += Map_OnTileFinished; mapPos = map.transform.position; } private void InitRaceGameObject() { +#if !(UNITY_IOS || UNITY_ANDROID) + minicamera.SetActive(true); +#endif map.gameObject.SetActive(true); player.SetActive(true); UIObject.SetActive(true); diff --git a/Assets/Scripts/UI/Prefab/Device/DeviceView.cs b/Assets/Scripts/UI/Prefab/Device/DeviceView.cs index 8cb4f62a..d63b15a9 100644 --- a/Assets/Scripts/UI/Prefab/Device/DeviceView.cs +++ b/Assets/Scripts/UI/Prefab/Device/DeviceView.cs @@ -142,7 +142,7 @@ public class DeviceView : MonoBehaviour })); UIManager.AddEvent(connectionButton.gameObject, EventTriggerType.PointerClick, new UnityEngine.Events.UnityAction(e => { - if (!mPairButton.activeSelf) + if (!connectionPanel.activeSelf) { return; } diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index 322a495f..eb7c161f 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -1072,6 +1072,8 @@ public class UIManager : MonoBehaviour private void OnDestroy() { UIManager.Instance = null; + Resources.UnloadUnusedAssets(); + GC.Collect(); } public static void SwitchAccount() {