薛鸿潇 hace 5 años
padre
commit
8e2d51c04f

+ 9 - 1
assets/script/game/data/GameData.ts

@@ -213,8 +213,16 @@ export enum GameProp {
 class PlayerProp {
     /** 自定义不需要校验的数据 */
     gameUserData = 0;
+    
+    _isSignInToday = 0;
     /** 今日是否有签到 */
-    isSignInToday = 0;
+    set isSignInToday(value: number) {
+        this._isSignInToday = value;
+        gData.sign.init_data = true;
+    }
+    get isSignInToday(): number {
+        return this._isSignInToday;
+    }
 
     private _piggyBank: number = 0;
     /** 存钱罐存款 */

+ 4 - 15
assets/script/game/data/module/SignData.ts

@@ -21,7 +21,6 @@ export class SignData extends Data {
         }
         // 服务端数据
         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);
@@ -51,16 +50,6 @@ export class SignData extends Data {
         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>> = [];
     /** 初始化列表数据 */
@@ -104,7 +93,7 @@ export class SignData extends Data {
         let _state = 0;
         if (login_day <= this.sign_last_bar) {
             _state = RewardState.none;
-        } else if (this.sign_can && login_day == (this.sign_last_bar + 1)) {
+        } else if (gData.gameData.gameData.isSignInToday && login_day == (this.sign_last_bar + 1)) {
             _state = RewardState.unlock;
         } else {
             _state = RewardState.lock;
@@ -128,7 +117,7 @@ export class SignData extends Data {
      * 签到完成
      */
     public async signComplete() {
-        this.sign_can = 0;
+        gData.gameData.gameData.isSignInToday = 0;
         this.sign_last_bar++;
         gData.gameData.gameData.signInDay++;
         gData.gameData.gameData.isSignInToday = 0;
@@ -136,7 +125,7 @@ export class SignData extends Data {
         let new_data = [
             {
                 key: GameProp.sign_can,
-                value: this.sign_can
+                value: gData.gameData.gameData.isSignInToday
             },
             {
                 key: GameProp.sign_last_bar,
@@ -187,7 +176,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) {
                     if (state === RewardState.unlock) {
                         index = i;
                         return index

+ 3 - 0
assets/script/game/module/pigBank/PigBank.ts

@@ -75,6 +75,9 @@ export default class PigBank extends cc.Component {
     private clickCashOP() {
         mk.audio.playEffect("button");
         if (!gData.pigbank.cash_enable) {
+            mk.tip.pop('明日可提现')
+            return;
+        } else if (gData.gameData.gameData.piggyBank < gData.pigbank.cash_min_limit) {
             mk.tip.pop('满' + gData.pigbank.cash_min_limit + '元可提现')
             return;
         }

+ 2 - 2
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) 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 && gData.sign.haveSignDay()) {
             this.anim_btn.play();
             this.anim_btn.getComponent('SetGray').setGray(false);
         } else {