|
|
@@ -2,7 +2,7 @@
|
|
|
* @Author: mojunshou 1637302775@qq.com
|
|
|
* @Date: 2025-03-20 15:01:09
|
|
|
* @LastEditors: mojunshou 1637302775@qq.com
|
|
|
- * @LastEditTime: 2025-04-19 11:56:58
|
|
|
+ * @LastEditTime: 2025-04-19 16:48:29
|
|
|
* @Description: 消除游戏主场景
|
|
|
*/
|
|
|
import { _decorator, Button, Color, EventTouch, instantiate, JsonAsset, Label, Node, Prefab, randomRangeInt, Sprite, tween, UITransform, Vec2, Vec3, Widget } from "cc";
|
|
|
@@ -297,6 +297,7 @@ export class EliminateViewComp extends CCComp {
|
|
|
this.money = smc.account.AccountModel.wxCoin;
|
|
|
this.cash = smc.account.AccountModel.hbCoin;
|
|
|
this.targetScore = smc.game.GameModel.targetScore;
|
|
|
+ this.popupType = smc.game.GameModel.popupType;
|
|
|
this.lab_score.string = this.score.toString();
|
|
|
this.lab_wxCoin.string = Format.formatWxCoin(this.money);
|
|
|
this.lab_hbCoin.string = Format.formatRedPacketCoin(this.cash);
|
|
|
@@ -2154,6 +2155,7 @@ export class EliminateViewComp extends CCComp {
|
|
|
this.setData();
|
|
|
this.reopenGrid();
|
|
|
this.initButtonState(this.autoState);
|
|
|
+ this.updateWelfarePoint();
|
|
|
}
|
|
|
|
|
|
//重新清除网格
|
|
|
@@ -2183,16 +2185,18 @@ export class EliminateViewComp extends CCComp {
|
|
|
|
|
|
//===============初始化检查是否要打开福利界面====
|
|
|
private updateWelfarePoint() {
|
|
|
- this.popupType = "weal_6";
|
|
|
+ this.popupType = "weal_3";
|
|
|
switch (this.popupType) {
|
|
|
case "weal_1":
|
|
|
// this.btn_warmReminder();
|
|
|
oops.gui.open(UIID.WarmReminder);
|
|
|
+ ServerHandler.inst.GetGuideInfo();
|
|
|
break;
|
|
|
case "weal_2":
|
|
|
// this.btn_cashRebate();
|
|
|
//打开福利二
|
|
|
oops.gui.open(UIID.WelfareTwo);
|
|
|
+ ServerHandler.inst.GetGuideInfo();
|
|
|
break;
|
|
|
case "weal_3":
|
|
|
// this.btn_doubleRewards();
|
|
|
@@ -2200,24 +2204,10 @@ export class EliminateViewComp extends CCComp {
|
|
|
oops.gui.open(UIID.WelfareThree);
|
|
|
break;
|
|
|
}
|
|
|
-
|
|
|
- //如果当前是12关
|
|
|
-
|
|
|
- // smc.game.GameModel.curLevelConfig.eventType = "SIGN_POINT"
|
|
|
-
|
|
|
- // if (smc.game.GameModel.curLevelConfig.eventType == "SIGN_POINT") {
|
|
|
- // //展示提现信息
|
|
|
- // // this.WechatReward();
|
|
|
- // oops.gui.open(UIID.ReservePopup);
|
|
|
- // } else {
|
|
|
-
|
|
|
-
|
|
|
- // }
|
|
|
-
|
|
|
- oops.gui.open(UIID.ReservePopup)
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+ if (smc.game.GameModel.curLevelConfig.eventType && smc.game.GameModel.curLevelConfig.eventType === "SIGN_POINT") {
|
|
|
+ //展示提现信息
|
|
|
+ oops.gui.open(UIID.ReservePopup);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -2250,56 +2240,57 @@ export class EliminateViewComp extends CCComp {
|
|
|
}
|
|
|
|
|
|
btn_text() {
|
|
|
- const param = {
|
|
|
- "showReward": [
|
|
|
- {
|
|
|
- "propId": "1004",
|
|
|
- "propNum": 500
|
|
|
- },
|
|
|
- {
|
|
|
- "propId": "1005",
|
|
|
- "propNum": 200
|
|
|
- },
|
|
|
- {
|
|
|
- "propId": "1006",
|
|
|
- "propNum": 1
|
|
|
- }
|
|
|
- ],
|
|
|
- "levelProgress": {
|
|
|
- "nextProgress": 1,
|
|
|
- "levelInfoList": [
|
|
|
- {
|
|
|
- "level": 1,
|
|
|
- "eventType": "WITHDRAW_POINT",
|
|
|
- "withdraw": true
|
|
|
- },
|
|
|
- {
|
|
|
- "level": 4,
|
|
|
- "eventType": "WITHDRAW_POINT",
|
|
|
- "withdraw": false
|
|
|
- },
|
|
|
- {
|
|
|
- "level": 6,
|
|
|
- "eventType": "WITHDRAW_POINT",
|
|
|
- "withdraw": false
|
|
|
- },
|
|
|
- {
|
|
|
- "level": 8,
|
|
|
- "eventType": "WITHDRAW_POINT",
|
|
|
- "withdraw": false
|
|
|
- },
|
|
|
- {
|
|
|
- "level": 12,
|
|
|
- "eventType": "SIGN_POINT",
|
|
|
- "withdraw": false
|
|
|
- }
|
|
|
- ]
|
|
|
- }
|
|
|
- }
|
|
|
+ // const param = {
|
|
|
+ // "showReward": [
|
|
|
+ // {
|
|
|
+ // "propId": "1004",
|
|
|
+ // "propNum": 500
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // "propId": "1005",
|
|
|
+ // "propNum": 200
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // "propId": "1006",
|
|
|
+ // "propNum": 1
|
|
|
+ // }
|
|
|
+ // ],
|
|
|
+ // "levelProgress": {
|
|
|
+ // "nextProgress": 1,
|
|
|
+ // "levelInfoList": [
|
|
|
+ // {
|
|
|
+ // "level": 1,
|
|
|
+ // "eventType": "WITHDRAW_POINT",
|
|
|
+ // "withdraw": true
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // "level": 4,
|
|
|
+ // "eventType": "WITHDRAW_POINT",
|
|
|
+ // "withdraw": false
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // "level": 6,
|
|
|
+ // "eventType": "WITHDRAW_POINT",
|
|
|
+ // "withdraw": false
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // "level": 8,
|
|
|
+ // "eventType": "WITHDRAW_POINT",
|
|
|
+ // "withdraw": false
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // "level": 12,
|
|
|
+ // "eventType": "SIGN_POINT",
|
|
|
+ // "withdraw": false
|
|
|
+ // }
|
|
|
+ // ]
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // let str = JSON.stringify(param);
|
|
|
+ // ServerHandler.inst.onDoubleSurprise(str);
|
|
|
|
|
|
|
|
|
+ // ServerHandler.inst.GetGuideInfo();
|
|
|
|
|
|
- let str = JSON.stringify(param);
|
|
|
- ServerHandler.inst.onDoubleSurprise(str);
|
|
|
}
|
|
|
}
|