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

增加动态添加数据接口AddData

Browse Source
This commit is contained in:
monitor1394
2018-09-21 22:30:48 +08:00
parent 7e950e07c9
commit b2043a7d6d
5 changed files with 175 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/XCharts/Demo.cs
View File

@@ -5,19 +5,23 @@ public class Demo : MonoBehaviour
{ {
private LineChart lineChart; private LineChart lineChart;
private float time; private float time;
private int count;
void Awake () { void Awake()
{
lineChart = transform.Find("line_chart").GetComponent<LineChart>(); lineChart = transform.Find("line_chart").GetComponent<LineChart>();
} }
void Update () { void Update()
{
time += Time.deltaTime; time += Time.deltaTime;
if (time >= 1) if (time >= 1)
{ {
time = 0; time = 0;
//lineChart.AddPoint("fps", Random.Range(24.0f, 60.0f)); count++;
//lineChart.AddPoint("rtt", Random.Range(15, 30)); lineChart.AddXAxisCategory("key" + count);
//lineChart.AddPoint("ping", Random.Range(0, 100)); lineChart.AddData("line1", "key"+count, Random.Range(24.0f, 60.0f));
lineChart.AddData("line2", "key"+count, Random.Range(24.0f, 60.0f));
} }
} }
} }

3
Assets/XCharts/Scripts/BarChart.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic; using UnityEngine;
using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
namespace xcharts namespace xcharts

127
Assets/XCharts/Scripts/BaseChart.cs
View File

