@zhongguo168a/yxeditor-common 0.0.28 → 0.0.30

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import { HorizontalTextAlignment, VerticalTextAlignment, Scheduler, macro, director, math, instantiate, SpriteAtlas, Size, Vec2, Rect, SpriteFrame, path, assetManager, ImageAsset, JsonAsset, TextAsset, Asset, Texture2D, find, Canvas, Node, Vec3, Vec4, resources, UITransform, Widget } from 'cc';
+import { HorizontalTextAlignment, VerticalTextAlignment, director, macro, Scheduler, math, instantiate, SpriteAtlas, Size, Vec2, Rect, SpriteFrame, path, assetManager, ImageAsset, JsonAsset, TextAsset, Asset, Texture2D, find, Canvas, Node, Vec3, Vec4, resources, UITransform, Widget } from 'cc';
 
 class NetUtil {
     // 获取URL的参数对象
@@ -360,8 +360,7 @@ class Timer {
         return this._scheduler;
     }
     constructor() {
-        this._scheduler = new Scheduler();
-        Scheduler.enableForTarget(this._scheduler);
+        this._scheduler = director.getScheduler();
     }
     /**
      * 定时执行一次。
@@ -3963,20 +3962,24 @@ class ViewController extends Controller {
         view.state = ViewState.Opening;
         view.dispatch(ViewEvent.Opening);
         //
-        // try {
-        viewrepo.push(view);
-        this.onOpening(view);
-        // @ts-ignore
-        if (!view._waitOpenComplete) {
-            // 没有被打断，打开完成
-            this.openComplete(view);
-        }
-        // } catch (e) {
-        //     console.error(`open view ${view.route.key}`)
-        //     console.error(e.stack);
-        //     //
-        //     this.closeView(view);
-        // }
+        try {
+            viewrepo.push(view);
+            this.onOpening(view);
+            // @ts-ignore
+            if (!view._waitOpenComplete) {
+                // 没有被打断，打开完成
+                this.openComplete(view);
+            }
+            else {
+                // 被打断了，等待完成1
+            }
+        }
+        catch (e) {
+            console.error(`open view ${view.route.key}`);
+            console.error(e.stack);
+            //
+            this.closeView(view);
+        }
     }
     openComplete(view) {
         if (!view) {