Merge pull request #462 from JasonXuDeveloper/development

JasonXuDeveloper · web-flow · commit b05e4961698d · 2023-04-12T17:32:28.000+10:00
fix async lifecycle bug
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@
 
 
 
-# JENGINE v0.8.0
+# JENGINE v0.8.0f1
 
 **JEngine is an out-of-the-box framework designed for Unity developers. It encapsulates powerful functions. Beginners can also get started quickly and easily create games that can be updated in runtime.**
 
diff --git a/README_zh_cn.md b/README_zh_cn.md
@@ -30,7 +30,7 @@
 
 
 
-# JENGINE v0.8.0
+# JENGINE v0.8.0f1
 
 JEngine是针对Unity开发者设计的**开箱即用**的框架，封装了强大的功能，小白也能**快速上手**，**轻松制作**可以**热更新的游戏**
 
diff --git a/UnityProject/Assets/Dependencies/JEngine/Core/Manager/ClassBindMgr.cs b/UnityProject/Assets/Dependencies/JEngine/Core/Manager/ClassBindMgr.cs
@@ -32,13 +32,17 @@ namespace JEngine.Core
 {
     public partial class ClassBindMgr : MonoBehaviour
     {
-        public static void Instantiate()
+        public static async Task Instantiate()
         {
             if (_instance != null)
                 return;
 
             _instance = new GameObject("ClassBindMgr").AddComponent<ClassBindMgr>();
             DontDestroyOnLoad(_instance);
+            SceneManager.sceneLoaded += _instance.OnSceneLoaded;
+            SceneManager.sceneUnloaded += _instance.OnSceneUnloaded;
+            LoadedScenes.Add(SceneManager.GetActiveScene());
+            await DoBind();
         }
 
         private static ClassBindMgr _instance;
@@ -51,11 +55,6 @@ private void Awake()
             {
                 DestroyImmediate(this);
             }
-
-            SceneManager.sceneLoaded += OnSceneLoaded;
-            SceneManager.sceneUnloaded += OnSceneUnloaded;
-            LoadedScenes.Add(SceneManager.GetActiveScene());
-            _ = DoBind();
         }
 
         private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
@@ -73,11 +72,11 @@ private void OnDestroy()
         {
             if (_instance == this)
             {
-                _instance = null;
-                SceneManager.sceneLoaded -= OnSceneLoaded;
-                SceneManager.sceneUnloaded -= OnSceneUnloaded;
+                SceneManager.sceneLoaded -= _instance.OnSceneLoaded;
+                SceneManager.sceneUnloaded -= _instance.OnSceneUnloaded;
                 LoadedScenes.Clear();
                 Cbs.Clear();
+                _instance = null;
             }
         }
 
@@ -121,7 +120,7 @@ public static async Task DoBind(List<ClassBind> cbs)
                         continue;
                     }
 
-                    cb.Active(data);
+                    await cb.Active(data);
                 }
             }
         }
diff --git a/UnityProject/Assets/Dependencies/JEngine/Core/Util/ClassBind.cs b/UnityProject/Assets/Dependencies/JEngine/Core/Util/ClassBind.cs
@@ -6,6 +6,7 @@
 using ILRuntime.CLR.Utils;
 using ILRuntime.Reflection;
 using System.Threading.Tasks;
+using JEngine.Core.DO_NOT_USE;
 using ILRuntime.CLR.TypeSystem;
 using UnityEngine.Serialization;
 using ILRuntime.Runtime.Enviorment;
@@ -443,7 +444,7 @@ void BindVal(MemberInfo mi)
         /// Active
         /// </summary>
         /// <param name="classData"></param>
-        public void Active(ClassData classData)
+        public async Task Active(ClassData classData)
         {
             string classType =
                 $"{(string.IsNullOrEmpty(classData.classNamespace) ? String.Empty : $"{classData.classNamespace}.")}{classData.className}";
@@ -458,31 +459,50 @@ public void Active(ClassData classData)
                     Log.PrintError($"自动绑定{name}出错：{classType}没有成功绑定数据，自动激活成功，但可能会抛出空异常！");
                 }
 
-                //不管是啥类型，直接invoke这个awake方法
-                var flags = BindingFlags.Default | BindingFlags.Public
-                                                 | BindingFlags.Instance | BindingFlags.FlattenHierarchy |
-                                                 BindingFlags.NonPublic | BindingFlags.Static;
-                var awakeMethod = clrInstance.GetType().GetMethod("Awake",flags);
-                if (awakeMethod == null)
+                if (classData.ClrInstance is MonoBehaviourAdapter.Adaptor mb) 
                 {
-                    awakeMethod = t.GetMethod("Awake", flags);
+                    mb.Awake();
                 }
