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

assets/res/game/ui/game/board1.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "1ca37dda-c4f7-4dc1-b673-adcb1038089d",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 389,
-  "height": 238,
-  "platformSettings": {},
-  "subMetas": {
-    "board1": {
-      "ver": "1.0.4",
-      "uuid": "38268aab-760e-4247-85a8-d1f2e32ed5fb",
-      "rawTextureUuid": "1ca37dda-c4f7-4dc1-b673-adcb1038089d",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 1,
-      "offsetY": 1.5,
-      "trimX": 2,
-      "trimY": 0,
-      "width": 387,
-      "height": 235,
-      "rawWidth": 389,
-      "rawHeight": 238,
-      "borderTop": 115.5,
-      "borderBottom": 59.5,
-      "borderLeft": 89,
-      "borderRight": 120,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/ui/game/board2.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "21d03d8e-9904-4f8e-a2a2-fc860e5c9d31",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 523,
-  "height": 253,
-  "platformSettings": {},
-  "subMetas": {
-    "board2": {
-      "ver": "1.0.4",
-      "uuid": "9a248dd5-f19a-4ee4-aef9-af22b7dee322",
-      "rawTextureUuid": "21d03d8e-9904-4f8e-a2a2-fc860e5c9d31",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 523,
-      "height": 253,
-      "rawWidth": 523,
-      "rawHeight": 253,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/ui/game/goal.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "92e959a0-c083-4a38-a90e-97e3ea8993dd",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 412,
-  "height": 201,
-  "platformSettings": {},
-  "subMetas": {
-    "goal": {
-      "ver": "1.0.4",
-      "uuid": "10753b65-e13f-4d00-8048-f29bba39ecb8",
-      "rawTextureUuid": "92e959a0-c083-4a38-a90e-97e3ea8993dd",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": -2.5,
-      "offsetY": 0,
-      "trimX": 11,
-      "trimY": 0,
-      "width": 385,
-      "height": 201,
-      "rawWidth": 412,
-      "rawHeight": 201,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/ui/game/icon_getMoneyBtn.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "b1bfb2e7-64fe-4d62-9acd-2cefd7c70feb",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 129,
-  "height": 358,
-  "platformSettings": {},
-  "subMetas": {
-    "icon_getMoneyBtn": {
-      "ver": "1.0.4",
-      "uuid": "85475e07-2364-44ea-a295-22c5c0ebf814",
-      "rawTextureUuid": "b1bfb2e7-64fe-4d62-9acd-2cefd7c70feb",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 129,
-      "height": 358,
-      "rawWidth": 129,
-      "rawHeight": 358,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/ui/game/level.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 73,
-  "height": 36,
+  "width": 140,
+  "height": 50,
   "platformSettings": {},
   "subMetas": {
     "level": {
@@ -22,10 +22,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 73,
-      "height": 36,
-      "rawWidth": 73,
-      "rawHeight": 36,
+      "width": 140,
+      "height": 50,
+      "rawWidth": 140,
+      "rawHeight": 50,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/resources/game/prefab/nodepool/CellBg.prefab

@@ -36,8 +36,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 80,
-      "height": 80
+      "width": 85,
+      "height": 85
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -90,7 +90,7 @@
     "_prefab": {
       "__id__": 4
     },
-    "_opacity": 255,
+    "_opacity": 100,
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
@@ -100,8 +100,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 78,
-      "height": 78
+      "width": 80,
+      "height": 80
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -188,7 +188,7 @@
     "asset": {
       "__uuid__": "49512c4e-25f3-4ebc-a675-b22eae1941a1"
     },
-    "fileId": "11R/xfJYhI4JeIr7jDCUeW",
+    "fileId": "",
     "sync": false
   }
 ]

assets/resources/game/prefab/nodepool/CellItem.prefab

@@ -40,8 +40,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 80,
-      "height": 80
+      "width": 85,
+      "height": 85
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -107,8 +107,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 75,
-      "height": 75
+      "width": 80,
+      "height": 80
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

assets/resources/game/prefab/uiItem/redbagitem.prefab

@@ -58,7 +58,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -160,
+        293.257,
         0,
         0,
         0,

assets/script/before/GamePlay.ts

@@ -28,18 +28,11 @@ export default class GamePlay extends cc.Component {
     /**标题 */
     @property(cc.Node)
     node_top: cc.Node = null;
-    @property(cc.Node)
-    node_goal: cc.Node = null;
-    /**目标分数 */
-    @property(ArtNum)
-    artNum_targetScore: ArtNum = null;
 
-    /**得分 */
-    @property(ArtNum)
-    artNum_score: ArtNum = null;
-    /**关卡数目 */
-    @property(ArtNum)
-    artNum_level: ArtNum = null;
+    @property(cc.Label)
+    label_level: cc.Label = null;
+    @property(cc.Node)
+    node_redPacketIcon: cc.Node = null;
 
     /**内容 */
     @property(cc.Node)
@@ -48,13 +41,6 @@ export default class GamePlay extends cc.Component {
     @property(cc.Node)
     node_cellBg: cc.Node = null;
 
-    /**红包图标 */
-    @property(cc.Node)
-    node_redPacketIcon: cc.Node = null;
-    /**红包动画 */
-    @property(cc.Animation)
-    ani_redPacketIcon: cc.Animation = null;
-
     /**暂停按钮 */
     @property(cc.Node)
     node_pauseBtn: cc.Node = null;
@@ -62,10 +48,8 @@ export default class GamePlay extends cc.Component {
     /**进度条UI */
     @property(cc.Node)
     node_progressUI: cc.Node = null;
-    @property(cc.ProgressBar)
-    bar_progress: cc.ProgressBar = null;
-    @property(cc.Node)
-    node_progressIcon: cc.Node = null;
+    @property(cc.Sprite)
+    spr_progress: cc.Sprite = null;
 
     /**重置按钮 */
     @property(cc.Node)
@@ -227,7 +211,7 @@ export default class GamePlay extends cc.Component {
     update(dt) {
         if (this.curProgressScore >= this.curGetScore) {
             if (this.curProgressScore == 0) {
-                this.bar_progress.progress = 0;
+                this.spr_progress.fillRange = 0;
             }
             return;
         }
@@ -241,7 +225,6 @@ export default class GamePlay extends cc.Component {
                 let nextProgressScore: number = this.curProgressScore + this.addScoreSpeed;
 
                 if (this.curProgressScore < GamePlay.Inst.targetScore && nextProgressScore >= GamePlay.Inst.targetScore) {
-                    this.ani_redPacketIcon.play("ani_redPacket_icon_on");
                     let node_getTargetScoreTip = PoolMgr.Inst.getPoolPrefab(NODEPOOLPREFABTYPE.GetTargetScoreTip);
                     GamePlay.Inst.node_effectUI.addChild(node_getTargetScoreTip);
                 }
@@ -288,7 +271,7 @@ export default class GamePlay extends cc.Component {
     /**初始化关卡数目 */
     initLevel() {
         mk.console.log("[Game] PlayerConst.levelNum", PlayerConst.levelNum);
-        this.artNum_level.init(PlayerConst.levelNum + 1);
+        this.label_level.string = `第${PlayerConst.levelNum + 1}关`
     }
 
     /**初始化总分数 */
@@ -299,12 +282,10 @@ export default class GamePlay extends cc.Component {
         // this.targetScore = 5000;
         this.addScoreSpeed = Math.floor(this.targetScore / 400) * 2 + 4;
         mk.console.log("this.addScoreSpeed", this.addScoreSpeed);
-        this.artNum_targetScore.init(this.targetScore);
     }
 
     /**初始化得分 */
     initScore() {
-        this.artNum_score.init(this.curProgressScore);
         this.initProgress();
     }
 
@@ -312,20 +293,8 @@ export default class GamePlay extends cc.Component {
     initProgress() {
         let progress = this.curProgressScore / this.targetScore;
         progress = progress > 1 ? 1 : progress;
-        this.bar_progress.progress = progress;
+        this.spr_progress.fillRange = progress;
         // LogUtil.log("progressprogressprogressprogressprogressprogress", progress);
-        if (progress == 0) {
-            this.node_progressIcon.active = false;
-        }
-        else if (progress == 1) {
-
-        }
-        else {
-            if (this.node_progressIcon.active == false) {
-                this.node_progressIcon.active = true;
-            }
-        }
-        this.node_progressIcon.x = this.bar_progress.totalLength * progress - this.bar_progress.totalLength * 0.5 - 5;
     }
 
     /**初始化道具 */
@@ -908,7 +877,6 @@ export default class GamePlay extends cc.Component {
 
     /**刷新关卡 */
     refreshGame() {
-
         this.recycleAllRedPacket();
         this.recycleAllCellItem();
         this.ifPass = false;
@@ -919,7 +887,6 @@ export default class GamePlay extends cc.Component {
         this.curProgressScore = 0;
         this.curGetScore = 0;
         this.finalGetScore = 0;
-        this.ani_redPacketIcon.play();
         this.initScore();
     }
 
@@ -972,11 +939,6 @@ export default class GamePlay extends cc.Component {
         GamePlay.Inst.ifGetPass = true;
         PlayerConst.levelNum = passLevelNum;
 
-        //视频计数
-        DataMgr.Inst.updatePassNum(++PlayerConst.passNum);
-
-        mk.console.log("PlayerConst.passNum", PlayerConst.passNum);
-
         //游戏结算
         this.gameCount();
 

assets/script/before/data/PlayerConst.ts

@@ -24,9 +24,6 @@ export default class PlayerConst extends cc.Component {
     /**玩家现金数目 */
     public static cashNum: number = 0;
 
-    /**商城积分数目 */
-    public static shopScoreNum: number = 0;
-
     /**关卡数 */
     public static levelNum: number = 0;
 

assets/script/before/mgr/DataMgr.ts

@@ -72,24 +72,6 @@ export default class DataMgr extends cc.Component {
             PlayerConst.todayPassRedPacketNum = todayPassRedPacketNum;
         }
 
-        //今天的观看视频数
-        let watchVideoNum = StorageMgr.Inst.getStorage(DATA_STORAGE_KEY.watchVideoNum);
-        if (!!watchVideoNum) {
-            PlayerConst.watchVideoNum = watchVideoNum;
-        }
-
-        //在线时间
-        let onlineTime = StorageMgr.Inst.getStorage(DATA_STORAGE_KEY.onlineTime);
-        if (!!onlineTime) {
-            PlayerConst.onlineTime = onlineTime;
-        }
-
-        //过关数量
-        let passNum = StorageMgr.Inst.getStorage(DATA_STORAGE_KEY.passNum);
-        if (!!passNum) {
-            PlayerConst.passNum = passNum;
-        }
-
         //地址
         let address = StorageMgr.Inst.getStorage(DATA_STORAGE_KEY.adress);
         if (!!address) {
@@ -175,49 +157,6 @@ export default class DataMgr extends cc.Component {
         mk.event.emit(EVENT_TYPE.UPDATE_CashNum);
     }
 
-    /**更新观看视频次数
-     * num 视频数
-     */
-    public updateWatchVideoNum(num: number) {
-        mk.console.log("观看视频次数!!!!!!!!!!!!!!!!!!!!!!!", PlayerConst.watchVideoNum, num);
-        PlayerConst.watchVideoNum = num;
-        StorageMgr.Inst.setStorage(DATA_STORAGE_KEY.watchVideoNum, PlayerConst.watchVideoNum);
-    }
-
-    /**更新观看视频次数
-    * num 视频数
-    */
-    public updateOnlineTime(num: number) {
-        PlayerConst.onlineTime = num;
-        // LogUtil.log("计算在线时间!!!!!!!!!!!!!!!!!!!!!!!", num);
-        StorageMgr.Inst.setStorage(DATA_STORAGE_KEY.onlineTime, PlayerConst.onlineTime);
-    }
-
-    public interval_countOnlineTime: number = 0;
-    /**开始计算在线时间 */
-    public startCountOnlineTime() {
-        this.interval_countOnlineTime = setInterval(() => {
-            DataMgr.Inst.updateOnlineTime(PlayerConst.onlineTime += 10);
-
-            //如果每日体现界面存在
-            let node_dailyCashOutUI = mk.ui.getCurOnPanel("DailyCashOutUI");
-            if (node_dailyCashOutUI) {
-                let dailyCashOut = node_dailyCashOutUI.getComponent(DailyCashOutUI);
-                dailyCashOut.initOnlineTime();
-                dailyCashOut.initCashOutState();
-            }
-        }, 10000);
-    }
-
-    /**更新观看视频次数
-    * num 视频数
-    */
-    public updatePassNum(num: number) {
-        mk.console.log("通过次数!!!!!!!!!!!!!!!!!!!!!!!", num);
-        PlayerConst.passNum = num;
-        StorageMgr.Inst.setStorage(DATA_STORAGE_KEY.passNum, PlayerConst.passNum);
-    }
-
     /**
      * 更新道具数据
      * @param updateType 更新类型 0 刷新 1 增 2减

assets/script/before/view/DailyCashOutUI.ts

@@ -1,211 +0,0 @@
-// Learn TypeScript:
-//  - https://docs.cocos.com/creator/manual/en/scripting/typescript.html
-// Learn Attribute:
-//  - https://docs.cocos.com/creator/manual/en/scripting/reference/attributes.html
-// Learn life-cycle callbacks:
-//  - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
-
-import { EVENT_TYPE } from "../../game/data/GameData";
-import GameConst from "../data/GameConst";
-import PlayerConst from "../data/PlayerConst";
-import EffectMgr from "../mgr/EffectMgr";
-import GameMgr, { UI_NAME } from "../mgr/GameMgr";
-import HttpMgr from "../mgr/HttpMgr";
-import GameLogic from "../util/GameLogic";
-
-const { ccclass, property } = cc._decorator;
-
-@ccclass
-export default class DailyCashOutUI extends cc.Component {
-
-    @property(cc.Node)
-    node_rectBg: cc.Node = null;
-
-    @property(cc.Label)
-    label_videoTaskTip: cc.Label = null;
-    @property(cc.Label)
-    label_videoTaskProgress: cc.Label = null;
-    @property(cc.ProgressBar)
-    bar_videoTaskProgress: cc.ProgressBar = null;
-
-    @property(cc.Label)
-    label_timeTaskTip: cc.Label = null;
-    @property(cc.Label)
-    @property(cc.Label)
-    label_timeTaskProgress: cc.Label = null;
-    @property(cc.ProgressBar)
-    bar_timeTaskProgress: cc.ProgressBar = null;
-
-    @property(cc.Label)
-    label_passTaskTip: cc.Label = null;
-    @property(cc.Label)
-    label_passTaskProgress: cc.Label = null;
-    @property(cc.ProgressBar)
-    bar_passTaskProgress: cc.ProgressBar = null;
-
-    @property(cc.Node)
-    node_closeBtn: cc.Node = null;
-
-    @property(cc.Node)
-    node_cashOutBtn: cc.Node = null;
-    @property(cc.Node)
-    node_cashOutBtn_on: cc.Node = null;
-    @property(cc.Node)
-    node_cashOutBtn_off: cc.Node = null;
-
-    public videoNum: number = 30;
-    public onlineTime: number = 30;
-    public passNum: number = 20;
-
-    // LIFE-CYCLE CALLBACKS:
-
-    // onLoad () {}
-
-    onEnable() {
-        GameMgr.Inst.sendEvent(UI_NAME.DailyCashOutUI, "进入每日打卡界面");
-        this.initView();
-    }
-
-    start() {
-        this.node_rectBg.setContentSize(cc.winSize.width, cc.winSize.height);
-        this.initEvent();
-    }
-
-    initView() {
-        this.initLabelTip();
-        this.initWatchVideoNum();
-        this.initOnlineTime();
-        this.initPassNum();
-        this.initCashOutState();
-    }
-
-    initLabelTip() {
-        if (PlayerConst.loginDay == 1) {
-            this.videoNum = 10;
-            this.onlineTime = 5;
-            this.passNum = 3;
-        }
-        else {
-            this.videoNum = GameLogic.getVideoNumByEcpm();
-            this.onlineTime = 15;
-            this.passNum = 15;
-        }
-        this.label_videoTaskTip.string = `观看视频${this.videoNum}次`;
-        this.label_timeTaskTip.string = `在线时长达到${this.onlineTime}分钟`;
-        this.label_passTaskTip.string = `通关${this.passNum}关`;
-    }
-
-    initWatchVideoNum() {
-        this.label_videoTaskProgress.string = `${PlayerConst.watchVideoNum}/${this.videoNum}`;
-
-        let progress = PlayerConst.watchVideoNum / this.videoNum;
-        progress = progress >= 1 ? 1 : progress;
-        this.bar_videoTaskProgress.progress = progress;
-    }
-
-    initOnlineTime() {
-        let onlineTime = Math.floor(PlayerConst.onlineTime / 60);
-
-        this.label_timeTaskProgress.string = `${onlineTime}/${this.onlineTime}`;
-
-        let progress = onlineTime / this.onlineTime;
-        progress = progress >= 1 ? 1 : progress;
-        this.bar_timeTaskProgress.progress = progress;
-    }
-
-    initPassNum() {
-        this.label_passTaskProgress.string = `${PlayerConst.passNum}/${this.passNum}`;
-
-        let progress = PlayerConst.passNum / this.passNum;
-        progress = progress >= 1 ? 1 : progress;
-        this.bar_passTaskProgress.progress = progress;
-    }
-
-    /**初始化提现状态 */
-    initCashOutState() {
-        if (this.bar_videoTaskProgress.progress != 1 || this.bar_timeTaskProgress.progress != 1 || this.bar_passTaskProgress.progress != 1) {
-            this.node_cashOutBtn_off.active = true;
-            this.node_cashOutBtn_on.active = !this.node_cashOutBtn_off.active;
-        }
-        else {
-            this.node_cashOutBtn_on.active = !PlayerConst.ifDailyCashOut;
-            this.node_cashOutBtn_off.active = PlayerConst.ifDailyCashOut;
-        }
-    }
-
-    /**初始化事件 */
-    initEvent() {
-        this.node_cashOutBtn.on(cc.Node.EventType.TOUCH_END, this.onClickBtn, this);
-        this.node_closeBtn.on(cc.Node.EventType.TOUCH_END, this.onClickBtn, this);
-
-        //如果未授权则添加监听
-        if (!GameConst.isAuth) {
-            mk.event.register(EVENT_TYPE.BACK_WxAuth, this.onWxAuthBack, this);
-        }
-    }
-
-    /**点击按钮 */
-    onClickBtn(event: cc.Event.EventTouch) {
-        // AudioMgr.Inst.playEffect(AUDIO_CLIP_NAME.buttonClick);
-        mk.audio.playEffect("ef_button_click");
-        switch (event.currentTarget) {
-            case this.node_cashOutBtn:
-                this.onClickCashOutBtn();
-                break;
-            case this.node_closeBtn:
-                this.onClickCloseBtn();
-                break;
-        }
-    }
-
-    // update (dt) {}
-
-    //点击提现按钮
-    onClickCashOutBtn() {
-        GameMgr.Inst.sendEvent(UI_NAME.DailyCashOutUI, "点击提现按钮");
-
-        if (!GameConst.isAuth) {
-            EffectMgr.Inst.addTip("授权才能提现哦");
-            mk.ui.openPanel("game/prefab/uiPanel/GuideAuthUI");
-            return;
-        }
-
-        if (!this.node_cashOutBtn_on.active) {
-            if (PlayerConst.ifDailyCashOut) {
-                EffectMgr.Inst.addTip(`今天已提现啦,明天再来哦~`);
-            }
-            else {
-                EffectMgr.Inst.addTip(`完成任务才可提现哦`);
-            }
-            return;
-        }
-
-        let cashNum = 0.3;
-        HttpMgr.Inst.cash(cashNum, 2).then(() => {
-            PlayerConst.ifDailyCashOut = true;
-            this.initCashOutState();
-            EffectMgr.Inst.addTip("提现成功,请等待微信到账");
-            GameMgr.Inst.sendEvent(UI_NAME.DailyCashOutUI, "每日提现成功");
-            GameMgr.Inst.sendEventCp(UI_NAME.DailyCashOutUI, "每日提现成功");
-            //提现操作
-        }).catch((err) => {
-            mk.console.log("[DailyCashOut] cash err", err);
-            EffectMgr.Inst.addTip(err.errmsg);
-            // EffectMgr.Inst.addTip(`后台维护中,请稍后再试`)
-        });
-    }
-
-    //点击继续按钮
-    onClickCloseBtn() {
-        GameMgr.Inst.sendEvent(UI_NAME.DailyCashOutUI, "点击关闭按钮");
-        
-        mk.ui.closePanel("DailyCashOutUI")
-    }
-
-    //自定义事件---------------------------------------------------------------------
-    /**微信授权返回 */
-    onWxAuthBack() {
-        this.initView();
-        mk.event.register(EVENT_TYPE.BACK_WxAuth, this.onWxAuthBack, this);
-    }
-}

assets/script/before/view/DailyCashOutUI.ts.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.0.8",
-  "uuid": "82a514ca-01cf-4c6f-bae0-9736f0bb830f",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
-}

assets/script/before/view/effect/ScoreEnergy.ts

@@ -42,8 +42,8 @@ export default class ScoreEnergy extends cc.Component {
         this.node.x = x;
         this.node.y = y;
 
-        let pos_x = GamePlay.Inst.node_progressUI.x + GamePlay.Inst.node_progressIcon.x;
-        let pos_y = GamePlay.Inst.node_progressUI.y;
+        let pos_x = GamePlay.Inst.node_progressUI.x;
+        let pos_y = GamePlay.Inst.node_progressUI.y + GamePlay.Inst.node_redPacketIcon.y;
 
         GamePlay.Inst.finalGetScore += score;
 

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

@@ -343,16 +343,16 @@ export default class CellItem extends cc.Component {
                 node_scoreEnergy.getComponent(ScoreEnergy).init(x, y, score);
                 GamePlay.Inst.node_effectUI.addChild(node_scoreEnergy);
 
-                //点击哪一个就在哪个位置生成
-                if (GamePlay.Inst.curClickCellItem == this) {
-                    GamePlay.Inst.curClickCellItem = null;
-                    let eliminateNum = GamePlay.Inst.cleanedVecArr.length;
-                    if (GamePlay.Inst.checkAddLevelRedPacket(eliminateNum)) {
-                        let node_levelRedPacket = PoolMgr.Inst.getPoolPrefab(NODEPOOLPREFABTYPE.LevelRedPacketItem);
-                        node_levelRedPacket.setPosition(pos_x, pos_y);
-                        GamePlay.Inst.node_levelRedPacketUI.addChild(node_levelRedPacket);
-                    }
-                }
+                //点击哪一个就在哪个位置生成 去除该功能
+                // if (GamePlay.Inst.curClickCellItem == this) {
+                //     GamePlay.Inst.curClickCellItem = null;
+                //     let eliminateNum = GamePlay.Inst.cleanedVecArr.length;
+                //     if (GamePlay.Inst.checkAddLevelRedPacket(eliminateNum)) {
+                //         let node_levelRedPacket = PoolMgr.Inst.getPoolPrefab(NODEPOOLPREFABTYPE.LevelRedPacketItem);
+                //         node_levelRedPacket.setPosition(pos_x, pos_y);
+                //         GamePlay.Inst.node_levelRedPacketUI.addChild(node_levelRedPacket);
+                //     }
+                // }
             }
         }