Skip to content

X
xiaoxiaole
Commit bb51e54a authored by wjf's avatar wjf
Browse files
Options

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

parents 45c5db23 2fea965a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 224 additions and 712 deletions
egret/.wing/exml.json
View file @ bb51e54a
...@@ -115,6 +115,10 @@ ...@@ -115,6 +115,10 @@
{ {
"key": "data.img", "key": "data.img",
"value": "http://yun.duiba.com.cn/babi/img/bm2ryg8wht.gif" "value": "http://yun.duiba.com.cn/babi/img/bm2ryg8wht.gif"
},
{
"key": "data.url",
"value": "turnprize_icon1_png"
} }
] ]
}, },
...@@ -164,8 +168,8 @@ ...@@ -164,8 +168,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/libs/new_wx/components/PrizePanel.ts
View file @ bb51e54a
...@@ -11,14 +11,43 @@ import { NetManager } from "../../tw/manager/NetManager"; ...@@ -11,14 +11,43 @@ import { NetManager } from "../../tw/manager/NetManager";
import Panel from "./Panel"; import Panel from "./Panel";
export default class PrizePanel extends Panel { export default class PrizePanel extends Panel {
_level; _level;
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;
}
}
start(data) { start(data) {
super.start(); super.start();
setGray(this['pica']); setGray(this['pica']);
setGray(this['picb']); setGray(this['picb']);
setGray(this['picc']); setGray(this['picc']);
this._level = parseInt(data.level + ''); this._level = parseInt(data.level + '');
const itemid = DataManager.ins.getData('getPlugOrderStatus').lottery.itemId;
this.data.img = `http://yun.duiba.com.cn/db_games/${window['imgver']}/${itemid}.png`; this.updateOption(data.option);
this['shareBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => { this['shareBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
NetManager.ins.clickLog(getlogItem(15)); NetManager.ins.clickLog(getlogItem(15));
...@@ -29,7 +58,7 @@ export default class PrizePanel extends Panel { ...@@ -29,7 +58,7 @@ export default class PrizePanel extends Panel {
}, this); }, this);
this['goBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => { this['goBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
this.hidePanel(); this.hidePanel();
if (this._level + 1 <= 70) if (this._level + 1 <= window['last_level'])
changeMapScene({ level: this._level + 1 }); changeMapScene({ level: this._level + 1 });
else else
changeMapScene(); changeMapScene();
......
egret/resource/TextureMerger/scratchprize.tmproject 0 → 100644
View file @ bb51e54a
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"scratchprize","version":5,"files":["../assets/scratch/prize/scratchPrize_bg.png","../assets/scratch/prize/scratchPrize_btn.png","../assets/scratch/prize/scratchPrize_game_btn.png"]}
\ No newline at end of file
egret/resource/default.res.json
View file @ bb51e54a
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
}, },
{ {
"keys": "scratchPrize_bg_png,scratchPrize_btn_png,scratchPrize_game_btn_png", "keys": "scratchPrize_bg_png,scratchPrize_btn_png,scratchPrize_game_btn_png",
"name": "scratchprizepanel" "name": "scratchprize"
}, },
{ {
"keys": "scratch_rule_bg_png", "keys": "scratch_rule_bg_png",
......
egret/resource/skins/BackSkin.exml
View file @ bb51e54a
<?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 @ bb51e54a
...@@ -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/resource/skins/MapSkin.exml
View file @ bb51e54a
...@@ -105,6 +105,34 @@ ...@@ -105,6 +105,34 @@
<e:Label id="inviteTips" text="立即到账" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xffffff" size="18" fontFamily="Helvetica"/> <e:Label id="inviteTips" text="立即到账" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xffffff" size="18" fontFamily="Helvetica"/>
</e:Group> </e:Group>
</e:Group> </e:Group>
<e:Group id="turnTableGroup" x="567.36" y="318.43">
<e:Button id="turnTableBtn" label="" x="33.36" y="0">
<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"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Group x="6" y="10.24">
<e:Image id="turnTableTipsBg" source="invite_txtbg_png" y="0" touchEnabled="false"/>
<e:Label id="turnTableTips" text="立即到" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xFFFFFF" size="18" fontFamily="Helvetica"/>
</e:Group>
</e:Group>
<e:Group id="scratchGroup" y="476" right="18">
<e:Button id="scratchBtn" label="" y="0">
<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"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Group x="-24">
<e:Image id="scratchTipsBg" source="invite_txtbg_png" y="0" touchEnabled="false"/>
<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 x="30" scaleX="1.4" scaleY="1.4" bottom="23">
<e:Group id="settingGroup" x="2" y="6.08" visible="false"> <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:Image id="settingbg" source="设置bg_png" y="0" x="0" scale9Grid="9,84,54,76" height="231"/>
...@@ -164,33 +192,5 @@ ...@@ -164,33 +192,5 @@
</e:Group> </e:Group>
<e:Label text="点击开宝箱" y="791" size="37" horizontalCenter="0" bold="true"/> <e:Label text="点击开宝箱" y="791" size="37" horizontalCenter="0" bold="true"/>
</e:Group> </e:Group>
<e:Group id="turnTableGroup" x="567.36" y="318.43">
<e:Button id="turnTableBtn" label="" x="33.36" y="0">
<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"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Group x="6" y="10.24">
<e:Image id="turnTableTipsBg" source="invite_txtbg_png" y="0" touchEnabled="false"/>
<e:Label id="turnTableTips" text="立即到" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xFFFFFF" size="18" fontFamily="Helvetica"/>
</e:Group>
</e:Group>
<e:Group id="scratchGroup" y="476" right="18">
<e:Button id="scratchBtn" label="" y="0">
<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"/>
<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
</e:Skin>
</e:skinName>
</e:Button>
<e:Group x="-24">
<e:Image id="scratchTipsBg" source="invite_txtbg_png" y="0" touchEnabled="false"/>
<e:Label id="scratchTips" text="立即到" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xFFFFFF" size="18" fontFamily="Helvetica"/>
</e:Group>
</e:Group>
<w:Config id="16c89f4ae1a"/> <w:Config id="16c89f4ae1a"/>
</e:Skin> </e:Skin>
\ No newline at end of file
egret/resource/skins/PrizeSkin.exml
View file @ bb51e54a
...@@ -4,6 +4,13 @@ ...@@ -4,6 +4,13 @@
<e:Component y="859.74" skinName="ADSmallSkin" x="84" visible="false"/> <e:Component y="859.74" skinName="ADSmallSkin" x="84" visible="false"/>
<e:Image id="light" source="common_prizelight_png" x="374.19" y="253.76" anchorOffsetX="375.76" anchorOffsetY="327.27"/> <e:Image id="light" source="common_prizelight_png" x="374.19" y="253.76" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
<e:Image source="prizePanelbg_png" y="61.15" horizontalCenter="0.5"/> <e:Image source="prizePanelbg_png" y="61.15" horizontalCenter="0.5"/>
<e:Image id="img" width="508" height="225" source="{data.url}" horizontalCenter="0" y="411.76" visible="false"/>
<e:Image id="money" source="signprize元宝_png" y="402.2" horizontalCenter="0" scaleX="0.8" scaleY="0.8" visible="false"/>
<e:Image id="blood" source="singprize体力_png" y="364.8" horizontalCenter="0" visible="false"/>
<e:Group id="numsgroup" x="396.38" y="410.4" 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="closeBtn" label="" x="618" y="235.25"> <e:Button id="closeBtn" label="" x="618" y="235.25">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
...@@ -28,7 +35,6 @@ ...@@ -28,7 +35,6 @@
</e:Skin> </e:Skin>
</e:skinName> </e:skinName>
</e:Button> </e:Button>
<e:Image id="img" y="429.28" touchEnabled="true" source="{data.img}" width="512" height="240" x="117"/>
<e:Image id="picb" source="点亮 副本 2_png" x="142" y="118.28"/> <e:Image id="picb" source="点亮 副本 2_png" x="142" y="118.28"/>
<e:Image id="pica" source="点亮 副本 2_png" x="608" y="118.28" scaleX="-1"/> <e:Image id="pica" source="点亮 副本 2_png" x="608" y="118.28" scaleX="-1"/>
<e:Image id="picc" source="点亮_png" y="69.28" x="280"/> <e:Image id="picc" source="点亮_png" y="69.28" x="280"/>
......
egret/src/mainScene/MainScene.ts
View file @ bb51e54a
...@@ -2476,34 +2476,41 @@ export default class MainScene extends Scene { ...@@ -2476,34 +2476,41 @@ export default class MainScene extends Scene {
updateMainTimerAfterGetData();//submit之后再判断一次home,更新倒计时 updateMainTimerAfterGetData();//submit之后再判断一次home,更新倒计时
}); });
const submitData = DataManager.ins.getData('hc_submit').data; const submitData = DataManager.ins.getData('hc_submit').data;
if (submitData.prizeType == 1) { if(submitData.option) {
//提交成功后捞结果
NetManager.ins.getPlugOrderStatus((s) => {
Loading2.instace.hide(); Loading2.instace.hide();
playSound(SoundType.sucess); PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL, { level: this.chapter,option:submitData.option });
if (s) { } else{
const data = DataManager.ins.getData('getPlugOrderStatus');
//区分奖品
if (data.lottery && data.lottery.type != "thanks") {
PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL, { level: this.chapter });
} else {
PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter });
}
} else {
//失败直接显示未中奖
PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter });
}
},
submitData.prizeResponse.orderNum,
() => { return DataManager.ins.getData('getPlugOrderStatus').result == 0 });
} else if (submitData.prizeType == 2) {
Loading2.instace.hide();
PanelCtrl.instance.show('prize2', { level: this.chapter });
} else {
Loading2.instace.hide(); Loading2.instace.hide();
PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter }); PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter });
} }
// if (submitData.prizeType == 1) {
// //提交成功后捞结果
// NetManager.ins.getPlugOrderStatus((s) => {
// Loading2.instace.hide();
// playSound(SoundType.sucess);
// if (s) {
// const data = DataManager.ins.getData('getPlugOrderStatus');
// //区分奖品
// if (data.lottery && data.lottery.type != "thanks") {
// PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL, { level: this.chapter });
// } else {
// PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter });
// }
// } else {
// //失败直接显示未中奖
// PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter });
// }
// },
// submitData.prizeResponse.orderNum,
// () => { return DataManager.ins.getData('getPlugOrderStatus').result == 0 });
// } else if (submitData.prizeType == 2) {
// Loading2.instace.hide();
// PanelCtrl.instance.show('prize2', { level: this.chapter });
// } else {
// Loading2.instace.hide();
// PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter });
// }
} else { } else {
Loading2.instace.hide(); Loading2.instace.hide();
if (!data) { if (!data) {
......
egret/src/mapScene/MapScene.ts
View file @ bb51e54a
...@@ -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 @ bb51e54a
...@@ -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/BagPanel.ts
View file @ bb51e54a
...@@ -47,14 +47,15 @@ export default class BagPanel extends Panel { ...@@ -47,14 +47,15 @@ export default class BagPanel extends Panel {
const prop1Nums = getPropNums(PropType.HAMMER); const prop1Nums = getPropNums(PropType.HAMMER);
const prop3Nums = getPropNums(PropType.CHANCE_NUM); const prop3Nums = getPropNums(PropType.CHANCE_NUM);
this.list.dataProvider = new eui.ArrayCollection([ this.list.dataProvider = new eui.ArrayCollection([
{
type:'hammer',
nums:prop1Nums
},
{ {
type:'boom', type:'boom',
nums:prop2Nums nums:prop2Nums
}, },
{
type:'hammer',
nums:prop1Nums
},
{ {
type:'change', type:'change',
nums:prop3Nums nums:prop3Nums
......
egret/src/panels/BoxPanel.ts
View file @ bb51e54a
...@@ -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/ScratchPanel.ts
View file @ bb51e54a
...@@ -141,7 +141,7 @@ export default class ScratchPanel extends Panel { ...@@ -141,7 +141,7 @@ export default class ScratchPanel extends Panel {
} else if(progress < 0) { } else if(progress < 0) {
progress = 0; progress = 0;
} }
this['numLabel'].text = `共${this.data.avatarList.length}位好友帮你刮了${progress}%`; this['numLabel'].text = `共${this.data.avatarList.length}位好友帮你刮了${progress.toFixed(2)}%`;
this["progressLabel"].text = `仅剩${(100 - progress).toFixed(2)}%`; // 进度条文字 this["progressLabel"].text = `仅剩${(100 - progress).toFixed(2)}%`; // 进度条文字
let _width = this["progressBg"].width * progress / 100; // 宽度 let _width = this["progressBg"].width * progress / 100; // 宽度
let dProgress = Math.abs(progress - this["progress"].width / this["progressBg"].width); // 比当前进度的差值的绝对值 let dProgress = Math.abs(progress - this["progress"].width / this["progressBg"].width); // 比当前进度的差值的绝对值
......
egret/src/panels/TurntablePanel/Turntable.ts
View file @ bb51e54a
...@@ -97,6 +97,7 @@ export default class Turntable extends Panel { ...@@ -97,6 +97,7 @@ export default class Turntable extends Panel {
private setBtnTouch(touchEnabled: boolean) { private setBtnTouch(touchEnabled: boolean) {
this.start_btn.touchEnabled = touchEnabled; this.start_btn.touchEnabled = touchEnabled;
this["closeBtn"].touchEnabled = touchEnabled; this["closeBtn"].touchEnabled = touchEnabled;
this.rulebtn.touchEnabled = touchEnabled;
} }
/** /**
...@@ -120,6 +121,7 @@ export default class Turntable extends Panel { ...@@ -120,6 +121,7 @@ export default class Turntable extends Panel {
NetManager.ins.hc_turnableDojoin((success, res) => { NetManager.ins.hc_turnableDojoin((success, res) => {
NetManager.ins.hc_home(() => { NetManager.ins.hc_home(() => {
SceneCtrl.instance.updateScene(); SceneCtrl.instance.updateScene();
this['nums'].text = `当前可用元宝：${getHomeData().wealth}`;
}, window['collectRuleId']); }, window['collectRuleId']);
Loading.instace.hide(); Loading.instace.hide();
// if(!success) { // if(!success) {
...@@ -153,6 +155,7 @@ export default class Turntable extends Panel { ...@@ -153,6 +155,7 @@ export default class Turntable extends Panel {
break; break;
default: default:
PanelCtrl.instance.show("TurntableNoPrizePanel", {type: 3});
break; break;
} }
return; return;
......
egret/src/panels/TurntablePanel/TurntablePrizePanel.ts
View file @ bb51e54a
...@@ -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/config.js
View file @ bb51e54a
...@@ -46,7 +46,7 @@ const config = { ...@@ -46,7 +46,7 @@ const config = {
data: './happyclear/openTreasureBox.json' data: './happyclear/openTreasureBox.json'
}, },
'/customActivity/happyclear/home': { '/customActivity/happyclear/home': {
data: './happyclear/homemax.json' data: './happyclear/home.json'
}, },
'/customActivity/happyclear/getLevelInfo': { '/customActivity/happyclear/getLevelInfo': {
data: './happyclear/getLevelInfo.json' data: './happyclear/getLevelInfo.json'
......
mock/happyclear/getBackReward.json
View file @ bb51e54a
...@@ -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/home.json
View file @ bb51e54a
This diff is collapsed.
mock/happyclear/openTreasureBox.json
View file @ bb51e54a
{ {
"success": false, "success": true,
"code": "0000000000", "code": "0000000000",
"desc": "OK", "desc": "OK",
"timestamp": 1566558623308, "timestamp": 1572332426229,
"data": { "data": {
"canReceiveTreasureBoxNum": 99, "canReceiveTreasureBoxNum": 1110,
"nextRangeStarsNum": 25, "nextRangeStarsNum": 8,
"isGetAllTreasureBox": 0, "totalStars": 6,
"orderNum": "1078836456709300393", "isGetAllTreasureBox": false,
"totalStars": 12 "orderNum": null,
"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": ""
}
} }
} }
\ No newline at end of file
mock/happyclear/scratchGetTaskInfo.json
View file @ bb51e54a
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"timestamp": 1572318933388, "timestamp": 1572318933388,
"data": { "data": {
"scratchCardTaskId": 1, "scratchCardTaskId": 1,
"taskStatus": 1, "taskStatus": 2,
"prizeImage": "//yun.dui88.com/images/201910/e6pmpk2pne.png", "prizeImage": "//yun.dui88.com/images/201910/e6pmpk2pne.png",
"currentTime": 1572318933366, "currentTime": 1572318933366,
"endTime": 1572358710000, "endTime": 1572358710000,
......
mock/happyclear/submit.json
View file @ bb51e54a
...@@ -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": 5,
"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