@@ -1,7 +1,5 @@
using UnityEngine; using UnityEngine;
using System.Collections;
using UnityEngine.UI; using UnityEngine.UI;
using xcharts;
using System.Collections.Generic; using System.Collections.Generic;
namespace xcharts namespace xcharts
@@ -73,9 +71,19 @@ namespace xcharts
{ {
public AxisType type; public AxisType type;
public int splitNumber = 5; public int splitNumber = 5;
public int maxSplitNumber = 5;
public bool showSplitLine; public bool showSplitLine;
public bool boundaryGap = true; public bool boundaryGap = true;
public List<string> data; public List<string> data;
public void AddCategory(string category)
{
if (data.Count >= maxSplitNumber)
{
data.RemoveAt(0);
}
data.Add(category);
}
} }
[System.Serializable] [System.Serializable]
@@ -115,13 +123,13 @@ namespace xcharts
public Color GetColor(int seriesIndex) public Color GetColor(int seriesIndex)
{ {
if (seriesIndex < 0 || seriesIndex > dataList.Count) seriesIndex = 0; if (seriesIndex < 0 || seriesIndex >= dataList.Count) seriesIndex = 0;
return dataList[seriesIndex].color; return dataList[seriesIndex].color;
} }
public bool IsShowSeries(int seriesIndex) public bool IsShowSeries(int seriesIndex)
{ {
if (seriesIndex < 0 || seriesIndex > dataList.Count) seriesIndex = 0; if (seriesIndex < 0 || seriesIndex >= dataList.Count) seriesIndex = 0;
return dataList[seriesIndex].show; return dataList[seriesIndex].show;
} }
} }
@@ -131,22 +139,29 @@ namespace xcharts
{ {
public string key; public string key;
public float value; public float value;
public SeriesData(string key, float value)
{
this.key = key;
this.value = value;
}
} }
[System.Serializable] [System.Serializable]
public class Series public class Series
{ {
public string legendKey; public string legendKey;
public int maxCount = 0;
public List<SeriesData> dataList = new List<SeriesData>(); public List<SeriesData> dataList = new List<SeriesData>();
public float max public float Max
{ {
get get
{ {
float max = 0; float max = 0;
foreach(var data in dataList) foreach (var data in dataList)
{ {
if(data.value > max) if (data.value > max)
{ {
max = data.value; max = data.value;
} }
@@ -155,7 +170,7 @@ namespace xcharts
} }
} }
public float total public float Total
{ {
get get
{ {
@@ -167,6 +182,15 @@ namespace xcharts
return total; return total;
} }
} }
public void AddData(string key, float value)
{
if (dataList.Count >= maxCount && maxCount != 0)
{
dataList.RemoveAt(0);
}
dataList.Add(new SeriesData(key, value));
}
} }
public class BaseChart : MaskableGraphic public class BaseChart : MaskableGraphic
@@ -185,9 +209,9 @@ namespace xcharts
[SerializeField] [SerializeField]
protected Coordinate coordinate; protected Coordinate coordinate;
[SerializeField] [SerializeField]
protected XAxis xAxis; public XAxis xAxis;
[SerializeField] [SerializeField]
protected YAxis yAxis; public YAxis yAxis;
[SerializeField] [SerializeField]
protected Legend legend; protected Legend legend;
[SerializeField] [SerializeField]
@@ -248,6 +272,31 @@ namespace xcharts
CheckCoordinateSizeChange(); CheckCoordinateSizeChange();
} }
public void AddData(string legend, string key, float value)
{
for (int i = 0; i < seriesList.Count; i++)
{
if (seriesList[i].legendKey == legend)
{
seriesList[i].AddData(key, value);
break;
}
}
RefreshChart();
}
public void AddXAxisCategory(string category)
{
xAxis.AddCategory(category);
OnXAxisType();
}
public void AddYAxisCategory(string category)
{
yAxis.AddCategory(category);
OnYAxisType();
}
private void HideChild(string match = null) private void HideChild(string match = null)
{ {
for (int i = 0; i < transform.childCount; i++) for (int i = 0; i < transform.childCount; i++)
@@ -371,7 +420,7 @@ namespace xcharts
private void InitLegend() private void InitLegend()
{ {
for(int i = 0; i < legend.dataList.Count; i++) for (int i = 0; i < legend.dataList.Count; i++)
{ {
LegendData data = legend.dataList[i]; LegendData data = legend.dataList[i];
Button btn = ChartUtils.AddButtonObject(LEGEND_TEXT + i, transform, font, Vector2.zero, Button btn = ChartUtils.AddButtonObject(LEGEND_TEXT + i, transform, font, Vector2.zero,
@@ -402,24 +451,27 @@ namespace xcharts
float startX = legend.left; float startX = legend.left;
if (startX <= 0) if (startX <= 0)
{ {
startX = (chartWid -(legendCount *legend.dataWid - (legendCount-1) * legend.dataSpace)) / 2; startX = (chartWid - (legendCount * legend.dataWid -
(legendCount - 1) * legend.dataSpace)) / 2;
} }
float posY = legend.location == Location.bottom ? legend.bottom : chartHig - legend.top - legend.dataHig; float posY = legend.location == Location.bottom ?
return new Vector3(startX + i * (legend.dataWid+legend.dataSpace),posY,0); legend.bottom : chartHig - legend.top - legend.dataHig;
return new Vector3(startX + i * (legend.dataWid + legend.dataSpace), posY, 0);
case Location.left: case Location.left:
case Location.right: case Location.right:
float startY =0; float startY = 0;
if (legend.top > 0) if (legend.top > 0)
{ {
startY = chartHig - legend.top- legend.dataHig; startY = chartHig - legend.top - legend.dataHig;
} }
else if (startY <= 0) else if (startY <= 0)
{ {
startY = chartHig - (chartHig - (legendCount * legend.dataHig - (legendCount - 1) * legend.dataSpace)) / 2 - legend.dataHig; float offset = (chartHig - (legendCount * legend.dataHig - (legendCount - 1) * legend.dataSpace)) / 2;
startY = chartHig - offset - legend.dataHig;
} }
float posX = legend.location == Location.left ? legend.left : chartWid - legend.right - legend.dataWid; float posX = legend.location == Location.left ? legend.left : chartWid - legend.right - legend.dataWid;
return new Vector3(posX,startY - i * (legend.dataHig + legend.dataSpace), 0); return new Vector3(posX, startY - i * (legend.dataHig + legend.dataSpace), 0);
default:break; default: break;
} }
return Vector3.zero; return Vector3.zero;
} }
@@ -463,7 +515,7 @@ namespace xcharts
} }
else else
{ {
return new Vector3(zeroX + (i + 1- 0.5f) * scaleWid, zeroY - coordinate.scaleLen - 5, 0); return new Vector3(zeroX + (i + 1 - 0.5f) * scaleWid, zeroY - coordinate.scaleLen - 5, 0);
} }
} }
} }
@@ -521,7 +573,8 @@ namespace xcharts
lastXMaxValue = max; lastXMaxValue = max;
OnXMaxValueChanged(); OnXMaxValueChanged();
} }
}else if(yAxis.type == AxisType.value) }
else if (yAxis.type == AxisType.value)
{ {
float max = GetMaxValue(); float max = GetMaxValue();
@@ -536,11 +589,12 @@ namespace xcharts
protected float GetMaxValue() protected float GetMaxValue()
{ {
float max = 0; float max = 0;
for(int i = 0; i < seriesList.Count; i++) for (int i = 0; i < seriesList.Count; i++)
{ {
if (legend.IsShowSeries(i) && seriesList[i].max > max) max = seriesList[i].max; if (legend.IsShowSeries(i) && seriesList[i].Max > max) max = seriesList[i].Max;
} }
return max; int bigger = (int)(max * 1.3f);
return bigger < 10 ? bigger : bigger - bigger % 10;
} }
private void CheckTile() private void CheckTile()
@@ -628,7 +682,7 @@ namespace xcharts
float max = GetMaxValue(); float max = GetMaxValue();
for (int i = 0; i < yScaleTextList.Count; i++) for (int i = 0; i < yScaleTextList.Count; i++)
{ {
yScaleTextList[i].text = ((int)(max * i / (yScaleTextList.Count -1))).ToString(); yScaleTextList[i].text = ((int)(max * i / (yScaleTextList.Count - 1))).ToString();
} }
} }
@@ -643,8 +697,9 @@ namespace xcharts
{ {
Button btn = legend.dataList[i].button; Button btn = legend.dataList[i].button;
btn.GetComponent<RectTransform>().sizeDelta = new Vector2(legend.dataWid, legend.dataHig); btn.GetComponent<RectTransform>().sizeDelta = new Vector2(legend.dataWid, legend.dataHig);
btn.GetComponentInChildren<Text>().transform.GetComponent<RectTransform>().sizeDelta = new Vector2(legend.dataWid, legend.dataHig); Text txt = btn.GetComponentInChildren<Text>();
btn.GetComponentInChildren<Text>().transform.localPosition = Vector3.zero; txt.transform.GetComponent<RectTransform>().sizeDelta = new Vector2(legend.dataWid, legend.dataHig);
txt.transform.localPosition = Vector3.zero;
btn.transform.localPosition = GetLegendPosition(i); btn.transform.localPosition = GetLegendPosition(i);
btn.gameObject.SetActive(legend.show); btn.gameObject.SetActive(legend.show);
} }
@@ -682,25 +737,31 @@ namespace xcharts
{ {
float pX = zeroX - coordinate.scaleLen; float pX = zeroX - coordinate.scaleLen;
float pY = zeroY + i * coordinateHig / (yAxis.splitNumber - 1); float pY = zeroY + i * coordinateHig / (yAxis.splitNumber - 1);
ChartUtils.DrawLine(vh, new Vector3(pX, pY), new Vector3(zeroX, pY), coordinate.tickness, Color.white); ChartUtils.DrawLine(vh, new Vector3(pX, pY), new Vector3(zeroX, pY), coordinate.tickness,
Color.white);
if (yAxis.showSplitLine) if (yAxis.showSplitLine)
{ {
ChartUtils.DrawLine(vh, new Vector3(zeroX, pY), new Vector3(zeroX + coordinateWid, pY), coordinate.tickness, Color.grey); ChartUtils.DrawLine(vh, new Vector3(zeroX, pY),
new Vector3(zeroX + coordinateWid, pY), coordinate.tickness, Color.grey);
} }
} }
for (int i = 1; i < xAxis.splitNumber; i++) for (int i = 1; i < xAxis.splitNumber; i++)
{ {
float pX = zeroX + i * coordinateWid / (xAxis.splitNumber - 1); float pX = zeroX + i * coordinateWid / (xAxis.splitNumber - 1);
float pY = zeroY - coordinate.scaleLen - 2; float pY = zeroY - coordinate.scaleLen - 2;
ChartUtils.DrawLine(vh, new Vector3(pX, zeroY), new Vector3(pX, pY), coordinate.tickness, Color.white); ChartUtils.DrawLine(vh, new Vector3(pX, zeroY), new Vector3(pX, pY), coordinate.tickness,
Color.white);
if (xAxis.showSplitLine) if (xAxis.showSplitLine)
{ {
ChartUtils.DrawLine(vh, new Vector3(pX, zeroY), new Vector3(pX, zeroY + coordinateHig), coordinate.tickness, Color.grey); ChartUtils.DrawLine(vh, new Vector3(pX, zeroY), new Vector3(pX, zeroY + coordinateHig),
coordinate.tickness, Color.grey);
} }
} }
//draw x,y axis //draw x,y axis
ChartUtils.DrawLine(vh, new Vector3(zeroX, zeroY - coordinate.scaleLen), new Vector3(zeroX, zeroY + coordinateHig + 2), coordinate.tickness, Color.white); ChartUtils.DrawLine(vh, new Vector3(zeroX, zeroY - coordinate.scaleLen),
ChartUtils.DrawLine(vh, new Vector3(zeroX - coordinate.scaleLen, zeroY), new Vector3(zeroX + coordinateWid + 2, zeroY), coordinate.tickness, Color.white); new Vector3(zeroX, zeroY + coordinateHig + 2), coordinate.tickness, Color.white);
ChartUtils.DrawLine(vh, new Vector3(zeroX - coordinate.scaleLen, zeroY),
new Vector3(zeroX + coordinateWid + 2, zeroY), coordinate.tickness, Color.white);
} }
} }
} }

