drgame-cc 1.0.49 → 1.0.52

package/drscript/focus/FocusVisualLayer.ts

@@ -1,7 +1,5 @@
 import { FingerStyle } from "../Define";
-import FocusManager, { FocusRuntimeItem } from "./FocusManager";
-
-const { ccclass } = cc._decorator;
+import { FocusRuntimeItem } from "./FocusManager";
 
 const FOCUS_STYLE_MAP: { [key: string]: string } = {
     [FingerStyle.Default]: "focus_1",
@@ -10,140 +8,172 @@ const FOCUS_STYLE_MAP: { [key: string]: string } = {
     [FingerStyle.Blue]: "focus_4",
 };
 
-@ccclass
-export default class FocusVisualLayer extends cc.Component {
-    private static _style: FingerStyle = FingerStyle.Default;
-    private static _focusZIndex: number = 800;
-
-    public static get style(): FingerStyle {
-        return FocusVisualLayer._style;
-    }
-
-    public static setStyle(style: FingerStyle) {
-        FocusVisualLayer._style = style;
-    }
-
-    public static setFocusZIndex(z: number) {
-        FocusVisualLayer._focusZIndex = z;
-    }
+const CURSOR_SCALE = 1.5;
+const MAX_RETRY = 3;
 
+export default class FocusVisualLayer {
+    private node: cc.Node;
     private spineNode: cc.Node | null = null;
     private spine: sp.Skeleton | null = null;
-    private currentItem: FocusRuntimeItem | null = null;
-    private inited: boolean = false;
     private spineLoaded: boolean = false;
-    private static _focusEnabled: boolean = true;
-
-    public static create(parent: cc.Node): FocusVisualLayer {
-        let node = parent.getChildByName("FocusVisualLayer");
-        if (!node) {
-            node = new cc.Node("FocusVisualLayer");
-            parent.addChild(node, FocusVisualLayer._focusZIndex);
-            cc.game?.addPersistRootNode?.(node);
-        }
-        let layer = node.getComponent(FocusVisualLayer);
-        if (!layer) layer = node.addComponent(FocusVisualLayer);
-        layer.init();
-        return layer;
-    }
+    private style: FingerStyle;
+    private lastItem: FocusRuntimeItem | null = null;
+    private retryCount: number = 0;
+    /** 是否已标记为销毁 */
+    private _disposed: boolean = false;
+
+    constructor(parent: cc.Node, options?: { style?: FingerStyle; zIndex?: number }) {
+        this.style = options?.style ?? FingerStyle.Default;
+        this.node = new cc.Node("FocusVisualLayer");
+
+        // anchor 设为 (0,0)，position 为 (0,0)，使本地坐标与"左下角原点"的世界坐标对齐
+        this.node.anchorX = 0;
+        this.node.anchorY = 0;
+        this.node.setPosition(0, 0);
+        parent.addChild(this.node, options?.zIndex ?? 800);
 
-    onDestroy() {
-        FocusManager.offFocusChanged(this.onFocusChanged);
+        this.buildView();
+        this.loadSpine();
     }
 
-    public init() {
-        if (this.inited) return;
-        this.inited = true;
-        this.node.zIndex = FocusVisualLayer._focusZIndex;
-        this.resizeToParent();
-        this.buildView();
+    setStyle(style: FingerStyle) {
+        this.style = style;
+        this.spineLoaded = false;
+        this.retryCount = 0;
         this.loadSpine();
-        FocusManager.onFocusChanged(this.onFocusChanged);
-        this.refresh(FocusManager.getCurrentFocusItem());
     }
 
-    private onFocusChanged = (item: FocusRuntimeItem | null) => {
-        this.refresh(item);
+    setZIndex(z: number) {
+        this.node.zIndex = z;
     }
 
-    private buildView() {
-        if (!this.spineNode) {
-            this.spineNode = new cc.Node("FocusSpine");
-            this.spineNode.zIndex = 2;
-            this.spine = this.spineNode.addComponent(sp.Skeleton);
-            this.spine.premultipliedAlpha = false;
-            this.node.addChild(this.spineNode);
-            this.spineNode.active = false;
+    dispose() {
+        this._disposed = true;
+        if (this.node && this.node.parent) {
+            this.node.removeFromParent(true);
         }
+    }
+
+    onFocusChanged(item: FocusRuntimeItem | null) {
+        this.lastItem = item;
+        if (!item || item.showCursor === false) {
+            this.hide();
+            return;
+        }
+        // 不管 spine 是否加载完成，都尝试更新位置
+        this.node.active = true;
+        this.updatePosition(item);
+    }
+
+    private buildView() {
+        this.spineNode = new cc.Node("FocusSpine");
+        this.spineNode.zIndex = 2;
+        // anchor 设为 (0.5, 0.5)，以手指中心定位
+        this.spineNode.anchorX = 0.5;
+        this.spineNode.anchorY = 0.5;
+        this.spine = this.spineNode.addComponent(sp.Skeleton);
+        this.spine.premultipliedAlpha = false;
+        this.spine.defaultSkin = "default";
+        this.node.addChild(this.spineNode);
+        this.spineNode.active = false;
         this.node.active = false;
     }
 
     private getFocusPath(): string {
-        let folder = FOCUS_STYLE_MAP[FocusVisualLayer._style] || "focus_1";
+        let folder = FOCUS_STYLE_MAP[this.style] || "focus_1";
         return `drres/focus/${folder}/gesture`;
     }
 
     private loadSpine() {
         let path = this.getFocusPath();
         cc.loader.loadRes(path, sp.SkeletonData, (error: Error, spData: sp.SkeletonData) => {
+            if (this._disposed) return;
+
             if (error || !this.spine) {
-                console.warn("[FocusVisualLayer] Load spine failed:", error);
+                console.warn("[FocusVisualLayer] Load spine failed:", error ? error.message : "spine component is null");
+                if (this.retryCount < MAX_RETRY) {
+                    this.retryCount++;
+                    console.warn(`[FocusVisualLayer] Retry ${this.retryCount}/${MAX_RETRY}...`);
+                    setTimeout(() => this.loadSpine(), 500);
+                } else {
+                    console.error(`[FocusVisualLayer] Spine load exhausted retries, path=${path}`);
+                }
                 return;
             }
             this.spine.skeletonData = spData;
             this.spineLoaded = true;
-            if (this.currentItem) {
-                this.refresh(this.currentItem);
+            this.retryCount = 0;
+
+            // Spine 加载完成后，如果有待处理的焦点，重新定位
+            if (this.lastItem && this.lastItem.showCursor !== false) {
+                this.node.active = true;
+                this.updatePosition(this.lastItem);
             }
         });
     }
 
-    private refresh(item: FocusRuntimeItem | null) {
-        this.currentItem = item;
-        if (!item || item.showCursor === false) {
-            this.hide();
-            return;
-        }
-        if (!FocusVisualLayer._focusEnabled) {
-            this.hide();
-            return;
-        }
-        this.node.active = true;
-        this.updatePosition(item);
-    }
-
-    private hide() {
+    hide() {
         this.node.active = false;
-        this.currentItem = null;
         if (this.spineNode) this.spineNode.active = false;
     }
 
-    private static readonly CURSOR_SCALE: number = 1.5;
-
     private updatePosition(item: FocusRuntimeItem) {
-        if (!item || !item.node || !item.node.isValid || !item.node.activeInHierarchy) {
+        if (!item || !item.node || !item.node.isValid) {
             this.hide();
             return;
         }
+
+        // spine 未加载完成，记录 lastItem，等加载完成后再定位
         if (!this.spineLoaded || !this.spine || !this.spineNode) {
+            if (this.spineNode) this.spineNode.active = false;
             return;
         }
-        this.resizeToParent();
-        let box = item.node.getBoundingBoxToWorld();
-        let bottomRight = cc.v2(box.x + box.width / 2 + 20, box.y + box.height / 2 - 20);
-        let local = this.node.convertToNodeSpaceAR(bottomRight);
-
-        this.spineNode.setPosition(local);
-        this.spineNode.setScale(FocusVisualLayer.CURSOR_SCALE);
-        this.spineNode.active = true;
-        this.spine.setAnimation(0, "gesture", true);
-    }
 
-    private resizeToParent() {
-        let parent = this.node.parent;
-        let width = parent && parent.width ? parent.width : (cc.winSize && cc.winSize.width) || 1920;
-        let height = parent && parent.height ? parent.height : (cc.winSize && cc.winSize.height) || 1080;
-        this.node.setContentSize(width, height);
-        this.node.setPosition(0, 0);
+        try {
+            let box = item.node.getBoundingBoxToWorld();
+            let bottomRight = cc.v2(box.x + box.width / 2 + 20, box.y + box.height / 2 - 20);
+            let local = this.node.convertToNodeSpaceAR(bottomRight);
+
+            this.spineNode.setPosition(local);
+            this.spineNode.setScale(CURSOR_SCALE);
+            this.spineNode.active = true;
+            this.spine.setAnimation(0, "gesture", true);
+            // // 获取焦点项的世界坐标位置: 用 getPosition 替代 getBoundingBoxToWorld
+            // // getBoundingBoxToWorld 在 scale 动画过程中可能返回不稳定的值
+            // let worldPos = item.node.convertToWorldSpaceAR(cc.v2(0, 0));
+            // let size = item.node.getContentSize();
+
+            // // 如果内容尺寸为 0，尝试从 Sprite/Button 获取尺寸
+            // if (size.width <= 0 || size.height <= 0) {
+            //     let sprite = item.node.getComponent(cc.Sprite);
+            //     if (sprite && sprite.spriteFrame) {
+            //         let rect = sprite.spriteFrame.getRect();
+            //         size = cc.size(rect.width, rect.height);
+            //     } else {
+            //         // 兜底：使用节点 scale 后的默认尺寸
+            //         size = cc.size(100, 60);
+            //     }
+            // }
+
+            // // 按实际 scale 缩放尺寸
+            // let scaleX = item.node.scaleX;
+            // let scaleY = item.node.scaleY;
+            // let w = size.width * Math.abs(scaleX || 1);
+            // let h = size.height * Math.abs(scaleY || 1);
+
+            // // 定位在焦点项的右上方（固定偏移 40px）
+            // let posX = worldPos.x + w / 2 + 40;
+            // let posY = worldPos.y + h / 2 + 40;
+
+            // this.spineNode.setPosition(posX, posY);
+            // this.spineNode.setScale(CURSOR_SCALE);
+            // this.spineNode.active = true;
+            // this.node.active = true;
+
+            // // 每次导航必须重新设置动画，确保 Spine 渲染更新
+            // this.spine.setAnimation(0, "gesture", true);
+        } catch (e) {
+            console.warn("[FocusVisualLayer] updatePosition error:", e);
+        }
     }
 }

package/package.json

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

package/drscript/BtnExtra.ts

@@ -1,17 +0,0 @@
-
-const { ccclass, property } = cc._decorator;
-
-@ccclass('BtnExtra')
-export class BtnExtra extends cc.Component {
-    @property({
-        type: cc.SpriteFrame,
-        tooltip: '悬停状态图片'
-    })
-    hoverSprite: cc.SpriteFrame = null;
-
-    @property({
-        type: cc.SpriteFrame,
-        tooltip: '普通状态图片'
-    })
-    normalSprite: cc.SpriteFrame = null;
-}

package/drscript/GameAnalytics.ts

@@ -1,150 +0,0 @@
-import { ActionType, Reporter, IReportItem } from "./ad-sdk/ad-sdk";
-import { AnalyticsEvent, AnalyticsAction } from "./Define";
-
-const REPORT_URL = "https://sup.daoran.tv/bi-api/api/game/lewo/batch";
-
-/** 事件定义：element_position + 曝光/点击事件名 */
-const EVENT_MAP: Record<AnalyticsEvent, { ep: string; expose: string; click?: string }> = {
-    [AnalyticsEvent.GameLoading]: { ep: "game_loading", expose: "game_loading_expose" },
-    [AnalyticsEvent.StartGameButton]: { ep: "start_game_button", expose: "start_game_expose", click: "start_game_click" },
-    [AnalyticsEvent.WatchVideoContinueButton]: { ep: "watch_video_continue_button", expose: "watch_video_continue_expose", click: "watch_video_continue_click" },
-    [AnalyticsEvent.ReplayButton]: { ep: "replay_button", expose: "replay_expose", click: "replay_click" },
-    [AnalyticsEvent.RewardVideoAd]: { ep: "reward_video_ad", expose: "ad_expose" },
-};
-
-export default class GameAnalytics {
-    private static initialized: boolean = false;
-    private static loadingReported: boolean = false;
-    private static reportedExposures: { [event: string]: boolean } = {};
-    private static reportInterval: number = 1000 * 30; // 30秒上报一次
-    private static reportMaxSize: number = 50;
-    private static reportKey = "game_analytics_report_cache";
-
-    public static init(config: {
-        app_item: string;
-        content_type?: string;
-        content_id?: string;
-        content_title?: string;
-    }): void {
-        if (GameAnalytics.initialized) return;
-
-        try {
-            Reporter.init({
-                report_url: REPORT_URL,
-                app_item: config.app_item,
-                content_type: config.content_type || "游戏",
-                content_id: config.content_id || "",
-                content_title: config.content_title || "",
-            });
-            GameAnalytics.initialized = true;
-            var httpReq = new XMLHttpRequest();
-            httpReq.open("POST", 'https://sup.daoran.tv/bi-api/api/config/get');
-            httpReq.setRequestHeader("Content-Type", "application/json");
-            httpReq.setRequestHeader("Accept", "application/json");
-            httpReq.send();
-            httpReq.onreadystatechange = () => {
-                if (httpReq.readyState === 4 && httpReq.status === 200) {
-                    console.log("[GameAnalytics] report batch success", httpReq.responseText);
-                }
-            };
-            setInterval(() => {
-                this.reportBatchCache();
-            }, this.reportInterval);
-        } catch (error) {
-            console.warn("[GameAnalytics] init failed", error);
-        }
-    }
-
-    public static reportLoadingOnce(): void {
-        if (this.loadingReported) return;
-        this.loadingReported = true;
-        this.report(AnalyticsEvent.GameLoading, AnalyticsAction.Exposure);
-    }
-
-    public static reportExposureOnce(event: AnalyticsEvent): void {
-        if (this.reportedExposures[event]) return;
-        this.reportedExposures[event] = true;
-        this.report(event, AnalyticsAction.Exposure);
-    }
-
-    public static report(
-        event: AnalyticsEvent,
-        action: AnalyticsAction,
-        adRequestId?: string
-    ): void {
-        if (!this.initialized) return;
-        const def = EVENT_MAP[event];
-        const eventName = action === AnalyticsAction.Exposure ? def.expose : def.click;
-        if (!def || !eventName) {
-            console.warn("[GameAnalytics] unsupported event/action", event, action);
-            return;
-        }
-
-        try {
-            const reportItem: any = {
-                element_position: def.ep,
-                action_type: action === AnalyticsAction.Exposure
-                    ? ActionType.Exposure
-                    : ActionType.Click,
-                event_name: eventName,
-            };
-            if (event === AnalyticsEvent.RewardVideoAd && adRequestId) {
-                reportItem.ad_request_id = adRequestId;
-            }
-            var reportCache: IReportItem[] = null;
-            const cache = localStorage.getItem(this.reportKey);
-            if (cache) {
-                reportCache = JSON.parse(cache);
-            }
-            if (reportCache) {
-                reportCache.push(reportItem);
-            } else {
-                reportCache = [reportItem];
-            }
-            localStorage.setItem(this.reportKey, JSON.stringify(reportCache));
-        } catch (error) {
-            console.warn("[GameAnalytics] report failed", error);
-        }
-    }
-
-    public static reportBatch(events: AnalyticsEvent[]): void {
-        if (!this.initialized || events.length === 0) return;
-        try {
-            const items: IReportItem[] = [];
-            for (const e of events) {
-                const def = EVENT_MAP[e];
-                if (!def) continue;
-                const item: any = {
-                    element_position: def.ep,
-                    action_type: ActionType.Exposure,
-                    event_name: def.expose,
-                    ad_request_id: "",
-                };
-                items.push(item);
-            }
-            if (items.length > 0) Reporter.reportBatch(items);
-        } catch (error) {
-            console.warn("[GameAnalytics] report failed", error);
-        }
-    }
-
-    private static reportBatchCache(): void {
-        if (!this.initialized) return;
-        var reportCache: IReportItem[] = null;
-        const cache = localStorage.getItem(this.reportKey);
-        if (cache) {
-            reportCache = JSON.parse(cache);
-        }
-        if (!reportCache || reportCache.length === 0) return;
-
-        try {
-            const reportItem = reportCache.splice(0, this.reportMaxSize);
-            Reporter.reportBatch(reportItem);
-        } catch (error) {
-            console.warn("[GameAnalytics] report failed", error);
-            reportCache = [];
-        } finally {
-            localStorage.setItem(this.reportKey, JSON.stringify(reportCache));
-        }
-    }
-}

package/drscript/focus/FocusItem.ts

@@ -1,39 +0,0 @@
-import FocusManager from "./FocusManager";
-
-const { ccclass, property } = cc._decorator;
-
-@ccclass
-export default class FocusItem extends cc.Component {
-    @property
-    scopeId: string = "";
-
-    @property
-    focusScale: number = 1.08;
-
-    @property
-    autoRegister: boolean = true;
-
-    onEnable() {
-        if (this.autoRegister) FocusManager.register(this);
-    }
-
-    onDisable() {
-        if (this.autoRegister) FocusManager.unregister(this.node);
-    }
-
-    onFocus() {
-    }
-
-    onBlur() {
-    }
-
-    onConfirm() {
-        let button = this.node.getComponent(cc.Button);
-        if (button && button.interactable) {
-            cc.Component.EventHandler.emitEvents(button.clickEvents, null);
-        } else {
-            var event = new cc.Event.EventCustom(cc.Node.EventType.TOUCH_END, true);
-            this.node.emit(cc.Node.EventType.TOUCH_END, event);
-        }
-    }
-}

package/drscript/focus/FocusItem.ts.meta

@@ -1,10 +0,0 @@
-{
-  "ver": "1.1.0",
-  "uuid": "bd94425f-361c-4c94-a03d-8001b12f1305",
-  "importer": "typescript",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
-}

package/drscript/focus/FocusScope.ts

@@ -1,10 +0,0 @@
-export default class FocusScope {
-    public scopeId: string;
-    public root: cc.Node | null;
-    public lastFocusId: string = "";
-
-    constructor(scopeId: string, root?: cc.Node) {
-        this.scopeId = scopeId || "page";
-        this.root = root || null;
-    }
-}

package/drscript/focus/FocusScope.ts.meta

@@ -1,10 +0,0 @@
-{
-  "ver": "1.1.0",
-  "uuid": "cfa53b0b-9d55-4aa2-8000-241eebc81a4d",
-  "importer": "typescript",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
-}