drgame-cc 1.0.42 → 1.0.44

package/drres/prefab/HelperWin.prefab

@@ -19,12 +19,19 @@
     "_children": [
       {
         "__id__": 2
+      },
+      {
+        "__id__": 5
       }
     ],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 8
+      }
+    ],
     "_prefab": {
-      "__id__": 5
+      "__id__": 9
     },
     "_opacity": 255,
     "_color": {
@@ -75,7 +82,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "skeleton",
+    "_name": "mask",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -90,6 +97,113 @@
     "_prefab": {
       "__id__": 4
     },
+    "_opacity": 200,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1920,
+      "height": 1080
+    },
+    "_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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "f6aace52-c6f1-417b-a839-fde3c205f9d6"
+    },
+    "_type": 1,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "8dNQBNAh9E97y/EdTXOupL",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "skeleton",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 6
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
@@ -142,7 +256,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 5
     },
     "_enabled": true,
     "_materials": [
@@ -188,6 +302,16 @@
     "fileId": "773nu47W9KRIk2SeNjYEqp",
     "sync": false
   },
+  {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "_id": ""
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {

package/drres/prefab/HelperWin.prefab.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.3.2",
+  "uuid": "120edc35-743b-4658-a087-bdd9ae1233ad",
+  "importer": "prefab",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

package/drscript/HelperWin.ts

@@ -7,8 +7,7 @@ const { ccclass, property } = cc._decorator;
 
 @ccclass
 export default class HelperWin extends cc.Component {
-    @property(sp.Skeleton)
-    spine: sp.Skeleton = null;
+    private spine: sp.Skeleton = null;
 
     private nativeBackHandler: () => boolean = null;
 

package/drscript/PlatformAdapter.ts

@@ -262,20 +262,18 @@ export class PlatformAdapter {
             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();
+        if (AdSdk.exitGame) AdSdk.exitGame();
+        cc.game.end();
+        // var GRoot = window['GRoot'];
+        // let bridge: ILobbyBridge = GRoot && GRoot.inst.node.getComponentInChildren('LobbyBridge');
+        // bridge && bridge.exitGame();
     }
 
-    /** 显示玩法说明界面
-     * @param url 玩法说明界面spine动画资源路径, 相对于resources/spine/目录
-     * @param cb 关闭玩法说明界面回调
-     */
-    public static async showHelperWin(url: string, cb: () => void) {
+    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, true);
+            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();