Skip to content

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

1

parent 9a9af71d
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 { ...@@ -418,6 +418,8 @@ export default class MainBase extends eui.UILayer {
"mainSoundBtnOff", "mainSoundBtnOff",
"mainMusicBtnOff", "mainMusicBtnOff",
"monster_shoot", "monster_shoot",
"ele33_1",
"ele33_0",
] ]
for (var i = 0; i < arr.length; i++) { for (var i = 0; i < arr.length; i++) {
RES.getResAsync(arr[i] + "_png") RES.getResAsync(arr[i] + "_png")
......
egret/libs/new_wx/ctrls/sceneCtrl.ts
View file @ 3fd1a080
...@@ -71,8 +71,10 @@ export default class SceneCtrl { ...@@ -71,8 +71,10 @@ export default class SceneCtrl {
this._currentScene = scene; this._currentScene = scene;
this._parent.addChild(scene); this._parent.addChild(scene);
wait(1000).then(()=>{ wait(1000).then(()=>{
oldScene.destroy(); if(oldScene) {
this._parent.removeChild(oldScene); oldScene.destroy();
this._parent.removeChild(oldScene);
}
}); });
} }
......
egret/resource/default.res.json
View file @ 3fd1a080
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
"name": "h5" "name": "h5"
}, },
{ {
"keys": "bonusFra1_png,bonusFra10_png,bonusFra11_png,bonusFra12_png,bonusFra13_png,bonusFra14_png,bonusFra15_png,bonusFra16_png,bonusFra17_png,bonusFra18_png,bonusFra19_png,bonusFra2_png,bonusFra20_png,bonusFra21_png,bonusFra22_png,bonusFra23_png,bonusFra24_png,bonusFra25_png,bonusFra26_png,bonusFra27_png,bonusFra3_png,bonusFra4_png,bonusFra5_png,bonusFra6_png,bonusFra7_png,bonusFra8_png,bonusFra9_png,bonusShoot_png,bonusTime_png,boom1_png,boom10_png,boom11_png,boom12_png,boom13_png,boom14_png,boom15_png,boom16_png,boom17_png,boom18_png,boom2_png,boom3_png,boom4_png,boom5_png,boom6_png,boom7_png,boom8_png,boom9_png,boomBtn_png,chooseRect_png,dangqianfenshu_png,eggPiece1_png,eggPiece2_png,eggPiece3_png,eggPiece4_png,eggPiece5_png,eggStatus0_png,eggStatus1_png,eggStatus2_png,ele0_png,ele0Exp_png,ele0Line_png,ele1_png,ele1Exp_png,ele1Line_png,ele2_png,ele2Exp_png,ele2Line_png,ele3_png,ele3Exp_png,ele3Line_png,ele4_png,ele4Exp_png,ele4Line_png,ele5_png,ele6_png,ele7_png,ele8_png,ele9_png,eleDis1_png,eleDis10_png,eleDis11_png,eleDis12_png,eleDis13_png,eleDis14_png,eleDis15_png,eleDis16_png,eleDis17_png,eleDis18_png,eleDis19_png,eleDis2_png,eleDis3_png,eleDis4_png,eleDis5_png,eleDis6_png,eleDis7_png,eleDis8_png,eleDis9_png,exLighting1_png,exLighting11_png,exLighting14_png,exLighting16_png,exLighting18_png,exLighting19_png,exLighting21_png,exLighting23_png,exLighting25_png,exLighting27_png,exLighting29_png,exLighting3_png,exLighting32_png,exLighting34_png,exLighting5_png,exLighting7_png,exLighting9_png,greenCircleDown_png,greenCircleUp_png,guidePropBoom_png,guidePropCow_png,guidePropHammer_png,guidePropHand_png,guidePropMsgPanel_png,guidePropShoe_png,hammerBtn_png,ice2_png,ice3_png,ice4_png,ice5_png,ice6_png,jellyArrow_png,leftArrow_png,lightedStar_png,lineLight_png,lockVine_png,magicLion_png,magicLionBg_png,mainMusicBtnOff_png,mainMusicBtnOn_png,mainQuestionBtn_png,mainQuitBtn_png,mainSettingBg_png,mainSoundBtnOff_png,mainSoundBtnOn_png,main_mapbottom_png,playSceneBg_jpg,progressDown_png,propNum0_png,propNum1_png,propNum2_png,propNum3_png,propNum4_png,propNum5_png,propNum6_png,propNum7_png,propNum8_png,propNum9_png,propNumBg_png,rectLat_png,rightArrow_png,rightMark_png,rock2_png,rock3_png,rock4_png,rock5_png,rock6_png,scoreNumber0_png,scoreNumber1_png,scoreNumber2_png,scoreNumber3_png,scoreNumber4_png,scoreNumber5_png,scoreNumber6_png,scoreNumber7_png,scoreNumber8_png,scoreNumber9_png,setting_png,starProgress_png,stepAni1_png,stepAni10_png,stepAni11_png,stepAni2_png,stepAni3_png,stepAni4_png,stepAni5_png,stepAni6_png,stepAni7_png,stepAni8_png,stepAni9_png,stepBtn_png,stepNumber0_png,stepNumber1_png,stepNumber2_png,stepNumber3_png,stepNumber4_png,stepNumber5_png,stepNumber6_png,stepNumber7_png,stepNumber8_png,stepNumber9_png,stepsBoard_png,targetBoard_png,targetNumber0_png,targetNumber1_png,targetNumber2_png,targetNumber3_png,targetNumber4_png,targetNumber5_png,targetNumber6_png,targetNumber7_png,targetNumber8_png,targetNumber9_png,unlightedStar_png,yellowCircleDown_png,yellowCircleUp_png,yezi1_png,bubbleStar19_png,bubleEle0_png,bubleEle1_png,bubleEle2_png,bubleEle3_png,bubleEle4_png,bubbleStar1_png,bubbleStar2_png,bubbleStar3_png,bubbleStar4_png,bubbleStar5_png,bubbleStar6_png,bubbleStar7_png,bubbleStar8_png,bubbleStar9_png,bubbleStar10_png,bubbleStar11_png,bubbleStar12_png,bubbleStar13_png,bubbleStar14_png,bubbleStar15_png,bubbleStar16_png,bubbleStar17_png,bubbleStar18_png,ele11_png,ele10_png,brownBallFace_png,eyeDownLeft_png,eyeSingle_png,greyBallFace_png,eyeDownRight_png,hairballPiece9_png,hairballPiece8_png,hairballPiece7_png,hairballPiece6_png,hairballPiece5_png,hairballPiece4_png,hairballPiece3_png,hairballPiece2_png,hairballPiece11_png,hairballPiece10_png,hairballPiece1_png,hairballDisBg_png,curScoreNum9_png,curScoreNum8_png,curScoreNum7_png,curScoreNum6_png,curScoreNum5_png,curScoreNum4_png,curScoreNum3_png,curScoreNum2_png,curScoreNum1_png,curScoreNum0_png,festivalTargetBg_png,lineLight9_png,lineLight8_png,lineLight7_png,lineLight6_png,lineLight5_png,lineLight4_png,lineLight3_png,lineLight2_png,lineLight13_png,lineLight12_png,lineLight11_png,lineLight10_png,lineLight1_png,fesRedUp_png,fesRedSmallLight_png,fesRedDown_png,fesRedCap_png,fesRedBombSta1_png,fesRedBigLight_png,fesEleSmallDis9_png,fesEleSmallDis8_png,fesEleSmallDis7_png,fesEleSmallDis6_png,fesEleSmallDis5_png,fesEleSmallDis4_png,fesEleSmallDis3_png,fesEleSmallDis2_png,fesEleSmallDis10_png,fesEleSmallDis1_png,ele12_png,ele13_png,xingxingbi_png,tinyRedMid_png,tinyRedLeft_png,tinyRedRight_png,rectLatWhite_png,fesRedBombSta2_png,ele14_png,redBombYStar_png,redBombBStar_png,redBombBSnow_png,线条尾部炸开_00000_png,线条尾部炸开_00001_png,线条尾部炸开_00002_png,线条尾部炸开_00003_png,线条尾部炸开_00004_png,线条尾部炸开_00005_png,线条尾部炸开_00006_png,线条尾部炸开_00007_png,线条尾部炸开_00008_png,ele15_png,ele16_png,ele17_png,ele18_png,ele19_png,ele20_png,empty_png,ele23_png,ele25_png,ele27_png,ele26_png,ele24_png,ele22_png,chocolateMark3_png,chocolateMark1_png,chocolateFour_png,chocolateMark0_png,chocolateMark2_png,redbombParticle_png,monster_shoot_png", "keys": "bonusFra1_png,bonusFra10_png,bonusFra11_png,bonusFra12_png,bonusFra13_png,bonusFra14_png,bonusFra15_png,bonusFra16_png,bonusFra17_png,bonusFra18_png,bonusFra19_png,bonusFra2_png,bonusFra20_png,bonusFra21_png,bonusFra22_png,bonusFra23_png,bonusFra24_png,bonusFra25_png,bonusFra26_png,bonusFra27_png,bonusFra3_png,bonusFra4_png,bonusFra5_png,bonusFra6_png,bonusFra7_png,bonusFra8_png,bonusFra9_png,bonusShoot_png,bonusTime_png,boom1_png,boom10_png,boom11_png,boom12_png,boom13_png,boom14_png,boom15_png,boom16_png,boom17_png,boom18_png,boom2_png,boom3_png,boom4_png,boom5_png,boom6_png,boom7_png,boom8_png,boom9_png,boomBtn_png,chooseRect_png,dangqianfenshu_png,eggPiece1_png,eggPiece2_png,eggPiece3_png,eggPiece4_png,eggPiece5_png,eggStatus0_png,eggStatus1_png,eggStatus2_png,ele0_png,ele0Exp_png,ele0Line_png,ele1_png,ele1Exp_png,ele1Line_png,ele2_png,ele2Exp_png,ele2Line_png,ele3_png,ele3Exp_png,ele3Line_png,ele4_png,ele4Exp_png,ele4Line_png,ele5_png,ele6_png,ele7_png,ele8_png,ele9_png,eleDis1_png,eleDis10_png,eleDis11_png,eleDis12_png,eleDis13_png,eleDis14_png,eleDis15_png,eleDis16_png,eleDis17_png,eleDis18_png,eleDis19_png,eleDis2_png,eleDis3_png,eleDis4_png,eleDis5_png,eleDis6_png,eleDis7_png,eleDis8_png,eleDis9_png,exLighting1_png,exLighting11_png,exLighting14_png,exLighting16_png,exLighting18_png,exLighting19_png,exLighting21_png,exLighting23_png,exLighting25_png,exLighting27_png,exLighting29_png,exLighting3_png,exLighting32_png,exLighting34_png,exLighting5_png,exLighting7_png,exLighting9_png,greenCircleDown_png,greenCircleUp_png,guidePropBoom_png,guidePropCow_png,guidePropHammer_png,guidePropHand_png,guidePropMsgPanel_png,guidePropShoe_png,hammerBtn_png,ice2_png,ice3_png,ice4_png,ice5_png,ice6_png,jellyArrow_png,leftArrow_png,lightedStar_png,lineLight_png,lockVine_png,magicLion_png,magicLionBg_png,mainMusicBtnOff_png,mainMusicBtnOn_png,mainQuestionBtn_png,mainQuitBtn_png,mainSettingBg_png,mainSoundBtnOff_png,mainSoundBtnOn_png,main_mapbottom_png,playSceneBg_jpg,progressDown_png,propNum0_png,propNum1_png,propNum2_png,propNum3_png,propNum4_png,propNum5_png,propNum6_png,propNum7_png,propNum8_png,propNum9_png,propNumBg_png,rectLat_png,rightArrow_png,rightMark_png,rock2_png,rock3_png,rock4_png,rock5_png,rock6_png,scoreNumber0_png,scoreNumber1_png,scoreNumber2_png,scoreNumber3_png,scoreNumber4_png,scoreNumber5_png,scoreNumber6_png,scoreNumber7_png,scoreNumber8_png,scoreNumber9_png,setting_png,starProgress_png,stepAni1_png,stepAni10_png,stepAni11_png,stepAni2_png,stepAni3_png,stepAni4_png,stepAni5_png,stepAni6_png,stepAni7_png,stepAni8_png,stepAni9_png,stepBtn_png,stepNumber0_png,stepNumber1_png,stepNumber2_png,stepNumber3_png,stepNumber4_png,stepNumber5_png,stepNumber6_png,stepNumber7_png,stepNumber8_png,stepNumber9_png,stepsBoard_png,targetBoard_png,targetNumber0_png,targetNumber1_png,targetNumber2_png,targetNumber3_png,targetNumber4_png,targetNumber5_png,targetNumber6_png,targetNumber7_png,targetNumber8_png,targetNumber9_png,unlightedStar_png,yellowCircleDown_png,yellowCircleUp_png,yezi1_png,bubbleStar19_png,bubleEle0_png,bubleEle1_png,bubleEle2_png,bubleEle3_png,bubleEle4_png,bubbleStar1_png,bubbleStar2_png,bubbleStar3_png,bubbleStar4_png,bubbleStar5_png,bubbleStar6_png,bubbleStar7_png,bubbleStar8_png,bubbleStar9_png,bubbleStar10_png,bubbleStar11_png,bubbleStar12_png,bubbleStar13_png,bubbleStar14_png,bubbleStar15_png,bubbleStar16_png,bubbleStar17_png,bubbleStar18_png,ele11_png,ele10_png,brownBallFace_png,eyeDownLeft_png,eyeSingle_png,greyBallFace_png,eyeDownRight_png,hairballPiece9_png,hairballPiece8_png,hairballPiece7_png,hairballPiece6_png,hairballPiece5_png,hairballPiece4_png,hairballPiece3_png,hairballPiece2_png,hairballPiece11_png,hairballPiece10_png,hairballPiece1_png,hairballDisBg_png,curScoreNum9_png,curScoreNum8_png,curScoreNum7_png,curScoreNum6_png,curScoreNum5_png,curScoreNum4_png,curScoreNum3_png,curScoreNum2_png,curScoreNum1_png,curScoreNum0_png,festivalTargetBg_png,lineLight9_png,lineLight8_png,lineLight7_png,lineLight6_png,lineLight5_png,lineLight4_png,lineLight3_png,lineLight2_png,lineLight13_png,lineLight12_png,lineLight11_png,lineLight10_png,lineLight1_png,fesRedUp_png,fesRedSmallLight_png,fesRedDown_png,fesRedCap_png,fesRedBombSta1_png,fesRedBigLight_png,fesEleSmallDis9_png,fesEleSmallDis8_png,fesEleSmallDis7_png,fesEleSmallDis6_png,fesEleSmallDis5_png,fesEleSmallDis4_png,fesEleSmallDis3_png,fesEleSmallDis2_png,fesEleSmallDis10_png,fesEleSmallDis1_png,ele12_png,ele13_png,xingxingbi_png,tinyRedMid_png,tinyRedLeft_png,tinyRedRight_png,rectLatWhite_png,fesRedBombSta2_png,ele14_png,redBombYStar_png,redBombBStar_png,redBombBSnow_png,线条尾部炸开_00000_png,线条尾部炸开_00001_png,线条尾部炸开_00002_png,线条尾部炸开_00003_png,线条尾部炸开_00004_png,线条尾部炸开_00005_png,线条尾部炸开_00006_png,线条尾部炸开_00007_png,线条尾部炸开_00008_png,ele15_png,ele16_png,ele17_png,ele18_png,ele19_png,ele20_png,empty_png,ele23_png,ele25_png,ele27_png,ele26_png,ele24_png,ele22_png,chocolateMark3_png,chocolateMark1_png,chocolateFour_png,chocolateMark0_png,chocolateMark2_png,redbombParticle_png,monster_shoot_png,ele33_1_png,ele33_0_png",
"name": "main2" "name": "main2"
}, },
{ {
...@@ -231,10 +231,6 @@ ...@@ -231,10 +231,6 @@
{ {
"keys": "backindex_png", "keys": "backindex_png",
"name": "backindex" "name": "backindex"
},
{
"keys": "monsterState_json",
"name": "preload"
} }
], ],
"resources": [ "resources": [
...@@ -4477,6 +4473,16 @@ ...@@ -4477,6 +4473,16 @@
"type": "sheet", "type": "sheet",
"name": "monsterState_json", "name": "monsterState_json",
"subkeys": "糖果消失_00000,糖果消失_00001,糖果消失_00002,糖果消失_00003,糖果消失_00004,糖果消失_00005,糖果消失_00006,糖果消失_00007,糖果消失_00008,糖果消失_00009,糖果消失_00010,糖果消失_00011,糖果消失_00012,糖果消失_00013,糖果消失_00014" "subkeys": "糖果消失_00000,糖果消失_00001,糖果消失_00002,糖果消失_00003,糖果消失_00004,糖果消失_00005,糖果消失_00006,糖果消失_00007,糖果消失_00008,糖果消失_00009,糖果消失_00010,糖果消失_00011,糖果消失_00012,糖果消失_00013,糖果消失_00014"
},
{
"url": "assets/mainScene/ele33_0.png",
"type": "image",
"name": "ele33_0_png"
},
{
"url": "assets/mainScene/ele33_1.png",
"type": "image",
"name": "ele33_1_png"
} }
] ]
} }
\ No newline at end of file
egret/src/mainScene/MainScene.ts
View file @ 3fd1a080
...@@ -768,6 +768,15 @@ export default class MainScene extends Scene { ...@@ -768,6 +768,15 @@ export default class MainScene extends Scene {
this.lattices[i].element = fireworks; this.lattices[i].element = fireworks;
fireworks.resetFireworks(this); fireworks.resetFireworks(this);
break; 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: case ElementConfigType.CHICKEN_EGG:
let egg: Element = Tool.getElement(ElementType.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"; ...@@ -3,4 +3,61 @@ import { PassType } from "../enum/PassType";
import { ElementType } from "../enum/ElementType"; import { ElementType } from "../enum/ElementType";
//401-425 //401-425
export const Chapters16: ChapterData[] = [ 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 { ...@@ -141,6 +141,12 @@ export class Element extends eui.Component {
this.addChild(this.monster); this.addChild(this.monster);
this.showImage.alpha = 0; 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; private _candy: Candy;
resetToCandyView(baseElement: CandyBaseElementType) { resetToCandyView(baseElement: CandyBaseElementType) {
......
egret/src/something/enum/ElementConfigType.ts
View file @ 3fd1a080
...@@ -61,4 +61,8 @@ export enum ElementConfigType { ...@@ -61,4 +61,8 @@ export enum ElementConfigType {
* 独眼怪 * 独眼怪
*/ */
MONSTER = 14, 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 { ...@@ -52,6 +52,8 @@ export enum ElementType {
MONSTER_CATTLE, MONSTER_CATTLE,
MONSTER_LION, MONSTER_LION,
MONSTER_PIG, MONSTER_PIG,
FISH,//气鼓鱼
} }
export const isMonsterEle = (t: ElementType) => { export const isMonsterEle = (t: ElementType) => {
......
mock/happyclear/home.json
View file @ 3fd1a080
...@@ -2017,126 +2017,6 @@ ...@@ -2017,126 +2017,6 @@
"levelNum": 401, "levelNum": 401,
"maxScore": 47440, "maxScore": 47440,
"stars": 1 "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 @@ ...@@ -2012,7 +2012,133 @@
"levelNum": 400, "levelNum": 400,
"maxScore": 47440, "maxScore": 47440,
"stars": 1 "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": [ "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