Skip to content

X
xiaoxiaole
Commit 552e2862 authored by 邱旭's avatar 邱旭
Browse files
Options

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

parents 717641f4 764b4f81
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 49 deletions
egret/resource/skins/MapSkin.exml
View file @ 552e2862
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</e:Button> </e:Button>
<e:Group x="84.67" y="0"> <e:Group x="84.67" y="0">
<e:Image id="inviteTipsBg" source="invite_txtbg_png" x="0" y="0" touchEnabled="false"/> <e:Image id="inviteTipsBg" source="invite_txtbg_png" x="0" y="0" touchEnabled="false"/>
<e:Label id="inviteTips" text="待领取取" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xffffff" size="16"/> <e:Label id="inviteTips" text="立即到账" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xffffff" size="16"/>
</e:Group> </e:Group>
</e:Group> </e:Group>
<e:Group x="30" scaleX="1.4" scaleY="1.4" bottom="23"> <e:Group x="30" scaleX="1.4" scaleY="1.4" bottom="23">
......
egret/src/panels/StartPanel.ts
View file @ 552e2862
...@@ -32,11 +32,15 @@ export default class StartPanel extends Panel { ...@@ -32,11 +32,15 @@ export default class StartPanel extends Panel {
this['empty'].visible = false; this['empty'].visible = false;
NetManager.ins.hc_levelNumRank(() => { NetManager.ins.hc_levelNumRank(() => {
const { data: friends } = DataManager.ins.getData('hc_levelNumRank'); let { data: friends } = DataManager.ins.getData('hc_levelNumRank');
friends = friends.rank;
if(friends && friends.length > 0 ) { if(friends && friends.length > 0 ) {
this.friendlist.visible = true; this.friendlist.visible = true;
if (friends.length > 5) if (friends.length > 5)
friends.length = 5; friends.length = 5;
friends.forEach((ele,index) => {
ele.rank = index + 1;
});
const ac = new eui.ArrayCollection(friends); const ac = new eui.ArrayCollection(friends);
this.friendlist.dataProvider = ac; this.friendlist.dataProvider = ac;
} }
......
mock/happyclear/levelNumRank.json
View file @ 552e2862
{ {
"success": true, "success": true,
"code": null, "code": "0000000000",
"desc": null, "desc": "OK",
"timestamp": 1566199822308, "timestamp": 1571044339755,
"data": [ "data": {
{ "levelNum": 1,
"nickName": "奈何本人没文化，一句卧槽行天下", "rank": [
"avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg", {
"stars": 1, "nickName": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
"maxScore": 1234567, "avatar": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
"rank": "1" "stars": 3,
}, "maxScore": 31940,
{ "rank": null,
"nickName": "2奈何本人没文化，一句卧槽行天下", "levelNum": null,
"avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg", "consumerId": null
"stars": 1, }
"maxScore": 1234567, ,
"rank": "2" {
}, "nickName": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
{ "avatar": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
"nickName": "3奈何本人没文化，一句卧槽行天下", "stars": 3,
"avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg", "maxScore": 31940,
"stars": 1, "rank": null,
"maxScore": 1234567, "levelNum": null,
"rank": "3" "consumerId": null
}, }
{ ]
"nickName": "4奈何本人没文化，一句卧槽行天下", }
"avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
"stars": 1,
"maxScore": 1234567,
"rank": "4"
},
{
"nickName": "5奈何本人没文化，一句卧槽行天下",
"avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
"stars": 1,
"maxScore": 123,
"rank": "5"
},
{
"nickName": "6奈何本人没文化，一句卧槽行天下",
"avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
"stars": 1,
"maxScore": 555555,
"rank": "6"
}
]
} }
\ 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