Merge branch 'development'

merge

Author: JasonXuDeveloper

UnityProject/Assets/Dependencies/JEngine/Core/ILRuntimeHelper/Adapters/MonoBehaviourAdapter.cs

@@ -180,6 +180,7 @@ void OnEnable()
             {
                 Awake();
                 LifeCycleMgr.Instance.ExecuteOnceTask();
+                _skipEnable = false;
                 return;
             }
             if (_skipEnable)

UnityProject/Assets/Dependencies/JEngine/Core/Manager/LifeCycleMgr.cs

@@ -204,16 +204,6 @@ private void OnDestroy()
         /// </summary>
         private readonly List<IntPtr> _onceTaskItems = new List<IntPtr>(100);
 
-        /// <summary>
-        /// no gc search for awake objs
-        /// </summary>
-        private readonly HashSet<IntPtr> _awakeObjs = new HashSet<IntPtr>();
-
-        /// <summary>
-        /// no gc search for start objs
-        /// </summary>
-        private readonly HashSet<IntPtr> _startObjs = new HashSet<IntPtr>();
-
         /// <summary>
         /// Create lifecycle item
         /// </summary>
@@ -248,7 +238,6 @@ public void AddAwakeItem<T>(T instance, MethodInfo method) where T : class
             _awakeItems.Add(GetLifeCycleItem(in ptr, in address,
                 () => method?.Invoke(instance, ConstMgr.NullObjects),
                 () => true));
-            _awakeObjs.Add((IntPtr)ptr);
         }
 
         /// <summary>
@@ -262,7 +251,6 @@ public void AddStartItem<T>(T instance, MethodInfo method) where T : class
             _startItems.Add(GetLifeCycleItem(in ptr, in address,
                 () => method?.Invoke(instance, ConstMgr.NullObjects),
                 () => true));
-            _startObjs.Add((IntPtr)ptr);
         }
 
         /// <summary>
@@ -287,7 +275,8 @@ public void AddUpdateItem(object instance, MethodInfo method)
         /// <param name="method"></param>
         /// <param name="parent"></param>
         /// <param name="cond"></param>
