Commit 6ea681fb authored by wjf's avatar wjf

l

parent a7b04ec8
...@@ -703,7 +703,7 @@ export default class MainScene extends Scene { ...@@ -703,7 +703,7 @@ export default class MainScene extends Scene {
//添加节日元素,条件可能会变 //添加节日元素,条件可能会变
if (fesChapterData.indexOf(this.chapter >> 0) > -1 && if (fesChapterData.indexOf(this.chapter >> 0) > -1 &&
getRedBombTimes() && getRedBombTimes() &&
// Math.random() > 0.5 && Math.random() > 0.5 &&
this.lattices[festivalIndex] && //格子必须有 this.lattices[festivalIndex] && //格子必须有
(Tool.judgeSetFesEle(this.lattices[festivalIndex]) || !this.lattices[festivalIndex].element) //没有元素也行 (Tool.judgeSetFesEle(this.lattices[festivalIndex]) || !this.lattices[festivalIndex].element) //没有元素也行
) { ) {
......
...@@ -21,8 +21,9 @@ export default class RedBombAlertPanel extends Panel { ...@@ -21,8 +21,9 @@ export default class RedBombAlertPanel extends Panel {
mv.once(egret.Event.COMPLETE, () => { mv.once(egret.Event.COMPLETE, () => {
mv.stop(); mv.stop();
this.removeChild(mv); this.removeChild(mv);
//条件再修改,根据后端数据
const data = DataManager.ins.getData('hc_redBombAward').data; const data = DataManager.ins.getData('hc_redBombAward').data;
if(data){ if(data&&data.option){
this.playPrizeAni(); this.playPrizeAni();
}else{ }else{
this.playNoPrizeAni(); this.playNoPrizeAni();
...@@ -53,7 +54,7 @@ export default class RedBombAlertPanel extends Panel { ...@@ -53,7 +54,7 @@ export default class RedBombAlertPanel extends Panel {
this.once(egret.TouchEvent.TOUCH_TAP,()=>{this.hidePanel()},this); this.once(egret.TouchEvent.TOUCH_TAP,()=>{this.hidePanel()},this);
}, this); }, this);
setTimeout(()=>{ setTimeout(()=>{
mv.setImage("img_2349","//yun.dui88.com/images/201910/e6pmpk2pne.png") mv.setImage("img_2349",DataManager.ins.getData('hc_redBombAward').data.option.img)
},100) },100)
}); });
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"appItemId":2322, "appItemId":2322,
"categoryType":1, "categoryType":1,
"coinType":1, "coinType":1,
"img":"1", "img":"//yun.dui88.com/images/201910/e6pmpk2pne.png",
"maxValue":2, "maxValue":2,
"minValue":1, "minValue":1,
"name":"测试商品", "name":"测试商品",
......
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