Skip to content

X
xiaoxiaole
Commit d722f417 authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parent 6d270ce3
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 15 deletions
egret/resource/TextureMerger/scratchprize.tmproject 0 → 100644
View file @ d722f417
{"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/skins/BackSkin.exml
View file @ d722f417
<?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/src/panels/BackPanel.ts
View file @ d722f417
...@@ -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 @ d722f417
...@@ -21,8 +21,10 @@ export default class BoxPanel extends Panel { ...@@ -21,8 +21,10 @@ export default class BoxPanel 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:
...@@ -37,6 +39,7 @@ export default class BoxPanel extends Panel { ...@@ -37,6 +39,7 @@ export default class BoxPanel 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/TurntablePanel/TurntablePrizePanel.ts
View file @ d722f417
...@@ -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 @ d722f417
...@@ -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 @ d722f417
...@@ -12,14 +12,15 @@ ...@@ -12,14 +12,15 @@
"option": { "option": {
"id": "41", "id": "41",
"day": null, "day": null,
"categoryType": 5, "realValue":87,
"categoryType": 4,
"title": "游戏次数2", "title": "游戏次数2",
"rate": "10", "rate": "10",
"minValue": null, "minValue": null,
"maxValue": null, "maxValue": null,
"coinType": 1, "coinType": 1,
"propType": 2, "propType": 2,
"num": 2, "num": null,
"img": "//yun.dui88.com/images/201910/e6pmpk2pne.png", "img": "//yun.dui88.com/images/201910/e6pmpk2pne.png",
"appItemId": null, "appItemId": null,
"name": "", "name": "",
......
mock/happyclear/submit.json
View file @ d722f417
...@@ -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