diff --git a/Runtime/Component/Child/MLValue.cs b/Runtime/Component/Child/MLValue.cs index 4b8dd16a..589127ba 100644 --- a/Runtime/Component/Child/MLValue.cs +++ b/Runtime/Component/Child/MLValue.cs @@ -10,20 +10,24 @@ namespace XCharts.Runtime [System.Serializable] public class MLValue : ChildComponent { + /// + /// the type of value. + /// |数值类型。 + /// public enum Type { /// - /// Percent form. + /// Percent value form. /// |百分比形式。 /// Percent, /// - /// Absolute form. + /// Absolute value form. /// |绝对值形式。 /// Absolute, /// - /// Extra form. + /// Extra value form. /// |额外形式。 /// Extra @@ -34,18 +38,24 @@ namespace XCharts.Runtime public Type type { get { return m_Type; } set { m_Type = value; } } public float value { get { return m_Value; } set { m_Value = value; } } - public MLValue(Type type, float value) - { - m_Type = type; - m_Value = value; - } - public MLValue(float value) { m_Type = Type.Percent; m_Value = value; } + public MLValue(Type type, float value) + { + m_Type = type; + m_Value = value; + } + + /// + /// Get the value by type. + /// |根据类型获取值。 + /// + /// 默认值 + /// public float GetValue(float total) { switch (m_Type) diff --git a/Runtime/Serie/Bar/BarHandler.PolarCoord.cs b/Runtime/Serie/Bar/BarHandler.PolarCoord.cs index 278196ac..5cb75bc1 100644 --- a/Runtime/Serie/Bar/BarHandler.PolarCoord.cs +++ b/Runtime/Serie/Bar/BarHandler.PolarCoord.cs @@ -27,7 +27,7 @@ namespace XCharts.Runtime m_LastCheckContextFlag = needCheck; serie.context.pointerItemDataIndex = -1; serie.context.pointerEnter = false; - serie.interact.SetValue(ref needAnimation1, lineWidth, false); + serie.interact.SetValue(ref needAnimation1, lineWidth); foreach (var serieData in serie.data) { var symbol = SerieHelper.GetSerieSymbol(serie, serieData); @@ -53,7 +53,7 @@ namespace XCharts.Runtime if (m_LegendEnter) { serie.context.pointerEnter = true; - serie.interact.SetValue(ref needInteract, lineWidth, true, serie.animation.interaction.GetWidth(lineWidth)); + serie.interact.SetValue(ref needInteract, serie.animation.interaction.GetWidth(lineWidth)); for (int i = 0; i < serie.dataCount; i++) { var serieData = serie.data[i]; diff --git a/Runtime/Serie/Heatmap/HeatmapHandler.PolarCoord.cs b/Runtime/Serie/Heatmap/HeatmapHandler.PolarCoord.cs index f32cfb26..95f6c932 100644 --- a/Runtime/Serie/Heatmap/HeatmapHandler.PolarCoord.cs +++ b/Runtime/Serie/Heatmap/HeatmapHandler.PolarCoord.cs @@ -27,7 +27,7 @@ namespace XCharts.Runtime m_LastCheckContextFlag = needCheck; serie.context.pointerItemDataIndex = -1; serie.context.pointerEnter = false; - serie.interact.SetValue(ref needAnimation1, lineWidth, false); + serie.interact.SetValue(ref needAnimation1, lineWidth); foreach (var serieData in serie.data) { var symbol = SerieHelper.GetSerieSymbol(serie, serieData); @@ -53,7 +53,7 @@ namespace XCharts.Runtime if (m_LegendEnter) { serie.context.pointerEnter = true; - serie.interact.SetValue(ref needInteract, lineWidth, true, serie.animation.interaction.GetWidth(lineWidth)); + serie.interact.SetValue(ref needInteract, serie.animation.interaction.GetWidth(lineWidth)); for (int i = 0; i < serie.dataCount; i++) { var serieData = serie.data[i]; diff --git a/Runtime/Serie/Line/LineHandler.GridCoord.cs b/Runtime/Serie/Line/LineHandler.GridCoord.cs index e5598134..5694aa3b 100644 --- a/Runtime/Serie/Line/LineHandler.GridCoord.cs +++ b/Runtime/Serie/Line/LineHandler.GridCoord.cs @@ -61,7 +61,7 @@ namespace XCharts.Runtime if (m_LegendEnter) { serie.context.pointerEnter = true; - serie.interact.SetValue(ref needInteract, lineWidth, true, serie.animation.interaction.GetWidth(lineWidth)); + serie.interact.SetValue(ref needInteract, serie.animation.interaction.GetWidth(lineWidth)); for (int i = 0; i < serie.dataCount; i++) { var serieData = serie.data[i]; @@ -73,7 +73,7 @@ namespace XCharts.Runtime else if (serie.context.isTriggerByAxis) { serie.context.pointerEnter = false; - serie.interact.SetValue(ref needInteract, lineWidth, true, serie.animation.interaction.GetWidth(lineWidth)); + serie.interact.SetValue(ref needInteract, serie.animation.interaction.GetWidth(lineWidth)); for (int i = 0; i < serie.dataCount; i++) { var serieData = serie.data[i]; @@ -116,7 +116,7 @@ namespace XCharts.Runtime needInteract = true; } if (serie.context.pointerItemDataIndex >= 0) - serie.interact.SetValue(ref needInteract, lineWidth, true, serie.animation.interaction.GetWidth(lineWidth)); + serie.interact.SetValue(ref needInteract, serie.animation.interaction.GetWidth(lineWidth)); else serie.interact.SetValue(ref needInteract, lineWidth); } diff --git a/Runtime/Serie/Line/LineHandler.PolarCoord.cs b/Runtime/Serie/Line/LineHandler.PolarCoord.cs index d66c1b0b..e6e8b9cd 100644 --- a/Runtime/Serie/Line/LineHandler.PolarCoord.cs +++ b/Runtime/Serie/Line/LineHandler.PolarCoord.cs @@ -27,7 +27,7 @@ namespace XCharts.Runtime m_LastCheckContextFlag = needCheck; serie.context.pointerItemDataIndex = -1; serie.context.pointerEnter = false; - serie.interact.SetValue(ref needAnimation1, lineWidth, false); + serie.interact.SetValue(ref needAnimation1, lineWidth); foreach (var serieData in serie.data) { var symbol = SerieHelper.GetSerieSymbol(serie, serieData); @@ -53,7 +53,7 @@ namespace XCharts.Runtime if (m_LegendEnter) { serie.context.pointerEnter = true; - serie.interact.SetValue(ref needInteract, lineWidth, true, serie.animation.interaction.GetWidth(lineWidth)); + serie.interact.SetValue(ref needInteract, serie.animation.interaction.GetWidth(lineWidth)); for (int i = 0; i < serie.dataCount; i++) { var serieData = serie.data[i]; diff --git a/Runtime/Serie/Line/SimplifiedLineHandler.cs b/Runtime/Serie/Line/SimplifiedLineHandler.cs index 9e9ee788..4abe6af9 100644 --- a/Runtime/Serie/Line/SimplifiedLineHandler.cs +++ b/Runtime/Serie/Line/SimplifiedLineHandler.cs @@ -46,7 +46,7 @@ namespace XCharts.Runtime m_LastCheckContextFlag = needCheck; serie.context.pointerItemDataIndex = -1; serie.context.pointerEnter = false; - serie.interact.SetValue(ref needAnimation1, lineWidth, false); + serie.interact.SetValue(ref needAnimation1, lineWidth); foreach (var serieData in serie.data) { var symbol = SerieHelper.GetSerieSymbol(serie, serieData); @@ -72,7 +72,7 @@ namespace XCharts.Runtime if (m_LegendEnter) { serie.context.pointerEnter = true; - serie.interact.SetValue(ref needInteract, lineWidth, true, serie.animation.interaction.GetWidth(lineWidth)); + serie.interact.SetValue(ref needInteract, serie.animation.interaction.GetWidth(lineWidth)); for (int i = 0; i < serie.dataCount; i++) { var serieData = serie.data[i]; @@ -84,7 +84,7 @@ namespace XCharts.Runtime else if (serie.context.isTriggerByAxis) { serie.context.pointerEnter = true; - serie.interact.SetValue(ref needInteract, lineWidth, true, serie.animation.interaction.GetWidth(lineWidth)); + serie.interact.SetValue(ref needInteract, serie.animation.interaction.GetWidth(lineWidth)); for (int i = 0; i < serie.dataCount; i++) { var serieData = serie.data[i]; @@ -119,7 +119,7 @@ namespace XCharts.Runtime { serie.context.pointerEnter = true; serie.context.pointerItemDataIndex = serieData.index; - serie.interact.SetValue(ref needInteract, lineWidth, true); + serie.interact.SetValue(ref needInteract, serie.animation.interaction.GetWidth(lineWidth)); } } if (lastIndex != serie.context.pointerItemDataIndex) diff --git a/Runtime/Serie/Radar/RadarHandler.cs b/Runtime/Serie/Radar/RadarHandler.cs index 4710a1e0..6f32edfb 100644 --- a/Runtime/Serie/Radar/RadarHandler.cs +++ b/Runtime/Serie/Radar/RadarHandler.cs @@ -127,7 +127,7 @@ namespace XCharts.Runtime if (m_LegendEnter) { serieData.context.highlight = true; - serieData.interact.SetValue(ref needInteract, symbolSize, serieData.context.highlight); + serieData.interact.SetValue(ref needInteract, serie.animation.interaction.GetRadius(symbolSize)); } else { @@ -164,7 +164,10 @@ namespace XCharts.Runtime } } } - serieData.interact.SetValue(ref needInteract, symbolSize, serieData.context.highlight); + if (serieData.context.highlight) + serieData.interact.SetValue(ref needInteract, serie.animation.interaction.GetRadius(symbolSize)); + else + serieData.interact.SetValue(ref needInteract, symbolSize); } } break;