Skip to content

B
babycare_xiaoxiao
Commit 8c5d2091 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

1

parents 434b1d1f de2a0c90
Show whitespace changes
Inline Side-by-side
Showing with 109 additions and 45 deletions
resource/res.json
View file @ 8c5d2091
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
"keys": "增加体力背景.png,无字按钮底.png", "keys": "增加体力背景.png,无字按钮底.png",
"name": "BuyPowerPanel" "name": "BuyPowerPanel"
}, },
{
"keys": "comCloseBtn.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common"
},
{ {
"keys": "积分不足背景.png,赚取积分.png", "keys": "积分不足背景.png,赚取积分.png",
"name": "CreditsOutPanel" "name": "CreditsOutPanel"
...@@ -16,10 +20,22 @@ ...@@ -16,10 +20,22 @@
"keys": "失败Bg.png,失败重新闯关.png", "keys": "失败Bg.png,失败重新闯关.png",
"name": "FailedPanel" "name": "FailedPanel"
}, },
{
"keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png",
"name": "festival"
},
{
"keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png,hor_eke3_0.png,hor_eke3_1.png,hor_eke3_10.png,hor_eke3_11.png,hor_eke3_12.png,hor_eke3_13.png,hor_eke3_14.png,hor_eke3_15.png,hor_eke3_2.png,hor_eke3_3.png,hor_eke3_4.png,hor_eke3_5.png,hor_eke3_6.png,hor_eke3_7.png,hor_eke3_8.png,hor_eke3_9.png,hor_ele0_0.png,hor_ele0_1.png,hor_ele0_10.png,hor_ele0_11.png,hor_ele0_12.png,hor_ele0_13.png,hor_ele0_14.png,hor_ele0_15.png,hor_ele0_2.png,hor_ele0_3.png,hor_ele0_4.png,hor_ele0_5.png,hor_ele0_6.png,hor_ele0_7.png,hor_ele0_8.png,hor_ele0_9.png,hor_ele1_0.png,hor_ele1_1.png,hor_ele1_10.png,hor_ele1_11.png,hor_ele1_12.png,hor_ele1_13.png,hor_ele1_14.png,hor_ele1_15.png,hor_ele1_2.png,hor_ele1_3.png,hor_ele1_4.png,hor_ele1_5.png,hor_ele1_6.png,hor_ele1_7.png,hor_ele1_8.png,hor_ele1_9.png,hor_ele2_0.png,hor_ele2_1.png,hor_ele2_10.png,hor_ele2_11.png,hor_ele2_12.png,hor_ele2_13.png,hor_ele2_14.png,hor_ele2_15.png,hor_ele2_2.png,hor_ele2_3.png,hor_ele2_4.png,hor_ele2_5.png,hor_ele2_6.png,hor_ele2_7.png,hor_ele2_8.png,hor_ele2_9.png,hor_ele4_0.png,hor_ele4_1.png,hor_ele4_10.png,hor_ele4_11.png,hor_ele4_12.png,hor_ele4_13.png,hor_ele4_14.png,hor_ele4_15.png,hor_ele4_2.png,hor_ele4_3.png,hor_ele4_4.png,hor_ele4_5.png,hor_ele4_6.png,hor_ele4_7.png,hor_ele4_8.png,hor_ele4_9.png,ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png",
"name": "fiveVerHorDis"
},
{ {
"keys": "圆圈.png,开心收下.png", "keys": "圆圈.png,开心收下.png",
"name": "FreePowerPanel" "name": "FreePowerPanel"
}, },
{
"keys": "map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_creditsBg.png,map_energyAdd.png,map_energyBg.png,map_prizeBox.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_推车.png,map_狐狸气球.png",
"name": "map"
},
{ {
"keys": "体力不足Bg.png,体力不足按钮.png", "keys": "体力不足Bg.png,体力不足按钮.png",
"name": "NoEnergyPanel" "name": "NoEnergyPanel"
...@@ -28,6 +44,10 @@ ...@@ -28,6 +44,10 @@
"keys": "步数耗尽Bg.png,步数耗尽复活.png,步数耗尽结束按钮.png", "keys": "步数耗尽Bg.png,步数耗尽复活.png,步数耗尽结束按钮.png",
"name": "NoStepBtn" "name": "NoStepBtn"
}, },
{
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,boomBtn.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0.png,ele0Exp.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele1Exp.png,ele2.png,ele2Exp.png,ele3.png,ele3Exp.png,ele4.png,ele4Exp.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece10.png,hairballPiece11.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.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,main_mapbottom.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.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,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene"
},
{ {
"keys": "活动规则背景.png", "keys": "活动规则背景.png",
"name": "RulePanel" "name": "RulePanel"
...@@ -59,6 +79,7 @@ ...@@ -59,6 +79,7 @@
{ {
"keys": "使用道具背景.png", "keys": "使用道具背景.png",
"name": "UseToolPanel" "name": "UseToolPanel"
<<<<<<< HEAD
}, },
{ {
"keys": "comCloseBtn.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png", "keys": "comCloseBtn.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
...@@ -79,6 +100,8 @@ ...@@ -79,6 +100,8 @@
{ {
"keys": "ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png", "keys": "ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png",
"name": "vertical" "name": "vertical"
=======
>>>>>>> de2a0c90685724008b8a869901c801ccb75c9e3b
} }
], ],
"path": "./resource/" "path": "./resource/"
......
src/ResJson.ts
View file @ 8c5d2091
...@@ -4,6 +4,10 @@ export const ResJson = { ...@@ -4,6 +4,10 @@ export const ResJson = {
"keys": "增加体力背景.png,无字按钮底.png", "keys": "增加体力背景.png,无字按钮底.png",
"name": "BuyPowerPanel" "name": "BuyPowerPanel"
}, },
{
"keys": "comCloseBtn.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common"
},
{ {
"keys": "积分不足背景.png,赚取积分.png", "keys": "积分不足背景.png,赚取积分.png",
"name": "CreditsOutPanel" "name": "CreditsOutPanel"
...@@ -16,10 +20,22 @@ export const ResJson = { ...@@ -16,10 +20,22 @@ export const ResJson = {
"keys": "失败Bg.png,失败重新闯关.png", "keys": "失败Bg.png,失败重新闯关.png",
"name": "FailedPanel" "name": "FailedPanel"
}, },
{
"keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png",
"name": "festival"
},
{
"keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png,hor_eke3_0.png,hor_eke3_1.png,hor_eke3_10.png,hor_eke3_11.png,hor_eke3_12.png,hor_eke3_13.png,hor_eke3_14.png,hor_eke3_15.png,hor_eke3_2.png,hor_eke3_3.png,hor_eke3_4.png,hor_eke3_5.png,hor_eke3_6.png,hor_eke3_7.png,hor_eke3_8.png,hor_eke3_9.png,hor_ele0_0.png,hor_ele0_1.png,hor_ele0_10.png,hor_ele0_11.png,hor_ele0_12.png,hor_ele0_13.png,hor_ele0_14.png,hor_ele0_15.png,hor_ele0_2.png,hor_ele0_3.png,hor_ele0_4.png,hor_ele0_5.png,hor_ele0_6.png,hor_ele0_7.png,hor_ele0_8.png,hor_ele0_9.png,hor_ele1_0.png,hor_ele1_1.png,hor_ele1_10.png,hor_ele1_11.png,hor_ele1_12.png,hor_ele1_13.png,hor_ele1_14.png,hor_ele1_15.png,hor_ele1_2.png,hor_ele1_3.png,hor_ele1_4.png,hor_ele1_5.png,hor_ele1_6.png,hor_ele1_7.png,hor_ele1_8.png,hor_ele1_9.png,hor_ele2_0.png,hor_ele2_1.png,hor_ele2_10.png,hor_ele2_11.png,hor_ele2_12.png,hor_ele2_13.png,hor_ele2_14.png,hor_ele2_15.png,hor_ele2_2.png,hor_ele2_3.png,hor_ele2_4.png,hor_ele2_5.png,hor_ele2_6.png,hor_ele2_7.png,hor_ele2_8.png,hor_ele2_9.png,hor_ele4_0.png,hor_ele4_1.png,hor_ele4_10.png,hor_ele4_11.png,hor_ele4_12.png,hor_ele4_13.png,hor_ele4_14.png,hor_ele4_15.png,hor_ele4_2.png,hor_ele4_3.png,hor_ele4_4.png,hor_ele4_5.png,hor_ele4_6.png,hor_ele4_7.png,hor_ele4_8.png,hor_ele4_9.png,ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png",
"name": "fiveVerHorDis"
},
{ {
"keys": "圆圈.png,开心收下.png", "keys": "圆圈.png,开心收下.png",
"name": "FreePowerPanel" "name": "FreePowerPanel"
}, },
{
"keys": "map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_creditsBg.png,map_energyAdd.png,map_energyBg.png,map_prizeBox.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_推车.png,map_狐狸气球.png",
"name": "map"
},
{ {
"keys": "体力不足Bg.png,体力不足按钮.png", "keys": "体力不足Bg.png,体力不足按钮.png",
"name": "NoEnergyPanel" "name": "NoEnergyPanel"
...@@ -28,6 +44,10 @@ export const ResJson = { ...@@ -28,6 +44,10 @@ export const ResJson = {
"keys": "步数耗尽Bg.png,步数耗尽复活.png,步数耗尽结束按钮.png", "keys": "步数耗尽Bg.png,步数耗尽复活.png,步数耗尽结束按钮.png",
"name": "NoStepBtn" "name": "NoStepBtn"
}, },
{
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,boomBtn.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0.png,ele0Exp.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele1Exp.png,ele2.png,ele2Exp.png,ele3.png,ele3Exp.png,ele4.png,ele4Exp.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece10.png,hairballPiece11.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.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,main_mapbottom.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.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,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene"
},
{ {
"keys": "活动规则背景.png", "keys": "活动规则背景.png",
"name": "RulePanel" "name": "RulePanel"
...@@ -59,6 +79,7 @@ export const ResJson = { ...@@ -59,6 +79,7 @@ export const ResJson = {
{ {
"keys": "使用道具背景.png", "keys": "使用道具背景.png",
"name": "UseToolPanel" "name": "UseToolPanel"
<<<<<<< HEAD
}, },
{ {
"keys": "comCloseBtn.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png", "keys": "comCloseBtn.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
...@@ -79,6 +100,8 @@ export const ResJson = { ...@@ -79,6 +100,8 @@ export const ResJson = {
{ {
"keys": "ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png", "keys": "ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png",
"name": "vertical" "name": "vertical"
=======
>>>>>>> de2a0c90685724008b8a869901c801ccb75c9e3b
} }
], ],
"path": "./resource/" "path": "./resource/"
......
src/scene/PlayScene.ts
View file @ 8c5d2091
...@@ -104,7 +104,7 @@ const fesChapterData: number[] = [] ...@@ -104,7 +104,7 @@ const fesChapterData: number[] = []
const festivalIndex: number = 40 const festivalIndex: number = 40
export class PlayScene extends Scene { export class PlayScene extends Scene {
get groupNames() { return ["playScene"] } get groupNames() { return ["playScene","fiveVerHorDis"] }
//关卡数据 //关卡数据
chapterData: ChapterData; chapterData: ChapterData;
//关数 //关数
...@@ -245,7 +245,7 @@ export class PlayScene extends Scene { ...@@ -245,7 +245,7 @@ export class PlayScene extends Scene {
this.initTarget(); this.initTarget();
//初始化索引信息，包括10*10的， //初始化索引信息，包括10*10的，
Tool.init(Tool.getColOddEven(this.chapterData.map.lattices), !!(this.passElements && this.passElements[ElementType.LOLLIPOP])); Tool.init(Tool.getColOddEven(this.chapterData.map.lattices), !!(this.passElements && this.passElements[ElementType.LOLLIPOP]));
this.initUi(); this.initScene();
//修改道具数量，发接口消耗传过来的道具 //修改道具数量，发接口消耗传过来的道具
// if (data.boom) { // if (data.boom) {
// NetManager.ins.hc_useProp(() => { }, PropType.BOOMS, data.boom); // NetManager.ins.hc_useProp(() => { }, PropType.BOOMS, data.boom);
...@@ -322,9 +322,9 @@ export class PlayScene extends Scene { ...@@ -322,9 +322,9 @@ export class PlayScene extends Scene {
// mv.stop(); // mv.stop();
// let fun; // let fun;
// mv.addEventListener(FYGE.Event.COMPLETE, fun = function (e) { // mv.addEventListener(FYGE.Event.COMPLETE, fun = function (e) {
// e.target.stop() // e.currentTarget.stop()
// if (e.target.parent) { // if (e.currentTarget.parent) {
// e.target.parent.removeChild(e.target) // e.currentTarget.parent.removeChild(e.currentTarget)
// } // }
// }, this) // }, this)
// movieClips[svgas[i]] = mv; // movieClips[svgas[i]] = mv;
...@@ -334,7 +334,7 @@ export class PlayScene extends Scene { ...@@ -334,7 +334,7 @@ export class PlayScene extends Scene {
// } // }
} }
//初始化界面ui,,道具弄在这里s //初始化界面ui,,道具弄在这里s
initUi() { initScene() {
//皮肤上的几个 //皮肤上的几个
//第几关 //第几关
var chapterTxt = new FYGE.BitmapText({});//TODO文本 var chapterTxt = new FYGE.BitmapText({});//TODO文本
...@@ -370,6 +370,7 @@ export class PlayScene extends Scene { ...@@ -370,6 +370,7 @@ export class PlayScene extends Scene {
//加遮罩,大遮罩一直都加，小遮罩时时判断 //加遮罩,大遮罩一直都加，小遮罩时时判断
var mask = drawShape(path); var mask = drawShape(path);
this.elementContainer.mask = mask; this.elementContainer.mask = mask;
mask.updateShape();//执行一边吧，不然又bug，不更新_localBoundSelf
this.addChild(mask) this.addChild(mask)
//容器事件 //容器事件
this.elementContainer.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, this.mouseDownE, this); this.elementContainer.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, this.mouseDownE, this);
...@@ -411,11 +412,11 @@ export class PlayScene extends Scene { ...@@ -411,11 +412,11 @@ export class PlayScene extends Scene {
this.elementTargets.x = 375; this.elementTargets.x = 375;
this.elementTargets.y = 148; this.elementTargets.y = 148;
this.addChild(this.elementTargets); this.addChild(this.elementTargets);
this.targetScoreTxt.visible = false; // this.targetScoreTxt.visible = false;
} else { } else {
this.passElements = null; this.passElements = null;
this.targetScoreTxt.visible = true; // this.targetScoreTxt.visible = true;
this.targetScoreTxt.text = "目标分数：" + this.chapterData.passTarget.score; // this.targetScoreTxt.text = "目标分数：" + this.chapterData.passTarget.score;
} }
} }
initRecycle() { initRecycle() {
...@@ -944,7 +945,7 @@ export class PlayScene extends Scene { ...@@ -944,7 +945,7 @@ export class PlayScene extends Scene {
} }
let fun: Function; let fun: Function;
this.elementContainer.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, fun = function (e) { this.elementContainer.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, fun = function (e) {
var ele = e.target.parent var ele = e.currentTarget.parent.parent;
if (ele instanceof Element && if (ele instanceof Element &&
// ele.type != ElementType.ROCK && // ele.type != ElementType.ROCK &&
ele.type != ElementType.LOLLIPOP) { ele.type != ElementType.LOLLIPOP) {
...@@ -1063,21 +1064,23 @@ export class PlayScene extends Scene { ...@@ -1063,21 +1064,23 @@ export class PlayScene extends Scene {
// }, prop) // }, prop)
} }
mouseDownE(e: FYGE.MouseEvent) { mouseDownE(e: FYGE.MouseEvent) {
//现在有两级，element的showImage是FrameAni
var ele = e.currentTarget.parent.parent
// console.log(e.currentTarget.parent.parent)
// if (!this.enableTouch) return // if (!this.enableTouch) return
var self = this; var self = this;
if (e.target.parent instanceof Element) { if (ele && ele instanceof Element) {
//去掉提示动画 //去掉提示动画
this.isShowWarning = false; this.isShowWarning = false;
this.noActionCount = 0; this.noActionCount = 0;
this.resetWarning(); this.resetWarning();
if (!Tool.judgeChosen(e.target.parent)) return if (!Tool.judgeChosen(ele)) return
// console.log(e.target.parent) if (self.SELECTED && Tool.checkNeb(ele, self.SELECTED)) {
if (self.SELECTED && Tool.checkNeb(e.target.parent, self.SELECTED)) { self.exchangeElementAni(self.SELECTED, ele, self.callbackEx);
self.exchangeElementAni(self.SELECTED, e.target.parent, self.callbackEx);
self.SELECTED.removeChild(self.choosed); self.SELECTED.removeChild(self.choosed);
self.SELECTED = null; self.SELECTED = null;
} else { } else {
self.SELECTED = e.target.parent; self.SELECTED = ele;
if (self.SELECTED.effectType == EffectType.MAGICLION) { if (self.SELECTED.effectType == EffectType.MAGICLION) {
self.elementContainer.addChildAt(self.SELECTED, 0); self.elementContainer.addChildAt(self.SELECTED, 0);
} else { } else {
...@@ -1088,10 +1091,11 @@ export class PlayScene extends Scene { ...@@ -1088,10 +1091,11 @@ export class PlayScene extends Scene {
} }
} }
mouseMoveE(e) { mouseMoveE(e) {
if (this.SELECTED && e.target.parent instanceof Element) { if (this.SELECTED && e.currentTarget.parent.parent instanceof Element) {
if (!Tool.judgeChosen(e.target.parent)) return var ele = e.currentTarget.parent.parent
if (Tool.checkNeb(e.target.parent, this.SELECTED)) { if (!Tool.judgeChosen(ele)) return
this.exchangeElementAni(this.SELECTED, e.target.parent, this.callbackEx); if (Tool.checkNeb(ele, this.SELECTED)) {
this.exchangeElementAni(this.SELECTED, ele, this.callbackEx);
this.SELECTED.removeChild(this.choosed); this.SELECTED.removeChild(this.choosed);
this.SELECTED = null; this.SELECTED = null;
} }
...@@ -2464,15 +2468,15 @@ export class PlayScene extends Scene { ...@@ -2464,15 +2468,15 @@ export class PlayScene extends Scene {
* @param score * @param score
* @param p * @param p
*/ */
pushScoreAni(score: number, p: number[]) { pushScoreAni(score: number, p: number[]) {//暂时不用
let scoreAni = Pool.takeOut(RecoverName.SCORE_ANI); // let scoreAni = Pool.takeOut(RecoverName.SCORE_ANI);
if (!scoreAni) { // if (!scoreAni) {
scoreAni = new ScoreAni(); // scoreAni = new ScoreAni();
} // }
scoreAni.score = score; // scoreAni.score = score;
scoreAni.x = p[0]; // scoreAni.x = p[0];
scoreAni.y = p[1]; // scoreAni.y = p[1];
this.scoreAnis.push(scoreAni) // this.scoreAnis.push(scoreAni)
} }
/** /**
...@@ -2687,7 +2691,9 @@ export class PlayScene extends Scene { ...@@ -2687,7 +2691,9 @@ export class PlayScene extends Scene {
ani.y = p[1]; ani.y = p[1];
ani.play(); ani.play();
if (name == RecoverName.MAGICLION_ANI) { if (name == RecoverName.MAGICLION_ANI) {
console.log(this.getChildIndex(this.map))
//具体索引还要改 //具体索引还要改
// console.log()
this.addChildAt(ani, this.getChildIndex(this.map) + 1); this.addChildAt(ani, this.getChildIndex(this.map) + 1);
} else { } else {
this.addChild(ani); this.addChild(ani);
...@@ -2875,3 +2881,15 @@ export class PlayScene extends Scene { ...@@ -2875,3 +2881,15 @@ export class PlayScene extends Scene {
// }, 80) // }, 80)
} }
} }
/**
* 后续Element变复杂了，就用这个
* 现在暂时只有两级
*/
// function findElement(currentTarget: FYGE.DisplayObject): Element {
// while (!(currentTarget instanceof Element)) {
// currentTarget = currentTarget.parent;
// if (!currentTarget) return null;
// }
// return currentTarget
// }
\ No newline at end of file
src/something/anis/BonusShootAni.ts
View file @ 8c5d2091
...@@ -21,7 +21,7 @@ export class BonusShootAni extends FYGE.Container { ...@@ -21,7 +21,7 @@ export class BonusShootAni extends FYGE.Container {
// this.shoot.anchorOffsetY = 37 / 2; // this.shoot.anchorOffsetY = 37 / 2;
this.addChild(this.shoot); this.addChild(this.shoot);
var arr = [] var arr = []
for (var i = 0; i <= 11; i++) arr.push("bonusFra" + i + ".png"); for (var i = 0; i <= 11; i++) arr.push(RES.getRes("bonusFra" + i + ".png"));
this.imageAni = new FYGE.FrameAni(arr); this.imageAni = new FYGE.FrameAni(arr);
this.addChild(this.imageAni); this.addChild(this.imageAni);
......
src/something/anis/VerticalAni.ts
View file @ 8c5d2091
...@@ -9,7 +9,7 @@ export class VerticalAni extends Ani { ...@@ -9,7 +9,7 @@ export class VerticalAni extends Ani {
constructor() { constructor() {
super() super()
this.aniName = RecoverName.VERTICAL_ANI// "VerticalAni"; this.aniName = RecoverName.VERTICAL_ANI// "VerticalAni";
this.showImage = new FYGE.Sprite(RES.getRes("lineLight_png")); this.showImage = new FYGE.Sprite(RES.getRes("lineLight.png"));
this.addChild(this.showImage); this.addChild(this.showImage);
this.showImage.anchorTexture.set(0.5, 0.5); this.showImage.anchorTexture.set(0.5, 0.5);
// this.showImage.anchorOffsetX = 147 / 2; // this.showImage.anchorOffsetX = 147 / 2;
......
src/something/anisCall/DoorChangeAni.ts
View file @ 8c5d2091
...@@ -93,7 +93,7 @@ export class DoorChangeAni extends FYGE.Container { ...@@ -93,7 +93,7 @@ export class DoorChangeAni extends FYGE.Container {
if (ice) { if (ice) {
//原先没有就加上 //原先没有就加上
if (!this.ice) { if (!this.ice) {
var textureIce: FYGE.Texture = RES.getRes("ele" + ElementType.ICE + "_png"); var textureIce: FYGE.Texture = RES.getRes("ele" + ElementType.ICE + ".png");
this.ice = new FYGE.Sprite(textureIce); this.ice = new FYGE.Sprite(textureIce);
this.ice.x = - textureIce.width / 2; this.ice.x = - textureIce.width / 2;
this.ice.y = -textureIce.height / 2; this.ice.y = -textureIce.height / 2;
......
src/something/anisCall/FesRedShootAni.ts
View file @ 8c5d2091
...@@ -23,7 +23,7 @@ export class FesRedShootAni extends FYGE.Container { ...@@ -23,7 +23,7 @@ export class FesRedShootAni extends FYGE.Container {
this.addChild(this.light); this.addChild(this.light);
var arr = [] var arr = []
for (var i = 1; i <= 10; i++) { for (var i = 1; i <= 10; i++) {
arr.push("fesEleSmallDis" + i + ".png"); arr.push(RES.getRes("fesEleSmallDis" + i + ".png"));
} }
this.imageAniCon = new FYGE.Container(); this.imageAniCon = new FYGE.Container();
this.imageAni = new FYGE.FrameAni(arr); this.imageAni = new FYGE.FrameAni(arr);
......
src/something/class/ChickenEgg.ts
View file @ 8c5d2091
...@@ -4,7 +4,7 @@ import { RES } from "../../../module/RES"; ...@@ -4,7 +4,7 @@ import { RES } from "../../../module/RES";
//四种状态的图片，剩三种了 //四种状态的图片，剩三种了
const images = { const images = {
2: "ele" + ElementType.CHICKEN_EGG + ".png", 2: "ele" + ElementType.CHICKEN_EGG + ".png",
// 2: "eggStatus2_png", // 2: "eggStatus2.png",
1: "eggStatus1.png", 1: "eggStatus1.png",
0: "eggStatus0.png" 0: "eggStatus0.png"
} }
......
src/something/logic/aaa.ts
View file @ 8c5d2091
...@@ -45,12 +45,12 @@ export function drawBg(paths: PathData[], lattices?: number[]) { ...@@ -45,12 +45,12 @@ export function drawBg(paths: PathData[], lattices?: number[]) {
.position.set(x, y) .position.set(x, y)
return c return c
} }
export function drawShape(paths: PathData[]): FYGE.Shape { export function drawShape(paths: PathData[], dontFill: boolean = false): FYGE.Shape {
var shape = new FYGE.Shape(); var shape = new FYGE.Shape();
for (var i = 0; i < paths.length; i++) { for (var i = 0; i < paths.length; i++) {
var path = paths[i]; var path = paths[i];
//画路径 //画路径
shape.beginFill(0x5e2635, 1); !dontFill && shape.beginFill(0x5e2635, 1);
drawPoly(shape, path) drawPoly(shape, path)
//画洞了 //画洞了
for (var j = 0; j < path.holes.length; j++) { for (var j = 0; j < path.holes.length; j++) {
...@@ -58,7 +58,7 @@ export function drawShape(paths: PathData[]): FYGE.Shape { ...@@ -58,7 +58,7 @@ export function drawShape(paths: PathData[]): FYGE.Shape {
drawPoly(shape, hole) drawPoly(shape, hole)
} }
//最终绘制 //最终绘制
shape.endFill() !dontFill && shape.endFill()
} }
return shape return shape
} }
......
src/something/periodAni/VerticalBgAni.ts
View file @ 8c5d2091
...@@ -10,13 +10,13 @@ export class VerticalBgAni extends FYGE.Container { ...@@ -10,13 +10,13 @@ export class VerticalBgAni extends FYGE.Container {
count: number = 0; count: number = 0;
constructor() { constructor() {
super() super()
var textureL: FYGE.Texture = RES.getRes("leftArrow_png") var textureL: FYGE.Texture = RES.getRes("leftArrow.png")
this.upArrow = new FYGE.Sprite; (textureL); this.upArrow = new FYGE.Sprite; (textureL);
this.upArrow.rotation = 90; this.upArrow.rotation = 90;
this.upArrow.x = textureL.width / 2 + 1; this.upArrow.x = textureL.width / 2 + 1;
this.upArrow.y = -45 this.upArrow.y = -45
this.addChild(this.upArrow); this.addChild(this.upArrow);
var textureR: FYGE.Texture = RES.getRes("rightArrow_png") var textureR: FYGE.Texture = RES.getRes("rightArrow.png")
this.downArrow = new FYGE.Sprite(textureR); this.downArrow = new FYGE.Sprite(textureR);
this.downArrow.rotation = 90; this.downArrow.rotation = 90;
this.downArrow.x = textureR.width / 2 + 1; this.downArrow.x = textureR.width / 2 + 1;
...@@ -54,8 +54,8 @@ export class VerticalBgAni extends FYGE.Container { ...@@ -54,8 +54,8 @@ export class VerticalBgAni extends FYGE.Container {
this.direction = true; this.direction = true;
this.count = 0; this.count = 0;
var textureL: FYGE.Texture = RES.getRes("leftArrow_png") var textureL: FYGE.Texture = RES.getRes("leftArrow.png")
var textureR: FYGE.Texture = RES.getRes("rightArrow_png") var textureR: FYGE.Texture = RES.getRes("rightArrow.png")
this.upArrow.x = textureL.width / 2 + 1; this.upArrow.x = textureL.width / 2 + 1;
this.upArrow.y = -45 this.upArrow.y = -45
this.downArrow.x = textureR.width / 2 + 1; this.downArrow.x = textureR.width / 2 + 1;
......
src/something/states/LockState.ts
View file @ 8c5d2091
...@@ -41,7 +41,7 @@ export class LockState extends State { ...@@ -41,7 +41,7 @@ export class LockState extends State {
// private showImage: egret.Bitmap; // private showImage: egret.Bitmap;
// constructor() { // constructor() {
// super() // super()
// var texture: egret.Texture = RES.getRes("lockVine_png") // var texture: egret.Texture = RES.getRes("lockVine.png")
// this.showImage = new egret.Bitmap(texture); // this.showImage = new egret.Bitmap(texture);
// this.addChild(this.showImage); // this.addChild(this.showImage);
// this.showImage.x = -texture.textureWidth / 2; // this.showImage.x = -texture.textureWidth / 2;
...@@ -71,7 +71,7 @@ export class LockState extends State { ...@@ -71,7 +71,7 @@ export class LockState extends State {
// constructor() { // constructor() {
// super() // super()
// this.aniName = "LockAni"; // this.aniName = "LockAni";
// this.lockDown = new eui.Image("lockDown_png"); // this.lockDown = new eui.Image("lockDown.png");
// this.addChild(this.lockDown); // this.addChild(this.lockDown);
// setTimeout(() => { // setTimeout(() => {
// this.lockDown.x = -this.lockDown.width / 2; // this.lockDown.x = -this.lockDown.width / 2;
...@@ -85,7 +85,7 @@ export class LockState extends State { ...@@ -85,7 +85,7 @@ export class LockState extends State {
// this.addChild(mask); // this.addChild(mask);
// this.lockDown.mask = mask; // this.lockDown.mask = mask;
// this.lockUp = new eui.Image("lockUp_png"); // this.lockUp = new eui.Image("lockUp.png");
// this.addChild(this.lockUp); // this.addChild(this.lockUp);
// setTimeout(() => { // setTimeout(() => {
// this.lockUp.x = -this.lockUp.width / 2; // this.lockUp.x = -this.lockUp.width / 2;
......
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