Commit 5fd9d915 authored by haiyoucuv's avatar haiyoucuv

主页

parent 5c17f07d
This diff is collapsed.
{ {
"success": true, "success": true,
"data": { "data": {
"avatar": "https://source.unsplash.com/user/erondu/76x76", "avatar": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01xTeKMI1wMhRux48Y6_!!2275046294-2-miniprogram.png",
"nickName": "我啊是大请问", "nickName": "我啊是大请问",
"activityId": "string", "activityId": "string",
"openId": "string", "openId": "string",
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"message": "nisi amet sunt Lorem", "message": "nisi amet sunt Lorem",
"data": { "data": {
"rule": "测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试", "rule": "测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试活动规则测试",
"currentLevel": 7, "currentLevel": 25,
"power": 101, "power": 101,
"tools": { "tools": {
"steps": 100, "steps": 100,
......
resource/common/stepBtn.png

15.4 KB | W: | H:

resource/common/stepBtn.png

13.6 KB | W: | H:

resource/common/stepBtn.png
resource/common/stepBtn.png
resource/common/stepBtn.png
resource/common/stepBtn.png
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_avatar_bg.png

6.98 KB | W: | H:

resource/map/map_avatar_bg.png

6.01 KB | W: | H:

resource/map/map_avatar_bg.png
resource/map/map_avatar_bg.png
resource/map/map_avatar_bg.png
resource/map/map_avatar_bg.png
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_bg1.jpg

189 KB | W: | H:

resource/map/map_bg1.jpg

187 KB | W: | H:

resource/map/map_bg1.jpg
resource/map/map_bg1.jpg
resource/map/map_bg1.jpg
resource/map/map_bg1.jpg
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_bg3.jpg

392 KB | W: | H:

resource/map/map_bg3.jpg

393 KB | W: | H:

resource/map/map_bg3.jpg
resource/map/map_bg3.jpg
resource/map/map_bg3.jpg
resource/map/map_bg3.jpg
  • 2-up
  • Swipe
  • Onion skin
resource/map/map_check_enable.png

9.12 KB | W: | H:

resource/map/map_check_enable.png

9.34 KB | W: | H:

resource/map/map_check_enable.png
resource/map/map_check_enable.png
resource/map/map_check_enable.png
resource/map/map_check_enable.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/jellyArrow.png

1.86 KB | W: | H:

resource/playScene/jellyArrow.png

1.23 KB | W: | H:

resource/playScene/jellyArrow.png
resource/playScene/jellyArrow.png
resource/playScene/jellyArrow.png
resource/playScene/jellyArrow.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
"name": "map" "name": "map"
}, },
{ {
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8-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,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png", "keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,fesRedBombSta1.png,fesRedBombSta2.png,fesRedCap.png,fesRedDown.png,fesRedUp.png,festivalTargetBg.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,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,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,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,xingxingbi.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene" "name": "playScene"
}, },
{ {
......
...@@ -9,6 +9,7 @@ import { destroyNetData } from "./TaoBaoNet"; ...@@ -9,6 +9,7 @@ import { destroyNetData } from "./TaoBaoNet";
import { SkinJson } from "./SkinJson"; import { SkinJson } from "./SkinJson";
import { G_EVENT } from "./common/G_EVENT"; import { G_EVENT } from "./common/G_EVENT";
import { LoadingScene } from "./scene/LoadingScene"; import { LoadingScene } from "./scene/LoadingScene";
import { PlayScene } from "./scene/PlayScene";
/** /**
...@@ -84,6 +85,8 @@ export class Main { ...@@ -84,6 +85,8 @@ export class Main {
// if (document.getElementById("__loading__")) document.getElementById("__loading__").style.display = "none"; // if (document.getElementById("__loading__")) document.getElementById("__loading__").style.display = "none";
//打开开始场景 //打开开始场景
changeScene(LoadingScene); changeScene(LoadingScene);
// changeScene(PlayScene, {chapter: 120});
} }
//在小程序显示时调用onShow //在小程序显示时调用onShow
......
...@@ -69,7 +69,7 @@ export const ResJson = { ...@@ -69,7 +69,7 @@ export const ResJson = {
"name": "map" "name": "map"
}, },
{ {
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8-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,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png", "keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,fesRedBombSta1.png,fesRedBombSta2.png,fesRedCap.png,fesRedDown.png,fesRedUp.png,festivalTargetBg.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,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,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,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,xingxingbi.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene" "name": "playScene"
}, },
{ {
......
...@@ -114,7 +114,8 @@ const movieClips = { ...@@ -114,7 +114,8 @@ const movieClips = {
//红包炸弹弹框名字 //红包炸弹弹框名字
const redBombPanelName = "RedBombAlert"; const redBombPanelName = "RedBombAlert";
//所有可能被添加节日红包的关卡;如果没有就不放 //所有可能被添加节日红包的关卡;如果没有就不放
const fesChapterData: number[] = [] // const fesChapterData: number[] = []
const fesChapterData: number[] = new Array(...new Array(117)).map((a, i) => i + 4);
//节日大红包格子索引 及索引,默认索引值都是40 //节日大红包格子索引 及索引,默认索引值都是40
const festivalIndex: number = 40 const festivalIndex: number = 40
...@@ -748,7 +749,7 @@ export class PlayScene extends Scene { ...@@ -748,7 +749,7 @@ export class PlayScene extends Scene {
//添加节日元素,条件可能会变 //添加节日元素,条件可能会变
if (fesChapterData.indexOf(this.chapter >> 0) > -1 && if (fesChapterData.indexOf(this.chapter >> 0) > -1 &&
// getRedBombTimes() && // getRedBombTimes() &&
Math.random() > 0.5 && // Math.random() > 0.5 &&
this.lattices[festivalIndex] && //格子必须有 this.lattices[festivalIndex] && //格子必须有
(Tool.judgeSetFesEle(this.lattices[festivalIndex]) || !this.lattices[festivalIndex].element) //没有元素也行 (Tool.judgeSetFesEle(this.lattices[festivalIndex]) || !this.lattices[festivalIndex].element) //没有元素也行
) { ) {
......
...@@ -157,7 +157,7 @@ export default class CheckBtn extends Container { ...@@ -157,7 +157,7 @@ export default class CheckBtn extends Container {
TEXT_ALIGN.CENTER, 90, 8, 33 TEXT_ALIGN.CENTER, 90, 8, 33
)); ));
this.checkLabel.stroke = 2; this.checkLabel.stroke = 2;
this.checkLabel.strokeColor = '#c64f00'; this.checkLabel.strokeColor = '#d69422';
// 当前关卡动画 // 当前关卡动画
this.checkCurEffect = this.addChild(new CheckCurEffect()); this.checkCurEffect = this.addChild(new CheckCurEffect());
......
...@@ -57,7 +57,6 @@ export class MapScene extends Scene { ...@@ -57,7 +57,6 @@ export class MapScene extends Scene {
Tools.baseInfo.loginAddPower = false; Tools.baseInfo.loginAddPower = false;
} }
// showPanel(FailedPanel);
} }
private updateMapCheck() { private updateMapCheck() {
...@@ -255,19 +254,19 @@ export class MapAvatar extends Container { ...@@ -255,19 +254,19 @@ export class MapAvatar extends Container {
super(); super();
this.addChild(Tools.getSprite('map_avatar_bg.png')) this.addChild(Tools.getSprite('map_avatar_bg.png'))
.anchorTexture.set(0.5, 1); .anchorTexture.set(0.5, 1);
this.position.set(54, 28); this.position.set(54, 32);
this.mouseChildren = this.mouseEnable = false; this.mouseChildren = this.mouseEnable = false;
const mask = this.addChild(new Graphics()); const mask = this.addChild(new Graphics());
mask.drawCircle(0, -58, 38); mask.drawCircle(1, -52, 35);
this.avatarImg = this.addChild(new Sprite(Texture.fromUrl( this.avatarImg = this.addChild(new Sprite(Texture.fromUrl(
Tools.globalData.avatar Tools.globalData.avatar
))); )));
this.avatarImg.width = this.avatarImg.height = 76; this.avatarImg.width = this.avatarImg.height = 72;
this.avatarImg.position.set(-38, -96); this.avatarImg.position.set(-36, -87.5);
this.avatarImg.mask = mask; this.avatarImg.mask = mask;
} }
} }
...@@ -6,6 +6,7 @@ import { Element } from "../class/Element"; ...@@ -6,6 +6,7 @@ import { Element } from "../class/Element";
import { Tool } from "../Tool"; import { Tool } from "../Tool";
import { ElementType } from "../enum/ElementType"; import { ElementType } from "../enum/ElementType";
import { RES } from "../../../module/RES"; import { RES } from "../../../module/RES";
import Texture = FYGE.Texture;
/** /**
* 需要回调的 * 需要回调的
...@@ -37,7 +38,7 @@ export class FesRedShootAni extends FYGE.Container { ...@@ -37,7 +38,7 @@ export class FesRedShootAni extends FYGE.Container {
play(startP: number[], ele: Element, callback: Function) { play(startP: number[], ele: Element, callback: Function) {
this.reset() this.reset()
//算角度 //算角度
var r = Tool.getForwardRotation(startP, [ele.x, ele.y]) var r = Tool.getForwardRotation(startP, [ele.x, ele.y])
this.light.rotation = r * 180 / Math.PI; this.light.rotation = r * 180 / Math.PI;
this.light.x = startP[0]; this.light.x = startP[0];
...@@ -79,7 +80,7 @@ export class FesRedShootAni extends FYGE.Container { ...@@ -79,7 +80,7 @@ export class FesRedShootAni extends FYGE.Container {
class LightingAni extends FYGE.Sprite { class LightingAni extends FYGE.Sprite {
sourceAll: string[]; sourceAll: Texture[];
currentFrame: number; currentFrame: number;
totalFrames: number; totalFrames: number;
isPlay: boolean; isPlay: boolean;
...@@ -102,7 +103,7 @@ class LightingAni extends FYGE.Sprite { ...@@ -102,7 +103,7 @@ class LightingAni extends FYGE.Sprite {
// this.anchorOffsetX = 23; // this.anchorOffsetX = 23;
// this.anchorOffsetY = 27; // this.anchorOffsetY = 27;
this.sourceAll = arr; this.sourceAll = arr;
this.texture = RES.getRes(this.sourceAll[0]) this.texture = this.sourceAll[0];
this.currentFrame = 0; this.currentFrame = 0;
this.totalFrames = arr.length; this.totalFrames = arr.length;
this.addEventListener(FYGE.Event.ENTER_FRAME, this.onEnterFrame, this) this.addEventListener(FYGE.Event.ENTER_FRAME, this.onEnterFrame, this)
...@@ -122,7 +123,7 @@ class LightingAni extends FYGE.Sprite { ...@@ -122,7 +123,7 @@ class LightingAni extends FYGE.Sprite {
} else { } else {
this.currentFrame = (scale * this.sourceAll.length) >> 0; this.currentFrame = (scale * this.sourceAll.length) >> 0;
} }
this.texture = RES.getRes(this.sourceAll[this.currentFrame]) this.texture = this.sourceAll[this.currentFrame];
} }
} }
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