Skip to content

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

1

parent 9a9af71d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 284 additions and 127 deletions
egret/libs/new_wx/MainBase.ts
View file @ 3fd1a080
......@@ -418,6 +418,8 @@ export default class MainBase extends eui.UILayer {
"mainSoundBtnOff",
"mainMusicBtnOff",
"monster_shoot",
"ele33_1",
"ele33_0",
]
for (var i = 0; i < arr.length; i++) {
RES.getResAsync(arr[i] + "_png")
......
egret/libs/new_wx/ctrls/sceneCtrl.ts
View file @ 3fd1a080
......@@ -71,8 +71,10 @@ export default class SceneCtrl {
this._currentScene = scene;
this._parent.addChild(scene);
wait(1000).then(()=>{
oldScene.destroy();
this._parent.removeChild(oldScene);
if(oldScene) {
oldScene.destroy();
this._parent.removeChild(oldScene);
}
});
}
......
egret/resource/default.res.json
View file @ 3fd1a080
This diff is collapsed.
egret/src/mainScene/MainScene.ts
View file @ 3fd1a080
......@@ -768,6 +768,15 @@ export default class MainScene extends Scene {
this.lattices[i].element = fireworks;
fireworks.resetFireworks(this);
break;
//鱼s
case ElementConfigType.FISH:
let fish: Element = Tool.getElement(ElementType.FISH)
fish.x = p[0];
fish.y = p[1];
this.elementContainer.addChild(fish);
this.lattices[i].element = fish;
fish.resetToFishView();
break;
//鸡蛋
case ElementConfigType.CHICKEN_EGG:
let egg: Element = Tool.getElement(ElementType.CHICKEN_EGG)
......
egret/src/something/chapters/Chapter16 copy.ts 0 → 100644
View file @ 3fd1a080
import { ChapterData } from "../interface/ChapterData";
import { PassType } from "../enum/PassType";
import { ElementType } from "../enum/ElementType";
//401-425
export const Chapters16: ChapterData[] = [
//1引导基本消除
{
baseElementTypes: [0, 1, 2, 3],
bubbleProbability: 0,
stepCount: 25,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.CHICKEN,
count: 45,
},
],
},
starScores: [1000, 5000, 10000],
map: {
lattices: [
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0, 1, 0, 0,
0, 1, 1, 1, 0, 1, 1, 1, 0,
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, 0, 0, 1, 0, 0, 0, 0,
],
generateLats: [
{ index: 11, type: [0], cus: [] },
{ index: 15, type: [0], cus: [] },
],
// connectedLats: [[0, 18], [1, 19], [2, 20]],
elements: [
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0, 1, 0, 0,
0, 1, 1, 1, 0, 1, 1, 1, 0,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 15, 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, 0, 0, 1, 0, 0, 0, 0,
],
baseElements: [
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 20, 0, 0, 0, 20, 0, 0,
0, 20, 10, 20, 0, 20, 10, 20, 0,
20, 10, 20, 10, 20, 10, 20, 10, 20,
20, 10, 20, 20, 10, 20, 20, 10, 20,
0, 20, 10, 20, 10, 20, 10, 20, 0,
0, 0, 20, 10, 20, 10, 20, 0, 0,
0, 0, 0, 20, 10, 20, 0, 0, 0,
0, 0, 0, 0, 20, 0, 0, 0, 0,
],
// recycles: [70, 71, 72, 73]
},
},
]
\ No newline at end of file
egret/src/something/chapters/Chapter16.ts
View file @ 3fd1a080
......@@ -3,4 +3,61 @@ import { PassType } from "../enum/PassType";
import { ElementType } from "../enum/ElementType";
//401-425
export const Chapters16: ChapterData[] = [
//1引导基本消除
{
baseElementTypes: [0, 1, 2, 3],
bubbleProbability: 0,
stepCount: 25,
passTarget: {
type: PassType.ELEMENT_TARGET,
elements: [
{
type: ElementType.CHICKEN,
count: 45,
},
],
},
starScores: [1000, 5000, 10000],
map: {
lattices: [
1, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0, 1, 0, 0,
0, 1, 1, 1, 0, 1, 1, 1, 0,
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, 0, 0, 1, 0, 0, 0, 0,
],
generateLats: [
{ index: 11, type: [0], cus: [] },
{ index: 15, type: [0], cus: [] },
],
// connectedLats: [[0, 18], [1, 19], [2, 20]],
elements: [
1, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0, 1, 0, 0,
0, 1, 1, 1, 0, 1, 1, 1, 0,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 15, 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, 0, 0, 1, 0, 0, 0, 0,
],
baseElements: [
20, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 20, 0, 0, 0, 20, 0, 0,
0, 20, 10, 20, 0, 20, 10, 20, 0,
20, 10, 20, 10, 20, 10, 20, 10, 20,
20, 10, 20, 20, 10, 20, 20, 10, 20,
0, 20, 10, 20, 10, 20, 10, 20, 0,
0, 0, 20, 10, 20, 10, 20, 0, 0,
0, 0, 0, 20, 10, 20, 0, 0, 0,
0, 0, 0, 0, 20, 0, 0, 0, 0,
],
// recycles: [70, 71, 72, 73]
},
},
]
\ No newline at end of file
egret/src/something/class/Element.ts
View file @ 3fd1a080
......@@ -141,6 +141,12 @@ export class Element extends eui.Component {
this.addChild(this.monster);
this.showImage.alpha = 0;
}
resetToFishView() {
this.changeSource("ele33_0_png");
// this.monster = new Monster(res,this.type);
// this.addChild(this.monster);
// this.showImage.alpha = 0;
}
private _candy: Candy;
resetToCandyView(baseElement: CandyBaseElementType) {
......
egret/src/something/enum/ElementConfigType.ts
View file @ 3fd1a080
......@@ -61,4 +61,8 @@ export enum ElementConfigType {
* 独眼怪
*/
MONSTER = 14,
/**
* 汽鼓鱼
*/
FISH = 15,
}
\ No newline at end of file
egret/src/something/enum/ElementType.ts
View file @ 3fd1a080
......@@ -52,6 +52,8 @@ export enum ElementType {
MONSTER_CATTLE,
MONSTER_LION,
MONSTER_PIG,
FISH,//气鼓鱼
}
export const isMonsterEle = (t: ElementType) => {
......
mock/happyclear/home.json
View file @ 3fd1a080
......@@ -2017,126 +2017,6 @@
"levelNum": 401,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 402,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 403,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 404,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 405,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 406,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 407,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 408,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 409,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 410,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 411,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 412,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 413,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 414,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 415,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 416,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 417,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 418,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 419,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 420,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 421,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 422,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 423,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 424,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 425,
"maxScore": 47440,
"stars": 1
}
],
......
mock/happyclear/homemax.json
View file @ 3fd1a080
......@@ -2012,7 +2012,133 @@
"levelNum": 400,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 401,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 402,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 403,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 404,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 405,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 406,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 407,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 408,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 409,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 410,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 411,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 412,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 413,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 414,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 415,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 416,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 417,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 418,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 419,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 420,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 421,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 422,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 423,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 424,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 425,
"maxScore": 47440,
"stars": 1
}
],
"remainProp": [
{
......
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