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

Fixed a build compatibility error

Browse Source
This commit is contained in:
monitor1394
2021-01-21 12:34:48 +08:00
parent 2a0782e5aa
commit 104a0cb15d
6 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG-EN.md
View File

@@ -1,6 +1,7 @@
# 更新日志 # 更新日志
* (2021.01.21) Fixed a build compatibility error
* (2021.01.19) Add `XChartsSettings` `editorShowAllListData` parameter to configure whether to display all the list's data in Inspector * (2021.01.19) Add `XChartsSettings` `editorShowAllListData` parameter to configure whether to display all the list's data in Inspector
* (2021.01.19) Release `v2.0.0-preview.1` version * (2021.01.19) Release `v2.0.0-preview.1` version
* (2021.01.02) Release `v1.6.3` version * (2021.01.02) Release `v1.6.3` version

1
CHANGELOG.md
View File

@@ -1,6 +1,7 @@
# 更新日志 # 更新日志
* (2021.01.21) 修复打包兼容报错问题
* (2021.01.19) 增加`XChartsSettings`的`editorShowAllListData`参数配置是否在`Inspector`中显示列表的所有数据 * (2021.01.19) 增加`XChartsSettings`的`editorShowAllListData`参数配置是否在`Inspector`中显示列表的所有数据
* (2021.01.19) 发布`v2.0.0-preview.1`版本 * (2021.01.19) 发布`v2.0.0-preview.1`版本
* (2021.01.02) 发布`v1.6.3`版本 * (2021.01.02) 发布`v1.6.3`版本

3
Examples/Runtime/Example80_Polar.cs
View File

@@ -1,5 +1,4 @@
using System.Runtime.InteropServices; /************************************************/
/************************************************/
/* */ /* */
/* Copyright (c) 2018 - 2021 monitor1394 */ /* Copyright (c) 2018 - 2021 monitor1394 */
/* https://github.com/monitor1394 */ /* https://github.com/monitor1394 */

4
Runtime/Utils/DefineSymbolsUtil.cs
View File

@@ -1,3 +1,4 @@
#if UNITY_EDITOR
/************************************************/ /************************************************/
/* */ /* */
/* Copyright (c) 2018 - 2021 monitor1394 */ /* Copyright (c) 2018 - 2021 monitor1394 */
@@ -90,4 +91,5 @@ namespace XCharts
} }
} }
} }
} }
#endif

3
Runtime/XChartsMgr.cs
View File

@@ -412,8 +412,10 @@ namespace XCharts
} }
} }
#if UNITY_EDITOR
public static void EnableTextMeshPro() public static void EnableTextMeshPro()
{ {
DefineSymbolsUtil.AddGlobalDefine("dUI_TextMeshPro"); DefineSymbolsUtil.AddGlobalDefine("dUI_TextMeshPro");
RemoveAllChartObject(); RemoveAllChartObject();
} }
@@ -423,5 +425,6 @@ namespace XCharts
DefineSymbolsUtil.RemoveGlobalDefine("dUI_TextMeshPro"); DefineSymbolsUtil.RemoveGlobalDefine("dUI_TextMeshPro");
RemoveAllChartObject(); RemoveAllChartObject();
} }
#endif
} }
} }

4
Runtime/XChartsSettings.cs
View File

@@ -18,9 +18,9 @@ namespace XCharts
public class XChartsSettings : ScriptableObject public class XChartsSettings : ScriptableObject
{ {
[SerializeField] private Font m_Font; [SerializeField] private Font m_Font = null;
#if dUI_TextMeshPro #if dUI_TextMeshPro
[SerializeField] private TMP_FontAsset m_TMPFont; [SerializeField] private TMP_FontAsset m_TMPFont = null;
#endif #endif
[SerializeField] [Range(1, 200)] private int m_FontSizeLv1 = 28; [SerializeField] [Range(1, 200)] private int m_FontSizeLv1 = 28;
[SerializeField] [Range(1, 200)] private int m_FontSizeLv2 = 24; [SerializeField] [Range(1, 200)] private int m_FontSizeLv2 = 24;