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

修复拖出制作预设时异常的问题

Browse Source
This commit is contained in:
monitor1394
2019-10-31 09:40:12 +08:00
parent 16c8d26e2a
commit 2dc3c2f759
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demo/Runtime/Demo.cs
View File

@@ -96,7 +96,7 @@ namespace XCharts
var btnPanel = transform.Find("chart_list"); var btnPanel = transform.Find("chart_list");
m_BtnClone = transform.Find("btn_clone").gameObject; m_BtnClone = transform.Find("btn_clone").gameObject;
m_BtnClone.SetActive(false); m_BtnClone.SetActive(false);
//ChartHelper.DestroyAllChildren(btnPanel); ChartHelper.DestroyAllChildren(btnPanel);
foreach (var module in m_ChartModule) foreach (var module in m_ChartModule)
{ {
var btnName = "btn_" + module.name; var btnName = "btn_" + module.name;

2
Runtime/Internal/BaseChart.cs
View File

@@ -289,7 +289,7 @@ namespace XCharts
{ {
var labelObject = ChartHelper.AddObject(s_SerieLabelObjectName, transform, chartAnchorMin, var labelObject = ChartHelper.AddObject(s_SerieLabelObjectName, transform, chartAnchorMin,
chartAnchorMax, chartPivot, new Vector2(chartWidth, chartHeight)); chartAnchorMax, chartPivot, new Vector2(chartWidth, chartHeight));
// ChartHelper.DestroyAllChildren(labelObject.transform); ChartHelper.DestroyAllChildren(labelObject.transform);
int count = 0; int count = 0;
for (int i = 0; i < m_Series.Count; i++) for (int i = 0; i < m_Series.Count; i++)
{ {

10
Runtime/Utility/ChartHelper.cs
View File

@@ -12,6 +12,9 @@ using System.Text.RegularExpressions;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityEngine.UI; using UnityEngine.UI;
#if UNITY_EDITOR
using UnityEditor;
#endif
namespace XCharts namespace XCharts
{ {
@@ -74,6 +77,13 @@ namespace XCharts
public static void DestroyAllChildren(Transform parent) public static void DestroyAllChildren(Transform parent)
{ {
if(parent == null) return;
#if UNITY_EDITOR
if (PrefabUtility.IsPartOfAnyPrefab(parent.gameObject))
{
return;
}
#endif
while (parent.childCount > 0) while (parent.childCount > 0)
{ {
var go = parent.GetChild(0); var go = parent.GetChild(0);