Skip to content

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

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

parents 5ae0921d e1f6d0d4
Show whitespace changes
Inline Side-by-side
Showing with 131 additions and 42 deletions
egret/src/mapScene/icon/ScratchIcon.ts
View file @ e41cc2b9
......@@ -23,6 +23,7 @@ export default class ScratchIcon extends IconBase {
public getTaskInfo() {
NetManager.ins.scratchGetTaskInfo((success, res) => {
if(!success) {
this.visible = false;
return;
}
let status = res.data.taskStatus;
......
egret/src/panels/TurntablePanel/Turntable.ts
View file @ e41cc2b9
......@@ -47,6 +47,7 @@ export default class Turntable extends Panel {
this['container2'].touchEnabled = false;
this['container2'].touchChildren = false;
this['nums'].text = `当前可用元宝：${getHomeData().wealth}`;
this['btnLabel'].text = "";
this.initUI();
}
......@@ -130,7 +131,7 @@ export default class Turntable extends Panel {
id = "thanks";
} else if(data.isScratchCard) {
id = "scratch";
}else {
} else {
id = data.option.categoryType;
}
this.rotateByPrize(id, () => {
......@@ -249,10 +250,13 @@ export default class Turntable extends Panel {
// 添加奖品
let prizeList = [];
for(let v of data.luckyDrawInfo.prizeList) {
if(v.categoryType == 1) {
continue;
}
prizeList.push(Utils.deepClone(v));
}
prizeList.push({
prizeList.unshift({
categoryType: 'thanks',
}, {
categoryType: 'scratch',
......@@ -296,6 +300,9 @@ export default class Turntable extends Panel {
v.prizeImg = prizeImg;
RotaryData.key.push(v.categoryType);
RotaryData.data[v.categoryType] = [{start: i * 60 - 20, end: i * 60 + 20}];
if(i>=6){
return;
}
this[`img${i}`].source = v.prizeImg;
if(this.data.onceAgain) { // 再抽一次
......
mock/happyclear/turnablebaseInfo.json
View file @ e41cc2b9
{
"code":"0000000000",
"data":{
"luckyDrawInfo":{
"baseCount":50,
"bonusCount":10,
"enable":true,
"id":"1234",
"prizeList":[
"success": true,
"code": "0000000000",
"desc": "OK",
"timestamp": 1572263074076,
"data": {
"remainTimes": null,
"costCoinJoinTimes": 0,
"nextTimeNeedCoin": 20,
"luckyDrawInfo": {
"enable": true,
"id": null,
"baseCount": 20,
"bonusCount": 0,
"prizeList": [
{
"categoryType":4,
"coinType":1,
"maxValue":10,
"minValue":10,
"rate":"20",
"title":"奖品信息"
"id": "",
"day": null,
"categoryType": 2,
"title": "11",
"rate": "11",
"minValue": null,
"maxValue": null,
"coinType": null,
"propType": null,
"num": 3,
"img": "",
"appItemId": null,
"name": "",
"value": ""
},
{
"appItemId":2099,
"categoryType":5,
"img":"虚拟商品图片",
"name":"虚拟商品名称",
"rate":"30",
"title":"奖品信息",
"value":"虚拟商品编码"
"id": "",
"day": null,
"categoryType": 4,
"title": "11",
"rate": "11",
"minValue": 11,
"maxValue": null,
"coinType": 1,
"propType": null,
"num": null,
"img": "",
"appItemId": null,
"name": "",
"value": ""
},
{
"categoryType":7,
"num":10,
"propType":2,
"rate":"30",
"title":"奖品信息"
"id": "",
"day": null,
"categoryType": 2,
"title": "111",
"rate": "11",
"minValue": null,
"maxValue": null,
"coinType": null,
"propType": null,
"num": 2,
"img": "",
"appItemId": null,
"name": "",
"value": ""
},
{
"categoryType":3,
"num":10,
"propType":2,
"rate":"30",
"title":"奖品信息"
}
]
"id": "",
"day": null,
"categoryType": 3,
"title": "11",
"rate": "11",
"minValue": null,
"maxValue": null,
"coinType": null,
"propType": 2,
"num": null,
"img": "",
"appItemId": null,
"name": "",
"value": ""
},
"remainTimes":11,
"costCoinJoinTimes":10,
"nextTimeNeedCoin":999999
{
"id": "",
"day": null,
"categoryType": 3,
"title": "11",
"rate": "11",
"minValue": null,
"maxValue": null,
"coinType": null,
"propType": 2,
"num": null,
"img": "",
"appItemId": null,
"name": "",
"value": ""
},
{
"id": "",
"day": null,
"categoryType": 2,
"title": "11",
"rate": "1",
"minValue": null,
"maxValue": null,
"coinType": null,
"propType": null,
"num": 2,
"img": "",
"appItemId": null,
"name": "",
"value": ""
},
"desc":"OK",
"success":true,
"timestamp":1572060015013
{
"id": "",
"day": null,
"categoryType": 3,
"title": "1111",
"rate": "11",
"minValue": null,
"maxValue": null,
"coinType": null,
"propType": 2,
"num": null,
"img": "",
"appItemId": null,
"name": "",
"value": ""
}
]
}
}
}
\ 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