1111

mock/miniTb/qiaqia2.exchangeGoods.json

@@ -5,16 +5,16 @@
         "amount": "5",
         "drawStatus": 6,
         "openId": "AAGquNyCAKrpWdzBzeceF5T-",
-        "remark": "今日领取达到上限，明日再来领取哦",
+        "remark": "请至卡券包删除无用权益再领取",
         "type": 1,
         "prizeId": "5ee8809b8564b515371c5c11",
         "activityId": "5ee70c078564b5153717fbfd",
         "ename": "ffdd8a992ad545d6b0ecb46d76f18982",
         "userNick": "lpf468169313",
         "name": "限制库存优惠券洽洽1",
-        "_id": "AAGquNyCAKrpWdzBzeceF5T-1592297851985",
-        "exchangeDay": "2020/06/16"
+        "_id": "AAGquNyCAKrpWdzBzeceF5T-1592373462304",
+        "exchangeDay": "2020/06/17"
     },
-    "success": tr
+    "success": true,
     "message": "成功"
 }

mock/miniTb/qiaqiaHome.getGameInfo.json

@@ -3,43 +3,39 @@
     "data": {
         "guideStep": 8,
         "guideIsEnd": true,
-        "waterDrops": 94,
+        "waterDrops": 0,
         "plants": [
             {
-                "level": 2,
-                "waterRestCount": 1,
-                "totalTime": 3000,
-                "plant": true,
-                "waterTime": 1591954069560,
+                "level": "",
+                "waterRestCount": "",
+                "plant": false,
+                "waterTime": "",
                 "index": 1,
-                "plantType": "CHESTNUT"
+                "plantType": ""
             },
             {
-                "level": 3,
-                "waterRestCount": 0,
-                "totalTime": 0,
+                "level": "",
+                "waterRestCount": "",
                 "plant": false,
                 "waterTime": "",
                 "index": 2,
-                "plantType": "CHESTNUT"
+                "plantType": ""
             },
             {
-                "level": 3,
-                "waterRestCount": 0,
-                "totalTime": 0,
+                "level": "",
+                "waterRestCount": "",
                 "plant": false,
                 "waterTime": "",
                 "index": 3,
-                "plantType": "CHESTNUT"
+                "plantType": ""
             },
             {
-                "level": 3,
-                "waterRestCount": 0,
-                "totalTime": 0,
+                "level": "",
+                "waterRestCount": "",
                 "plant": false,
                 "waterTime": "",
                 "index": 4,
-                "plantType": "CHESTNUT"
+                "plantType": ""
             }
         ]
     },

src/panels/ExSuccessPanel.ts

@@ -57,11 +57,11 @@ export default class ExSuccessPanel extends Panel {
                 showToast('兑换成功');
             }).catch(() => {
                 this.hideAll();
-                showToast('奖品发放失败\n请前往我的奖品处进行处理');
+                // showToast('奖品发放失败\n请前往我的奖品处进行处理');
             })
         } else {
             this.hideAll();
-            // showToast('奖品发放失败\n请前往我的奖品处进行处理');
+            showToast('奖品发放失败\n请前往我的奖品处进行处理');
         }
     }
 

src/panels/TaskPanel.ts

 import { Panel } from "../../module/views/Panel";
 import { Tool } from "../Tools";
 import { layers } from "../../module/views/layers";
-import { RES } from "../../module/RES";
 import { activityId, sellerId, sendTbNet, TbNetName } from "../TaoBaoNet";
 import { GDispatcher } from "../Main";
 import { G_EVENT } from "../const/GEVENT";
@@ -147,7 +146,7 @@ const taskInfo = {
     },
     invites: {
         name: '邀请好友',
-        tips: '邀请3位好友可得大量水滴',
+        tips: '邀请好友可得大量水滴',
         btnLabel: '去邀请',
         doneLabel: '明日再来'
     },

src/parts/Game/ProgressBar.ts

@@ -28,10 +28,15 @@ export default class ProgressBar extends Container {
         this.fill.position.set(56, 1);
         // mask
         const mask = this.addChild(new Graphics());
-        mask.drawRect(56, 1, 139, 29);
+        mask.drawRect(0, 0, 195, 31);
         this.fill.mask = mask;
 
-        this.fill.x = -59;
+        mask.mouseEnable = false;
+        mask.mouseChildren = false;
+
+        this.fill.x = 56.2;
+
+        mask.x = -138;
 
         // nameLabel
         this.nameLabel = this.addChild(new TextField());
@@ -116,8 +121,11 @@ export default class ProgressBar extends Container {
         this.timeLabel.text = `${hour}时${min}分后浇水`;
         // this.timeLabel.position.set(56 + (136 - this.timeLabel.textWidth) / 2, 0);
 
+        // const progress = 1 - this.cutTime / this.fullTime;
+        // this.fill.x = 139 * progress - 139 + 53;
         const progress = 1 - this.cutTime / this.fullTime;
-        this.fill.x = 139 * progress - 139 + 53;
+        this.fill.mask.x = -138 + 138 * progress;
+
     }
 
     /**

src/scenes/GameScene.ts

@@ -6,6 +6,7 @@ import { Land } from "../parts/Game/Land";
 import MouseEvent = FYGE.MouseEvent;
 import { gameResource } from "../const/staticData";
 import Sprite = FYGE.Sprite;
+// import ProgressBar from "../parts/Game/ProgressBar";
 
 export class GameScene extends Scene {
 
@@ -44,6 +45,10 @@ export class GameScene extends Scene {
         this.adBtn.name = '广告';
         this.adBtn.visible = false;
 
+       // let a = this.addChild(new ProgressBar());
+       // a.position.set(400, 500);
+       // a.visible = true;
+
     }
 
     start() {