diff --git a/Assets/XCharts/Demo/Scripts/Demo10_LineSimple.cs b/Assets/XCharts/Demo/Scripts/Demo10_LineSimple.cs new file mode 100644 index 00000000..220047ba --- /dev/null +++ b/Assets/XCharts/Demo/Scripts/Demo10_LineSimple.cs @@ -0,0 +1,39 @@ +using UnityEngine; +using XCharts; + +[DisallowMultipleComponent] +[ExecuteInEditMode] +public class Demo10_LineSimple : MonoBehaviour +{ + void Awake() + { + var chart = gameObject.GetComponent(); + if (chart == null) return; + + chart.title.show = true; + chart.title.text = "Line Simple"; + + chart.tooltip.show = true; + chart.legend.show = false; + + chart.xAxises[0].show = true; + chart.xAxises[1].show = false; + chart.yAxises[0].show = true; + chart.yAxises[1].show = false; + + chart.xAxises[0].type = Axis.AxisType.Category; + chart.yAxises[0].type = Axis.AxisType.Value; + + int dataCount = 10; + chart.xAxises[0].splitNumber = dataCount; + chart.xAxises[0].boundaryGap = true; + + chart.RemoveData(); + chart.AddSerie("test", SerieType.Line); + for (int i = 0; i < dataCount; i++) + { + chart.AddXAxisData("x" + i); + chart.AddData(0, Random.Range(10, 20)); + } + } +} diff --git a/Assets/XCharts/Demo/Scripts/Demo_Test.cs.meta b/Assets/XCharts/Demo/Scripts/Demo10_LineSimple.cs.meta similarity index 71% rename from Assets/XCharts/Demo/Scripts/Demo_Test.cs.meta rename to Assets/XCharts/Demo/Scripts/Demo10_LineSimple.cs.meta index b7ff103b..cdda2186 100644 --- a/Assets/XCharts/Demo/Scripts/Demo_Test.cs.meta +++ b/Assets/XCharts/Demo/Scripts/Demo10_LineSimple.cs.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 79b834e804f7aa844bc2ad80cf2bda9f -timeCreated: 1557366438 -licenseType: Free +guid: 75496d488607d421fbf2c190f80ed0a7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/XCharts/Demo/Scripts/Demo_Dynamic.cs b/Assets/XCharts/Demo/Scripts/Demo_Dynamic.cs index ce9e287b..4719ea2f 100644 --- a/Assets/XCharts/Demo/Scripts/Demo_Dynamic.cs +++ b/Assets/XCharts/Demo/Scripts/Demo_Dynamic.cs @@ -21,8 +21,8 @@ public class Demo_Dynamic : MonoBehaviour void Awake() { chart = gameObject.GetComponentInChildren(); - chart.ClearAxisData(); - chart.series.ClearData(); + chart.RemoveData(); + chart.AddSerie("data", SerieType.Line); chart.maxCacheDataNumber = maxCacheDataNumber; timeNow = DateTime.Now; timeNow = timeNow.AddSeconds(-maxCacheDataNumber); @@ -30,14 +30,16 @@ public class Demo_Dynamic : MonoBehaviour void Update() { - if (initCount< maxCacheDataNumber) + if (initCount < maxCacheDataNumber) { int count = (int)(maxCacheDataNumber / initDataTime * Time.deltaTime); for (int i = 0; i < count; i++) { timeNow = timeNow.AddSeconds(1); - chart.AddXAxisData(timeNow.ToString("hh:mm:ss")); - chart.AddData(0, UnityEngine.Random.Range(60, 150)); + string category = timeNow.ToString("hh:mm:ss"); + float value = UnityEngine.Random.Range(60, 150); + chart.AddXAxisData(category); + chart.AddData(0, value); initCount++; if (initCount > maxCacheDataNumber) break; } @@ -48,8 +50,10 @@ public class Demo_Dynamic : MonoBehaviour { updateTime = 0; count++; - chart.AddXAxisData(DateTime.Now.ToString("hh:mm:ss")); - chart.AddData(0, UnityEngine.Random.Range(60, 150)); + string category = DateTime.Now.ToString("hh:mm:ss"); + float value = UnityEngine.Random.Range(60, 150); + chart.AddXAxisData(category); + chart.AddData(0, value); chart.RefreshChart(); } } diff --git a/Assets/XCharts/Demo/Scripts/Demo_LargeData.cs b/Assets/XCharts/Demo/Scripts/Demo_LargeData.cs index 926a0723..dcd429a6 100644 --- a/Assets/XCharts/Demo/Scripts/Demo_LargeData.cs +++ b/Assets/XCharts/Demo/Scripts/Demo_LargeData.cs @@ -37,34 +37,6 @@ public class Demo_LargeData : MonoBehaviour initCount++; if (initCount > maxCacheDataNumber) break; } - chart.RefreshChart(); - } - } - - void GenerateData(int count, CoordinateChart chart) - { - var baseValue = Random.Range(0, 1000); - var time = new System.DateTime(2011, 1, 1); - var smallBaseValue = 0; - - chart.xAxises[0].ClearData(); - for (var i = 0; i < count; i++) - { - chart.AddXAxisData(time.ToString("hh:mm:ss")); - - smallBaseValue = i % 30 == 0 - ? Random.Range(0, 700) - : (smallBaseValue + Random.Range(0, 500) - 250); - baseValue += Random.Range(0, 20) - 10; - float value = Mathf.Max( - 0, - Mathf.Round(baseValue + smallBaseValue) + 3000 - ); - //var index = i % 100; - //var value = (Mathf.Sin(index / 5) * (index / 5 - 10) + index / 6) * 5; - value = Mathf.Abs(value); - chart.AddData(0, value); - time = time.AddSeconds(1); } } } diff --git a/Assets/XCharts/Demo/Scripts/Demo_Test.cs b/Assets/XCharts/Demo/Scripts/Demo_Test.cs deleted file mode 100644 index cf8b79a6..00000000 --- a/Assets/XCharts/Demo/Scripts/Demo_Test.cs +++ /dev/null @@ -1,30 +0,0 @@ -using UnityEngine; -using XCharts; - -[DisallowMultipleComponent] -[ExecuteInEditMode] -//[RequireComponent(typeof(CoordinateChart))] -public class Demo_Test : MonoBehaviour -{ - private CoordinateChart chart; - private float time; - private int count; - - void Awake() - { - chart = gameObject.GetComponentInChildren(); - } - - void Update() - { - time += Time.deltaTime; - if (time >= 1) - { - time = 0; - count++; - chart.UpdateData(0, Random.Range(60, 150)); - chart.AddXAxisData("time" + count); - chart.AddData(0, Random.Range(60, 150)); - } - } -} diff --git a/Assets/XCharts/Demo/demo_xchart.unity b/Assets/XCharts/Demo/demo_xchart.unity index 56e94352..07f33e72 100644 --- a/Assets/XCharts/Demo/demo_xchart.unity +++ b/Assets/XCharts/Demo/demo_xchart.unity @@ -815,9 +815,9 @@ RectTransform: m_Father: {fileID: 1682817859} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &11118700 @@ -890,7 +890,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 1200 + m_Text: 40 --- !u!222 &11118703 CanvasRenderer: m_ObjectHideFlags: 0 @@ -928,11 +928,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1659951233} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 314, y: 59} + m_AnchoredPosition: {x: -270, y: -110} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &14702920 @@ -1162,11 +1162,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1659951233} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 172.39746, y: 119.00001} + m_AnchoredPosition: {x: -411.60254, y: -49.999992} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &18226465 @@ -1468,9 +1468,9 @@ RectTransform: m_Father: {fileID: 1943779960} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &22894719 @@ -1864,9 +1864,9 @@ RectTransform: m_Father: {fileID: 1115672621} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &33486541 @@ -1904,9 +1904,9 @@ RectTransform: m_Father: {fileID: 1929109315} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &37082860 @@ -2197,7 +2197,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 82.5 + m_Text: 75 --- !u!222 &46520763 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2811,11 +2811,11 @@ RectTransform: - {fileID: 1397469335} - {fileID: 652209510} m_Father: {fileID: 1852695385} - m_RootOrder: 2 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -338} m_SizeDelta: {x: 584, y: 338} m_Pivot: {x: 0, y: 0} --- !u!222 &57554495 @@ -3274,9 +3274,9 @@ RectTransform: m_Father: {fileID: 1682817859} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &68328340 @@ -3608,7 +3608,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 55 + m_Text: 50 --- !u!222 &73323893 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3722,9 +3722,9 @@ RectTransform: m_Father: {fileID: 949128875} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &79321943 @@ -4328,7 +4328,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 55 + m_Text: 50 --- !u!222 &82169082 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6649,7 +6649,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:02:09 + m_Text: 11:59:53 --- !u!222 &121438356 CanvasRenderer: m_ObjectHideFlags: 0 @@ -9576,9 +9576,9 @@ RectTransform: m_Father: {fileID: 2075090255} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &163899804 @@ -9769,9 +9769,9 @@ RectTransform: m_Father: {fileID: 641299932} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &169035582 @@ -10435,7 +10435,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:16:59 + m_Text: 12:14:43 --- !u!222 &182305921 CanvasRenderer: m_ObjectHideFlags: 0 @@ -10480,9 +10480,9 @@ RectTransform: m_Father: {fileID: 641299932} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &182389798 @@ -11003,7 +11003,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 27.5 + m_Text: 25 --- !u!222 &190076411 CanvasRenderer: m_ObjectHideFlags: 0 @@ -11408,11 +11408,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1030591450} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 342, y: 279} + m_AnchoredPosition: {x: 50, y: 110} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &196056551 @@ -11526,7 +11526,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 1200 + m_Text: 60 --- !u!222 &196360211 CanvasRenderer: m_ObjectHideFlags: 0 @@ -11645,9 +11645,9 @@ RectTransform: m_Father: {fileID: 1682817859} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &198078718 @@ -13129,1007 +13129,72 @@ MonoBehaviour: m_AxisIndex: 0 m_TwoDimensionData: 0 m_YData: + - 143 + - 70 + - 61 + - 138 + - 114 - 70 - - 127 - - 117 - - 102 - - 96 - - 89 - - 105 - - 142 - - 113 - - 90 - - 68 - - 140 - - 136 - - 117 - - 120 - - 96 - - 84 - - 63 - 117 + - 70 - 124 - - 72 - - 132 + - 74 + - 143 + - 141 + - 70 + - 66 + - 69 + - 126 + - 122 + - 141 - 131 - - 109 - - 77 - - 77 - - 101 - - 119 - - 108 - - 89 - - 141 - - 128 - - 86 - - 98 - - 138 - - 90 - - 130 - - 67 - 132 - - 107 - - 98 - - 145 - - 107 - - 70 - - 73 - - 139 - - 101 - - 126 - - 147 - - 127 - - 96 - - 116 - - 114 - - 61 - - 78 - - 68 - - 121 - - 117 - - 118 - - 99 - - 70 - - 71 - - 134 - - 109 - - 146 - - 130 - - 112 - - 80 - - 126 - - 93 - - 84 - - 93 - - 107 - - 127 + - 89 + - 63 + - 89 - 64 - - 102 - - 94 - - 100 - - 102 - - 98 - - 120 - - 110 - - 109 - - 79 - - 139 - - 128 - - 142 - - 86 - - 97 - - 138 - - 61 - - 127 - - 91 - - 74 - - 105 - - 96 - - 127 - - 89 - - 91 - - 96 - - 115 - - 118 - - 66 - - 118 - - 88 - - 76 - - 78 - - 95 - - 115 - - 115 - - 93 - - 134 - - 81 - - 115 - - 79 - - 102 - - 80 - - 107 - - 92 - - 94 - - 119 - - 95 - - 96 - - 67 - - 98 - - 130 - - 132 - - 102 - - 76 - - 126 - - 123 - - 73 - - 67 - - 144 - - 142 - - 109 - - 149 - - 112 - - 104 - - 111 - - 66 - - 124 - - 80 - - 70 - - 138 - - 102 - - 146 - - 62 - - 89 - - 123 - - 103 - - 104 - - 127 - - 78 - - 102 - - 117 - - 124 - - 120 - 145 - - 101 - - 102 - - 147 - - 99 - - 118 - - 139 - - 128 - - 149 - - 136 - - 102 - - 122 - - 107 - - 130 - - 120 - - 129 - - 109 - - 145 - - 72 - - 85 - - 128 - - 114 - 142 - - 134 - - 148 - - 135 - - 143 - - 116 - - 65 - - 90 - - 80 - - 114 - - 91 - - 77 - - 87 - - 96 - - 74 - - 127 - - 82 - - 140 - - 119 - - 141 - - 108 - - 113 - - 98 - - 69 - - 91 - - 100 - - 81 - - 87 - - 97 - - 116 - - 108 - - 139 - - 132 - - 74 - - 91 - - 60 - - 61 - - 108 - - 118 - - 88 - - 98 - - 102 - - 71 - - 120 - - 127 - - 109 - - 130 - - 123 - - 92 - - 112 - - 114 - - 128 - - 90 - - 137 - - 89 - - 146 - - 91 - - 141 - - 143 - - 77 - - 123 - - 83 - - 95 - - 98 - - 121 - - 97 - - 92 - - 136 - - 70 - - 126 - - 71 - - 124 - - 135 - - 63 - - 101 - - 103 - - 94 - - 64 - - 78 - - 118 - - 121 - - 100 - - 116 - - 69 - - 99 - - 134 - - 70 - - 112 - - 138 - - 146 - - 143 - - 103 - - 102 - - 75 - - 74 - - 139 - - 118 - - 69 - - 130 - - 116 - - 118 - - 117 - - 111 - - 94 - - 130 - - 63 - - 61 - - 117 - - 96 - - 119 - - 95 - - 125 - - 115 - - 115 - - 99 - - 91 - - 88 - - 102 - - 135 - - 122 - - 80 - - 75 - - 90 - - 112 - - 123 - - 64 - - 123 - - 120 - - 62 - - 91 - - 128 - - 102 - - 143 - - 61 - - 104 - - 61 - - 108 - - 61 - - 72 - - 112 - - 68 - - 115 - - 79 - - 130 - - 76 - - 91 - - 106 - - 86 - - 123 - - 140 - - 93 - - 77 - - 90 - - 93 - - 97 - - 111 - - 127 - - 77 - - 123 - - 113 - - 109 - - 116 - - 113 - - 92 - - 98 - - 69 - - 127 - - 65 - - 79 - - 63 - - 81 - - 71 - - 146 - - 70 - - 66 - - 65 - - 141 - - 122 - - 99 - - 123 - - 133 - - 141 - - 137 - - 96 - - 83 - - 77 - - 130 - - 67 - - 106 - - 85 - - 148 - - 64 - - 110 - - 98 - - 80 - - 73 - - 105 - - 103 - - 89 - - 108 - - 135 - - 108 - - 82 - - 139 - - 114 - - 141 - - 126 - - 70 - - 142 - - 137 - - 141 - - 68 - - 67 - - 100 - - 75 - - 71 - - 87 - - 116 - - 77 - - 102 - - 88 - - 96 - - 102 - - 125 - - 149 - - 62 - - 67 - - 124 - - 118 - - 89 - - 116 - - 126 - - 119 - - 69 - - 100 - - 113 - - 86 - - 129 - - 90 - - 108 - - 75 - - 142 - - 84 - - 139 - - 140 - - 99 - - 62 - - 141 - - 67 - - 61 - - 139 - - 140 - - 142 - - 146 - - 80 - - 107 - - 145 - - 119 - - 129 - - 108 - - 77 - - 115 - - 141 - - 112 - - 120 - - 60 - - 76 - - 95 - - 120 - - 74 - - 130 - - 73 - - 107 - - 91 - - 127 - - 72 - - 136 - - 135 - - 149 - - 96 - - 124 - - 141 - - 126 - - 90 - - 139 - - 134 - - 145 - - 138 - - 102 - - 63 - - 101 - - 99 - - 117 - - 136 - - 141 - - 83 - - 108 - - 141 - - 60 - - 70 - - 138 - - 74 - - 97 - - 86 - - 113 - - 96 - - 117 - - 110 - - 84 - - 61 - - 112 - - 142 - - 68 - - 84 - - 102 - - 114 - - 102 - - 74 - - 69 - - 102 - - 70 - - 104 - - 96 - - 118 - - 111 - - 63 - - 76 - - 129 - - 134 - - 105 - - 149 - - 125 - - 138 - - 91 - - 90 - - 107 - - 80 - - 102 - - 122 - - 116 - - 64 - - 80 - - 98 - - 127 - - 75 - - 136 - - 118 - - 123 - - 90 - - 117 - - 127 - - 139 - - 87 - - 93 - - 76 - - 123 - - 106 - - 146 - - 72 - - 68 - - 137 - - 119 - - 130 - - 117 - - 114 - - 67 - - 60 - - 104 - - 87 - - 68 - - 148 - - 140 - - 62 - - 135 - - 148 - - 72 - - 144 - - 73 - - 84 - - 90 - - 100 - - 143 - - 74 - - 71 - - 76 - - 86 - - 109 - - 91 - - 60 - - 119 - - 109 - - 66 - - 83 - - 95 - - 110 - - 89 - - 103 - - 135 - - 121 - - 128 - - 114 - - 81 - - 108 - - 124 - - 86 - - 142 - - 138 - - 144 - - 125 - - 73 - - 65 - - 90 - - 88 - - 67 - - 86 - - 65 - - 109 - - 124 - - 121 - - 146 - - 116 - - 102 - - 83 - - 114 - - 144 - - 84 - - 148 - - 135 - - 105 - - 130 - - 79 - - 68 - - 72 - - 93 - - 85 - - 87 - - 110 - - 116 - - 73 - - 100 - - 133 - - 67 - - 141 - - 106 - - 128 - - 123 - - 96 - - 109 - - 69 - - 93 - - 137 - - 96 - - 114 - - 87 - - 95 - - 73 - - 118 - - 61 - - 94 - - 133 - - 134 - - 99 - - 114 - - 97 - - 139 - - 84 - - 103 - - 106 - - 109 - - 109 - - 82 - - 120 - - 121 - - 103 - - 65 - - 143 - - 97 - - 73 - - 65 - - 113 - - 99 - - 71 - - 112 - - 98 - - 105 - - 137 - - 128 - - 121 - - 86 - - 116 - - 103 - - 67 - - 121 - - 94 - - 120 - - 129 - - 100 - - 65 - - 137 - - 73 - - 141 - - 120 - - 118 - - 116 - - 137 - - 146 - - 81 - - 116 - - 85 - - 109 - - 81 - - 69 - - 76 - - 101 - - 135 - - 69 - - 146 - - 80 - - 90 - - 67 - - 111 - - 102 - - 137 - - 137 - - 124 - - 142 - - 139 - - 81 - - 108 - - 72 - - 83 - - 113 - - 137 - - 63 - - 75 - - 69 - - 80 - - 144 - - 124 - - 110 - - 93 - - 140 - - 125 - - 89 - - 79 - - 63 - - 108 - - 74 - - 99 - - 118 - - 148 - - 70 - - 61 - - 139 - - 90 - - 99 - - 98 - - 139 - - 140 - - 130 - - 62 - - 77 - - 122 - - 147 - - 117 - - 107 - - 109 - - 113 - - 129 - - 144 - - 88 - - 68 - - 91 - - 106 - - 133 - - 103 - - 92 - - 103 - 131 + - 62 + - 92 + - 138 + - 138 - 139 + - 125 + - 106 + - 106 + - 149 + - 100 + - 91 + - 68 + - 86 + - 95 + - 66 + - 123 - 126 - - 147 - - 73 - - 118 - - 91 - - 136 - - 133 - - 97 - - 112 - - 118 - - 91 - - 145 - - 67 - - 82 - - 115 + - 141 + - 107 + - 104 + - 86 + - 68 + - 124 - 140 - - 102 - - 107 - - 60 - - 84 - - 80 - - 120 + - 81 - 75 - - 146 - - 64 - - 77 - - 135 - - 122 - - 135 - - 118 - - 134 - - 77 + - 140 + - 65 + - 96 + - 124 + - 133 + - 108 - 90 - - 126 - - 123 - - 75 - - 105 - - 127 - - 134 - - 84 - - 70 - - 97 - - 63 - - 138 - - 136 - - 138 - - 86 - - 126 - - 104 - - 104 - - 80 - - 71 - - 99 - - 74 - - 85 - - 122 - - 69 - - 122 - - 127 + - 110 - 135 - - 63 - - 62 - - 120 - - 112 - - 65 - - 117 - - 96 - - 124 - - 128 - - 144 - - 148 - - 136 - - 138 - - 119 - - 75 - - 82 - - 135 - - 129 - - 64 - - 118 - 147 - - 95 - - 122 - - 122 - - 93 - - 66 - - 68 - - 64 - - 69 - 78 - - 133 - - 141 - - 61 - - 121 - - 104 - - 117 - - 120 - - 102 - - 93 - - 126 - - 149 - - 76 - - 144 - - 110 - - 105 - - 92 - - 113 - - 66 - - 135 - - 148 - - 95 - - 100 - - 117 - - 149 - - 142 - 114 - - 103 - - 116 - - 80 - - 105 - - 125 - - 100 - - 126 - - 76 - 96 - - 73 - - 95 - - 89 - - 118 - - 95 - - 142 - - 105 - - 148 - - 114 - - 76 - - 80 - - 107 - - 110 - - 114 - - 105 - - 70 - - 92 - - 99 - - 114 - - 106 - - 85 - - 119 - - 61 - - 92 - - 149 - - 112 - - 73 - - 82 - - 131 - - 115 - - 139 - - 86 - - 78 - - 132 - - 119 - - 67 - - 72 - - 136 - - 65 - - 105 - - 101 - - 148 - - 144 - - 137 - - 95 - - 99 - - 131 - - 78 - - 99 - - 65 - - 103 - - 66 - - 102 - - 149 - - 62 - - 95 - - 66 - - 124 - - 143 - - 114 - - 68 - - 136 - - 69 - - 77 - - 132 - - 107 - - 64 - - 87 - - 93 - - 110 - - 141 - - 105 - - 78 - - 94 - - 70 - - 145 - - 137 - - 134 - - 72 - - 133 - - 71 - - 102 - - 125 - - 62 - - 76 - - 78 - - 60 - - 107 - - 66 - - 65 - - 123 - - 72 - - 131 - - 128 - - 104 - - 149 - - 106 - - 107 - - 94 - - 98 - - 70 - - 75 - - 74 - - 97 - - 142 - - 84 - - 78 - - 92 - - 126 - - 71 - - 98 - - 96 - - 123 - - 110 - - 76 - - 128 m_XData: - 0 - 1 @@ -14197,941 +13262,6 @@ MonoBehaviour: - 63 - 64 - 65 - - 66 - - 67 - - 68 - - 69 - - 70 - - 71 - - 72 - - 73 - - 74 - - 75 - - 76 - - 77 - - 78 - - 79 - - 80 - - 81 - - 82 - - 83 - - 84 - - 85 - - 86 - - 87 - - 88 - - 89 - - 90 - - 91 - - 92 - - 93 - - 94 - - 95 - - 96 - - 97 - - 98 - - 99 - - 100 - - 101 - - 102 - - 103 - - 104 - - 105 - - 106 - - 107 - - 108 - - 109 - - 110 - - 111 - - 112 - - 113 - - 114 - - 115 - - 116 - - 117 - - 118 - - 119 - - 120 - - 121 - - 122 - - 123 - - 124 - - 125 - - 126 - - 127 - - 128 - - 129 - - 130 - - 131 - - 132 - - 133 - - 134 - - 135 - - 136 - - 137 - - 138 - - 139 - - 140 - - 141 - - 142 - - 143 - - 144 - - 145 - - 146 - - 147 - - 148 - - 149 - - 150 - - 151 - - 152 - - 153 - - 154 - - 155 - - 156 - - 157 - - 158 - - 159 - - 160 - - 161 - - 162 - - 163 - - 164 - - 165 - - 166 - - 167 - - 168 - - 169 - - 170 - - 171 - - 172 - - 173 - - 174 - - 175 - - 176 - - 177 - - 178 - - 179 - - 180 - - 181 - - 182 - - 183 - - 184 - - 185 - - 186 - - 187 - - 188 - - 189 - - 190 - - 191 - - 192 - - 193 - - 194 - - 195 - - 196 - - 197 - - 198 - - 199 - - 200 - - 201 - - 202 - - 203 - - 204 - - 205 - - 206 - - 207 - - 208 - - 209 - - 210 - - 211 - - 212 - - 213 - - 214 - - 215 - - 216 - - 217 - - 218 - - 219 - - 220 - - 221 - - 222 - - 223 - - 224 - - 225 - - 226 - - 227 - - 228 - - 229 - - 230 - - 231 - - 232 - - 233 - - 234 - - 235 - - 236 - - 237 - - 238 - - 239 - - 240 - - 241 - - 242 - - 243 - - 244 - - 245 - - 246 - - 247 - - 248 - - 249 - - 250 - - 251 - - 252 - - 253 - - 254 - - 255 - - 256 - - 257 - - 258 - - 259 - - 260 - - 261 - - 262 - - 263 - - 264 - - 265 - - 266 - - 267 - - 268 - - 269 - - 270 - - 271 - - 272 - - 273 - - 274 - - 275 - - 276 - - 277 - - 278 - - 279 - - 280 - - 281 - - 282 - - 283 - - 284 - - 285 - - 286 - - 287 - - 288 - - 289 - - 290 - - 291 - - 292 - - 293 - - 294 - - 295 - - 296 - - 297 - - 298 - - 299 - - 300 - - 301 - - 302 - - 303 - - 304 - - 305 - - 306 - - 307 - - 308 - - 309 - - 310 - - 311 - - 312 - - 313 - - 314 - - 315 - - 316 - - 317 - - 318 - - 319 - - 320 - - 321 - - 322 - - 323 - - 324 - - 325 - - 326 - - 327 - - 328 - - 329 - - 330 - - 331 - - 332 - - 333 - - 334 - - 335 - - 336 - - 337 - - 338 - - 339 - - 340 - - 341 - - 342 - - 343 - - 344 - - 345 - - 346 - - 347 - - 348 - - 349 - - 350 - - 351 - - 352 - - 353 - - 354 - - 355 - - 356 - - 357 - - 358 - - 359 - - 360 - - 361 - - 362 - - 363 - - 364 - - 365 - - 366 - - 367 - - 368 - - 369 - - 370 - - 371 - - 372 - - 373 - - 374 - - 375 - - 376 - - 377 - - 378 - - 379 - - 380 - - 381 - - 382 - - 383 - - 384 - - 385 - - 386 - - 387 - - 388 - - 389 - - 390 - - 391 - - 392 - - 393 - - 394 - - 395 - - 396 - - 397 - - 398 - - 399 - - 400 - - 401 - - 402 - - 403 - - 404 - - 405 - - 406 - - 407 - - 408 - - 409 - - 410 - - 411 - - 412 - - 413 - - 414 - - 415 - - 416 - - 417 - - 418 - - 419 - - 420 - - 421 - - 422 - - 423 - - 424 - - 425 - - 426 - - 427 - - 428 - - 429 - - 430 - - 431 - - 432 - - 433 - - 434 - - 435 - - 436 - - 437 - - 438 - - 439 - - 440 - - 441 - - 442 - - 443 - - 444 - - 445 - - 446 - - 447 - - 448 - - 449 - - 450 - - 451 - - 452 - - 453 - - 454 - - 455 - - 456 - - 457 - - 458 - - 459 - - 460 - - 461 - - 462 - - 463 - - 464 - - 465 - - 466 - - 467 - - 468 - - 469 - - 470 - - 471 - - 472 - - 473 - - 474 - - 475 - - 476 - - 477 - - 478 - - 479 - - 480 - - 481 - - 482 - - 483 - - 484 - - 485 - - 486 - - 487 - - 488 - - 489 - - 490 - - 491 - - 492 - - 493 - - 494 - - 495 - - 496 - - 497 - - 498 - - 499 - - 500 - - 501 - - 502 - - 503 - - 504 - - 505 - - 506 - - 507 - - 508 - - 509 - - 510 - - 511 - - 512 - - 513 - - 514 - - 515 - - 516 - - 517 - - 518 - - 519 - - 520 - - 521 - - 522 - - 523 - - 524 - - 525 - - 526 - - 527 - - 528 - - 529 - - 530 - - 531 - - 532 - - 533 - - 534 - - 535 - - 536 - - 537 - - 538 - - 539 - - 540 - - 541 - - 542 - - 543 - - 544 - - 545 - - 546 - - 547 - - 548 - - 549 - - 550 - - 551 - - 552 - - 553 - - 554 - - 555 - - 556 - - 557 - - 558 - - 559 - - 560 - - 561 - - 562 - - 563 - - 564 - - 565 - - 566 - - 567 - - 568 - - 569 - - 570 - - 571 - - 572 - - 573 - - 574 - - 575 - - 576 - - 577 - - 578 - - 579 - - 580 - - 581 - - 582 - - 583 - - 584 - - 585 - - 586 - - 587 - - 588 - - 589 - - 590 - - 591 - - 592 - - 593 - - 594 - - 595 - - 596 - - 597 - - 598 - - 599 - - 600 - - 601 - - 602 - - 603 - - 604 - - 605 - - 606 - - 607 - - 608 - - 609 - - 610 - - 611 - - 612 - - 613 - - 614 - - 615 - - 616 - - 617 - - 618 - - 619 - - 620 - - 621 - - 622 - - 623 - - 624 - - 625 - - 626 - - 627 - - 628 - - 629 - - 630 - - 631 - - 632 - - 633 - - 634 - - 635 - - 636 - - 637 - - 638 - - 639 - - 640 - - 641 - - 642 - - 643 - - 644 - - 645 - - 646 - - 647 - - 648 - - 649 - - 650 - - 651 - - 652 - - 653 - - 654 - - 655 - - 656 - - 657 - - 658 - - 659 - - 660 - - 661 - - 662 - - 663 - - 664 - - 665 - - 666 - - 667 - - 668 - - 669 - - 670 - - 671 - - 672 - - 673 - - 674 - - 675 - - 676 - - 677 - - 678 - - 679 - - 680 - - 681 - - 682 - - 683 - - 684 - - 685 - - 686 - - 687 - - 688 - - 689 - - 690 - - 691 - - 692 - - 693 - - 694 - - 695 - - 696 - - 697 - - 698 - - 699 - - 700 - - 701 - - 702 - - 703 - - 704 - - 705 - - 706 - - 707 - - 708 - - 709 - - 710 - - 711 - - 712 - - 713 - - 714 - - 715 - - 716 - - 717 - - 718 - - 719 - - 720 - - 721 - - 722 - - 723 - - 724 - - 725 - - 726 - - 727 - - 728 - - 729 - - 730 - - 731 - - 732 - - 733 - - 734 - - 735 - - 736 - - 737 - - 738 - - 739 - - 740 - - 741 - - 742 - - 743 - - 744 - - 745 - - 746 - - 747 - - 748 - - 749 - - 750 - - 751 - - 752 - - 753 - - 754 - - 755 - - 756 - - 757 - - 758 - - 759 - - 760 - - 761 - - 762 - - 763 - - 764 - - 765 - - 766 - - 767 - - 768 - - 769 - - 770 - - 771 - - 772 - - 773 - - 774 - - 775 - - 776 - - 777 - - 778 - - 779 - - 780 - - 781 - - 782 - - 783 - - 784 - - 785 - - 786 - - 787 - - 788 - - 789 - - 790 - - 791 - - 792 - - 793 - - 794 - - 795 - - 796 - - 797 - - 798 - - 799 - - 800 - - 801 - - 802 - - 803 - - 804 - - 805 - - 806 - - 807 - - 808 - - 809 - - 810 - - 811 - - 812 - - 813 - - 814 - - 815 - - 816 - - 817 - - 818 - - 819 - - 820 - - 821 - - 822 - - 823 - - 824 - - 825 - - 826 - - 827 - - 828 - - 829 - - 830 - - 831 - - 832 - - 833 - - 834 - - 835 - - 836 - - 837 - - 838 - - 839 - - 840 - - 841 - - 842 - - 843 - - 844 - - 845 - - 846 - - 847 - - 848 - - 849 - - 850 - - 851 - - 852 - - 853 - - 854 - - 855 - - 856 - - 857 - - 858 - - 859 - - 860 - - 861 - - 862 - - 863 - - 864 - - 865 - - 866 - - 867 - - 868 - - 869 - - 870 - - 871 - - 872 - - 873 - - 874 - - 875 - - 876 - - 877 - - 878 - - 879 - - 880 - - 881 - - 882 - - 883 - - 884 - - 885 - - 886 - - 887 - - 888 - - 889 - - 890 - - 891 - - 892 - - 893 - - 894 - - 895 - - 896 - - 897 - - 898 - - 899 - - 900 - - 901 - - 902 - - 903 - - 904 - - 905 - - 906 - - 907 - - 908 - - 909 - - 910 - - 911 - - 912 - - 913 - - 914 - - 915 - - 916 - - 917 - - 918 - - 919 - - 920 - - 921 - - 922 - - 923 - - 924 - - 925 - - 926 - - 927 - - 928 - - 929 - - 930 - - 931 - - 932 - - 933 - - 934 - - 935 - - 936 - - 937 - - 938 - - 939 - - 940 - - 941 - - 942 - - 943 - - 944 - - 945 - - 946 - - 947 - - 948 - - 949 - - 950 - - 951 - - 952 - - 953 - - 954 - - 955 - - 956 - - 957 - - 958 - - 959 - - 960 - - 961 - - 962 - - 963 - - 964 - - 965 - - 966 - - 967 - - 968 - - 969 - - 970 - - 971 - - 972 - - 973 - - 974 - - 975 - - 976 - - 977 - - 978 - - 979 - - 980 - - 981 - - 982 - - 983 - - 984 - - 985 - - 986 - - 987 - - 988 - - 989 - - 990 - - 991 - - 992 - - 993 - - 994 - - 995 - - 996 - - 997 - - 998 - - 999 - - 1000 m_Large: 0 m_MinShowDataNumber: 0 m_MaxShowDataNumber: 0 @@ -15156,1007 +13286,72 @@ MonoBehaviour: m_SplitLineType: 2 m_BoundaryGap: 0 m_Data: - - 02:01:54 - - 02:01:55 - - 02:01:56 - - 02:01:57 - - 02:01:58 - - 02:01:59 - - 02:02:00 - - 02:02:01 - - 02:02:02 - - 02:02:03 - - 02:02:04 - - 02:02:05 - - 02:02:06 - - 02:02:07 - - 02:02:08 - - 02:02:09 - - 02:02:10 - - 02:02:11 - - 02:02:12 - - 02:02:13 - - 02:02:14 - - 02:02:15 - - 02:02:16 - - 02:02:17 - - 02:02:18 - - 02:02:19 - - 02:02:20 - - 02:02:21 - - 02:02:22 - - 02:02:23 - - 02:02:24 - - 02:02:25 - - 02:02:26 - - 02:02:27 - - 02:02:28 - - 02:02:29 - - 02:02:30 - - 02:02:31 - - 02:02:32 - - 02:02:33 - - 02:02:34 - - 02:02:35 - - 02:02:36 - - 02:02:37 - - 02:02:38 - - 02:02:39 - - 02:02:40 - - 02:02:41 - - 02:02:42 - - 02:02:43 - - 02:02:44 - - 02:02:45 - - 02:02:46 - - 02:02:47 - - 02:02:48 - - 02:02:49 - - 02:02:50 - - 02:02:51 - - 02:02:52 - - 02:02:53 - - 02:02:54 - - 02:02:55 - - 02:02:56 - - 02:02:57 - - 02:02:58 - - 02:02:59 - - 02:03:00 - - 02:03:01 - - 02:03:02 - - 02:03:03 - - 02:03:04 - - 02:03:05 - - 02:03:06 - - 02:03:07 - - 02:03:08 - - 02:03:09 - - 02:03:10 - - 02:03:11 - - 02:03:12 - - 02:03:13 - - 02:03:14 - - 02:03:15 - - 02:03:16 - - 02:03:17 - - 02:03:18 - - 02:03:19 - - 02:03:20 - - 02:03:21 - - 02:03:22 - - 02:03:23 - - 02:03:24 - - 02:03:25 - - 02:03:26 - - 02:03:27 - - 02:03:28 - - 02:03:29 - - 02:03:30 - - 02:03:31 - - 02:03:32 - - 02:03:33 - - 02:03:34 - - 02:03:35 - - 02:03:36 - - 02:03:37 - - 02:03:38 - - 02:03:39 - - 02:03:40 - - 02:03:41 - - 02:03:42 - - 02:03:43 - - 02:03:44 - - 02:03:45 - - 02:03:46 - - 02:03:47 - - 02:03:48 - - 02:03:49 - - 02:03:50 - - 02:03:51 - - 02:03:52 - - 02:03:53 - - 02:03:54 - - 02:03:55 - - 02:03:56 - - 02:03:57 - - 02:03:58 - - 02:03:59 - - 02:04:00 - - 02:04:01 - - 02:04:02 - - 02:04:03 - - 02:04:04 - - 02:04:05 - - 02:04:06 - - 02:04:07 - - 02:04:08 - - 02:04:09 - - 02:04:10 - - 02:04:11 - - 02:04:12 - - 02:04:13 - - 02:04:14 - - 02:04:15 - - 02:04:16 - - 02:04:17 - - 02:04:18 - - 02:04:19 - - 02:04:20 - - 02:04:21 - - 02:04:22 - - 02:04:23 - - 02:04:24 - - 02:04:25 - - 02:04:26 - - 02:04:27 - - 02:04:28 - - 02:04:29 - - 02:04:30 - - 02:04:31 - - 02:04:32 - - 02:04:33 - - 02:04:34 - - 02:04:35 - - 02:04:36 - - 02:04:37 - - 02:04:38 - - 02:04:39 - - 02:04:40 - - 02:04:41 - - 02:04:42 - - 02:04:43 - - 02:04:44 - - 02:04:45 - - 02:04:46 - - 02:04:47 - - 02:04:48 - - 02:04:49 - - 02:04:50 - - 02:04:51 - - 02:04:52 - - 02:04:53 - - 02:04:54 - - 02:04:55 - - 02:04:56 - - 02:04:57 - - 02:04:58 - - 02:04:59 - - 02:05:00 - - 02:05:01 - - 02:05:02 - - 02:05:03 - - 02:05:04 - - 02:05:05 - - 02:05:06 - - 02:05:07 - - 02:05:08 - - 02:05:09 - - 02:05:10 - - 02:05:11 - - 02:05:12 - - 02:05:13 - - 02:05:14 - - 02:05:15 - - 02:05:16 - - 02:05:17 - - 02:05:18 - - 02:05:19 - - 02:05:20 - - 02:05:21 - - 02:05:22 - - 02:05:23 - - 02:05:24 - - 02:05:25 - - 02:05:26 - - 02:05:27 - - 02:05:28 - - 02:05:29 - - 02:05:30 - - 02:05:31 - - 02:05:32 - - 02:05:33 - - 02:05:34 - - 02:05:35 - - 02:05:36 - - 02:05:37 - - 02:05:38 - - 02:05:39 - - 02:05:40 - - 02:05:41 - - 02:05:42 - - 02:05:43 - - 02:05:44 - - 02:05:45 - - 02:05:46 - - 02:05:47 - - 02:05:48 - - 02:05:49 - - 02:05:50 - - 02:05:51 - - 02:05:52 - - 02:05:53 - - 02:05:54 - - 02:05:55 - - 02:05:56 - - 02:05:57 - - 02:05:58 - - 02:05:59 - - 02:06:00 - - 02:06:01 - - 02:06:02 - - 02:06:03 - - 02:06:04 - - 02:06:05 - - 02:06:06 - - 02:06:07 - - 02:06:08 - - 02:06:09 - - 02:06:10 - - 02:06:11 - - 02:06:12 - - 02:06:13 - - 02:06:14 - - 02:06:15 - - 02:06:16 - - 02:06:17 - - 02:06:18 - - 02:06:19 - - 02:06:20 - - 02:06:21 - - 02:06:22 - - 02:06:23 - - 02:06:24 - - 02:06:25 - - 02:06:26 - - 02:06:27 - - 02:06:28 - - 02:06:29 - - 02:06:30 - - 02:06:31 - - 02:06:32 - - 02:06:33 - - 02:06:34 - - 02:06:35 - - 02:06:36 - - 02:06:37 - - 02:06:38 - - 02:06:39 - - 02:06:40 - - 02:06:41 - - 02:06:42 - - 02:06:43 - - 02:06:44 - - 02:06:45 - - 02:06:46 - - 02:06:47 - - 02:06:48 - - 02:06:49 - - 02:06:50 - - 02:06:51 - - 02:06:52 - - 02:06:53 - - 02:06:54 - - 02:06:55 - - 02:06:56 - - 02:06:57 - - 02:06:58 - - 02:06:59 - - 02:07:00 - - 02:07:01 - - 02:07:02 - - 02:07:03 - - 02:07:04 - - 02:07:05 - - 02:07:06 - - 02:07:07 - - 02:07:08 - - 02:07:09 - - 02:07:10 - - 02:07:11 - - 02:07:12 - - 02:07:13 - - 02:07:14 - - 02:07:15 - - 02:07:16 - - 02:07:17 - - 02:07:18 - - 02:07:19 - - 02:07:20 - - 02:07:21 - - 02:07:22 - - 02:07:23 - - 02:07:24 - - 02:07:25 - - 02:07:26 - - 02:07:27 - - 02:07:28 - - 02:07:29 - - 02:07:30 - - 02:07:31 - - 02:07:32 - - 02:07:33 - - 02:07:34 - - 02:07:35 - - 02:07:36 - - 02:07:37 - - 02:07:38 - - 02:07:39 - - 02:07:40 - - 02:07:41 - - 02:07:42 - - 02:07:43 - - 02:07:44 - - 02:07:45 - - 02:07:46 - - 02:07:47 - - 02:07:48 - - 02:07:49 - - 02:07:50 - - 02:07:51 - - 02:07:52 - - 02:07:53 - - 02:07:54 - - 02:07:55 - - 02:07:56 - - 02:07:57 - - 02:07:58 - - 02:07:59 - - 02:08:00 - - 02:08:01 - - 02:08:02 - - 02:08:03 - - 02:08:04 - - 02:08:05 - - 02:08:06 - - 02:08:07 - - 02:08:08 - - 02:08:09 - - 02:08:10 - - 02:08:11 - - 02:08:12 - - 02:08:13 - - 02:08:14 - - 02:08:15 - - 02:08:16 - - 02:08:17 - - 02:08:18 - - 02:08:19 - - 02:08:20 - - 02:08:21 - - 02:08:22 - - 02:08:23 - - 02:08:24 - - 02:08:25 - - 02:08:26 - - 02:08:27 - - 02:08:28 - - 02:08:29 - - 02:08:30 - - 02:08:31 - - 02:08:32 - - 02:08:33 - - 02:08:34 - - 02:08:35 - - 02:08:36 - - 02:08:37 - - 02:08:38 - - 02:08:39 - - 02:08:40 - - 02:08:41 - - 02:08:42 - - 02:08:43 - - 02:08:44 - - 02:08:45 - - 02:08:46 - - 02:08:47 - - 02:08:48 - - 02:08:49 - - 02:08:50 - - 02:08:51 - - 02:08:52 - - 02:08:53 - - 02:08:54 - - 02:08:55 - - 02:08:56 - - 02:08:57 - - 02:08:58 - - 02:08:59 - - 02:09:00 - - 02:09:01 - - 02:09:02 - - 02:09:03 - - 02:09:04 - - 02:09:05 - - 02:09:06 - - 02:09:07 - - 02:09:08 - - 02:09:09 - - 02:09:10 - - 02:09:11 - - 02:09:12 - - 02:09:13 - - 02:09:14 - - 02:09:15 - - 02:09:16 - - 02:09:17 - - 02:09:18 - - 02:09:19 - - 02:09:20 - - 02:09:21 - - 02:09:22 - - 02:09:23 - - 02:09:24 - - 02:09:25 - - 02:09:26 - - 02:09:27 - - 02:09:28 - - 02:09:29 - - 02:09:30 - - 02:09:31 - - 02:09:32 - - 02:09:33 - - 02:09:34 - - 02:09:35 - - 02:09:36 - - 02:09:37 - - 02:09:38 - - 02:09:39 - - 02:09:40 - - 02:09:41 - - 02:09:42 - - 02:09:43 - - 02:09:44 - - 02:09:45 - - 02:09:46 - - 02:09:47 - - 02:09:48 - - 02:09:49 - - 02:09:50 - - 02:09:51 - - 02:09:52 - - 02:09:53 - - 02:09:54 - - 02:09:55 - - 02:09:56 - - 02:09:57 - - 02:09:58 - - 02:09:59 - - 02:10:00 - - 02:10:01 - - 02:10:02 - - 02:10:03 - - 02:10:04 - - 02:10:05 - - 02:10:06 - - 02:10:07 - - 02:10:08 - - 02:10:09 - - 02:10:10 - - 02:10:11 - - 02:10:12 - - 02:10:13 - - 02:10:14 - - 02:10:15 - - 02:10:16 - - 02:10:17 - - 02:10:18 - - 02:10:19 - - 02:10:20 - - 02:10:21 - - 02:10:22 - - 02:10:23 - - 02:10:24 - - 02:10:25 - - 02:10:26 - - 02:10:27 - - 02:10:28 - - 02:10:29 - - 02:10:30 - - 02:10:31 - - 02:10:32 - - 02:10:33 - - 02:10:34 - - 02:10:35 - - 02:10:36 - - 02:10:37 - - 02:10:38 - - 02:10:39 - - 02:10:40 - - 02:10:41 - - 02:10:42 - - 02:10:43 - - 02:10:44 - - 02:10:45 - - 02:10:46 - - 02:10:47 - - 02:10:48 - - 02:10:49 - - 02:10:50 - - 02:10:51 - - 02:10:52 - - 02:10:53 - - 02:10:54 - - 02:10:55 - - 02:10:56 - - 02:10:57 - - 02:10:58 - - 02:10:59 - - 02:11:00 - - 02:11:01 - - 02:11:02 - - 02:11:03 - - 02:11:04 - - 02:11:05 - - 02:11:06 - - 02:11:07 - - 02:11:08 - - 02:11:09 - - 02:11:10 - - 02:11:11 - - 02:11:12 - - 02:11:13 - - 02:11:14 - - 02:11:15 - - 02:11:16 - - 02:11:17 - - 02:11:18 - - 02:11:19 - - 02:11:20 - - 02:11:21 - - 02:11:22 - - 02:11:23 - - 02:11:24 - - 02:11:25 - - 02:11:26 - - 02:11:27 - - 02:11:28 - - 02:11:29 - - 02:11:30 - - 02:11:31 - - 02:11:32 - - 02:11:33 - - 02:11:34 - - 02:11:35 - - 02:11:36 - - 02:11:37 - - 02:11:38 - - 02:11:39 - - 02:11:40 - - 02:11:41 - - 02:11:42 - - 02:11:43 - - 02:11:44 - - 02:11:45 - - 02:11:46 - - 02:11:47 - - 02:11:48 - - 02:11:49 - - 02:11:50 - - 02:11:51 - - 02:11:52 - - 02:11:53 - - 02:11:54 - - 02:11:55 - - 02:11:56 - - 02:11:57 - - 02:11:58 - - 02:11:59 - - 02:12:00 - - 02:12:01 - - 02:12:02 - - 02:12:03 - - 02:12:04 - - 02:12:05 - - 02:12:06 - - 02:12:07 - - 02:12:08 - - 02:12:09 - - 02:12:10 - - 02:12:11 - - 02:12:12 - - 02:12:13 - - 02:12:14 - - 02:12:15 - - 02:12:16 - - 02:12:17 - - 02:12:18 - - 02:12:19 - - 02:12:20 - - 02:12:21 - - 02:12:22 - - 02:12:23 - - 02:12:24 - - 02:12:25 - - 02:12:26 - - 02:12:27 - - 02:12:28 - - 02:12:29 - - 02:12:30 - - 02:12:31 - - 02:12:32 - - 02:12:33 - - 02:12:34 - - 02:12:35 - - 02:12:36 - - 02:12:37 - - 02:12:38 - - 02:12:39 - - 02:12:40 - - 02:12:41 - - 02:12:42 - - 02:12:43 - - 02:12:44 - - 02:12:45 - - 02:12:46 - - 02:12:47 - - 02:12:48 - - 02:12:49 - - 02:12:50 - - 02:12:51 - - 02:12:52 - - 02:12:53 - - 02:12:54 - - 02:12:55 - - 02:12:56 - - 02:12:57 - - 02:12:58 - - 02:12:59 - - 02:13:00 - - 02:13:01 - - 02:13:02 - - 02:13:03 - - 02:13:04 - - 02:13:05 - - 02:13:06 - - 02:13:07 - - 02:13:08 - - 02:13:09 - - 02:13:10 - - 02:13:11 - - 02:13:12 - - 02:13:13 - - 02:13:14 - - 02:13:15 - - 02:13:16 - - 02:13:17 - - 02:13:18 - - 02:13:19 - - 02:13:20 - - 02:13:21 - - 02:13:22 - - 02:13:23 - - 02:13:24 - - 02:13:25 - - 02:13:26 - - 02:13:27 - - 02:13:28 - - 02:13:29 - - 02:13:30 - - 02:13:31 - - 02:13:32 - - 02:13:33 - - 02:13:34 - - 02:13:35 - - 02:13:36 - - 02:13:37 - - 02:13:38 - - 02:13:39 - - 02:13:40 - - 02:13:41 - - 02:13:42 - - 02:13:43 - - 02:13:44 - - 02:13:45 - - 02:13:46 - - 02:13:47 - - 02:13:48 - - 02:13:49 - - 02:13:50 - - 02:13:51 - - 02:13:52 - - 02:13:53 - - 02:13:54 - - 02:13:55 - - 02:13:56 - - 02:13:57 - - 02:13:58 - - 02:13:59 - - 02:14:00 - - 02:14:01 - - 02:14:02 - - 02:14:03 - - 02:14:04 - - 02:14:05 - - 02:14:06 - - 02:14:07 - - 02:14:08 - - 02:14:09 - - 02:14:10 - - 02:14:11 - - 02:14:12 - - 02:14:13 - - 02:14:14 - - 02:14:15 - - 02:14:16 - - 02:14:17 - - 02:14:18 - - 02:14:19 - - 02:14:20 - - 02:14:21 - - 02:14:22 - - 02:14:23 - - 02:14:24 - - 02:14:25 - - 02:14:26 - - 02:14:27 - - 02:14:28 - - 02:14:29 - - 02:14:30 - - 02:14:31 - - 02:14:32 - - 02:14:33 - - 02:14:34 - - 02:14:35 - - 02:14:36 - - 02:14:37 - - 02:14:38 - - 02:14:39 - - 02:14:40 - - 02:14:41 - - 02:14:42 - - 02:14:43 - - 02:14:44 - - 02:14:45 - - 02:14:46 - - 02:14:47 - - 02:14:48 - - 02:14:49 - - 02:14:50 - - 02:14:51 - - 02:14:52 - - 02:14:53 - - 02:14:54 - - 02:14:55 - - 02:14:56 - - 02:14:57 - - 02:14:58 - - 02:14:59 - - 02:15:00 - - 02:15:01 - - 02:15:02 - - 02:15:03 - - 02:15:04 - - 02:15:05 - - 02:15:06 - - 02:15:07 - - 02:15:08 - - 02:15:09 - - 02:15:10 - - 02:15:11 - - 02:15:12 - - 02:15:13 - - 02:15:14 - - 02:15:15 - - 02:15:16 - - 02:15:17 - - 02:15:18 - - 02:15:19 - - 02:15:20 - - 02:15:21 - - 02:15:22 - - 02:15:23 - - 02:15:24 - - 02:15:25 - - 02:15:26 - - 02:15:27 - - 02:15:28 - - 02:15:29 - - 02:15:30 - - 02:15:31 - - 02:15:32 - - 02:15:33 - - 02:15:34 - - 02:15:35 - - 02:15:36 - - 02:15:37 - - 02:15:38 - - 02:15:39 - - 02:15:40 - - 02:15:41 - - 02:15:42 - - 02:15:43 - - 02:15:44 - - 02:15:45 - - 02:15:46 - - 02:15:47 - - 02:15:48 - - 02:15:49 - - 02:15:50 - - 02:15:51 - - 02:15:52 - - 02:15:53 - - 02:15:54 - - 02:15:55 - - 02:15:56 - - 02:15:57 - - 02:15:58 - - 02:15:59 - - 02:16:00 - - 02:16:01 - - 02:16:02 - - 02:16:03 - - 02:16:04 - - 02:16:05 - - 02:16:06 - - 02:16:07 - - 02:16:08 - - 02:16:09 - - 02:16:10 - - 02:16:11 - - 02:16:12 - - 02:16:13 - - 02:16:14 - - 02:16:15 - - 02:16:16 - - 02:16:17 - - 02:16:18 - - 02:16:19 - - 02:16:20 - - 02:16:21 - - 02:16:22 - - 02:16:23 - - 02:16:24 - - 02:16:25 - - 02:16:26 - - 02:16:27 - - 02:16:28 - - 02:16:29 - - 02:16:30 - - 02:16:31 - - 02:16:32 - - 02:16:33 - - 02:16:34 - - 02:16:35 - - 02:16:36 - - 02:16:37 - - 02:16:38 - - 02:16:39 - - 02:16:40 - - 02:16:41 - - 02:16:42 - - 02:16:43 - - 02:16:44 - - 02:16:45 - - 02:16:46 - - 02:16:47 - - 02:16:48 - - 02:16:49 - - 02:16:50 - - 02:16:51 - - 02:16:52 - - 02:16:53 - - 02:16:54 - - 02:16:55 - - 02:16:56 - - 02:16:57 - - 02:16:58 - - 02:16:59 - - 02:17:00 - - 02:17:01 - - 02:17:02 - - 02:17:03 - - 02:17:04 - - 02:17:05 - - 02:17:06 - - 02:17:07 - - 02:17:08 - - 02:17:09 - - 02:17:10 - - 02:17:11 - - 02:17:12 - - 02:17:13 - - 02:17:14 - - 02:17:15 - - 02:17:16 - - 02:17:17 - - 02:17:18 - - 02:17:19 - - 02:17:20 - - 02:17:21 - - 02:17:22 - - 02:17:23 - - 02:17:24 - - 02:17:25 - - 02:17:26 - - 02:17:27 - - 02:17:28 - - 02:17:29 - - 02:17:30 - - 02:17:31 - - 02:17:32 - - 02:17:33 - - 02:17:34 - - 02:17:35 - - 02:17:36 - - 02:17:37 - - 02:17:38 - - 02:17:39 - - 02:17:40 - - 02:17:41 - - 02:17:42 - - 02:17:43 - - 02:17:44 - - 02:17:45 - - 02:17:46 - - 02:17:47 - - 02:17:48 - - 02:17:49 - - 02:17:50 - - 02:17:51 - - 02:17:52 - - 02:17:53 - - 02:17:54 - - 02:17:55 - - 02:17:56 - - 02:17:57 - - 02:17:58 - - 02:17:59 - - 02:18:00 - - 02:18:01 - - 02:18:02 - - 02:18:03 - - 02:18:04 - - 02:18:05 - - 02:18:06 - - 02:18:07 - - 02:18:08 - - 02:18:09 - - 02:18:10 - - 02:18:11 - - 02:18:12 - - 02:18:13 - - 02:18:14 - - 02:18:15 - - 02:18:16 - - 02:18:17 - - 02:18:18 - - 02:18:19 - - 02:18:20 - - 02:18:21 - - 02:18:22 - - 02:18:23 - - 02:18:24 - - 02:18:25 - - 02:18:26 - - 02:18:27 - - 02:18:28 - - 02:18:29 - - 02:18:30 - - 02:18:31 - - 02:18:32 - - 02:18:33 - - 02:18:34 + - 11:59:38 + - 11:59:39 + - 11:59:40 + - 11:59:41 + - 11:59:42 + - 11:59:43 + - 11:59:44 + - 11:59:45 + - 11:59:46 + - 11:59:47 + - 11:59:48 + - 11:59:49 + - 11:59:50 + - 11:59:51 + - 11:59:52 + - 11:59:53 + - 11:59:54 + - 11:59:55 + - 11:59:56 + - 11:59:57 + - 11:59:58 + - 11:59:59 + - 12:00:00 + - 12:00:01 + - 12:00:02 + - 12:00:03 + - 12:00:04 + - 12:00:05 + - 12:00:06 + - 12:00:07 + - 12:00:08 + - 12:00:09 + - 12:00:10 + - 12:00:11 + - 12:00:12 + - 12:00:13 + - 12:00:14 + - 12:00:15 + - 12:00:16 + - 12:00:17 + - 12:00:18 + - 12:00:19 + - 12:00:20 + - 12:00:21 + - 12:00:22 + - 12:00:23 + - 12:00:24 + - 12:00:25 + - 12:00:26 + - 12:00:27 + - 12:00:28 + - 12:00:29 + - 12:00:30 + - 12:00:31 + - 12:00:32 + - 12:00:33 + - 12:00:34 + - 12:00:35 + - 12:00:36 + - 12:00:37 + - 12:00:38 + - 12:00:39 + - 12:00:40 + - 12:00:41 + - 12:00:42 + - 12:00:43 m_AxisLine: m_Show: 1 m_OnZero: 1 @@ -17364,9 +14559,9 @@ RectTransform: m_Father: {fileID: 641299932} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &233308400 @@ -18311,9 +15506,9 @@ RectTransform: m_Father: {fileID: 501021417} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &256510470 @@ -19517,11 +16712,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1659951233} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 172.39746, y: 218.99998} + m_AnchoredPosition: {x: -411.60254, y: 49.999992} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &271232942 @@ -19854,7 +17049,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 82.5 + m_Text: 75 --- !u!222 &277788233 CanvasRenderer: m_ObjectHideFlags: 0 @@ -20048,9 +17243,9 @@ RectTransform: m_Father: {fileID: 1570353673} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &285565738 @@ -22863,7 +20058,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 110 + m_Text: 100 --- !u!222 &319441077 CanvasRenderer: m_ObjectHideFlags: 0 @@ -23096,9 +20291,9 @@ RectTransform: m_Father: {fileID: 2075090255} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &327173547 @@ -23175,9 +20370,9 @@ RectTransform: m_Father: {fileID: 1826786631} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &330331241 @@ -23479,7 +20674,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:06:54 + m_Text: 11:59:57 --- !u!222 &332029977 CanvasRenderer: m_ObjectHideFlags: 0 @@ -23708,7 +20903,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:02:00 + m_Text: 11:59:44 --- !u!222 &339607524 CanvasRenderer: m_ObjectHideFlags: 0 @@ -25352,9 +22547,9 @@ RectTransform: m_Father: {fileID: 1929109315} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &375318323 @@ -25461,7 +22656,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 27.5 + m_Text: 25 --- !u!222 &377111682 CanvasRenderer: m_ObjectHideFlags: 0 @@ -26641,9 +23836,9 @@ RectTransform: m_Father: {fileID: 501021417} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &397152877 @@ -27174,9 +24369,9 @@ RectTransform: m_Father: {fileID: 935459893} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &409973586 @@ -27928,7 +25123,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 110 + m_Text: 100 --- !u!222 &427142439 CanvasRenderer: m_ObjectHideFlags: 0 @@ -28595,7 +25790,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 1600 + m_Text: 80 --- !u!222 &441576772 CanvasRenderer: m_ObjectHideFlags: 0 @@ -28673,7 +25868,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:17:42 + m_Text: 12:14:38 --- !u!222 &441911192 CanvasRenderer: m_ObjectHideFlags: 0 @@ -29142,11 +26337,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1852695385} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 455.7785, y: 88.0983} + m_AnchoredPosition: {x: 163.77852, y: -80.9017} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &447365845 @@ -29657,9 +26852,9 @@ RectTransform: m_Father: {fileID: 501021417} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &455197223 @@ -29732,7 +26927,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:17:00 + m_Text: 12:14:44 --- !u!222 &455197226 CanvasRenderer: m_ObjectHideFlags: 0 @@ -29807,7 +27002,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 82.5 + m_Text: 75 --- !u!222 &458431100 CanvasRenderer: m_ObjectHideFlags: 0 @@ -29881,7 +27076,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 110 + m_Text: 100 --- !u!222 &460011777 CanvasRenderer: m_ObjectHideFlags: 0 @@ -30834,9 +28029,9 @@ RectTransform: m_Father: {fileID: 831057718} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &470876354 @@ -30909,7 +28104,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 2400 + m_Text: 80 --- !u!222 &470876357 CanvasRenderer: m_ObjectHideFlags: 0 @@ -31021,11 +28216,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1659951233} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 314, y: 279} + m_AnchoredPosition: {x: -270, y: 110} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &472824660 @@ -31468,7 +28663,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 600 + m_Text: 20 --- !u!222 &474832650 CanvasRenderer: m_ObjectHideFlags: 0 @@ -34508,9 +31703,9 @@ RectTransform: m_Father: {fileID: 949128875} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &517278097 @@ -34992,7 +32187,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 40 + m_Text: 80 --- !u!222 &525057155 CanvasRenderer: m_ObjectHideFlags: 0 @@ -35066,7 +32261,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 82.5 + m_Text: 75 --- !u!222 &526165100 CanvasRenderer: m_ObjectHideFlags: 0 @@ -35218,7 +32413,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 110 + m_Text: 100 --- !u!222 &527540712 CanvasRenderer: m_ObjectHideFlags: 0 @@ -35473,7 +32668,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 82.5 + m_Text: 75 --- !u!222 &533513094 CanvasRenderer: m_ObjectHideFlags: 0 @@ -35946,7 +33141,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 27.5 + m_Text: 25 --- !u!222 &540895866 CanvasRenderer: m_ObjectHideFlags: 0 @@ -36378,7 +33573,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 27.5 + m_Text: 25 --- !u!222 &546037351 CanvasRenderer: m_ObjectHideFlags: 0 @@ -36795,9 +33990,9 @@ RectTransform: m_Father: {fileID: 949128875} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &552129961 @@ -37056,7 +34251,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:11:54 + m_Text: 12:00:17 --- !u!222 &553866732 CanvasRenderer: m_ObjectHideFlags: 0 @@ -37396,7 +34591,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 110 + m_Text: 100 --- !u!222 &556032769 CanvasRenderer: m_ObjectHideFlags: 0 @@ -37905,7 +35100,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 110 + m_Text: 100 --- !u!222 &560735657 CanvasRenderer: m_ObjectHideFlags: 0 @@ -37951,9 +35146,9 @@ RectTransform: m_Father: {fileID: 2005110618} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &563002035 @@ -38389,9 +35584,9 @@ RectTransform: m_Father: {fileID: 949128875} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &570885749 @@ -38907,7 +36102,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: Legend + m_Text: data --- !u!222 &580739205 CanvasRenderer: m_ObjectHideFlags: 0 @@ -40088,9 +37283,9 @@ RectTransform: m_Father: {fileID: 949128875} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &594751336 @@ -40160,7 +37355,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 110 + m_Text: 100 --- !u!222 &594751339 CanvasRenderer: m_ObjectHideFlags: 0 @@ -41069,7 +38264,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:02:02 + m_Text: 11:59:46 --- !u!222 &600371344 CanvasRenderer: m_ObjectHideFlags: 0 @@ -41144,7 +38339,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 82.5 + m_Text: 75 --- !u!222 &605027270 CanvasRenderer: m_ObjectHideFlags: 0 @@ -41372,7 +38567,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 3000 + m_Text: 100 --- !u!222 &608634868 CanvasRenderer: m_ObjectHideFlags: 0 @@ -41561,9 +38756,9 @@ RectTransform: m_Father: {fileID: 501021417} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &612251187 @@ -42361,11 +39556,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1852695385} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 191.89435, y: 199.90172} + m_AnchoredPosition: {x: -100.10565, y: 30.901712} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &624234218 @@ -42869,9 +40064,9 @@ RectTransform: m_Father: {fileID: 831057718} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &637135134 @@ -43553,9 +40748,9 @@ RectTransform: m_Father: {fileID: 1929109315} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &640562307 @@ -44932,9 +42127,9 @@ RectTransform: m_Father: {fileID: 147165467} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &662037722 @@ -45524,7 +42719,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 55 + m_Text: 50 --- !u!222 &672642849 CanvasRenderer: m_ObjectHideFlags: 0 @@ -45845,11 +43040,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1852695385} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 228.22147, y: 88.098305} + m_AnchoredPosition: {x: -63.778538, y: -80.901695} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &678430342 @@ -46859,7 +44054,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:01:59 + m_Text: 11:59:43 --- !u!222 &693738098 CanvasRenderer: m_ObjectHideFlags: 0 @@ -47151,7 +44346,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 30 + m_Text: 60 --- !u!222 &700909184 CanvasRenderer: m_ObjectHideFlags: 0 @@ -47234,9 +44429,9 @@ RectTransform: m_Father: {fileID: 1570353673} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &702556114 @@ -48152,7 +45347,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:17:01 + m_Text: 12:14:45 --- !u!222 &711116923 CanvasRenderer: m_ObjectHideFlags: 0 @@ -48722,9 +45917,9 @@ RectTransform: m_Father: {fileID: 1115672621} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &719232886 @@ -48943,7 +46138,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 27.5 + m_Text: 25 --- !u!222 &720752468 CanvasRenderer: m_ObjectHideFlags: 0 @@ -49165,7 +46360,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 110 + m_Text: 100 --- !u!222 &723334031 CanvasRenderer: m_ObjectHideFlags: 0 @@ -50370,7 +47565,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 400 + m_Text: 20 --- !u!222 &739941282 CanvasRenderer: m_ObjectHideFlags: 0 @@ -50791,9 +47986,9 @@ RectTransform: m_Father: {fileID: 1115672621} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &754184908 @@ -51621,11 +48816,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1659951233} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 455.60254, y: 219} + m_AnchoredPosition: {x: -128.39746, y: 49.999996} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &769762582 @@ -51736,7 +48931,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 50 + m_Text: 100 --- !u!222 &771088780 CanvasRenderer: m_ObjectHideFlags: 0 @@ -51929,9 +49124,9 @@ RectTransform: m_Father: {fileID: 1826786631} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &772629881 @@ -52414,9 +49609,9 @@ RectTransform: m_Father: {fileID: 147165467} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &785765524 @@ -53793,7 +50988,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 110 + m_Text: 100 --- !u!222 &809917393 CanvasRenderer: m_ObjectHideFlags: 0 @@ -54360,7 +51555,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 27.5 + m_Text: 25 --- !u!222 &820258667 CanvasRenderer: m_ObjectHideFlags: 0 @@ -54627,7 +51822,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 82.5 + m_Text: 75 --- !u!222 &821701773 CanvasRenderer: m_ObjectHideFlags: 0 @@ -55477,7 +52672,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 55 + m_Text: 50 --- !u!222 &835554937 CanvasRenderer: m_ObjectHideFlags: 0 @@ -56162,9 +53357,9 @@ RectTransform: m_Father: {fileID: 949128875} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &849921337 @@ -56312,7 +53507,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 82.5 + m_Text: 75 --- !u!222 &852471970 CanvasRenderer: m_ObjectHideFlags: 0 @@ -57323,7 +54518,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:02:06 + m_Text: 11:59:50 --- !u!222 &864125728 CanvasRenderer: m_ObjectHideFlags: 0 @@ -57701,1007 +54896,72 @@ MonoBehaviour: m_AxisIndex: 0 m_TwoDimensionData: 0 m_YData: - - 136 - - 115 - - 95 - - 140 - - 97 - - 122 - - 90 - - 109 - - 142 - - 149 - - 137 - 131 - - 92 - - 111 - - 149 - - 106 - - 91 - - 93 - - 126 - - 111 - - 131 - - 141 - - 131 - - 113 - - 66 - - 131 - - 138 - - 64 - - 111 - - 102 - - 87 - - 77 - - 116 - - 93 - - 101 - - 72 - - 92 - - 98 - - 107 - - 83 - - 136 - - 92 - - 136 - - 124 - - 102 - - 133 - - 129 - - 107 - - 82 - - 87 - - 97 - - 89 - - 111 - - 139 - - 80 - - 129 - - 106 - - 137 - - 100 - - 111 - - 86 - - 88 - - 101 - - 87 - - 139 - - 127 - - 140 - - 129 - - 100 - - 135 - - 62 - - 81 - - 145 - - 128 - - 129 - - 117 - - 123 - - 138 - 75 - - 140 - - 140 - - 67 - - 138 - - 128 - - 84 - - 95 - - 137 - - 135 - 144 - - 148 - - 102 - - 116 - - 135 - - 90 - - 91 - - 125 - - 71 - - 136 - - 63 - - 113 - - 64 - - 138 - - 77 - - 125 - - 129 - - 97 - - 115 - - 61 - - 79 - - 95 - - 85 - - 125 - - 146 - - 107 - - 142 - - 75 - - 87 - - 140 - - 86 - - 106 - - 92 - - 136 - - 119 - - 123 - - 110 - - 87 - - 88 - - 76 - - 88 - - 113 - - 119 - - 72 - - 61 - - 74 - 78 - - 92 - - 84 - - 79 - - 109 - - 95 - - 108 + - 140 + - 87 + - 110 + - 143 + - 74 + - 129 + - 88 + - 123 + - 120 + - 114 + - 134 + - 123 + - 68 + - 96 + - 136 - 98 + - 91 + - 145 + - 144 + - 74 + - 142 + - 133 + - 111 + - 63 + - 140 + - 112 - 61 - - 137 + - 135 + - 145 + - 66 + - 144 + - 74 - 118 - - 130 - 121 - - 100 - - 98 - - 143 - - 146 - - 91 - - 87 - - 64 - - 97 - - 117 - - 117 - - 76 - - 106 - - 72 - - 111 - - 104 - - 143 - 107 - - 67 - - 141 - - 89 - - 76 - - 135 - - 125 - - 144 - - 69 - - 93 - - 148 - - 126 - - 86 - - 82 - - 64 - - 87 - - 124 - - 70 - - 114 - - 100 - - 122 - - 143 - - 120 - - 101 - - 89 - - 111 - - 126 - - 77 - - 84 - - 112 - - 107 - - 118 - - 74 - - 148 - - 140 - - 112 - - 139 - - 77 - - 119 - - 65 - - 62 - - 115 - - 110 - - 79 - - 148 - - 84 - - 141 - - 67 - - 71 - - 87 - - 82 - - 67 - - 135 - - 122 - - 142 - - 71 - - 69 - - 92 - - 89 - - 104 - - 72 - - 145 - - 60 - - 106 - - 111 - - 138 - - 133 - - 108 - - 140 - - 112 - - 133 - - 119 - - 100 - - 98 - - 114 - - 74 - - 103 - - 114 - - 82 - - 65 - - 101 - - 102 - - 66 - - 132 - - 103 - - 135 - - 74 + - 129 - 130 - - 129 - - 102 - 95 - - 82 - - 140 - - 148 - - 142 - - 118 - - 140 - - 87 - - 100 - - 89 - - 106 - - 141 - - 104 - - 63 - - 95 - - 61 - - 120 - - 104 - - 95 - - 96 - - 124 - - 104 - - 92 - - 80 - - 120 - - 69 - - 72 - - 147 - - 70 - - 118 - - 125 - - 141 - - 129 - - 134 - - 103 - - 145 - - 122 - - 110 - - 108 - - 86 - - 76 - - 68 - - 76 - - 117 - - 63 - - 81 - - 72 - - 69 - - 68 - - 107 - - 78 - - 84 - - 125 - - 128 - - 133 - - 126 - - 70 - - 81 - - 142 - - 94 - - 119 - - 111 - - 140 - - 128 - - 127 - - 126 - - 91 - - 108 - - 65 - - 87 - - 67 - - 104 - - 127 - - 76 - - 143 - - 101 - - 122 - - 134 - - 106 - - 149 - - 72 - - 115 - - 104 - - 90 - - 140 - - 143 - - 61 - - 116 - - 115 - - 92 - - 103 - - 137 - - 129 - - 79 - - 102 - - 75 - - 81 - - 78 - - 75 - - 91 - - 110 - - 138 - - 77 - - 135 - - 85 - - 145 - - 131 - - 81 - - 142 - - 65 - - 115 - - 69 - - 146 - - 69 - - 134 - - 61 - - 136 - - 86 - - 129 - - 78 - - 91 - - 102 - - 147 - - 80 - - 91 - - 65 - - 119 - - 103 - - 96 - - 143 - - 120 - - 90 - 69 + - 121 - 60 - - 142 - - 130 - - 139 - - 133 - - 99 - - 143 - - 94 - - 114 - - 108 - - 88 - - 114 - - 125 - - 103 - - 122 - - 61 - - 85 - - 60 - - 100 - - 142 - - 90 - - 76 - - 113 - - 138 - - 115 - - 96 - - 87 - - 126 - - 124 - - 113 - - 108 - - 64 - - 117 - - 78 - - 114 - - 95 - - 69 - - 138 - - 143 - - 134 - - 139 - - 126 - - 62 - - 134 - - 102 - - 125 - - 122 - - 127 - - 65 - - 147 - - 100 - - 144 - - 142 - - 131 - - 75 - - 129 - - 139 - - 117 - 74 - - 110 - - 76 - - 90 - - 82 + - 141 + - 83 - 109 - - 90 - - 130 - - 128 - - 110 - - 123 - - 129 - - 84 - - 67 - - 109 - - 112 - - 81 - - 140 + - 132 - 82 - - 143 - - 144 - - 139 - - 71 - - 108 - - 68 - - 91 - - 116 - - 74 - - 81 - - 118 - - 113 - - 132 - - 66 - - 132 - - 96 - - 132 - - 134 - - 145 - - 140 - - 90 - - 87 - - 116 - - 127 - - 79 - - 133 - - 114 - - 100 - - 85 - - 130 - - 100 - - 101 - - 122 - - 93 - - 98 - - 149 - - 137 - - 92 - - 88 - - 113 - - 120 - - 141 - - 103 - - 145 - - 126 - - 117 - - 125 - - 89 - - 140 - - 79 - - 64 - - 147 - - 98 - - 142 - - 147 - - 134 - - 77 - - 120 - - 112 - - 93 - - 77 - - 138 - - 106 - - 147 - - 115 - - 90 - - 102 - - 146 - - 143 - - 71 - - 94 - - 123 - - 113 - - 136 - - 145 - 69 - - 90 - - 115 + - 122 + - 74 + - 139 + - 123 + - 126 - 73 - - 149 - - 78 - - 129 - - 84 - - 139 - - 100 - - 112 - - 67 - - 67 - - 70 - - 119 - - 82 - - 141 - - 84 - - 109 - - 131 - - 142 - - 98 - - 125 - - 117 - - 69 - - 102 - - 134 - - 140 - - 88 - - 68 - - 145 - - 97 - - 130 - - 71 - - 135 - - 138 - - 115 - - 133 - - 88 - - 87 - - 91 - - 88 - - 94 - - 112 - - 149 - - 126 - - 140 - - 133 - - 100 - - 116 - - 62 - - 108 - - 145 - - 129 - - 86 - - 125 - - 90 - - 99 - - 101 - - 110 - - 81 - - 116 - - 115 - - 113 - - 99 - - 107 - - 118 - - 110 - - 68 - - 90 - - 143 - - 107 - - 93 - - 140 - - 82 - - 68 - - 124 - - 68 - - 73 - - 80 - - 136 - - 78 - - 109 - - 108 - - 102 - - 134 - - 68 - - 95 - - 149 - - 99 - - 131 - - 90 - - 69 - - 98 - - 132 - - 99 - - 65 - - 86 - - 120 - - 99 - - 86 - - 130 - - 142 - - 146 - - 130 - - 115 - - 76 - - 92 - - 138 - - 114 - - 83 - - 93 - - 145 - - 61 - - 101 - - 63 - - 89 - - 117 - - 93 - - 112 - - 76 - - 128 - - 71 - - 78 - - 135 - - 116 - - 125 - - 127 - - 109 - - 69 - - 116 - - 102 - - 90 - - 133 - - 98 - - 106 - - 120 - - 141 - - 133 - - 78 - - 149 - - 64 - - 91 - - 130 - - 140 - - 111 - - 72 - - 66 - - 143 - - 129 - - 91 - - 84 - - 80 - - 117 - - 93 - - 111 - - 79 - - 101 - - 67 - - 122 - - 88 - - 95 - - 77 - - 138 - - 124 - - 138 - - 109 - - 130 - - 117 - - 121 - - 113 - - 126 - - 147 - - 124 - - 116 - - 109 - - 107 - - 148 - - 93 - - 113 - - 138 - - 68 - - 79 - - 98 - - 82 - - 100 - - 81 - - 138 - - 62 - - 100 - - 130 - - 124 - - 124 - - 67 - - 139 - - 90 - - 69 - - 107 - - 126 - - 120 - - 61 - - 101 - - 126 - - 114 - - 102 - - 66 - - 98 - - 83 - - 148 - - 68 - - 107 - - 110 - - 112 - - 114 - - 75 - - 139 - - 124 - - 87 - - 104 - - 98 - - 71 - 85 - - 77 - - 83 - - 76 - - 63 - - 100 - - 116 - - 89 - - 96 - - 114 - - 119 - - 117 - - 144 - - 121 - - 113 - - 126 - - 75 - - 65 - - 78 - - 106 - - 146 - - 149 - - 116 - - 87 - - 112 - - 92 - - 85 - - 113 - - 68 - - 135 - - 115 - - 115 - - 130 - - 65 - - 99 - - 104 - - 69 - - 66 - - 116 - - 106 - - 138 - - 95 - - 76 - - 144 - - 62 - - 114 - - 86 - - 83 - - 86 - - 149 - - 112 - - 68 - - 129 - - 79 - - 148 - - 86 - - 116 - - 131 - - 66 - - 96 - - 87 - - 105 - - 81 - - 139 - - 136 - - 100 - - 138 - - 93 - - 110 - - 99 - - 91 - - 116 - - 127 - - 128 - - 130 - - 115 - - 130 - - 82 - - 127 - - 126 - - 64 - - 71 - - 139 - - 95 - - 120 - - 87 - - 112 - - 91 - - 65 - - 128 - - 107 - - 98 - - 99 - - 144 - - 65 - - 127 - - 72 - - 149 - - 123 - - 143 - - 109 - - 130 - - 116 - - 71 - - 93 - - 138 - - 127 - - 90 - - 141 - - 61 - - 129 - - 84 - - 114 - - 68 - - 123 - - 75 - - 96 - - 102 - - 67 - - 128 - - 80 - - 148 - - 110 - - 128 - - 69 - - 145 - - 131 - - 145 - - 80 - - 142 - - 95 - - 138 - - 82 - - 79 - - 70 - - 120 - - 64 - - 94 - - 82 - - 127 - - 72 - - 78 - - 114 - - 103 - - 140 - - 148 - - 75 - - 147 - - 94 - - 61 - 64 - 76 - - 75 - - 95 - - 68 - - 147 - - 114 - - 92 - - 130 - - 148 - - 116 - - 124 - - 63 - - 146 - - 106 - - 97 - - 66 - - 85 - - 144 - - 137 - - 77 - - 101 - - 139 - - 121 - - 145 - - 123 - - 111 - - 108 - - 65 - - 116 - - 122 - - 62 - - 141 - - 79 - - 66 - - 119 - - 85 - - 134 - - 63 - - 82 - - 128 - - 87 - - 94 - - 136 - - 117 - - 93 - - 112 - - 109 - - 121 - - 115 - - 127 - - 96 - - 108 - - 122 - - 130 - - 137 - - 148 - - 83 - - 109 - - 127 - - 149 - - 73 - - 80 - - 123 - - 116 - - 66 - - 102 - - 88 - - 72 - - 61 - - 144 - - 114 - - 137 - 90 - 99 - - 76 - - 136 - - 60 - - 146 - - 123 - - 74 - - 136 - - 149 - - 70 - - 102 - - 74 - - 138 - - 90 - - 66 - - 79 - - 76 - - 119 + - 128 + - 64 + - 71 m_XData: - 0 - 1 @@ -58769,941 +55029,6 @@ MonoBehaviour: - 63 - 64 - 65 - - 66 - - 67 - - 68 - - 69 - - 70 - - 71 - - 72 - - 73 - - 74 - - 75 - - 76 - - 77 - - 78 - - 79 - - 80 - - 81 - - 82 - - 83 - - 84 - - 85 - - 86 - - 87 - - 88 - - 89 - - 90 - - 91 - - 92 - - 93 - - 94 - - 95 - - 96 - - 97 - - 98 - - 99 - - 100 - - 101 - - 102 - - 103 - - 104 - - 105 - - 106 - - 107 - - 108 - - 109 - - 110 - - 111 - - 112 - - 113 - - 114 - - 115 - - 116 - - 117 - - 118 - - 119 - - 120 - - 121 - - 122 - - 123 - - 124 - - 125 - - 126 - - 127 - - 128 - - 129 - - 130 - - 131 - - 132 - - 133 - - 134 - - 135 - - 136 - - 137 - - 138 - - 139 - - 140 - - 141 - - 142 - - 143 - - 144 - - 145 - - 146 - - 147 - - 148 - - 149 - - 150 - - 151 - - 152 - - 153 - - 154 - - 155 - - 156 - - 157 - - 158 - - 159 - - 160 - - 161 - - 162 - - 163 - - 164 - - 165 - - 166 - - 167 - - 168 - - 169 - - 170 - - 171 - - 172 - - 173 - - 174 - - 175 - - 176 - - 177 - - 178 - - 179 - - 180 - - 181 - - 182 - - 183 - - 184 - - 185 - - 186 - - 187 - - 188 - - 189 - - 190 - - 191 - - 192 - - 193 - - 194 - - 195 - - 196 - - 197 - - 198 - - 199 - - 200 - - 201 - - 202 - - 203 - - 204 - - 205 - - 206 - - 207 - - 208 - - 209 - - 210 - - 211 - - 212 - - 213 - - 214 - - 215 - - 216 - - 217 - - 218 - - 219 - - 220 - - 221 - - 222 - - 223 - - 224 - - 225 - - 226 - - 227 - - 228 - - 229 - - 230 - - 231 - - 232 - - 233 - - 234 - - 235 - - 236 - - 237 - - 238 - - 239 - - 240 - - 241 - - 242 - - 243 - - 244 - - 245 - - 246 - - 247 - - 248 - - 249 - - 250 - - 251 - - 252 - - 253 - - 254 - - 255 - - 256 - - 257 - - 258 - - 259 - - 260 - - 261 - - 262 - - 263 - - 264 - - 265 - - 266 - - 267 - - 268 - - 269 - - 270 - - 271 - - 272 - - 273 - - 274 - - 275 - - 276 - - 277 - - 278 - - 279 - - 280 - - 281 - - 282 - - 283 - - 284 - - 285 - - 286 - - 287 - - 288 - - 289 - - 290 - - 291 - - 292 - - 293 - - 294 - - 295 - - 296 - - 297 - - 298 - - 299 - - 300 - - 301 - - 302 - - 303 - - 304 - - 305 - - 306 - - 307 - - 308 - - 309 - - 310 - - 311 - - 312 - - 313 - - 314 - - 315 - - 316 - - 317 - - 318 - - 319 - - 320 - - 321 - - 322 - - 323 - - 324 - - 325 - - 326 - - 327 - - 328 - - 329 - - 330 - - 331 - - 332 - - 333 - - 334 - - 335 - - 336 - - 337 - - 338 - - 339 - - 340 - - 341 - - 342 - - 343 - - 344 - - 345 - - 346 - - 347 - - 348 - - 349 - - 350 - - 351 - - 352 - - 353 - - 354 - - 355 - - 356 - - 357 - - 358 - - 359 - - 360 - - 361 - - 362 - - 363 - - 364 - - 365 - - 366 - - 367 - - 368 - - 369 - - 370 - - 371 - - 372 - - 373 - - 374 - - 375 - - 376 - - 377 - - 378 - - 379 - - 380 - - 381 - - 382 - - 383 - - 384 - - 385 - - 386 - - 387 - - 388 - - 389 - - 390 - - 391 - - 392 - - 393 - - 394 - - 395 - - 396 - - 397 - - 398 - - 399 - - 400 - - 401 - - 402 - - 403 - - 404 - - 405 - - 406 - - 407 - - 408 - - 409 - - 410 - - 411 - - 412 - - 413 - - 414 - - 415 - - 416 - - 417 - - 418 - - 419 - - 420 - - 421 - - 422 - - 423 - - 424 - - 425 - - 426 - - 427 - - 428 - - 429 - - 430 - - 431 - - 432 - - 433 - - 434 - - 435 - - 436 - - 437 - - 438 - - 439 - - 440 - - 441 - - 442 - - 443 - - 444 - - 445 - - 446 - - 447 - - 448 - - 449 - - 450 - - 451 - - 452 - - 453 - - 454 - - 455 - - 456 - - 457 - - 458 - - 459 - - 460 - - 461 - - 462 - - 463 - - 464 - - 465 - - 466 - - 467 - - 468 - - 469 - - 470 - - 471 - - 472 - - 473 - - 474 - - 475 - - 476 - - 477 - - 478 - - 479 - - 480 - - 481 - - 482 - - 483 - - 484 - - 485 - - 486 - - 487 - - 488 - - 489 - - 490 - - 491 - - 492 - - 493 - - 494 - - 495 - - 496 - - 497 - - 498 - - 499 - - 500 - - 501 - - 502 - - 503 - - 504 - - 505 - - 506 - - 507 - - 508 - - 509 - - 510 - - 511 - - 512 - - 513 - - 514 - - 515 - - 516 - - 517 - - 518 - - 519 - - 520 - - 521 - - 522 - - 523 - - 524 - - 525 - - 526 - - 527 - - 528 - - 529 - - 530 - - 531 - - 532 - - 533 - - 534 - - 535 - - 536 - - 537 - - 538 - - 539 - - 540 - - 541 - - 542 - - 543 - - 544 - - 545 - - 546 - - 547 - - 548 - - 549 - - 550 - - 551 - - 552 - - 553 - - 554 - - 555 - - 556 - - 557 - - 558 - - 559 - - 560 - - 561 - - 562 - - 563 - - 564 - - 565 - - 566 - - 567 - - 568 - - 569 - - 570 - - 571 - - 572 - - 573 - - 574 - - 575 - - 576 - - 577 - - 578 - - 579 - - 580 - - 581 - - 582 - - 583 - - 584 - - 585 - - 586 - - 587 - - 588 - - 589 - - 590 - - 591 - - 592 - - 593 - - 594 - - 595 - - 596 - - 597 - - 598 - - 599 - - 600 - - 601 - - 602 - - 603 - - 604 - - 605 - - 606 - - 607 - - 608 - - 609 - - 610 - - 611 - - 612 - - 613 - - 614 - - 615 - - 616 - - 617 - - 618 - - 619 - - 620 - - 621 - - 622 - - 623 - - 624 - - 625 - - 626 - - 627 - - 628 - - 629 - - 630 - - 631 - - 632 - - 633 - - 634 - - 635 - - 636 - - 637 - - 638 - - 639 - - 640 - - 641 - - 642 - - 643 - - 644 - - 645 - - 646 - - 647 - - 648 - - 649 - - 650 - - 651 - - 652 - - 653 - - 654 - - 655 - - 656 - - 657 - - 658 - - 659 - - 660 - - 661 - - 662 - - 663 - - 664 - - 665 - - 666 - - 667 - - 668 - - 669 - - 670 - - 671 - - 672 - - 673 - - 674 - - 675 - - 676 - - 677 - - 678 - - 679 - - 680 - - 681 - - 682 - - 683 - - 684 - - 685 - - 686 - - 687 - - 688 - - 689 - - 690 - - 691 - - 692 - - 693 - - 694 - - 695 - - 696 - - 697 - - 698 - - 699 - - 700 - - 701 - - 702 - - 703 - - 704 - - 705 - - 706 - - 707 - - 708 - - 709 - - 710 - - 711 - - 712 - - 713 - - 714 - - 715 - - 716 - - 717 - - 718 - - 719 - - 720 - - 721 - - 722 - - 723 - - 724 - - 725 - - 726 - - 727 - - 728 - - 729 - - 730 - - 731 - - 732 - - 733 - - 734 - - 735 - - 736 - - 737 - - 738 - - 739 - - 740 - - 741 - - 742 - - 743 - - 744 - - 745 - - 746 - - 747 - - 748 - - 749 - - 750 - - 751 - - 752 - - 753 - - 754 - - 755 - - 756 - - 757 - - 758 - - 759 - - 760 - - 761 - - 762 - - 763 - - 764 - - 765 - - 766 - - 767 - - 768 - - 769 - - 770 - - 771 - - 772 - - 773 - - 774 - - 775 - - 776 - - 777 - - 778 - - 779 - - 780 - - 781 - - 782 - - 783 - - 784 - - 785 - - 786 - - 787 - - 788 - - 789 - - 790 - - 791 - - 792 - - 793 - - 794 - - 795 - - 796 - - 797 - - 798 - - 799 - - 800 - - 801 - - 802 - - 803 - - 804 - - 805 - - 806 - - 807 - - 808 - - 809 - - 810 - - 811 - - 812 - - 813 - - 814 - - 815 - - 816 - - 817 - - 818 - - 819 - - 820 - - 821 - - 822 - - 823 - - 824 - - 825 - - 826 - - 827 - - 828 - - 829 - - 830 - - 831 - - 832 - - 833 - - 834 - - 835 - - 836 - - 837 - - 838 - - 839 - - 840 - - 841 - - 842 - - 843 - - 844 - - 845 - - 846 - - 847 - - 848 - - 849 - - 850 - - 851 - - 852 - - 853 - - 854 - - 855 - - 856 - - 857 - - 858 - - 859 - - 860 - - 861 - - 862 - - 863 - - 864 - - 865 - - 866 - - 867 - - 868 - - 869 - - 870 - - 871 - - 872 - - 873 - - 874 - - 875 - - 876 - - 877 - - 878 - - 879 - - 880 - - 881 - - 882 - - 883 - - 884 - - 885 - - 886 - - 887 - - 888 - - 889 - - 890 - - 891 - - 892 - - 893 - - 894 - - 895 - - 896 - - 897 - - 898 - - 899 - - 900 - - 901 - - 902 - - 903 - - 904 - - 905 - - 906 - - 907 - - 908 - - 909 - - 910 - - 911 - - 912 - - 913 - - 914 - - 915 - - 916 - - 917 - - 918 - - 919 - - 920 - - 921 - - 922 - - 923 - - 924 - - 925 - - 926 - - 927 - - 928 - - 929 - - 930 - - 931 - - 932 - - 933 - - 934 - - 935 - - 936 - - 937 - - 938 - - 939 - - 940 - - 941 - - 942 - - 943 - - 944 - - 945 - - 946 - - 947 - - 948 - - 949 - - 950 - - 951 - - 952 - - 953 - - 954 - - 955 - - 956 - - 957 - - 958 - - 959 - - 960 - - 961 - - 962 - - 963 - - 964 - - 965 - - 966 - - 967 - - 968 - - 969 - - 970 - - 971 - - 972 - - 973 - - 974 - - 975 - - 976 - - 977 - - 978 - - 979 - - 980 - - 981 - - 982 - - 983 - - 984 - - 985 - - 986 - - 987 - - 988 - - 989 - - 990 - - 991 - - 992 - - 993 - - 994 - - 995 - - 996 - - 997 - - 998 - - 999 - - 1000 m_Large: 0 m_MinShowDataNumber: 0 m_MaxShowDataNumber: 0 @@ -59728,1007 +55053,72 @@ MonoBehaviour: m_SplitLineType: 2 m_BoundaryGap: 0 m_Data: - - 02:01:54 - - 02:01:55 - - 02:01:56 - - 02:01:57 - - 02:01:58 - - 02:01:59 - - 02:02:00 - - 02:02:01 - - 02:02:02 - - 02:02:03 - - 02:02:04 - - 02:02:05 - - 02:02:06 - - 02:02:07 - - 02:02:08 - - 02:02:09 - - 02:02:10 - - 02:02:11 - - 02:02:12 - - 02:02:13 - - 02:02:14 - - 02:02:15 - - 02:02:16 - - 02:02:17 - - 02:02:18 - - 02:02:19 - - 02:02:20 - - 02:02:21 - - 02:02:22 - - 02:02:23 - - 02:02:24 - - 02:02:25 - - 02:02:26 - - 02:02:27 - - 02:02:28 - - 02:02:29 - - 02:02:30 - - 02:02:31 - - 02:02:32 - - 02:02:33 - - 02:02:34 - - 02:02:35 - - 02:02:36 - - 02:02:37 - - 02:02:38 - - 02:02:39 - - 02:02:40 - - 02:02:41 - - 02:02:42 - - 02:02:43 - - 02:02:44 - - 02:02:45 - - 02:02:46 - - 02:02:47 - - 02:02:48 - - 02:02:49 - - 02:02:50 - - 02:02:51 - - 02:02:52 - - 02:02:53 - - 02:02:54 - - 02:02:55 - - 02:02:56 - - 02:02:57 - - 02:02:58 - - 02:02:59 - - 02:03:00 - - 02:03:01 - - 02:03:02 - - 02:03:03 - - 02:03:04 - - 02:03:05 - - 02:03:06 - - 02:03:07 - - 02:03:08 - - 02:03:09 - - 02:03:10 - - 02:03:11 - - 02:03:12 - - 02:03:13 - - 02:03:14 - - 02:03:15 - - 02:03:16 - - 02:03:17 - - 02:03:18 - - 02:03:19 - - 02:03:20 - - 02:03:21 - - 02:03:22 - - 02:03:23 - - 02:03:24 - - 02:03:25 - - 02:03:26 - - 02:03:27 - - 02:03:28 - - 02:03:29 - - 02:03:30 - - 02:03:31 - - 02:03:32 - - 02:03:33 - - 02:03:34 - - 02:03:35 - - 02:03:36 - - 02:03:37 - - 02:03:38 - - 02:03:39 - - 02:03:40 - - 02:03:41 - - 02:03:42 - - 02:03:43 - - 02:03:44 - - 02:03:45 - - 02:03:46 - - 02:03:47 - - 02:03:48 - - 02:03:49 - - 02:03:50 - - 02:03:51 - - 02:03:52 - - 02:03:53 - - 02:03:54 - - 02:03:55 - - 02:03:56 - - 02:03:57 - - 02:03:58 - - 02:03:59 - - 02:04:00 - - 02:04:01 - - 02:04:02 - - 02:04:03 - - 02:04:04 - - 02:04:05 - - 02:04:06 - - 02:04:07 - - 02:04:08 - - 02:04:09 - - 02:04:10 - - 02:04:11 - - 02:04:12 - - 02:04:13 - - 02:04:14 - - 02:04:15 - - 02:04:16 - - 02:04:17 - - 02:04:18 - - 02:04:19 - - 02:04:20 - - 02:04:21 - - 02:04:22 - - 02:04:23 - - 02:04:24 - - 02:04:25 - - 02:04:26 - - 02:04:27 - - 02:04:28 - - 02:04:29 - - 02:04:30 - - 02:04:31 - - 02:04:32 - - 02:04:33 - - 02:04:34 - - 02:04:35 - - 02:04:36 - - 02:04:37 - - 02:04:38 - - 02:04:39 - - 02:04:40 - - 02:04:41 - - 02:04:42 - - 02:04:43 - - 02:04:44 - - 02:04:45 - - 02:04:46 - - 02:04:47 - - 02:04:48 - - 02:04:49 - - 02:04:50 - - 02:04:51 - - 02:04:52 - - 02:04:53 - - 02:04:54 - - 02:04:55 - - 02:04:56 - - 02:04:57 - - 02:04:58 - - 02:04:59 - - 02:05:00 - - 02:05:01 - - 02:05:02 - - 02:05:03 - - 02:05:04 - - 02:05:05 - - 02:05:06 - - 02:05:07 - - 02:05:08 - - 02:05:09 - - 02:05:10 - - 02:05:11 - - 02:05:12 - - 02:05:13 - - 02:05:14 - - 02:05:15 - - 02:05:16 - - 02:05:17 - - 02:05:18 - - 02:05:19 - - 02:05:20 - - 02:05:21 - - 02:05:22 - - 02:05:23 - - 02:05:24 - - 02:05:25 - - 02:05:26 - - 02:05:27 - - 02:05:28 - - 02:05:29 - - 02:05:30 - - 02:05:31 - - 02:05:32 - - 02:05:33 - - 02:05:34 - - 02:05:35 - - 02:05:36 - - 02:05:37 - - 02:05:38 - - 02:05:39 - - 02:05:40 - - 02:05:41 - - 02:05:42 - - 02:05:43 - - 02:05:44 - - 02:05:45 - - 02:05:46 - - 02:05:47 - - 02:05:48 - - 02:05:49 - - 02:05:50 - - 02:05:51 - - 02:05:52 - - 02:05:53 - - 02:05:54 - - 02:05:55 - - 02:05:56 - - 02:05:57 - - 02:05:58 - - 02:05:59 - - 02:06:00 - - 02:06:01 - - 02:06:02 - - 02:06:03 - - 02:06:04 - - 02:06:05 - - 02:06:06 - - 02:06:07 - - 02:06:08 - - 02:06:09 - - 02:06:10 - - 02:06:11 - - 02:06:12 - - 02:06:13 - - 02:06:14 - - 02:06:15 - - 02:06:16 - - 02:06:17 - - 02:06:18 - - 02:06:19 - - 02:06:20 - - 02:06:21 - - 02:06:22 - - 02:06:23 - - 02:06:24 - - 02:06:25 - - 02:06:26 - - 02:06:27 - - 02:06:28 - - 02:06:29 - - 02:06:30 - - 02:06:31 - - 02:06:32 - - 02:06:33 - - 02:06:34 - - 02:06:35 - - 02:06:36 - - 02:06:37 - - 02:06:38 - - 02:06:39 - - 02:06:40 - - 02:06:41 - - 02:06:42 - - 02:06:43 - - 02:06:44 - - 02:06:45 - - 02:06:46 - - 02:06:47 - - 02:06:48 - - 02:06:49 - - 02:06:50 - - 02:06:51 - - 02:06:52 - - 02:06:53 - - 02:06:54 - - 02:06:55 - - 02:06:56 - - 02:06:57 - - 02:06:58 - - 02:06:59 - - 02:07:00 - - 02:07:01 - - 02:07:02 - - 02:07:03 - - 02:07:04 - - 02:07:05 - - 02:07:06 - - 02:07:07 - - 02:07:08 - - 02:07:09 - - 02:07:10 - - 02:07:11 - - 02:07:12 - - 02:07:13 - - 02:07:14 - - 02:07:15 - - 02:07:16 - - 02:07:17 - - 02:07:18 - - 02:07:19 - - 02:07:20 - - 02:07:21 - - 02:07:22 - - 02:07:23 - - 02:07:24 - - 02:07:25 - - 02:07:26 - - 02:07:27 - - 02:07:28 - - 02:07:29 - - 02:07:30 - - 02:07:31 - - 02:07:32 - - 02:07:33 - - 02:07:34 - - 02:07:35 - - 02:07:36 - - 02:07:37 - - 02:07:38 - - 02:07:39 - - 02:07:40 - - 02:07:41 - - 02:07:42 - - 02:07:43 - - 02:07:44 - - 02:07:45 - - 02:07:46 - - 02:07:47 - - 02:07:48 - - 02:07:49 - - 02:07:50 - - 02:07:51 - - 02:07:52 - - 02:07:53 - - 02:07:54 - - 02:07:55 - - 02:07:56 - - 02:07:57 - - 02:07:58 - - 02:07:59 - - 02:08:00 - - 02:08:01 - - 02:08:02 - - 02:08:03 - - 02:08:04 - - 02:08:05 - - 02:08:06 - - 02:08:07 - - 02:08:08 - - 02:08:09 - - 02:08:10 - - 02:08:11 - - 02:08:12 - - 02:08:13 - - 02:08:14 - - 02:08:15 - - 02:08:16 - - 02:08:17 - - 02:08:18 - - 02:08:19 - - 02:08:20 - - 02:08:21 - - 02:08:22 - - 02:08:23 - - 02:08:24 - - 02:08:25 - - 02:08:26 - - 02:08:27 - - 02:08:28 - - 02:08:29 - - 02:08:30 - - 02:08:31 - - 02:08:32 - - 02:08:33 - - 02:08:34 - - 02:08:35 - - 02:08:36 - - 02:08:37 - - 02:08:38 - - 02:08:39 - - 02:08:40 - - 02:08:41 - - 02:08:42 - - 02:08:43 - - 02:08:44 - - 02:08:45 - - 02:08:46 - - 02:08:47 - - 02:08:48 - - 02:08:49 - - 02:08:50 - - 02:08:51 - - 02:08:52 - - 02:08:53 - - 02:08:54 - - 02:08:55 - - 02:08:56 - - 02:08:57 - - 02:08:58 - - 02:08:59 - - 02:09:00 - - 02:09:01 - - 02:09:02 - - 02:09:03 - - 02:09:04 - - 02:09:05 - - 02:09:06 - - 02:09:07 - - 02:09:08 - - 02:09:09 - - 02:09:10 - - 02:09:11 - - 02:09:12 - - 02:09:13 - - 02:09:14 - - 02:09:15 - - 02:09:16 - - 02:09:17 - - 02:09:18 - - 02:09:19 - - 02:09:20 - - 02:09:21 - - 02:09:22 - - 02:09:23 - - 02:09:24 - - 02:09:25 - - 02:09:26 - - 02:09:27 - - 02:09:28 - - 02:09:29 - - 02:09:30 - - 02:09:31 - - 02:09:32 - - 02:09:33 - - 02:09:34 - - 02:09:35 - - 02:09:36 - - 02:09:37 - - 02:09:38 - - 02:09:39 - - 02:09:40 - - 02:09:41 - - 02:09:42 - - 02:09:43 - - 02:09:44 - - 02:09:45 - - 02:09:46 - - 02:09:47 - - 02:09:48 - - 02:09:49 - - 02:09:50 - - 02:09:51 - - 02:09:52 - - 02:09:53 - - 02:09:54 - - 02:09:55 - - 02:09:56 - - 02:09:57 - - 02:09:58 - - 02:09:59 - - 02:10:00 - - 02:10:01 - - 02:10:02 - - 02:10:03 - - 02:10:04 - - 02:10:05 - - 02:10:06 - - 02:10:07 - - 02:10:08 - - 02:10:09 - - 02:10:10 - - 02:10:11 - - 02:10:12 - - 02:10:13 - - 02:10:14 - - 02:10:15 - - 02:10:16 - - 02:10:17 - - 02:10:18 - - 02:10:19 - - 02:10:20 - - 02:10:21 - - 02:10:22 - - 02:10:23 - - 02:10:24 - - 02:10:25 - - 02:10:26 - - 02:10:27 - - 02:10:28 - - 02:10:29 - - 02:10:30 - - 02:10:31 - - 02:10:32 - - 02:10:33 - - 02:10:34 - - 02:10:35 - - 02:10:36 - - 02:10:37 - - 02:10:38 - - 02:10:39 - - 02:10:40 - - 02:10:41 - - 02:10:42 - - 02:10:43 - - 02:10:44 - - 02:10:45 - - 02:10:46 - - 02:10:47 - - 02:10:48 - - 02:10:49 - - 02:10:50 - - 02:10:51 - - 02:10:52 - - 02:10:53 - - 02:10:54 - - 02:10:55 - - 02:10:56 - - 02:10:57 - - 02:10:58 - - 02:10:59 - - 02:11:00 - - 02:11:01 - - 02:11:02 - - 02:11:03 - - 02:11:04 - - 02:11:05 - - 02:11:06 - - 02:11:07 - - 02:11:08 - - 02:11:09 - - 02:11:10 - - 02:11:11 - - 02:11:12 - - 02:11:13 - - 02:11:14 - - 02:11:15 - - 02:11:16 - - 02:11:17 - - 02:11:18 - - 02:11:19 - - 02:11:20 - - 02:11:21 - - 02:11:22 - - 02:11:23 - - 02:11:24 - - 02:11:25 - - 02:11:26 - - 02:11:27 - - 02:11:28 - - 02:11:29 - - 02:11:30 - - 02:11:31 - - 02:11:32 - - 02:11:33 - - 02:11:34 - - 02:11:35 - - 02:11:36 - - 02:11:37 - - 02:11:38 - - 02:11:39 - - 02:11:40 - - 02:11:41 - - 02:11:42 - - 02:11:43 - - 02:11:44 - - 02:11:45 - - 02:11:46 - - 02:11:47 - - 02:11:48 - - 02:11:49 - - 02:11:50 - - 02:11:51 - - 02:11:52 - - 02:11:53 - - 02:11:54 - - 02:11:55 - - 02:11:56 - - 02:11:57 - - 02:11:58 - - 02:11:59 - - 02:12:00 - - 02:12:01 - - 02:12:02 - - 02:12:03 - - 02:12:04 - - 02:12:05 - - 02:12:06 - - 02:12:07 - - 02:12:08 - - 02:12:09 - - 02:12:10 - - 02:12:11 - - 02:12:12 - - 02:12:13 - - 02:12:14 - - 02:12:15 - - 02:12:16 - - 02:12:17 - - 02:12:18 - - 02:12:19 - - 02:12:20 - - 02:12:21 - - 02:12:22 - - 02:12:23 - - 02:12:24 - - 02:12:25 - - 02:12:26 - - 02:12:27 - - 02:12:28 - - 02:12:29 - - 02:12:30 - - 02:12:31 - - 02:12:32 - - 02:12:33 - - 02:12:34 - - 02:12:35 - - 02:12:36 - - 02:12:37 - - 02:12:38 - - 02:12:39 - - 02:12:40 - - 02:12:41 - - 02:12:42 - - 02:12:43 - - 02:12:44 - - 02:12:45 - - 02:12:46 - - 02:12:47 - - 02:12:48 - - 02:12:49 - - 02:12:50 - - 02:12:51 - - 02:12:52 - - 02:12:53 - - 02:12:54 - - 02:12:55 - - 02:12:56 - - 02:12:57 - - 02:12:58 - - 02:12:59 - - 02:13:00 - - 02:13:01 - - 02:13:02 - - 02:13:03 - - 02:13:04 - - 02:13:05 - - 02:13:06 - - 02:13:07 - - 02:13:08 - - 02:13:09 - - 02:13:10 - - 02:13:11 - - 02:13:12 - - 02:13:13 - - 02:13:14 - - 02:13:15 - - 02:13:16 - - 02:13:17 - - 02:13:18 - - 02:13:19 - - 02:13:20 - - 02:13:21 - - 02:13:22 - - 02:13:23 - - 02:13:24 - - 02:13:25 - - 02:13:26 - - 02:13:27 - - 02:13:28 - - 02:13:29 - - 02:13:30 - - 02:13:31 - - 02:13:32 - - 02:13:33 - - 02:13:34 - - 02:13:35 - - 02:13:36 - - 02:13:37 - - 02:13:38 - - 02:13:39 - - 02:13:40 - - 02:13:41 - - 02:13:42 - - 02:13:43 - - 02:13:44 - - 02:13:45 - - 02:13:46 - - 02:13:47 - - 02:13:48 - - 02:13:49 - - 02:13:50 - - 02:13:51 - - 02:13:52 - - 02:13:53 - - 02:13:54 - - 02:13:55 - - 02:13:56 - - 02:13:57 - - 02:13:58 - - 02:13:59 - - 02:14:00 - - 02:14:01 - - 02:14:02 - - 02:14:03 - - 02:14:04 - - 02:14:05 - - 02:14:06 - - 02:14:07 - - 02:14:08 - - 02:14:09 - - 02:14:10 - - 02:14:11 - - 02:14:12 - - 02:14:13 - - 02:14:14 - - 02:14:15 - - 02:14:16 - - 02:14:17 - - 02:14:18 - - 02:14:19 - - 02:14:20 - - 02:14:21 - - 02:14:22 - - 02:14:23 - - 02:14:24 - - 02:14:25 - - 02:14:26 - - 02:14:27 - - 02:14:28 - - 02:14:29 - - 02:14:30 - - 02:14:31 - - 02:14:32 - - 02:14:33 - - 02:14:34 - - 02:14:35 - - 02:14:36 - - 02:14:37 - - 02:14:38 - - 02:14:39 - - 02:14:40 - - 02:14:41 - - 02:14:42 - - 02:14:43 - - 02:14:44 - - 02:14:45 - - 02:14:46 - - 02:14:47 - - 02:14:48 - - 02:14:49 - - 02:14:50 - - 02:14:51 - - 02:14:52 - - 02:14:53 - - 02:14:54 - - 02:14:55 - - 02:14:56 - - 02:14:57 - - 02:14:58 - - 02:14:59 - - 02:15:00 - - 02:15:01 - - 02:15:02 - - 02:15:03 - - 02:15:04 - - 02:15:05 - - 02:15:06 - - 02:15:07 - - 02:15:08 - - 02:15:09 - - 02:15:10 - - 02:15:11 - - 02:15:12 - - 02:15:13 - - 02:15:14 - - 02:15:15 - - 02:15:16 - - 02:15:17 - - 02:15:18 - - 02:15:19 - - 02:15:20 - - 02:15:21 - - 02:15:22 - - 02:15:23 - - 02:15:24 - - 02:15:25 - - 02:15:26 - - 02:15:27 - - 02:15:28 - - 02:15:29 - - 02:15:30 - - 02:15:31 - - 02:15:32 - - 02:15:33 - - 02:15:34 - - 02:15:35 - - 02:15:36 - - 02:15:37 - - 02:15:38 - - 02:15:39 - - 02:15:40 - - 02:15:41 - - 02:15:42 - - 02:15:43 - - 02:15:44 - - 02:15:45 - - 02:15:46 - - 02:15:47 - - 02:15:48 - - 02:15:49 - - 02:15:50 - - 02:15:51 - - 02:15:52 - - 02:15:53 - - 02:15:54 - - 02:15:55 - - 02:15:56 - - 02:15:57 - - 02:15:58 - - 02:15:59 - - 02:16:00 - - 02:16:01 - - 02:16:02 - - 02:16:03 - - 02:16:04 - - 02:16:05 - - 02:16:06 - - 02:16:07 - - 02:16:08 - - 02:16:09 - - 02:16:10 - - 02:16:11 - - 02:16:12 - - 02:16:13 - - 02:16:14 - - 02:16:15 - - 02:16:16 - - 02:16:17 - - 02:16:18 - - 02:16:19 - - 02:16:20 - - 02:16:21 - - 02:16:22 - - 02:16:23 - - 02:16:24 - - 02:16:25 - - 02:16:26 - - 02:16:27 - - 02:16:28 - - 02:16:29 - - 02:16:30 - - 02:16:31 - - 02:16:32 - - 02:16:33 - - 02:16:34 - - 02:16:35 - - 02:16:36 - - 02:16:37 - - 02:16:38 - - 02:16:39 - - 02:16:40 - - 02:16:41 - - 02:16:42 - - 02:16:43 - - 02:16:44 - - 02:16:45 - - 02:16:46 - - 02:16:47 - - 02:16:48 - - 02:16:49 - - 02:16:50 - - 02:16:51 - - 02:16:52 - - 02:16:53 - - 02:16:54 - - 02:16:55 - - 02:16:56 - - 02:16:57 - - 02:16:58 - - 02:16:59 - - 02:17:00 - - 02:17:01 - - 02:17:02 - - 02:17:03 - - 02:17:04 - - 02:17:05 - - 02:17:06 - - 02:17:07 - - 02:17:08 - - 02:17:09 - - 02:17:10 - - 02:17:11 - - 02:17:12 - - 02:17:13 - - 02:17:14 - - 02:17:15 - - 02:17:16 - - 02:17:17 - - 02:17:18 - - 02:17:19 - - 02:17:20 - - 02:17:21 - - 02:17:22 - - 02:17:23 - - 02:17:24 - - 02:17:25 - - 02:17:26 - - 02:17:27 - - 02:17:28 - - 02:17:29 - - 02:17:30 - - 02:17:31 - - 02:17:32 - - 02:17:33 - - 02:17:34 - - 02:17:35 - - 02:17:36 - - 02:17:37 - - 02:17:38 - - 02:17:39 - - 02:17:40 - - 02:17:41 - - 02:17:42 - - 02:17:43 - - 02:17:44 - - 02:17:45 - - 02:17:46 - - 02:17:47 - - 02:17:48 - - 02:17:49 - - 02:17:50 - - 02:17:51 - - 02:17:52 - - 02:17:53 - - 02:17:54 - - 02:17:55 - - 02:17:56 - - 02:17:57 - - 02:17:58 - - 02:17:59 - - 02:18:00 - - 02:18:01 - - 02:18:02 - - 02:18:03 - - 02:18:04 - - 02:18:05 - - 02:18:06 - - 02:18:07 - - 02:18:08 - - 02:18:09 - - 02:18:10 - - 02:18:11 - - 02:18:12 - - 02:18:13 - - 02:18:14 - - 02:18:15 - - 02:18:16 - - 02:18:17 - - 02:18:18 - - 02:18:19 - - 02:18:20 - - 02:18:21 - - 02:18:22 - - 02:18:23 - - 02:18:24 - - 02:18:25 - - 02:18:26 - - 02:18:27 - - 02:18:28 - - 02:18:29 - - 02:18:30 - - 02:18:31 - - 02:18:32 - - 02:18:33 - - 02:18:34 + - 11:59:38 + - 11:59:39 + - 11:59:40 + - 11:59:41 + - 11:59:42 + - 11:59:43 + - 11:59:44 + - 11:59:45 + - 11:59:46 + - 11:59:47 + - 11:59:48 + - 11:59:49 + - 11:59:50 + - 11:59:51 + - 11:59:52 + - 11:59:53 + - 11:59:54 + - 11:59:55 + - 11:59:56 + - 11:59:57 + - 11:59:58 + - 11:59:59 + - 12:00:00 + - 12:00:01 + - 12:00:02 + - 12:00:03 + - 12:00:04 + - 12:00:05 + - 12:00:06 + - 12:00:07 + - 12:00:08 + - 12:00:09 + - 12:00:10 + - 12:00:11 + - 12:00:12 + - 12:00:13 + - 12:00:14 + - 12:00:15 + - 12:00:16 + - 12:00:17 + - 12:00:18 + - 12:00:19 + - 12:00:20 + - 12:00:21 + - 12:00:22 + - 12:00:23 + - 12:00:24 + - 12:00:25 + - 12:00:26 + - 12:00:27 + - 12:00:28 + - 12:00:29 + - 12:00:30 + - 12:00:31 + - 12:00:32 + - 12:00:33 + - 12:00:34 + - 12:00:35 + - 12:00:36 + - 12:00:37 + - 12:00:38 + - 12:00:39 + - 12:00:40 + - 12:00:41 + - 12:00:42 + - 12:00:43 m_AxisLine: m_Show: 1 m_OnZero: 1 @@ -61067,9 +55457,9 @@ RectTransform: m_Father: {fileID: 642687476} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &873174208 @@ -61105,9 +55495,9 @@ RectTransform: m_Father: {fileID: 1943779960} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &876487839 @@ -62274,9 +56664,9 @@ RectTransform: m_Father: {fileID: 1929109315} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &885715297 @@ -63137,7 +57527,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 27.5 + m_Text: 25 --- !u!222 &895018468 CanvasRenderer: m_ObjectHideFlags: 0 @@ -63666,7 +58056,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 27.5 + m_Text: 25 --- !u!222 &900973071 CanvasRenderer: m_ObjectHideFlags: 0 @@ -63850,11 +58240,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1030591450} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 342, y: 59} + m_AnchoredPosition: {x: 49.999992, y: -110} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &901828079 @@ -63930,9 +58320,9 @@ RectTransform: m_Father: {fileID: 1826786631} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &904076259 @@ -64844,9 +59234,9 @@ RectTransform: m_Father: {fileID: 641299932} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &925445359 @@ -66017,7 +60407,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.31764707, g: 0.31764707, b: 0.31764707, a: 0.70980394} + m_Color: {r: 0.31764707, g: 0.31764707, b: 0.31764707, a: 0.78431374} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -66164,7 +60554,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.31764707, g: 0.31764707, b: 0.31764707, a: 0.70980394} + m_Color: {r: 0.31764707, g: 0.31764707, b: 0.31764707, a: 0.78431374} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -66828,7 +61218,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:18:02 + m_Text: 12:14:41 --- !u!222 &944299792 CanvasRenderer: m_ObjectHideFlags: 0 @@ -67022,7 +61412,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:10:54 + m_Text: 12:00:12 --- !u!222 &946451148 CanvasRenderer: m_ObjectHideFlags: 0 @@ -67694,7 +62084,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1659951233} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -68429,9 +62819,9 @@ RectTransform: m_Father: {fileID: 147165467} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &958846323 @@ -68692,7 +63082,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:02:07 + m_Text: 11:59:51 --- !u!222 &965287304 CanvasRenderer: m_ObjectHideFlags: 0 @@ -69170,7 +63560,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 55 + m_Text: 50 --- !u!222 &969555798 CanvasRenderer: m_ObjectHideFlags: 0 @@ -69746,9 +64136,9 @@ RectTransform: m_Father: {fileID: 2075090255} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &980310890 @@ -70543,9 +64933,9 @@ RectTransform: m_Father: {fileID: 642687476} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1003458024 @@ -70659,9 +65049,9 @@ RectTransform: m_Father: {fileID: 147165467} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1008006624 @@ -70694,11 +65084,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1030591450} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 483.60254, y: 118.99999} + m_AnchoredPosition: {x: 191.60254, y: -50.000008} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1008006626 @@ -71908,9 +66298,9 @@ RectTransform: m_Father: {fileID: 1943779960} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1028651700 @@ -72022,13 +66412,13 @@ RectTransform: m_Children: - {fileID: 195504625} - {fileID: 918558619} - - {fileID: 2105507622} - {fileID: 196056550} - {fileID: 1139228460} - {fileID: 1008006625} - {fileID: 901828078} - {fileID: 1762931329} - {fileID: 1527025945} + - {fileID: 2105507622} m_Father: {fileID: 515963} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -72086,7 +66476,7 @@ MonoBehaviour: rgba: 542200145 m_TooltipBackgroundColor: serializedVersion: 2 - rgba: 3042005329 + rgba: 3360772433 m_TooltipFlagAreaColor: serializedVersion: 2 rgba: 542200145 @@ -72466,7 +66856,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 55 + m_Text: 50 --- !u!222 &1032352055 CanvasRenderer: m_ObjectHideFlags: 0 @@ -73199,7 +67589,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 82.5 + m_Text: 75 --- !u!222 &1050016947 CanvasRenderer: m_ObjectHideFlags: 0 @@ -73952,7 +68342,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:05:14 + m_Text: 11:59:51 --- !u!222 &1062536968 CanvasRenderer: m_ObjectHideFlags: 0 @@ -74149,9 +68539,9 @@ RectTransform: m_Father: {fileID: 2075090255} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1069636158 @@ -74447,7 +68837,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 110 + m_Text: 100 --- !u!222 &1072861289 CanvasRenderer: m_ObjectHideFlags: 0 @@ -74521,7 +68911,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 110 + m_Text: 100 --- !u!222 &1076528773 CanvasRenderer: m_ObjectHideFlags: 0 @@ -75318,9 +69708,9 @@ RectTransform: m_Father: {fileID: 1682817859} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1100316549 @@ -75467,9 +69857,9 @@ RectTransform: m_Father: {fileID: 2005110618} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1105444207 @@ -76433,9 +70823,9 @@ RectTransform: m_Father: {fileID: 642687476} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1127142891 @@ -76505,7 +70895,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 110 + m_Text: 100 --- !u!222 &1127142894 CanvasRenderer: m_ObjectHideFlags: 0 @@ -76957,7 +71347,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 55 + m_Text: 50 --- !u!222 &1132722553 CanvasRenderer: m_ObjectHideFlags: 0 @@ -77333,11 +71723,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1030591450} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 483.60254, y: 219} + m_AnchoredPosition: {x: 191.60254, y: 49.999996} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1139228461 @@ -77600,7 +71990,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 55 + m_Text: 50 --- !u!222 &1145373414 CanvasRenderer: m_ObjectHideFlags: 0 @@ -77674,7 +72064,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 55 + m_Text: 50 --- !u!222 &1146075908 CanvasRenderer: m_ObjectHideFlags: 0 @@ -77904,7 +72294,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 27.5 + m_Text: 25 --- !u!222 &1148215298 CanvasRenderer: m_ObjectHideFlags: 0 @@ -80049,11 +74439,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1852695385} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 342, y: 279} + m_AnchoredPosition: {x: 50, y: 110} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1187511509 @@ -80432,7 +74822,7 @@ MonoBehaviour: m_ItemGap: 5 m_ItemFontSize: 16 m_Data: - - Legend + - data m_Tooltip: m_Show: 1 m_CrossLabel: 0 @@ -80444,214 +74834,44 @@ MonoBehaviour: m_DataFromJson: 0 m_Show: 1 m_Type: 0 - m_Name: + m_Name: data m_Stack: m_AxisIndex: 0 m_TwoDimensionData: 0 m_YData: + - 83 - 89 - - 67 - - 74 - - 72 - - 84 - - 89 - - 85 - - 114 - - 138 - - 71 - - 92 - - 77 - - 73 - - 85 - - 82 - - 113 - - 63 - - 82 - - 105 - - 83 - - 113 - - 119 - - 120 - - 111 - - 70 - - 140 - - 149 - - 91 - - 87 - - 121 - - 75 - - 94 - - 141 - - 100 - - 100 - - 91 - - 119 - - 132 - - 124 - - 79 - - 90 - - 119 - - 105 - - 147 - - 135 - - 63 - - 105 - - 66 - - 63 - - 105 - - 69 - - 61 - - 149 - - 90 - - 67 - - 62 - - 95 - - 95 - - 131 - - 74 - - 81 - - 104 - - 134 - - 126 - - 60 - - 67 - - 100 - - 74 - - 131 - - 81 - - 99 - - 114 - - 105 - - 83 - - 79 - - 95 - - 136 - - 76 - - 136 - - 98 - - 129 - - 111 - - 62 - - 93 - - 67 - - 143 - - 112 - - 85 - - 62 - - 133 - - 62 - - 138 - - 103 - - 83 - - 75 - - 83 - - 81 - - 127 - - 94 - - 79 - - 112 - m_XData: - - 48 - - 49 - - 50 - - 51 - - 52 - - 53 - - 54 - - 55 - - 56 - - 57 - - 58 - - 59 - - 60 - - 61 - - 62 - - 63 - - 64 - - 65 - - 66 - - 67 - - 68 - - 69 - - 70 - - 71 - - 72 - - 73 - - 74 - - 75 - - 76 - - 77 - - 78 - - 79 - - 80 - - 81 - - 82 - - 83 - - 84 - - 85 - - 86 - - 87 - - 88 - - 89 - - 90 - - 91 - - 92 - - 93 - - 94 - - 95 - 96 - - 97 - - 98 + - 110 + - 144 + - 135 - 99 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 - - 100 + - 149 + - 132 + - 97 + - 136 + - 77 + - 74 + - 114 + - 67 + - 94 + m_XData: + - 0 + - 1 + - 2 + - 3 + - 4 + - 5 + - 6 + - 7 + - 8 + - 9 + - 10 + - 11 + - 12 + - 13 + - 14 + - 15 m_Large: 0 m_MinShowDataNumber: 0 m_MaxShowDataNumber: 0 @@ -80676,107 +74896,22 @@ MonoBehaviour: m_SplitLineType: 2 m_BoundaryGap: 0 m_Data: - - 02:17:42 - - 02:17:43 - - 02:17:44 - - 02:17:45 - - 02:17:46 - - 02:17:47 - - 02:17:48 - - 02:17:49 - - 02:17:50 - - 02:17:51 - - 02:17:52 - - 02:17:53 - - 02:17:54 - - 02:17:55 - - 02:17:56 - - 02:17:57 - - 02:17:58 - - 02:17:59 - - 02:18:00 - - 02:18:01 - - 02:18:02 - - 02:18:03 - - 02:18:04 - - 02:18:05 - - 02:18:06 - - 02:18:07 - - 02:18:08 - - 02:18:09 - - 02:18:10 - - 02:18:11 - - 02:18:12 - - 02:18:13 - - 02:18:14 - - 02:18:15 - - 02:18:16 - - 02:18:17 - - 02:18:18 - - 02:18:19 - - 02:18:20 - - 02:18:21 - - 02:18:22 - - 02:18:23 - - 02:18:24 - - 02:18:25 - - 02:18:26 - - 02:18:27 - - 02:18:28 - - 02:18:29 - - 02:18:30 - - 02:18:31 - - 02:18:32 - - 02:18:33 - - 02:18:34 - - 02:18:55 - - 02:18:58 - - 02:19:08 - - 02:19:14 - - 02:19:21 - - 02:20:16 - - 02:20:52 - - 02:21:43 - - 02:21:46 - - 02:21:52 - - 02:21:56 - - 02:22:04 - - 02:22:16 - - 02:22:23 - - 02:22:27 - - 02:24:11 - - 02:24:16 - - 02:24:18 - - 02:24:23 - - 02:24:24 - - 02:24:29 - - 02:24:38 - - 02:24:43 - - 02:24:51 - - 02:25:02 - - 02:25:06 - - 02:25:10 - - 02:25:15 - - 02:25:30 - - 02:25:34 - - 02:25:37 - - 02:25:46 - - 02:25:54 - - 02:26:07 - - 02:26:09 - - 02:26:10 - - 02:26:11 - - 02:26:13 - - 02:26:14 - - 02:26:16 - - 02:26:17 - - 02:26:19 - - 02:26:21 - - 02:26:25 - - 02:26:27 - - 02:26:29 - - 02:26:30 - - 02:26:36 + - 12:14:38 + - 12:14:39 + - 12:14:40 + - 12:14:41 + - 12:14:42 + - 12:14:43 + - 12:14:44 + - 12:14:45 + - 12:14:46 + - 12:14:47 + - 12:14:48 + - 12:14:49 + - 12:14:50 + - 12:14:51 + - 12:14:52 + - 12:14:53 m_AxisLine: m_Show: 1 m_OnZero: 1 @@ -81664,7 +75799,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 55 + m_Text: 50 --- !u!222 &1200529174 CanvasRenderer: m_ObjectHideFlags: 0 @@ -83702,7 +77837,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 82.5 + m_Text: 75 --- !u!222 &1225927306 CanvasRenderer: m_ObjectHideFlags: 0 @@ -84505,7 +78640,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:09:34 + m_Text: 12:00:07 --- !u!222 &1232991607 CanvasRenderer: m_ObjectHideFlags: 0 @@ -84739,7 +78874,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:21:43 + m_Text: 12:14:47 --- !u!222 &1240976689 CanvasRenderer: m_ObjectHideFlags: 0 @@ -86396,11 +80531,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1852695385} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 492.10565, y: 199.9017} + m_AnchoredPosition: {x: 200.10565, y: 30.901697} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1267263750 @@ -86900,9 +81035,9 @@ RectTransform: m_Father: {fileID: 1826786631} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1277475125 @@ -86938,9 +81073,9 @@ RectTransform: m_Father: {fileID: 2005110618} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1278210999 @@ -87400,9 +81535,9 @@ RectTransform: m_Father: {fileID: 501021417} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1290282014 @@ -88525,7 +82660,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 800 + m_Text: 40 --- !u!222 &1307446076 CanvasRenderer: m_ObjectHideFlags: 0 @@ -88603,7 +82738,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:18:34 + m_Text: 12:00:43 --- !u!222 &1307663188 CanvasRenderer: m_ObjectHideFlags: 0 @@ -88643,9 +82778,9 @@ RectTransform: m_Father: {fileID: 2075090255} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1316429577 @@ -89060,7 +83195,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 55 + m_Text: 50 --- !u!222 &1325669049 CanvasRenderer: m_ObjectHideFlags: 0 @@ -90336,7 +84471,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 55 + m_Text: 50 --- !u!222 &1343331572 CanvasRenderer: m_ObjectHideFlags: 0 @@ -90382,9 +84517,9 @@ RectTransform: m_Father: {fileID: 641299932} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &1345280471 @@ -91414,9 +85549,9 @@ RectTransform: m_Father: {fileID: 1929109315} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1368582131 @@ -91779,9 +85914,9 @@ RectTransform: m_Father: {fileID: 1115672621} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1374630719 @@ -92452,9 +86587,9 @@ RectTransform: m_Father: {fileID: 641299932} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1384363597 @@ -92568,9 +86703,9 @@ RectTransform: m_Father: {fileID: 1115672621} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1385426967 @@ -93688,9 +87823,9 @@ RectTransform: m_Father: {fileID: 1943779960} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &1402444949 @@ -94387,7 +88522,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 110 + m_Text: 100 --- !u!222 &1412188734 CanvasRenderer: m_ObjectHideFlags: 0 @@ -94685,7 +88820,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:17:02 + m_Text: 12:14:46 --- !u!222 &1421180836 CanvasRenderer: m_ObjectHideFlags: 0 @@ -95520,7 +89655,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 27.5 + m_Text: 25 --- !u!222 &1431546949 CanvasRenderer: m_ObjectHideFlags: 0 @@ -96708,7 +90843,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 55 + m_Text: 50 --- !u!222 &1451508878 CanvasRenderer: m_ObjectHideFlags: 0 @@ -96748,9 +90883,9 @@ RectTransform: m_Father: {fileID: 1826786631} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1451935926 @@ -96820,7 +90955,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 55 + m_Text: 50 --- !u!222 &1451935929 CanvasRenderer: m_ObjectHideFlags: 0 @@ -96974,9 +91109,9 @@ RectTransform: m_Father: {fileID: 1115672621} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1460781877 @@ -97935,7 +92070,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 110 + m_Text: 100 --- !u!222 &1488558938 CanvasRenderer: m_ObjectHideFlags: 0 @@ -97975,11 +92110,11 @@ RectTransform: - {fileID: 653518685} - {fileID: 1871179818} m_Father: {fileID: 1659951233} - m_RootOrder: 2 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -338} m_SizeDelta: {x: 584, y: 338} m_Pivot: {x: 0, y: 0} --- !u!222 &1492870683 @@ -98056,7 +92191,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 82.5 + m_Text: 75 --- !u!222 &1493634483 CanvasRenderer: m_ObjectHideFlags: 0 @@ -99662,7 +93797,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:08:34 + m_Text: 12:00:04 --- !u!222 &1522164962 CanvasRenderer: m_ObjectHideFlags: 0 @@ -99837,11 +93972,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1030591450} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 200.39746, y: 218.99998} + m_AnchoredPosition: {x: -91.60255, y: 49.999992} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1527025946 @@ -99918,9 +94053,9 @@ RectTransform: m_Father: {fileID: 147165467} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1530761482 @@ -101598,7 +95733,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:18:22 + m_Text: 12:14:44 --- !u!222 &1548881616 CanvasRenderer: m_ObjectHideFlags: 0 @@ -101906,7 +96041,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:13:34 + m_Text: 12:00:23 --- !u!222 &1557603447 CanvasRenderer: m_ObjectHideFlags: 0 @@ -103311,9 +97446,9 @@ RectTransform: m_Father: {fileID: 1826786631} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1586192224 @@ -104401,7 +98536,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.31764707, g: 0.31764707, b: 0.31764707, a: 0.70980394} + m_Color: {r: 0.31764707, g: 0.31764707, b: 0.31764707, a: 0.78431374} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -116532,7 +110667,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 82.5 + m_Text: 75 --- !u!222 &1632029916 CanvasRenderer: m_ObjectHideFlags: 0 @@ -116899,7 +111034,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 10 + m_Text: 20 --- !u!222 &1636839117 CanvasRenderer: m_ObjectHideFlags: 0 @@ -118487,9 +112622,9 @@ RectTransform: m_Father: {fileID: 501021417} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1657598370 @@ -118748,7 +112883,6 @@ RectTransform: m_Children: - {fileID: 4214939} - {fileID: 1644173897} - - {fileID: 1492870682} - {fileID: 472824659} - {fileID: 769762581} - {fileID: 1760768106} @@ -118756,6 +112890,7 @@ RectTransform: - {fileID: 18226464} - {fileID: 271232941} - {fileID: 950671906} + - {fileID: 1492870682} m_Father: {fileID: 515963} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -118813,7 +112948,7 @@ MonoBehaviour: rgba: 542200145 m_TooltipBackgroundColor: serializedVersion: 2 - rgba: 3042005329 + rgba: 3360772433 m_TooltipFlagAreaColor: serializedVersion: 2 rgba: 542200145 @@ -119757,7 +113892,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 20 + m_Text: 40 --- !u!222 &1676370586 CanvasRenderer: m_ObjectHideFlags: 0 @@ -120210,7 +114345,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 82.5 + m_Text: 75 --- !u!222 &1687282387 CanvasRenderer: m_ObjectHideFlags: 0 @@ -120884,7 +115019,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 27.5 + m_Text: 25 --- !u!222 &1701914187 CanvasRenderer: m_ObjectHideFlags: 0 @@ -121597,9 +115732,9 @@ RectTransform: m_Father: {fileID: 1682817859} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1719780494 @@ -122014,9 +116149,9 @@ RectTransform: m_Father: {fileID: 147165467} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1727422596 @@ -122288,9 +116423,9 @@ RectTransform: m_Father: {fileID: 642687476} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &1730658103 @@ -123673,11 +117808,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1659951233} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 455.60254, y: 118.99999} + m_AnchoredPosition: {x: -128.39746, y: -50.000008} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1760768107 @@ -123751,11 +117886,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1030591450} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 200.39746, y: 119.00001} + m_AnchoredPosition: {x: -91.60255, y: -49.999992} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1762931330 @@ -124058,9 +118193,9 @@ RectTransform: m_Father: {fileID: 1570353673} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1768471440 @@ -124612,7 +118747,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:02:08 + m_Text: 11:59:52 --- !u!222 &1784797043 CanvasRenderer: m_ObjectHideFlags: 0 @@ -124882,9 +119017,9 @@ RectTransform: m_Father: {fileID: 642687476} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1790700246 @@ -125067,9 +119202,9 @@ RectTransform: m_Father: {fileID: 935459893} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1792640457 @@ -125804,7 +119939,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:17:03 + m_Text: 12:14:47 --- !u!222 &1810845768 CanvasRenderer: m_ObjectHideFlags: 0 @@ -126029,7 +120164,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 2000 + m_Text: 100 --- !u!222 &1815192714 CanvasRenderer: m_ObjectHideFlags: 0 @@ -127007,9 +121142,9 @@ RectTransform: m_Father: {fileID: 2005110618} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1833792104 @@ -128066,12 +122201,12 @@ RectTransform: m_Children: - {fileID: 327173548} - {fileID: 1433738408} - - {fileID: 57554494} - {fileID: 1187511508} - {fileID: 1267263749} - {fileID: 447365844} - {fileID: 678430341} - {fileID: 624234217} + - {fileID: 57554494} m_Father: {fileID: 515963} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -128129,7 +122264,7 @@ MonoBehaviour: rgba: 542200145 m_TooltipBackgroundColor: serializedVersion: 2 - rgba: 3042005329 + rgba: 3360772433 m_TooltipFlagAreaColor: serializedVersion: 2 rgba: 542200145 @@ -129198,7 +123333,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 27.5 + m_Text: 25 --- !u!222 &1865840127 CanvasRenderer: m_ObjectHideFlags: 0 @@ -129238,9 +123373,9 @@ RectTransform: m_Father: {fileID: 935459893} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1867764079 @@ -129278,9 +123413,9 @@ RectTransform: m_Father: {fileID: 831057718} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1868865849 @@ -129427,7 +123562,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 1800 + m_Text: 60 --- !u!222 &1869409050 CanvasRenderer: m_ObjectHideFlags: 0 @@ -130421,7 +124556,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 82.5 + m_Text: 75 --- !u!222 &1888574595 CanvasRenderer: m_ObjectHideFlags: 0 @@ -130551,9 +124686,9 @@ RectTransform: m_Father: {fileID: 935459893} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1889992825 @@ -130956,9 +125091,9 @@ RectTransform: m_Father: {fileID: 642687476} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1894980811 @@ -131176,7 +125311,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 27.5 + m_Text: 25 --- !u!222 &1898016543 CanvasRenderer: m_ObjectHideFlags: 0 @@ -131300,9 +125435,9 @@ RectTransform: m_Father: {fileID: 935459893} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &1898431516 @@ -132566,9 +126701,9 @@ RectTransform: m_Father: {fileID: 2075090255} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1921075249 @@ -132792,9 +126927,9 @@ RectTransform: m_Father: {fileID: 1570353673} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!224 &1929109315 @@ -134279,9 +128414,9 @@ RectTransform: m_Father: {fileID: 831057718} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &1967590212 @@ -134432,7 +128567,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:26:36 + m_Text: 12:14:53 --- !u!222 &1969945334 CanvasRenderer: m_ObjectHideFlags: 0 @@ -135095,7 +129230,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 27.5 + m_Text: 25 --- !u!222 &1978284690 CanvasRenderer: m_ObjectHideFlags: 0 @@ -135215,9 +129350,9 @@ RectTransform: m_Father: {fileID: 1682817859} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &1980179284 @@ -135775,7 +129910,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:08:14 + m_Text: 12:00:02 --- !u!222 &1985682992 CanvasRenderer: m_ObjectHideFlags: 0 @@ -136355,7 +130490,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:02:10 + m_Text: 11:59:54 --- !u!222 &1994361781 CanvasRenderer: m_ObjectHideFlags: 0 @@ -138297,7 +132432,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:01:54 + m_Text: 11:59:38 --- !u!222 &2025453680 CanvasRenderer: m_ObjectHideFlags: 0 @@ -139031,9 +133166,9 @@ RectTransform: m_Father: {fileID: 1943779960} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &2041555581 @@ -140006,9 +134141,9 @@ RectTransform: m_Father: {fileID: 831057718} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &2055677417 @@ -140391,9 +134526,9 @@ RectTransform: m_Father: {fileID: 831057718} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &2062882541 @@ -140700,9 +134835,9 @@ RectTransform: m_Father: {fileID: 1943779960} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &2068230400 @@ -140928,9 +135063,9 @@ RectTransform: m_Father: {fileID: 1570353673} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &2072699944 @@ -141734,9 +135869,9 @@ RectTransform: m_Father: {fileID: 935459893} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &2087953055 @@ -141962,9 +136097,9 @@ RectTransform: m_Father: {fileID: 1570353673} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &2094485070 @@ -142802,11 +136937,11 @@ RectTransform: - {fileID: 771755140} - {fileID: 596891596} m_Father: {fileID: 1030591450} - m_RootOrder: 2 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -338} m_SizeDelta: {x: 584, y: 338} m_Pivot: {x: 0, y: 0} --- !u!222 &2105507623 @@ -142924,9 +137059,9 @@ RectTransform: m_Father: {fileID: 2005110618} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &2108811663 @@ -143030,9 +137165,9 @@ RectTransform: m_Father: {fileID: 2005110618} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &2111887379 @@ -143179,7 +137314,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:02:03 + m_Text: 11:59:47 --- !u!222 &2112362026 CanvasRenderer: m_ObjectHideFlags: 0 @@ -144364,9 +138499,9 @@ RectTransform: m_Father: {fileID: 1929109315} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -300} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 584, y: 300} m_Pivot: {x: 0, y: 0} --- !u!1 &2139189594 @@ -144586,7 +138721,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 02:02:01 + m_Text: 11:59:45 --- !u!222 &2140299682 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/XCharts/Scripts/UI/BarChart.cs b/Assets/XCharts/Scripts/UI/BarChart.cs index a85acea3..a061edb4 100644 --- a/Assets/XCharts/Scripts/UI/BarChart.cs +++ b/Assets/XCharts/Scripts/UI/BarChart.cs @@ -4,7 +4,7 @@ using UnityEngine.UI; namespace XCharts { - [AddComponentMenu("XCharts/BarChart", 13)] + [AddComponentMenu("XCharts/BarChart", 14)] [ExecuteInEditMode] [RequireComponent(typeof(RectTransform))] [DisallowMultipleComponent] @@ -20,12 +20,37 @@ namespace XCharts public bool inSameBar { get { return m_InSameBar; } set { m_InSameBar = value; } } public float barWidth { get { return m_BarWidth; } set { m_BarWidth = value; } } public float space { get { return m_Space; } set { m_Space = value; } } + + public static Bar defaultBar{ + get{ + return new Bar(){ + m_InSameBar = false, + m_BarWidth = 0.7f, + m_Space = 10 + }; + } + } } - [SerializeField] private Bar m_Bar = new Bar(); + [SerializeField] private Bar m_Bar = Bar.defaultBar; public Bar bar { get { return m_Bar; } } +#if UNITY_EDITOR + protected override void Reset() + { + base.Reset(); + m_Bar = Bar.defaultBar; + RemoveData(); + AddSerie("bar1", SerieType.Line); + for (int i = 0; i < 5; i++) + { + AddXAxisData("x" + (i + 1)); + AddData(0, Random.Range(10, 90)); + } + } +#endif + private void DrawYBarSerie(VertexHelper vh, int serieIndex, int stackCount, Serie serie, Color color, ref Dictionary seriesHig) { @@ -71,7 +96,7 @@ namespace XCharts Serie serie, Color color, ref Dictionary seriesHig) { if (!m_Legend.IsActive(serie.name)) return; - List showData = serie.GetYData(m_DataZoom); + List showData = serie.GetYDataList(m_DataZoom); var yAxis = m_YAxises[serie.axisIndex]; var xAxis = m_XAxises[serie.axisIndex]; if (!xAxis.show) xAxis = m_XAxises[(serie.axisIndex + 1) % m_XAxises.Count]; @@ -90,7 +115,7 @@ namespace XCharts seriesHig[i] = 0; } float value = showData[i]; - float pX = zeroX + i * scaleWid; + float pX = coordinateX + i * scaleWid; float zeroY = coordinateY + yAxis.zeroYOffset; if (!xAxis.boundaryGap) pX -= scaleWid / 2; float pY = seriesHig[i] + zeroY + m_Coordinate.tickness; @@ -145,7 +170,7 @@ namespace XCharts Vector3 ep = new Vector2(m_Tooltip.pointerPos.x, coordinateY + coordinateHig); DrawSplitLine(vh, false, Axis.SplitLineType.Dashed, sp, ep, m_ThemeInfo.tooltipLineColor); float splitWidth = yAxis.GetSplitWidth(coordinateHig, m_DataZoom); - float pY = zeroY + (m_Tooltip.yValues[i] - 1) * splitWidth + + float pY = coordinateY + (m_Tooltip.yValues[i] - 1) * splitWidth + (yAxis.boundaryGap ? splitWidth / 2 : 0); sp = new Vector2(coordinateX, pY); ep = new Vector2(coordinateX + coordinateWid, pY); diff --git a/Assets/XCharts/Scripts/UI/Internal/Axis.cs b/Assets/XCharts/Scripts/UI/Internal/Axis.cs index 3fdc21b9..43ca88d9 100644 --- a/Assets/XCharts/Scripts/UI/Internal/Axis.cs +++ b/Assets/XCharts/Scripts/UI/Internal/Axis.cs @@ -123,14 +123,14 @@ namespace XCharts public string GetData(int index, DataZoom dataZoom) { - var showData = GetData(dataZoom); + var showData = GetDataList(dataZoom); if (index >= 0 && index < showData.Count) return showData[index]; else return ""; } - public List GetData(DataZoom dataZoom) + public List GetDataList(DataZoom dataZoom) { if (dataZoom != null && dataZoom.show) { @@ -179,7 +179,7 @@ namespace XCharts public int GetSplitNumber(DataZoom dataZoom) { if (type == AxisType.Value) return m_SplitNumber; - int dataCount = GetData(dataZoom).Count; + int dataCount = GetDataList(dataZoom).Count; if (dataCount > 2 * m_SplitNumber || dataCount <= 0) return m_SplitNumber; else @@ -193,7 +193,7 @@ namespace XCharts public int GetDataNumber(DataZoom dataZoom) { - return GetData(dataZoom).Count; + return GetDataList(dataZoom).Count; } public float GetDataWidth(float coordinateWidth, DataZoom dataZoom) @@ -202,7 +202,7 @@ namespace XCharts return coordinateWidth / (m_BoundaryGap ? dataCount : dataCount - 1); } - public string GetScaleName(int index, float minValue, float maxValue, DataZoom dataZoom) + public string GetLabelName(int index, float minValue, float maxValue, DataZoom dataZoom) { if (m_Type == AxisType.Value) { @@ -212,7 +212,7 @@ namespace XCharts else return (value).ToString("f1"); } - var showData = GetData(dataZoom); + var showData = GetDataList(dataZoom); int dataCount = showData.Count; if (dataCount <= 0) return ""; @@ -239,7 +239,7 @@ namespace XCharts } else { - var showData = GetData(dataZoom); + var showData = GetDataList(dataZoom); int dataCount = showData.Count; if (dataCount > 2 * splitNumber || dataCount <= 0) return m_BoundaryGap ? m_SplitNumber + 1 : m_SplitNumber; @@ -259,7 +259,10 @@ namespace XCharts { for (int i = 0; i < axisLabelTextList.Count; i++) { - axisLabelTextList[i].text = GetScaleName(i, minValue, maxValue, dataZoom); + if (axisLabelTextList[i] != null) + { + axisLabelTextList[i].text = GetLabelName(i, minValue, maxValue, dataZoom); + } } } diff --git a/Assets/XCharts/Scripts/UI/Internal/BaseChart.cs b/Assets/XCharts/Scripts/UI/Internal/BaseChart.cs index 28d4fbd7..f91b3ea9 100644 --- a/Assets/XCharts/Scripts/UI/Internal/BaseChart.cs +++ b/Assets/XCharts/Scripts/UI/Internal/BaseChart.cs @@ -50,23 +50,192 @@ namespace XCharts public Tooltip tooltip { get { return m_Tooltip; } } public Series series { get { return m_Series; } } - public bool large { get { return m_Large; } set { m_Large = value; } } + /// + /// The min number of data to show in chart. + /// public int minShowDataNumber { get { return m_MinShowDataNumber; } set { m_MinShowDataNumber = value; if (m_MinShowDataNumber < 0) m_MinShowDataNumber = 0; } } + + /// + /// The max number of data to show in chart. + /// public int maxShowDataNumber { get { return m_MaxShowDataNumber; } set { m_MaxShowDataNumber = value; if (m_MaxShowDataNumber < 0) m_MaxShowDataNumber = 0; } } + + /// + /// The max number of serie and axis data cache. + /// The first data will be remove when the size of serie and axis data is larger then maxCacheDataNumber. + /// default:0,unlimited. + /// public int maxCacheDataNumber { get { return m_MaxCacheDataNumber; } set { m_MaxCacheDataNumber = value; if (m_MaxCacheDataNumber < 0) m_MaxCacheDataNumber = 0; } } + /// + /// Remove all series and legend data. + /// It just emptying all of serie's data without emptying the list of series. + /// + public virtual void ClearData() + { + m_Series.ClearData(); + m_Legend.ClearData(); + RefreshChart(); + } + + /// + /// Remove legend and serie by name. + /// + /// the name of serie + public virtual void RemoveData(string serieName) + { + m_Series.Remove(serieName); + m_Legend.RemoveData(serieName); + RefreshChart(); + } + + /// + /// Remove all data from series and legend. + /// The series list is also cleared. + /// + public virtual void RemoveData() + { + m_Legend.ClearData(); + m_Series.RemoveAll(); + RefreshChart(); + } + + /// + /// Add a serie to serie list. + /// + /// the name of serie + /// the type of serie + /// whether to show this serie + /// the added serie + public virtual Serie AddSerie(string serieName, SerieType type, bool show = true) + { + m_Legend.AddData(serieName); + return m_Series.AddSerie(serieName, type); + } + + /// + /// Add a data to serie. + /// If serie doesn't exist,will be add to series. + /// If serieName doesn't exist in legend,will be add to legend. + /// + /// the name of serie + /// the data to add + public virtual void AddData(string serieName, float value) + { + m_Legend.AddData(serieName); + m_Series.AddData(serieName, value, m_MaxCacheDataNumber); + RefreshChart(); + } + + /// + /// Add a data to serie. + /// If serie doesn't exist, the data is ignored. + /// + /// the index of serie + /// the data to add + public virtual void AddData(int serieIndex, float value) + { + m_Series.AddData(serieIndex, value, m_MaxCacheDataNumber); + RefreshChart(); + } + + /// + /// Update serie data by serie name. + /// + /// the name of serie + /// the data will be update + /// the index of data + public virtual void UpdateData(string serieName, float value, int dataIndex = 0) + { + m_Series.UpdateData(serieName, value, dataIndex); + RefreshChart(); + } + + /// + /// Update serie data by serie index. + /// + /// the index of serie + /// the data will be update + /// the index of data + public virtual void UpdateData(int serieIndex, float value, int dataIndex = 0) + { + m_Series.UpdateData(serieIndex, value, dataIndex); + RefreshChart(); + } + + /// + /// Whether to show serie and legend. + /// + /// the name of serie + /// Active or not + public virtual void SetActive(string serieName, bool active) + { + m_Legend.SetActive(serieName, active); + m_Series.SetActive(serieName, active); + } + + /// + /// Whether to show serie and legend. + /// + /// the index of serie + /// Active or not + public virtual void SetActive(int serieIndex, bool active) + { + m_Legend.SetActive(serieIndex, active); + m_Series.SetActive(serieIndex, active); + } + + /// + /// Whether serie is activated. + /// + /// the name of serie + /// True when activated + public virtual bool IsActive(string serieName) + { + return m_Legend.IsActive(serieName) || m_Series.IsActive(serieName); + } + + /// + /// Whether serie is activated. + /// + /// the index of serie + /// True when activated + public virtual bool IsActive(int serieIndex) + { + return m_Legend.IsActive(serieIndex) || m_Series.IsActive(serieIndex); + } + + /// + /// Redraw chart next frame. + /// + public void RefreshChart() + { + m_RefreshChart = true; + } + + /// + /// Update chart theme + /// + /// theme + public void UpdateTheme(Theme theme) + { + this.m_Theme = theme; + OnThemeChanged(); + RefreshChart(); + } + protected override void Awake() { if (m_ThemeInfo == null) @@ -116,72 +285,6 @@ namespace XCharts } } - public void ClearData() - { - m_Series.ClearData(); - m_Legend.ClearData(); - } - - public virtual void AddData(string legend, float value) - { - m_Legend.AddData(legend); - m_Series.AddData(legend, value, m_MaxCacheDataNumber); - RefreshChart(); - } - - public virtual void AddData(int legend, float value) - { - m_Series.AddData(legend, value, m_MaxCacheDataNumber); - } - - public virtual void UpdateData(string legend, float value, int dataIndex = 0) - { - m_Series.UpdateData(legend, value, dataIndex); - RefreshChart(); - } - - public virtual void UpdateData(int legendIndex, float value, int dataIndex = 0) - { - m_Series.UpdateData(legendIndex, value, dataIndex); - RefreshChart(); - } - - public virtual void SetActive(string legend, bool active) - { - m_Legend.SetActive(legend, active); - m_Series.SetActive(legend, active); - } - - public virtual void SetActive(int index, bool active) - { - m_Legend.SetActive(index, active); - m_Series.SetActive(index, active); - } - - public virtual bool IsActive(string name) - { - return m_Legend.IsActive(name) || m_Series.IsActive(name); - } - - public virtual bool IsActive(int index) - { - return m_Legend.IsActive(index) || m_Series.IsActive(index); - } - - public virtual void RemoveData(string legend) - { - m_Legend.RemoveData(legend); - m_Series.RemoveData(legend); - RefreshChart(); - } - - public void UpdateTheme(Theme theme) - { - this.m_Theme = theme; - OnThemeChanged(); - SetAllDirty(); - } - private void InitTitle() { m_Title.OnChanged(); @@ -411,11 +514,6 @@ namespace XCharts { } - public void RefreshChart() - { - m_RefreshChart = true; - } - protected virtual void RefreshTooltip() { } diff --git a/Assets/XCharts/Scripts/UI/Internal/Coordinate.cs b/Assets/XCharts/Scripts/UI/Internal/Coordinate.cs index 6a4bbdf3..692cc007 100644 --- a/Assets/XCharts/Scripts/UI/Internal/Coordinate.cs +++ b/Assets/XCharts/Scripts/UI/Internal/Coordinate.cs @@ -26,10 +26,10 @@ namespace XCharts { var coordinate = new Coordinate { - m_Left = 40f, - m_Right = 80f, - m_Top = 50f, - m_Bottom = 30f, + m_Left = 50, + m_Right = 30, + m_Top = 60, + m_Bottom = 30, m_Tickness = 0.6f, m_FontSize = 16, }; diff --git a/Assets/XCharts/Scripts/UI/Internal/CoordinateChart.cs b/Assets/XCharts/Scripts/UI/Internal/CoordinateChart.cs index d23d4d33..98cdb36b 100644 --- a/Assets/XCharts/Scripts/UI/Internal/CoordinateChart.cs +++ b/Assets/XCharts/Scripts/UI/Internal/CoordinateChart.cs @@ -27,8 +27,8 @@ namespace XCharts private List m_CheckYAxises = new List(); private Coordinate m_CheckCoordinate = Coordinate.defaultCoordinate; - public float zeroX { get { return coordinateX; } } - public float zeroY { get { return coordinateY; } } + // public float coordinateX { get { return coordinateX; } } + // public float coordinateY { get { return coordinateY; } } public float coordinateX { get { return m_Coordinate.left; } } public float coordinateY { get { return m_Coordinate.bottom; } } public float coordinateWid { get { return chartWidth - m_Coordinate.left - m_Coordinate.right; } } @@ -36,6 +36,52 @@ namespace XCharts public List xAxises { get { return m_XAxises; } } public List yAxises { get { return m_YAxises; } } + /// + /// Remove all data from series,legend and axis. + /// It just emptying all of serie's data without emptying the list of series. + /// + public override void ClearData() + { + base.ClearData(); + ClearAxisData(); + } + + /// + /// Remove all data from series,legend and axis. + /// The series list is also cleared. + /// + public override void RemoveData() + { + base.RemoveData(); + ClearAxisData(); + } + + /// + /// Remove all data of axises. + /// + public void ClearAxisData() + { + foreach (var item in m_XAxises) item.data.Clear(); + foreach (var item in m_YAxises) item.data.Clear(); + } + + /// + /// + /// + /// + /// + public void AddXAxisData(string category, int xAxisIndex = 0) + { + m_XAxises[xAxisIndex].AddData(category, m_MaxCacheDataNumber); + OnXAxisChanged(); + } + + public void AddYAxisData(string category, int yAxisIndex = 0) + { + m_YAxises[yAxisIndex].AddData(category, m_MaxCacheDataNumber); + OnYAxisChanged(); + } + protected override void Awake() { base.Awake(); @@ -64,9 +110,7 @@ namespace XCharts m_Coordinate = Coordinate.defaultCoordinate; m_XAxises.Clear(); m_YAxises.Clear(); - InitDefaultAxises(); - InitAxisX(); - InitAxisY(); + Awake(); } #endif @@ -270,39 +314,24 @@ namespace XCharts InitAxisY(); } - public void ClearAxisData() - { - foreach (var item in m_XAxises) item.data.Clear(); - foreach (var item in m_YAxises) item.data.Clear(); - } - public void AddXAxisData(string category, int xAxisIndex = 0) - { - m_XAxises[xAxisIndex].AddData(category, m_MaxCacheDataNumber); - OnXAxisChanged(); - } - - public void AddYAxisData(string category, int yAxisIndex = 0) - { - m_YAxises[yAxisIndex].AddData(category, m_MaxCacheDataNumber); - OnYAxisChanged(); - } - private void InitDefaultAxises() { if (m_XAxises.Count <= 0) { - var axis1 = new XAxis(); - axis1.Copy(axis1); + var axis1 = XAxis.defaultXAxis; var axis2 = XAxis.defaultXAxis; + axis1.show = true; axis2.show = false; m_XAxises.Add(axis1); m_XAxises.Add(axis2); } if (m_YAxises.Count <= 0) { - var axis1 = new YAxis(); - axis1.Copy(axis1); + var axis1 = YAxis.defaultYAxis; var axis2 = YAxis.defaultYAxis; + axis1.show = true; + axis1.splitNumber = 6; + axis1.boundaryGap = false; axis2.show = false; m_YAxises.Add(axis1); m_YAxises.Add(axis2); @@ -353,7 +382,7 @@ namespace XCharts } txt.transform.localPosition = GetLabelYPosition(labelWidth, i, yAxisIndex, yAxis); - txt.text = yAxis.GetScaleName(i, yAxis.minValue, yAxis.maxValue, m_DataZoom); + txt.text = yAxis.GetLabelName(i, yAxis.minValue, yAxis.maxValue, m_DataZoom); txt.gameObject.SetActive(yAxis.show && (yAxis.axisLabel.interval == 0 || i % (yAxis.axisLabel.interval + 1) == 0)); yAxis.axisLabelTextList.Add(txt); @@ -397,12 +426,15 @@ namespace XCharts } } //init tooltip label - Vector2 privot = yAxisIndex > 0 ? new Vector2(0, 0.5f) : new Vector2(1, 0.5f); - var labelParent = m_Tooltip.gameObject.transform; - GameObject labelObj = ChartHelper.AddTooltipLabel(objName + "_label", labelParent, m_ThemeInfo.font, privot); - yAxis.SetTooltipLabel(labelObj); - yAxis.SetTooltipLabelColor(m_ThemeInfo.tooltipBackgroundColor, m_ThemeInfo.tooltipTextColor); - yAxis.SetTooltipLabelActive(yAxis.show && m_Tooltip.show && m_Tooltip.crossLabel); + if (m_Tooltip.gameObject) + { + Vector2 privot = yAxisIndex > 0 ? new Vector2(0, 0.5f) : new Vector2(1, 0.5f); + var labelParent = m_Tooltip.gameObject.transform; + GameObject labelObj = ChartHelper.AddTooltipLabel(objName + "_label", labelParent, m_ThemeInfo.font, privot); + yAxis.SetTooltipLabel(labelObj); + yAxis.SetTooltipLabelColor(m_ThemeInfo.tooltipBackgroundColor, m_ThemeInfo.tooltipTextColor); + yAxis.SetTooltipLabelActive(yAxis.show && m_Tooltip.show && m_Tooltip.crossLabel); + } } private void InitAxisX() @@ -438,7 +470,7 @@ namespace XCharts xAxis.axisLabel.fontSize, xAxis.axisLabel.rotate, xAxis.axisLabel.fontStyle); txt.transform.localPosition = GetLabelXPosition(labelWidth, i, xAxisIndex, xAxis); - txt.text = xAxis.GetScaleName(i, xAxis.minValue, xAxis.maxValue, m_DataZoom); + txt.text = xAxis.GetLabelName(i, xAxis.minValue, xAxis.maxValue, m_DataZoom); txt.gameObject.SetActive(xAxis.show && (xAxis.axisLabel.interval == 0 || i % (xAxis.axisLabel.interval + 1) == 0)); xAxis.axisLabelTextList.Add(txt); @@ -481,12 +513,15 @@ namespace XCharts break; } } - Vector2 privot = xAxisIndex > 0 ? new Vector2(0.5f, 1) : new Vector2(0.5f, 1); - var labelParent = m_Tooltip.gameObject.transform; - GameObject labelObj = ChartHelper.AddTooltipLabel(objName + "_label", labelParent, m_ThemeInfo.font, privot); - xAxis.SetTooltipLabel(labelObj); - xAxis.SetTooltipLabelColor(m_ThemeInfo.tooltipBackgroundColor, m_ThemeInfo.tooltipTextColor); - xAxis.SetTooltipLabelActive(xAxis.show && m_Tooltip.show && m_Tooltip.crossLabel); + if (m_Tooltip.gameObject) + { + Vector2 privot = xAxisIndex > 0 ? new Vector2(0.5f, 1) : new Vector2(0.5f, 1); + var labelParent = m_Tooltip.gameObject.transform; + GameObject labelObj = ChartHelper.AddTooltipLabel(objName + "_label", labelParent, m_ThemeInfo.font, privot); + xAxis.SetTooltipLabel(labelObj); + xAxis.SetTooltipLabelColor(m_ThemeInfo.tooltipBackgroundColor, m_ThemeInfo.tooltipTextColor); + xAxis.SetTooltipLabelActive(xAxis.show && m_Tooltip.show && m_Tooltip.crossLabel); + } } private void InitDataZoom() diff --git a/Assets/XCharts/Scripts/UI/Internal/Legend.cs b/Assets/XCharts/Scripts/UI/Internal/Legend.cs index c1b8272e..f309a2c9 100644 --- a/Assets/XCharts/Scripts/UI/Internal/Legend.cs +++ b/Assets/XCharts/Scripts/UI/Internal/Legend.cs @@ -44,7 +44,7 @@ namespace XCharts { m_Show = true, m_Orient = Orient.Horizonal, - m_Location = Location.defaultRight, + m_Location = Location.defaultTop, m_ItemWidth = 60.0f, m_ItemHeight = 20.0f, m_ItemGap = 5, @@ -54,6 +54,7 @@ namespace XCharts "Legend" } }; + legend.location.top = 30; return legend; } } diff --git a/Assets/XCharts/Scripts/UI/Internal/Radar.cs b/Assets/XCharts/Scripts/UI/Internal/Radar.cs index fcbc8c6a..bf1d86f5 100644 --- a/Assets/XCharts/Scripts/UI/Internal/Radar.cs +++ b/Assets/XCharts/Scripts/UI/Internal/Radar.cs @@ -92,10 +92,16 @@ namespace XCharts m_LineColor = Color.grey, m_Indicator = true, m_BackgroundColorList = new List { - new Color32(194, 53, 49, 255), - new Color32(47, 69, 84, 255) + new Color32(246, 246, 246, 255), + new Color32(231, 231, 231, 255) }, - m_IndicatorList = new List(5) + m_IndicatorList = new List(5){ + new Indicator(){name="radar1",max = 100}, + new Indicator(){name="radar2",max = 100}, + new Indicator(){name="radar3",max = 100}, + new Indicator(){name="radar4",max = 100}, + new Indicator(){name="radar5",max = 100}, + } }; return radar; } diff --git a/Assets/XCharts/Scripts/UI/Internal/Serie.cs b/Assets/XCharts/Scripts/UI/Internal/Serie.cs index a210dde1..d7612317 100644 --- a/Assets/XCharts/Scripts/UI/Internal/Serie.cs +++ b/Assets/XCharts/Scripts/UI/Internal/Serie.cs @@ -149,13 +149,24 @@ namespace XCharts while (m_XData.Count > maxDataNumber) m_XData.RemoveAt(0); while (m_YData.Count > maxDataNumber) m_YData.RemoveAt(0); } - m_YData.Add(value); m_XData.Add(m_XData.Count); + m_YData.Add(value); + } + + public void AddXYData(float xValue, float yValue, int maxDataNumber = 0) + { + if (maxDataNumber > 0) + { + while (m_XData.Count > maxDataNumber) m_XData.RemoveAt(0); + while (m_YData.Count > maxDataNumber) m_YData.RemoveAt(0); + } + m_XData.Add(xValue); + m_YData.Add(yValue); } public float GetYData(int index, DataZoom dataZoom = null) { - var showData = GetYData(dataZoom); + var showData = GetYDataList(dataZoom); if (index >= 0 && index <= showData.Count - 1) { return showData[index]; @@ -163,7 +174,17 @@ namespace XCharts return 0; } - public List GetYData(DataZoom dataZoom) + public void GetXYData(int index, DataZoom dataZoom, out float xValue, out float yVlaue) + { + xValue = 0; + yVlaue = 0; + var xShowData = GetXDataList(dataZoom); + if (index >= 0 && index < xShowData.Count) xValue = xShowData[index]; + var yShowData = GetYDataList(dataZoom); + if (index >= 0 && index < yShowData.Count) yVlaue = yShowData[index]; + } + + public List GetYDataList(DataZoom dataZoom) { if (dataZoom != null && dataZoom.show) { @@ -182,7 +203,7 @@ namespace XCharts } } - public List GetXData(DataZoom dataZoom) + public List GetXDataList(DataZoom dataZoom) { if (dataZoom != null && dataZoom.show) { @@ -246,6 +267,18 @@ namespace XCharts } } + public void UpdateXYData(int index, float xValue, float yValue) + { + if (index >= 0 && index <= m_YData.Count - 1) + { + m_YData[index] = yValue; + } + if (index >= 0 && index <= m_XData.Count - 1) + { + m_XData[index] = xValue; + } + } + public override void ParseJsonData(string jsonData) { if (string.IsNullOrEmpty(jsonData) || !m_DataFromJson) return; diff --git a/Assets/XCharts/Scripts/UI/Internal/Series.cs b/Assets/XCharts/Scripts/UI/Internal/Series.cs index af7d84e6..e52ffab1 100644 --- a/Assets/XCharts/Scripts/UI/Internal/Series.cs +++ b/Assets/XCharts/Scripts/UI/Internal/Series.cs @@ -79,15 +79,47 @@ namespace XCharts return false; } - public void RemoveData(string name) + /// + /// Remove serie from series. + /// + /// the name of serie + public void Remove(string serieName) { - var serie = GetSerie(name); + var serie = GetSerie(serieName); if (serie != null) { m_Series.Remove(serie); } } + /// + /// Remove all serie from series. + /// + public void RemoveAll() + { + m_Series.Clear(); + } + + public Serie AddSerie(string serieName, SerieType type, bool show = true) + { + var serie = GetSerie(serieName); + if (serie == null) + { + serie = new Serie(); + serie.type = type; + serie.show = show; + serie.name = serieName; + serie.yData = new List(); + m_Series.Add(serie); + } + else + { + serie.type = type; + serie.show = show; + } + return serie; + } + public Serie AddData(string name, float value, int maxDataNumber = 0) { if (m_Series == null) @@ -116,6 +148,16 @@ namespace XCharts return serie; } + public Serie AddXYData(int index, float xValue, float yValue, int maxDataNumber = 0) + { + var serie = GetSerie(index); + if (serie != null) + { + serie.AddXYData(xValue, yValue, maxDataNumber); + } + return serie; + } + public void UpdateData(string name, float value, int dataIndex = 0) { var serie = GetSerie(name); @@ -125,6 +167,15 @@ namespace XCharts } } + public void UpdateXYData(string name, float xValue, float yValue, int dataIndex = 0) + { + var serie = GetSerie(name); + if (serie != null) + { + serie.UpdateXYData(dataIndex, xValue, yValue); + } + } + public void UpdateData(int index, float value, int dataIndex = 0) { var serie = GetSerie(index); @@ -134,6 +185,15 @@ namespace XCharts } } + public void UpdateXYData(int index, float xValue, float yValue, int dataIndex = 0) + { + var serie = GetSerie(index); + if (serie != null) + { + serie.UpdateXYData(dataIndex, xValue, yValue); + } + } + public void UpdateFilterData(DataZoom dataZoom) { if (dataZoom != null && dataZoom.show) @@ -186,12 +246,12 @@ namespace XCharts public void GetXMinMaxValue(DataZoom dataZoom, int axisIndex, out int minVaule, out int maxValue) { - GetMinMaxValue(dataZoom,axisIndex,false,out minVaule,out maxValue); + GetMinMaxValue(dataZoom, axisIndex, false, out minVaule, out maxValue); } public void GetYMinMaxValue(DataZoom dataZoom, int axisIndex, out int minVaule, out int maxValue) { - GetMinMaxValue(dataZoom,axisIndex,true,out minVaule,out maxValue); + GetMinMaxValue(dataZoom, axisIndex, true, out minVaule, out maxValue); } public void GetMinMaxValue(DataZoom dataZoom, int axisIndex, bool yValue, out int minVaule, out int maxValue) @@ -208,7 +268,7 @@ namespace XCharts { var serie = ss.Value[i]; if (serie.axisIndex != axisIndex) continue; - var showData = yValue ? serie.GetYData(dataZoom) : serie.GetXData(dataZoom); + var showData = yValue ? serie.GetYDataList(dataZoom) : serie.GetXDataList(dataZoom); for (int j = 0; j < showData.Count; j++) { if (!seriesTotalValue.ContainsKey(j)) @@ -234,7 +294,7 @@ namespace XCharts if (m_Series[i].axisIndex != axisIndex) continue; if (IsActive(i)) { - var showData = yValue ? m_Series[i].GetYData(dataZoom) : m_Series[i].GetXData(dataZoom); + var showData = yValue ? m_Series[i].GetYDataList(dataZoom) : m_Series[i].GetXDataList(dataZoom); foreach (var data in showData) { if (data > max) max = data; @@ -246,7 +306,7 @@ namespace XCharts if (max == int.MinValue && min == int.MaxValue) { minVaule = 0; - maxValue = 100; + maxValue = 90; } else { diff --git a/Assets/XCharts/Scripts/UI/LineChart.cs b/Assets/XCharts/Scripts/UI/LineChart.cs index 0c934f7f..92a04cec 100644 --- a/Assets/XCharts/Scripts/UI/LineChart.cs +++ b/Assets/XCharts/Scripts/UI/LineChart.cs @@ -4,6 +4,10 @@ using UnityEngine.UI; namespace XCharts { + [AddComponentMenu("XCharts/LineChart", 13)] + [ExecuteInEditMode] + [RequireComponent(typeof(RectTransform))] + [DisallowMultipleComponent] public class LineChart : CoordinateChart { [SerializeField] private Line m_Line = Line.defaultLine; @@ -15,6 +19,13 @@ namespace XCharts { base.Reset(); m_Line = Line.defaultLine; + RemoveData(); + AddSerie("line1", SerieType.Line); + for (int i = 0; i < 5; i++) + { + AddXAxisData("x" + (i + 1)); + AddData(0, Random.Range(10, 90)); + } } #endif @@ -91,15 +102,15 @@ namespace XCharts var axis = m_XAxises[i]; if (!axis.show) continue; float splitWidth = axis.GetSplitWidth(coordinateWid, m_DataZoom); - float px = zeroX + (m_Tooltip.xValues[i] - 1) * splitWidth + float px = coordinateX + (m_Tooltip.xValues[i] - 1) * splitWidth + (axis.boundaryGap ? splitWidth / 2 : 0); Vector2 sp = new Vector2(px, coordinateY); Vector2 ep = new Vector2(px, coordinateY + coordinateHig); ChartHelper.DrawLine(vh, sp, ep, m_Coordinate.tickness, m_ThemeInfo.tooltipLineColor); if (m_Tooltip.crossLabel) { - sp = new Vector2(zeroX, m_Tooltip.pointerPos.y); - ep = new Vector2(zeroX + coordinateWid, m_Tooltip.pointerPos.y); + sp = new Vector2(coordinateX, m_Tooltip.pointerPos.y); + ep = new Vector2(coordinateX + coordinateWid, m_Tooltip.pointerPos.y); DrawSplitLine(vh, true, Axis.SplitLineType.Dashed, sp, ep, m_ThemeInfo.tooltipLineColor); } } @@ -159,14 +170,14 @@ namespace XCharts var axis = m_YAxises[i]; if (!axis.show) continue; float splitWidth = axis.GetSplitWidth(coordinateHig, m_DataZoom); - float pY = zeroY + (m_Tooltip.yValues[i] - 1) * splitWidth + (axis.boundaryGap ? splitWidth / 2 : 0); + float pY = coordinateY + (m_Tooltip.yValues[i] - 1) * splitWidth + (axis.boundaryGap ? splitWidth / 2 : 0); Vector2 sp = new Vector2(coordinateX, pY); Vector2 ep = new Vector2(coordinateX + coordinateWid, pY); ChartHelper.DrawLine(vh, sp, ep, m_Coordinate.tickness, m_ThemeInfo.tooltipFlagAreaColor); if (m_Tooltip.crossLabel) { - sp = new Vector2(m_Tooltip.pointerPos.x, zeroY); - ep = new Vector2(m_Tooltip.pointerPos.x, zeroY + coordinateHig); + sp = new Vector2(m_Tooltip.pointerPos.x, coordinateY); + ep = new Vector2(m_Tooltip.pointerPos.x, coordinateY + coordinateHig); DrawSplitLine(vh, false, Axis.SplitLineType.Dashed, sp, ep, m_ThemeInfo.tooltipLineColor); } } @@ -180,8 +191,8 @@ namespace XCharts List lastPoints = new List(); List lastSmoothPoints = new List(); List smoothPoints = new List(); - List yData = serie.GetYData(m_DataZoom); - List xData = serie.GetXData(m_DataZoom); + List yData = serie.GetYDataList(m_DataZoom); + List xData = serie.GetXDataList(m_DataZoom); Color color = m_ThemeInfo.GetColor(serieIndex); Vector3 lp = Vector3.zero; @@ -190,7 +201,7 @@ namespace XCharts var xAxis = m_XAxises[serie.axisIndex]; if (!xAxis.show) xAxis = m_XAxises[(serie.axisIndex + 1) % m_XAxises.Count]; float scaleWid = xAxis.GetDataWidth(coordinateWid, m_DataZoom); - float startX = zeroX + (xAxis.boundaryGap ? scaleWid / 2 : 0); + float startX = coordinateX + (xAxis.boundaryGap ? scaleWid / 2 : 0); int maxCount = maxShowDataNumber > 0 ? (maxShowDataNumber > yData.Count ? yData.Count : maxShowDataNumber) : yData.Count; @@ -254,8 +265,8 @@ namespace XCharts if (m_Line.area) { Color areaColor = new Color(color.r, color.g, color.b, color.a * 0.75f); - ChartHelper.DrawPolygon(vh, new Vector2(middle1.x, zeroY), middle1, np, - new Vector2(np.x, zeroY), areaColor); + ChartHelper.DrawPolygon(vh, new Vector2(middle1.x, coordinateY), middle1, np, + new Vector2(np.x, coordinateY), areaColor); } break; case Line.StepType.Middle: @@ -268,11 +279,11 @@ namespace XCharts if (m_Line.area) { Color areaColor = new Color(color.r, color.g, color.b, color.a * 0.75f); - ChartHelper.DrawPolygon(vh, new Vector2(lp.x, zeroY), lp, middle1, - new Vector2(middle1.x, zeroY), areaColor); - ChartHelper.DrawPolygon(vh, new Vector2(middle2.x + 2 * m_Line.tickness, zeroY), + ChartHelper.DrawPolygon(vh, new Vector2(lp.x, coordinateY), lp, middle1, + new Vector2(middle1.x, coordinateY), areaColor); + ChartHelper.DrawPolygon(vh, new Vector2(middle2.x + 2 * m_Line.tickness, coordinateY), new Vector2(middle2.x + 2 * m_Line.tickness, middle2.y), np, - new Vector2(np.x, zeroY), areaColor); + new Vector2(np.x, coordinateY), areaColor); } break; case Line.StepType.End: @@ -283,9 +294,9 @@ namespace XCharts if (m_Line.area) { Color areaColor = new Color(color.r, color.g, color.b, color.a * 0.75f); - ChartHelper.DrawPolygon(vh, new Vector2(lp.x, zeroY), lp, + ChartHelper.DrawPolygon(vh, new Vector2(lp.x, coordinateY), lp, new Vector2(middle1.x - m_Line.tickness, middle1.y), - new Vector2(middle1.x - m_Line.tickness, zeroY), areaColor); + new Vector2(middle1.x - m_Line.tickness, coordinateY), areaColor); } break; } @@ -313,14 +324,14 @@ namespace XCharts lastSmoothPoints[lastSmoothPoints.Count - 1].y + m_Line.tickness) : new Vector3(lastSmoothPoints[smoothPointCount].x, lastSmoothPoints[smoothPointCount].y + m_Line.tickness)) : - new Vector3(to.x, zeroY + m_Coordinate.tickness); + new Vector3(to.x, coordinateY + m_Coordinate.tickness); Vector3 tlp = serieIndex > 0 ? (smoothPointCount > lastSmoothPoints.Count - 1 ? new Vector3(lastSmoothPoints[lastSmoothPoints.Count - 2].x, lastSmoothPoints[lastSmoothPoints.Count - 2].y + m_Line.tickness) : new Vector3(lastSmoothPoints[smoothPointCount - 1].x, lastSmoothPoints[smoothPointCount - 1].y + m_Line.tickness)) : - new Vector3(start.x, zeroY + m_Coordinate.tickness); + new Vector3(start.x, coordinateY + m_Coordinate.tickness); Color areaColor = new Color(color.r, color.g, color.b, color.a * 0.75f); ChartHelper.DrawPolygon(vh, alp, anp, tnp, tlp, areaColor); } @@ -336,24 +347,24 @@ namespace XCharts Vector3 alp = new Vector3(lp.x, lp.y - m_Line.tickness); Vector3 anp = new Vector3(np.x, np.y - m_Line.tickness); Color areaColor = new Color(color.r, color.g, color.b, color.a * 0.75f); - var cross = ChartHelper.GetIntersection(lp, np, new Vector3(zeroX, zeroY), - new Vector3(zeroX + coordinateWid, zeroY)); + var cross = ChartHelper.GetIntersection(lp, np, new Vector3(coordinateX, coordinateY), + new Vector3(coordinateX + coordinateWid, coordinateY)); if (cross == Vector3.zero) { Vector3 tnp = serieIndex > 0 ? new Vector3(lastPoints[i].x, lastPoints[i].y + m_Line.tickness) : - new Vector3(np.x, zeroY + m_Coordinate.tickness); + new Vector3(np.x, coordinateY + m_Coordinate.tickness); Vector3 tlp = serieIndex > 0 ? new Vector3(lastPoints[i - 1].x, lastPoints[i - 1].y + m_Line.tickness) : - new Vector3(lp.x, zeroY + m_Coordinate.tickness); + new Vector3(lp.x, coordinateY + m_Coordinate.tickness); ChartHelper.DrawPolygon(vh, alp, anp, tnp, tlp, areaColor); } else { - Vector3 cross1 = new Vector3(cross.x, cross.y + (alp.y > zeroY ? m_Coordinate.tickness : -m_Coordinate.tickness)); - Vector3 cross2 = new Vector3(cross.x, cross.y + (anp.y > zeroY ? m_Coordinate.tickness : -m_Coordinate.tickness)); - Vector3 xp1 = new Vector3(alp.x, zeroY + (alp.y > zeroY ? m_Coordinate.tickness : -m_Coordinate.tickness)); - Vector3 xp2 = new Vector3(anp.x, zeroY + (anp.y > zeroY ? m_Coordinate.tickness : -m_Coordinate.tickness)); + Vector3 cross1 = new Vector3(cross.x, cross.y + (alp.y > coordinateY ? m_Coordinate.tickness : -m_Coordinate.tickness)); + Vector3 cross2 = new Vector3(cross.x, cross.y + (anp.y > coordinateY ? m_Coordinate.tickness : -m_Coordinate.tickness)); + Vector3 xp1 = new Vector3(alp.x, coordinateY + (alp.y > coordinateY ? m_Coordinate.tickness : -m_Coordinate.tickness)); + Vector3 xp2 = new Vector3(anp.x, coordinateY + (anp.y > coordinateY ? m_Coordinate.tickness : -m_Coordinate.tickness)); ChartHelper.DrawTriangle(vh, alp, cross1, xp1, areaColor); ChartHelper.DrawTriangle(vh, anp, cross2, xp2, areaColor); } @@ -385,7 +396,7 @@ namespace XCharts var yAxis = m_YAxises[serie.axisIndex]; if (!yAxis.show) yAxis = m_YAxises[(serie.axisIndex + 1) % m_YAxises.Count]; float scaleWid = yAxis.GetDataWidth(coordinateHig, m_DataZoom); - float startY = zeroY + (yAxis.boundaryGap ? scaleWid / 2 : 0); + float startY = coordinateY + (yAxis.boundaryGap ? scaleWid / 2 : 0); int maxCount = maxShowDataNumber > 0 ? (maxShowDataNumber > serie.yData.Count ? serie.yData.Count : maxShowDataNumber) : serie.yData.Count; @@ -436,8 +447,8 @@ namespace XCharts if (m_Line.area) { Color areaColor = new Color(color.r, color.g, color.b, color.a * 0.75f); - ChartHelper.DrawPolygon(vh, new Vector2(zeroX, middle1.y), middle1, np, - new Vector2(zeroX, np.y), areaColor); + ChartHelper.DrawPolygon(vh, new Vector2(coordinateX, middle1.y), middle1, np, + new Vector2(coordinateX, np.y), areaColor); } break; case Line.StepType.Middle: @@ -450,11 +461,11 @@ namespace XCharts if (m_Line.area) { Color areaColor = new Color(color.r, color.g, color.b, color.a * 0.75f); - ChartHelper.DrawPolygon(vh, new Vector2(zeroX, lp.y), lp, middle1, - new Vector2(zeroX, middle1.y), areaColor); - ChartHelper.DrawPolygon(vh, new Vector2(zeroX, middle2.y + 2 * m_Line.tickness), + ChartHelper.DrawPolygon(vh, new Vector2(coordinateX, lp.y), lp, middle1, + new Vector2(coordinateX, middle1.y), areaColor); + ChartHelper.DrawPolygon(vh, new Vector2(coordinateX, middle2.y + 2 * m_Line.tickness), new Vector2(middle2.x, middle2.y + 2 * m_Line.tickness), np, - new Vector2(zeroX, np.y), areaColor); + new Vector2(coordinateX, np.y), areaColor); } break; case Line.StepType.End: @@ -465,9 +476,9 @@ namespace XCharts if (m_Line.area) { Color areaColor = new Color(color.r, color.g, color.b, color.a * 0.75f); - ChartHelper.DrawPolygon(vh, new Vector2(zeroX, lp.y), middle1, + ChartHelper.DrawPolygon(vh, new Vector2(coordinateX, lp.y), middle1, new Vector2(np.x, np.y), - new Vector2(zeroX, np.y), areaColor); + new Vector2(coordinateX, np.y), areaColor); } break; } @@ -493,14 +504,14 @@ namespace XCharts lastSmoothPoints[lastSmoothPoints.Count - 1].y + m_Line.tickness) : new Vector3(lastSmoothPoints[smoothPointCount].x, lastSmoothPoints[smoothPointCount].y + m_Line.tickness)) : - new Vector3(zeroX + m_Coordinate.tickness, to.y); + new Vector3(coordinateX + m_Coordinate.tickness, to.y); Vector3 tlp = serieIndex > 0 ? (smoothPointCount > lastSmoothPoints.Count - 1 ? new Vector3(lastSmoothPoints[lastSmoothPoints.Count - 2].x, lastSmoothPoints[lastSmoothPoints.Count - 2].y + m_Line.tickness) : new Vector3(lastSmoothPoints[smoothPointCount - 1].x, lastSmoothPoints[smoothPointCount - 1].y + m_Line.tickness)) : - new Vector3(zeroX + m_Coordinate.tickness, start.y); + new Vector3(coordinateX + m_Coordinate.tickness, start.y); Color areaColor = new Color(color.r, color.g, color.b, color.a * 0.75f); ChartHelper.DrawPolygon(vh, alp, anp, tnp, tlp, areaColor); } @@ -516,24 +527,24 @@ namespace XCharts Vector3 alp = new Vector3(lp.x, lp.y - m_Line.tickness); Vector3 anp = new Vector3(np.x, np.y - m_Line.tickness); Color areaColor = new Color(color.r, color.g, color.b, color.a * 0.75f); - var cross = ChartHelper.GetIntersection(lp, np, new Vector3(zeroX, zeroY), - new Vector3(zeroX, zeroY + coordinateHig)); + var cross = ChartHelper.GetIntersection(lp, np, new Vector3(coordinateX, coordinateY), + new Vector3(coordinateX, coordinateY + coordinateHig)); if (cross == Vector3.zero) { Vector3 tnp = serieIndex > 0 ? new Vector3(lastPoints[i].x, lastPoints[i].y + m_Line.tickness) : - new Vector3(zeroX + m_Coordinate.tickness, np.y); + new Vector3(coordinateX + m_Coordinate.tickness, np.y); Vector3 tlp = serieIndex > 0 ? new Vector3(lastPoints[i - 1].x, lastPoints[i - 1].y + m_Line.tickness) : - new Vector3(zeroX + m_Coordinate.tickness, lp.y); + new Vector3(coordinateX + m_Coordinate.tickness, lp.y); ChartHelper.DrawPolygon(vh, alp, anp, tnp, tlp, areaColor); } else { - Vector3 cross1 = new Vector3(cross.x + (alp.x > zeroX ? m_Coordinate.tickness : -m_Coordinate.tickness), cross.y); - Vector3 cross2 = new Vector3(cross.x + (anp.x > zeroX ? m_Coordinate.tickness : -m_Coordinate.tickness), cross.y); - Vector3 xp1 = new Vector3(zeroX + (alp.x > zeroX ? m_Coordinate.tickness : -m_Coordinate.tickness), alp.y); - Vector3 xp2 = new Vector3(zeroX + (anp.x > zeroX ? m_Coordinate.tickness : -m_Coordinate.tickness), anp.y); + Vector3 cross1 = new Vector3(cross.x + (alp.x > coordinateX ? m_Coordinate.tickness : -m_Coordinate.tickness), cross.y); + Vector3 cross2 = new Vector3(cross.x + (anp.x > coordinateX ? m_Coordinate.tickness : -m_Coordinate.tickness), cross.y); + Vector3 xp1 = new Vector3(coordinateX + (alp.x > coordinateX ? m_Coordinate.tickness : -m_Coordinate.tickness), alp.y); + Vector3 xp2 = new Vector3(coordinateX + (anp.x > coordinateX ? m_Coordinate.tickness : -m_Coordinate.tickness), anp.y); ChartHelper.DrawTriangle(vh, alp, cross1, xp1, areaColor); ChartHelper.DrawTriangle(vh, anp, cross2, xp2, areaColor); } diff --git a/Assets/XCharts/Scripts/UI/PieChart.cs b/Assets/XCharts/Scripts/UI/PieChart.cs index ce07ccfa..91a05c00 100644 --- a/Assets/XCharts/Scripts/UI/PieChart.cs +++ b/Assets/XCharts/Scripts/UI/PieChart.cs @@ -5,6 +5,10 @@ using UnityEngine.UI; namespace XCharts { + [AddComponentMenu("XCharts/PieChart", 15)] + [ExecuteInEditMode] + [RequireComponent(typeof(RectTransform))] + [DisallowMultipleComponent] public class PieChart : BaseChart { [SerializeField] private Pie m_Pie = Pie.defaultPie; @@ -17,6 +21,39 @@ namespace XCharts public Pie pie { get { return m_Pie; } } + /// + /// Add a data to pie. + /// + /// the name of data + /// the data + public override void AddData(string legend, float value) + { + m_Legend.AddData(legend); + var serie = m_Series.AddData(legend, value); + if (serie != null) + { + serie.ClearData(); + serie.AddYData(value); + RefreshChart(); + } + } + + /// + /// Update the data for the specified name. + /// + /// the name of data + /// the data + /// is not used in this function + public override void UpdateData(string legend, float value, int dataIndex = 0) + { + var serie = m_Series.GetSerie(legend); + if (serie != null) + { + serie.UpdateYData(0, value); + RefreshChart(); + } + } + protected override void Awake() { raycastTarget = m_Pie.selected; @@ -32,27 +69,16 @@ namespace XCharts } } - public override void AddData(string legend, float value) +#if UNITY_EDITOR + protected override void Reset() { - m_Legend.AddData(legend); - var serie = m_Series.AddData(legend, value); - if (serie != null) - { - serie.ClearData(); - serie.AddYData(value); - RefreshChart(); - } - } - - public override void UpdateData(string legend, float value, int dataIndex = 0) - { - var serie = m_Series.GetSerie(legend); - if (serie != null) - { - serie.UpdateYData(0, value); - RefreshChart(); - } + base.Reset(); + m_Pie = Pie.defaultPie; + RemoveData(); + AddData("Pie1", 80); + AddData("Pie2", 20); } +#endif protected override void DrawChart(VertexHelper vh) { diff --git a/Assets/XCharts/Scripts/UI/RadarChart.cs b/Assets/XCharts/Scripts/UI/RadarChart.cs index f13d40c7..7be38779 100644 --- a/Assets/XCharts/Scripts/UI/RadarChart.cs +++ b/Assets/XCharts/Scripts/UI/RadarChart.cs @@ -5,6 +5,10 @@ using UnityEngine.UI; namespace XCharts { + [AddComponentMenu("XCharts/RadarChart", 16)] + [ExecuteInEditMode] + [RequireComponent(typeof(RectTransform))] + [DisallowMultipleComponent] public class RadarChart : BaseChart { private const string INDICATOR_TEXT = "indicator"; @@ -20,10 +24,16 @@ namespace XCharts public Radar radar { get { return m_Radar; } } + public override void RemoveData() + { + base.RemoveData(); + m_Radar.indicatorList.Clear(); + } protected override void Awake() { base.Awake(); UpdateRadarCenter(); + InitIndicator(); } protected override void Update() @@ -32,6 +42,21 @@ namespace XCharts CheckRadarInfoChanged(); } +#if UNITY_EDITOR + protected override void Reset() + { + base.Reset(); + RemoveData(); + m_Radar = Radar.defaultRadar; + AddSerie("Radar", SerieType.Radar); + for (int i = 0; i < 5; i++) + { + AddData(0, Random.Range(20, 90)); + } + } +#endif + + private void InitIndicator() { indicatorTextList.Clear(); @@ -161,7 +186,7 @@ namespace XCharts for (int j = 0; j < dataList.Count; j++) { var max = m_Radar.GetIndicatorMax(j) > 0 ? - m_Radar.GetIndicatorMax(j) : + m_Radar.GetIndicatorMax(j) : GetMaxValue(j); var radius = max < 0 ? m_Radar.radius - m_Radar.radius * dataList[j] / max : m_Radar.radius * dataList[j] / max;