Skip to content

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

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

parents 473858af d722f417
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 47 deletions
egret/.wing/exml.json
View file @ f276e0c2
...@@ -164,8 +164,8 @@ ...@@ -164,8 +164,8 @@
"16cc233ca3b": { "16cc233ca3b": {
"bindingDataTestObj": [ "bindingDataTestObj": [
{ {
"key": "data.img", "key": "data.url",
"value": "http://yun.duiba.com.cn/babi/img/bm2ryg8wht.gif" "value": "turnprize_icon1_png"
} }
] ]
}, },
......
egret/resource/skins/BackSkin.exml
View file @ f276e0c2
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<e:Skin class="BackSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="BackSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16e0235c541"/> <w:Config id="16e0235c541"/>
<e:Component y="806.52" skinName="ADSmallSkin" horizontalCenter="0" visible="false"/> <e:Component y="848.94" skinName="ADSmallSkin" horizontalCenter="0" visible="false"/>
<e:Image y="-30.27" source="backbg_png" horizontalCenter="0"/> <e:Image y="-48.45" source="backbg_png" horizontalCenter="0" scale9Grid="93,550,564,42" height="910"/>
<e:Image y="-20.27" horizontalCenter="0" x="10" source=""/> <e:Image y="-20.27" horizontalCenter="0" x="10" source=""/>
<e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="377.76" visible="false"/> <e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="377.76" visible="false"/>
<e:Image id="money" source="signprize元宝_png" y="368.2" horizontalCenter="0" scaleX="0.8" scaleY="0.8" visible="false"/> <e:Image id="money" source="signprize元宝_png" y="368.2" horizontalCenter="0" scaleX="0.8" scaleY="0.8" visible="false"/>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="inviteBtn" label="" y="675" horizontalCenter="12"> <e:Button id="inviteBtn" label="" y="720.45" horizontalCenter="12">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="back按钮 副本 91_png" source.down="back按钮 副本 91_png" source.disabled="back按钮 副本 91_png"/> <e:Image width="100%" height="100%" source="back按钮 副本 91_png" source.down="back按钮 副本 91_png" source.disabled="back按钮 副本 91_png"/>
......
egret/resource/skins/BoxSkin.exml
View file @ f276e0c2
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
<e:Skin class="BoxSkin" width="750" height="1205" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing"> <e:Skin class="BoxSkin" width="750" height="1205" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16cc233ca3b"/> <w:Config id="16cc233ca3b"/>
<e:Component y="739.52" skinName="ADSmallSkin" x="84" visible="false"/> <e:Component y="739.52" skinName="ADSmallSkin" x="84" visible="false"/>
<e:Image source="boxbg_png" y="33.76" horizontalCenter="0"/> <e:Image source="boxbg_png" y="-32.9" horizontalCenter="0" scale9Grid="93,413,564,43" height="783"/>
<e:Image id="img" y="355" touchEnabled="true" source="{data.img}" width="512" height="240" scaleX="0.9" scaleY="0.9" horizontalCenter="0"/> <e:Button id="closeBtn" label="" x="604.96" y="124.18">
<e:Button id="closeBtn" label="" x="604.96" y="190.84">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing"> <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" source.disabled="closeCommonBtn_png"/> <e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
...@@ -12,7 +11,14 @@ ...@@ -12,7 +11,14 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Button id="close2Btn" label="" y="602" horizontalCenter="0"> <e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="311.1"/>
<e:Image id="money" source="signprize元宝_png" y="301.54" horizontalCenter="0" scaleX="0.8" scaleY="0.8" visible="false"/>
<e:Image id="blood" source="singprize体力_png" y="264.14" horizontalCenter="0" visible="false"/>
<e:Group id="numsgroup" x="396.38" y="309.74" visible="false">
<e:Image id="numsbg" source="signprize_numsbg_png" x="0" y="0"/>
<e:Label id="propnums" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/>
</e:Group>
<e:Button id="close2Btn" label="" y="597.34" horizontalCenter="0">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
<e:Image width="100%" height="100%" source="boxbtn_png" source.down="boxbtn_png" source.disabled="boxbtn_png"/> <e:Image width="100%" height="100%" source="boxbtn_png" source.down="boxbtn_png" source.disabled="boxbtn_png"/>
......
egret/src/mapScene/MapScene.ts
View file @ f276e0c2
...@@ -773,33 +773,21 @@ export default class MapScene extends Scene { ...@@ -773,33 +773,21 @@ export default class MapScene extends Scene {
this['boxani'].touchEnabled = true; this['boxani'].touchEnabled = true;
this['boxani'].touchChildren = true; this['boxani'].touchChildren = true;
if(success) { if(success) {
const boxdata = DataManager.ins.getData('hc_openTreasureBox').data; const hc_openTreasureBox = DataManager.ins.getData('hc_openTreasureBox');
const boxdata = hc_openTreasureBox.data;
const homeData = DataManager.ins.getData('hc_home').data; const homeData = DataManager.ins.getData('hc_home').data;
homeData.canReceiveTreasureBoxNum = boxdata.canReceiveTreasureBoxNum; homeData.canReceiveTreasureBoxNum = boxdata.canReceiveTreasureBoxNum;
homeData.nextRangeStarsNum = boxdata.nextRangeStarsNum; homeData.nextRangeStarsNum = boxdata.nextRangeStarsNum;
homeData.totalStarts = boxdata.totalStarts; homeData.totalStarts = boxdata.totalStarts;
homeData.isGetAllTreasureBox = boxdata.isGetAllTreasureBox; homeData.isGetAllTreasureBox = boxdata.isGetAllTreasureBox;
this.updateBox(); this.updateBox();
const data = DataManager.ins.getData('hc_openTreasureBox').data;
NetManager.ins.getPlugOrderStatus((s) => { if(hc_openTreasureBox.success && boxdata && boxdata.option) {
if(s) {
const data = DataManager.ins.getData('getPlugOrderStatus');
//区分奖品
if(data.lottery && data.lottery.type != 'thanks') {
PanelCtrl.instance.show('box'); PanelCtrl.instance.show('box');
} else { } else {
showToast('哎呀！奖励与您擦肩而过！快继续闯关！');
}
} else {
showToast('哎呀！奖励与您擦肩而过！快继续闯关！'); showToast('哎呀！奖励与您擦肩而过！快继续闯关！');
} }
},
data.orderNum,
() => {
return DataManager.ins.getData('getPlugOrderStatus').result == 0
});
} else { } else {
PanelCtrl.instance.show('box2'); PanelCtrl.instance.show('box2');
......
egret/src/panels/BackPanel.ts
View file @ f276e0c2
...@@ -9,7 +9,7 @@ export default class BackPanel extends Panel { ...@@ -9,7 +9,7 @@ export default class BackPanel extends Panel {
start(data) { start(data) {
super.start(); super.start();
this.showlog(); this.showlog();
addAdComp(84, 806.52, this,56) addAdComp(84, 848.94, this,56)
const backData = DataManager.ins.getData('hc_getBackReward'); const backData = DataManager.ins.getData('hc_getBackReward');
this.updateOption(backData.data); this.updateOption(backData.data);
NetManager.ins.showLog(getlogItem(56)); NetManager.ins.showLog(getlogItem(56));
...@@ -30,8 +30,10 @@ export default class BackPanel extends Panel { ...@@ -30,8 +30,10 @@ export default class BackPanel extends Panel {
} }
updateOption(option: any) { updateOption(option: any) {
const { categoryType, img, num, propType } = option;// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品 const { categoryType, img, num, propType,realValue } = option;// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
this['propnums'].text = 'x1';
if(num)
this['propnums'].text = 'x' + num; this['propnums'].text = 'x' + num;
switch (categoryType) { switch (categoryType) {
case 2: case 2:
...@@ -46,6 +48,7 @@ export default class BackPanel extends Panel { ...@@ -46,6 +48,7 @@ export default class BackPanel extends Panel {
case 4: case 4:
this['numsgroup'].visible = true; this['numsgroup'].visible = true;
this['money'].visible = true; this['money'].visible = true;
this['propnums'].text = 'x' + realValue;
break; break;
default: default:
this['img'].visible = true; this['img'].visible = true;
......
egret/src/panels/BoxPanel.ts
View file @ f276e0c2
...@@ -12,13 +12,42 @@ export default class BoxPanel extends Panel { ...@@ -12,13 +12,42 @@ export default class BoxPanel extends Panel {
}, this); }, this);
this.showlog(); this.showlog();
// this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl;
const itemid = DataManager.ins.getData('getPlugOrderStatus').lottery.itemId; addAdComp(84,739.52,this,27);
this.data.img = `http://yun.duiba.com.cn/db_games/${window['imgver']}/${itemid}.png`;
addAdComp(84,739.52,this,27) const hc_openTreasureBox = DataManager.ins.getData('hc_openTreasureBox');
const boxdata = hc_openTreasureBox.data;
this.updateOption(boxdata.option);
} }
updateOption(option: any) {
const { categoryType, img, num, propType,realValue } = option;// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
this['propnums'].text = 'x1';
if(num)
this['propnums'].text = 'x' + num;
switch (categoryType) {
case 2:
this['blood'].visible = true;
this['numsgroup'].visible = true;
break;
case 3:
this['numsgroup'].visible = true;
this['img'].visible = true;
this.data.url = `turnprize_icon${propType}_png`;
break;
case 4:
this['numsgroup'].visible = true;
this['money'].visible = true;
this['propnums'].text = 'x' + realValue;
break;
default:
this['img'].visible = true;
this.data.url = img;
break;
}
}
showlog() { showlog() {
NetManager.ins.showLog(getlogItem(17)); NetManager.ins.showLog(getlogItem(17));
NetManager.ins.showLog(getlogItem(27)); NetManager.ins.showLog(getlogItem(27));
......
egret/src/panels/TurntablePanel/TurntablePrizePanel.ts
View file @ f276e0c2
...@@ -35,7 +35,7 @@ export default class TurnPrizePanel extends Panel { ...@@ -35,7 +35,7 @@ export default class TurnPrizePanel extends Panel {
} }
updateOption(option: any) { updateOption(option: any) {
const { categoryType, img, num, propType } = option;// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品 const { categoryType, img, num, propType,realValue } = option;// 2次数 3道具 4元宝 5实物 6优惠券 7虚拟商品
this['propnums'].text = 'x1'; this['propnums'].text = 'x1';
if(num) if(num)
...@@ -54,6 +54,7 @@ export default class TurnPrizePanel extends Panel { ...@@ -54,6 +54,7 @@ export default class TurnPrizePanel extends Panel {
case 4: case 4:
this['numsgroup'].visible = true; this['numsgroup'].visible = true;
this['money'].visible = true; this['money'].visible = true;
this['propnums'].text = 'x' + realValue;
break; break;
default: default:
this['img'].visible = true; this['img'].visible = true;
......
mock/happyclear/getBackReward.json
View file @ f276e0c2
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
"code":"0000000000", "code":"0000000000",
"data":{ "data":{
"appItemId":2322, "appItemId":2322,
"categoryType":1, "categoryType":2,
"coinType":1, "coinType":1,
"img":"1", "img": "//yun.dui88.com/images/201910/e6pmpk2pne.png",
"maxValue":2, "maxValue":2,
"minValue":1, "minValue":1,
"realValue":87,
"name":"测试商品", "name":"测试商品",
"num":3, "num":3,
"propType":2, "propType":2,
......
mock/happyclear/openTreasureBox.json
View file @ f276e0c2
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"desc": "OK", "desc": "OK",
"timestamp": 1572332426229, "timestamp": 1572332426229,
"data": { "data": {
"canReceiveTreasureBoxNum": 0, "canReceiveTreasureBoxNum": 1110,
"nextRangeStarsNum": 8, "nextRangeStarsNum": 8,
"totalStars": 6, "totalStars": 6,
"isGetAllTreasureBox": false, "isGetAllTreasureBox": false,
...@@ -12,15 +12,16 @@ ...@@ -12,15 +12,16 @@
"option": { "option": {
"id": "41", "id": "41",
"day": null, "day": null,
"categoryType": 2, "realValue":87,
"categoryType": 4,
"title": "游戏次数2", "title": "游戏次数2",
"rate": "10", "rate": "10",
"minValue": null, "minValue": null,
"maxValue": null, "maxValue": null,
"coinType": null, "coinType": 1,
"propType": null, "propType": 2,
"num": 2, "num": null,
"img": "", "img": "//yun.dui88.com/images/201910/e6pmpk2pne.png",
"appItemId": null, "appItemId": null,
"name": "", "name": "",
"value": "" "value": ""
......
mock/happyclear/submit.json
View file @ f276e0c2
...@@ -4,7 +4,23 @@ ...@@ -4,7 +4,23 @@
"desc":"OK", "desc":"OK",
"timestamp":1566546925981, "timestamp":1566546925981,
"data":{ "data":{
"prizeType":2, "option": {
"id": "41",
"day": null,
"realValue":87,
"categoryType": 4,
"title": "游戏次数2",
"rate": "10",
"minValue": null,
"maxValue": null,
"coinType": 1,
"propType": 2,
"num": null,
"img": "//yun.dui88.com/images/201910/e6pmpk2pne.png",
"appItemId": null,
"name": "",
"value": ""
},
"prizeResponse":{ "prizeResponse":{
"errorCode":null, "errorCode":null,
"changeMoney":888, "changeMoney":888,
......
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