Skip to content

X
xiaoxiaole
Commit 4d778beb authored by 邱旭's avatar 邱旭
Browse files
Options

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

parents 5a3f52df 24819e65
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 9 deletions
egret/src/something/chapters/Chapter4.ts
View file @ 4d778beb
......@@ -155,10 +155,10 @@ export const Chapters4: ChapterData[] = [
]
}
},
//67 待调整通关目标，目标不存在现在
//67
{
baseElementTypes: [0, 1, 3, 2, 4],
bubbleProbability: 20,
bubbleProbability: 0.2,
stepCount: 32,
passTarget: { type: 1, elements: [{ type: 9, count: 28 }] },
starScores: [6000, 12000, 24000],
......@@ -251,7 +251,14 @@ export const Chapters4: ChapterData[] = [
},
//70
{
baseElementTypes: [1, 0, 2, 3], bubbleProbability: 80, stepCount: 20, passTarget: { type: 1, elements: [{ type: 1, count: 72 }] }, starScores: [5000, 11000, 20000], map: { lattices: [0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], connectedLats: [[11, 29], [12, 30], [13, 31], [14, 32], [15, 33]], elements: [0, 0, 2, 2, 2, 2, 2, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 6, 7, 7, 7, 7, 7, 6, 0, 0, 6, 7, 7, 7, 7, 7, 6, 0, 0, 2, 7, 7, 7, 7, 7, 2, 0, 0, 0, 2, 6, 2, 6, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], baseElements: [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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0], recycles: [], generateLats: [{ index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 11, type: null }, { index: 12, type: null }, { index: 13, type: null }, { index: 14, type: null }, { index: 15, type: null }] }
baseElementTypes: [1, 0, 2, 3],
bubbleProbability: 0,
stepCount: 20,
passTarget: { type: 1, elements: [{ type: 1, count: 60 }] },
starScores: [5000, 11000, 20000],
map: {
lattices: [0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], connectedLats: [[11, 29], [12, 30], [13, 31], [14, 32], [15, 33]], elements: [0, 0, 2, 2, 2, 2, 2, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 6, 7, 7, 7, 7, 7, 6, 0, 0, 6, 7, 7, 7, 7, 7, 6, 0, 0, 2, 7, 7, 7, 7, 7, 2, 0, 0, 0, 2, 6, 2, 6, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], baseElements: [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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0], recycles: [], generateLats: [{ index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 11, type: null }, { index: 12, type: null }, { index: 13, type: null }, { index: 14, type: null }, { index: 15, type: null }]
}
},
//71
{
......@@ -259,7 +266,54 @@ export const Chapters4: ChapterData[] = [
},
//72
{
baseElementTypes: [0, 2, 3, 4], bubbleProbability: 0, stepCount: 25, passTarget: { type: 1, elements: [{ type: 2, count: 58 }, { type: 1, count: 28 }, { type: 5, count: 14 }] }, starScores: [6000, 12000, 21000], map: { lattices: [0, 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, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 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], connectedLats: [], elements: [0, 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, 1, 0, 2, 2, 2, 2, 0, 1, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0, 6, 6, 0, 0, 2, 0, 2, 0, 0, 0, 0, 0, 0, 2], baseElements: [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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0], recycles: [], generateLats: [{ index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null }] }
baseElementTypes: [0, 2, 3, 4],
bubbleProbability: 0,
stepCount: 25,
passTarget: {
type: 1, elements: [
{ type: 2, count: 58 },
{ type: 1, count: 28 },
{ type: 5, count: 14 }
]
},
starScores: [6000, 12000, 21000],
map: {
lattices: [
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,
1, 0, 1, 1, 1, 1, 0, 1, 0,
0, 0, 1, 1, 1, 1, 0, 0, 0,
0, 1, 1, 1, 1, 1, 1, 0, 0,
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
],
connectedLats: [],
elements: [
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,
1, 0, 2, 2, 2, 2, 0, 1, 0,
0, 0, 2, 2, 2, 2, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0,
2, 0, 0, 0, 0, 0, 0, 2, 0,
2, 0, 0, 6, 6, 0, 0, 2, 0,
2, 0, 0, 0, 0, 0, 0, 2, 0,
],
recycles: [],
generateLats: [
{ index: 0, type: null },
{ index: 1, type: null },
{ index: 2, type: null },
{ index: 3, type: null },
{ index: 4, type: null },
{ index: 5, type: null },
{ index: 6, type: null },
{ index: 7, type: null },
]
}
},
//73
{
......
egret/src/something/class/ChickenEgg.ts
View file @ 4d778beb
......@@ -2,8 +2,8 @@ import { ElementType } from "../enum/ElementType";
//四种状态的图片
const images = {
3: "ele"+ElementType.CHICKEN_EGG+"_png",
2: "eggStatus2_png",
2: "ele"+ElementType.CHICKEN_EGG+"_png",
// 2: "eggStatus2_png",
1: "eggStatus1_png",
0: "eggStatus0_png"
}
......@@ -18,7 +18,7 @@ export class ChickenEgg extends eui.Component {
*/
isActive: boolean;
/**
* 鸡蛋状态变化 3 2 1 0 再往后，可孵鸡
* 鸡蛋状态变化 2 1 0 再往后，可孵鸡
*/
private _statusNum: number;
get statusNum() {
......@@ -37,7 +37,7 @@ export class ChickenEgg extends eui.Component {
}
}
constructor(n: number = 3) {
constructor(n: number = 2) {
super()
this.showImage = new eui.Image();
this.addChild(this.showImage)
......@@ -64,7 +64,7 @@ export class ChickenEgg extends eui.Component {
}
reset(n: number = 3) {
reset(n: number = 2) {
this.changeSource(images[n]);
this.isActive = false;
this._statusNum = n;
......
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