添加返回处理事件

Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset

@@ -16,9 +16,7 @@ MonoBehaviour:
   deleteDllAfterBuilds: 1
   AutomateForAllAOTPlatforms: 1
   automateForPlatforms: 0900000014000000
-  lastScan: 638322055491964378
+  lastScan: 638322882897678802
-  lastScan: 638322820025823816
-  lastScan: 638315169427075152
   supportSerializedTypes:
   - TypeName: UnityEngine.Animator, UnityEngine.AnimationModule
     IsCustom: 0
@@ -27,10 +25,6 @@ MonoBehaviour:
       Unity.ResourceManager
     IsCustom: 0
     Emit: 1
-  - TypeName: UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle,
-      Unity.ResourceManager
-    IsCustom: 0
-    Emit: 1
   - TypeName: PMaker.Await.AwaitTimeline, Assembly-CSharp
     IsCustom: 0
     Emit: 1
@@ -49,14 +43,6 @@ MonoBehaviour:
       UnityEngine.CoreModule]], mscorlib
     IsCustom: 0
     Emit: 1
-  - TypeName: System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle,
-      Unity.ResourceManager]], mscorlib
-    IsCustom: 0
-    Emit: 1
-  - TypeName: System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[UnityEngine.GameObject,
-      UnityEngine.CoreModule]], mscorlib
-    IsCustom: 0
-    Emit: 1
   - TypeName: System.Collections.Generic.Dictionary`2[[ObjectItem, Assembly-CSharp],[System.String[],
       mscorlib]], mscorlib
     IsCustom: 0
@@ -93,14 +79,6 @@ MonoBehaviour:
       Unity.TextMeshPro]], mscorlib]], mscorlib
     IsCustom: 0
     Emit: 1
-  - TypeName: System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.String,
-      mscorlib]], mscorlib
-    IsCustom: 0
-    Emit: 1
-  - TypeName: System.Collections.Generic.Dictionary`2[[TMPro.TMP_FontAsset, Unity.TextMeshPro],[System.Collections.Generic.List`1[[TMPro.TextMeshProUGUI,
-      Unity.TextMeshPro]], mscorlib]], mscorlib
-    IsCustom: 0
-    Emit: 1
   - TypeName: System.Collections.Generic.EnumEqualityComparer`1[[UnityTest.ZXL.DialogueType,
       Assembly-CSharp]], mscorlib
     IsCustom: 0
@@ -125,10 +103,6 @@ MonoBehaviour:
       mscorlib],[UnityEngine.GameObject, UnityEngine.CoreModule]], mscorlib]], System.Core
     IsCustom: 0
     Emit: 1
-  - TypeName: System.Collections.Generic.HashSet`1[[System.Collections.Generic.Dictionary`2[[System.String,
-      mscorlib],[UnityEngine.GameObject, UnityEngine.CoreModule]], mscorlib]], System.Core
-    IsCustom: 0
-    Emit: 1
   - TypeName: System.Collections.Generic.IEqualityComparer`1[[UnityTest.ZXL.DialogueType,
       Assembly-CSharp]], mscorlib
     IsCustom: 0
@@ -149,10 +123,6 @@ MonoBehaviour:
       Unity.TextMeshPro]], mscorlib
     IsCustom: 0
     Emit: 1
-  - TypeName: System.Collections.Generic.IEqualityComparer`1[[TMPro.TMP_FontAsset,
-      Unity.TextMeshPro]], mscorlib
-    IsCustom: 0
-    Emit: 1
   - TypeName: System.Int32, mscorlib
     IsCustom: 0
     Emit: 1
@@ -175,17 +145,6 @@ MonoBehaviour:
       mscorlib
     IsCustom: 0
     Emit: 1
