事件系统优化更新

事件系统优化更新 1.使用静态代替单例，静态方法调用时候内存地址无需二次偏移定位 2.UI事件在关闭UI时自动反监听
2025-08-14 16:51:28 +00:00 · 2022-10-26 15:14:04 +08:00
parent 2e175fbcac
commit 74092e6399
37 changed files with 905 additions and 1187 deletions
--- a/Assets/TEngine.Demo/Demo/TEngine.ActorDemo/ActorTestMain.cs
+++ b/Assets/TEngine.Demo/Demo/TEngine.ActorDemo/ActorTestMain.cs
@@ -11,7 +11,7 @@ public class ActorTestMain : MonoBehaviour
    {
        //Demo示例，监听TEngine流程加载器OnStartGame事件
        //抛出这个事件说明框架流程加载完成（热更新，初始化等）
-        GameEventMgr.Instance.AddEventListener(TEngineEvent.OnStartGame,OnStartGame);
+        GameEvent.AddEventListener(TEngineEvent.OnStartGame,OnStartGame);
    }

    private void OnStartGame()
--- a/Assets/TEngine.Demo/Demo/TEngine.ActorDemo/PlayEntityMgr.cs
+++ b/Assets/TEngine.Demo/Demo/TEngine.ActorDemo/PlayEntityMgr.cs
@@ -17,9 +17,9 @@ namespace TEngine.Runtime.Actor
        /// </summary>
        void RegisterEvent()
        {
-            GameEventMgr.Instance.AddEventListener<IEntity, float, object>(EntityEvent.ShowEntitySuccess, OnShowEntitySuccess);
-            GameEventMgr.Instance.AddEventListener<int, string, string, string, object>(EntityEvent.ShowEntityFailure, OnShowEntityFailure);
-            GameEventMgr.Instance.AddEventListener<int, string, IEntityGroup, object>(EntityEvent.HideEntityComplete, OnHideEntityComplete);
+            GameEvent.AddEventListener<IEntity, float, object>(EntityEvent.ShowEntitySuccess, OnShowEntitySuccess);
+            GameEvent.AddEventListener<int, string, string, string, object>(EntityEvent.ShowEntityFailure, OnShowEntityFailure);
+            GameEvent.AddEventListener<int, string, IEntityGroup, object>(EntityEvent.HideEntityComplete, OnHideEntityComplete);
        }

        /// <summary>
--- a/Assets/TEngine.Demo/Demo/TEngine.EntityDemo/EntityTestMain.cs
+++ b/Assets/TEngine.Demo/Demo/TEngine.EntityDemo/EntityTestMain.cs
@@ -11,7 +11,7 @@ public class EntityTestMain : MonoBehaviour
    {
        //Demo示例，监听TEngine流程加载器OnStartGame事件
        //抛出这个事件说明框架流程加载完成（热更新，初始化等）
-        GameEventMgr.Instance.AddEventListener(TEngineEvent.OnStartGame,OnStartGame);
+        GameEvent.AddEventListener(TEngineEvent.OnStartGame,OnStartGame);
    }

    private void OnStartGame()
--- a/Assets/TEngine.Demo/Demo/TEngine.EntityDemo/LightEntityMgr.cs
+++ b/Assets/TEngine.Demo/Demo/TEngine.EntityDemo/LightEntityMgr.cs
@@ -40,9 +40,9 @@ namespace TEngine.Demo.TEngine.EntityDemo
        /// </summary>
        void RegisterEvent()
        {
-            GameEventMgr.Instance.AddEventListener<IEntity, float, object>(EntityEvent.ShowEntitySuccess, OnShowEntitySuccess);
-            GameEventMgr.Instance.AddEventListener<int, string, string, string, object>(EntityEvent.ShowEntityFailure, OnShowEntityFailure);
-            GameEventMgr.Instance.AddEventListener<int, string, IEntityGroup, object>(EntityEvent.HideEntityComplete, OnHideEntityComplete);
+            GameEvent.AddEventListener<IEntity, float, object>(EntityEvent.ShowEntitySuccess, OnShowEntitySuccess);
+            GameEvent.AddEventListener<int, string, string, string, object>(EntityEvent.ShowEntityFailure, OnShowEntityFailure);
+            GameEvent.AddEventListener<int, string, IEntityGroup, object>(EntityEvent.HideEntityComplete, OnHideEntityComplete);
        }

        /// <summary>
--- a/Assets/TEngine.Demo/Demo/TEngine.NetDemo/NetTestMain.cs
+++ b/Assets/TEngine.Demo/Demo/TEngine.NetDemo/NetTestMain.cs
@@ -16,7 +16,7 @@ public class NetTestMain : MonoBehaviour
    {
        //Demo示例，监听TEngine流程加载器OnStartGame事件
        //抛出这个事件说明框架流程加载完成（热更新，初始化等）
-        GameEventMgr.Instance.AddEventListener(TEngineEvent.OnStartGame,OnStartGame);
+        GameEvent.AddEventListener(TEngineEvent.OnStartGame,OnStartGame);

    }

