Skip to content

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

111

parent d3971b8e
Hide whitespace changes
Inline Side-by-side
Showing with 486 additions and 191 deletions
.idea/workspace.xml
View file @ b41db497
...@@ -2,10 +2,36 @@ ...@@ -2,10 +2,36 @@
<project version="4"> <project version="4">
<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 afterPath="$PROJECT_DIR$/resource/map/map_whale_0.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_whale_1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_whale_10.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_whale_11.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_whale_12.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_whale_2.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_whale_3.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_whale_4.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_whale_5.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_whale_6.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_whale_7.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_whale_8.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_whale_9.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/water1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/water2.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/panels/StartPanelPrize.ts" afterDir="false" />
<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$/libs/FYGE.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/libs/FYGE.d.ts" afterDir="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/StartPanel/开始闯关不要能量.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/开始闯关不要能量.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_bg2.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_bg2.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.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/SkinJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/SkinJson.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/SkinJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/SkinJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.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/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapMid.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapMid.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.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" />
...@@ -35,7 +61,7 @@ ...@@ -35,7 +61,7 @@
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" /> <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/mock" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/resource/map" />
<property name="node.js.detected.package.tslint" value="true" /> <property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.path.for.package.tslint" value="project" /> <property name="node.js.path.for.package.tslint" value="project" />
<property name="node.js.selected.package.tslint" value="(autodetect)" /> <property name="node.js.selected.package.tslint" value="(autodetect)" />
...@@ -47,15 +73,16 @@ ...@@ -47,15 +73,16 @@
<property name="ts.external.directory.path" value="$PROJECT_DIR$/node_modules/typescript/lib" /> <property name="ts.external.directory.path" value="$PROJECT_DIR$/node_modules/typescript/lib" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src/scene/map" />
</key>
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/mock" />
<recent name="$PROJECT_DIR$/resource/map" /> <recent name="$PROJECT_DIR$/resource/map" />
<recent name="$PROJECT_DIR$/mock" />
<recent name="$PROJECT_DIR$/libs" /> <recent name="$PROJECT_DIR$/libs" />
<recent name="$PROJECT_DIR$/resource" /> <recent name="$PROJECT_DIR$/resource" />
</key> </key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resource/common" />
<recent name="$PROJECT_DIR$/src/scene/map" />
</key>
</component> </component>
<component name="RunManager" selected="npm.dev"> <component name="RunManager" selected="npm.dev">
<configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true"> <configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
...@@ -98,7 +125,7 @@ ...@@ -98,7 +125,7 @@
<workItem from="1594106517562" duration="5224000" /> <workItem from="1594106517562" duration="5224000" />
<workItem from="1594111755267" duration="29551000" /> <workItem from="1594111755267" duration="29551000" />
<workItem from="1594260676967" duration="30060000" /> <workItem from="1594260676967" duration="30060000" />
<workItem from="1594604662575" duration="5635000" /> <workItem from="1594604662575" duration="27176000" />
</task> </task>
<task id="LOCAL-00001" summary="111"> <task id="LOCAL-00001" summary="111">
<created>1594122339119</created> <created>1594122339119</created>
...@@ -158,22 +185,22 @@ ...@@ -158,22 +185,22 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="58" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1594303577069" /> <state x="58" y="183" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1594303577069" />
<state width="879" height="329" key="GridCell.Tab.0.bottom" timestamp="1594605745156"> <state width="882" height="329" key="GridCell.Tab.0.bottom" timestamp="1594643554502">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="879" height="329" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1594605745156" /> <state width="882" height="329" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1594643554502" />
<state width="879" height="329" key="GridCell.Tab.0.center" timestamp="1594605745155"> <state width="882" height="329" key="GridCell.Tab.0.center" timestamp="1594643554497">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="879" height="329" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1594605745155" /> <state width="882" height="329" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1594643554497" />
<state width="879" height="329" key="GridCell.Tab.0.left" timestamp="1594605745155"> <state width="882" height="329" key="GridCell.Tab.0.left" timestamp="1594643554496">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="879" height="329" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1594605745155" /> <state width="882" height="329" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1594643554496" />
<state width="879" height="329" key="GridCell.Tab.0.right" timestamp="1594605745156"> <state width="882" height="329" key="GridCell.Tab.0.right" timestamp="1594643554497">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="879" height="329" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1594605745156" /> <state width="882" height="329" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1594643554497" />
<state x="210" y="320" key="RollbackChangesDialog" timestamp="1594173186663"> <state x="210" y="320" key="RollbackChangesDialog" timestamp="1594173186663">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
...@@ -202,13 +229,17 @@ ...@@ -202,13 +229,17 @@
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="805" y="23" width="879" height="1158" key="dock-window-3/31.23.1889.1177@31.23.1889.1177" timestamp="1594604843980" /> <state x="805" y="23" width="879" height="1158" key="dock-window-3/31.23.1889.1177@31.23.1889.1177" timestamp="1594604843980" />
<state x="222" y="390" key="refactoring.ChangeSignatureDialog" timestamp="1594631868193">
<screen x="31" y="23" width="1889" height="1177" />
</state>
<state x="222" y="390" key="refactoring.ChangeSignatureDialog/31.23.1889.1177@31.23.1889.1177" timestamp="1594631868193" />
<state x="157" y="286" key="run.anything.popup" timestamp="1594188122355"> <state x="157" y="286" key="run.anything.popup" timestamp="1594188122355">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594188122355" /> <state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594188122355" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1594609774151"> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup" timestamp="1594632955275">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594609774151" /> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1594632955275" />
</component> </component>
</project> </project>
\ No newline at end of file
mock/miniTb/babycare.getIndex.json
View file @ b41db497
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"message": "OK", "message": "OK",
"data": { "data": {
"power": 100, "power": 100,
"currentLevel": 4, "currentLevel": 120,
"tools": { "tools": {
"STEPS": 1, "STEPS": 1,
"BOOMS": 2, "BOOMS": 2,
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
{ {
"level": 5 "level": 5
}, },
{
"level": 4
},
{ {
"level": 1 "level": 1
} }
...@@ -45,7 +48,56 @@ ...@@ -45,7 +48,56 @@
"scores": 44444, "scores": 44444,
"stars": 2, "stars": 2,
"isPrizeLevel": false, "isPrizeLevel": false,
"isVisitSuccess": false "isVisitSuccess": true
},
{
"level": 5,
"scores": 44444,
"stars": 2,
"isPrizeLevel": false,
"isVisitSuccess": true
},
{
"level": 6,
"scores": 44444,
"stars": 2,
"isPrizeLevel": false,
"isVisitSuccess": true
},
{
"level": 7,
"scores": 44444,
"stars": 2,
"isPrizeLevel": false,
"isVisitSuccess": true
},
{
"level": 4,
"scores": 44444,
"stars": 2,
"isPrizeLevel": false,
"isVisitSuccess": true
},
{
"level": 8,
"scores": 44444,
"stars": 2,
"isPrizeLevel": false,
"isVisitSuccess": true
},
{
"level": 9,
"scores": 44444,
"stars": 2,
"isPrizeLevel": false,
"isVisitSuccess": true
},
{
"level": 10,
"scores": 44444,
"stars": 2,
"isPrizeLevel": false,
"isVisitSuccess": true
} }
], ],
"isFristLogin": false "isFristLogin": false
......
resource/map/map_bg2.jpg
View replaced file @ d3971b8e View file @ b41db497
resource/map/map_bg2.jpg

723 KB | W: | H:

resource/map/map_bg2.jpg

747 KB | W: | H:

resource/map/map_bg2.jpg
resource/map/map_bg2.jpg
resource/map/map_bg2.jpg
resource/map/map_bg2.jpg
  • 2-up
  • Swipe
  • Onion skin