-  - TypeName: System.Collections.Generic.List`1[[QuestionDatabase+Data, Assembly-CSharp]],
-      mscorlib
-    IsCustom: 0
-    Emit: 1
-  - TypeName: System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib
-    IsCustom: 0
-    Emit: 1
-  - TypeName: System.Collections.Generic.List`1[[TMPro.TextMeshProUGUI, Unity.TextMeshPro]],
-      mscorlib
-    IsCustom: 0
-    Emit: 1
   - TypeName: UnityTest.ZXL.ObjectComponent, Assembly-CSharp
     IsCustom: 0
     Emit: 1
@@ -197,10 +156,6 @@ MonoBehaviour:
       Unity.TextMeshPro]], mscorlib
     IsCustom: 0
     Emit: 1
-  - TypeName: System.Collections.Generic.ObjectEqualityComparer`1[[TMPro.TMP_FontAsset,
-      Unity.TextMeshPro]], mscorlib
-    IsCustom: 0
-    Emit: 1
   - TypeName: ObjectItem, Assembly-CSharp
     IsCustom: 0
     Emit: 1
@@ -225,18 +180,6 @@ MonoBehaviour:
   - TypeName: UnityEngine.ResourceManagement.ResourceProviders.SceneInstance, Unity.ResourceManager
     IsCustom: 0
     Emit: 1
-  - TypeName: QuestionDatabase+Data, Assembly-CSharp
-    IsCustom: 0
-    Emit: 1
-  - TypeName: QuestionDatabase+Option, Assembly-CSharp
-    IsCustom: 0
-    Emit: 1
-  - TypeName: QuestionDatabase+QusetionType, Assembly-CSharp
-    IsCustom: 0
-    Emit: 1
-  - TypeName: UnityEngine.ResourceManagement.ResourceProviders.SceneInstance, Unity.ResourceManager
-    IsCustom: 0
-    Emit: 1
   - TypeName: System.String, mscorlib
     IsCustom: 0
     Emit: 1
@@ -249,9 +192,3 @@ MonoBehaviour:
   - TypeName: TMPro.TMP_FontAsset, Unity.TextMeshPro
     IsCustom: 0
     Emit: 1
-  - TypeName: TMPro.TextMeshProUGUI, Unity.TextMeshPro
-    IsCustom: 0
-    Emit: 1
-  - TypeName: TMPro.TMP_FontAsset, Unity.TextMeshPro
-    IsCustom: 0
-    Emit: 1

Assets/UnityTest/ZXL/Scene/Main.unity

@@ -11019,7 +11019,7 @@ MonoBehaviour:
       Entry: 8
       Data: 
   hhh: '**************************************'
-  startProcessType: 2
+  startProcessType: 0
 --- !u!1 &150321891
 GameObject:
   m_ObjectHideFlags: 0

Assets/UnityTest/ZXL/Scripts/Process/ProcessBase.cs

@@ -132,6 +132,14 @@ namespace UnityTest.ZXL
         private void Update()
         {
             OnUpdate();
+
+#if UNITY_EDITOR
+            if (Input.GetKeyDown(KeyCode.P))
+            {
+                Debug.Log("结束当前流程");
+                EventManager.Instance.FireNow(this, new ProcessOverEventArgs(processType));
+            }
+#endif
         }
 
         private void OnDisable()

Assets/UnityTest/ZXL/Scripts/Process/ProcessManager.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using DragonSoul.Shared;
 using Mono.Event;
+using PMaker.MessagePipe;
 using Sirenix.OdinInspector;
 using Sirenix.Serialization;
 using UnityEditor;
@@ -67,6 +68,7 @@ namespace UnityTest.ZXL
             {
                 // 完成四个模块的任务了
                 Debug.Log("完成四个模块的任务了");
+                MessageKit.GetPublisher<string>().Publish("返回类型");
                 return;
             }
 

ProjectSettings/ProjectSettings.asset

@@ -149,6 +149,7 @@ PlayerSettings:
   preloadedAssets:
   - {fileID: 0}
   - {fileID: 0}
+  - {fileID: 11400000, guid: 377fab9146e60364fa298d388667a056, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1