From b2043a7d6dad91d1fadcb0bfbeee1f23d2bc8903 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Fri, 21 Sep 2018 22:30:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A8=E6=80=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3AddData?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/XCharts/Demo.cs | 14 +-- Assets/XCharts/Scripts/BarChart.cs | 3 +- Assets/XCharts/Scripts/BaseChart.cs | 133 ++++++++++++++++++++-------- Assets/XCharts/Scripts/LineChart.cs | 4 +- Assets/XCharts/demo.unity | 117 +++++++++++++----------- 5 files changed, 175 insertions(+), 96 deletions(-) diff --git a/Assets/XCharts/Demo.cs b/Assets/XCharts/Demo.cs index 78d0dc54..bdb18c4a 100644 --- a/Assets/XCharts/Demo.cs +++ b/Assets/XCharts/Demo.cs @@ -5,19 +5,23 @@ public class Demo : MonoBehaviour { private LineChart lineChart; private float time; + private int count; - void Awake () { + void Awake() + { lineChart = transform.Find("line_chart").GetComponent(); } - void Update () { + void Update() + { time += Time.deltaTime; if (time >= 1) { time = 0; - //lineChart.AddPoint("fps", Random.Range(24.0f, 60.0f)); - //lineChart.AddPoint("rtt", Random.Range(15, 30)); - //lineChart.AddPoint("ping", Random.Range(0, 100)); + count++; + lineChart.AddXAxisCategory("key" + count); + lineChart.AddData("line1", "key"+count, Random.Range(24.0f, 60.0f)); + lineChart.AddData("line2", "key"+count, Random.Range(24.0f, 60.0f)); } } } diff --git a/Assets/XCharts/Scripts/BarChart.cs b/Assets/XCharts/Scripts/BarChart.cs index 07681f3e..891cc77f 100644 --- a/Assets/XCharts/Scripts/BarChart.cs +++ b/Assets/XCharts/Scripts/BarChart.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; using UnityEngine.UI; namespace xcharts diff --git a/Assets/XCharts/Scripts/BaseChart.cs b/Assets/XCharts/Scripts/BaseChart.cs index d929acbd..abc18aab 100644 --- a/Assets/XCharts/Scripts/BaseChart.cs +++ b/Assets/XCharts/Scripts/BaseChart.cs @@ -1,7 +1,5 @@ using UnityEngine; -using System.Collections; using UnityEngine.UI; -using xcharts; using System.Collections.Generic; namespace xcharts @@ -73,9 +71,19 @@ namespace xcharts { public AxisType type; public int splitNumber = 5; + public int maxSplitNumber = 5; public bool showSplitLine; public bool boundaryGap = true; public List data; + + public void AddCategory(string category) + { + if (data.Count >= maxSplitNumber) + { + data.RemoveAt(0); + } + data.Add(category); + } } [System.Serializable] @@ -115,13 +123,13 @@ namespace xcharts 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; } 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; } } @@ -131,22 +139,29 @@ namespace xcharts { public string key; public float value; + + public SeriesData(string key, float value) + { + this.key = key; + this.value = value; + } } [System.Serializable] public class Series { public string legendKey; + public int maxCount = 0; public List dataList = new List(); - public float max + public float Max { get { float max = 0; - foreach(var data in dataList) + foreach (var data in dataList) { - if(data.value > max) + if (data.value > max) { max = data.value; } @@ -155,7 +170,7 @@ namespace xcharts } } - public float total + public float Total { get { @@ -167,6 +182,15 @@ namespace xcharts 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 @@ -185,9 +209,9 @@ namespace xcharts [SerializeField] protected Coordinate coordinate; [SerializeField] - protected XAxis xAxis; + public XAxis xAxis; [SerializeField] - protected YAxis yAxis; + public YAxis yAxis; [SerializeField] protected Legend legend; [SerializeField] @@ -248,6 +272,31 @@ namespace xcharts 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) { for (int i = 0; i < transform.childCount; i++) @@ -371,7 +420,7 @@ namespace xcharts 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]; Button btn = ChartUtils.AddButtonObject(LEGEND_TEXT + i, transform, font, Vector2.zero, @@ -402,24 +451,27 @@ namespace xcharts float startX = legend.left; 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; - return new Vector3(startX + i * (legend.dataWid+legend.dataSpace),posY,0); + float posY = legend.location == Location.bottom ? + legend.bottom : chartHig - legend.top - legend.dataHig; + return new Vector3(startX + i * (legend.dataWid + legend.dataSpace), posY, 0); case Location.left: case Location.right: - float startY =0; + float startY = 0; if (legend.top > 0) { - startY = chartHig - legend.top- legend.dataHig; + startY = chartHig - legend.top - legend.dataHig; } 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; - return new Vector3(posX,startY - i * (legend.dataHig + legend.dataSpace), 0); - default:break; + return new Vector3(posX, startY - i * (legend.dataHig + legend.dataSpace), 0); + default: break; } return Vector3.zero; } @@ -444,7 +496,7 @@ namespace xcharts return new Vector3(zeroX - coordinate.scaleLen - 2f, zeroY + i * scaleWid, 0); } - + } } @@ -463,7 +515,7 @@ namespace xcharts } 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,9 +573,10 @@ namespace xcharts lastXMaxValue = max; OnXMaxValueChanged(); } - }else if(yAxis.type == AxisType.value) + } + else if (yAxis.type == AxisType.value) { - + float max = GetMaxValue(); if (lastYMaxValue != max) { @@ -536,11 +589,12 @@ namespace xcharts protected float GetMaxValue() { 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() @@ -562,7 +616,7 @@ namespace xcharts { if (checkLegend.dataWid != legend.dataWid || checkLegend.dataHig != legend.dataHig || - checkLegend.dataSpace != legend.dataSpace || + checkLegend.dataSpace != legend.dataSpace || checkLegend.left != legend.left || checkLegend.right != legend.right || checkLegend.bottom != legend.bottom || @@ -628,7 +682,7 @@ namespace xcharts float max = GetMaxValue(); 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; btn.GetComponent().sizeDelta = new Vector2(legend.dataWid, legend.dataHig); - btn.GetComponentInChildren().transform.GetComponent().sizeDelta = new Vector2(legend.dataWid, legend.dataHig); - btn.GetComponentInChildren().transform.localPosition = Vector3.zero; + Text txt = btn.GetComponentInChildren(); + txt.transform.GetComponent().sizeDelta = new Vector2(legend.dataWid, legend.dataHig); + txt.transform.localPosition = Vector3.zero; btn.transform.localPosition = GetLegendPosition(i); btn.gameObject.SetActive(legend.show); } @@ -682,25 +737,31 @@ namespace xcharts { float pX = zeroX - coordinate.scaleLen; 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) { - 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++) { float pX = zeroX + i * coordinateWid / (xAxis.splitNumber - 1); 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) { - 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 - 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 - coordinate.scaleLen, zeroY), new Vector3(zeroX + coordinateWid + 2, zeroY), coordinate.tickness, Color.white); + 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 - coordinate.scaleLen, zeroY), + new Vector3(zeroX + coordinateWid + 2, zeroY), coordinate.tickness, Color.white); } } } \ No newline at end of file diff --git a/Assets/XCharts/Scripts/LineChart.cs b/Assets/XCharts/Scripts/LineChart.cs index 9360a721..3ec4fee2 100644 --- a/Assets/XCharts/Scripts/LineChart.cs +++ b/Assets/XCharts/Scripts/LineChart.cs @@ -1,6 +1,4 @@ - -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; using UnityEngine.UI; namespace xcharts diff --git a/Assets/XCharts/demo.unity b/Assets/XCharts/demo.unity index bebf6b1e..f84603cc 100644 --- a/Assets/XCharts/demo.unity +++ b/Assets/XCharts/demo.unity @@ -136,7 +136,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2394332} 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_Children: [] m_Father: {fileID: 1505386462} @@ -144,7 +144,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {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_Pivot: {x: 1, y: 0.5} --- !u!114 &2394334 @@ -1061,7 +1061,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 235400232} 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_Children: [] m_Father: {fileID: 867959890} @@ -1069,7 +1069,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {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_Pivot: {x: 1, y: 0.5} --- !u!114 &235400234 @@ -1104,7 +1104,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 300 + m_Text: 93 --- !u!222 &235400235 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1348,7 +1348,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 310576448} 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_Children: [] m_Father: {fileID: 1505386462} @@ -1356,7 +1356,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {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_Pivot: {x: 1, y: 0.5} --- !u!114 &310576450 @@ -1422,7 +1422,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 312954779} 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_Children: [] m_Father: {fileID: 1505386462} @@ -1430,7 +1430,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {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_Pivot: {x: 1, y: 0.5} --- !u!114 &312954781 @@ -1724,7 +1724,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 23 + m_Text: 29 --- !u!222 &348603706 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1829,7 +1829,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 366227576} 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_Children: [] m_Father: {fileID: 822231471} @@ -1837,7 +1837,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {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_Pivot: {x: 1, y: 0.5} --- !u!114 &366227578 @@ -2043,7 +2043,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 394926123} 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_Children: [] m_Father: {fileID: 1505386462} @@ -2051,7 +2051,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {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_Pivot: {x: 1, y: 0.5} --- !u!114 &394926125 @@ -2347,7 +2347,7 @@ Camera: m_Enabled: 1 serializedVersion: 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: serializedVersion: 2 x: 0 @@ -2675,7 +2675,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 60 + m_Text: 80 --- !u!222 &492181724 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2823,7 +2823,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 45 + m_Text: 60 --- !u!222 &500450068 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3287,7 +3287,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 95 + m_Text: 119 --- !u!222 &566565926 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3435,7 +3435,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 71 + m_Text: 89 --- !u!222 &635640133 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4385,7 +4385,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 100 + m_Text: 31 --- !u!222 &841332740 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4622,7 +4622,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 30 + m_Text: 40 --- !u!222 &902542137 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4653,7 +4653,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 918887844} 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_Children: [] m_Father: {fileID: 1505386462} @@ -4661,7 +4661,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {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_Pivot: {x: 1, y: 0.5} --- !u!114 &918887846 @@ -4918,7 +4918,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 15 + m_Text: 20 --- !u!222 &979520139 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5140,7 +5140,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 200 + m_Text: 62 --- !u!222 &1096778763 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5391,7 +5391,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: 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_OnCullStateChanged: m_PersistentCalls: @@ -5420,7 +5420,7 @@ MonoBehaviour: xAxis: type: 1 splitNumber: 6 - showSplitLine: 0 + showSplitLine: 1 boundaryGap: 1 data: - "\u5468\u4E00" @@ -5447,11 +5447,16 @@ MonoBehaviour: dataList: - show: 1 type: 0 - key: week - text: "\u661F\u671F" + key: line1 + text: line1 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: - - legendKey: week + - legendKey: line1 dataList: - key: value: 0 @@ -5463,6 +5468,18 @@ MonoBehaviour: value: 40 - key: value: 60 + - legendKey: line2 + dataList: + - key: + value: 20.13 + - key: + value: 30 + - key: + value: 80 + - key: + value: 27.86 + - key: + value: 30 lineData: tickness: 1 showPoint: 1 @@ -5808,8 +5825,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 370, y: 42.210003} - m_SizeDelta: {x: 72.425, y: 20} + m_AnchoredPosition: {x: 370, y: 42.21} + m_SizeDelta: {x: 82.5, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1402865510 MonoBehaviour: @@ -6435,7 +6452,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 400 + m_Text: 124 --- !u!222 &1507933106 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6466,7 +6483,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1534777650} 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_Children: [] m_Father: {fileID: 822231471} @@ -6474,7 +6491,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {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_Pivot: {x: 1, y: 0.5} --- !u!114 &1534777652 @@ -6651,7 +6668,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1555716909} 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_Children: [] m_Father: {fileID: 822231471} @@ -6659,7 +6676,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {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_Pivot: {x: 1, y: 0.5} --- !u!114 &1555716911 @@ -6844,8 +6861,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 172, y: 42.210003} - m_SizeDelta: {x: 72.425, y: 20} + m_AnchoredPosition: {x: 172, y: 42.21} + m_SizeDelta: {x: 82.5, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1565408695 MonoBehaviour: @@ -7286,7 +7303,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 47 + m_Text: 59 --- !u!222 &1675486929 CanvasRenderer: m_ObjectHideFlags: 0 @@ -7428,7 +7445,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1748048610} 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_Children: [] m_Father: {fileID: 822231471} @@ -7436,7 +7453,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {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_Pivot: {x: 1, y: 0.5} --- !u!114 &1748048612 @@ -7502,7 +7519,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1750720942} 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_Children: [] m_Father: {fileID: 822231471} @@ -7510,7 +7527,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {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_Pivot: {x: 1, y: 0.5} --- !u!114 &1750720944 @@ -7991,8 +8008,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 304, y: 42.210003} - m_SizeDelta: {x: 72.425, y: 20} + m_AnchoredPosition: {x: 304, y: 42.21} + m_SizeDelta: {x: 82.5, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1859954397 MonoBehaviour: @@ -8065,8 +8082,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 238, y: 42.210003} - m_SizeDelta: {x: 72.425, y: 20} + m_AnchoredPosition: {x: 238, y: 42.21} + m_SizeDelta: {x: 82.5, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1898376883 MonoBehaviour: @@ -9101,8 +9118,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 106, y: 42.210003} - m_SizeDelta: {x: 72.425, y: 20} + m_AnchoredPosition: {x: 106, y: 42.21} + m_SizeDelta: {x: 82.5, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &2127078497 MonoBehaviour: