Skip to content

B
babycare_xiaoxiao
Commit 5e5a132c authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

1

parent 0009e911
Show whitespace changes
Inline Side-by-side
Showing with 2598 additions and 10622 deletions
lt/bg_loop.json 0 → 100644
View file @ 5e5a132c
This source diff could not be displayed because it is too large. You can view the blob instead.
lt/title.json 0 → 100644
View file @ 5e5a132c
This source diff could not be displayed because it is too large. You can view the blob instead.
mock/miniTb/popmartXXL2c.drawLotteryPrize.json
View file @ 5e5a132c
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
"data": { "data": {
"_id": "", "_id": "",
"name": "aaa", "name": "aaa",
"type": 1, "type": 6,
"image": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png", "image": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png",
"drawStatus": "", "drawStatus": "",
"level": "1" "level": "1",
"toolType": "booms"
} }
} }
\ No newline at end of file
output.js
View file @ 5e5a132c
...@@ -13326,6 +13326,7 @@ var TbNetName; ...@@ -13326,6 +13326,7 @@ var TbNetName;
TbNetName["receiveEnamePrize"] = "popmartXXL2c.receiveEnamePrize"; TbNetName["receiveEnamePrize"] = "popmartXXL2c.receiveEnamePrize";
TbNetName["drawLotteryPrize"] = "popmartXXL2c.drawLotteryPrize"; TbNetName["drawLotteryPrize"] = "popmartXXL2c.drawLotteryPrize";
TbNetName["getToolsInfo"] = "popmartXXL2c.getToolsInfo"; TbNetName["getToolsInfo"] = "popmartXXL2c.getToolsInfo";
TbNetName["getPower"] = "popmartXXL2c.getRemainTimes";
TbNetName["doHelp"] = "popmartXXL2c.doHelp"; TbNetName["doHelp"] = "popmartXXL2c.doHelp";
TbNetName["getActivityBaseInfoById"] = "popmartXXL2c.getActivityBaseInfoById"; TbNetName["getActivityBaseInfoById"] = "popmartXXL2c.getActivityBaseInfoById";
TbNetName["consumerTools"] = "popmartXXL2c.consumerTools"; TbNetName["consumerTools"] = "popmartXXL2c.consumerTools";
...@@ -18830,7 +18831,9 @@ var TaskItem = (function (_super) { ...@@ -18830,7 +18831,9 @@ var TaskItem = (function (_super) {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateToOutside, { url: this.data.url }); TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateToOutside, { url: this.data.url });
break; break;
case TaskType.browseGoods: case TaskType.browseGoods:
console.log('去浏览页'); TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateTo, {
url: '/pages/goodsPage/goodsPage?taskType=browseGoods&itemIds=' + this.data.itemIds
});
break; break;
case TaskType.follow: case TaskType.follow:
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.favorShop, {}, function (fs, fr) { TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.favorShop, {}, function (fs, fr) {
...@@ -18843,7 +18846,9 @@ var TaskItem = (function (_super) { ...@@ -18843,7 +18846,9 @@ var TaskItem = (function (_super) {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.showSharePanel, { openId: Tools_1.Tools.globalData.openId }); TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.showSharePanel, { openId: Tools_1.Tools.globalData.openId });
break; break;
case TaskType.orderGoods: case TaskType.orderGoods:
console.log('去下单页'); TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateTo, {
url: '/pages/goodsPage/goodsPage?taskType=orderGoods&itemIds=' + this.data.itemIds
});
break; break;
} }
}; };
...@@ -21997,6 +22002,8 @@ var Ease = FYGE.Ease; ...@@ -21997,6 +22002,8 @@ var Ease = FYGE.Ease;
var ctrls_1 = __webpack_require__(/*! ../../../module/ctrls */ "./module/ctrls/index.ts"); var ctrls_1 = __webpack_require__(/*! ../../../module/ctrls */ "./module/ctrls/index.ts");
var FreePowerPanel_1 = __webpack_require__(/*! ../../panels/FreePowerPanel */ "./src/panels/FreePowerPanel.ts"); var FreePowerPanel_1 = __webpack_require__(/*! ../../panels/FreePowerPanel */ "./src/panels/FreePowerPanel.ts");
var TaoBaoNet_1 = __webpack_require__(/*! ../../TaoBaoNet */ "./src/TaoBaoNet.ts"); var TaoBaoNet_1 = __webpack_require__(/*! ../../TaoBaoNet */ "./src/TaoBaoNet.ts");
var Main_1 = __webpack_require__(/*! ../../Main */ "./src/Main.ts");
var G_EVENT_1 = __webpack_require__(/*! ../../common/G_EVENT */ "./src/common/G_EVENT.ts");
var MapScene = (function (_super) { var MapScene = (function (_super) {
__extends(MapScene, _super); __extends(MapScene, _super);
function MapScene() { function MapScene() {
...@@ -22163,9 +22170,11 @@ var MapScene = (function (_super) { ...@@ -22163,9 +22170,11 @@ var MapScene = (function (_super) {
}; };
MapScene.prototype.initEvents = function () { MapScene.prototype.initEvents = function () {
_super.prototype.initEvents.call(this); _super.prototype.initEvents.call(this);
Main_1.GDispatcher.addEventListener(G_EVENT_1.G_EVENT.ON_SHOW, this.updateScene, this);
}; };
MapScene.prototype.removeEvents = function () { MapScene.prototype.removeEvents = function () {
_super.prototype.removeEvents.call(this); _super.prototype.removeEvents.call(this);
Main_1.GDispatcher.removeEventListener(G_EVENT_1.G_EVENT.ON_SHOW, this.updateScene, this);
}; };
MapScene.checkArr = []; MapScene.checkArr = [];
return MapScene; return MapScene;
...@@ -22377,7 +22386,13 @@ var MapUI = (function (_super) { ...@@ -22377,7 +22386,13 @@ var MapUI = (function (_super) {
this.energyBox = this.addChild(new EnergyBox({})); this.energyBox = this.addChild(new EnergyBox({}));
}; };
MapUI.prototype.updateUI = function () { MapUI.prototype.updateUI = function () {
this.energyBox.count = Tools_1.Tools.propInfo.power; var _this = this;
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getPower, {}, function (success, res) {
_this.energyBox.count = Tools_1.Tools.propInfo.power;
if (!success)
return;
_this.energyBox.count = Tools_1.Tools.propInfo.power = res.data.power;
});
}; };
return MapUI; return MapUI;
}(Container)); }(Container));
output.js.map
View file @ 5e5a132c
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
View file @ 5e5a132c
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
"dev": "webpack-dev-server --open --config webpack.dev.js --host 0.0.0.0", "dev": "webpack-dev-server --open --config webpack.dev.js --host 0.0.0.0",
"buildTS": "webpack --config webpack.prod.js && node scripts/mergeJs && npm run copyJs", "buildTS": "webpack --config webpack.prod.js && node scripts/mergeJs && npm run copyJs",
"copyJs": "node scripts/copyJs", "copyJs": "node scripts/copyJs",
"lt": "node scripts/handleLotS.js" "lt": "node scripts/handleLotS.js && npm run flushRes"
}, },
"author": "MrKwon", "author": "MrKwon",
"license": "ISC" "license": "ISC"
......
resource/loadingScene/loadingBg.jpg
View replaced file @ 0009e911 View file @ 5e5a132c
resource/loadingScene/loadingBg.jpg

236 KB | W: | H:

resource/loadingScene/loadingBg.jpg

107 KB | W: | H:

resource/loadingScene/loadingBg.jpg
resource/loadingScene/loadingBg.jpg
resource/loadingScene/loadingBg.jpg
resource/loadingScene/loadingBg.jpg
  • 2-up
  • Swipe
  • Onion skin
resource/loadingScene/loadingPro1.png
View replaced file @ 0009e911 View file @ 5e5a132c
resource/loadingScene/loadingPro1.png

19.2 KB | W: | H:

resource/loadingScene/loadingPro1.png

10.6 KB | W: | H:

resource/loadingScene/loadingPro1.png
resource/loadingScene/loadingPro1.png
resource/loadingScene/loadingPro1.png
resource/loadingScene/loadingPro1.png
  • 2-up
  • Swipe
  • Onion skin
resource/loadingScene/loadingPro10.png
View replaced file @ 0009e911 View file @ 5e5a132c
resource/loadingScene/loadingPro10.png

19.3 KB | W: | H:

resource/loadingScene/loadingPro10.png

10.8 KB | W: | H:

resource/loadingScene/loadingPro10.png
resource/loadingScene/loadingPro10.png
resource/loadingScene/loadingPro10.png
resource/loadingScene/loadingPro10.png
  • 2-up
  • Swipe
  • Onion skin
resource/loadingScene/loadingPro11.png
View replaced file @ 0009e911 View file @ 5e5a132c
resource/loadingScene/loadingPro11.png

19.4 KB | W: | H:

resource/loadingScene/loadingPro11.png

10.6 KB | W: | H:

resource/loadingScene/loadingPro11.png
resource/loadingScene/loadingPro11.png
resource/loadingScene/loadingPro11.png
resource/loadingScene/loadingPro11.png
  • 2-up
  • Swipe
  • Onion skin
resource/loadingScene/loadingPro2.png
View replaced file @ 0009e911 View file @ 5e5a132c
resource/loadingScene/loadingPro2.png

19.3 KB | W: | H:

resource/loadingScene/loadingPro2.png

10.7 KB | W: | H:

resource/loadingScene/loadingPro2.png
resource/loadingScene/loadingPro2.png
resource/loadingScene/loadingPro2.png
resource/loadingScene/loadingPro2.png
  • 2-up
  • Swipe
  • Onion skin
resource/loadingScene/loadingPro3.png
View replaced file @ 0009e911 View file @ 5e5a132c
resource/loadingScene/loadingPro3.png

19.3 KB | W: | H:

resource/loadingScene/loadingPro3.png

10.6 KB | W: | H:

resource/loadingScene/loadingPro3.png
resource/loadingScene/loadingPro3.png
resource/loadingScene/loadingPro3.png
resource/loadingScene/loadingPro3.png
  • 2-up
  • Swipe
  • Onion skin
resource/loadingScene/loadingPro4.png
View replaced file @ 0009e911 View file @ 5e5a132c
resource/loadingScene/loadingPro4.png

19.5 KB | W: | H:

resource/loadingScene/loadingPro4.png

10.5 KB | W: | H:

resource/loadingScene/loadingPro4.png
resource/loadingScene/loadingPro4.png
resource/loadingScene/loadingPro4.png
resource/loadingScene/loadingPro4.png
  • 2-up
  • Swipe
  • Onion skin
resource/loadingScene/loadingPro5.png
View replaced file @ 0009e911 View file @ 5e5a132c
resource/loadingScene/loadingPro5.png

19.5 KB | W: | H:

resource/loadingScene/loadingPro5.png

10.5 KB | W: | H:

resource/loadingScene/loadingPro5.png
resource/loadingScene/loadingPro5.png
resource/loadingScene/loadingPro5.png
resource/loadingScene/loadingPro5.png
  • 2-up
  • Swipe
  • Onion skin
resource/loadingScene/loadingPro6.png
View replaced file @ 0009e911 View file @ 5e5a132c
resource/loadingScene/loadingPro6.png

19.4 KB | W: | H:

resource/loadingScene/loadingPro6.png

10.3 KB | W: | H:

resource/loadingScene/loadingPro6.png
resource/loadingScene/loadingPro6.png
resource/loadingScene/loadingPro6.png
resource/loadingScene/loadingPro6.png
  • 2-up
  • Swipe
  • Onion skin
resource/loadingScene/loadingPro7.png
View replaced file @ 0009e911 View file @ 5e5a132c
resource/loadingScene/loadingPro7.png

19.6 KB | W: | H:

resource/loadingScene/loadingPro7.png

10.6 KB | W: | H:

resource/loadingScene/loadingPro7.png
resource/loadingScene/loadingPro7.png
resource/loadingScene/loadingPro7.png
resource/loadingScene/loadingPro7.png
  • 2-up
  • Swipe
  • Onion skin
resource/loadingScene/loadingPro8.png
View replaced file @ 0009e911 View file @ 5e5a132c
resource/loadingScene/loadingPro8.png

19.6 KB | W: | H:

resource/loadingScene/loadingPro8.png

10.8 KB | W: | H:

resource/loadingScene/loadingPro8.png
resource/loadingScene/loadingPro8.png
resource/loadingScene/loadingPro8.png
resource/loadingScene/loadingPro8.png
  • 2-up
  • Swipe
  • Onion skin
resource/loadingScene/loadingPro9.png
View replaced file @ 0009e911 View file @ 5e5a132c
resource/loadingScene/loadingPro9.png

19.5 KB | W: | H:

resource/loadingScene/loadingPro9.png

10.7 KB | W: | H:

resource/loadingScene/loadingPro9.png
resource/loadingScene/loadingPro9.png
resource/loadingScene/loadingPro9.png
resource/loadingScene/loadingPro9.png
  • 2-up
  • Swipe
  • Onion skin
resource/res.json
View file @ 5e5a132c
...@@ -61,13 +61,9 @@ ...@@ -61,13 +61,9 @@
"name": "fiveVerHorDis" "name": "fiveVerHorDis"
}, },
{ {
"keys": "carb_arm.png,carb_body.png,carb_hand_l.png,carb_hand_r.png,fox_arm_l.png,fox_body.png,fox_head.png,fox_tail0.png,fox_tail1.png,fox_tail10.png,fox_tail11.png,fox_tail12.png,fox_tail13.png,fox_tail14.png,fox_tail2.png,fox_tail3.png,fox_tail4.png,fox_tail5.png,fox_tail6.png,fox_tail7.png,fox_tail8.png,fox_tail9.png,hommer.png,img_line1.png,img_line2.png,img_line3.png,img_line4.png,img_line5.png,img_owl.png,img_tree.png,lighting_1.png,lighting_2.png,loadingBg.jpg,loadingBg2.png,loadingPro0.png,loadingPro1.png,loadingPro10.png,loadingPro11.png,loadingPro2.png,loadingPro3.png,loadingPro4.png,loadingPro5.png,loadingPro6.png,loadingPro7.png,loadingPro8.png,loadingPro9.png,loadingTitle.png,owl_sleep.png,proDown.png,wheel.png", "keys": "loadingBg.jpg,loadingPro0.png,loadingPro1.png,loadingPro10.png,loadingPro11.png,loadingPro2.png,loadingPro3.png,loadingPro4.png,loadingPro5.png,loadingPro6.png,loadingPro7.png,loadingPro8.png,loadingPro9.png,proDown.png",
"name": "loadingScene" "name": "loadingScene"
}, },
{
"keys": "lotteryBtn.png,lotteryItemBg.png,lotteryMachineBg.jpg,lotteryReturnBtn.png,prizeItemBg.png,shadowMask.png",
"name": "lotteryScene"
},
{ {
"keys": "cur_light_1.png,cur_light_2.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,lightImg.png,mapGuide.png,map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_enable.png,map_check_enable_cur.png,map_energyAdd.png,map_energyBg.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_taskBtn_tip.png", "keys": "cur_light_1.png,cur_light_2.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,lightImg.png,mapGuide.png,map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_enable.png,map_check_enable_cur.png,map_energyAdd.png,map_energyBg.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_taskBtn_tip.png",
"name": "map" "name": "map"
...@@ -100,6 +96,14 @@ ...@@ -100,6 +96,14 @@
"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,ele0Line.png,ele1Exp.png,ele1Line.png,ele2Exp.png,ele2Line.png,ele3Exp.png,ele3Line.png,ele4Exp.png,ele4Line.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,gameGuide1.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-1.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.jpg,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,prop_count_bg.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,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", "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,ele0Line.png,ele1Exp.png,ele1Line.png,ele2Exp.png,ele2Line.png,ele3Exp.png,ele3Line.png,ele4Exp.png,ele4Line.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,gameGuide1.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-1.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.jpg,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,prop_count_bg.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,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" "name": "playScene"
}, },
{
"keys": "0d37cb05-b970-43a7-9bcc-b617756885ff.png,0ea400c4-35c5-48c2-970d-f7f942f236d0.png,0fa7d552-2406-43f0-b943-a02e7306ba7b.png,121c1dcf-3439-46c3-94b1-2dc0a2328292.png,1f062bf4-e898-4aca-93ff-64dc7ac39b55.png,24e778ec-7b78-46e1-9305-a41d4dd2660b.png,25b1766e-ae87-4b86-8706-d0422eed8402.png,299d34f5-0947-408e-ad03-f591b54435f1.png,30994ee9-dfce-4815-8830-5f59a3581532.png,3d81bb8a-d507-46cf-aadf-acc264251d15.png,44143eac-1ebb-4c6f-a712-23bccad2d8e7.png,446172d9-8cae-41f8-879b-36d9c0505746.png,4740ad76-b823-4229-8896-3a5268d519c6.png,49f443bf-ce54-4c09-9d7d-85084f2fec65.png,528f8387-a46a-41c5-bfd4-c3534cb6226f.png,5596d058-d177-42c9-a5f2-5737fb2c2ede.png,61ff6238-9225-4a1a-b401-65cb5ace0417.png,776414a4-6190-4826-b502-58020d623d45.png,7ce1df43-a1b0-4506-8076-c8fed4dcd39c.png,8794ea27-6e1b-4fc9-b7a0-dc4c682832b7.png,8d7b922a-1c6c-4377-9098-c1514e0b512c.png,9444e747-9e09-4452-93df-a470dac6f201.png,9eeccbcd-988c-49ea-aed8-737c910ca214.png,a52128bc-3b0a-421c-944a-7bdc4a6c14b7.png,a5faf813-2707-49fe-9595-c74db99bbdab.png,a618d9b6-b2ce-4b02-8219-c92a1fae1c15.png,af26b6bf-0409-4d11-853c-6b39b2bb8761.png,b978ea1a-c871-4246-b100-5cc182d1cf73.png,c0acb40f-4193-4d77-afcf-a9e76821dbbf.png,c4b17d9a-4622-4ff3-9949-cc8cce0c69b9.png,c4ef35a4-9645-43d1-a59e-15d1b2267fa0.png,cbb513ad-909c-4f19-9d2d-ae1a76d4ff63.png,d00a6100-05af-4477-ab25-c1dfd6081e3c.png,e412ed05-1dc0-4424-bcd5-0f77dddc81c0.png,f563a30f-a00b-4230-8304-856d0168f325.png,fadc7c50-c964-4b48-824f-9f0d31a070d4.png,ffbcdc34-5b73-4c17-9bab-2d2d7009c6f2.png",
"name": "pop_laoding_bg"
},
{
"keys": "ea362f0b-b2c8-4d39-bbf2-d8a60962d6e0.png,ee8ac4e5-73d7-421b-bcc5-3fbf2781e3f3.png,fd21b9df-66ff-4c4c-9beb-8d70be581fde.png",
"name": "pop_loading_title"
},
{ {
"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", "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" "name": "starLight"
......
scripts/handleLotS.js
View file @ 5e5a132c
...@@ -9,7 +9,7 @@ var path = require('path'); ...@@ -9,7 +9,7 @@ var path = require('path');
var hashBase64 = {}; var hashBase64 = {};
var pathName = "./l"; var pathName = "./lt";
var outPath = "./resource" var outPath = "./resource"
//读文件夹 //读文件夹
var files = fs.readdirSync(pathName); var files = fs.readdirSync(pathName);
......
src/ResJson.ts
View file @ 5e5a132c
This source diff could not be displayed because it is too large. You can view the blob instead.
src/TaoBaoNet.ts
View file @ 5e5a132c
...@@ -16,6 +16,8 @@ export enum TbNetName { ...@@ -16,6 +16,8 @@ export enum TbNetName {
drawLotteryPrize = 'popmartXXL2c.drawLotteryPrize', drawLotteryPrize = 'popmartXXL2c.drawLotteryPrize',
getToolsInfo = 'popmartXXL2c.getToolsInfo', getToolsInfo = 'popmartXXL2c.getToolsInfo',
getPower = 'popmartXXL2c.getRemainTimes',
// inviteId // inviteId
doHelp = 'popmartXXL2c.doHelp', doHelp = 'popmartXXL2c.doHelp',
...@@ -192,7 +194,7 @@ export function sendTbNet( ...@@ -192,7 +194,7 @@ export function sendTbNet(
} }
let fun = function(e: { type: string, data: dataOut }) { let fun = function (e: { type: string, data: dataOut }) {
//清除超时记录 //清除超时记录
// clearWait(waitObj) // clearWait(waitObj)
//移除事件 //移除事件
...@@ -239,7 +241,7 @@ export function sendTbNet( ...@@ -239,7 +241,7 @@ export function sendTbNet(
// }, 10000) // }, 10000)
//用事件方式吧，派发事件发接口,,,,注意很多独有的事件名别重了，onHide,onShow,onMessage等 放到最后，因为有同步的情况 //用事件方式吧，派发事件发接口,,,,注意很多独有的事件名别重了，onHide,onShow,onMessage等 放到最后，因为有同步的情况
GDispatcher.dispatchEvent({type: "onMessage"}, {netName, parameter}) GDispatcher.dispatchEvent({ type: "onMessage" }, { netName, parameter })
}) })
//@ts-ignore //@ts-ignore
// if (!fc) fc = getApp().cloud.function; // if (!fc) fc = getApp().cloud.function;
......
src/Tools.ts
View file @ 5e5a132c
...@@ -111,9 +111,9 @@ export class Tools { ...@@ -111,9 +111,9 @@ export class Tools {
sendTbNet(TbNetName.getToolsInfo, {}, sendTbNet(TbNetName.getToolsInfo, {},
(st, rt) => { (st, rt) => {
if (!st) return; if (!st) return;
this.propInfo.booms = +res.data.tools.booms; this.propInfo.booms = +rt.data.tools.booms;
this.propInfo.steps = +res.data.tools.steps; this.propInfo.steps = +rt.data.tools.steps;
this.propInfo.hammers = +res.data.tools.hammers; this.propInfo.hammers = +rt.data.tools.hammers;
} }
); );
resolve(true) resolve(true)
......
src/lotties/pop_laoding_bg.ts 0 → 100644
View file @ 5e5a132c
export const pop_laoding_bg = {
"v": "5.6.10",
"fr": 30,
"ip": 0,
"op": 60,
"w": 750,
"h": 1624,
"nm": "pop_laoding_bg",
"layers": [
{
"ind": 1,
"ty": 2,
"nm": "leg_l",
"parent": 6,
"refId": "49f443bf-ce54-4c09-9d7d-85084f2fec65",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 0,
"s": [
0
]
},
{
"t": 30,
"s": [
-9
]
},
{
"t": 60,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
21,
147.5,
0
]
},
"a": {
"a": 0,
"k": [
86,
22.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 2,
"ty": 2,
"nm": "leg_r",
"parent": 6,
"refId": "3d81bb8a-d507-46cf-aadf-acc264251d15",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 0,
"s": [
0
]
},
{
"t": 30,
"s": [
-11
]
},
{
"t": 60,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
114,
135,
0
]
},
"a": {
"a": 0,
"k": [
66,
18,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 3,
"ty": 2,
"nm": "cloth",
"parent": 6,
"refId": "1f062bf4-e898-4aca-93ff-64dc7ac39b55",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
65.5,
139,
0
]
},
"a": {
"a": 0,
"k": [
86.5,
57,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 4,
"ty": 2,
"nm": "arm_r",
"parent": 6,
"refId": "446172d9-8cae-41f8-879b-36d9c0505746",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 0,
"s": [
0
]
},
{
"t": 30,
"s": [
-6
]
},
{
"t": 60,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
125.5,
24.5,
0
]
},
"a": {
"a": 0,
"k": [
164.5,
34.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 5,
"ty": 2,
"nm": "tie",
"parent": 6,
"refId": "a52128bc-3b0a-421c-944a-7bdc4a6c14b7",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
51,
6.5,
0
]
},
"a": {
"a": 0,
"k": [
28,
27.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 6,
"ty": 2,
"nm": "body",
"refId": "299d34f5-0947-408e-ad03-f591b54435f1",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
378,
999.5,
0
]
},
{
"t": 30,
"s": [
378,
1009.5,
0
]
},
{
"t": 60,
"s": [
378,
999.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
70,
124.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 30,
"s": [
100,
100,
100
]
},
{
"t": 60,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 7,
"ty": 2,
"nm": "cake",
"parent": 6,
"refId": "fadc7c50-c964-4b48-824f-9f0d31a070d4",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
-26,
-48,
0
]
},
{
"t": 30,
"s": [
-26,
-35,
0
]
},
{
"t": 60,
"s": [
-26,
-48,
0
]
}
]
},
"a": {
"a": 0,
"k": [
54,
51,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 8,
"ty": 2,
"nm": "nose",
"parent": 6,
"refId": "7ce1df43-a1b0-4506-8076-c8fed4dcd39c",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
42,
-60.5,
0
]
},
"a": {
"a": 0,
"k": [
12,
10.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 9,
"ty": 2,
"nm": "eye_l",
"parent": 8,
"refId": "c4b17d9a-4622-4ff3-9949-cc8cce0c69b9",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
-22.99,
-18.306,
0
]
},
"a": {
"a": 0,
"k": [
26.01,
50.694,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 30,
"s": [
100,
100,
100
]
},
{
"t": 32,
"s": [
100,
0,
100
]
},
{
"t": 34,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 10,
"ty": 2,
"nm": "eye_r",
"parent": 8,
"refId": "30994ee9-dfce-4815-8830-5f59a3581532",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
100.102,
10.163,
0
]
},
"a": {
"a": 0,
"k": [
55.102,
52.163,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 30,
"s": [
100,
100,
100
]
},
{
"t": 32,
"s": [
100,
0,
100
]
},
{
"t": 34,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 11,
"ty": 2,
"nm": "mouth",
"parent": 8,
"refId": "9444e747-9e09-4452-93df-a470dac6f201",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
10.5,
31,
0
]
},
"a": {
"a": 0,
"k": [
23.5,
12,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 12,
"ty": 2,
"nm": "haed",
"parent": 6,
"refId": "af26b6bf-0409-4d11-853c-6b39b2bb8761",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
61.5,
-4,
0
]
},
"a": {
"a": 0,
"k": [
124.5,
280,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 13,
"ty": 2,
"nm": "tail_1",
"parent": 6,
"refId": "776414a4-6190-4826-b502-58020d623d45",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 0,
"s": [
0
]
},
{
"t": 30,
"s": [
7
]
},
{
"t": 60,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
128.5,
110.5,
0
]
},
"a": {
"a": 0,
"k": [
16.5,
53.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 14,
"ty": 2,
"nm": "tail_2",
"parent": 6,
"refId": "25b1766e-ae87-4b86-8706-d0422eed8402",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 0,
"s": [
0
]
},
{
"t": 30,
"s": [
-9
]
},
{
"t": 60,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
135.5,
132.5,
0
]
},
"a": {
"a": 0,
"k": [
21.5,
19.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 15,
"ty": 2,
"nm": "arm_l",
"parent": 6,
"refId": "8794ea27-6e1b-4fc9-b7a0-dc4c682832b7",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 0,
"s": [
0
]
},
{
"t": 30,
"s": [
-14
]
},
{
"t": 60,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
13,
31.5,
0
]
},
"a": {
"a": 0,
"k": [
74,
34.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 16,
"ty": 2,
"nm": "quan.png",
"refId": "121c1dcf-3439-46c3-94b1-2dc0a2328292",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 0,
"s": [
0
]
},
{
"t": 30,
"s": [
-1
]
},
{
"t": 60,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
639,
1320,
0
]
},
"a": {
"a": 0,
"k": [
161.7,
179.692,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 17,
"ty": 2,
"nm": "cherry.png",
"parent": 19,
"refId": "f563a30f-a00b-4230-8304-856d0168f325",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
325.5,
-29.5,
0
]
},
"a": {
"a": 0,
"k": [
77,
82,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 18,
"ty": 2,
"nm": "lemmon.png",
"parent": 19,
"refId": "44143eac-1ebb-4c6f-a712-23bccad2d8e7",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
31.5,
218.5,
0
]
},
"a": {
"a": 0,
"k": [
104.5,
103,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 30,
"s": [
100,
102,
100
]
},
{
"t": 60,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 19,
"ty": 2,
"nm": "dong.png",
"refId": "e412ed05-1dc0-4424-bcd5-0f77dddc81c0",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
387,
1212,
0
]
},
"a": {
"a": 0,
"k": [
193.5,
268.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 0,
"s": [
100,
100,
100
]
},
{
"t": 30,
"s": [
102,
96,
100
]
},
{
"t": 60,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 20,
"ty": 2,
"nm": "plate.png",
"refId": "c0acb40f-4193-4d77-afcf-a9e76821dbbf",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
385,
1215,
0
]
},
"a": {
"a": 0,
"k": [
278,
79,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 21,
"ty": 2,
"nm": "eye_l 2",
"parent": 23,
"refId": "d00a6100-05af-4477-ab25-c1dfd6081e3c",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
-8.682,
-8.488,
0
]
},
"a": {
"a": 0,
"k": [
10.318,
27.512,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 61
},
{
"ind": 22,
"ty": 2,
"nm": "eye_r 2",
"parent": 23,
"refId": "61ff6238-9225-4a1a-b401-65cb5ace0417",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
42.786,
13.802,
0
]
},
"a": {
"a": 0,
"k": [
16.786,
19.802,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 61
},
{
"ind": 23,
"ty": 2,
"nm": "nose 2",
"parent": 25,
"refId": "c4ef35a4-9645-43d1-a59e-15d1b2267fa0",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
31,
54.5,
0
]
},
"a": {
"a": 0,
"k": [
8,
7.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 61
},
{
"ind": 24,
"ty": 2,
"nm": "ear_r",
"parent": 25,
"refId": "b978ea1a-c871-4246-b100-5cc182d1cf73",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 15,
"s": [
0
]
},
{
"t": 17,
"s": [
-3
]
},
{
"t": 19,
"s": [
0
]
}
]
},
"p": {
"a": 1,
"k": [
{
"t": 15,
"s": [
88,
28.5,
0
]
},
{
"t": 17,
"s": [
86.75,
26.25,
0
]
},
{
"t": 19,
"s": [
88,
28.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
13,
38.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 15,
"s": [
100,
100,
100
]
},
{
"t": 17,
"s": [
96,
100,
100
]
},
{
"t": 19,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 61
},
{
"ind": 25,
"ty": 2,
"nm": "head",
"parent": 32,
"refId": "0d37cb05-b970-43a7-9bcc-b617756885ff",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 30,
"s": [
0
]
},
{
"t": 48,
"s": [
-8
]
},
{
"t": 60,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
64,
9,
0
]
},
"a": {
"a": 0,
"k": [
40,
72,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 61
},
{
"ind": 26,
"ty": 2,
"nm": "hair",
"parent": 25,
"refId": "a618d9b6-b2ce-4b02-8219-c92a1fae1c15",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
68,
2.5,
0
]
},
"a": {
"a": 0,
"k": [
14,
12.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 61
},
{
"ind": 27,
"ty": 2,
"nm": "ear_l",
"parent": 25,
"refId": "a5faf813-2707-49fe-9595-c74db99bbdab",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
34,
1.5,
0
]
},
"a": {
"a": 0,
"k": [
27,
41.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 61
},
{
"ind": 28,
"ty": 2,
"nm": "arm_l 2",
"parent": 32,
"refId": "4740ad76-b823-4229-8896-3a5268d519c6",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 30,
"s": [
0
]
},
{
"t": 37,
"s": [
-51
]
},
{
"t": 41,
"s": [
-36
]
},
{
"t": 45,
"s": [
-51
]
},
{
"t": 49,
"s": [
-36
]
},
{
"t": 53,
"s": [
-51
]
},
{
"t": 60,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
60.705,
36.471,
0
]
},
"a": {
"a": 0,
"k": [
11,
11,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 61
},
{
"ind": 29,
"ty": 2,
"nm": "dang",
"parent": 32,
"refId": "24e778ec-7b78-46e1-9305-a41d4dd2660b",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
78,
33.5,
0
]
},
"a": {
"a": 0,
"k": [
12,
9.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 61
},
{
"ind": 30,
"ty": 2,
"nm": "leg",
"parent": 32,
"refId": "cbb513ad-909c-4f19-9d2d-ae1a76d4ff63",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 30,
"s": [
0
]
},
{
"t": 48,
"s": [
12
]
},
{
"t": 60,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
15.5,
50,
0
]
},
"a": {
"a": 0,
"k": [
15.5,
7,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 61
},
{
"ind": 31,
"ty": 2,
"nm": "arm_r 2",
"parent": 32,
"refId": "ffbcdc34-5b73-4c17-9bab-2d2d7009c6f2",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 30,
"s": [
26
]
},
{
"t": 37,
"s": [
-20
]
},
{
"t": 41,
"s": [
-40
]
},
{
"t": 45,
"s": [
-20
]
},
{
"t": 49,
"s": [
-40
]
},
{
"t": 53,
"s": [
-20
]
},
{
"t": 60,
"s": [
26
]
}
]
},
"p": {
"a": 0,
"k": [
90.343,
29.461,
0
]
},
"a": {
"a": 0,
"k": [
8.343,
6.461,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 61
},
{
"ind": 32,
"ty": 2,
"nm": "body 2",
"refId": "9eeccbcd-988c-49ea-aed8-737c910ca214",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 30,
"s": [
0
]
},
{
"t": 48,
"s": [
-12
]
},
{
"t": 60,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
613,
1012.5,
0
]
},
"a": {
"a": 0,
"k": [
17,
49.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 30,
"s": [
100,
100,
100
]
},
{
"t": 37,
"s": [
103,
103,
100
]
},
{
"t": 53,
"s": [
103,
103,
100
]
},
{
"t": 60,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 0,
"op": 61
},
{
"ind": 33,
"ty": 2,
"nm": "tail",
"parent": 32,
"refId": "5596d058-d177-42c9-a5f2-5737fb2c2ede",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 0,
"s": [
0
]
},
{
"t": 9,
"s": [
12
]
},
{
"t": 18,
"s": [
0
]
},
{
"t": 27,
"s": [
12
]
},
{
"t": 36,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
9.5,
52,
0
]
},
"a": {
"a": 0,
"k": [
42.5,
70,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 61
},
{
"ind": 34,
"ty": 2,
"nm": "shadow",
"refId": "0ea400c4-35c5-48c2-970d-f7f942f236d0",
"ks": {
"o": {
"a": 0,
"k": 50.196
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
659.5,
1021,
0
]
},
"a": {
"a": 0,
"k": [
82.5,
20,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 61
},
{
"ind": 35,
"ty": 2,
"nm": "cloud_1.png",
"refId": "528f8387-a46a-41c5-bfd4-c3534cb6226f",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
455,
1529,
0
]
},
{
"t": 30,
"s": [
469,
1539,
0
]
},
{
"t": 60,
"s": [
455,
1529,
0
]
}
]
},
"a": {
"a": 0,
"k": [
295,
95,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 36,
"ty": 2,
"nm": "cloud_2.png",
"refId": "8d7b922a-1c6c-4377-9098-c1514e0b512c",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
240,
1512.5,
0
]
},
{
"t": 30,
"s": [
236,
1514.5,
0
]
},
{
"t": 60,
"s": [
240,
1512.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
240,
111.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
},
{
"ind": 37,
"ty": 2,
"nm": "cloud_3.png",
"refId": "0fa7d552-2406-43f0-b943-a02e7306ba7b",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 0,
"s": [
375,
1488,
0
]
},
{
"t": 30,
"s": [
377,
1472,
0
]
},
{
"t": 60,
"s": [
375,
1488,
0
]
}
]
},
"a": {
"a": 0,
"k": [
375,
136,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 0,
"op": 180
}
],
"markers": []
}
\ No newline at end of file
src/lotties/pop_loading_title.ts 0 → 100644
View file @ 5e5a132c
export const pop_loading_title = {
"v": "5.6.10",
"fr": 30,
"ip": 0,
"op": 30,
"w": 750,
"h": 1624,
"nm": "pop_loading_title",
"layers": [
{
"ind": 1,
"ty": 2,
"nm": "cat.png",
"parent": 3,
"refId": "ea362f0b-b2c8-4d39-bbf2-d8a60962d6e0",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 1,
"k": [
{
"t": 12,
"s": [
-16
]
},
{
"t": 18,
"s": [
0
]
}
]
},
"p": {
"a": 0,
"k": [
59,
102.75,
0
]
},
"a": {
"a": 0,
"k": [
24,
0.25,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 12,
"op": 186
},
{
"ind": 2,
"ty": 2,
"nm": "logo.png",
"refId": "ee8ac4e5-73d7-421b-bcc5-3fbf2781e3f3",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 0,
"k": [
387,
419,
0
]
},
"a": {
"a": 0,
"k": [
238.5,
159.5,
0
]
},
"s": {
"a": 1,
"k": [
{
"t": 3,
"s": [
50,
50,
100
]
},
{
"t": 9,
"s": [
110,
94,
100
]
},
{
"t": 12,
"s": [
96,
102,
100
]
},
{
"t": 15,
"s": [
102,
99,
100
]
},
{
"t": 18,
"s": [
100,
100,
100
]
}
]
}
},
"ip": 3,
"op": 183
},
{
"ind": 3,
"ty": 2,
"nm": "cat_main.png",
"parent": 2,
"refId": "fd21b9df-66ff-4c4c-9beb-8d70be581fde",
"ks": {
"o": {
"a": 0,
"k": 100
},
"r": {
"a": 0,
"k": 0
},
"p": {
"a": 1,
"k": [
{
"t": 6,
"s": [
389.5,
164.5,
0
]
},
{
"t": 12,
"s": [
469.5,
104.5,
0
]
}
]
},
"a": {
"a": 0,
"k": [
68.5,
77.5,
0
]
},
"s": {
"a": 0,
"k": [
100,
100,
100
]
}
},
"ip": 6,
"op": 186
}
],
"markers": []
}
\ No newline at end of file
src/panels/TaskPanel.ts
View file @ 5e5a132c
...@@ -263,9 +263,10 @@ class TaskItem extends Item { ...@@ -263,9 +263,10 @@ class TaskItem extends Item {
case TaskType.member: case TaskType.member:
sendTbNet(TbNetName.navigateToOutside, { url: this.data.url }); sendTbNet(TbNetName.navigateToOutside, { url: this.data.url });
break; break;
case TaskType.browseGoods: case TaskType.browseGoods: // 浏览商品
/// TODO 去浏览页 sendTbNet(TbNetName.navigateTo, {
console.log('去浏览页'); url: '/pages/goodsPage/goodsPage?taskType=browseGoods&itemIds=' + this.data.itemIds
});
break; break;
case TaskType.follow: case TaskType.follow:
sendTbNet(TbNetName.favorShop, {}, sendTbNet(TbNetName.favorShop, {},
...@@ -281,8 +282,9 @@ class TaskItem extends Item { ...@@ -281,8 +282,9 @@ class TaskItem extends Item {
sendTbNet(TbNetName.showSharePanel, { openId: Tools.globalData.openId }); sendTbNet(TbNetName.showSharePanel, { openId: Tools.globalData.openId });
break; break;
case TaskType.orderGoods: case TaskType.orderGoods:
/// TODO 去下单页 sendTbNet(TbNetName.navigateTo, {
console.log('去下单页'); url: '/pages/goodsPage/goodsPage?taskType=orderGoods&itemIds=' + this.data.itemIds
});
break; break;
} }
} }
......
src/scene/LoadingScene.ts
View file @ 5e5a132c
...@@ -8,10 +8,12 @@ import { MapScene } from "./map/MapScene"; ...@@ -8,10 +8,12 @@ import { MapScene } from "./map/MapScene";
import { layers } from "../../module/views/layers"; import { layers } from "../../module/views/layers";
import { GTool } from "../../module/tools/GTool"; import { GTool } from "../../module/tools/GTool";
import { Lottie } from "../Lottie"; import { Lottie } from "../Lottie";
import { pop_laoding_bg } from "../lotties/pop_laoding_bg";
import { pop_loading_title } from "../lotties/pop_loading_title";
export class LoadingScene extends Scene { export class LoadingScene extends Scene {
get groupNames() { get groupNames() {
return ["loadingScene"] return ["loadingScene", 'pop_laoding_bg', 'pop_loading_title']
} }
progressBar: ProgressBarS; progressBar: ProgressBarS;
...@@ -22,33 +24,14 @@ export class LoadingScene extends Scene { ...@@ -22,33 +24,14 @@ export class LoadingScene extends Scene {
//背景 //背景
this.addChild(FYGE.Sprite.fromFrame("loadingBg.jpg")) this.addChild(FYGE.Sprite.fromFrame("loadingBg.jpg"))
//光 const loadingBg = this.addChild(new Lottie(pop_laoding_bg));
var l1 = this.addChild(FYGE.Sprite.fromFrame("lighting_1.png")) loadingBg.play(-1);
l1.position.set(543, 765)
var l2 = this.addChild(FYGE.Sprite.fromFrame("lighting_2.png")) const loadingTitle = this.addChild(new Lottie(pop_loading_title));
l2.position.set(545, 765) console.log(loadingTitle);
l2.visible = false;
FYGE.Tween.get(l1, {loop: true}) loadingTitle.play(1);
.wait(500)
.call(() => {
l1.visible = !l1.visible
})
FYGE.Tween.get(l2, {loop: true})
.wait(500)
.call(() => {
l2.visible = !l2.visible
})
// console.log(a.position,b.position)
//摩天轮
var wheel = this.addChild(FYGE.Sprite.fromFrame("wheel.png"))
.addEventListener(FYGE.Event.ENTER_FRAME, () => {
wheel.rotation += 0.3
})
wheel.anchorTexture.set(0.5, 0.5);
wheel.position.set(50, 780)
wheel.alpha = 0.3;
//背景2
this.addChild(FYGE.Sprite.fromFrame("loadingBg2.png"))
//进度条底图 //进度条底图
this.addChild(FYGE.Sprite.fromFrame("proDown.png")) this.addChild(FYGE.Sprite.fromFrame("proDown.png"))
.position.set((750 - 577) / 2, 1288 - 24) .position.set((750 - 577) / 2, 1288 - 24)
...@@ -60,24 +43,11 @@ export class LoadingScene extends Scene { ...@@ -60,24 +43,11 @@ export class LoadingScene extends Scene {
pro.position.set(375, 1288)//位置按正常满条的位置 pro.position.set(375, 1288)//位置按正常满条的位置
//@ts-ignore 进度条托管 //@ts-ignore 进度条托管
this.progressBar = new ProgressBarS(pro); this.progressBar = new ProgressBarS(pro);
//动画
//尾巴
var foxTail = new FYGE.FrameAni((() => {
var arrFox = [];
var count = -1;
while (++count <= 14) arrFox.push(RES.getRes("fox_tail" + count + ".png"))
return arrFox
})())
foxTail.play(0);
//标题
this.addChild(new Title())
//提示文案，随机文案待定 //提示文案，随机文案待定
this.addChild(Tools.getText( this.addChild(Tools.getText(
GTool.randomT([ GTool.randomT([
"提示：固定关卡可抽取通关奖励哟！", '游戏加载中...'
"开心趣消消，烦恼全抛掉！",
"解锁120关，最高可得TF彩妆礼盒、\nDyson吹风机！"
]), ]),
28, 28,
"#ae3830", "#ae3830",
...@@ -160,73 +130,3 @@ export class LoadingScene extends Scene { ...@@ -160,73 +130,3 @@ export class LoadingScene extends Scene {
//到时如果内存炸了，考虑销毁用过的贴图缓存，待测试，在RES里写个根据销毁组内贴图的方法 //到时如果内存炸了，考虑销毁用过的贴图缓存，待测试，在RES里写个根据销毁组内贴图的方法
} }
} }
const lingConfig = [
{
"name": "img_line1",
"x": 0,
"y": 70,
},
{
"name": "img_line2",
"x": 85,
"y": 50,
},
{
"name": "img_line3",
"x": 195,
"y": 0,
},
{
"name": "img_line4",
"x": 322,
"y": 50,
},
{
"name": "img_line5",
"x": 402,
"y": 70,
}
]
class Title extends FYGE.Container {
constructor() {
super();
//线
var line = this.addChild(new FYGE.Container());
for (var i = 0; i < lingConfig.length; i++) {
var c = lingConfig[i]
line.addChild(FYGE.Sprite.fromFrame(c.name + ".png"))
.position.set(c.x, c.y);
}
line.anchor.set(433 / 2, 0);
line.scaleY = 0.18
//标题
var title = line.addChild(FYGE.Sprite.fromFrame("loadingTitle.png"))
title.position.set(-33, 313)
title.anchor.set(494 / 2, 40);
this.x = 160//待调整
var targetY = -80
this.y = -560;//待调整
//新建就动画出现吧，
FYGE.Tween.get(this)
.to({y: targetY + 25}, 300)
.to({y: targetY - 30}, 100)
.to({y: targetY}, 100);
[line, title].forEach((e) => {
FYGE.Tween.get(e)
.to({rotation: 1.5}, 300)
.to({rotation: -0.5}, 100)
.to({rotation: 0}, 100)
if (e === line) {
FYGE.Tween.get(e)
.to({scaleY: 1.05}, 300)
.to({scaleY: 0.96}, 100)
.to({scaleY: 1}, 100)
}
})
}
}
src/scene/PlayScene.ts
View file @ 5e5a132c
...@@ -233,7 +233,7 @@ export class PlayScene extends Scene { ...@@ -233,7 +233,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)
} }
//所有道具容器 //所有道具容器
...@@ -474,17 +474,17 @@ export class PlayScene extends Scene { ...@@ -474,17 +474,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)
} }
} }
...@@ -542,7 +542,7 @@ export class PlayScene extends Scene { ...@@ -542,7 +542,7 @@ export class PlayScene extends Scene {
//冰块数据 2 3 5 6 或者51 61 //冰块数据 2 3 5 6 或者51 61
const iceData = [2, 3, 5, 6, 51, 61]; const iceData = [2, 3, 5, 6, 51, 61];
if (iceData.indexOf(latticesD[i]) >= 0) { if (iceData.indexOf(latticesD[i]) >= 0) {
const iceCount = (function(n) { const 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;
...@@ -849,19 +849,19 @@ export class PlayScene extends Scene { ...@@ -849,19 +849,19 @@ export class PlayScene extends Scene {
const ay = a.y; const ay = a.y;
const bx = b.x; const bx = b.x;
const by = b.y; const 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)
} }
...@@ -923,7 +923,7 @@ export class PlayScene extends Scene { ...@@ -923,7 +923,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) {
const ele = e.currentTarget.parent.parent; const ele = e.currentTarget.parent.parent;
if (ele instanceof Element && if (ele instanceof Element &&
// ele.type != ElementType.ROCK && // ele.type != ElementType.ROCK &&
...@@ -1116,7 +1116,7 @@ export class PlayScene extends Scene { ...@@ -1116,7 +1116,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);
...@@ -1125,7 +1125,7 @@ export class PlayScene extends Scene { ...@@ -1125,7 +1125,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)
} }
//数据交换 //数据交换
...@@ -1199,16 +1199,16 @@ export class PlayScene extends Scene { ...@@ -1199,16 +1199,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中
const emptyIndex = this.emptys.indexOf(indexDown); const 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);
//加上一个 //加上一个
...@@ -1222,7 +1222,7 @@ export class PlayScene extends Scene { ...@@ -1222,7 +1222,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)
} }
} }
...@@ -1255,7 +1255,7 @@ export class PlayScene extends Scene { ...@@ -1255,7 +1255,7 @@ export class PlayScene extends Scene {
if (indexs != null) { if (indexs != null) {
//最后一个 //最后一个
const downIndex = indexs[indexs.length - 1].index; const 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)
...@@ -1327,7 +1327,7 @@ export class PlayScene extends Scene { ...@@ -1327,7 +1327,7 @@ export class PlayScene extends Scene {
const anis: FallAniData[] = []; const anis: FallAniData[] = [];
const emptys = this.emptys; const emptys = this.emptys;
//排序从大到小 //排序从大到小
emptys.sort(function(a, b) { emptys.sort(function (a, b) {
return a < b ? 1 : -1 return a < b ? 1 : -1
}) })
for (let i = 0; i < emptys.length; i++) { for (let i = 0; i < emptys.length; i++) {
...@@ -1385,7 +1385,7 @@ export class PlayScene extends Scene { ...@@ -1385,7 +1385,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)
...@@ -1404,7 +1404,7 @@ export class PlayScene extends Scene { ...@@ -1404,7 +1404,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);
//优先判断生成的，不用管掉落了，跳下一个 //优先判断生成的，不用管掉落了，跳下一个
...@@ -1454,7 +1454,7 @@ export class PlayScene extends Scene { ...@@ -1454,7 +1454,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;
...@@ -1462,7 +1462,7 @@ export class PlayScene extends Scene { ...@@ -1462,7 +1462,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 {
...@@ -1485,11 +1485,11 @@ export class PlayScene extends Scene { ...@@ -1485,11 +1485,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处的动画
//如果下格子上方有格子，用遮罩的写法 //如果下格子上方有格子，用遮罩的写法
...@@ -1512,9 +1512,9 @@ export class PlayScene extends Scene { ...@@ -1512,9 +1512,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
...@@ -2547,7 +2547,7 @@ export class PlayScene extends Scene { ...@@ -2547,7 +2547,7 @@ export class PlayScene extends Scene {
const lat = this.lattices[index]; const 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) {
//交换结束后,判断是否有三消 //交换结束后,判断是否有三消
...@@ -2626,8 +2626,44 @@ export class PlayScene extends Scene { ...@@ -2626,8 +2626,44 @@ export class PlayScene extends Scene {
sendTbNet(TbNetName.gameOver, params, (s, res) => { sendTbNet(TbNetName.gameOver, params, (s, res) => {
hideWaiting(); hideWaiting();
if (s) { if (s) {
if (suc) {
let prizeLevel = 50;
if (this.data.chapter > 50 && this.data.chapter <= 100) {
prizeLevel = 100;
} else if (this.data.chapter > 100) {
prizeLevel = 120;
}
sendTbNet(TbNetName.drawLotteryPrize, {
prizeDataType: prizeLevel,
level: this.data.chapter,
stars: this.scoreProgress.starCount,
},
(ds, dr) => {
if (!ds || !dr.data || dr.data.type == 5) {
//@ts-ignore
Tools.gameOver(Object.assign(res.data || {}, params));
return;
}
const data: any = {};
if (dr.data.type == 6) {
data.tool = {
type: dr.data.toolType
};
} else {
data.prize = {
image: dr.data.image
};
}
//@ts-ignore
Tools.gameOver(Object.assign(data, params));
}
);
} else {
//@ts-ignore
Tools.gameOver(Object.assign(res.data || {}, params));
}
//@ts-ignore //@ts-ignore
Tools.gameOver(Object.assign(res.data || {}, params)) // Tools.gameOver(Object.assign(res.data || {}, params))
} else { } else {
//没有数据，网络超时，再次提交，到时小程序测试网络断开时返回数据 //没有数据，网络超时，再次提交，到时小程序测试网络断开时返回数据
if (res.data) { if (res.data) {
...@@ -2650,7 +2686,7 @@ export class PlayScene extends Scene { ...@@ -2650,7 +2686,7 @@ export class PlayScene extends Scene {
*/ */
openRedBombPanel(callback: Function = null) { openRedBombPanel(callback: Function = null) {
if (this.redBombPanelMark) { if (this.redBombPanelMark) {
showPanel(FesRedPrizePanel, {callback: callback}); showPanel(FesRedPrizePanel, { callback: callback });
this.redBombPanelMark = false; this.redBombPanelMark = false;
return true; return true;
} }
...@@ -2729,7 +2765,7 @@ export class PlayScene extends Scene { ...@@ -2729,7 +2765,7 @@ export class PlayScene extends Scene {
this.passElements[type]--; this.passElements[type]--;
// console.log(this.elementTargets.targets[type]) // console.log(this.elementTargets.targets[type])
//@ts-ignore //@ts-ignore
const p = this.elementTargets.targets[type].localToGlobal({x: 40 * 0.8, y: 40 * 0.8}); const p = this.elementTargets.targets[type].localToGlobal({ x: 40 * 0.8, y: 40 * 0.8 });
this.addChild(FlyTargetAni(type, fromP, [p.x, p.y - layers.stageOffsetY], () => { this.addChild(FlyTargetAni(type, fromP, [p.x, p.y - layers.stageOffsetY], () => {
this.elementTargets.targets[type].count--; this.elementTargets.targets[type].count--;
})) }))
...@@ -2844,7 +2880,7 @@ export class PlayScene extends Scene { ...@@ -2844,7 +2880,7 @@ export class PlayScene extends Scene {
this.addChild(eleC); this.addChild(eleC);
/// TODO 小红包消失动画 /// TODO 小红包消失动画
Tween.get(eleC) Tween.get(eleC)
.to({scaleX: 0, scaleY: 0}, 270, Ease.backIn) .to({ scaleX: 0, scaleY: 0 }, 270, Ease.backIn)
.call(() => { .call(() => {
this.removeChild(eleC); this.removeChild(eleC);
this.festivalTarget.count--; this.festivalTarget.count--;
...@@ -2940,22 +2976,22 @@ class MusicBtn extends FYGE.Sprite { ...@@ -2940,22 +2976,22 @@ class MusicBtn extends FYGE.Sprite {
isOn = !isOn; isOn = !isOn;
this.texture = RES.getRes(isOn ? "musicOn.png" : "musicOff.png"); this.texture = RES.getRes(isOn ? "musicOn.png" : "musicOff.png");
//播放或暂停音乐接口 //播放或暂停音乐接口
sendTbNet(TbNetName.openMusic, {isOn: isOn}) sendTbNet(TbNetName.openMusic, { isOn: isOn })
}, this); }, this);
//默认开启 //默认开启
// this.isOn = true; // this.isOn = true;
if (isOn) sendTbNet(TbNetName.openMusic, {isOn: true}) if (isOn) sendTbNet(TbNetName.openMusic, { isOn: true })
//添加onSHow事件 //添加onSHow事件
GDispatcher.addEventListener(G_EVENT.ON_SHOW, this.onShow, this) GDispatcher.addEventListener(G_EVENT.ON_SHOW, this.onShow, this)
} }
onShow() { onShow() {
if (isOn) sendTbNet(TbNetName.openMusic, {isOn: true}) if (isOn) sendTbNet(TbNetName.openMusic, { isOn: true })
} }
destroy() { destroy() {
GDispatcher.removeEventListener(G_EVENT.ON_SHOW, this.onShow, this) GDispatcher.removeEventListener(G_EVENT.ON_SHOW, this.onShow, this)
sendTbNet(TbNetName.openMusic, {isOn: false}) sendTbNet(TbNetName.openMusic, { isOn: false })
super.destroy() super.destroy()
} }
......
src/scene/map/MapScene.ts
View file @ 5e5a132c
...@@ -16,6 +16,8 @@ import Ease = FYGE.Ease; ...@@ -16,6 +16,8 @@ import Ease = FYGE.Ease;
import { showPanel, showToast } from "../../../module/ctrls"; import { showPanel, showToast } from "../../../module/ctrls";
import { FreePowerPanel } from "../../panels/FreePowerPanel"; import { FreePowerPanel } from "../../panels/FreePowerPanel";
import { sendTbNet, TbNetName } from "../../TaoBaoNet"; import { sendTbNet, TbNetName } from "../../TaoBaoNet";
import { GDispatcher } from "../../Main";
import { G_EVENT } from "../../common/G_EVENT";
export class MapScene extends Scene { export class MapScene extends Scene {
private mapContainer: Container = null; private mapContainer: Container = null;
...@@ -253,10 +255,12 @@ export class MapScene extends Scene { ...@@ -253,10 +255,12 @@ export class MapScene extends Scene {
public initEvents() { public initEvents() {
super.initEvents(); super.initEvents();
GDispatcher.addEventListener(G_EVENT.ON_SHOW, this.updateScene, this);
} }
public removeEvents() { public removeEvents() {
super.removeEvents(); super.removeEvents();
GDispatcher.removeEventListener(G_EVENT.ON_SHOW, this.updateScene, this);
} }
} }
......
src/scene/map/MapUI.ts
View file @ 5e5a132c
...@@ -48,7 +48,7 @@ export default class MapUI extends Container { ...@@ -48,7 +48,7 @@ export default class MapUI extends Container {
console.log('我的奖品'); console.log('我的奖品');
sendTbNet( sendTbNet(
TbNetName.navigateTo, TbNetName.navigateTo,
{ url: '/pages/myprize/myprize'}, { url: '/pages/myprize/myprize' },
() => { () => {
}, },
true true
...@@ -84,7 +84,13 @@ export default class MapUI extends Container { ...@@ -84,7 +84,13 @@ export default class MapUI extends Container {
} }
public updateUI() { public updateUI() {
sendTbNet(TbNetName.getPower, {},
(success, res) => {
this.energyBox.count = Tools.propInfo.power; this.energyBox.count = Tools.propInfo.power;
if (!success) return;
this.energyBox.count = Tools.propInfo.power = res.data.power;
}
);
} }
} }
......
tsConfig.json
View file @ 5e5a132c
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
"removeComments": true, "removeComments": true,
"noEmitOnError":true, "noEmitOnError":true,
"outDir":"dist", "outDir":"dist",
/*"outFile": "./index.js",*/
"lib": [ "lib": [
"es5", "es5",
"dom", "dom",
......
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