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

egret/resource/skins/MapSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="MapSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Rect id="rectbg" width="750" height="1206"/>
+	<e:Rect id="rectbg" width="750" height="1206" x="-0.4"/>
 	<e:Scroller id="scroll" width="750" height="1624" x="0" y="0" scrollPolicyH="off" scrollPolicyV="on" locked="true">
 		<e:Group id="scrollGroup">
 		</e:Group>
 	</e:Scroller>
-	<e:Group id="treasureboxBtn" y="37.67" x="478.29" scaleX="0.8" scaleY="0.8" locked="true">
-		<e:Image source="宝箱bg_png" y="22" x="9.18"/>
-		<e:Group x="80.34" y="31.46">
+	<e:Group id="treasureboxBtn" y="40" x="541.01" scaleX="1" scaleY="1" anchorOffsetX="0" width="199.33" height="82">
+		<e:Image source="宝箱bg_png" y="13.33" x="9.18"/>
+		<e:Group x="80.34" y="23.48" anchorOffsetX="0" width="104">
 		<e:Rect id="rect" width="124" height="45" x="0" y="0" visible="false"/>
 		<e:Image id="progressbg" source="progress2_png" y="0" x="0" visible="false"/>
 		<e:Image id="progressfront" source="progress1_png" y="0" x="0" visible="false"/>
 		<e:Image source="星星_png" verticalCenter="-2.5" x="-17.31"/>
-		<e:Label id="totalStarTxt" text="300/300" verticalAlign="middle" textAlign="left" size="18" bold="true" fontFamily="FZY3JW" verticalCenter="-4" x="16"/>
+		<e:Label id="totalStarTxt" text="300/300" verticalAlign="middle" textAlign="left" size="20" bold="true" fontFamily="FZY3JW" x="16" verticalCenter="-5.5"/>
 		</e:Group>
-		<e:Image id="box" source="宝箱_png" right="185" verticalCenter="8" anchorOffsetX="34" anchorOffsetY="34"/>
+		<e:Image id="box" source="宝箱_png" right="125.33000000000001" anchorOffsetX="34" anchorOffsetY="34" verticalCenter="7"/>
 		<e:Group id="boxiconWrapper" x="34" y="16.85" touchEnabled="false" touchChildren="false" scaleX="0.85" scaleY="0.85">
 		<e:Image x="8.32" y="0" source="iconbg_png"/>
 		<e:Label id="boxNumsTxt" text="0" x="0" verticalAlign="middle" textAlign="center" size="18" width="46" y="6.14" fontFamily="FZY3JW"/>
 		</e:Group>
 	</e:Group>
-	<e:Group id="top" x="170.88" y="47.51" scaleX="0.8" scaleY="0.8" anchorOffsetX="0" width="383.5" locked="true">
+	<e:Group id="top" x="148" y="40" scaleX="1" scaleY="1" anchorOffsetX="0" width="383.5">
 		<e:Image source="元宝bg_png" x="4.8" y="12"/>
-		<e:Label id="bloodTxt" text="5" x="11.88" width="49" verticalAlign="middle" textAlign="center" size="23" fontFamily="FZY3JW" verticalCenter="0.5"/>
-		<e:Label id="fullTxt" text="已满" x="59.21" width="69.5" verticalAlign="middle" textAlign="center" size="24" anchorOffsetX="0" verticalCenter="0" visible="false"/>
+		<e:Label id="bloodTxt" text="5" x="11.88" width="49" verticalAlign="middle" textAlign="center" size="24" fontFamily="FZY3JW" verticalCenter="0.5"/>
+		<e:Label id="fullTxt" text="已满" x="59.21" width="69.5" verticalAlign="middle" textAlign="center" size="22" anchorOffsetX="0" y="30.5" visible="false"/>
 		<e:Label id="goldTxt" text="0" x="262.23" width="55.5" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW" size="22" anchorOffsetX="0" anchorOffsetY="0" height="22" verticalCenter="0"/>
 		<e:Group id="bloodBtn" width="158.33" height="54.17" x="10" y="13.33" anchorOffsetX="0" anchorOffsetY="0"/>
 		<e:Group id="goldBtn" width="158.33" height="54.17" x="202.9" y="13.33" anchorOffsetX="0" anchorOffsetY="0"/>
