Commit b40b44ea authored by wjf's avatar wjf

l

parent 2e2ca461
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
/* background-color: #000000; */ background-color: #f5cccd;
/* background: linear-gradient(#93dbb7,#ff0,#b5d89a); */ /* background: linear-gradient(#93dbb7,#ff0,#b5d89a); */
background: linear-gradient(#93dbb7,#b5d89a); /* background: linear-gradient(#93dbb7,#b5d89a); */
} }
</style> </style>
</head> </head>
......
{
"code": "000000",
"data": 1,
"success": true,
"message": "成功"
}
\ No newline at end of file
{
"code": "000000",
"data": {
"tools": {
"HAMMERS": 1,
"STEPS": 0,
"BOOMS": 0
}
},
"success": true,
"message": "成功"
}
\ No newline at end of file
{
"code": "000000",
"data": {
"power": 3
},
"success": true,
"message": "成功"
}
\ No newline at end of file
{
"code": "530001",
"data": {
"isvip": false,
"url": "//market.m.taobao.com/apps/market/shopmember/index.html?wh_weex=true&sellerId=2207623078795&extraInfo=%7B%22source%22%3A%22isvapp%22%2C%22entrance%22%3A%22duiba%22%7D"
},
"success": false,
"message": "需要成为会员"
}
\ No newline at end of file
{
"code": "000000",
"data": {
"currentLevel": 11,
"prize": {},
"isPrizeLevel": false,
"tool": {}
},
"success": true,
"message": "成功"
}
\ No newline at end of file
{
"code": "000000",
"data": {
"currentLevel": 11,
"visitors": [
{
"activityId": "5f08084ec3ad3494b9201c0e",
"score": 10000,
"level": 120,
"createTime": 1594370024407,
"openId": "AAHuCvE-ALiIWXYsJuTb5S4W",
"isVisitSuccess": true,
"updateTime": 1594370024407,
"_id": "5f0827e89da67191b6b29261",
"stars": 3,
"isPrizeLevel": false,
"sendAwardType": true
},
{
"activityId": "5f08084ec3ad3494b9201c0e",
"score": 10000,
"level": 10,
"createTime": 1594370106090,
"openId": "AAHuCvE-ALiIWXYsJuTb5S4W",
"isVisitSuccess": true,
"updateTime": 1594370106090,
"_id": "5f08283a75cfb693ea1b3d5b",
"stars": 3,
"isPrizeLevel": true,
"sendAwardType": "prize"
},
{
"activityId": "5f08084ec3ad3494b9201c0e",
"score": 10000,
"level": 1,
"createTime": 1594369315957,
"openId": "AAHuCvE-ALiIWXYsJuTb5S4W",
"isVisitSuccess": true,
"updateTime": 1594369868256,
"_id": "5f082523c3ad3494b92036bf",
"stars": 3,
"isPrizeLevel": false,
"sendAwardType": true
}
],
"prizes": [
{
"receiveTime": "",
"level": 120,
"isReceive": false
}
],
"power": 3,
"tools": {
"HAMMERS": 1,
"STEPS": 0,
"BOOMS": 0
},
"topAward": ""
},
"success": true,
"message": "成功"
}
\ No newline at end of file
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"message": "OK", "message": "OK",
"data": { "data": {
"power": 100, "power": 100,
"currentLevel": 1, "currentLevel": 120,
"tools": { "tools": {
"STEPS": 1, "STEPS": 1,
"BOOMS": 2, "BOOMS": 2,
......
{
"code": "000000",
"data": [
{
"switchStock": 1,
"image": "https://img.alicdn.com/imgextra/i2/2275046294/O1CN01c4rCs11wMhRrsjEep_!!2275046294-2-miniprogram.png",
"isBackUp": false,
"properiodto": 1600,
"level": 1,
"probability": "16",
"openId": "AAFwCvE-ALiIWXYsJuTQVRpH",
"prizeType": 60,
"updateTime": 1594623032191,
"type": 3,
"properiodfrom": 1,
"activityId": "5f08084ec3ad3494b9201c0e",
"ename": "",
"lockStatus": 1,
"credits": "",
"createTime": 1594361933509,
"deleteStatus": 1,
"name": "60关奖品3",
"useStock": 1,
"rank": "",
"_id": "5f08084e0cb7338a0a377c8e",
"id": "",
"stock": 200
},
{
"isBackUp": true,
"properiodto": 10000,
"level": 2,
"probability": "84",
"prizeType": 60,
"updateTime": 1594623032197,
"type": 5,
"properiodfrom": 1601,
"activityId": "5f08084ec3ad3494b9201c0e",
"lockStatus": 1,
"createTime": 1594623032197,
"deleteStatus": 1,
"name": "谢谢参与",
"useStock": 0,
"_id": "5f0c043852bbde91d1ca5682"
}
],
"success": true,
"message": "成功"
}
\ No newline at end of file
{
"code": "000000",
"data": [
{
"taskType": "member",
"times": 1,
"todayCompleteTimes": 0,
"waitReceive": 0,
"rewards": 65
},
{
"taskType": "invites",
"times": 3,
"todayCompleteTimes": 0,
"waitReceive": 0,
"value": "",
"rewards": 10
},
{
"taskType": "follow",
"times": 1,
"todayCompleteTimes": 0,
"waitReceive": 0,
"value": "",
"rewards": 7
},
{
"taskType": "browseGoods",
"times": 3,
"todayCompleteTimes": 0,
"waitReceive": 0,
"value": "",
"rewards": 10
}
],
"success": true,
"message": "成功"
}
\ No newline at end of file
{
"success": false,
"message": "您还不是会员",
"data": {
"isvip": false,
"url": "xxx",
"credits": 1111
}
}
\ No newline at end of file
{
"code":"000000",
"data":1,
"success":true,
"message":"成功"
}
\ No newline at end of file
{ {
"groups": [ "groups": [
{
"keys": "bonusTime0.png,bonusTime1.png,bonusTime10.png,bonusTime11.png,bonusTime12.png,bonusTime13.png,bonusTime14.png,bonusTime15.png,bonusTime16.png,bonusTime17.png,bonusTime18.png,bonusTime19.png,bonusTime2.png,bonusTime20.png,bonusTime21.png,bonusTime22.png,bonusTime23.png,bonusTime24.png,bonusTime25.png,bonusTime26.png,bonusTime27.png,bonusTime28.png,bonusTime3.png,bonusTime4.png,bonusTime5.png,bonusTime6.png,bonusTime7.png,bonusTime8.png,bonusTime9.png",
"name": "bonusTime"
},
{ {
"keys": "增加体力背景.png,无字按钮底.png", "keys": "增加体力背景.png,无字按钮底.png",
"name": "BuyPowerPanel" "name": "BuyPowerPanel"
}, },
{ {
<<<<<<< HEAD "keys": "comCloseBtn.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"keys": "comCloseBtn.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common" "name": "common"
}, },
{ {
=======
>>>>>>> 53f0d1bd52890e958613d5588c5c300802cabe5e
"keys": "积分不足背景.png,赚取积分.png", "keys": "积分不足背景.png,赚取积分.png",
"name": "CreditsOutPanel" "name": "CreditsOutPanel"
}, },
...@@ -23,10 +24,38 @@ ...@@ -23,10 +24,38 @@
"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_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_ele3_0.png,hor_ele3_1.png,hor_ele3_10.png,hor_ele3_11.png,hor_ele3_12.png,hor_ele3_13.png,hor_ele3_14.png,hor_ele3_15.png,hor_ele3_2.png,hor_ele3_3.png,hor_ele3_4.png,hor_ele3_5.png,hor_ele3_6.png,hor_ele3_7.png,hor_ele3_8.png,hor_ele3_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": "cur_light_1.png,cur_light_2.png,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,water1.png,water2.png",
"name": "map"
},
{
"keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png",
"name": "mapCheckPrizeEffect"
},
{
"keys": "map_crab_0.png,map_crab_1.png,map_crab_10.png,map_crab_11.png,map_crab_12.png,map_crab_13.png,map_crab_14.png,map_crab_15.png,map_crab_16.png,map_crab_17.png,map_crab_18.png,map_crab_19.png,map_crab_2.png,map_crab_20.png,map_crab_21.png,map_crab_22.png,map_crab_23.png,map_crab_24.png,map_crab_25.png,map_crab_26.png,map_crab_27.png,map_crab_28.png,map_crab_29.png,map_crab_3.png,map_crab_30.png,map_crab_4.png,map_crab_5.png,map_crab_6.png,map_crab_7.png,map_crab_8.png,map_crab_9.png",
"name": "mapCrabEffect"
},
{
"keys": "map_owl_0.png,map_owl_1.png,map_owl_10.png,map_owl_11.png,map_owl_12.png,map_owl_13.png,map_owl_14.png,map_owl_15.png,map_owl_2.png,map_owl_3.png,map_owl_4.png,map_owl_5.png,map_owl_6.png,map_owl_7.png,map_owl_8.png,map_owl_9.png",
"name": "mapOwlEffect"
},
{
"keys": "map_whale_0.png,map_whale_1.png,map_whale_10.png,map_whale_11.png,map_whale_12.png,map_whale_2.png,map_whale_3.png,map_whale_4.png,map_whale_5.png,map_whale_6.png,map_whale_7.png,map_whale_8.png,map_whale_9.png",
"name": "mapWhaleEffect"
},
{ {
"keys": "体力不足Bg.png,体力不足按钮.png", "keys": "体力不足Bg.png,体力不足按钮.png",
"name": "NoEnergyPanel" "name": "NoEnergyPanel"
...@@ -36,13 +65,10 @@ ...@@ -36,13 +65,10 @@
"name": "NoStepBtn" "name": "NoStepBtn"
}, },
{ {
<<<<<<< HEAD "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,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.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,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,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.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,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"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,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.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,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,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBtn.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,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene" "name": "playScene"
}, },
{ {
=======
>>>>>>> 53f0d1bd52890e958613d5588c5c300802cabe5e
"keys": "活动规则背景.png", "keys": "活动规则背景.png",
"name": "RulePanel" "name": "RulePanel"
}, },
...@@ -73,46 +99,6 @@ ...@@ -73,46 +99,6 @@
{ {
"keys": "使用道具背景.png", "keys": "使用道具背景.png",
"name": "UseToolPanel" "name": "UseToolPanel"
},
{
"keys": "bonusTime0.png,bonusTime1.png,bonusTime10.png,bonusTime11.png,bonusTime12.png,bonusTime13.png,bonusTime14.png,bonusTime15.png,bonusTime16.png,bonusTime17.png,bonusTime18.png,bonusTime19.png,bonusTime2.png,bonusTime20.png,bonusTime21.png,bonusTime22.png,bonusTime23.png,bonusTime24.png,bonusTime25.png,bonusTime26.png,bonusTime27.png,bonusTime28.png,bonusTime3.png,bonusTime4.png,bonusTime5.png,bonusTime6.png,bonusTime7.png,bonusTime8.png,bonusTime9.png",
"name": "bonusTime"
},
{
"keys": "comCloseBtn.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common"
},
{
"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_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_ele3_0.png,hor_ele3_1.png,hor_ele3_10.png,hor_ele3_11.png,hor_ele3_12.png,hor_ele3_13.png,hor_ele3_14.png,hor_ele3_15.png,hor_ele3_2.png,hor_ele3_3.png,hor_ele3_4.png,hor_ele3_5.png,hor_ele3_6.png,hor_ele3_7.png,hor_ele3_8.png,hor_ele3_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": "cur_light_1.png,cur_light_2.png,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,water1.png,water2.png",
"name": "map"
},
{
"keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png",
"name": "mapCheckPrizeEffect"
},
{
"keys": "map_crab_0.png,map_crab_1.png,map_crab_10.png,map_crab_11.png,map_crab_12.png,map_crab_13.png,map_crab_14.png,map_crab_15.png,map_crab_16.png,map_crab_17.png,map_crab_18.png,map_crab_19.png,map_crab_2.png,map_crab_20.png,map_crab_21.png,map_crab_22.png,map_crab_23.png,map_crab_24.png,map_crab_25.png,map_crab_26.png,map_crab_27.png,map_crab_28.png,map_crab_29.png,map_crab_3.png,map_crab_30.png,map_crab_4.png,map_crab_5.png,map_crab_6.png,map_crab_7.png,map_crab_8.png,map_crab_9.png",
"name": "mapCrabEffect"
},
{
"keys": "map_owl_0.png,map_owl_1.png,map_owl_10.png,map_owl_11.png,map_owl_12.png,map_owl_13.png,map_owl_14.png,map_owl_15.png,map_owl_2.png,map_owl_3.png,map_owl_4.png,map_owl_5.png,map_owl_6.png,map_owl_7.png,map_owl_8.png,map_owl_9.png",
"name": "mapOwlEffect"
},
{
"keys": "map_whale_0.png,map_whale_1.png,map_whale_10.png,map_whale_11.png,map_whale_12.png,map_whale_2.png,map_whale_3.png,map_whale_4.png,map_whale_5.png,map_whale_6.png,map_whale_7.png,map_whale_8.png,map_whale_9.png",
"name": "mapWhaleEffect"
},
{
"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,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.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,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,rectLat.png,rectLatWhite.png,redDoorBg.png,redNum0.png,redNum1.png,redNum2.png,redNum3.png,redNum4.png,redNum5.png,redNum6.png,redNum7.png,redNum8.png,redNum9.png,redNum关.png,redNum冒号.png,redNum分.png,redNum数.png,redNum第.png,redNum通.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.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,table.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene"
} }
], ],
"path": "./resource/" "path": "./resource/"
......
export const ResJson = { export const ResJson = {
"groups": [ "groups": [
{
"keys": "bonusTime0.png,bonusTime1.png,bonusTime10.png,bonusTime11.png,bonusTime12.png,bonusTime13.png,bonusTime14.png,bonusTime15.png,bonusTime16.png,bonusTime17.png,bonusTime18.png,bonusTime19.png,bonusTime2.png,bonusTime20.png,bonusTime21.png,bonusTime22.png,bonusTime23.png,bonusTime24.png,bonusTime25.png,bonusTime26.png,bonusTime27.png,bonusTime28.png,bonusTime3.png,bonusTime4.png,bonusTime5.png,bonusTime6.png,bonusTime7.png,bonusTime8.png,bonusTime9.png",
"name": "bonusTime"
},
{ {
"keys": "增加体力背景.png,无字按钮底.png", "keys": "增加体力背景.png,无字按钮底.png",
"name": "BuyPowerPanel" "name": "BuyPowerPanel"
}, },
{ {
<<<<<<< HEAD "keys": "comCloseBtn.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"keys": "comCloseBtn.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common" "name": "common"
}, },
{ {
=======
>>>>>>> 53f0d1bd52890e958613d5588c5c300802cabe5e
"keys": "积分不足背景.png,赚取积分.png", "keys": "积分不足背景.png,赚取积分.png",
"name": "CreditsOutPanel" "name": "CreditsOutPanel"
}, },
...@@ -23,10 +24,38 @@ export const ResJson = { ...@@ -23,10 +24,38 @@ 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_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_ele3_0.png,hor_ele3_1.png,hor_ele3_10.png,hor_ele3_11.png,hor_ele3_12.png,hor_ele3_13.png,hor_ele3_14.png,hor_ele3_15.png,hor_ele3_2.png,hor_ele3_3.png,hor_ele3_4.png,hor_ele3_5.png,hor_ele3_6.png,hor_ele3_7.png,hor_ele3_8.png,hor_ele3_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": "cur_light_1.png,cur_light_2.png,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,water1.png,water2.png",
"name": "map"
},
{
"keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png",
"name": "mapCheckPrizeEffect"
},
{
"keys": "map_crab_0.png,map_crab_1.png,map_crab_10.png,map_crab_11.png,map_crab_12.png,map_crab_13.png,map_crab_14.png,map_crab_15.png,map_crab_16.png,map_crab_17.png,map_crab_18.png,map_crab_19.png,map_crab_2.png,map_crab_20.png,map_crab_21.png,map_crab_22.png,map_crab_23.png,map_crab_24.png,map_crab_25.png,map_crab_26.png,map_crab_27.png,map_crab_28.png,map_crab_29.png,map_crab_3.png,map_crab_30.png,map_crab_4.png,map_crab_5.png,map_crab_6.png,map_crab_7.png,map_crab_8.png,map_crab_9.png",
"name": "mapCrabEffect"
},
{
"keys": "map_owl_0.png,map_owl_1.png,map_owl_10.png,map_owl_11.png,map_owl_12.png,map_owl_13.png,map_owl_14.png,map_owl_15.png,map_owl_2.png,map_owl_3.png,map_owl_4.png,map_owl_5.png,map_owl_6.png,map_owl_7.png,map_owl_8.png,map_owl_9.png",
"name": "mapOwlEffect"
},
{
"keys": "map_whale_0.png,map_whale_1.png,map_whale_10.png,map_whale_11.png,map_whale_12.png,map_whale_2.png,map_whale_3.png,map_whale_4.png,map_whale_5.png,map_whale_6.png,map_whale_7.png,map_whale_8.png,map_whale_9.png",
"name": "mapWhaleEffect"
},
{ {
"keys": "体力不足Bg.png,体力不足按钮.png", "keys": "体力不足Bg.png,体力不足按钮.png",
"name": "NoEnergyPanel" "name": "NoEnergyPanel"
...@@ -36,13 +65,10 @@ export const ResJson = { ...@@ -36,13 +65,10 @@ export const ResJson = {
"name": "NoStepBtn" "name": "NoStepBtn"
}, },
{ {
<<<<<<< HEAD "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,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.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,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,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.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,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"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,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.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,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,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBtn.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,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene" "name": "playScene"
}, },
{ {
=======
>>>>>>> 53f0d1bd52890e958613d5588c5c300802cabe5e
"keys": "活动规则背景.png", "keys": "活动规则背景.png",
"name": "RulePanel" "name": "RulePanel"
}, },
...@@ -73,46 +99,6 @@ export const ResJson = { ...@@ -73,46 +99,6 @@ export const ResJson = {
{ {
"keys": "使用道具背景.png", "keys": "使用道具背景.png",
"name": "UseToolPanel" "name": "UseToolPanel"
},
{
"keys": "bonusTime0.png,bonusTime1.png,bonusTime10.png,bonusTime11.png,bonusTime12.png,bonusTime13.png,bonusTime14.png,bonusTime15.png,bonusTime16.png,bonusTime17.png,bonusTime18.png,bonusTime19.png,bonusTime2.png,bonusTime20.png,bonusTime21.png,bonusTime22.png,bonusTime23.png,bonusTime24.png,bonusTime25.png,bonusTime26.png,bonusTime27.png,bonusTime28.png,bonusTime3.png,bonusTime4.png,bonusTime5.png,bonusTime6.png,bonusTime7.png,bonusTime8.png,bonusTime9.png",
"name": "bonusTime"
},
{
"keys": "comCloseBtn.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common"
},
{
"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_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_ele3_0.png,hor_ele3_1.png,hor_ele3_10.png,hor_ele3_11.png,hor_ele3_12.png,hor_ele3_13.png,hor_ele3_14.png,hor_ele3_15.png,hor_ele3_2.png,hor_ele3_3.png,hor_ele3_4.png,hor_ele3_5.png,hor_ele3_6.png,hor_ele3_7.png,hor_ele3_8.png,hor_ele3_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": "cur_light_1.png,cur_light_2.png,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,water1.png,water2.png",
"name": "map"
},
{
"keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png",
"name": "mapCheckPrizeEffect"
},
{
"keys": "map_crab_0.png,map_crab_1.png,map_crab_10.png,map_crab_11.png,map_crab_12.png,map_crab_13.png,map_crab_14.png,map_crab_15.png,map_crab_16.png,map_crab_17.png,map_crab_18.png,map_crab_19.png,map_crab_2.png,map_crab_20.png,map_crab_21.png,map_crab_22.png,map_crab_23.png,map_crab_24.png,map_crab_25.png,map_crab_26.png,map_crab_27.png,map_crab_28.png,map_crab_29.png,map_crab_3.png,map_crab_30.png,map_crab_4.png,map_crab_5.png,map_crab_6.png,map_crab_7.png,map_crab_8.png,map_crab_9.png",
"name": "mapCrabEffect"
},
{
"keys": "map_owl_0.png,map_owl_1.png,map_owl_10.png,map_owl_11.png,map_owl_12.png,map_owl_13.png,map_owl_14.png,map_owl_15.png,map_owl_2.png,map_owl_3.png,map_owl_4.png,map_owl_5.png,map_owl_6.png,map_owl_7.png,map_owl_8.png,map_owl_9.png",
"name": "mapOwlEffect"
},
{
"keys": "map_whale_0.png,map_whale_1.png,map_whale_10.png,map_whale_11.png,map_whale_12.png,map_whale_2.png,map_whale_3.png,map_whale_4.png,map_whale_5.png,map_whale_6.png,map_whale_7.png,map_whale_8.png,map_whale_9.png",
"name": "mapWhaleEffect"
},
{
"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,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.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,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,rectLat.png,rectLatWhite.png,redDoorBg.png,redNum0.png,redNum1.png,redNum2.png,redNum3.png,redNum4.png,redNum5.png,redNum6.png,redNum7.png,redNum8.png,redNum9.png,redNum关.png,redNum冒号.png,redNum分.png,redNum数.png,redNum第.png,redNum通.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.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,table.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene"
} }
], ],
"path": "./resource/" "path": "./resource/"
......
...@@ -9,9 +9,61 @@ export enum TbNetName { ...@@ -9,9 +9,61 @@ export enum TbNetName {
* activityId params elemType * activityId params elemType
*/ */
trackingReport = "squirrelsAdoptRest2c.trackingReport", trackingReport = "squirrelsAdoptRest2c.trackingReport",
/**
* 进入活动调用, 刷新数据不调用该接口
* activityId userNick avatar follow inviteId
*/
getIndex = "babycare.getIndex", getIndex = "babycare.getIndex",
/**
* 获取游戏信息
* activityId
*/
getGameInfo = "babycare.getGameInfo",
/**
* 消耗道具 ,会返回剩余所有道具数量
* activityId type
*/
consumerTools = "babycare.consumerTools",
/**
* 提交分数
* activityId level score stars isVisitSuccess(是否通关)
*/
gameOver = "babycare.gameOver",
/**
* 领取任务奖励
* activityId taskType
*/
receiveTaskRewards = "babycare.receiveTaskRewards",
/**
* 积分兑换道具和体力
* activityId type credits
*/
exchange = "babycare.exchange",
/**
* 根据等级获取奖品列表
* activityId level
*/
getPrizesByLevel = "babycare.getPrizesByLevel",
/**
* 查询用户积分
* activityId
*/
queryCredits = "babycare.queryCredits",
/**
* 开始闯关,会返回体力值
* activityId level
*/
dojoin = "babycare.dojoin",
/**
* 完成任务(浏览商品详情页, 关注店铺)
* activityId taskType
*/
completeTask = "babycare.completeTask",
/**
* 任务列表
* activityId
*/
getTaskList = "babycare.getTaskList",
///////////////////前端调用接口都加个mine ///////////////////前端调用接口都加个mine
...@@ -35,7 +87,7 @@ export enum TbNetName { ...@@ -35,7 +87,7 @@ export enum TbNetName {
*/ */
getAdoptName = "mine.getAdoptName", getAdoptName = "mine.getAdoptName",
//基本都是前端同步方法 ///////////////////////////基本都是前端同步方法
/** /**
* 获取参数 * 获取参数
*/ */
......
...@@ -4,6 +4,7 @@ import Tween = FYGE.Tween; ...@@ -4,6 +4,7 @@ import Tween = FYGE.Tween;
import DisplayObject = FYGE.DisplayObject; import DisplayObject = FYGE.DisplayObject;
import Ease = FYGE.Ease; import Ease = FYGE.Ease;
import { sendTbNet, TbNetName } from "./TaoBaoNet"; import { sendTbNet, TbNetName } from "./TaoBaoNet";
import { PropType } from "./something/enum/PropType";
/** /**
* 定制,记录一些全局量和方法 * 定制,记录一些全局量和方法
...@@ -28,7 +29,99 @@ export class Tools { ...@@ -28,7 +29,99 @@ export class Tools {
"inviteId": string, "inviteId": string,
"isFollow": boolean "isFollow": boolean
} }
/**
* 游戏数据,需要根据接口维护
*/
public static gameData: {
"currentLevel": number,
"visitors": {
"score": number,
"level": number,
"isVisitSuccess": boolean,
"stars": number,
}[],
"prizes": {
"receiveTime": string,//number
"level": number,
"isReceive": boolean
}[],
"power": number,
"tools": {
"HAMMERS": number,
"STEPS": number,
"BOOMS": number
},
"isFristLogin": boolean,//是否是首次
"topAward": any//120关自动开奖
}
/**
* 首页数据,loading页面执行一次
*/
public static getIndex() {
return new Promise((r) => {
sendTbNet(TbNetName.getIndex, {
userNick: this.globalData.nickName,
avatar: this.globalData.avatar,
follow: this.globalData.isFollow,
inviteId: this.globalData.inviteId,
}, (s, res) => {
if (s) this.gameData = res.data;
r(s);
})
})
}
/**
* 进入地图页面刷新
*/
public static getGameInfo() {
return new Promise((r) => {
sendTbNet(TbNetName.getGameInfo, (s, res) => {
if (s) this.gameData = res.data;
r(s);
})
})
}
/**
* 消耗道具
*/
public static consumerTools(type: PropType): Promise<boolean> {
return new Promise((resolve, reject) => {
sendTbNet(TbNetName.consumerTools, { type }, (s, res) => {
if (s) {
//修改道具数量
this.gameData.tools = res.data.tools;
// resolve(res);//数据按照gameData的更新,不返回
resolve(true)
} else {
reject()
}
})
})
}
/**
* 兑换道具,根据返回参数判断
*/
public static async exchange(type: PropType): Promise<boolean | string> {
//先获取积分,判断是否有积分
var creditsData = await sendTbNet(TbNetName.queryCredits)
//接口失败,没数据时,返回false
if (!creditsData || !creditsData.data) {
return false
}
//非会员,返回会员路径
if (creditsData && !creditsData.success && !creditsData.data.isvip) {
return creditsData.data.url
}
const res = await sendTbNet(TbNetName.exchange, { type, credits: creditsData.data.credits })
if (res.success) {
//修改道具数量和体力
this.gameData.power = res.data.power;
this.gameData.tools = res.data.tools;
return true;//可根据gameData修改视图
} else {
return false;
}
}
/** /**
* 询问权限用 * 询问权限用
*/ */
......
import { Panel } from "../../module/views/Panel"; import { Panel } from "../../module/views/Panel";
import { PropType } from "../something/enum/PropType";
export class ToolsOutPanel extends Panel { export class ToolsOutPanel extends Panel {
get groupNames() { return ["ToolsOutPanel"] } get groupNames() { return ["ToolsOutPanel"] }
get skinName() { return "ToolsOutPanel" } get skinName() { return "ToolsOutPanel" }
consideBtn:FYGE.Button; consideBtn: FYGE.Button;
sureBtn:FYGE.Button; sureBtn: FYGE.Button;
closeBtn:FYGE.Button; closeBtn: FYGE.Button;
msgTxt:FYGE.TextField; msgTxt: FYGE.TextField;
data: {
type: PropType;
}
initUi() { initUi() {
......
...@@ -52,8 +52,9 @@ import { GTool } from '../../module/tools/GTool'; ...@@ -52,8 +52,9 @@ import { GTool } from '../../module/tools/GTool';
import { Tools } from '../Tools'; import { Tools } from '../Tools';
import { PropType } from '../something/enum/PropType'; import { PropType } from '../something/enum/PropType';
import { RES } from '../../module/RES'; import { RES } from '../../module/RES';
import { showToast } from '../../module/ctrls'; import { showToast, showWaiting, showPanel } from '../../module/ctrls';
import { layers } from '../../module/views/layers'; import { layers } from '../../module/views/layers';
import { ToolsOutPanel } from '../panels/ToolsOutPanel';
const aniClass = { const aniClass = {
"BoomAni": BoomAni, "BoomAni": BoomAni,
...@@ -217,7 +218,7 @@ export class PlayScene extends Scene { ...@@ -217,7 +218,7 @@ export class PlayScene extends Scene {
this._score = value; this._score = value;
FYGE.Tween.removeTweens(this.scoreProgress); FYGE.Tween.removeTweens(this.scoreProgress);
FYGE.Tween.get(this.scoreProgress, {}, null, true) FYGE.Tween.get(this.scoreProgress, {}, null, true)
.to({score: value}, 300) .to({ score: value }, 300)
} }
//所有道具容器 //所有道具容器
...@@ -444,17 +445,17 @@ export class PlayScene extends Scene { ...@@ -444,17 +445,17 @@ export class PlayScene extends Scene {
const [row, col] = rc; const [row, col] = rc;
//不用考虑0 //不用考虑0
if (!endRowNumHash[col]) { if (!endRowNumHash[col]) {
endRowNumHash[col] = {row: row, index: i}; endRowNumHash[col] = { row: row, index: i };
} }
if (row > endRowNumHash[col].row) { if (row > endRowNumHash[col].row) {
endRowNumHash[col] = {row: row, index: i}; endRowNumHash[col] = { row: row, index: i };
} }
//取大行数 //取大行数
endRowNum = Math.max(rc[0], endRowNum) endRowNum = Math.max(rc[0], endRowNum)
} }
this.recycleIndexs = []; this.recycleIndexs = [];
for (const key in endRowNumHash) { for (const key in endRowNumHash) {
const {index, row} = endRowNumHash[key]; const { index, row } = endRowNumHash[key];
if (endRowNum == row) this.recycleIndexs.push(index) if (endRowNum == row) this.recycleIndexs.push(index)
} }
} }
...@@ -512,7 +513,7 @@ export class PlayScene extends Scene { ...@@ -512,7 +513,7 @@ export class PlayScene extends Scene {
//冰块数据 2 3 5 6 或者51 61 //冰块数据 2 3 5 6 或者51 61
var iceData = [2, 3, 5, 6, 51, 61] var iceData = [2, 3, 5, 6, 51, 61]
if (iceData.indexOf(latticesD[i]) >= 0) { if (iceData.indexOf(latticesD[i]) >= 0) {
var iceCount = (function(n) { var iceCount = (function (n) {
if (n == 2 || n == 3) return n - 1; if (n == 2 || n == 3) return n - 1;
if (n == 5 || n == 6) return n - 4; if (n == 5 || n == 6) return n - 4;
return parseInt((n + "").split("")[0]) - 4; return parseInt((n + "").split("")[0]) - 4;
...@@ -774,9 +775,9 @@ export class PlayScene extends Scene { ...@@ -774,9 +775,9 @@ export class PlayScene extends Scene {
* 绝对别修改,其他地方有调用的 * 绝对别修改,其他地方有调用的
*/ */
updateScene() { updateScene() {
// this.propBtnCon.boomBtn.propNumShow.count = getPropNums(PropType.BOOMS); // this.propBtnCon.boomCount = Tools.gameData.tools.BOOMS;
// this.propBtnCon.hammerBtn.propNumShow.count = getPropNums(PropType.HAMMERS); // this.propBtnCon.hammerCount = Tools.gameData.tools.HAMMERS;
// this.propBtnCon.stepBtn.propNumShow.count = getPropNums(PropType.STEPS); // this.propBtnCon.stepCount = Tools.gameData.tools.STEPS;
} }
//侦听事件 //侦听事件
...@@ -829,19 +830,19 @@ export class PlayScene extends Scene { ...@@ -829,19 +830,19 @@ export class PlayScene extends Scene {
var ay = a.y; var ay = a.y;
var bx = b.x; var bx = b.x;
var by = b.y; var by = b.y;
FYGE.Tween.get(a, {loop: true}) FYGE.Tween.get(a, { loop: true })
.to({x: (bx - ax) / 10 + ax, y: (by - ay) / 10 + ay}, 100) .to({ x: (bx - ax) / 10 + ax, y: (by - ay) / 10 + ay }, 100)
.to({x: ax, y: ay}, 100) .to({ x: ax, y: ay }, 100)
.wait(200) .wait(200)
.to({x: (bx - ax) / 10 + ax, y: (by - ay) / 10 + ay}, 100) .to({ x: (bx - ax) / 10 + ax, y: (by - ay) / 10 + ay }, 100)
.to({x: ax, y: ay}, 100) .to({ x: ax, y: ay }, 100)
.wait(400) .wait(400)
FYGE.Tween.get(b, {loop: true}) FYGE.Tween.get(b, { loop: true })
.to({x: (ax - bx) / 10 + bx, y: (ay - by) / 10 + by}, 100) .to({ x: (ax - bx) / 10 + bx, y: (ay - by) / 10 + by }, 100)
.to({x: bx, y: by}, 100) .to({ x: bx, y: by }, 100)
.wait(200) .wait(200)
.to({x: (ax - bx) / 10 + bx, y: (ay - by) / 10 + by}, 100) .to({ x: (ax - bx) / 10 + bx, y: (ay - by) / 10 + by }, 100)
.to({x: bx, y: by}, 100) .to({ x: bx, y: by }, 100)
.wait(400) .wait(400)
} }
...@@ -866,18 +867,6 @@ export class PlayScene extends Scene { ...@@ -866,18 +867,6 @@ export class PlayScene extends Scene {
// onTap_settingBtn() { // onTap_settingBtn() {
// this.settingGroup.visible = !this.settingGroup.visible; // this.settingGroup.visible = !this.settingGroup.visible;
// } // }
// onTap_questionBtn() {
// PanelCtrl.instance.show(ModuleTypes.RULE_PANEL);
// this.onTap_settingBtn();
// }
// onTap_soundBtnn() {
// toggleSound()
// if (getSoundOn()) {
// this.soundBtn.source = "mainSoundBtnOn.png"
// } else {
// this.soundBtn.source = "mainSoundBtnOff.png"
// }
// }
// onTap_musicBtn() { // onTap_musicBtn() {
// // toggleBg(); // // toggleBg();
// toggleGameBg(); // toggleGameBg();
...@@ -887,55 +876,22 @@ export class PlayScene extends Scene { ...@@ -887,55 +876,22 @@ export class PlayScene extends Scene {
// this.musicBtn.source = "mainMusicBtnOff.png" // this.musicBtn.source = "mainMusicBtnOff.png"
// } // }
// } // }
// onTap_quitBtn() {
// PanelCtrl.instance.show("quit", { level: this.chapter });
// }
onTap_boomBtn() { onTap_boomBtn() {
// if (this.propBtnCon.boomBtn.propNumShow.count <= 0) { this.propBtnCon.boomCount ?
// //购买弹框 this.useProp(PropType.BOOMS) :
// PanelCtrl.instance.show("VideoBuyPanel", { showPanel(ToolsOutPanel, { type: PropType.BOOMS });//注意弹框逻辑,购买完后要调用updateScene
// propType: PropType.BOOMS,
// showVideo: !this.recordOnce.boom,
// complete: (isVideo) => {
// this.propBtnCon.boomBtn.propNumShow.count++;
// if (isVideo) this.recordOnce.boom = true;
// }
// })
// } else {
this.useProp(PropType.BOOMS)
// }
} }
onTap_hammerBtn() { onTap_hammerBtn() {
// if (this.propBtnCon.hammerBtn.propNumShow.count <= 0) { this.propBtnCon.hammerCount ?
// //购买弹框 this.useProp(PropType.HAMMERS) :
// PanelCtrl.instance.show("VideoBuyPanel", { showPanel(ToolsOutPanel, { type: PropType.HAMMERS });//注意弹框逻辑,购买完后要调用updateScene
// propType: PropType.HAMMERS,
// showVideo: !this.recordOnce.hammer,
// complete: (isVideo) => {
// this.propBtnCon.hammerBtn.propNumShow.count++;
// if (isVideo) this.recordOnce.hammer = true;
// }
// })
// } else {
this.useProp(PropType.HAMMERS)
// }
} }
onTap_stepBtn() { onTap_stepBtn() {
// if (this.propBtnCon.stepBtn.propNumShow.count <= 0) { this.propBtnCon.stepCount ?
// //购买弹框 this.useProp(PropType.STEPS) :
// PanelCtrl.instance.show("VideoBuyPanel", { showPanel(ToolsOutPanel, { type: PropType.STEPS });//注意弹框逻辑,购买完后要调用updateScene
// propType: PropType.STEPS,
// showVideo: !this.recordOnce.step,
// complete: (isVideo) => {
// this.propBtnCon.stepBtn.propNumShow.count++;
// if (isVideo) this.recordOnce.step = true;
// }
// })
// } else {
this.useProp(PropType.STEPS)
// }
} }
//使用道具逻辑 //使用道具逻辑
...@@ -960,7 +916,7 @@ export class PlayScene extends Scene { ...@@ -960,7 +916,7 @@ export class PlayScene extends Scene {
this.choosed.parent.removeChild(this.choosed) this.choosed.parent.removeChild(this.choosed)
} }
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.currentTarget.parent.parent; var ele = e.currentTarget.parent.parent;
if (ele instanceof Element && if (ele instanceof Element &&
// ele.type != ElementType.ROCK && // ele.type != ElementType.ROCK &&
...@@ -1004,12 +960,14 @@ export class PlayScene extends Scene { ...@@ -1004,12 +960,14 @@ export class PlayScene extends Scene {
} }
} }
sendPropUse(prop: PropType, index?: number) { async sendPropUse(prop: PropType, index?: number) {
//移除事件 //移除事件
this.propGuide.removeAllEventListener(); this.propGuide.removeAllEventListener();
//移除自己 //移除自己
this.removeChild(this.propGuide); this.removeChild(this.propGuide);
// NetManager.ins.hc_useProp((s, data) => { //接口
showWaiting();
var s = await Tools.consumerTools(prop);
//还原事件 //还原事件
this.addEventListener(FYGE.Event.ENTER_FRAME, this.onEnterFrame, this); this.addEventListener(FYGE.Event.ENTER_FRAME, this.onEnterFrame, this);
//区分 //区分
...@@ -1020,7 +978,7 @@ export class PlayScene extends Scene { ...@@ -1020,7 +978,7 @@ export class PlayScene extends Scene {
} else { } else {
this.removeChild(this.stepCircle) this.removeChild(this.stepCircle)
} }
// if (s) { if (s) {
//成功的 //成功的
switch (prop) { switch (prop) {
case PropType.BOOMS: case PropType.BOOMS:
...@@ -1064,23 +1022,17 @@ export class PlayScene extends Scene { ...@@ -1064,23 +1022,17 @@ export class PlayScene extends Scene {
// showToast("步数增加成功"); // showToast("步数增加成功");
break; break;
} }
// } else { //更新道具数量
// //失败的话,要继续能点击 this.updateScene();
// this.enableMouseEvt(true) } else {
// } //失败的话,要继续能点击
// if (data) { this.enableMouseEvt(true)
// //如果有返回数据,没有说明是网络问题,不发home }
// //更新道具数量
// NetManager.ins.hc_home(() => {
// this.updateScene();
// }, window['collectRuleId']);
// }
// }, prop)
} }
mouseDownE(e: FYGE.MouseEvent) { mouseDownE(e: FYGE.MouseEvent) {
//现在有两级,element的showImage是FrameAni //现在有两级,element的showImage是FrameAni
var ele = e.currentTarget.parent.parent var ele = e.currentTarget.parent.parent;
// console.log(e.currentTarget.parent.parent) // console.log(e.currentTarget.parent.parent)
// if (!this.enableTouch) return // if (!this.enableTouch) return
var self = this; var self = this;
...@@ -1157,7 +1109,7 @@ export class PlayScene extends Scene { ...@@ -1157,7 +1109,7 @@ export class PlayScene extends Scene {
private exchangeElementAni(s: Element, o: Element, callback?) { private exchangeElementAni(s: Element, o: Element, callback?) {
this.enableMouseEvt(false); this.enableMouseEvt(false);
FYGE.Tween.get(s) FYGE.Tween.get(s)
.to({x: o.x, y: o.y}, 166) .to({ x: o.x, y: o.y }, 166)
.call(() => { .call(() => {
if (callback) { if (callback) {
callback.bind(this)(s, o); callback.bind(this)(s, o);
...@@ -1166,7 +1118,7 @@ export class PlayScene extends Scene { ...@@ -1166,7 +1118,7 @@ export class PlayScene extends Scene {
} }
}) })
FYGE.Tween.get(o) FYGE.Tween.get(o)
.to({x: s.x, y: s.y}, 166) .to({ x: s.x, y: s.y }, 166)
} }
//数据交换 //数据交换
...@@ -1240,16 +1192,16 @@ export class PlayScene extends Scene { ...@@ -1240,16 +1192,16 @@ export class PlayScene extends Scene {
if (lat.down != null) { if (lat.down != null) {
latDown = this.lattices[lat.down]; latDown = this.lattices[lat.down];
indexDown = lat.down; indexDown = lat.down;
connects.push({index: indexDown, type: FallType.THROUGH}) connects.push({ index: indexDown, type: FallType.THROUGH })
} else { } else {
latDown = this.lattices[index + Tool.colNum] latDown = this.lattices[index + Tool.colNum]
indexDown = index + Tool.colNum; indexDown = index + Tool.colNum;
connects.push({index: indexDown, type: FallType.STRIGHT}) connects.push({ index: indexDown, type: FallType.STRIGHT })
} }
//下方有格子,并且再this.empty中 //下方有格子,并且再this.empty中
var emptyIndex = this.emptys.indexOf(indexDown) var emptyIndex = this.emptys.indexOf(indexDown)
if (emptyIndex > -1) { if (emptyIndex > -1) {
anis.push({ele: lat.element, indexs: connects}); anis.push({ ele: lat.element, indexs: connects });
//去掉一个 //去掉一个
this.emptys.splice(emptyIndex, 1); this.emptys.splice(emptyIndex, 1);
//加上一个 //加上一个
...@@ -1263,7 +1215,7 @@ export class PlayScene extends Scene { ...@@ -1263,7 +1215,7 @@ export class PlayScene extends Scene {
lat.isGenerate && lat.isGenerate &&
!Tool.judgeFall(this.lattices[index - Tool.colNum]) !Tool.judgeFall(this.lattices[index - Tool.colNum])
) { ) {
anis.push({ele: null, indexs: [{index: index, type: FallType.STRIGHT}]}); anis.push({ ele: null, indexs: [{ index: index, type: FallType.STRIGHT }] });
Tool.removeEle(index, this.emptys) Tool.removeEle(index, this.emptys)
} }
} }
...@@ -1296,7 +1248,7 @@ export class PlayScene extends Scene { ...@@ -1296,7 +1248,7 @@ export class PlayScene extends Scene {
if (indexs != null) { if (indexs != null) {
//最后一个 //最后一个
var downIndex = indexs[indexs.length - 1].index; var downIndex = indexs[indexs.length - 1].index;
anis.push({ele: lat.element, indexs: indexs}); anis.push({ ele: lat.element, indexs: indexs });
//去掉最后一个 //去掉最后一个
// this.emptys.splice(emptyIndex, 1); // this.emptys.splice(emptyIndex, 1);
Tool.removeEle(downIndex, this.emptys) Tool.removeEle(downIndex, this.emptys)
...@@ -1368,7 +1320,7 @@ export class PlayScene extends Scene { ...@@ -1368,7 +1320,7 @@ export class PlayScene extends Scene {
var anis: FallAniData[] = []; var anis: FallAniData[] = [];
var emptys = this.emptys; var emptys = this.emptys;
//排序从大到小 //排序从大到小
emptys.sort(function(a, b) { emptys.sort(function (a, b) {
return a < b ? 1 : -1 return a < b ? 1 : -1
}) })
for (var i = 0; i < emptys.length; i++) { for (var i = 0; i < emptys.length; i++) {
...@@ -1426,7 +1378,7 @@ export class PlayScene extends Scene { ...@@ -1426,7 +1378,7 @@ export class PlayScene extends Scene {
//如果latFall存在 //如果latFall存在
if (latFall) { if (latFall) {
//能掉落,记录元素动画 //能掉落,记录元素动画
anis.push({ele: latFall.element, indexs: [{index: indexMy, type: type}]}); anis.push({ ele: latFall.element, indexs: [{ index: indexMy, type: type }] });
//去掉 //去掉
// console.log(emptys) // console.log(emptys)
// console.log(indexFall) // console.log(indexFall)
...@@ -1445,7 +1397,7 @@ export class PlayScene extends Scene { ...@@ -1445,7 +1397,7 @@ export class PlayScene extends Scene {
//判断是否是生成口 //判断是否是生成口
if (lat.isGenerate) { if (lat.isGenerate) {
//是生成口,就不用管落下乐 //是生成口,就不用管落下乐
anis.push({ele: null, indexs: [{index: indexMy, type: FallType.STRIGHT}]}) anis.push({ ele: null, indexs: [{ index: indexMy, type: FallType.STRIGHT }] })
//去掉 //去掉
emptys.splice(i, 1); emptys.splice(i, 1);
//优先判断生成的,不用管掉落了,跳下一个 //优先判断生成的,不用管掉落了,跳下一个
...@@ -1496,7 +1448,7 @@ export class PlayScene extends Scene { ...@@ -1496,7 +1448,7 @@ export class PlayScene extends Scene {
mask.y = fp[1]; mask.y = fp[1];
this.elementContainer.addChild(mask); this.elementContainer.addChild(mask);
ele.mask = mask; ele.mask = mask;
tween.to({x: fp[0], y: fp[1]}, deltaTime) tween.to({ x: fp[0], y: fp[1] }, deltaTime)
.call(() => { .call(() => {
//移除遮罩 //移除遮罩
ele.mask = null; ele.mask = null;
...@@ -1504,7 +1456,7 @@ export class PlayScene extends Scene { ...@@ -1504,7 +1456,7 @@ export class PlayScene extends Scene {
mask.recover() mask.recover()
}) })
} else { } else {
tween.to({x: fp[0], y: fp[1]}, deltaTime) tween.to({ x: fp[0], y: fp[1] }, deltaTime)
} }
wait += deltaTime wait += deltaTime
} else { } else {
...@@ -1527,11 +1479,11 @@ export class PlayScene extends Scene { ...@@ -1527,11 +1479,11 @@ export class PlayScene extends Scene {
//如果上格子下面有格子, 用遮罩的写法, //如果上格子下面有格子, 用遮罩的写法,
if (this.lattices[indexUp + Tool.colNum]) { if (this.lattices[indexUp + Tool.colNum]) {
EleMaskAni(ele, upPos, wait, this.elementContainer, true, deltaTime); EleMaskAni(ele, upPos, wait, this.elementContainer, true, deltaTime);
tween.set({alpha: 0}) tween.set({ alpha: 0 })
.wait(deltaTime) .wait(deltaTime)
.set({alpha: 1}) .set({ alpha: 1 })
} else { } else {
tween.to({x: upPos[0], y: upPos[1] + Tool.height}, deltaTime); tween.to({ x: upPos[0], y: upPos[1] + Tool.height }, deltaTime);
} }
//down处的动画 //down处的动画
//如果下格子上方有格子,用遮罩的写法 //如果下格子上方有格子,用遮罩的写法
...@@ -1554,9 +1506,9 @@ export class PlayScene extends Scene { ...@@ -1554,9 +1506,9 @@ export class PlayScene extends Scene {
oriRow = Tool.indexToRc(index)[0]; oriRow = Tool.indexToRc(index)[0];
//动画 //动画
if (lastX != null) { if (lastX != null) {
tween.set({x: lastX, y: lastY}) tween.set({ x: lastX, y: lastY })
} }
tween.to({x: p[0], y: p[1]}, delta * deltaTime) tween.to({ x: p[0], y: p[1] }, delta * deltaTime)
//累计等待时间 //累计等待时间
wait += delta * deltaTime; wait += delta * deltaTime;
lastX = null lastX = null
...@@ -1954,7 +1906,7 @@ export class PlayScene extends Scene { ...@@ -1954,7 +1906,7 @@ export class PlayScene extends Scene {
showToast("元素已无法消除") showToast("元素已无法消除")
setTimeout(() => { setTimeout(() => {
// //playSound(SoundType.fail); // //playSound(SoundType.fail);
var panelsDatas = this.returnPanels("failed", {level: this.chapter}) var panelsDatas = this.returnPanels("failed", { level: this.chapter })
// PanelCtrl.instance.showPanels(panelsDatas[0], panelsDatas[1], () => { }); // PanelCtrl.instance.showPanels(panelsDatas[0], panelsDatas[1], () => { });
// PanelCtrl.instance.show("failed", { level: this.chapter }); // PanelCtrl.instance.show("failed", { level: this.chapter });
}, 1000) }, 1000)
...@@ -2563,7 +2515,7 @@ export class PlayScene extends Scene { ...@@ -2563,7 +2515,7 @@ export class PlayScene extends Scene {
var lat = this.lattices[index]; var lat = this.lattices[index];
lat.element = ele; lat.element = ele;
FYGE.Tween.get(ele) FYGE.Tween.get(ele)
.to({x: p[0], y: p[1]}, 500) .to({ x: p[0], y: p[1] }, 500)
.call(() => { .call(() => {
if (++count == countAll) { if (++count == countAll) {
//交换结束后,判断是否有三消 //交换结束后,判断是否有三消
...@@ -2850,7 +2802,7 @@ export class PlayScene extends Scene { ...@@ -2850,7 +2802,7 @@ export class PlayScene extends Scene {
if (this.festivalTargetNum) { if (this.festivalTargetNum) {
this.festivalTargetNum--; this.festivalTargetNum--;
//@ts-ignore //@ts-ignore
var p = this.festivalTarget.localToGlobal({x: 40 * 0.8, y: 40 * 0.8}) var p = this.festivalTarget.localToGlobal({ x: 40 * 0.8, y: 40 * 0.8 })
this.addChild(FlyTargetAni(ElementType.FESTIVALELE_SMALL, [ele.x, ele.y], [p.x, p.y], () => { this.addChild(FlyTargetAni(ElementType.FESTIVALELE_SMALL, [ele.x, ele.y], [p.x, p.y], () => {
this.festivalTarget.count--; this.festivalTarget.count--;
})) }))
......
...@@ -23,12 +23,12 @@ const chapters: ChapterData[] = [].concat( ...@@ -23,12 +23,12 @@ const chapters: ChapterData[] = [].concat(
Chapters4, Chapters4,
Chapters5, Chapters5,
Chapters6, Chapters6,
Chapters7, // Chapters7,
Chapters8, // Chapters8,
Chapters9, // Chapters9,
Chapters10, // Chapters10,
Chapters11, // Chapters11,
Chapters12, // Chapters12,
) )
/** /**
* 获取关卡数据,返回关卡数据 * 获取关卡数据,返回关卡数据
......
...@@ -5,4 +5,5 @@ export enum PropType { ...@@ -5,4 +5,5 @@ export enum PropType {
STEPS = "STEPS", STEPS = "STEPS",
BOOMS = "BOOMS", BOOMS = "BOOMS",
HAMMERS = "HAMMERS", HAMMERS = "HAMMERS",
POWER = "POWER",
} }
\ No newline at end of file
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