Skip to content

X
xiaoxiaole
Commit 36d0d7fd authored by wjf's avatar wjf
Browse files
Options

l

parent 171887eb
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 59 deletions
egret/src/mainScene/GameGuide.ts
View file @ 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不消除果冻时，果冻会逐渐蔓延"
]
},
} }
/** /**
......
egret/src/mainScene/MainScene.ts
View file @ 36d0d7fd
...@@ -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() {
......
egret/src/something/Chapters.ts
View file @ 36d0d7fd
...@@ -3354,8 +3354,8 @@ export const Chapters: ChapterData[] = [ ...@@ -3354,8 +3354,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第八十二关 //第八十二关
...@@ -3400,8 +3400,8 @@ export const Chapters: ChapterData[] = [ ...@@ -3400,8 +3400,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第八十三关 //第八十三关
...@@ -3445,8 +3445,8 @@ export const Chapters: ChapterData[] = [ ...@@ -3445,8 +3445,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第八十四关 //第八十四关
...@@ -3490,8 +3490,8 @@ export const Chapters: ChapterData[] = [ ...@@ -3490,8 +3490,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第八十五关 //第八十五关
...@@ -3535,8 +3535,8 @@ export const Chapters: ChapterData[] = [ ...@@ -3535,8 +3535,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第八十六关 //第八十六关
...@@ -3580,8 +3580,8 @@ export const Chapters: ChapterData[] = [ ...@@ -3580,8 +3580,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第八十七关 //第八十七关
...@@ -3625,8 +3625,8 @@ export const Chapters: ChapterData[] = [ ...@@ -3625,8 +3625,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第八十八关 //第八十八关
...@@ -3663,15 +3663,15 @@ export const Chapters: ChapterData[] = [ ...@@ -3663,15 +3663,15 @@ export const Chapters: ChapterData[] = [
type: PassType.ELEMENT_TARGET, type: PassType.ELEMENT_TARGET,
elements: [ elements: [
{ {
type: ElementType.ICE, type: ElementType.ROCK,
count: 65 count: 14
} }
], ],
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第八十九关 //第八十九关
...@@ -3691,7 +3691,7 @@ export const Chapters: ChapterData[] = [ ...@@ -3691,7 +3691,7 @@ export const Chapters: ChapterData[] = [
generateLats: [1, 1, 1, 1, 1, 1, 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],], connectedLats: [[0, 27], [1, 28], [2, 29], [6, 33], [7, 34], [8, 35],],
elements: [ elements: [
0, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 1, 1, 1, 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,
...@@ -3716,8 +3716,8 @@ export const Chapters: ChapterData[] = [ ...@@ -3716,8 +3716,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第九十关 //第九十关
...@@ -3762,8 +3762,8 @@ export const Chapters: ChapterData[] = [ ...@@ -3762,8 +3762,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
////////////////////////////////// //////////////////////////////////
...@@ -3771,15 +3771,15 @@ export const Chapters: ChapterData[] = [ ...@@ -3771,15 +3771,15 @@ export const Chapters: ChapterData[] = [
{ {
map: { map: {
lattices: [ lattices: [
0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 3, 1, 1, 1, 1, 1, 3, 0,
0, 1, 3, 3, 3, 3, 3, 1, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0,
0, 1, 3, 3, 3, 3, 3, 1, 0, 0, 3, 3, 3, 3, 3, 3, 3, 0,
1, 0, 3, 3, 3, 3, 3, 0, 1, 1, 0, 3, 3, 3, 3, 3, 0, 1,
0, 0, 3, 3, 3, 3, 3, 0, 0, 0, 0, 3, 3, 3, 3, 3, 0, 0,
3, 0, 3, 3, 3, 3, 3, 0, 3, 1, 0, 3, 3, 3, 3, 3, 0, 1,
3, 0, 3, 3, 3, 3, 3, 0, 3, 2, 0, 3, 3, 3, 3, 3, 0, 2,
3, 0, 0, 0, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0, 1,
3, 0, 0, 0, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0, 1,
], ],
generateLats: [0, 1, 1, 1, 1, 1, 1, 1, 0], generateLats: [0, 1, 1, 1, 1, 1, 1, 1, 0],
connectedLats: [[27, 45], [35, 53]], connectedLats: [[27, 45], [35, 53]],
...@@ -3809,8 +3809,8 @@ export const Chapters: ChapterData[] = [ ...@@ -3809,8 +3809,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第九十二关 //第九十二关
...@@ -3823,9 +3823,9 @@ export const Chapters: ChapterData[] = [ ...@@ -3823,9 +3823,9 @@ export const Chapters: ChapterData[] = [
0, 0, 1, 1, 1, 1, 1, 1, 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, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1,
0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1,
0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 1, 1, 1,
], ],
generateLats: [1, 0, 0, 1, 1, 1, 0, 0, 0], generateLats: [1, 0, 0, 1, 1, 1, 0, 0, 0],
//connectedLats: [[27, 45], [35, 53]], //connectedLats: [[27, 45], [35, 53]],
...@@ -3855,8 +3855,8 @@ export const Chapters: ChapterData[] = [ ...@@ -3855,8 +3855,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第九十三关 //第九十三关
...@@ -3865,7 +3865,7 @@ export const Chapters: ChapterData[] = [ ...@@ -3865,7 +3865,7 @@ export const Chapters: ChapterData[] = [
lattices: [ lattices: [
0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1,
0, 0, 3, 0, 0, 0, 1, 3, 3, 0, 0, 3, 0, 0, 0, 1, 3, 3,
0, 3, 3, 3, 0, 3, 3, 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, 3, 3, 3, 3, 3, 3, 3, 3, 3,
...@@ -3895,14 +3895,14 @@ export const Chapters: ChapterData[] = [ ...@@ -3895,14 +3895,14 @@ export const Chapters: ChapterData[] = [
elements: [ elements: [
{ {
type: ElementType.ICE, type: ElementType.ICE,
count: 22 count: 54
} }
], ],
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第九十四关 //第九十四关
...@@ -3947,8 +3947,8 @@ export const Chapters: ChapterData[] = [ ...@@ -3947,8 +3947,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第九十五关 //第九十五关
...@@ -3993,8 +3993,8 @@ export const Chapters: ChapterData[] = [ ...@@ -3993,8 +3993,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第九十六关 //第九十六关
...@@ -4039,8 +4039,8 @@ export const Chapters: ChapterData[] = [ ...@@ -4039,8 +4039,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第九十七关 //第九十七关
...@@ -4085,8 +4085,8 @@ export const Chapters: ChapterData[] = [ ...@@ -4085,8 +4085,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第九十八关 //第九十八关
...@@ -4131,8 +4131,8 @@ export const Chapters: ChapterData[] = [ ...@@ -4131,8 +4131,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第九十九关 //第九十九关
...@@ -4177,8 +4177,8 @@ export const Chapters: ChapterData[] = [ ...@@ -4177,8 +4177,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
//第一百关 //第一百关
...@@ -4223,8 +4223,8 @@ export const Chapters: ChapterData[] = [ ...@@ -4223,8 +4223,8 @@ export const Chapters: ChapterData[] = [
}, },
starScores: [ starScores: [
6000, 6000,
10000, 15000,
22000 32000
] ]
}, },
] ]
\ No newline at end of file
egret/src/something/logic/AiControl.ts
View file @ 36d0d7fd
...@@ -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
} }
} }
......
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