Skip to content

X
xiaoxiaole
Commit 5887a265 authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parent 15b992c7
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 8 deletions
egret/.wing/exml.json
View file @ 5887a265
......@@ -143,7 +143,8 @@
"backgroundY": 0,
"backgroundWidth": -1,
"backgroundHeight": -1,
"backgroundAlpha": 100
"backgroundAlpha": 100,
"bindingDataTestObj": []
},
"16c945ea8db": {
"backgroundType": "user",
......
egret/resource/default.res.json
View file @ 5887a265
......@@ -21,7 +21,7 @@
"name": "buy3"
},
{
"keys": "taskicon_png,recordbtn_png,progress2_png,progress1_png,namebg_png,msgTri_png,map3_jpg,map2_jpg,map1_jpg,map_signicon_png,lionMsgBg_png,invite_txtbg_png,invite_icon_png,iconbg_png,icon_png,guideOver_png,guideMoney_png,guideLove_png,guideLevel_png,guideBox_png,friend_avatar_png,avatar_png,animal1_png,ad_icon_png,元宝bg_png,有星星_png,音乐关闭_png,音乐_png,星星bg_png,星星_png,无星星_png,问题_png,退出_png,狮子_png,声音关闭_png,声音_png,设置bg_png,设置_png,光 副本 4_png,关闭 拷贝_png,道具_png,宝箱btn_png,宝箱bg_png,宝箱3_png,宝箱2_png,宝箱1_png,宝箱_png,map明日可领_png,map今日可领_png,map刮现金红包_png,map大转盘_png,有星星2_png,有星星3_png,icongray_png",
"keys": "宝箱_png,宝箱1_png,宝箱2_png,宝箱3_png,宝箱bg_png,宝箱btn_png,道具_png,关闭 拷贝_png,光 副本 4_png,设置_png,设置bg_png,声音_png,声音关闭_png,狮子_png,退出_png,问题_png,无星星_png,星星_png,星星bg_png,音乐_png,音乐关闭_png,有星星_png,有星星2_png,有星星3_png,元宝bg_png,ad_icon_png,animal1_png,avatar_png,friend_avatar_png,guideBox_png,guideLevel_png,guideLove_png,guideMoney_png,guideOver_png,icon_png,iconbg_png,icongray_png,invite_icon_png,invite_txtbg_png,lionMsgBg_png,map_signicon_png,map1_jpg,map2_jpg,map2+_png,map2+bg_png,map2红包大作战_png,map2热门引导_png,map2周一红包雨_png,map3_jpg,map大转盘_png,map刮现金红包_png,map今日可领_png,map明日可领_png,maphot_png,msgTri_png,namebg_png,progress1_png,progress2_png,recordbtn_png,taskicon_png",
"name": "map"
},
{
......@@ -195,6 +195,10 @@
{
"keys": "redbagact_rule按钮_png,redbagactbtn_png,redbagact热门活动专区_png,redbagact退出按钮_png",
"name": "redbagactivity"
},
{
"keys": "map2+_png,map2+bg_png,map2周一红包雨_png,map2热门引导_png,map2红包大作战_png,maphot_png",
"name": "preload"
}
],
"resources": [
......@@ -3252,6 +3256,36 @@
"url": "assets/hbGame/hbGame_CutTime_btn.png",
"type": "image",
"name": "hbGame_CutTime_btn_png"
},
{
"url": "assets/map/map2+.png",
"type": "image",
"name": "map2+_png"
},
{
"url": "assets/map/map2+bg.png",
"type": "image",
"name": "map2+bg_png"
},
{
"url": "assets/map/map2周一红包雨.png",
"type": "image",
"name": "map2周一红包雨_png"
},
{
"url": "assets/map/map2热门引导.png",
"type": "image",
"name": "map2热门引导_png"
},
{
"url": "assets/map/map2红包大作战.png",
"type": "image",
"name": "map2红包大作战_png"
},
{
"url": "assets/map/maphot.png",
"type": "image",
"name": "maphot_png"
}
]
}
\ No newline at end of file
egret/resource/skins/MapSkin.exml
View file @ 5887a265
......@@ -133,7 +133,15 @@
<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 x="30" scaleX="1.4" scaleY="1.4" bottom="23">
<e:Group id="activitys" x="13.4" y="620.55">
<e:Group id="actIconsGroup" x="12.12" y="0" visible="false">
<e:Image source="map2+bg_png" x="-15.15" y="0"/>
<e:Image id="act1Btn" source="map2周一红包雨_png" x="8.27" y="157.5"/>
<e:Image id="act2Btn" source="map2红包大作战_png" x="163.76" y="159"/>
</e:Group>
<e:Image id="actsShowBtn" source="map2+_png" x="-7.64" y="5.45"/>
</e:Group>
<e:Group id="settingsx" x="30" scaleX="1.4" scaleY="1.4" bottom="23" locked="true">
<e:Group id="settingGroup" x="2" y="6.08" visible="false">
<e:Image id="settingbg" source="设置bg_png" y="0" x="0" scale9Grid="9,84,54,76" height="231"/>
<e:Button id="soundBtn" label="" y="59.65" horizontalCenter="0.5">
......
egret/src/mapScene/MapScene.ts
View file @ 5887a265
......@@ -91,8 +91,6 @@ export default class MapScene extends Scene {
this.sendInvite();
PanelCtrl.instance.show("HbCutTime");
this.updateMyInfo();
this.updateAdData();
GDispatcher.dispatchEvent("getInviteInfo"); // 查询邀请信息，控制邀请有礼角标
......@@ -520,6 +518,13 @@ export default class MapScene extends Scene {
PanelCtrl.instance.show('task');
}
onTap_actsShowBtn() {
this['actIconsGroup'].visible=!this['actIconsGroup'].visible;
}
onTap_act1btn() {
PanelCtrl.instance.show("HbCutTime");
}
onTap_inviteBtn() {
NetManager.ins.clickLog(getlogItem(33));
NetManager.ins.getInviteInfo((success, res) => {
......@@ -599,6 +604,9 @@ export default class MapScene extends Scene {
* 查询邀请信息
*/
getInviteInfo() {
const hc_advert = DataManager.ins.getData('hc_advert').data;
const { mapAdvert } = hc_advert;
// tslint:disable-next-line: cyclomatic-complexity
NetManager.ins.getInviteInfo((success, res) => {
if (!success || !res.data) {
return;
......@@ -610,6 +618,7 @@ export default class MapScene extends Scene {
switch (true) {
case (flag == 0): // 未完成 显示倒计时
this["inviteGroup"].visible = true;
if(!mapAdvert || mapAdvert.enable==false) this['activitys'].y = 458;
NetManager.ins.showLog(getlogItem(33));
this["inviteTipsBg"].visible = true;
this["inviteTips"].visible = true;
......@@ -622,6 +631,7 @@ export default class MapScene extends Scene {
case (flag == 1): // 完成未开奖 待领奖 显示待领奖
NetManager.ins.showLog(getlogItem(33));
this["inviteGroup"].visible = true;
if(!mapAdvert || mapAdvert.enable==false) this['activitys'].y = 458;
this["inviteTipsBg"].visible = true;
this["inviteTips"].visible = true;
this["inviteTips"].text = "待领奖";
......@@ -629,12 +639,14 @@ export default class MapScene extends Scene {
case (flag == 2): // 领奖成功 无角标
case (flag == 3): // 领奖失败 无角标
this["inviteGroup"].visible = true;
if(!mapAdvert || mapAdvert.enable==false) this['activitys'].y = 458;
NetManager.ins.showLog(getlogItem(33));
this["inviteTipsBg"].visible = false;
this["inviteTips"].visible = false;
break;
case (flag == 4): // 可以开启下一次发任务 显示立即到账
this["inviteGroup"].visible = true;
if(!mapAdvert || mapAdvert.enable==false) this['activitys'].y = 458;
NetManager.ins.showLog(getlogItem(33));
this["inviteTipsBg"].visible = true;
this["inviteTips"].visible = true;
......@@ -642,6 +654,7 @@ export default class MapScene extends Scene {
break;
case (flag == 5): // 等待开启下一次发任务 无角标
this["inviteGroup"].visible = true;
if(!mapAdvert || mapAdvert.enable==false) this['activitys'].y = 458;
NetManager.ins.showLog(getlogItem(33));
this["inviteTipsBg"].visible = false;
this["inviteTips"].visible = false;
......@@ -649,6 +662,10 @@ export default class MapScene extends Scene {
case (flag == 6): // 无入口
this["inviteGroup"].visible = false;
this['adBtn'].y = 323.76;
if(mapAdvert && mapAdvert.enable)
this['activitys'].y = 458;
else
this['activitys'].y = 303.76;
break;
default:
break;
......@@ -700,7 +717,9 @@ export default class MapScene extends Scene {
protected initEvents() {
// this['goldBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_goldBtn, this)
this['inviteBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_inviteBtn, this)
this['act1Btn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_act1btn, this);
this['actsShowBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_actsShowBtn, this);
this['inviteBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_inviteBtn, this);
this['friendBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_friendBtn, this)
this['adBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_adBtn, this)
this['taskBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_taskBtn, this)
......
mock/happyclear/advert.json
View file @ 5887a265
{
"code": "0000000000",
"data": {
"mapAdvert1": {
"mapAdvert": {
"enable": true,
"advertList": [
{
......
mock/happyclear/getInviteInfo.json
View file @ 5887a265
......@@ -8,7 +8,7 @@
"invitationCount": 1,
"sysTime": 1572403459405,
"endTime": 1572489858000,
"completeFlag": 0,
"completeFlag": 6,
"openPrizMsg": null,
"prizeType": "7",
"prizeName": null,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment