drgame-cc 1.0.45 → 1.0.47

package/drscript/focus/FocusVisualLayer.ts

@@ -1,24 +1,45 @@
-import TvUiConfigManager from "../config/TvUiConfigManager";
-import { TvUiIconItem } from "../config/TvUiConfig";
-import IconManager from "../icon/IconManager";
+import { FingerStyle } from "../Define";
 import FocusManager, { FocusRuntimeItem } from "./FocusManager";
 
 const { ccclass } = cc._decorator;
 
+const FOCUS_STYLE_MAP: { [key: string]: string } = {
+    [FingerStyle.Default]: "focus_1",
+    [FingerStyle.White]: "focus_2",
+    [FingerStyle.Gold]: "focus_3",
+    [FingerStyle.Blue]: "focus_4",
+};
+
 @ccclass
 export default class FocusVisualLayer extends cc.Component {
-    private graphics: cc.Graphics | null = null;
-    private iconNode: cc.Node | null = null;
-    private iconSprite: cc.Sprite | null = null;
+    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;
+    }
+
+    private spineNode: cc.Node | null = null;
+    private spine: sp.Skeleton | null = null;
     private currentItem: FocusRuntimeItem | null = null;
-    private currentIconConfig: TvUiIconItem | 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, 800);
+            parent.addChild(node, FocusVisualLayer._focusZIndex);
+            cc.game?.addPersistRootNode?.(node);
         }
         let layer = node.getComponent(FocusVisualLayer);
         if (!layer) layer = node.addComponent(FocusVisualLayer);
