Commit 23e42a3b authored by zjz1994's avatar zjz1994

代码暂存

parent 0a66bd0a
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<e:Group id="selbox" width="531" y="427.37" horizontalCenter="0.5"> <e:Group id="selbox" width="531" y="427.37" horizontalCenter="6.5">
<e:Group id="zhuanpan" width="531" height="121" scaleX="1" scaleY="1" horizontalCenter="0" top="0"> <e:Group id="zhuanpan" width="531" height="121" scaleX="1" scaleY="1" horizontalCenter="0" top="0">
<e:Image source="itembg_png" horizontalCenter="0" verticalCenter="0"/> <e:Image source="itembg_png" horizontalCenter="0" verticalCenter="0"/>
<e:Image source="bloodhert_png" x="12" verticalCenter="6.5"/> <e:Image source="bloodhert_png" x="12" verticalCenter="6.5"/>
...@@ -78,8 +78,8 @@ ...@@ -78,8 +78,8 @@
</e:Group> </e:Group>
</e:Group> </e:Group>
<e:Group id="botinfo" width="750" height="170" y="846.45" horizontalCenter="0"> <e:Group id="botinfo" width="750" height="170" y="846.45" horizontalCenter="0">
<e:Image id="countheart" source="bloodhert_png" x="273.28" scaleX="0.4" scaleY="0.4" y="11"/> <e:Image id="countheart" source="bloodhert_png" x="257.3" scaleX="0.4" scaleY="0.4" y="11"/>
<e:Label id="countdownTxt" text="恢复:00:32:41" size="24" width="509" verticalAlign="middle" textAlign="left" x="314" scaleX="1" scaleY="1" y="13" textColor="0xc17343" fontFamily="FZY3JW" bold="false"/> <e:Label id="countdownTxt" text="恢复 : 00 : 32 : 41" size="24" width="509" verticalAlign="middle" textAlign="left" x="298.02" scaleX="1" scaleY="1" y="13" textColor="0xc17343" fontFamily="FZY3JW" bold="false"/>
<e:Button id="resumeBtn" label="" y="50" horizontalCenter="0" x="189" scaleX="1" scaleY="1"> <e:Button id="resumeBtn" label="" y="50" horizontalCenter="0" x="189" scaleX="1" scaleY="1">
<e:skinName> <e:skinName>
<e:Skin states="up,down,disabled"> <e:Skin states="up,down,disabled">
......
...@@ -46,7 +46,10 @@ export default class BloodPanel extends Panel { ...@@ -46,7 +46,10 @@ export default class BloodPanel extends Panel {
//是否显示抽奖得体力 //是否显示抽奖得体力
var showcj:boolean = false; var showcj:boolean = false;
if(res&&res.data&&res.data.luckyDrawConf&&res.data.luckyDrawConf.enable){ if(res&&res.data&&res.data.luckyDrawConf&&res.data.luckyDrawConf.enable){
showcj = true; var bloodadd = res.data.luckyDrawConf.prizeList.filter(item => item.categoryType == 2);
if(bloodadd.length>0){
showcj = true;
}
} }
//显示条数 //显示条数
var tipnum:number = 3; var tipnum:number = 3;
......
This diff is collapsed.
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