1

egret/.wing/exml.json

@@ -8,7 +8,10 @@
     "globalBackgroundHeight": -1,
     "globalBackgroundColor": "#c1c1c1",
     "globalBackgroundImage": "",
-    "globalAutoLayerMarkEnable": false
+    "globalAutoLayerMarkEnable": false,
+    "gridColor": 13238148,
+    "gridEnabled": true,
+    "gridSize": "50"
   },
   "1667fb18fa6": {
     "bindingDataTestObj": [
@@ -148,7 +151,8 @@
     "backgroundWidth": -1,
     "backgroundHeight": -1,
     "backgroundAlpha": 100,
-    "bindingDataTestObj": []
+    "bindingDataTestObj": [],
+    "guideLinesEnabled": false
   },
   "16c945ea8db": {
     "backgroundType": "user",

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" x="-0.4"/>
+	<e:Rect id="rectbg" width="750" height="1206" locked="true"/>
 	<e:Scroller id="scroll" width="750" height="1624" x="0" y="0" scrollPolicyH="off" scrollPolicyV="on" locked="true">
 		<e:Group id="scrollGroup">
 		</e:Group>
@@ -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">
+	<e:Group id="inviteGroup" x="16.69" y="323.76" anchorOffsetX="0" width="132" locked="true">
 		<e:Button id="inviteBtn" label="" x="10" y="1.54">
 			<e:skinName>
 			<e:Skin states="up,down,disabled">
@@ -102,13 +102,13 @@
 			</e:Skin>
 			</e:skinName>
 		</e:Button>
-		<e:Group x="75.36" y="-1.33">
-			<e:Image id="inviteTipsBg" x="78" y="0" touchEnabled="false" scaleX="-1" source="txtbg_blue_png"/>
+		<e:Group x="92.36" y="-1.33">
+			<e:Image id="inviteTipsBg" touchEnabled="false" scaleX="-1" source="invite_txtbg_png" left="0" top="0" bottom="0" verticalCenter="0" right="0" horizontalCenter="0"/>
 			<e:Label id="inviteTips" text="立即到账" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xffffff" size="18" fontFamily="FZY3JW"/>
 		</e:Group>
 	</e:Group>
-	<e:Group id="turnTableGroup" x="564.5" y="475" anchorOffsetX="0" width="159" locked="true">
-		<e:Button id="turnTableBtn" label="" x="33.36" y="0">
+	<e:Group id="turnTableGroup" x="589.5" y="475" anchorOffsetX="0" width="134" locked="true">
+		<e:Button id="turnTableBtn" label="" y="0" horizontalCenter="0">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="map大转盘_png" source.down="map大转盘_png" source.disabled="map大转盘_png"/>
@@ -116,13 +116,13 @@
 			</e:Skin>
 		</e:skinName>
 		</e:Button>
-		<e:Group x="6" y="10.24">
-		<e:Image id="turnTableTipsBg" y="0" touchEnabled="false" source="txtbg_orange_png"/>
+		<e:Group x="-60" y="0.24">
+		<e:Image id="turnTableTipsBg" y="0" touchEnabled="false" source="invite_txtbg_png"/>
 		<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">
-		<e:Button id="scratchBtn" label="" y="0" x="-5.32">
+	<e:Group id="scratchGroup" y="631" right="25" locked="true">
+		<e:Button id="scratchBtn" label="" y="0" x="-5.32" locked="true">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="map刮现金红包_png" source.down="map刮现金红包_png" source.disabled="map刮现金红包_png"/>
@@ -130,8 +130,8 @@
 			</e:Skin>
 		</e:skinName>
 		</e:Button>
-		<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:Group x="-59.6" anchorOffsetX="0" width="98" y="0" anchorOffsetY="0" height="42">
+		<e:Image id="scratchTipsBg" source="invite_txtbg_png" touchEnabled="false" anchorOffsetX="0" anchorOffsetY="0" left="0" horizontalCenter="0" top="0" verticalCenter="0" right="0" bottom="0" scale9Grid="18,8,62,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>
@@ -144,12 +144,12 @@
 				</e:Skin>
 			</e:skinName>
 		</e:Button>
-		<e:Group x="-24">
-		<e:Image id="taskTipsBg" y="0" touchEnabled="false" source="txtbg_purple_png"/>
+		<e:Group x="-64">
+		<e:Image id="taskTipsBg" y="0" touchEnabled="false" source="invite_txtbg_png"/>
 		<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" locked="true">
+	<e:Group id="activitys" x="13.4" y="620.55" touchEnabled="false">
 		<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"/>
@@ -170,7 +170,7 @@
 		<e:Image id="actsShowBtn" source="map2+_png" x="9.29" y="17.45"/>
 		<e:Image id="actTips" source="maphot_png" x="96.82" y="3.44"/>
 	</e:Group>
-	<e:Group id="settingsx" scaleX="1" scaleY="1" touchEnabled="false" bottom="23" left="30" locked="true">
+	<e:Group id="settingsx" scaleX="1" scaleY="1" touchEnabled="false" bottom="23" left="30">
 		<e:Group id="settingGroup" verticalCenter="0" horizontalCenter="0" visible="false">
 			<e:Image id="settingbg" source="设置bg_png" verticalCenter="0" horizontalCenter="0" scale9Grid="44,0,250,89"/>
 			<e:Button id="musicBtn" label="" horizontalCenter="-39" verticalCenter="0">

egret/src/mapScene/MapScene.ts

@@ -299,11 +299,12 @@ export default class MapScene extends Scene {
             }
         }
 
+        // 当前关卡的水花动效
         if(homeData.levels.length < window['total_level']) {
             const targetIcon = MapScene.iconHash[target];
             const light = RES.getRes('lightani_png');
 
-            const pic = new egret.Bitmap(light);//76 61
+            const pic = this['pic'] || new egret.Bitmap(light);//76 61
             pic.x = targetIcon.x + 50;
             pic.y = targetIcon.y + 37 + 7;
             targetIcon.mappart.addChildAt(pic, 1);
@@ -343,7 +344,7 @@ export default class MapScene extends Scene {
         if(homeData.levels.length >= window['total_level'])
             lastOrder = window['total_level'];
         this.scroll.viewport.scrollV = this.getScrollV(lastOrder, this.stage.stageHeight);
-        console.warn(this.getScrollV(lastOrder, this.stage.stageHeight));
+        // console.warn(this.getScrollV(lastOrder, this.stage.stageHeight));
         setTimeout(() => {
 
             try {