@@ -28,49 +49,53 @@ export default class FocusVisualLayer extends cc.Component {
 
     onDestroy() {
         FocusManager.offFocusChanged(this.onFocusChanged);
-        TvUiConfigManager.offChanged(this.onConfigChanged);
     }
 
     public init() {
         if (this.inited) return;
         this.inited = true;
-        this.node.zIndex = (TvUiConfigManager.getConfig().focus || {}).zIndex || 800;
+        this.node.zIndex = FocusVisualLayer._focusZIndex;
         this.resizeToParent();
         this.buildView();
+        this.loadSpine();
         FocusManager.onFocusChanged(this.onFocusChanged);
-        TvUiConfigManager.onChanged(this.onConfigChanged);
         this.refresh(FocusManager.getCurrentFocusItem());
     }
 
-    update() {
-        if (!this.currentItem) return;
-        this.drawFocus(this.currentItem);
-        if (this.iconNode && this.iconNode.active && this.currentIconConfig) {
-            this.positionIcon(this.currentItem, this.currentIconConfig);
-        }
+    private onFocusChanged = (item: FocusRuntimeItem | null) => {
+        this.refresh(item);
     }
 
     private buildView() {
-        if (!this.graphics) {
-            this.graphics = this.node.addComponent(cc.Graphics);
-        }
-        if (!this.iconNode) {
-            this.iconNode = new cc.Node("FocusIcon");
-            this.iconNode.zIndex = 2;
-            this.iconSprite = this.iconNode.addComponent(cc.Sprite);
-            this.iconSprite.sizeMode = cc.Sprite.SizeMode.CUSTOM;
-            this.node.addChild(this.iconNode, 2);
+        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;
         }
         this.node.active = false;
     }
 
-    private onFocusChanged = (item: FocusRuntimeItem | null) => {
-        this.refresh(item);
+    private getFocusPath(): string {
+        let folder = FOCUS_STYLE_MAP[FocusVisualLayer._style] || "focus_1";
+        return `drres/focus/${folder}/gesture`;
     }
 
-    private onConfigChanged = () => {
-        this.node.zIndex = (TvUiConfigManager.getConfig().focus || {}).zIndex || 800;
-        this.refresh(this.currentItem);
+    private loadSpine() {
+        let path = this.getFocusPath();
+        cc.loader.loadRes(path, sp.SkeletonData, (error: Error, spData: sp.SkeletonData) => {
+            if (error || !this.spine) {
+                console.warn("[FocusVisualLayer] Load spine failed:", error);
+                return;
+            }
+            this.spine.skeletonData = spData;
+            this.spineLoaded = true;
+            if (this.currentItem) {
+                this.refresh(this.currentItem);
+            }
+        });
     }
 
     private refresh(item: FocusRuntimeItem | null) {
@@ -79,145 +104,39 @@ export default class FocusVisualLayer extends cc.Component {
             this.hide();
             return;
         }
+        if (!FocusVisualLayer._focusEnabled) {
+            this.hide();
+            return;
+        }
         this.node.active = true;
-        this.drawFocus(item);
-        this.refreshIcon(item);
+        this.updatePosition(item);
     }
 
     private hide() {
         this.node.active = false;
         this.currentItem = null;
-        if (this.graphics) this.graphics.clear();
-        if (this.iconNode) this.iconNode.active = false;
-        this.currentIconConfig = null;
+        if (this.spineNode) this.spineNode.active = false;
     }
 
-    // private drawFocus(item: FocusRuntimeItem) {
-    //     if (!item || !item.node || !item.node.isValid || !item.node.activeInHierarchy) {
-    //         this.hide();
-    //         return;
-    //     }
-    //     this.resizeToParent();
-    //     let focusConfig = TvUiConfigManager.getConfig().focus || {};
-    //     if (focusConfig.enabled === false) {
-    //         this.hide();
-    //         return;
-    //     }
-    //     if (!this.graphics) return;
-    //     this.graphics.clear();
-    //     if (focusConfig.frameEnabled !== true) {
-    //         return;
-    //     }
-    //     let box = item.node.getBoundingBoxToWorld();
-    //     let center = cc.v2(box.x + box.width / 2, box.y + box.height / 2);
-    //     let local = this.node.convertToNodeSpaceAR(center);
-    //     let padding = focusConfig.framePadding || 0;
-    //     this.graphics.lineWidth = focusConfig.lineWidth || 4;
-    //     this.graphics.strokeColor = this.parseColor(focusConfig.frameColor || "#ffd451", focusConfig.frameOpacity);
-    //     this.graphics.rect(local.x - box.width / 2 - padding, local.y - box.height / 2 - padding, box.width + padding * 2, box.height + padding * 2);
-    //     this.graphics.stroke();
-    // }
-
-    private refreshIcon(item: FocusRuntimeItem) {
-        let iconKey = item.iconKey || (TvUiConfigManager.getConfig().focus || {}).defaultIconKey || "default";
-        IconManager.getSpriteFrame(iconKey, (frame: cc.SpriteFrame | null, iconConfig?: TvUiIconItem | null) => {
-            if (this.currentItem != item || !this.iconNode || !this.iconSprite) return;
-            if (!frame) {
-                this.iconNode.active = false;
-                return;
-            }
-            this.iconNode.active = true;
-            this.iconSprite.spriteFrame = frame;
-            this.currentIconConfig = iconConfig || {};
-            this.positionIcon(item, this.currentIconConfig);
-        });
-    }
+    private static readonly CURSOR_SCALE: number = 1.5;
 
-    private drawFocus(item: FocusRuntimeItem) {
+    private updatePosition(item: FocusRuntimeItem) {
         if (!item || !item.node || !item.node.isValid || !item.node.activeInHierarchy) {
             this.hide();
             return;
         }
-        this.resizeToParent();
-        let focusConfig = TvUiConfigManager.getConfig().focus || {};
-        if (focusConfig.enabled === false) {
-            this.hide();
-            return;
-        }
-        if (!this.graphics) return;
-        this.graphics.clear();
-        if (focusConfig.frameEnabled !== true) {
+        if (!this.spineLoaded || !this.spine || !this.spineNode) {
             return;
         }
-
-        let node = item.node;
-        let worldPos = node.parent.convertToWorldSpaceAR(node.position);
-        let local = this.node.convertToNodeSpaceAR(worldPos);
-
-        let contentSize = node.getContentSize();
-        let scaleX = node.scaleX;
-        let scaleY = node.scaleY;
-        let width = contentSize.width * scaleX;
-        let height = contentSize.height * scaleY;
-
-        let padding = focusConfig.framePadding || 0;
-        this.graphics.lineWidth = focusConfig.lineWidth || 4;
-        this.graphics.strokeColor = this.parseColor(focusConfig.frameColor || "#ffd451", focusConfig.frameOpacity);
-        this.graphics.rect(local.x - width / 2 - padding, local.y - height / 2 - padding, width + padding * 2, height + padding * 2);
-        this.graphics.stroke();
-    }
-
-    // private positionIcon(item: FocusRuntimeItem, iconConfig: TvUiIconItem) {
-    //     if (!item || !item.node || !item.node.isValid) return;
-    //     let focusConfig = TvUiConfigManager.getConfig().focus || {};
-
-    //     let node = item.node;
-    //     let worldPos = node.parent.convertToWorldSpaceAR(node.position);
-    //     let local = this.node.convertToNodeSpaceAR(worldPos);
-
-    //     let contentSize = node.getContentSize();
-    //     let scaleX = node.scaleX;
-    //     let scaleY = node.scaleY;
-    //     let width = contentSize.width * scaleX;
-    //     let height = contentSize.height * scaleY;
-
-    //     let iconWidth = iconConfig.width || 60;
-    //     let iconHeight = iconConfig.height || 60;
-    //     let offsetX = iconConfig.offsetX;
-    //     let offsetY = iconConfig.offsetY;
-    //     if (offsetX === undefined) offsetX = focusConfig.iconOffsetX || 0;
-    //     if (offsetY === undefined) offsetY = focusConfig.iconOffsetY || 0;
-    //     if (!this.iconNode) return;
-
-    //     let x = local.x + width / 2 + offsetX;
-    //     let y = local.y + height / 2 + offsetY;
-    //     if ((focusConfig.iconPlacement || "bottomRight") == "bottomRight") {
-    //         y = local.y - height / 2 - offsetY;
-    //     }
-    //     this.iconNode.setContentSize(iconWidth, iconHeight);
-    //     this.iconNode.setPosition(x, y);
-    // }
-
-    private positionIcon(item: FocusRuntimeItem, iconConfig: TvUiIconItem) {
-        if (!item || !item.node || !item.node.isValid) return;
-        let focusConfig = TvUiConfigManager.getConfig().focus || {};
+        this.resizeToParent();
         let box = item.node.getBoundingBoxToWorld();
-        let center = cc.v2(box.x + box.width / 2, box.y + box.height / 2);
-        let local = this.node.convertToNodeSpaceAR(center);
-        let width = iconConfig.width || 60;
-        let height = iconConfig.height || 60;
-        let offsetX = iconConfig.offsetX;
-        let offsetY = iconConfig.offsetY;
-        if (offsetX === undefined) offsetX = focusConfig.iconOffsetX || 0;
-        if (offsetY === undefined) offsetY = focusConfig.iconOffsetY || 0;
-        if (!this.iconNode) return;
-        let x = local.x + box.width / 2 + offsetX;
-        let y = local.y + box.height / 2 + offsetY;
-        if ((focusConfig.iconPlacement || "bottomRight") == "bottomRight") {
-            y = local.y - box.height / 2 - offsetY;
-        }
-        this.iconNode.setContentSize(width, height);
-        this.iconNode.setPosition(x, y);
+        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() {
@@ -227,12 +146,4 @@ export default class FocusVisualLayer extends cc.Component {
         this.node.setContentSize(width, height);
         this.node.setPosition(0, 0);
     }
-
-    private parseColor(hex: string, opacity?: number): cc.Color {
-        hex = (hex || "#ffd451").replace("#", "");
-        let r = parseInt(hex.substr(0, 2), 16);
-        let g = parseInt(hex.substr(2, 2), 16);
-        let b = parseInt(hex.substr(4, 2), 16);
-        return cc.color(r || 255, g || 212, b || 81, opacity === undefined ? 230 : opacity);
-    }
-}
+}

package/drscript/focus.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "bf5b7cab-c7bb-482b-8a70-47f0016d8e24",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

package/drscript/input/KeyboardMove.ts

@@ -1,15 +1,44 @@
-import TvUi from "../core/TvUi";
-import { TvRemoteKey } from "./KeyCodeAdapter";
+import { KeyCode } from "../ad-sdk/ad-sdk";
 
 const { ccclass, property } = cc._decorator;
 
+const KEY_CODE_MAP: { [key: number]: string } = {
+    19: KeyCode.Up,
+    20: KeyCode.Down,
+    21: KeyCode.Left,
+    22: KeyCode.Right,
+    23: KeyCode.Enter,
+    37: KeyCode.Left,
+    38: KeyCode.Up,
+    39: KeyCode.Right,
+    40: KeyCode.Down,
+    0: KeyCode.Back,
+    4: KeyCode.Back,
+    6: KeyCode.Back,
+    8: KeyCode.Back,
+    13: KeyCode.Enter,
+    27: KeyCode.Back,
+    65: KeyCode.Left,   // A
+    66: KeyCode.Enter,  // B
+    80: KeyCode.Enter,  // P (Pause)
+    83: KeyCode.Down,   // S
+    87: KeyCode.Up,     // W
+    68: KeyCode.Right,  // D
+    1000: KeyCode.Left,
+    1001: KeyCode.Right,
+    1003: KeyCode.Up,
+    1004: KeyCode.Down,
+    1005: KeyCode.Enter,
+    10009: KeyCode.Back,
+};
+
 @ccclass
 export default class KeyboardMove extends cc.Component {
     /**
      * 按键移动回调
      */
     public callback: (dir: cc.Vec2) => void;
-    private _keys: Set<TvRemoteKey> = new Set();
+    private _keys: Set<string> = new Set();
     private _dir: cc.Vec2 = cc.v2(0, 0);
 
     onLoad(): void {
@@ -24,13 +53,13 @@ export default class KeyboardMove extends cc.Component {
     }
 
     private onKeyDown(event: cc.Event.EventKeyboard): void {
-        let key = TvUi.input.toRemoteKey(event.keyCode);
-        this._keys.add(key);
+        let key = KEY_CODE_MAP[event.keyCode];
+        if (key) this._keys.add(key);
     }
 
     private onKeyUp(event: cc.Event.EventKeyboard): void {
-        let key = TvUi.input.toRemoteKey(event.keyCode);
-        this._keys.delete(key);
+        let key = KEY_CODE_MAP[event.keyCode];
+        if (key) this._keys.delete(key);
     }
 
     update(dt: number): void {
@@ -41,10 +70,10 @@ export default class KeyboardMove extends cc.Component {
         dir.x = 0;
         dir.y = 0;
 
-        if (this._keys.has(TvRemoteKey.Left)) dir.x -= 1;
-        if (this._keys.has(TvRemoteKey.Right)) dir.x += 1;
-        if (this._keys.has(TvRemoteKey.Down)) dir.y -= 1;
-        if (this._keys.has(TvRemoteKey.Up)) dir.y += 1;
+        if (this._keys.has(KeyCode.Left)) dir.x -= 1;
+        if (this._keys.has(KeyCode.Right)) dir.x += 1;
+        if (this._keys.has(KeyCode.Down)) dir.y -= 1;
+        if (this._keys.has(KeyCode.Up)) dir.y += 1;
 
         if (dir.x !== 0 || dir.y !== 0) {
             dir.normalizeSelf();

package/drscript/input/KeyboardMove.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "be2454bd-c5ec-42ed-aac1-53ed56bc537b",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

package/drscript/input.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "5fda29eb-7729-48f7-bbf0-15dcab3b9a41",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

package/drscript/interface.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "73a70449-4adf-4062-a7ab-8ce5523ef0aa",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

package/drscript/pinyin.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "dfb658d3-2629-4a95-9e58-8c14f0e6c268",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

package/drscript/toast.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "bf7c86a2-3fc4-451e-94e6-3f0add364ef7",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

package/drscript/virtualgamepad.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "6a84303e-cf3d-4685-8a8b-b95042a9f40f",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

package/package.json

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

package/drres/config/default.json

@@ -1,108 +0,0 @@
-{
-  "designWidth": 1920,
-  "designHeight": 1080,
-  "cpId": "ppl",
-  "version": "1.0.0",
-  "defaultScopeId": "page",
-  "enableRemoteInput": true,
-  "enableLifecycle": true,
-  "focus": {
-    "enabled": true,
-    "frameEnabled": false,
-    "framePadding": 10,
-    "frameColor": "#ffd451",
-    "frameOpacity": 230,
-    "lineWidth": 5,
-    "animationTime": 0.1,
-    "defaultIconKey": "default",
-    "iconPlacement": "bottomRight",
-    "iconOffsetX": -20,
-    "iconOffsetY": 20,
-    "zIndex": 800
-  },
-  "icons": {
-    "default": {
-      "path": "drres/icons/pointer-yellow-60",
-      "width": 60,
-      "height": 60,
-      "offsetX": -20,
-      "offsetY": 20
-    },
-    "yellow": {
-      "path": "drres/icons/pointer-yellow-60",
-      "width": 60,
-      "height": 60,
-      "offsetX": -20,
-      "offsetY": 20
-    },
-    "blue": {
-      "path": "drres/icons/pointer-blue-60",
-      "width": 60,
-      "height": 60,
-      "offsetX": -20,
-      "offsetY": 20
-    },
-    "pink": {
-      "path": "drres/icons/pointer-pink-60",
-      "width": 60,
-      "height": 60,
-      "offsetX": -20,
-      "offsetY": 20
-    },
-    "white": {
-      "path": "drres/icons/pointer-white-60",
-      "width": 60,
-      "height": 60,
-      "offsetX": -20,
-      "offsetY": 20
-    }
-  },
-  "adSdk": {
-    "platform": "xiaomi"
-  },
-  "ads": {
-    "reward": {
-      "enabled": true,
-      "mode": "reward",
-      "channels": [
-        {
-          "type": "aggregate",
-          "priority": 1,
-          "rewardType": "reward"
-        },
-        {
-          "type": "mock",
-          "priority": 100
-        }
-      ]
-    },
-    "popup": {
-      "enabled": true,
-      "mode": "popup",
-      "channels": [
-        {
-          "type": "aggregate",
-          "priority": 1
-        },
-        {
-          "type": "mock",
-          "priority": 100
-        }
-      ]
-    },
-    "game": {
-      "enabled": true,
-      "mode": "popup",
-      "channels": [
-        {
-          "type": "aggregate",
-          "priority": 1
-        },
-        {
-          "type": "mock",
-          "priority": 100
-        }
-      ]
-    }
-  }
-}

package/drres/config/default.json.meta

@@ -1,6 +0,0 @@
-{
-  "ver": "1.0.2",
-  "uuid": "436a7017-623f-4fd3-9870-785af00d37ed",
-  "importer": "json",
-  "subMetas": {}
-}