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

assets/resources/module/turnable/turnable.prefab

@@ -314,8 +314,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 53,
-      "height": 49
+      "width": 88,
+      "height": 88
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2012,7 +2012,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "5842DuYrxPr6sP4i61F2qV",
+    "fileId": "19SbS9OXFJhYv9RHMGVIuA",
     "sync": false
   },
   {
@@ -2144,7 +2144,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "f43OPjgtFGzIDThuBNUqDz",
+    "fileId": "f1kK+NbW9Ar7k08ThAapN6",
     "sync": false
   },
   {
@@ -2276,7 +2276,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "7eeZac7yxKt4Rx5P2Zl9Ll",
+    "fileId": "8fXbJbkx5DnpE0hVkTN8ZJ",
     "sync": false
   },
   {
@@ -2489,7 +2489,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "3d+JpJ5f1NLKiF9y9hN2st",
+    "fileId": "c8uKfKMOFPvohBehzJrJQ5",
     "sync": false
   },
   {
@@ -3567,8 +3567,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        2.5,
+        2.5,
         1
       ]
     },

assets/script/before/mgr/PoolMgr.ts

@@ -203,14 +203,10 @@ export enum NODEPOOLPREFABTYPE {
     Hammer = 7,
     /**变化特效 */
     Change = 8,
-    /**提现 */
-    CashOutItem = 9,
     /**提示item */
     TipItemUI = 10,
     /**目标达成 */
     GetTargetScoreTip = 11,
-    /**关卡红包 */
-    LevelRedPacketItem = 12,
     /**得分 */
     GetScore = 13,
     /**图片提示item */

assets/script/game/component/NumberAnim.ts

@@ -0,0 +1,78 @@
+
+const { ccclass, property } = cc._decorator;
+/**
+ * 数字跳动动画
+ * @author 薛鸿潇
+ */
+@ccclass
+export default class NumberAnim extends cc.Component {
+
+    /** 动画目标 */
+    private lbl_count: cc.Label = null;
+    onLoad() {
+        this.lbl_count = this.node.getComponent(cc.Label) || this.node.addComponent(cc.Label);
+    }
+
+    /**
+     * 设置数值
+     * @param new_value 目标值
+     */
+    public setValue(new_value: number) {
+        let time = new_value - this.targetProgress;
+        this.targetProgress = new_value;
+        this.PlayMoneyAni(0.3)
+    }
+
+    //////////////////////////////////数字滚动效果//////////////////////////////////
+    /** 滚动的目标值 */
+    private targetProgress: number = 0;
+
+    private delta: number = 0;
+    /** 滚动中的数字 */
+    private curValue: number = 0;
+    private curTime: number = 0;
+    private totalTime: number = 0;
+    /** 上次值 */
+    private lastNum: number = 0;
+    /** 动画中 */
+    private isPlayAni: boolean = false;
+
+    private PlayMoneyAni(time) {
+        this.totalTime = time;
+        this.delta = (this.targetProgress - this.lastNum) / time;
+        this.curValue = this.lastNum;
+        this.curTime = 0;
+        // console.log("--->Update Time: " + time + " delta: " + this.delta + " curValue: " + this.curValue + " lastNum: " + this.lastNum);
+        this.isPlayAni = true;
+    }
+
+    private PlayMoneyAniUpdate(dt) {
+        if (this.isPlayAni) {
+            if (this.curTime < this.totalTime) {
+                this.curTime += dt;
+                this.curValue += this.delta * dt;
+                if (this.curValue >= this.targetProgress) {
+                    this.isPlayAni = false;
+                    this.curValue = this.targetProgress;
+                    this.lastNum = this.targetProgress;
+                }
+                // console.log("-->CurValue:" + this.curValue);
+            } else {
+                this.isPlayAni = false;
+                this.curTime = this.totalTime;
+                //this.unschedule(this.UpdateAni);
+                this.curValue = this.targetProgress;
+                this.lastNum = this.targetProgress;
+            }
+            if (this.curValue == this.targetProgress) {
+                this.lbl_count.string = `${this.targetProgress}`;
+            } else {
+                this.lbl_count.string = `${this.curValue.toFixed(0)}`;
+            }
+        }
+    }
+
+    update(dt) {
+        this.PlayMoneyAniUpdate(dt);
+    }
+}

assets/script/game/component/NumberAnim.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "88626179-665f-4120-a8e6-29a625c91587",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

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

@@ -6,17 +6,14 @@ import { RewardType } from "../GameData";
  * @author 邹勇 薛鸿潇
  */
 export class RewardData extends Data {
-    /** 
-     * 标志位 
-     * - 初始化提现样式
-    */
-    public init_cash_style: boolean = true;
+    
+    /** 增加的红包币 */
+    public add_redbag_value: number = 0;
 
     private _data: Array<any> = [];
     /** 奖励列表 */
     set data(value: Array<any>) {
         this._data = value;
-        this.init_cash_style = true;
     }
     get data(): Array<any> {
         return this._data;
@@ -43,5 +40,29 @@ export class RewardData extends Data {
                 gData.gameData.gameData.piggyBank += gData.reward.data[i].rewardNum;
             }
         }
+        gData.reward.data = [];
+    }
+
+    public flyCoinAnim() {
+        if (!gData.reward.data || !gData.reward.data.length) return;
+        let is_add_money = true;
+        const i_count = gData.reward.data.length;
+        for (let i = 0; i < i_count; i++) {
+            let target_node = gData.gameData.gameStyle.icon_hb;
+            if (gData.reward.data[i].rewardType == RewardType.redBag) {
+                target_node = gData.gameData.gameStyle.icon_hb;
+            } else if (gData.reward.data[i].rewardType == RewardType.rmb) {
+                // target_node = gData.gameData.gameStyle.icon_zb;
+            } else if (gData.reward.data[i].rewardType == RewardType.pigRmb) {
+                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(gData.reward.data[i].rewardType, 10, start_node_pos, end_world_pos, () => {
+                is_add_money && this.addReward();
+            })
+        }
+
     }
 }

assets/script/game/game/Game.ts

@@ -61,7 +61,7 @@ export default class Game extends cc.Component {
 
     update() {
         if (gData.gameData.init_coin) {
-            this.initInfo();
+            this.runMoneyAnim();
         }
 
         if (gData.gameData.init_head) {
@@ -69,7 +69,6 @@ export default class Game extends cc.Component {
         }
     }
     lateUpdate() {
-        gData.gameData.init_coin = false;
         gData.gameData.init_head = false;
     }
 
@@ -99,12 +98,24 @@ export default class Game extends cc.Component {
     private initInfo() {
         this.lbl_redMoney.string = gData.gameData.gameData.redMoney + "";
         this.lbl_rmb.string = gData.gameData.gameData.piggyBank + "";
+        gData.gameData.init_coin = false;
+    }
+
+    /**
+     * 货币变更动画
+     */
+     private runMoneyAnim() {
+        this.lbl_redMoney.getComponent('NumberAnim').setValue(gData.gameData.gameData.redMoney);
+        this.lbl_rmb.getComponent('NumberAnim').setValue(gData.gameData.gameData.piggyBank);
+        gData.gameData.init_coin = false;
+        // gData.gameData.init_coin = false;
     }
 
     private async initHead() {
         let result = await mk.loader.loadRemote(gData.wechatData.avatar + "?aaa=aa.jpg", null);
         this.img_head.spriteFrame = new cc.SpriteFrame(result);
     }
+    
 
     //测试道具获取效果
     private testFly() {
@@ -124,6 +135,7 @@ export default class Game extends cc.Component {
             mk.tip.pop("请先点击头像,在设置界面授权");
             return;
         }
+        console.log("=== 分享图片");
         JsbSystem.sharePic();
     }
 }

assets/script/game/module/blessingBag/BlessingBag.ts

@@ -121,7 +121,8 @@ export default class BlessingBag extends cc.Component {
 
         if (gData.blessingBag.isPlayAniUpdate) {
             if (this.lastNum < data.cumulativeAmount) {
-                mk.fly.PlayCoinAnim(1, 10, this.btnAd.getPosition(), this.btnCash.getPosition(), () => {
+                let world_pos = this.btnCash.parent.convertToWorldSpaceAR(this.btnCash.getPosition());
+                mk.fly.PlayCoinAnim(1, 10, this.btnAd.getPosition(), world_pos, () => {
                     this.aniBigAdBtn.setCurrentTime(0);
                     this.aniBigAdBtn.play();
                 });

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

@@ -23,11 +23,13 @@ export default class PigBank extends cc.Component {
     start() {
         this.initCashDesc();
         mk.audio.playEffect("pigBank", false);
-        // let target_node = gData.gameData.gameStyle.icon_zb;
+        // let target_node = gData.gameData.gameStyle.icon_hb;
         // 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);
+        // mk.fly.PlayCoinAnim(1, 10, start_node_pos, end_node_pos, () => {
+        //     if (!gData.gameData.init_coin) gData.gameData.gameData.redMoney = 1234
+        // });
     }
 
     update(dt) {

assets/script/game/module/redeem/RedeemNode.ts

@@ -57,6 +57,10 @@ export default class RedeemNode extends cc.Component {
 
     InitData() {
         let data = gData.redeem.redeemData.redemption;
+        if (!data.content) {
+            mk.ui.closePanel('module/redeem/RedeemNode');
+            return
+        }
         this.txtGiftName.string = data.title;
         this.rewardData = data.content;
         for (let n of this.rds) {

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

@@ -61,12 +61,13 @@ export default class Reward extends cc.Component {
     start() {
         /** 盖子 */
         this.initLid();
-        gData.reward.init_cash_style = true;
+        // gData.gameData.gameData.redMoney = 1500;// 测试数据
+        this.initCashOutStyle(gData.gameData.gameData.redMoney);
     }
 
     update(dt) {
-        if (gData.reward.init_cash_style) {
-            this.initCashOutStyle();
+        if (gData.reward.add_redbag_value) {
+            this.initCashOutStyle(gData.gameData.gameData.redMoney + gData.reward.add_redbag_value);
         }
         if (gData.reward.adData) {
             // 展示奖励
@@ -76,7 +77,7 @@ export default class Reward extends cc.Component {
     }
 
     lateUpdate() {
-        gData.reward.init_cash_style = null;
+        gData.reward.add_redbag_value = 0;
         gData.reward.adData = null;
     }
 
@@ -107,16 +108,18 @@ export default class Reward extends cc.Component {
     /**
      * 底部提现相关样式
      */
-    private initCashOutStyle() {
+    private initCashOutStyle(redMoney: number = 0) {
         const cash_bar = gData.redBagCash.cash_bar;
         let cash_data = gData.redBagCash.getItemDataByIndex(cash_bar);
         if (!cash_data) return;
 
         this.lbl_cash.string = cash_data.money / 100 + '元';
-        this.lbl_cash_out.string = gData.gameData.gameData.redMoney + '/' + cash_data.type_value;
-        this.spr_cash_out.fillRange = gData.gameData.gameData.redMoney / cash_data.type_value;
+        this.lbl_cash_out.string = redMoney + '/' + cash_data.type_value;
+        const fillRange = redMoney / cash_data.type_value >= 1 ? 1 : redMoney / cash_data.type_value;
+        // this.spr_cash_out.fillRange = fillRange;
+        cc.tween(this.spr_cash_out).to(fillRange, { fillRange: fillRange }).start();
     }
-
+    
     /**
      * 看广告
      */
@@ -139,6 +142,9 @@ export default class Reward extends cc.Component {
                 }
             });
         }
+        // gData.reward.adData = {}
+        // gData.reward.adData.videoRedMoney = {}
+        // gData.reward.adData.videoRedMoney.videoRewardList = [{ rewardType: 3, rewardNum: 1000 }, { rewardType: 1, rewardNum: 1000 }]// 测试数据
     }
 
     /**
@@ -147,6 +153,7 @@ export default class Reward extends cc.Component {
     private async watchVideoCall() {
         if (gData.reward.adData) {
             // 气泡视频奖励 通关视频奖励 
+            // gData.reward.adData.videoRedMoney.videoRewardList = [{ rewardType: 3, rewardNum: 1000 }, { rewardType: 1, rewardNum: 1000 }]// 测试数据
             gData.reward.data = gData.reward.adData.videoRedMoney.videoRewardList;
         }
         if (!gData.reward.data || !gData.reward.data.length) return;
@@ -164,7 +171,7 @@ export default class Reward extends cc.Component {
                 }
             }
         }
-        
+
         // 图标展示
         if (gData.reward.data[0].rewardType === RewardType.redBag) {
             this.node_coin.spriteFrame = await mk.loader.load('game/texture/coin/' + RewardType.redBag, cc.SpriteFrame);
@@ -183,6 +190,11 @@ export default class Reward extends cc.Component {
         this.node_luck.active = false;
         this.node_mission.active = false;
         this.btn_watch_video.node.active = false;
+
+        // 底部进度动画
+        if (gData.reward.data[0].rewardType === RewardType.redBag) {
+            gData.reward.add_redbag_value = gData.reward.data[0].rewardNum;
+        }
     }
 
     /**
@@ -190,9 +202,7 @@ export default class Reward extends cc.Component {
      */
     private clickGetReward() {
         cc.log('获取奖励：', gData.reward.data);
-        gData.reward.addReward();
-        this.flyCoinAnim();
-        gData.reward.data = [];
+        gData.reward.flyCoinAnim();
     }
 
     /**
@@ -203,24 +213,6 @@ export default class Reward extends cc.Component {
         mk.ui.openPanel(path);
     }
 
-    /**
-     * 飞coin动画
-     */
-    private flyCoinAnim() {
-        if (!gData.reward.data || !gData.reward.data.length) return;
-        let target_node = gData.gameData.gameStyle.icon_hb;
-        if (gData.reward.data[0].rewardType == RewardType.redBag) {
-            target_node = gData.gameData.gameStyle.icon_hb;
-        } else if (gData.reward.data[0].rewardType == RewardType.rmb) {
-            // target_node = gData.gameData.gameStyle.icon_zb;
-        } else if (gData.reward.data[0].rewardType == RewardType.pigRmb) {
-            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(gData.reward.data[0].rewardType, 10, start_node_pos, end_node_pos)
-    }
 
     /**
      * 下一关操作

assets/script/mk/system/FlySystem.ts

@@ -10,11 +10,12 @@ export default class FlySystem extends cc.Component {
         mk.fly = this;
     }
 
+    private is_new_cb = true;
     /**
      * @param type 类型 道具id  10001，10002
      * @param num 特效数量
      * @param pos 起始位置
-     * @param endpos 飞行的目标坐标 或目标对象路径
+     * @param endpos 飞行目标的世界坐标 或目标对象路径
      * @param cb 动画结束回调
     */
     public async PlayCoinAnim(type: number = 0, num: number, pos: cc.Vec2, endpos: cc.Vec2 | string, item_cb: Function = null) {
@@ -34,6 +35,7 @@ export default class FlySystem extends cc.Component {
 
             this.FlyIn(type, copyCoin, initPos, endpos, item_cb);
         }
+        this.is_new_cb = true;
     }
 
     private FlyIn(type: number, target: cc.Node, end: cc.Vec2, endpos: cc.Vec2 | string = null, item_cb: Function = null) {
@@ -59,7 +61,7 @@ export default class FlySystem extends cc.Component {
             end_pos = this.node.convertToNodeSpaceAR(world_pos);
         }
         else {
-            end_pos = end as cc.Vec2;
+            end_pos = this.node.convertToNodeSpaceAR(end);
         }
 
         cc.tween(target)
@@ -72,9 +74,10 @@ export default class FlySystem extends cc.Component {
                 }
 
                 if (item_cb != null) {
-                    item_cb();
-                    this.iconScale(type);
+                    this.is_new_cb && item_cb();
+                    this.is_new_cb = false;
                 }
+                this.iconScale(type);
             })
             .start();
     }

assets/script/mk/system/JsbSystem.ts

@@ -236,7 +236,7 @@ export default class JsbSystem {
             this.callStaticMethod("GameConfig", "installApk:", "");
         }
     }
-  
+
     /** 
      * 是否可以启动游戏
      * @param packageName 包名
@@ -343,7 +343,7 @@ export default class JsbSystem {
             return
         }
         if (cc.sys.os == cc.sys.OS_ANDROID) {
-            jsb.reflection.callStaticMethod("org/cocos2dx/javascript/config/TTAdManagerHolder", "sharePic", "()V");
+            jsb.reflection.callStaticMethod(this._JSB_ANDROID_PATH, "sharePic", "()V");
         }
         else if (cc.sys.os == cc.sys.OS_IOS) {
             jsb.reflection.callStaticMethod("GameConfig", "sharePic:", "");

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java

@@ -44,6 +44,7 @@ public class ThirdSdkMgr {
     /** 分享图 */
     public static  void sharePic()
     {
+        Log.d("=== Android","微信分享大图");
         WXEntryActivity.getInstance().sharePic();
     }
 

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -5012,7 +5012,10 @@ a.default.Inst.initScore();
 var g = l.default.Inst.getPoolPrefab(l.NODEPOOLPREFABTYPE.ScoreEnergy);
 g.getComponent(h.default).init(y, _, u);
 a.default.Inst.node_effectUI.addChild(g);
-this.spr_redPackIcon.node.active && a.default.Inst.finalGetScore < a.default.Inst.targetScore && mk.ui.openPanel("module/reward/rewardLuck");
+if (this.spr_redPackIcon.node.active && a.default.Inst.finalGetScore < a.default.Inst.targetScore) {
+gData.reward.subType = 2;
+mk.ui.openPanel("module/reward/rewardLuck");
+}
 }
 }
 this.spr_redPackIcon.node.active && (this.spr_redPackIcon.node.active = !1);
@@ -6285,13 +6288,13 @@ case 3:
 l = c.sent();
 a.getComponent(cc.Sprite).spriteFrame = l;
 a.setParent(this.node);
-a.scale = mk.math.random(.8, 1.2, !1);
+a.scale = mk.math.random(.56, .84, !1);
 a.angle = mk.math.random(-45, 45, !1);
 u = (u = cc.v2(mk.math.random(-1, 1, !1), mk.math.random(-1, 1, !1))).normalize();
 p = cc.v2(mk.math.random(10, 160, !1) * u.x, mk.math.random(10, 160, !1) * u.y);
 d = n.add(p);
 a.setPosition(n);
-this.FlyIn(a, d, o, i);
+this.FlyIn(t, a, d, o, i);
 c.label = 4;
 
 case 4:
@@ -6304,40 +6307,56 @@ return [ 2 ];
 });
 });
 };
-e.prototype.FlyIn = function(t, e, n, o) {
-var i = this;
-void 0 === n && (n = null);
+e.prototype.FlyIn = function(t, e, n, o, i) {
+var r = this;
 void 0 === o && (o = null);
-cc.tween(t).to(mk.math.random(.3, .6, !1), {
-position: cc.v3(e)
+void 0 === i && (i = null);
+cc.tween(e).to(mk.math.random(.3, .6, !1), {
+position: cc.v3(n)
 }, cc.easeSineInOut()).call(function() {
-i.FlyOut(t, n, o);
+r.FlyOut(t, e, o, i);
 }).start();
 };
-e.prototype.FlyOut = function(t, e, n) {
-void 0 === n && (n = null);
-var o = mk.math.random(.3, 1, !1);
-cc.tween(t).to(o, {
+e.prototype.FlyOut = function(t, e, n, o) {
+var i = this;
+void 0 === o && (o = null);
+var r = mk.math.random(.3, 1, !1);
+cc.tween(e).to(r, {
 scale: .8
 }).start();
-var i = null, r = null;
-if ("string" == typeof e) {
-var a = (r = cc.find(e)).parent.convertToWorldSpaceAR(r.getPosition());
-i = this.node.convertToNodeSpaceAR(a);
-} else i = e;
-cc.tween(t).to(o, {
-position: cc.v3(i)
+var a = null, c = null;
+if ("string" == typeof n) {
+var s = (c = cc.find(n)).parent.convertToWorldSpaceAR(c.getPosition());
+a = this.node.convertToNodeSpaceAR(s);
+} else a = n;
+cc.tween(e).to(r, {
+position: cc.v3(a)
 }, cc.easeSineOut()).call(function() {
-console.log("end_pos  ", t.position);
-mk.pool.return("game/prefab/coin", t);
-r && cc.tween(r).to(.1, {
+console.log("end_pos  ", e.position);
+mk.pool.return("game/prefab/coin", e);
+c && cc.tween(c).to(.1, {
 scale: 1.2
 }).to(.05, {
 scale: 1
 }).start();
-null != n && n();
+if (null != o) {
+o();
+i.iconScale(t);
+}
 }).start();
 };
+e.prototype.iconScale = function(t) {
+var e;
+1 === t ? e = gData.gameData.gameStyle.icon_hb : 3 === t && (e = gData.gameData.gameStyle.icon_zb);
+if (e) {
+var n = cc.tween().to(.05, {
+scale: .9
+}), o = cc.tween().to(.05, {
+scale: 1
+}), i = cc.tween().sequence(n, o);
+cc.tween(e).then(i).repeat(2).start();
+}
+};
 return r([ s ], e);
 }(cc.Component);
 n.default = l;
@@ -7139,9 +7158,9 @@ t[t.redBag_cash_bar = 220] = "redBag_cash_bar";
 var c = function() {
 function t() {
 this.gameUserData = 0;
-this.isSignInToday = 0;
+this._isSignInToday = 0;
 this._piggyBank = 0;
-this.isWithdrawable = 0;
+this._isWithdrawable = 0;
 this.piggyBankCashTimes = 0;
 this.totalPiggyBankCashTimes = 0;
 this.cashIndex = 0;
@@ -7149,7 +7168,7 @@ this.lastTime = 0;
 this.loginDays = 0;
 this.newPlayer = 0;
 this._redMoney = 0;
-this.signInDay = 0;
+this._signInDay = 0;
 this.turntableTimes = 0;
 this.versioncfg = 0;
 this.userTuCaoInfo = 0;
@@ -7158,6 +7177,17 @@ this.hammerPropNum = 0;
 this.resetPropNum = 0;
 this.changePropNum = 0;
 }
+Object.defineProperty(t.prototype, "isSignInToday", {
+get: function() {
+return this._isSignInToday;
+},
+set: function(t) {
+this._isSignInToday = t;
+gData.sign.init_data = !0;
+},
+enumerable: !1,
+configurable: !0
+});
 Object.defineProperty(t.prototype, "piggyBank", {
 get: function() {
 return this._piggyBank;
@@ -7165,6 +7195,20 @@ return this._piggyBank;
 set: function(t) {
 this._piggyBank = t;
 gData.gameData.init_coin = !0;
+gData.pigbank.init_data = !0;
+},
+enumerable: !1,
+configurable: !0
+});
+Object.defineProperty(t.prototype, "isWithdrawable", {
+get: function() {
+return this._isWithdrawable;
+},
+set: function(t) {
+if (this._isWithdrawable != t) {
+this._isWithdrawable = t;
+gData.pigbank.init_data = !0;
+}
 },
 enumerable: !1,
 configurable: !0
@@ -7180,6 +7224,17 @@ gData.gameData.init_coin = !0;
 enumerable: !1,
 configurable: !0
 });
+Object.defineProperty(t.prototype, "signInDay", {
+get: function() {
+return this._signInDay;
+},
+set: function(t) {
+this._signInDay = t;
+gData.sign.init_data = !0;
+},
+enumerable: !1,
+configurable: !0
+});
 return t;
 }();
 (function(t) {
@@ -8464,7 +8519,10 @@ e.prototype.onClickStart = function() {
 this.node_gameplay.active = !0;
 };
 e.prototype.onClickShare = function() {
-gData.loginData.isAuth ? s.default.sharePic() : mk.tip.pop("请先点击头像,在设置界面授权");
+if (gData.loginData.isAuth) {
+console.log("=== 分享图片");
+s.default.sharePic();
+} else mk.tip.pop("请先点击头像,在设置界面授权");
 };
 r([ d({
 type: cc.Node,
@@ -9051,9 +9109,7 @@ var e = null !== t && t.apply(this, arguments) || this;
 e.lbl_desc = null;
 return e;
 }
-e.prototype.start = function() {
-mk.audio.playEffect("button");
-};
+e.prototype.start = function() {};
 e.prototype.update = function() {
 gData.help.init_desc_name && (this.lbl_desc.string = gData.help.des);
 };
@@ -9433,7 +9489,7 @@ t.ShareToMiniGame = function() {
 cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "ShareToMiniGame", "()V") : cc.sys.os == cc.sys.OS_IOS && this.callStaticMethod("AppController", "WxAuth", "");
 };
 t.sharePic = function() {
-cc.sys.platform != cc.sys.WECHAT_GAME && (cc.sys.os == cc.sys.OS_ANDROID ? jsb.reflection.callStaticMethod("org/cocos2dx/javascript/config/TTAdManagerHolder", "sharePic", "()V") : cc.sys.os == cc.sys.OS_IOS && jsb.reflection.callStaticMethod("GameConfig", "sharePic:", ""));
+cc.sys.platform != cc.sys.WECHAT_GAME && (cc.sys.os == cc.sys.OS_ANDROID ? jsb.reflection.callStaticMethod(this._JSB_ANDROID_PATH, "sharePic", "()V") : cc.sys.os == cc.sys.OS_IOS && jsb.reflection.callStaticMethod("GameConfig", "sharePic:", ""));
 };
 t.downFile2Local = function(t, e, n, o, i) {
 var r = jsb.fileUtils.getWritablePath() + e;
@@ -11955,26 +12011,10 @@ i(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.init_data = !0;
-e._cash_enable = 0;
 e.cash_min_limit = .3;
 return e;
 }
-e.prototype.init = function() {
-this.cash_enable = gData.gameData.gameData.isWithdrawable;
-};
-Object.defineProperty(e.prototype, "cash_enable", {
-get: function() {
-return this._cash_enable;
-},
-set: function(t) {
-if (this._cash_enable != t) {
-this._cash_enable = t;
-this.init_data = !0;
-}
-},
-enumerable: !1,
-configurable: !0
-});
+e.prototype.init = function() {};
 e.prototype.cashOP = function() {
 return r(this, void 0, void 0, function() {
 var t, e;
@@ -11994,7 +12034,7 @@ gData.receiptNotice.receip_rmb = gData.gameData.gameData.piggyBank;
 gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
 mk.ui.openPanel("module/receiptNotice/receiptNotice");
 } else e.CashMode;
-this.cash_enable = 0;
+gData.gameData.gameData.isWithdrawable = 0;
 return [ 2 ];
 }
 });
@@ -12168,7 +12208,7 @@ gData.pigbank.init_data = !1;
 gData.pigbank.adData = null;
 };
 e.prototype.initCashDesc = function() {
-if (gData.pigbank.cash_enable) {
+if (gData.gameData.gameData.isWithdrawable) {
 this.lbl_get_desc.string = "直接提现";
 this.node_tip_anim.active = !1;
 this.anim_btn_cash.play();
@@ -12186,10 +12226,10 @@ this.lbl_deposit.string = t + "元";
 };
 e.prototype.clickCashOP = function() {
 mk.audio.playEffect("button");
-if (gData.pigbank.cash_enable) {
+if (gData.gameData.gameData.isWithdrawable) if (gData.gameData.gameData.piggyBank < gData.pigbank.cash_min_limit) mk.tip.pop("满" + gData.pigbank.cash_min_limit + "元可提现"); else {
 gData.pigbank.cashOP();
 mk.ui.closePanel(this.node.name);
-} else mk.tip.pop("满" + gData.pigbank.cash_min_limit + "元可提现");
+} else mk.tip.pop("明日可提现");
 };
 e.prototype.clickOpenHelpCall = function() {
 return a(this, void 0, void 0, function() {
@@ -12588,10 +12628,8 @@ t[t.BonusTip = 5] = "BonusTip";
 t[t.ScoreEnergy = 6] = "ScoreEnergy";
 t[t.Hammer = 7] = "Hammer";
 t[t.Change = 8] = "Change";
-t[t.CashOutItem = 9] = "CashOutItem";
 t[t.TipItemUI = 10] = "TipItemUI";
 t[t.GetTargetScoreTip = 11] = "GetTargetScoreTip";
-t[t.LevelRedPacketItem = 12] = "LevelRedPacketItem";
 t[t.GetScore = 13] = "GetScore";
 t[t.TipSpriteItemUI = 14] = "TipSpriteItemUI";
 })(i = n.NODEPOOLPREFABTYPE || (n.NODEPOOLPREFABTYPE = {}));
@@ -14431,6 +14469,7 @@ function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.init_cash_style = !0;
 e._data = [];
+e.subType = 1;
 return e;
 }
 Object.defineProperty(e.prototype, "data", {
@@ -14660,12 +14699,15 @@ this.spr_cash_out.fillRange = gData.gameData.gameData.redMoney / e.type_value;
 };
 e.prototype.clickWatchVideo = function() {
 cc.log("看广告请求");
-gData.reward.data[0] && gData.reward.data[0].rewardType === p.RewardType.redBag ? mk.ad.watchAd(function(t) {
+this.lid_type === s.mission ? mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
 t && gData.adData.watchVideo(u.AdFun.settlement);
 }) : mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
-t && gData.adData.watchVideo(u.AdFun.bubble);
+if (t) {
+gData.adData.watchVideo(2 === gData.reward.subType ? u.AdFun.checkpoint : u.AdFun.bubble);
+gData.reward.subType = null;
+}
 });
 };
 e.prototype.watchVideoCall = function() {
@@ -15808,8 +15850,6 @@ function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.init_data = !1;
 e._c_sign = [];
-e._sign_last_bar = 0;
-e._sign_can = 1;
 e.list_data = [];
 return e;
 }
@@ -15820,8 +15860,6 @@ for (var e in t) t[e] = parseInt(t[e]);
 });
 this.c_sign = gData.gameData.configs.SignIn;
 }
-this.sign_last_bar = gData.gameData.gameData.signInDay;
-this.sign_can = gData.gameData.gameData.isSignInToday;
 };
 Object.defineProperty(e.prototype, "c_sign", {
 get: function() {
@@ -15834,28 +15872,6 @@ this.init_data = !0;
 enumerable: !1,
 configurable: !0
 });
-Object.defineProperty(e.prototype, "sign_last_bar", {
-get: function() {
-return this._sign_last_bar;
-},
-set: function(t) {
-this._sign_last_bar = t;
-this.init_data = !0;
-},
-enumerable: !1,
-configurable: !0
-});
-Object.defineProperty(e.prototype, "sign_can", {
-get: function() {
-return this._sign_can;
-},
-set: function(t) {
-this._sign_can = t;
-this.init_data = !0;
-},
-enumerable: !1,
-configurable: !0
-});
 e.prototype.initListData = function() {
 for (var t = [], e = 0; e < 30; ) {
 for (var n = [], o = 0; o < 3; o++) {
@@ -15868,60 +15884,50 @@ t.push(n);
 this.list_data = t;
 };
 e.prototype.getStateByDay = function(t) {
-return t <= this.sign_last_bar ? s.RewardState.none : this.sign_can && t == this.sign_last_bar + 1 ? s.RewardState.unlock : s.RewardState.lock;
+return t <= gData.gameData.gameData.signInDay ? s.RewardState.none : 0 == gData.gameData.gameData.isSignInToday && t == gData.gameData.gameData.signInDay + 1 ? s.RewardState.unlock : s.RewardState.lock;
 };
 e.prototype.haveSignDay = function() {
-return !(this.sign_last_bar >= this.c_sign.length);
+return !(gData.gameData.gameData.signInDay >= this.c_sign.length);
 };
 e.prototype.signComplete = function() {
 return r(this, void 0, void 0, function() {
-var t, e, n, o;
-return a(this, function(i) {
-switch (i.label) {
+var t, e, n;
+return a(this, function(o) {
+switch (o.label) {
 case 0:
-this.sign_can = 0;
-this.sign_last_bar++;
 gData.gameData.gameData.signInDay++;
-gData.gameData.gameData.isSignInToday = 0;
-t = [ {
-key: s.GameProp.sign_can,
-value: this.sign_can
-}, {
-key: s.GameProp.sign_last_bar,
-value: this.sign_last_bar
-} ];
-gData.gameData.setProps(t);
-if ((e = this.c_sign[this.sign_last_bar - 1]).rewardType !== s.RewardType.redBag) return [ 3, 1 ];
-gData.reward.data = [ e ];
+gData.gameData.gameData.isSignInToday = 1;
+if ((t = this.c_sign[gData.gameData.gameData.signInDay - 1]).rewardType !== s.RewardType.redBag) return [ 3, 1 ];
+gData.reward.data = [ t ];
 mk.ui.openPanel("module/reward/reward");
 return [ 3, 4 ];
 
 case 1:
-if (e.rewardType !== s.RewardType.rmb) return [ 3, 3 ];
-n = {};
-return [ 4, mk.http.sendRequest("readyCash", "POST", JSON.stringify(n)) ];
+if (t.rewardType !== s.RewardType.rmb) return [ 3, 3 ];
+e = {};
+return [ 4, mk.http.sendRequest("readyCash", "POST", JSON.stringify(e)) ];
 
 case 2:
-if (0 != (o = i.sent()).errcode) {
+if (0 != (n = o.sent()).errcode) {
 mk.tip.pop("系统异常");
 return [ 2 ];
 }
-if (0 == o.CashMode) {
-gData.receiptNotice.receip_rmb = e.rewardNum;
+if (0 == n.CashMode) {
+gData.receiptNotice.receip_rmb = t.rewardNum;
 gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
 mk.ui.openPanel("module/receiptNotice/receiptNotice");
-} else o.CashMode;
+} else n.CashMode;
 return [ 3, 4 ];
 
 case 3:
-if (e.rewardType === s.RewardType.pigRmb) {
+if (t.rewardType === s.RewardType.pigRmb) {
 gData.reward.data = [ {
-rewardNum: e.rewardNum,
-rewardType: e.rewardType
+rewardNum: t.rewardNum,
+rewardType: t.rewardType
 } ];
 mk.ui.openPanel("module/reward/reward");
 }
-i.label = 4;
+o.label = 4;
 
 case 4:
 return [ 2 ];
@@ -15932,7 +15938,7 @@ return [ 2 ];
 e.prototype.getItemIndexByCanSign = function() {
 for (var t = 0, e = this.list_data.length, n = 0; n < e; n++) for (var o = this.list_data[n].length, i = 0; i < o; i++) {
 var r = this.getStateByDay(this.list_data[n][i].loginDay);
-if (this.sign_can) {
+if (0 == gData.gameData.gameData.isSignInToday) {
 if (r === s.RewardState.unlock) return n;
 } else if (r === s.RewardState.lock) return n;
 }
@@ -16419,7 +16425,7 @@ gData.sign.adData = null;
 };
 e.prototype.clickReceiveReward = function() {
 mk.audio.playEffect("button");
-gData.sign.sign_can && gData.sign.haveSignDay() && mk.ad.watchAd(function(t) {
+1 != gData.gameData.gameData.isSignInToday && gData.sign.haveSignDay() && mk.ad.watchAd(function(t) {
 mk.console.log("watchAD:" + t);
 t && gData.adData.watchVideo(a.AdFun.sign);
 });
@@ -16430,7 +16436,7 @@ gData.sign.signComplete();
 this.tableview.resetItemData(t, gData.sign.list_data[t]);
 };
 e.prototype.initBtnStyle = function() {
-if (gData.sign.sign_can && gData.sign.haveSignDay()) {
+if (0 == gData.gameData.gameData.isSignInToday && gData.sign.haveSignDay()) {
 this.anim_btn.play();
 this.anim_btn.getComponent("SetGray").setGray(!1);
 } else {