-                else
+                else if (classData.ClrInstance is ClassBindNonMonoBehaviourAdapter.Adaptor mb2)
                 {
-                    awakeMethod.Invoke(clrInstance, null);
-                    classData.Activated = true;
+                    mb2.Awake();
                 }
-
-                if (awakeMethod == null)
+                else
                 {
-                    Log.PrintError($"{t.FullName}不包含Awake方法，无法激活，已跳过");
+                    //不管是啥类型，直接invoke这个awake方法
+                    var flags = BindingFlags.Default | BindingFlags.Public
+                                                     | BindingFlags.Instance | BindingFlags.FlattenHierarchy |
+                                                     BindingFlags.NonPublic | BindingFlags.Static;
+                    var awakeMethod = clrInstance.GetType().GetMethod("Awake",flags);
+                    if (awakeMethod == null)
+                    {
+                        awakeMethod = t.GetMethod("Awake", flags);
+                    }
+                    else
+                    {
+                        awakeMethod.Invoke(clrInstance, null);
+                        classData.Activated = true;
+                    }
+
+                    if (awakeMethod == null)
+                    {
+                        Log.PrintError($"{t.FullName}不包含Awake方法，无法激活，已跳过");
+                    }
+                    else if (!classData.Activated)
+                    {
+                        awakeMethod.Invoke(clrInstance, null);
+                    }
                 }
-                else if (!classData.Activated)
+
+                TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
+                LifeCycleMgr.Instance.AddTask(() =>
                 {
-                    awakeMethod.Invoke(clrInstance, null);
-                }
-                ((MonoBehaviour)clrInstance).enabled = true;
-                classData.Activated = true;
+
+                    ((MonoBehaviour)clrInstance).enabled = true;
+                    classData.Activated = true;
+                    tcs.SetResult(true);
+                });
+                await tcs.Task;
             }
 
             Remove();
diff --git a/UnityProject/Assets/Dependencies/JEngine/Core/Util/InitJEngine.cs b/UnityProject/Assets/Dependencies/JEngine/Core/Util/InitJEngine.cs
@@ -81,7 +81,7 @@ public async Task LoadHotUpdateCallback()
         //调用SetupGame周期
         Tools.InvokeHotMethod(HotMainType, SetupGameMethod);
         //初始化ClassBind
-        ClassBindMgr.Instantiate();
+        await ClassBindMgr.Instantiate();
         //调用RunGame周期
         Tools.InvokeHotMethod(HotMainType, RunGameMethod);
         //调用在主工程的热更代码加载完毕后的周期
diff --git a/UnityProject/Assets/Dependencies/JEngine/Editor/JEngineTools/CryptoWindow.cs b/UnityProject/Assets/Dependencies/JEngine/Editor/JEngineTools/CryptoWindow.cs
@@ -56,7 +56,7 @@ private void OnGUI()
             //文本
             Key = EditorGUILayout.TextField("Encrypt Key (加密密码)", Key);
             GUILayout.Space(30);
