Commit 7b01535b authored by zjz1994's avatar zjz1994

修改通关卡住bug

parent 0b71f387
...@@ -3457,11 +3457,11 @@ export default class MainScene extends Scene { ...@@ -3457,11 +3457,11 @@ export default class MainScene extends Scene {
//如果只有步数转化的,不能再进结算, //如果只有步数转化的,不能再进结算,
else { else {
//一次大消除结束 //一次大消除结束
/** // /**
var effectElements = [], elements = []; var effectElements = [], elements = [];
for(var i = Tool.colNum * Tool.rowNum - 1; i >= 0; i--) { for(var i = Tool.colNum * Tool.rowNum - 1; i >= 0; i--) {
var lat = this.lattices[i]; var lat = this.lattices[i];
if(Tool.judgeBaseEle(lat)&&!lat.element.hasState(StateType.BLOCK_LOCK)) { if(Tool.judgeBaseEle(lat)&&!lat.element.hasAnyState()) {
if(lat.element.effectType != null) { if(lat.element.effectType != null) {
effectElements.push(i); effectElements.push(i);
} else { } else {
...@@ -3474,7 +3474,7 @@ export default class MainScene extends Scene { ...@@ -3474,7 +3474,7 @@ export default class MainScene extends Scene {
this.eliminate(); this.eliminate();
return; return;
} }
*/ // */
// else{ // else{
// console.log("可以结束"); // console.log("可以结束");
// } // }
...@@ -4881,7 +4881,7 @@ export default class MainScene extends Scene { ...@@ -4881,7 +4881,7 @@ export default class MainScene extends Scene {
var effectElements = [], elements = []; var effectElements = [], elements = [];
for(var i = Tool.colNum * Tool.rowNum - 1; i >= 0; i--) { for(var i = Tool.colNum * Tool.rowNum - 1; i >= 0; i--) {
var lat = this.lattices[i]; var lat = this.lattices[i];
if(Tool.judgeBaseEle(lat)&&!lat.element.hasState(StateType.BLOCK_LOCK)) { if(Tool.judgeBaseEle(lat)&&!lat.element.hasAnyState()) {
if(lat.element.effectType != null) { if(lat.element.effectType != null) {
effectElements.push(i); effectElements.push(i);
} else { } else {
......
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