foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-19 06:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

兼容unity5.6

Browse Source
This commit is contained in:
monitor1394
2021-04-13 09:57:33 +08:00
parent 620d7b4698
commit 32e9ce864b
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Internal/BaseGraph.cs
View File

@@ -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)
{

2
Runtime/Internal/DrawSerieRadar.cs
View File

@@ -265,7 +265,7 @@ namespace XCharts
}
chart.RefreshBasePainter();
};
radar.refreshComponent?.Invoke();
radar.refreshComponent.Invoke();
}
private void DrawMutipleRadar(VertexHelper vh, Serie serie, int i)

14
Runtime/XChartsMgr.cs
View File

@@ -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)