Skip to content

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

1

parent ef35f514
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 135 deletions
egret/resource/default.res.json
View file @ 37739be7
......@@ -238,7 +238,7 @@
},
{
"name": "preload",
"keys": "honeymc_json"
"keys": "honeymc_json,ele36_png"
}
],
"resources": [
......@@ -4552,6 +4552,11 @@
"type": "sheet",
"url": "assets/mc/honeymc.json",
"subkeys": "合成 4_00013,合成 4_00012,合成 4_00011,合成 4_00010,合成 4_00009,合成 4_00008,合成 4_00007,合成 4_00006,合成 4_00005,合成 4_00004,合成 4_00003,合成 4_00002,合成 4_00001"
},
{
"name": "ele36_png",
"type": "image",
"url": "assets/mainScene/ele36.png"
}
]
}
\ No newline at end of file
egret/src/mainScene/MainScene.ts
View file @ 37739be7
......@@ -62,7 +62,7 @@ import { Lattice } from '../something/class/Lattice';
import { EffectType } from '../something/enum/EffectType';
import { ElementConfigType } from '../something/enum/ElementConfigType';
import { CandyBaseElementType, codeMsgs, convertBaseElementType, elementMonsterResMap, ElementType, fireworksTypeMap, FiveBaseElementTypes, MonsterBaseElementType, monsterElementMap, submitTran } from '../something/enum/ElementType';
import { isIce, isSpecialLattice } from '../something/enum/LatticeType';
import { isIce, isSpecialLattice, isSand, isBlock } from '../something/enum/LatticeType';
import { PassType } from '../something/enum/PassType';
import { RecoverName } from '../something/enum/RecoverName';
import { StateType } from '../something/enum/StateType';
......@@ -159,7 +159,7 @@ export default class MainScene extends Scene {
return 'Main2'
}
gm=()=>{
gm = () => {
var json = {};
//分数
json[1] = 9999999;
......@@ -299,7 +299,7 @@ export default class MainScene extends Scene {
async start(data) {
super.start();
window['gm'] =this.gm;
window['gm'] = this.gm;
//第几关
this.chapter = (data && data.chapter) ? data.chapter : 1;
// this.chapter = 24;
......@@ -619,7 +619,10 @@ export default class MainScene extends Scene {
}
latticeDisplay = ice;
this.lattices[i].ice = ice;
} else {
} else if (isSand(latticesD[i])) {
latticeDisplay = genBlockDisplay(latticesD[i]);
this.lattices[i].block = latticeDisplay as BaseBlock;
} else if(isBlock(latticesD[i])) {
latticeDisplay = genBlockDisplay(latticesD[i]);
this.lattices[i].block = latticeDisplay as BaseBlock;
}
......@@ -2418,7 +2421,7 @@ export default class MainScene extends Scene {
if (!ele) {
//以防万一还是判断一次
}
//下面带状态的要优先判断
//有枷锁的
else if (ele.hasState(StateType.LOCK)) {
......@@ -2431,7 +2434,7 @@ export default class MainScene extends Scene {
}
else if (ele.hasState(StateType.HONEY)) {
ele.setState(StateType.HONEY, false);
createHoneyDisAni(ele.x,ele.y,this)
createHoneyDisAni(ele.x, ele.y, this)
this.goElementTarget(ElementType.HONEY, [ele.x, ele.y]);
}
else if (ele.monster) {//如果是独眼怪,
......
egret/src/something/chapters/Chapter18.ts
View file @ 37739be7
......@@ -3,7 +3,6 @@ import { PassType } from "../enum/PassType";
import { ElementType } from "../enum/ElementType";
//451-471
export const Chapters18: ChapterData[] = [
{
baseElementTypes: [0, 1, 2, 3],
bubbleProbability: 0,
......@@ -24,7 +23,7 @@ export const Chapters18: ChapterData[] = [
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,
1, 1, 1, 1, 2, 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,
......
egret/src/something/class/Lattice.ts
View file @ 37739be7
......@@ -18,6 +18,7 @@ export class Lattice {
* 石门，冰石门，深冰石门
*/
block: BaseBlock;
sand: BaseBlock;
/**
* 上面的元素（null，消除元素，石头，冰激凌等），
*/
......
egret/src/something/enum/ElementType.ts
View file @ 37739be7
......@@ -56,7 +56,7 @@ export enum ElementType {
FISH,//气鼓鱼
HONEY,// 蜂蜜
HONEY_POT,//蜂蜜罐
SAND
SAND,
}
export const isMonsterEle = (t: ElementType) => {
......
egret/src/something/enum/LatticeType.ts
View file @ 37739be7
......@@ -26,4 +26,12 @@ export const isSpecialLattice = (type: LatticeType) => {
export const isIce = (type: LatticeType) => {
return type == LatticeType.ICE || type == LatticeType.DARK_ICE
}
export const isBlock = (type: LatticeType) => {
return type == LatticeType.BlOCK || type == LatticeType.BLOCK_AND_ICE || type == LatticeType.BLOCK_AND_DARK_ICE
}
export const isSand = (type: LatticeType) => {
return type == LatticeType.SAND
}
\ No newline at end of file
mock/happyclear/home.json
View file @ 37739be7
......@@ -2262,131 +2262,6 @@
"levelNum": 450,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 451,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 452,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 453,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 454,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 455,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 456,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 457,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 458,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 459,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 460,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 461,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 462,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 463,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 464,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 465,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 466,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 467,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 468,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 469,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 470,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 471,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 472,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 473,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 474,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 475,
"maxScore": 47440,
"stars": 1
}
],
......
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