Skip to content

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

1

parent 74b24e6e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 420 additions and 52 deletions
egret/src/mainScene/MainScene.ts
View file @ 410284f4
......@@ -2378,7 +2378,7 @@ export default class MainScene extends Scene {
this.steps += 5;
}, 333)
} else { //消融
this.playAni(RecoverName.ELEDIS_ANI, p)
this.playAni(RecoverName.CANDY_DIS_ANI, p)
//这里面会去算个数
this.recoverEle(index);
}
......
egret/src/something/anis/candy/createCandyDis0Ani.ts
View file @ 410284f4
......@@ -4,7 +4,7 @@ import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDis0Ani = (x,y,p) => {
const spritesheet = RES.getRes('candydis0_json');
if(!spritesheet)return;
const list = getEffectFramesStr('兔子糖果_000', 0, 12);
const list = getEffectFramesStr('兔子糖果_000', 0, 11);
const movieclip = new MovieClip({
spritesheet: spritesheet,
......
egret/src/something/anis/candy/createCandyDis1Ani.ts
View file @ 410284f4
......@@ -4,7 +4,7 @@ import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDis1Ani = (x,y,p) => {
const spritesheet = RES.getRes('candydis1_json');
if(!spritesheet)return;
const list = getEffectFramesStr('兔子糖果_000', 0, 12);
const list = getEffectFramesStr('鸟糖果_000', 0, 11);
const movieclip = new MovieClip({
spritesheet: spritesheet,
......
egret/src/something/anis/candy/createCandyDis2Ani.ts
View file @ 410284f4
......@@ -4,7 +4,7 @@ import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDis2Ani = (x,y,p) => {
const spritesheet = RES.getRes('candydis2_json');
if(!spritesheet)return;
const list = getEffectFramesStr('兔子糖果_000', 0, 12);
const list = getEffectFramesStr('牛糖果_000', 0, 11);
const movieclip = new MovieClip({
spritesheet: spritesheet,
......
egret/src/something/anis/candy/createCandyDis3Ani.ts
View file @ 410284f4
......@@ -4,7 +4,7 @@ import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDis3Ani = (x,y,p) => {
const spritesheet = RES.getRes('candydis3_json');
if(!spritesheet)return;
const list = getEffectFramesStr('兔子糖果_000', 0, 12);
const list = getEffectFramesStr('狮子糖果_000', 0, 11);
const movieclip = new MovieClip({
spritesheet: spritesheet,
......
egret/src/something/anis/candy/createCandyDis4Ani.ts
View file @ 410284f4
......@@ -4,7 +4,7 @@ import MovieClip from "../../../movieclip/MovieClip";
export const createCandyDis4Ani = (x,y,p) => {
const spritesheet = RES.getRes('candydis4_json');
if(!spritesheet)return;
const list = getEffectFramesStr('兔子糖果_000', 0, 11);
const list = getEffectFramesStr('猪糖果_000', 0, 11);
const movieclip = new MovieClip({
spritesheet: spritesheet,
......
egret/src/something/chapters/Chapter13.ts
View file @ 410284f4
This diff is collapsed.
egret/src/something/class/Candy.ts
View file @ 410284f4
......@@ -6,7 +6,7 @@ export class Candy extends egret.Sprite {
nextState(): any {
return new Promise(async (r) => {
this._step--;
if (this._step < 0) {
if (this._step <= 0) {
this._step = 0;
}else {
if(this.ele) this.ele.playCandySubAni();
......
egret/src/something/enum/RecoverName.ts
View file @ 410284f4
......@@ -45,6 +45,7 @@ export enum RecoverName {
ROCK_ANI = "RockAni",
ICE_ANI = "IceAni",
BOOM_ANI = "BoomAni",
CANDY_DIS_ANI = "CandyDisAni",
ELEDIS_ANI = "EleDisAni",
HORIZONTAL_ANI = "HorizontalAni",
VERTICAL_ANI = "VerticalAni",
......
mock/happyclear/homemax.json
View file @ 410284f4
......@@ -1131,6 +1131,387 @@
"levelNum": 225,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 226,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 227,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 228,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 229,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 230,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 231,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 232,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 233,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 234,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 235,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 236,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 237,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 238,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 239,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 240,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 241,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 242,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 243,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 244,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 245,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 246,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 247,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 248,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 249,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 250,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 251,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 252,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 253,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 254,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 255,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 256,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 257,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 258,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 259,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 260,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 261,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 262,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 263,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 264,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 265,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 266,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 267,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 268,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 269,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 270,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 271,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 272,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 273,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 274,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 275,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 276,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 277,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 278,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 279,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 280,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 281,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 282,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 283,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 284,
"maxScore": 47440,
"stars": 1
}
,
{
"levelNum": 285,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 286,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 287,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 288,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 289,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 290,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 291,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 292,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 293,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 294,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 295,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 296,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 297,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 298,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 299,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 300,
"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