4
Assets/XCharts/Scripts/LineChart.cs
View File

@@ -1,6 +1,4 @@
 using UnityEngine;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
namespace xcharts namespace xcharts

117
Assets/XCharts/demo.unity
View File

@@ -136,7 +136,7 @@ RectTransform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 2394332} m_GameObject: {fileID: 2394332}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 422.5, y: 15, z: 0} m_LocalPosition: {x: 422.5, y: 20, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1505386462} m_Father: {fileID: 1505386462}
@@ -144,7 +144,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 422.5, y: 15} m_AnchoredPosition: {x: 422.5, y: 20}
m_SizeDelta: {x: 85, y: 20} m_SizeDelta: {x: 85, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &2394334 --- !u!114 &2394334
@@ -1061,7 +1061,7 @@ RectTransform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 235400232} m_GameObject: {fileID: 235400232}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 33, y: 200.55249, z: 0} m_LocalPosition: {x: 33, y: 200.5525, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 867959890} m_Father: {fileID: 867959890}
@@ -1069,7 +1069,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 33, y: 200.55249} m_AnchoredPosition: {x: 33, y: 200.5525}
m_SizeDelta: {x: 40, y: 20} m_SizeDelta: {x: 40, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &235400234 --- !u!114 &235400234
@@ -1104,7 +1104,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 300 m_Text: 93
--- !u!222 &235400235 --- !u!222 &235400235
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1348,7 +1348,7 @@ RectTransform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 310576448} m_GameObject: {fileID: 310576448}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 167.5, y: 15, z: 0} m_LocalPosition: {x: 167.5, y: 20, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1505386462} m_Father: {fileID: 1505386462}
@@ -1356,7 +1356,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 167.5, y: 15} m_AnchoredPosition: {x: 167.5, y: 20}
m_SizeDelta: {x: 85, y: 20} m_SizeDelta: {x: 85, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &310576450 --- !u!114 &310576450
@@ -1422,7 +1422,7 @@ RectTransform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 312954779} m_GameObject: {fileID: 312954779}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 337.5, y: 15, z: 0} m_LocalPosition: {x: 337.5, y: 20, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1505386462} m_Father: {fileID: 1505386462}
@@ -1430,7 +1430,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 337.5, y: 15} m_AnchoredPosition: {x: 337.5, y: 20}
m_SizeDelta: {x: 85, y: 20} m_SizeDelta: {x: 85, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &312954781 --- !u!114 &312954781
@@ -1724,7 +1724,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 23 m_Text: 29
--- !u!222 &348603706 --- !u!222 &348603706
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -1829,7 +1829,7 @@ RectTransform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 366227576} m_GameObject: {fileID: 366227576}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 422.5, y: 15, z: 0} m_LocalPosition: {x: 422.5, y: 20, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 822231471} m_Father: {fileID: 822231471}
@@ -1837,7 +1837,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 422.5, y: 15} m_AnchoredPosition: {x: 422.5, y: 20}
m_SizeDelta: {x: 85, y: 20} m_SizeDelta: {x: 85, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &366227578 --- !u!114 &366227578
@@ -2043,7 +2043,7 @@ RectTransform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 394926123} m_GameObject: {fileID: 394926123}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 252.5, y: 15, z: 0} m_LocalPosition: {x: 252.5, y: 20, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1505386462} m_Father: {fileID: 1505386462}
@@ -2051,7 +2051,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 252.5, y: 15} m_AnchoredPosition: {x: 252.5, y: 20}
m_SizeDelta: {x: 85, y: 20} m_SizeDelta: {x: 85, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &394926125 --- !u!114 &394926125
@@ -2347,7 +2347,7 @@ Camera:
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_ClearFlags: 2 m_ClearFlags: 2
m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0} m_BackGroundColor: {r: 1, g: 1, b: 1, a: 1}
m_NormalizedViewPortRect: m_NormalizedViewPortRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
@@ -2675,7 +2675,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 60 m_Text: 80
--- !u!222 &492181724 --- !u!222 &492181724
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -2823,7 +2823,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 45 m_Text: 60
--- !u!222 &500450068 --- !u!222 &500450068
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -3287,7 +3287,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 95 m_Text: 119
--- !u!222 &566565926 --- !u!222 &566565926
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -3435,7 +3435,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 71 m_Text: 89
--- !u!222 &635640133 --- !u!222 &635640133
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4385,7 +4385,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 100 m_Text: 31
--- !u!222 &841332740 --- !u!222 &841332740
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4622,7 +4622,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 30 m_Text: 40
--- !u!222 &902542137 --- !u!222 &902542137
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -4653,7 +4653,7 @@ RectTransform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 918887844} m_GameObject: {fileID: 918887844}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 82.5, y: 15, z: 0} m_LocalPosition: {x: 82.5, y: 20, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1505386462} m_Father: {fileID: 1505386462}
@@ -4661,7 +4661,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 82.5, y: 15} m_AnchoredPosition: {x: 82.5, y: 20}
m_SizeDelta: {x: 85, y: 20} m_SizeDelta: {x: 85, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &918887846 --- !u!114 &918887846
@@ -4918,7 +4918,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 15 m_Text: 20
--- !u!222 &979520139 --- !u!222 &979520139
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -5140,7 +5140,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 200 m_Text: 62
--- !u!222 &1096778763 --- !u!222 &1096778763
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -5391,7 +5391,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 0.8784314, g: 0.8784314, b: 0.8784314, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
@@ -5420,7 +5420,7 @@ MonoBehaviour:
xAxis: xAxis:
type: 1 type: 1
splitNumber: 6 splitNumber: 6
showSplitLine: 0 showSplitLine: 1
boundaryGap: 1 boundaryGap: 1
data: data:
- "\u5468\u4E00" - "\u5468\u4E00"
@@ -5447,11 +5447,16 @@ MonoBehaviour:
dataList: dataList:
- show: 1 - show: 1
type: 0 type: 0
key: week key: line1
text: "\u661F\u671F" text: line1
color: {r: 0.9338235, g: 0.3158521, b: 0.3158521, a: 1} color: {r: 0.9338235, g: 0.3158521, b: 0.3158521, a: 1}
- show: 1
type: 0
key: line2
text: line2
color: {r: 0.45662212, g: 0.6838235, b: 0.36705235, a: 1}
seriesList: seriesList:
- legendKey: week - legendKey: line1
dataList: dataList:
- key: - key:
value: 0 value: 0
@@ -5463,6 +5468,18 @@ MonoBehaviour:
value: 40 value: 40
- key: - key:
value: 60 value: 60
- legendKey: line2
dataList:
- key:
value: 20.13
- key:
value: 30
- key:
value: 80
- key:
value: 27.86
- key:
value: 30
lineData: lineData:
tickness: 1 tickness: 1
showPoint: 1 showPoint: 1
@@ -5808,8 +5825,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 370, y: 42.210003} m_AnchoredPosition: {x: 370, y: 42.21}
m_SizeDelta: {x: 72.425, y: 20} m_SizeDelta: {x: 82.5, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1402865510 --- !u!114 &1402865510
MonoBehaviour: MonoBehaviour:
@@ -6435,7 +6452,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 400 m_Text: 124
--- !u!222 &1507933106 --- !u!222 &1507933106
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -6466,7 +6483,7 @@ RectTransform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1534777650} m_GameObject: {fileID: 1534777650}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 252.5, y: 15, z: 0} m_LocalPosition: {x: 252.5, y: 20, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 822231471} m_Father: {fileID: 822231471}
@@ -6474,7 +6491,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 252.5, y: 15} m_AnchoredPosition: {x: 252.5, y: 20}
m_SizeDelta: {x: 85, y: 20} m_SizeDelta: {x: 85, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1534777652 --- !u!114 &1534777652
@@ -6651,7 +6668,7 @@ RectTransform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1555716909} m_GameObject: {fileID: 1555716909}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 82.5, y: 15, z: 0} m_LocalPosition: {x: 82.5, y: 20, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 822231471} m_Father: {fileID: 822231471}
@@ -6659,7 +6676,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 82.5, y: 15} m_AnchoredPosition: {x: 82.5, y: 20}
m_SizeDelta: {x: 85, y: 20} m_SizeDelta: {x: 85, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1555716911 --- !u!114 &1555716911
@@ -6844,8 +6861,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 172, y: 42.210003} m_AnchoredPosition: {x: 172, y: 42.21}
m_SizeDelta: {x: 72.425, y: 20} m_SizeDelta: {x: 82.5, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1565408695 --- !u!114 &1565408695
MonoBehaviour: MonoBehaviour:
@@ -7286,7 +7303,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1 m_HorizontalOverflow: 1
m_VerticalOverflow: 1 m_VerticalOverflow: 1
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: 47 m_Text: 59
--- !u!222 &1675486929 --- !u!222 &1675486929
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@@ -7428,7 +7445,7 @@ RectTransform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1748048610} m_GameObject: {fileID: 1748048610}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 337.5, y: 15, z: 0} m_LocalPosition: {x: 337.5, y: 20, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 822231471} m_Father: {fileID: 822231471}
@@ -7436,7 +7453,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 337.5, y: 15} m_AnchoredPosition: {x: 337.5, y: 20}
m_SizeDelta: {x: 85, y: 20} m_SizeDelta: {x: 85, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1748048612 --- !u!114 &1748048612
@@ -7502,7 +7519,7 @@ RectTransform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1750720942} m_GameObject: {fileID: 1750720942}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 167.5, y: 15, z: 0} m_LocalPosition: {x: 167.5, y: 20, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 822231471} m_Father: {fileID: 822231471}
@@ -7510,7 +7527,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 167.5, y: 15} m_AnchoredPosition: {x: 167.5, y: 20}
m_SizeDelta: {x: 85, y: 20} m_SizeDelta: {x: 85, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1750720944 --- !u!114 &1750720944
@@ -7991,8 +8008,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 304, y: 42.210003} m_AnchoredPosition: {x: 304, y: 42.21}
m_SizeDelta: {x: 72.425, y: 20} m_SizeDelta: {x: 82.5, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1859954397 --- !u!114 &1859954397
MonoBehaviour: MonoBehaviour:
@@ -8065,8 +8082,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 238, y: 42.210003} m_AnchoredPosition: {x: 238, y: 42.21}
m_SizeDelta: {x: 72.425, y: 20} m_SizeDelta: {x: 82.5, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1898376883 --- !u!114 &1898376883
MonoBehaviour: MonoBehaviour:
@@ -9101,8 +9118,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 106, y: 42.210003} m_AnchoredPosition: {x: 106, y: 42.21}
m_SizeDelta: {x: 72.425, y: 20} m_SizeDelta: {x: 82.5, y: 20}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &2127078497 --- !u!114 &2127078497
MonoBehaviour: MonoBehaviour: