Skip to content

Commit 561ab81

Browse files
author
shihang
committed
修改图表对象池错误
1 parent dd64641 commit 561ab81

File tree

9 files changed

+17
-18
lines changed

9 files changed

+17
-18
lines changed

Assets/Scenes/TestGraph.unity

16 Bytes
Binary file not shown.

Assets/Scenes/test.unity

16.6 KB
Binary file not shown.

Assets/Scenes/test.unity.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Scripts/TestGraph/UIBarGraphManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private void DrawDesc()
6363
_descs = new Text[_datas.Length];
6464
for (int i = 0; i < _datas.Length; i++)
6565
{
66-
Text desc = ObjectPool.Instance.GetObject(_descPrefab.name, _descContent).GetComponent<Text>();
66+
Text desc = ObjectPool.Instance.GetObject(DESCPOOL, _descContent).GetComponent<Text>();
6767
desc.text = _datas[i]._desc;
6868
desc.transform.SetAsLastSibling();//使用对象池和自动布局组件会调乱顺序,要重置
6969
desc.gameObject.SetActive(true);
@@ -80,7 +80,7 @@ private void DrawBar()
8080
_bars = new Image[_datas.Length];
8181
for (int i = 0; i < _datas.Length; i++)
8282
{
83-
Image bar = ObjectPool.Instance.GetObject(_barPrefab.name, _barContent).GetComponent<Image>();
83+
Image bar = ObjectPool.Instance.GetObject(BARPOOL, _barContent).GetComponent<Image>();
8484
bar.rectTransform.sizeDelta = new Vector2(_barWidth, bar.rectTransform.sizeDelta.y);
8585
bar.rectTransform.localPosition = new Vector3(_descs[i].rectTransform.localPosition.x, bar.rectTransform.localPosition.y, 0);//锚点在中心
8686
bar.fillAmount = 0;

Assets/Scripts/TestGraph/UILineGraphManager.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private void DrawDesc()
9393
_descs = new Text[_datas.Length];
9494
for (int i = 0; i < _datas.Length; i++)
9595
{
96-
Text desc = ObjectPool.Instance.GetObject(_descPrefab.name, _descContent).GetComponent<Text>();
96+
Text desc = ObjectPool.Instance.GetObject(DESCPOOL, _descContent).GetComponent<Text>();
9797
desc.text = _datas[i]._desc;
9898
desc.transform.SetAsLastSibling();//使用对象池和自动布局组件会调乱顺序,要重置
9999
desc.gameObject.SetActive(true);
@@ -111,7 +111,7 @@ private void DrawDot()
111111
_dots = new RectTransform[_datas.Length];
112112
for (int i = 0; i < _datas.Length; i++)
113113
{
114-
RectTransform dot = ObjectPool.Instance.GetObject(_dotPrefab.name, _dotContent).GetComponent<RectTransform>();
114+
RectTransform dot = ObjectPool.Instance.GetObject(DOTPOOL, _dotContent).GetComponent<RectTransform>();
115115
dot.localPosition = new Vector3(_descs[i].transform.localPosition.x, height * (_datas[i].Rate - 0.5f), 0);//锚点在中心
116116
dot.sizeDelta = Vector2.one * _lineWidth * 2;
117117
dot.gameObject.SetActive(true);
@@ -141,7 +141,7 @@ private void DrawLine(int index = 0)
141141
Vector3 dir = curPos - nextPos;
142142
float angle = Vector3.Angle(Vector3.up, dir);
143143
Vector2 center = (curPos + nextPos) / 2;
144-
Image line = ObjectPool.Instance.GetObject(_linePrefab.name, _lineContent).GetComponent<Image>();
144+
Image line = ObjectPool.Instance.GetObject(LINEPOOL, _lineContent).GetComponent<Image>();
145145
line.rectTransform.localEulerAngles = Vector3.forward * angle;
146146
line.rectTransform.localPosition = center;
147147
line.rectTransform.sizeDelta = new Vector2(_lineWidth, length);

Assets/Scripts/TestGraph/UIPieGraphManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ private void DrawNote()
8181
_colors = new Color[_datas.Length];
8282
for (int i = 0; i < _datas.Length; i++)
8383
{
84-
Text note = ObjectPool.Instance.GetObject(_notePrefab.name, _noteContent).GetComponent<Text>();
84+
Text note = ObjectPool.Instance.GetObject(NOTEPOOL, _noteContent).GetComponent<Text>();
8585
_colors[i] = new Color(0, (float)i / _datas.Length, 0);
8686
note.text = _datas[i]._desc;
8787
note.GetComponentInChildren<Image>().color = _colors[i];
@@ -104,7 +104,7 @@ private void DrawPie()
104104
Vector3 _curAngle = Vector3.zero;
105105
for (int i = 0; i < _datas.Length; i++)
106106
{
107-
UIPieImage pie = ObjectPool.Instance.GetObject(_piePrefab.name, _pieContent).GetComponent<UIPieImage>();
107+
UIPieImage pie = ObjectPool.Instance.GetObject(PIEPOOL, _pieContent).GetComponent<UIPieImage>();
108108
pie.rectTransform.sizeDelta = Vector2.one * _pieRadius * 2;
109109
float rate = _datas[i]._value / sum;
110110
pie.fillAmount = 0;

Assets/Scripts/TestGraph/UIPieImage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ private Vector2[] GetPathes(float radius, float angle)
9292
if (i - 1 < rate && i >= rate)
9393
{
9494
pathes = new Vector2[i + 2];
95-
Debug.Log(i);
95+
//Debug.Log(i);
9696
for (int j = 2; j < pathes.Length - 1; j++)
9797
{
9898
pathes[j] = new Vector2(radius * Mathf.Sin(radian / i * (j - 1)), radius * Mathf.Cos(radian / i * (j - 1)));

Assets/Scripts/TestGraph/UIRadarGraphManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ private void DrawDesc()
101101
GetVertexs();
102102
for (int i = 0; i < _vertexs.Length; i++)
103103
{
104-
Text desc = ObjectPool.Instance.GetObject(_descPrefab.name, _descContent).GetComponent<Text>();
104+
Text desc = ObjectPool.Instance.GetObject(DESCPOOL, _descContent).GetComponent<Text>();
105105
desc.text = _datas[i]._desc;
106106
Vector2 pos = _vertexs[i];
107107
if (Mathf.Abs(pos.x) >= 0.1f)

Assets/Scripts/TestWindows.meta

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)