-        public void AddUpdateItem<T>(T instance, MethodInfo method, GameObject parent, Func<bool> cond = null) where T : class
+        public void AddUpdateItem<T>(T instance, MethodInfo method, GameObject parent, Func<bool> cond = null)
+            where T : class
         {
             void* ptr = UnsafeUtility.PinGCObjectAndGetAddress(instance, out var address);
             _updateItems.Add(GetLifeCycleItem(in ptr, in address,
@@ -362,11 +351,12 @@ public void AddLateUpdateItem(object instance, MethodInfo method)
         /// <param name="method"></param>
         /// <param name="parent"></param>
         /// <param name="cond"></param>
-        public void AddLateUpdateItem<T>(T instance, MethodInfo method, GameObject parent, Func<bool> cond = null) where T : class
+        public void AddLateUpdateItem<T>(T instance, MethodInfo method, GameObject parent, Func<bool> cond = null)
+            where T : class
         {
             void* ptr = UnsafeUtility.PinGCObjectAndGetAddress(instance, out var address);
             _lateUpdateItems.Add(GetLifeCycleItem(in ptr, in address,
-                () => method?.Invoke(instance, ConstMgr.NullObjects), 
+                () => method?.Invoke(instance, ConstMgr.NullObjects),
                 () => cond == null ? parent.activeInHierarchy : parent.activeInHierarchy && cond.Invoke()));
         }
 
@@ -408,11 +398,12 @@ public void AddFixedUpdateItem(object instance, MethodInfo method)
         /// <param name="method"></param>
         /// <param name="parent"></param>
         /// <param name="cond"></param>
-        public void AddFixedUpdateItem<T>(T instance, MethodInfo method, GameObject parent, Func<bool> cond = null) where T : class
+        public void AddFixedUpdateItem<T>(T instance, MethodInfo method, GameObject parent, Func<bool> cond = null)
+            where T : class
         {
             void* ptr = UnsafeUtility.PinGCObjectAndGetAddress(instance, out var address);
             _fixedUpdateItems.Add(GetLifeCycleItem(in ptr, in address,
-                () => method?.Invoke(instance, ConstMgr.NullObjects), 
+                () => method?.Invoke(instance, ConstMgr.NullObjects),
                 () => cond == null ? parent.activeInHierarchy : parent.activeInHierarchy && cond.Invoke()));
         }
 
@@ -626,22 +617,10 @@ private bool InstancesContains(in LifeCycleItem* item)
         /// <returns></returns>
         private bool IgnoreWithInInstances(in LifeCycleItem* item)
         {
-            return _awakeObjs.Contains(item->InstancePtr)
-                   || _startObjs.Contains(item->InstancePtr);
+            return _awakeItems.Contains((IntPtr)item)
+                   || _startItems.Contains((IntPtr)item);
         }
 
-        /// <summary>
-        /// remove obj from instances
-        /// </summary>
-        /// <param name="ptr"></param>
-        /// <returns></returns>
-        private bool RemoveInstanceIfContains(IntPtr ptr) => _instances.Contains(ptr);
-
-        /// <summary>
-        /// remove obj from instances
-        /// </summary>
-        private Predicate<IntPtr> RemoveInstanceIfContainsPredicate => RemoveInstanceIfContains;
-
         /// <summary>
         /// execute once task
         /// </summary>
@@ -709,9 +688,6 @@ private void LateUpdate()
                 }
 
                 ExecuteItems(_awakeItems);
-
-                //清理
-                _awakeObjs.RemoveWhere(RemoveInstanceIfContainsPredicate);
             }
 
             //如果有start
@@ -720,9 +696,6 @@ private void LateUpdate()
                 //确保本帧没处理过这些对象
                 if (_instances.Count > 0)
                 {
-                    //调用start，并记录本帧处理的对象
-                    ExecuteItems(_startItems, true, InstancesContains);
-
                     cnt = _startItems.Count;
                     for (i = 0; i < cnt; i++)
                     {
@@ -732,22 +705,22 @@ private void LateUpdate()
                             _instances.Add(item->InstancePtr);
                         }
                     }
+
+                    //调用start，并记录本帧处理的对象
+                    ExecuteItems(_startItems, true, InstancesContains);
                 }
                 else
                 {
-                    ExecuteItems(_startItems);
-
                     //调用start，并记录本帧处理的对象
                     cnt = _startItems.Count;
                     for (i = 0; i < cnt; i++)
                     {
                         item = (LifeCycleItem*)_startItems[i];
                         _instances.Add(item->InstancePtr);
                     }
-                }
 
-                //清理
-                _startObjs.RemoveWhere(RemoveInstanceIfContainsPredicate);
+                    ExecuteItems(_startItems);
+                }
             }
 
             //处理late update

UnityProject/Assets/Dependencies/JEngine/Editor/JEngineTools/EditorUpdates/ChangeScene.cs

@@ -31,10 +31,13 @@ private static async void DoChange()
                     if (!Application.isPlaying) return;
                     await Task.Delay(10);
                 }
+
                 DynamicGI.UpdateEnvironment();
             }
 
-            var key = Object.FindObjectOfType<InitJEngine>().key;
+            var initJEngine = GameObject.Find("InitJEngine");
+            var comp = initJEngine.GetComponent<InitJEngine>();
+            var key = comp.key;
             var k = PlayerPrefs.GetString($"{prefix}.EncryptPassword", "");
             if (string.IsNullOrEmpty(k))
             {
@@ -50,7 +53,7 @@ private static async void DoChange()
                         Setting.GetString(SettingString.Ok), Setting.GetString(SettingString.Ignore));
                     if (res)
                     {
-                        Object.FindObjectOfType<InitJEngine>().key = k;
+                        comp.key = k;
                     }
                 }
             }

UnityProject/Assets/Dependencies/JEngine/Templates/MonoAdapter.txt

@@ -74,6 +74,7 @@
                 {
                     Awake();
                     LifeCycleMgr.Instance.ExecuteOnceTask();
+                    _skipEnable = false;
                     return;
                 }
                 if (_skipEnable)