drgame-cc 1.0.37 → 1.0.39

package/drres/prefab/HelperWin.prefab

@@ -0,0 +1,202 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "HelperWin",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "skeleton",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": {
+      "__id__": 4
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1388.91,
+      "height": 923.54
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "sp.Skeleton",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
+      }
+    ],
+    "paused": false,
+    "defaultSkin": "default",
+    "defaultAnimation": "animation",
+    "_preCacheMode": 0,
+    "_cacheMode": 0,
+    "loop": false,
+    "premultipliedAlpha": true,
+    "timeScale": 1,
+    "_accTime": 0,
+    "_playCount": 0,
+    "_frameCache": null,
+    "_curFrame": null,
+    "_skeletonCache": null,
+    "_animationName": "animation",
+    "_animationQueue": [],
+    "_headAniInfo": null,
+    "_playTimes": 1,
+    "_isAniComplete": true,
+    "_N$skeletonData": null,
+    "_N$_defaultCacheMode": 0,
+    "_N$debugSlots": false,
+    "_N$debugBones": false,
+    "_N$debugMesh": false,
+    "_N$useTint": false,
+    "_N$enableBatch": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "773nu47W9KRIk2SeNjYEqp",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

package/drscript/HelperWin.ts

@@ -0,0 +1,55 @@
+import { AdSdk, KeyAction, KeyCode } from "./ad-sdk/ad-sdk";
+import TvUi from "./core/TvUi";
+import { Loader } from "./Loader";
+import { PlatformAdapter } from "./PlatformAdapter";
+
+const { ccclass, property } = cc._decorator;
+
+@ccclass
+export default class HelperWin extends cc.Component {
+    @property(sp.Skeleton)
+    spine: sp.Skeleton = null;
+
+    private nativeBackHandler: () => boolean = null;
+
+    start() {
+    }
+
+    public async setBackHandler(url: string, cb: () => void) {
+        let spData = await Loader.loadRes(`spine/${url}`, sp.SkeletonData);
+        if (!spData) {
+            console.log(`[PlatformAdapter] HelperWin setBackHandler failed, url: ${url}`);
+            return;
+        }
+        this.spine = this.node.getChildByName("skeleton").getComponent(sp.Skeleton);
+        this.spine.skeletonData = spData;
+        this.spine.setAnimation(0, 'animation', false);
+        AdSdk.onKeyEvent((e) => {
+            var isDown = e.action === KeyAction.Down;
+
+            if (isDown) {
+                switch (e.key) {
+                    case KeyCode.Back:
+                        this.node.active = false;
+                        cb && cb();
+                        break;
+                }
+            }
+        });
+        this.nativeBackHandler = () => {
+            this.node.destroy();
+            cb && cb();
+            return true;
+        };
+        TvUi.back.push(this.nativeBackHandler);
+    }
+
+    onEnable() {
+        PlatformAdapter.showWindow(this.node);
+    }
+
+    onDisable() {
+        TvUi.back.remove(this.nativeBackHandler);
+        PlatformAdapter.hideWindow(this.node);
+    }
+}

package/drscript/Loader.ts

