Commit dd5e91ab authored by wjf's avatar wjf

l

parent 4aded47c
...@@ -1124,8 +1124,12 @@ export default class MainScene extends Scene { ...@@ -1124,8 +1124,12 @@ export default class MainScene extends Scene {
lat.element = null lat.element = null
} }
} else { } else {
//如果有格子。无元素,是生成口 //如果有格子。无元素,是生成口,且上方没有能掉落的格子时(若有,遍历上面格子时掉落)
if (lat && !lat.element && lat.isGenerate) { if (lat &&
!lat.element &&
lat.isGenerate &&
!Tool.judgeFall(this.lattices[index - Tool.colNum])
) {
anis.push({ ele: null, indexs: [{ index: index, type: FallType.STRIGHT }] }); anis.push({ ele: null, indexs: [{ index: index, type: FallType.STRIGHT }] });
Tool.removeEle(index, this.emptys) Tool.removeEle(index, this.emptys)
} }
...@@ -2476,10 +2480,10 @@ export default class MainScene extends Scene { ...@@ -2476,10 +2480,10 @@ 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.option) { if (submitData.option) {
Loading2.instace.hide(); Loading2.instace.hide();
PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL, { level: this.chapter,option:submitData.option }); PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL, { level: this.chapter, option: submitData.option });
} else{ } 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 });
} }
......
...@@ -264,6 +264,22 @@ export const Chapters3: ChapterData[] = [ ...@@ -264,6 +264,22 @@ export const Chapters3: ChapterData[] = [
{ index: 37, type: 0 }, { index: 37, type: 0 },
{ index: 38, type: 0 }, { index: 38, type: 0 },
{ index: 39, type: 0 }, { index: 39, type: 0 },
{ index: 45, type: 0 },
{ index: 46, type: 0 },
{ index: 47, type: 0 },
{ index: 48, type: 0 },
{ index: 54, type: 0 },
{ index: 55, type: 0 },
{ index: 56, type: 0 },
{ index: 57, type: 0 },
{ index: 63, type: 0 },
{ index: 64, type: 0 },
{ index: 65, type: 0 },
{ index: 66, type: 0 },
] ]
} }
}, },
......
...@@ -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/home.json' data: './happyclear/homemax.json'
}, },
'/customActivity/happyclear/getLevelInfo': { '/customActivity/happyclear/getLevelInfo': {
data: './happyclear/getLevelInfo.json' data: './happyclear/getLevelInfo.json'
......
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