Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework into master

assets/resources/game/prefab/game.prefab

@@ -4120,7 +4120,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 217,
-      "height": 60
+      "height": 58
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4132,7 +4132,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        -1,
         0,
         0,
         0,
@@ -4175,7 +4175,7 @@
       "__uuid__": "146c87a4-54bc-43db-8e7a-c1e92835c69c"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -4229,8 +4229,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 89.39,
-      "height": 44.32
+      "width": 59.53,
+      "height": 48.36
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4241,8 +4241,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -6,
+        2.5,
         0,
         0,
         0,
@@ -4281,13 +4281,15 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "300元",
-    "_N$string": "300元",
-    "_fontSize": 32,
-    "_lineHeight": 32,
+    "_string": "0元",
+    "_N$string": "0元",
+    "_fontSize": 36,
+    "_lineHeight": 36,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -4314,7 +4316,7 @@
       "b": 0,
       "a": 255
     },
-    "_width": 2,
+    "_width": 1.5,
     "_id": ""
   },
   {
@@ -4635,7 +4637,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 217,
-      "height": 60
+      "height": 58
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4647,7 +4649,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        -1,
         0,
         0,
         0,
@@ -4690,7 +4692,7 @@
       "__uuid__": "146c87a4-54bc-43db-8e7a-c1e92835c69c"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -4744,8 +4746,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 92.98,
-      "height": 44.32
+      "width": 23.53,
+      "height": 48.36
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4756,8 +4758,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        -6,
+        2.5,
         0,
         0,
         0,
@@ -4796,13 +4798,15 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "22222",
-    "_N$string": "22222",
-    "_fontSize": 32,
-    "_lineHeight": 32,
+    "_string": "0",
+    "_N$string": "0",
+    "_fontSize": 36,
+    "_lineHeight": 36,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -4829,7 +4833,7 @@
       "b": 0,
       "a": 255
     },
