1

egret/resource/default.res.json

@@ -105,7 +105,7 @@
 			"name": "inviterule"
 		},
 		{
-			"keys": "ad_closebtn_png",
+			"keys": "ad_closebtn_png,adbg_png,admask_png",
 			"name": "ad"
 		},
 		{
@@ -2264,6 +2264,16 @@
 			"url": "assets/common/exchangebtn.png",
 			"type": "image",
 			"name": "exchangebtn_png"
+		},
+		{
+			"url": "assets/ad/admask.png",
+			"type": "image",
+			"name": "admask_png"
+		},
+		{
+			"url": "assets/ad/adbg.png",
+			"type": "image",
+			"name": "adbg_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="adBtn" y="142" horizontalCenter="0" width="540" height="600" source="{data.img}"/>
-	<e:Button id="closeBtn" label="" y="811" horizontalCenter="0">
+	<e:Image source="adbg_png" y="29" horizontalCenter="0"/>
+	<e:Image id="adBtn" y="218" width="560" height="600" source="{data.img}" x="95"/>
+	<e:Button id="closeBtn" label="" y="164" horizontalCenter="270">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
-			<e:Image width="100%" height="100%" source="ad_closebtn_png" source.down="ad_closebtn_png" source.disabled="ad_closebtn_png"/>
+			<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
 			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
+	<e:Rect id="mask" width="560" height="600" x="95" y="218" ellipseWidth="100" ellipseHeight="100"/>
 </e:Skin>
\ No newline at end of file

egret/src/panels/ADPanel.ts

@@ -12,6 +12,8 @@ export default class ADPanel extends Panel {
         const { noticeAdvert } = hc_advert;
         this.visible = noticeAdvert.enable;
 
+        this['adBtn'].mask = this['mask'];
+
         result = noticeAdvert.advertList;
         if (Array.isArray(noticeAdvert.advertList)) {
             const index = Math.floor(noticeAdvert.advertList.length * Math.random());

mock/happyclear/advert.json

@@ -5,7 +5,7 @@
     "timestamp":1566199822308,
     "data":{
         "popupAdvert":{
-            "enable":0,
+            "enable":1,
             "advertList":[
                 {
                     "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
@@ -18,7 +18,7 @@
             ]
         },
         "noticeAdvert":{
-            "enable":0,
+            "enable":1,
             "advertList":[
                 {
                     "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
@@ -31,7 +31,7 @@
             ]
         },
         "mapAdvert":{
-            "enable":0,
+            "enable":1,
             "advertList":[
                 {
                     "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",