From 32e9ce864b3d00fc20d7cbbc9a5b2a768f516958 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Tue, 13 Apr 2021 09:57:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9unity5.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Runtime/Internal/BaseGraph.cs | 4 ++-- Runtime/Internal/DrawSerieRadar.cs | 2 +- Runtime/XChartsMgr.cs | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Runtime/Internal/BaseGraph.cs b/Runtime/Internal/BaseGraph.cs index 1df8ddff..113f3db3 100644 --- a/Runtime/Internal/BaseGraph.cs +++ b/Runtime/Internal/BaseGraph.cs @@ -147,9 +147,9 @@ namespace XCharts { if (component.anyDirty) { - if (component.componentDirty) + if (component.componentDirty && component.refreshComponent != null) { - component.refreshComponent?.Invoke(); + component.refreshComponent.Invoke(); } if (component.vertsDirty) { diff --git a/Runtime/Internal/DrawSerieRadar.cs b/Runtime/Internal/DrawSerieRadar.cs index 61712778..5efc77c9 100644 --- a/Runtime/Internal/DrawSerieRadar.cs +++ b/Runtime/Internal/DrawSerieRadar.cs @@ -265,7 +265,7 @@ namespace XCharts } chart.RefreshBasePainter(); }; - radar.refreshComponent?.Invoke(); + radar.refreshComponent.Invoke(); } private void DrawMutipleRadar(VertexHelper vh, Serie serie, int i) diff --git a/Runtime/XChartsMgr.cs b/Runtime/XChartsMgr.cs index 91b38cbb..c0ef1b47 100644 --- a/Runtime/XChartsMgr.cs +++ b/Runtime/XChartsMgr.cs @@ -130,7 +130,7 @@ namespace XCharts url = "https://gitee.com/monitor1394/unity-ugui-XCharts/raw/master/Assets/XCharts/package.json"; web = UnityWebRequest.Get(url); #if UNITY_2017_3_OR_NEWER - yield return web.SendWebRequest(); + yield return web.SendWebRequest(); #else yield return web.Send(); #endif @@ -141,7 +141,7 @@ namespace XCharts url = "https://raw.githubusercontent.com/monitor1394/unity-ugui-XCharts/master/Assets/XCharts/CHANGELOG.md"; web = UnityWebRequest.Get(url); #if UNITY_2017_3_OR_NEWER - yield return web.SendWebRequest(); + yield return web.SendWebRequest(); #else yield return web.Send(); #endif @@ -150,7 +150,7 @@ namespace XCharts url = "https://gitee.com/monitor1394/unity-ugui-XCharts/raw/master/Assets/XCharts/CHANGELOG.md"; web = UnityWebRequest.Get(url); #if UNITY_2017_3_OR_NEWER - yield return web.SendWebRequest(); + yield return web.SendWebRequest(); #else yield return web.Send(); #endif @@ -242,9 +242,9 @@ namespace XCharts public bool IsWebRequestError(UnityWebRequest request) { #if UNITY_5 - return request.isError && ! request.responseCode >= 400; + return request.isError && request.responseCode < 400; #elif UNITY_2017_1 - return request.isError && ! request.isHttpError; + return request.isError && !request.isHttpError; #elif UNITY_2020_2 return (int)request.result > 1; #else @@ -426,7 +426,7 @@ namespace XCharts var tmpName = "\"Unity.TextMeshPro\""; foreach (var line in lines) { - if (string.IsNullOrWhiteSpace(line)) continue; + if (string.IsNullOrEmpty(line)) continue; if (line.Contains("\"references\": [")) { dest.Add(line); @@ -472,7 +472,7 @@ namespace XCharts dest.Add(line); } } - if (addedTMP || removedTMP) File.WriteAllText(asmdefPath, string.Join("\n", dest)); + if (addedTMP || removedTMP) File.WriteAllText(asmdefPath, string.Join("\n", dest.ToArray())); return true; } catch (System.Exception e)