Commit f9c6b4f1 authored by wildfirecode's avatar wildfirecode

Merge branch '0930' into dev

parents 434cca28 36d0d7fd
...@@ -415,6 +415,33 @@ const chapterFuns = { ...@@ -415,6 +415,33 @@ const chapterFuns = {
"被困住的元素无法进行移动,当触发元素\n消除时,元素上的藤蔓即可被消除" "被困住的元素无法进行移动,当触发元素\n消除时,元素上的藤蔓即可被消除"
] ]
}, },
//果冻消除
81: {
elementTypes: [
0, 0, 0, 4, 5, 2, 0, 0, 0,
0, 0, 4, 5, 3, 4, 1, 0, 0,
0, 5, 5, 4, 4, 1, 4, 2, 0,
3, 2, 1, 5, 4, 3, 1, 4, 5,
4, 3, 5, 4, 2, 3, 1, 3, 4,
1, 2, 2, 1, 3, 2, 2, 5, 3,
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0,
5, 2, 3, 1, 0, 3, 5, 5, 1
],
stepCount: 1,
showIndexs: [
[32, 41, 50, 49],
],
hideIndexs: [
[32, 41],
],
handIndexs: [
[49, 50]
],
msg: [
"当果冻附近的元素产生消除时,即可消除果冻\n不消除果冻时,果冻会逐渐蔓延"
]
},
} }
/** /**
......
...@@ -219,9 +219,9 @@ export default class MainScene extends Scene { ...@@ -219,9 +219,9 @@ export default class MainScene extends Scene {
super.start(); super.start();
//第几关 //第几关
this.chapter = (data && data.chapter) ? data.chapter : 1; this.chapter = (data && data.chapter) ? data.chapter : 1;
this.chapter = 81; // this.chapter = 81;
this.chapterTxt.text = "第" + this.chapter + "关"; this.chapterTxt.text = "第" + this.chapter + "关";
//关卡数据,1期定制,70,后面35关地图一致,步数减少 //关卡数据
var mapDataIndex = this.chapter; var mapDataIndex = this.chapter;
//56到70的话,中间36到50 //56到70的话,中间36到50
if (this.chapter >= 56 && this.chapter <= 70) { if (this.chapter >= 56 && this.chapter <= 70) {
...@@ -286,7 +286,7 @@ export default class MainScene extends Scene { ...@@ -286,7 +286,7 @@ export default class MainScene extends Scene {
AiControl.ins.init(this.lattices); AiControl.ins.init(this.lattices);
//游戏引导 //游戏引导
const gameGuideChapterNum = [1, 5, 6, 7, 8, 9, 10, 19, 24] const gameGuideChapterNum = [1, 5, 6, 7, 8, 9, 10, 19, 24, 81]
if (gameGuideChapterNum.indexOf(this.chapter >> 0) > -1) { if (gameGuideChapterNum.indexOf(this.chapter >> 0) > -1) {
if (!readCache(getCacheKey() + this.chapter)) { if (!readCache(getCacheKey() + this.chapter)) {
this.gameGuide = new GameGuide(this); this.gameGuide = new GameGuide(this);
...@@ -593,6 +593,16 @@ export default class MainScene extends Scene { ...@@ -593,6 +593,16 @@ export default class MainScene extends Scene {
} }
// this.lattices[11].element.effectType=EffectType.MAGICLION; // this.lattices[11].element.effectType=EffectType.MAGICLION;
// this.lattices[20].element.effectType=EffectType.MAGICLION; // this.lattices[20].element.effectType=EffectType.MAGICLION;
var bbb = [];
for (var a = 0; a < this.lattices.length; a++) {
var lat = this.lattices[a];
if (lat && lat.element && lat.element.type <= 4) {
bbb.push(lat.element.type + 1);
} else {
bbb.push(0)
}
}
console.log(bbb);
//初始化完先检测死图 //初始化完先检测死图
this.warningCop = Tool.dieMapCheck(this.lattices); this.warningCop = Tool.dieMapCheck(this.lattices);
...@@ -1813,6 +1823,8 @@ export default class MainScene extends Scene { ...@@ -1813,6 +1823,8 @@ export default class MainScene extends Scene {
//石头 //石头
else if (ele.type == ElementType.ROCK) { else if (ele.type == ElementType.ROCK) {
this.removeRock(index); this.removeRock(index);
//算个数
this.goElementTarget(ele);
} }
//果冻 //果冻
else if (ele.type == ElementType.JELLY) { else if (ele.type == ElementType.JELLY) {
...@@ -2468,6 +2480,7 @@ export default class MainScene extends Scene { ...@@ -2468,6 +2480,7 @@ export default class MainScene extends Scene {
arr[i].touchEnabled = b; arr[i].touchEnabled = b;
arr[i].touchChildren = b; arr[i].touchChildren = b;
} }
this.quitBtn.touchEnabled = b;
this.enableTouch = b; this.enableTouch = b;
} }
sample() { sample() {
......
...@@ -11,7 +11,7 @@ import { ElementType } from "./enum/ElementType"; ...@@ -11,7 +11,7 @@ import { ElementType } from "./enum/ElementType";
export const Chapters: ChapterData[] = [ export const Chapters: ChapterData[] = [
//第0关为空吧 //第0关为空吧,
null, null,
//第一关 //第一关
{ {
...@@ -2192,7 +2192,7 @@ export const Chapters: ChapterData[] = [ ...@@ -2192,7 +2192,7 @@ export const Chapters: ChapterData[] = [
] ]
}, },
//////////////////////////// ////////////////////////////
//56到70,用中间36到50的数据,步数减4,所以先置空,还是先拷贝上吧,,现在逻辑并不用56到70关的数据 //56到70,用中间36到50的数据,步数减4,所以先置空,还是先拷贝上吧,,现在逻辑并不用56到70关的数据
//第五十六关 //第五十六关
{ {
map: { map: {
...@@ -3317,49 +3317,274 @@ export const Chapters: ChapterData[] = [ ...@@ -3317,49 +3317,274 @@ export const Chapters: ChapterData[] = [
{ {
map: { map: {
lattices: [ lattices: [
0, 3, 0, 3, 0, 3, 0, 3, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0,
3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 1, 1, 1, 1, 1, 0, 0,
0, 3, 3, 3, 3, 3, 3, 3, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0,
3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1,
0, 3, 3, 3, 3, 3, 3, 3, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 1, 1, 1, 2, 2, 2,
],
generateLats: [0, 0, 0, 1, 1, 1, 0, 0, 0],
elements: [
0, 0, 0, 1, 1, 1, 0, 0, 0,
0, 0, 1, 1, 1, 1, 1, 0, 0,
0, 1, 1, 1, 1, 1, 1, 1, 0,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
5, 5, 5, 5, 5, 5, 5, 5, 5,
2, 2, 2, 2, 2, 2, 2, 2, 2,
4, 4, 4, 1, 5, 1, 4, 4, 4,
],
},
baseElementTypes: [0, 1, 2, 3, 4],
effectInitProbability: 0.05,
stepCount: 38,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.ICE,
count: 15
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第八十二关
{
map: {
lattices: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
0, 0, 0, 0, 0, 0, 0, 0, 0,
1, 3, 3, 3, 3, 3, 3, 3, 1,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
0, 3, 3, 3, 3, 3, 3, 3, 0, 1, 3, 3, 3, 3, 3, 3, 3, 1,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
0, 3, 0, 3, 0, 3, 0, 3, 0,
], ],
generateLats: [0, 1, 0, 1, 0, 1, 0, 1, 0], generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
connectedLats: [[27, 45], [28, 46], [29, 47], [30, 48], [31, 49], [32, 50], [33, 51], [34, 52], [35, 53]],
elements: [ elements: [
0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
5, 1, 1, 1, 1, 1, 1, 1, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
0, 0, 0, 0, 0, 0, 0, 0, 0,
5, 4, 5, 4, 5, 4, 5, 4, 5,
4, 5, 4, 5, 4, 5, 4, 5, 4,
5, 4, 5, 4, 5, 4, 5, 4, 5,
4, 5, 4, 5, 4, 5, 4, 5, 4,
],
},
baseElementTypes: [0, 1, 2, 3, 4],
effectInitProbability: 0.02,
stepCount: 40,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.ICE,
count: 32
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第八十三关
{
map: {
lattices: [
0, 0, 1, 1, 1, 1, 1, 0, 0,
0, 0, 1, 1, 1, 1, 1, 0, 0,
0, 0, 1, 1, 1, 1, 1, 0, 0,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
],
generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
elements: [
0, 0, 3, 1, 1, 1, 1, 0, 0,
0, 0, 1, 1, 1, 1, 1, 0, 0,
0, 0, 1, 1, 1, 1, 1, 0, 0,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
2, 2, 1, 2, 2, 2, 1, 2, 2,
5, 2, 5, 2, 5, 2, 5, 2, 5,
],
},
baseElementTypes: [0, 1, 2, 3, 4],
effectInitProbability: 0.02,
stepCount: 20,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.LOLLIPOP,
count: 2
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第八十四关
{
map: {
lattices: [
3, 3, 1, 1, 0, 1, 1, 3, 3,
3, 3, 1, 1, 0, 1, 1, 3, 3,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
3, 3, 1, 1, 0, 1, 1, 3, 3,
3, 3, 1, 1, 0, 1, 1, 3, 3,
],
generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
elements: [
1, 1, 1, 1, 0, 1, 1, 1, 1,
1, 1, 1, 1, 0, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 2, 2, 2, 2, 2, 1, 1,
1, 1, 2, 5, 5, 5, 2, 1, 1,
1, 1, 2, 2, 2, 2, 2, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 0, 1, 1, 1, 1,
1, 1, 1, 1, 0, 1, 1, 1, 1,
],
},
baseElementTypes: [0, 1, 2, 3, 4],
effectInitProbability: 0.02,
stepCount: 30,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.ICE,
count: 16
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第八十五关
{
map: {
lattices: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0,
2, 1, 1, 1, 6, 1, 1, 1, 2,
0, 1, 1, 1, 6, 1, 1, 1, 0,
2, 1, 1, 1, 6, 1, 1, 1, 2,
0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0,
5, 1, 1, 1, 1, 1, 1, 1, 5, 0, 1, 1, 1, 1, 1, 1, 1, 0,
0, 5, 0, 5, 0, 5, 0, 5, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
],
generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
elements: [
1, 3, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
0, 1, 2, 2, 2, 2, 2, 1, 0,
0, 1, 2, 5, 5, 5, 2, 1, 0,
0, 1, 2, 2, 2, 2, 2, 1, 0,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
], ],
}, },
baseElementTypes: [0, 1, 2, 3, 4], baseElementTypes: [0, 1, 2, 3, 4],
effectInitProbability: 0.02, effectInitProbability: 0.03,
stepCount: 250 + 3, stepCount: 50,
passTarget: { passTarget: {
type: PassType.ELEMENT_TARGET, type: PassType.ELEMENT_TARGET,
elements: [ elements: [
{ {
type: ElementType.CHICKEN, type: ElementType.LOLLIPOP,
count: 1000 count: 4
} }
], ],
}, },
starScores: [ starScores: [
4000, 6000,
8000, 15000,
15000 32000
] ]
}, },
//第八十六关
//第一百关 {
map: {
lattices: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3,
],
generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
elements: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
4, 2, 4, 2, 4, 2, 4, 2, 4,
5, 4, 5, 4, 5, 4, 5, 4, 5,
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0,
],
},
baseElementTypes: [0, 1, 2, 3, 4],
effectInitProbability: 0.05,
stepCount: 30,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.ICE,
count: 18
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第八十七关
{ {
map: { map: {
lattices: [ lattices: [
...@@ -3376,32 +3601,630 @@ export const Chapters: ChapterData[] = [ ...@@ -3376,32 +3601,630 @@ export const Chapters: ChapterData[] = [
generateLats: [0, 1, 0, 1, 0, 1, 0, 1, 0], generateLats: [0, 1, 0, 1, 0, 1, 0, 1, 0],
elements: [ elements: [
0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0,
4, 1, 1, 1, 1, 1, 1, 1, 4,
0, 1, 1, 1, 1, 1, 1, 1, 0,
5, 1, 1, 1, 1, 1, 1, 1, 5, 5, 1, 1, 1, 1, 1, 1, 1, 5,
0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0,
2, 1, 1, 1, 6, 1, 1, 1, 2, 4, 1, 1, 1, 1, 1, 1, 1, 4,
0, 1, 1, 1, 6, 1, 1, 1, 0,
2, 1, 1, 1, 6, 1, 1, 1, 2,
0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0,
5, 1, 1, 1, 1, 1, 1, 1, 5, 5, 1, 1, 1, 1, 1, 1, 1, 5,
0, 5, 0, 5, 0, 5, 0, 5, 0, 0, 4, 0, 5, 0, 5, 0, 4, 0,
], ],
}, },
baseElementTypes: [0, 1, 2, 3, 4], baseElementTypes: [0, 1, 2, 3, 4],
effectInitProbability: 0.02, effectInitProbability: 0.05,
stepCount: 250 + 3, stepCount: 40,
passTarget: { passTarget: {
type: PassType.ELEMENT_TARGET, type: PassType.ELEMENT_TARGET,
elements: [ elements: [
{ {
type: ElementType.CHICKEN, type: ElementType.ICE,
count: 1000 count: 65
} }
], ],
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
]
},
//第八十八关
{
map: {
lattices: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 0, 1, 0, 1, 0, 1, 0, 1,
],
generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
elements: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 4,
5, 5, 5, 5, 5, 5, 5, 5, 5,
2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 0, 2, 0, 2, 0, 2, 0, 2,
],
},
baseElementTypes: [0, 1, 2, 3, 4],
effectInitProbability: 0.05,
stepCount: 40,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.ROCK,
count: 14
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第八十九关
{
map: {
lattices: [
1, 1, 1, 0, 0, 0, 1, 1, 1,
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 2, 2, 2, 0, 0, 0,
2, 2, 2, 3, 3, 3, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2,
3, 3, 3, 3, 3, 3, 3, 3, 3,
2, 2, 2, 2, 2, 2, 2, 2, 2,
0, 0, 0, 3, 3, 3, 0, 0, 0,
0, 0, 0, 0, 1, 0, 0, 0, 0,
],
generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
connectedLats: [[0, 27], [1, 28], [2, 29], [6, 33], [7, 34], [8, 35],],
elements: [
1, 1, 1, 0, 0, 0, 1, 1, 1,
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 1, 1, 1, 0, 0, 0,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 4, 1, 1, 1, 1,
1, 1, 1, 4, 5, 4, 1, 1, 1,
1, 1, 1, 1, 5, 1, 1, 1, 1,
],
},
baseElementTypes: [0, 1, 2, 3, 4],
effectInitProbability: 0.05,
stepCount: 30,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.ICE,
count: 42
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第九十关
{
map: {
lattices: [
1, 1, 1, 3, 3, 3, 1, 1, 1,
1, 1, 1, 3, 3, 3, 1, 1, 1,
1, 1, 1, 3, 3, 3, 1, 1, 1,
1, 1, 1, 3, 3, 3, 1, 1, 1,
1, 1, 1, 3, 3, 3, 1, 1, 1,
1, 1, 1, 3, 3, 3, 1, 1, 1,
1, 1, 1, 3, 3, 3, 1, 1, 1,
1, 1, 1, 3, 3, 3, 1, 1, 1,
1, 1, 1, 3, 3, 3, 1, 1, 1,
],
generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
//connectedLats: [[0, 27], [1, 28], [2, 29], [6, 33], [7, 34], [8, 35],],
elements: [
1, 1, 2, 5, 1, 1, 2, 1, 1,
1, 1, 2, 1, 5, 1, 2, 1, 1,
1, 1, 2, 1, 1, 5, 2, 1, 1,
1, 1, 2, 1, 5, 1, 2, 1, 1,
1, 1, 2, 5, 1, 1, 2, 1, 1,
1, 1, 2, 1, 5, 1, 2, 1, 1,
1, 1, 2, 1, 1, 5, 2, 1, 1,
1, 1, 2, 1, 5, 1, 2, 1, 1,
1, 1, 2, 5, 1, 1, 2, 1, 1,
],
},
baseElementTypes: [0, 1, 2, 3, 4],
effectInitProbability: 0.05,
stepCount: 30,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.ICE,
count: 27
}
],
},
starScores: [
6000,
15000,
32000
]
},
//////////////////////////////////
//第九十一关
{
map: {
lattices: [
0, 3, 1, 1, 1, 1, 1, 3, 0,
0, 3, 3, 3, 3, 3, 3, 3, 0,
0, 3, 3, 3, 3, 3, 3, 3, 0,
1, 0, 3, 3, 3, 3, 3, 0, 1,
0, 0, 3, 3, 3, 3, 3, 0, 0,
1, 0, 3, 3, 3, 3, 3, 0, 1,
2, 0, 3, 3, 3, 3, 3, 0, 2,
1, 0, 0, 0, 0, 0, 0, 0, 1,
1, 0, 0, 0, 0, 0, 0, 0, 1,
],
generateLats: [0, 1, 1, 1, 1, 1, 1, 1, 0],
connectedLats: [[27, 45], [35, 53]],
elements: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
],
},
baseElementTypes: [0, 1, 2, 3, 4],
effectInitProbability: 0.05,
stepCount: 40,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.ICE,
count: 38
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第九十二关
{
map: {
lattices: [
1, 0, 0, 0, 0, 0, 0, 0, 0,
0, 1, 0, 1, 1, 1, 0, 0, 0,
0, 0, 1, 1, 1, 1, 1, 0, 0,
0, 0, 1, 1, 1, 1, 1, 1, 0,
0, 0, 1, 1, 1, 1, 1, 1, 1,
0, 0, 1, 1, 1, 1, 1, 1, 1,
0, 0, 1, 1, 1, 1, 1, 1, 1,
0, 0, 1, 1, 1, 1, 1, 1, 1,
0, 0, 1, 0, 0, 1, 1, 1, 1,
],
generateLats: [1, 0, 0, 1, 1, 1, 0, 0, 0],
//connectedLats: [[27, 45], [35, 53]],
elements: [
3, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 2, 2, 2, 1, 1, 1,
1, 1, 1, 2, 5, 2, 1, 1, 1,
1, 1, 1, 2, 2, 2, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
],
},
baseElementTypes: [0, 1, 2, 3, 4],
effectInitProbability: 0.05,
stepCount: 30,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.LOLLIPOP,
count: 3
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第九十三关
{
map: {
lattices: [
0, 0, 1, 0, 0, 0, 0, 1, 1,
0, 0, 3, 0, 0, 0, 1, 3, 3,
0, 3, 3, 3, 0, 1, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3,
0, 0, 0, 0, 0, 0, 0, 0, 1,
],
generateLats: [0, 0, 1, 0, 0, 0, 0, 1, 1],
//connectedLats: [[27, 45], [35, 53]],
elements: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 4,
1, 1, 1, 1, 1, 1, 1, 4, 4,
1, 1, 1, 1, 1, 1, 4, 4, 4,
1, 1, 1, 1, 1, 1, 1, 1, 0,
],
},
baseElementTypes: [0, 1, 2, 3, 4],
effectInitProbability: 0.03,
stepCount: 22,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.ICE,
count: 54
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第九十四关
{
map: {
lattices: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 0, 0, 3, 0, 0, 1, 1,
1, 1, 1, 1, 3, 1, 1, 1, 1,
1, 1, 1, 1, 3, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
3, 3, 3, 3, 0, 3, 3, 3, 3,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 3, 3, 3, 1, 1, 1,
],
generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
//connectedLats: [[27, 45], [35, 53]],
elements: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 5, 1, 1, 1, 1,
1, 1, 1, 1, 4, 1, 1, 1, 1,
1, 1, 1, 1, 4, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
2, 2, 2, 2, 1, 2, 2, 2, 2,
0, 0, 0, 0, 1, 0, 0, 0, 0,
1, 1, 1, 4, 4, 4, 1, 1, 1,
],
},
baseElementTypes: [0, 1, 2, 3, 4],
effectInitProbability: 0.03,
stepCount: 26,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.ICE,
count: 14
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第九十五关
{
map: {
lattices: [
0, 3, 3, 3, 3, 3, 3, 3, 0,
0, 3, 3, 3, 3, 3, 3, 3, 0,
0, 3, 3, 3, 3, 3, 3, 3, 0,
0, 3, 3, 3, 3, 3, 3, 3, 0,
0, 3, 3, 3, 3, 3, 3, 3, 0,
0, 3, 3, 3, 3, 3, 3, 3, 0,
0, 3, 3, 3, 3, 3, 3, 3, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 2, 2, 2, 2, 2, 2, 2, 0,
],
generateLats: [0, 1, 1, 1, 1, 1, 1, 1, 0],
connectedLats: [[55, 73], [56, 74], [57, 75], [58, 76], [59, 77], [60, 78], [61, 79]],
elements: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
],
},
baseElementTypes: [0, 1, 2, 3, 4],
effectInitProbability: 0.03,
stepCount: 25,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.ICE,
count: 56
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第九十六关
{
map: {
lattices: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 0, 0, 1, 0, 0, 1, 1,
1, 0, 0, 2, 0, 2, 0, 0, 1,
0, 0, 2, 2, 0, 2, 2, 0, 0,
0, 2, 2, 2, 0, 2, 2, 2, 0,
2, 2, 2, 2, 0, 2, 2, 2, 2,
2, 2, 2, 2, 0, 2, 2, 2, 2,
],
generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
// connectedLats: [[55, 73], [56, 74],[57, 75],[58, 76],[59, 77],[60, 78],[61, 79]],
elements: [
1, 1, 1, 2, 2, 2, 1, 1, 1,
1, 1, 1, 2, 2, 2, 1, 1, 1,
1, 1, 1, 2, 2, 2, 1, 1, 1,
1, 1, 1, 2, 2, 2, 1, 1, 1,
1, 0, 0, 0, 0, 0, 0, 0, 1,
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0,
],
},
baseElementTypes: [0, 1, 2, 3],
effectInitProbability: 0,
stepCount: 21,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.ICE,
count: 28
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第九十七关
{
map: {
lattices: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
0, 1, 1, 1, 1, 1, 1, 1, 0,
0, 0, 1, 1, 1, 1, 1, 0, 0,
0, 0, 0, 1, 1, 1, 0, 0, 0,
0, 0, 1, 1, 1, 1, 1, 0, 0,
0, 1, 1, 1, 0, 1, 1, 1, 0,
],
generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
// connectedLats: [[55, 73], [56, 74],[57, 75],[58, 76],[59, 77],[60, 78],[61, 79]],
elements: [
1, 1, 1, 1, 3, 1, 1, 1, 1,
1, 1, 1, 2, 2, 2, 1, 1, 1,
1, 1, 1, 2, 5, 2, 1, 1, 1,
1, 1, 1, 2, 2, 2, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 4, 4, 4, 1, 1, 1,
1, 1, 2, 2, 2, 2, 2, 1, 1,
1, 2, 5, 5, 0, 5, 5, 2, 1,
],
},
baseElementTypes: [0, 1, 2, 3],
effectInitProbability: 0.06,
stepCount: 21,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.LOLLIPOP,
count: 4
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第九十八关
{
map: {
lattices: [
0, 0, 0, 0, 1, 1, 1, 1, 1,
0, 0, 0, 0, 1, 1, 1, 1, 1,
0, 0, 0, 0, 1, 1, 1, 1, 1,
1, 1, 1, 0, 1, 1, 1, 1, 1,
0, 0, 0, 0, 1, 1, 1, 1, 1,
2, 2, 2, 2, 2, 0, 0, 0, 0,
2, 2, 2, 2, 2, 0, 0, 0, 0,
2, 2, 2, 2, 2, 0, 1, 1, 1,
2, 2, 2, 2, 2, 0, 1, 1, 1,
],
generateLats: [1, 1, 1, 0, 1, 1, 1, 1, 1],
connectedLats: [[27, 45], [28, 46], [29, 47], [42, 69], [43, 70], [44, 71]],
elements: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
],
},
baseElementTypes: [0, 1, 2, 3],
effectInitProbability: 0.04,
stepCount: 24,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.ICE,
count: 20
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第九十九关
{
map: {
lattices: [
1, 1, 1, 1, 0, 1, 1, 1, 1,
0, 0, 0, 0, 0, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 0, 1, 1, 1, 1,
1, 1, 1, 1, 0, 1, 1, 1, 1,
1, 1, 1, 1, 0, 0, 0, 0, 0,
1, 1, 1, 1, 0, 1, 1, 1, 1,
1, 1, 1, 1, 0, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
],
generateLats: [1, 1, 1, 1, 0, 1, 1, 1, 1],
connectedLats: [[0, 18], [1, 19], [2, 20], [3, 21], [41, 59], [42, 60], [43, 61], [44, 62]],
elements: [
1, 1, 1, 1, 0, 3, 3, 3, 1,
1, 1, 1, 1, 0, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
2, 2, 2, 2, 1, 1, 1, 1, 1,
1, 1, 1, 1, 5, 2, 2, 2, 2,
],
},
baseElementTypes: [0, 1, 2, 3],
effectInitProbability: 0.04,
stepCount: 22,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.LOLLIPOP,
count: 4
}
],
},
starScores: [
6000,
15000,
32000
]
},
//第一百关
{
map: {
lattices: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 3, 3, 3, 3, 3, 0, 0,
0, 0, 3, 3, 0, 3, 3, 0, 0,
0, 0, 3, 3, 3, 3, 3, 0, 0,
],
generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
connectedLats: [[38, 56], [39, 57], [40, 58], [41, 59], [42, 60]],
elements: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
0, 0, 5, 5, 5, 5, 5, 0, 0,
0, 0, 5, 5, 0, 5, 5, 0, 0,
0, 0, 5, 5, 5, 5, 5, 0, 0,
],
},
baseElementTypes: [0, 1, 2, 3],
effectInitProbability: 0.06,
stepCount: 34,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.ICE,
count: 14
}
],
},
starScores: [
6000,
15000,
32000
] ]
}, },
] ]
\ No newline at end of file
...@@ -239,7 +239,8 @@ function judgeSpread(index: number, lattices: Lattice[]): number { ...@@ -239,7 +239,8 @@ function judgeSpread(index: number, lattices: Lattice[]): number {
var i = arr.splice(rand, 1)[0]; var i = arr.splice(rand, 1)[0];
if (lattices[i] && if (lattices[i] &&
lattices[i].element && lattices[i].element &&
lattices[i].element.type <= 4) { lattices[i].element.type <= 4&&
!lattices[i].element.isLock) {
return i return i
} }
} }
......
...@@ -511,15 +511,15 @@ ...@@ -511,15 +511,15 @@
"remainProp": [ "remainProp": [
{ {
"type": 2, "type": 2,
"num": 0 "num": 2
}, },
{ {
"type": 3, "type": 3,
"num": 0 "num": 2
}, },
{ {
"type": 4, "type": 4,
"num": 0 "num": 2
} }
], ],
"remainEnargy": 99, "remainEnargy": 99,
......
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