diff --git a/CHANGELOG-EN.md b/CHANGELOG-EN.md index 0657a686..54237c77 100644 --- a/CHANGELOG-EN.md +++ b/CHANGELOG-EN.md @@ -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) Release `v2.0.0-preview.1` version * (2021.01.02) Release `v1.6.3` version diff --git a/CHANGELOG.md b/CHANGELOG.md index 221ead9d..cf32082b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # 更新日志 +* (2021.01.21) 修复打包兼容报错问题 * (2021.01.19) 增加`XChartsSettings`的`editorShowAllListData`参数配置是否在`Inspector`中显示列表的所有数据 * (2021.01.19) 发布`v2.0.0-preview.1`版本 * (2021.01.02) 发布`v1.6.3`版本 diff --git a/Examples/Runtime/Example80_Polar.cs b/Examples/Runtime/Example80_Polar.cs index 4e695d0c..24001edf 100644 --- a/Examples/Runtime/Example80_Polar.cs +++ b/Examples/Runtime/Example80_Polar.cs @@ -1,5 +1,4 @@ -using System.Runtime.InteropServices; -/************************************************/ +/************************************************/ /* */ /* Copyright (c) 2018 - 2021 monitor1394 */ /* https://github.com/monitor1394 */ diff --git a/Runtime/Utils/DefineSymbolsUtil.cs b/Runtime/Utils/DefineSymbolsUtil.cs index fe26908a..a0322442 100644 --- a/Runtime/Utils/DefineSymbolsUtil.cs +++ b/Runtime/Utils/DefineSymbolsUtil.cs @@ -1,3 +1,4 @@ +#if UNITY_EDITOR /************************************************/ /* */ /* Copyright (c) 2018 - 2021 monitor1394 */ @@ -90,4 +91,5 @@ namespace XCharts } } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/Runtime/XChartsMgr.cs b/Runtime/XChartsMgr.cs index cf6c8120..066bbea3 100644 --- a/Runtime/XChartsMgr.cs +++ b/Runtime/XChartsMgr.cs @@ -412,8 +412,10 @@ namespace XCharts } } +#if UNITY_EDITOR public static void EnableTextMeshPro() { + DefineSymbolsUtil.AddGlobalDefine("dUI_TextMeshPro"); RemoveAllChartObject(); } @@ -423,5 +425,6 @@ namespace XCharts DefineSymbolsUtil.RemoveGlobalDefine("dUI_TextMeshPro"); RemoveAllChartObject(); } +#endif } } \ No newline at end of file diff --git a/Runtime/XChartsSettings.cs b/Runtime/XChartsSettings.cs index d7e3a511..cae8b93f 100644 --- a/Runtime/XChartsSettings.cs +++ b/Runtime/XChartsSettings.cs @@ -18,9 +18,9 @@ namespace XCharts public class XChartsSettings : ScriptableObject { - [SerializeField] private Font m_Font; + [SerializeField] private Font m_Font = null; #if dUI_TextMeshPro - [SerializeField] private TMP_FontAsset m_TMPFont; + [SerializeField] private TMP_FontAsset m_TMPFont = null; #endif [SerializeField] [Range(1, 200)] private int m_FontSizeLv1 = 28; [SerializeField] [Range(1, 200)] private int m_FontSizeLv2 = 24;