Skip to content

X
xiaoxiaole
Commit 5c7492ae authored by zjz1994's avatar zjz1994
Browse files
Options

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

parents 02a93b8c 025d2b31
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 59 deletions
egret/resource/assets/hbCutTime/hbCutTimeFont.fnt
View file @ 5c7492ae
{"file":"hbCutTimeFont.png","frames":{
"0":{"x":0,"y":0,"w":56,"h":81,"offX":-0.5,"offY":0,"sourceW":55,"sourceH":81},
"1":{"x":58,"y":0,"w":55,"h":81,"offX":0,"offY":0,"sourceW":55,"sourceH":81},
"2":{"x":115,"y":0,"w":55,"h":81,"offX":0,"offY":0,"sourceW":55,"sourceH":81},
"3":{"x":171,"y":83,"w":55,"h":81,"offX":0,"offY":0,"sourceW":55,"sourceH":81},
"4":{"x":0,"y":166,"w":55,"h":81,"offX":0,"offY":0,"sourceW":55,"sourceH":81},
"5":{"x":114,"y":83,"w":55,"h":81,"offX":0,"offY":0,"sourceW":55,"sourceH":81},
"6":{"x":57,"y":166,"w":55,"h":81,"offX":0,"offY":0,"sourceW":55,"sourceH":81},
"7":{"x":57,"y":83,"w":55,"h":81,"offX":0,"offY":0,"sourceW":55,"sourceH":81},
"8":{"x":172,"y":0,"w":55,"h":81,"offX":0,"offY":0,"sourceW":55,"sourceH":81},
"9":{"x":0,"y":83,"w":55,"h":81,"offX":0,"offY":0,"sourceW":55,"sourceH":81},
"分":{"x":153,"y":166,"w":36,"h":34,"offX":3,"offY":23,"sourceW":42,"sourceH":81},
"秒":{"x":114,"y":166,"w":37,"h":35,"offX":2,"offY":23,"sourceW":42,"sourceH":81},
"时":{"x":191,"y":166,"w":34,"h":34,"offX":4,"offY":23,"sourceW":42,"sourceH":81}}}
\ No newline at end of file
"时":{"x":193,"y":166,"w":34,"h":34,"offX":4,"offY":23,"sourceW":42,"sourceH":81},
"分":{"x":155,"y":166,"w":36,"h":35,"offX":3,"offY":23,"sourceW":42,"sourceH":81},
"秒":{"x":116,"y":166,"w":37,"h":35,"offX":2,"offY":23,"sourceW":42,"sourceH":81},
"0":{"x":58,"y":83,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81},
"1":{"x":0,"y":83,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81},
"2":{"x":116,"y":83,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81},
"3":{"x":174,"y":83,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81},
"4":{"x":0,"y":0,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81},
"5":{"x":0,"y":166,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81},
"6":{"x":116,"y":0,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81},
"9":{"x":58,"y":0,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81},
"7":{"x":174,"y":0,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81},
"8":{"x":58,"y":166,"w":56,"h":81,"offX":0,"offY":0,"sourceW":56,"sourceH":81}}}
\ No newline at end of file
egret/resource/skins/HbCutTimeSkin.exml
View file @ 5c7492ae
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
xmlns:w="http://ns.egret.com/wing">
<e:Image y="30.33" horizontalCenter="0" source="hbCutTime_bg_png"/>
<e:BitmapLabel id="cutTimeLabel" y="619.33" text="00时00分00秒" letterSpacing="8" font="hbCutTimeFont_fnt" horizontalCenter="10"/>
<e:Image id="tipImage" y="571" source="hbCutTime_cutLine_disable_png" horizontalCenter="1.5"/>
<e:Button id="closeBtn" label="" x="616" y="302.33">
<e:Image y="-94.67" horizontalCenter="0" source="hbCutTime_bg_png"/>
<e:BitmapLabel id="cutTimeLabel" y="619.33" text="00时00分00秒" letterSpacing="8" horizontalCenter="10" font="hbCutTimeFont_fnt"/>
<e:Image id="tipImage" y="566" source="hbCutTime_cutLine_disable_png" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="601.5" y="326.33">
<e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png"
......@@ -13,7 +13,7 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Button id="rule_btn" label="" y="834" horizontalCenter="1">
<e:Button id="rule_btn" label="" y="864" horizontalCenter="0">
<e:skinName>
<e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="hbCutTime_rule_btn_png" source.down="hbCutTime_rule_btn_png" source.disabled="hbCutTime_rule_btn_png"/>
......@@ -21,5 +21,5 @@
</e:Skin>
</e:skinName>
</e:Button>
<e:Image id="ok_btn" y="769" source="hbCutTime_btn_enable_png" horizontalCenter="1" anchorOffsetX="179" anchorOffsetY="52"/>
<e:Image id="ok_btn" y="769" source="hbCutTime_btn_enable_png" anchorOffsetX="179" anchorOffsetY="52" horizontalCenter="0"/>
</e:Skin>
\ No newline at end of file
egret/resource/skins/TaskCenterItemSkin.exml
View file @ 5c7492ae
......@@ -5,8 +5,12 @@
<e:Image id="taskImg" width="90" height="90" x="28.25" anchorOffsetX="0" anchorOffsetY="0" verticalCenter="-2"/>
<e:Label id="title" text="Label" x="140" y="38" size="30" fontFamily="FZY4JW" textColor="0x944a09"/>
<e:Label id="remark" text="Label" x="140" y="87" size="24" fontFamily="FZY3JW" textColor="0x944a09"/>
<e:Group id="moneyGroup" x="248.25" y="84.25">
<e:Image x="0" anchorOffsetX="0" anchorOffsetY="0" source="taskPrize_money_png" scaleX="0.3025210084033613" scaleY="0.3466666666666667" verticalCenter="-2"/>
<e:Label id="moneyCount" text="×999" x="37.7" size="28" fontFamily="FZY3JW" textColor="0xf25d45" bold="true" verticalCenter="0"/>
</e:Group>
<e:Group id="btnGroup" x="441" width="217" height="91" verticalCenter="0">
<e:Image id="btnImg" source="TaskCenter_doneBtn_png" horizontalCenter="0" verticalCenter="0"/>
<e:Label id="btnLabel" text="去完成" verticalAlign="middle" textAlign="center" horizontalCenter="0" verticalCenter="-3.5" strokeColor="0x7e7e7e" stroke="2" fontFamily="FZY3JW" size="30"/>
<e:Label id="btnLabel" text="去完成" verticalAlign="middle" textAlign="center" horizontalCenter="0.5" verticalCenter="-4.5" strokeColor="0x7e7e7e" stroke="2" fontFamily="FZY3JW" size="30"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/resource/skins/TaskCenterPrizeSkin.exml
View file @ 5c7492ae
<?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="-150.5"/>
<e:Component y="830" skinName="ADSmallSkin" anchorOffsetX="0" anchorOffsetY="0" horizontalCenter="0" visible="false"/>
<e:Image source="TaskCenterPrize_bg_png" y="-150.5" horizontalCenter="0"/>
<e:Button id="closeBtn" label="" x="607" y="240">
<e:skinName>
<e:Skin states="up,down,disabled">
......@@ -11,13 +11,13 @@
</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}"/>
<e:Image id="money" y="376.4" scaleX="0.7" scaleY="0.7" source="signprize元宝_png" horizontalCenter="0" visible="false"/>
<e:Image id="img" y="374.77" touchEnabled="true" width="518" height="243" scaleX="1" scaleY="1" source="{data.url}" horizontalCenter="2" anchorOffsetX="0" anchorOffsetY="0"/>
<e:Image id="money" y="470.02" scaleX="0.7" scaleY="0.7" horizontalCenter="-41.5" source="taskPrize_money_png"/>
<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" 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 id="numsgroup" x="380.4" y="468.27" anchorOffsetX="0" width="188" anchorOffsetY="0" height="62">
<e:Image id="numsbg" source="signprize_numsbg_png" x="0" y="0" visible="false"/>
<e:Label id="nums" text="X8" size="48" verticalCenter="0" verticalAlign="middle" textAlign="center" fontFamily="FZY3JW" textColor="0xc17343" left="0" bold="true"/>
</e:Group>
<e:Label id="tipsLabel" text="继续完成任务可以获得更多元宝哦~" y="632.73" textColor="0xF54500" fontFamily="FZY3JW" size="26" horizontalCenter="0"/>
<e:Group id="btn" y="690" anchorOffsetX="0" width="332.33" anchorOffsetY="0" height="104.33" horizontalCenter="0">
......
egret/src/panels/TaskCenter/TaskCenter.ts
View file @ 5c7492ae
......@@ -63,6 +63,8 @@ class TaskCenterItem extends eui.ItemRenderer {
public taskImg: eui.Image;
public title: eui.Label;
public remark: eui.Label;
public moneyGroup: eui.Group;
public moneyCount: eui.Label;
public btnGroup: eui.Group;
public btnImg: eui.Image;
public btnLabel: eui.Label;
......@@ -79,6 +81,11 @@ class TaskCenterItem extends eui.ItemRenderer {
}
this.title.text = this.data.taskTitle;
this.remark.text = this.data.remark;
let count = this.data.remark.match(/(?<=得).*?(?=元宝)/);
this.moneyCount.text = `×${count[count.length - 1]}`;
this.moneyGroup.x = this.remark.x + this.remark.width + 20;
this.setBtn(); // 设置按钮
}
......
egret/src/panels/TaskCenter/TaskCenterPrize.ts
View file @ 5c7492ae
......@@ -55,37 +55,40 @@ export default class TaskCenterPrize extends Panel {
}
updateOption(option: any) {
const {categoryType, img, num, propType, realValue} = option;// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
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 = true;
this['nums'].text = 'x' + realValue;
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;
}
this['nums'].text = 'x' + realValue;
// 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 = true;
// this['nums'].text = 'x' + realValue;
// 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() {
......
mock/happyclear/taskAward.json
View file @ 5c7492ae
......@@ -7,14 +7,14 @@
"option": {
"id": "224",
"day": null,
"categoryType": 2,
"categoryType": 4,
"title": "炸弹",
"rate": "50",
"minValue": null,
"maxValue": null,
"coinType": null,
"realValue": 30,
"propType": 2,
"propType": 4,
"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