Skip to content

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

换了点皮

parent 5649733d
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 96 deletions
.idea/workspace.xml
View file @ 5f922342
...@@ -3,20 +3,12 @@ ...@@ -3,20 +3,12 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment=""> <list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/boomBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/boomBtn.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/hammerBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/hammerBtn.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/stepBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/stepBtn.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/guidePropBoom.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/guidePropBoom.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/lightedStar.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/lightedStar.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/main_mapbottom.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/main_mapbottom.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/playBg.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/playBg.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/rectLat.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/rectLat.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/table.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/table.png" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/playScene/table.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/table.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/topBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/topBg.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/unlightedStar.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/unlightedStar.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.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/scene/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/PropBtnCon.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/PropBtnCon.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/uis/PropGuide.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/uis/PropGuide.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -80,7 +72,7 @@ ...@@ -80,7 +72,7 @@
<recent name="$PROJECT_DIR$/resource/SuccessPrizePanel" /> <recent name="$PROJECT_DIR$/resource/SuccessPrizePanel" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.dev"> <component name="RunManager" selected="npm.flushRes">
<configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true"> <configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" /> <package-json value="$PROJECT_DIR$/package.json" />
<command value="run" /> <command value="run" />
...@@ -104,8 +96,8 @@ ...@@ -104,8 +96,8 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.flushRes" /> <item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -444,7 +436,14 @@ ...@@ -444,7 +436,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1596447404981</updated> <updated>1596447404981</updated>
</task> </task>
<option name="localTasksCounter" value="43" /> <task id="LOCAL-00043" summary="换了点皮">
<created>1600833548431</created>
<option name="number" value="00043" />
<option name="presentableId" value="LOCAL-00043" />
<option name="project" value="LOCAL" />
<updated>1600833548431</updated>
</task>
<option name="localTasksCounter" value="44" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -459,7 +458,8 @@ ...@@ -459,7 +458,8 @@
<MESSAGE value="1111" /> <MESSAGE value="1111" />
<MESSAGE value="120未中奖不弹弹窗" /> <MESSAGE value="120未中奖不弹弹窗" />
<MESSAGE value="toast" /> <MESSAGE value="toast" />
<option name="LAST_COMMIT_MESSAGE" value="toast" /> <MESSAGE value="换了点皮" />
<option name="LAST_COMMIT_MESSAGE" value="换了点皮" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595229546530"> <state x="440" y="273" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595229546530">
...@@ -474,41 +474,41 @@ ...@@ -474,41 +474,41 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" /> <state x="251" y="471" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/31.23.1889.1177@31.23.1889.1177" timestamp="1594113080922" />
<state x="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1596447404763"> <state x="557" y="183" width="884" height="891" key="CommitChangelistDialog2" timestamp="1600833547740">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1596447404763" /> <state x="557" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1600833547740" />
<state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" /> <state x="558" y="183" width="884" height="891" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584297912" />
<state x="131" y="123" width="730" height="977" key="DiffContextDialog" timestamp="1596165868169"> <state x="131" y="123" width="730" height="977" key="DiffContextDialog" timestamp="1596165868169">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="131" y="123" width="730" height="977" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596165868169" /> <state x="131" y="123" width="730" height="977" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596165868169" />
<state width="869" height="321" key="GridCell.Tab.0.bottom" timestamp="1600833441653"> <state width="869" height="321" key="GridCell.Tab.0.bottom" timestamp="1600840853779">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" /> <state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="869" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1600833441653" /> <state width="869" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1600840853779" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" /> <state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" /> <state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state width="869" height="321" key="GridCell.Tab.0.center" timestamp="1600833441652"> <state width="869" height="321" key="GridCell.Tab.0.center" timestamp="1600840853777">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" /> <state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="869" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1600833441652" /> <state width="869" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1600840853777" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" /> <state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" /> <state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" />
<state width="869" height="321" key="GridCell.Tab.0.left" timestamp="1600833441651"> <state width="869" height="321" key="GridCell.Tab.0.left" timestamp="1600840853776">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" /> <state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="869" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1600833441651" /> <state width="869" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1600840853776" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577197" /> <state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577197" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" /> <state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" />
<state width="869" height="321" key="GridCell.Tab.0.right" timestamp="1600833441652"> <state width="869" height="321" key="GridCell.Tab.0.right" timestamp="1600840853778">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" /> <state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="869" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1600833441652" /> <state width="869" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1600840853778" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" /> <state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" /> <state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326"> <state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
...@@ -525,10 +525,10 @@ ...@@ -525,10 +525,10 @@
</state> </state>
<state x="289" y="314" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1596079390860" /> <state x="289" y="314" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1596079390860" />
<state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" /> <state x="300" y="248" key="SettingsEditor/31.23.1889.1177@31.23.1889.1177" timestamp="1594798992724" />
<state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1596447406308"> <state x="91" y="351" key="Vcs.Push.Dialog.v2" timestamp="1600833550176">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1596447406308" /> <state x="91" y="351" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1600833550176" />
<state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" /> <state x="92" y="351" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1595584299423" />
<state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397"> <state x="87" y="216" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594705166397">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
...@@ -556,11 +556,11 @@ ...@@ -556,11 +556,11 @@
</state> </state>
<state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" /> <state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" />
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" /> <state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" />
<state x="484" y="220" width="670" height="504" key="search.everywhere.popup" timestamp="1600829323295"> <state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1600839630483">
<screen x="30" y="23" width="1410" height="877" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="484" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1600829323295" /> <state x="484" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1600829323295" />
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596610144284" /> <state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1600839630483" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" /> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" />
</component> </component>
</project> </project>
\ No newline at end of file
resource/playScene/table.png
View replaced file @ 5649733d View file @ 5f922342
resource/playScene/table.png

