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

egret/resource/skins/FriendSkin.exml

@@ -50,9 +50,9 @@
 		<e:Rect id="avatarMask0" width="60" height="60" y="0" ellipseWidth="60" ellipseHeight="60"/>
 	</e:Group>
 	<e:Label id="nameTxt0" text="nickname" y="245" textColor="0x784325" horizontalCenter="6.5"/>
-	<e:Label id="rankTxt" text="0" x="112" y="311" width="86" textAlign="center" verticalAlign="middle" height="52" size="48"/>
+	<e:Label id="rankTxt" text="-" x="112" y="311" width="86" textAlign="center" verticalAlign="middle" height="52" size="48"/>
 	<e:Label id="nameTxt" text="-" x="306" y="307" size="24"/>
-	<e:Label id="progress" text="第0关" x="306" y="340.79" size="24"/>
+	<e:Label id="progress" text="第1关" x="306" y="340.79" size="24"/>
 	<e:Label id="score" text="分数:0分" x="414" y="340.79" size="24" anchorOffsetX="0" anchorOffsetY="0"/>
 	<e:Label id="empty" text="您还没有好友" y="636" textColor="0x784325" horizontalCenter="6.5"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/MapTopSkin.exml

@@ -17,7 +17,7 @@
 		<e:Image source="icon_png" x="0" y="0"/>
 		<e:BitmapLabel width="76" x="12" y="18.69" text="4" font="nums_fnt" textAlign="center"/>
 	</e:Group>
-	<e:Group x="551" y="810" id="icon4">
+	<e:Group x="513" y="841" id="icon4">
 		<e:Image source="icon_png" x="0" y="0"/>
 		<e:BitmapLabel width="76" x="12" y="18.69" text="5" font="nums_fnt" textAlign="center"/>
 	</e:Group>

egret/src/H5Scene.ts

@@ -12,7 +12,7 @@ export default class H5Scene extends Scene {
         },this);
         this['gobtn'].addEventListener(egret.TouchEvent.TOUCH_TAP,()=>{
             const code = Utils.getRequestByKey('shareCode');
-            window.location.href =  `${window['targetUrl']}&shareCode=code`
+            window.location.href =  `${window['targetUrl']}&shareCode=${code}`
         },this);
     }
 

egret/src/mapScene/GuideCon.ts

@@ -85,14 +85,14 @@ export class GuideCon extends egret.DisplayObjectContainer {
         this.groups = [];
         //guideLove
         var guideLove = new egret.Bitmap(RES.getRes("guideLove_png"));
-        guideLove.x = 38.72;
-        guideLove.y = 23.5;
+        guideLove.x = 169;
+        guideLove.y = 15.83;
         this.addChild(guideLove);
         this.groups.push(guideLove);
         //guideMoney
         var guideMoney = new egret.Bitmap(RES.getRes("guideMoney_png"));
-        guideMoney.x = 354;
-        guideMoney.y = 24.34;
+        guideMoney.x = 356;
+        guideMoney.y = 15.31;
         this.addChild(guideMoney);
         this.groups.push(guideMoney);
         //关卡
@@ -103,20 +103,21 @@ export class GuideCon extends egret.DisplayObjectContainer {
         this.groups.push(guideLevel);
         //宝箱
         var box = new egret.Bitmap(RES.getRes("guideBox_png"));
-        box.x = 20.61;
-        box.y = 136.24;
+        box.x = 515;
+        box.y = 12.83;
         this.addChild(box);
         this.groups.push(box);
         //两个图标，道具商城和我的奖励
         var gg = new egret.DisplayObjectContainer();
         gg.addChild(new egret.Bitmap(RES.getRes("道具_png")));
         var recordBtn = new egret.Bitmap(RES.getRes("recordbtn_png"));
-        recordBtn.y = 304.4 - 154;
+        recordBtn.x = 620.14-615.08;
+        recordBtn.y = 255.91-128.01;
         gg.addChild(recordBtn);
         this.addChild(gg);
         this.groups.push(gg);
-        gg.x = 615;
-        gg.y = 154;
+        gg.x = 615.08;
+        gg.y = 128.01;
 
         //跳过提示
         var guideOver = new egret.Bitmap(RES.getRes("guideOver_png"));
@@ -152,11 +153,11 @@ export class GuideCon extends egret.DisplayObjectContainer {
     }
 
     positions: number[][] = [
-        [245, 290, 180],
-        [570, 290, 180],
+        [350, 280, 180],
+        [550, 280, 180],
         [260, 280, 0],
-        [255, 430, 180],
-        [440, 390, -90],
+        [710, 280, 180],
+        [440, 350, -90],
     ]
     words: string[] = [
         "这里是体力值，闯关失败会\n扣除1体力值，闯关成功不扣\n除哦~",

egret/src/mapScene/MapScene.ts

@@ -749,9 +749,9 @@ export default class MapScene extends Scene {
         return 'Map'
     }
 }
-export const getNick = (nickname) => {
+export const getNick = (nickname,max=4) => {
     if(!nickname) return nickname;
-    const max = 4;
+    
     if(nickname.length > max)
         return nickname.slice(0, max) + '...';
     return nickname;

egret/src/panels/FriendPanel.ts

@@ -22,7 +22,10 @@ export default class FriendPanel extends Panel {
         this.list.visible = false;
         this['empty'].visible = false;
         NetManager.ins.hc_totalNumRank(() => {
-            const { data: hc_totalNumRank } = DataManager.ins.getData('hc_totalNumRank');
+            let { data: hc_totalNumRank } = DataManager.ins.getData('hc_totalNumRank');
+            if(hc_totalNumRank==null) {
+                hc_totalNumRank = {}
+            }
             const {  rank, userRank } = hc_totalNumRank;
             if (userRank) {
                 this.progress.textFlow = (new egret.HtmlTextParser).parser(
@@ -58,7 +61,7 @@ export default class FriendPanel extends Panel {
             this['avatar'].source = this['avatar0'].source = data.avatar;
 
             this['nameTxt'].text = getNick(data.nickname);
-            this['nameTxt0'].text = getNick(data.nickname);
+            this['nameTxt0'].text = getNick(data.nickname,10);
         });
     }
 

mock/happyclear/totalNumRank.json

-{
-    "success": true,
+{"success":true,"code":"0000000000","desc":"OK","timestamp":1571055816178,"data":null}
\ No newline at end of file
-    "code": "0000000000",
-    "desc": "OK",
-    "timestamp": 1571043800755,
-    "data": {
-        "userRank": {
-            "nickName": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
-            "avatar": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
-            "stars": 83,
-            "maxScore": 7220,
-            "rank": 1,
-            "levelNum": 32,
-            "consumerId": 1539361
-        },
-        "rank": [
-            {
-                "nickName": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
-                "avatar": "https://wx.qlogo.cn/mmopen/vi_32/5icsJibet91SjpqD2GygMAA5twUoqVTiaOqS3NQNia0Jbuia2fZxlh03AIyiaaVTRRKOxo1Ym17icjBBkiaMhicv3zhXgRQ/132",
-                "stars": 83,
-                "maxScore": 7220,
-                "rank": 1,
-                "levelNum": 32,
-                "consumerId": 1539361
-            }
-        ]
-    }
-}
\ No newline at end of file