Commit 01c7408c authored by 邱旭's avatar 邱旭

1

parent db37104b
......@@ -60,6 +60,7 @@
<script src="libs/fileSave.js"></script>
<img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;"/>
<script>
window['testUrl'] = 'http://cuxiaoprexg.m.cnsuning.com/scms/cx521.html?activityId=SL446689024459878400&subactivityId=SUB446689681678090240&businessid=cx521';
window['hbRainTime'] = 30; // 红包雨倒计时
window['plugs'] = [1, 2, 3]
// localStorage.clear();
......
......@@ -71,6 +71,9 @@ import BombTipsPanel from "../../src/panels/BombTipsPanel";
import RedBombRule from "../../src/panels/RedBombRule";
import RedBombAlertPanel from "../../src/panels/RedBombAlertPanel";
import { GFun } from "../tc/util/GFun";
import TaskCenter from "../../src/panels/TaskCenter/TaskCenter";
import TaskCenterPrize from "../../src/panels/TaskCenter/TaskCenterPrize";
import TaskCenterNoPrize from "../../src/panels/TaskCenter/TaskCenterNoPrize";
export default class MainBase extends eui.UILayer {
constructor() {
......@@ -130,7 +133,6 @@ export default class MainBase extends eui.UILayer {
['prize2', { cls: Prize2Panel }],
['sign', { cls: SignPanel }],
['signPrize', { cls: SignPrizePanel }],
['task', { cls: TaskPanel }],
['taskPrize', { cls: TaskPrizePanel }],
['back', { cls: BackPanel }],
['invite', { cls: InvitePanel }],
......@@ -153,6 +155,9 @@ export default class MainBase extends eui.UILayer {
['BombTipsPanel', { cls: BombTipsPanel }],
['RedBombAlert', { cls: RedBombAlertPanel }],
['RedBombRule', { cls: RedBombRule }],
['task', { cls: TaskCenter }],
['taskCenterPrize', { cls: TaskCenterPrize }],
['taskCenterNoPrize', { cls: TaskCenterNoPrize }],
];
const scenes = [
......
import ComponentBase from "./ComponentBase";
export default class Panel extends ComponentBase {
public onShowAnim(){
egret.Tween.get(this).set({ y: -200 }).to({ y: 0 }, 500, egret.Ease.quartOut);
}
public onHideAnim(){
}
constructor() {
super();
}
......
......@@ -73,7 +73,8 @@ export default class PanelCtrl {
this._current = panel;
panel.start(data);
this.add(panel);
egret.Tween.get(panel).set({ y: -200 }).to({ y: 0 }, 500, egret.Ease.quartOut);
// egret.Tween.get(panel).set({ y: -200 }).to({ y: 0 }, 500, egret.Ease.quartOut);
panel.onShowAnim();
}
addMask() {
......
......@@ -83,6 +83,7 @@ export enum NetName {
SCRATCH_GET_SHARECODE,
SCRATCH_DOHELP,
HBRAIN_BASEINFO,
GET_TASKINFO,
}
\ No newline at end of file
......@@ -2258,4 +2258,47 @@ export class NetManager extends ABNetManager {
this.send(net);
}
///////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////// 任务中心 /////////////////////////////////////
/**
* 任务中心任务查询
* @param callback
*/
public getTaskInfo(callback: Function): void {
const net: INetData = {
name: NetName.GET_TASKINFO,
uri: window['duiba'] +'/customActivity/happyclear/taskSystem/getTaskInfo',
type: 'get',
dataType: 'json',
hideMsg: true,
param: {
activityId: DataManager.ins.customCfgData.actId,
},
callback: callback
};
this.send(net);
}
/**
* 任务中心领奖
* @param callback
* @param subActivityId 子活动编码
*/
public taskAward(callback: Function, subActivityId): void {
const net: INetData = {
name: NetName.GET_TASKINFO,
uri: window['duiba'] +'/customActivity/happyclear/taskSystem/award',
type: 'get',
dataType: 'json',
hideMsg: true,
param: {
activityId: DataManager.ins.customCfgData.actId,
subActivityId:subActivityId,
detect: window['detect'],
deviceSessionId: window['_device_session_id']
},
callback: callback
};
this.send(net);
}
///////////////////////////////////////////////////////////////////////////////////
}
\ No newline at end of file
{"file":"taskCenterFont.png","frames":{
"/":{"x":214,"y":46,"w":13,"h":21,"offX":0,"offY":2,"sourceW":13,"sourceH":25},
"_0":{"x":0,"y":27,"w":16,"h":20,"offX":0,"offY":2,"sourceW":16,"sourceH":25},
"_1":{"x":36,"y":49,"w":11,"h":20,"offX":0,"offY":2,"sourceW":11,"sourceH":25},
"_2":{"x":18,"y":27,"w":16,"h":20,"offX":0,"offY":2,"sourceW":16,"sourceH":25},
"_3":{"x":90,"y":27,"w":16,"h":20,"offX":0,"offY":2,"sourceW":16,"sourceH":25},
"_4":{"x":190,"y":23,"w":17,"h":20,"offX":0,"offY":2,"sourceW":17,"sourceH":25},
"_5":{"x":54,"y":27,"w":16,"h":20,"offX":0,"offY":2,"sourceW":16,"sourceH":25},
"_6":{"x":108,"y":27,"w":16,"h":20,"offX":0,"offY":2,"sourceW":16,"sourceH":25},
"_7":{"x":72,"y":27,"w":16,"h":20,"offX":0,"offY":2,"sourceW":16,"sourceH":25},
"_8":{"x":36,"y":27,"w":16,"h":20,"offX":0,"offY":2,"sourceW":16,"sourceH":25},
"_9":{"x":126,"y":27,"w":16,"h":20,"offX":0,"offY":2,"sourceW":16,"sourceH":25},
"(":{"x":0,"y":49,"w":10,"h":24,"offX":0,"offY":0,"sourceW":10,"sourceH":25},
")":{"x":25,"y":49,"w":9,"h":24,"offX":0,"offY":0,"sourceW":9,"sourceH":25},
"0":{"x":190,"y":0,"w":17,"h":21,"offX":0,"offY":2,"sourceW":17,"sourceH":25},
"1":{"x":12,"y":49,"w":11,"h":21,"offX":0,"offY":2,"sourceW":11,"sourceH":25},
"2":{"x":144,"y":27,"w":15,"h":21,"offX":0,"offY":2,"sourceW":15,"sourceH":25},
"3":{"x":180,"y":45,"w":15,"h":21,"offX":0,"offY":2,"sourceW":15,"sourceH":25},
"4":{"x":209,"y":0,"w":17,"h":21,"offX":0,"offY":2,"sourceW":17,"sourceH":25},
"5":{"x":197,"y":46,"w":15,"h":21,"offX":0,"offY":2,"sourceW":15,"sourceH":25},
"6":{"x":209,"y":23,"w":16,"h":21,"offX":0,"offY":2,"sourceW":16,"sourceH":25},
"7":{"x":228,"y":0,"w":17,"h":21,"offX":0,"offY":2,"sourceW":17,"sourceH":25},
"8":{"x":227,"y":23,"w":16,"h":21,"offX":0,"offY":2,"sourceW":16,"sourceH":25},
"9":{"x":162,"y":26,"w":16,"h":21,"offX":0,"offY":2,"sourceW":16,"sourceH":25},
"成":{"x":108,"y":0,"w":25,"h":25,"offX":0,"offY":0,"sourceW":25,"sourceH":25},
"奖":{"x":135,"y":0,"w":25,"h":25,"offX":0,"offY":0,"sourceW":25,"sourceH":25},
"励":{"x":81,"y":0,"w":25,"h":25,"offX":0,"offY":0,"sourceW":25,"sourceH":25},
"领":{"x":27,"y":0,"w":25,"h":25,"offX":0,"offY":0,"sourceW":25,"sourceH":25},
"取":{"x":162,"y":0,"w":26,"h":24,"offX":0,"offY":0,"sourceW":26,"sourceH":25},
"去":{"x":54,"y":0,"w":25,"h":25,"offX":0,"offY":0,"sourceW":25,"sourceH":25},
"完":{"x":0,"y":0,"w":25,"h":25,"offX":0,"offY":0,"sourceW":25,"sourceH":25},
"x":{"x":229,"y":46,"w":16,"h":16,"offX":0,"offY":4,"sourceW":16,"sourceH":25}}}
\ No newline at end of file
......@@ -21,7 +21,7 @@
"name": "buy3"
},
{
"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,map2+bg2_png,mapredbagicom_png,maplight2_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,map2+bg2_png,mapredbagicom_png,maplight2_png,taskBtn_png,txtbg_blue_png,txtbg_orange_png,txtbg_purple_png",
"name": "map"
},
{
......@@ -199,6 +199,18 @@
{
"keys": "redbagtips_ele_png,redbagtips_ele1_png,redbagtips_ele2_png,redbagtips_ele3_png,redbagtips_light_png,redbagtips按钮_png,redbagtips活动规则_png,redbagtipsbg_png,redbagtips_ele7_png",
"name": "redbombtips"
},
{
"keys": "TaskCenter_getPrizeBtn_png,TaskCenter_goTaskBtn_png,TaskCenter_bg_png,TaskCenter_taskBg_png,TaskCenterBuy_png,TaskCenterShop_png,TaskCenterGame_png,TaskCenterWatch_png,TaskCenter_doneBtn_png",
"name": "taskcenter"
},
{
"keys": "TaskCenterPrize_bg_png",
"name": "taskcenterprize"
},
{
"keys": "TaskCenterNoPrizebg_png",
"name": "taskcenternoprize"
}
],
"resources": [
......@@ -3588,6 +3600,81 @@
"url": "assets/startpanel2/startpanel_numsbg.png",
"type": "image",
"name": "startpanel_numsbg_png"
},
{
"url": "assets/TaskCenterPanel/TaskCenter_getPrizeBtn.png",
"type": "image",
"name": "TaskCenter_getPrizeBtn_png"
},
{
"url": "assets/TaskCenterPanel/TaskCenter_goTaskBtn.png",
"type": "image",
"name": "TaskCenter_goTaskBtn_png"
},
{
"url": "assets/TaskCenterPanel/TaskCenter_bg.png",
"type": "image",
"name": "TaskCenter_bg_png"
},
{
"url": "assets/TaskCenterPanel/TaskCenter_taskBg.png",
"type": "image",
"name": "TaskCenter_taskBg_png"
},
{
"url": "assets/TaskCenterPanel/TaskCenterBuy.png",
"type": "image",
"name": "TaskCenterBuy_png"
},
{
"url": "assets/TaskCenterPanel/TaskCenterShop.png",
"type": "image",
"name": "TaskCenterShop_png"
},
{
"url": "assets/TaskCenterPanel/TaskCenterGame.png",
"type": "image",
"name": "TaskCenterGame_png"
},
{
"url": "assets/TaskCenterPanel/TaskCenterWatch.png",
"type": "image",
"name": "TaskCenterWatch_png"
},
{
"url": "assets/TaskCenterPrize/TaskCenterPrize_bg.png",
"type": "image",
"name": "TaskCenterPrize_bg_png"
},
{
"url": "assets/TaskCenterNoPrize/TaskCenterNoPrizebg.png",
"type": "image",
"name": "TaskCenterNoPrizebg_png"
},
{
"url": "assets/TaskCenterPanel/TaskCenter_doneBtn.png",
"type": "image",
"name": "TaskCenter_doneBtn_png"
},
{
"url": "assets/map/taskBtn.png",
"type": "image",
"name": "taskBtn_png"
},
{
"url": "assets/map/txtbg_blue.png",
"type": "image",
"name": "txtbg_blue_png"
},
{
"url": "assets/map/txtbg_orange.png",
"type": "image",
"name": "txtbg_orange_png"
},
{
"url": "assets/map/txtbg_purple.png",
"type": "image",
"name": "txtbg_purple_png"
}
]
}
\ No newline at end of file
......@@ -76,6 +76,10 @@
"resource/skins/StarSkin.exml",
"resource/skins/StartPanelSkin.exml",
"resource/skins/StartSkin.exml",
"resource/skins/TaskCenterSkin.exml",
"resource/skins/TaskCenterItemSkin.exml",
"resource/skins/TaskCenterPrizeSkin.exml",
"resource/skins/TaskCenterNoPrizeSkin.exml",
"resource/skins/TargetItemSkin.exml",
"resource/skins/TaskItemSkin.exml",
"resource/skins/TaskPrizeSkin.exml",
......
......@@ -51,7 +51,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="recordBtn" label="" x="614.14" y="174.01">
<e:Button id="recordBtn" label="" x="606.14" y="174.01">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="recordbtn_png" source.down="recordbtn_png" source.disabled="recordbtn_png"/>
......@@ -69,7 +69,7 @@
<e:Label id="nameTxt" text="La121233bel" y="91.5" size="20" horizontalCenter="1" fontFamily="FZY3JW"/>
</e:Group>
<e:Image id="adBtn" y="478" source="ad_icon_png" right="602" width="122" height="122"/>
<e:Button id="taskBtn" label="" x="572.62" y="248.51" visible="false">
<e:Button id="taskBtn1" label="" x="572.62" y="248.51" visible="false">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="taskicon_png" source.down="taskicon_png" source.disabled="taskicon_png"/>
......@@ -101,11 +101,11 @@
</e:skinName>
</e:Button>
<e:Group x="75.36" y="-1.33">
<e:Image id="inviteTipsBg" source="invite_txtbg_png" x="78" y="0" touchEnabled="false" scaleX="-1"/>
<e:Image id="inviteTipsBg" x="78" y="0" touchEnabled="false" scaleX="-1" source="txtbg_blue_png"/>
<e:Label id="inviteTips" text="立即到账" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xffffff" size="18" fontFamily="FZY3JW"/>
</e:Group>
</e:Group>
<e:Group id="turnTableGroup" x="567.36" y="318.43">
<e:Group id="turnTableGroup" x="564.5" y="474.01" anchorOffsetX="0" width="159">
<e:Button id="turnTableBtn" label="" x="33.36" y="0">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -115,12 +115,12 @@
</e:skinName>
</e:Button>
<e:Group x="6" y="10.24">
<e:Image id="turnTableTipsBg" source="invite_txtbg_png" y="0" touchEnabled="false"/>
<e:Image id="turnTableTipsBg" y="0" touchEnabled="false" source="txtbg_orange_png"/>
<e:Label id="turnTableTips" text="立即到" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xFFFFFF" size="18" fontFamily="FZY3JW"/>
</e:Group>
</e:Group>
<e:Group id="scratchGroup" y="476" right="18">
<e:Button id="scratchBtn" label="" y="0">
<e:Group id="scratchGroup" y="631.01" right="27">
<e:Button id="scratchBtn" label="" y="0" x="-5.32">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="map刮现金红包_png" source.down="map刮现金红包_png" source.disabled="map刮现金红包_png"/>
......@@ -133,6 +133,20 @@
<e:Label id="scratchTips" text="立即到" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xFFFFFF" size="18" fontFamily="FZY3JW"/>
</e:Group>
</e:Group>
<e:Group id="taskGroup" y="324.96" right="30">
<e:Button id="taskBtn" label="" y="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="taskBtn_png" source.down="taskBtn_png" source.disabled="taskBtn_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Group x="-24">
<e:Image id="taskTipsBg" y="0" touchEnabled="false" source="txtbg_purple_png"/>
<e:Label id="taskTips" text="有优惠" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xFFFFFF" size="18" fontFamily="FZY3JW"/>
</e:Group>
</e:Group>
<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"/>
......
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="TaskCenterItem" width="674" height="149" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16d5c2563cb"/>
<e:Image source="TaskCenter_taskBg_png" horizontalCenter="0" verticalCenter="0"/>
<e:Image id="taskImg" width="100" height="100" x="30" anchorOffsetX="0" anchorOffsetY="0" verticalCenter="0"/>
<e:Label id="title" text="Label" x="162" y="38" textColor="0x885037" size="32" fontFamily="FZY4JW"/>
<e:Label id="remark" text="Label" x="162" y="87" size="24" fontFamily="FZY3JW" textColor="0xc3917b"/>
<e:Group id="btnGroup" x="472" y="47" width="180" height="67">
<e:Image id="btnImg" x="0" y="0" source="TaskCenter_doneBtn_png"/>
<e:Label id="btnLabel" text="去完成" verticalAlign="middle" textAlign="center" horizontalCenter="0" verticalCenter="-3.5" strokeColor="0x7e7e7e" stroke="2" fontFamily="FZY3JW" size="24"/>
</e:Group>
</e:Skin>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="SignPrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16d5c2563cb"/>
<e:Component y="1014" skinName="ADSmallSkin" x="84" visible="false"/>
<e:Image y="248" horizontalCenter="0" source="TaskCenterNoPrizebg_png"/>
<e:Button id="closeBtn" label="" x="615" y="272">
<e:skinName>
<e:Skin states="up,down,disabled">
<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:Group id="duibaGroup" width="400" height="621" horizontalCenter="0" top="360">
<e:Button id="duibaBtn" label="" y="508" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="TaskCenterGame_png" source.down="TaskCenterGame_png" source.disabled="TaskCenterGame_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Label text="啊哦,奖励擦肩而过…" y="0" textColor="0xf54500" fontFamily="FZY3JW" size="40" horizontalCenter="0"/>
</e:Group>
<e:Group id="shopGroup" width="400" height="621" horizontalCenter="0" top="360" visible="false">
<e:Button id="shopBtn" label="" y="508" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="TaskCenterShop_png" source.down="TaskCenterShop_png" source.disabled="TaskCenterShop_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Label text="继续浏逛逛店铺,还可以获得更多奖励哦~" y="20" fontFamily="FZY3JW" size="28" horizontalCenter="0" x="10" textColor="0xfb6300"/>
<e:Label text="换个姿势,再来一次!" y="-40" textColor="0xF54500" fontFamily="FZY3JW" size="46" horizontalCenter="0" x="-30" scaleX="1" scaleY="1"/>
</e:Group>
<e:Group id="watchGroup" width="400" height="621" horizontalCenter="0" top="360" visible="false">
<e:Label text="换个姿势,再来一次!" y="-40" textColor="0xF54500" fontFamily="FZY3JW" size="46" horizontalCenter="0"/>
<e:Label text="继续浏览商品,还可以获得更多奖励哦~" y="20" fontFamily="FZY3JW" size="28" horizontalCenter="0" x="10" textColor="0xfb6300"/>
<e:Button id="watchBtn" label="" y="508" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="TaskCenterWatch_png" source.down="TaskCenterWatch_png" source.disabled="TaskCenterWatch_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
</e:Group>
<e:Group id="buyGroup" width="400" height="621" horizontalCenter="0" top="360" visible="false">
<e:Label text="换个姿势,再来一次!" y="-40" textColor="0xF54500" fontFamily="FZY3JW" size="46" horizontalCenter="0"/>
<e:Label text="继续下单还可以获得更多奖励哦~" y="20" fontFamily="FZY3JW" size="28" horizontalCenter="0" x="10" textColor="0xfb6300"/>
<e:Button id="buyBtn" label="" y="508" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="TaskCenterBuy_png" source.down="TaskCenterBuy_png" source.disabled="TaskCenterBuy_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
</e:Group>
</e:Skin>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="SignPrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16d5c2563cb"/>
<e:Component y="830" skinName="ADSmallSkin" horizontalCenter="0" visible="false"/>
<e:Image horizontalCenter="0" source="TaskCenterPrize_bg_png" y="0"/>
<e:Button id="closeBtn" label="" x="631" y="291.12">
<e:skinName>
<e:Skin states="up,down,disabled">
<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:Image id="img" y="375.77" touchEnabled="true" width="512" height="240" scaleX="1" scaleY="1" horizontalCenter="0" source="{data.url}" visible="false"/>
<e:Image id="money" y="366.4" horizontalCenter="0.5" scaleX="0.7" scaleY="0.7" source="common_money_png"/>
<e:Label id="propnums2" text="30" textColor="0x885037" bold="true" y="527.64" width="75" textAlign="right" x="282.6" fontFamily="FZY3JW"/>
<e:Image id="blood" y="368.16" horizontalCenter="0" source="common_blood_png" scaleX="0.7" scaleY="0.7" visible="false"/>
<e:Group id="numsgroup" x="396.38" y="378.12" visible="false">
<e:Image id="numsbg" source="signprize_numsbg_png" x="0" y="0"/>
<e:Label id="nums" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW"/>
</e:Group>
<e:Label id="tipsLabel" text="继续完成任务可以获得更多元宝哦~" y="632.73" textColor="0xF54500" fontFamily="FZY3JW" size="26" horizontalCenter="0"/>
<e:Button id="close2Btn" label="" y="676.73" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="TaskCenterGame_png" source.down="TaskCenterGame_png" source.disabled="TaskCenterGame_png"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
</e:Skin>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="SignPrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16d5c2563cb"/>
<e:Component y="758.04" skinName="ADSmallSkin" x="84" visible="false"/>
<e:Image y="0" horizontalCenter="0" source="TaskCenter_bg_png"/>
<e:Button id="closeBtn" label="" x="670" y="68.15">
<e:skinName>
<e:Skin states="up,down,disabled">
<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:Scroller id="taskScroller" width="674" height="522.34" y="170.81" horizontalCenter="0" anchorOffsetY="0">
<e:Group anchorOffsetX="0" width="222.73" anchorOffsetY="0" height="525">
<e:List id="list" left="0" right="0" horizontalCenter="0" y="0"/>
</e:Group>
</e:Scroller>
</e:Skin>
\ No newline at end of file
......@@ -17,8 +17,8 @@ export class MyExmlPlugin extends ExmlPlugin2 implements plugins.Command {
'nums2.png',
'hbCutTimeFont.png',
'hbGameScoreFont.png',
'hbGameCutTimeFont.png'
'hbGameCutTimeFont.png',
'taskCenterFont.png'
];
if (excludes.indexOf(file.basename) != -1) {
return file;
......
......@@ -30,6 +30,7 @@ import RedBagAni, { createRedBagIcon } from "./RedBagAni";
import { createEffect2MovieClip } from "../effect/createEffect2";
import ActIcon from "./icon/ActIcon";
import { NetName } from "../../libs/tw/enum/NetName";
import TaskCenterIcon from "./icon/TaskCenterIcon";
let doHelpFlag = false;
// let doScratchHelpFlag = false;
......@@ -371,6 +372,7 @@ export default class MapScene extends Scene {
this.icons = {
"scratchIcon": new ScratchIcon("scratchIcon", this["scratchGroup"], this["scratchBtn"], this["scratchTipsBg"], this["scratchTips"]),
"turntableIcon": new TurntableIcon("turntableIcon", this["turnTableGroup"], this["turnTableBtn"], this["turnTableTipsBg"], this["turnTableTips"]),
"taskCenterIcon": new TaskCenterIcon("taskCenterIcon", this["taskGroup"], this["taskBtn"], this["taskTipsBg"], this["taskTips"]),
};
this.actIcon = new ActIcon(this['actsShowBtn'], this['actTips'], this['actIconsGroup']);
......@@ -619,10 +621,6 @@ export default class MapScene extends Scene {
this['bloodTxt'].text = `${data.remainEnargy}`;
}
onTap_taskBtn() {
PanelCtrl.instance.show('task');
}
onTap_guide() {
this['guide'].visible = false;
localStorage.setItem('activityguide', '1');
......@@ -854,7 +852,6 @@ export default class MapScene extends Scene {
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)
this['signBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_signBtn, this)
this['bloodBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_bloodBtn, this)
this['settingBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.toggleSettings, this)
......
import IconBase from "./IconBase";
import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
export default class ScratchIcon extends IconBase {
constructor(name: string, group: eui.Group, btn: eui.Button, tipsBg?: eui.Image, tipsLabel?: eui.Label) {
super(name, group, btn, tipsBg, tipsLabel);
}
protected start() {
super.start();
}
/**
* 点击icon
* @param e 点击事件
*/
protected onTouchBtn(e: egret.TouchEvent) {
super.onTouchBtn(e);
PanelCtrl.instance.show('task');
}
protected initEvents() {
super.initEvents();
}
protected removeEvents() {
super.removeEvents();
}
public destory() {
super.destory();
}
}
\ No newline at end of file
......@@ -73,7 +73,7 @@ export default class BoxPanel extends Panel {
get skinKey() { return 'Box' }
}
export const addAdComp = (x, y, parent: egret.DisplayObjectContainer, logid) => {
export const addAdComp = (x, y, parent: egret.DisplayObjectContainer, logid?) => {
const comp = new AdSmallComp();
comp.loadSkin();
comp.start({ logid: logid });
......
import Panel from "../../../libs/new_wx/components/Panel";
import getSkinPath from "../../../libs/new_wx/utils/getSkinPath";
import log = egret.log;
import { createRedBagIcon } from "../../mapScene/RedBagAni";
import nrSetRenderMode = egret_native.nrSetRenderMode;
import { NetName } from "../../../libs/tw/enum/NetName";
import { NetManager } from "../../../libs/tw/manager/NetManager";
import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
import { ModuleTypes } from "../../../libs/new_wx/types/sceneTypes";
export default class TaskCenter extends Panel {
public closeBtn: eui.Button;
public taskScroller: eui.Scroller;
public list: eui.List;
onShowAnim() {
let canvasW = 750 / window.innerWidth * window.innerWidth;
let canvasH = 750 / window.innerWidth * window.innerHeight;
// console.log('canvasW:' + canvasW + '\tcanvasH:' + canvasH);
log({
canvasW: canvasW,
canvasH: canvasH
});
egret.Tween.get(this).set({y: canvasH}).to({y: canvasH - 710}, 300, egret.Ease.quadInOut);
}
start(data) {
super.start();
this.list.useVirtualLayout = false;
this.list.itemRenderer = TaskCenterItem;
this.getTaskInfo();
}
private getTaskInfo() {
NetManager.ins.getTaskInfo((success, res) => {
if(!success) {
return;
}
const data = res.data;
this.list.dataProvider = new eui.ArrayCollection(data);
});
}
onTouchTap_closeBtn() {
// let canvasW = 750 / window.innerWidth * window.innerWidth;
let canvasH = 750 / window.innerWidth * window.innerHeight;
// console.log('canvasW:' + canvasW + 'canvasH:' + canvasH);
egret.Tween.get(this).to({y: canvasH}, 300, egret.Ease.quadInOut).call(() => {
super.onTouchTap_closeBtn();
});
}
get skinKey() {
return 'TaskCenter'
}
}
////////////////////////////////////////////////////////////////////////////////////////////////
/**
* 任务中心列表
*/
class TaskCenterItem extends eui.ItemRenderer {
public taskImg:eui.Image;
public title:eui.Label;
public remark:eui.Label;
public btnGroup:eui.Group;
public btnImg:eui.Image;
public btnLabel:eui.Label;
constructor() {
super();
this.skinName = getSkinPath('TaskCenterItem');
}
dataChanged() {
// console.log(this.data);
this.taskImg.source = this.data.icon;
this.title.text = this.data.taskTitle;
this.remark.text = this.data.remark;
this.setBtn(); // 设置按钮
}
// '0x7e7e7e' done 灰色
// '0x1376df' goTask 蓝色
// '0xf99f45' getPrize 橙色
// 设置按钮
private setBtn() {
const count = this.data.count;
const done = this.data.done;
const limit = this.data.limit;
this.btnLabel.stroke = 2;
if(count > 0) { // 可领奖
this.btnImg.source = 'TaskCenter_' + 'getPrize' + 'Btn_png';
this.btnLabel.text = `领取奖励×${count}`;
this.btnLabel.strokeColor = 0xf99f45;
this.btnGroup.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
// 领奖
NetManager.ins.taskAward((success, res) => {
if(!success) {
PanelCtrl.instance.show('taskCenterNoPrize');
return;
}
PanelCtrl.instance.show('taskCenterPrize', res.data);
}, this.data.subActivityId);
}, this);
} else if(done < limit) { // 已完成
this.btnImg.source = 'TaskCenter_' + 'goTask' + 'Btn_png';
this.btnLabel.text = `去完成(${done}/${limit})`;
this.btnLabel.strokeColor = 0x1376df;
this.btnGroup.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
// 跳转任务链接
window.location.href = this.data.appIncompletelink;
}, this);
} else {
this.btnImg.source = 'TaskCenter_' + 'done' + 'Btn_png';
this.btnLabel.text = '已完成';
this.btnLabel.strokeColor = 0x7e7e7e;
}
}
}
\ No newline at end of file
import Panel from "../../../libs/new_wx/components/Panel";
import { addAdComp } from "../BoxPanel";
import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
export default class TaskCenterNoPrize extends Panel {
public closeBtn: eui.Button;
public duibaGroup: eui.Group;
public duibaBtn: eui.Button;
public shopGroup: eui.Group;
public shopBtn: eui.Button;
public watchGroup: eui.Group;
public watchBtn: eui.Button;
public buyGroup: eui.Group;
public buyBtn: eui.Button;
start(data) {
super.start();
addAdComp(84, 1014, this);
}
onTouchTap_closeBtn() {
super.onTouchTap_closeBtn();
PanelCtrl.instance.show('task');
}
get skinKey() {
return 'TaskCenterNoPrize'
}
}
\ No newline at end of file
import Panel from "../../../libs/new_wx/components/Panel";
import { DataManager } from "../../../libs/tw/manager/DataManager";
import { addAdComp } from "../BoxPanel";
import { NetManager } from "../../../libs/tw/manager/NetManager";
import PanelCtrl from "../../../libs/new_wx/ctrls/panelCtrl";
export default class TaskCenterPrize extends Panel {
public closeBtn: eui.Button;
public img: eui.Image;
public money: eui.Image;
public propnums2: eui.Label;
public blood: eui.Image;
public numsgroup: eui.Group;
public numsbg: eui.Image;
public nums: eui.Label;
public tipsLabel: eui.Label;
public close2Btn: eui.Button;
start(data) {
super.start();
this.updateOption(data.option);
// 埋点
addAdComp(84, 830, this);
}
updateOption(option: any) {
const {categoryType, img, num, propType, realValue} = option;// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
this['nums'].text = 'x1';
if(num)
this['nums'].text = 'x' + num;
switch(categoryType) {
case 2:
this['blood'].visible = true;
this['numsgroup'].visible = true;
this.tipsLabel.text = '继续完成任务可以获得更多体力哦~';
break;
case 3:
this['numsgroup'].visible = true;
this['img'].visible = true;
this.data.url = `turnprize_icon${propType}_png`;
this.tipsLabel.text = '继续完成任务可以获得更多道具哦~';
break;
case 4:
this['numsgroup'].visible = false;
this['money'].visible = true;
this['propnums2'].visible = true;
this['propnums2'].text = realValue;
this.tipsLabel.text = '继续完成任务可以获得更多元宝哦~';
break;
default:
this['img'].visible = true;
this.data.url = img;
this.tipsLabel.text = '继续完成任务可以获得更多优惠哦~';
break;
}
}
onTouchTap_closeBtn() {
super.onTouchTap_closeBtn();
PanelCtrl.instance.show('task');
}
get skinKey() {
return 'TaskCenterPrize'
}
protected get closeBtns(): eui.Button[] {
return [this['closeBtn'], this['close2Btn']]
}
}
\ No newline at end of file
......@@ -21,9 +21,6 @@ const config = {
'/customActivity/happyclear/totalNumRank': {
data: './happyclear/totalNumRank.json'
},
'/customActivity/happyclear/totalNumRank': {
data: './happyclear/totalNumRank.json'
},
'/customActivity/happyclear/userInfo': {
data: './happyclear/userInfo.json'
},
......@@ -175,7 +172,14 @@ const config = {
'/customActivity/happyclear/redRain/doJoin':{
data: './happyclear/hbRainDoJoin.json'
},
}
//////////////////// 消消乐任务中心 ////////////////////
'/customActivity/happyclear/taskSystem/getTaskInfo':{
data: './happyclear/getTaskInfo.json'
},
'/customActivity/happyclear/taskSystem/award':{
data: './happyclear/taskAward.json'
},
};
for (let item in config) {
if (config.hasOwnProperty(item))
......
{
"code": "0000000000",
"data": [
{
"appCompletelText": "已完成文案",
"appCompletelink": "已完成链接",
"appIncompleteText": "未完成文案",
"appIncompletelink": "https://www.baidu.com/",
"count": 0,
"done": 3,
"icon": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg",
"limit": 5,
"taskTitle": "正在完成的任务Title",
"taskName": "正在完成的任务Name",
"remark": "正在完成的任务Remark",
"status": 0,
"subActivityId": "666",
"browseSecond": "倒计时秒数,浏览页面倒计时的时长,兑吧无需关注。",
"completeLink": "倒计时图标(已完成),任务完成时展示的图标,兑吧无需关注。",
"homeLink": "主会场链接,兑吧无需关注。",
"incompleteLink": "倒计时图标(未完成),兑吧无需关注。",
"pcCompletelText": "pc已完成文案,兑吧无需关注。",
"pcCompletelink": "pc已完成链接,兑吧无需关注。",
"pcIncompleteText": "pc未完成文案,兑吧无需关注。",
"pcIncompletelink": "pc未完成链接,兑吧无需关注。",
"receivetype": "领取方式,兑吧无需关注。",
"subActivityName": "子活动名称,兑吧无需关注。",
"taskId": "兑吧无需关注。",
"taskStatus": "任务状态,兑吧无需关注。",
"taskViceTitle": "任务副标题,目前未启用,兑吧无需关注。",
"terminalType": "终端类型,1、pc2、APP6、微信9、全部,兑吧无需关注。"
},
{
"appCompletelText": "已完成文案",
"appCompletelink": "已完成链接",
"appIncompleteText": "未完成文案",
"appIncompletelink": "https://www.baidu.com/",
"count": 2,
"done": 3,
"icon": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg",
"limit": 5,
"taskTitle": "可以领奖的任务Title",
"taskName": "可以领奖的任务Name",
"remark": "可以领奖的任务Remark",
"status": 0,
"subActivityId": "777",
"browseSecond": "倒计时秒数,浏览页面倒计时的时长,兑吧无需关注。",
"completeLink": "倒计时图标(已完成),任务完成时展示的图标,兑吧无需关注。",
"homeLink": "主会场链接,兑吧无需关注。",
"incompleteLink": "倒计时图标(未完成),兑吧无需关注。",
"pcCompletelText": "pc已完成文案,兑吧无需关注。",
"pcCompletelink": "pc已完成链接,兑吧无需关注。",
"pcIncompleteText": "pc未完成文案,兑吧无需关注。",
"pcIncompletelink": "pc未完成链接,兑吧无需关注。",
"receivetype": "领取方式,兑吧无需关注。",
"subActivityName": "子活动名称,兑吧无需关注。",
"taskId": "兑吧无需关注。",
"taskStatus": "任务状态,兑吧无需关注。",
"taskViceTitle": "任务副标题,目前未启用,兑吧无需关注。",
"terminalType": "终端类型,1、pc2、APP6、微信9、全部,兑吧无需关注。"
},
{
"appCompletelText": "已完成文案",
"appCompletelink": "已完成链接",
"appIncompleteText": "未完成文案",
"appIncompletelink": "https://www.baidu.com/",
"count": 0,
"done": 5,
"icon": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg",
"limit": 5,
"taskTitle": "已完成的任务Title",
"taskName": "已完成的任务Name",
"remark": "已完成的任务Remark",
"status": 0,
"subActivityId": "888",
"browseSecond": "倒计时秒数,浏览页面倒计时的时长,兑吧无需关注。",
"completeLink": "倒计时图标(已完成),任务完成时展示的图标,兑吧无需关注。",
"homeLink": "主会场链接,兑吧无需关注。",
"incompleteLink": "倒计时图标(未完成),兑吧无需关注。",
"pcCompletelText": "pc已完成文案,兑吧无需关注。",
"pcCompletelink": "pc已完成链接,兑吧无需关注。",
"pcIncompleteText": "pc未完成文案,兑吧无需关注。",
"pcIncompletelink": "pc未完成链接,兑吧无需关注。",
"receivetype": "领取方式,兑吧无需关注。",
"subActivityName": "子活动名称,兑吧无需关注。",
"taskId": "兑吧无需关注。",
"taskStatus": "任务状态,兑吧无需关注。",
"taskViceTitle": "任务副标题,目前未启用,兑吧无需关注。",
"terminalType": "终端类型,1、pc2、APP6、微信9、全部,兑吧无需关注。"
},
{
"appCompletelText": "已完成文案",
"appCompletelink": "已完成链接",
"appIncompleteText": "未完成文案",
"appIncompletelink": "https://www.baidu.com/",
"count": 0,
"done": 5,
"icon": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg",
"limit": 5,
"taskTitle": "已完成的任务Title",
"taskName": "已完成的任务Name",
"remark": "已完成的任务Remark",
"status": 0,
"subActivityId": "888",
"browseSecond": "倒计时秒数,浏览页面倒计时的时长,兑吧无需关注。",
"completeLink": "倒计时图标(已完成),任务完成时展示的图标,兑吧无需关注。",
"homeLink": "主会场链接,兑吧无需关注。",
"incompleteLink": "倒计时图标(未完成),兑吧无需关注。",
"pcCompletelText": "pc已完成文案,兑吧无需关注。",
"pcCompletelink": "pc已完成链接,兑吧无需关注。",
"pcIncompleteText": "pc未完成文案,兑吧无需关注。",
"pcIncompletelink": "pc未完成链接,兑吧无需关注。",
"receivetype": "领取方式,兑吧无需关注。",
"subActivityName": "子活动名称,兑吧无需关注。",
"taskId": "兑吧无需关注。",
"taskStatus": "任务状态,兑吧无需关注。",
"taskViceTitle": "任务副标题,目前未启用,兑吧无需关注。",
"terminalType": "终端类型,1、pc2、APP6、微信9、全部,兑吧无需关注。"
},
{
"appCompletelText": "已完成文案",
"appCompletelink": "已完成链接",
"appIncompleteText": "未完成文案",
"appIncompletelink": "https://www.baidu.com/",
"count": 0,
"done": 5,
"icon": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg",
"limit": 5,
"taskTitle": "已完成的任务Title",
"taskName": "已完成的任务Name",
"remark": "已完成的任务Remark",
"status": 0,
"subActivityId": "888",
"browseSecond": "倒计时秒数,浏览页面倒计时的时长,兑吧无需关注。",
"completeLink": "倒计时图标(已完成),任务完成时展示的图标,兑吧无需关注。",
"homeLink": "主会场链接,兑吧无需关注。",
"incompleteLink": "倒计时图标(未完成),兑吧无需关注。",
"pcCompletelText": "pc已完成文案,兑吧无需关注。",
"pcCompletelink": "pc已完成链接,兑吧无需关注。",
"pcIncompleteText": "pc未完成文案,兑吧无需关注。",
"pcIncompletelink": "pc未完成链接,兑吧无需关注。",
"receivetype": "领取方式,兑吧无需关注。",
"subActivityName": "子活动名称,兑吧无需关注。",
"taskId": "兑吧无需关注。",
"taskStatus": "任务状态,兑吧无需关注。",
"taskViceTitle": "任务副标题,目前未启用,兑吧无需关注。",
"terminalType": "终端类型,1、pc2、APP6、微信9、全部,兑吧无需关注。"
}
],
"desc": "OK",
"success": true,
"timestamp": 1574759175658
}
\ No newline at end of file
{
"success": true,
"code": "0000000000",
"desc": "OK",
"timestamp": 1572958024679,
"data": {
"option": {
"id": "224",
"day": null,
"categoryType": 4,
"title": "炸弹",
"rate": "50",
"minValue": null,
"maxValue": null,
"coinType": null,
"realValue": 30,
"propType": 3,
"num": null,
"img": "",
"appItemId": null,
"name": "",
"value": ""
},
"orderNum": null
}
}
\ No newline at end of file
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