Skip to content

X
xiaoxiaole
Commit 57aa4a66 authored by 邱旭's avatar 邱旭
Browse files
Options

1

parent 7b76a58d
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
egret/resource/skins/TaskCenterPrizeSkin.exml
View file @ 57aa4a66
......@@ -12,10 +12,10 @@
</e:skinName>
</e:Button>
<e:Image id="img" y="375.77" touchEnabled="true" width="512" height="240" scaleX="1" scaleY="1" horizontalCenter="0" source="{data.url}" visible="false"/>
<e:Image id="money" y="376.4" scaleX="0.7" scaleY="0.7" source="signprize元宝_png" horizontalCenter="0"/>
<e:Image id="money" y="376.4" scaleX="0.7" scaleY="0.7" source="signprize元宝_png" horizontalCenter="0" visible="false"/>
<e:Label id="propnums2" text="30" textColor="0x885037" bold="true" y="526.64" width="75" textAlign="right" x="287.6" fontFamily="FZY3JW" visible="false"/>
<e:Image id="blood" y="376.16" source="common_blood_png" scaleX="0.7" scaleY="0.7" horizontalCenter="0" visible="false"/>
<e:Group id="numsgroup" x="396.38" y="378.12">
<e:Group id="numsgroup" x="396.38" y="378.12" visible="false">
<e:Image id="numsbg" source="signprize_numsbg_png" x="0" y="0"/>
<e:Label id="nums" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW"/>
</e:Group>
......
egret/src/panels/HongbaoRain/RainMgr.ts
View file @ 57aa4a66
......@@ -47,7 +47,7 @@ export default class RainMgr {
let newRainObj = this.rainPool.get();
if(!newRainObj) {
newRainObj = new RainObj({
key: RainData[~~(Math.random() * RainData.key.length)],
key: RainData.key[~~(Math.random() * RainData.key.length)],
rainGroup: this.rainGroup,
pool:this.rainPool,
});
......
mock/happyclear/getTaskInfo.json
View file @ 57aa4a66
......@@ -2,19 +2,19 @@
"success": true,
"code": "0000000000",
"desc": "OK",
"timestamp": 1575011959435,
"timestamp": 1575292008257,
"data": [
{
"subActivityId": "SUB446971598063218688",
"subActivityId": "1",
"subActivityName": "狮狮连萌下单",
"status": "0",
"taskStatus": "0",
"remark": "下单任务",
"taskTitle": "狮狮连萌下单任务",
"taskViceTitle": "狮狮连萌下单任务",
"icon": "//uimgpre.cnsuning.com/uimg//scdc/exchange/152420922403871250.png",
"limit": "1",
"done": "0",
"icon": "http://uimgpre.cnsuning.com/uimg//scdc/exchange/152420922403871250.png",
"limit": "5",
"done": "3",
"appIncompleteText": "去看看",
"appCompleteText": "已完成",
"appIncompletelink": "http://cprexg.m.cnsuning.com/snWhale.html#/fight",
......@@ -29,20 +29,20 @@
"incompleteLink": null,
"completeLink": null,
"terminalType": "9",
"taskName": null,
"taskId": null,
"count": null,
"tips": ""
"taskName": "狮狮连萌逛店铺",
"taskId": "RW448429803289649152",
"count": "2",
"tips": "你好"
},
{
"subActivityId": "SUB446970931785445376",
"subActivityId": "2",
"subActivityName": "狮狮连萌逛店铺",
"status": "0",
"taskStatus": "99",
"remark": "逛店铺呀",
"taskTitle": "狮狮连萌逛店铺",
"taskViceTitle": "200金币",
"icon": "//uimgxgpre.cnsuning.com/uimg//scdc/exchange/157086878298813552.png",
"icon": "http://uimgxgpre.cnsuning.com/uimg//scdc/exchange/157086878298813552.png",
"limit": "3",
"done": "0",
"appIncompleteText": "去看看",
......@@ -59,20 +59,20 @@
"incompleteLink": "//uimgxgpre.cnsuning.com/uimg//scdc/exchange/157438697439978713.png",
"completeLink": "//uimgxgpre.cnsuning.com/uimg//scdc/exchange/157438697442128421.png",
"terminalType": "9",
"taskName": "狮狮连萌逛店铺",
"taskId": "RW448429803289649152",
"count": "3",
"tips": "去看看"
"taskName": "狮狮连萌浏览商品",
"taskId": "RW448431261020004352",
"count": "1",
"tips": "你好02"
},
{
"subActivityId": "SUB446971290222411776",
"subActivityId": "3",
"subActivityName": "狮狮连萌浏览商品",
"status": "0",
"taskStatus": "99",
"remark": "浏览商品聚合页",
"taskTitle": "狮狮连萌浏览商品",
"taskViceTitle": "200金币",
"icon": "//uimgxgpre.cnsuning.com/uimg//scdc/exchange/157086878298813552.png",
"icon": "http://uimgxgpre.cnsuning.com/uimg//scdc/exchange/157086878298813552.png",
"limit": "1",
"done": "0",
"appIncompleteText": "去看看",
......@@ -89,20 +89,20 @@
"incompleteLink": "//uimgxgpre.cnsuning.com/uimg//scdc/exchange/157438705987079430.png",
"completeLink": "//uimgxgpre.cnsuning.com/uimg//scdc/exchange/157438705989552821.png",
"terminalType": "9",
"taskName": "狮狮连萌浏览商品",
"taskId": "RW448431261020004352",
"count": "1",
"tips": "去看看"
"taskName": null,
"taskId": null,
"count": null,
"tips": "你好02"
},
{
"subActivityId": "SUB446689681678090240",
"subActivityId": "4",
"subActivityName": "狮狮连萌逛会场",
"status": "0",
"taskStatus": "99",
"remark": "狮狮连萌浏览啦",
"taskTitle": "狮狮连萌逛会场任务",
"taskViceTitle": null,
"icon": null,
"icon": "http://uimgpre.cnsuning.com/uimg//scdc/exchange/152420922403871250.png",
"limit": "8",
"done": "0",
"appIncompleteText": "去看看",
......@@ -121,8 +121,8 @@
"terminalType": "9",
"taskName": "狮狮连萌逛会场任务",
"taskId": "RW446695731227987968",
"count": "2",
"tips": "去看看"
"count": "1",
"tips": "你好04"
}
]
}
\ No newline at end of file
mock/happyclear/taskAward.json
View file @ 57aa4a66
......@@ -7,7 +7,7 @@
"option": {
"id": "224",
"day": null,
"categoryType": 3,
"categoryType": 2,
"title": "炸弹",
"rate": "50",
"minValue": null,
......
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