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

egret/libs/tw/manager/NetManager.ts

@@ -2137,7 +2137,9 @@ export class NetManager extends ABNetManager {
             hideMsg: true,
             param: {
                 activityId: DataManager.ins.customCfgData.actId,
-                scratchCardTaskId:scratchCardTaskId
+                scratchCardTaskId:scratchCardTaskId,
+                detect: window['detect'],
+                deviceSessionId: window['_device_session_id']
             },
             callback: callback
         };

egret/src/mapScene/icon/ScratchIcon.ts

@@ -7,6 +7,7 @@ import { ModuleTypes } from "../../../libs/new_wx/types/sceneTypes";
 import { loadSvga } from "../../loadSvga";
 import getResPath from "../../../libs/new_tc/getResPath";
 import Utils from "../../Utils";
+import { showToast } from "../../../libs/new_wx/ctrls/toastCtrl";
 
 export default class ScratchIcon extends IconBase {
     private cutTimer: CutTimer = null;
@@ -81,8 +82,11 @@ export default class ScratchIcon extends IconBase {
                     // PanelCtrl.instance.show('scratch', res.data);
                     break;
                 case (status == 2): // 当前任务完成待领奖 请求领奖接口
-                    NetManager.ins.scratchTakePrize((success) => {
+                    NetManager.ins.scratchTakePrize((success, res) => {
                         if(!success) {
+                            if(res.code == 600016){
+                                showToast("哎呀，萌狮开小差啦！\n过会再来看看吧！");
+                            }
                             return;
                         }
                         PanelCtrl.instance.show("scratchPrize", res.data);

egret/src/panels/TurntablePanel/TurntablePrize2Panel.ts

@@ -7,6 +7,7 @@ import { NetManager } from "../../../libs/tw/manager/NetManager";
 import CutTimer from "../../CutTimer";
 import Utils from "../../Utils";
 import { getlogItem } from "../../Main";
+import { showToast } from "../../../libs/new_wx/ctrls/toastCtrl";
 
 export default class TurnPrize2Panel extends Panel {
     start(data) {
@@ -103,6 +104,9 @@ export default class TurnPrize2Panel extends Panel {
                 case (status == 2): // 当前任务完成待领奖 请求领奖接口
                     NetManager.ins.scratchTakePrize((success, res) => {
                         if (!success) {
+                            if(res.code == 600016){
+                                showToast("哎呀，萌狮开小差啦！\n过会再来看看吧！");
+                            }
                             return;
                         }
                         PanelCtrl.instance.show("scratchPrize", res.data);