-    "_width": 2,
+    "_width": 1.5,
     "_id": ""
   },
   {

assets/resources/module/pigBank/pigBank.prefab

@@ -688,7 +688,7 @@
       "ctor": "Float64Array",
       "array": [
         243.665,
-        -359.42,
+        -375,
         0,
         0,
         0,
@@ -1523,7 +1523,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 428,
+      "width": 460,
       "height": 60
     },
     "_anchorPoint": {
@@ -1536,7 +1536,7 @@
       "ctor": "Float64Array",
       "array": [
         -10.56,
-        -359.255,
+        -375,
         0,
         0,
         0,
@@ -1590,7 +1590,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 264,
+      "width": 284,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -1602,7 +1602,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -82,
+        -88,
         0,
         0,
         0,
@@ -1644,7 +1644,7 @@
     "_dstBlendFactor": 771,
     "_string": "每观看一个视频，都有",
     "_N$string": "每观看一个视频，都有",
-    "_fontSize": 26,
+    "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": {
@@ -1721,7 +1721,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 108,
+      "width": 116,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -1733,7 +1733,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        104,
+        112,
         0,
         0,
         0,
@@ -1775,7 +1775,7 @@
     "_dstBlendFactor": 771,
     "_string": "一笔现金",
     "_N$string": "一笔现金",
-    "_fontSize": 26,
+    "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": {
@@ -1852,7 +1852,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 56,
+      "width": 60,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -1864,7 +1864,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        186,
+        200,
         0,
         0,
         0,
@@ -1906,7 +1906,7 @@
     "_dstBlendFactor": 771,
     "_string": "存入",
     "_N$string": "存入",
-    "_fontSize": 26,
+    "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": {
@@ -1963,7 +1963,7 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 428,
+      "width": 460,
       "height": 60
     },
     "_resize": 1,

assets/resources/module/redBagCash/texture/close.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 53,
-  "height": 49,
+  "width": 88,
+  "height": 88,
   "platformSettings": {},
   "subMetas": {
     "close": {
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 53,
-      "height": 49,
-      "rawWidth": 53,
-      "rawHeight": 49,
+      "width": 88,
+      "height": 88,
+      "rawWidth": 88,
+      "rawHeight": 88,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/module/redBagCode/redBagCode.prefab

@@ -898,9 +898,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 146,
+      "g": 96,
+      "b": 72,
       "a": 255
     },
     "_contentSize": {

assets/resources/module/reward/reward.prefab

@@ -454,8 +454,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 58,
-      "height": 39.8
+      "width": 60,
+      "height": 41.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -536,12 +536,12 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 39,
+      "r": 207,
       "g": 110,
-      "b": 186,
+      "b": 3,
       "a": 255
     },
-    "_width": 1,
+    "_width": 2,
     "_id": ""
   },
   {
@@ -552,7 +552,7 @@
     "asset": {
       "__uuid__": "14193c60-068a-42b4-92cf-a6cb623fe40f"
     },
-    "fileId": "50AX0Mr0dJEpg5S1sxUhui",
+    "fileId": "da7lho9qNH2ZB/qccJ7nBS",
     "sync": false
   },
   {
@@ -571,7 +571,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "a833cf58-9d83-4c93-bc43-76a3a2110b3f"
+      "__uuid__": "fa82b822-09c5-49ed-ac06-d9ff17013b1f"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -679,7 +679,7 @@
     "asset": {
       "__uuid__": "14193c60-068a-42b4-92cf-a6cb623fe40f"
     },
-    "fileId": "8en+L8aJpIdIfKaeU0fmm3",
+    "fileId": "22G3V2YSJBt5kHm/Bxrm69",
     "sync": false
   },
   {
@@ -2089,8 +2089,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 258,
-      "height": 109
+      "width": 328,
+      "height": 137
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2273,7 +2273,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "14b76ceb-5063-4baf-b85e-159a06092a0e"
+      "__uuid__": "cb3cd092-c92d-4a3a-8805-93621d1c1a9b"
     },
     "_type": 0,
     "_sizeMode": 1,

assets/resources/module/reward/rewardLuck.prefab

@@ -454,8 +454,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 58,
-      "height": 39.8
+      "width": 60,
+      "height": 41.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -536,12 +536,12 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 39,
+      "r": 207,
       "g": 110,
-      "b": 186,
+      "b": 3,
       "a": 255
     },
-    "_width": 1,
+    "_width": 2,
     "_id": ""
   },
   {
@@ -552,7 +552,7 @@
     "asset": {
       "__uuid__": "eb3877a0-0566-4cd8-bb4e-fe5969e6f0e2"
     },
-    "fileId": "50AX0Mr0dJEpg5S1sxUhui",
+    "fileId": "d7+/uB2JtDTYhdLXeHf8UZ",
     "sync": false
   },
   {
@@ -571,7 +571,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "a833cf58-9d83-4c93-bc43-76a3a2110b3f"
+      "__uuid__": "fa82b822-09c5-49ed-ac06-d9ff17013b1f"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -679,7 +679,7 @@
     "asset": {
       "__uuid__": "eb3877a0-0566-4cd8-bb4e-fe5969e6f0e2"
     },
-    "fileId": "8en+L8aJpIdIfKaeU0fmm3",
+    "fileId": "09/48ULD1IPpZUKHJYtAP0",
     "sync": false
   },
   {
@@ -2089,8 +2089,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 258,
-      "height": 109
+      "width": 328,
+      "height": 137
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2273,7 +2273,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "14b76ceb-5063-4baf-b85e-159a06092a0e"
+      "__uuid__": "cb3cd092-c92d-4a3a-8805-93621d1c1a9b"
     },
     "_type": 0,
     "_sizeMode": 1,

assets/resources/module/reward/rewardMission.prefab

@@ -2089,8 +2089,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 258,
-      "height": 109
+      "width": 328,
+      "height": 137
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2273,7 +2273,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "14b76ceb-5063-4baf-b85e-159a06092a0e"
+      "__uuid__": "cb3cd092-c92d-4a3a-8805-93621d1c1a9b"
     },
     "_type": 0,
     "_sizeMode": 1,

assets/resources/module/reward/texture/button_big.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "3884bc38-27df-4707-ac5c-b80f451f6bc1",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 258,
+  "height": 109,
+  "platformSettings": {},
+  "subMetas": {
+    "button_big": {
+      "ver": "1.0.4",
+      "uuid": "cb3cd092-c92d-4a3a-8805-93621d1c1a9b",
+      "rawTextureUuid": "3884bc38-27df-4707-ac5c-b80f451f6bc1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 328,
+      "height": 137,
+      "rawWidth": 328,
+      "rawHeight": 137,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/script/before/view/uiItem/CellItem.ts

@@ -357,6 +357,7 @@ export default class CellItem extends cc.Component {
                 GamePlay.Inst.node_effectUI.addChild(node_scoreEnergy);
 
                 if (this.spr_redPackIcon.node.active && GamePlay.Inst.finalGetScore < GamePlay.Inst.targetScore) {
+                    gData.reward.subType = 2;
                     mk.ui.openPanel("module/reward/rewardLuck");
                 }
             }

assets/script/game/data/GameData.ts

@@ -216,21 +216,48 @@ export enum GameProp {
 class PlayerProp {
     /** 自定义不需要校验的数据 */
     gameUserData = 0;
-    /** 今日是否有签到 */
-    isSignInToday = 0;
+    
+    _isSignInToday = 0;
+    /**
+     * 今日是否有签到
+     * - 0 未签到，表示可以签到
+     * - 1 有签到，表示不可签到
+     */
+    set isSignInToday(value: number) {
+        this._isSignInToday = value;
+        gData.sign.init_data = true;
+    }
+    get isSignInToday(): number {
+        return this._isSignInToday;
+    }
 
     private _piggyBank: number = 0;
     /** 存钱罐存款 */
     set piggyBank(value: number) {
         this._piggyBank = value;
         gData.gameData.init_coin = true;
+        gData.pigbank.init_data = true;
     }
     get piggyBank(): number {
         return this._piggyBank;
     }
 
-    /** 存钱罐能否提现 */
-    isWithdrawable = 0;
+    _isWithdrawable = 0;
+    /**
+     * 存钱罐能否提现
+     * - 0 不能提现
+     * - 1 能提现
+     */
+    set isWithdrawable(value: number) {
+        if (this._isWithdrawable != value) {
+            this._isWithdrawable = value;
+            gData.pigbank.init_data = true;
+        }
+    }
+    get isWithdrawable(): number {
+        return this._isWithdrawable;
+    }
+
     /** 存钱罐每日提现次数 */
     piggyBankCashTimes = 0;
     /** 累计存钱罐每日提现次数 */
@@ -252,8 +279,16 @@ class PlayerProp {
     get redMoney(): number {
         return this._redMoney;
     }
+
+    _signInDay = 0;
     /** 累计签到次数 客户端理解 上次签到天数 */
-    signInDay = 0;
+    set signInDay(value: number) {
+        this._signInDay = value;
+        gData.sign.init_data = true;
+    }
+    get signInDay(): number {
+        return this._signInDay;
+    }
     /** 转盘次数 */
     turntableTimes = 0;
     /** 版本号 */

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

@@ -16,23 +16,10 @@ export class PigBankData extends Data {
      * 数据初始化
      */
     public init() {
-        // 提现状态
-        this.cash_enable = gData.gameData.gameData.isWithdrawable;
     }
 
     /** 标志位：是否需要刷新数据 */
     public init_data: boolean = true;
-    /** 是否可提现 */
-    private _cash_enable: number = 0;
-    set cash_enable(bool: number) {
-        if (this._cash_enable != bool) {
-            this._cash_enable = bool;
-            this.init_data = true;
-        }
-    }
-    get cash_enable(): number {
-        return this._cash_enable;
-    }
 
     /** 提现最低限制 */
     public cash_min_limit: number = 0.3;
@@ -59,7 +46,7 @@ export class PigBankData extends Data {
         else if (response.CashMode == 1) {//公众号打款
 
         }
-        this.cash_enable = 0;
+        gData.gameData.gameData.isWithdrawable = 0;
         
     }
 }

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

@@ -23,6 +23,13 @@ export class RewardData extends Data {
     }
 
     /**
+     * 气泡子红包类型
+     * - 1 主界面气泡、关卡气泡
+     * - 2 关卡消除
+     */
+    subType: number = 1;
+
+    /**
     * 奖励添加
     */
     public addReward() {

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

@@ -19,9 +19,6 @@ export class SignData extends Data {
             });
             this.c_sign = gData.gameData.configs.SignIn;
         }
-        // 服务端数据
-        this.sign_last_bar = gData.gameData.gameData.signInDay;
-        this.sign_can = gData.gameData.gameData.isSignInToday;
 
         // 客户端测试数据
         // this.sign_last_bar = gData.gameData.getProp(GameProp.sign_last_bar);
@@ -41,25 +38,6 @@ export class SignData extends Data {
         return this._c_sign;
     }
 
-    private _sign_last_bar = 0;
-    /** 上次签到天数 */
-    set sign_last_bar(value: number) {
-        this._sign_last_bar = value;
-        this.init_data = true;
-    }
-    get sign_last_bar(): number {
-        return this._sign_last_bar;
-    }
-
-    private _sign_can = 1;
-    /** 能够签到 */
-    set sign_can(value: number) {
-        this._sign_can = value;
-        this.init_data = true;
-    }
-    get sign_can(): number {
-        return this._sign_can;
-    }
 
     /** 签到列表数据 */
     public list_data: Array<Array<CSignType>> = [];
@@ -102,9 +80,9 @@ export class SignData extends Data {
      */
     public getStateByDay(login_day: number) {
         let _state = 0;
-        if (login_day <= this.sign_last_bar) {
+        if (login_day <= gData.gameData.gameData.signInDay) {
             _state = RewardState.none;
-        } else if (this.sign_can && login_day == (this.sign_last_bar + 1)) {
+        } else if (gData.gameData.gameData.isSignInToday == 0 && login_day == (gData.gameData.gameData.signInDay + 1)) {
             _state = RewardState.unlock;
         } else {
             _state = RewardState.lock;
@@ -117,7 +95,7 @@ export class SignData extends Data {
      * - 签到天数用完后将不可签到
      */
     public haveSignDay() {
-        if (this.sign_last_bar >= this.c_sign.length) {
+        if (gData.gameData.gameData.signInDay >= this.c_sign.length) {
             return false;
         } else {
             return true;
@@ -128,30 +106,28 @@ export class SignData extends Data {
      * 签到完成
      */
     public async signComplete() {
-        this.sign_can = 0;
-        this.sign_last_bar++;
         gData.gameData.gameData.signInDay++;
-        gData.gameData.gameData.isSignInToday = 0;
-        // 自定义状态
-        let new_data = [
-            {
-                key: GameProp.sign_can,
-                value: this.sign_can
-            },
-            {
-                key: GameProp.sign_last_bar,
-                value: this.sign_last_bar
-            }
-        ]
-        gData.gameData.setProps(new_data);
+        gData.gameData.gameData.isSignInToday = 1;
+        // // 自定义状态
+        // let new_data = [
+        //     {
+        //         key: GameProp.sign_can,
+        //         value: gData.gameData.gameData.isSignInToday
+        //     },
+        //     {
+        //         key: GameProp.sign_last_bar,
+        //         value: this.sign_last_bar
+        //     }
+        // ]
+        // gData.gameData.setProps(new_data);
         // 奖励展示
-        let reward_data = this.c_sign[this.sign_last_bar - 1];
+        let reward_data = this.c_sign[gData.gameData.gameData.signInDay - 1];
         if (reward_data.rewardType === RewardType.redBag) {
             // 红包
             gData.reward.data = [reward_data];// 数据列表
             mk.ui.openPanel('module/reward/reward')
         } else if (reward_data.rewardType === RewardType.rmb) {
-            // 陷阱提现
+            // 现金提现
             let data = {};
             let response = await mk.http.sendRequest('readyCash', 'POST', JSON.stringify(data));
             // let response = await mk.http.sendRequest('readyCash', 'POST', JSON.stringify(data));
@@ -159,7 +135,7 @@ export class SignData extends Data {
                 mk.tip.pop('系统异常');
                 return;
             }
-            
+
             if (response.CashMode == 0) {//星云打款
                 gData.receiptNotice.receip_rmb = reward_data.rewardNum;
                 gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
@@ -187,7 +163,7 @@ export class SignData extends Data {
             const i_count = this.list_data[i].length;
             for (let j = 0; j < i_count; j++) {
                 let state = this.getStateByDay(this.list_data[i][j].loginDay);
-                if (this.sign_can) {
+                if (gData.gameData.gameData.isSignInToday == 0) {
                     if (state === RewardState.unlock) {
                         index = i;
                         return index

assets/script/game/module/help/Help.ts

@@ -12,7 +12,6 @@ export default class Help extends cc.Component {
     lbl_desc: cc.Label = null;
 
     start(){
-        mk.audio.playEffect("button");
     }
 
     update() {

assets/script/game/module/pigBank/PigBank.ts

@@ -23,6 +23,11 @@ export default class PigBank extends cc.Component {
     start() {
         this.initCashDesc();
         mk.audio.playEffect("pigBank", false);
+        // let target_node = gData.gameData.gameStyle.icon_zb;
+        // const end_world_pos = target_node.parent.convertToWorldSpaceAR(target_node.getPosition());
+        // const end_node_pos = gData.gameData.gameStyle.node.parent.convertToNodeSpaceAR(end_world_pos);
+        // let start_node_pos = new cc.Vec2(0, -300);
+        // mk.fly.PlayCoinAnim(3, 10, start_node_pos, end_node_pos);
     }
 
     update(dt) {
@@ -43,7 +48,7 @@ export default class PigBank extends cc.Component {
      * 提现描述展示
      */
     private initCashDesc() {
-        if (gData.pigbank.cash_enable) {
+        if (gData.gameData.gameData.isWithdrawable) {
             this.lbl_get_desc.string = '直接提现';
             this.node_tip_anim.active = false;
             this.anim_btn_cash.play();
@@ -74,7 +79,10 @@ export default class PigBank extends cc.Component {
      */
     private clickCashOP() {
         mk.audio.playEffect("button");
-        if (!gData.pigbank.cash_enable) {
+        if (!gData.gameData.gameData.isWithdrawable) {
+            mk.tip.pop('明日可提现')
+            return;
+        } else if (gData.gameData.gameData.piggyBank < gData.pigbank.cash_min_limit) {
             mk.tip.pop('满' + gData.pigbank.cash_min_limit + '元可提现')
             return;
         }

assets/script/game/module/reward/Reward.ts

@@ -122,8 +122,8 @@ export default class Reward extends cc.Component {
      */
     private clickWatchVideo() {
         cc.log('看广告请求');
-        if (gData.reward.data[0] && gData.reward.data[0].rewardType === RewardType.redBag) {
-            // 关卡结算视频
+        if (this.lid_type === LidType.mission) {
+            // 关卡结算红包
             mk.ad.watchAd((success: boolean) => {
                 mk.console.log("watchAD:" + success);
                 if (success) {
@@ -131,16 +131,14 @@ export default class Reward extends cc.Component {
                 }
             });
         } else {
-            // 气泡视频
             mk.ad.watchAd((success: boolean) => {
                 mk.console.log("watchAD:" + success);
                 if (success) {
-                    gData.adData.watchVideo(AdFun.bubble);
+                    gData.adData.watchVideo(gData.reward.subType === 2 ? AdFun.checkpoint : AdFun.bubble);
+                    gData.reward.subType = null;
                 }
             });
         }
-        // 测试数据
-        // gData.reward.adData = gData.reward.data;
     }
 
     /**

assets/script/game/module/sign/Sign.ts

@@ -65,7 +65,7 @@ export default class Sign extends cc.Component {
      */
     private clickReceiveReward() {
         mk.audio.playEffect("button");
-        if (!gData.sign.sign_can) return;
+        if (gData.gameData.gameData.isSignInToday == 1) return;
         if (!gData.sign.haveSignDay()) return;
 
         // 看广告
@@ -96,7 +96,7 @@ export default class Sign extends cc.Component {
      * 初始化按钮样式
      */
     private initBtnStyle() {
-        if (gData.sign.sign_can && gData.sign.haveSignDay()) {
+        if (gData.gameData.gameData.isSignInToday == 0 && gData.sign.haveSignDay()) {
             this.anim_btn.play();
             this.anim_btn.getComponent('SetGray').setGray(false);
         } else {

assets/script/mk/system/FlySystem.ts

@@ -17,14 +17,14 @@ export default class FlySystem extends cc.Component {
      * @param endpos 飞行的目标坐标 或目标对象路径
      * @param cb 动画结束回调
     */
-    public async PlayCoinAnim(type: number = 0, num: number, pos: cc.Vec2, endpos: cc.Vec2 | string, cb: Function = null) {
+    public async PlayCoinAnim(type: number = 0, num: number, pos: cc.Vec2, endpos: cc.Vec2 | string, item_cb: Function = null) {
         for (let i = 0; i < num; i++) {
             let copyCoin = await mk.pool.getPrefab('game/prefab/coin');
             let url = 'game/texture/coin/' + type;
             let sf = await mk.loader.load(url, cc.SpriteFrame);
             copyCoin.getComponent(cc.Sprite).spriteFrame = sf;
             copyCoin.setParent(this.node);
-            copyCoin.scale = mk.math.random(0.8, 1.2, false);
+            copyCoin.scale = mk.math.random(0.56, 0.84, false);
             copyCoin.angle = mk.math.random(-45, 45, false);
             let dir = cc.v2(mk.math.random(-1, 1, false), mk.math.random(-1, 1, false));
             dir = dir.normalize();
@@ -32,20 +32,20 @@ export default class FlySystem extends cc.Component {
             let initPos = pos.add(deltaInit);
             copyCoin.setPosition(pos);
 
-            this.FlyIn(copyCoin, initPos, endpos, cb);
+            this.FlyIn(type, copyCoin, initPos, endpos, item_cb);
         }
     }
 
-    private FlyIn(target: cc.Node, end: cc.Vec2, endpos: cc.Vec2 | string = null, cb: Function = null) {
+    private FlyIn(type: number, target: cc.Node, end: cc.Vec2, endpos: cc.Vec2 | string = null, item_cb: Function = null) {
         cc.tween(target)
             .to(mk.math.random(0.3, 0.6, false), { position: cc.v3(end) }, cc.easeSineInOut())
             .call(() => {
-                this.FlyOut(target, endpos, cb);
+                this.FlyOut(type, target, endpos, item_cb);
             })
             .start();
     }
 
-    private FlyOut(target: cc.Node, end: cc.Vec2 | string, cb: Function = null) {
+    private FlyOut(type: number, target: cc.Node, end: cc.Vec2 | string, item_cb: Function = null) {
         let dur = mk.math.random(0.3, 1, false);
         cc.tween(target)
             .to(dur, { scale: 0.8 })
@@ -71,11 +71,31 @@ export default class FlySystem extends cc.Component {
                     cc.tween(end_node).to(0.1, { scale: 1.2 }).to(0.05, { scale: 1 }).start();
                 }
 
-                if (cb != null) {
-                    cb();
+                if (item_cb != null) {
+                    item_cb();
+                    this.iconScale(type);
                 }
             })
             .start();
     }
+
+    /**
+     * icon缩放动画
+     * @param type icon类型
+     * @returns 
+     */
+    private iconScale(type: number) {
+        let node;
+        if (type === 1) {
+            node = gData.gameData.gameStyle.icon_hb;
+        } else if (type === 3) {
+            node = gData.gameData.gameStyle.icon_zb;
+        }
+        if (!node) return;
+        let scale1 = cc.tween().to(0.05, { scale: 0.9 });
+        let scale2 = cc.tween().to(0.05, { scale: 1 });
+        let seque = cc.tween().sequence(scale1, scale2);
+        cc.tween(node).then(seque).repeat(2).start();
+    }
 }
 

build/.gitignore

@@ -0,0 +1 @@
+/jsb-default