update0.6.0.1

This commit is contained in:
2026-06-30 09:42:27 +08:00
parent d56d4731a4
commit 6d79ad50fd
9 changed files with 150 additions and 1 deletions
+167
View File
@@ -0,0 +1,167 @@
using System.Linq;
using UnityEngine;
using UnityEngine.Events;
using UnityEngine.EventSystems;
using XericLibrary.Runtime.MacroLibrary;
namespace Deconstruction.Runtime
{
public static class MacroEventTrigger
{
#region 基本事件
/// <summary>
/// 添加事件
/// </summary>
/// <param name="eventTrigger"></param>
/// <param name="eventType"></param>
/// <param name="entryEvent"></param>
public static void AddEntryEvent(this EventTrigger eventTrigger, EventTriggerType eventType,
UnityAction<BaseEventData> entryEvent)
{
var e = new EventTrigger.TriggerEvent();
e.AddListener(entryEvent);
var eventData = new EventTrigger.Entry()
{
eventID = eventType,
callback = e,
};
eventTrigger.triggers.Add(eventData);
}
/// <summary>
/// 移除类别下的所有事件
/// </summary>
/// <param name="eventTrigger"></param>
/// <param name="eventType"></param>
public static void RemoveEntryEvent(this EventTrigger eventTrigger, EventTriggerType eventType)
{
foreach (var trigger in eventTrigger.triggers
.Where(a => a.eventID == eventType))
{
eventTrigger.triggers.Remove(trigger);
}
}
/// <summary>
/// 移除事件
/// </summary>
/// <param name="eventTrigger"></param>
/// <param name="entryEvent"></param>
public static void RemoveEntryEvent(this EventTrigger eventTrigger, UnityAction<BaseEventData> entryEvent)
{
// 不知道,所以全部欧拉一遍
eventTrigger.triggers
.ForEachDo(a => a.callback.RemoveListener(entryEvent));
}
/// <summary>
/// 清除所有事件
/// </summary>
/// <param name="eventTrigger"></param>
public static void RemoveAllEntryEvent(this EventTrigger eventTrigger)
{
eventTrigger.triggers.Clear();
}
/// <summary>
/// 尝试返回光标事件下的碰撞结果
/// </summary>
/// <param name="data"></param>
/// <returns></returns>
public static bool TryGetPointerEventData(this BaseEventData data, out RaycastResult result)
{
if (data is PointerEventData pointer)
{
result = pointer.pointerCurrentRaycast;
return true;
}
result = default;
return false;
}
#endregion
#region 细节事件
public static EventTrigger.TriggerEvent onPointerEnter(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.PointerEnter);
public static EventTrigger.TriggerEvent onPointerExit(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.PointerExit);
public static EventTrigger.TriggerEvent onPointerDown(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.PointerDown);
public static EventTrigger.TriggerEvent onPointerUp(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.PointerUp);
public static EventTrigger.TriggerEvent onPointerClick(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.PointerClick);
public static EventTrigger.TriggerEvent onDrag(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.Drag);
public static EventTrigger.TriggerEvent onDrop(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.Drop);
public static EventTrigger.TriggerEvent onScroll(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.Scroll);
public static EventTrigger.TriggerEvent onUpdateSelected(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.UpdateSelected);
public static EventTrigger.TriggerEvent onSelect(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.Select);
public static EventTrigger.TriggerEvent onDeselect(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.Deselect);
public static EventTrigger.TriggerEvent onMove(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.Move);
public static EventTrigger.TriggerEvent onInitializePotentialDrag(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.InitializePotentialDrag);
public static EventTrigger.TriggerEvent onBeginDrag(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.BeginDrag);
public static EventTrigger.TriggerEvent onEndDrag(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.EndDrag);
/// <summary>
/// 用户提交输入时触发(比如回车)
/// </summary>
/// <param name="eventTrigger"></param>
/// <returns></returns>
public static EventTrigger.TriggerEvent onSubmit(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.Submit);
public static EventTrigger.TriggerEvent onCancel(this EventTrigger eventTrigger)
=> eventTrigger.GetEventTrigger(EventTriggerType.Cancel);
private static EventTrigger.TriggerEvent GetEventTrigger(this EventTrigger eventTrigger, EventTriggerType type)
{
EventTrigger.TriggerEvent e = null;
var entry = eventTrigger.triggers.FirstOrDefault(a => a.eventID == type);
if (entry == null)
{
e = new EventTrigger.TriggerEvent();
entry = new EventTrigger.Entry()
{
eventID = type,
callback = e,
};
eventTrigger.triggers.Add(entry);
}
else
e = entry.callback;
return e;
}
public static void ClearAllEventTrigger(this EventTrigger eventTrigger) => eventTrigger.triggers.Clear();
#endregion
}
}
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 5c736d2c11fc4e03947574b18003d66c
timeCreated: 1729761085
+53
View File
@@ -0,0 +1,53 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using UnityEngine;
using UnityEngine.UI;
using XericLibrary.Runtime.MacroLibrary;
namespace Deconstruction.Runtime
{
public static class MacroLayout
{
/// <summary>
/// 将布局组标记为脏,以触发重算布局。
/// </summary>
/// <param name="layoutGroup"></param>
public static void SetLayoutDirty(this LayoutGroup layoutGroup)
{
// var type = typeof(LayoutGroup);
// var method = type.GetMethod("SetDirty", BindingFlags.Instance | BindingFlags.NonPublic);
// method?.Invoke(layoutGroup, null);
LayoutRebuilder.ForceRebuildLayoutImmediate(layoutGroup.RectTransform());
}
/// <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()
{
yield return null;
LayoutRebuilder.MarkLayoutForRebuild(script.RectTransform());
}
}
}
}
+3
View File
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 34832ce232e3acf45b7ca41349d5515e
timeCreated: 1734339863
+132
View File
@@ -0,0 +1,132 @@
#if UNITY_WEBGL
using System;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
using UnityEngine;
using XericLibrary.Runtime.MacroLibrary;
using XericLibrary.Runtime.Type;
using XericLibrary.Runtime.Type.Base;
namespace XericLibrary.Runtime.MacroLibrary
{
/// <summary>
/// Web 平台文件句柄。
/// </summary>
public class WebGLHandle : CrossPlatformFileHandle
{
public override string PlatformName => "WebGL";
public static WebGLHandle handle = new WebGLHandle();
public static float GlobalTimeout = 10f;
public float Timeout = -1f;
private float timeout => Timeout >= 0 ? Timeout : GlobalTimeout;
public WebGLHandle() : base(RuntimePlatform.WebGLPlayer)
{
if (handle == null)
handle = this;
}
[DllImport("__Internal")]
private static extern void Download(string base64str, string fileName);
//[DllImport("__Internal")]
//private static extern void OpenFileDialog(string gameObjectName, string callbackMethodName);
//[DllImport("__Internal")]
//private static extern void OpenFileDialogBinary(string gameObjectName, string callbackMethodName);
public override bool ReadTextFromFile(string absolutePathname, out string content)
{
var waitFlag = false;
var result = string.Empty;
SingleMonoBase<WebFileLoader>.GlobalInstance.DirectlyLoadFile(absolutePathname, s => result = s, s =>
{
XericLogger.CCError($"WebGl文件同步加载失败:{s}");
}, () => { waitFlag = true; });
// 等待文件加载完成
while (!waitFlag)
{
// 让出控制权,避免完全阻塞
Debug.LogWarning("不建议在WebGl端使用同步文件读取方式,当前已让渡主线程控制权");
Thread.Sleep(0);
}
content = result;
return waitFlag;
}
public override bool WriteTextIntoFile(string absolutePathname, string content)
{
try
{
Download(content, absolutePathname);
return true;
}
catch (Exception e)
{
Debug.LogError($"无法下载文件{absolutePathname}:{e.Message}");
return false;
}
}
public override async Task<bool> AsyncReadTextFromFile(string absolutePathname, Action<string> complete, Action<string> loadError)
{
var waitFlag = false;
var result = false;
SingleMonoBase<WebFileLoader>.GlobalInstance.DirectlyLoadFile(absolutePathname,
s =>
{
result = true;
complete?.Invoke(s);
}, loadError, () => { waitFlag = true; });
await MacroAsync.WaitUntil(() => waitFlag, () => "WebGl文件读取失败", timeout);
return result;
}
public override async Task<bool> AsyncWriteTextIntoFile(string absolutePathname, string content, Action complete, Action<string> loadError)
{
await Task.Yield();
if (WriteTextIntoFile(absolutePathname, content))
{
complete?.Invoke();
}
else
{
loadError?.Invoke("WebGL文件写入失败");
XericLogger.CCError("WebGL文件写入失败");
}
await Task.CompletedTask;
return false;
}
public override string CombinePath(string pathA, string pathB)
{
try
{
if (!pathA.EndsWith("/")) // 确保路径以斜杠结尾
pathA += "/";
var uri = new Uri(new Uri(pathA, UriKind.Absolute), new Uri(pathB, UriKind.RelativeOrAbsolute));
/* 不能使用uri自己的
* 比如 uri.IsAbsoluteUri ? uri.AbsolutePath : uri.LocalPath;
* 在这种情况时:
* http://192.168.0.39:8080/DGJ/StreamingAssets/ + UriConfig.json
* 结果是 => /DGJ/StreamingAssets/UriConfig.json 用是AbsolutePath
* 所以要么直接A + B
* 要么直接Tostring。
*/
Debug.Log($"Web路径拼接处理结果浏览:{pathA}\n{pathB}\n{uri}\n");
return uri.ToString();
}
catch (UriFormatException ex)
{
// 处理URI格式错误
XericLogger.CCError($"Web路径拼接失败: {ex.Message}");
return string.Empty;
}
}
}
}
#endif
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 2137fae15766b1f40a4e7c94acb5cb70
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: