Skip to content

X
xiaoxiaole
Commit f65fe0ec authored by wildfirecode's avatar wildfirecode
Browse files
Options

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

parents 0e80a170 583c3e1d
Show whitespace changes
Inline Side-by-side
Showing with 82 additions and 45 deletions
egret/src/something/chapters/Chapter1.ts
View file @ f65fe0ec
...@@ -699,11 +699,11 @@ export const Chapters1: ChapterData[] = [ ...@@ -699,11 +699,11 @@ export const Chapters1: ChapterData[] = [
elements: [ elements: [
{ {
type: ElementType.CHICKEN, type: ElementType.CHICKEN,
count: 45 count: 35
}, },
{ {
type: ElementType.CATTLE, type: ElementType.CATTLE,
count: 65 count: 35
}, },
] ]
}, },
...@@ -733,8 +733,8 @@ export const Chapters1: ChapterData[] = [ ...@@ -733,8 +733,8 @@ export const Chapters1: ChapterData[] = [
], ],
baseElements: [ baseElements: [
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 20, 21, 20, 0, 0, 0, 0, 0, 0, 20, 14, 20, 0, 0, 0,
0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0,
10, 10, 20, 20, 50, 30, 30, 40, 40, 10, 10, 20, 20, 50, 30, 30, 40, 40,
10, 10, 20, 20, 50, 30, 30, 40, 40, 10, 10, 20, 20, 50, 30, 30, 40, 40,
40, 40, 30, 30, 40, 10, 10, 50, 50, 40, 40, 30, 30, 40, 10, 10, 50, 50,
...@@ -843,7 +843,7 @@ export const Chapters1: ChapterData[] = [ ...@@ -843,7 +843,7 @@ export const Chapters1: ChapterData[] = [
0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0,
0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 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, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
......
egret/src/something/chapters/Chapter2.ts
View file @ f65fe0ec
...@@ -259,7 +259,7 @@ export const Chapters2: ChapterData[] = [ ...@@ -259,7 +259,7 @@ export const Chapters2: ChapterData[] = [
connectedLats: [[2, 29], [3, 30], [4, 31], [74, 6], [75, 7], [76, 8]] connectedLats: [[2, 29], [3, 30], [4, 31], [74, 6], [75, 7], [76, 8]]
}, },
}, },
//25 //25 待调整
{ {
baseElementTypes: [0, 1, 2, 3], baseElementTypes: [0, 1, 2, 3],
bubbleProbability: 0, bubbleProbability: 0,
...@@ -302,48 +302,31 @@ export const Chapters2: ChapterData[] = [ ...@@ -302,48 +302,31 @@ export const Chapters2: ChapterData[] = [
0, 0, 0, 4, 4, 4, 4, 4, 4, 0, 0, 0, 4, 4, 4, 4, 4, 4,
], ],
baseElements: [ baseElements: [
11, 13, 20, 10, 0, 0, 0, 0, 0, 11, 13, 20, 10, 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, 20, 30, 20, 30, 20, 30, 0, 0, 0, 20, 30, 20, 30, 20, 30,
0, 0, 0, 30, 20, 30, 20, 30, 20, 0, 0, 0, 30, 20, 30, 20, 30, 20,
33, 32, 0, 10, 20, 10, 20, 10, 20, 33, 32, 0, 10, 20, 10, 20, 10, 20,
32, 41, 0, 20, 10, 20, 10, 20, 10, 32, 41, 0, 20, 10, 20, 10, 20, 10,
42, 23, 0, 10, 20, 10, 20, 10, 20, 42, 23, 0, 10, 20, 10, 20, 10, 20,
0, 0, 0, 20, 30, 20, 30, 20, 30, 0, 0, 0, 20, 30, 20, 30, 20, 30,
0, 0, 0, 30, 20, 30, 20, 30, 20, 0, 0, 0, 30, 20, 30, 20, 30, 20,
], ],
generateLats: [ generateLats: [
{ index: 0, type: [0], cus: [] }, { index: 0, type: [0], cus: [] },
{ index: 3, type: [0], cus: [] }, { index: 3, type: [0], cus: [] },
{ index: 2, type: [0], cus: [] }, { index: 2, type: [0], cus: [] },
{ index: 1, type: [0], cus: [] }, { index: 1, type: [0], cus: [] },
{ index: 36, type: [0], cus: [] }, { index: 36, type: [0], cus: [] },
{ index: 37, type: [0], cus: [] }, { index: 37, type: [0], cus: [] },
{ index: 21, type: [0], cus: [] }, { index: 21, type: [0], cus: [] },
{ index: 22, type: [0], cus: [] }, { index: 22, type: [0], cus: [] },
{ index: 23, type: [0], cus: [] }, { index: 23, type: [0], cus: [] },
{ index: 24, type: [0], cus: [] }, { index: 24, type: [0], cus: [] },
{ index: 25, type: [0], cus: [] }, { index: 25, type: [0], cus: [] },
{ index: 26, type: [0], cus: [] }, { index: 26, type: [0], cus: [] },
], ],
}, },
}, },
//26 //26
{ {
......
egret/src/something/chapters/Chapter3.ts
View file @ f65fe0ec
...@@ -617,27 +617,27 @@ export const Chapters3: ChapterData[] = [ ...@@ -617,27 +617,27 @@ export const Chapters3: ChapterData[] = [
starScores: [5000, 12000, 18000], starScores: [5000, 12000, 18000],
map: { map: {
lattices: [ lattices: [
0, 3, 3, 1, 1, 1, 1, 3, 3, 3, 3, 1, 1, 1, 1, 3, 3, 0,
0, 3, 3, 1, 1, 1, 1, 3, 3, 3, 3, 1, 1, 1, 1, 3, 3, 0,
0, 3, 3, 1, 1, 1, 1, 3, 3, 3, 3, 1, 1, 1, 1, 3, 3, 0,
0, 3, 3, 1, 1, 1, 1, 3, 3, 3, 3, 1, 1, 1, 1, 3, 3, 0,
0, 3, 3, 3, 1, 1, 3, 3, 3, 3, 3, 3, 1, 1, 3, 3, 3, 0,
0, 3, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 3, 0,
0, 1, 3, 1, 3, 3, 1, 3, 1, 1, 3, 1, 3, 3, 1, 3, 1, 0,
0, 0, 1, 3, 1, 1, 3, 1, 0, 0, 1, 3, 1, 1, 3, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0 0, 0, 0, 0, 0, 0, 0, 0, 0,
], ],
connectedLats: [], connectedLats: [],
elements: [ elements: [
0, 2, 2, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 0,
0, 2, 2, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 0,
0, 2, 2, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 0,
0, 2, 2, 2, 1, 1, 2, 2, 2, 2, 2, 2, 1, 1, 2, 2, 2, 0,
0, 2, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 2, 0,
0, 2, 2, 1, 2, 2, 1, 2, 2, 2, 2, 1, 2, 2, 1, 2, 2, 0,
0, 1, 2, 2, 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, 2, 2, 1, 0,
0, 0, 1, 2, 2, 2, 2, 1, 0, 0, 1, 2, 2, 2, 2, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0 0, 0, 0, 0, 0, 0, 0, 0, 0,
], ],
baseElements: [ baseElements: [
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
...@@ -646,12 +646,13 @@ export const Chapters3: ChapterData[] = [ ...@@ -646,12 +646,13 @@ export const Chapters3: ChapterData[] = [
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, 12, 13, 0, 0, 0, 0, 0, 0, 12, 13, 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: [], recycles: [],
generateLats: [ generateLats: [
{ index: 0, type: null },
{ index: 1, type: null }, { index: 1, type: null },
{ index: 2, type: null }, { index: 2, type: null },
{ index: 3, type: null }, { index: 3, type: null },
...@@ -659,10 +660,63 @@ export const Chapters3: ChapterData[] = [ ...@@ -659,10 +660,63 @@ export const Chapters3: ChapterData[] = [
{ index: 5, type: null }, { index: 5, type: null },
{ index: 6, type: null }, { index: 6, type: null },
{ index: 7, type: null }, { index: 7, type: null },
{ index: 8, type: null },
] ]
} }
}, },
//60 //60
{ baseElementTypes: [0, 1, 2, 3], bubbleProbability: 10, stepCount: 33, passTarget: { type: 1, elements: [{ type: 9, count: 27 }] }, starScores: [5000, 12000, 18000], map: { lattices: [0, 3, 3, 1, 1, 1, 1, 3, 3, 0, 3, 3, 1, 1, 1, 1, 3, 3, 0, 3, 3, 1, 1, 1, 1, 3, 3, 0, 0, 3, 1, 1, 2, 1, 3, 0, 0, 0, 3, 3, 1, 1, 3, 3, 0, 0, 3, 1, 1, 1, 1, 1, 1, 3, 0, 1, 3, 1, 3, 3, 1, 3, 1, 0, 1, 1, 3, 1, 1, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0], connectedLats: [], elements: [0, 1, 2, 2, 2, 2, 2, 2, 4, 0, 2, 1, 2, 2, 2, 2, 4, 2, 0, 2, 2, 1, 2, 2, 4, 2, 2, 0, 0, 2, 2, 1, 4, 2, 2, 0, 0, 0, 2, 2, 4, 1, 2, 2, 0, 0, 4, 2, 7, 2, 2, 1, 2, 1, 0, 2, 1, 2, 2, 2, 2, 1, 2, 0, 4, 2, 4, 2, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0], baseElements: [0, 20, 0, 0, 0, 0, 0, 0, 40, 0, 0, 20, 0, 0, 0, 0, 40, 0, 0, 0, 0, 14, 0, 0, 40, 0, 0, 0, 0, 0, 0, 20, 40, 0, 0, 0, 0, 0, 0, 0, 40, 22, 0, 0, 0, 0, 40, 0, 40, 0, 0, 20, 0, 20, 0, 0, 40, 0, 12, 13, 0, 20, 0, 0, 40, 0, 40, 0, 0, 20, 14, 20, 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, 1, 2, 3],
bubbleProbability: 10,
stepCount: 33,
passTarget: { type: 1, elements: [{ type: 9, count: 27 }] },
starScores: [5000, 12000, 18000],
map: {
lattices: [
3, 3, 1, 1, 1, 1, 3, 3, 0,
3, 3, 1, 1, 1, 1, 3, 3, 0,
3, 3, 1, 1, 1, 1, 3, 3, 0,
0, 3, 1, 1, 2, 1, 3, 0, 0,
0, 3, 3, 1, 1, 3, 3, 0, 0,
3, 1, 1, 1, 1, 1, 1, 3, 0,
1, 3, 1, 3, 3, 1, 3, 1, 0,
1, 1, 3, 1, 1, 3, 1, 1, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0
],
connectedLats: [],
elements: [
1, 2, 2, 2, 2, 2, 2, 4, 0,
2, 1, 2, 2, 2, 2, 4, 2, 0,
2, 2, 1, 2, 2, 4, 2, 2, 0,
0, 2, 2, 1, 4, 2, 2, 0, 0,
0, 2, 2, 4, 1, 2, 2, 0, 0,
4, 2, 7, 2, 2, 1, 2, 1, 0,
2, 1, 2, 2, 2, 2, 1, 2, 0,
4, 2, 4, 2, 2, 1, 1, 1, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0
],
baseElements: [
20, 0, 0, 0, 0, 0, 0, 40, 0,
0, 20, 0, 0, 0, 0, 40, 0, 0,
0, 0, 14, 0, 0, 40, 0, 0, 0,
0, 0, 0, 20, 40, 0, 0, 0, 0,
0, 0, 0, 40, 22, 0, 0, 0, 0,
40, 0, 40, 0, 0, 20, 0, 20, 0,
0, 40, 0, 12, 13, 0, 20, 0, 0,
40, 0, 40, 0, 0, 20, 14, 20, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 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 },
]
}
},
] ]
\ No newline at end of file
egret/src/something/class/RectMask.ts
View file @ f65fe0ec
...@@ -8,7 +8,7 @@ import { RecoverName } from "../enum/RecoverName"; ...@@ -8,7 +8,7 @@ import { RecoverName } from "../enum/RecoverName";
export class RectMask extends egret.Shape { export class RectMask extends egret.Shape {
constructor() { constructor() {
super(); super();
this.graphics.beginFill(0xffffff); // this.graphics.beginFill(0xffffff);
this.graphics.beginFill(0xff0000, 1); this.graphics.beginFill(0xff0000, 1);
this.graphics.drawRect(-Tool.width / 2, -Tool.height / 2, Tool.width, Tool.height) this.graphics.drawRect(-Tool.width / 2, -Tool.height / 2, Tool.width, Tool.height)
this.graphics.endFill(); this.graphics.endFill();
......
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