keytops-game-framework 1.0.17 → 1.0.19

package/dist/app/module/view/ViewManager.d.ts

@@ -16,6 +16,7 @@ export type ViewAnalyticsInfo = {
     name: string;
     group?: string;
 };
+export type TouchLockToken = symbol;
 /**
  * 视图管理类
  */
@@ -28,6 +29,7 @@ export declare class ViewManager {
     private _currentStack;
     private _viewCache;
     private _currentMaskView;
+    private _touchLocks;
     private _viewEvent;
     private static created;
     /**
@@ -94,16 +96,21 @@ export declare class ViewManager {
     scene<T extends IScene>(): T;
     /**
      * 开启当前场景的可交互性
+     * @param token closeTouch返回的触摸锁令牌。传入时仅释放该锁，所有锁释放后才会真正开启触摸；不传则清空全部触摸锁并开启触摸。
      */
-    openTouch(): void;
+    openTouch(token?: TouchLockToken): void;
     /**
      * 关闭当前场景的可交互性
      * @param maskViewConfig 可选参数，默认为空白，要显示的遮罩试图。
      * @param delay 可选参数，默认200毫秒，显示maskView的延迟时间。
+     * @returns 当前触摸锁令牌，可传给openTouch精确释放本次锁。
      */
     closeTouch(maskViewConfig?: {
         prototype: IView;
-    } | ViewConfig | string, delay?: number): Promise<void>;
+    } | ViewConfig | string, delay?: number): Promise<TouchLockToken>;
+    private _lockTouch;
+    private _applyTouchState;
+    private _showMaskView;
     /**
      * 当前主视图
      * @returns
@@ -136,6 +143,7 @@ export declare class ViewManager {
     } | ViewConfig | string, parent?: IView, ...datas: any[]): Promise<T>;
     private _addView;
     private _addViewbyConfig;
+    private _loadViewByConfig;
     /**
      * 加载视图到内存，之后还需要调用loader.initView接口获取view
      * @param config 要加载的视图配置|Class|名称

package/dist/index.js

@@ -6912,6 +6912,7 @@ class ViewManager {
         this._viewAnalyticsMap = new Map();
         this._currentStack = [];
         this._viewCache = new Map();
+        this._touchLocks = new Set();
         if (ViewManager.created) {
             throw new Error("ViewManager 是单例");
         }
@@ -6965,36 +6966,80 @@ class ViewManager {
     }
     /**
      * 开启当前场景的可交互性
+     * @param token closeTouch返回的触摸锁令牌。传入时仅释放该锁，所有锁释放后才会真正开启触摸；不传则清空全部触摸锁并开启触摸。
      */
-    openTouch() {
-        timer.clear(this, this.closeTouch);
-        if (this._currentMaskView) {
-            this._currentMaskView.removeFromParent(true);
-            this._currentMaskView = null;
+    openTouch(token) {
+        if (token) {
+            this._touchLocks.delete(token);
         }
-        if (this._scene) {
-            this._scene.touchEnabled = true;
+        else {
+            this._touchLocks.clear();
         }
+        this._applyTouchState();
     }
     /**
      * 关闭当前场景的可交互性
      * @param maskViewConfig 可选参数，默认为空白，要显示的遮罩试图。
      * @param delay 可选参数，默认200毫秒，显示maskView的延迟时间。
+     * @returns 当前触摸锁令牌，可传给openTouch精确释放本次锁。
      */
     closeTouch(maskViewConfig = null, delay = 200) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this._scene || !this._scene.touchEnabled) {
-                return;
+            const token = this._lockTouch();
+            let config = maskViewConfig && this._getViewConfig(maskViewConfig);
+            if (!config) {
+                return token;
+            }
+            if (delay <= 0) {
+                yield this._showMaskView(config, token);
+                return token;
+            }
+            timer.once(delay, this, this._showMaskView, [config, token]);
+            return token;
+        });
+    }
+    _lockTouch() {
+        const token = Symbol("touch-lock");
+        this._touchLocks.add(token);
+        this._applyTouchState();
+        return token;
+    }
+    _applyTouchState() {
+        const locked = this._touchLocks.size > 0;
+        if (!locked) {
+            timer.clear(this, this._showMaskView);
+            if (this._currentMaskView) {
+                this._currentMaskView.removeFromParent(true);
+                this._currentMaskView = null;
             }
-            this._scene.touchEnabled = false;
-            if (!maskViewConfig || !this._getViewConfig(maskViewConfig)) {
+        }
+        if (this._scene) {
+            this._scene.touchEnabled = !locked;
+        }
+    }
+    _showMaskView(maskViewConfig, token) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this._scene || !this._touchLocks.has(token) || this._currentMaskView) {
                 return;
             }