resource/res.json
View file @ b41db497
{ {
"groups": [ "groups": [
{
"keys": "bonusTime0.png,bonusTime1.png,bonusTime10.png,bonusTime11.png,bonusTime12.png,bonusTime13.png,bonusTime14.png,bonusTime15.png,bonusTime16.png,bonusTime17.png,bonusTime18.png,bonusTime19.png,bonusTime2.png,bonusTime20.png,bonusTime21.png,bonusTime22.png,bonusTime23.png,bonusTime24.png,bonusTime25.png,bonusTime26.png,bonusTime27.png,bonusTime28.png,bonusTime3.png,bonusTime4.png,bonusTime5.png,bonusTime6.png,bonusTime7.png,bonusTime8.png,bonusTime9.png",
"name": "bonusTime"
},
{ {
"keys": "增加体力背景.png,无字按钮底.png", "keys": "增加体力背景.png,无字按钮底.png",
"name": "BuyPowerPanel" "name": "BuyPowerPanel"
}, },
{
"keys": "comCloseBtn.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common"
},
{ {
"keys": "积分不足背景.png,赚取积分.png", "keys": "积分不足背景.png,赚取积分.png",
"name": "CreditsOutPanel" "name": "CreditsOutPanel"
...@@ -24,22 +16,10 @@ ...@@ -24,22 +16,10 @@
"keys": "失败Bg.png,失败重新闯关.png", "keys": "失败Bg.png,失败重新闯关.png",
"name": "FailedPanel" "name": "FailedPanel"
}, },
{
"keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png",
"name": "festival"
},
{
"keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png,hor_ele0_0.png,hor_ele0_1.png,hor_ele0_10.png,hor_ele0_11.png,hor_ele0_12.png,hor_ele0_13.png,hor_ele0_14.png,hor_ele0_15.png,hor_ele0_2.png,hor_ele0_3.png,hor_ele0_4.png,hor_ele0_5.png,hor_ele0_6.png,hor_ele0_7.png,hor_ele0_8.png,hor_ele0_9.png,hor_ele1_0.png,hor_ele1_1.png,hor_ele1_10.png,hor_ele1_11.png,hor_ele1_12.png,hor_ele1_13.png,hor_ele1_14.png,hor_ele1_15.png,hor_ele1_2.png,hor_ele1_3.png,hor_ele1_4.png,hor_ele1_5.png,hor_ele1_6.png,hor_ele1_7.png,hor_ele1_8.png,hor_ele1_9.png,hor_ele2_0.png,hor_ele2_1.png,hor_ele2_10.png,hor_ele2_11.png,hor_ele2_12.png,hor_ele2_13.png,hor_ele2_14.png,hor_ele2_15.png,hor_ele2_2.png,hor_ele2_3.png,hor_ele2_4.png,hor_ele2_5.png,hor_ele2_6.png,hor_ele2_7.png,hor_ele2_8.png,hor_ele2_9.png,hor_ele3_0.png,hor_ele3_1.png,hor_ele3_10.png,hor_ele3_11.png,hor_ele3_12.png,hor_ele3_13.png,hor_ele3_14.png,hor_ele3_15.png,hor_ele3_2.png,hor_ele3_3.png,hor_ele3_4.png,hor_ele3_5.png,hor_ele3_6.png,hor_ele3_7.png,hor_ele3_8.png,hor_ele3_9.png,hor_ele4_0.png,hor_ele4_1.png,hor_ele4_10.png,hor_ele4_11.png,hor_ele4_12.png,hor_ele4_13.png,hor_ele4_14.png,hor_ele4_15.png,hor_ele4_2.png,hor_ele4_3.png,hor_ele4_4.png,hor_ele4_5.png,hor_ele4_6.png,hor_ele4_7.png,hor_ele4_8.png,hor_ele4_9.png,ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png",
"name": "fiveVerHorDis"
},
{ {
"keys": "圆圈.png,开心收下.png", "keys": "圆圈.png,开心收下.png",
"name": "FreePowerPanel" "name": "FreePowerPanel"
}, },
{
"keys": "cur_light_1.png,cur_light_2.png,map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_creditsBg.png,map_energyAdd.png,map_energyBg.png,map_prizeBox.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_推车.png,map_狐狸气球.png,prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png",
"name": "map"
},
{ {
"keys": "体力不足Bg.png,体力不足按钮.png", "keys": "体力不足Bg.png,体力不足按钮.png",
"name": "NoEnergyPanel" "name": "NoEnergyPanel"
...@@ -48,16 +28,12 @@ ...@@ -48,16 +28,12 @@
"keys": "步数耗尽Bg.png,步数耗尽复活.png,步数耗尽结束按钮.png", "keys": "步数耗尽Bg.png,步数耗尽复活.png,步数耗尽结束按钮.png",
"name": "NoStepBtn" "name": "NoStepBtn"
}, },
{
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,boomBtn.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0.png,ele0Exp.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele1Exp.png,ele2.png,ele2Exp.png,ele3.png,ele3Exp.png,ele4.png,ele4Exp.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.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,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece10.png,hairballPiece11.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,hammerBtn.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,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,redNum0.png,redNum1.png,redNum2.png,redNum3.png,redNum4.png,redNum5.png,redNum6.png,redNum7.png,redNum8.png,redNum9.png,redNum关.png,redNum冒号.png,redNum分.png,redNum数.png,redNum第.png,redNum通.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepBtn.png,table.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene"
},
{ {
"keys": "活动规则背景.png", "keys": "活动规则背景.png",
"name": "RulePanel" "name": "RulePanel"
}, },
{ {
"keys": "开始闯关Bg.png,开始闯关不要能量.png", "keys": "开始闯关Bg.png",
"name": "StartPanel" "name": "StartPanel"
}, },
{ {
...@@ -83,6 +59,30 @@ ...@@ -83,6 +59,30 @@
{ {
"keys": "使用道具背景.png", "keys": "使用道具背景.png",
"name": "UseToolPanel" "name": "UseToolPanel"
},
{
"keys": "bonusTime0.png,bonusTime1.png,bonusTime10.png,bonusTime11.png,bonusTime12.png,bonusTime13.png,bonusTime14.png,bonusTime15.png,bonusTime16.png,bonusTime17.png,bonusTime18.png,bonusTime19.png,bonusTime2.png,bonusTime20.png,bonusTime21.png,bonusTime22.png,bonusTime23.png,bonusTime24.png,bonusTime25.png,bonusTime26.png,bonusTime27.png,bonusTime28.png,bonusTime3.png,bonusTime4.png,bonusTime5.png,bonusTime6.png,bonusTime7.png,bonusTime8.png,bonusTime9.png",
"name": "bonusTime"
},
{
"keys": "comCloseBtn.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common"
},
{
"keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png",
"name": "festival"
},
{
"keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png,hor_ele0_0.png,hor_ele0_1.png,hor_ele0_10.png,hor_ele0_11.png,hor_ele0_12.png,hor_ele0_13.png,hor_ele0_14.png,hor_ele0_15.png,hor_ele0_2.png,hor_ele0_3.png,hor_ele0_4.png,hor_ele0_5.png,hor_ele0_6.png,hor_ele0_7.png,hor_ele0_8.png,hor_ele0_9.png,hor_ele1_0.png,hor_ele1_1.png,hor_ele1_10.png,hor_ele1_11.png,hor_ele1_12.png,hor_ele1_13.png,hor_ele1_14.png,hor_ele1_15.png,hor_ele1_2.png,hor_ele1_3.png,hor_ele1_4.png,hor_ele1_5.png,hor_ele1_6.png,hor_ele1_7.png,hor_ele1_8.png,hor_ele1_9.png,hor_ele2_0.png,hor_ele2_1.png,hor_ele2_10.png,hor_ele2_11.png,hor_ele2_12.png,hor_ele2_13.png,hor_ele2_14.png,hor_ele2_15.png,hor_ele2_2.png,hor_ele2_3.png,hor_ele2_4.png,hor_ele2_5.png,hor_ele2_6.png,hor_ele2_7.png,hor_ele2_8.png,hor_ele2_9.png,hor_ele3_0.png,hor_ele3_1.png,hor_ele3_10.png,hor_ele3_11.png,hor_ele3_12.png,hor_ele3_13.png,hor_ele3_14.png,hor_ele3_15.png,hor_ele3_2.png,hor_ele3_3.png,hor_ele3_4.png,hor_ele3_5.png,hor_ele3_6.png,hor_ele3_7.png,hor_ele3_8.png,hor_ele3_9.png,hor_ele4_0.png,hor_ele4_1.png,hor_ele4_10.png,hor_ele4_11.png,hor_ele4_12.png,hor_ele4_13.png,hor_ele4_14.png,hor_ele4_15.png,hor_ele4_2.png,hor_ele4_3.png,hor_ele4_4.png,hor_ele4_5.png,hor_ele4_6.png,hor_ele4_7.png,hor_ele4_8.png,hor_ele4_9.png,ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png",
"name": "fiveVerHorDis"
},
{
"keys": "cur_light_1.png,cur_light_2.png,map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_creditsBg.png,map_energyAdd.png,map_energyBg.png,map_prizeBox.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_whale_0.png,map_whale_1.png,map_whale_10.png,map_whale_11.png,map_whale_12.png,map_whale_2.png,map_whale_3.png,map_whale_4.png,map_whale_5.png,map_whale_6.png,map_whale_7.png,map_whale_8.png,map_whale_9.png,map_推车.png,map_狐狸气球.png,prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png,water1.png,water2.png",
"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,boomBtn.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,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,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece10.png,hairballPiece11.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,hammerBtn.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,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,redNum0.png,redNum1.png,redNum2.png,redNum3.png,redNum4.png,redNum5.png,redNum6.png,redNum7.png,redNum8.png,redNum9.png,redNum关.png,redNum冒号.png,redNum分.png,redNum数.png,redNum第.png,redNum通.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepBtn.png,table.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene"
} }
], ],
"path": "./resource/" "path": "./resource/"
......
src/Main.ts
View file @ b41db497
...@@ -78,8 +78,8 @@ export class Main { ...@@ -78,8 +78,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(MapScene); changeScene(MapScene);
changeScene(PlayScene); // changeScene(PlayScene);
// changeScene(SStartScene); // changeScene(SStartScene);
// changeScene(StoryScene); // changeScene(StoryScene);
// changeScene(AdoptScene); // changeScene(AdoptScene);
......
src/ResJson.ts
View file @ b41db497
export const ResJson = { export const ResJson = {
"groups": [ "groups": [
{
"keys": "bonusTime0.png,bonusTime1.png,bonusTime10.png,bonusTime11.png,bonusTime12.png,bonusTime13.png,bonusTime14.png,bonusTime15.png,bonusTime16.png,bonusTime17.png,bonusTime18.png,bonusTime19.png,bonusTime2.png,bonusTime20.png,bonusTime21.png,bonusTime22.png,bonusTime23.png,bonusTime24.png,bonusTime25.png,bonusTime26.png,bonusTime27.png,bonusTime28.png,bonusTime3.png,bonusTime4.png,bonusTime5.png,bonusTime6.png,bonusTime7.png,bonusTime8.png,bonusTime9.png",
"name": "bonusTime"
},
{ {
"keys": "增加体力背景.png,无字按钮底.png", "keys": "增加体力背景.png,无字按钮底.png",
"name": "BuyPowerPanel" "name": "BuyPowerPanel"
}, },
{
"keys": "comCloseBtn.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common"
},
{ {
"keys": "积分不足背景.png,赚取积分.png", "keys": "积分不足背景.png,赚取积分.png",
"name": "CreditsOutPanel" "name": "CreditsOutPanel"
...@@ -24,22 +16,10 @@ export const ResJson = { ...@@ -24,22 +16,10 @@ export const ResJson = {
"keys": "失败Bg.png,失败重新闯关.png", "keys": "失败Bg.png,失败重新闯关.png",
"name": "FailedPanel" "name": "FailedPanel"
}, },
{
"keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png",
"name": "festival"
},
{
"keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png,hor_ele0_0.png,hor_ele0_1.png,hor_ele0_10.png,hor_ele0_11.png,hor_ele0_12.png,hor_ele0_13.png,hor_ele0_14.png,hor_ele0_15.png,hor_ele0_2.png,hor_ele0_3.png,hor_ele0_4.png,hor_ele0_5.png,hor_ele0_6.png,hor_ele0_7.png,hor_ele0_8.png,hor_ele0_9.png,hor_ele1_0.png,hor_ele1_1.png,hor_ele1_10.png,hor_ele1_11.png,hor_ele1_12.png,hor_ele1_13.png,hor_ele1_14.png,hor_ele1_15.png,hor_ele1_2.png,hor_ele1_3.png,hor_ele1_4.png,hor_ele1_5.png,hor_ele1_6.png,hor_ele1_7.png,hor_ele1_8.png,hor_ele1_9.png,hor_ele2_0.png,hor_ele2_1.png,hor_ele2_10.png,hor_ele2_11.png,hor_ele2_12.png,hor_ele2_13.png,hor_ele2_14.png,hor_ele2_15.png,hor_ele2_2.png,hor_ele2_3.png,hor_ele2_4.png,hor_ele2_5.png,hor_ele2_6.png,hor_ele2_7.png,hor_ele2_8.png,hor_ele2_9.png,hor_ele3_0.png,hor_ele3_1.png,hor_ele3_10.png,hor_ele3_11.png,hor_ele3_12.png,hor_ele3_13.png,hor_ele3_14.png,hor_ele3_15.png,hor_ele3_2.png,hor_ele3_3.png,hor_ele3_4.png,hor_ele3_5.png,hor_ele3_6.png,hor_ele3_7.png,hor_ele3_8.png,hor_ele3_9.png,hor_ele4_0.png,hor_ele4_1.png,hor_ele4_10.png,hor_ele4_11.png,hor_ele4_12.png,hor_ele4_13.png,hor_ele4_14.png,hor_ele4_15.png,hor_ele4_2.png,hor_ele4_3.png,hor_ele4_4.png,hor_ele4_5.png,hor_ele4_6.png,hor_ele4_7.png,hor_ele4_8.png,hor_ele4_9.png,ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png",
"name": "fiveVerHorDis"
},
{ {
"keys": "圆圈.png,开心收下.png", "keys": "圆圈.png,开心收下.png",
"name": "FreePowerPanel" "name": "FreePowerPanel"
}, },
{
"keys": "cur_light_1.png,cur_light_2.png,map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_creditsBg.png,map_energyAdd.png,map_energyBg.png,map_prizeBox.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_推车.png,map_狐狸气球.png,prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png",
"name": "map"
},
{ {
"keys": "体力不足Bg.png,体力不足按钮.png", "keys": "体力不足Bg.png,体力不足按钮.png",
"name": "NoEnergyPanel" "name": "NoEnergyPanel"
...@@ -48,16 +28,12 @@ export const ResJson = { ...@@ -48,16 +28,12 @@ export const ResJson = {
"keys": "步数耗尽Bg.png,步数耗尽复活.png,步数耗尽结束按钮.png", "keys": "步数耗尽Bg.png,步数耗尽复活.png,步数耗尽结束按钮.png",
"name": "NoStepBtn" "name": "NoStepBtn"
}, },
{
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,boomBtn.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0.png,ele0Exp.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele1Exp.png,ele2.png,ele2Exp.png,ele3.png,ele3Exp.png,ele4.png,ele4Exp.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.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,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece10.png,hairballPiece11.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,hammerBtn.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,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,redNum0.png,redNum1.png,redNum2.png,redNum3.png,redNum4.png,redNum5.png,redNum6.png,redNum7.png,redNum8.png,redNum9.png,redNum关.png,redNum冒号.png,redNum分.png,redNum数.png,redNum第.png,redNum通.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepBtn.png,table.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene"
},
{ {
"keys": "活动规则背景.png", "keys": "活动规则背景.png",
"name": "RulePanel" "name": "RulePanel"
}, },
{ {
"keys": "开始闯关Bg.png,开始闯关不要能量.png", "keys": "开始闯关Bg.png",
"name": "StartPanel" "name": "StartPanel"
}, },
{ {
...@@ -83,6 +59,30 @@ export const ResJson = { ...@@ -83,6 +59,30 @@ export const ResJson = {
{ {
"keys": "使用道具背景.png", "keys": "使用道具背景.png",
"name": "UseToolPanel" "name": "UseToolPanel"
},
{
"keys": "bonusTime0.png,bonusTime1.png,bonusTime10.png,bonusTime11.png,bonusTime12.png,bonusTime13.png,bonusTime14.png,bonusTime15.png,bonusTime16.png,bonusTime17.png,bonusTime18.png,bonusTime19.png,bonusTime2.png,bonusTime20.png,bonusTime21.png,bonusTime22.png,bonusTime23.png,bonusTime24.png,bonusTime25.png,bonusTime26.png,bonusTime27.png,bonusTime28.png,bonusTime3.png,bonusTime4.png,bonusTime5.png,bonusTime6.png,bonusTime7.png,bonusTime8.png,bonusTime9.png",
"name": "bonusTime"
},
{
"keys": "comCloseBtn.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,star.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,动物.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common"
},
{
"keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png",
"name": "festival"
},
{
"keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png,hor_ele0_0.png,hor_ele0_1.png,hor_ele0_10.png,hor_ele0_11.png,hor_ele0_12.png,hor_ele0_13.png,hor_ele0_14.png,hor_ele0_15.png,hor_ele0_2.png,hor_ele0_3.png,hor_ele0_4.png,hor_ele0_5.png,hor_ele0_6.png,hor_ele0_7.png,hor_ele0_8.png,hor_ele0_9.png,hor_ele1_0.png,hor_ele1_1.png,hor_ele1_10.png,hor_ele1_11.png,hor_ele1_12.png,hor_ele1_13.png,hor_ele1_14.png,hor_ele1_15.png,hor_ele1_2.png,hor_ele1_3.png,hor_ele1_4.png,hor_ele1_5.png,hor_ele1_6.png,hor_ele1_7.png,hor_ele1_8.png,hor_ele1_9.png,hor_ele2_0.png,hor_ele2_1.png,hor_ele2_10.png,hor_ele2_11.png,hor_ele2_12.png,hor_ele2_13.png,hor_ele2_14.png,hor_ele2_15.png,hor_ele2_2.png,hor_ele2_3.png,hor_ele2_4.png,hor_ele2_5.png,hor_ele2_6.png,hor_ele2_7.png,hor_ele2_8.png,hor_ele2_9.png,hor_ele3_0.png,hor_ele3_1.png,hor_ele3_10.png,hor_ele3_11.png,hor_ele3_12.png,hor_ele3_13.png,hor_ele3_14.png,hor_ele3_15.png,hor_ele3_2.png,hor_ele3_3.png,hor_ele3_4.png,hor_ele3_5.png,hor_ele3_6.png,hor_ele3_7.png,hor_ele3_8.png,hor_ele3_9.png,hor_ele4_0.png,hor_ele4_1.png,hor_ele4_10.png,hor_ele4_11.png,hor_ele4_12.png,hor_ele4_13.png,hor_ele4_14.png,hor_ele4_15.png,hor_ele4_2.png,hor_ele4_3.png,hor_ele4_4.png,hor_ele4_5.png,hor_ele4_6.png,hor_ele4_7.png,hor_ele4_8.png,hor_ele4_9.png,ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png",
"name": "fiveVerHorDis"
},
{
"keys": "cur_light_1.png,cur_light_2.png,map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_creditsBg.png,map_energyAdd.png,map_energyBg.png,map_prizeBox.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_whale_0.png,map_whale_1.png,map_whale_10.png,map_whale_11.png,map_whale_12.png,map_whale_2.png,map_whale_3.png,map_whale_4.png,map_whale_5.png,map_whale_6.png,map_whale_7.png,map_whale_8.png,map_whale_9.png,map_推车.png,map_狐狸气球.png,prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png,water1.png,water2.png",
"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,boomBtn.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,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,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece10.png,hairballPiece11.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,hammerBtn.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,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,redNum0.png,redNum1.png,redNum2.png,redNum3.png,redNum4.png,redNum5.png,redNum6.png,redNum7.png,redNum8.png,redNum9.png,redNum关.png,redNum冒号.png,redNum分.png,redNum数.png,redNum第.png,redNum通.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepBtn.png,table.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene"
} }
], ],
"path": "./resource/" "path": "./resource/"
......
src/SkinJson.ts
View file @ b41db497
...@@ -462,16 +462,6 @@ export const SkinJson = { ...@@ -462,16 +462,6 @@ export const SkinJson = {
"tUp": "关闭按钮.png" "tUp": "关闭按钮.png"
}, },
"id": "closeBtn" "id": "closeBtn"
},
{
"name": "动物",
"x": 154,
"y": 693,
"alpha": 1,
"type": "sprite",
"props": {
"source": "动物.png"
}
} }
] ]
}, },
...@@ -520,25 +510,26 @@ export const SkinJson = { ...@@ -520,25 +510,26 @@ export const SkinJson = {
"id": "tipsTex" "id": "tipsTex"
}, },
{ {
"name": "动物", "name": "开始闯关要能量",
"x": 154, "x": 163,
"y": 692, "y": 1120,
"alpha": 1, "alpha": 1,
"type": "sprite", "type": "button",
"props": { "props": {
"source": "动物.png" "tUp": "开始闯关要能量.png"
} },
"id": "startBtn"
}, },
{ {
"name": "开始闯关要能量", "name": "开始闯关不要能量",
"x": 163, "x": 163,
"y": 1120, "y": 1120,
"alpha": 1, "alpha": 1,
"type": "button", "type": "button",
"props": { "props": {
"tUp": "开始闯关要能量.png" "tUp": "开始闯关不要能量.png"
}, },
"id": "startBtn" "id": "startBtn2"
}, },
{ {
"name": "prize", "name": "prize",
......
src/panels/StartPanel.ts
View file @ b41db497
import { Panel } from "../../module/views/Panel"; import { Panel } from "../../module/views/Panel";
import TEXT_ALIGN = FYGE.TEXT_ALIGN;
import { getChapterData } from "../something/chapters/getChapter"; import { getChapterData } from "../something/chapters/getChapter";
import { Tools } from "../Tools";
import { ElementTargetData } from "../something/interface/ElementTargetData";
import Container = FYGE.Container; import Container = FYGE.Container;
import TEXT_ALIGN = FYGE.TEXT_ALIGN;
import MouseEvent = FYGE.MouseEvent;
import { changeScene } from "../../module/ctrls";
import { PlayScene } from "../scene/PlayScene";
export class StartPanel extends Panel { export class StartPanel extends Panel {
get groupNames() { get groupNames() {
...@@ -22,24 +27,45 @@ export class StartPanel extends Panel { ...@@ -22,24 +27,45 @@ export class StartPanel extends Panel {
this.checkTex.textWidth = 750; this.checkTex.textWidth = 750;
this.checkTex.textAlign = TEXT_ALIGN.CENTER; this.checkTex.textAlign = TEXT_ALIGN.CENTER;
this.checkTex.x = 0; this.checkTex.x = 0;
this.checkTex.text = `第 ${this.data.check} 关`; this.checkTex.text = `第 ${this.data.level} 关`;
this.startBtn.visible = !this.data.isPlayed;
this.startBtn2.visible = this.data.isPlayed;
this.addChild(new StartTarget(this.data.level))
.position.set(0, 682);
this.addChild(new StartTarget(this.data.check)); this.tipsTex.visible = this.data.stars < 3;
} }
start(data) { start(data) {
super.start(); super.start();
} }
private startGame() {
changeScene(PlayScene, {chapter: this.data.level});
this.hidePanel();
}
initEvents() { initEvents() {
super.initEvents(); super.initEvents();
this.startBtn.addEventListener(MouseEvent.CLICK, this.startGame, this);
this.startBtn2.addEventListener(MouseEvent.CLICK, this.startGame, this);
} }
removeEvents() { removeEvents() {
super.removeEvents(); super.removeEvents();
this.startBtn.removeEventListener(MouseEvent.CLICK, this.startGame, this);
this.startBtn2.removeEventListener(MouseEvent.CLICK, this.startGame, this);
} }
} }
const pos = [
[325],
[240, 410],
[180, 325, 470],
]
export class StartTarget extends Container { export class StartTarget extends Container {
constructor(checkNum: number) { constructor(checkNum: number) {
super(); super();
...@@ -48,8 +74,28 @@ export class StartTarget extends Container { ...@@ -48,8 +74,28 @@ export class StartTarget extends Container {
if (passTarget.type == 0) { // 分数 if (passTarget.type == 0) { // 分数
} else if (passTarget.type == 1) { // 消除元素个数 } else if (passTarget.type == 1) { // 消除元素个数
passTarget.elements.forEach((v, i) => {
this.addChild(new StartTargetItem(v)).x = pos[passTarget.elements.length - 1][i];
});
} }
} }
} }
export class StartTargetItem extends Container {
constructor(data: ElementTargetData) {
super();
const targetImg = this.addChild(Tools.getSprite(`ele${data.type}.png`));
targetImg.width = targetImg.height = 100;
const targetTex = this.addChild(Tools.getText(
`${data.count}`, 30, '#ffffff',
TEXT_ALIGN.CENTER, 100, 0, 108
));
targetTex.strokeColor = '#eb5b57';
targetTex.stroke = 3;
}
}
src/panels/StartPanelPrize.ts 0 → 100644
View file @ b41db497
import { Panel } from "../../module/views/Panel";
import MouseEvent = FYGE.MouseEvent;
import { changeScene } from "../../module/ctrls";
import { PlayScene } from "../scene/PlayScene";
import { StartTarget } from "./StartPanel";
import TEXT_ALIGN = FYGE.TEXT_ALIGN;
export class StartPanelPrize extends Panel {
get groupNames() {
return ["StartPanelPrize"]
}
get skinName() {
return "StartPanelPrize"
}
closeBtn: FYGE.Button;
startBtn: FYGE.Button;
startBtn2: FYGE.Button;
tipsTex: FYGE.TextField;
checkTex: FYGE.TextField;
initUi() {
this.checkTex.textWidth = 750;
this.checkTex.textAlign = TEXT_ALIGN.CENTER;
this.checkTex.x = 0;
this.checkTex.text = `第 ${this.data.level} 关`;
this.startBtn.visible = !this.data.isPlayed;
this.startBtn2.visible = this.data.isPlayed;
this.addChild(new StartTarget(this.data.level))
.position.set(0, 682);
}
start(data) {
super.start();
}
private startGame() {
changeScene(PlayScene, {chapter: this.data.level});
this.hidePanel();
}
initEvents() {
super.initEvents();
this.startBtn.addEventListener(MouseEvent.CLICK, this.startGame, this);
this.startBtn2.addEventListener(MouseEvent.CLICK, this.startGame, this);
}
removeEvents() {
super.removeEvents();
this.startBtn.removeEventListener(MouseEvent.CLICK, this.startGame, this);
this.startBtn2.removeEventListener(MouseEvent.CLICK, this.startGame, this);
}
}
src/scene/PlayScene.ts
View file @ b41db497
import { BonusShootAni, stepPosition } from '../something/anis/BonusShootAni'; import { BonusShootAni, stepPosition } from '../something/anis/BonusShootAni';
import { BoomAni } from '../something/anis/BoomAni'; import { BoomAni } from '../something/anis/BoomAni';
import { CrossAni } from '../something/anis/CrossAni'; import { CrossAni } from '../something/anis/CrossAni';
...@@ -105,7 +104,10 @@ const fesChapterData: number[] = [] ...@@ -105,7 +104,10 @@ const fesChapterData: number[] = []
const festivalIndex: number = 40 const festivalIndex: number = 40
export class PlayScene extends Scene { export class PlayScene extends Scene {
get groupNames() { return ["playScene", "fiveVerHorDis", "bonusTime"] } get groupNames() {
return ["playScene", "fiveVerHorDis", "bonusTime"]
}
//关卡数据 //关卡数据
chapterData: ChapterData; chapterData: ChapterData;
//关数 //关数
...@@ -190,9 +192,11 @@ export class PlayScene extends Scene { ...@@ -190,9 +192,11 @@ export class PlayScene extends Scene {
*/ */
private _steps: number; private _steps: number;
private stepNumber: FYGE.BitmapText; private stepNumber: FYGE.BitmapText;
get steps(): number { get steps(): number {
return this._steps return this._steps
} }
set steps(value: number) { set steps(value: number) {
if (value == this._steps) return if (value == this._steps) return
this._steps = value; this._steps = value;
...@@ -207,13 +211,15 @@ export class PlayScene extends Scene { ...@@ -207,13 +211,15 @@ export class PlayScene extends Scene {
get score(): number { get score(): number {
return this._score return this._score
} }
set score(value: number) { set score(value: number) {
if (value == this._score) return; if (value == this._score) return;
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)
} }
//所有道具容器 //所有道具容器
propBtnCon: PropBtnCon; propBtnCon: PropBtnCon;
//道具使用引导 //道具使用引导
...@@ -234,6 +240,7 @@ export class PlayScene extends Scene { ...@@ -234,6 +240,7 @@ export class PlayScene extends Scene {
step: false, step: false,
failStep: false failStep: false
} }
initUi() { initUi() {
//适配，整体置顶， //适配，整体置顶，
//背景图居中 //背景图居中
...@@ -243,8 +250,10 @@ export class PlayScene extends Scene { ...@@ -243,8 +250,10 @@ export class PlayScene extends Scene {
this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(0, 10); this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(0, 10);
var commonTextArr = {}; var commonTextArr = {};
for (var i = 0; i < 10; i++)commonTextArr[i] = RES.getRes("redNum" + i + ".png"); for (var i = 0; i < 10; i++) commonTextArr[i] = RES.getRes("redNum" + i + ".png");
["第", "关", "分", "数"].forEach((e) => { commonTextArr[e] = RES.getRes("redNum" + e + ".png"); }) ["第", "关", "分", "数"].forEach((e) => {
commonTextArr[e] = RES.getRes("redNum" + e + ".png");
})
commonTextArr["："] = RES.getRes("redNum冒号.png"); commonTextArr["："] = RES.getRes("redNum冒号.png");
//通关目标分数 //通关目标分数
this.targetScoreTxt = this.addChild(new FYGE.BitmapText(commonTextArr)); this.targetScoreTxt = this.addChild(new FYGE.BitmapText(commonTextArr));
...@@ -253,8 +262,10 @@ export class PlayScene extends Scene { ...@@ -253,8 +262,10 @@ export class PlayScene extends Scene {
// this.targetScoreTxt.text = "通关分数：1000" // this.targetScoreTxt.text = "通关分数：1000"
// console.log(this.targetScoreTxt) // console.log(this.targetScoreTxt)
} }
start(data: { chapter: number }) { start(data: { chapter: number }) {
super.start(); super.start();
data = this.data;
//第几关 //第几关
this.chapter = (data && data.chapter) ? data.chapter : 1; this.chapter = (data && data.chapter) ? data.chapter : 1;
// this.chapter = 24; // this.chapter = 24;
...@@ -306,8 +317,7 @@ export class PlayScene extends Scene { ...@@ -306,8 +317,7 @@ export class PlayScene extends Scene {
if (!this.warningCop) { if (!this.warningCop) {
//替换顺序 //替换顺序
this.upsetElement(); this.upsetElement();
} } else {
else {
this.enableMouseEvt(true); this.enableMouseEvt(true);
//引导 //引导
this.initGuide(); this.initGuide();
...@@ -319,6 +329,7 @@ export class PlayScene extends Scene { ...@@ -319,6 +329,7 @@ export class PlayScene extends Scene {
//AiControl初始化， //AiControl初始化，
AiControl.ins.init(this.lattices); AiControl.ins.init(this.lattices);
} }
/** /**
* 加载所有用到的svga * 加载所有用到的svga
* 重写，变成其他动画 * 重写，变成其他动画
...@@ -352,6 +363,7 @@ export class PlayScene extends Scene { ...@@ -352,6 +363,7 @@ export class PlayScene extends Scene {
// }) // })
// } // }
} }
//初始化界面ui,,道具弄在这里s //初始化界面ui,,道具弄在这里s
initScene() { initScene() {
...@@ -399,7 +411,7 @@ export class PlayScene extends Scene { ...@@ -399,7 +411,7 @@ export class PlayScene extends Scene {
this.propBtnCon.boomBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onTap_boomBtn, this) this.propBtnCon.boomBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onTap_boomBtn, this)
this.propBtnCon.hammerBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onTap_hammerBtn, this) this.propBtnCon.hammerBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onTap_hammerBtn, this)
this.propBtnCon.stepBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onTap_stepBtn, this) this.propBtnCon.stepBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onTap_stepBtn, this)
//初始化道具信息 //初始化道具信息
this.updateScene(); this.updateScene();
//选择框 无需加入场景 //选择框 无需加入场景
var textureChoosed: FYGE.Texture = RES.getRes("chooseRect.png") var textureChoosed: FYGE.Texture = RES.getRes("chooseRect.png")
...@@ -411,8 +423,9 @@ export class PlayScene extends Scene { ...@@ -411,8 +423,9 @@ export class PlayScene extends Scene {
//bonusTime引导，备用的，无需加入场景 //bonusTime引导，备用的，无需加入场景
this.bonusTime = new BonusTime(); this.bonusTime = new BonusTime();
this.bonusTime.x = 375 this.bonusTime.x = 375
this.bonusTime.y = 1624 / 2-layers.stageOffsetY; this.bonusTime.y = 1624 / 2 - layers.stageOffsetY;
} }
initTarget() { initTarget() {
//通关目标,如果通关目标是元素时，赋值this.passElements，否则 //通关目标,如果通关目标是元素时，赋值this.passElements，否则
if (this.chapterData.passTarget.type == PassType.ELEMENT_TARGET) { if (this.chapterData.passTarget.type == PassType.ELEMENT_TARGET) {
...@@ -434,6 +447,7 @@ export class PlayScene extends Scene { ...@@ -434,6 +447,7 @@ export class PlayScene extends Scene {
this.targetScoreTxt.text = "目标分数：" + this.chapterData.passTarget.score; this.targetScoreTxt.text = "目标分数：" + this.chapterData.passTarget.score;
} }
} }
initRecycle() { initRecycle() {
//以防万一，初始化下。不排除，目标元素不是棒棒糖的，但是元素里有棒棒糖的情况； //以防万一，初始化下。不排除，目标元素不是棒棒糖的，但是元素里有棒棒糖的情况；
this.recycleIndexs = []; this.recycleIndexs = [];
...@@ -444,7 +458,8 @@ export class PlayScene extends Scene { ...@@ -444,7 +458,8 @@ export class PlayScene extends Scene {
var recycles = this.chapterData.map.recycles; var recycles = this.chapterData.map.recycles;
//如果没有就取最下层的，用地图数据格子初始化 //如果没有就取最下层的，用地图数据格子初始化
if (!recycles || !recycles.length) { if (!recycles || !recycles.length) {
var endRowNumHash = {}, endRowNum: number = 0;; var endRowNumHash = {}, endRowNum: number = 0;
;
for (var i = 0; i < this.chapterData.map.lattices.length; i++) { for (var i = 0; i < this.chapterData.map.lattices.length; i++) {
var d = this.chapterData.map.lattices[i]; var d = this.chapterData.map.lattices[i];
if (!d) continue; if (!d) continue;
...@@ -452,17 +467,17 @@ export class PlayScene extends Scene { ...@@ -452,17 +467,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)
} }
} }
...@@ -486,6 +501,7 @@ export class PlayScene extends Scene { ...@@ -486,6 +501,7 @@ export class PlayScene extends Scene {
this.map.addChildAt(imgs, 0); this.map.addChildAt(imgs, 0);
} }
} }
//初始化地图格子数据，包括生成口，联通口 //初始化地图格子数据，包括生成口，联通口
initLattices() { initLattices() {
var latticesD = this.chapterData.map.lattices; var latticesD = this.chapterData.map.lattices;
...@@ -519,7 +535,7 @@ export class PlayScene extends Scene { ...@@ -519,7 +535,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;
...@@ -576,14 +592,13 @@ export class PlayScene extends Scene { ...@@ -576,14 +592,13 @@ export class PlayScene extends Scene {
} else { } else {
this.connectState = 4; this.connectState = 4;
} }
} } else if (hasBigToSmall) {
else if (hasBigToSmall) {
this.connectState = 2; this.connectState = 2;
} } else if (hasSmallToBig) {
else if (hasSmallToBig) {
this.connectState = 1; this.connectState = 1;
}//否则默认的2 }//否则默认的2
} }
//初始化地图元素 //初始化地图元素
initElement() { initElement() {
//没有就根据地图格子随机元素 //没有就根据地图格子随机元素
...@@ -632,7 +647,7 @@ export class PlayScene extends Scene { ...@@ -632,7 +647,7 @@ export class PlayScene extends Scene {
this.lollipopCount++; this.lollipopCount++;
ele = Tool.getElement(ElementType.LOLLIPOP) ele = Tool.getElement(ElementType.LOLLIPOP)
break; break;
//石头 //石头
case 2: case 2:
ele = Tool.getElement(ElementType.ROCK) ele = Tool.getElement(ElementType.ROCK)
break; break;
...@@ -675,6 +690,7 @@ export class PlayScene extends Scene { ...@@ -675,6 +690,7 @@ export class PlayScene extends Scene {
this.lollipopMark = true this.lollipopMark = true
} }
} }
//重置基础元素及特效类型 //重置基础元素及特效类型
initBaseElement() { initBaseElement() {
var elements = this.chapterData.map.baseElements; var elements = this.chapterData.map.baseElements;
...@@ -700,6 +716,7 @@ export class PlayScene extends Scene { ...@@ -700,6 +716,7 @@ export class PlayScene extends Scene {
if (!ele.hasState(StateType.BUBBLE)) ele.effectType = arr[0] ? arr[0] - 1 : null; if (!ele.hasState(StateType.BUBBLE)) ele.effectType = arr[0] ? arr[0] - 1 : null;
} }
} }
//初始化引导，游戏和道具 //初始化引导，游戏和道具
initGuide() { initGuide() {
//游戏引导 //游戏引导
...@@ -722,6 +739,7 @@ export class PlayScene extends Scene { ...@@ -722,6 +739,7 @@ export class PlayScene extends Scene {
// } // }
// } // }
} }
//初始化节日元素，暂时不用 //初始化节日元素，暂时不用
initFestivalEle(): boolean { initFestivalEle(): boolean {
//添加节日元素，条件可能会变 //添加节日元素，条件可能会变
...@@ -764,8 +782,7 @@ export class PlayScene extends Scene { ...@@ -764,8 +782,7 @@ export class PlayScene extends Scene {
if (!this.warningCop) { if (!this.warningCop) {
//替换顺序 //替换顺序
this.upsetElement(); this.upsetElement();
} } else {
else {
this.enableMouseEvt(true); this.enableMouseEvt(true);
} }
} }
...@@ -812,6 +829,7 @@ export class PlayScene extends Scene { ...@@ -812,6 +829,7 @@ export class PlayScene extends Scene {
this.elementContainer.removeEventListener(FYGE.MouseEvent.MOUSE_DOWN, this.mouseDownE, this); this.elementContainer.removeEventListener(FYGE.MouseEvent.MOUSE_DOWN, this.mouseDownE, this);
this.elementContainer.removeEventListener(FYGE.MouseEvent.MOUSE_MOVE, this.mouseMoveE, this); this.elementContainer.removeEventListener(FYGE.MouseEvent.MOUSE_MOVE, this.mouseMoveE, this);
} }
onEnterFrame() { onEnterFrame() {
if (this.enableTouch && !this.gameGuide) { if (this.enableTouch && !this.gameGuide) {
this.noActionCount++; this.noActionCount++;
...@@ -825,6 +843,7 @@ export class PlayScene extends Scene { ...@@ -825,6 +843,7 @@ export class PlayScene extends Scene {
this.warningAni(); this.warningAni();
} }
} }
//出现交换提示 //出现交换提示
warningAni() { warningAni() {
var a = this.warningCop[0]; var a = this.warningCop[0];
...@@ -833,21 +852,22 @@ export class PlayScene extends Scene { ...@@ -833,21 +852,22 @@ 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)
} }
//重置移动提示 //重置移动提示
resetWarning() { resetWarning() {
if (!this.warningCop) return if (!this.warningCop) return
...@@ -865,6 +885,7 @@ export class PlayScene extends Scene { ...@@ -865,6 +885,7 @@ export class PlayScene extends Scene {
b.x = bp[0]; b.x = bp[0];
b.y = bp[1]; b.y = bp[1];
} }
// onTap_settingBtn() { // onTap_settingBtn() {
// this.settingGroup.visible = !this.settingGroup.visible; // this.settingGroup.visible = !this.settingGroup.visible;
// } // }
...@@ -907,6 +928,7 @@ export class PlayScene extends Scene { ...@@ -907,6 +928,7 @@ export class PlayScene extends Scene {
this.useProp(PropType.BOOMS) this.useProp(PropType.BOOMS)
// } // }
} }
onTap_hammerBtn() { onTap_hammerBtn() {
// if (this.propBtnCon.hammerBtn.propNumShow.count <= 0) { // if (this.propBtnCon.hammerBtn.propNumShow.count <= 0) {
// //购买弹框 // //购买弹框
...@@ -922,6 +944,7 @@ export class PlayScene extends Scene { ...@@ -922,6 +944,7 @@ export class PlayScene extends Scene {
this.useProp(PropType.HAMMERS) this.useProp(PropType.HAMMERS)
// } // }
} }
onTap_stepBtn() { onTap_stepBtn() {
// if (this.propBtnCon.stepBtn.propNumShow.count <= 0) { // if (this.propBtnCon.stepBtn.propNumShow.count <= 0) {
// //购买弹框 // //购买弹框
...@@ -937,6 +960,7 @@ export class PlayScene extends Scene { ...@@ -937,6 +960,7 @@ export class PlayScene extends Scene {
this.useProp(PropType.STEPS) this.useProp(PropType.STEPS)
// } // }
} }
//使用道具逻辑 //使用道具逻辑
useProp(prop: PropType) { useProp(prop: PropType) {
//去掉移动提示侦听 //去掉移动提示侦听
...@@ -959,7 +983,7 @@ export class PlayScene extends Scene { ...@@ -959,7 +983,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 &&
...@@ -1001,6 +1025,7 @@ export class PlayScene extends Scene { ...@@ -1001,6 +1025,7 @@ export class PlayScene extends Scene {
}, this); }, this);
} }
} }
sendPropUse(prop: PropType, index?: number) { sendPropUse(prop: PropType, index?: number) {
//移除事件 //移除事件
this.propGuide.removeAllEventListener(); this.propGuide.removeAllEventListener();
...@@ -1074,6 +1099,7 @@ export class PlayScene extends Scene { ...@@ -1074,6 +1099,7 @@ export class PlayScene extends Scene {
// } // }
// }, prop) // }, prop)
} }
mouseDownE(e: FYGE.MouseEvent) { mouseDownE(e: FYGE.MouseEvent) {
//现在有两级，element的showImage是FrameAni //现在有两级，element的showImage是FrameAni
var ele = e.currentTarget.parent.parent var ele = e.currentTarget.parent.parent
...@@ -1101,6 +1127,7 @@ export class PlayScene extends Scene { ...@@ -1101,6 +1127,7 @@ export class PlayScene extends Scene {
} }
} }
} }
mouseMoveE(e) { mouseMoveE(e) {
if (this.SELECTED && e.currentTarget.parent.parent instanceof Element) { if (this.SELECTED && e.currentTarget.parent.parent instanceof Element) {
var ele = e.currentTarget.parent.parent var ele = e.currentTarget.parent.parent
...@@ -1112,6 +1139,7 @@ export class PlayScene extends Scene { ...@@ -1112,6 +1139,7 @@ export class PlayScene extends Scene {
} }
} }
} }
//交换元素回调函数，处理数据及重新交换 //交换元素回调函数，处理数据及重新交换
private callbackEx(s, o) { private callbackEx(s, o) {
this.exchangeData(s, o); this.exchangeData(s, o);
...@@ -1146,11 +1174,12 @@ export class PlayScene extends Scene { ...@@ -1146,11 +1174,12 @@ export class PlayScene extends Scene {
this.exchangeElementAni(s, o); this.exchangeElementAni(s, o);
} }
} }
//交换元素动画 //交换元素动画
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);
...@@ -1159,8 +1188,9 @@ export class PlayScene extends Scene { ...@@ -1159,8 +1188,9 @@ 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)
} }
//数据交换 //数据交换
private exchangeData(a: Element, b: Element) { private exchangeData(a: Element, b: Element) {
var latA = this.lattices[a.index]; var latA = this.lattices[a.index];
...@@ -1168,7 +1198,9 @@ export class PlayScene extends Scene { ...@@ -1168,7 +1198,9 @@ export class PlayScene extends Scene {
latA.element = b; latA.element = b;
latB.element = a; latB.element = a;
} }
fallVerMark: boolean fallVerMark: boolean
/** /**
* 掉落方法还有问题，遇到那种少量垂直元素，只能等垂直元素到底后，才考虑斜落，以后再考虑一边掉落逻辑， * 掉落方法还有问题，遇到那种少量垂直元素，只能等垂直元素到底后，才考虑斜落，以后再考虑一边掉落逻辑，
* 比如在一次性fallVerticalEx每列加上斜落元素，必须自身下方是空，无连通的情况 * 比如在一次性fallVerticalEx每列加上斜落元素，必须自身下方是空，无连通的情况
...@@ -1212,6 +1244,7 @@ export class PlayScene extends Scene { ...@@ -1212,6 +1244,7 @@ export class PlayScene extends Scene {
} }
} }
/** /**
* 竖直掉落,一格判断,,没有按竖直生成口从上到下，所以有点问题 * 竖直掉落,一格判断,,没有按竖直生成口从上到下，所以有点问题
*/ */
...@@ -1229,16 +1262,16 @@ export class PlayScene extends Scene { ...@@ -1229,16 +1262,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);
//加上一个 //加上一个
...@@ -1252,7 +1285,7 @@ export class PlayScene extends Scene { ...@@ -1252,7 +1285,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)
} }
} }
...@@ -1285,7 +1318,7 @@ export class PlayScene extends Scene { ...@@ -1285,7 +1318,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)
...@@ -1336,16 +1369,13 @@ export class PlayScene extends Scene { ...@@ -1336,16 +1369,13 @@ export class PlayScene extends Scene {
} }
} }
if (this.connectState == 1) { if (this.connectState == 1) {
for (var m = Tool.colNum; m >= 0; m--)operation(m) for (var m = Tool.colNum; m >= 0; m--) operation(m)
} } else if (this.connectState == 2) {
else if (this.connectState == 2) {
for (var m = 0; m < Tool.colNum; m++) operation(m) for (var m = 0; m < Tool.colNum; m++) operation(m)
} } else if (this.connectState == 3) {
else if (this.connectState == 3) {
for (var m = Tool.colNum; m >= 0; m--) operation(m); for (var m = Tool.colNum; m >= 0; m--) operation(m);
for (var m = 0; m < Tool.colNum; m++) operation(m); for (var m = 0; m < Tool.colNum; m++) operation(m);
} } else if (this.connectState == 4) {
else if (this.connectState == 4) {
for (var m = 0; m < Tool.colNum; m++) operation(m); for (var m = 0; m < Tool.colNum; m++) operation(m);
for (var m = Tool.colNum; m >= 0; m--) operation(m); for (var m = Tool.colNum; m >= 0; m--) operation(m);
} }
...@@ -1360,7 +1390,9 @@ export class PlayScene extends Scene { ...@@ -1360,7 +1390,9 @@ export class PlayScene extends Scene {
var anis: FallAniData[] = []; var anis: FallAniData[] = [];
var emptys = this.emptys; var emptys = this.emptys;
//排序从大到小 //排序从大到小
emptys.sort(function (a, b) { return a < b ? 1 : -1 }) emptys.sort(function(a, b) {
return a < b ? 1 : -1
})
for (var i = 0; i < emptys.length; i++) { for (var i = 0; i < emptys.length; i++) {
let indexMy = emptys[i]; let indexMy = emptys[i];
var lat = this.lattices[indexMy]; var lat = this.lattices[indexMy];
...@@ -1416,7 +1448,7 @@ export class PlayScene extends Scene { ...@@ -1416,7 +1448,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)
...@@ -1435,7 +1467,7 @@ export class PlayScene extends Scene { ...@@ -1435,7 +1467,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);
//优先判断生成的，不用管掉落了，跳下一个 //优先判断生成的，不用管掉落了，跳下一个
...@@ -1486,7 +1518,7 @@ export class PlayScene extends Scene { ...@@ -1486,7 +1518,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;
...@@ -1494,7 +1526,7 @@ export class PlayScene extends Scene { ...@@ -1494,7 +1526,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 {
...@@ -1517,11 +1549,11 @@ export class PlayScene extends Scene { ...@@ -1517,11 +1549,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处的动画
//如果下格子上方有格子，用遮罩的写法 //如果下格子上方有格子，用遮罩的写法
...@@ -1544,9 +1576,9 @@ export class PlayScene extends Scene { ...@@ -1544,9 +1576,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
...@@ -1755,8 +1787,7 @@ export class PlayScene extends Scene { ...@@ -1755,8 +1787,7 @@ export class PlayScene extends Scene {
else if (len == 4) { else if (len == 4) {
if ([s, o].indexOf(ele) > -1) { if ([s, o].indexOf(ele) > -1) {
ele.temEffectType = EffectType.HORIZONTAL; ele.temEffectType = EffectType.HORIZONTAL;
} } else if (!s && k == 2) {
else if (!s && k == 2) {
ele.temEffectType = EffectType.HORIZONTAL; ele.temEffectType = EffectType.HORIZONTAL;
} }
//最终判断 //最终判断
...@@ -1789,7 +1820,6 @@ export class PlayScene extends Scene { ...@@ -1789,7 +1820,6 @@ export class PlayScene extends Scene {
} }
/** /**
* 执行消除，应该是一个迭代，只要eliminatedElements有东西就一直执行 * 执行消除，应该是一个迭代，只要eliminatedElements有东西就一直执行
* 掉落后的逻辑很复杂 * 掉落后的逻辑很复杂
...@@ -1836,6 +1866,7 @@ export class PlayScene extends Scene { ...@@ -1836,6 +1866,7 @@ export class PlayScene extends Scene {
}, 200) }, 200)
} }
} }
/** /**
* 掉落完后的操作 * 掉落完后的操作
*/ */
...@@ -1932,6 +1963,7 @@ export class PlayScene extends Scene { ...@@ -1932,6 +1963,7 @@ export class PlayScene extends Scene {
}) })
}) })
} }
/** /**
* 果冻蔓延和气泡变色需要重新检查死图 * 果冻蔓延和气泡变色需要重新检查死图
*/ */
...@@ -1944,7 +1976,7 @@ export class PlayScene extends Scene { ...@@ -1944,7 +1976,7 @@ export class PlayScene extends Scene {
showToast("元素已无法消除") showToast("元素已无法消除")
setTimeout(() => { setTimeout(() => {
// //playSound(SoundType.fail); // //playSound(SoundType.fail);
var panelsDatas = this.returnPanels("failed", { level: this.chapter }) var panelsDatas = this.returnPanels("failed", {level: this.chapter})
// PanelCtrl.instance.showPanels(panelsDatas[0], panelsDatas[1], () => { }); // PanelCtrl.instance.showPanels(panelsDatas[0], panelsDatas[1], () => { });
// PanelCtrl.instance.show("failed", { level: this.chapter }); // PanelCtrl.instance.show("failed", { level: this.chapter });
}, 1000) }, 1000)
...@@ -1960,13 +1992,15 @@ export class PlayScene extends Scene { ...@@ -1960,13 +1992,15 @@ export class PlayScene extends Scene {
if (this.gameGuide) { if (this.gameGuide) {
this.addChild(this.gameGuide) this.addChild(this.gameGuide)
this.gameGuide.show() this.gameGuide.show()
}; }
;
//允许移动 //允许移动
this.enableMouseEvt(true); this.enableMouseEvt(true);
//检查是否有红包炸弹弹框；有就弹出；然后置空 //检查是否有红包炸弹弹框；有就弹出；然后置空
this.openRedBombPanel(); this.openRedBombPanel();
} }
} }
/** /**
* 特效元素的组合效果 * 特效元素的组合效果
*/ */
...@@ -1990,7 +2024,7 @@ export class PlayScene extends Scene { ...@@ -1990,7 +2024,7 @@ export class PlayScene extends Scene {
this.recoverEle(one); this.recoverEle(one);
this.recoverEle(two); this.recoverEle(two);
//先不管特效组合时的自身的分数 //先不管特效组合时的自身的分数
//把所有元素加入 //把所有元素加入
for (var i = 0; i < this.lattices.length; i++) { for (var i = 0; i < this.lattices.length; i++) {
var lat = this.lattices[i]; var lat = this.lattices[i];
if (Tool.judgeEliminate(lat)) { if (Tool.judgeEliminate(lat)) {
...@@ -2127,6 +2161,7 @@ export class PlayScene extends Scene { ...@@ -2127,6 +2161,7 @@ export class PlayScene extends Scene {
} }
} }
} }
/** /**
* 螺旋线消除 * 螺旋线消除
*/ */
...@@ -2148,6 +2183,7 @@ export class PlayScene extends Scene { ...@@ -2148,6 +2183,7 @@ export class PlayScene extends Scene {
} }
this.magicRotateData.length = 0; this.magicRotateData.length = 0;
} }
/** /**
* 普通元素消除,先消除无特效的，有特效的存下，然后触发，找下一步消除的元素 * 普通元素消除,先消除无特效的，有特效的存下，然后触发，找下一步消除的元素
* 加入石头，果冻，鸡蛋，各种状态 * 加入石头，果冻，鸡蛋，各种状态
...@@ -2165,7 +2201,7 @@ export class PlayScene extends Scene { ...@@ -2165,7 +2201,7 @@ export class PlayScene extends Scene {
if (!ele) { if (!ele) {
//以防万一还是判断一次 //以防万一还是判断一次
} }
//下面带状态的要优先判断 //下面带状态的要优先判断
//有枷锁的 //有枷锁的
else if (ele.hasState(StateType.LOCK)) { else if (ele.hasState(StateType.LOCK)) {
//被禁锢的解开 //被禁锢的解开
...@@ -2267,9 +2303,10 @@ export class PlayScene extends Scene { ...@@ -2267,9 +2303,10 @@ export class PlayScene extends Scene {
} }
return effectIndexs return effectIndexs
} }
/** /**
* 特效元素消除时，波及，添加新的消除元素 * 特效元素消除时，波及，添加新的消除元素
* @param effectIndexs * @param effectIndexs
*/ */
effectEliminate(effectIndexs: number[]) { effectEliminate(effectIndexs: number[]) {
if (effectIndexs.length && !this.hasPassed) this.effectContinuityTimes++; if (effectIndexs.length && !this.hasPassed) this.effectContinuityTimes++;
...@@ -2382,6 +2419,7 @@ export class PlayScene extends Scene { ...@@ -2382,6 +2419,7 @@ export class PlayScene extends Scene {
//playSound(sounds[a]); //playSound(sounds[a]);
// } // }
} }
/** /**
* 判断是否通关 * 判断是否通关
*/ */
...@@ -2424,8 +2462,7 @@ export class PlayScene extends Scene { ...@@ -2424,8 +2462,7 @@ export class PlayScene extends Scene {
if (effectElements.length) { if (effectElements.length) {
Array.prototype.push.apply(this.eliminatedElements, effectElements); Array.prototype.push.apply(this.eliminatedElements, effectElements);
this.eliminate(); this.eliminate();
} } else {
else {
//如果步数原先就为0或没有元素了；直接提交了 //如果步数原先就为0或没有元素了；直接提交了
if (this.steps == 0 || elements.length == 0) { if (this.steps == 0 || elements.length == 0) {
this.score += 1000 * this.steps; this.score += 1000 * this.steps;
...@@ -2453,7 +2490,7 @@ export class PlayScene extends Scene { ...@@ -2453,7 +2490,7 @@ export class PlayScene extends Scene {
//分数 //分数
this.score += 1000; this.score += 1000;
this.addChild(bonusShootAni); this.addChild(bonusShootAni);
//算角度 //算角度
var r = Tool.getForwardRotation(stepPosition, [ele.x, ele.y]) var r = Tool.getForwardRotation(stepPosition, [ele.x, ele.y])
bonusShootAni.play(r * 180 / Math.PI, [ele.x, ele.y], () => { bonusShootAni.play(r * 180 / Math.PI, [ele.x, ele.y], () => {
ele.effectType = Math.random() > 0.5 ? EffectType.HORIZONTAL : EffectType.VERTICAL; ele.effectType = Math.random() > 0.5 ? EffectType.HORIZONTAL : EffectType.VERTICAL;
...@@ -2474,10 +2511,11 @@ export class PlayScene extends Scene { ...@@ -2474,10 +2511,11 @@ export class PlayScene extends Scene {
} }
} }
} }
/** /**
* 创建分数得动画 * 创建分数得动画
* @param score * @param score
* @param p * @param p
*/ */
pushScoreAni(score: number, p: number[]) {//暂时不用 pushScoreAni(score: number, p: number[]) {//暂时不用
let scoreAni = Pool.takeOut(RecoverName.SCORE_ANI); let scoreAni = Pool.takeOut(RecoverName.SCORE_ANI);
...@@ -2498,12 +2536,10 @@ export class PlayScene extends Scene { ...@@ -2498,12 +2536,10 @@ export class PlayScene extends Scene {
if (this.oneStepScore > 5000) { if (this.oneStepScore > 5000) {
//playSound(SoundType.toast); //playSound(SoundType.toast);
sv = "wonderful"; sv = "wonderful";
} } else if (this.oneStepScore > 3000) {
else if (this.oneStepScore > 3000) {
//playSound(SoundType.toast); //playSound(SoundType.toast);
sv = "amazing"; sv = "amazing";
} } else if (this.oneStepScore > 1000) {
else if (this.oneStepScore > 1000) {
//playSound(SoundType.toast); //playSound(SoundType.toast);
sv = "great"; sv = "great";
} }
...@@ -2551,7 +2587,7 @@ export class PlayScene extends Scene { ...@@ -2551,7 +2587,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) {
//交换结束后,判断是否有三消 //交换结束后,判断是否有三消
...@@ -2582,7 +2618,7 @@ export class PlayScene extends Scene { ...@@ -2582,7 +2618,7 @@ export class PlayScene extends Scene {
* 从容器移除 * 从容器移除
* 回收元素 * 回收元素
* 如果格子有冰等等 * 如果格子有冰等等
* @param index * @param index
*/ */
recoverEle(index: number) { recoverEle(index: number) {
let ele = this.removeOperation(index); let ele = this.removeOperation(index);
...@@ -2612,8 +2648,8 @@ export class PlayScene extends Scene { ...@@ -2612,8 +2648,8 @@ export class PlayScene extends Scene {
/** /**
* 包括捞结果 * 包括捞结果
* @param json * @param json
* @param callback * @param callback
*/ */
submit(json: string) { submit(json: string) {
// NetManager.ins.hc_submit((s, data) => { // NetManager.ins.hc_submit((s, data) => {
...@@ -2673,8 +2709,8 @@ export class PlayScene extends Scene { ...@@ -2673,8 +2709,8 @@ export class PlayScene extends Scene {
/** /**
* 为了能加入红包炸弹的弹框 * 为了能加入红包炸弹的弹框
* @param panel * @param panel
* @param data * @param data
*/ */
returnPanels(panelName, data) { returnPanels(panelName, data) {
var panels = [], params = []; var panels = [], params = [];
...@@ -2691,7 +2727,7 @@ export class PlayScene extends Scene { ...@@ -2691,7 +2727,7 @@ export class PlayScene extends Scene {
/** /**
* 播放动画 * 播放动画
* @param name * @param name
*/ */
playAni(name: RecoverName, p: number[]) { playAni(name: RecoverName, p: number[]) {
let ani = Pool.takeOut(name); let ani = Pool.takeOut(name);
...@@ -2714,7 +2750,7 @@ export class PlayScene extends Scene { ...@@ -2714,7 +2750,7 @@ export class PlayScene extends Scene {
/** /**
* 格子上的冰块破碎 * 格子上的冰块破碎
* @param lat * @param lat
*/ */
iceBroken(lat: Lattice) { iceBroken(lat: Lattice) {
if (lat && lat.ice) { if (lat && lat.ice) {
...@@ -2742,7 +2778,7 @@ export class PlayScene extends Scene { ...@@ -2742,7 +2778,7 @@ export class PlayScene extends Scene {
if (this.passElements[type] != 0) { if (this.passElements[type] != 0) {
this.passElements[type]--; this.passElements[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], () => { this.addChild(FlyTargetAni(type, fromP, [p.x, p.y], () => {
this.elementTargets.targets[type].count--; this.elementTargets.targets[type].count--;
})) }))
...@@ -2774,6 +2810,7 @@ export class PlayScene extends Scene { ...@@ -2774,6 +2810,7 @@ export class PlayScene extends Scene {
} }
} }
} }
//检查附近所有元素 //检查附近所有元素
checkNebAll(latttice: Lattice) { checkNebAll(latttice: Lattice) {
//如果格子有冰 //如果格子有冰
...@@ -2807,18 +2844,20 @@ export class PlayScene extends Scene { ...@@ -2807,18 +2844,20 @@ export class PlayScene extends Scene {
return lat.element.type == ElementType.FESTIVALELE_SMALL; return lat.element.type == ElementType.FESTIVALELE_SMALL;
}); });
} }
/** /**
* 石头的移除，包括动效 * 石头的移除，包括动效
* @param index * @param index
*/ */
removeRock(index: number) { removeRock(index: number) {
this.removeOperation(index); this.removeOperation(index);
//播放动效 //播放动效
this.playAni(RecoverName.ROCK_ANI, Tool.getPositionByIndex(index)) this.playAni(RecoverName.ROCK_ANI, Tool.getPositionByIndex(index))
} }
/** /**
* 果冻的移除，包括动效 * 果冻的移除，包括动效
* @param index * @param index
*/ */
removeJelly(index: number) { removeJelly(index: number) {
this.jellyBrokenMark = true; this.jellyBrokenMark = true;
...@@ -2834,7 +2873,7 @@ export class PlayScene extends Scene { ...@@ -2834,7 +2873,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--;
})) }))
...@@ -2846,13 +2885,14 @@ export class PlayScene extends Scene { ...@@ -2846,13 +2885,14 @@ export class PlayScene extends Scene {
} }
} }
} }
/** /**
* 移除元素的操作: * 移除元素的操作:
* 进入emptys * 进入emptys
* 从场景移除 * 从场景移除
* 回收元素 * 回收元素
* 格子元素置空 * 格子元素置空
* @param index * @param index
*/ */
removeOperation(index: number): Element { removeOperation(index: number): Element {
//没有格子，或者没有元素， //没有格子，或者没有元素，
...@@ -2903,4 +2943,4 @@ export class PlayScene extends Scene { ...@@ -2903,4 +2943,4 @@ export class PlayScene extends Scene {
// if (!currentTarget) return null; // if (!currentTarget) return null;
// } // }
// return currentTarget // return currentTarget
// } // }
\ No newline at end of file
src/scene/map/CheckBtn.ts
View file @ b41db497
...@@ -13,6 +13,7 @@ import Tween = FYGE.Tween; ...@@ -13,6 +13,7 @@ import Tween = FYGE.Tween;
import { Panel } from "../../../module/views/Panel"; import { Panel } from "../../../module/views/Panel";
import { showPanel } from "../../../module/ctrls"; import { showPanel } from "../../../module/ctrls";
import { StartPanel } from "../../panels/StartPanel"; import { StartPanel } from "../../panels/StartPanel";
import { StartPanelPrize } from "../../panels/StartPanelPrize";
export enum CHECK_TYPE { export enum CHECK_TYPE {
COM, // 普通 COM, // 普通
...@@ -21,6 +22,22 @@ export enum CHECK_TYPE { ...@@ -21,6 +22,22 @@ export enum CHECK_TYPE {
export default class CheckBtn extends Container { export default class CheckBtn extends Container {
private checkData: {
level: number,
scores: number,
stars: number,
isPrizeLevel: boolean,
isVisitSuccess: boolean
isPlayed: boolean
} = {
level: 1,
scores: 0,
stars: 0,
isPrizeLevel: false,
isVisitSuccess: false,
isPlayed: false
};
private btn: Button = null; private btn: Button = null;
private checkLabel: TextField = null; private checkLabel: TextField = null;
...@@ -35,9 +52,13 @@ export default class CheckBtn extends Container { ...@@ -35,9 +52,13 @@ export default class CheckBtn extends Container {
private _data: any = null; private _data: any = null;
public set data(data) { public set data(data) {
this._data = data; this._data = data;
if (!data) return;
if (!data.isVisitSuccess) return; if (!data.isVisitSuccess) return;
this.enabled = data.isVisitSuccess; this.enabled = data.isVisitSuccess;
this.starCount = data.stars; this.starCount = data.stars;
this.checkData = data;
this.checkData.isPlayed = true;
} }
private _starCount = 0; private _starCount = 0;
...@@ -154,6 +175,7 @@ export default class CheckBtn extends Container { ...@@ -154,6 +175,7 @@ export default class CheckBtn extends Container {
// 关卡文字 // 关卡文字
this.checkNum = data.check; this.checkNum = data.check;
this.checkData.level = data.check;
this.checkLabel = this.btn.addChild(Tools.getText( this.checkLabel = this.btn.addChild(Tools.getText(
data.check, 30, '#ffffff', data.check, 30, '#ffffff',
TEXT_ALIGN.CENTER, 90, 8, 33 TEXT_ALIGN.CENTER, 90, 8, 33
...@@ -169,7 +191,10 @@ export default class CheckBtn extends Container { ...@@ -169,7 +191,10 @@ export default class CheckBtn extends Container {
// 点击事件 // 点击事件
this.btn.addEventListener(MouseEvent.CLICK, () => { this.btn.addEventListener(MouseEvent.CLICK, () => {
console.log(`关卡:${this.checkNum}`); console.log(`关卡:${this.checkNum}`);
showPanel(StartPanel, {check: this.checkNum}); console.log(this.checkData);
this._isPrize
? showPanel(StartPanelPrize, this.checkData)
: showPanel(StartPanel, this.checkData);
}, this); }, this);
} }
...@@ -231,15 +256,16 @@ class CheckCurEffect extends Container { ...@@ -231,15 +256,16 @@ class CheckCurEffect extends Container {
.wait(700); .wait(700);
Tween.get(this.light1, {loop: true}) Tween.get(this.light1, {loop: true})
.set({alpha: 0}) .set({alpha: 1})
.to({alpha: 1}, 700) .wait(700)
// .to({alpha: 1}, 700)
.to({alpha: 0}, 600) .to({alpha: 0}, 600)
.wait(700) .wait(700)
Tween.get(this.light2, {loop: true}) Tween.get(this.light2, {loop: true})
.set({scaleX: 0.8, scaleY: 0.8}) .set({scaleX: 0.8, scaleY: 0.8})
.to({scaleX: 1.3, scaleY: 1.3}, 1000) .to({scaleX: 1.3, scaleY: 1.3}, 1000)
.wait(700); .wait(1000);
Tween.get(this.light2, {loop: true}) Tween.get(this.light2, {loop: true})
.set({alpha: 0}) .set({alpha: 0})
......
src/scene/map/MapMid.ts
View file @ b41db497
import MapPart from "./MapPart"; import MapPart from "./MapPart";
import { RES } from "../../../module/RES"; import { RES } from "../../../module/RES";
import Point = FYGE.Point; import Point = FYGE.Point;
import Sprite = FYGE.Sprite;
import { Tools } from "../../Tools";
import Tween = FYGE.Tween;
import Texture = FYGE.Texture;
import FrameAni = FYGE.FrameAni;
import { loadConfigurationFromPath } from "tslint/lib/configuration";
export default class MapMid extends MapPart { export default class MapMid extends MapPart {
...@@ -8,6 +14,12 @@ export default class MapMid extends MapPart { ...@@ -8,6 +14,12 @@ export default class MapMid extends MapPart {
protected totalCount = 10; protected totalCount = 10;
private balloon: Sprite = null;
private water: Sprite = null;
private water1: Texture = null;
private water2: Texture = null;
private whaleAni: FrameAni = null;
protected btnPos = [ protected btnPos = [
[267, 1519], [267, 1519],
[211, 1325], [211, 1325],
...@@ -27,8 +39,37 @@ export default class MapMid extends MapPart { ...@@ -27,8 +39,37 @@ export default class MapMid extends MapPart {
this.bg.texture = RES.getRes('map_bg2.jpg'); this.bg.texture = RES.getRes('map_bg2.jpg');
this.initIcon(); this.initIcon();
this.initEffect();
this.water1 = RES.getRes('water1.png');
this.water2 = RES.getRes('water2.png');
this.water = this.addChild(new Sprite(this.water1));
this.water.position.set(544, 687);
} }
private initEffect() {
this.balloon = this.addChild(Tools.getSprite('map_狐狸气球.png', -216, 750));
Tween.get(this.balloon, {loop: true})
.set({x: -216, y: 1150})
.to({x: 750 + 100, y: 837}, 20006);
this.water = this.addChild(new Sprite(this.water1));
this.water.position.set(544, 687);
const whaleTextures: Texture[] = new Array(25);
for (let i = 0; i < 13; i++) {
whaleTextures[25 - i] = whaleTextures[i] = RES.getRes(`map_whale_${i}.png`);
}
this.whaleAni = this.addChild(new FrameAni(whaleTextures));
this.whaleAni.position.set(645, 575);
this.whaleAni.play(-1);
}
private waterIndex1: boolean = true;
private waterIndex: number = 0;
public update() { public update() {
super.update(); super.update();
let up = this.localToGlobal(new Point(0, -10), new Point()); let up = this.localToGlobal(new Point(0, -10), new Point());
...@@ -39,6 +80,13 @@ export default class MapMid extends MapPart { ...@@ -39,6 +80,13 @@ export default class MapMid extends MapPart {
|| this.stage.viewRect.isPointIn(bp) || this.stage.viewRect.isPointIn(bp)
|| this.stage.viewRect.isPointIn(ucp) || this.stage.viewRect.isPointIn(ucp)
|| this.stage.viewRect.isPointIn(bcp); || this.stage.viewRect.isPointIn(bcp);
if (this.waterIndex++ > 5) {
this.waterIndex1 = !this.waterIndex1;
this.water.texture = this.waterIndex1 ? this.water1 : this.water2;
this.waterIndex = 0;
}
} }
......
src/scene/map/MapScene.ts
View file @ b41db497
...@@ -20,7 +20,7 @@ export class MapScene extends Scene { ...@@ -20,7 +20,7 @@ export class MapScene extends Scene {
MapScene.checkArr = []; MapScene.checkArr = [];
} }
private uiLayer: Container = null; private uiLayer: MapUI = null;
public get groupNames(): string[] { public get groupNames(): string[] {
return ['map']; return ['map'];
...@@ -49,6 +49,8 @@ export class MapScene extends Scene { ...@@ -49,6 +49,8 @@ export class MapScene extends Scene {
if (!success) return; if (!success) return;
this.uiLayer.energyBox.count = res.data.power;
const currentLevel = res.data.currentLevel; const currentLevel = res.data.currentLevel;
// 已经通关的 // 已经通关的
...@@ -58,8 +60,10 @@ export class MapScene extends Scene { ...@@ -58,8 +60,10 @@ export class MapScene extends Scene {
} }
// 当前关卡 // 当前关卡
MapScene.checkArr[currentLevel].type = CHECK_TYPE.CUR; if (currentLevel < 121) {
MapScene.checkArr[currentLevel].enabled = true; MapScene.checkArr[currentLevel].type = CHECK_TYPE.CUR;
MapScene.checkArr[currentLevel].enabled = true;
}
// 未通关的 // 未通关的
for (let i = currentLevel + 1; i < 121; i++) { for (let i = currentLevel + 1; i < 121; i++) {
......
src/scene/map/MapUI.ts
View file @ b41db497
...@@ -8,12 +8,13 @@ import { Tools } from "../../Tools"; ...@@ -8,12 +8,13 @@ import { Tools } from "../../Tools";
import MouseEvent = FYGE.MouseEvent; import MouseEvent = FYGE.MouseEvent;
export default class MapUI extends Container { export default class MapUI extends Container {
public energyBox: EnergyBox = null;
private creditsBox: CreditsBox = null;
private prizeBox: PrizeBox = null;
private myPrizeBtn: Button = null; private myPrizeBtn: Button = null;
private ruleBtn: Button = null; private ruleBtn: Button = null;
private taskBtn: Button = null; private taskBtn: Button = null;
private energyBox: EnergyBox = null;
private creditsBox: CreditsBox = null;
private prizeBox: PrizeBox = null;
constructor() { constructor() {
super(); super();
......
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