--- a/Assets/TEngine.Demo/Demo/TEngine.UIDemo/Resources/UI/TestUI.prefab
+++ b/Assets/TEngine.Demo/Demo/TEngine.UIDemo/Resources/UI/TestUI.prefab
@@ -0,0 +1,181 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6402266109080598536
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4817885892919467575}
+  - component: {fileID: 7802103059775820765}
+  - component: {fileID: 7249197984681057450}
+  m_Layer: 5
+  m_Name: m_text233
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4817885892919467575
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6402266109080598536}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 3174286174385965140}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7802103059775820765
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6402266109080598536}
+  m_CullTransparentMesh: 1
+--- !u!114 &7249197984681057450
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6402266109080598536}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
+--- !u!1 &8235976447969581174
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3174286174385965140}
+  - component: {fileID: 1003415184935212904}
+  - component: {fileID: 1919534446368215616}
+  - component: {fileID: 4766758077184901772}
+  m_Layer: 5
+  m_Name: TestUI
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3174286174385965140
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8235976447969581174}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 4817885892919467575}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!223 &1003415184935212904
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8235976447969581174}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &1919534446368215616
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8235976447969581174}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!114 &4766758077184901772
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8235976447969581174}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
--- a/Assets/TEngine.Demo/Demo/TEngine.UIDemo/Resources/UI/TestUI.prefab.meta
+++ b/Assets/TEngine.Demo/Demo/TEngine.UIDemo/Resources/UI/TestUI.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8da8ae71cd1ab564fb2735b351ee48a0
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TEngine.Demo/Demo/TEngine.UIDemo/TestUI.cs
+++ b/Assets/TEngine.Demo/Demo/TEngine.UIDemo/TestUI.cs
@@ -0,0 +1,34 @@
+using TEngine;
+using TEngine.Runtime;
+using UnityEngine;
+using UnityEngine.UI;
+
+using TEngine.Runtime.UIModule;
+
+class TestUI : UIWindow
+{
+    public static int TestEvent = StringId.StringToHash("TestEvent");
+    
+    #region 脚本工具生成的代码
+    private Text m_text233;
+    protected override void ScriptGenerator()
+    {
+        m_text233 = FindChildComponent<Text>("m_text233");
+    }
+    #endregion
+
+    protected override void RegisterEvent()
+    {
+        base.RegisterEvent();
+        AddUIEvent(TestEvent,Test);
+    }
+
+    private void Test()
+    {
+        Log.Fatal("Test Trigger");
+    }
+
+    #region 事件
+    #endregion
+
+}
--- a/Assets/TEngine.Demo/Demo/TEngine.UIDemo/TestUI.cs.meta
+++ b/Assets/TEngine.Demo/Demo/TEngine.UIDemo/TestUI.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0ec109ee7f6e49e796052056bacefbcf
+timeCreated: 1666767723
--- a/Assets/TEngine.Demo/Demo/TEngine.UIDemo/UIDemo.unity
+++ b/Assets/TEngine.Demo/Demo/TEngine.UIDemo/UIDemo.unity
@@ -38,12 +38,12 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 11
+  serializedVersion: 12
  m_GIWorkflowMode: 1
  m_GISettings:
    serializedVersion: 2
@@ -98,7 +98,7 @@ LightmapSettings:
    m_TrainingDataDestination: TrainingData
    m_LightProbeSampleCountMultiplier: 4
  m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 1
+  m_LightingSettings: {fileID: 0}
 --- !u!196 &4
 NavMeshSettings:
  serializedVersion: 2
@@ -118,6 +118,8 @@ NavMeshSettings:
    manualTileSize: 0
    tileSize: 256
    accuratePlacement: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
@@ -240,6 +242,7 @@ Light:
  m_UseColorTemperature: 0
  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
  m_UseBoundingSphereOverride: 0
+  m_UseViewFrustumForShadowCasterCull: 1
  m_ShadowRadius: 0
  m_ShadowAngle: 0
 --- !u!4 &1274323984
@@ -356,13 +359,13 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3463045026010536330, guid: 161ff7c8132079c4a95e2e4e70ddd41b,
        type: 3}
-      propertyPath: m_ResourceHelperTypeName
-      value: TEngine.Runtime.UnityResourceHelper
+      propertyPath: ResourceMode
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 3463045026010536330, guid: 161ff7c8132079c4a95e2e4e70ddd41b,
        type: 3}
-      propertyPath: ResourceMode
-      value: 3
+      propertyPath: m_ResourceHelperTypeName
+      value: TEngine.Runtime.UnityResourceHelper
      objectReference: {fileID: 0}
    - target: {fileID: 3463045026180535776, guid: 161ff7c8132079c4a95e2e4e70ddd41b,
        type: 3}
@@ -427,7 +430,7 @@ PrefabInstance:
    - target: {fileID: 3463045026377943191, guid: 161ff7c8132079c4a95e2e4e70ddd41b,
        type: 3}
      propertyPath: m_EntranceProcedureTypeName
-      value: TEngine.Runtime.ProcedureCodeInit
+      value: TEngine.Runtime.ProcedureLaunch
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 161ff7c8132079c4a95e2e4e70ddd41b, type: 3}
--- a/Assets/TEngine.Demo/Demo/TEngine.UIDemo/UITestMain.cs
+++ b/Assets/TEngine.Demo/Demo/TEngine.UIDemo/UITestMain.cs
@@ -10,9 +10,10 @@ public class UITestMain : MonoBehaviour
    {
        //Demo示例，监听TEngine流程加载器OnStartGame事件
        //抛出这个事件说明框架流程加载完成（热更新，初始化等）
-        GameEventMgr.Instance.AddEventListener(TEngineEvent.OnStartGame,OnStartGame);
+        GameEvent.AddEventListener(TEngineEvent.OnStartGame,OnStartGame);
    }

+    private int _loopTime = 0;
    /// <summary>
    /// OnStartGame
    /// </summary>
@@ -20,5 +21,17 @@ public class UITestMain : MonoBehaviour
    {
        // 激活UI系统
        UISys.Instance.Active();
+
+        UISys.Mgr.ShowWindow<TestUI>();
+
+        TimerMgr.Instance.AddTimer((args =>
+        {
+            _loopTime++;
+            GameEvent.Send(TestUI.TestEvent);
+            if (_loopTime > 7)
+            {
+                UISys.Mgr.CloseWindow<TestUI>();
+            }
+        }), 1f, true);
    }
 }