Skip to content

X
xiaoxiaole
Commit 18b21f9b authored by 邱旭's avatar 邱旭
Browse files
Options

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

parents efe0d0e1 e51b0fec
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 42 deletions
egret/resource/TextureMerger/ad.tmproject 0 → 100644
View file @ 18b21f9b
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"ad","version":5,"files":["../assets/ad/ad_closebtn.png"]}
\ No newline at end of file
egret/resource/default.res.json
View file @ 18b21f9b
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
"name": "inviterule" "name": "inviterule"
}, },
{ {
"name": "preload", "keys": "ad_closebtn_png",
"keys": "ad_closebtn_png" "name": "ad"
} }
], ],
"resources": [ "resources": [
...@@ -2221,9 +2221,9 @@ ...@@ -2221,9 +2221,9 @@
"name": "inviterulebg_png" "name": "inviterulebg_png"
}, },
{ {
"name": "ad_closebtn_png", "url": "assets/ad/ad_closebtn.png",
"type": "image", "type": "image",
"url": "assets/ad/ad_closebtn.png" "name": "ad_closebtn_png"
} }
] ]
} }
\ No newline at end of file
egret/resource/skins/ADSkin.exml
View file @ 18b21f9b
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="AddSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="AddSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16db3bd8eb8"/> <w:Config id="16db3bd8eb8"/>
<e:Image id="closeBtn2" y="142" horizontalCenter="0" width="540" height="600" source="{data.img}"/> <e:Image id="adBtn" y="142" horizontalCenter="0" width="540" height="600" source="{data.img}"/>
<e:Button id="closeBtn" label="" y="811" horizontalCenter="0"> <e:Button id="closeBtn" label="" y="811" horizontalCenter="0">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
......
egret/src/panels/ADPanel.ts
View file @ 18b21f9b
...@@ -18,6 +18,10 @@ export default class ADPanel extends Panel { ...@@ -18,6 +18,10 @@ export default class ADPanel extends Panel {
result = popupAdvert.advertList[index]; result = popupAdvert.advertList[index];
} }
this.data.img = result.img; this.data.img = result.img;
this['adBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
window.location.href = result.url;
}, this);
} }
showlog() { showlog() {
...@@ -34,6 +38,6 @@ export default class ADPanel extends Panel { ...@@ -34,6 +38,6 @@ export default class ADPanel extends Panel {
} }
protected get closeBtns(): eui.Button[] { return [this['closeBtn'], this['closeBtn2']] } protected get closeBtns(): eui.Button[] { return [this['closeBtn']] }
get skinKey() { return 'AD' } get skinKey() { return 'AD' }
} }
\ No newline at end of file
egret/src/panels/StartPanel.ts
View file @ 18b21f9b
...@@ -32,13 +32,15 @@ export default class StartPanel extends Panel { ...@@ -32,13 +32,15 @@ export default class StartPanel extends Panel {
this['empty'].visible = false; this['empty'].visible = false;
NetManager.ins.hc_levelNumRank(() => { NetManager.ins.hc_levelNumRank(() => {
let { data: friends } = DataManager.ins.getData('hc_levelNumRank'); let friends = DataManager.ins.getData('hc_levelNumRank').data;
if (friends == null)
friends = { rank: [] };
friends = friends.rank; 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) => { friends.forEach((ele, index) => {
ele.rank = index + 1; ele.rank = index + 1;
}); });
const ac = new eui.ArrayCollection(friends); const ac = new eui.ArrayCollection(friends);
......
mock/happyclear/levelNumRank copy.json 0 → 100644
View file @ 18b21f9b
{
"success": true,
"code": "0000000000",
"desc": "OK",
"timestamp": 1571044339755,
"data": {
"levelNum": 1,
"rank": [
{
"nickName": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
"avatar": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
"stars": 3,
"maxScore": 31940,
"rank": null,
"levelNum": null,
"consumerId": null
}
,
{
"nickName": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
"avatar": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
"stars": 3,
"maxScore": 31940,
"rank": null,
"levelNum": null,
"consumerId": null
}
]
}
}
\ No newline at end of file
mock/happyclear/levelNumRank.json
View file @ 18b21f9b
{ {"success":true,"code":"0000000000","desc":"OK","timestamp":1571045294822,"data":null}
"success": true, \ No newline at end of file
"code": "0000000000",
"desc": "OK",
"timestamp": 1571044339755,
"data": {
"levelNum": 1,
"rank": [
{
"nickName": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
"avatar": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
"stars": 3,
"maxScore": 31940,
"rank": null,
"levelNum": null,
"consumerId": null
}
,
{
"nickName": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
"avatar": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
"stars": 3,
"maxScore": 31940,
"rank": null,
"levelNum": null,
"consumerId": null
}
]
}
}
\ 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