鼠标指针问题修复

Assets/Render/Renderer2Dtest.asset

@@ -463,18 +463,15 @@ MonoBehaviour:
     m_PostInfinity: 2
     m_RotationOrder: 4
   _filter:
-  - 0.004854369
-  - 0.021177985
-  - 0.06010355
-  - 0.106563106
-  - 0.14548868
-  - 0.1618123
-  - 0.1618123
-  - 0.14548868
-  - 0.106563106
-  - 0.06010355
-  - 0.021177985
-  - 0.004854369
+  - 0.007228916
+  - 0.043749984
+  - 0.12409639
+  - 0.20444278
+  - 0.24096388
+  - 0.20444278
+  - 0.12409639
+  - 0.043749984
+  - 0.007228916
 --- !u!114 &-6086986437317696584
 MonoBehaviour:
   m_ObjectHideFlags: 3

Assets/Scripts/Dialog System/DialogController.cs

@@ -20,11 +20,11 @@ namespace AibisDream
 
             _dialogueRunner.onDialogueStart.AddListener(() =>
             {
-                EnumEventSystem.Global.Send(InteractionEventEnum.DialogEnd);
+                EnumEventSystem.Global.Send(InteractionEventEnum.DialogStart);
             });
             _dialogueRunner.onDialogueComplete.AddListener(() =>
             {
-                EnumEventSystem.Global.Send(InteractionEventEnum.DialogStart);
+                EnumEventSystem.Global.Send(InteractionEventEnum.DialogEnd);
             });
         }
 

Assets/Scripts/Dialog System/LineAdvanceInput.cs

@@ -30,6 +30,7 @@ namespace AibisDream
 
         private void Update()
         {
+            
             _handler.Handle(_curSyncToken, IsInputAvailable);
         }
 

Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs

@@ -220,7 +220,7 @@ namespace AibisDream
         private void RegisterDialogEvents()
         {
             // 监听对话结束事件
-            EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, OnDialogueComplete);
+            EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, OnDialogueComplete);
         }
         
         /// <summary>
@@ -250,7 +250,7 @@ namespace AibisDream
         /// </summary>
         private void OnDestroy()
         {
-            EnumEventSystem.Global.UnRegister(InteractionEventEnum.DialogStart, OnDialogueComplete);
+            EnumEventSystem.Global.UnRegister(InteractionEventEnum.DialogEnd, OnDialogueComplete);
         }
         
         #endregion

Assets/Scripts/FixSystemNew/BodyModule/CableSystem.cs

@@ -51,14 +51,14 @@ namespace AibisDream.FixSystem
 
         private void OnEnable()
         {
-            EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, HandleDialogueStart);
-            EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, HandleDialogueComplete);
+            EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, HandleDialogueComplete);
+            EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, HandleDialogueStart);
         }
 
         private void OnDisable()
         {
-            EnumEventSystem.Global.UnRegister(InteractionEventEnum.DialogEnd, HandleDialogueStart);
-            EnumEventSystem.Global.UnRegister(InteractionEventEnum.DialogStart, HandleDialogueComplete);
+            EnumEventSystem.Global.UnRegister(InteractionEventEnum.DialogEnd, HandleDialogueComplete);
+            EnumEventSystem.Global.UnRegister(InteractionEventEnum.DialogStart, HandleDialogueStart);
         }
         
         private void InitComponentRefs()

Assets/Scripts/Framework/EventSystemKit/EventSystemEx.cs

@@ -69,13 +69,10 @@ namespace AibisDream.Framework
         {
             if (holdingObjList.Count > 0 || draggingObjList.Count > 0)
             {
-                Debug.Log($"Dragging: {draggingObjList.Count}");
-                Debug.Log($"Holding: {holdingObjList.Count}");
                 return TriggerEnum.Dragging;
             }
             else if (pointerOverObjList.Count > 0)
             {
-                Debug.Log($"PointerOver: {pointerOverObjList.Count}");
                 return TriggerEnum.PointerOver;
             }
             else

Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs

@@ -117,6 +117,7 @@ namespace AibisDream.Framework
 
         public override void OnBeginDrag(PointerEventData eventData)
         {
+            EventSystemEx.Instance.OnEndDrag(_interaction);
             base.OnBeginDrag(eventData);
         }
     }

Assets/Scripts/Game Loop/GameManager.cs

@@ -268,7 +268,7 @@ namespace AibisDream
             _unRegisters[3] = EnumEventSystem.Global.Register(GameLoopEnum.UnPauseGame, () => state.OnPause(false));
 
             _unRegisters[4] = EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, () => state.OnDialog(true));
-            _unRegisters[5] = EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, () => state.OnDialog(true));
+            _unRegisters[5] = EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, () => state.OnDialog(false));
         }
 
         private void UnRegisterEvents()

Assets/Scripts/MiniGame/Gear/GearSystem.cs

@@ -68,8 +68,8 @@ namespace AibisDream
 
         private void OnEnable()
         {
-            var unRegister1 = EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, () => _isInteractive = true);
-            var unRegister2 = EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, () => _isInteractive = false);
+            var unRegister1 = EnumEventSystem.Global.Register(InteractionEventEnum.DialogEnd, () => _isInteractive = true);
+            var unRegister2 = EnumEventSystem.Global.Register(InteractionEventEnum.DialogStart, () => _isInteractive = false);
             _evtUnRegisters = new[] { unRegister1, unRegister2 };
         }