Merge branch 'master' of git.mokasz.com:zouyong/team1_nc

assets/resources/game/coregame/coregame.prefab

@@ -33226,8 +33226,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -38439,8 +38439,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -43780,8 +43780,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -48990,8 +48990,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -54203,8 +54203,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -59544,8 +59544,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -64754,8 +64754,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -69967,8 +69967,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -75308,8 +75308,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -80518,8 +80518,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -85731,8 +85731,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -91072,8 +91072,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -96282,8 +96282,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -101495,8 +101495,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -106836,8 +106836,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -112046,8 +112046,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -117259,8 +117259,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,
@@ -122600,8 +122600,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -3,
+        -1,
         0,
         0,
         0,

assets/resources/module/newNotice/newNotice.prefab

@@ -24,6 +24,9 @@
     "_active": true,
     "_components": [
       {
+        "__id__": 64
+      },
+      {
         "__id__": 65
       },
       {
@@ -31,13 +34,10 @@
       },
       {
         "__id__": 67
-      },
-      {
-        "__id__": 68
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 68
     },
     "_opacity": 255,
     "_color": {
@@ -125,11 +125,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 63
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 63
     },
     "_opacity": 255,
     "_color": {
@@ -229,7 +229,7 @@
         1,
         1,
         1,
-        1
+        0
       ]
     },
     "_eulerAngles": {
@@ -278,22 +278,75 @@
     "_id": ""
   },
   {
-    "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
+    "__type__": "cc.Button",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 3
     },
     "_enabled": true,
-    "node_panel": {
-      "__id__": 1
-    },
-    "transition_type": 0,
-    "onComplete": [
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
       {
         "__id__": 6
       }
     ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": null,
     "_id": ""
   },
   {
@@ -1982,13 +2035,10 @@
       },
       {
         "__id__": 59
-      },
-      {
-        "__id__": 60
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 61
     },
     "_opacity": 255,
     "_color": {
@@ -2021,7 +2071,7 @@
         1,
         1,
         1,
-        1
+        0
       ]
     },
     "_eulerAngles": {
@@ -2212,11 +2262,15 @@
     "_grayMaterial": null,
     "duration": 0.1,
     "zoomScale": 1.2,
-    "clickEvents": [],
+    "clickEvents": [
+      {
+        "__id__": 60
+      }
+    ],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
-    "_N$transition": 0,
-    "transition": 0,
+    "_N$transition": 3,
+    "transition": 3,
     "_N$normalColor": {
       "__type__": "cc.Color",
       "r": 255,
@@ -2269,25 +2323,6 @@
     "_id": ""
   },
   {
-    "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 53
-    },
-    "_enabled": true,
-    "node_panel": {
-      "__id__": 1
-    },
-    "transition_type": 3,
-    "onComplete": [
-      {
-        "__id__": 61
-      }
-    ],
-    "_id": ""
-  },
-  {
     "__type__": "cc.ClickEvent",
     "target": {
       "__id__": 1

assets/script/game/data/module/RedBagCashData.ts

@@ -1,6 +1,5 @@
 
 import { Data } from "../../../mk/data/Data";
-import JsbSystem from "../../../mk/system/JsbSystem";
 import { GameProp, RewardState } from "../GameData";
 /**
  * 红包提现数据

assets/script/game/module/cashPro/CashPro.ts

@@ -61,5 +61,6 @@ export default class CashPro extends cc.Component {
 
     clickCloseBtn() {
         gData.gameData.init_redBagTask = true;
+        mk.ui.closePanel('newNotice');
     }
 }

assets/script/game/module/login/Login.ts

@@ -65,7 +65,7 @@ export default class Login extends cc.Component {
     update() {
         if (!this.hasDeviceBackInit) {
             this.hasDeviceBackInit = true;
-            this.getDeviceInfoBack();
+            this.getAppVersion();
         }
 
         //如果更新没有结束,就不进入正常加载流程
@@ -174,7 +174,7 @@ export default class Login extends cc.Component {
     }
 
     /** 获取设备信息后 */
-    public async getDeviceInfoBack() {
+    public async getAppVersion() {
         //获取appid 和 配置version
         JsbSystem.getWxAppId();
         //获取登录需要的sessionkey

assets/script/game/module/newNotice/NewNotice.ts

@@ -30,9 +30,7 @@ export default class NewNotice extends cc.Component {
     }
 
     private clickCloseBtn() {
-        //mk.audio.playEffect("closeButton");
-        gData.gameData.init_redBagTask = true;
-
+        mk.audio.playEffect('button');
         gData.cashPro.openCashPro(gData.receiptNotice.receip_rmb);
         gData.cashPro.init_success = true;
     }