Skip to content

X
xiaoxiaole
Commit 6f48d065 authored by wjf's avatar wjf
Browse files
Options

l

parents ab9ce8f4 a013cd42
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 47 deletions
egret/libs/tw/manager/NetManager.ts
View file @ 6f48d065
...@@ -698,7 +698,7 @@ export class NetManager extends ABNetManager { ...@@ -698,7 +698,7 @@ export class NetManager extends ABNetManager {
* @param {number} orderId 订单ID * @param {number} orderId 订单ID
* @param {number} prizeLevel 开奖等级，暂未开放 * @param {number} prizeLevel 开奖等级，暂未开放
*/ */
public getPlugOrderStatus(callback: Function, orderId: number, pollingCheck: Function, pollingCount = 5, prizeLevel?: number): void { public getPlugOrderStatus(callback: Function, orderId: number, pollingCheck: Function, pollingCount = 10, prizeLevel?: number): void {
const net: INetData = { const net: INetData = {
name: 'getPlugOrderStatus', name: 'getPlugOrderStatus',
uri: '/plugin/getOrderStatus', uri: '/plugin/getOrderStatus',
......
egret/resource/TextureMerger/box.tmproject 0 → 100644
View file @ 6f48d065
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"box","version":5,"files":["../assets/box/boxbtn.png","../assets/box/boxbg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/main.tmproject
View file @ 6f48d065
This diff is collapsed.
egret/resource/default.res.json
View file @ 6f48d065
...@@ -63,6 +63,10 @@ ...@@ -63,6 +63,10 @@
{ {
"keys": "blood体力补济站_png,blood按钮_png,blood按钮 副本1_png,blood按钮 副本_png", "keys": "blood体力补济站_png,blood按钮_png,blood按钮 副本1_png,blood按钮 副本_png",
"name": "blood" "name": "blood"
},
{
"keys": "boxbtn_png,boxbg_png",
"name": "box"
} }
], ],
"resources": [ "resources": [
......
egret/src/mainScene/MainScene.ts
View file @ 6f48d065
...@@ -2162,7 +2162,7 @@ export default class MainScene extends Scene { ...@@ -2162,7 +2162,7 @@ export default class MainScene extends Scene {
} }
}, },
submitData.prizeResponse.orderNum, submitData.prizeResponse.orderNum,
() => { DataManager.ins.getData('getPlugOrderStatus').result == 0 }) () => { return DataManager.ins.getData('getPlugOrderStatus').result == 0 });
}else { }else {
PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { starCount: this.scoreProgress.starCount }); PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { starCount: this.scoreProgress.starCount });
......
egret/src/mapScene/MapScene.ts
View file @ 6f48d065
...@@ -176,13 +176,32 @@ export default class MapScene extends Scene { ...@@ -176,13 +176,32 @@ export default class MapScene extends Scene {
NetManager.ins.hc_openTreasureBox((success) => { NetManager.ins.hc_openTreasureBox((success) => {
this['box'].touchEnabled = true; this['box'].touchEnabled = true;
if (success) { if (success) {
const boxdata = DataManager.ins.getData('hc_openTreasureBox').data; const boxdata = DataManager.ins.getData('hc_openTreasureBox').data;
const homeData = DataManager.ins.getData('hc_home').data; const homeData = DataManager.ins.getData('hc_home').data;
homeData.canReceiveTreasureBoxNum = boxdata.canReceiveTreasureBoxNum; homeData.canReceiveTreasureBoxNum = boxdata.canReceiveTreasureBoxNum;
homeData.nextRangeStarsNum = boxdata.nextRangeStarsNum; homeData.nextRangeStarsNum = boxdata.nextRangeStarsNum;
homeData.totalStarts = boxdata.totalStarts; homeData.totalStarts = boxdata.totalStarts;
this.updateBox(); this.updateBox();
PanelCtrl.instance.show('box'); const data = DataManager.ins.getData('hc_openTreasureBox').data;
NetManager.ins.getPlugOrderStatus((s) => {
if (s) {
const data = DataManager.ins.getData('getPlugOrderStatus');
//区分奖品
if (data.lottery) {
PanelCtrl.instance.show('box');
} else {
showToast('您与奖品擦肩而过~');
}
} else {
showToast('您与奖品擦肩而过~');
}
},
data.orderNum,
() => { return DataManager.ins.getData('getPlugOrderStatus').result == 0 });
} }
}) })
// } // }
......
mock/happyclear/openTreasureBox.json
View file @ 6f48d065
{ {"success":true,"code":"0000000000","desc":"OK","timestamp":1566558623308,"data":{"canReceiveTreasureBoxNum":0,"nextRangeStarsNum":25,"orderNum":"1078836456709300393","totalStars":12}}
"code":"0000000000", \ No newline at end of file
"data":{
"canReceiveTreasureBoxNum":2,
"nextRangeStarsNum":99,
"totalStarts":0,
"orderNum":"2323"
},
"desc":"OK",
"success":true,
"timestamp":1566374161976
}
\ No newline at end of file
mock/happyclear/submit.json
View file @ 6f48d065
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
"success": true, "success": true,
"code": "0000000000", "code": "0000000000",
"desc": "OK", "desc": "OK",
"timestamp": 1566556954843, "timestamp": 1566557834416,
"data": { "data": {
"prizeType": 1, "prizeType": 1,
"prizeResponse": { "prizeResponse": {
"orderNum": "1078836456709200289", "orderNum": "1078836456709220393",
"errorMsg": null, "errorMsg": null,
"success": true "success": true
}, },
......
mock/json/getPlugOrderStatus copy.json 0 → 100755
View file @ 6f48d065
{
"result": 1,
"success": true,
"lottery": {
"androidDownloadUrl": "//trade.m.duiba.com.cn",
"coupon_code": "123456",
"st_info": "{\"info_type\":\"1\",\"os\":\"1\",\"login_type\":1,\"item_id\":31164,\"isEmbed\":true,\"button_type\":\"70004\",\"ip\":\"115.238.95.186\",\"consumer_id\":1,\"duiba_activity_id\":350,\"domain\":\"//embedlog.duiba.com.cn\",\"activity_type\":\"7\",\"activity_id\":350,\"app_id\":1,\"info\":\"355045189855250001\"}",
"link": "//trade.m.duiba.com.cn/crecord/recordDetailNew?orderId=355045190182920001&after=1&dbnewopen&dpm=1.4.3.0&dcm=101.31164.0.0&pluginId=350",
"useBtnText": "查看使用方法",
"st_info_close": "{\"info_type\":\"1\",\"os\":\"1\",\"login_type\":1,\"item_id\":31164,\"isEmbed\":true,\"button_type\":\"70005\",\"ip\":\"115.238.95.186\",\"consumer_id\":1,\"duiba_activity_id\":350,\"domain\":\"//embedlog.duiba.com.cn\",\"activity_type\":\"7\",\"activity_id\":350,\"app_id\":1,\"info\":\"355045189855250001\"}",
"st_info_expouse": "{\"info_type\":\"1\",\"os\":\"1\",\"login_type\":1,\"item_id\":31164,\"isEmbed\":true,\"button_type\":\"70001\",\"ip\":\"115.238.95.186\",\"consumer_id\":1,\"duiba_activity_id\":350,\"domain\":\"//embedlog.duiba.com.cn\",\"activity_type\":\"7\",\"activity_id\":350,\"app_id\":1,\"info\":\"355045189855250001\"}",
"type": "virtual",
"title": "重复券测试grape",
"st_info_detail": "{\"info_type\":\"1\",\"os\":\"1\",\"login_type\":1,\"item_id\":31164,\"isEmbed\":true,\"button_type\":\"70002\",\"ip\":\"115.238.95.186\",\"consumer_id\":1,\"duiba_activity_id\":350,\"domain\":\"//embedlog.duiba.com.cn\",\"activity_type\":\"7\",\"activity_id\":350,\"app_id\":1,\"info\":\"355045189855250001\"}",
"confirm": false,
"openUrl": "//trade.m.duiba.com.cn/crecord/recordDetailNew?id=355045190182920001&after=1&dbnewopen&dpm=1.4.2.0&dcm=101.31164.0.0",
"imgurl": "//yun.duiba.com.cn/images/201607/73htz55ih9.jpg",
"showUse": true,
"st_info_dpm_close": "{\"dpm\":\"1.4.4.0\",\"consumerId\":1,\"domain\":\"//embedlog.duiba.com.cn\",\"appId\":1,\"dcm\":\"101.31164.0.0\"}",
"iosDownloadUrl": "//trade.m.duiba.com.cn",
"st_info_dpm_img": "{\"dpm\":\"1.4.2.0\",\"consumerId\":1,\"domain\":\"//embedlog.duiba.com.cn\",\"appId\":1,\"dcm\":\"101.31164.0.0\"}",
"tip": "",
"id": 38852,
"coupon_key": "111",
"st_info_use": "{\"info_type\":\"1\",\"os\":\"1\",\"login_type\":1,\"item_id\":31164,\"isEmbed\":true,\"button_type\":\"40003\",\"ip\":\"115.238.95.186\",\"consumer_id\":1,\"duiba_activity_id\":350,\"domain\":\"//embedlog.duiba.com.cn\",\"activity_type\":\"7\",\"activity_id\":350,\"app_id\":1,\"info\":\"355045189855250001\"}",
"validate": "2020-04-01",
"st_info_pic": "{\"info_type\":\"1\",\"os\":\"1\",\"login_type\":1,\"item_id\":31164,\"isEmbed\":true,\"button_type\":\"70003\",\"ip\":\"115.238.95.186\",\"consumer_id\":1,\"duiba_activity_id\":350,\"domain\":\"//embedlog.duiba.com.cn\",\"activity_type\":\"7\",\"activity_id\":350,\"app_id\":1,\"info\":\"355045189855250001\"}"
}
}
\ No newline at end of file
mock/json/getPlugOrderStatus.json
View file @ 6f48d065
{ {"result":2,"lotteryCode":1,"success":true,"lottery":{"confirm":false,"coupon_code":"24324238208","coupon_key":"865690","id":1419,"imgurl":"//yun.dui88.com/images/201907/ns452782nx.png","isAppHidden":true,"isDownloadUrl":true,"itemId":49385,"link":"//activity.m.duibadev.com.cn/crecord/recordDetailNew?orderId=1080794503076520393&after=1&dbnewopen&dpm=1.4.3.0&dcm=101.49385.0.0","linkTo":0,"showUse":false,"st_info_dpm_close":"{\"dpm\":\"1.4.4.0\",\"consumerId\":500208009,\"domain\":\"//activity.m.duibadev.com.cn\",\"appId\":1,\"dcm\":\"101.49385.0.0\"}","st_info_dpm_go_use":"{\"dpm\":\"1.4.1.0\",\"consumerId\":500208009,\"domain\":\"//activity.m.duibadev.com.cn\",\"appId\":1,\"dcm\":\"101.49385.0.0\"}","st_info_dpm_img":"{\"dpm\":\"1.4.1.0\",\"consumerId\":500208009,\"domain\":\"//activity.m.duibadev.com.cn\",\"appId\":1,\"dcm\":\"101.49385.0.0\"}","tip":"","title":"亚组委-随机","type":"coupon","useBtnText":"马上使用","validate":"2019-08-31"},"takeSuccess":false}
"result": 1, \ No newline at end of file
"success": true,
"lottery": {
"androidDownloadUrl": "//trade.m.duiba.com.cn",
"coupon_code": "123456",
"st_info": "{\"info_type\":\"1\",\"os\":\"1\",\"login_type\":1,\"item_id\":31164,\"isEmbed\":true,\"button_type\":\"70004\",\"ip\":\"115.238.95.186\",\"consumer_id\":1,\"duiba_activity_id\":350,\"domain\":\"//embedlog.duiba.com.cn\",\"activity_type\":\"7\",\"activity_id\":350,\"app_id\":1,\"info\":\"355045189855250001\"}",
"link": "//trade.m.duiba.com.cn/crecord/recordDetailNew?orderId=355045190182920001&after=1&dbnewopen&dpm=1.4.3.0&dcm=101.31164.0.0&pluginId=350",
"useBtnText": "查看使用方法",
"st_info_close": "{\"info_type\":\"1\",\"os\":\"1\",\"login_type\":1,\"item_id\":31164,\"isEmbed\":true,\"button_type\":\"70005\",\"ip\":\"115.238.95.186\",\"consumer_id\":1,\"duiba_activity_id\":350,\"domain\":\"//embedlog.duiba.com.cn\",\"activity_type\":\"7\",\"activity_id\":350,\"app_id\":1,\"info\":\"355045189855250001\"}",
"st_info_expouse": "{\"info_type\":\"1\",\"os\":\"1\",\"login_type\":1,\"item_id\":31164,\"isEmbed\":true,\"button_type\":\"70001\",\"ip\":\"115.238.95.186\",\"consumer_id\":1,\"duiba_activity_id\":350,\"domain\":\"//embedlog.duiba.com.cn\",\"activity_type\":\"7\",\"activity_id\":350,\"app_id\":1,\"info\":\"355045189855250001\"}",
"type": "virtual",
"title": "重复券测试grape",
"st_info_detail": "{\"info_type\":\"1\",\"os\":\"1\",\"login_type\":1,\"item_id\":31164,\"isEmbed\":true,\"button_type\":\"70002\",\"ip\":\"115.238.95.186\",\"consumer_id\":1,\"duiba_activity_id\":350,\"domain\":\"//embedlog.duiba.com.cn\",\"activity_type\":\"7\",\"activity_id\":350,\"app_id\":1,\"info\":\"355045189855250001\"}",
"confirm": false,
"openUrl": "//trade.m.duiba.com.cn/crecord/recordDetailNew?id=355045190182920001&after=1&dbnewopen&dpm=1.4.2.0&dcm=101.31164.0.0",
"imgurl": "//yun.duiba.com.cn/images/201607/73htz55ih9.jpg",
"showUse": true,
"st_info_dpm_close": "{\"dpm\":\"1.4.4.0\",\"consumerId\":1,\"domain\":\"//embedlog.duiba.com.cn\",\"appId\":1,\"dcm\":\"101.31164.0.0\"}",
"iosDownloadUrl": "//trade.m.duiba.com.cn",
"st_info_dpm_img": "{\"dpm\":\"1.4.2.0\",\"consumerId\":1,\"domain\":\"//embedlog.duiba.com.cn\",\"appId\":1,\"dcm\":\"101.31164.0.0\"}",
"tip": "",
"id": 38852,
"coupon_key": "111",
"st_info_use": "{\"info_type\":\"1\",\"os\":\"1\",\"login_type\":1,\"item_id\":31164,\"isEmbed\":true,\"button_type\":\"40003\",\"ip\":\"115.238.95.186\",\"consumer_id\":1,\"duiba_activity_id\":350,\"domain\":\"//embedlog.duiba.com.cn\",\"activity_type\":\"7\",\"activity_id\":350,\"app_id\":1,\"info\":\"355045189855250001\"}",
"validate": "2020-04-01",
"st_info_pic": "{\"info_type\":\"1\",\"os\":\"1\",\"login_type\":1,\"item_id\":31164,\"isEmbed\":true,\"button_type\":\"70003\",\"ip\":\"115.238.95.186\",\"consumer_id\":1,\"duiba_activity_id\":350,\"domain\":\"//embedlog.duiba.com.cn\",\"activity_type\":\"7\",\"activity_id\":350,\"app_id\":1,\"info\":\"355045189855250001\"}"
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment