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

# Conflicts:
#	egret/resource/default.res.json

egret/resource/skins/ADSmallSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="ADSmallSkin" width="615" height="238" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16db4bf413f"/>
-	<e:Image source="common_adbg_png"/>
-	<e:Image id="img" y="69" width="493" height="111" source="{data.img}" anchorOffsetY="0" horizontalCenter="0"/>
+
+	<e:Image source="nsad1_png" horizontalCenter="0" y="35"/>
+	<e:Image id="img" y="44" width="560" height="160" source="{data.img}" anchorOffsetY="0" horizontalCenter="0.5"/>
+	<e:Image id="adsmask" source="adsmask_png" horizontalCenter="0.5" y="45" width="560" height="160"/>
+	<e:Image source="nsad2_png" horizontalCenter="-7.5"/>
 </e:Skin>
\ No newline at end of file

egret/src/mapScene/AdSmallComp.ts

@@ -11,6 +11,10 @@ export default class AdSmallComp extends ComponentBase {
         let result;
         // this.touchEnabled = this.touchChildren = false;
         super.start(data);
+
+        if(!this['img'].mask){
+            this['img'].mask = this['adsmask'];
+        }
         NetManager.ins.hc_advert(() => {
             const { data } = DataManager.ins.getData('hc_advert');
             let { popupAdvert } = data;