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

egret/resource/skins/InviteCutTimePanelSkin.exml

@@ -20,5 +20,4 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Component y="726.33" skinName="ADSmallSkin" horizontalCenter="0"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/InvitePrizePanelSkin.exml

@@ -28,5 +28,5 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Component y="845.33" skinName="ADSmallSkin" horizontalCenter="0"/>
+	<e:Component skinName="ADSmallSkin" horizontalCenter="0"/>
 </e:Skin>
\ No newline at end of file

egret/src/panels/InviteCutTimePanel.ts

@@ -4,6 +4,7 @@ import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
 import getHomeData from "../getHomeData";
 import { ModuleTypes } from "../../libs/new_wx/types/sceneTypes";
 import Utils from "../Utils";
+import { addAdComp } from "./BoxPanel";
 
 /**
  * 邀请规则面板
@@ -40,7 +41,7 @@ export default class InviteCutTimePanel extends Panel {
     }
 
     onTouchOK() {
-        if((getHomeData().levels.length + 1)>window['last_level']){
+        if((getHomeData().levels.length + 1) > window['last_level']) {
             changeMapScene();
             super.hidePanel();
             return;
@@ -56,6 +57,7 @@ export default class InviteCutTimePanel extends Panel {
         this.timer.addEventListener(egret.TimerEvent.TIMER, this.cutTimer, this);
         this.timer.start();
         this.cutTimer();
+        addAdComp(84, 726.33, this);
     }
 
     private cutTimer() {

egret/src/panels/InvitePrizePanel.ts

@@ -2,6 +2,7 @@ import Panel from "../../libs/new_wx/components/Panel";
 import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
 import getHomeData from "../getHomeData";
 import { changeMapScene } from "../startScene/StartScene";
+import { addAdComp } from "./BoxPanel";
 
 /**
  * 邀请规则面板
@@ -38,7 +39,7 @@ export default class InvitePrizePanel extends Panel {
     }
 
     onTouchOK() {
-        if((getHomeData().levels.length + 1)>window['last_level']){
+        if((getHomeData().levels.length + 1) > window['last_level']) {
             changeMapScene();
             super.hidePanel();
             return;
@@ -52,6 +53,7 @@ export default class InvitePrizePanel extends Panel {
 
     initUI() {
         this.prizeImg.source = this.data.prizeImg;
+        addAdComp(84, 845.33, this);
     }
 
     protected get closeBtns(): eui.Button[] {

mock/happyclear/getInviteInfo.json

@@ -15,7 +15,7 @@
                 "avatar": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg"
             }
         ],
-        "completeFlag": 0,
+        "completeFlag": 1,
         "openPrizeMsg": "图片",
         "prizeType": "nickname",
         "prizeName": "nickname",