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

优化代码

Browse Source
This commit is contained in:
monitor1394
2019-07-25 21:10:57 +08:00
parent 51e3707072
commit f51c498503
9 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -4,7 +4,8 @@
/Library
/Temp
/UnityPackageManager
/Assets/Res
/Assets/Res.meta
/Assets/XCharts/Demo/demo_test.unity
/Assets/XCharts/Demo/demo_test.unity.meta

2
Assets/XCharts/Demo/Editor/ChartModuleDrawer.cs
View File

@@ -6,8 +6,6 @@ namespace XCharts
[CustomPropertyDrawer(typeof(ChartModule), true)]
public class ChartModuleDrawer : PropertyDrawer
{
bool m_BarModuleToggle = true;
public override void OnGUI(Rect pos, SerializedProperty prop, GUIContent label)
{
Rect drawRect = pos;

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

@@ -85,7 +85,6 @@ public class Demo : MonoBehaviour
void InitModuleButton()
{
var font = Resources.GetBuiltinResource<Font>("Arial.ttf");
var btnPanel = transform.Find("chart_list");
m_BtnClone = transform.Find("btn_clone").gameObject;
m_BtnClone.SetActive(false);
@@ -104,7 +103,7 @@ public class Demo : MonoBehaviour
btn = GameObject.Instantiate(m_BtnClone);
btn.SetActive(true);
btn.name = btnName;
btn.transform.parent = btnPanel;
btn.transform.SetParent(btnPanel);
btn.transform.localPosition = Vector3.zero;
}
btn.transform.localScale = Vector3.one;

6
Assets/XCharts/Scripts/Editor/BaseChartEditor.cs
View File

@@ -28,15 +28,9 @@ namespace XCharts
protected float m_DefaultLabelWidth;
protected float m_DefaultFieldWidth;
private int m_SeriesSize;
private bool m_ThemeModuleToggle = false;
private bool m_BaseModuleToggle = false;
protected virtual void OnEnable()
{
m_Target = (BaseChart)target;

3
Assets/XCharts/Scripts/Editor/PropertyDrawers/SerieDrawer.cs
View File

@@ -10,7 +10,6 @@ namespace XCharts
private List<bool> m_SerieModuleToggle = new List<bool>();
private List<bool> m_DataFoldout = new List<bool>();
private int m_DataSize = 0;
private bool m_ShowJsonDataArea = false;
private string m_JsonDataAreaText;
@@ -160,8 +159,6 @@ namespace XCharts
EditorGUIUtility.fieldWidth = lastFieldWid;
EditorGUIUtility.labelWidth = lastLabelWid;
}
SerializedProperty element1 = data.GetArrayElementAtIndex(0);
SerializedProperty element2 = data.GetArrayElementAtIndex(1);
}
public override float GetPropertyHeight(SerializedProperty prop, GUIContent label)

10
Assets/XCharts/Scripts/Editor/PropertyDrawers/SerieSymbolDrawer.cs
View File

@@ -7,13 +7,6 @@ namespace XCharts
[CustomPropertyDrawer(typeof(SerieSymbol), true)]
public class SerieSymbolDrawer : PropertyDrawer
{
private List<bool> m_SerieModuleToggle = new List<bool>();
private List<bool> m_DataFoldout = new List<bool>();
private int m_DataSize = 0;
private bool m_ShowJsonDataArea = false;
private string m_JsonDataAreaText;
public override void OnGUI(Rect pos, SerializedProperty prop, GUIContent label)
{
Rect drawRect = pos;
@@ -26,9 +19,6 @@ namespace XCharts
SerializedProperty m_DataScale = prop.FindPropertyRelative("m_DataScale");
SerializedProperty m_SelectedDataScale = prop.FindPropertyRelative("m_SelectedDataScale");
SerializedProperty m_SizeCallback = prop.FindPropertyRelative("m_SizeCallback");
SerializedProperty m_SelectedSizeCallback = prop.FindPropertyRelative("m_SelectedSizeCallback");
EditorGUI.PropertyField(drawRect, m_Type, new GUIContent("Symbol Type"));
drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
EditorGUI.PropertyField(drawRect, m_SizeType, new GUIContent("Symbol SizeType"));

1
Assets/XCharts/Scripts/UI/BarChart.cs
View File

@@ -167,7 +167,6 @@ namespace XCharts
serieNameSet.Clear();
for (int j = 0; j < seriesCount; j++)
{
var seriesHig = new Dictionary<int, float>();
var serieList = stackSeries[j];
seriesCurrHig.Clear();
if (seriesCurrHig.Capacity != serieList[0].dataCount)

1
Assets/XCharts/Scripts/UI/ScatterChart.cs
View File

@@ -89,7 +89,6 @@ namespace XCharts
int maxCount = maxShowDataNumber > 0 ?
(maxShowDataNumber > serie.dataCount ? serie.dataCount : maxShowDataNumber)
: serie.dataCount;
int dataCount = (maxCount - minShowDataNumber);
for (int n = minShowDataNumber; n < maxCount; n++)
{
float xValue, yValue;

2
Assets/XCharts/Scripts/UI/Utility/ChartHelper.cs
View File

@@ -84,7 +84,7 @@ namespace XCharts
{
obj = new GameObject();
obj.name = name;
obj.transform.parent = parent;
obj.transform.SetParent(parent);
obj.transform.localScale = Vector3.one;
obj.transform.localPosition = Vector3.zero;
}