Skip to content

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

1

parent 936426e1
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 5 deletions
egret/resource/default.res.json
View file @ 888a7723
......@@ -97,7 +97,7 @@
"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",
"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,ele29_png,ele29_3_png,ele29_2_png,ele29_1_png,ele29_0_png,ele28_png,ele28_3_png,ele28_2_png,ele28_1_png,ele28_0_png,ele30_png,ele30_3_png,ele30_2_png,ele30_1_png,ele30_0_png,ele31_png,ele31_3_png,ele31_2_png,ele31_1_png,ele31_0_png,ele32_png,ele32_3_png,ele32_2_png,ele32_1_png,ele32_0_png",
"name": "main2"
},
{
......@@ -231,6 +231,10 @@
{
"keys": "backindex_png",
"name": "backindex"
},
{
"keys": "ele28_png,ele29_png,ele28_0_png,ele28_1_png,ele28_2_png,ele28_3_png,ele29_0_png,ele29_2_png,ele29_1_png,ele29_3_png,ele30_0_png,ele30_1_png,ele30_2_png,ele30_3_png,ele30_png,ele31_png,ele31_0_png,ele31_1_png,ele31_2_png,ele31_3_png,ele32_png,ele32_0_png,ele32_1_png,ele32_2_png,ele32_3_png",
"name": "preload"
}
],
"resources": [
......@@ -4287,6 +4291,131 @@
"url": "assets/redbombtips/redbagtips_elexx.png",
"type": "image",
"name": "redbagtips_elexx_png"
},
{
"url": "assets/mainScene/ele28.png",
"type": "image",
"name": "ele28_png"
},
{
"url": "assets/mainScene/ele29.png",
"type": "image",
"name": "ele29_png"
},
{
"url": "assets/mainScene/ele28_0.png",
"type": "image",
"name": "ele28_0_png"
},
{
"url": "assets/mainScene/ele28_1.png",
"type": "image",
"name": "ele28_1_png"
},
{
"url": "assets/mainScene/ele28_2.png",
"type": "image",
"name": "ele28_2_png"
},
{
"url": "assets/mainScene/ele28_3.png",
"type": "image",
"name": "ele28_3_png"
},
{
"url": "assets/mainScene/ele29_0.png",
"type": "image",
"name": "ele29_0_png"
},
{
"url": "assets/mainScene/ele29_2.png",
"type": "image",
"name": "ele29_2_png"
},
{
"url": "assets/mainScene/ele29_1.png",
"type": "image",
"name": "ele29_1_png"
},
{
"url": "assets/mainScene/ele29_3.png",
"type": "image",
"name": "ele29_3_png"
},
{
"url": "assets/mainScene/ele30_0.png",
"type": "image",
"name": "ele30_0_png"
},
{
"url": "assets/mainScene/ele30_1.png",
"type": "image",
"name": "ele30_1_png"
},
{
"url": "assets/mainScene/ele30_2.png",
"type": "image",
"name": "ele30_2_png"
},
{
"url": "assets/mainScene/ele30_3.png",
"type": "image",
"name": "ele30_3_png"
},
{
"url": "assets/mainScene/ele30.png",
"type": "image",
"name": "ele30_png"
},
{
"url": "assets/mainScene/ele31.png",
"type": "image",
"name": "ele31_png"
},
{
"url": "assets/mainScene/ele31_0.png",
"type": "image",
"name": "ele31_0_png"
},
{
"url": "assets/mainScene/ele31_1.png",
"type": "image",
"name": "ele31_1_png"
},
{
"url": "assets/mainScene/ele31_2.png",
"type": "image",
"name": "ele31_2_png"
},
{
"url": "assets/mainScene/ele31_3.png",
"type": "image",
"name": "ele31_3_png"
},
{
"url": "assets/mainScene/ele32.png",
"type": "image",
"name": "ele32_png"
},
{
"url": "assets/mainScene/ele32_0.png",
"type": "image",
"name": "ele32_0_png"
},
{
"url": "assets/mainScene/ele32_1.png",
"type": "image",
"name": "ele32_1_png"
},
{
"url": "assets/mainScene/ele32_2.png",
"type": "image",
"name": "ele32_2_png"
},
{
"url": "assets/mainScene/ele32_3.png",
"type": "image",
"name": "ele32_3_png"
}
]
}
\ No newline at end of file
egret/src/mainScene/MainScene.ts
View file @ 888a7723
......@@ -148,7 +148,7 @@ const redBombPanelName = "RedBombAlert";
const fesChapterData: number[] = [];
for (let i = 1; i < 999; i++) { /// TODO 测试
if (i == 25 || i == 44 || i == 226 || i == 330) continue;
if (i == 25 || i == 44 || i == 226 || i == 330) continue;
fesChapterData.push(i);
}
......@@ -796,10 +796,11 @@ export default class MainScene extends Scene {
const elementConfig = elementConfigs[i];//对应的element
const baseElement = elements[i];
const isCandyEle = elementConfig == ElementConfigType.CANDY;
const isMonsterEle = elementConfig == ElementConfigType.MONSTER;
//不是基础元素,跳过，
if (!Tool.judgeBaseEle(this.lattices[i]) && !isCandyEle) continue;
if (!Tool.judgeBaseEle(this.lattices[i]) && !isCandyEle && !isMonsterEle) continue;
//是0，跳过
if (!baseElement && !isCandyEle) continue
if (!baseElement && !isCandyEle && !isMonsterEle) continue
const ele: Element = this.lattices[i].element;
if (isCandyEle) { //糖果元素
if (baseElement == CandyBaseElementType.RANDOM) {//如果是随机糖果，目前只有随机糖果
......@@ -810,7 +811,11 @@ export default class MainScene extends Scene {
// ele.resetToCandyView(resultBaseElement);//切换成糖果视图
}
} else {
}
else if (isMonsterEle) { //独眼怪物元素
}
else {
//解析elements[i];
var arr: number[] = Tool.returnTO(elements[i]);
//基础类型，没有就是null，有就-1，对ElementType对应
......
egret/src/something/enum/ElementConfigType.ts
View file @ 888a7723
......@@ -57,6 +57,10 @@ export enum ElementConfigType {
*/
JELLY_MONSTER = 12,
FIREWORKS = 13,
/**
* 独眼怪
*/
MONSTER = 14,
}
// export const isCandy = (t: ElementConfigType) => {
......
egret/src/something/enum/ElementType.ts
View file @ 888a7723
......@@ -46,6 +46,12 @@ export enum ElementType {
FIREWORKS_PIG,
FIREWORKS_SHOOTER,//烟花
MONSTER_RABBIT,//独眼怪
MONSTER_CHICKEN,
MONSTER_CATTLE,
MONSTER_LION,
MONSTER_PIG,
}
export enum CandyBaseElementType {
......@@ -58,6 +64,16 @@ export enum CandyBaseElementType {
}
export enum MonsterBaseElementType {
RANDOM = 0,//随机
RABBIT = 1,//兔子
CHICKEN = 2,//鸟
CATTLE = 3,//牛
LION = 4,//狮子
PIG = 5,//猪
}
export const fireworksTypeMap:any = {}
fireworksTypeMap[ElementType.RABBIT]=ElementType.FIREWORKS_RABBIT;
fireworksTypeMap[ElementType.CHICKEN]=ElementType.FIREWORKS_CHICKEN;
......
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