Skip to content

X
xiaoxiaole
Commit 7b76a58d authored by 邱旭's avatar 邱旭
Browse files
Options

1

parent 9445fb50
Expand all Show whitespace changes
Inline Side-by-side
Showing with 250 additions and 297 deletions
egret/libs/tw/manager/NetManager.ts
View file @ 7b76a58d
......@@ -2287,7 +2287,7 @@ export class NetManager extends ABNetManager {
const net: INetData = {
name: NetName.GET_TASKINFO,
uri: window['duiba'] +'/customActivity/happyclear/taskSystem/award',
type: 'get',
type: 'post',
dataType: 'json',
hideMsg: true,
param: {
......
egret/resource/TextureMerger/map.tmproject
View file @ 7b76a58d
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/宝箱.png","../assets/map/宝箱1.png","../assets/map/宝箱2.png","../assets/map/宝箱3.png","../assets/map/宝箱bg.png","../assets/map/宝箱btn.png","../assets/map/道具.png","../assets/map/关闭 拷贝.png","../assets/map/光 副本 4.png","../assets/map/设置.png","../assets/map/设置bg.png","../assets/map/声音.png","../assets/map/声音关闭.png","../assets/map/狮子.png","../assets/map/退出.png","../assets/map/问题.png","../assets/map/无星星.png","../assets/map/星星.png","../assets/map/星星bg.png","../assets/map/音乐.png","../assets/map/音乐关闭.png","../assets/map/有星星.png","../assets/map/有星星2.png","../assets/map/有星星3.png","../assets/map/元宝bg.png","../assets/map/ad_icon.png","../assets/map/animal1.png","../assets/map/avatar.png","../assets/map/friend_avatar.png","../assets/map/guideBox.png","../assets/map/guideLevel.png","../assets/map/guideLove.png","../assets/map/guideMoney.png","../assets/map/guideOver.png","../assets/map/icon.png","../assets/map/iconbg.png","../assets/map/icongray.png","../assets/map/invite_icon.png","../assets/map/invite_txtbg.png","../assets/map/lionMsgBg.png","../assets/map/map_signicon.png","../assets/map/map2+.png","../assets/map/map2+bg.png","../assets/map/map2红包大作战.png","../assets/map/map2热门引导.png","../assets/map/map2周一红包雨.png","../assets/map/map大转盘.png","../assets/map/map刮现金红包.png","../assets/map/map今日可领.png","../assets/map/map明日可领.png","../assets/map/maphot.png","../assets/map/msgTri.png","../assets/map/namebg.png","../assets/map/progress1.png","../assets/map/progress2.png","../assets/map/recordbtn.png","../assets/map/taskicon.png","../assets/map/map2+bg2.png","../assets/map/mapredbagicom.png","../assets/map/maplight2.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/宝箱.png","../assets/map/宝箱1.png","../assets/map/宝箱2.png","../assets/map/宝箱3.png","../assets/map/宝箱bg.png","../assets/map/宝箱btn.png","../assets/map/道具.png","../assets/map/关闭 拷贝.png","../assets/map/光 副本 4.png","../assets/map/设置.png","../assets/map/设置bg.png","../assets/map/声音.png","../assets/map/声音关闭.png","../assets/map/狮子.png","../assets/map/退出.png","../assets/map/问题.png","../assets/map/无星星.png","../assets/map/星星.png","../assets/map/星星bg.png","../assets/map/音乐.png","../assets/map/音乐关闭.png","../assets/map/有星星.png","../assets/map/有星星2.png","../assets/map/有星星3.png","../assets/map/元宝bg.png","../assets/map/ad_icon.png","../assets/map/animal1.png","../assets/map/avatar.png","../assets/map/friend_avatar.png","../assets/map/guideBox.png","../assets/map/guideLevel.png","../assets/map/guideLove.png","../assets/map/guideMoney.png","../assets/map/guideOver.png","../assets/map/icon.png","../assets/map/iconbg.png","../assets/map/icongray.png","../assets/map/invite_icon.png","../assets/map/invite_txtbg.png","../assets/map/lionMsgBg.png","../assets/map/map_signicon.png","../assets/map/map2+.png","../assets/map/map2+bg.png","../assets/map/map2红包大作战.png","../assets/map/map2热门引导.png","../assets/map/map2周一红包雨.png","../assets/map/map大转盘.png","../assets/map/map刮现金红包.png","../assets/map/map今日可领.png","../assets/map/map明日可领.png","../assets/map/maphot.png","../assets/map/msgTri.png","../assets/map/namebg.png","../assets/map/progress1.png","../assets/map/progress2.png","../assets/map/recordbtn.png","../assets/map/taskicon.png","../assets/map/map2+bg2.png","../assets/map/mapredbagicom.png","../assets/map/maplight2.png","../assets/map/taskBtn.png","../assets/map/txtbg_blue.png","../assets/map/txtbg_orange.png","../assets/map/txtbg_purple.png"]}
\ No newline at end of file
egret/resource/TextureMerger/sign.tmproject
View file @ 7b76a58d
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sign","version":5,"files":["../assets/sign/signitem.png","../assets/sign/signicon6.png","../assets/sign/signicon5.png","../assets/sign/signicon4.png","../assets/sign/signicon3.png","../assets/sign/signicon2.png","../assets/sign/signicon_blood.png","../assets/sign/signbtn4.png","../assets/sign/signbtn3.png","../assets/sign/signbtn2.png","../assets/sign/signbtn1.png","../assets/sign/signbg.png","../assets/sign/sign_quan88.png","../assets/sign/sign_quan8.png","../assets/sign/sign_quan58.png","../assets/sign/sign_quan38.png","../assets/sign/sign_quan28.png","../assets/sign/sign_quan16.png","../assets/sign/sign_quan15.png","../assets/sign/sign_quan12.png","../assets/sign/sign_line2.png","../assets/sign/sign_line.png","../assets/sign/sign_light.png","../assets/sign/sign_icon1.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sign","version":5,"files":["../assets/sign/signitem.png","../assets/sign/signicon6.png","../assets/sign/signicon5.png","../assets/sign/signicon4.png","../assets/sign/signicon3.png","../assets/sign/signicon2.png","../assets/sign/signicon_blood.png","../assets/sign/signbtn4.png","../assets/sign/signbtn3.png","../assets/sign/signbtn2.png","../assets/sign/signbtn1.png","../assets/sign/signbg.png","../assets/sign/sign_quan88.png","../assets/sign/sign_quan8.png","../assets/sign/sign_quan58.png","../assets/sign/sign_quan38.png","../assets/sign/sign_quan28.png","../assets/sign/sign_quan16.png","../assets/sign/sign_quan15.png","../assets/sign/sign_quan12.png","../assets/sign/sign_line2.png","../assets/sign/sign_line.png","../assets/sign/sign_light.png","../assets/sign/sign_icon1.png","../assets/sign/sign_quan10.png","../assets/sign/sign_quan23.png","../assets/sign/sign_quan36.png"]}
\ No newline at end of file
egret/resource/TextureMerger/taskcenter.tmproject 0 → 100644
View file @ 7b76a58d
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"taskcenter","version":5,"files":["../assets/TaskCenterPanel/TaskCenter_getPrizeBtn.png","../assets/TaskCenterPanel/TaskCenter_goTaskBtn.png","../assets/TaskCenterPanel/TaskCenter_bg.png","../assets/TaskCenterPanel/TaskCenter_taskBg.png","../assets/TaskCenterPanel/TaskCenter_doneBtn.png","../assets/TaskCenterPanel/TaskCenter_btn.png"]}
\ No newline at end of file
egret/resource/TextureMerger/taskcenternoprize.tmproject 0 → 100644
View file @ 7b76a58d
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"taskcenternoprize","version":5,"files":["../assets/TaskCenterNoPrize/TaskCenterNoPrizebg.png"]}
\ No newline at end of file
egret/resource/TextureMerger/preload.tmproject → egret/resource/TextureMerger/taskcenterprize.tmproject
View file @ 7b76a58d
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/redbombalert/redbombalert文案.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"taskcenterprize","version":5,"files":["../assets/TaskCenterPrize/TaskCenterPrize_bg.png"]}
\ No newline at end of file
egret/resource/default.res.json
View file @ 7b76a58d
......@@ -201,7 +201,7 @@
"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,TaskCenter_btn_png",
"keys": "TaskCenter_getPrizeBtn_png,TaskCenter_goTaskBtn_png,TaskCenter_bg_png,TaskCenter_taskBg_png,TaskCenter_doneBtn_png,TaskCenter_btn_png",
"name": "taskcenter"
},
{
......@@ -3621,26 +3621,6 @@
"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",
......
egret/resource/default.thm.json
View file @ 7b76a58d
......@@ -76,11 +76,11 @@
"resource/skins/StarSkin.exml",
"resource/skins/StartPanelSkin.exml",
"resource/skins/StartSkin.exml",
"resource/skins/TaskCenterSkin.exml",
"resource/skins/TargetItemSkin.exml",
"resource/skins/TaskCenterItemSkin.exml",
"resource/skins/TaskCenterPrizeSkin.exml",
"resource/skins/TaskCenterNoPrizeSkin.exml",
"resource/skins/TargetItemSkin.exml",
"resource/skins/TaskCenterPrizeSkin.exml",
"resource/skins/TaskCenterSkin.exml",
"resource/skins/TaskItemSkin.exml",
"resource/skins/TaskPrizeSkin.exml",
"resource/skins/TaskSkin.exml",
......
egret/resource/skins/SignPrizeSkin.exml
View file @ 7b76a58d
......@@ -4,8 +4,8 @@
<e:Component y="779.37" skinName="ADSmallSkin" x="84" visible="false"/>
<e:Image source="singprizebg_png" y="54.85" horizontalCenter="0"/>
<e:Image id="img" y="375.77" touchEnabled="true" source="{data.img}" width="512" height="240" scaleX="1" scaleY="1" horizontalCenter="0"/>
<e:Image id="money" y="366.4" horizontalCenter="0.5" scaleX="0.7" scaleY="0.7" source="common_money_png" visible="false"/>
<e:Label id="propnums2" text="30" textColor="0x885037" bold="true" y="523.64" width="75" textAlign="right" x="282.6" fontFamily="FZY3JW" visible="false"/>
<e:Image id="money" y="366.4" horizontalCenter="0.5" scaleX="0.7" scaleY="0.7" source="signprize元宝_png" visible="false"/>
<e:Label id="propnums2" text="30" textColor="0x885037" bold="true" y="525.64" width="75" textAlign="right" x="282.6" fontFamily="FZY3JW" visible="false"/>
<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="367.12">
<e:Image id="numsbg" source="signprize_numsbg_png" x="0" y="0"/>
......
egret/resource/skins/TaskCenterNoPrizeSkin.exml
View file @ 7b76a58d
<?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:Component y="867.5" skinName="ADSmallSkin" x="84" visible="false"/>
<e:Image y="101.5" horizontalCenter="-0.5" source="TaskCenterNoPrizebg_png"/>
<e:Button id="closeBtn" label="" x="613.5" y="125.5">
<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"/>
......@@ -11,14 +11,14 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Group id="duibaGroup" horizontalCenter="0" top="360" visible="false">
<e:Group id="duibaGroup" horizontalCenter="-1" top="214" visible="false">
<e:Label text="啊哦，奖励擦肩而过…" y="0" textColor="0xf54500" fontFamily="FZY3JW" size="40" horizontalCenter="0"/>
</e:Group>
<e:Group id="suningGroup" horizontalCenter="0" top="360">
<e:Group id="suningGroup" horizontalCenter="-1" top="214" visible="false">
<e:Label id="suningLabel" 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="btn" x="196" y="875" width="358" height="113">
<e:Group id="btn" x="194.5" y="728.5" width="358" height="113">
<e:Button label="" y="0" x="0">
<e:skinName>
<e:Skin states="up,down,disabled">
......
egret/resource/skins/TaskCenterPrizeSkin.exml
View file @ 7b76a58d
......@@ -12,16 +12,16 @@
</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="5.5" scaleX="0.7" scaleY="0.7" source="common_money_png"/>
<e:Label id="propnums2" text="30" textColor="0x885037" bold="true" y="526.64" width="75" textAlign="right" x="287.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="money" y="376.4" scaleX="0.7" scaleY="0.7" source="signprize元宝_png" horizontalCenter="0"/>
<e:Label id="propnums2" text="30" textColor="0x885037" bold="true" y="526.64" width="75" textAlign="right" x="287.6" fontFamily="FZY3JW" visible="false"/>
<e:Image id="blood" y="376.16" source="common_blood_png" scaleX="0.7" scaleY="0.7" horizontalCenter="0" visible="false"/>
<e:Group id="numsgroup" x="396.38" y="378.12">
<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:Group id="btn" x="214" y="690">
<e:Image y="0" source="TaskCenter_btn_png" scaleX="0.9" scaleY="0.9" x="0"/>
<e:Label id="btnLabel" text="继续闯关" y="27" size="35" strokeColor="0x2091e9" stroke="3" fontFamily="FZY3JW" x="91"/>
<e:Label id="btnLabel" text="继续闯关" y="27" size="35" strokeColor="0x2091e9" stroke="3" fontFamily="FZY3JW" horizontalCenter="0"/>
</e:Group>
</e:Skin>
egret/src/mapScene/MapScene.ts
View file @ 7b76a58d
......@@ -208,6 +208,7 @@ export default class MapScene extends Scene {
for(let i = 0; i < taskInfoRes.data.length; i++){
if(taskInfoRes.data[i].count > 0){
panels.push('task');
break;
}
}
}
......
egret/src/mapScene/icon/TaskCenterIcon.ts
View file @ 7b76a58d
......@@ -15,6 +15,7 @@ export default class TaskCenterIcon extends IconBase {
NetManager.ins.getTaskInfo((success, res) => {
if(!success) {
this.visible = false;
GDispatcher.dispatchEvent('updateTurnTablePosition');
return;
}
const data = res.data;
......
egret/src/panels/SignPrizePanel.ts
View file @ 7b76a58d
......@@ -31,11 +31,11 @@ export default class SignPrizePanel extends Panel {
this['img'].visible = prizeType!= 'times' && prizeType!= 'coin';
this['money'].visible = prizeType=='coin';
this['propnums2'].visible = prizeType=='coin';
// this['propnums2'].visible = prizeType=='coin';
this['blood'].visible = prizeType=='times';
if(prizeType=='coin') {
this['numsgroup'].visible=false;
}
// if(prizeType=='coin') {
// this['numsgroup'].visible=false;
// }
addAdComp(84,779.37,this,24);
this.showlog();
}
......
egret/src/panels/TaskCenter/TaskCenter.ts
View file @ 7b76a58d
......@@ -88,7 +88,7 @@ class TaskCenterItem extends eui.ItemRenderer {
const count = this.data.count; // 领取奖励*count
const done = this.data.done;
const limit = this.data.limit; // done/limit
const appCompletelText = this.data.appCompletelText; // 已完成文案
const appCompleteText = this.data.appCompleteText; // 已完成文案
const appIncompleteText = this.data.appIncompleteText; // 未完成文案
this.btnLabel.stroke = 2;
......@@ -98,6 +98,8 @@ class TaskCenterItem extends eui.ItemRenderer {
this.btnLabel.strokeColor = 0xf99f45;
this.btnGroup.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
// 领奖
this.btnGroup.touchEnabled = false;
this.btnGroup.touchChildren = false;
NetManager.ins.taskAward((success, res) => {
if(!success) {
PanelCtrl.instance.show('taskCenterNoPrize', {prizeData: res, taskData: this.data});
......@@ -122,7 +124,7 @@ class TaskCenterItem extends eui.ItemRenderer {
}, this);
} else { // 已完成
this.btnImg.source = 'TaskCenter_' + 'done' + 'Btn_png';
this.btnLabel.text = `${appCompletelText}`;
this.btnLabel.text = `${appCompleteText}`;
this.btnLabel.strokeColor = 0x7e7e7e;
}
}
......
egret/src/panels/TaskCenter/TaskCenterNoPrize.ts
View file @ 7b76a58d
......@@ -67,7 +67,7 @@ export default class TaskCenterNoPrize extends Panel {
break;
}
addAdComp(84, 1014, this);
addAdComp(84, 867.5, this);
}
onTouchTap_closeBtn() {
......
egret/src/panels/TaskCenter/TaskCenterPrize.ts
View file @ 7b76a58d
......@@ -70,10 +70,11 @@ export default class TaskCenterPrize extends Panel {
this.tipsLabel.text = '继续完成任务可以获得更多道具哦~';
break;
case 4:
this['numsgroup'].visible = false;
this['numsgroup'].visible = true;
this['nums'].text = 'x' + realValue;
this['money'].visible = true;
this['propnums2'].visible = true;
this['propnums2'].text = realValue;
// this['propnums2'].visible = true;
// this['propnums2'].text = realValue;
this.tipsLabel.text = '继续完成任务可以获得更多元宝哦~';
break;
default:
......
mock/happyclear/getTaskInfo.json
View file @ 7b76a58d
This diff is collapsed.
mock/happyclear/taskAward.json
View file @ 7b76a58d
{
"success": false,
"success": true,
"code": "600064",
"desc": "OK",
"timestamp": 1572958024679,
......@@ -7,14 +7,14 @@
"option": {
"id": "224",
"day": null,
"categoryType": 4,
"categoryType": 3,
"title": "炸弹",
"rate": "50",
"minValue": null,
"maxValue": null,
"coinType": null,
"realValue": 30,
"propType": 3,
"propType": 2,
"num": null,
"img": "",
"appItemId": 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