From 559506ddc5184f95a7fb309dd4f87a91641fe18d Mon Sep 17 00:00:00 2001 From: Amani <799375868@qq.com> Date: Sun, 13 Sep 2026 11:20:16 +0800 Subject: [PATCH] =?UTF-8?q?EventCenter=E6=94=B9=E5=90=8D=E4=B8=BAGameEvent?= =?UTF-8?q?Helper=E7=AC=A6=E5=90=88=E9=A1=B9=E7=9B=AE=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E4=B9=A0=E6=83=AF=EF=BC=8CSetSprite=E6=8F=90=E5=89=8D=E5=81=9A?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=9C=B0=E5=9D=80=E7=9A=84=E5=88=A4=E7=A9=BA?= =?UTF-8?q?=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、GameEventAnalyzer增加RemoveEventListener的检查 2、EventCenter重命名为GameEventHelper 3、SetSpriteExtensions的SetSprite提前对资源地址进行判空返回，防止进入资源模块的异常抛出 4、ResourceExtComponent.Resource取消对异步取消的警告日志 --- .../GameEventAnalyzer/Definition.cs | 2 +- .../Generator/EventInterfaceGenerator.cs | 44 +++++++++--------- .../Core/GameEvent/GameEventAnalyzer.dll | Bin 25600 -> 25600 bytes .../Core/GameEvent/SourceGenerator.dll | Bin 27136 -> 27136 bytes .../Implement/SetSpriteExtensions.cs | 16 +++++++ .../ResourceExtComponent.Resource.cs | 4 ++ 6 files changed, 43 insertions(+), 23 deletions(-) diff --git a/Tools/GameEventSourceGenerator/GameEventAnalyzer/Definition.cs b/Tools/GameEventSourceGenerator/GameEventAnalyzer/Definition.cs index b969108685..c41609577f 100644 --- a/Tools/GameEventSourceGenerator/GameEventAnalyzer/Definition.cs +++ b/Tools/GameEventSourceGenerator/GameEventAnalyzer/Definition.cs @@ -78,7 +78,7 @@ public sealed class Definition /// public static readonly List CheckMethodNameList = [ - "AddUIEvent", "AddEventListener" + "AddUIEvent", "AddEventListener", "RemoveEventListener" ]; /// diff --git a/Tools/GameEventSourceGenerator/SourceGenerator/Generator/EventInterfaceGenerator.cs b/Tools/GameEventSourceGenerator/SourceGenerator/Generator/EventInterfaceGenerator.cs index a190a8c248..3ad3fbd853 100644 --- a/Tools/GameEventSourceGenerator/SourceGenerator/Generator/EventInterfaceGenerator.cs +++ b/Tools/GameEventSourceGenerator/SourceGenerator/Generator/EventInterfaceGenerator.cs @@ -9,15 +9,15 @@ [Generator] public class EventInterfaceGenerator : ISourceGenerator { - private sealed class EventCenterInterfaceInfo + private sealed class GameEventHelperInterfaceInfo { public string InterfaceName { get; set; } = string.Empty; public string EventClassName { get; set; } = string.Empty; public string GroupClassName { get; set; } = string.Empty; - public List Methods { get; } = new List(); + public List Methods { get; } = new List(); } - private sealed class EventCenterMethodInfo + private sealed class GameEventHelperMethodInfo { public string MethodName { get; set; } = string.Empty; public string ActionType { get; set; } = string.Empty; @@ -31,7 +31,7 @@ public void Execute(GeneratorExecutionContext context) { var syntaxTrees = context.Compilation.SyntaxTrees; List classNameList = new List(); - List eventCenterInterfaceInfos = new List(); + List gameEventHelperInterfaceInfos = new List(); foreach (var tree in syntaxTrees) { @@ -61,15 +61,15 @@ public void Execute(GeneratorExecutionContext context) context.AddSource($"{interfaceName}_Gen.g.cs", implementationClassCode); classNameList.Add($"{interfaceName}_Gen"); - eventCenterInterfaceInfos.Add(GenerateEventCenterInterfaceInfo(interfaceName, eventClassName, interfaceNode, context)); + gameEventHelperInterfaceInfos.Add(GenerateGameEventHelperInterfaceInfo(interfaceName, eventClassName, interfaceNode, context)); } } if (classNameList.Count > 0) { - string uniqueFileName = $"GameEventHelper.g.cs"; + string uniqueFileName = $"GameEventHelper.Init.g.cs"; context.AddSource(uniqueFileName, GenerateGameEventHelper(classNameList)); - context.AddSource("EventCenter.g.cs", GenerateEventCenter(eventCenterInterfaceInfos)); + context.AddSource("GameEventHelper.g.cs", GenerateGameEventHelper(gameEventHelperInterfaceInfos)); } } @@ -90,7 +90,7 @@ private string GenerateGameEventHelper(List classNameList) sb.AppendLine(); sb.AppendLine($"namespace {Definition.NameSpace}"); sb.AppendLine($"{{"); - sb.AppendLine($" public static class GameEventHelper"); + sb.AppendLine($" public static partial class GameEventHelper"); sb.AppendLine(" {"); sb.AppendLine($" public static void Init()"); sb.AppendLine(" {"); @@ -106,7 +106,7 @@ private string GenerateGameEventHelper(List classNameList) return sb.ToString(); } - private string GenerateEventCenter(List eventCenterInterfaceInfos) + private string GenerateGameEventHelper(List gameEventHelperInterfaceInfos) { var sb = new StringBuilder(); sb.AppendLine($"//------------------------------------------------------------------------------"); @@ -123,24 +123,24 @@ private string GenerateEventCenter(List eventCenterInt sb.AppendLine(); sb.AppendLine($"namespace {Definition.NameSpace}"); sb.AppendLine($"{{"); - sb.AppendLine($" public partial class EventCenter"); + sb.AppendLine($" public static partial class GameEventHelper"); sb.AppendLine(" {"); - GenerateEventCenterGroup(sb, eventCenterInterfaceInfos, "AddEvent", "AddEventListener"); + GenerateGameEventHelperGroup(sb, gameEventHelperInterfaceInfos, "AddEvent", "AddEventListener"); sb.AppendLine(); - GenerateEventCenterGroup(sb, eventCenterInterfaceInfos, "RemoveEvent", "RemoveEventListener"); + GenerateGameEventHelperGroup(sb, gameEventHelperInterfaceInfos, "RemoveEvent", "RemoveEventListener"); sb.AppendLine(" }"); sb.AppendLine("}"); return sb.ToString(); } - private void GenerateEventCenterGroup(StringBuilder sb, List eventCenterInterfaceInfos, string className, string methodName) + private void GenerateGameEventHelperGroup(StringBuilder sb, List gameEventHelperInterfaceInfos, string className, string methodName) { sb.AppendLine($" public partial class {className}"); sb.AppendLine(" {"); - for (int i = 0; i < eventCenterInterfaceInfos.Count; i++) + for (int i = 0; i < gameEventHelperInterfaceInfos.Count; i++) { - var interfaceInfo = eventCenterInterfaceInfos[i]; + var interfaceInfo = gameEventHelperInterfaceInfos[i]; sb.AppendLine($" public partial class {interfaceInfo.GroupClassName}"); sb.AppendLine(" {"); @@ -160,7 +160,7 @@ private void GenerateEventCenterGroup(StringBuilder sb, List()) { - eventCenterInterfaceInfo.Methods.Add(new EventCenterMethodInfo + gameEventHelperInterfaceInfo.Methods.Add(new GameEventHelperMethodInfo { MethodName = method.Identifier.ToString(), ActionType = GenerateActionType(method, semanticModel), }); } - return eventCenterInterfaceInfo; + return gameEventHelperInterfaceInfo; } - private string GetEventCenterGroupName(string interfaceName) + private string GetGameEventHelperGroupName(string interfaceName) { if (interfaceName.Length > 1 && interfaceName[0] == 'I' && char.IsUpper(interfaceName[1])) { diff --git a/UnityProject/Assets/TEngine/Runtime/Core/GameEvent/GameEventAnalyzer.dll b/UnityProject/Assets/TEngine/Runtime/Core/GameEvent/GameEventAnalyzer.dll index 255d1e9d5a68fe9eeb7143168689d64813cea1d1..f5fe59be66b7eeea76ac1664ea4cb843aced3a34 100644 GIT binary patch delta 1411 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取消设置资源的Token。 public static void SetSprite(this Image image, string location, bool setNativeSize = false, Action callback = null, CancellationToken cancellationToken = default) { + if (string.IsNullOrEmpty(location)) + { + return; + } ResourceExtComponent.Instance.SetAssetByResources(SetSpriteObject.Create(image, location, setNativeSize, callback, cancellationToken), cancellationToken).Forget(); } @@ -29,6 +33,10 @@ public static void SetSprite(this Image image, string location, bool setNativeSi /// 取消设置资源的Token。 public static void SetSprite(this SpriteRenderer spriteRenderer, string location, Action callback = null, CancellationToken cancellationToken = default) { + if (string.IsNullOrEmpty(location)) + { + return; + } ResourceExtComponent.Instance.SetAssetByResources(SetSpriteObject.Create(spriteRenderer, location, callback, cancellationToken), cancellationToken).Forget(); } @@ -42,6 +50,10 @@ public static void SetSprite(this SpriteRenderer spriteRenderer, string location /// 取消设置资源的Token。 public static void SetSubSprite(this Image image, string location, string spriteName, bool setNativeSize = false, CancellationToken cancellationToken = default) { + if (string.IsNullOrEmpty(location) || string.IsNullOrEmpty(spriteName)) + { + return; + } ResourceExtComponent.Instance.SetSubSprite(image, location, spriteName, setNativeSize, cancellationToken).Forget(); } @@ -54,6 +66,10 @@ public static void SetSubSprite(this Image image, string location, string sprite /// 取消设置资源的Token。 public static void SetSubSprite(this SpriteRenderer spriteRenderer, string location, string spriteName, CancellationToken cancellationToken = default) { + if (string.IsNullOrEmpty(location) || string.IsNullOrEmpty(spriteName)) + { + return; + } ResourceExtComponent.Instance.SetSubSprite(spriteRenderer, location, spriteName, cancellationToken).Forget(); } } \ No newline at end of file diff --git a/UnityProject/Assets/TEngine/Runtime/Module/ResourceModule/Extension/ResourceExtComponent.Resource.cs b/UnityProject/Assets/TEngine/Runtime/Module/ResourceModule/Extension/ResourceExtComponent.Resource.cs index e04da45416..be76907e25 100644 --- a/UnityProject/Assets/TEngine/Runtime/Module/ResourceModule/Extension/ResourceExtComponent.Resource.cs +++ b/UnityProject/Assets/TEngine/Runtime/Module/ResourceModule/Extension/ResourceExtComponent.Resource.cs @@ -107,6 +107,10 @@ public async UniTaskVoid SetAssetByResources(ISetAssetObject setAssetObject, loadedResource = await _resourceModule.LoadAssetAsync(location, linkedTokenSource.Token); if (loadedResource == null) { + if (linkedTokenSource.IsCancellationRequested) + { + return; + } Log.Error("加载资源失败，资源为空: '{0}'", location); return; }