drgame-cc 1.0.46 → 1.0.47

package/drscript/focus/FocusManager.ts

@@ -31,8 +31,8 @@ export default class FocusManager {
     private static itemMap: { [uuid: string]: FocusRuntimeItem } = {};
     private static scopeMap: { [uuid: string]: string } = {};
     private static currentNodeUuid: string = "";
-    private static scopes: ScopeInfo[] = [{ scopeId: "page", lastNodeUuid: "" }];
-    private static activeScopeId: string = "page";
+    private static scopes: ScopeInfo[] = [];
+    private static activeScopeId: string = "";
     private static listeners: FocusListener[] = [];
 
     private static readonly DEFAULT_FOCUS_SCALE = 1.08;
@@ -46,7 +46,7 @@ export default class FocusManager {
         let uuid = node.uuid;
         this.getNodeBaseScale(node);
 
-        let scopeId = options.scopeId || (component && component.scopeId) || this.activeScopeId || "page";
+        let scopeId = options.scopeId || (component && component.scopeId) || this.activeScopeId;
         this.scopeMap[uuid] = scopeId;
 
         let item: FocusRuntimeItem = {
@@ -127,7 +127,7 @@ export default class FocusManager {
         }
         this.scopes.push({ scopeId, lastNodeUuid: "", node: options?.node, nodeType: options?.nodeType, onBack: options?.onBack });
         this.activeScopeId = scopeId;
-        this.setFocusByUuid("", true);
+        this.clearFocus();
         if (!options?.skipEnsureFocus) this.ensureFocus();
     }
 
@@ -154,17 +154,17 @@ export default class FocusManager {
             }
         }
         let active = this.scopes[this.scopes.length - 1];
-        this.activeScopeId = active ? active.scopeId : "page";
+        this.activeScopeId = active ? active.scopeId : "";
         let restored = active && active.lastNodeUuid ? this.focus(active.lastNodeUuid) : false;
         if (!restored) {
-            this.setFocusByUuid("", true);
+            this.clearFocus();
             this.ensureFocus();
         }
     }
 
