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

整理代码，去除warning

Browse Source
This commit is contained in:
monitor1394
2020-03-22 08:45:05 +08:00
parent 27c2c88e26
commit d50db7b16c
9 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/XCharts/Demo/Runtime/Demo_Test.cs
View File

@@ -14,7 +14,6 @@ namespace XCharts
[ExecuteInEditMode] [ExecuteInEditMode]
public class Demo_Test : MonoBehaviour public class Demo_Test : MonoBehaviour
{ {
private float updateTime = 0;
BaseChart chart; BaseChart chart;
void Awake() void Awake()
{ {

1
Assets/XCharts/Runtime/Component/Sub/SerieLabel.cs
View File

@@ -102,7 +102,6 @@ namespace XCharts
[SerializeField] private float m_BorderWidth = 0.5f; [SerializeField] private float m_BorderWidth = 0.5f;
[SerializeField] private Color m_BorderColor = Color.grey; [SerializeField] private Color m_BorderColor = Color.grey;
[SerializeField] private bool m_ForceENotation = false; [SerializeField] private bool m_ForceENotation = false;
[NonSerialized] private bool m_LabelDirty = false;
/// <summary> /// <summary>
/// Whether the label is showed. /// Whether the label is showed.

2
Assets/XCharts/Runtime/Component/Sub/SerieSymbol.cs
View File

@@ -87,8 +87,6 @@ namespace XCharts
[SerializeField] private float m_SelectedDataScale = 1.5f; [SerializeField] private float m_SelectedDataScale = 1.5f;
[SerializeField] private SymbolSizeCallback m_SizeCallback; [SerializeField] private SymbolSizeCallback m_SizeCallback;
[SerializeField] private SymbolSizeCallback m_SelectedSizeCallback; [SerializeField] private SymbolSizeCallback m_SelectedSizeCallback;
[SerializeField] private Color m_Color;
[SerializeField] [Range(0, 1)] private float m_Opacity = 1;
[SerializeField] private int m_StartIndex; [SerializeField] private int m_StartIndex;
[SerializeField] private int m_Interval; [SerializeField] private int m_Interval;
[SerializeField] private bool m_ForceShowLast = false; [SerializeField] private bool m_ForceShowLast = false;

8
Assets/XCharts/Runtime/Component/Sub/TextStyle.cs
View File

@@ -25,10 +25,10 @@ namespace XCharts
[SerializeField] private int m_FontSize = 18; [SerializeField] private int m_FontSize = 18;
[SerializeField] private FontStyle m_FontStyle = FontStyle.Normal; [SerializeField] private FontStyle m_FontStyle = FontStyle.Normal;
[SerializeField] private float m_LineSpacing = 1f; [SerializeField] private float m_LineSpacing = 1f;
[SerializeField] private float m_PaddingLeft = 0f; // [SerializeField] private float m_PaddingLeft = 0f;
[SerializeField] private float m_PaddingRight = 0f; // [SerializeField] private float m_PaddingRight = 0f;
[SerializeField] private float m_PaddingTop = 0f; // [SerializeField] private float m_PaddingTop = 0f;
[SerializeField] private float m_PaddingBottom = 0f; // [SerializeField] private float m_PaddingBottom = 0f;
/// <summary> /// <summary>
/// Rotation of text. /// Rotation of text.

2
Assets/XCharts/Runtime/Helper/LegendHelper.cs
View File

@@ -55,7 +55,7 @@ namespace XCharts
ChartHelper.GetOrAddComponent<Button>(btnObj); ChartHelper.GetOrAddComponent<Button>(btnObj);
ChartHelper.GetOrAddComponent<Image>(iconObj); ChartHelper.GetOrAddComponent<Image>(iconObj);
ChartHelper.GetOrAddComponent<Image>(contentObj); ChartHelper.GetOrAddComponent<Image>(contentObj);
Text txt = ChartHelper.AddTextObject("Text", contentObj.transform, font, contentColor, ChartHelper.AddTextObject("Text", contentObj.transform, font, contentColor,
TextAnchor.MiddleLeft, anchorMin, anchorMax, pivot, sizeDelta, textStyle.fontSize, TextAnchor.MiddleLeft, anchorMin, anchorMax, pivot, sizeDelta, textStyle.fontSize,
textStyle.rotate, textStyle.fontStyle, textStyle.lineSpacing); textStyle.rotate, textStyle.fontStyle, textStyle.lineSpacing);
var item = new LegendItem(); var item = new LegendItem();

3
Assets/XCharts/Runtime/Internal/BaseChart.cs
View File

@@ -51,13 +51,11 @@ namespace XCharts
[SerializeField] protected Action<VertexHelper> m_CustomDrawCallback; [SerializeField] protected Action<VertexHelper> m_CustomDrawCallback;
[NonSerialized] private Theme m_CheckTheme = 0; [NonSerialized] private Theme m_CheckTheme = 0;
[NonSerialized] private Legend m_CheckLegend = Legend.defaultLegend;
[NonSerialized] private float m_CheckWidth = 0; [NonSerialized] private float m_CheckWidth = 0;
[NonSerialized] private float m_CheckHeight = 0; [NonSerialized] private float m_CheckHeight = 0;
[NonSerialized] private Vector2 m_CheckMinAnchor; [NonSerialized] private Vector2 m_CheckMinAnchor;
[NonSerialized] private Vector2 m_CheckMaxAnchor; [NonSerialized] private Vector2 m_CheckMaxAnchor;
[NonSerialized] private float m_CheckSerieCount = 0;
[NonSerialized] protected bool m_RefreshChart = false; [NonSerialized] protected bool m_RefreshChart = false;
[NonSerialized] protected bool m_RefreshLabel = false; [NonSerialized] protected bool m_RefreshLabel = false;
[NonSerialized] protected bool m_ReinitLabel = false; [NonSerialized] protected bool m_ReinitLabel = false;
@@ -296,7 +294,6 @@ namespace XCharts
if (!m_Series.IsLegalLegendName(datas[i])) continue; if (!m_Series.IsLegalLegendName(datas[i])) continue;
string legendName = m_Legend.GetFormatterContent(datas[i]); string legendName = m_Legend.GetFormatterContent(datas[i]);
var readIndex = m_LegendRealShowName.IndexOf(datas[i]); var readIndex = m_LegendRealShowName.IndexOf(datas[i]);
var objName = s_LegendObjectName + "_" + i + "_" + datas[i];
var active = IsActiveByLegend(datas[i]); var active = IsActiveByLegend(datas[i]);
var bgColor = LegendHelper.GetIconColor(m_Legend, readIndex, themeInfo, active); var bgColor = LegendHelper.GetIconColor(m_Legend, readIndex, themeInfo, active);
var item = LegendHelper.AddLegendItem(m_Legend, i, datas[i], legendObject.transform, m_ThemeInfo, var item = LegendHelper.AddLegendItem(m_Legend, i, datas[i], legendObject.transform, m_ThemeInfo,

1
Assets/XCharts/Runtime/Internal/CoordinateChart_DrawLine.cs
View File

@@ -171,7 +171,6 @@ namespace XCharts
lp = startPos; lp = startPos;
stPos1 = stPos2 = lastDir = lastDnPos = Vector3.zero; stPos1 = stPos2 = lastDir = lastDnPos = Vector3.zero;
smoothStartPosUp = smoothStartPosDn = Vector3.zero; smoothStartPosUp = smoothStartPosDn = Vector3.zero;
int dataCount = endIndex - startIndex;
float currDetailProgress = lp.x; float currDetailProgress = lp.x;
float totalDetailProgress = endPos.x; float totalDetailProgress = endPos.x;
serie.animation.InitProgress(serie.dataPoints.Count, currDetailProgress, totalDetailProgress); serie.animation.InitProgress(serie.dataPoints.Count, currDetailProgress, totalDetailProgress);

1
Assets/XCharts/Runtime/PieChart.cs
View File

@@ -570,7 +570,6 @@ namespace XCharts
return angle; return angle;
} }
StringBuilder sb = new StringBuilder();
protected override void UpdateTooltip() protected override void UpdateTooltip()
{ {
base.UpdateTooltip(); base.UpdateTooltip();

1
Assets/XCharts/Runtime/RingChart.cs
View File

@@ -320,7 +320,6 @@ namespace XCharts
return angle; return angle;
} }
StringBuilder sb = new StringBuilder();
protected override void UpdateTooltip() protected override void UpdateTooltip()
{ {
base.UpdateTooltip(); base.UpdateTooltip();