@@ -93,7 +93,7 @@
 			<e:Image id="sign_s2" source="map明日可领_png" x="1.33" y="0" visible="false"/>
 		</e:Group>
 	</e:Group>
-	<e:Group id="inviteGroup" x="16.69" y="323.76" locked="true">
+	<e:Group id="inviteGroup" x="16.69" y="323.76">
 		<e:Button id="inviteBtn" label="" x="10" y="1.54">
 			<e:skinName>
 			<e:Skin states="up,down,disabled">
@@ -121,7 +121,7 @@
 		<e:Label id="turnTableTips" text="立即到" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xFFFFFF" size="18" fontFamily="FZY3JW"/>
 		</e:Group>
 	</e:Group>
-	<e:Group id="scratchGroup" y="631" right="25" locked="true">
+	<e:Group id="scratchGroup" y="631" right="25">
 		<e:Button id="scratchBtn" label="" y="0" x="-5.32">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
@@ -130,9 +130,9 @@
 			</e:Skin>
 		</e:skinName>
 		</e:Button>
-		<e:Group x="-24">
-		<e:Image id="scratchTipsBg" source="invite_txtbg_png" y="0" touchEnabled="false"/>
-		<e:Label id="scratchTips" text="立即到" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xFFFFFF" size="18" fontFamily="FZY3JW"/>
+		<e:Group x="-23.6" anchorOffsetX="0" width="74.6" y="0">
+		<e:Image id="scratchTipsBg" source="invite_txtbg_png" touchEnabled="false" anchorOffsetX="0" width="74.6" anchorOffsetY="0" height="44.6" horizontalCenter="0" verticalCenter="0" scale9Grid="8,9,24,24"/>
+		<e:Label id="scratchTips" text="立即到" verticalCenter="-0.5" verticalAlign="middle" textAlign="center" textColor="0xFFFFFF" size="18" fontFamily="FZY3JW" horizontalCenter="0"/>
 		</e:Group>
 	</e:Group>
 	<e:Group id="taskGroup" y="325" right="30" locked="true">
@@ -149,7 +149,7 @@
 		<e:Label id="taskTips" text="有优惠" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xFFFFFF" size="18" fontFamily="FZY3JW"/>
 		</e:Group>
 	</e:Group>
-	<e:Group id="activitys" x="13.4" y="620.55" touchEnabled="false">
+	<e:Group id="activitys" x="13.4" y="620.55" touchEnabled="false" locked="true">
 		<e:Group id="actIconsGroup" x="-8.88" y="-4">
 			<e:Image id="actIconsBg2" source="map2+bg_png" x="-27.15" y="0" visible="false"/>
 			<e:Image id="actIconsBg1" x="-29.27" y="10" source="map2+bg2_png" visible="false"/>
@@ -229,9 +229,9 @@
 		</e:Group>
 		<e:Label text="点击开宝箱" y="791" size="37" horizontalCenter="0" bold="true"/>
 	</e:Group>
-	<e:Group id="guide" visible="false">
+	<e:Group id="guide" visible="false" locked="true">
 		<e:Rect width="750" height="1624" x="0" y="0" alpha="0.7"/>
-		<e:Image id="guideInner" source="map2热门引导_png" x="12.62" y="346.28"/>
+		<e:Image id="guideInner" source="map2热门引导_png" x="3.7" y="336.77"/>
 	</e:Group>
 	<w:Config id="16c89f4ae1a"/>
 </e:Skin>
\ No newline at end of file

egret/src/mapScene/GuideCon.ts

