mirror of
https://github.com/DCFApixels/DragonECS-Unity.git
synced 2025-09-18 18:14:35 +08:00
Compare commits
No commits in common. "71f1328a59a25aa9f6ff48dedcc22ff4c6962170" and "d21c65742b2e84d89a95a51f41703c1f4e003f28" have entirely different histories.
71f1328a59
...
d21c65742b
@ -231,16 +231,8 @@ namespace DCFApixels.DragonECS.Unity.Editors.X
|
|||||||
{
|
{
|
||||||
if (_runtimeComponentsDepth == RuntimeComponentsDepthRoot)
|
if (_runtimeComponentsDepth == RuntimeComponentsDepthRoot)
|
||||||
{
|
{
|
||||||
try
|
|
||||||
{
|
|
||||||
_runtimeComponentsDepth = 0;
|
|
||||||
_drawers[0].DrawWorldComponents_Internal(world);
|
_drawers[0].DrawWorldComponents_Internal(world);
|
||||||
}
|
}
|
||||||
finally
|
|
||||||
{
|
|
||||||
_runtimeComponentsDepth = RuntimeComponentsDepthRoot;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
private void DrawWorldComponents_Internal(EcsWorld world)
|
private void DrawWorldComponents_Internal(EcsWorld world)
|
||||||
{
|
{
|
||||||
@ -462,7 +454,7 @@ namespace DCFApixels.DragonECS.Unity.Editors.X
|
|||||||
bool childElementChanged = false;
|
bool childElementChanged = false;
|
||||||
var eventType = Event.current.type;
|
var eventType = Event.current.type;
|
||||||
|
|
||||||
var label2 = "-";
|
var label2 = UnityEditorUtility.GetLabel2(cache.Type.FullName + " " + type.FullName);
|
||||||
var drawerType = cache.DrawerType;
|
var drawerType = cache.DrawerType;
|
||||||
|
|
||||||
if (isUnityObjectField)
|
if (isUnityObjectField)
|
||||||
|
@ -529,6 +529,37 @@ namespace DCFApixels.DragonECS.Unity.Editors
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
//private static StructList<GUIContent> _stackLabels = new StructList<GUIContent>(4);
|
||||||
|
//public static StackTempLabelScope GetStackLabel(string text, string tooltip = null)
|
||||||
|
//{
|
||||||
|
// StackTempLabelScope result = default;
|
||||||
|
// if (_stackLabels.Count <= 0)
|
||||||
|
// {
|
||||||
|
// result = new StackTempLabelScope(new GUIContent());
|
||||||
|
// }
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
// var l = _stackLabels[_stackLabels.Count - 1];
|
||||||
|
// _stackLabels.RemoveAt(_stackLabels.Count - 1);
|
||||||
|
// result = new StackTempLabelScope(l);
|
||||||
|
// }
|
||||||
|
// result.Label.text = text;
|
||||||
|
// result.Label.tooltip = tooltip;
|
||||||
|
// return result;
|
||||||
|
//}
|
||||||
|
//private static void ReturnStackLabel(GUIContent label)
|
||||||
|
//{
|
||||||
|
// _stackLabels.Add(label);
|
||||||
|
//}
|
||||||
|
//public readonly struct StackTempLabelScope : IDisposable
|
||||||
|
//{
|
||||||
|
// public readonly GUIContent Label;
|
||||||
|
// public StackTempLabelScope(GUIContent label) { Label = label; }
|
||||||
|
// public void Dispose() { ReturnStackLabel(Label); }
|
||||||
|
// public static implicit operator GUIContent(StackTempLabelScope a) { return a.Label; }
|
||||||
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static class RuntimeComponentsUtility
|
internal static class RuntimeComponentsUtility
|
||||||
|
@ -7,7 +7,6 @@ using System;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Serialization;
|
|
||||||
|
|
||||||
namespace DCFApixels.DragonECS
|
namespace DCFApixels.DragonECS
|
||||||
{
|
{
|
||||||
@ -26,7 +25,6 @@ namespace DCFApixels.DragonECS
|
|||||||
{
|
{
|
||||||
[SerializeReference]
|
[SerializeReference]
|
||||||
[ReferenceButton(true, typeof(IComponentTemplate))]
|
[ReferenceButton(true, typeof(IComponentTemplate))]
|
||||||
[FormerlySerializedAs("_components")]
|
|
||||||
private IComponentTemplate[] _componentTemplates;
|
private IComponentTemplate[] _componentTemplates;
|
||||||
|
|
||||||
#region Properties
|
#region Properties
|
||||||
|
@ -7,7 +7,6 @@ using System;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Serialization;
|
|
||||||
|
|
||||||
namespace DCFApixels.DragonECS
|
namespace DCFApixels.DragonECS
|
||||||
{
|
{
|
||||||
@ -27,7 +26,6 @@ namespace DCFApixels.DragonECS
|
|||||||
private ScriptableEntityTemplateBase[] _templates;
|
private ScriptableEntityTemplateBase[] _templates;
|
||||||
[SerializeReference]
|
[SerializeReference]
|
||||||
[ReferenceButton(true, typeof(IComponentTemplate))]
|
[ReferenceButton(true, typeof(IComponentTemplate))]
|
||||||
[FormerlySerializedAs("_components")]
|
|
||||||
private IComponentTemplate[] _componentTemplates;
|
private IComponentTemplate[] _componentTemplates;
|
||||||
|
|
||||||
#region Properties
|
#region Properties
|
||||||
|
Loading…
Reference in New Issue
Block a user