-            if (delay <= 0) {
-                this._currentMaskView = yield this.addView(maskViewConfig, this._scene);
+            let view = this.getCacheView(maskViewConfig);
+            if (view) {
+                view = yield this._addView(view, this._scene);
+            }
+            else {
+                view = yield this._loadViewByConfig(maskViewConfig, this._scene, "显示遮罩视图错误");
+                this.cacheView(view);
+            }
+            if (!this._touchLocks.has(token)) {
+                view.removeFromParent(true);
                 return;
             }
-            timer.once(delay, this, this.closeTouch, [maskViewConfig, 0]);
+            this._currentMaskView = view;
+            timer.frameNext(this, () => {
+                if (this._currentMaskView == view && this._touchLocks.has(token)) {
+                    view.setData();
+                }
+            });
         });
     }
     /**
@@ -7061,12 +7106,13 @@ class ViewManager {
     }
     _switchViewByConfig(viewConfig, ...datas) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.closeTouch();
+            const touchToken = this._lockTouch();
             let loader;
             try {
                 loader = yield this.loadView(viewConfig);
             }
             catch (error) {
+                this.openTouch(touchToken);
                 console.error(`切换视图错误 code:${error.code}, msg:${error.msg || error.message}`);
                 throw new Error(`切换视图错误 code:${error.code}, msg:${error.msg || error.message}`);
             }
@@ -7085,7 +7131,7 @@ class ViewManager {
                 this._scene.addView(view, viewConfig.zIndex);
             }
             timer.frameNext(this, () => {
-                this.openTouch();
+                this.openTouch(touchToken);
                 view.setData(...datas);
             });
             return view;
@@ -7124,14 +7170,31 @@ class ViewManager {
     }
     _addViewbyConfig(config, parent, ...datas) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.closeTouch();
+            const touchToken = this._lockTouch();
+            let view;
+            try {
+                view = yield this._loadViewByConfig(config, parent, "添加视图错误");
+            }
+            catch (error) {
+                this.openTouch(touchToken);
+                throw error;
+            }
+            timer.frameNext(this, () => {
+                this.openTouch(touchToken);
+                view.setData(...datas);
+            });
+            return view;
+        });
+    }
+    _loadViewByConfig(config, parent, errorPrefix) {
+        return __awaiter(this, void 0, void 0, function* () {
             let loader;
             try {
                 loader = yield this.loadView(config);
             }
             catch (error) {
-                console.error(`添加视图错误 code:${error.code}, msg:${error.msg}`);
-                throw new Error(`添加视图错误 code:${error.code}, msg:${error.msg}`);
+                console.error(`${errorPrefix} code:${error.code}, msg:${error.msg || error.message}`);
+                throw new Error(`${errorPrefix} code:${error.code}, msg:${error.msg || error.message}`);
             }
             let name = config.name || config.path.substring(config.path.lastIndexOf("/") + 1);
             let view = loader.initView(name, true);
@@ -7139,10 +7202,6 @@ class ViewManager {
             view.config = config;
             view.analyticsInfo = this._viewAnalyticsMap.get(config.name);
             parent.addView(view, config.zIndex);
-            timer.frameNext(this, () => {
-                this.openTouch();
-                view.setData(...datas);
-            });
             return view;
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keytops-game-framework",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "cocos creator game framework library",
   "main": "./dist/index.js",
   "module": "./dist/index.js",