Skip to content

B
babycare_xiaoxiao
Commit 4f9045e0 authored by 邱旭's avatar 邱旭
Browse files
Options

gameGuide

parent a84c624d
Show whitespace changes
Inline Side-by-side
Showing with 145 additions and 121 deletions
.idea/workspace.xml
View file @ 4f9045e0
......@@ -2,75 +2,46 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/lotties/bonusTime.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lotties/bonus_lottie/03756d82-4e5c-4bdc-8247-7f704ed92ba7.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lotties/bonus_lottie/0b1a21c5-2e2f-43bc-81f7-ee1c4474d07f.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lotties/bonus_lottie/0f025d15-5a0b-4e5d-81e9-4a822c469467.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lotties/bonus_lottie/445121aa-3bae-4b89-a8e9-fd41e2779276.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lotties/bonus_lottie/54e427a5-b930-4506-a07d-8f1d7eb83ff5.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lotties/bonus_lottie/560f6473-1e86-433f-a2fb-8e6d0c06d32f.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lotties/bonus_lottie/8d000f4d-318a-47a1-9fa4-53c7b203a8fd.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lotties/bonus_lottie/9ed4a149-8df3-45d4-b531-63b82833255a.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lotties/checkTip.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lotties/关卡提示/e305be55-fdfd-453b-9e6d-41edfe68c0f1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/bonus_lottie/0250abc4-fabc-4bf3-970a-46ceeb12d416.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/bonus_lottie/03756d82-4e5c-4bdc-8247-7f704ed92ba7.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/bonus_lottie/0b1a21c5-2e2f-43bc-81f7-ee1c4474d07f.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/bonus_lottie/0f025d15-5a0b-4e5d-81e9-4a822c469467.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/bonus_lottie/445121aa-3bae-4b89-a8e9-fd41e2779276.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/bonus_lottie/54e427a5-b930-4506-a07d-8f1d7eb83ff5.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/bonus_lottie/560f6473-1e86-433f-a2fb-8e6d0c06d32f.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/bonus_lottie/8d000f4d-318a-47a1-9fa4-53c7b203a8fd.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/bonus_lottie/9ed4a149-8df3-45d4-b531-63b82833255a.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/bonus_lottie/b0c2b486-8dab-4c34-bec4-02e4b4ef835b.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/bonus_lottie/cd544214-fe15-402a-99a0-a57072952722.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/playScene/propCancel.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/关卡提示/e305be55-fdfd-453b-9e6d-41edfe68c0f1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/lotties/关卡提示.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/babycare_xiaoxiao.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuideBoard.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_5.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_5_1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_8.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/playSceneGuide/gameGuide_8_1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/playSceneGuide/guidePropBoom.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/playSceneGuide/guidePropCow.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/playSceneGuide/guidePropHammer.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/playSceneGuide/guidePropHand.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/playSceneGuide/guidePropMsgPanel.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/playSceneGuide/guidePropShoe.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/playSceneGuide/propGuideBoard.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/aa.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/bb.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/amazing.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/great.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_0.png" beforeDir="false" afterPath="$PROJECT_DIR$/lotties/bonus_lottie/0250abc4-fabc-4bf3-970a-46ceeb12d416.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_10.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_11.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_12.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_13.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_14.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_15.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_16.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_17.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_18.png" beforeDir="false" afterPath="$PROJECT_DIR$/lotties/bonus_lottie/cd544214-fe15-402a-99a0-a57072952722.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_19.png" beforeDir="false" afterPath="$PROJECT_DIR$/lotties/bonus_lottie/b0c2b486-8dab-4c34-bec4-02e4b4ef835b.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/img_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonusTime/wonderful.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/gameGuideBoard.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/gameGuideBoard.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/0250abc4-fabc-4bf3-970a-46ceeb12d416.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/03756d82-4e5c-4bdc-8247-7f704ed92ba7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/0b1a21c5-2e2f-43bc-81f7-ee1c4474d07f.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/0f025d15-5a0b-4e5d-81e9-4a822c469467.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/445121aa-3bae-4b89-a8e9-fd41e2779276.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/54e427a5-b930-4506-a07d-8f1d7eb83ff5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/560f6473-1e86-433f-a2fb-8e6d0c06d32f.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/8d000f4d-318a-47a1-9fa4-53c7b203a8fd.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/9ed4a149-8df3-45d4-b531-63b82833255a.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/b0c2b486-8dab-4c34-bec4-02e4b4ef835b.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/bonus_lottie/cd544214-fe15-402a-99a0-a57072952722.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/关卡提示/e305be55-fdfd-453b-9e6d-41edfe68c0f1.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/babycare.getIndex.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/gameGuideBoard.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/guidePropBoom.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/guidePropCow.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/guidePropHammer.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/guidePropHand.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/guidePropMsgPanel.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/guidePropShoe.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/handleLot.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/handleLot.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/handleLotS.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/handleLotS.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/lotties/bonus_lottie.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/lotties/bonus_lottie.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LoadingScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/chapters/Chapter1.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/chapters/Chapter1.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/FirstPropGift.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/FirstPropGift.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/PropGuide.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/PropGuide.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/GameGuide.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/GameGuide.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -157,10 +128,10 @@
<recent_temporary>
<list>
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.handleLotS" />
<item itemvalue="Node.js.handleLot.js" />
<item itemvalue="Node.js.handleLotS.js" />
<item itemvalue="npm.dev" />
</list>
</recent_temporary>
</component>
......@@ -173,14 +144,26 @@
<option name="presentableId" value="Default" />
<updated>1612576978320</updated>
<workItem from="1612576979459" duration="13000" />
<workItem from="1612577003915" duration="4010000" />
<workItem from="1612577003915" duration="10579000" />
</task>
<task id="LOCAL-00001" summary="斐乐消消乐">
<created>1612581213298</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1612581213298</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="VcsManagerConfiguration">
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_NEW_TODO" value="false" />
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
<MESSAGE value="斐乐消消乐" />
<option name="LAST_COMMIT_MESSAGE" value="斐乐消消乐" />
</component>
</project>
\ No newline at end of file
mock/miniTb/babycare.getIndex.json
View file @ 4f9045e0
......@@ -2,7 +2,7 @@
"code": "000000",
"data": {
"currentLevel": 66,
"isFristLogin": false,
"isFristLogin": true,
"visitors": [
{
"activityId": "5f1a528e964f9796f92d3ccf",
......
resource/res.json
View file @ 4f9045e0
......@@ -68,10 +68,6 @@
"keys": "使用道具背景.png",
"name": "UseToolPanel"
},
{
"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": "0250abc4-fabc-4bf3-970a-46ceeb12d416.png,03756d82-4e5c-4bdc-8247-7f704ed92ba7.png,0b1a21c5-2e2f-43bc-81f7-ee1c4474d07f.png,0f025d15-5a0b-4e5d-81e9-4a822c469467.png,445121aa-3bae-4b89-a8e9-fd41e2779276.png,54e427a5-b930-4506-a07d-8f1d7eb83ff5.png,560f6473-1e86-433f-a2fb-8e6d0c06d32f.png,8d000f4d-318a-47a1-9fa4-53c7b203a8fd.png,9ed4a149-8df3-45d4-b531-63b82833255a.png,b0c2b486-8dab-4c34-bec4-02e4b4ef835b.png,cd544214-fe15-402a-99a0-a57072952722.png",
"name": "bonus_lottie"
......@@ -105,13 +101,17 @@
"name": "mapCheckPrizeEffect"
},
{
"keys": "blueDoorBg.png,brownBallFace.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele0Hor.png,ele1Exp.png,ele1Hor.png,ele2Exp.png,ele2Hor.png,ele3Exp.png,ele3Hor.png,ele4Exp.png,ele4Hor.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propCancel.png,propNumBg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum当.png,settingBg.png,settingBtn.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"keys": "blueDoorBg.png,brownBallFace.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele0Hor.png,ele1Exp.png,ele1Hor.png,ele2Exp.png,ele2Hor.png,ele3Exp.png,ele3Hor.png,ele4Exp.png,ele4Hor.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propCancel.png,propNumBg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum当.png,settingBg.png,settingBtn.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene"
},
{
"keys": "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,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar20.png,bubbleStar21.png,bubbleStar22.png,bubbleStar23.png,bubbleStar24.png,bubbleStar25.png,bubbleStar26.png,bubbleStar27.png,bubbleStar28.png,bubbleStar29.png,bubbleStar3.png,bubbleStar30.png,bubbleStar31.png,bubbleStar32.png,bubbleStar33.png,bubbleStar34.png,bubbleStar35.png,bubbleStar36.png,bubbleStar37.png,bubbleStar38.png,bubbleStar39.png,bubbleStar4.png,bubbleStar40.png,bubbleStar41.png,bubbleStar42.png,bubbleStar43.png,bubbleStar44.png,bubbleStar45.png,bubbleStar46.png,bubbleStar47.png,bubbleStar48.png,bubbleStar49.png,bubbleStar5.png,bubbleStar50.png,bubbleStar51.png,bubbleStar52.png,bubbleStar53.png,bubbleStar54.png,bubbleStar55.png,bubbleStar56.png,bubbleStar57.png,bubbleStar58.png,bubbleStar59.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.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,stepAni1.png,stepAni10.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png",
"name": "playSceneEffect"
},
{
"keys": "gameGuideBoard.png,gameGuide_1.png,gameGuide_5.png,gameGuide_5_1.png,gameGuide_8.png,gameGuide_8_1.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,propGuideBoard.png",
"name": "playSceneGuide"
},
{
"keys": "chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png",
"name": "playSceneNum"
......
src/ResJson.ts
View file @ 4f9045e0
......@@ -68,10 +68,6 @@ export const ResJson = {
"keys": "使用道具背景.png",
"name": "UseToolPanel"
},
{
"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": "0250abc4-fabc-4bf3-970a-46ceeb12d416.png,03756d82-4e5c-4bdc-8247-7f704ed92ba7.png,0b1a21c5-2e2f-43bc-81f7-ee1c4474d07f.png,0f025d15-5a0b-4e5d-81e9-4a822c469467.png,445121aa-3bae-4b89-a8e9-fd41e2779276.png,54e427a5-b930-4506-a07d-8f1d7eb83ff5.png,560f6473-1e86-433f-a2fb-8e6d0c06d32f.png,8d000f4d-318a-47a1-9fa4-53c7b203a8fd.png,9ed4a149-8df3-45d4-b531-63b82833255a.png,b0c2b486-8dab-4c34-bec4-02e4b4ef835b.png,cd544214-fe15-402a-99a0-a57072952722.png",
"name": "bonus_lottie"
......@@ -105,13 +101,17 @@ export const ResJson = {
"name": "mapCheckPrizeEffect"
},
{
"keys": "blueDoorBg.png,brownBallFace.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele0Hor.png,ele1Exp.png,ele1Hor.png,ele2Exp.png,ele2Hor.png,ele3Exp.png,ele3Hor.png,ele4Exp.png,ele4Hor.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propCancel.png,propNumBg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum当.png,settingBg.png,settingBtn.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"keys": "blueDoorBg.png,brownBallFace.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele0Hor.png,ele1Exp.png,ele1Hor.png,ele2Exp.png,ele2Hor.png,ele3Exp.png,ele3Hor.png,ele4Exp.png,ele4Hor.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propCancel.png,propNumBg.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum当.png,settingBg.png,settingBtn.png,starProgress.png,stepAni11.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene"
},
{
"keys": "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,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar20.png,bubbleStar21.png,bubbleStar22.png,bubbleStar23.png,bubbleStar24.png,bubbleStar25.png,bubbleStar26.png,bubbleStar27.png,bubbleStar28.png,bubbleStar29.png,bubbleStar3.png,bubbleStar30.png,bubbleStar31.png,bubbleStar32.png,bubbleStar33.png,bubbleStar34.png,bubbleStar35.png,bubbleStar36.png,bubbleStar37.png,bubbleStar38.png,bubbleStar39.png,bubbleStar4.png,bubbleStar40.png,bubbleStar41.png,bubbleStar42.png,bubbleStar43.png,bubbleStar44.png,bubbleStar45.png,bubbleStar46.png,bubbleStar47.png,bubbleStar48.png,bubbleStar49.png,bubbleStar5.png,bubbleStar50.png,bubbleStar51.png,bubbleStar52.png,bubbleStar53.png,bubbleStar54.png,bubbleStar55.png,bubbleStar56.png,bubbleStar57.png,bubbleStar58.png,bubbleStar59.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.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,stepAni1.png,stepAni10.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png",
"name": "playSceneEffect"
},
{
"keys": "gameGuideBoard.png,gameGuide_1.png,gameGuide_5.png,gameGuide_5_1.png,gameGuide_8.png,gameGuide_8_1.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,propGuideBoard.png",
"name": "playSceneGuide"
},
{
"keys": "chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png",
"name": "playSceneNum"
......
src/scene/LoadingScene.ts
View file @ 4f9045e0
......@@ -2,9 +2,8 @@ import { Scene } from "../../module/views/Scene";
import { Tools } from "../Tools";
import { ProgressBarS } from "../common/ProgressBarS";
import { RES } from "../../module/RES";
import { sendTbNet, TbNetName, getTbData } from "../TaoBaoNet";
import { getTbData, sendTbNet, TbNetName } from "../TaoBaoNet";
import { layers } from "../../module/views/layers";
import { MapScene } from "./map/MapScene";
import { changeScene } from "../../module/ctrls";
import { PlayScene } from "./PlayScene";
......@@ -94,7 +93,8 @@ export class LoadingScene extends Scene {
if (pro >= 1) {
this.removeEventListener(FYGE.Event.PROGRESS, this.progressEvent, this);
// changeScene(MapScene, {from: "loading"})
changeScene(PlayScene, {chapter: 0});
localStorage.clear();
changeScene(PlayScene, { chapter: 61 });
// changeScene(LotteryScene,{level:1});
}
})
......
src/scene/PlayScene.ts
View file @ 4f9045e0
......@@ -119,7 +119,7 @@ const festivalIndex: number = 40
export class PlayScene extends Scene {
get groupNames() {
return ["playScene", "fiveVerHorDis", "playSceneEffect", "playSceneNum", "bonus_lottie"]
return ["playScene", "fiveVerHorDis", "playSceneEffect", "playSceneGuide", "playSceneNum", "bonus_lottie"]
}
//关卡数据
......@@ -408,7 +408,7 @@ export class PlayScene extends Scene {
//初始化道具信息
this.updateScene();
//选择框 无需加入场景
var textureChoosed: FYGE.Texture = RES.getRes("chooseRect.png")
const textureChoosed: FYGE.Texture = RES.getRes("chooseRect.png");
this.choosed = new FYGE.Sprite(textureChoosed);
this.choosed.anchorTexture.set(0.5, 0.5)
//道具使用时蒙层 无需加入场景，带入propBtnCo的位置数据
......
src/something/uis/FirstPropGift.ts
View file @ 4f9045e0
import { RES } from "../../../module/RES";
import { MsgBoard } from "./GameGuide";
import { layers } from "../../../module/views/layers";
import { Tools } from "../../Tools";
// 首次道具赠送
export class FirstPropGift extends FYGE.Container {
......@@ -13,7 +12,7 @@ export class FirstPropGift extends FYGE.Container {
bg.endFill();
bg.hitTestByPixel = false;
//信息板
var msgBoard = this.addChild(new MsgBoard());
var msgBoard = this.addChild(Tools.getSprite('propGuideBoard.png'));
msgBoard.position.set((750 - 604) / 2, 800);
// msgBoard.msg = "首次进入游戏，送你三个道具，让你通关无阻力！";
//三个道具
......
src/something/uis/GameGuide.ts
View file @ 4f9045e0
import { Tool } from "../Tool";
import { generateMapBg, drawPoly } from "../logic/aaa";
import { drawPoly, generateMapBg } from "../logic/aaa";
import { RES } from "../../../module/RES";
import { PlayScene } from "../../scene/PlayScene";
import { Tools } from "../../Tools";
import { GTool } from "../../../module/tools/GTool";
import Sprite = FYGE.Sprite;
/**
* 引导前，initElements需要编排特定元素
......@@ -22,7 +22,8 @@ export class GameGuide extends FYGE.Container {
stepAll: number;
thisObj: PlayScene;
msgBoard: MsgBoard
msgBoard: MsgBoard | Sprite;
/**
* 直接把this传入得了，懒得弄了
* @param thisObj
......@@ -57,19 +58,30 @@ export class GameGuide extends FYGE.Container {
}
this.handAni(handIndexs);
this.msgBoard.msg = chapterFuns[this.thisObj.chapter].msg[step] || "";
this.msgBoard.x = (750 - this.msgBoard.width) / 2;
const guideData = chapterFuns[this.thisObj.chapter];
if (guideData.img && guideData.img[step]) {
this.removeChild(this.msgBoard);
this.msgBoard = Tools.getSprite(guideData.img[step]);
console.log(this.msgBoard)
this.addChild(this.msgBoard);
} else {
(this.msgBoard as MsgBoard).msg = guideData.msg[step] || "";
}
const dp = guideData.dp;
const stepDp = (dp && dp[step]) || [0, 0];
this.msgBoard.x = (750 - this.msgBoard.width) / 2 + stepDp[0];
var p1 = Tool.getPositionByIndex(handIndexs[0]);
var p2 = Tool.getPositionByIndex(handIndexs[1]);
this.msgBoard.y = Math.max(p1[1], p2[1]) + 135;
this.msgBoard.y = Math.max(p1[1], p2[1]) + 135 + stepDp[1];
//定制修改，101关毛球引导，
if (this.thisObj.chapter == 101 && step == 0) {
this.msgBoard.y += 80;
}
//定制修改，9关组合特效修改
if (this.thisObj.chapter == 9) {
this.msgBoard.y -= 80;
}
this.stepCount--;
}
......@@ -87,19 +99,18 @@ export class GameGuide extends FYGE.Container {
private handAni(handIndexs: number[]) {
FYGE.Tween.removeTweens(this.hand)
var p1 = Tool.getPositionByIndex(handIndexs[0]);
var p2 = Tool.getPositionByIndex(handIndexs[1]);
const p1 = Tool.getPositionByIndex(handIndexs[0]);
const p2 = Tool.getPositionByIndex(handIndexs[1]);
this.hand.x = p1[0];
this.hand.y = p1[1];
FYGE.Tween.get(this.hand, { loop: true })
// .set({ x: p1[0], y: p1[1] })
.to({ x: p2[0], y: p2[1] }, 1000)
.to({ x: p1[0], y: p1[1] }, 100)
.to({ x: p1[0], y: p1[1] }, 100);
}
/**
*
* @param chapter
* @param step 0第一步，1第二步
*/
private drawBg(step: number = 0) {
......@@ -107,7 +118,7 @@ export class GameGuide extends FYGE.Container {
this.bg.beginFill(0x000000, 0.7);
this.drawRect();
//画特定的洞
var data = chapterFuns[this.thisObj.chapter]
const data = chapterFuns[this.thisObj.chapter];
drawHole(this.bg, data.showIndexs[step], data.hideIndexs[step]);
}
......@@ -131,15 +142,15 @@ export class MsgBoard extends FYGE.Sprite {
}
constructor() {
super(RES.getRes("gameGuideBoard.png"));
var msg = this.addChild(Tools.getText(
const msg = this.addChild(Tools.getText(
"",
30,
"#df5942",
"#744f1d",
FYGE.TEXT_ALIGN.LEFT,
330,
258,
14
))
158,
20
));
msg.textHeight = 166;
msg.verticalAlign = FYGE.VERTICAL_ALIGN.MIDDLE;
msg.lineType = FYGE.TEXT_lINETYPE.MULTI;
......@@ -166,7 +177,10 @@ const chapterFuns = {
],
//提示文案，尽量通用点的位置。x肯定都居中
msg: [
"3个同色动物头像成一排即可消除~"
"3个同色猫头像成一排即可消除~"
],
img: [
'gameGuide_1.png'
]
},
//冰块消除
......@@ -182,7 +196,7 @@ const chapterFuns = {
[21, 20]
],
msg: [
"消除冰块上的元素即可打破冰块"
"消除冰块上的猫头像即可打破冰块"
]
},
//石头消除
......@@ -198,7 +212,7 @@ const chapterFuns = {
[12, 13]
],
msg: [
"当石头附近的元素产生消除时，即可粉碎石头"
"当石头附近的猫头像产生消除时，即可粉碎石头"
]
},
//直线特效
......@@ -217,8 +231,15 @@ const chapterFuns = {
[49, 50]
],
msg: [
"4个同色元素形成直线就能合成直线特效",
"4个同样的猫头像形成直线就能合成直线特效",
"消除直线特效会产生直线消除"
],
img: [
'gameGuide_5.png',
'gameGuide_5_1.png',
],
dp: [
[0, 55],
]
},
//爆炸特效
......@@ -237,8 +258,12 @@ const chapterFuns = {
[30, 29]
],
msg: [
"5个同色动物头像成L形或T形就能合成爆炸特效",
"5个同样的猫头像成L形或T形就能合成爆炸特效",
"消除爆炸特效会产生3*3的范围消除",
],
img: [
'gameGuide_8.png',
'gameGuide_8_1.png',
]
},
//特效组合
......@@ -255,6 +280,9 @@ const chapterFuns = {
],
msg: [//"将两个特效互相拖动即可直接触发组合特效，\n组合特效的效果视组合的两个特效类型而定"
"两个特效互相拖动即可触发组合特效，组合特效的效果视两个特效类型而定"//缩短了
],
dp: [
[20, -250],
]
},
//魔力鸟特效
......@@ -273,8 +301,12 @@ const chapterFuns = {
[73, 64]
],
msg: [
"五个相同动物形成一字型即可合成魔力花特效",
"五个同样的猫头像形成一字型即可合成魔力花特效",
"拖动魔力花特效即可直接触发"
],
dp: [
[60, -150],
[30, -750],
]
},
//魔力鸟加特效
......@@ -310,7 +342,11 @@ const chapterFuns = {
],
msg: [
"当棒棒糖移至底层时，即可移除棒棒糖",
"消除棒棒糖下方的动物\n就可以收集棒棒糖啦"
"消除棒棒糖下方的猫头像\n就可以收集棒棒糖啦"
],
dp: [
[0, 0],
[0, -670],
]
},
//笼子消除
......@@ -326,7 +362,7 @@ const chapterFuns = {
[3, 2]
],
msg: [
"和困住藤蔓里的动物匹配\n消除，就可以打破藤蔓啦！"
"和困住藤蔓里的猫头像匹配\n消除，就可以打破藤蔓啦！"
]
},
//果冻消除
......@@ -342,7 +378,7 @@ const chapterFuns = {
[40, 49]
],
msg: [
"小心！会蔓延的果冻！\n消除果冻旁边的动物\n就能消除果冻~"
"小心！会蔓延的毛线球！\n消除毛线球旁边的猫头像\n就能消除毛线球~"
]
},
//鸡蛋
......@@ -358,9 +394,15 @@ const chapterFuns = {
[66, 57]
],
msg: [
"鸡蛋边上不断有动物消除时,会孵出小鸡"
"蛋蛋边上不断有猫猫消除时，会开出惊喜哦"
],
dp: [
[-70, -770],
]
},
//灰毛球
101: {
stepCount: 1,
......
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