Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev

egret/src/mapScene/icon/ScratchIcon.ts

@@ -86,8 +86,10 @@ export default class ScratchIcon extends IconBase {
                 case (status == 2): // 当前任务完成待领奖 请求领奖接口
                     NetManager.ins.scratchTakePrize((success, res) => {
                         if(!success) {
-                            if(res.code == 600016){
+                            if(res.code == 600016) {
                                 showToast("哎呀，萌狮开小差啦！\n过会再来看看吧！");
+                            } else if(res.code == 600028) {
+                                showToast("哎呀萌狮开小差啦！");
                             }
                             return;
                         }

egret/src/panels/ScratchPanel.ts

@@ -36,7 +36,7 @@ export default class ScratchPanel extends Panel {
             }
             x += 5;
             this.myShape.graphics.lineTo(x, y);
-            if(x > (+this.data.completePercent) / 100 * this["prizeImg"].width){
+            if(x > (+this.data.completePercent) / 100 * this["prizeImg"].width + 10){
                 return;
             }
             this.setGtaphics(x, y);

mock/happyclear/scratchGetTaskInfo.json

@@ -5,11 +5,11 @@
     "timestamp": 1572420059060,
     "data": {
         "scratchCardTaskId": 3,
-        "taskStatus": 2,
+        "taskStatus": 1,
         "prizeImage": "//yun.dui88.com/images/201910/9u6nk8sjt8.jpg",
         "currentTime": 1572420059060,
         "endTime": 1572493282000,
-        "completePercent": "100",
+        "completePercent": "98",
         "remainPercent": "0",
         "totalNeedCount": 1,
         "helpedCount": 1,