Skip to content

B
babycare_xiaoxiao
Commit c47af0df authored by wjf's avatar wjf
Browse files
Options

l

parent 3308ed7d
Hide whitespace changes
Inline Side-by-side
Showing with 9202 additions and 1680 deletions
mock/miniTb/aa.json 0 → 100644
View file @ c47af0df
{
"code": "000000",
"data": {
"currentLevel": 9,
"isFristLogin": false,
"visitors": [
{
"activityId": "5f11948b3075d9927ec1f4ce",
"score": 25230,
"level": 8,
"createTime": 1595384151916,
"openId": "AAE7CvE-ALiIWXYsJuQ4PxLI",
"isVisitSuccess": true,
"updateTime": 1595384151916,
"_id": "5f17a157114fbb904c2960a9",
"stars": 3,
"isPrizeLevel": false,
"sendAwardType": true
},
{
"activityId": "5f11948b3075d9927ec1f4ce",
"score": 48400,
"level": 7,
"createTime": 1595384121437,
"openId": "AAE7CvE-ALiIWXYsJuQ4PxLI",
"isVisitSuccess": true,
"updateTime": 1595384121437,
"_id": "5f17a1393075d9927ecaa167",
"stars": 3,
"isPrizeLevel": false,
"sendAwardType": true
},
{
"activityId": "5f11948b3075d9927ec1f4ce",
"score": 29190,
"level": 6,
"createTime": 1595383992964,
"openId": "AAE7CvE-ALiIWXYsJuQ4PxLI",
"isVisitSuccess": true,
"updateTime": 1595383992964,
"_id": "5f17a0b8964f9796f92905af",
"stars": 3,
"isPrizeLevel": false,
"sendAwardType": true
},
{
"activityId": "5f11948b3075d9927ec1f4ce",
"score": 35340,
"level": 5,
"createTime": 1595383923721,
"openId": "AAE7CvE-ALiIWXYsJuQ4PxLI",
"isVisitSuccess": true,
"updateTime": 1595383923721,
"_id": "5f17a07385a749991449cc5e",
"stars": 3,
"isPrizeLevel": false,
"sendAwardType": true
},
{
"activityId": "5f11948b3075d9927ec1f4ce",
"score": 15190,
"level": 4,
"createTime": 1595314767660,
"openId": "AAE7CvE-ALiIWXYsJuQ4PxLI",
"isVisitSuccess": true,
"updateTime": 1595314767660,
"_id": "5f16924f086e65659ba635f0",
"stars": 3,
"isPrizeLevel": false,
"sendAwardType": true
},
{
"activityId": "5f11948b3075d9927ec1f4ce",
"score": 13980,
"level": 3,
"createTime": 1595310071216,
"openId": "AAE7CvE-ALiIWXYsJuQ4PxLI",
"isVisitSuccess": true,
"updateTime": 1595310071216,
"_id": "5f167ff7086e65659ba61824",
"stars": 3,
"isPrizeLevel": false,
"sendAwardType": true
},
{
"activityId": "5f11948b3075d9927ec1f4ce",
"score": 960,
"level": 2,
"createTime": 1595309984235,
"openId": "AAE7CvE-ALiIWXYsJuQ4PxLI",
"isVisitSuccess": true,
"updateTime": 1595309984235,
"_id": "5f167fa0c3ad3494b93d47e3",
"stars": 3,
"isPrizeLevel": false,
"sendAwardType": true
},
{
"activityId": "5f11948b3075d9927ec1f4ce",
"score": 64690,
"level": 1,
"createTime": 1595309828984,
"openId": "AAE7CvE-ALiIWXYsJuQ4PxLI",
"isVisitSuccess": true,
"updateTime": 1595309828984,
"_id": "5f167f059897b48d280c5880",
"stars": 3,
"isPrizeLevel": false,
"sendAwardType": true
}
],
"prizes": [],
"loginAddPower": 0,
"power": 987,
"tools": {
"HAMMERS": 2,
"STEPS": 2,
"BOOMS": 1
},
"topAward": {}
},
"success": true,
"message": "成功"
}
\ No newline at end of file
mock/miniTb/babycare.getIndex.json
View file @ c47af0df
......@@ -5,7 +5,7 @@
"data": {
"power": 100,
"loginAddPower": true,
"currentLevel": 25,
"currentLevel": 120,
"tools": {
"STEPS": 1,
"BOOMS": 2,
......
output.js
View file @ c47af0df
......@@ -1785,6 +1785,498 @@ exports.Main = Main;
Object.defineProperty(exports, "__esModule", { value: true });
exports.ResJson = {
"groups": [
{
"keys": "增加体力背景.png,无字按钮底.png",
"name": "BuyPowerPanel",
"atlas": {
"增加体力背景.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 477,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 477,
"ro": true
},
"无字按钮底.png": {
"x": 2,
"y": 644,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
}
}
},
{
"keys": "积分不足背景.png,赚取积分.png",
"name": "CreditsOutPanel",
"atlas": {
"积分不足背景.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 437,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 437,
"ro": true
},
"赚取积分.png": {
"x": 2,
"y": 644,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
}
}
},
{
"keys": "兑换成功背景.png,知道啦.png",
"name": "ExchangeSucPanel",
"atlas": {
"兑换成功背景.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 599,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 599,
"ro": false
},
"知道啦.png": {
"x": 644,
"y": 2,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": true
}
}
},
{
"keys": "失败Bg.png,失败重新闯关.png",
"name": "FailedPanel",
"atlas": {
"失败Bg.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 839,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 839,
"ro": false
},
"失败重新闯关.png": {
"x": 2,
"y": 843,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
}
}
},
{
"keys": "圆圈.png,开心收下.png",
"name": "FreePowerPanel",
"atlas": {
"圆圈.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 798,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 798,
"ro": false
},
"开心收下.png": {
"x": 2,
"y": 802,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
}
}
},
{
"keys": "joinBg.png,joinBtn.png",
"name": "JoinPanel",
"atlas": {
"joinBg.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 438,
"ox": 55,
"oy": 497,
"sw": 750,
"sh": 1624,
"ro": true
},
"joinBtn.png": {
"x": 2,
"y": 644,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
}
}
},
{
"keys": "体力不足Bg.png,体力不足按钮.png",
"name": "NoEnergyPanel",
"atlas": {
"体力不足Bg.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 567,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 567,
"ro": false
},
"体力不足按钮.png": {
"x": 2,
"y": 571,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": true
}
}
},
{
"keys": "步数耗尽Bg.png,步数耗尽复活.png,步数耗尽结束按钮.png",
"name": "NoStepPanel",
"atlas": {
"步数耗尽Bg.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 527,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 527,
"ro": false
},
"步数耗尽复活.png": {
"x": 644,
"y": 118,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": false
},
"步数耗尽结束按钮.png": {
"x": 644,
"y": 2,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": false
}
}
},
{
"keys": "prizePanel.png,prizePanelBtn.png",
"name": "PrizePanel",
"atlas": {
"prizePanel.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 789,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 789,
"ro": false
},
"prizePanelBtn.png": {
"x": 2,
"y": 793,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
}
}
},
{
"keys": "活动规则背景.png",
"name": "RulePanel",
"atlas": {
"活动规则背景.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 747,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 747,
"ro": false
}
}
},
{
"keys": "开始闯关Bg.png",
"name": "StartPanel",
"atlas": {
"开始闯关Bg.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 799,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 799,
"ro": false
}
}
},
{
"keys": "关卡弹窗Bg.png",
"name": "StartPanelPrize",
"atlas": {
"关卡弹窗Bg.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 1019,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 1019,
"ro": false
}
}
},
{
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"name": "SuccessPanel",
"atlas": {
"star_dis.png": {
"x": 835,
"y": 957,
"w": 150,
"h": 144,
"ox": 0,
"oy": 0,
"sw": 150,
"sh": 144,
"ro": false
},
"star_en.png": {
"x": 835,
"y": 644,
"w": 164,
"h": 157,
"ox": 0,
"oy": 0,
"sw": 164,
"sh": 157,
"ro": false
},
"去抽奖.png": {
"x": 2,
"y": 1883,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": false
},
"圆角矩形 648.png": {
"x": 2,
"y": 1379,
"w": 502,
"h": 196,
"ox": 0,
"oy": 2,
"sw": 504,
"sh": 200,
"ro": true
},
"道具圆圈.png": {
"x": 835,
"y": 803,
"w": 152,
"h": 152,
"ox": 0,
"oy": 0,
"sw": 152,
"sh": 152,
"ro": false
},
"闯关成功.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 971,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 971,
"ro": true
},
"闯关成功Bg.png": {
"x": 2,
"y": 644,
"w": 640,
"h": 831,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 831,
"ro": true
},
"闯关成功不满星按钮.png": {
"x": 835,
"y": 1103,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": true
}
}
},
{
"keys": "任务背景.png,去完成.png,去完成灰.png,待领取.png",
"name": "TaskPanel",
"atlas": {
"任务背景.png": {
"x": 2,
"y": 2,
"w": 750,
"h": 1046,
"ox": 0,
"oy": 0,
"sw": 750,
"sh": 1046,
"ro": false
},
"去完成.png": {
"x": 754,
"y": 84,
"w": 183,
"h": 80,
"ox": 0,
"oy": 0,
"sw": 183,
"sh": 80,
"ro": false
},
"去完成灰.png": {
"x": 939,
"y": 2,
"w": 183,
"h": 80,
"ox": 0,
"oy": 0,
"sw": 183,
"sh": 80,
"ro": true
},
"待领取.png": {
"x": 754,
"y": 2,
"w": 183,
"h": 80,
"ox": 0,
"oy": 0,
"sw": 183,
"sh": 80,
"ro": false
}
}
},
{
"keys": "道具不足背景.png",
"name": "ToolsOutPanel",
"atlas": {
"道具不足背景.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 437,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 437,
"ro": true
}
}
},
{
"keys": "使用道具背景.png",
"name": "UseToolPanel",
"atlas": {
"使用道具背景.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 437,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 437,
"ro": true
}
}
},
{
"keys": "amazing.png,great.png,img_0.png,img_1.png,img_10.png,img_11.png,img_12.png,img_13.png,img_14.png,img_15.png,img_16.png,img_17.png,img_18.png,img_19.png,img_2.png,img_3.png,img_4.png,img_5.png,img_6.png,img_7.png,img_8.png,img_9.png,wonderful.png",
"name": "bonusTime",
......@@ -2044,34 +2536,6 @@ exports.ResJson = {
}
}
},
{
"keys": "增加体力背景.png,无字按钮底.png",
"name": "BuyPowerPanel",
"atlas": {
"增加体力背景.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 477,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 477,
"ro": true
},
"无字按钮底.png": {
"x": 2,
"y": 644,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
}
}
},
{
"keys": "boomBtn.png,comCloseBtn.png,comm_light.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,hammerBtn.png,star.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common",
......@@ -2419,90 +2883,6 @@ exports.ResJson = {
}
}
},
{
"keys": "积分不足背景.png,赚取积分.png",
"name": "CreditsOutPanel",
"atlas": {
"积分不足背景.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 437,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 437,
"ro": true
},
"赚取积分.png": {
"x": 2,
"y": 644,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
}
}
},
{
"keys": "兑换成功背景.png,知道啦.png",
"name": "ExchangeSucPanel",
"atlas": {
"兑换成功背景.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 599,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 599,
"ro": false
},
"知道啦.png": {
"x": 644,
"y": 2,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": true
}
}
},
{
"keys": "失败Bg.png,失败重新闯关.png",
"name": "FailedPanel",
"atlas": {
"失败Bg.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 839,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 839,
"ro": false
},
"失败重新闯关.png": {
"x": 2,
"y": 843,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
}
}
},
{
"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",
......@@ -5434,65 +5814,9 @@ exports.ResJson = {
"w": 76,
"h": 70,
"ox": 4,
"oy": 5,
"sw": 80,
"sh": 80,
"ro": false
}
}
},
{
"keys": "圆圈.png,开心收下.png",
"name": "FreePowerPanel",
"atlas": {
"圆圈.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 798,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 798,
"ro": false
},
"开心收下.png": {
"x": 2,
"y": 802,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": false
}
}
},
{
"keys": "joinBg.png,joinBtn.png",
"name": "JoinPanel",
"atlas": {
"joinBg.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 438,
"ox": 55,
"oy": 497,
"sw": 750,
"sh": 1624,
"ro": true
},
"joinBtn.png": {
"x": 2,
"y": 644,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"oy": 5,
"sw": 80,
"sh": 80,
"ro": false
}
}
......@@ -7183,73 +7507,6 @@ exports.ResJson = {
}
}
},
{
"keys": "体力不足Bg.png,体力不足按钮.png",
"name": "NoEnergyPanel",
"atlas": {
"体力不足Bg.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 567,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 567,
"ro": false
},
"体力不足按钮.png": {
"x": 2,
"y": 571,
"w": 424,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 424,
"sh": 114,
"ro": true
}
}
},
{
"keys": "步数耗尽Bg.png,步数耗尽复活.png,步数耗尽结束按钮.png",
"name": "NoStepPanel",
"atlas": {
"步数耗尽Bg.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 527,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 527,
"ro": false
},
"步数耗尽复活.png": {
"x": 644,
"y": 118,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": false
},
"步数耗尽结束按钮.png": {
"x": 644,
"y": 2,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": false
}
}
},
{
"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,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,gameGuideBoard.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,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,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene",
......@@ -9654,23 +9911,6 @@ exports.ResJson = {
}
}
},
{
"keys": "活动规则背景.png",
"name": "RulePanel",
"atlas": {
"活动规则背景.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 747,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 747,
"ro": false
}
}
},
{
"keys": "star_light_0.png,star_light_1.png,star_light_10.png,star_light_11.png,star_light_12.png,star_light_13.png,star_light_14.png,star_light_15.png,star_light_2.png,star_light_3.png,star_light_4.png,star_light_5.png,star_light_6.png,star_light_7.png,star_light_8.png,star_light_9.png",
"name": "starLight",
......@@ -9836,237 +10076,25 @@ exports.ResJson = {
"h": 336,
"ox": 50,
"oy": 82,
"sw": 500,
"sh": 500,
"ro": false
},
"star_light_9.png": {
"x": 392,
"y": 2,
"w": 374,
"h": 318,
"ox": 38,
"oy": 90,
"sw": 500,
"sh": 500,
"ro": false
}
}
},
{
"keys": "开始闯关Bg.png",
"name": "StartPanel",
"atlas": {
"开始闯关Bg.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 799,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 799,
"ro": false
}
}
},
{
"keys": "关卡弹窗Bg.png",
"name": "StartPanelPrize",
"atlas": {
"关卡弹窗Bg.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 1019,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 1019,
"ro": false
}
}
},
{
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
"name": "SuccessPanel",
"atlas": {
"star_dis.png": {
"x": 835,
"y": 957,
"w": 150,
"h": 144,
"ox": 0,
"oy": 0,
"sw": 150,
"sh": 144,
"ro": false
},
"star_en.png": {
"x": 835,
"y": 644,
"w": 164,
"h": 157,
"ox": 0,
"oy": 0,
"sw": 164,
"sh": 157,
"ro": false
},
"去抽奖.png": {
"x": 2,
"y": 1883,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": false
},
"圆角矩形 648.png": {
"x": 2,
"y": 1379,
"w": 502,
"h": 196,
"ox": 0,
"oy": 2,
"sw": 504,
"sh": 200,
"ro": true
},
"道具圆圈.png": {
"x": 835,
"y": 803,
"w": 152,
"h": 152,
"ox": 0,
"oy": 0,
"sw": 152,
"sh": 152,
"ro": false
},
"闯关成功.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 971,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 971,
"ro": true
},
"闯关成功Bg.png": {
"x": 2,
"y": 644,
"w": 640,
"h": 831,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 831,
"ro": true
},
"闯关成功不满星按钮.png": {
"x": 835,
"y": 1103,
"w": 274,
"h": 114,
"ox": 0,
"oy": 0,
"sw": 274,
"sh": 114,
"ro": true
}
}
},
{
"keys": "任务背景.png,去完成.png,去完成灰.png,待领取.png",
"name": "TaskPanel",
"atlas": {
"任务背景.png": {
"x": 2,
"y": 2,
"w": 750,
"h": 1046,
"ox": 0,
"oy": 0,
"sw": 750,
"sh": 1046,
"ro": false
},
"去完成.png": {
"x": 754,
"y": 84,
"w": 183,
"h": 80,
"ox": 0,
"oy": 0,
"sw": 183,
"sh": 80,
"sw": 500,
"sh": 500,
"ro": false
},
"去完成灰.png": {
"x": 939,
"y": 2,
"w": 183,
"h": 80,
"ox": 0,
"oy": 0,
"sw": 183,
"sh": 80,
"ro": true
},
"待领取.png": {
"x": 754,
"star_light_9.png": {
"x": 392,
"y": 2,
"w": 183,
"h": 80,
"ox": 0,
"oy": 0,
"sw": 183,
"sh": 80,
"w": 374,
"h": 318,
"ox": 38,
"oy": 90,
"sw": 500,
"sh": 500,
"ro": false
}
}
},
{
"keys": "道具不足背景.png",
"name": "ToolsOutPanel",
"atlas": {
"道具不足背景.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 437,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 437,
"ro": true
}
}
},
{
"keys": "使用道具背景.png",
"name": "UseToolPanel",
"atlas": {
"使用道具背景.png": {
"x": 2,
"y": 2,
"w": 640,
"h": 437,
"ox": 0,
"oy": 0,
"sw": 640,
"sh": 437,
"ro": true
}
}
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1595336296/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1595387678/resource/"
};
......@@ -10804,6 +10832,71 @@ exports.SkinJson = {
}
]
},
{
"name": "PrizePanel",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "背景",
"x": 55,
"y": 376,
"alpha": 1,
"type": "sprite",
"props": {
"source": "prizePanel.png"
}
},
{
"name": "关闭按钮",
"x": 631,
"y": 500,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "文案",
"x": 203,
"y": 650,
"alpha": 1,
"type": "text",
"props": {
"text": "恭喜获得XX奖品",
"size": 34,
"fillColor": "#df5942",
"textAlpha": 1
},
"id": "prizeTxt"
},
{
"name": "prizeImg",
"x": 250,
"y": 732,
"alpha": 1,
"type": "sprite",
"props": {
"source": ""
},
"id": "prizeImg"
},
{
"name": "立即领取",
"x": 163,
"y": 1002,
"alpha": 1,
"type": "button",
"props": {
"tUp": "prizePanelBtn.png"
},
"id": "prizeBtn"
}
]
},
{
"name": "TaskPanel",
"x": 0,
......@@ -11184,6 +11277,7 @@ var TbNetName;
(function (TbNetName) {
TbNetName["trackingReport"] = "squirrelsAdoptRest2c.trackingReport";
TbNetName["getIndex"] = "babycare.getIndex";
TbNetName["receiveEnamePrize"] = "babycare.receiveEnamePrize";
TbNetName["getActivityBaseInfoById"] = "babycare.getActivityBaseInfoById";
TbNetName["getGameInfo"] = "babycare.getGameInfo";
TbNetName["consumerTools"] = "babycare.consumerTools";
......@@ -16848,6 +16942,113 @@ var NoStepPanel = (function (_super) {
exports.NoStepPanel = NoStepPanel;
/***/ }),
/***/ "./src/panels/PrizePanel.ts":
/*!**********************************!*\
!*** ./src/panels/PrizePanel.ts ***!
\**********************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/views/Panel.ts");
var TEXT_ALIGN = FYGE.TEXT_ALIGN;
var Texture = FYGE.Texture;
var MouseEvent = FYGE.MouseEvent;
var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
var PrizePanel = (function (_super) {
__extends(PrizePanel, _super);
function PrizePanel() {
return _super !== null && _super.apply(this, arguments) || this;
}
Object.defineProperty(PrizePanel.prototype, "groupNames", {
get: function () {
return ["PrizePanel"];
},
enumerable: true,
configurable: true
});
Object.defineProperty(PrizePanel.prototype, "skinName", {
get: function () {
return "PrizePanel";
},
enumerable: true,
configurable: true
});
PrizePanel.prototype.initUi = function () {
this.prizeTxt.textAlign = TEXT_ALIGN.CENTER;
this.prizeTxt.textWidth = 750;
this.prizeTxt.x = 0;
this.prizeTxt.text = "\u606D\u559C\u83B7\u5F97" + this.data.name;
this.prizeImg.anchorTexture.x = 0.5;
this.prizeImg.x = 375;
this.prizeImg.texture = Texture.fromUrl(this.data.image);
};
PrizePanel.prototype.start = function (data) {
_super.prototype.start.call(this);
};
PrizePanel.prototype.clickPrizeBtn = function () {
var _this = this;
this.btnDelay(this.prizeBtn);
switch (this.data.type) {
case 1:
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.receiveEnamePrize, { id: this.data.id }, function (success, res) {
if (!success || !res) {
ctrls_1.showToast('奖品发放失败\n请前往我的奖品处进行处理');
_this.hidePanel();
return;
}
if (res.data) {
ctrls_1.showToast('奖品发放成功\n请前往我的奖品处查看');
}
else {
ctrls_1.showToast('奖品发放失败\n请前往我的奖品处进行处理');
}
_this.hidePanel();
}, true);
break;
case 3:
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getUserAddress, { prizeId: this.data.id }, function (success, res) {
if (!success) {
return;
}
ctrls_1.showToast('奖品发放成功\n请前往我的奖品处查看');
_this.hidePanel();
}, true);
break;
case 2:
case 5:
this.hidePanel();
break;
}
};
PrizePanel.prototype.initEvents = function () {
_super.prototype.initEvents.call(this);
this.prizeBtn.addEventListener(MouseEvent.CLICK, this.clickPrizeBtn, this);
};
PrizePanel.prototype.removeEvents = function () {
_super.prototype.removeEvents.call(this);
this.prizeBtn.removeEventListener(MouseEvent.CLICK, this.clickPrizeBtn, this);
};
return PrizePanel;
}(Panel_1.Panel));
exports.PrizePanel = PrizePanel;
/***/ }),
/***/ "./src/panels/RulePanel.ts":
......@@ -17579,7 +17780,7 @@ var SuccessPrizePanel = (function (_super) {
};
SuccessPrizePanel.prototype.initEvents = function () {
_super.prototype.initEvents.call(this);
this.againBtn.addEventListener(MouseEvent.CLICK, this.again, this);
this.againBtn.addEventListener(MouseEvent.CLICK, this.continue, this);
this.noPrizeAgainBtn.addEventListener(MouseEvent.CLICK, this.continue, this);
this.goPrizeBtn.addEventListener(MouseEvent.CLICK, this.goPrize, this);
};
......@@ -20017,8 +20218,12 @@ var PlayScene = (function (_super) {
return effectIndexs;
};
PlayScene.prototype.effectEliminate = function (effectIndexs) {
var _this = this;
if (effectIndexs.length && !this.hasPassed)
this.effectContinuityTimes++;
var judgeExclude = function (i) {
return _this.eliminatedElements.indexOf(i) < 0 && effectIndexs.indexOf(i) < 0;
};
for (var j = 0; j < effectIndexs.length; j++) {
var index = effectIndexs[j];
var lat = this.lattices[index];
......@@ -20041,15 +20246,14 @@ var PlayScene = (function (_super) {
this.magicRotateData.push(rotateData);
for (var i = 0; i < this.lattices.length; i++) {
if (Tool_1.Tool.judgeMagicEliminate(this.lattices[i]) &&
this.lattices[i].element.type == type) {
if (this.eliminatedElements.indexOf(i) < 0 && effectIndexs.indexOf(i) < 0) {
this.eliminatedElements.push(i);
if (Tool_1.Tool.judgeMagicRotate(this.lattices[i].element)) {
rotateData.elementsIndex.push(i);
}
if (Tool_1.Tool.judgeHasScore(this.lattices[i].element)) {
this.pushScoreAni(exports.baseScore * this.effectContinuityTimes * exports.effectBaseTimes["3"], Tool_1.Tool.getPositionByIndex(i));
}
this.lattices[i].element.type == type &&
judgeExclude(i)) {
this.eliminatedElements.push(i);
if (Tool_1.Tool.judgeMagicRotate(this.lattices[i].element)) {
rotateData.elementsIndex.push(i);
}
if (Tool_1.Tool.judgeHasScore(this.lattices[i].element)) {
this.pushScoreAni(exports.baseScore * this.effectContinuityTimes * exports.effectBaseTimes["3"], Tool_1.Tool.getPositionByIndex(i));
}
}
}
......@@ -20058,17 +20262,14 @@ var PlayScene = (function (_super) {
var boomAni = this.playAni(RecoverName_1.RecoverName.BOOM_ANI, p);
boomAni.scaleX = boomAni.scaleY = 1;
this.recoverEle(index);
for (var i = 0; i < this.lattices.length; i++) {
if (Tool_1.Tool.judgeEliminate(this.lattices[i]) &&
(Math.abs(this.lattices[i].row - lat.row) < 2 && Math.abs(this.lattices[i].column - lat.column) < 2)) {
if (this.eliminatedElements.indexOf(i) < 0 && effectIndexs.indexOf(i) < 0) {
this.eliminatedElements.push(i);
if (Tool_1.Tool.judgeHasScore(this.lattices[i].element)) {
this.pushScoreAni(exports.baseScore * this.effectContinuityTimes * exports.effectBaseTimes["2"], Tool_1.Tool.getPositionByIndex(i));
}
Tool_1.Tool.getExplosiveIndexes(lat, this.lattices).forEach(function (i) {
if (judgeExclude(i)) {
_this.eliminatedElements.push(i);
if (Tool_1.Tool.judgeHasScore(_this.lattices[i].element)) {
_this.pushScoreAni(exports.baseScore * _this.effectContinuityTimes * exports.effectBaseTimes["2"], Tool_1.Tool.getPositionByIndex(i));
}
}
}
});
break;
case EffectType_1.EffectType.HORIZONTAL:
var row = lat.row;
......@@ -20076,12 +20277,11 @@ var PlayScene = (function (_super) {
this.recoverEle(index);
for (var i = 0; i < Tool_1.Tool.colNum; i++) {
var ein = Tool_1.Tool.rcToIndex(row, i);
if (Tool_1.Tool.judgeEliminate(this.lattices[ein])) {
if (this.eliminatedElements.indexOf(ein) < 0 && effectIndexs.indexOf(ein) < 0) {
this.eliminatedElements.push(ein);
if (Tool_1.Tool.judgeHasScore(this.lattices[ein].element)) {
this.pushScoreAni(exports.baseScore * this.effectContinuityTimes * exports.effectBaseTimes["0"], Tool_1.Tool.getPositionByIndex(ein));
}
if (Tool_1.Tool.judgeEliminate(this.lattices[ein]) &&
judgeExclude(ein)) {
this.eliminatedElements.push(ein);
if (Tool_1.Tool.judgeHasScore(this.lattices[ein].element)) {
this.pushScoreAni(exports.baseScore * this.effectContinuityTimes * exports.effectBaseTimes["0"], Tool_1.Tool.getPositionByIndex(ein));
}
}
}
......@@ -20092,12 +20292,11 @@ var PlayScene = (function (_super) {
this.recoverEle(index);
for (var i = 0; i < Tool_1.Tool.rowNum; i++) {
var ein = Tool_1.Tool.rcToIndex(i, col);
if (Tool_1.Tool.judgeEliminate(this.lattices[ein])) {
if (this.eliminatedElements.indexOf(ein) < 0 && effectIndexs.indexOf(ein) < 0) {
this.eliminatedElements.push(ein);
if (Tool_1.Tool.judgeHasScore(this.lattices[ein].element)) {
this.pushScoreAni(exports.baseScore * this.effectContinuityTimes * exports.effectBaseTimes["1"], Tool_1.Tool.getPositionByIndex(ein));
}
if (Tool_1.Tool.judgeEliminate(this.lattices[ein]) &&
judgeExclude(ein)) {
this.eliminatedElements.push(ein);
if (Tool_1.Tool.judgeHasScore(this.lattices[ein].element)) {
this.pushScoreAni(exports.baseScore * this.effectContinuityTimes * exports.effectBaseTimes["1"], Tool_1.Tool.getPositionByIndex(ein));
}
}
}
......@@ -21074,6 +21273,8 @@ var Tween = FYGE.Tween;
var Ease = FYGE.Ease;
var ctrls_1 = __webpack_require__(/*! ../../../module/ctrls */ "./module/ctrls/index.ts");
var FreePowerPanel_1 = __webpack_require__(/*! ../../panels/FreePowerPanel */ "./src/panels/FreePowerPanel.ts");
var PrizePanel_1 = __webpack_require__(/*! ../../panels/PrizePanel */ "./src/panels/PrizePanel.ts");
var GTool_1 = __webpack_require__(/*! ../../../module/tools/GTool */ "./module/tools/GTool.ts");
var MapScene = (function (_super) {
__extends(MapScene, _super);
function MapScene() {
......@@ -21111,6 +21312,11 @@ var MapScene = (function (_super) {
ctrls_1.showPanel(FreePowerPanel_1.FreePowerPanel);
Tools_1.Tools.gameData.loginAddPower = false;
}
var openPrize = GTool_1.GTool.readCache('openPrize');
if (Tools_1.Tools.gameData.topAward && Tools_1.Tools.gameData.topAward._id && openPrize !== 'true') {
GTool_1.GTool.writeCache('openPrize', 'true');
ctrls_1.showPanel(PrizePanel_1.PrizePanel, Tools_1.Tools.gameData.topAward);
}
};
MapScene.prototype.updateMapCheck = function () {
var _this = this;
......@@ -21969,6 +22175,17 @@ var Tool = (function () {
}
return true;
};
Tool.getExplosiveIndexes = function (curLat, lats) {
var arr = [];
Tool.ExplosiveMatchArr.forEach(function (e) {
var col = curLat.column + e[0];
var row = curLat.row + e[1];
var index = Tool.rcToIndex(row, col);
if (Tool.judgeEliminate(lats[index]))
arr.push(index);
});
return arr;
};
Tool.dieMapCheck = function (lattices) {
var judgeMatch = Tool.judgeMatch;
var effectElements = [];
......@@ -22512,6 +22729,13 @@ var Tool = (function () {
Tool.indexPositions = [];
Tool.indexToRcMap10 = [];
Tool.indexPositions10 = [];
Tool.ExplosiveMatchArr = [
[0, -2],
[-1, -1], [0, -1], [1, -1],
[-2, 0], [-1, 0], [1, 0], [2, 0],
[-1, 1], [0, 1], [1, 1],
[0, 2],
];
return Tool;
}());
exports.Tool = Tool;
......@@ -32202,51 +32426,37 @@ var HorizontalBgAni = (function (_super) {
_this.leftArrow.x = -50;
_this.leftArrow.y = -textureL.height / 2;
_this.addChild(_this.leftArrow);
FYGE.Tween.get(_this.leftArrow, { loop: true })
var textureR = RES_1.RES.getRes("rightArrow.png");
_this.rightArrow = new FYGE.Sprite(textureR);
var oriX = 50 - textureR.width;
_this.rightArrow.x = oriX;
_this.rightArrow.y = -textureR.height / 2;
_this.addChild(_this.rightArrow);
_this.addTweens();
return _this;
}
HorizontalBgAni.prototype.reset = function () {
FYGE.Tween.removeTweens(this.leftArrow);
FYGE.Tween.removeTweens(this.rightArrow);
this.addTweens();
};
HorizontalBgAni.prototype.addTweens = function () {
FYGE.Tween.get(this.leftArrow, { loop: true })
.set({ alpha: 1 })
.wait(300)
.to({ alpha: 0 }, 700);
FYGE.Tween.get(_this.leftArrow, { loop: true })
FYGE.Tween.get(this.leftArrow, { loop: true })
.set({ x: -50 })
.to({ x: -50 - 6 }, 1000);
var textureR = RES_1.RES.getRes("rightArrow.png");
_this.rightArrow = new FYGE.Sprite(textureR);
var oriX = 50 - textureR.width;
_this.rightArrow.x = oriX;
_this.rightArrow.y = -textureR.height / 2;
_this.addChild(_this.rightArrow);
FYGE.Tween.get(_this.rightArrow, { loop: true })
FYGE.Tween.get(this.rightArrow, { loop: true })
.set({ alpha: 1 })
.wait(300)
.to({ alpha: 0 }, 700);
FYGE.Tween.get(_this.rightArrow, { loop: true })
FYGE.Tween.get(this.rightArrow, { loop: true })
.set({ x: oriX })
.to({ x: oriX + 6 }, 1000);
return _this;
}
HorizontalBgAni.prototype.onEnterFrame = function () {
if (this.count >= 10) {
if (this.direction) {
this.leftArrow.x -= this.outSpeed;
this.rightArrow.x += this.outSpeed;
}
else {
this.leftArrow.x += this.inSpeed;
this.rightArrow.x -= this.inSpeed;
}
if (this.leftArrow.x < -50) {
this.direction = false;
}
else if (this.leftArrow.x > -45) {
this.count = 0;
this.direction = true;
}
}
else {
this.count++;
}
};
HorizontalBgAni.prototype.reset = function () {
};
return HorizontalBgAni;
}(FYGE.Container));
......@@ -32353,13 +32563,6 @@ var VerticalBgAni = (function (_super) {
_this.upArrow.x = textureL.height / 2;
_this.upArrow.y = -50;
_this.addChild(_this.upArrow);
FYGE.Tween.get(_this.upArrow, { loop: true })
.set({ alpha: 1 })
.wait(300)
.to({ alpha: 0 }, 700);
FYGE.Tween.get(_this.upArrow, { loop: true })
.set({ y: -50 })
.to({ y: -50 - 6 }, 1000);
var textureR = RES_1.RES.getRes("rightArrow.png");
_this.downArrow = new FYGE.Sprite(textureR);
_this.downArrow.rotation = 90;
......@@ -32367,38 +32570,31 @@ var VerticalBgAni = (function (_super) {
var oriY = 50 - textureR.width;
_this.downArrow.y = oriY;
_this.addChild(_this.downArrow);
FYGE.Tween.get(_this.downArrow, { loop: true })
_this.addTweens();
return _this;
}
VerticalBgAni.prototype.reset = function () {
FYGE.Tween.removeTweens(this.upArrow);
FYGE.Tween.removeTweens(this.downArrow);
this.addTweens();
};
VerticalBgAni.prototype.addTweens = function () {
FYGE.Tween.get(this.upArrow, { loop: true })
.set({ alpha: 1 })
.wait(300)
.to({ alpha: 0 }, 700);
FYGE.Tween.get(this.upArrow, { loop: true })
.set({ y: -50 })
.to({ y: -50 - 6 }, 1000);
var textureR = RES_1.RES.getRes("rightArrow.png");
var oriY = 50 - textureR.width;
FYGE.Tween.get(this.downArrow, { loop: true })
.set({ alpha: 1 })
.wait(300)
.to({ alpha: 0 }, 700);
FYGE.Tween.get(_this.downArrow, { loop: true })
FYGE.Tween.get(this.downArrow, { loop: true })
.set({ y: oriY })
.to({ y: oriY + 6 }, 1000);
return _this;
}
VerticalBgAni.prototype.onEnterFrame = function () {
if (this.count >= 10) {
if (this.direction) {
this.upArrow.y -= this.outSpeed;
this.downArrow.y += this.outSpeed;
}
else {
this.upArrow.y += this.inSpeed;
this.downArrow.y -= this.inSpeed;
}
if (this.upArrow.y < -50) {
this.direction = false;
}
else if (this.upArrow.y > -45) {
this.count = 0;
this.direction = true;
}
}
else {
this.count++;
}
};
VerticalBgAni.prototype.reset = function () {
};
return VerticalBgAni;
}(FYGE.Container));
......@@ -33316,9 +33512,12 @@ var GameToast = (function (_super) {
FYGE.Tween.removeTweens(this);
this.scaleX = 0.1;
this.scaleY = 0.1;
this.alpha = 1;
FYGE.Tween.get(this)
.to({ scaleX: 1, scaleY: 1 }, 1 / 3 * 1000, FYGE.Ease.backOut)
.wait(1 / 3 * 1000)
.to({ scaleX: 1.1, scaleY: 1.1 }, 200 / 2)
.to({ scaleX: 1, scaleY: 1 }, 200 / 2)
.wait(700 / 2)
.to({ alpha: 0 }, 200 / 2)
.call(function () {
callback();
});
output.js.map
View file @ c47af0df
This source diff could not be displayed because it is too large. You can view the blob instead.
src/Lottie.ts
View file @ c47af0df
......@@ -62,10 +62,6 @@ export class Lottie extends FYGE.Container {
* 按帧率计算，60为1，30为2，
*/
private deltaFrame: number = 1;
/**
* 所有带动效的对象
*/
private tweenDatas: TweenData[];
get videoWidth(): number {
return this.rawData && this.rawData.w;
......@@ -268,8 +264,7 @@ export class Lottie extends FYGE.Container {
var rr = xs.replace(/[^0-9]/ig, "");
var num = Math.round((this.rawData.op - data[data.length - 1 - rr].t) / (data[data.length - 1].t - data[data.length - 1 - rr].t));
//objArr只有一部分是进行循环的。
objArr = objArr.slice(-(xs.replace(/[^0-9]/ig, "")))
if (dis["layerData"].nm == "bonus_light_11.png") { console.log(dis.alpha) }
objArr = objArr.slice(-rr)
while (--num) {
//补满
for (var o = 0; o < objArr.length; o++) {
......
src/ResJson.ts
View file @ c47af0df
This source diff could not be displayed because it is too large. You can view the blob instead.
src/SkinJson.1.ts deleted 100644 → 0
View file @ 3308ed7d
export const SkinJson = {
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "UseToolPanel",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "再想想",
"x": 93,
"y": 745,
"alpha": 1,
"type": "button",
"props": {
"tUp": "再想想.png"
},
"id": "consideBtn"
},
{
"name": "确定",
"x": 383,
"y": 745,
"alpha": 1,
"type": "button",
"props": {
"tUp": "确定.png"
},
"id": "sureBtn"
},
{
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "文案",
"x": 168,
"y": 619,
"alpha": 1,
"type": "text",
"props": {
"text": "确认使用步数道具+10步吗？",
"size": 34,
"fillColor": "#df5942",
"textAlpha": 1
},
"id": "msgTxt"
},
{
"name": "使用道具背景",
"x": 55,
"y": 498,
"alpha": 1,
"type": "sprite",
"props": {
"source": "使用道具背景.png"
}
}
]
},
{
"name": "FreePowerPanel",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "开心收下",
"x": 163,
"y": 900,
"alpha": 1,
"type": "button",
"props": {
"tUp": "开心收下.png"
},
"id": "acceptBtn"
},
{
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "圆圈",
"x": 55,
"y": 267,
"alpha": 1,
"type": "sprite",
"props": {
"source": "圆圈.png"
}
}
]
},
{
"name": "CreditsOutPanel",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "赚取积分",
"x": 163,
"y": 745,
"alpha": 1,
"type": "button",
"props": {
"tUp": "赚取积分.png"
},
"id": "earnBtn"
},
{
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "积分不足背景",
"x": 55,
"y": 498,
"alpha": 1,
"type": "sprite",
"props": {
"source": "积分不足背景.png"
}
}
]
},
{
"name": "ExchangeSucPanel",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "知道啦",
"x": 163,
"y": 745,
"alpha": 1,
"type": "button",
"props": {
"tUp": "知道啦.png"
},
"id": "knowBtn"
},
{
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "兑换成功背景",
"x": 55,
"y": 337,
"alpha": 1,
"type": "sprite",
"props": {
"source": "兑换成功背景.png"
}
}
]
},
{
"name": "ToolsOutPanel",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "再想想",
"x": 93,
"y": 745,
"alpha": 1,
"type": "button",
"props": {
"tUp": "再想想.png"
},
"id": "consideBtn"
},
{
"name": "确定",
"x": 383,
"y": 745,
"alpha": 1,
"type": "button",
"props": {
"tUp": "确定.png"
},
"id": "sureBtn"
},
{
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "文案",
"x": 203,
"y": 650,
"alpha": 1,
"type": "text",
"props": {
"text": "要消耗200积分兑换码？",
"size": 34,
"fillColor": "#df5942",
"textAlpha": 1
},
"id": "msgTxt"
},
{
"name": "道具不足背景",
"x": 55,
"y": 498,
"alpha": 1,
"type": "sprite",
"props": {
"source": "道具不足背景.png"
}
}
]
},
{
"name": "TaskPanel",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "关闭按钮",
"x": 671,
"y": 708,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "按钮1",
"x": 526,
"y": 923,
"type": "button",
"props": {
"tUp": "去完成.png",
"tDisable": "去完成灰.png"
},
"id": "taskBtn1"
},
{
"name": "按钮2",
"x": 526,
"y": 1102,
"type": "button",
"props": {
"tUp": "去完成.png",
"tDisable": "去完成灰.png"
},
"id": "taskBtn2"
},
{
"name": "按钮3",
"x": 526,
"y": 1282,
"type": "button",
"props": {
"tUp": "去完成.png",
"tDisable": "去完成灰.png"
},
"id": "taskBtn3"
},
{
"name": "按钮4",
"x": 525,
"y": 1462,
"type": "button",
"props": {
"tUp": "去完成.png",
"tDisable": "去完成灰.png"
},
"id": "taskBtn4"
},
{
"name": "任务背景",
"x": 0,
"y": 579,
"alpha": 1,
"type": "sprite",
"props": {
"source": "任务背景.png"
}
}
]
},
{
"name": "RulePanel",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "关闭按钮",
"x": 631,
"y": 410,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "规则只要字体颜色和大小,到时删掉",
"x": 96,
"y": 549,
"alpha": 1,
"type": "text",
"props": {
"text": "1、这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案。\n\r2、这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案。\r\r3、这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案。\r\r4、这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案，这里是活动规则文案。",
"size": 26,
"fillColor": "#892a1a",
"textAlpha": 1
}
},
{
"name": "活动规则背景",
"x": 55,
"y": 438,
"alpha": 1,
"type": "sprite",
"props": {
"source": "活动规则背景.png"
}
}
]
},
{
"name": "BuyPowerPanel",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "文案",
"x": 426,
"y": 682,
"alpha": 1,
"type": "text",
"props": {
"text": "+1",
"size": 36,
"fillColor": "#ffffff",
"textAlpha": 1
},
"id": "msgTxt"
},
{
"name": "无字按钮底",
"x": 163,
"y": 805,
"alpha": 1,
"type": "button",
"props": {
"tUp": "无字按钮底.png"
},
"id": "exchangeBtn"
},
{
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "增加体力背景",
"x": 55,
"y": 498,
"alpha": 1,
"type": "sprite",
"props": {
"source": "增加体力背景.png"
}
}
]
},
{
"name": "NoEnergyPanel",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "体力不足按钮",
"x": 163,
"y": 880,
"alpha": 1,
"type": "button",
"props": {
"tUp": "体力不足按钮.png"
},
"id": "okBtn"
},
{
"name": "体力不足Bg",
"x": 55,
"y": 497,
"alpha": 1,
"type": "sprite",
"props": {
"source": "体力不足Bg.png"
}
}
]
},
{
"name": "StartPanelPrize",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "prize",
"x": 130,
"y": 903,
"alpha": 1,
"type": "sprite",
"props": {
"source": "prize.png"
}
},
{
"name": "开始闯关要能量",
"x": 163,
"y": 1120,
"alpha": 1,
"type": "button",
"props": {
"tUp": "开始闯关要能量.png"
},
"id": "startBtn"
},
{
"name": "动物",
"x": 154,
"y": 692,
"alpha": 1,
"type": "sprite",
"props": {
"source": "动物.png"
}
},
{
"name": "提示文案",
"x": 206,
"y": 849,
"alpha": 1,
"type": "text",
"props": {
"text": "通关参与抽奖，最高可赢得",
"size": 28,
"fillColor": "#df5942",
"textAlpha": 1
},
"id": "tipsTex"
},
{
"name": "关卡数",
"x": 312,
"y": 519,
"alpha": 1,
"type": "text",
"props": {
"text": "第 6 关",
"size": 24.78875,
"fillColor": "#df5942",
"textAlpha": 1
},
"id": "checkTex"
},
{
"name": "关卡弹窗Bg",
"x": 55,
"y": 266,
"alpha": 1,
"type": "sprite",
"props": {
"source": "关卡弹窗Bg.png"
}
}
]
},
{
"name": "StartPanel",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "动物",
"x": 154,
"y": 693,
"alpha": 1,
"type": "sprite",
"props": {
"source": "动物.png"
}
},
{
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "关卡文字",
"x": 312,
"y": 519,
"alpha": 1,
"type": "text",
"props": {
"text": "第 6 关",
"size": 24.78875,
"fillColor": "#df5942",
"textAlpha": 1
},
"id": "checkTex"
},
{
"name": "提示文案",
"x": 221,
"y": 847,
"alpha": 1,
"type": "text",
"props": {
"text": "本关满星可获得随机道具",
"size": 28,
"fillColor": "#df5942",
"textAlpha": 1
},
"id": "tipsTex"
},
{
"name": "开始闯关不要能量",
"x": 163,
"y": 899,
"alpha": 1,
"type": "button",
"props": {
"tUp": "开始闯关不要能量.png"
},
"id": "startBtn2"
},
{
"name": "开始闯关要能量",
"x": 163,
"y": 899,
"alpha": 1,
"type": "button",
"props": {
"tUp": "开始闯关要能量.png"
},
"id": "startBtn"
},
{
"name": "开始闯关Bg",
"x": 55,
"y": 266,
"alpha": 1,
"type": "sprite",
"props": {
"source": "开始闯关Bg.png"
}
}
]
},
{
"name": "FailedPanel",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "失败重新闯关",
"x": 163,
"y": 957,
"alpha": 1,
"type": "button",
"props": {
"tUp": "失败重新闯关.png"
},
"id": "againBtn"
},
{
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "提示文案",
"x": 224,
"y": 611,
"alpha": 1,
"type": "text",
"props": {
"text": "再接再厉！\n再闯3关可参与抽奖！",
"size": 36,
"fillColor": "#df5942",
"textAlpha": 1
},
"id": "tipsTex"
},
{
"name": "关卡文字",
"x": 300,
"y": 519,
"alpha": 1,
"type": "text",
"props": {
"text": "第 24 关",
"size": 24.78875,
"fillColor": "#df5942",
"textAlpha": 1
},
"id": "checkTex"
},
{
"name": "失败Bg",
"x": 55,
"y": 276,
"alpha": 1,
"type": "sprite",
"props": {
"source": "失败Bg.png"
}
}
]
},
{
"name": "NoStepBtn",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "步数耗尽结束按钮",
"x": 93,
"y": 845,
"alpha": 1,
"type": "button",
"props": {
"tUp": "步数耗尽结束按钮.png"
},
"id": "overBtn"
},
{
"name": "步数耗尽复活",
"x": 383,
"y": 845,
"alpha": 1,
"type": "button",
"props": {
"tUp": "步数耗尽复活.png"
},
"id": "liveBtn"
},
{
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "提示文案",
"x": 163,
"y": 661,
"alpha": 1,
"type": "text",
"props": {
"text": "消耗20积分可复活 ，步数+5\n确认复活吗？",
"size": 34,
"fillColor": "#df5942",
"textAlpha": 1
},
"id": "tipsTex"
},
{
"name": "步数耗尽Bg",
"x": 55,
"y": 498,
"alpha": 1,
"type": "sprite",
"props": {
"source": "步数耗尽Bg.png"
}
}
]
},
{
"name": "SuccessPrizePanel",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "star",
"x": 145,
"y": 601,
"alpha": 1,
"type": "sprite",
"props": {
"source": "star.png"
}
},
{
"name": "道具",
"x": 124,
"y": 858,
"type": "container",
"children": [
{
"name": "道具",
"x": 76,
"y": 24,
"alpha": 1,
"type": "sprite",
"props": {
"source": "道具.png"
}
},
{
"name": "步数道具 x1",
"x": 265,
"y": 85,
"alpha": 1,
"type": "text",
"props": {
"text": "步数道具 x1",
"size": 30,
"fillColor": "#df5942",
"textAlpha": 1
}
},
{
"name": "圆角矩形 648",
"x": 0,
"y": 0,
"alpha": 1,
"type": "sprite",
"props": {
"source": "圆角矩形 648.png"
}
}
]
},
{
"name": "红包奖励",
"x": 130,
"y": 870,
"alpha": 1,
"type": "sprite",
"props": {
"source": "红包奖励.png"
}
},
{
"name": "提示文案",
"x": 182,
"y": 810,
"alpha": 1,
"type": "text",
"props": {
"text": "太厉害了！获得抽奖资格！",
"size": 34,
"fillColor": "#df5942",
"textAlpha": 1
},
"id": "tipsTex"
},
{
"name": "关卡文字",
"x": 300,
"y": 519,
"alpha": 1,
"type": "text",
"props": {
"text": "第 24 关",
"size": 24.78875,
"fillColor": "#df5942",
"textAlpha": 1
},
"id": "checkTex"
},
{
"name": "按钮-继续闯关",
"x": 383,
"y": 1095,
"alpha": 1,
"type": "sprite",
"props": {
"source": "按钮-继续闯关.png"
}
},
{
"name": "继续闯关小",
"x": 93,
"y": 1095,
"alpha": 1,
"type": "button",
"props": {
"tUp": "继续闯关小.png"
},
"id": "againBtn"
},
{
"name": "继续闯关大",
"x": 163,
"y": 1086,
"alpha": 1,
"type": "button",
"props": {
"tUp": "继续闯关大.png"
},
"id": "noPrizeAgainBtn"
},
{
"name": "闯关成功",
"x": 55,
"y": 266,
"alpha": 1,
"type": "sprite",
"props": {
"source": "闯关成功.png"
}
}
]
},
{
"name": "SuccessNoPrizePanel",
"x": 0,
"y": 0,
"type": "container",
"children": [
{
"name": "关闭按钮",
"x": 631,
"y": 470,
"alpha": 1,
"type": "button",
"props": {
"tUp": "关闭按钮.png"
},
"id": "closeBtn"
},
{
"name": "star",
"x": 145,
"y": 601,
"alpha": 1,
"type": "sprite",
"props": {
"source": "star.png"
}
},
{
"name": "提示文案",
"x": 210,
"y": 797,
"alpha": 1,
"type": "text",
"props": {
"text": "太厉害了！\n再闯6关就即可抽奖！",
"size": 36,
"fillColor": "#df5942",
"textAlpha": 1
},
"id": "tipsTex"
},
{
"name": "关卡文字",
"x": 300,
"y": 519,
"alpha": 1,
"type": "text",
"props": {
"text": "第 24 关",
"size": 24.78875,
"fillColor": "#df5942",
"textAlpha": 1
},
"id": "checkTex"
},
{
"name": "闯关成功不满星按钮",
"x": 91,
"y": 955,
"alpha": 1,
"type": "button",
"props": {
"tUp": "闯关成功不满星按钮.png"
},
"id": "againBtn"
},
{
"name": "继续闯关小",
"x": 381,
"y": 955,
"alpha": 1,
"type": "button",
"props": {
"tUp": "继续闯关小.png"
},
"id": "continueBtn"
},
{
"name": "继续闯关大",
"x": 163,
"y": 935,
"alpha": 1,
"type": "button",
"props": {
"tUp": "继续闯关大.png"
},
"id": "totalContinueBtn"
},
{
"name": "闯关成功Bg",
"x": 55,
"y": 266,
"alpha": 1,
"type": "sprite",
"props": {
"source": "闯关成功Bg.png"
}
}
]
}
]
}
\ No newline at end of file
src/scene/PlayScene.ts
View file @ c47af0df
......@@ -312,7 +312,7 @@ export class PlayScene extends Scene {
this.upsetElement();
} else {
this.enableMouseEvt(true);
//首次送道具，的动画先出，然后再出引导 TODO
//首次送道具，的动画先出，然后再出引导
if (this.chapter == 1 && Tools.gameData.isFristLogin) {
this.addChild(new FirstPropGift())
.once(FYGE.MouseEvent.CLICK, (e: FYGE.MouseEvent) => {
......@@ -2266,6 +2266,10 @@ export class PlayScene extends Scene {
*/
effectEliminate(effectIndexs: number[]) {
if (effectIndexs.length && !this.hasPassed) this.effectContinuityTimes++;
//判断是否在原先消除队列里或effectIndexs里
let judgeExclude = (i: number) => {
return this.eliminatedElements.indexOf(i) < 0 && effectIndexs.indexOf(i) < 0
}
// var sounds: SoundType[] = [];
for (var j = 0; j < effectIndexs.length; j++) {
var index = effectIndexs[j];
......@@ -2294,18 +2298,17 @@ export class PlayScene extends Scene {
//对于魔力鸟的效果有不一样的，旋转，该组元素要旋转消除
for (var i = 0; i < this.lattices.length; i++) {
if (Tool.judgeMagicEliminate(this.lattices[i]) &&
this.lattices[i].element.type == type //类型相等
this.lattices[i].element.type == type && //类型相等
judgeExclude(i)
) {
if (this.eliminatedElements.indexOf(i) < 0 && effectIndexs.indexOf(i) < 0) {
this.eliminatedElements.push(i);
//无特效未枷锁,无毛球的参与旋转
if (Tool.judgeMagicRotate(this.lattices[i].element)) {
rotateData.elementsIndex.push(i);
}
//加分
if (Tool.judgeHasScore(this.lattices[i].element)) {
this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes["3"], Tool.getPositionByIndex(i))
}
this.eliminatedElements.push(i);
//无特效未枷锁,无毛球的参与旋转
if (Tool.judgeMagicRotate(this.lattices[i].element)) {
rotateData.elementsIndex.push(i);
}
//加分
if (Tool.judgeHasScore(this.lattices[i].element)) {
this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes["3"], Tool.getPositionByIndex(i))
}
}
}
......@@ -2317,18 +2320,27 @@ export class PlayScene extends Scene {
boomAni.scaleX = boomAni.scaleY = 1;
this.recoverEle(index);
//3*3，需要优化
for (var i = 0; i < this.lattices.length; i++) {
if (Tool.judgeEliminate(this.lattices[i]) &&
(Math.abs(this.lattices[i].row - lat.row) < 2 && Math.abs(this.lattices[i].column - lat.column) < 2)) {
if (this.eliminatedElements.indexOf(i) < 0 && effectIndexs.indexOf(i) < 0) {
this.eliminatedElements.push(i);
//加分
if (Tool.judgeHasScore(this.lattices[i].element)) {
this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes["2"], Tool.getPositionByIndex(i))
}
// for (var i = 0; i < this.lattices.length; i++) {
// if (Tool.judgeEliminate(this.lattices[i]) &&
// (Math.abs(this.lattices[i].row - lat.row) < 2 && Math.abs(this.lattices[i].column - lat.column) < 2)) {
// if (this.eliminatedElements.indexOf(i) < 0 && effectIndexs.indexOf(i) < 0) {
// this.eliminatedElements.push(i);
// //加分
// if (Tool.judgeHasScore(this.lattices[i].element)) {
// this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes["2"], Tool.getPositionByIndex(i))
// }
// }
// }
// }
Tool.getExplosiveIndexes(lat, this.lattices).forEach((i) => {
if (judgeExclude(i)) {
this.eliminatedElements.push(i);
//加分
if (Tool.judgeHasScore(this.lattices[i].element)) {
this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes["2"], Tool.getPositionByIndex(i))
}
}
}
})
break;
case EffectType.HORIZONTAL:
// if (sounds.indexOf(SoundType.line) == -1) sounds.push(SoundType.line)
......@@ -2338,13 +2350,13 @@ export class PlayScene extends Scene {
this.recoverEle(index);
for (var i = 0; i < Tool.colNum; i++) {
var ein = Tool.rcToIndex(row, i);
if (Tool.judgeEliminate(this.lattices[ein])) {
if (this.eliminatedElements.indexOf(ein) < 0 && effectIndexs.indexOf(ein) < 0) {
this.eliminatedElements.push(ein);
//加分
if (Tool.judgeHasScore(this.lattices[ein].element)) {
this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes["0"], Tool.getPositionByIndex(ein))
}
if (Tool.judgeEliminate(this.lattices[ein]) &&
judgeExclude(ein)
) {
this.eliminatedElements.push(ein);
//加分
if (Tool.judgeHasScore(this.lattices[ein].element)) {
this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes["0"], Tool.getPositionByIndex(ein))
}
}
}
......@@ -2357,13 +2369,13 @@ export class PlayScene extends Scene {
this.recoverEle(index);
for (var i = 0; i < Tool.rowNum; i++) {
var ein = Tool.rcToIndex(i, col);
if (Tool.judgeEliminate(this.lattices[ein])) {
if (this.eliminatedElements.indexOf(ein) < 0 && effectIndexs.indexOf(ein) < 0) {
this.eliminatedElements.push(ein);
//加分
if (Tool.judgeHasScore(this.lattices[ein].element)) {
this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes["1"], Tool.getPositionByIndex(ein))
}
if (Tool.judgeEliminate(this.lattices[ein]) &&
judgeExclude(ein)
) {
this.eliminatedElements.push(ein);
//加分
if (Tool.judgeHasScore(this.lattices[ein].element)) {
this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes["1"], Tool.getPositionByIndex(ein))
}
}
}
......@@ -2632,7 +2644,7 @@ export class PlayScene extends Scene {
*/
openRedBombPanel() {
if (this.redBombPanelMark) {
// PanelCtrl.instance.show(redBombPanelName);TODO
// PanelCtrl.instance.show(redBombPanelName);
this.redBombPanelMark = false;
}
}
......
src/something/Tool.ts
View file @ c47af0df
......@@ -23,7 +23,7 @@ function initClientScale() {
document.body.clientHeight / document.body.clientWidth * 750;
var middleHeight = 80 * 9;
var topHeight = 238;
var botHeight = 140+20//210 //+10
var botHeight = 140 + 20//210 //+10
var smallestHeight = topHeight + middleHeight + botHeight;
if (stageHeight < smallestHeight) {
offsetYTwo[0] = topHeight;
......@@ -515,7 +515,29 @@ export class Tool {
}
return true
}
/**
* 爆炸波及的格子索引
*/
private static ExplosiveMatchArr = [
[0, -2],
[-1, -1], [0, -1], [1, -1],
[-2, 0], [-1, 0], [1, 0], [2, 0],
[-1, 1], [0, 1], [1, 1],
[0, 2],
]
/**
* 获取爆炸时的周边索引
*/
public static getExplosiveIndexes(curLat: Lattice, lats: Lattice[]): number[] {
var arr = []
Tool.ExplosiveMatchArr.forEach((e) => {
var col = curLat.column + e[0]
var row = curLat.row + e[1]
var index = Tool.rcToIndex(row, col);
if (Tool.judgeEliminate(lats[index])) arr.push(index)
})
return arr
}
/**
* 检测死图，需要提示
* 需要返回一组提示 两个能互相交换元素,数组
......
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