Skip to content

X
xiaoxiaole
Commit 5a8a63f3 authored by 邱旭's avatar 邱旭
Browse files
Options

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

parents 06fcb47a e41cc2b9
Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 1 deletion
egret/src/something/anis/HairballBrownDivideAni.ts 0 → 100644
View file @ 5a8a63f3
import { ImageAni } from "../class/ImageAni";
import { Pool } from "../Pool";
import { RecoverName } from "../enum/RecoverName";
import { playSound, SoundType } from "../../soundCtrl";
import { Tool } from "../Tool";
import { ElementType } from "../enum/ElementType";
import { Element } from "../class/Element";
import { StateType } from "../enum/StateType";
/**
* 分裂的动画，待写
*/
export class HairballBrownDivideAni extends egret.DisplayObjectContainer {
constructor() {
super()
}
play(type: StateType, startP: number[], endP: number[], callback: Function) {
var source: string;
switch (type) {
case StateType.HAIRBALLBLACK:
source = "ele" + ElementType.HAIRBALLBLACK + "_png";
break;
case StateType.HAIRBALLGREY:
source = "ele" + ElementType.HAIRBALLGREY + "_png";
break;
case StateType.HAIRBALLBROWN:
source = "ele" + ElementType.HAIRBALLBROWN + "_png";
break;
default:
source = "ele" + ElementType.HAIRBALLGREY + "_png";
break
}
var texture: egret.Texture = RES.getRes(source)
this.anchorOffsetX = texture.textureWidth / 2;
this.anchorOffsetY = texture.textureHeight;
this.x = startP[0];
this.y = startP[1] + texture.textureHeight / 2;
egret.Tween.get(this)
.to({ scaleX: 1.2, scaleY: 0.8 }, 50)
.to({ scaleX: 0.8, scaleY: 1.2 }, 50)
.to({ scaleX: 1, scaleY: 1 }, 50)
.to({ scaleX: 1.2, scaleY: 0.8 }, 50)
.to({ scaleX: 0.8, scaleY: 1.2 }, 50)
.to({ scaleX: 1, scaleY: 1 }, 50)
.call(() => {
//回收元素
if (this.parent) this.parent.removeChild(this);
Pool.recover(RecoverName.HAIRBALLJUMP_ANI, this)
//回调
callback();
})
egret.Tween.get(this)
.to({ x: endP[0], y: endP[1]+texture.textureHeight / 2 }, 300, egret.Ease.sineInOut)
}
}
egret/src/something/chapters/Chapter6.ts
View file @ 5a8a63f3
...@@ -61,5 +61,137 @@ export const Chapters6: ChapterData[] = [ ...@@ -61,5 +61,137 @@ export const Chapters6: ChapterData[] = [
{ index: 44, type: null } { index: 44, type: null }
] ]
} }
} },
//102
{
baseElementTypes: [0, 1, 2, 3],
bubbleProbability: 0,
stepCount: 30,
passTarget: { type: 1, elements: [{ type: 10, count: 6 }, { type: 5, count: 40 }] },
starScores: [6000, 11000, 21000],
map: {
lattices: [
0, 0, 1, 0, 0, 0, 1, 0, 0,
0, 0, 0, 1, 0, 1, 0, 0, 0,
0, 1, 1, 0, 0, 0, 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, 0, 1, 0, 1, 1, 1,
0, 1, 1, 1, 1, 1, 1, 1, 0
],
connectedLats: [],
elements: [
1, 1, 8, 1, 1, 1, 8, 1, 1,
1, 1, 1, 2, 1, 2, 1, 1, 1,
1, 2, 8, 1, 1, 1, 8, 2, 1,
2, 8, 2, 2, 1, 2, 2, 8, 2,
8, 2, 2, 2, 2, 2, 2, 2, 8,
2, 2, 2, 1, 1, 1, 2, 2, 2,
2, 2, 2, 1, 1, 1, 2, 2, 2,
2, 2, 2, 1, 2, 1, 2, 2, 2,
1, 2, 2, 1, 0, 1, 2, 2, 1,
],
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, 22, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 30, 40, 30, 0, 0, 0,
0, 0, 0, 40, 30, 40, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 22, 0, 22, 0, 0, 0
],
recycles: [],
generateLats: [{ index: 2, type: null }, { index: 6, type: null }, { index: 19, type: null }, { index: 25, type: null }, { index: 27, type: null }, { index: 30, type: null }, { index: 31, type: null }, { index: 32, type: null }, { index: 35, type: null }]
}
},
//103
{
baseElementTypes: [0, 1, 2, 3, 4],
bubbleProbability: 0,
stepCount: 28,
passTarget: { type: 1, elements: [{ type: 5, count: 12 }, { type: 9, count: 17 }] },
starScores: [5000, 12000, 21000],
map: {
lattices: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 3, 1, 1, 1, 3, 1, 1,
1, 1, 3, 1, 1, 1, 3, 1, 1,
1, 1, 3, 1, 1, 1, 3, 1, 1,
1, 1, 3, 1, 1, 1, 3, 1, 1,
1, 1, 3, 1, 1, 1, 3, 1, 1,
0, 3, 3, 3, 3, 3, 3, 3, 0,
0, 0, 1, 1, 1, 1, 1, 0, 0
],
connectedLats: [],
elements: [
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 2, 1, 1, 1, 2, 1, 1,
1, 1, 2, 1, 1, 1, 2, 1, 1,
1, 1, 5, 1, 1, 1, 5, 1, 1,
1, 1, 2, 1, 1, 1, 2, 1, 1,
1, 1, 2, 1, 1, 1, 2, 1, 1,
1, 2, 5, 2, 5, 2, 5, 2, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1
],
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: 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 }, { index: 8, type: null }]
}
},
//104
{ baseElementTypes: [0, 1, 2, 3, 4], bubbleProbability: 0, stepCount: 24, passTarget: { type: 1, elements: [{ type: 10, count: 15 }] }, starScores: [5000, 12000, 21000], map: { lattices: [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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], connectedLats: [], elements: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 8, 8, 8, 1, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 8, 8, 2, 0, 0, 0, 2, 8, 8, 8, 2, 2, 0, 0, 0, 2, 2, 8, 2, 8, 2, 1, 2, 2, 2, 8, 2, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 8, 2, 2, 2, 2, 2, 8, 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: 3, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 36, type: null }, { index: 37, type: null }, { index: 38, type: null }, { index: 42, type: null }, { index: 43, type: null }, { index: 44, type: null }] } },
//105
{
baseElementTypes: [0, 1, 2, 3, 4],
bubbleProbability: 0,
stepCount: 30,
passTarget: { type: 1, elements: [{ type: 10, count: 18 }, { type: 5, count: 25 }] },
starScores: [5000, 11000, 21000],
map: {
lattices: [
1, 1, 1, 0, 1, 1, 1, 1, 1,
1, 1, 1, 0, 1, 1, 1, 1, 1,
1, 1, 1, 0, 1, 1, 1, 1, 1,
0, 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, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1
],
connectedLats: [],
elements: [
1, 1, 8, 1, 8, 8, 8, 8, 8,
1, 1, 8, 1, 8, 8, 8, 8, 8,
1, 1, 8, 1, 8, 8, 8, 8, 8,
1, 1, 1, 1, 4, 4, 4, 4, 4,
2, 2, 2, 4, 1, 0, 0, 0, 0,
2, 2, 2, 4, 1, 0, 0, 0, 0,
2, 2, 2, 4, 1, 0, 0, 0, 0,
2, 2, 2, 4, 2, 2, 2, 2, 2,
2, 2, 2, 4, 2, 2, 2, 2, 2
],
baseElements: [10, 20, 42, 0, 0, 0, 0, 0, 0, 20, 10, 33, 0, 0, 0, 0, 0, 0, 10, 20, 41, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 20, 10, 20, 10, 20, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 0, 0], recycles: [], generateLats: [{ index: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 4, type: null }, { index: 5, type: null }, { index: 6, type: null }, { index: 7, type: null }, { index: 8, type: null }, { index: 36, type: null }, { index: 37, type: null }, { index: 38, type: null }, { index: 39, type: null }]
}
},
//106
{
baseElementTypes: [0, 1, 2, 3, 4], bubbleProbability: 0, stepCount: 30, passTarget: { type: 1, elements: [{ type: 9, count: 38 }, { type: 10, count: 18 }] }, starScores: [6000, 11000, 19000], map: { lattices: [2, 2, 2, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 0, 0, 2, 1, 1, 1, 2, 0, 0, 1, 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 2, 2, 2, 2, 2, 1, 1], connectedLats: [], elements: [1, 1, 1, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 8, 8, 1, 1, 1, 1, 1, 8, 8, 8, 8, 1, 8, 8, 8, 1, 8, 8, 8, 8, 1, 8, 8, 8, 1, 8, 8, 1, 1, 1, 4, 4, 4, 1, 1, 1, 4, 4, 1, 1, 1, 1, 1, 4, 4, 4, 4, 1, 1, 1, 1, 1, 4, 4, 4, 4, 1, 1, 1, 1, 1, 4, 4], baseElements: [0, 0, 0, 30, 40, 20, 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, 20, 20, 0, 0, 0, 0, 0, 20, 20, 33, 31, 0, 22, 23, 22, 0, 31, 33, 20, 20, 0, 0, 0, 0, 0, 20, 20], 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 }, { index: 8, type: null }, { index: 47, type: null }, { index: 48, type: null }, { index: 49, type: null }, { index: 50, type: null }, { index: 51, type: null }, { index: 54, type: null }, { index: 55, type: null }, { index: 61, type: null }, { index: 62, type: null }] }
},
] ]
\ No newline at end of file
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