59.8 KB | W: | H:

resource/playScene/table.png

56.9 KB | W: | H:

resource/playScene/table.png
resource/playScene/table.png
resource/playScene/table.png
resource/playScene/table.png
  • 2-up
  • Swipe
  • Onion skin
resource/res.json
View file @ 5f922342
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
"name": "mapWhaleEffect" "name": "mapWhaleEffect"
}, },
{ {
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png", "keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,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",
"name": "playScene" "name": "playScene"
}, },
{ {
......
src/ResJson.ts
View file @ 5f922342
...@@ -113,7 +113,7 @@ export const ResJson = { ...@@ -113,7 +113,7 @@ export const ResJson = {
"name": "mapWhaleEffect" "name": "mapWhaleEffect"
}, },
{ {
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png", "keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,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",
"name": "playScene" "name": "playScene"
}, },
{ {
......
src/scene/PlayScene.ts
View file @ 5f922342
...@@ -228,7 +228,7 @@ export class PlayScene extends Scene { ...@@ -228,7 +228,7 @@ export class PlayScene extends Scene {
this._score = value; this._score = value;
FYGE.Tween.removeTweens(this.scoreProgress); FYGE.Tween.removeTweens(this.scoreProgress);
FYGE.Tween.get(this.scoreProgress, {}, null, true) FYGE.Tween.get(this.scoreProgress, {}, null, true)
.to({ score: value }, 300) .to({score: value}, 300)
} }
//所有道具容器 //所有道具容器
...@@ -263,8 +263,10 @@ export class PlayScene extends Scene { ...@@ -263,8 +263,10 @@ export class PlayScene extends Scene {
this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(50, 9); this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(50, 9);
var commonTextArr = {}; var commonTextArr = {};
for (var i = 0; i < 10; i++)commonTextArr[i] = RES.getRes("scoreNum" + i + ".png"); for (var i = 0; i < 10; i++) commonTextArr[i] = RES.getRes("scoreNum" + i + ".png");
["通", "关", "分", "数"].forEach((e) => { commonTextArr[e] = RES.getRes("scoreNum" + e + ".png"); }) ["通", "关", "分", "数"].forEach((e) => {
commonTextArr[e] = RES.getRes("scoreNum" + e + ".png");
})
commonTextArr["："] = RES.getRes("scoreNum冒号.png"); commonTextArr["："] = RES.getRes("scoreNum冒号.png");
//通关目标分数 //通关目标分数
this.targetScoreTxt = this.addChild(new FYGE.BitmapText(commonTextArr)); this.targetScoreTxt = this.addChild(new FYGE.BitmapText(commonTextArr));
...@@ -273,7 +275,9 @@ export class PlayScene extends Scene { ...@@ -273,7 +275,9 @@ export class PlayScene extends Scene {
this.settingBtn = this.addChild(new SettingBtn()) this.settingBtn = this.addChild(new SettingBtn())
this.settingBtn.position.set(618, 16) this.settingBtn.position.set(618, 16)
} }
data: { chapter: number } data: { chapter: number }
start(data: { chapter: number }) { start(data: { chapter: number }) {
super.start(); super.start();
// data = { chapter: 1 } // data = { chapter: 1 }
...@@ -349,7 +353,7 @@ export class PlayScene extends Scene { ...@@ -349,7 +353,7 @@ export class PlayScene extends Scene {
* 加载所有用到的svga * 加载所有用到的svga
* 重写，变成其他动画 * 重写，变成其他动画
*/ */
async initSvgas() { async initSvgas() {
//这里加载资源吧 //这里加载资源吧
await RES.loadGroup("bonusTime") await RES.loadGroup("bonusTime")
var bonusTime = new Lottie(bonus_lottie) var bonusTime = new Lottie(bonus_lottie)
...@@ -370,7 +374,9 @@ export class PlayScene extends Scene { ...@@ -370,7 +374,9 @@ export class PlayScene extends Scene {
//第几关 //第几关
var chapterTex = Tools.getNumTextures("chapterNum"); var chapterTex = Tools.getNumTextures("chapterNum");
["第", "关"].forEach((e) => { chapterTex[e] = RES.getRes("chapterNum" + e + ".png") }) ["第", "关"].forEach((e) => {
chapterTex[e] = RES.getRes("chapterNum" + e + ".png")
})
var chapterTxt = this.addChild(new FYGE.BitmapText(chapterTex)); var chapterTxt = this.addChild(new FYGE.BitmapText(chapterTex));
chapterTxt.text = "第" + (this.chapter >> 0) + "关"; chapterTxt.text = "第" + (this.chapter >> 0) + "关";
chapterTxt.position.set(535, 58); chapterTxt.position.set(535, 58);
...@@ -416,7 +422,7 @@ export class PlayScene extends Scene { ...@@ -416,7 +422,7 @@ export class PlayScene extends Scene {
this.choosed = new FYGE.Sprite(textureChoosed); this.choosed = new FYGE.Sprite(textureChoosed);
this.choosed.anchorTexture.set(0.5, 0.5) this.choosed.anchorTexture.set(0.5, 0.5)
//道具使用时蒙层 无需加入场景，带入propBtnCo的位置数据 //道具使用时蒙层 无需加入场景，带入propBtnCo的位置数据
this.propGuide = new PropGuide(this.propBtnCon.y - 10); this.propGuide = new PropGuide(this.propBtnCon.y + 2);
// this.addChild(this.propGuide); // this.addChild(this.propGuide);
//bonusTime引导，备用的，无需加入场景 //bonusTime引导，备用的，无需加入场景
// this.bonusTime = new BonusTime(); // this.bonusTime = new BonusTime();
...@@ -465,17 +471,17 @@ export class PlayScene extends Scene { ...@@ -465,17 +471,17 @@ export class PlayScene extends Scene {
const [row, col] = rc; const [row, col] = rc;
//不用考虑0 //不用考虑0
if (!endRowNumHash[col]) { if (!endRowNumHash[col]) {
endRowNumHash[col] = { row: row, index: i }; endRowNumHash[col] = {row: row, index: i};
} }
if (row > endRowNumHash[col].row) { if (row > endRowNumHash[col].row) {
endRowNumHash[col] = { row: row, index: i }; endRowNumHash[col] = {row: row, index: i};
} }
//取大行数 //取大行数
endRowNum = Math.max(rc[0], endRowNum) endRowNum = Math.max(rc[0], endRowNum)
} }
this.recycleIndexs = []; this.recycleIndexs = [];
for (const key in endRowNumHash) { for (const key in endRowNumHash) {
const { index, row } = endRowNumHash[key]; const {index, row} = endRowNumHash[key];
if (endRowNum == row) this.recycleIndexs.push(index) if (endRowNum == row) this.recycleIndexs.push(index)
} }
} }
...@@ -533,7 +539,7 @@ export class PlayScene extends Scene { ...@@ -533,7 +539,7 @@ export class PlayScene extends Scene {
//冰块数据 2 3 5 6 或者51 61 //冰块数据 2 3 5 6 或者51 61
var iceData = [2, 3, 5, 6, 51, 61] var iceData = [2, 3, 5, 6, 51, 61]
if (iceData.indexOf(latticesD[i]) >= 0) { if (iceData.indexOf(latticesD[i]) >= 0) {
var iceCount = (function (n) { var iceCount = (function(n) {
if (n == 2 || n == 3) return n - 1; if (n == 2 || n == 3) return n - 1;
if (n == 5 || n == 6) return n - 4; if (n == 5 || n == 6) return n - 4;
return parseInt((n + "").split("")[0]) - 4; return parseInt((n + "").split("")[0]) - 4;
...@@ -838,19 +844,19 @@ export class PlayScene extends Scene { ...@@ -838,19 +844,19 @@ export class PlayScene extends Scene {
var ay = a.y; var ay = a.y;
var bx = b.x; var bx = b.x;
var by = b.y; var by = b.y;
FYGE.Tween.get(a, { loop: true }) FYGE.Tween.get(a, {loop: true})
.to({ x: (bx - ax) / 10 + ax, y: (by - ay) / 10 + ay }, 100) .to({x: (bx - ax) / 10 + ax, y: (by - ay) / 10 + ay}, 100)
.to({ x: ax, y: ay }, 100) .to({x: ax, y: ay}, 100)
.wait(200) .wait(200)
.to({ x: (bx - ax) / 10 + ax, y: (by - ay) / 10 + ay }, 100) .to({x: (bx - ax) / 10 + ax, y: (by - ay) / 10 + ay}, 100)
.to({ x: ax, y: ay }, 100) .to({x: ax, y: ay}, 100)
.wait(400) .wait(400)
FYGE.Tween.get(b, { loop: true }) FYGE.Tween.get(b, {loop: true})
.to({ x: (ax - bx) / 10 + bx, y: (ay - by) / 10 + by }, 100) .to({x: (ax - bx) / 10 + bx, y: (ay - by) / 10 + by}, 100)
.to({ x: bx, y: by }, 100) .to({x: bx, y: by}, 100)
.wait(200) .wait(200)
.to({ x: (ax - bx) / 10 + bx, y: (ay - by) / 10 + by }, 100) .to({x: (ax - bx) / 10 + bx, y: (ay - by) / 10 + by}, 100)
.to({ x: bx, y: by }, 100) .to({x: bx, y: by}, 100)
.wait(400) .wait(400)
} }
...@@ -887,19 +893,19 @@ export class PlayScene extends Scene { ...@@ -887,19 +893,19 @@ export class PlayScene extends Scene {
onTap_boomBtn() { onTap_boomBtn() {
this.propBtnCon.boomCount ? this.propBtnCon.boomCount ?
this.useProp(PropType.BOOMS) : this.useProp(PropType.BOOMS) :
showPanel(ToolsOutPanel, { type: PropType.BOOMS, showSucPanel: true });//注意弹框逻辑，购买完后要调用updateScene showPanel(ToolsOutPanel, {type: PropType.BOOMS, showSucPanel: true});//注意弹框逻辑，购买完后要调用updateScene
} }
onTap_hammerBtn() { onTap_hammerBtn() {
this.propBtnCon.hammerCount ? this.propBtnCon.hammerCount ?
this.useProp(PropType.HAMMERS) : this.useProp(PropType.HAMMERS) :
showPanel(ToolsOutPanel, { type: PropType.HAMMERS, showSucPanel: true });//注意弹框逻辑，购买完后要调用updateScene showPanel(ToolsOutPanel, {type: PropType.HAMMERS, showSucPanel: true});//注意弹框逻辑，购买完后要调用updateScene
} }
onTap_stepBtn() { onTap_stepBtn() {
this.propBtnCon.stepCount ? this.propBtnCon.stepCount ?
this.useProp(PropType.STEPS) : this.useProp(PropType.STEPS) :
showPanel(ToolsOutPanel, { type: PropType.STEPS, showSucPanel: true });//注意弹框逻辑，购买完后要调用updateScene showPanel(ToolsOutPanel, {type: PropType.STEPS, showSucPanel: true});//注意弹框逻辑，购买完后要调用updateScene
} }
//使用道具逻辑 //使用道具逻辑
...@@ -924,7 +930,7 @@ export class PlayScene extends Scene { ...@@ -924,7 +930,7 @@ export class PlayScene extends Scene {
this.choosed.parent.removeChild(this.choosed) this.choosed.parent.removeChild(this.choosed)
} }
let fun: Function; let fun: Function;
this.elementContainer.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, fun = function (e) { this.elementContainer.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, fun = function(e) {
var ele = e.currentTarget.parent.parent; var ele = e.currentTarget.parent.parent;
if (ele instanceof Element && if (ele instanceof Element &&
// ele.type != ElementType.ROCK && // ele.type != ElementType.ROCK &&
...@@ -968,7 +974,7 @@ export class PlayScene extends Scene { ...@@ -968,7 +974,7 @@ export class PlayScene extends Scene {
} }
} }
async sendPropUse(prop: PropType, index?: number) { async sendPropUse(prop: PropType, index?: number) {
//移除事件 //移除事件
this.propGuide.removeAllEventListener(); this.propGuide.removeAllEventListener();
//移除自己 //移除自己
...@@ -1117,7 +1123,7 @@ export class PlayScene extends Scene { ...@@ -1117,7 +1123,7 @@ export class PlayScene extends Scene {
private exchangeElementAni(s: Element, o: Element, callback?) { private exchangeElementAni(s: Element, o: Element, callback?) {
this.enableMouseEvt(false); this.enableMouseEvt(false);
FYGE.Tween.get(s) FYGE.Tween.get(s)
.to({ x: o.x, y: o.y }, 166) .to({x: o.x, y: o.y}, 166)
.call(() => { .call(() => {
if (callback) { if (callback) {
callback.bind(this)(s, o); callback.bind(this)(s, o);
...@@ -1126,7 +1132,7 @@ export class PlayScene extends Scene { ...@@ -1126,7 +1132,7 @@ export class PlayScene extends Scene {
} }
}) })
FYGE.Tween.get(o) FYGE.Tween.get(o)
.to({ x: s.x, y: s.y }, 166) .to({x: s.x, y: s.y}, 166)
} }
//数据交换 //数据交换
...@@ -1200,16 +1206,16 @@ export class PlayScene extends Scene { ...@@ -1200,16 +1206,16 @@ export class PlayScene extends Scene {
if (lat.down != null) { if (lat.down != null) {
latDown = this.lattices[lat.down]; latDown = this.lattices[lat.down];
indexDown = lat.down; indexDown = lat.down;
connects.push({ index: indexDown, type: FallType.THROUGH }) connects.push({index: indexDown, type: FallType.THROUGH})
} else { } else {
latDown = this.lattices[index + Tool.colNum] latDown = this.lattices[index + Tool.colNum]
indexDown = index + Tool.colNum; indexDown = index + Tool.colNum;
connects.push({ index: indexDown, type: FallType.STRIGHT }) connects.push({index: indexDown, type: FallType.STRIGHT})
} }
//下方有格子，并且再this.empty中 //下方有格子，并且再this.empty中
var emptyIndex = this.emptys.indexOf(indexDown) var emptyIndex = this.emptys.indexOf(indexDown)
if (emptyIndex > -1) { if (emptyIndex > -1) {
anis.push({ ele: lat.element, indexs: connects }); anis.push({ele: lat.element, indexs: connects});
//去掉一个 //去掉一个
this.emptys.splice(emptyIndex, 1); this.emptys.splice(emptyIndex, 1);
//加上一个 //加上一个
...@@ -1223,7 +1229,7 @@ export class PlayScene extends Scene { ...@@ -1223,7 +1229,7 @@ export class PlayScene extends Scene {
lat.isGenerate && lat.isGenerate &&
!Tool.judgeFall(this.lattices[index - Tool.colNum]) !Tool.judgeFall(this.lattices[index - Tool.colNum])
) { ) {
anis.push({ ele: null, indexs: [{ index: index, type: FallType.STRIGHT }] }); anis.push({ele: null, indexs: [{index: index, type: FallType.STRIGHT}]});
Tool.removeEle(index, this.emptys) Tool.removeEle(index, this.emptys)
} }
} }
...@@ -1256,7 +1262,7 @@ export class PlayScene extends Scene { ...@@ -1256,7 +1262,7 @@ export class PlayScene extends Scene {
if (indexs != null) { if (indexs != null) {
//最后一个 //最后一个
var downIndex = indexs[indexs.length - 1].index; var downIndex = indexs[indexs.length - 1].index;
anis.push({ ele: lat.element, indexs: indexs }); anis.push({ele: lat.element, indexs: indexs});
//去掉最后一个 //去掉最后一个
// this.emptys.splice(emptyIndex, 1); // this.emptys.splice(emptyIndex, 1);
Tool.removeEle(downIndex, this.emptys) Tool.removeEle(downIndex, this.emptys)
...@@ -1328,7 +1334,7 @@ export class PlayScene extends Scene { ...@@ -1328,7 +1334,7 @@ export class PlayScene extends Scene {
var anis: FallAniData[] = []; var anis: FallAniData[] = [];
var emptys = this.emptys; var emptys = this.emptys;
//排序从大到小 //排序从大到小
emptys.sort(function (a, b) { emptys.sort(function(a, b) {
return a < b ? 1 : -1 return a < b ? 1 : -1
}) })
for (var i = 0; i < emptys.length; i++) { for (var i = 0; i < emptys.length; i++) {
...@@ -1386,7 +1392,7 @@ export class PlayScene extends Scene { ...@@ -1386,7 +1392,7 @@ export class PlayScene extends Scene {
//如果latFall存在 //如果latFall存在
if (latFall) { if (latFall) {
//能掉落，记录元素动画 //能掉落，记录元素动画
anis.push({ ele: latFall.element, indexs: [{ index: indexMy, type: type }] }); anis.push({ele: latFall.element, indexs: [{index: indexMy, type: type}]});
//去掉 //去掉
// console.log(emptys) // console.log(emptys)
// console.log(indexFall) // console.log(indexFall)
...@@ -1405,7 +1411,7 @@ export class PlayScene extends Scene { ...@@ -1405,7 +1411,7 @@ export class PlayScene extends Scene {
//判断是否是生成口 //判断是否是生成口
if (lat.isGenerate) { if (lat.isGenerate) {
//是生成口，就不用管落下乐 //是生成口，就不用管落下乐
anis.push({ ele: null, indexs: [{ index: indexMy, type: FallType.STRIGHT }] }) anis.push({ele: null, indexs: [{index: indexMy, type: FallType.STRIGHT}]})
//去掉 //去掉
emptys.splice(i, 1); emptys.splice(i, 1);
//优先判断生成的，不用管掉落了，跳下一个 //优先判断生成的，不用管掉落了，跳下一个
...@@ -1456,7 +1462,7 @@ export class PlayScene extends Scene { ...@@ -1456,7 +1462,7 @@ export class PlayScene extends Scene {
mask.y = fp[1]; mask.y = fp[1];
this.elementContainer.addChild(mask); this.elementContainer.addChild(mask);
ele.mask = mask; ele.mask = mask;
tween.to({ x: fp[0], y: fp[1] }, deltaTime) tween.to({x: fp[0], y: fp[1]}, deltaTime)
.call(() => { .call(() => {
//移除遮罩 //移除遮罩
ele.mask = null; ele.mask = null;
...@@ -1464,7 +1470,7 @@ export class PlayScene extends Scene { ...@@ -1464,7 +1470,7 @@ export class PlayScene extends Scene {
mask.recover() mask.recover()
}) })
} else { } else {
tween.to({ x: fp[0], y: fp[1] }, deltaTime) tween.to({x: fp[0], y: fp[1]}, deltaTime)
} }
wait += deltaTime wait += deltaTime
} else { } else {
...@@ -1487,11 +1493,11 @@ export class PlayScene extends Scene { ...@@ -1487,11 +1493,11 @@ export class PlayScene extends Scene {
//如果上格子下面有格子, 用遮罩的写法， //如果上格子下面有格子, 用遮罩的写法，
if (this.lattices[indexUp + Tool.colNum]) { if (this.lattices[indexUp + Tool.colNum]) {
EleMaskAni(ele, upPos, wait, this.elementContainer, true, deltaTime); EleMaskAni(ele, upPos, wait, this.elementContainer, true, deltaTime);
tween.set({ alpha: 0 }) tween.set({alpha: 0})
.wait(deltaTime) .wait(deltaTime)
.set({ alpha: 1 }) .set({alpha: 1})
} else { } else {
tween.to({ x: upPos[0], y: upPos[1] + Tool.height }, deltaTime); tween.to({x: upPos[0], y: upPos[1] + Tool.height}, deltaTime);
} }
//down处的动画 //down处的动画
//如果下格子上方有格子，用遮罩的写法 //如果下格子上方有格子，用遮罩的写法
...@@ -1514,9 +1520,9 @@ export class PlayScene extends Scene { ...@@ -1514,9 +1520,9 @@ export class PlayScene extends Scene {
oriRow = Tool.indexToRc(index)[0]; oriRow = Tool.indexToRc(index)[0];
//动画 //动画
if (lastX != null) { if (lastX != null) {
tween.set({ x: lastX, y: lastY }) tween.set({x: lastX, y: lastY})
} }
tween.to({ x: p[0], y: p[1] }, delta * deltaTime) tween.to({x: p[0], y: p[1]}, delta * deltaTime)
//累计等待时间 //累计等待时间
wait += delta * deltaTime; wait += delta * deltaTime;
lastX = null lastX = null
...@@ -1895,7 +1901,9 @@ export class PlayScene extends Scene { ...@@ -1895,7 +1901,9 @@ export class PlayScene extends Scene {
}) })
//加步数 //加步数
this.playAni(RecoverName.STEP_ANI, [stepPosition[0] - 40, stepPosition[1] + 20]); this.playAni(RecoverName.STEP_ANI, [stepPosition[0] - 40, stepPosition[1] + 20]);
setTimeout(() => { this.steps += 5; }, 333) setTimeout(() => {
this.steps += 5;
}, 333)
//更新场景道具数据 //更新场景道具数据
this.updateScene() this.updateScene()
} }
...@@ -2159,7 +2167,7 @@ export class PlayScene extends Scene { ...@@ -2159,7 +2167,7 @@ export class PlayScene extends Scene {
if (!ele) { if (!ele) {
//以防万一还是判断一次 //以防万一还是判断一次
} }
//下面带状态的要优先判断 //下面带状态的要优先判断
//有枷锁的 //有枷锁的
else if (ele.hasState(StateType.LOCK)) { else if (ele.hasState(StateType.LOCK)) {
//被禁锢的解开 //被禁锢的解开
...@@ -2552,7 +2560,7 @@ export class PlayScene extends Scene { ...@@ -2552,7 +2560,7 @@ export class PlayScene extends Scene {
var lat = this.lattices[index]; var lat = this.lattices[index];
lat.element = ele; lat.element = ele;
FYGE.Tween.get(ele) FYGE.Tween.get(ele)
.to({ x: p[0], y: p[1] }, 500) .to({x: p[0], y: p[1]}, 500)
.call(() => { .call(() => {
if (++count == countAll) { if (++count == countAll) {
//交换结束后,判断是否有三消 //交换结束后,判断是否有三消
...@@ -2632,10 +2640,14 @@ export class PlayScene extends Scene { ...@@ -2632,10 +2640,14 @@ export class PlayScene extends Scene {
//没有数据，网络超时，再次提交，到时小程序测试网络断开时返回数据 //没有数据，网络超时，再次提交，到时小程序测试网络断开时返回数据
if (res.data) { if (res.data) {
showToast("网络开小差了\n再次连接中") showToast("网络开小差了\n再次连接中")
wait(() => { this.submit(suc); }, 1300) wait(() => {
this.submit(suc);
}, 1300)
} else { } else {
showToast(res.message || "活动太火爆了\n请稍后再来"); showToast(res.message || "活动太火爆了\n请稍后再来");
wait(() => { changeScene(MapScene) }, 1300) wait(() => {
changeScene(MapScene)
}, 1300)
} }
} }
}, true) }, true)
...@@ -2722,7 +2734,7 @@ export class PlayScene extends Scene { ...@@ -2722,7 +2734,7 @@ export class PlayScene extends Scene {
this.passElements[type]--; this.passElements[type]--;
// console.log(this.elementTargets.targets[type]) // console.log(this.elementTargets.targets[type])
//@ts-ignore //@ts-ignore
var p = this.elementTargets.targets[type].localToGlobal({ x: 40 * 0.8, y: 40 * 0.8 }) var p = this.elementTargets.targets[type].localToGlobal({x: 40 * 0.8, y: 40 * 0.8})
this.addChild(FlyTargetAni(type, fromP, [p.x, p.y - layers.stageOffsetY], () => { this.addChild(FlyTargetAni(type, fromP, [p.x, p.y - layers.stageOffsetY], () => {
this.elementTargets.targets[type].count--; this.elementTargets.targets[type].count--;
})) }))
...@@ -2817,7 +2829,7 @@ export class PlayScene extends Scene { ...@@ -2817,7 +2829,7 @@ export class PlayScene extends Scene {
if (this.festivalTargetNum) { if (this.festivalTargetNum) {
this.festivalTargetNum--; this.festivalTargetNum--;
//@ts-ignore //@ts-ignore
var p = this.festivalTarget.localToGlobal({ x: 40 * 0.8, y: 40 * 0.8 }) var p = this.festivalTarget.localToGlobal({x: 40 * 0.8, y: 40 * 0.8})
this.addChild(FlyTargetAni(ElementType.FESTIVALELE_SMALL, [ele.x, ele.y], [p.x, p.y], () => { this.addChild(FlyTargetAni(ElementType.FESTIVALELE_SMALL, [ele.x, ele.y], [p.x, p.y], () => {
this.festivalTarget.count--; this.festivalTarget.count--;
})) }))
...@@ -2889,6 +2901,7 @@ export class PlayScene extends Scene { ...@@ -2889,6 +2901,7 @@ export class PlayScene extends Scene {
// return currentTarget // return currentTarget
// } // }
let isOn: boolean = true; let isOn: boolean = true;
class SettingBtn extends FYGE.Container { class SettingBtn extends FYGE.Container {
constructor() { constructor() {
super() super()
...@@ -2906,17 +2919,19 @@ class SettingBtn extends FYGE.Container { ...@@ -2906,17 +2919,19 @@ class SettingBtn extends FYGE.Container {
isOn = !isOn; isOn = !isOn;
this.texture = RES.getRes(isOn ? "musicOn.png" : "musicOff.png"); this.texture = RES.getRes(isOn ? "musicOn.png" : "musicOff.png");
//播放或暂停音乐接口 //播放或暂停音乐接口
sendTbNet(TbNetName.openMusic, { isOn: isOn }) sendTbNet(TbNetName.openMusic, {isOn: isOn})
}, this); }, this);
//默认开启 //默认开启
// this.isOn = true; // this.isOn = true;
if (isOn) sendTbNet(TbNetName.openMusic, { isOn: true }) if (isOn) sendTbNet(TbNetName.openMusic, {isOn: true})
//添加onSHow事件 //添加onSHow事件
GDispatcher.addEventListener(G_EVENT.ON_SHOW, this.onShow, this) GDispatcher.addEventListener(G_EVENT.ON_SHOW, this.onShow, this)
} }
onShow() { onShow() {
if (isOn) sendTbNet(TbNetName.openMusic, { isOn: true }) if (isOn) sendTbNet(TbNetName.openMusic, {isOn: true})
} }
destroy() { destroy() {
GDispatcher.removeEventListener(G_EVENT.ON_SHOW, this.onShow, this) GDispatcher.removeEventListener(G_EVENT.ON_SHOW, this.onShow, this)
super.destroy() super.destroy()
...@@ -2935,7 +2950,7 @@ class SettingBtn extends FYGE.Container { ...@@ -2935,7 +2950,7 @@ class SettingBtn extends FYGE.Container {
destroy() { destroy() {
//关闭音乐 //关闭音乐
sendTbNet(TbNetName.openMusic, { isOn: false }) sendTbNet(TbNetName.openMusic, {isOn: false})
super.destroy() super.destroy()
} }
} }
src/something/uis/PropBtnCon.ts
View file @ 5f922342
import { RES } from "../../../module/RES"; import { RES } from "../../../module/RES";
import Sprite = FYGE.Sprite;
export class PropBtnCon extends FYGE.Container { export class PropBtnCon extends FYGE.Container {
...@@ -12,6 +12,7 @@ export class PropBtnCon extends FYGE.Container { ...@@ -12,6 +12,7 @@ export class PropBtnCon extends FYGE.Container {
get stepCount() { get stepCount() {
return this._stepCount; return this._stepCount;
} }
set stepCount(value) { set stepCount(value) {
this._stepCount = value; this._stepCount = value;
this.stepNum.text = "" + value; this.stepNum.text = "" + value;
...@@ -22,15 +23,18 @@ export class PropBtnCon extends FYGE.Container { ...@@ -22,15 +23,18 @@ export class PropBtnCon extends FYGE.Container {
get boomCount() { get boomCount() {
return this._boomCount; return this._boomCount;
} }
set boomCount(value) { set boomCount(value) {
this._boomCount = value; this._boomCount = value;
this.boomNum.text = "" + value; this.boomNum.text = "" + value;
} }
private hammerNum: FYGE.BitmapText; private hammerNum: FYGE.BitmapText;
private _hammerCount: number; private _hammerCount: number;
get hammerCount() { get hammerCount() {
return this._hammerCount; return this._hammerCount;
} }
set hammerCount(value) { set hammerCount(value) {
this._hammerCount = value; this._hammerCount = value;
this.hammerNum.text = "" + value; this.hammerNum.text = "" + value;
...@@ -40,25 +44,34 @@ export class PropBtnCon extends FYGE.Container { ...@@ -40,25 +44,34 @@ export class PropBtnCon extends FYGE.Container {
constructor() { constructor() {
super(); super();
this.addChild(FYGE.Sprite.fromFrame("table.png")); this.addChild(FYGE.Sprite.fromFrame("table.png"));
this.stepBtn = new FYGE.Button(RES.getRes("stepBtn.png")); this.stepBtn = new FYGE.Button(RES.getRes("stepBtn.png"));
this.stepBtn.x = 100 this.stepBtn.x = 132
this.addChild(this.stepBtn); this.addChild(this.stepBtn);
this.boomBtn = new FYGE.Button(RES.getRes("boomBtn.png")); this.boomBtn = new FYGE.Button(RES.getRes("boomBtn.png"));
this.boomBtn.x = 311 this.boomBtn.x = 336
this.addChild(this.boomBtn) this.addChild(this.boomBtn)
this.hammerBtn = new FYGE.Button(RES.getRes("hammerBtn.png")); this.hammerBtn = new FYGE.Button(RES.getRes("hammerBtn.png"));
this.hammerBtn.x = 488; this.hammerBtn.x = 516;
this.addChild(this.hammerBtn) this.addChild(this.hammerBtn)
this.stepBtn.y = this.boomBtn.y = this.hammerBtn.y = -10 this.stepBtn.y = this.boomBtn.y = this.hammerBtn.y = 3;
this.addChild(Sprite.fromFrame('prop_count_bg.png'))
.position.set(205, 68);
this.addChild(Sprite.fromFrame('prop_count_bg.png'))
.position.set(392, 68);
this.addChild(Sprite.fromFrame('prop_count_bg.png'))
.position.set(579, 68);
var arr = {}; var arr = {};
for (var i = 0; i < 10; i++)arr[i] = RES.getRes("propNum" + i + ".png") for (var i = 0; i < 10; i++) arr[i] = RES.getRes("propNum" + i + ".png")
//文案 //文案
this.stepNum = this.addChild(new FYGE.BitmapText(arr)); this.stepNum = this.addChild(new FYGE.BitmapText(arr));
this.boomNum = this.addChild(new FYGE.BitmapText(arr)); this.boomNum = this.addChild(new FYGE.BitmapText(arr));
this.hammerNum = this.addChild(new FYGE.BitmapText(arr)); this.hammerNum = this.addChild(new FYGE.BitmapText(arr));
this.stepNum.y = this.boomNum.y = this.hammerNum.y = 60; this.stepNum.y = this.boomNum.y = this.hammerNum.y = 75;
this.stepNum.text = this.boomNum.text = this.hammerNum.text = "13"; this.stepNum.text = this.boomNum.text = this.hammerNum.text = "13";
this.stepNum.textAlign = this.boomNum.textAlign = this.hammerNum.textAlign = FYGE.TEXT_ALIGN.CENTER; this.stepNum.textAlign = this.boomNum.textAlign = this.hammerNum.textAlign = FYGE.TEXT_ALIGN.CENTER;
this.stepNum.x = 227 this.stepNum.x = 227
...@@ -69,7 +82,6 @@ export class PropBtnCon extends FYGE.Container { ...@@ -69,7 +82,6 @@ export class PropBtnCon extends FYGE.Container {
} }
/** /**
* 自定义按钮 * 自定义按钮
*/ */
......
src/something/uis/PropGuide.ts
View file @ 5f922342
...@@ -21,15 +21,15 @@ export class PropGuide extends FYGE.Container { ...@@ -21,15 +21,15 @@ export class PropGuide extends FYGE.Container {
this.bg = new FYGE.Shape(); this.bg = new FYGE.Shape();
this.addChild(this.bg); this.addChild(this.bg);
this.boomBtn = new FYGE.Sprite(RES.getRes("boomBtn.png")); this.boomBtn = new FYGE.Sprite(RES.getRes("boomBtn.png"));
this.boomBtn.x = 311; this.boomBtn.x = 336;
this.boomBtn.y = offsetY; this.boomBtn.y = offsetY;
this.addChild(this.boomBtn); this.addChild(this.boomBtn);
this.hammerBtn = new FYGE.Sprite(RES.getRes("hammerBtn.png")); this.hammerBtn = new FYGE.Sprite(RES.getRes("hammerBtn.png"));
this.hammerBtn.x = 488; this.hammerBtn.x = 516;
this.hammerBtn.y = offsetY; this.hammerBtn.y = offsetY;
this.addChild(this.hammerBtn); this.addChild(this.hammerBtn);
this.stepBtn = new FYGE.Sprite(RES.getRes("stepBtn.png")); this.stepBtn = new FYGE.Sprite(RES.getRes("stepBtn.png"));
this.stepBtn.x = 100; this.stepBtn.x = 132;
this.stepBtn.y = offsetY; this.stepBtn.y = offsetY;
this.addChild(this.stepBtn); this.addChild(this.stepBtn);
//再调 //再调
...@@ -95,4 +95,4 @@ export class PropGuide extends FYGE.Container { ...@@ -95,4 +95,4 @@ export class PropGuide extends FYGE.Container {
this.bg.lineTo(Tool.offsetX, Tool.offsetY); this.bg.lineTo(Tool.offsetX, Tool.offsetY);
this.bg.endFill(); this.bg.endFill();
} }
} }
\ 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