Commit 516a68dc authored by wildfirecode's avatar wildfirecode

Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev

parents 8c0e33ea 4db334b6
...@@ -199,7 +199,7 @@ export default class MainScene extends Scene { ...@@ -199,7 +199,7 @@ export default class MainScene extends Scene {
Tool.init(); Tool.init();
//第几关 //第几关
this.chapter = (data && data.chapter) ? data.chapter : 1; this.chapter = (data && data.chapter) ? data.chapter : 1;
// this.chapter = 19; // this.chapter = 14;
this.chapterTxt.text = "第" + this.chapter + "关"; this.chapterTxt.text = "第" + this.chapter + "关";
//关卡数据,1期定制,70,后面35关地图一致,步数减少 //关卡数据,1期定制,70,后面35关地图一致,步数减少
var mapDataIndex = this.chapter; var mapDataIndex = this.chapter;
...@@ -488,8 +488,8 @@ export default class MainScene extends Scene { ...@@ -488,8 +488,8 @@ export default class MainScene extends Scene {
this.lattices[connectedLat[0]].down = connectedLat[1]; this.lattices[connectedLat[0]].down = connectedLat[1];
this.lattices[connectedLat[1]].up = connectedLat[0]; this.lattices[connectedLat[1]].up = connectedLat[0];
} }
//第35和70,要枷锁元素,定制,2期去掉 //第35和56,要枷锁元素,定制,2期去掉
if (this.chapter == 35 || this.chapter == 70) { if (this.chapter == 35 || this.chapter == 56) {
var locks = [4, 13, 22, 31, 40, 49, 57, 58, 59, 66, 67, 68, 75, 76, 77, 63, 64, 72, 73, 70, 71, 79, 80]; var locks = [4, 13, 22, 31, 40, 49, 57, 58, 59, 66, 67, 68, 75, 76, 77, 63, 64, 72, 73, 70, 71, 79, 80];
for (var aaa = 0; aaa < locks.length; aaa++) { for (var aaa = 0; aaa < locks.length; aaa++) {
this.lattices[locks[aaa]].element.isLock = true; this.lattices[locks[aaa]].element.isLock = true;
...@@ -830,9 +830,10 @@ export default class MainScene extends Scene { ...@@ -830,9 +830,10 @@ export default class MainScene extends Scene {
if (ele.type == ElementType.LOLLIPOP && ele.row == this.endRowNum) { if (ele.type == ElementType.LOLLIPOP && ele.row == this.endRowNum) {
this.recoverEle(ele.index); this.recoverEle(ele.index);
this.lollipopCount--; this.lollipopCount--;
//通关目标还有棒棒糖,并且,图中已为0,下次需要生成 //通关目标还有棒棒糖,并且,图中不足,下次需要生成
if (this.passElements && this.passElements[ElementType.LOLLIPOP] && this.lollipopCount <= 0) { if (this.passElements &&
this.lollipopCount = 0; this.passElements[ElementType.LOLLIPOP] &&
this.lollipopCount < this.passElements[ElementType.LOLLIPOP]) {
this.lollipopMark = true this.lollipopMark = true
} }
} }
...@@ -1055,9 +1056,10 @@ export default class MainScene extends Scene { ...@@ -1055,9 +1056,10 @@ export default class MainScene extends Scene {
if (obj.type == ElementType.LOLLIPOP && Tool.indexToRc(index)[0] == this.endRowNum) { if (obj.type == ElementType.LOLLIPOP && Tool.indexToRc(index)[0] == this.endRowNum) {
this.recoverEle(index); this.recoverEle(index);
this.lollipopCount--; this.lollipopCount--;
//通关目标还有棒棒糖,并且,图中已为0,下次需要生成 //通关目标还有棒棒糖,并且,图中不足,下次需要生成
if (this.passElements && this.passElements[ElementType.LOLLIPOP] && this.lollipopCount <= 0) { if (this.passElements &&
this.lollipopCount = 0; this.passElements[ElementType.LOLLIPOP] &&
this.lollipopCount < this.passElements[ElementType.LOLLIPOP]) {
this.lollipopMark = true this.lollipopMark = true
} }
} }
...@@ -1685,6 +1687,12 @@ export default class MainScene extends Scene { ...@@ -1685,6 +1687,12 @@ export default class MainScene extends Scene {
this.eliminate(); this.eliminate();
} }
else { else {
if (this.steps == 0) {
//如果步数原先就为0;直接提交了
var json = this.getSubmitJson()
this.submit(json)
return
}
this.isCountingTime = true; this.isCountingTime = true;
let countAll = Math.min(this.steps, elements.length); let countAll = Math.min(this.steps, elements.length);
let count = 0; let count = 0;
......
...@@ -414,7 +414,7 @@ export const Chapters: ChapterData[] = [ ...@@ -414,7 +414,7 @@ export const Chapters: ChapterData[] = [
], ],
generateLats: [2, 3, 4, 5, 6], generateLats: [2, 3, 4, 5, 6],
}, },
baseElementTypes: [0, 1, 2, 3, 4], baseElementTypes: [0, 1, 2, 3],
effectInitProbability: 0.05, effectInitProbability: 0.05,
stepCount: 18, stepCount: 18,
passTarget: { passTarget: {
......
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