-            if (GUILayout.Button("Build Bundles (打包资源)"))
+            if (GUILayout.Button("Encrypt Dll (加密Dll)"))
             {
                 if (Key == null)
                 {
diff --git a/UnityProject/Assets/HotUpdateResources/Main/Dll/Hidden~/HotUpdateScripts.dll b/UnityProject/Assets/HotUpdateResources/Main/Dll/Hidden~/HotUpdateScripts.dll
diff --git a/UnityProject/Assets/HotUpdateResources/Main/Dll/Hidden~/HotUpdateScripts.pdb b/UnityProject/Assets/HotUpdateResources/Main/Dll/Hidden~/HotUpdateScripts.pdb
diff --git a/UnityProject/Assets/HotUpdateResources/Main/Dll/HotUpdateScripts.bytes b/UnityProject/Assets/HotUpdateResources/Main/Dll/HotUpdateScripts.bytes
diff --git a/UnityProject/Assets/HotUpdateResources/Main/Dll/HotUpdateScripts.pdb.bytes b/UnityProject/Assets/HotUpdateResources/Main/Dll/HotUpdateScripts.pdb.bytes
diff --git a/UnityProject/HotUpdateScripts/JEngine/Core/JBehaviour.cs b/UnityProject/HotUpdateScripts/JEngine/Core/JBehaviour.cs
@@ -221,8 +221,7 @@ private static string AddClassBind(GameObject gameObject, bool activeAfter, Type
                 activeAfter = activeAfter,
             };
             var id = ((JBehaviour)cb.AddClass(cd))._instanceID;
-            cb.Active(cd);
-            UnityEngine.Object.Destroy(cb);
+            _ = cb.Active(cd);
             return id;
         }
 
diff --git a/UnityProject/UserSettings/EditorUserSettings.asset b/UnityProject/UserSettings/EditorUserSettings.asset
@@ -9,10 +9,10 @@ EditorUserSettings:
       value: 2242470311464673021a393214224b1524120b25393a25353e663c37e6cf3a69add435ece93f70283c11fb721130082beb
       flags: 0
     RecentlyUsedScenePath-1:
-      value: 2242470311464673021a393214224b1524120b25393a25353e663032ebee7b0be1e238eca81d3e313c4cfa320d2a18
+      value: 22424703114646720307186c052d56040f
       flags: 0
     RecentlyUsedScenePath-2:
-      value: 22424703114646720307186c052d56040f
+      value: 2242470311464673021a393214224b1524120b25393a25353e663032ebee7b0be1e238eca81d3e313c4cfa320d2a18
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.jasonxudeveloper.jengine",
-  "version": "0.8.0",
+  "version": "0.8.0f1",
   "displayName": "JEngine",
   "description": "The solution that allows unity games update in runtime.",
   "license": "MIT",

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`
`32`	`32`
`33`	`33`
`34`		`-# JENGINE v0.8.0`
	`34`	`+# JENGINE v0.8.0f1`
`35`	`35`
`36`	`36`	`JEngine is an out-of-the-box framework designed for Unity developers. It encapsulates powerful functions. Beginners can also get started quickly and easily create games that can be updated in runtime.`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`
`31`	`31`
`32`	`32`
`33`		`-# JENGINE v0.8.0`
	`33`	`+# JENGINE v0.8.0f1`
`34`	`34`
`35`	`35`	`JEngine是针对Unity开发者设计的开箱即用的框架，封装了强大的功能，小白也能快速上手，轻松制作可以热更新的游戏`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,17 @@ namespace JEngine.Core`
`32`	`32`	`{`
`33`	`33`	`public partial class ClassBindMgr : MonoBehaviour`
`34`	`34`	`{`
`35`		`- public static void Instantiate()`
	`35`	`+ public static async Task Instantiate()`
`36`	`36`	`{`
`37`	`37`	`if (_instance != null)`
`38`	`38`	`return;`
`39`	`39`
`40`	`40`	`_instance = new GameObject("ClassBindMgr").AddComponent<ClassBindMgr>();`
`41`	`41`	`DontDestroyOnLoad(_instance);`
	`42`	`+ SceneManager.sceneLoaded += _instance.OnSceneLoaded;`
	`43`	`+ SceneManager.sceneUnloaded += _instance.OnSceneUnloaded;`
	`44`	`+ LoadedScenes.Add(SceneManager.GetActiveScene());`
	`45`	`+ await DoBind();`
`42`	`46`	`}`
`43`	`47`
`44`	`48`	`private static ClassBindMgr _instance;`
`@@ -51,11 +55,6 @@ private void Awake()`
`51`	`55`	`{`
`52`	`56`	`DestroyImmediate(this);`
`53`	`57`	`}`
`54`		`-`
`55`		`- SceneManager.sceneLoaded += OnSceneLoaded;`
`56`		`- SceneManager.sceneUnloaded += OnSceneUnloaded;`
`57`		`- LoadedScenes.Add(SceneManager.GetActiveScene());`
`58`		`- _ = DoBind();`
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`private void OnSceneLoaded(Scene scene, LoadSceneMode mode)`
`@@ -73,11 +72,11 @@ private void OnDestroy()`
`73`	`72`	`{`
`74`	`73`	`if (_instance == this)`
`75`	`74`	`{`
`76`		`- _instance = null;`
`77`		`- SceneManager.sceneLoaded -= OnSceneLoaded;`
`78`		`- SceneManager.sceneUnloaded -= OnSceneUnloaded;`
	`75`	`+ SceneManager.sceneLoaded -= _instance.OnSceneLoaded;`
	`76`	`+ SceneManager.sceneUnloaded -= _instance.OnSceneUnloaded;`
`79`	`77`	`LoadedScenes.Clear();`
`80`	`78`	`Cbs.Clear();`
	`79`	`+ _instance = null;`
`81`	`80`	`}`
`82`	`81`	`}`
`83`	`82`
`@@ -121,7 +120,7 @@ public static async Task DoBind(List<ClassBind> cbs)`
`121`	`120`	`continue;`
`122`	`121`	`}`
`123`	`122`
`124`		`- cb.Active(data);`
	`123`	`+ await cb.Active(data);`
`125`	`124`	`}`
`126`	`125`	`}`
`127`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ private void OnGUI()`
`56`	`56`	`//文本`
`57`	`57`	`Key = EditorGUILayout.TextField("Encrypt Key (加密密码)", Key);`
`58`	`58`	`GUILayout.Space(30);`
`59`		`- if (GUILayout.Button("Build Bundles (打包资源)"))`
	`59`	`+ if (GUILayout.Button("Encrypt Dll (加密Dll)"))`
`60`	`60`	`{`
`61`	`61`	`if (Key == null)`
`62`	`62`	`{`