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

egret/resource/skins/MapSkin.exml

@@ -133,7 +133,7 @@
 		<e:Label id="scratchTips" text="立即到" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xFFFFFF" size="18" fontFamily="Helvetica"/>
 		</e:Group>
 	</e:Group>
-	<e:Group id="activitys" x="13.4" y="620.55">
+	<e:Group id="activitys" x="13.4" y="620.55" touchEnabled="false">
 		<e:Group id="actIconsGroup" x="12.12" y="0">
 			<e:Image id="actIconsBg1" source="map2+bg_png" x="-27.15" y="0" visible="false"/>
 			<e:Image id="actIconsBg2" x="-29.27" y="10" source="map2+bg2_png"/>

egret/src/mapScene/MapScene.ts

@@ -677,6 +677,7 @@ export default class MapScene extends Scene {
             switch(true) {
                 case (flag == 0):   // 	未完成 显示倒计时
                     this["inviteGroup"].visible = true;
+                    this["inviteGroup"].touchEnabled = true;
                     if(!mapAdvert || mapAdvert.enable == false) {
                         this['activitys'].y = 458;
                         this['guideInner'].y = 185;
@@ -693,6 +694,7 @@ export default class MapScene extends Scene {
                 case (flag == 1):   // 完成未开奖 待领奖 显示待领奖
                     NetManager.ins.showLog(getlogItem(33));
                     this["inviteGroup"].visible = true;
+                    this["inviteGroup"].touchEnabled = true;
                     if(!mapAdvert || mapAdvert.enable == false) {
                         this['activitys'].y = 458;
                         this['guideInner'].y = 185;
@@ -704,6 +706,7 @@ export default class MapScene extends Scene {
                 case (flag == 2):   // 领奖成功 无角标
                 case (flag == 3):   // 领奖失败 无角标
                     this["inviteGroup"].visible = true;
+                    this["inviteGroup"].touchEnabled = true;
                     if(!mapAdvert || mapAdvert.enable == false) {
                         this['activitys'].y = 458;
                         this['guideInner'].y = 185;
@@ -714,6 +717,7 @@ export default class MapScene extends Scene {
                     break;
                 case (flag == 4):   // 可以开启下一次发任务 显示立即到账
                     this["inviteGroup"].visible = true;
+                    this["inviteGroup"].touchEnabled = true;
                     if(!mapAdvert || mapAdvert.enable == false) {
                         this['activitys'].y = 458;
                         this['guideInner'].y = 185;
@@ -725,6 +729,7 @@ export default class MapScene extends Scene {
                     break;
                 case (flag == 5):   // 等待开启下一次发任务 无角标
                     this["inviteGroup"].visible = true;
+                    this["inviteGroup"].touchEnabled = true;
                     if(!mapAdvert || mapAdvert.enable == false) {
                         this['activitys'].y = 458;
                         this['guideInner'].y = 185;
@@ -735,6 +740,7 @@ export default class MapScene extends Scene {
                     break;
                 case (flag == 6):   // 无入口
                     this["inviteGroup"].visible = false;
+                    this["inviteGroup"].touchEnabled = false;
                     this['adBtn'].y = 323.76;
                     if(mapAdvert && mapAdvert.enable) {
                         this['guideInner'].y = 185;

egret/src/mapScene/icon/ActIcon.ts

@@ -53,6 +53,9 @@ export default class ActIcon {
         this.actsShowBtn.visible = visible;
         this.actTips.visible = visible;
         this.actIconsGroup.visible = visible;
+        this.actsShowBtn.touchEnabled = visible;
+        this.actTips.touchEnabled = visible;
+        this.actIconsGroup.touchEnabled = visible;
     }
 
     private onTap_actsShowBtn() {

egret/src/mapScene/icon/IconBase.ts

@@ -35,9 +35,11 @@ export default class IconBase {
         }
         if(this.iconTips){
             this.iconTips.visible = visible;
+            this.iconTips.touchEnabled = visible;
         }
         if(this.iconTipsBg){
             this.iconTipsBg.visible = visible;
+            this.iconTipsBg.touchEnabled = visible;
         }
     }
 
@@ -50,6 +52,10 @@ export default class IconBase {
         this.iconBtn.visible = visible;
         // this.iconTipsBg.visible = visible;
         // this.iconTips.visible = visible;
+        this.iconGroup.touchEnabled = visible;
+        this.iconBtn.touchEnabled = visible;
+        // this.iconTipsBg.touchEnabled = visible;
+        // this.iconTips.touchEnabled = visible;
         GDispatcher.dispatchEvent('updateActIcon');
     }