整理代码

This commit is contained in:
monitor1394
2019-06-21 09:34:33 +08:00
parent f2b1593add
commit 6000ad6881
35 changed files with 68 additions and 97 deletions

5
.gitignore vendored
View File

@@ -1,10 +1,9 @@
/.vs /.vs
/.vscode
.vs .vs
/Library /Library
/Temp /Temp
/UnityPackageManager /UnityPackageManager
/Assets/XLua/Examples
/Assets/XCharts/Demo/demo_test.unity /Assets/XCharts/Demo/demo_test.unity
/Assets/XCharts/Demo/demo_test.unity.meta /Assets/XCharts/Demo/demo_test.unity.meta
@@ -16,3 +15,5 @@
*.pdb *.pdb
*.exp *.exp
*.apk *.apk
*.DS_Store
*.cache

View File

@@ -1,6 +1,5 @@
using System; using System;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
using XCharts; using XCharts;
[DisallowMultipleComponent] [DisallowMultipleComponent]

View File

@@ -1,5 +1,4 @@
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
using XCharts; using XCharts;
[DisallowMultipleComponent] [DisallowMultipleComponent]

View File

@@ -1,5 +1,4 @@
using System.Collections.Generic; using UnityEditor;
using UnityEditor;
using UnityEngine; using UnityEngine;
namespace XCharts namespace XCharts

View File

@@ -1,7 +1,6 @@
using UnityEditor; using UnityEditor;
using UnityEditorInternal; using UnityEditorInternal;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {
@@ -154,7 +153,8 @@ namespace XCharts
{ {
height += EditorGUIUtility.singleLineHeight * 3 + EditorGUIUtility.standardVerticalSpacing; height += EditorGUIUtility.singleLineHeight * 3 + EditorGUIUtility.standardVerticalSpacing;
} }
}else if(type == Axis.AxisType.Value) }
else if (type == Axis.AxisType.Value)
{ {
height += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; height += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
SerializedProperty m_MinMaxType = prop.FindPropertyRelative("m_MinMaxType"); SerializedProperty m_MinMaxType = prop.FindPropertyRelative("m_MinMaxType");

View File

@@ -1,6 +1,5 @@
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -1,6 +1,5 @@
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -1,6 +1,5 @@
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -1,6 +1,5 @@
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -1,6 +1,5 @@
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -1,6 +1,5 @@
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -1,6 +1,5 @@
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -1,6 +1,5 @@
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -1,6 +1,5 @@
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -1,6 +1,5 @@
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -1,6 +1,5 @@
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -1,7 +1,5 @@
using System.Collections.Generic; using UnityEditor;
using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -1,7 +1,6 @@
using UnityEditor; using UnityEditor;
using UnityEditorInternal; using UnityEditorInternal;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -1,6 +1,5 @@
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -1,6 +1,5 @@
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -1,7 +1,4 @@
using UnityEngine; namespace XCharts
using System.Collections;
namespace XCharts
{ {
public interface IJsonData public interface IJsonData
{ {

View File

@@ -1,7 +1,4 @@
using UnityEngine; namespace XCharts
using System.Collections;
namespace XCharts
{ {
public interface IPropertyChanged public interface IPropertyChanged
{ {

View File

@@ -1,7 +1,5 @@
using System; using System;
using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
namespace XCharts namespace XCharts
{ {

View File

@@ -2,7 +2,6 @@
using UnityEngine.UI; using UnityEngine.UI;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
namespace XCharts namespace XCharts
@@ -162,7 +161,6 @@ namespace XCharts
m_Tooltip.SetActive(false); m_Tooltip.SetActive(false);
return; return;
} }
m_Tooltip.SetActive(true);
if (m_Series.Count == 1) if (m_Series.Count == 1)
{ {
float value = m_Series.GetData(0, index); float value = m_Series.GetData(0, index);
@@ -221,6 +219,7 @@ namespace XCharts
pos.y = m_Tooltip.height; pos.y = m_Tooltip.height;
} }
m_Tooltip.UpdateContentPos(pos); m_Tooltip.UpdateContentPos(pos);
m_Tooltip.SetActive(true);
} }
protected override void OnThemeChanged() protected override void OnThemeChanged()

View File

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

View File

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

View File

@@ -1,5 +1,4 @@
using UnityEngine; using UnityEngine;
using System.Collections;
using System; using System;
namespace XCharts namespace XCharts

View File

@@ -47,6 +47,7 @@ namespace XCharts
public void SetObj(GameObject obj) public void SetObj(GameObject obj)
{ {
m_GameObject = obj; m_GameObject = obj;
m_GameObject.SetActive(false);
} }
public void SetContentObj(GameObject content) public void SetContentObj(GameObject content)
@@ -64,6 +65,8 @@ namespace XCharts
m_LabelY = labelY; m_LabelY = labelY;
m_LabelRectY = labelY.GetComponent<RectTransform>(); m_LabelRectY = labelY.GetComponent<RectTransform>();
m_LabelTextY = labelY.GetComponentInChildren<Text>(); m_LabelTextY = labelY.GetComponentInChildren<Text>();
m_LabelX.SetActive(false);
m_LabelY.SetActive(false);
} }
public void SetContentBackgroundColor(Color color) public void SetContentBackgroundColor(Color color)

View File

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