-    /** 获取最顶层绑定了节点的作用域（排除 page） */
+    /** 获取最顶层绑定了节点的作用域 */
     public static getTopNodeScope(): ScopeInfo | null {
-        for (let i = this.scopes.length - 1; i >= 1; i--) {
+        for (let i = this.scopes.length - 1; i >= 0; i--) {
             if (this.scopes[i].node) return this.scopes[i];
         }
         return null;
@@ -182,27 +182,38 @@ export default class FocusManager {
         this.itemMap = {};
         this.scopeMap = {};
         this.currentNodeUuid = "";
-        this.scopes = [{ scopeId: "page", lastNodeUuid: "" }];
-        this.activeScopeId = "page";
+        this.scopes = [];
+        this.activeScopeId = "";
         this.emitFocusChanged(null, old);
     }
 
-    public static focus(target: string | cc.Node): boolean {
+    public static focus(target: string | cc.Node, silent: boolean = false): boolean {
         this.cleanup();
         if (!target) return false;
-        let item: FocusRuntimeItem | null = null;
-        if (typeof target == "string") {
-            item = this.itemMap[target];
-        } else {
-            for (let i = 0; i < this.items.length; i++) {
-                if (this.items[i].node == target) {
-                    item = this.items[i];
-                    break;
-                }
+        let uuid = typeof target == "string" ? target : target.uuid;
+        let item = this.itemMap[uuid];
+        if (!item || !this.isItemActive(item) || !this.isInActiveScope(item)) return false;
+
+        let previous: FocusRuntimeItem | null = this.getCurrentFocusItem();
+        if (uuid == this.currentNodeUuid && uuid) {
+            let current = this.getCurrentFocusItem();
+            if (current) {
+                this.setFocusVisual(current, true);
+                // 总是触发位置更新，即使静默模式也要更新视觉位置
+                this.emitFocusChanged(current, previous || current);
             }
+            return true;
         }
-        if (!item || !this.isItemActive(item) || !this.isInActiveScope(item)) return false;
-        this.setFocusByUuid(item.node.uuid);
+        if (previous) this.setFocusVisual(previous, false);
+        this.currentNodeUuid = uuid || "";
+        let current: FocusRuntimeItem | null = this.getCurrentFocusItem();
+        if (current) {
+            let scope = this.getActiveScope();
+            if (scope) scope.lastNodeUuid = current.node.uuid;
+            this.setFocusVisual(current, true);
+        }
+        // 总是触发位置更新，确保视觉层收到通知
+        this.emitFocusChanged(current, previous);
         return true;
     }
 
@@ -237,7 +248,7 @@ export default class FocusManager {
         }
 
         if (best) {
-            this.setFocusByUuid(best.node.uuid);
+            this.focus(best.node.uuid);
             return true;
         }
         return this.moveByOrder(direction == "left" || direction == "down" ? -1 : 1);
@@ -275,26 +286,11 @@ export default class FocusManager {
         if (index >= 0) this.listeners.splice(index, 1);
     }
 
-    private static setFocusByUuid(uuid: string, silent: boolean = false) {
-        if (uuid == this.currentNodeUuid && uuid) {
-            let current = this.getCurrentFocusItem();
-            if (current && !silent) {
-                this.setFocusVisual(current, true);
-                this.emitFocusChanged(current, current);
-            }
-            return;
-        }
+    public static clearFocus() {
         let previous: FocusRuntimeItem | null = this.getCurrentFocusItem();
         if (previous) this.setFocusVisual(previous, false);
-        this.currentNodeUuid = uuid || "";
-        let current: FocusRuntimeItem | null = this.getCurrentFocusItem();
-        if (current) {
-            let scope = this.getActiveScope();
-            if (scope) scope.lastNodeUuid = current.node.uuid;
-            this.setFocusVisual(current, true);
-        }
-        if (!silent) this.emitFocusChanged(current, previous);
-        if (silent && previous) this.emitFocusChanged(null, previous);
+        this.currentNodeUuid = "";
+        if (previous) this.emitFocusChanged(null, previous);
     }
 
     private static setFocusVisual(item: FocusRuntimeItem, focused: boolean, immediate: boolean = false) {
@@ -326,7 +322,8 @@ export default class FocusManager {
         if (spriteFrame) sprite.spriteFrame = spriteFrame;
     }
 
-    private static _ensureFocusPending: boolean = false;
+    private static _ensureFocusRetry: number = 0;
+    private static readonly _ENSURE_FOCUS_MAX_RETRY = 3;
 
     private static ensureFocus() {
         this.cleanup();
@@ -336,23 +333,23 @@ export default class FocusManager {
         for (let i = 0; i < this.items.length; i++) {
             let item = this.items[i];
             if (this.isItemActive(item) && this.isInActiveScope(item)) {
-                this.setFocusByUuid(item.node.uuid);
+                this.focus(item.node.uuid);
+                this._ensureFocusRetry = 0;
                 return;
             }
         }
         // 有注册的按钮但暂无活跃节点，可能是节点尚未完全初始化，延迟重试
-        if (this.items.length > 0 && !this._ensureFocusPending) {
-            this._ensureFocusPending = true;
+        if (this.items.length > 0 && this._ensureFocusRetry < this._ENSURE_FOCUS_MAX_RETRY) {
+            this._ensureFocusRetry++;
             setTimeout(() => {
-                this._ensureFocusPending = false;
                 this.ensureFocus();
             }, 50);
+            return;
         }
-        // 既无注册项也无焦点，清除焦点状态
-        if (this.items.length === 0) {
-            this.currentNodeUuid = "";
-            this.emitFocusChanged(null, null);
-        }
+        // 超过重试次数/无注册项，清除焦点状态
+        this._ensureFocusRetry = 0;
+        this.currentNodeUuid = "";
+        this.emitFocusChanged(null, null);
     }
 
     private static moveByOrder(step: number): boolean {
@@ -369,7 +366,7 @@ export default class FocusManager {
             }
         }
         let next = (index + step + activeItems.length) % activeItems.length;
-        this.setFocusByUuid(activeItems[next].node.uuid);
+        this.focus(activeItems[next].node.uuid);
         return true;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drgame-cc",
-  "version": "1.0.46",
+  "version": "1.0.47",
   "description": "道然游戏适配包",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",