@@ -8,14 +8,15 @@ export class Loader {
      */
     public static async loadRes<T extends cc.Asset>(
         path: string,
+        type: new () => T,
         progressCallback?: (progress: number) => void
     ): Promise<T> {
         return new Promise<T>((resolve, reject) => {
-            cc.loader.loadRes(path, (completedCount: number, totalCount: number, item: any) => {
+            cc.loader.loadRes(path, type as any, (completedCount: number, totalCount: number, item: any) => {
                 if (progressCallback) {
                     progressCallback(completedCount / totalCount);
                 }
-            }, (error: Error, asset: cc.Asset) => {
+            }, (error: Error, asset: T) => {
                 if (error) {
                     reject(error);
                 } else {
@@ -57,7 +58,7 @@ export class Loader {
  * @returns Promise<Map<string, any>>
  */
     public static async loadBatch(
-        resources: Array<{ path: string; key?: string }>,
+        resources: Array<{ path: string; type: new () => cc.Asset; key?: string }>,
         progressCallback?: (progress: number, completedCount: number, totalCount: number) => void
     ): Promise<Map<string, any>> {
         const results = new Map<string, any>();
@@ -66,7 +67,7 @@ export class Loader {
 
         const loadPromises = resources.map((res, index) => {
             const key = res.key || res.path;
-            return this.loadRes(res.path)
+            return this.loadRes(res.path, res.type)
                 .then((asset) => {
                     results.set(key, asset);
                     completedCount++;

package/drscript/PlatformAdapter.ts

@@ -7,16 +7,25 @@ import { showRewardVideo } from "./Info";
 import { Loader } from "./Loader";
 import ToastManager from "./toast/ToastManager";
 import { InternalUitl } from "./InternalUitl";
+import { WebBridge } from "./WebBridge";
+import { AdPlatform, AdSdk } from "./ad-sdk/ad-sdk";
+import HelperWin from "./HelperWin";
 /** 平台适配器,名字有点长防止和Platform，Adapter冲突 */
 export class PlatformAdapter {
     private static readonly version = "1.0.36";
     private static readonly designWidth = 1920;
     private static readonly designHeight = 1080;
+    private static webBridge: WebBridge;
+    private static _canWatchVideo: boolean;
+    private static _isVIP: boolean;
+    private static _zhName: string;
     /** 初始化
      * @param cnName 中文名称
      * @param minigameID 小游戏ID,文档地址:https://doc.weixin.qq.com/sheet/e3_AcEAlgaLALsCNiuHzH2NOQGCjVc3a?scode=AOcA0AdfAAoSqmh5BfAQIA6AYEAB4&tab=BB08J2
      */
     public static async init(cnName: string, minigameID: number) {
+        this._zhName = cnName;
+        this.webBridge = new WebBridge();
         var platform = GameAnalyticsPlatform.XiaomiTv;//平台由sdk后续处理
         var appItem = GameAnalytics.getAppItem(platform);
         var contentId = minigameID.toString();//InternalUitl.getChineseInitials(cnName);
@@ -72,6 +81,14 @@ export class PlatformAdapter {
         });
         if (this.isCocos)
             await ToastManager.Inst.init();
+        let adapters: any = {};
+        adapters[platform] = { cpId: contentId };
+        await AdSdk.init({
+            platform: AdPlatform.Xiaomi,
+            adapters: adapters
+        });
+        AdSdk.onGameReady(this.version);
+        // AdSdk.onKeyEvent(this.onKeyEvent.bind(this));
     }
 
     /**
@@ -174,7 +191,7 @@ export class PlatformAdapter {
     }
 
     public static async showExitWin() {
-        let exitPfb = await Loader.loadRes<cc.Prefab>('drres/prefab/ExitWin');
+        let exitPfb = await Loader.loadRes('drres/prefab/ExitWin', cc.Prefab);
         let exitWin = cc.instantiate(exitPfb);
         exitWin.parent = cc.director.getScene();
         exitWin.setPosition(cc.v2(cc.winSize.width / 2, cc.winSize.height / 2));
@@ -224,9 +241,45 @@ export class PlatformAdapter {
         return window['cc'] != undefined;
     }
 
+    /** 是否是基座环境 */
+    public static get isWebBridge() {
+        return this.webBridge.isAvailable();
+    }
+
+    /** 是否可以观看视频 */
+    public static get canWatchVideo() {
+        return !this._canWatchVideo;
+    }
+
+    /** 是否是VIP用户 */
+    public static get isVIP() {
+        return this._isVIP;
+    }
+
     /** 退出游戏 */
     public static exitGame() {
-        let bridge: ILobbyBridge = cc.director.getScene().getComponentInChildren('LobbyBridge');
+        if (this.isWebBridge) {
+            this.webBridge.callHandler("router/navigateBack", {}, (a) => { cc.log(a); });
+            return;
+        }
+        var GRoot = window['GRoot'];
+        let bridge: ILobbyBridge = GRoot && GRoot.inst.node.getComponentInChildren('LobbyBridge');
         bridge && bridge.exitGame();
     }
+
+    public static async showHelper(url: string, cb: () => void) {
+        var key = `${this._zhName}-isFirst`;
+        var isFirst = cc.sys.localStorage.getItem(key);
+        if (!isFirst) {
+            cc.sys.localStorage.setItem(key, false);
+            let helperPfb = await Loader.loadRes('drres/prefab/HelperWin', cc.Prefab);
+            let helperWin = cc.instantiate(helperPfb);
+            helperWin.parent = cc.director.getScene();
+            helperWin.setPosition(cc.v2(cc.winSize.width / 2, cc.winSize.height / 2));
+            var comp = helperWin.addComponent(HelperWin);
+            comp.setBackHandler(url, cb);
+        } else {
+            cb && cb();
+        }
+    }
 }

package/drscript/WebBridge.ts

@@ -0,0 +1,35 @@
+/**
+ * Web 桥接
+ * 封装 window.callHandler 的调用逻辑
+ * 构造时一次性检测可用性，避免每次调用重复判断
+ */
+export class WebBridge {
+
+    /** 缓存：callHandler 是否可用 */
+    private _available: boolean;
+
+    constructor() {
+        this._available = cc.sys.isBrowser && typeof (window as any).callHandler === 'function';
+    }
+
+    /** 检测浏览器环境中是否存在 callHandler */
+    isAvailable(): boolean {
+        return this._available;
+    }
+
+    callHandler(message: string, param: any, success?: Function, fail?: Function): void {
+        if (this._available) {
+            (window as any).callHandler(message, param, success);
+        } else {
+            fail && fail({ code: -1, message: 'callHandler 未找到，非基座环境' });
+        }
+    }
+
+    async getSystemInfo(): Promise<any> {
+        return new Promise<any>((resolve, reject) => {
+            this.callHandler("system/getSystemInfo", {}, resolve,
+                (err: any) => reject(err || new Error('非基座环境：callHandler 不存在'))
+            );
+        });
+    }
+}

package/drscript/ad/AdManager.ts

@@ -66,7 +66,7 @@ export default class AdManager {
 
     public static showPopup(options: AdShowOptions): Promise<boolean> {
         options = this.mergeOptions(options, { mode: "popup" });
-        return this.showSlot((options && options.slotId) || (options && options.trigger_scene) || "popup", options);
+        return this.showSlot((options && options.slotId) || (options && options.scene) || "popup", options);
     }
 
     public static hidePopup(scene?: string) {

package/drscript/core/BackManager.ts

@@ -14,14 +14,12 @@ export default class BackManager {
     }
 
     public static push(handler: BackHandler) {
-        return;
         if (!handler) return;
         this.remove(handler);
         this.handlers.push(handler);
     }
 
     public static remove(handler: BackHandler) {
-        return;
         for (let i = this.handlers.length - 1; i >= 0; i--) {
             if (this.handlers[i] == handler) this.handlers.splice(i, 1);
         }

package/drscript/input/KeyCodeAdapter.ts

@@ -11,13 +11,13 @@ export enum TvRemoteKey {
 
 export default class KeyCodeAdapter {
     public static toRemoteKey(keyCode: number): TvRemoteKey {
-        if ([0, 4, 8, 27, 10009].indexOf(keyCode) >= 0) return TvRemoteKey.Back;
-        if ([13, 23, 66].indexOf(keyCode) >= 0) return TvRemoteKey.Ok;
+        if ([0, 4, 6, 8, 27, 10009].indexOf(keyCode) >= 0) return TvRemoteKey.Back;
+        if ([13, 23, 66, 1005].indexOf(keyCode) >= 0) return TvRemoteKey.Ok;
         if ([80].indexOf(keyCode) >= 0) return TvRemoteKey.Pause;
-        if ([21, 37].indexOf(keyCode) >= 0) return TvRemoteKey.Left;
-        if ([19, 38].indexOf(keyCode) >= 0) return TvRemoteKey.Up;
-        if ([22, 39].indexOf(keyCode) >= 0) return TvRemoteKey.Right;
-        if ([20, 40].indexOf(keyCode) >= 0) return TvRemoteKey.Down;
+        if ([21, 37, 1000].indexOf(keyCode) >= 0) return TvRemoteKey.Left;
+        if ([19, 38, 1003].indexOf(keyCode) >= 0) return TvRemoteKey.Up;
+        if ([22, 39, 1001].indexOf(keyCode) >= 0) return TvRemoteKey.Right;
+        if ([20, 40, 1004].indexOf(keyCode) >= 0) return TvRemoteKey.Down;
         return TvRemoteKey.Unknown;
     }
 }

package/package.json

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