Skip to content

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

1

parents a55f58f5 45a79e11
Hide whitespace changes
Inline Side-by-side
Showing with 315 additions and 116 deletions
resource/res.json
View file @ de939ebd
{
"groups": [
{
"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"
},
{
"keys": "增加体力背景.png,无字按钮底.png",
"name": "BuyPowerPanel"
},
{
"keys": "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,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common"
},
{
"keys": "积分不足背景.png,赚取积分.png",
"name": "CreditsOutPanel"
......@@ -16,6 +24,14 @@
"keys": "失败Bg.png,失败重新闯关.png",
"name": "FailedPanel"
},
{
"keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png",
"name": "festival"
},
{
"keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png,hor_ele0_0.png,hor_ele0_1.png,hor_ele0_10.png,hor_ele0_11.png,hor_ele0_12.png,hor_ele0_13.png,hor_ele0_14.png,hor_ele0_15.png,hor_ele0_2.png,hor_ele0_3.png,hor_ele0_4.png,hor_ele0_5.png,hor_ele0_6.png,hor_ele0_7.png,hor_ele0_8.png,hor_ele0_9.png,hor_ele1_0.png,hor_ele1_1.png,hor_ele1_10.png,hor_ele1_11.png,hor_ele1_12.png,hor_ele1_13.png,hor_ele1_14.png,hor_ele1_15.png,hor_ele1_2.png,hor_ele1_3.png,hor_ele1_4.png,hor_ele1_5.png,hor_ele1_6.png,hor_ele1_7.png,hor_ele1_8.png,hor_ele1_9.png,hor_ele2_0.png,hor_ele2_1.png,hor_ele2_10.png,hor_ele2_11.png,hor_ele2_12.png,hor_ele2_13.png,hor_ele2_14.png,hor_ele2_15.png,hor_ele2_2.png,hor_ele2_3.png,hor_ele2_4.png,hor_ele2_5.png,hor_ele2_6.png,hor_ele2_7.png,hor_ele2_8.png,hor_ele2_9.png,hor_ele3_0.png,hor_ele3_1.png,hor_ele3_10.png,hor_ele3_11.png,hor_ele3_12.png,hor_ele3_13.png,hor_ele3_14.png,hor_ele3_15.png,hor_ele3_2.png,hor_ele3_3.png,hor_ele3_4.png,hor_ele3_5.png,hor_ele3_6.png,hor_ele3_7.png,hor_ele3_8.png,hor_ele3_9.png,hor_ele4_0.png,hor_ele4_1.png,hor_ele4_10.png,hor_ele4_11.png,hor_ele4_12.png,hor_ele4_13.png,hor_ele4_14.png,hor_ele4_15.png,hor_ele4_2.png,hor_ele4_3.png,hor_ele4_4.png,hor_ele4_5.png,hor_ele4_6.png,hor_ele4_7.png,hor_ele4_8.png,hor_ele4_9.png,ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png",
"name": "fiveVerHorDis"
},
{
"keys": "圆圈.png,开心收下.png",
"name": "FreePowerPanel"
......@@ -24,6 +40,30 @@
"keys": "joinBg.png,joinBtn.png",
"name": "JoinPanel"
},
{
"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",
"name": "loadingScene"
},
{
"keys": "cur_light_1.png,cur_light_2.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_creditsBg.png,map_energyAdd.png,map_energyBg.png,map_prizeBox.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_推车.png,map_狐狸气球.png,water1.png,water2.png",
"name": "map"
},
{
"keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png",
"name": "mapCheckPrizeEffect"
},
{
"keys": "map_crab_0.png,map_crab_1.png,map_crab_10.png,map_crab_11.png,map_crab_12.png,map_crab_13.png,map_crab_14.png,map_crab_15.png,map_crab_16.png,map_crab_17.png,map_crab_18.png,map_crab_19.png,map_crab_2.png,map_crab_20.png,map_crab_21.png,map_crab_22.png,map_crab_23.png,map_crab_24.png,map_crab_25.png,map_crab_26.png,map_crab_27.png,map_crab_28.png,map_crab_29.png,map_crab_3.png,map_crab_30.png,map_crab_4.png,map_crab_5.png,map_crab_6.png,map_crab_7.png,map_crab_8.png,map_crab_9.png",
"name": "mapCrabEffect"
},
{
"keys": "map_owl_0.png,map_owl_1.png,map_owl_10.png,map_owl_11.png,map_owl_12.png,map_owl_13.png,map_owl_14.png,map_owl_15.png,map_owl_2.png,map_owl_3.png,map_owl_4.png,map_owl_5.png,map_owl_6.png,map_owl_7.png,map_owl_8.png,map_owl_9.png",
"name": "mapOwlEffect"
},
{
"keys": "map_whale_0.png,map_whale_1.png,map_whale_10.png,map_whale_11.png,map_whale_12.png,map_whale_2.png,map_whale_3.png,map_whale_4.png,map_whale_5.png,map_whale_6.png,map_whale_7.png,map_whale_8.png,map_whale_9.png",
"name": "mapWhaleEffect"
},
{
"keys": "体力不足Bg.png,体力不足按钮.png",
"name": "NoEnergyPanel"
......@@ -32,10 +72,18 @@
"keys": "步数耗尽Bg.png,步数耗尽复活.png,步数耗尽结束按钮.png",
"name": "NoStepPanel"
},
{
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,boomBtn.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,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,hammerBtn.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepBtn.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,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"
},
{
"keys": "活动规则背景.png",
"name": "RulePanel"
},
{
"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"
},
{
"keys": "开始闯关Bg.png",
"name": "StartPanel"
......@@ -45,7 +93,11 @@
"name": "StartPanelPrize"
},
{
<<<<<<< HEAD
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
=======
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
>>>>>>> 45a79e11dc97944c226208857f8714b2d91b475a
"name": "SuccessPanel"
},
{
......@@ -59,6 +111,7 @@
{
"keys": "使用道具背景.png",
"name": "UseToolPanel"
<<<<<<< HEAD
},
{
"keys": "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",
......@@ -107,6 +160,8 @@
{
"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"
=======
>>>>>>> 45a79e11dc97944c226208857f8714b2d91b475a
}
],
"path": "./resource/"
......
resource/skin.json
View file @ de939ebd
......@@ -708,7 +708,7 @@
]
},
{
"name": "NoStepBtn",
"name": "NoStepPanel",
"x": 0,
"y": 0,
"type": "container",
......
src/Main.ts
View file @ de939ebd
......@@ -12,6 +12,7 @@ import { MapScene } from "./scene/map/MapScene";
import { PlayScene } from "./scene/PlayScene";
import { LoadingScene } from "./scene/LoadingScene";
import { JoinPanel } from "./panels/JoinPanel";
import { NoStepPanel } from "./panels/NoStepPanel";
/**
* 全局事件，为了和小程序交互
......@@ -86,7 +87,7 @@ export class Main {
// changeScene(StoryScene);
// changeScene(AdoptScene);
// console.log("恶趣味去")
// showPanel(JoinPanel)
// showPanel(NoStepPanel)
//测试
// sendTbNet(TbNetName.aaa, {}, (s, res) => {
// console.log(res)
......
src/ResJson.ts
View file @ de939ebd
export const ResJson = {
"groups": [
{
"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"
},
{
"keys": "增加体力背景.png,无字按钮底.png",
"name": "BuyPowerPanel"
},
{
"keys": "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,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common"
},
{
"keys": "积分不足背景.png,赚取积分.png",
"name": "CreditsOutPanel"
......@@ -16,6 +24,14 @@ export const ResJson = {
"keys": "失败Bg.png,失败重新闯关.png",
"name": "FailedPanel"
},
{
"keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png",
"name": "festival"
},
{
"keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png,hor_ele0_0.png,hor_ele0_1.png,hor_ele0_10.png,hor_ele0_11.png,hor_ele0_12.png,hor_ele0_13.png,hor_ele0_14.png,hor_ele0_15.png,hor_ele0_2.png,hor_ele0_3.png,hor_ele0_4.png,hor_ele0_5.png,hor_ele0_6.png,hor_ele0_7.png,hor_ele0_8.png,hor_ele0_9.png,hor_ele1_0.png,hor_ele1_1.png,hor_ele1_10.png,hor_ele1_11.png,hor_ele1_12.png,hor_ele1_13.png,hor_ele1_14.png,hor_ele1_15.png,hor_ele1_2.png,hor_ele1_3.png,hor_ele1_4.png,hor_ele1_5.png,hor_ele1_6.png,hor_ele1_7.png,hor_ele1_8.png,hor_ele1_9.png,hor_ele2_0.png,hor_ele2_1.png,hor_ele2_10.png,hor_ele2_11.png,hor_ele2_12.png,hor_ele2_13.png,hor_ele2_14.png,hor_ele2_15.png,hor_ele2_2.png,hor_ele2_3.png,hor_ele2_4.png,hor_ele2_5.png,hor_ele2_6.png,hor_ele2_7.png,hor_ele2_8.png,hor_ele2_9.png,hor_ele3_0.png,hor_ele3_1.png,hor_ele3_10.png,hor_ele3_11.png,hor_ele3_12.png,hor_ele3_13.png,hor_ele3_14.png,hor_ele3_15.png,hor_ele3_2.png,hor_ele3_3.png,hor_ele3_4.png,hor_ele3_5.png,hor_ele3_6.png,hor_ele3_7.png,hor_ele3_8.png,hor_ele3_9.png,hor_ele4_0.png,hor_ele4_1.png,hor_ele4_10.png,hor_ele4_11.png,hor_ele4_12.png,hor_ele4_13.png,hor_ele4_14.png,hor_ele4_15.png,hor_ele4_2.png,hor_ele4_3.png,hor_ele4_4.png,hor_ele4_5.png,hor_ele4_6.png,hor_ele4_7.png,hor_ele4_8.png,hor_ele4_9.png,ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png",
"name": "fiveVerHorDis"
},
{
"keys": "圆圈.png,开心收下.png",
"name": "FreePowerPanel"
......@@ -24,6 +40,30 @@ export const ResJson = {
"keys": "joinBg.png,joinBtn.png",
"name": "JoinPanel"
},
{
"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",
"name": "loadingScene"
},
{
"keys": "cur_light_1.png,cur_light_2.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_creditsBg.png,map_energyAdd.png,map_energyBg.png,map_prizeBox.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_推车.png,map_狐狸气球.png,water1.png,water2.png",
"name": "map"
},
{
"keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png",
"name": "mapCheckPrizeEffect"
},
{
"keys": "map_crab_0.png,map_crab_1.png,map_crab_10.png,map_crab_11.png,map_crab_12.png,map_crab_13.png,map_crab_14.png,map_crab_15.png,map_crab_16.png,map_crab_17.png,map_crab_18.png,map_crab_19.png,map_crab_2.png,map_crab_20.png,map_crab_21.png,map_crab_22.png,map_crab_23.png,map_crab_24.png,map_crab_25.png,map_crab_26.png,map_crab_27.png,map_crab_28.png,map_crab_29.png,map_crab_3.png,map_crab_30.png,map_crab_4.png,map_crab_5.png,map_crab_6.png,map_crab_7.png,map_crab_8.png,map_crab_9.png",
"name": "mapCrabEffect"
},
{
"keys": "map_owl_0.png,map_owl_1.png,map_owl_10.png,map_owl_11.png,map_owl_12.png,map_owl_13.png,map_owl_14.png,map_owl_15.png,map_owl_2.png,map_owl_3.png,map_owl_4.png,map_owl_5.png,map_owl_6.png,map_owl_7.png,map_owl_8.png,map_owl_9.png",
"name": "mapOwlEffect"
},
{
"keys": "map_whale_0.png,map_whale_1.png,map_whale_10.png,map_whale_11.png,map_whale_12.png,map_whale_2.png,map_whale_3.png,map_whale_4.png,map_whale_5.png,map_whale_6.png,map_whale_7.png,map_whale_8.png,map_whale_9.png",
"name": "mapWhaleEffect"
},
{
"keys": "体力不足Bg.png,体力不足按钮.png",
"name": "NoEnergyPanel"
......@@ -32,10 +72,18 @@ export const ResJson = {
"keys": "步数耗尽Bg.png,步数耗尽复活.png,步数耗尽结束按钮.png",
"name": "NoStepPanel"
},
{
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,boomBtn.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,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,hammerBtn.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepBtn.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,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"
},
{
"keys": "活动规则背景.png",
"name": "RulePanel"
},
{
"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"
},
{
"keys": "开始闯关Bg.png",
"name": "StartPanel"
......@@ -45,7 +93,11 @@ export const ResJson = {
"name": "StartPanelPrize"
},
{
<<<<<<< HEAD
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具.png,道具圆圈.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
=======
"keys": "star_dis.png,star_en.png,去抽奖.png,圆角矩形 648.png,道具.png,闯关成功.png,闯关成功Bg.png,闯关成功不满星按钮.png",
>>>>>>> 45a79e11dc97944c226208857f8714b2d91b475a
"name": "SuccessPanel"
},
{
......@@ -59,6 +111,7 @@ export const ResJson = {
{
"keys": "使用道具背景.png",
"name": "UseToolPanel"
<<<<<<< HEAD
},
{
"keys": "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",
......@@ -107,6 +160,8 @@ export const ResJson = {
{
"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"
=======
>>>>>>> 45a79e11dc97944c226208857f8714b2d91b475a
}
],
"path": "./resource/"
......
src/Tools.ts
View file @ de939ebd
......@@ -10,6 +10,7 @@ import { showPanel } from "../module/ctrls";
import { FailedPanel } from "./panels/FailedPanel";
import { SuccessPrizePanel } from "./panels/SuccessPrizePanel";
import { SuccessNoPrizePanel } from "./panels/SuccessNoPrizePanel";
import { CreditsOutPanel } from "./panels/CreditsOutPanel";
/**
* 定制，记录一些全局量和方法
......@@ -145,13 +146,19 @@ export class Tools {
if (creditsData && !creditsData.success && !creditsData.data.isvip) {
return creditsData.data.url
}
const res = await sendTbNet(TbNetName.exchange, {type, credits: creditsData.data.credits})
const res = await sendTbNet(TbNetName.exchange, { type, credits: creditsData.data.credits }, null, true)
if (res.success) {
//修改道具数量和体力
this.gameData.power = res.data.power;
this.gameData.tools = res.data.tools;
return true;//可根据gameData修改视图
} else {
//如果code积分不足，弹出赚积分弹窗 待写code TODO
if (res.code == "") {
showPanel(CreditsOutPanel)
} else {
showToast(res.message || "网络开小差了，请重试")
}
return false;
}
}
......
src/panels/CreditsOutPanel.ts
View file @ de939ebd
import { Panel } from "../../module/views/Panel";
import { sendTbNet, TbNetName } from "../TaoBaoNet";
import { Tools } from "../Tools";
export class CreditsOutPanel extends Panel {
get groupNames() { return ["CreditsOutPanel"] }
get skinName() { return "CreditsOutPanel" }
earnBtn:FYGE.Button;
closeBtn:FYGE.Button;
earnBtn: FYGE.Button;
closeBtn: FYGE.Button;
initUi() {
}
start(data) {
super.start();
}
initEvents() {
super.initEvents();
super.initEvents();
this.earnBtn.addEventListener(FYGE.MouseEvent.CLICK, () => {
Tools.btnDelay(this);
sendTbNet(TbNetName.navigateToOutside, { url: "" })//TODO 路径待写
}, this)
}
removeEvents() {
super.removeEvents();
super.removeEvents();
}
}
src/panels/ExchangeSucPanel.ts
View file @ de939ebd
......@@ -5,16 +5,7 @@ export class ExchangeSucPanel extends Panel {
knowBtn:FYGE.Button;
closeBtn:FYGE.Button;
initUi() {
}
start(data) {
super.start();
}
initEvents() {
super.initEvents();
}
removeEvents() {
super.removeEvents();
get closeBtns(){
return [this.knowBtn,this.closeBtn]
}
}
src/panels/NoStepPanel.ts 0 → 100644
View file @ de939ebd
import { Panel } from "../../module/views/Panel";
import { Tools } from "../Tools";
import { getCurrentScene, showPanel } from "../../module/ctrls";
import { ToolsOutPanel } from "./ToolsOutPanel";
import { PropType } from "../something/enum/PropType";
export class NoStepPanel extends Panel {
get groupNames() { return ["NoStepPanel"] }
get skinName() { return "NoStepPanel" }
overBtn: FYGE.Button;
liveBtn: FYGE.Button;
closeBtn: FYGE.Button;
tipsTex: FYGE.TextField;
data: {
reviveFun: () => void
}
initUi() {
Tools.changeTextAlign(this.tipsTex, FYGE.TEXT_ALIGN.CENTER, 500)
this.tipsTex.text = "是否使用步数道具\n增加5次步数"
}
initEvents() {
//结束
[this.closeBtn, this.overBtn].forEach((e) => {
e.addEventListener(FYGE.MouseEvent.CLICK, () => {
getCurrentScene().submit(false);
this.hidePanel();
}, this)
})
//复活
this.liveBtn.addEventListener(FYGE.MouseEvent.CLICK, () => {
//无步数道具，弹出积分兑换
if (!Tools.gameData.tools.STEPS) {
showPanel(ToolsOutPanel, { type: PropType.STEPS, showSucPanel: false })
} else {
this.data.reviveFun();
this.hidePanel();
}
}, this)
}
removeEvents() {
}
}
src/panels/ToolsOutPanel.ts
View file @ de939ebd
......@@ -4,6 +4,7 @@ import { getTbData, TbNetName } from "../TaoBaoNet";
import { Tools } from "../Tools";
import { showWaiting, hideWaiting, getCurrentScene, showPanel, showToast } from "../../module/ctrls";
import { JoinPanel } from "./JoinPanel";
import { ExchangeSucPanel } from "./ExchangeSucPanel";
export class ToolsOutPanel extends Panel {
get groupNames() {
......@@ -22,7 +23,7 @@ export class ToolsOutPanel extends Panel {
closeBtn: FYGE.Button;
msgTxt: FYGE.TextField;
data: { type: PropType }
data: { type: PropType, showSucPanel: boolean }
initUi() {
// 文案居中
......@@ -51,7 +52,8 @@ export class ToolsOutPanel extends Panel {
}
//成功了，关闭弹框，修改道具信息
else if (res) {
showToast("兑换成功")
// showToast("兑换成功")
if (this.data.showSucPanel) showPanel(ExchangeSucPanel)
this.hidePanel();
getCurrentScene().updateScene()
}
......
src/scene/PlayScene.ts
View file @ de939ebd
......@@ -52,11 +52,15 @@ import { GTool } from '../../module/tools/GTool';
import { Tools } from '../Tools';
import { PropType } from '../something/enum/PropType';
import { RES } from '../../module/RES';
import { showToast, showWaiting, showPanel, hideWaiting } from '../../module/ctrls';
import { showToast, showWaiting, showPanel, hideWaiting, wait, changeScene } from '../../module/ctrls';
import { layers } from '../../module/views/layers';
import { ToolsOutPanel } from '../panels/ToolsOutPanel';
import { Lottie } from '../Lottie';
import { bb } from '../bb';
import { GameToast } from '../something/uis/GameToast';
import { sendTbNet, TbNetName } from '../TaoBaoNet';
import { MapScene } from './map/MapScene';
import { NoStepPanel } from '../panels/NoStepPanel';
const aniClass = {
"BoomAni": BoomAni,
......@@ -239,6 +243,8 @@ export class PlayScene extends Scene {
//记录是否有红包炸弹弹框
redBombPanelMark: boolean;
//记录本局是否提示过加步数
addedStepWarning: boolean = false;
//记录三种道具，及失败步数增加hash
recordOnce = {
boom: false,
......@@ -265,7 +271,7 @@ export class PlayScene extends Scene {
//设置，待定
this.addChild(FYGE.Sprite.fromFrame("settingBtn.png")).position.set(618, 16)
}
data: { chapter: number }
start(data: { chapter: number }) {
super.start();
// data = { chapter: 1 }
......@@ -274,6 +280,7 @@ export class PlayScene extends Scene {
// this.chapter = 24;
//关卡数据
this.chapterData = getChapterData(this.chapter);
// this.chapterData.stepCount = 4
//初始化目标信息
this.initTarget();
//初始化索引信息，包括10*10的，
......@@ -330,6 +337,11 @@ export class PlayScene extends Scene {
(1624 - bonusTime.videoHeight) / 2 - layers.stageOffsetY
)
movieClips.bonusTime = bonusTime;
["great", "wonderful", "amazing"].forEach((e) => {
var g = new GameToast(e + ".png");
g.position.set(375, 1624 / 2 - layers.stageOffsetY);
movieClips[e] = g
})
}
//初始化界面ui,,道具弄在这里s
......@@ -866,19 +878,19 @@ export class PlayScene extends Scene {
onTap_boomBtn() {
this.propBtnCon.boomCount ?
this.useProp(PropType.BOOMS) :
showPanel(ToolsOutPanel, { type: PropType.BOOMS });//注意弹框逻辑，购买完后要调用updateScene
showPanel(ToolsOutPanel, { type: PropType.BOOMS, showSucPanel: true });//注意弹框逻辑，购买完后要调用updateScene
}
onTap_hammerBtn() {
this.propBtnCon.hammerCount ?
this.useProp(PropType.HAMMERS) :
showPanel(ToolsOutPanel, { type: PropType.HAMMERS });//注意弹框逻辑，购买完后要调用updateScene
showPanel(ToolsOutPanel, { type: PropType.HAMMERS, showSucPanel: true });//注意弹框逻辑，购买完后要调用updateScene
}
onTap_stepBtn() {
this.propBtnCon.stepCount ?
this.useProp(PropType.STEPS) :
showPanel(ToolsOutPanel, { type: PropType.STEPS });//注意弹框逻辑，购买完后要调用updateScene
showPanel(ToolsOutPanel, { type: PropType.STEPS, showSucPanel: true });//注意弹框逻辑，购买完后要调用updateScene
}
//使用道具逻辑
......@@ -1502,10 +1514,18 @@ export class PlayScene extends Scene {
}
}
}
//判断是否要掉落回弹动效
let showFallAni: boolean = (() => {
// console.log(indexs.length)
// if(!indexs.length)return false
// let p0 = indexs.length == 1 ? [ele.x, ele.y] : Tool.getPositionByIndex(indexs[0].index);
// let p1 = Tool.getPositionByIndex(indexs[indexs.length - 1].index);
// return (Math.abs(p0[0] - p1[0]) < 1)
return false
})()
//元素赋值，考虑到底放哪好
var lat = this.lattices[endIndex];
lat.element = ele;
ele.fallAni()
//最终回调
tween.call(() => {
let endP = Tool.getPositionByIndex(endIndex);
......@@ -1520,7 +1540,10 @@ export class PlayScene extends Scene {
this.lollipopCount < this.passElements[ElementType.LOLLIPOP]) {
this.lollipopMark = true
}
} else if (showFallAni) {
ele.fallAni()
}
if (++count == countAll) callback();
})
}
......@@ -1793,6 +1816,7 @@ export class PlayScene extends Scene {
this.eliminate()
return
}
//有时间改成await
AiControl.ins.doorMotion(this, () => {
//鸡蛋的ai操作，存在判断三消，毛球的ai，也一样，所以放前面，存在三消时都直接执行eliminate了。不执行后续的回调
AiControl.ins.eggMotion(this, () => {
......@@ -1810,8 +1834,8 @@ export class PlayScene extends Scene {
else {
//通关了
//提交分数等
var json = this.getSubmitJson()
this.submit(json)
// var json = this.getSubmitJson()
this.submit()
}
return
}
......@@ -1837,30 +1861,38 @@ export class PlayScene extends Scene {
this.effectContinuityTimes = 0;
//判断步数是否为0；
if (this.steps == 0) {
//失败弹框
// //playSound(SoundType.fail);
// var panelsDatas = this.returnPanels("failed", {
// level: this.chapter,
// showVideo: !this.recordOnce.failStep,//是否显示观看视频加步数
// complete: () => {//观看完成回调，其实只要继续执行下面的逻辑就行
// let count = 0;
// let countAll = 2;
// AiControl.ins.jellyMotion(this, () => {
// if (++count === countAll) this.aiMotionCheckDieMap()
// })
// AiControl.ins.bubbleMotion(this, () => {
// if (++count === countAll) this.aiMotionCheckDieMap()
// })
// //加标记
// this.recordOnce.failStep = true;
// //加步数
// this.playAni(RecoverName.STEP_ANI, [50, 100]);
// setTimeout(() => { this.steps += 5; }, 333)
// }
// })
//TODO
// PanelCtrl.instance.showPanels(panelsDatas[0], panelsDatas[1], () => { });
// PanelCtrl.instance.show("failed", { level: this.chapter });
//还未提示过加步数
if (!this.addedStepWarning) {
this.addedStepWarning = true;
//没步数弹框
showPanel(NoStepPanel, {
reviveFun: async () => {
showWaiting();//这种情况要考虑失败嘛？
var s = await Tools.consumerTools(PropType.STEPS);
hideWaiting();
if (!s) {//使用失败，直接提交吧
this.submit(false)
} else {//走完剩下的流程
let count = 0;
let countAll = 2;
AiControl.ins.jellyMotion(this, () => {
if (++count === countAll) this.aiMotionCheckDieMap()
})
AiControl.ins.bubbleMotion(this, () => {
if (++count === countAll) this.aiMotionCheckDieMap()
})
//加步数
this.playAni(RecoverName.STEP_ANI, [stepPosition[0] - 40, stepPosition[1] + 20]);
setTimeout(() => { this.steps += 5; }, 333)
//更新场景道具数据
this.updateScene()
}
}
})
} else {
//失败提交
this.submit(false)
}
return
}
//果冻的时间980，气泡的时间1100，必须考虑直接执行的情况，所以必须同时判断
......@@ -1893,7 +1925,7 @@ export class PlayScene extends Scene {
showToast("元素已无法消除")
setTimeout(() => {
// //playSound(SoundType.fail);
var panelsDatas = this.returnPanels("failed", { level: this.chapter })
// var panelsDatas = this.returnPanels("failed", { level: this.chapter })
// PanelCtrl.instance.showPanels(panelsDatas[0], panelsDatas[1], () => { });
// PanelCtrl.instance.show("failed", { level: this.chapter });
}, 1000)
......@@ -2384,8 +2416,8 @@ export class PlayScene extends Scene {
if (this.steps == 0 || elements.length == 0) {
this.score += 1000 * this.steps;
this.steps = 0;
var json = this.getSubmitJson()
this.submit(json)
// var json = this.getSubmitJson()
this.submit()
return
}
this.isCountingTime = true;
......@@ -2447,7 +2479,7 @@ export class PlayScene extends Scene {
* 一次分数的toast
*/
oneStepScoreToast() {
var sv: string;
let sv: string;
if (this.oneStepScore > 5000) {
//playSound(SoundType.toast);
sv = "wonderful";
......@@ -2460,12 +2492,9 @@ export class PlayScene extends Scene {
}
if (sv && movieClips[sv]) {
this.addChild(movieClips[sv])
movieClips[sv].gotoAndPlay(1, true)
setTimeout(() => {
if (movieClips[sv].parent) {
this.removeChild(movieClips[sv])
}
}, 667)
movieClips[sv].play(1, () => {
this.removeChild(movieClips[sv])
})
}
this.oneStepScore = 0;
}
......@@ -2562,54 +2591,33 @@ export class PlayScene extends Scene {
}
/**
* 包括捞结果
* @param json
* @param callback
* 提交方法
* @param suc 默认true表示成功提交
*/
submit(json: string) {
// NetManager.ins.hc_submit((s, data) => {
// if (s) {
// wait(200).then(() => {
// updateMainTimerAfterGetData();//submit之后再判断一次home,更新倒计时
// });
// const submitData = DataManager.ins.getData('hc_submit').data;
// var panelsDatas;
// if (submitData.option) {
// panelsDatas = this.returnPanels(ModuleTypes.PRIZE_PANEL, { level: this.chapter, option: submitData.option });
// // PanelCtrl.instance.show(ModuleTypes.PRIZE_PANEL, { level: this.chapter, option: submitData.option });
// } else {
// panelsDatas = this.returnPanels(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter })
// // PanelCtrl.instance.show(ModuleTypes.NO_PRIZE_PANEL, { level: this.chapter });
// }
// //弹出所有的
// PanelCtrl.instance.showPanels(panelsDatas[0], panelsDatas[1], () => { })
// } else {
// if (!data) {
// //错误弹框，网络错误
// //提交失败
// showToast("网络开小差了\n再次连接中")
// setTimeout(() => {
// this.submit(json);
// }, 1300)
// } else {
// //提交失败,根据错误码显示错误信息
// var txt = codeMsgs[data.code] || "活动太火爆了\n请稍后再来";
// showToast(txt);
// setTimeout(() => {
// var data = createData();
// data.level = this.chapter;
// NetManager.ins.hc_home(() => {
// SceneCtrl.instance.change(ModuleTypes.MAP_SCENE, data);
// }, window['collectRuleId']);
// }, 1300)
// }
// }
// },
// DataManager.ins.getData("hc_doJoin").data,
// this.chapter,
// json,
// DataManager.ins.getData("getNgameStartStatus").data.submitToken)
submit(suc: boolean = true) {
var params = {
level: this.data.chapter,
score: this.score,
stars: this.scoreProgress.starCount,
isVisitSuccess: suc,
}
showWaiting();
sendTbNet(TbNetName.gameOver, params, (s, res) => {
hideWaiting();
if (s) {
//@ts-ignore
Tools.gameOver(Object.assign(res.data, params))
} else {
//没有数据，网络超时，再次提交，到时小程序测试网络断开时返回数据
if (res.data) {
showToast("网络开小差了\n再次连接中")
wait(() => { this.submit(suc); }, 1300)
} else {
showToast(res.message || "活动太火爆了\n请稍后再来");
wait(() => { changeScene(MapScene) }, 1300)
}
}
}, true)
}
/**
......
src/something/class/Element.ts
View file @ de939ebd
......@@ -324,10 +324,14 @@ export class Element extends FYGE.Container {
}
public fallAni() {
// egret.Tween.get(this, null, null, true)
// FYGE.Tween.get(this, null, null, true)
// .set({ scaleY: 1 })
// .to({ scaleY: 0.7 }, 200)
// .to({ scaleY: 1 }, 100)
let oriY = this.y;
FYGE.Tween.get(this, null, null, true)
.to({ y: oriY+4 }, 100)
.to({y: oriY }, 100)
}
/**
......
src/something/uis/GameGuide.ts
View file @ de939ebd
......@@ -66,6 +66,10 @@ export class GameGuide extends FYGE.Container {
if (this.thisObj.chapter == 101 && step == 0) {
this.msgBoard.y += 80;
}
//定制修改，9关组合特效修改
if (this.thisObj.chapter == 9) {
this.msgBoard.y -= 80;
}
this.stepCount--;
}
......@@ -249,10 +253,8 @@ const chapterFuns = {
handIndexs: [
[63, 72],
],
msg: [
"将两个特效互相拖动即可直接触发组合特效，\n组合特效的效果视组合的两个特效类型而定"
// "五个相同动物形成一字型即可合成魔力花特效",
// "拖动魔力花特效即可直接触发"
msg: [//"将两个特效互相拖动即可直接触发组合特效，\n组合特效的效果视组合的两个特效类型而定"
"两个特效互相拖动即可触发组合特效，组合特效的效果视两个特效类型而定"//缩短了
]
},
//魔力鸟特效
......
src/something/uis/GameToast.ts 0 → 100644
View file @ de939ebd
import { RES } from "../../../module/RES";
export class GameToast extends FYGE.Sprite {
constructor(resName: string) {
super(RES.getRes(resName));
this.anchorTexture.set(0.5, 0.5);
}
/**
*
* @param a 为了和lottie封的方法一致
* @param callback
*/
play(a, callback: Function) {
FYGE.Tween.removeTweens(this)
this.scaleX = 0.1;
this.scaleY = 0.1;
FYGE.Tween.get(this)
.to({ scaleX: 1, scaleY: 1 }, 1/3*1000, FYGE.Ease.backOut)
.wait(1/3*1000)
.call(() => {
callback();
})
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment