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

egret/resource/TextureMerger/ad.tmproject

+{"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

@@ -105,8 +105,8 @@
 			"name": "inviterule"
 		},
 		{
-			"name": "preload",
-			"keys": "ad_closebtn_png"
+			"keys": "ad_closebtn_png",
+			"name": "ad"
 		}
 	],
 	"resources": [
@@ -2221,9 +2221,9 @@
 			"name": "inviterulebg_png"
 		},
 		{
-			"name": "ad_closebtn_png",
+			"url": "assets/ad/ad_closebtn.png",
 			"type": "image",
-			"url": "assets/ad/ad_closebtn.png"
+			"name": "ad_closebtn_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/ADSkin.exml

 <?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">
 	<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:skinName>
 			<e:Skin states="up,down,disabled">

egret/src/panels/ADPanel.ts

@@ -18,6 +18,10 @@ export default class ADPanel extends Panel {
             result = popupAdvert.advertList[index];
         }
         this.data.img = result.img;
+
+        this['adBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
+            window.location.href = result.url;
+        }, this);
     }
 
     showlog() {
@@ -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' }
 }
\ No newline at end of file

egret/src/panels/StartPanel.ts

@@ -32,22 +32,24 @@ export default class StartPanel extends Panel {
         this['empty'].visible = false;
 
         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;
-            if(friends && friends.length > 0 ) {
+            if (friends && friends.length > 0) {
                 this.friendlist.visible = true;
                 if (friends.length > 5)
                     friends.length = 5;
-                    friends.forEach((ele,index) => {
-                        ele.rank = index + 1;
-                    });
+                friends.forEach((ele, index) => {
+                    ele.rank = index + 1;
+                });
                 const ac = new eui.ArrayCollection(friends);
                 this.friendlist.dataProvider = ac;
             }
             else {
                 this['empty'].visible = true;
             }
-            
+
         }, data)
 
         setGlow(this['levelTxt'], 0xfa4b09, 1);

mock/happyclear/levelNumRank copy.json

+{
+    "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

-{
-    "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
+{"success":true,"code":"0000000000","desc":"OK","timestamp":1571045294822,"data":null}
\ No newline at end of file