update 0.5.8
This commit is contained in:
@@ -4,7 +4,7 @@ using UnityEngine.Events;
|
||||
using UnityEngine.EventSystems;
|
||||
using XericLibrary.Runtime.MacroLibrary;
|
||||
|
||||
namespace DigitalTwinTool
|
||||
namespace Deconstruction.Runtime
|
||||
{
|
||||
public static class MacroEventTrigger
|
||||
{
|
||||
@@ -84,49 +84,49 @@ namespace DigitalTwinTool
|
||||
|
||||
#region 细节事件
|
||||
|
||||
public static EventTrigger.TriggerEvent OnPointerEnter(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onPointerEnter(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.PointerEnter);
|
||||
|
||||
public static EventTrigger.TriggerEvent OnPointerExit(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onPointerExit(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.PointerExit);
|
||||
|
||||
public static EventTrigger.TriggerEvent OnPointerDown(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onPointerDown(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.PointerDown);
|
||||
|
||||
public static EventTrigger.TriggerEvent OnPointerUp(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onPointerUp(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.PointerUp);
|
||||
|
||||
public static EventTrigger.TriggerEvent OnPointerClick(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onPointerClick(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.PointerClick);
|
||||
|
||||
public static EventTrigger.TriggerEvent OnDrag(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onDrag(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.Drag);
|
||||
|
||||
public static EventTrigger.TriggerEvent OnDrop(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onDrop(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.Drop);
|
||||
|
||||
public static EventTrigger.TriggerEvent OnScroll(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onScroll(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.Scroll);
|
||||
|
||||
public static EventTrigger.TriggerEvent OnUpdateSelected(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onUpdateSelected(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.UpdateSelected);
|
||||
|
||||
public static EventTrigger.TriggerEvent OnSelect(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onSelect(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.Select);
|
||||
|
||||
public static EventTrigger.TriggerEvent OnDeselect(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onDeselect(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.Deselect);
|
||||
|
||||
public static EventTrigger.TriggerEvent OnMove(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onMove(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.Move);
|
||||
|
||||
public static EventTrigger.TriggerEvent OnInitializePotentialDrag(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onInitializePotentialDrag(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.InitializePotentialDrag);
|
||||
|
||||
public static EventTrigger.TriggerEvent OnBeginDrag(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onBeginDrag(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.BeginDrag);
|
||||
|
||||
public static EventTrigger.TriggerEvent OnEndDrag(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onEndDrag(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.EndDrag);
|
||||
|
||||
/// <summary>
|
||||
@@ -134,10 +134,10 @@ namespace DigitalTwinTool
|
||||
/// </summary>
|
||||
/// <param name="eventTrigger"></param>
|
||||
/// <returns></returns>
|
||||
public static EventTrigger.TriggerEvent OnSubmit(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onSubmit(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.Submit);
|
||||
|
||||
public static EventTrigger.TriggerEvent OnCancel(this EventTrigger eventTrigger)
|
||||
public static EventTrigger.TriggerEvent onCancel(this EventTrigger eventTrigger)
|
||||
=> eventTrigger.GetEventTrigger(EventTriggerType.Cancel);
|
||||
|
||||
private static EventTrigger.TriggerEvent GetEventTrigger(this EventTrigger eventTrigger, EventTriggerType type)
|
||||
@@ -160,6 +160,8 @@ namespace DigitalTwinTool
|
||||
return e;
|
||||
}
|
||||
|
||||
public static void ClearAllEventTrigger(this EventTrigger eventTrigger) => eventTrigger.triggers.Clear();
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -6,26 +6,42 @@ using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
using XericLibrary.Runtime.MacroLibrary;
|
||||
|
||||
namespace DigitalTwinTool
|
||||
namespace Deconstruction.Runtime
|
||||
{
|
||||
public static class MacroLayout
|
||||
{
|
||||
/// <summary>
|
||||
/// 将布局组标记为脏,以触发重算。
|
||||
/// 将布局组标记为脏,以触发重算布局。
|
||||
/// </summary>
|
||||
/// <param name="layoutGroup"></param>
|
||||
public static void SetDirty(this LayoutGroup layoutGroup)
|
||||
public static void SetLayoutDirty(this LayoutGroup layoutGroup)
|
||||
{
|
||||
var type = typeof(LayoutGroup);
|
||||
var method = type.GetMethod("SetDirty", BindingFlags.Instance | BindingFlags.NonPublic);
|
||||
method?.Invoke(layoutGroup, null);
|
||||
// var type = typeof(LayoutGroup);
|
||||
// var method = type.GetMethod("SetDirty", BindingFlags.Instance | BindingFlags.NonPublic);
|
||||
// method?.Invoke(layoutGroup, null);
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate(layoutGroup.RectTransform());
|
||||
}
|
||||
|
||||
private static HashSet<RectTransform> _rebuildSet = new HashSet<RectTransform>();
|
||||
public static void WaitParentLayoutRebuild(this MonoBehaviour script)
|
||||
/// <summary>
|
||||
/// 将canvas组件白哦及为脏,以触发canvas充算布局
|
||||
/// </summary>
|
||||
/// <param name="rectTrans"></param>
|
||||
public static void SetLayoutDirty(this RectTransform rectTrans)
|
||||
{
|
||||
LayoutRebuilder.ForceRebuildLayoutImmediate(rectTrans);
|
||||
}
|
||||
|
||||
|
||||
private static HashSet<RectTransform> _rebuildSet = new HashSet<RectTransform>();
|
||||
/// <summary>
|
||||
/// 等待这帧过去之后再触发重建
|
||||
/// </summary>
|
||||
/// <param name="script"></param>
|
||||
public static void WaitParentLayoutRebuildThenRebuildAgen(this MonoBehaviour script)
|
||||
{
|
||||
if (!script.RectTransform())
|
||||
return;
|
||||
script.StartCoroutine(waitForRebuild());
|
||||
|
||||
return;
|
||||
IEnumerator waitForRebuild()
|
||||
{
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,33 @@
|
||||
fileFormatVersion: 2
|
||||
guid: af972e12c8e41814188a98b92de42e0c
|
||||
PluginImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
iconMap: {}
|
||||
executionOrder: {}
|
||||
defineConstraints: []
|
||||
isPreloaded: 0
|
||||
isOverridable: 1
|
||||
isExplicitlyReferenced: 0
|
||||
validateReferences: 1
|
||||
platformData:
|
||||
- first:
|
||||
Any:
|
||||
second:
|
||||
enabled: 1
|
||||
settings: {}
|
||||
- first:
|
||||
Editor: Editor
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
DefaultValueInitialized: true
|
||||
- first:
|
||||
Windows Store Apps: WindowsStoreApps
|
||||
second:
|
||||
enabled: 0
|
||||
settings:
|
||||
CPU: AnyCPU
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "Lrss3.Deconstruction",
|
||||
"rootNamespace": "Deconstruction",
|
||||
"references": [
|
||||
"GUID:6055be8ebefd69e48b49212b09b47b2f"
|
||||
"Unity.TextMeshPro"
|
||||
],
|
||||
"includePlatforms": [],
|
||||
"excludePlatforms": [],
|
||||
|
||||
@@ -60,7 +60,9 @@ namespace Deconstruction.UI.TmpText
|
||||
/// <summary>
|
||||
/// 当前超链接管理器下的所有超链接
|
||||
/// </summary>
|
||||
#if ODIN_INSPECTOR
|
||||
[ShowInInspector]
|
||||
#endif
|
||||
public List<TMPHyperlinkReceiver> Children { get; internal set; }
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -115,7 +115,7 @@ namespace Deconstruction.UI.TmpText
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.LogError($"超链接目标事件存在错误 {_tmpText.text.LimitStringLength(32)} :\n{e.Message}\n{e.Data}", this);
|
||||
Debug.LogError($"超链接目标事件存在错误 {_tmpText.text.LimitStringLength(32)} :\n{e.Message}\n{e}\n\n", this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 579f0719bf2bbad4cbf32941bd430366
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user