Skip to content

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

1

parent bcd3fa62
Expand all Show whitespace changes
Inline Side-by-side
Showing with 331 additions and 68 deletions
egret/resource/TextureMerger/startpanel.tmproject
View file @ a244e702
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["../assets/startpanel2/startpanel通关条件.png","../assets/startpanel2/startpanel数量.png","../assets/startpanel2/startpanel数量 副本 3.png","../assets/startpanel2/startpanel目标33.png","../assets/startpanel2/startpanel目标3.png","../assets/startpanel2/startpanel按钮.png","../assets/startpanel2/startpanel_icon3.png","../assets/startpanel2/startpanel_icon2.png","../assets/startpanel2/startpanel_icon1.png","../assets/startpanel2/startpanel_icon.png","../assets/startpanel2/startpanel_ele9.png","../assets/startpanel2/startpanel_ele8.png","../assets/startpanel2/startpanel_ele7.png","../assets/startpanel2/startpanel_ele6.png","../assets/startpanel2/startpanel_ele5.png","../assets/startpanel2/startpanel_ele4.png","../assets/startpanel2/startpanel_ele3.png","../assets/startpanel2/startpanel_ele2.png","../assets/startpanel2/startpanel_ele1.png","../assets/startpanel2/startpanel_ele0.png","../assets/startpanel2/startpanel_block2.png","../assets/startpanel2/startpanel_bg2.png","../assets/startpanel2/startpanel_avatar.png","../assets/startpanel2/startpanel_ele10.png","../assets/startpanel2/startpanel_numsbg.png"]} {"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["../assets/startpanel2/startpanel通关条件.png","../assets/startpanel2/startpanel数量.png","../assets/startpanel2/startpanel数量 副本 3.png","../assets/startpanel2/startpanel目标33.png","../assets/startpanel2/startpanel目标3.png","../assets/startpanel2/startpanel按钮.png","../assets/startpanel2/startpanel_icon3.png","../assets/startpanel2/startpanel_icon2.png","../assets/startpanel2/startpanel_icon1.png","../assets/startpanel2/startpanel_icon.png","../assets/startpanel2/startpanel_ele9.png","../assets/startpanel2/startpanel_ele8.png","../assets/startpanel2/startpanel_ele7.png","../assets/startpanel2/startpanel_ele6.png","../assets/startpanel2/startpanel_ele5.png","../assets/startpanel2/startpanel_ele4.png","../assets/startpanel2/startpanel_ele3.png","../assets/startpanel2/startpanel_ele2.png","../assets/startpanel2/startpanel_ele1.png","../assets/startpanel2/startpanel_ele0.png","../assets/startpanel2/startpanel_block2.png","../assets/startpanel2/startpanel_bg2.png","../assets/startpanel2/startpanel_avatar.png","../assets/startpanel2/startpanel_ele10.png","../assets/startpanel2/startpanel_numsbg.png","../assets/startpanel2/startpanel_ele27.png","../assets/startpanel2/startpanel_ele26.png","../assets/startpanel2/startpanel_ele25.png","../assets/startpanel2/startpanel_ele24.png","../assets/startpanel2/startpanel_ele23.png","../assets/startpanel2/startpanel_ele22.png"]}
\ No newline at end of file \ No newline at end of file
egret/src/mainScene/MainScene.ts
View file @ a244e702
...@@ -3013,8 +3013,8 @@ export default class MainScene extends Scene { ...@@ -3013,8 +3013,8 @@ export default class MainScene extends Scene {
let lat = this.lattices[index]; let lat = this.lattices[index];
if (lat && lat.element && lat.element.type == ElementType.FIREWORKS_SHOOTER) { if (lat && lat.element && lat.element.type == ElementType.FIREWORKS_SHOOTER) {
const type = fireworksTypeMap[ele.type]; const type = fireworksTypeMap[ele.type];
if (this.passElements && this.passElements[type] != undefined) { if (this.passElements && this.passElements[type] != undefined && this.passElements[type] != 0) {
lat.element.canFire && lat.element.fire(); lat.element.canFire && lat.element.fire(type);
// this.goElementTarget(type, [this.stage.stageWidth/2, this.stage.stageHeight/2]); // this.goElementTarget(type, [this.stage.stageWidth/2, this.stage.stageHeight/2]);
this.goElementTarget(type, [ele.x, ele.y]); this.goElementTarget(type, [ele.x, ele.y]);
} }
......
egret/src/something/chapters/Chapter14.ts
View file @ a244e702
This source diff could not be displayed because it is too large. You can view the blob instead.
egret/src/something/class/Element.ts
View file @ a244e702
...@@ -27,6 +27,7 @@ import { ChickenEgg } from "./ChickenEgg"; ...@@ -27,6 +27,7 @@ import { ChickenEgg } from "./ChickenEgg";
import { FestivalEle } from "./FestivalEle"; import { FestivalEle } from "./FestivalEle";
import { FestivalEle2 } from "./FestivalEle2"; import { FestivalEle2 } from "./FestivalEle2";
import { State } from "./State"; import { State } from "./State";
import wait from "../../../libs/new_tc/wait";
/** /**
* 考虑到底继承白鹭的啥Component还是Container * 考虑到底继承白鹭的啥Component还是Container
* 坐标原点需要坐落在格子的中心点 * 坐标原点需要坐落在格子的中心点
...@@ -39,12 +40,22 @@ export class Element extends eui.Component { ...@@ -39,12 +40,22 @@ export class Element extends eui.Component {
return t - this._fireworksTimer > 2 * 1000; return t - this._fireworksTimer > 2 * 1000;
} }
fire() { fire(type: ElementType) {
this._fireworksTimer = new Date().getTime(); this._fireworksTimer = new Date().getTime();
if (type == ElementType.FIREWORKS_PIG)
this.toFireworksAction(1, 90); //pig
else if (type == ElementType.FIREWORKS_CHICKEN)
this.toFireworksAction(91, 180);//chicken
else if (type == ElementType.FIREWORKS_LION)
this.toFireworksAction(181, 270);//lion
else if (type == ElementType.FIREWORKS_CATTLE)
this.toFireworksAction(271, 360);//cattle
else if (type == ElementType.FIREWORKS_RABBIT)
this.toFireworksAction(361, 450);//rabbit
} }
_fireworks; _fireworks;
async resetFireworks(thisobj) { resetFireworks(thisobj) {
this.changeSource('empty_png'); this.changeSource('empty_png');
this.showImage.alpha = 0; this.showImage.alpha = 0;
const mv: any = initSvga(getFireworksVideoItem()); const mv: any = initSvga(getFireworksVideoItem());
...@@ -54,7 +65,20 @@ export class Element extends eui.Component { ...@@ -54,7 +65,20 @@ export class Element extends eui.Component {
mv.anchorOffsetY = 500; mv.anchorOffsetY = 500;
mv.x = this.x; mv.x = this.x;
mv.y = this.y - 38; mv.y = this.y - 38;
this._fireworks.gotoAndStop(1);
} }
toFireworksAction(start, end) {
const cb = () => {
if (this._fireworks.currentFrame == end) { //向上吹
this._fireworks.gotoAndStop(start);
this._fireworks.removeEventListener(egret.Event.ENTER_FRAME, cb, this);
}
};
this._fireworks.addEventListener(egret.Event.ENTER_FRAME, cb, this);
this._fireworks.gotoAndPlay(start, true);
}
_mv; _mv;
async resetMonster() { async resetMonster() {
this.changeSource('empty_png'); this.changeSource('empty_png');
......
mock/happyclear/home.json
View file @ a244e702
...@@ -1667,6 +1667,226 @@ ...@@ -1667,6 +1667,226 @@
"levelNum": 331, "levelNum": 331,
"maxScore": 47440, "maxScore": 47440,
"stars": 1 "stars": 1
},
{
"levelNum": 332,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 333,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 334,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 335,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 336,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 337,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 338,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 339,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 340,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 341,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 342,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 343,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 344,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 345,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 346,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 347,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 348,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 349,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 350,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 351,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 352,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 353,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 354,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 355,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 356,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 357,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 358,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 359,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 360,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 361,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 362,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 363,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 364,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 365,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 366,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 367,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 368,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 369,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 370,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 371,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 372,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 373,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 374,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 375,
"maxScore": 47440,
"stars": 1
} }
], ],
"remainProp": [ "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