Merge pull request #332 from JasonXuDeveloper/development

fixed JPrefab bug
JasonXuDeveloper · May 23, 2022 · c04dc66 · c04dc66
2 parents 7d0ffe0 + ea3db7a
commit c04dc66
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/UnityProject/Assets/HotUpdateResources/Dll/Hidden~/HotUpdateScripts.dll b/UnityProject/Assets/HotUpdateResources/Dll/Hidden~/HotUpdateScripts.dll
diff --git a/UnityProject/Assets/HotUpdateResources/Dll/Hidden~/HotUpdateScripts.pdb b/UnityProject/Assets/HotUpdateResources/Dll/Hidden~/HotUpdateScripts.pdb
diff --git a/UnityProject/HotUpdateScripts/JEngine/Core/JPrefab.cs b/UnityProject/HotUpdateScripts/JEngine/Core/JPrefab.cs
@@ -78,12 +78,12 @@ private JPrefab(string path, string package, bool async, Action<bool, JPrefab> c
             }
             if (async)
             {
-                _ = LoadPrefabAsync(path, complete);
+                LoadPrefabAsync(path, package, complete).Coroutine();
             }
             else
             {
-                var obj = AssetMgr.Load(path);
-                Instance = obj != null ? obj as GameObject : null;
+                var obj = AssetMgr.Load<GameObject>(path, package);
+                Instance = obj;
                 Loaded = true;
             }
             this.path = path;
@@ -95,17 +95,18 @@ private JPrefab(string path, string package, bool async, Action<bool, JPrefab> c
         /// </summary>
         public async Task WaitForAsyncLoading()
         {
-            while(!Loaded)
+            await Task.Delay(1);
+            while (!Loaded && !Error)
             {
                 await Task.Delay(1);
             }
         }
 
 
-        private async Task LoadPrefabAsync(string path, Action<bool, JPrefab> callback)
+        private async ET.ETTask LoadPrefabAsync(string path, string package, Action<bool, JPrefab> callback)
         {
-            var obj = await AssetMgr.LoadAsync(path);
-            Instance = obj != null ? obj as GameObject : null;
+            var obj = await AssetMgr.LoadAsync<GameObject>(path, package);
+            Instance = obj;
             Loaded = true;
             callback?.Invoke(!Error, this);
         }