@@ -85,26 +85,26 @@ export class GuideCon extends egret.DisplayObjectContainer {
         this.groups = [];
         //guideLove
         var guideLove = new egret.Bitmap(RES.getRes("guideLove_png"));
-        guideLove.x = 169;
-        guideLove.y = 15.83;
+        guideLove.x = 151.66;
+        guideLove.y = 50.99;
         this.addChild(guideLove);
         this.groups.push(guideLove);
         //guideMoney
         var guideMoney = new egret.Bitmap(RES.getRes("guideMoney_png"));
-        guideMoney.x = 356;
-        guideMoney.y = 15.31;
+        guideMoney.x = 342.92;
+        guideMoney.y = 51.15;
         this.addChild(guideMoney);
         this.groups.push(guideMoney);
         //关卡
         var guideLevel = new egret.Bitmap(RES.getRes("guideLevel_png"));
-        guideLevel.x = 315;
-        guideLevel.y = 462;
+        guideLevel.x = 417;
+        guideLevel.y = 587.17;
         this.addChild(guideLevel);
         this.groups.push(guideLevel);
         //宝箱
         var box = new egret.Bitmap(RES.getRes("guideBox_png"));
-        box.x = 515;
-        box.y = 12.83;
+        box.x = 542;
+        box.y = 54.32;
         this.addChild(box);
         this.groups.push(box);
         //两个图标，道具商城和我的奖励
@@ -153,19 +153,19 @@ export class GuideCon extends egret.DisplayObjectContainer {
     }
 
     positions: number[][] = [
-        [350, 280, 180],
-        [550, 280, 180],
-        [260, 280, 0],
-        [710, 280, 180],
+        [338, 310, 180],
+        [530, 310, 180],
+        [369, 380, 0],
+        [743, 310, 180],
         [440, 350, -90],
-    ]
+    ];
     words: string[] = [
         "这里是体力值，闯关失败会\n扣除1体力值，闯关成功不扣\n除哦~",
         "这里是元宝，闯关成功后可\n随机获得大量元宝，元宝可\n用于兑换体力值和游戏道具",
         "在这里选择查看关卡，闯关\n成功后还有机会赢得丰厚奖\n励哟！",
         "每个关卡收集的星星可用于\n开启宝箱，宝箱里还有更多\n无敌券、品牌券在等你！",
         "进入道具商城去兑换道具为\n游戏加分吧~获得的奖励可\n在“我的奖励”中查看哦"
-    ]
+    ];
     /**
      * 1开始
      * @param step 

egret/src/mapScene/MapScene.ts

@@ -411,7 +411,7 @@ export default class MapScene extends Scene {
             this['guide'].visible = true;
             // });
         }
-    }
+    };
 
     onEnterFrame() {
         const offset = 0;
@@ -721,6 +721,9 @@ export default class MapScene extends Scene {
             this._countDown.stop();
 
             this['fullTxt'].visible = true;
+
+            this['fullTxt'].text = `${data.remainEnargy}/${data.remainEnargy}`;
+
             this['countdown'].visible = false;
         } else {
             const left = data.refectionCountdown - Math.floor(new Date().getTime() / 1000);
@@ -1186,4 +1189,4 @@ export const getNick = (nickname, max = 4) => {
     if(nickname.length > max)
         return nickname.slice(0, max) + '...';
     return nickname;
-}
\ No newline at end of file
+};
\ No newline at end of file

egret/src/startScene/StartScene.ts

@@ -162,10 +162,8 @@ export const createData = () => {
     });
 
     return startSceneData
-}
+};
 
 export const getRepeatCount = () => {
-    /// TODO 14 = MapTopPart.LEVEL_NUMS + MapBottomPart.LEVEL_NUMS
-    /// TODO 13 = MapRpeatPart.LEVEL_NUMS
     return (window['total_level'] - MapTopPart.LEVEL_NUMS - MapBottomPart.LEVEL_NUMS) / (MapRpeatPart.LEVEL_NUMS);
-}
+};

mock/happyclear/home.json

@@ -1132,7 +1132,7 @@
                 "maxScore": 47440,
                 "stars": 1
             },
-            
+
             {
                 "levelNum": 226,
                 "maxScore": 47440,